[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldmap dot_factory.hxx, 1.2, 1.3 dr
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldmap dot_factory.hxx, 1.2, 1.3 drawable.cxx, 1.1, 1.2 drawable_factory.cxx, 1.1, 1.2 graph.cxx, 1.11, 1.12 graph.hxx, 1.23, 1.24 level_dot.cxx, 1.25, 1.26 manager.cxx, 1.40, 1.41 path.cxx, 1.7, 1.8 path_drawable.cxx, 1.8, 1.9 path_drawable.hxx, 1.5, 1.6 pathfinder.hxx, 1.12, 1.13 pingus.cxx, 1.33, 1.34 sprite_drawable.cxx, 1.4, 1.5 surface_drawable.cxx, 1.6, 1.7 worldmap.cxx, 1.51, 1.52 worldmap.hxx, 1.30, 1.31 |
Date: |
Tue, 21 Oct 2003 13:01:55 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv31821/worldmap
Modified Files:
dot_factory.hxx drawable.cxx drawable_factory.cxx graph.cxx
graph.hxx level_dot.cxx manager.cxx path.cxx path_drawable.cxx
path_drawable.hxx pathfinder.hxx pingus.cxx
sprite_drawable.cxx surface_drawable.cxx worldmap.cxx
worldmap.hxx
Log Message:
- bunch of misc changes
Index: dot_factory.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/dot_factory.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dot_factory.hxx 19 Apr 2003 10:23:19 -0000 1.2
+++ dot_factory.hxx 21 Oct 2003 11:01:52 -0000 1.3
@@ -20,6 +20,7 @@
#ifndef HEADER_PINGUS_DOT_FACTORY_HXX
#define HEADER_PINGUS_DOT_FACTORY_HXX
+namespace Pingus {
namespace WorldMapNS {
class Dot;
@@ -37,6 +38,7 @@
};
} // namespace WorldMapNS
+} // namespace Pingus
#endif
Index: drawable.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/drawable.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- drawable.cxx 12 Oct 2002 23:37:23 -0000 1.1
+++ drawable.cxx 21 Oct 2003 11:01:52 -0000 1.2
@@ -19,6 +19,7 @@
#include "drawable.hxx"
-
+namespace Pingus {
+} // namespace Pingus
/* EOF */
Index: drawable_factory.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/drawable_factory.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- drawable_factory.cxx 12 Oct 2002 23:37:23 -0000 1.1
+++ drawable_factory.cxx 21 Oct 2003 11:01:52 -0000 1.2
@@ -23,6 +23,7 @@
#include "sprite_drawable.hxx"
#include "drawable_factory.hxx"
+namespace Pingus {
namespace WorldMapNS {
Drawable*
@@ -40,5 +41,6 @@
}
} // namespace WorldMapNS
+} // namespace Pingus
/* EOF */
Index: graph.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/graph.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- graph.cxx 14 Oct 2002 00:38:22 -0000 1.11
+++ graph.cxx 21 Oct 2003 11:01:52 -0000 1.12
@@ -19,11 +19,13 @@
#include "graph.hxx"
+namespace Pingus {
namespace WorldMapNS {
const NodeId NoNode = -1;
const EdgeId NoEdge = -1;
} // namespace WorldMapNS
+} // namespace Pingus
/* EOF */
Index: graph.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/graph.hxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- graph.hxx 19 Apr 2003 10:23:19 -0000 1.23
+++ graph.hxx 21 Oct 2003 11:01:52 -0000 1.24
@@ -25,6 +25,7 @@
#include <iostream>
#include <vector>
+namespace Pingus {
namespace WorldMapNS {
typedef int NodeId;
@@ -179,6 +180,7 @@
};
} // namespace WorldMapNS
+} // namespace Pingus
#endif
Index: level_dot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/level_dot.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- level_dot.cxx 20 Oct 2003 19:28:55 -0000 1.25
+++ level_dot.cxx 21 Oct 2003 11:01:52 -0000 1.26
@@ -152,11 +152,12 @@
void
LevelDot::draw_hover(GraphicContext& gc)
{
+#ifdef CLANLIB_0_6
int pos_correction = 0;
if (accessible())
{
- int length =
Fonts::pingus_small->get_text_width(System::translate(get_plf()->get_levelname()))
/ 2;
+ int length =
Fonts::pingus_small.get_text_width(System::translate(get_plf()->get_levelname()))
/ 2;
int realpos = static_cast<int>(gc.world_to_screen(Vector(pos.x, pos.y,
0)).x);
if (realpos - length < 0)
pos_correction = realpos - length;
@@ -170,7 +171,7 @@
}
else
{
- int length = Fonts::pingus_small->get_text_width(_("locked")) / 2;
+ int length = Fonts::pingus_small.get_text_width(_("locked")) / 2;
int realpos = static_cast<int>(gc.world_to_screen(Vector(pos.x, pos.y,
0)).x);
if (realpos - length < 0)
pos_correction = realpos - length;
@@ -189,6 +190,7 @@
int(pos.x), int(pos.y - 56),
get_plf()->get_resname());
}
+#endif
}
void
Index: manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- manager.cxx 20 Oct 2003 19:28:55 -0000 1.40
+++ manager.cxx 21 Oct 2003 11:01:52 -0000 1.41
@@ -91,7 +91,7 @@
WorldMapManagerCreditsButton::on_pointer_enter()
{
SurfaceButton::on_pointer_enter();
- PingusSound::play_sound ("tick");
+ Sound::PingusSound::play_sound ("tick");
}
@@ -121,7 +121,7 @@
WorldMapManagerStoryButton::on_pointer_enter()
{
SurfaceButton::on_pointer_enter();
- PingusSound::play_sound ("tick");
+ Sound::PingusSound::play_sound ("tick");
}
@@ -151,7 +151,7 @@
WorldMapManagerCloseButton::on_pointer_enter()
{
SurfaceButton::on_pointer_enter();
- PingusSound::play_sound ("tick");
+ Sound::PingusSound::play_sound ("tick");
}
void
@@ -181,7 +181,7 @@
SurfaceButton::on_pointer_enter();
if (!WorldMapManager::instance()->get_worldmap()->get_pingus()->is_walking())
{
- PingusSound::play_sound ("tick");
+ Sound::PingusSound::play_sound ("tick");
}
}
@@ -246,7 +246,7 @@
WorldMapManager::on_startup ()
{
exit_worldmap = false;
- PingusSound::stop_music();
+ Sound::PingusSound::stop_music();
if (!worldmap)
{
Index: path.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/path.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- path.cxx 19 Apr 2003 10:23:19 -0000 1.7
+++ path.cxx 21 Oct 2003 11:01:52 -0000 1.8
@@ -22,6 +22,7 @@
#include <assert.h>
#include "path.hxx"
+namespace Pingus {
namespace WorldMapNS {
Path::Path()
@@ -107,5 +108,6 @@
}
} // namespace WorldMapNS
+} // namespace Pingus
/* EOF */
Index: path_drawable.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/path_drawable.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- path_drawable.cxx 19 Apr 2003 10:23:19 -0000 1.8
+++ path_drawable.cxx 21 Oct 2003 11:01:52 -0000 1.9
@@ -21,6 +21,7 @@
#include "../gui/graphic_context.hxx"
#include "path_drawable.hxx"
+namespace Pingus {
namespace WorldMapNS {
PathDrawable::PathDrawable (const Path& arg_path)
@@ -48,5 +49,6 @@
}
} // namespace WorldMapNS
+} // namespace Pingus
/* EOF */
Index: path_drawable.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/path_drawable.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- path_drawable.hxx 19 Apr 2003 10:23:19 -0000 1.5
+++ path_drawable.hxx 21 Oct 2003 11:01:52 -0000 1.6
@@ -23,6 +23,7 @@
#include "drawable.hxx"
#include "path_graph.hxx"
+namespace Pingus {
namespace WorldMapNS {
/** Drawable to show the path between two nodes, only used for
@@ -44,6 +45,7 @@
};
} // namespace WorldMapNS
+} // namespace Pingus
#endif
Index: pathfinder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/pathfinder.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pathfinder.hxx 19 Apr 2003 10:23:19 -0000 1.12
+++ pathfinder.hxx 21 Oct 2003 11:01:52 -0000 1.13
@@ -23,6 +23,7 @@
#include <queue>
#include "graph.hxx"
+namespace Pingus {
namespace WorldMapNS {
struct PathfinderResult
@@ -179,6 +180,7 @@
};
} // namespace WorldMapNS
+} // namespace Pingus
#endif
Index: pingus.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/pingus.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- pingus.cxx 19 Apr 2003 10:23:19 -0000 1.33
+++ pingus.cxx 21 Oct 2003 11:01:52 -0000 1.34
@@ -24,6 +24,7 @@
#include "../math.hxx"
#include "pingus.hxx"
+namespace Pingus {
namespace WorldMapNS {
Pingus::Pingus (PathGraph* arg_path)
@@ -261,5 +262,6 @@
}
} // namespace WorldMapNS
+} // namespace Pingus
/* EOF */
Index: sprite_drawable.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/sprite_drawable.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sprite_drawable.cxx 19 Apr 2003 10:23:19 -0000 1.4
+++ sprite_drawable.cxx 21 Oct 2003 11:01:52 -0000 1.5
@@ -20,6 +20,7 @@
#include "../gui/graphic_context.hxx"
#include "sprite_drawable.hxx"
+namespace Pingus {
namespace WorldMapNS {
SpriteDrawable::SpriteDrawable(xmlDocPtr doc, xmlNodePtr cur)
@@ -40,5 +41,6 @@
}
} // namespace WorldMapNS
+} // namespace Pingus
/* EOF */
Index: surface_drawable.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/surface_drawable.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface_drawable.cxx 19 Apr 2003 10:23:19 -0000 1.6
+++ surface_drawable.cxx 21 Oct 2003 11:01:52 -0000 1.7
@@ -28,6 +28,7 @@
#include "pingus.hxx"
#include "surface_drawable.hxx"
+namespace Pingus {
namespace WorldMapNS {
SurfaceDrawable::SurfaceDrawable(xmlDocPtr doc, xmlNodePtr cur)
@@ -78,5 +79,6 @@
}
} // namespace WorldMapNS
+} // namespace Pingus
/* EOF */
Index: worldmap.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- worldmap.cxx 19 Oct 2003 12:25:47 -0000 1.51
+++ worldmap.cxx 21 Oct 2003 11:01:52 -0000 1.52
@@ -20,8 +20,8 @@
#include <assert.h>
#include <iostream>
#include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/mouse.h>
#include "../fonts.hxx"
#include "../path_manager.hxx"
#include "../stat_manager.hxx"
@@ -359,7 +359,7 @@
}
else
{
- PingusSound::play_sound("chink");
+ Sound::PingusSound::play_sound("chink");
}
}
}
Index: worldmap.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.hxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- worldmap.hxx 20 Oct 2003 19:28:55 -0000 1.30
+++ worldmap.hxx 21 Oct 2003 11:01:52 -0000 1.31
@@ -25,11 +25,14 @@
#include "../libxmlfwd.hxx"
#include "../gui/display_graphic_context.hxx"
-class GraphicContext;
class CL_Key;
class CL_Font;
class CL_InputDevice;
+namespace Pingus {
+
+class GraphicContext;
+
namespace WorldMapNS {
typedef int EdgeId;
@@ -133,6 +136,7 @@
};
} // namespace WorldMapNS
+} // namespace Pingus
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldmap dot_factory.hxx, 1.2, 1.3 drawable.cxx, 1.1, 1.2 drawable_factory.cxx, 1.1, 1.2 graph.cxx, 1.11, 1.12 graph.hxx, 1.23, 1.24 level_dot.cxx, 1.25, 1.26 manager.cxx, 1.40, 1.41 path.cxx, 1.7, 1.8 path_drawable.cxx, 1.8, 1.9 path_drawable.hxx, 1.5, 1.6 pathfinder.hxx, 1.12, 1.13 pingus.cxx, 1.33, 1.34 sprite_drawable.cxx, 1.4, 1.5 surface_drawable.cxx, 1.6, 1.7 worldmap.cxx, 1.51, 1.52 worldmap.hxx, 1.30, 1.31,
Ingo Ruhnke <=