[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldmap drawable.hxx,1.4,1.5 manager
From: |
torangan |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldmap drawable.hxx,1.4,1.5 manager.cxx,1.15,1.16 path_drawable.cxx,1.2,1.3 path_graph.cxx,1.6,1.7 pingus.cxx,1.11,1.12 worldmap.cxx,1.18,1.19 |
Date: |
13 Oct 2002 20:25:02 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv16015/worldmap
Modified Files:
drawable.hxx manager.cxx path_drawable.cxx path_graph.cxx
pingus.cxx worldmap.cxx
Log Message:
some small cleanup
Index: drawable.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/drawable.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- drawable.hxx 13 Oct 2002 14:19:25 -0000 1.4
+++ drawable.hxx 13 Oct 2002 20:25:00 -0000 1.5
@@ -57,6 +57,7 @@
{
PingusError::raise("Drawable: Couldn't get name of object");
}
+ UNUSED_ARG(doc);
}
virtual ~Drawable() {}
Index: manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- manager.cxx 12 Oct 2002 23:34:43 -0000 1.15
+++ manager.cxx 13 Oct 2002 20:25:00 -0000 1.16
@@ -85,7 +85,8 @@
void
WorldMapManager::WorldMapComponent::update (float delta)
{
- WorldMapManager::instance ()->worldmap->update ();
+ WorldMapManager::instance()->worldmap->update();
+ UNUSED_ARG(delta);
}
void
Index: path_drawable.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/path_drawable.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- path_drawable.cxx 13 Oct 2002 19:28:34 -0000 1.2
+++ path_drawable.cxx 13 Oct 2002 20:25:00 -0000 1.3
@@ -23,13 +23,13 @@
namespace WorldMapNS {
-PathDrawable::PathDrawable(const Path& arg_path)
+PathDrawable::PathDrawable (const Path& arg_path)
: path(arg_path)
{
}
void
-PathDrawable::draw(GraphicContext& gc)
+PathDrawable::draw (GraphicContext& gc)
{
Path::iterator prev = path.begin();
@@ -45,7 +45,7 @@
}
void
-PathDrawable::update()
+PathDrawable::update ()
{
}
Index: path_graph.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/path_graph.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- path_graph.cxx 13 Oct 2002 19:28:34 -0000 1.6
+++ path_graph.cxx 13 Oct 2002 20:25:00 -0000 1.7
@@ -171,8 +171,8 @@
std::vector<Vector>
PathGraph::get_path(NodeId start_id, NodeId end_id)
{
- Node<Dot*>& start = graph.resolve_node(start_id);
- Node<Dot*>& end = graph.resolve_node(end_id);
+ //Node<Dot*>& start = graph.resolve_node(start_id);
+ //Node<Dot*>& end = graph.resolve_node(end_id);
Pathfinder<Dot*, Path*> pathfinder(graph, start_id);
std::vector<NodeId> path = pathfinder.get_path(end_id);
Index: pingus.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/pingus.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pingus.cxx 12 Oct 2002 23:34:43 -0000 1.11
+++ pingus.cxx 13 Oct 2002 20:25:00 -0000 1.12
@@ -74,6 +74,8 @@
// Recalc pingu position on the screen
pos = calc_pos ();
+#else
+UNUSED_ARG(delta);
#endif
}
@@ -105,6 +107,8 @@
node_path = node_path2;
}
}
+#else
+ UNUSED_ARG(target);
#endif
return false;
}
Index: worldmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- worldmap.cxx 13 Oct 2002 14:19:25 -0000 1.18
+++ worldmap.cxx 13 Oct 2002 20:25:00 -0000 1.19
@@ -144,7 +144,7 @@
cur = cur->children;
cur = XMLhelper::skip_blank(cur);
-
+ UNUSED_ARG(doc);
}
void
@@ -176,17 +176,20 @@
void
WorldMap::remove_drawable(Drawable* drawable)
{
-
+ UNUSED_ARG(drawable);
}
void
WorldMap::set_pingus(NodeId id)
{
+ UNUSED_ARG(id);
}
void
WorldMap::on_primary_button_press(int x, int y)
{
+ UNUSED_ARG(x);
+ UNUSED_ARG(y);
}
} // namespace WorldMapNS
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldmap drawable.hxx,1.4,1.5 manager.cxx,1.15,1.16 path_drawable.cxx,1.2,1.3 path_graph.cxx,1.6,1.7 pingus.cxx,1.11,1.12 worldmap.cxx,1.18,1.19,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src config_xml.cxx,1.2,1.3 pingu_holder.cxx,1.17,1.18 pingu_info.cxx,1.5,1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx,1.6,1.7 fake_exit.cxx,1.10,1.11 hammer.cxx,1.10,1.11 laser_exit.cxx,1.9,1.10 smasher.cxx,1.13,1.14
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src config_xml.cxx,1.2,1.3 pingu_holder.cxx,1.17,1.18 pingu_info.cxx,1.5,1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs exit.cxx,1.6,1.7 fake_exit.cxx,1.10,1.11 hammer.cxx,1.10,1.11 laser_exit.cxx,1.9,1.10 smasher.cxx,1.13,1.14
- Index(es):