projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big CMakeLists update.
[supertux.git]
/
src
/
scripting
/
functions.cpp
diff --git
a/src/scripting/functions.cpp
b/src/scripting/functions.cpp
index
b978813
..
95d8607
100644
(file)
--- a/
src/scripting/functions.cpp
+++ b/
src/scripting/functions.cpp
@@
-51,6
+51,8
@@
#include "squirrel_util.hpp"
#include "time_scheduler.hpp"
#include "squirrel_util.hpp"
#include "time_scheduler.hpp"
+extern float game_speed;
+
namespace Scripting
{
namespace Scripting
{
@@
-96,6
+98,11
@@
void shrink_screen(float dest_x, float dest_y, float seconds)
main_loop->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
}
main_loop->set_screen_fade(new ShrinkFade(Vector(dest_x, dest_y), seconds));
}
+void abort_screenfade()
+{
+ main_loop->set_screen_fade(NULL);
+}
+
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);
@@
-163,11
+170,10
@@
void save_state()
{
using namespace WorldMapNS;
{
using namespace WorldMapNS;
- if(World::current() == NULL)
+ if(World::current() == NULL
|| WorldMap::current() == NULL
)
throw std::runtime_error("Can't save state without active World");
throw std::runtime_error("Can't save state without active World");
- if(WorldMap::current() != NULL)
- WorldMap::current()->save_state();
+ WorldMap::current()->save_state();
World::current()->save_state();
}
World::current()->save_state();
}
@@
-175,8
+181,8
@@
void update_worldmap()
{
using namespace WorldMapNS;
{
using namespace WorldMapNS;
- if(World::current() == NULL)
- throw std::runtime_error("Can't
save state without active World
");
+ if(World
Map
::current() == NULL)
+ throw std::runtime_error("Can't
update Worldmap: none active
");
WorldMap::current()->load_state();
}
WorldMap::current()->load_state();
}
@@
-188,13
+194,13
@@
bool validate_sector_player()
if (Sector::current() == 0)
{
log_info << "No current sector." << std::endl;
if (Sector::current() == 0)
{
log_info << "No current sector." << std::endl;
-
return false;
+ return false;
}
if (Sector::current()->player == 0)
{
log_info << "No player." << std::endl;
}
if (Sector::current()->player == 0)
{
log_info << "No player." << std::endl;
-
return false;
+ return false;
}
return true;
}
}
return true;
}
@@
-271,6
+277,10
@@
void camera()
log_info << "Camera is at " << Sector::current()->camera->get_translation().x << "," << Sector::current()->camera->get_translation().y << std::endl;
}
log_info << "Camera is at " << Sector::current()->camera->get_translation().x << "," << Sector::current()->camera->get_translation().y << std::endl;
}
+void set_gamma(float gamma) {
+ SDL_SetGamma(gamma, gamma, gamma);
+}
+
void quit()
{
main_loop->quit();
void quit()
{
main_loop->quit();
@@
-281,4
+291,9
@@
int rand()
return systemRandom.rand();
}
return systemRandom.rand();
}
+void set_game_speed(float speed)
+{
+ ::game_speed = speed;
+}
+
}
}