merged new collision detection branch back into mainline

[supertux.git] / src / scripting / functions.hpp

diff --git a/src/scripting/functions.hpp b/src/scripting/functions.hpp
index 9222c0e..87066bf 100644 (file)
--- a/src/scripting/functions.hpp
+++ b/src/scripting/functions.hpp
@@ -30,17 +30,20 @@
 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
+ */
+void print_stacktrace(HSQUIRRELVM vm);
+
+/**
+ * returns the currently running thread
+ */
+SQInteger get_current_thread(HSQUIRRELVM vm) __custom;
 
 /**
  * Display a text file and scrolls it over the screen (on next screenswitch)
@@ -102,11 +105,6 @@ void import(HSQUIRRELVM v, const std::string& filename);
 void save_state();
 
 /**
- * Add a key to the inventory
- */
-void add_key(int new_key);
-
-/**
  * enable/disable drawing of collision rectangles
  */
 void debug_collrects(bool enable);
@@ -114,7 +112,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
@@ -122,6 +120,16 @@ void debug_draw_fps(bool enable);
 void debug_draw_solids_only(bool enable);
 
 /**
+ * Changes music to musicfile
+ */
+void play_music(const std::string& musicfile);
+
+/**
+ * Plays a soundfile
+ */
+void play_sound(const std::string& soundfile);
+
+/**
  * speeds Tux up
  */
 void grease();
@@ -132,19 +140,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
@@ -170,6 +173,12 @@ void camera();
  * exit the game
  */
 void quit();
+
+/**
+ * Returns a random integer
+ */
+int rand();
+
 }
 
 #endif