/[enigma]/enigma/src/game.cc
ViewVC logotype

Diff of /enigma/src/game.cc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.4 by dheck, Sun Feb 2 18:17:37 2003 UTC revision 1.5 by dheck, Wed Feb 12 23:20:04 2003 UTC
# Line 140  GameMenu::on_action(gui::Widget *w) { Line 140  GameMenu::on_action(gui::Widget *w) {
140      }      }
141      else if (w == restart)      else if (w == restart)
142      {      {
143          enigma::RestartLevel();          enigma::RestartGame();
144          Menu::quit();          Menu::quit();
145      }      }
146      else if (w == options)      else if (w == options)
# Line 364  Game::tick(double dtime) Line 364  Game::tick(double dtime)
364      case PLAYERDEAD:      case PLAYERDEAD:
365          actor_dead_dtime += dtime;          actor_dead_dtime += dtime;
366          if (actor_dead_dtime <= 0.5) {          if (actor_dead_dtime <= 0.5) {
367                handle_events();
368                player::Tick(dtime);
369              world::Tick(dtime);              world::Tick(dtime);
370              display::Tick(dtime);              display::Tick(dtime);
371              display::Redraw(screen);              display::Redraw(screen);
             handle_events();  
372          } else {          } else {
373              change_state (RESTARTGAME);              change_state (RESTARTGAME);
374          }          }
# Line 380  Game::tick(double dtime) Line 381  Game::tick(double dtime)
381          break;          break;
382    
383      case RELOADLEVEL:      case RELOADLEVEL:
384          load_level(icurrent_level);          if (current_state_dtime >= 1.0) {
385          change_state(INGAME);              load_level(icurrent_level);
386                change_state(INGAME);
387            } else {
388                world::Tick(dtime);
389                display::Tick(dtime);
390                display::Redraw(screen);
391                handle_events();
392            }
393          break;          break;
394    
395      case LEVELINFO:      case LEVELINFO:
# Line 621  Game::on_keydown(SDL_Event &e) Line 629  Game::on_keydown(SDL_Event &e)
629    
630      case SDLK_F3:      case SDLK_F3:
631          player::Suicide();          player::Suicide();
632  //        change_state(RELOADLEVEL);          change_state(RELOADLEVEL);
633          break;          break;
634    
635      case SDLK_F10:      case SDLK_F10:
636          {          {
637              string fname = level_pack->levels[icurrent_level].filename + ".bmp";              string fname = level_pack->levels[icurrent_level].filename + ".bmp";

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26