Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11052/src
Modified Files:
badguy.h level.cpp sector.cpp tilemap.cpp
Log Message:
Changes:
- Font now supports drawing effect;
- Level saving now works. Still has flaws:
o Spawn points are not saved;
o Tilemaps do not know differ foreground/background. Matze, Can you have a look at this?
- Other minor stuff.
Index: badguy.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- badguy.h 14 Jun 2004 22:45:23 -0000 1.55
+++ badguy.h 29 Jun 2004 13:00:41 -0000 1.56
@@ -136,6 +136,9 @@
*/
void kill_me(int score);
+ /** initializes the badguy (when he appears on screen) */
+ void activate(Direction direction); // should only be used by BadGuy's objects
+
private:
void init();
@@ -153,9 +156,6 @@
void action_wingling(double frame_ratio);
void action_walkingtree(double frame_ratio);
- /** initializes the badguy (when he appears on screen) */
- void activate(Direction direction);
-
/** handles falling down. disables gravity calculation when we're back on
* ground */
void fall();
Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- level.cpp 28 Jun 2004 11:30:26 -0000 1.94
+++ level.cpp 29 Jun 2004 13:00:41 -0000 1.95
@@ -115,7 +115,11 @@
writer->write_int("time", time_left);
for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
+ {
+ writer->start_list("sector");
i->second->write(*writer);
+ writer->end_list("sector");
+ }
writer->end_list("supertux-level");
Index: tilemap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tilemap.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tilemap.cpp 15 Jun 2004 14:27:34 -0000 1.12
+++ tilemap.cpp 29 Jun 2004 13:00:43 -0000 1.13
@@ -52,7 +52,7 @@
else if(layer == "foreground")
layer = LAYER_FOREGROUNDTILES;
else
- std::cout << "Unknown layer '" << layer << "' in tilemap.\n";
+ std::cerr << "Unknown layer '" << layer << "' in tilemap.\n";
}
reader.read_bool("solid", solid);
@@ -99,7 +99,8 @@
else if(layer == LAYER_FOREGROUNDTILES)
writer.write_string("layer", "foreground");
else {
- std::cout << "Warning unknown layer in tilemap.\n";
+ writer.write_string("layer", "unknown");
+ std::cerr << "Warning unknown layer in tilemap.\n";
}
writer.write_bool("solid", solid);
Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sector.cpp 28 Jun 2004 11:30:27 -0000 1.12
+++ sector.cpp 29 Jun 2004 13:00:42 -0000 1.13
@@ -265,6 +265,7 @@
{
writer.write_string("name", name);
writer.write_float("gravity", gravity);
+ writer.write_string("music", song_title);
for(GameObjects::iterator i = gameobjects.begin();
i != gameobjects.end(); ++i) {
|
