return NONE;
}
-TileManager* TileManager::instance_ = 0;
-
TileManager::TileManager()
{
- std::string stwt_filename = datadir + "images/worldmap/antarctica.stwt";
+ std::string stwt_filename = datadir + "/images/worldmap/antarctica.stwt";
lisp_object_t* root_obj = lisp_read_from_file(stwt_filename);
if (!root_obj)
{
assert(0);
}
+
+ lisp_free(root_obj);
+}
+
+TileManager::~TileManager()
+{
+ for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i)
+ delete *i;
}
Tile*
return tiles[i];
}
+//---------------------------------------------------------------------------
+
Tux::Tux(WorldMap* worldmap_)
: worldmap(worldmap_)
{
sprite = new Surface(datadir + "/images/worldmap/tux.png", USE_ALPHA);
offset = 0;
moving = false;
- tile_pos.x = 5;
+ tile_pos.x = 4;
tile_pos.y = 5;
direction = NONE;
input_direction = NONE;
}
+Tux::~Tux()
+{
+ delete sprite;
+}
+
void
Tux::draw(const Point& offset)
{
Point pos = get_pos();
sprite->draw(pos.x + offset.x,
- pos.y + offset.y);
+ pos.y + offset.y - 10);
}
}
}
+//---------------------------------------------------------------------------
+Tile::Tile()
+{
+}
+
+Tile::~Tile()
+{
+ delete sprite;
+}
+
+//---------------------------------------------------------------------------
+
WorldMap::WorldMap()
{
+ tile_manager = new TileManager();
tux = new Tux(this);
width = 20;
WorldMap::~WorldMap()
{
delete tux;
+ delete tile_manager;
+
+ delete level_sprite;
+ delete leveldot_green;
+ delete leveldot_red;
}
void
WorldMap::load_map()
{
- std::string filename = datadir + "levels/default/worldmap.stwm";
+ std::string filename = datadir + "/levels/default/worldmap.stwm";
lisp_object_t* root_obj = lisp_read_from_file(filename);
if (!root_obj)
cur = lisp_cdr(cur);
}
}
+
+ lisp_free(root_obj);
}
void WorldMap::get_level_title(Levels::pointer level)
{
-/** get level's title */
-level->title = "<no title>";
+ /** get level's title */
+ level->title = "<no title>";
-FILE * fi;
-lisp_object_t* root_obj = 0;
-fi = fopen((datadir + "levels/" + level->name).c_str(), "r");
-if (fi == NULL)
+ FILE * fi;
+ lisp_object_t* root_obj = 0;
+ fi = fopen((datadir + "/levels/" + level->name).c_str(), "r");
+ if (fi == NULL)
{
- perror((datadir + "levels/" + level->name).c_str());
- return;
+ perror((datadir + "/levels/" + level->name).c_str());
+ return;
}
-lisp_stream_t stream;
-lisp_stream_init_file (&stream, fi);
-root_obj = lisp_read (&stream);
+ lisp_stream_t stream;
+ lisp_stream_init_file (&stream, fi);
+ root_obj = lisp_read (&stream);
-if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR)
+ if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR)
{
- printf("World: Parse Error in file %s", level->name.c_str());
+ printf("World: Parse Error in file %s", level->name.c_str());
}
-if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
+ if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
{
- LispReader reader(lisp_cdr(root_obj));
- reader.read_string("name", &level->title);
+ LispReader reader(lisp_cdr(root_obj));
+ reader.read_string("name", &level->title);
}
-fclose(fi);
+ lisp_free(root_obj);
+
+ fclose(fi);
}
void
level->y == tux->get_tile_pos().y)
{
std::cout << "Enter the current level: " << level->name << std::endl;;
- GameSession session(datadir + "levels/" + level->name,
+ GameSession session(datadir + "/levels/" + level->name,
1, ST_GL_LOAD_LEVEL_FILE);
switch (session.run())
{
case GameSession::LEVEL_FINISHED:
- level->solved = true;
+ {
+ bool old_level_state = level->solved;
+ level->solved = true;
+
+ if (session.get_world()->get_tux()->got_coffee)
+ player_status.bonus = PlayerStatus::FLOWER_BONUS;
+ else if (session.get_world()->get_tux()->size == BIG)
+ player_status.bonus = PlayerStatus::GROWUP_BONUS;
+ else
+ player_status.bonus = PlayerStatus::NO_BONUS;
+
+ if (old_level_state != level->solved)
+ { // Try to detect the next direction to which we should walk
+ // FIXME: Mostly a hack
+ Direction dir = NONE;
+
+ Tile* tile = at(tux->get_tile_pos());
+
+ if (tile->north && tux->back_direction != NORTH)
+ dir = NORTH;
+ else if (tile->south && tux->back_direction != SOUTH)
+ dir = SOUTH;
+ else if (tile->east && tux->back_direction != EAST)
+ dir = EAST;
+ else if (tile->west && tux->back_direction != WEST)
+ dir = WEST;
+
+ if (dir != NONE)
+ {
+ tux->set_direction(dir);
+ tux->update(0.33f);
+ }
+
+ std::cout << "Walk to dir: " << dir << std::endl;
+ }
+ }
+
break;
case GameSession::LEVEL_ABORT:
// Reseting the player_status might be a worthy
break;
case GameSession::GAME_OVER:
quit = true;
+ player_status.bonus = PlayerStatus::NO_BONUS;
break;
case GameSession::NONE:
// Should never be reached
&& p.y >= 0
&& p.y < height);
- return TileManager::instance()->get(tilemap[width * p.y + p.x]);
+ return tile_manager->get(tilemap[width * p.y + p.x]);
}
WorldMap::Level*
<< " (lives " << player_status.lives << ")\n"
<< " (score " << player_status.score << ")\n"
<< " (distros " << player_status.distros << ")\n"
- << " (tux (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")"
- << " (back \"" << direction_to_string(tux->back_direction) << "\"))\n"
+ << " (tux (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")\n"
+ << " (back \"" << direction_to_string(tux->back_direction) << "\")\n"
+ << " (bonus \"" << bonus_to_string(player_status.bonus) << "\"))\n"
<< " (levels\n";
for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
std::cout << "loadgame: " << filename << std::endl;
savegame_file = filename;
- if (access(filename.c_str(), F_OK) == 0)
- {
- lisp_object_t* cur = lisp_read_from_file(filename);
+ if (access(filename.c_str(), F_OK) != 0)
+ return;
+
+ lisp_object_t* savegame = lisp_read_from_file(filename);
+ lisp_object_t* cur = savegame;
- if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0)
- return;
+ if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0)
+ return;
- cur = lisp_cdr(cur);
- LispReader reader(cur);
-
- reader.read_int("lives", &player_status.lives);
- reader.read_int("score", &player_status.score);
- reader.read_int("distros", &player_status.distros);
+ cur = lisp_cdr(cur);
+ LispReader reader(cur);
- if (player_status.lives < 0)
- player_status.lives = START_LIVES;
+ reader.read_int("lives", &player_status.lives);
+ reader.read_int("score", &player_status.score);
+ reader.read_int("distros", &player_status.distros);
- lisp_object_t* tux_cur = 0;
- if (reader.read_lisp("tux", &tux_cur))
- {
- Point p;
- std::string back_str = "none";
+ if (player_status.lives < 0)
+ player_status.lives = START_LIVES;
- LispReader tux_reader(tux_cur);
- tux_reader.read_int("x", &p.x);
- tux_reader.read_int("y", &p.y);
- tux_reader.read_string("back", &back_str);
-
- tux->back_direction = string_to_direction(back_str);
- tux->set_tile_pos(p);
- }
+ lisp_object_t* tux_cur = 0;
+ if (reader.read_lisp("tux", &tux_cur))
+ {
+ Point p;
+ std::string back_str = "none";
+ std::string bonus_str = "none";
+
+ LispReader tux_reader(tux_cur);
+ tux_reader.read_int("x", &p.x);
+ tux_reader.read_int("y", &p.y);
+ tux_reader.read_string("back", &back_str);
+ tux_reader.read_string("bonus", &bonus_str);
+
+ player_status.bonus = string_to_bonus(bonus_str);
+ tux->back_direction = string_to_direction(back_str);
+ tux->set_tile_pos(p);
+ }
- lisp_object_t* level_cur = 0;
- if (reader.read_lisp("levels", &level_cur))
+ lisp_object_t* level_cur = 0;
+ if (reader.read_lisp("levels", &level_cur))
+ {
+ while(level_cur)
{
- while(level_cur)
- {
- lisp_object_t* sym = lisp_car(lisp_car(level_cur));
- lisp_object_t* data = lisp_cdr(lisp_car(level_cur));
+ lisp_object_t* sym = lisp_car(lisp_car(level_cur));
+ lisp_object_t* data = lisp_cdr(lisp_car(level_cur));
- if (strcmp(lisp_symbol(sym), "level") == 0)
- {
- std::string name;
- bool solved = false;
+ if (strcmp(lisp_symbol(sym), "level") == 0)
+ {
+ std::string name;
+ bool solved = false;
- LispReader level_reader(data);
- level_reader.read_string("name", &name);
- level_reader.read_bool("solved", &solved);
+ LispReader level_reader(data);
+ level_reader.read_string("name", &name);
+ level_reader.read_bool("solved", &solved);
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
- {
- if (name == i->name)
- i->solved = solved;
- }
+ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+ {
+ if (name == i->name)
+ i->solved = solved;
}
-
- level_cur = lisp_cdr(level_cur);
}
+
+ level_cur = lisp_cdr(level_cur);
}
}
+
+ lisp_free(savegame);
}
} // namespace WorldMapNS
projects / supertux.git / blobdiff