[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.18,1.19 pingus
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.18,1.19 pingus.cxx,1.22,1.23 worldmap.cxx,1.24,1.25 |
Date: |
29 Oct 2002 12:48:35 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv516
Modified Files:
manager.cxx pingus.cxx worldmap.cxx
Log Message:
some minor changes, not really bugfixes
Index: manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- manager.cxx 15 Oct 2002 15:49:42 -0000 1.18
+++ manager.cxx 29 Oct 2002 12:48:33 -0000 1.19
@@ -34,7 +34,7 @@
// FIXME: The default startup map should be configurable by some file
worldmap = boost::shared_ptr<WorldMap>
- (new WorldMap (path_manager.complete("worldmaps/volcano.xml")));
+ (new WorldMap (path_manager.complete("worldmaps/tutorial.xml")));
//worldmap->on_startup ();
Index: pingus.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/pingus.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- pingus.cxx 15 Oct 2002 23:54:01 -0000 1.22
+++ pingus.cxx 29 Oct 2002 12:48:33 -0000 1.23
@@ -196,7 +196,8 @@
float
Pingus::get_z_pos() const
{
- return 2000.0f;
+ // FIXME: Should should be interpolated from the given position on the path
+ return 10.0f;
}
void
Index: worldmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- worldmap.cxx 17 Oct 2002 16:06:21 -0000 1.24
+++ worldmap.cxx 29 Oct 2002 12:48:33 -0000 1.25
@@ -66,7 +66,9 @@
parse_file(doc, cur);
pingus = new Pingus(path_graph);
- pingus->set_position(path_graph->lookup_node("leveldot_3"));
+ // FIXME: This should not be hardcoded, but instead be noted in the
+ // savegame or worldmap
+ pingus->set_position(0);
add_drawable(pingus);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.18,1.19 pingus.cxx,1.22,1.23 worldmap.cxx,1.24,1.25,
grumbel <=