[Enigma-cvs] enigma/src game.cc,1.47,1.48

[Ralf Westram <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv22278/src

Modified Files:
        game.cc 
Log Message:
- commented out unused states PLAYERDEAD and NOMORELIVES



Index: game.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/game.cc,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** game.cc     20 Oct 2003 08:05:45 -0000      1.47
--- game.cc     20 Oct 2003 17:08:39 -0000      1.48
***************
*** 72,77 ****
              INGAME,             // game is currently running
              LEVELFINISHED,      // level finished; proceed to next one
!             PLAYERDEAD,         // player is dead; restart level shortly
!             NOMORELIVES,        // no player has any lives left, restart
              STARTGAME,          // start the current level (when called from 
level menu)
              RESTARTGAME,        // restart the current level (new lives)
--- 72,77 ----
              INGAME,             // game is currently running
              LEVELFINISHED,      // level finished; proceed to next one
! //             PLAYERDEAD,         // player is dead; restart level shortly
! //             NOMORELIVES,        // no player has any lives left, restart
              STARTGAME,          // start the current level (when called from 
level menu)
              RESTARTGAME,        // restart the current level (new lives)
***************
*** 99,103 ****
          unsigned    icurrent_level;
          Uint32      last_tick_time;
!         double      actor_dead_dtime;
          double      current_state_dtime;
          double      overall_level_time;
--- 99,103 ----
          unsigned    icurrent_level;
          Uint32      last_tick_time;
! //         double      actor_dead_dtime;
          double      current_state_dtime;
          double      overall_level_time;
***************
*** 132,136 ****
  
  void
! GameMenu::draw_background(px::GC &gc) 
  {
      if (!zoomed) {
--- 132,136 ----
  
  void
! GameMenu::draw_background(px::GC &gc)
  {
      if (!zoomed) {
***************
*** 176,180 ****
          // clipped to the screen boundary).
          display::RedrawAll(video::GetScreen());
!         
          // get the selected part from screen
  //         SDL_Surface *back = video::GetScreen()->get_surface();
--- 176,180 ----
          // clipped to the screen boundary).
          display::RedrawAll(video::GetScreen());
! 
          // get the selected part from screen
  //         SDL_Surface *back = video::GetScreen()->get_surface();
***************
*** 271,277 ****
      if (state == newstate) return;
      switch (newstate) {
!     case NOMORELIVES:
!         sound::PlaySound("exit");
!         break;
  
      case LEVELFINISHED:
--- 271,277 ----
      if (state == newstate) return;
      switch (newstate) {
! //     case NOMORELIVES:
! //         sound::PlaySound("exit");
! //         break;
  
      case LEVELFINISHED:
***************
*** 299,306 ****
              return;             // do not enter state
          break;
!     case PLAYERDEAD:
!         actor_dead_dtime = 0;
! //        display::ShowText("You lost", display::TEXT_STATIC);
!         break;
  
      case LEVELINIT:
--- 299,306 ----
              return;             // do not enter state
          break;
! //     case PLAYERDEAD:
! //         actor_dead_dtime = 0;
! // //        display::ShowText("You lost", display::TEXT_STATIC);
! //         break;
  
      case LEVELINIT:
***************
*** 326,333 ****
  {
      bool     skip_solved = mode == 2 || (mode == 0 && 
options::SkipSolvedLevels);
!     unsigned next_level  = NextLevel(level_pack, icurrent_level, 
!                                      HighestAvailableLevel(level_pack), 
!                                      skip_solved, 
!                                      true); 
  
      if (next_level) {
--- 326,333 ----
  {
      bool     skip_solved = mode == 2 || (mode == 0 && 
options::SkipSolvedLevels);
!     unsigned next_level  = NextLevel(level_pack, icurrent_level,
!                                      HighestAvailableLevel(level_pack),
!                                      skip_solved,
!                                      true);
  
      if (next_level) {
***************
*** 387,408 ****
          break;
  
!     case PLAYERDEAD:
!         actor_dead_dtime += dtime;
!         if (actor_dead_dtime <= 0.5) {
!             handle_events();
!             player::Tick(dtime);
!             world::Tick(dtime);
!             display::Tick(dtime);
!             display::Redraw(screen);
!         } else {
!             change_state (RESTARTGAME);
!         }
!         break;
  
!     case NOMORELIVES:
!         if (current_state_dtime >= 2.0) {
!             change_state(RESTARTGAME);
!         }
!         break;
  
      case RELOADLEVEL:
--- 387,408 ----
          break;
  
! //     case PLAYERDEAD:
! //         actor_dead_dtime += dtime;
! //         if (actor_dead_dtime <= 0.5) {
! //             handle_events();
! //             player::Tick(dtime);
! //             world::Tick(dtime);
! //             display::Tick(dtime);
! //             display::Redraw(screen);
! //         } else {
! //             change_state (RESTARTGAME);
! //         }
! //         break;
  
! //     case NOMORELIVES:
! //         if (current_state_dtime >= 2.0) {
! //             change_state(RESTARTGAME);
! //         }
! //         break;
  
      case RELOADLEVEL:
***************
*** 804,809 ****
  
  unsigned
! enigma::NextLevel (LevelPack *lp, unsigned levelidx, unsigned max_available, 
!                    bool skip_solved, bool skip_todo) 
  {
      // returns 0 if none found
--- 804,809 ----
  
  unsigned
! enigma::NextLevel (LevelPack *lp, unsigned levelidx, unsigned max_available,
!                    bool skip_solved, bool skip_todo)
  {
      // returns 0 if none found
***************
*** 849,853 ****
  
  unsigned
! enigma::HighestAvailableLevel(LevelPack *lp) 
  {
      if( options::WizardMode || // No restriction in WizardMode
--- 849,853 ----
  
  unsigned
! enigma::HighestAvailableLevel(LevelPack *lp)
  {
      if( options::WizardMode || // No restriction in WizardMode
***************
*** 872,880 ****
  GetStatus (LevelPack *lp, size_t index)
  {
!     return options::GetLevelStatus (lp->get_name(), 
                                      lp->get_info(index)->filename);
  }
  
! bool 
  enigma::LevelIsLocked (LevelPack *lp, size_t index)
  {
--- 872,880 ----
  GetStatus (LevelPack *lp, size_t index)
  {
!     return options::GetLevelStatus (lp->get_name(),
                                      lp->get_info(index)->filename);
  }
  
! bool
  enigma::LevelIsLocked (LevelPack *lp, size_t index)
  {