X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscripting%2Ffunctions.hpp;h=d56f6c2f7f5b96f431e5000f730589343e2d7392;hb=11a3b78a422c0deac010eef7de06c97d6b83bad0;hp=250fa7bf835f3c30f545dea288164c7683633575;hpb=c62711567861587107d124642db29e2674ee6533;p=supertux.git

diff --git a/src/scripting/functions.hpp b/src/scripting/functions.hpp
index 250fa7bf8..d56f6c2f7 100644
--- a/src/scripting/functions.hpp
+++ b/src/scripting/functions.hpp
@@ -30,17 +30,10 @@
 namespace Scripting
 {
 
-//TODO: Get this from PlayerStatus (update MiniSwig!)
-static const int KEY_BRASS  = 0x001;
-static const int KEY_IRON   = 0x002;
-static const int KEY_BRONZE = 0x004;
-static const int KEY_SILVER = 0x008;
-static const int KEY_GOLD   = 0x010;
-
 /**
  * Display the value of the argument. This is usefull for inspecting tables.
  */
-int display(HSQUIRRELVM vm) __custom;
+SQInteger display(HSQUIRRELVM vm) __custom;
 
 /**
  * Displays contents of the current stack
@@ -50,7 +43,7 @@ void print_stacktrace(HSQUIRRELVM vm);
 /**
  * returns the currently running thread
  */
-int get_current_thread(HSQUIRRELVM vm) __custom;
+SQInteger get_current_thread(HSQUIRRELVM vm) __custom;
 
 /**
  * Display a text file and scrolls it over the screen (on next screenswitch)
@@ -95,6 +88,12 @@ void fadeout_screen(float seconds);
 void shrink_screen(float dest_x, float dest_y, float seconds);
 
 /**
+ * Aborts any kind of previous screen fade; the screenchange will happen
+ * anyway.
+ */
+void abort_screenfade();
+
+/**
  * Translate a text into the users language (by looking it up in the .po
  * files)
  */
@@ -112,9 +111,9 @@ void import(HSQUIRRELVM v, const std::string& filename);
 void save_state();
 
 /**
- * Add a key to the inventory
+ * Update worldmap from worldmap state (state.world variable)
  */
-void add_key(int new_key);
+void update_worldmap();
 
 /**
  * enable/disable drawing of collision rectangles
@@ -124,7 +123,7 @@ void debug_collrects(bool enable);
 /**
  * enable/disable drawing of fps
  */
-void debug_draw_fps(bool enable);
+void debug_show_fps(bool enable);
 
 /**
  * enable/disable drawing of non-solid layers
@@ -152,19 +151,14 @@ void grease();
 void invincible();
 
 /**
- * recall Tux's invincibility
- */
-void mortal();
-
-/**
- * hurt Tux (kill when Small Tux, otherwise lose powerup or shrink)
+ * makes Tux a ghost, i.e. lets him float around and through solid objects
  */
-void shrink();
+void ghost();
 
 /**
- * kill Tux
+ * recall Tux's invincibility and ghost status
  */
-void kill();
+void mortal();
 
 /**
  * reinitialise and respawn Tux at the beginning of the current level
@@ -190,7 +184,12 @@ void camera();
  * exit the game
  */
 void quit();
+
+/**
+ * Returns a random integer
+ */
+int rand();
+
 }
 
 #endif
-