X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Ffunctions.cpp;h=95d860761bce1f5793aa17834f49ee170d56f9a5;hb=7a0031e8f250c852743709ab06ecafe1896eefbe;hp=874dfa651c2f22c75ab8d934bd1ecb1cb81c7c48;hpb=13c6f377301f91c8d79ab768ba97b5eb771ed624;p=supertux.git

diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp
index 874dfa651..95d860761 100644
--- a/src/scripting/functions.cpp
+++ b/src/scripting/functions.cpp
@@ -45,15 +45,18 @@
 #include "object/camera.hpp"
 #include "flip_level_transformer.hpp"
 #include "audio/sound_manager.hpp"
+#include "random_generator.hpp"
 
 #include "squirrel_error.hpp"
 #include "squirrel_util.hpp"
 #include "time_scheduler.hpp"
 
+extern float game_speed;
+
 namespace Scripting
 {
 
-int display(HSQUIRRELVM vm)
+SQInteger display(HSQUIRRELVM vm)
 {
   Console::output << squirrel2string(vm, -1) << std::endl;
   return 0;
@@ -64,7 +67,7 @@ void print_stacktrace(HSQUIRRELVM vm)
   print_squirrel_stack(vm);
 }
 
-int get_current_thread(HSQUIRRELVM vm)
+SQInteger get_current_thread(HSQUIRRELVM vm)
 {
   sq_pushobject(vm, vm_to_object(vm));
   return 1;
@@ -95,6 +98,11 @@ void shrink_screen(float dest_x, float dest_y, float seconds)
   main_loop->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
 }
 
+void abort_screenfade()
+{
+  main_loop->set_screen_fade(NULL);
+}
+
 std::string translate(const std::string& text)
 {
   return dictionary_manager.get_dictionary().translate(text);
@@ -130,11 +138,11 @@ static SQInteger squirrel_read_char(SQUserPointer file)
 void import(HSQUIRRELVM vm, const std::string& filename)
 {
   IFileStream in(filename);
-    
+
   if(SQ_FAILED(sq_compile(vm, squirrel_read_char, &in,
           filename.c_str(), SQTrue)))
     throw SquirrelError(vm, "Couldn't parse script");
-    
+
   sq_pushroottable(vm);
   if(SQ_FAILED(sq_call(vm, 1, SQFalse, SQTrue))) {
     sq_pop(vm, 1);
@@ -148,7 +156,7 @@ void debug_collrects(bool enable)
   Sector::show_collrects = enable;
 }
 
-void debug_draw_fps(bool enable)
+void debug_show_fps(bool enable)
 {
   config->show_fps = enable;
 }
@@ -161,15 +169,24 @@ void debug_draw_solids_only(bool enable)
 void save_state()
 {
   using namespace WorldMapNS;
-  
-  if(World::current() == NULL)
+
+  if(World::current() == NULL || WorldMap::current() == NULL)
     throw std::runtime_error("Can't save state without active World");
 
-  if(WorldMap::current() != NULL)
-    WorldMap::current()->save_state();
+  WorldMap::current()->save_state();
   World::current()->save_state();
 }
 
+void update_worldmap()
+{
+  using namespace WorldMapNS;
+
+  if(WorldMap::current() == NULL)
+    throw std::runtime_error("Can't update Worldmap: none active");
+
+  WorldMap::current()->load_state();
+}
+
 // not added to header, function to only be used by others
 // in this file
 bool validate_sector_player()
@@ -177,13 +194,13 @@ bool validate_sector_player()
   if (Sector::current() == 0)
   {
     log_info << "No current sector." << std::endl;
-	return false;
+    return false;
   }
 
   if (Sector::current()->player == 0)
   {
     log_info << "No player." << std::endl;
-	return false;
+    return false;
   }
   return true;
 }
@@ -212,25 +229,19 @@ void invincible()
   tux->invincible_timer.start(10000);
 }
 
-void mortal()
+void ghost()
 {
   if (!validate_sector_player()) return;
   ::Player* tux = Sector::current()->player;
-  tux->invincible_timer.stop();
+  tux->set_ghost_mode(true);
 }
 
-void shrink()
-{
-  if (!validate_sector_player()) return;
-  ::Player* tux = Sector::current()->player;
-  tux->kill(tux->SHRINK);
-}
-
-void kill()
+void mortal()
 {
   if (!validate_sector_player()) return;
   ::Player* tux = Sector::current()->player;
-  tux->kill(tux->KILL);
+  tux->invincible_timer.stop();
+  tux->set_ghost_mode(false);
 }
 
 void restart()
@@ -255,7 +266,7 @@ void gotoend()
   if (!validate_sector_player()) return;
   ::Player* tux = Sector::current()->player;
   tux->move(Vector(
-          (Sector::current()->solids->get_width()*32) - (SCREEN_WIDTH*2), 0));
+          (Sector::current()->get_width()) - (SCREEN_WIDTH*2), 0));
   Sector::current()->camera->reset(
         Vector(tux->get_pos().x, tux->get_pos().y));
 }
@@ -266,10 +277,23 @@ void camera()
   log_info << "Camera is at " << Sector::current()->camera->get_translation().x << "," << Sector::current()->camera->get_translation().y << std::endl;
 }
 
+void set_gamma(float gamma) {
+  SDL_SetGamma(gamma, gamma, gamma);
+}
+
 void quit()
 {
   main_loop->quit();
 }
 
+int rand()
+{
+  return systemRandom.rand();
 }
 
+void set_game_speed(float speed)
+{
+  ::game_speed = speed;
+}
+
+}