projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make it build with -DCOMPILE_AMALGATION=ON. Still not certain how intern_draw/next_po...
[supertux.git]
/
src
/
scripting
/
functions.cpp
diff --git
a/src/scripting/functions.cpp
b/src/scripting/functions.cpp
index
1f8ed94
..
6c84d30
100644
(file)
--- a/
src/scripting/functions.cpp
+++ b/
src/scripting/functions.cpp
@@
-24,8
+24,8
@@
#include "supertux/fadeout.hpp"
#include "supertux/game_session.hpp"
#include "supertux/gameconfig.hpp"
#include "supertux/fadeout.hpp"
#include "supertux/game_session.hpp"
#include "supertux/gameconfig.hpp"
-#include "supertux/
main
.hpp"
-#include "supertux/
mainloop
.hpp"
+#include "supertux/
globals
.hpp"
+#include "supertux/
screen_manager
.hpp"
#include "supertux/sector.hpp"
#include "supertux/shrinkfade.hpp"
#include "supertux/textscroller.hpp"
#include "supertux/sector.hpp"
#include "supertux/shrinkfade.hpp"
#include "supertux/textscroller.hpp"
@@
-36,9
+36,7
@@
#include "scripting/squirrel_util.hpp"
#include "scripting/time_scheduler.hpp"
#include "scripting/squirrel_util.hpp"
#include "scripting/time_scheduler.hpp"
-extern float g_game_speed;
-
-namespace Scripting {
+namespace scripting {
SQInteger display(HSQUIRRELVM vm)
{
SQInteger display(HSQUIRRELVM vm)
{
@@
-64,59
+62,55
@@
void wait(HSQUIRRELVM vm, float seconds)
void wait_for_screenswitch(HSQUIRRELVM vm)
{
void wait_for_screenswitch(HSQUIRRELVM vm)
{
- g_
main_loop
->waiting_threads.add(vm);
+ g_
screen_manager
->waiting_threads.add(vm);
}
void exit_screen()
{
}
void exit_screen()
{
- g_
main_loop
->exit_screen();
+ g_
screen_manager
->exit_screen();
}
void fadeout_screen(float seconds)
{
}
void fadeout_screen(float seconds)
{
- g_
main_loop
->set_screen_fade(new FadeOut(seconds));
+ g_
screen_manager
->set_screen_fade(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_
main_loop
->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
+ g_
screen_manager
->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
}
void abort_screenfade()
{
}
void abort_screenfade()
{
- g_
main_loop
->set_screen_fade(NULL);
+ g_
screen_manager
->set_screen_fade(NULL);
}
std::string translate(const std::string& text)
{
}
std::string translate(const std::string& text)
{
- return dictionary_manager
.
get_dictionary().translate(text);
+ return dictionary_manager
->
get_dictionary().translate(text);
}
void display_text_file(const std::string& filename)
{
}
void display_text_file(const std::string& filename)
{
- g_
main_loop
->push_screen(new TextScroller(filename));
+ g_
screen_manager
->push_screen(new TextScroller(filename));
}
void load_worldmap(const std::string& filename)
{
}
void load_worldmap(const std::string& filename)
{
- using namespace
WorldMapNS
;
+ using namespace
worldmap
;
- g_main_loop->push_screen(new WorldMap(filename));
-}
+ if(World::current() == NULL)
+ throw std::runtime_error("Can't start WorldMap without active world.");
-void load_level(const std::string& filename)
-{
- g_main_loop->push_screen(new GameSession(filename));
+ g_screen_manager->push_screen(new WorldMap(filename, World::current()->get_player_status()));
}
}
-
static SQInteger squirrel_read_char(SQUserPointer fil
e)
+
void load_level(const std::string& filenam
e)
{
{
- std::istream* in = reinterpret_cast<std::istream*> (file);
- char c = in->get();
- if(in->eof())
- return 0;
+ if(GameSession::current() == NULL)
+ throw std::runtime_error("Can't start level without active level.");
-
return c
;
+
g_screen_manager->push_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)
@@
-152,7
+146,7
@@
void debug_draw_solids_only(bool enable)
void debug_worldmap_ghost(bool enable)
{
void debug_worldmap_ghost(bool enable)
{
- using namespace
WorldMapNS
;
+ using namespace
worldmap
;
if(WorldMap::current() == NULL)
throw std::runtime_error("Can't change ghost mode without active WorldMap");
if(WorldMap::current() == NULL)
throw std::runtime_error("Can't change ghost mode without active WorldMap");
@@
-162,7
+156,7
@@
void debug_worldmap_ghost(bool enable)
void save_state()
{
void save_state()
{
- using namespace
WorldMapNS
;
+ using namespace
worldmap
;
if(World::current() == NULL || WorldMap::current() == NULL)
throw std::runtime_error("Can't save state without active World");
if(World::current() == NULL || WorldMap::current() == NULL)
throw std::runtime_error("Can't save state without active World");
@@
-173,7
+167,7
@@
void save_state()
void update_worldmap()
{
void update_worldmap()
{
- using namespace
WorldMapNS
;
+ using namespace
worldmap
;
if(WorldMap::current() == NULL)
throw std::runtime_error("Can't update Worldmap: none active");
if(WorldMap::current() == NULL)
throw std::runtime_error("Can't update Worldmap: none active");
@@
-212,7
+206,7
@@
void play_sound(const std::string& filename)
void grease()
{
if (!validate_sector_player()) return;
void grease()
{
if (!validate_sector_player()) return;
- ::Player* tux = Sector::current()->player; //
S
cripting::Player != ::Player
+ ::Player* tux = Sector::current()->player; //
s
cripting::Player != ::Player
tux->get_physic().set_velocity_x(tux->get_physic().get_velocity_x()*3);
}
tux->get_physic().set_velocity_x(tux->get_physic().get_velocity_x()*3);
}
@@
-277,7
+271,7
@@
void set_gamma(float gamma) {
void quit()
{
void quit()
{
- g_
main_loop
->quit();
+ g_
screen_manager
->quit();
}
int rand()
}
int rand()