#include <sstream>
#include <unistd.h>
-#include "gettext.h"
-#include "video/surface.h"
-#include "video/screen.h"
-#include "video/drawing_context.h"
-#include "sprite/sprite_manager.h"
-#include "audio/sound_manager.h"
-#include "lisp/parser.h"
-#include "lisp/lisp.h"
-#include "lisp/list_iterator.h"
-#include "lisp/writer.h"
-#include "game_session.h"
-#include "sector.h"
-#include "worldmap.h"
-#include "resources.h"
-#include "misc.h"
-#include "player_status.h"
-#include "textscroller.h"
-#include "main.h"
-#include "spawn_point.h"
-#include "file_system.h"
-#include "gui/menu.h"
-#include "gui/mousecursor.h"
-#include "control/joystickkeyboardcontroller.h"
-#include "object/background.h"
-#include "object/tilemap.h"
-#include "scripting/script_interpreter.h"
+#include "gettext.hpp"
+#include "video/surface.hpp"
+#include "video/screen.hpp"
+#include "video/drawing_context.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "audio/sound_manager.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/list_iterator.hpp"
+#include "lisp/writer.hpp"
+#include "game_session.hpp"
+#include "sector.hpp"
+#include "worldmap.hpp"
+#include "resources.hpp"
+#include "misc.hpp"
+#include "player_status.hpp"
+#include "textscroller.hpp"
+#include "main.hpp"
+#include "spawn_point.hpp"
+#include "file_system.hpp"
+#include "gui/menu.hpp"
+#include "gui/mousecursor.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "object/background.hpp"
+#include "object/tilemap.hpp"
+#include "scripting/script_interpreter.hpp"
Menu* worldmap_menu = 0;
void
Tux::draw(DrawingContext& context)
{
- switch (player_status.bonus) {
+ switch (player_status->bonus) {
case GROWUP_BONUS:
tux_sprite->set_action("large");
break;
tux = new Tux(this);
add_object(tux);
- leveldot_green
- = new Surface(datadir + "/images/tiles/worldmap/leveldot_green.png", true);
- leveldot_red
- = new Surface(datadir + "/images/tiles/worldmap/leveldot_red.png", true);
- messagedot
- = new Surface(datadir + "/images/tiles/worldmap/messagedot.png", true);
- teleporterdot
- = new Surface(datadir + "/images/tiles/worldmap/teleporterdot.png", true);
+ leveldot_green= new Surface("images/worldmap/common/leveldot_green.png", true);
+ leveldot_red = new Surface("images/worldmap/common/leveldot_red.png", true);
+ messagedot = new Surface("images/worldmap/common/messagedot.png", true);
+ teleporterdot = new Surface("images/worldmap/common/teleporterdot.png", true);
name = "<no title>";
- music = "salcon.mod";
+ music = "salcon.ogg";
intro_displayed = false;
total_stats.reset();
try {
lisp::Parser parser;
- std::string filename = get_resource_filename(map_filename);
- std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+ std::auto_ptr<lisp::Lisp> root (parser.parse(map_filename));
const lisp::Lisp* lisp = root->get_lisp("supertux-worldmap");
if(!lisp)
- throw new std::runtime_error("file isn't a supertux-worldmap file.");
+ throw std::runtime_error("file isn't a supertux-worldmap file.");
clear_objects();
lisp::ListIterator iter(lisp);
try {
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (
- parser.parse(get_resource_filename(levels_path + level.name)));
+ std::auto_ptr<lisp::Lisp> root (parser.parse(levels_path + level.name));
const lisp::Lisp* level_lisp = root->get_lisp("supertux-level");
if(!level_lisp)
if (special_tile->teleport_dest != Vector(-1,-1))
{
// TODO: an animation, camera scrolling or a fading would be a nice touch
- sound_manager->play_sound("warp");
+ sound_manager->play("sounds/warp.wav");
tux->back_direction = D_NONE;
tux->set_tile_pos(special_tile->teleport_dest);
SDL_Delay(1000);
if (level->pos == tux->get_tile_pos())
{
- PlayerStatus old_player_status = player_status;
+ sound_manager->stop_music();
+ PlayerStatus old_player_status = *player_status;
// do a shriking fade to the level
shrink_fade(Vector((level->pos.x*32 + 16 + offset.x),
(level->pos.y*32 + 16 + offset.y)), 500);
- GameSession session(get_resource_filename(levels_path + level->name),
+ GameSession session(levels_path + level->name,
ST_GL_LOAD_LEVEL_FILE, &level->statistics);
switch (session.run())
level_finished = false;
/* In case the player's abort the level, keep it using the old
status. But the minimum lives and no bonus. */
- player_status.coins = old_player_status.coins;
- player_status.lives = std::min(old_player_status.lives, player_status.lives);
- player_status.bonus = NO_BONUS;
+ player_status->coins = old_player_status.coins;
+ player_status->lives = std::min(old_player_status.lives, player_status->lives);
+ player_status->bonus = NO_BONUS;
break;
case GameSession::ES_GAME_OVER:
context.draw_text(blue_text, _("GAMEOVER"),
Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1);
- sprintf(str, _("COINS: %d"), player_status.coins);
+ sprintf(str, _("COINS: %d"), player_status->coins);
context.draw_text(gold_text, str,
Vector(SCREEN_WIDTH/2, SCREEN_WIDTH - 32), CENTER_ALLIGN,
LAYER_FOREGROUND1);
wait_for_event(2.0, 6.0);
quit = true;
- player_status.reset();
+ player_status->reset();
break;
}
case GameSession::ES_NONE:
break;
}
- sound_manager->play_music(song);
+ sound_manager->play_music(std::string("music/") + music);
Menu::set_current(0);
if (!savegame_file.empty())
savegame(savegame_file);
std::auto_ptr<ScriptInterpreter> interpreter
(new ScriptInterpreter(levels_path));
std::istringstream in(level->extro_script);
- interpreter->load_script(in, "level-extro-script");
- interpreter->start_script();
+ interpreter->run_script(in, "level-extro-script");
add_object(interpreter.release());
} catch(std::exception& e) {
std::cerr << "Couldn't run level-extro-script:" << e.what() << "\n";
context.push_transform();
context.set_translation(Vector(0, 0));
- player_status.draw(context);
+ player_status->draw(context);
if (!tux->is_moving())
{
quit = false;
- song = sound_manager->load_music(datadir + "/music/" + music);
- sound_manager->play_music(song);
+ sound_manager->play_music(std::string("music/") + music);
if(!intro_displayed && intro_script != "") {
try {
std::auto_ptr<ScriptInterpreter> interpreter
(new ScriptInterpreter(levels_path));
std::istringstream in(intro_script);
- interpreter->load_script(in, "worldmap-intro-script");
- interpreter->start_script();
+ interpreter->run_script(in, "worldmap-intro-script");
add_object(interpreter.release());
} catch(std::exception& e) {
std::cerr << "Couldn't execute worldmap-intro-script: "
while(!quit) {
Uint32 ticks = SDL_GetTicks();
float elapsed_time = float(ticks - lastticks) / 1000;
- global_time += elapsed_time;
+ game_time += elapsed_time;
lastticks = ticks;
// 40 fps minimum // TODO use same code as in GameSession here
context.pop_transform();
get_input();
update(elapsed_time);
+ sound_manager->update();
if(Menu::current()) {
Menu::current()->draw(context);
if(filename == "")
return;
- std::ofstream file(filename.c_str(), std::ios::out);
- lisp::Writer writer(file);
+ lisp::Writer writer(filename);
int nb_solved_levels = 0, total_levels = 0;
for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) {
writer.write_float("x", tux->get_tile_pos().x);
writer.write_float("y", tux->get_tile_pos().y);
writer.write_string("back", direction_to_string(tux->back_direction));
- player_status.write(writer);
+ player_status->write(writer);
writer.write_string("back", direction_to_string(tux->back_direction));
writer.end_list("tux");
load_map();
savegame->get("intro-displayed", intro_displayed);
- savegame->get("lives", player_status.lives);
- savegame->get("coins", player_status.coins);
- savegame->get("max-score-multiplier", player_status.max_score_multiplier);
- if (player_status.lives < 0)
- player_status.reset();
+ savegame->get("lives", player_status->lives);
+ savegame->get("coins", player_status->coins);
+ savegame->get("max-score-multiplier", player_status->max_score_multiplier);
+ if (player_status->lives < 0)
+ player_status->reset();
const lisp::Lisp* tux_lisp = savegame->get_lisp("tux");
if(tux)
tux_lisp->get("x", p.x);
tux_lisp->get("y", p.y);
tux_lisp->get("back", back_str);
- player_status.read(*tux_lisp);
+ player_status->read(*tux_lisp);
tux->back_direction = string_to_direction(back_str);
tux->set_tile_pos(p);
std::cerr << "Problem loading game '" << filename << "': " << e.what()
<< "\n";
load_map();
- player_status.reset();
+ player_status->reset();
}
calculate_total_stats();
projects / supertux.git / blobdiff