Made invincibility sparkle a particle effect

[supertux.git] / src / game_session.cpp

diff --git a/src/game_session.cpp b/src/game_session.cpp
index 2f66372..daac30f 100644 (file)
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -66,6 +66,8 @@
 #include "console.hpp"
 #include "flip_level_transformer.hpp"
 #include "trigger/secretarea_trigger.hpp"
+#include "random_generator.hpp"
+#include "scripting/squirrel_util.hpp"
 
 // the engine will be run with a logical framerate of 64fps.
 // We chose 64fps here because it is a power of 2, so 1/64 gives an "even"
@@ -120,6 +122,7 @@ GameSession::restart_level(bool fromBeginning)
   level->stats.total_badguys = level->get_total_badguys();
   level->stats.total_secrets = level->get_total_count<SecretAreaTrigger>();
   level->stats.reset();
+  if (!fromBeginning) level->stats.declare_invalid();
 
   if (fromBeginning) reset_sector="";
   if(reset_sector != "") {
@@ -141,8 +144,14 @@ GameSession::restart_level(bool fromBeginning)
 
   currentsector->play_music(LEVEL_MUSIC);
 
-  if(capture_file != "")
+  if(capture_file != "") {
+    int newSeed=0;               // next run uses a new seed
+    while (newSeed == 0)            // which is the next non-zero random num.
+        newSeed = systemRandom.rand();
+    config->random_seed = systemRandom.srand(newSeed);
+    log_info << "Next run uses random seed " <<config->random_seed <<std::endl;
     record_demo(capture_file);
+  }
 }
 
 GameSession::~GameSession()
@@ -168,6 +177,11 @@ GameSession::record_demo(const std::string& filename)
     throw std::runtime_error(msg.str());
   }
   capture_file = filename;
+
+  char buf[30];                            // save the seed in the demo file
+  sprintf(buf, "random_seed=%010d", config->random_seed);
+  for (int i=0; i==0 || buf[i-1]; i++)
+    capture_demo_stream->put(buf[i]);
 }
 
 void
@@ -186,6 +200,19 @@ GameSession::play_demo(const std::string& filename)
   Player& tux = *currentsector->player;
   demo_controller = new CodeController();
   tux.set_controller(demo_controller);
+
+  char buf[30];                            // recall the seed from the demo file
+  int seed;
+  for (int i=0; i<30 && (i==0 || buf[i-1]); i++)
+    playback_demo_stream->get(buf[i]);
+  if (sscanf(buf, "random_seed=%010d", &seed) == 1) {
+    config->random_seed = seed;            // save where it will be used
+    log_info << "Taking random seed " << seed << " from demo file" <<std::endl;
+  }
+  else {
+    playback_demo_stream->seekg(0);     // old style w/o seed, restart at beg
+    log_info << "Demo file contains no random number" << std::endl;
+  }
 }
 
 void
@@ -233,8 +260,19 @@ GameSession::on_escape_press()
 {
   if(currentsector->player->is_dying() || end_sequence != NO_ENDSEQUENCE)
     return;   // don't let the player open the menu, when he is dying
+
+  if(level->on_menukey_script != "") {
+    std::istringstream in(level->on_menukey_script);
+    run_script(in, "OnMenuKeyScript");
+  } else {
+    toggle_pause();
+  }
+}
   
-  if (!Menu::current()) {
+void
+GameSession::toggle_pause()
+{
+  if(Menu::current() == NULL) {
     Menu::set_current(game_menu.get());
     game_menu->set_active_item(MNID_CONTINUE);
     game_pause = true;
@@ -244,6 +282,36 @@ GameSession::on_escape_press()
   }
 }
 
+HSQUIRRELVM
+GameSession::run_script(std::istream& in, const std::string& sourcename)
+{
+  using namespace Scripting;
+
+  // garbage collect thread list
+  for(ScriptList::iterator i = scripts.begin();
+      i != scripts.end(); ) {
+    HSQOBJECT& object = *i;
+    HSQUIRRELVM vm = object_to_vm(object);
+
+    if(sq_getvmstate(vm) != SQ_VMSTATE_SUSPENDED) {
+      sq_release(global_vm, &object);
+      i = scripts.erase(i);
+      continue;
+    }
+
+    ++i;
+  }
+
+  HSQOBJECT object = create_thread(global_vm);
+  scripts.push_back(object);
+
+  HSQUIRRELVM vm = object_to_vm(object);
+
+  compile_and_run(vm, in, sourcename);
+
+  return vm;
+}
+
 void
 GameSession::process_events()
 {
@@ -378,15 +446,15 @@ GameSession::setup()
 void
 GameSession::update(float elapsed_time)
 {
+  // handle controller
+  if(main_controller->pressed(Controller::PAUSE_MENU))
+    on_escape_press();
+  
   process_events();
   process_menu();
 
   check_end_conditions();
 
-  // handle controller
-  if(main_controller->pressed(Controller::PAUSE_MENU))
-    on_escape_press();
-  
   // respawning in new sector?
   if(newsector != "" && newspawnpoint != "") {
     Sector* sector = level->get_sector(newsector);
@@ -406,11 +474,9 @@ GameSession::update(float elapsed_time)
     if (end_sequence == ENDSEQUENCE_RUNNING) {
       currentsector->update(elapsed_time/2);
     } else if(end_sequence == NO_ENDSEQUENCE) {
-      if(!currentsector->player->growing_timer.started()) {
-       play_time += elapsed_time; //TODO: make sure we don't count cutscene time
-        level->stats.time = play_time;
-        currentsector->update(elapsed_time);
-      }
+      play_time += elapsed_time; //TODO: make sure we don't count cutscene time
+      level->stats.time = play_time;
+      currentsector->update(elapsed_time);
     } 
   }