projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Proposed fix for coverity #29372" because of causing Segmentation
[supertux.git]
/
src
/
scripting
/
functions.cpp
diff --git
a/src/scripting/functions.cpp
b/src/scripting/functions.cpp
index
af907e3
..
893191b
100644
(file)
--- a/
src/scripting/functions.cpp
+++ b/
src/scripting/functions.cpp
@@
-44,7
+44,7
@@
namespace scripting {
SQInteger display(HSQUIRRELVM vm)
{
SQInteger display(HSQUIRRELVM vm)
{
- Console::output << squirrel2string(vm, -1) << std::endl;
+ Console
Buffer
::output << squirrel2string(vm, -1) << std::endl;
return 0;
}
return 0;
}
@@
-66,37
+66,37
@@
void wait(HSQUIRRELVM vm, float seconds)
void wait_for_screenswitch(HSQUIRRELVM vm)
{
void wait_for_screenswitch(HSQUIRRELVM vm)
{
-
g_screen_manager
->m_waiting_threads.add(vm);
+
ScreenManager::current()
->m_waiting_threads.add(vm);
}
void exit_screen()
{
}
void exit_screen()
{
-
g_screen_manager
->pop_screen();
+
ScreenManager::current()
->pop_screen();
}
void fadeout_screen(float seconds)
{
}
void fadeout_screen(float seconds)
{
-
g_screen_manager
->set_screen_fade(std::unique_ptr<ScreenFade>(new FadeOut(seconds)));
+
ScreenManager::current()
->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(std::unique_ptr<ScreenFade>(new ShrinkFade(Vector(dest_x, dest_y), seconds)));
+
ScreenManager::current()
->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(std::unique_ptr<ScreenFade>());
+
ScreenManager::current()
->set_screen_fade(std::unique_ptr<ScreenFade>());
}
std::string translate(const std::string& text)
{
}
std::string translate(const std::string& text)
{
- return dictionary_manager->get_dictionary().translate(text);
+ return
g_
dictionary_manager->get_dictionary().translate(text);
}
void display_text_file(const std::string& filename)
{
}
void display_text_file(const std::string& filename)
{
-
g_screen_manager
->push_screen(std::unique_ptr<Screen>(new TextScroller(filename)));
+
ScreenManager::current()
->push_screen(std::unique_ptr<Screen>(new TextScroller(filename)));
}
void load_worldmap(const std::string& filename)
}
void load_worldmap(const std::string& filename)
@@
-109,7
+109,7
@@
void load_worldmap(const std::string& filename)
}
else
{
}
else
{
-
g_screen_manager
->push_screen(std::unique_ptr<Screen>(new WorldMap(filename, WorldMap::current()->get_savegame())));
+
ScreenManager::current()
->push_screen(std::unique_ptr<Screen>(new WorldMap(filename, WorldMap::current()->get_savegame())));
}
}
}
}
@@
-121,7
+121,7
@@
void load_level(const std::string& filename)
}
else
{
}
else
{
-
g_screen_manager
->push_screen(std::unique_ptr<Screen>(new GameSession(filename, GameSession::current()->get_savegame())));
+
ScreenManager::current()
->push_screen(std::unique_ptr<Screen>(new GameSession(filename, GameSession::current()->get_savegame())));
}
}
}
}
@@
-205,12
+205,12
@@
bool validate_sector_player()
void play_music(const std::string& filename)
{
void play_music(const std::string& filename)
{
-
sound_manager
->play_music(filename);
+
SoundManager::current()
->play_music(filename);
}
void play_sound(const std::string& filename)
{
}
void play_sound(const std::string& filename)
{
-
sound_manager
->play(filename);
+
SoundManager::current()
->play(filename);
}
void grease()
}
void grease()
@@
-282,7
+282,7
@@
void set_gamma(float gamma)
void quit()
{
void quit()
{
-
g_screen_manager
->quit();
+
ScreenManager::current()
->quit();
}
int rand()
}
int rand()