projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ Patch #1793 ] Turn physic into POD
[supertux.git]
/
src
/
scripting
/
functions.cpp
diff --git
a/src/scripting/functions.cpp
b/src/scripting/functions.cpp
index
9669469
..
ecc2bf9
100644
(file)
--- a/
src/scripting/functions.cpp
+++ b/
src/scripting/functions.cpp
@@
-29,44
+29,56
@@
#include "game_session.hpp"
#include "tinygettext/tinygettext.hpp"
#include "physfs/physfs_stream.hpp"
#include "game_session.hpp"
#include "tinygettext/tinygettext.hpp"
#include "physfs/physfs_stream.hpp"
-#include "script_manager.hpp"
#include "resources.hpp"
#include "gettext.hpp"
#include "log.hpp"
#include "mainloop.hpp"
#include "resources.hpp"
#include "gettext.hpp"
#include "log.hpp"
#include "mainloop.hpp"
-#include "worldmap.hpp"
+#include "worldmap
/worldmap
.hpp"
#include "world.hpp"
#include "sector.hpp"
#include "world.hpp"
#include "sector.hpp"
+#include "gameconfig.hpp"
#include "object/player.hpp"
#include "object/tilemap.hpp"
#include "main.hpp"
#include "object/player.hpp"
#include "object/tilemap.hpp"
#include "main.hpp"
+#include "fadeout.hpp"
+#include "shrinkfade.hpp"
#include "object/camera.hpp"
#include "flip_level_transformer.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_error.hpp"
-#include "wrapper_util.hpp"
+#include "squirrel_util.hpp"
+#include "time_scheduler.hpp"
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;
}
+void print_stacktrace(HSQUIRRELVM vm)
+{
+ print_squirrel_stack(vm);
+}
+
+SQInteger get_current_thread(HSQUIRRELVM vm)
+{
+ sq_pushobject(vm, vm_to_object(vm));
+ return 1;
+}
+
void wait(HSQUIRRELVM vm, float seconds)
{
void wait(HSQUIRRELVM vm, float seconds)
{
- SQUserPointer ptr = sq_getforeignptr(vm);
- ScriptManager* script_manager = reinterpret_cast<ScriptManager*> (ptr);
- script_manager->set_wakeup_event(vm, ScriptManager::TIME, seconds);
+ TimeScheduler::instance->schedule_thread(vm, game_time + seconds);
}
void wait_for_screenswitch(HSQUIRRELVM vm)
{
}
void wait_for_screenswitch(HSQUIRRELVM vm)
{
- SQUserPointer ptr = sq_getforeignptr(vm);
- ScriptManager* script_manager = reinterpret_cast<ScriptManager*> (ptr);
- script_manager->set_wakeup_event(vm, ScriptManager::SCREEN_SWITCHED);
+ main_loop->waiting_threads.add(vm);
}
void exit_screen()
}
void exit_screen()
@@
-74,6
+86,16
@@
void exit_screen()
main_loop->exit_screen();
}
main_loop->exit_screen();
}
+void fadeout_screen(float seconds)
+{
+ main_loop->set_screen_fade(new FadeOut(seconds));
+}
+
+void shrink_screen(float dest_x, float dest_y, float seconds)
+{
+ main_loop->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
+}
+
std::string translate(const std::string& text)
{
return dictionary_manager.get_dictionary().translate(text);
std::string translate(const std::string& text)
{
return dictionary_manager.get_dictionary().translate(text);
@@
-88,14
+110,12
@@
void load_worldmap(const std::string& filename)
{
using namespace WorldMapNS;
{
using namespace WorldMapNS;
- std::auto_ptr<WorldMap> worldmap(new WorldMap());
- worldmap->loadmap(filename);
- main_loop->push_screen(worldmap.release());
+ main_loop->push_screen(new WorldMap(filename));
}
void load_level(const std::string& filename)
{
}
void load_level(const std::string& filename)
{
- main_loop->push_screen(new GameSession(filename
, ST_GL_PLAY
));
+ main_loop->push_screen(new GameSession(filename));
}
static SQInteger squirrel_read_char(SQUserPointer file)
}
static SQInteger squirrel_read_char(SQUserPointer file)
@@
-108,43
+128,46
@@
static SQInteger squirrel_read_char(SQUserPointer file)
return c;
}
return c;
}
-
void import(HSQUIRRELVM vm, const std::string& filename)
{
IFileStream in(filename);
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");
if(SQ_FAILED(sq_compile(vm, squirrel_read_char, &in,
filename.c_str(), SQTrue)))
throw SquirrelError(vm, "Couldn't parse script");
-
+
sq_pushroottable(vm);
sq_pushroottable(vm);
- if(SQ_FAILED(sq_call(vm, 1, SQFalse))) {
+ if(SQ_FAILED(sq_call(vm, 1, SQFalse
, SQTrue
))) {
sq_pop(vm, 1);
throw SquirrelError(vm, "Couldn't execute script");
}
sq_pop(vm, 1);
}
sq_pop(vm, 1);
throw SquirrelError(vm, "Couldn't execute script");
}
sq_pop(vm, 1);
}
-void
add_key(int new_key
)
+void
debug_collrects(bool enable
)
{
{
-
player_status->set_keys(new_key)
;
+
Sector::show_collrects = enable
;
}
}
-void debug_
collrect
s(bool enable)
+void debug_
show_fp
s(bool enable)
{
{
-
Sector::show_collrect
s = enable;
+
config->show_fp
s = enable;
}
}
-void draw_solids_only(bool enable)
+void d
ebug_d
raw_solids_only(bool enable)
{
Sector::draw_solids_only = enable;
}
void save_state()
{
{
Sector::draw_solids_only = enable;
}
void save_state()
{
+ using namespace WorldMapNS;
+
if(World::current() == NULL)
throw std::runtime_error("Can't save state without active World");
if(World::current() == NULL)
throw std::runtime_error("Can't save state without active World");
+ if(WorldMap::current() != NULL)
+ WorldMap::current()->save_state();
World::current()->save_state();
}
World::current()->save_state();
}
@@
-166,11
+189,21
@@
bool validate_sector_player()
return true;
}
return true;
}
+void play_music(const std::string& filename)
+{
+ sound_manager->play_music(filename);
+}
+
+void play_sound(const std::string& filename)
+{
+ sound_manager->play(filename);
+}
+
void grease()
{
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player; // Scripting::Player != ::Player
void grease()
{
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player; // Scripting::Player != ::Player
- tux->physic.
set_velocity_x(tux->physic.get_velocity_x()*3)
;
+ tux->physic.
vx = tux->physic.vx*3
;
}
void invincible()
}
void invincible()
@@
-180,25
+213,19
@@
void invincible()
tux->invincible_timer.start(10000);
}
tux->invincible_timer.start(10000);
}
-void
mortal
()
+void
ghost
()
{
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player;
{
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;
{
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()
@@
-223,7
+250,7
@@
void gotoend()
if (!validate_sector_player()) return;
::Player* tux = Sector::current()->player;
tux->move(Vector(
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));
}
Sector::current()->camera->reset(
Vector(tux->get_pos().x, tux->get_pos().y));
}
@@
-239,5
+266,9
@@
void quit()
main_loop->quit();
}
main_loop->quit();
}
+int rand()
+{
+ return systemRandom.rand();
}
}
+}