projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged new collision detection branch back into mainline
[supertux.git]
/
src
/
scripting
/
functions.cpp
diff --git
a/src/scripting/functions.cpp
b/src/scripting/functions.cpp
index
874dfa6
..
aa8ace7
100644
(file)
--- a/
src/scripting/functions.cpp
+++ b/
src/scripting/functions.cpp
@@
-45,6
+45,7
@@
#include "object/camera.hpp"
#include "flip_level_transformer.hpp"
#include "audio/sound_manager.hpp"
#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 "squirrel_error.hpp"
#include "squirrel_util.hpp"
@@
-53,7
+54,7
@@
namespace Scripting
{
namespace Scripting
{
-
int
display(HSQUIRRELVM vm)
+
SQInteger
display(HSQUIRRELVM vm)
{
Console::output << squirrel2string(vm, -1) << std::endl;
return 0;
{
Console::output << squirrel2string(vm, -1) << std::endl;
return 0;
@@
-64,7
+65,7
@@
void print_stacktrace(HSQUIRRELVM vm)
print_squirrel_stack(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;
{
sq_pushobject(vm, vm_to_object(vm));
return 1;
@@
-148,7
+149,7
@@
void debug_collrects(bool enable)
Sector::show_collrects = enable;
}
Sector::show_collrects = enable;
}
-void debug_
dra
w_fps(bool enable)
+void debug_
sho
w_fps(bool enable)
{
config->show_fps = enable;
}
{
config->show_fps = enable;
}
@@
-212,25
+213,19
@@
void invincible()
tux->invincible_timer.start(10000);
}
tux->invincible_timer.start(10000);
}
-void mortal()
-{
- if (!validate_sector_player()) return;
- ::Player* tux = Sector::current()->player;
- tux->invincible_timer.stop();
-}
-
-void shrink()
+void ghost()
{
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player;
{
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player;
- tux->
kill(tux->SHRINK
);
+ tux->
set_ghost_mode(true
);
}
}
-void
kil
l()
+void
morta
l()
{
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player;
{
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()
}
void restart()
@@
-271,5
+266,10
@@
void quit()
main_loop->quit();
}
main_loop->quit();
}
+int rand()
+{
+ return systemRandom.rand();
+}
+
}
}