projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ecce94
)
Just changed the name of a worldmap flag.
author
Ricardo Cruz
<rick2@aeiou.pt>
Sat, 17 Jul 2004 16:20:33 +0000
(16:20 +0000)
committer
Ricardo Cruz
<rick2@aeiou.pt>
Sat, 17 Jul 2004 16:20:33 +0000
(16:20 +0000)
SVN-Revision: 1586
src/worldmap.cpp
patch
|
blob
|
history
src/worldmap.h
patch
|
blob
|
history
diff --git
a/src/worldmap.cpp
b/src/worldmap.cpp
index
edbcc06
..
b0e29b7
100644
(file)
--- a/
src/worldmap.cpp
+++ b/
src/worldmap.cpp
@@
-429,7
+429,7
@@
WorldMap::load_map()
reader.read_string("extro-filename", level.extro_filename);
reader.read_string("map-message", level.display_map_message);
reader.read_string("extro-filename", level.extro_filename);
reader.read_string("map-message", level.display_map_message);
- reader.read_string("
goto-world", level.goto
_worldmap);
+ reader.read_string("
next-world", level.next
_worldmap);
reader.read_string("level", level.name, true);
reader.read_int("x", level.x);
reader.read_int("y", level.y);
reader.read_string("level", level.name, true);
reader.read_int("x", level.x);
reader.read_int("y", level.y);
@@
-788,10
+788,10
@@
WorldMap::update(float delta)
// TODO: add an effect, like a camera scrolling, or at least, a fading
tux->set_tile_pos(Vector(level->swap_x, level->swap_y));
}
// TODO: add an effect, like a camera scrolling, or at least, a fading
tux->set_tile_pos(Vector(level->swap_x, level->swap_y));
}
- if (!level->
goto
_worldmap.empty())
+ if (!level->
next
_worldmap.empty())
{
// Load given worldmap
{
// Load given worldmap
- loadmap(level->
goto
_worldmap);
+ loadmap(level->
next
_worldmap);
}
if (level->quit_worldmap)
quit = true;
}
if (level->quit_worldmap)
quit = true;
diff --git
a/src/worldmap.h
b/src/worldmap.h
index
5113c74
..
0d20a1c
100644
(file)
--- a/
src/worldmap.h
+++ b/
src/worldmap.h
@@
-155,7
+155,7
@@
public:
std::string display_map_message;
/** Go to this world */
std::string display_map_message;
/** Go to this world */
- std::string
goto
_worldmap;
+ std::string
next
_worldmap;
/** Quit the worldmap */
bool quit_worldmap;
/** Quit the worldmap */
bool quit_worldmap;