+// $Id$
//
-// C Implementation: world
+// SuperTux
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
-// Description:
+// 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 distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "globals.h"
-#include "scene.h"
-#include "screen.h"
-#include "defines.h"
-#include "world.h"
-#include "level.h"
-#include "tile.h"
-
-texture_type img_distro[4];
+// 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 <config.h>
+
+#include <stddef.h>
+#include <physfs.h>
+#include <stdexcept>
+
+#include "world.hpp"
+#include "file_system.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/lisp.hpp"
+#include "physfs/physfs_stream.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "scripting/serialize.hpp"
+#include "log.hpp"
+#include "worldmap/worldmap.hpp"
+#include "mainloop.hpp"
+
+static bool has_suffix(const std::string& data, const std::string& suffix)
+{
+ if (data.length() >= suffix.length())
+ return data.compare(data.length() - suffix.length(), suffix.length(), suffix) == 0;
+ else
+ return false;
+}
-World world;
+World* World::current_ = NULL;
World::World()
{
- level = new Level;
+ is_levelset = true;
+ hide_from_contribs = false;
+ sq_resetobject(&world_thread);
}
World::~World()
{
- delete level;
-}
-
-int
-World::load(const char* subset, int level_nr)
-{
- return level->load(subset, level_nr);
-}
-
-int
-World::load(const std::string& filename)
-{
- return level->load(filename);
+ sq_release(Scripting::global_vm, &world_thread);
+ if(current_ == this)
+ current_ = NULL;
}
void
-World::arrays_free(void)
-{
- bad_guys.clear();
- bouncy_distros.clear();
- broken_bricks.clear();
- bouncy_bricks.clear();
- floating_scores.clear();
- upgrades.clear();
- bullets.clear();
- std::vector<ParticleSystem*>::iterator i;
- for(i = particle_systems.begin(); i != particle_systems.end(); ++i) {
- delete *i;
+World::set_savegame_filename(const std::string& filename)
+{
+ this->savegame_filename = filename;
+ // make sure the savegame directory exists
+ std::string dirname = FileSystem::dirname(filename);
+ if(!PHYSFS_exists(dirname.c_str())) {
+ if(PHYSFS_mkdir(dirname.c_str())) {
+ std::ostringstream msg;
+ msg << "Couldn't create directory for savegames '"
+ << dirname << "': " <<PHYSFS_getLastError();
+ throw std::runtime_error(msg.str());
+ }
}
- particle_systems.clear();
-}
-
-void
-World::activate_particle_systems()
-{
- if (level->particle_system == "clouds")
- {
- particle_systems.push_back(new CloudParticleSystem);
- }
- else if (level->particle_system == "snow")
- {
- particle_systems.push_back(new SnowParticleSystem);
- }
- else if (level->particle_system != "")
- {
- st_abort("unknown particle system specified in level", "");
- }
+ if(!PHYSFS_isDirectory(dirname.c_str())) {
+ std::ostringstream msg;
+ msg << "Savegame path '" << dirname << "' is not a directory";
+ throw std::runtime_error(msg.str());
+ }
}
void
-World::draw()
+World::load(const std::string& filename)
{
- int y,x;
-
- /* Draw screen: */
- if(timer_check(&super_bkgd_timer))
- texture_draw(&img_super_bkgd, 0, 0);
- else
- {
- /* Draw the real background */
- if(get_level()->bkgd_image[0] != '\0')
- {
- int s = (int)scroll_x / 30;
- texture_draw_part(&level->img_bkgd, s, 0,0,0,level->img_bkgd.w - s, level->img_bkgd.h);
- texture_draw_part(&level->img_bkgd, 0, 0,screen->w - s ,0,s,level->img_bkgd.h);
- }
- else
- {
- clearscreen(level->bkgd_red, level->bkgd_green, level->bkgd_blue);
- }
- }
-
- /* Draw particle systems (background) */
- std::vector<ParticleSystem*>::iterator p;
- for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
- {
- (*p)->draw(scroll_x, 0, 0);
- }
-
- /* Draw background: */
- for (y = 0; y < 15; ++y)
- {
- for (x = 0; x < 21; ++x)
- {
- drawshape(32*x - fmodf(scroll_x, 32), y * 32,
- level->bg_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
- }
- }
-
- /* Draw interactive tiles: */
- for (y = 0; y < 15; ++y)
- {
- for (x = 0; x < 21; ++x)
- {
- drawshape(32*x - fmodf(scroll_x, 32), y * 32,
- level->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
- }
- }
+ basedir = FileSystem::dirname(filename);
- /* (Bouncy bricks): */
- for (unsigned int i = 0; i < bouncy_bricks.size(); ++i)
- bouncy_brick_draw(&bouncy_bricks[i]);
+ lisp::Parser parser;
+ const lisp::Lisp* root = parser.parse(filename);
- for (unsigned int i = 0; i < bad_guys.size(); ++i)
- bad_guys[i].draw();
+ const lisp::Lisp* info = root->get_lisp("supertux-world");
+ if(info == NULL)
+ info = root->get_lisp("supertux-level-subset");
+ if(info == NULL)
+ throw std::runtime_error("File is not a world or levelsubset file");
- tux.draw();
+ hide_from_contribs = false;
+ is_levelset = true;
- for (unsigned int i = 0; i < bullets.size(); ++i)
- bullet_draw(&bullets[i]);
+ info->get("title", title);
+ info->get("description", description);
+ info->get("levelset", is_levelset);
+ info->get_vector("levels", levels);
+ info->get("hide-from-contribs", hide_from_contribs);
- for (unsigned int i = 0; i < floating_scores.size(); ++i)
- floating_score_draw(&floating_scores[i]);
+ // Level info file doesn't define any levels, so read the
+ // directory to see what we can find
- for (unsigned int i = 0; i < upgrades.size(); ++i)
- upgrade_draw(&upgrades[i]);
-
- for (unsigned int i = 0; i < bouncy_distros.size(); ++i)
- bouncy_distro_draw(&bouncy_distros[i]);
-
- for (unsigned int i = 0; i < broken_bricks.size(); ++i)
- broken_brick_draw(&broken_bricks[i]);
-
- /* Draw foreground: */
- for (y = 0; y < 15; ++y)
- {
- for (x = 0; x < 21; ++x)
- {
- drawshape(32*x - fmodf(scroll_x, 32), y * 32,
- level->fg_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
- }
- }
-
- /* Draw particle systems (foreground) */
- for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
- {
- (*p)->draw(scroll_x, 0, 1);
- }
-}
-
-void
-World::action()
-{
- /* Handle bouncy distros: */
- for (unsigned int i = 0; i < bouncy_distros.size(); i++)
- bouncy_distro_action(&bouncy_distros[i]);
-
- /* Handle broken bricks: */
- for (unsigned int i = 0; i < broken_bricks.size(); i++)
- broken_brick_action(&broken_bricks[i]);
-
- /* Handle distro counting: */
- if (counting_distros)
- {
- distro_counter--;
+ std::string path = basedir;
+ char** files = PHYSFS_enumerateFiles(path.c_str());
+ if(!files) {
+ log_warning << "Couldn't read subset dir '" << path << "'" << std::endl;
+ return;
+ }
- if (distro_counter <= 0)
- counting_distros = -1;
+ for(const char* const* filename = files; *filename != 0; ++filename) {
+ if(has_suffix(*filename, ".stl")) {
+ levels.push_back(path + *filename);
}
-
- // Handle all kinds of game objects
- for (unsigned int i = 0; i < bouncy_bricks.size(); i++)
- bouncy_brick_action(&bouncy_bricks[i]);
-
- for (unsigned int i = 0; i < floating_scores.size(); i++)
- floating_score_action(&floating_scores[i]);
-
- for (unsigned int i = 0; i < bullets.size(); ++i)
- bullet_action(&bullets[i]);
-
- for (unsigned int i = 0; i < upgrades.size(); i++)
- upgrade_action(&upgrades[i]);
-
- for (unsigned int i = 0; i < bad_guys.size(); i++)
- bad_guys[i].action();
+ }
+ PHYSFS_freeList(files);
}
void
-World::add_score(float x, float y, int s)
+World::run()
{
- score += s;
+ using namespace Scripting;
- floating_score_type new_floating_score;
- floating_score_init(&new_floating_score,x,y,s);
- floating_scores.push_back(new_floating_score);
-}
-
-void
-World::add_bouncy_distro(float x, float y)
-{
- bouncy_distro_type new_bouncy_distro;
- bouncy_distro_init(&new_bouncy_distro,x,y);
- bouncy_distros.push_back(new_bouncy_distro);
-}
+ current_ = this;
-void
-World::add_broken_brick(Tile* tile, float x, float y)
-{
- add_broken_brick_piece(tile, x, y, -1, -4);
- add_broken_brick_piece(tile, x, y + 16, -1.5, -3);
+ // create new squirrel table for persisten game state
+ HSQUIRRELVM vm = Scripting::global_vm;
- add_broken_brick_piece(tile, x + 16, y, 1, -4);
- add_broken_brick_piece(tile, x + 16, y + 16, 1.5, -3);
-}
+ sq_pushroottable(vm);
+ sq_pushstring(vm, "state", -1);
+ sq_newtable(vm);
+ if(SQ_FAILED(sq_createslot(vm, -3)))
+ throw Scripting::SquirrelError(vm, "Couldn't create state table");
+ sq_pop(vm, 1);
-void
-World::add_broken_brick_piece(Tile* tile, float x, float y, float xm, float ym)
-{
- broken_brick_type new_broken_brick;
- broken_brick_init(&new_broken_brick, tile, x, y, xm, ym);
- broken_bricks.push_back(new_broken_brick);
-}
+ load_state();
-void
-World::add_bouncy_brick(float x, float y)
-{
- bouncy_brick_type new_bouncy_brick;
- bouncy_brick_init(&new_bouncy_brick,x,y);
- bouncy_bricks.push_back(new_bouncy_brick);
-}
+ std::string filename = basedir + "/world.nut";
+ try {
+ IFileStream in(filename);
-void
-World::add_bad_guy(float x, float y, BadGuyKind kind)
-{
- bad_guys.push_back(BadGuy());
- BadGuy& new_bad_guy = bad_guys.back();
-
- new_bad_guy.init(x,y,kind);
+ sq_release(global_vm, &world_thread);
+ world_thread = create_thread(global_vm);
+ compile_and_run(object_to_vm(world_thread), in, filename);
+ } catch(std::exception& ) {
+ // fallback: try to load worldmap worldmap.stwm
+ using namespace WorldMapNS;
+ main_loop->push_screen(new WorldMap(basedir + "worldmap.stwm"));
+ }
}
void
-World::add_upgrade(float x, float y, int dir, int kind)
-{
- upgrade_type new_upgrade;
- upgrade_init(&new_upgrade,x,y,dir,kind);
- upgrades.push_back(new_upgrade);
-}
-
-void
-World::add_bullet(float x, float y, float xm, int dir)
-{
- bullet_type new_bullet;
- bullet_init(&new_bullet,x,y,xm,dir);
- bullets.push_back(new_bullet);
-
- play_sound(sounds[SND_SHOOT], SOUND_CENTER_SPEAKER);
-}
-
-
-
-void bouncy_distro_init(bouncy_distro_type* pbouncy_distro, float x, float y)
-{
- pbouncy_distro->base.x = x;
- pbouncy_distro->base.y = y;
- pbouncy_distro->base.ym = -2;
-}
-
-void bouncy_distro_action(bouncy_distro_type* pbouncy_distro)
-{
- pbouncy_distro->base.y = pbouncy_distro->base.y + pbouncy_distro->base.ym * frame_ratio;
-
- pbouncy_distro->base.ym += 0.1 * frame_ratio;
-
- if (pbouncy_distro->base.ym >= 0)
- world.bouncy_distros.erase(static_cast<std::vector<bouncy_distro_type>::iterator>(pbouncy_distro));
-}
-
-void bouncy_distro_draw(bouncy_distro_type* pbouncy_distro)
-{
- texture_draw(&img_distro[0],
- pbouncy_distro->base.x - scroll_x,
- pbouncy_distro->base.y);
-}
-
-void broken_brick_init(broken_brick_type* pbroken_brick, Tile* tile,
- float x, float y, float xm, float ym)
-{
- pbroken_brick->tile = tile;
- pbroken_brick->base.x = x;
- pbroken_brick->base.y = y;
- pbroken_brick->base.xm = xm;
- pbroken_brick->base.ym = ym;
-
- timer_init(&pbroken_brick->timer, true);
- timer_start(&pbroken_brick->timer,200);
-}
-
-void broken_brick_action(broken_brick_type* pbroken_brick)
-{
- pbroken_brick->base.x = pbroken_brick->base.x + pbroken_brick->base.xm * frame_ratio;
- pbroken_brick->base.y = pbroken_brick->base.y + pbroken_brick->base.ym * frame_ratio;
-
- if (!timer_check(&pbroken_brick->timer))
- world.broken_bricks.erase(static_cast<std::vector<broken_brick_type>::iterator>(pbroken_brick));
-}
-
-void broken_brick_draw(broken_brick_type* pbroken_brick)
-{
- SDL_Rect src, dest;
- src.x = rand() % 16;
- src.y = rand() % 16;
- src.w = 16;
- src.h = 16;
-
- dest.x = (int)(pbroken_brick->base.x - scroll_x);
- dest.y = (int)pbroken_brick->base.y;
- dest.w = 16;
- dest.h = 16;
-
- if (pbroken_brick->tile->images.size() > 0)
- texture_draw_part(&pbroken_brick->tile->images[0],
- src.x,src.y,dest.x,dest.y,dest.w,dest.h);
-}
-
-void bouncy_brick_init(bouncy_brick_type* pbouncy_brick, float x, float y)
-{
- pbouncy_brick->base.x = x;
- pbouncy_brick->base.y = y;
- pbouncy_brick->offset = 0;
- pbouncy_brick->offset_m = -BOUNCY_BRICK_SPEED;
- pbouncy_brick->shape = GameSession::current()->get_level()->gettileid(x, y);
-}
-
-void bouncy_brick_action(bouncy_brick_type* pbouncy_brick)
+World::save_state()
{
+ using namespace Scripting;
- pbouncy_brick->offset = (pbouncy_brick->offset +
- pbouncy_brick->offset_m * frame_ratio);
+ lisp::Writer writer(savegame_filename);
- /* Go back down? */
+ writer.start_list("supertux-savegame");
+ writer.write_int("version", 1);
- if (pbouncy_brick->offset < -BOUNCY_BRICK_MAX_OFFSET)
- pbouncy_brick->offset_m = BOUNCY_BRICK_SPEED;
-
-
- /* Stop bouncing? */
-
- if (pbouncy_brick->offset >= 0)
- world.bouncy_bricks.erase(static_cast<std::vector<bouncy_brick_type>::iterator>(pbouncy_brick));
-}
-
-void bouncy_brick_draw(bouncy_brick_type* pbouncy_brick)
-{
- int s;
- SDL_Rect dest;
-
- if (pbouncy_brick->base.x >= scroll_x - 32 &&
- pbouncy_brick->base.x <= scroll_x + screen->w)
- {
- dest.x = (int)(pbouncy_brick->base.x - scroll_x);
- dest.y = (int)pbouncy_brick->base.y;
- dest.w = 32;
- dest.h = 32;
-
- Level* plevel = GameSession::current()->get_level();
-
- // FIXME: overdrawing hack to clean the tile from the screen to
- // paint it later at on offseted position
- if(plevel->bkgd_image[0] == '\0')
- {
- fillrect(pbouncy_brick->base.x - scroll_x, pbouncy_brick->base.y,
- 32,32,
- plevel->bkgd_red, plevel->bkgd_green, plevel->bkgd_blue, 0);
- }
- else
- {
- s = (int)scroll_x / 30;
- texture_draw_part(&plevel->img_bkgd, dest.x + s, dest.y,
- dest.x, dest.y,dest.w,dest.h);
- }
-
- drawshape(pbouncy_brick->base.x - scroll_x,
- pbouncy_brick->base.y + pbouncy_brick->offset,
- pbouncy_brick->shape);
- }
-}
+ using namespace WorldMapNS;
+ if(WorldMap::current() != NULL) {
+ std::ostringstream title;
+ title << WorldMap::current()->get_title();
+ title << " (" << WorldMap::current()->solved_level_count()
+ << "/" << WorldMap::current()->level_count() << ")";
+ writer.write_string("title", title.str());
+ }
-void floating_score_init(floating_score_type* pfloating_score, float x, float y, int s)
-{
- pfloating_score->base.x = x;
- pfloating_score->base.y = y - 16;
- timer_init(&pfloating_score->timer,true);
- timer_start(&pfloating_score->timer,1000);
- pfloating_score->value = s;
-}
+ writer.start_list("tux");
+ player_status->write(writer);
+ writer.end_list("tux");
-void floating_score_action(floating_score_type* pfloating_score)
-{
- pfloating_score->base.y = pfloating_score->base.y - 2 * frame_ratio;
+ writer.start_list("state");
- if(!timer_check(&pfloating_score->timer))
- world.floating_scores.erase(static_cast<std::vector<floating_score_type>::iterator>(pfloating_score));
-}
+ sq_pushroottable(global_vm);
+ sq_pushstring(global_vm, "state", -1);
+ if(SQ_SUCCEEDED(sq_get(global_vm, -2))) {
+ Scripting::save_squirrel_table(global_vm, -1, writer);
+ sq_pop(global_vm, 1);
+ }
+ sq_pop(global_vm, 1);
+ writer.end_list("state");
-void floating_score_draw(floating_score_type* pfloating_score)
-{
- char str[10];
- sprintf(str, "%d", pfloating_score->value);
- text_draw(&gold_text, str, (int)pfloating_score->base.x + 16 - strlen(str) * 8, (int)pfloating_score->base.y, 1);
+ writer.end_list("supertux-savegame");
}
-/* Break a brick: */
-void trybreakbrick(float x, float y, bool small)
-{
- Level* plevel = GameSession::current()->get_level();
-
- Tile* tile = gettile(x, y);
- if (tile->brick)
- {
- if (tile->data > 0)
- {
- /* Get a distro from it: */
- world.add_bouncy_distro(((int)(x + 1) / 32) * 32,
- (int)(y / 32) * 32);
-
- if (!counting_distros)
- {
- counting_distros = true;
- distro_counter = 50;
- }
-
- if (distro_counter <= 0)
- plevel->change(x, y, TM_IA, tile->next_tile);
-
- play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
- score = score + SCORE_DISTRO;
- distros++;
- }
- else if (!small)
- {
- /* Get rid of it: */
- plevel->change(x, y, TM_IA, tile->next_tile);
-
- /* Replace it with broken bits: */
- world.add_broken_brick(tile,
- ((int)(x + 1) / 32) * 32,
- (int)(y / 32) * 32);
-
- /* Get some score: */
- play_sound(sounds[SND_BRICK], SOUND_CENTER_SPEAKER);
- score = score + SCORE_BRICK;
- }
- }
+void
+World::load_state()
+{
+ using namespace Scripting;
+
+ try {
+ lisp::Parser parser;
+ const lisp::Lisp* root = parser.parse(savegame_filename);
+
+ const lisp::Lisp* lisp = root->get_lisp("supertux-savegame");
+ if(lisp == NULL)
+ throw std::runtime_error("file is not a supertux-savegame file");
+
+ int version = 1;
+ lisp->get("version", version);
+ if(version != 1)
+ throw std::runtime_error("incompatible savegame version");
+
+ const lisp::Lisp* tux = lisp->get_lisp("tux");
+ if(tux == NULL)
+ throw std::runtime_error("No tux section in savegame");
+ player_status->read(*tux);
+
+ const lisp::Lisp* state = lisp->get_lisp("state");
+ if(state == NULL)
+ throw std::runtime_error("No state section in savegame");
+
+ sq_pushroottable(global_vm);
+ sq_pushstring(global_vm, "state", -1);
+ if(SQ_FAILED(sq_deleteslot(global_vm, -2, SQFalse)))
+ sq_pop(global_vm, 1);
+
+ sq_pushstring(global_vm, "state", -1);
+ sq_newtable(global_vm);
+ load_squirrel_table(global_vm, -1, state);
+ if(SQ_FAILED(sq_createslot(global_vm, -3)))
+ throw std::runtime_error("Couldn't create state table");
+ sq_pop(global_vm, 1);
+ } catch(std::exception& e) {
+ log_debug << "Couldn't load savegame: " << e.what() << std::endl;
+ }
}
-/* Empty a box: */
-void tryemptybox(float x, float y, int col_side)
+const std::string&
+World::get_level_filename(unsigned int i) const
{
- Level* plevel = GameSession::current()->get_level();
-
- Tile* tile = gettile(x,y);
- if (!tile->fullbox)
- return;
-
- // according to the collision side, set the upgrade direction
- if(col_side == LEFT)
- col_side = RIGHT;
- else
- col_side = LEFT;
-
- switch(tile->data)
- {
- case 1: //'A': /* Box with a distro! */
- world.add_bouncy_distro(((int)(x + 1) / 32) * 32, (int)(y / 32) * 32 - 32);
- play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
- score = score + SCORE_DISTRO;
- distros++;
- break;
-
- case 2: // 'B': /* Add an upgrade! */
- if (tux.size == SMALL) /* Tux is small, add mints! */
- world.add_upgrade((int)((x + 1) / 32) * 32, (int)(y / 32) * 32 - 32, col_side, UPGRADE_MINTS);
- else /* Tux is big, add coffee: */
- world.add_upgrade((int)((x + 1) / 32) * 32, (int)(y / 32) * 32 - 32, col_side, UPGRADE_COFFEE);
- play_sound(sounds[SND_UPGRADE], SOUND_CENTER_SPEAKER);
- break;
-
- case 3:// '!': /* Add a golden herring */
- world.add_upgrade((int)((x + 1) / 32) * 32, (int)(y / 32) * 32 - 32, col_side, UPGRADE_HERRING);
- break;
- default:
- break;
- }
-
- /* Empty the box: */
- plevel->change(x, y, TM_IA, tile->next_tile);
+ return levels[i];
}
-/* Try to grab a distro: */
-void trygrabdistro(float x, float y, int bounciness)
+unsigned int
+World::get_num_levels() const
{
- Level* plevel = GameSession::current()->get_level();
- Tile* tile = gettile(x, y);
- if (tile && tile->distro)
- {
- plevel->change(x, y, TM_IA, tile->next_tile);
- play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
-
- if (bounciness == BOUNCE)
- {
- world.add_bouncy_distro(((int)(x + 1) / 32) * 32,
- (int)(y / 32) * 32);
- }
-
- score = score + SCORE_DISTRO;
- distros++;
- }
+ return levels.size();
}
-/* Try to bump a bad guy from below: */
-void trybumpbadguy(float x, float y)
+const std::string&
+World::get_basedir() const
{
- /* Bad guys: */
- for (unsigned int i = 0; i < world.bad_guys.size(); i++)
- {
- if (world.bad_guys[i].base.x >= x - 32 && world.bad_guys[i].base.x <= x + 32 &&
- world.bad_guys[i].base.y >= y - 16 && world.bad_guys[i].base.y <= y + 16)
- {
- world.bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_BUMP);
- }
- }
-
-
- /* Upgrades: */
- for (unsigned int i = 0; i < world.upgrades.size(); i++)
- {
- if (world.upgrades[i].base.height == 32 &&
- world.upgrades[i].base.x >= x - 32 && world.upgrades[i].base.x <= x + 32 &&
- world.upgrades[i].base.y >= y - 16 && world.upgrades[i].base.y <= y + 16)
- {
- world.upgrades[i].base.xm = -world.upgrades[i].base.xm;
- world.upgrades[i].base.ym = -8;
- play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER);
- }
- }
+ return basedir;
}
-
-/* EOF */
-
projects / supertux.git / blobdiff