projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing includes to Squirrel and SuperTux to make -DENABLE_SQDBG=ON compile...
[supertux.git]
/
src
/
scripting
/
functions.cpp
diff --git
a/src/scripting/functions.cpp
b/src/scripting/functions.cpp
index
ba0fc3f
..
045114e
100644
(file)
--- a/
src/scripting/functions.cpp
+++ b/
src/scripting/functions.cpp
@@
-64,27
+64,27
@@
void wait(HSQUIRRELVM vm, float seconds)
void wait_for_screenswitch(HSQUIRRELVM vm)
{
void wait_for_screenswitch(HSQUIRRELVM vm)
{
- g_screen_manager->waiting_threads.add(vm);
+ g_screen_manager->
m_
waiting_threads.add(vm);
}
void exit_screen()
{
}
void exit_screen()
{
- g_screen_manager->
exit
_screen();
+ g_screen_manager->
pop
_screen();
}
void fadeout_screen(float seconds)
{
}
void fadeout_screen(float seconds)
{
- g_screen_manager->set_screen_fade(
new FadeOut(seconds
));
+ g_screen_manager->set_screen_fade(
std::unique_ptr<ScreenFade>(new FadeOut(seconds)
));
}
void shrink_screen(float dest_x, float dest_y, float seconds)
{
}
void shrink_screen(float dest_x, float dest_y, float seconds)
{
- g_screen_manager->set_screen_fade(
new ShrinkFade(Vector(dest_x, dest_y), seconds
));
+ g_screen_manager->set_screen_fade(
std::unique_ptr<ScreenFade>(new ShrinkFade(Vector(dest_x, dest_y), seconds)
));
}
void abort_screenfade()
{
}
void abort_screenfade()
{
- g_screen_manager->set_screen_fade(
NULL
);
+ g_screen_manager->set_screen_fade(
std::unique_ptr<ScreenFade>()
);
}
std::string translate(const std::string& text)
}
std::string translate(const std::string& text)
@@
-94,7
+94,7
@@
std::string translate(const std::string& text)
void display_text_file(const std::string& filename)
{
void display_text_file(const std::string& filename)
{
- g_screen_manager->push_screen(
new TextScroller(filename
));
+ g_screen_manager->push_screen(
std::unique_ptr<Screen>(new TextScroller(filename)
));
}
void load_worldmap(const std::string& filename)
}
void load_worldmap(const std::string& filename)
@@
-104,7
+104,7
@@
void load_worldmap(const std::string& filename)
if(World::current() == NULL)
throw std::runtime_error("Can't start WorldMap without active world.");
if(World::current() == NULL)
throw std::runtime_error("Can't start WorldMap without active world.");
- g_screen_manager->push_screen(
new WorldMap(filename, World::current()->get_player_status(
)));
+ g_screen_manager->push_screen(
std::unique_ptr<Screen>(new WorldMap(filename, World::current()->get_player_status()
)));
}
void load_level(const std::string& filename)
}
void load_level(const std::string& filename)
@@
-112,7
+112,7
@@
void load_level(const std::string& filename)
if(GameSession::current() == NULL)
throw std::runtime_error("Can't start level without active level.");
if(GameSession::current() == NULL)
throw std::runtime_error("Can't start level without active level.");
- g_screen_manager->push_screen(
new GameSession(filename, GameSession::current()->get_player_status(
)));
+ g_screen_manager->push_screen(
std::unique_ptr<Screen>(new GameSession(filename, GameSession::current()->get_player_status()
)));
}
void import(HSQUIRRELVM vm, const std::string& filename)
}
void import(HSQUIRRELVM vm, const std::string& filename)