X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fscripting%2Ffunctions.cpp;h=2c906ffb4da83f4575b6f04e2e76ec9108555c54;hb=c0b5cfa3eadebef8101f87cd593eb221bdef9280;hp=236a12ad2ed21f1421a669cbae0e75bdcebbc7eb;hpb=3655d32f63f75b2af054ec68d4176e55a561ba96;p=supertux.git diff --git a/src/scripting/functions.cpp b/src/scripting/functions.cpp index 236a12ad2..2c906ffb4 100644 --- a/src/scripting/functions.cpp +++ b/src/scripting/functions.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,49 +12,39 @@ // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -#include - -#include -#include -#include -#include -#include -#include "textscroller.hpp" -#include "functions.hpp" -#include "game_session.hpp" -#include "tinygettext/tinygettext.hpp" -#include "physfs/physfs_stream.hpp" -#include "resources.hpp" -#include "gettext.hpp" -#include "log.hpp" -#include "mainloop.hpp" -#include "worldmap/worldmap.hpp" -#include "world.hpp" -#include "sector.hpp" -#include "gameconfig.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" +// along with this program. If not, see . + +#include "scripting/functions.hpp" + #include "audio/sound_manager.hpp" -#include "random_generator.hpp" +#include "math/random_generator.hpp" +#include "object/camera.hpp" +#include "object/player.hpp" +#include "physfs/buffered_ifile_stream.hpp" +#include "supertux/fadeout.hpp" +#include "supertux/game_session.hpp" +#include "supertux/gameconfig.hpp" +#include "supertux/globals.hpp" +#include "supertux/screen_manager.hpp" +#include "supertux/sector.hpp" +#include "supertux/shrinkfade.hpp" +#include "supertux/textscroller.hpp" +#include "supertux/tile.hpp" +#include "supertux/world.hpp" +#include "util/gettext.hpp" +#include "video/renderer.hpp" +#include "video/video_system.hpp" +#include "worldmap/tux.hpp" +#include "worldmap/worldmap.hpp" -#include "squirrel_error.hpp" -#include "squirrel_util.hpp" -#include "time_scheduler.hpp" +#include "scripting/squirrel_util.hpp" +#include "scripting/time_scheduler.hpp" -namespace Scripting -{ +namespace scripting { SQInteger display(HSQUIRRELVM vm) { - Console::output << squirrel2string(vm, -1) << std::endl; + ConsoleBuffer::output << squirrel2string(vm, -1) << std::endl; return 0; } @@ -78,62 +66,72 @@ void wait(HSQUIRRELVM vm, float seconds) void wait_for_screenswitch(HSQUIRRELVM vm) { - main_loop->waiting_threads.add(vm); + ScreenManager::current()->m_waiting_threads.add(vm); } void exit_screen() { - main_loop->exit_screen(); + ScreenManager::current()->pop_screen(); } void fadeout_screen(float seconds) { - main_loop->set_screen_fade(new FadeOut(seconds)); + ScreenManager::current()->set_screen_fade(std::unique_ptr(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)); + ScreenManager::current()->set_screen_fade(std::unique_ptr(new ShrinkFade(Vector(dest_x, dest_y), seconds))); +} + +void abort_screenfade() +{ + ScreenManager::current()->set_screen_fade(std::unique_ptr()); } 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) { - main_loop->push_screen(new TextScroller(filename)); + ScreenManager::current()->push_screen(std::unique_ptr(new TextScroller(filename))); } void load_worldmap(const std::string& filename) { - using namespace WorldMapNS; + using namespace worldmap; - main_loop->push_screen(new WorldMap(filename)); + if (!WorldMap::current()) + { + throw std::runtime_error("Can't start Worldmap without active WorldMap"); + } + else + { + ScreenManager::current()->push_screen(std::unique_ptr(new WorldMap(filename, WorldMap::current()->get_savegame()))); + } } void load_level(const std::string& filename) { - main_loop->push_screen(new GameSession(filename)); -} - -static SQInteger squirrel_read_char(SQUserPointer file) -{ - std::istream* in = reinterpret_cast (file); - char c = in->get(); - if(in->eof()) - return 0; - - return c; + if (!GameSession::current()) + { + throw std::runtime_error("Can't start level without active level."); + } + else + { + ScreenManager::current()->push_screen(std::unique_ptr(new GameSession(filename, GameSession::current()->get_savegame()))); + } } void import(HSQUIRRELVM vm, const std::string& filename) { - IFileStream in(filename); + BufferedIFileStream* stream = new BufferedIFileStream(filename); + IFileStream* in = stream->get_stream(); if(SQ_FAILED(sq_compile(vm, squirrel_read_char, &in, - filename.c_str(), SQTrue))) + filename.c_str(), SQTrue))) throw SquirrelError(vm, "Couldn't parse script"); sq_pushroottable(vm); @@ -151,7 +149,7 @@ void debug_collrects(bool enable) void debug_show_fps(bool enable) { - config->show_fps = enable; + g_config->show_fps = enable; } void debug_draw_solids_only(bool enable) @@ -159,16 +157,33 @@ void debug_draw_solids_only(bool enable) Sector::draw_solids_only = enable; } -void save_state() +void debug_draw_editor_images(bool enable) +{ + Tile::draw_editor_images = 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(World::current() == NULL) - throw std::runtime_error("Can't save state without active World"); + WorldMap::current()->get_tux()->set_ghost_mode(enable); +} - if(WorldMap::current() != NULL) +void save_state() +{ + using worldmap::WorldMap; + + if (!WorldMap::current()) + { + throw std::runtime_error("Can't save state without active Worldmap"); + } + else + { WorldMap::current()->save_state(); - World::current()->save_state(); + } } // not added to header, function to only be used by others @@ -178,32 +193,32 @@ bool validate_sector_player() 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; - return false; + return false; } return true; } void play_music(const std::string& filename) { - sound_manager->play_music(filename); + SoundManager::current()->play_music(filename); } void play_sound(const std::string& filename) { - sound_manager->play(filename); + SoundManager::current()->play(filename); } 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); + ::Player* tux = Sector::current()->player; // scripting::Player != ::Player + tux->get_physic().set_velocity_x(tux->get_physic().get_velocity_x()*3); } void invincible() @@ -242,7 +257,7 @@ void whereami() { if (!validate_sector_player()) return; ::Player* tux = Sector::current()->player; - log_info << "You are at x " << tux->get_pos().x << ", y " << tux->get_pos().y << std::endl; + log_info << "You are at x " << ((int) tux->get_pos().x) << ", y " << ((int) tux->get_pos().y) << std::endl; } void gotoend() @@ -250,9 +265,9 @@ void gotoend() if (!validate_sector_player()) return; ::Player* tux = Sector::current()->player; tux->move(Vector( - (Sector::current()->get_width()) - (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)); + Vector(tux->get_pos().x, tux->get_pos().y)); } void camera() @@ -261,14 +276,51 @@ void camera() log_info << "Camera is at " << Sector::current()->camera->get_translation().x << "," << Sector::current()->camera->get_translation().y << std::endl; } +void set_gamma(float gamma) +{ + VideoSystem::current()->get_renderer().set_gamma(gamma); +} + void quit() { - main_loop->quit(); + ScreenManager::current()->quit(); } int rand() { - return systemRandom.rand(); + return gameRandom.rand(); } +void set_game_speed(float speed) +{ + ::g_game_speed = speed; } + +void record_demo(const std::string& filename) +{ + if (GameSession::current() == 0) + { + log_info << "No game session" << std::endl; + return; + } + GameSession::current()->restart_level(); + GameSession::current()->record_demo(filename); +} + +void play_demo(const std::string& filename) +{ + if (GameSession::current() == 0) + { + log_info << "No game session" << std::endl; + return; + } + // Reset random seed + g_config->random_seed = GameSession::current()->get_demo_random_seed(filename); + g_config->random_seed = gameRandom.srand(g_config->random_seed); + GameSession::current()->restart_level(); + GameSession::current()->play_demo(filename); +} + +} + +/* EOF */