[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src groundtype.cxx,NONE,1.1 groundtype.hx
|
From: |
grumbel |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src groundtype.cxx,NONE,1.1 groundtype.hxx,NONE,1.1 Makefile.am,1.100,1.101 col_map.cxx,1.8,1.9 col_map.hxx,1.6,1.7 liquid.cxx,1.6,1.7 pingu.cxx,1.25,1.26 pingu_action.cxx,1.7,1.8 pingu_map.cxx,1.3,1.4 plf.cxx,1.8,1.9 plf.hxx,1.6,1.7 smallmap.cxx,1.16,1.17 smallmap_image.cxx,1.6,1.7 spot_map.cxx,1.14,1.15 spot_map.hxx,1.5,1.6 worldobj_data_factory.cxx,1.17,1.18 xml_plf.cxx,1.18,1.19 psm_parser.cxx,1.5,NONE psm_parser.hxx,1.3,NONE |
|
Date: |
16 Sep 2002 20:31:11 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv10000
Modified Files:
Makefile.am col_map.cxx col_map.hxx liquid.cxx pingu.cxx
pingu_action.cxx pingu_map.cxx plf.cxx plf.hxx smallmap.cxx
smallmap_image.cxx spot_map.cxx spot_map.hxx
worldobj_data_factory.cxx xml_plf.cxx
Added Files:
groundtype.cxx groundtype.hxx
Removed Files:
psm_parser.cxx psm_parser.hxx
Log Message:
- some groundpiece splitting/moving
--- NEW FILE: groundtype.cxx ---
// $Id: groundtype.cxx,v 1.1 2002/09/16 20:31:09 grumbel Exp $
//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
#include "groundtype.hxx"
Groundtype::GPType
Groundtype::string_to_type(const std::string& arg_type)
{
if (arg_type == "solid")
return Groundtype::GP_SOLID;
else if (arg_type == "transparent")
return Groundtype::GP_TRANSPARENT;
else if (arg_type == "ground")
return Groundtype::GP_GROUND;
else if (arg_type == "bridge")
return Groundtype::GP_BRIDGE;
else if (arg_type == "water")
return Groundtype::GP_WATER;
else if (arg_type == "lava")
return Groundtype::GP_LAVA;
else if (arg_type == "remove")
return Groundtype::GP_REMOVE;
else
{
std::cout << "Groundtype: Unhandled type: " << arg_type << std::endl;
return Groundtype::GP_GROUND;
}
}
std::string
Groundtype::type_to_string(GPType arg_type)
{
switch (arg_type)
{
case Groundtype::GP_SOLID:
return "solid";
case Groundtype::GP_TRANSPARENT:
return "transparent";
case Groundtype::GP_GROUND:
return "ground";
case Groundtype::GP_BRIDGE:
return "bridge";
case Groundtype::GP_WATER:
return "water";
case Groundtype::GP_LAVA:
return "lava";
case Groundtype::GP_REMOVE:
return "remove";
default:
std::cout << "Groundtype: Unhandled type: " << arg_type << std::endl;
return "ground";
}
}
/* EOF */
--- NEW FILE: groundtype.hxx ---
// $Id: groundtype.hxx,v 1.1 2002/09/16 20:31:09 grumbel Exp $
//
// Pingus - A free Lemmings clone
// Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef HEADER_PINGUS_GROUNDTYPE_HXX
#define HEADER_PINGUS_GROUNDTYPE_HXX
#include <string>
/** This class olds the definitions of the different types of ground
available in pingus, it might also provide converter function from
GPType to std::string and vice verse. */
class Groundtype
{
public:
enum GPType {
GP_NOTHING,
GP_SOLID,
GP_TRANSPARENT,
GP_GROUND,
GP_BRIDGE,
GP_WATER,
GP_LAVA,
GP_REMOVE,
GP_OUTOFSCREEN
};
static GPType string_to_type(const std::string& arg_type);
static std::string type_to_string(GPType arg_type);
};
#endif
/* EOF */
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- Makefile.am 16 Sep 2002 15:47:35 -0000 1.100
+++ Makefile.am 16 Sep 2002 20:31:09 -0000 1.101
@@ -162,8 +162,8 @@
global_event.hxx \
globals.cxx \
globals.hxx \
-groundpiece_data.cxx \
-groundpiece_data.hxx \
+groundtype.hxx \
+groundtype.cxx \
graphic_context.hxx \
gui_obj.hxx \
gui_obj.cxx \
@@ -269,8 +269,6 @@
plt_xml.hxx \
prefab.cxx \
prefab.hxx \
-psm_parser.cxx \
-psm_parser.hxx \
range.cxx \
range.hxx \
res_descriptor.cxx \
Index: col_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/col_map.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- col_map.cxx 16 Sep 2002 19:18:56 -0000 1.8
+++ col_map.cxx 16 Sep 2002 20:31:09 -0000 1.9
@@ -99,7 +99,7 @@
if (x >= 0 && x < width && y >= 0 && y < height) {
return colmap[x+y*width];
} else {
- return GroundpieceData::GP_OUTOFSCREEN;
+ return Groundtype::GP_OUTOFSCREEN;
}
}
@@ -151,8 +151,8 @@
{
if (buffer[(i + (swidth*line)) * 4] != 0)
{
- if (colmap[i + (width*(line+y) + x)] !=
GroundpieceData::GP_SOLID)
- colmap[i + (width*(line+y) + x)] =
GroundpieceData::GP_NOTHING;
+ if (colmap[i + (width*(line+y) + x)] != Groundtype::GP_SOLID)
+ colmap[i + (width*(line+y) + x)] = Groundtype::GP_NOTHING;
}
}
}
@@ -178,8 +178,8 @@
{
if (buffer[i + (swidth*line)])
{
- if (colmap[i + (width*(line+y) + x)] !=
GroundpieceData::GP_SOLID)
- colmap[i + (width*(line+y) + x)] =
GroundpieceData::GP_NOTHING;
+ if (colmap[i + (width*(line+y) + x)] != Groundtype::GP_SOLID)
+ colmap[i + (width*(line+y) + x)] = Groundtype::GP_NOTHING;
}
}
}
@@ -193,7 +193,7 @@
}
void
-ColMap::put(int x, int y, GroundpieceData::GPType p)
+ColMap::put(int x, int y, Groundtype::GPType p)
{
if (x > 0 && x < width
&& y > 0 && y < height)
@@ -225,13 +225,13 @@
}
bool
-ColMap::blit_allowed (int x, int y, GroundpieceData::GPType gtype)
+ColMap::blit_allowed (int x, int y, Groundtype::GPType gtype)
{
// FIXME: Inline me
- if (gtype == GroundpieceData::GP_BRIDGE)
+ if (gtype == Groundtype::GP_BRIDGE)
{
int pixel = getpixel (x, y);
- return pixel == GroundpieceData::GP_NOTHING;
+ return pixel == Groundtype::GP_NOTHING;
}
else
{
@@ -240,17 +240,17 @@
}
void
-ColMap::put(const CL_Surface& sur, int sur_x, int sur_y,
GroundpieceData::GPType gptype)
+ColMap::put(const CL_Surface& sur, int sur_x, int sur_y, Groundtype::GPType
gptype)
{
put(sur.get_provider(), sur_x, sur_y, gptype);
}
// Puts a surface on the colmap
void
-ColMap::put(CL_SurfaceProvider* provider, int sur_x, int sur_y,
GroundpieceData::GPType pixel)
+ColMap::put(CL_SurfaceProvider* provider, int sur_x, int sur_y,
Groundtype::GPType pixel)
{
// transparent groundpieces are only drawn on the gfx map, not on the colmap
- if (pixel == GroundpieceData::GP_TRANSPARENT)
+ if (pixel == Groundtype::GP_TRANSPARENT)
return;
if ((sur_x > width) || (sur_y > height))
@@ -338,21 +338,21 @@
{
switch(colmap[i])
{
- case GroundpieceData::GP_NOTHING:
+ case Groundtype::GP_NOTHING:
buffer[i * 4 + 0] = 0;
buffer[i * 4 + 1] = 0;
buffer[i * 4 + 2] = 0;
buffer[i * 4 + 3] = 0;
break;
- case GroundpieceData::GP_SOLID:
+ case Groundtype::GP_SOLID:
buffer[i * 4 + 0] = 255;
buffer[i * 4 + 1] = 100;
buffer[i * 4 + 2] = 100;
buffer[i * 4 + 3] = 100;
break;
- case GroundpieceData::GP_BRIDGE:
+ case Groundtype::GP_BRIDGE:
buffer[i * 4 + 0] = 255;
buffer[i * 4 + 1] = 0;
buffer[i * 4 + 2] = 0;
Index: col_map.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/col_map.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- col_map.hxx 4 Sep 2002 19:40:19 -0000 1.6
+++ col_map.hxx 16 Sep 2002 20:31:09 -0000 1.7
@@ -20,7 +20,7 @@
#ifndef HEADER_PINGUS_COL_MAP_HXX
#define HEADER_PINGUS_COL_MAP_HXX
-#include "groundpiece_data.hxx"
+#include "groundtype.hxx"
class GraphicContext;
class ResDescriptor;
@@ -76,11 +76,11 @@
int getpixel(int x, int y);
/** Return true if the given GroundType i*/
- bool blit_allowed (int x, int y, GroundpieceData::GPType);
+ bool blit_allowed (int x, int y, Groundtype::GPType);
- void put(int x, int y, GroundpieceData::GPType p =
GroundpieceData::GP_GROUND);
- void put(const CL_Surface&, int x, int y, GroundpieceData::GPType);
- void put(CL_SurfaceProvider*, int x, int y, GroundpieceData::GPType);
+ void put(int x, int y, Groundtype::GPType p = Groundtype::GP_GROUND);
+ void put(const CL_Surface&, int x, int y, Groundtype::GPType);
+ void put(CL_SurfaceProvider*, int x, int y, Groundtype::GPType);
/// void remove(int x, int y);
void remove(const CL_Surface&, int x, int y);
Index: liquid.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/liquid.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- liquid.cxx 16 Sep 2002 15:47:35 -0000 1.6
+++ liquid.cxx 16 Sep 2002 20:31:09 -0000 1.7
@@ -48,7 +48,7 @@
CL_Surface sur = PingusResource::load_surface("Liquid/water_cmap", "global");
for(int i=0; i < width; ++i)
- world->get_colmap()->put(sur, (int)pos.x + i, (int)pos.y,
GroundpieceData::GP_WATER);
+ world->get_colmap()->put(sur, (int)pos.x + i, (int)pos.y,
Groundtype::GP_WATER);
}
void
Index: pingu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- pingu.cxx 14 Sep 2002 19:06:33 -0000 1.25
+++ pingu.cxx 16 Sep 2002 20:31:09 -0000 1.26
@@ -309,7 +309,7 @@
// FIXME: Out of screen check is ugly
/** The Pingu has hit the edge of the screen, a good time to let him
die. */
- if (rel_getpixel(0, -1) == GroundpieceData::GP_OUTOFSCREEN)
+ if (rel_getpixel(0, -1) == Groundtype::GP_OUTOFSCREEN)
{
PingusSound::play_sound("sounds/die.wav");
status = PS_DEAD;
Index: pingu_action.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_action.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingu_action.cxx 4 Sep 2002 14:55:11 -0000 1.7
+++ pingu_action.cxx 16 Sep 2002 20:31:09 -0000 1.8
@@ -78,7 +78,7 @@
{
int pixel = rel_getpixel(x, y + pingu_height);
- if (pixel != GroundpieceData::GP_NOTHING && !(pixel &
GroundpieceData::GP_BRIDGE))
+ if (pixel != Groundtype::GP_NOTHING && !(pixel & Groundtype::GP_BRIDGE))
return true;
return false;
Index: pingu_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu_map.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pingu_map.cxx 14 Sep 2002 19:06:33 -0000 1.3
+++ pingu_map.cxx 16 Sep 2002 20:31:09 -0000 1.4
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <ClanLib/Display/Display/surface.h>
#include "col_map.hxx"
#include "pingu_map.hxx"
Index: plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- plf.cxx 16 Sep 2002 15:47:35 -0000 1.8
+++ plf.cxx 16 Sep 2002 20:31:09 -0000 1.9
@@ -145,7 +145,7 @@
return author;
}
-std::vector<GroundpieceData>
+std::vector<WorldObjsData::GroundpieceData>
PLF::get_groundpieces(void)
{
return groundpieces;
Index: plf.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plf.hxx 16 Sep 2002 15:47:35 -0000 1.6
+++ plf.hxx 16 Sep 2002 20:31:09 -0000 1.7
@@ -22,7 +22,7 @@
#include <map>
#include "action_data.hxx"
-#include "groundpiece_data.hxx"
+#include "worldobjsdata/groundpiece_data.hxx"
class WorldObjData;
@@ -86,7 +86,7 @@
bool playable;
std::vector<ActionData> actions;
- std::vector<GroundpieceData> groundpieces;
+ std::vector<WorldObjsData::GroundpieceData> groundpieces;
/** FIXME: PLF should probally become and interface only, it currently is a
bit overfull */
@@ -145,7 +145,7 @@
std::string get_author();
std::vector<ActionData> get_actions(void);
- std::vector<GroundpieceData> get_groundpieces(void);
+ std::vector<WorldObjsData::GroundpieceData> get_groundpieces(void);
/** Return a access to the worldobj_data, the caller must not delete
anything in this vector */
Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- smallmap.cxx 14 Sep 2002 19:06:33 -0000 1.16
+++ smallmap.cxx 16 Sep 2002 20:31:09 -0000 1.17
@@ -74,28 +74,28 @@
current_pixel = buffer[tx + (ty * colmap->get_width())];
- if (current_pixel == GroundpieceData::GP_NOTHING)
+ if (current_pixel == Groundtype::GP_NOTHING)
{
cbuffer[4 * ((y * width) + x) + 0] = 150;
cbuffer[4 * ((y * width) + x) + 1] = 0;
cbuffer[4 * ((y * width) + x) + 2] = 0;
cbuffer[4 * ((y * width) + x) + 3] = 0;
}
- else if (current_pixel == GroundpieceData::GP_BRIDGE)
+ else if (current_pixel == Groundtype::GP_BRIDGE)
{
cbuffer[4 * ((y * width) + x) + 0] = 255;
cbuffer[4 * ((y * width) + x) + 1] = 100;
cbuffer[4 * ((y * width) + x) + 2] = 255;
cbuffer[4 * ((y * width) + x) + 3] = 0;
}
- else if (current_pixel == GroundpieceData::GP_LAVA)
+ else if (current_pixel == Groundtype::GP_LAVA)
{
cbuffer[4 * ((y * width) + x) + 0] = 255;
cbuffer[4 * ((y * width) + x) + 1] = 100;
cbuffer[4 * ((y * width) + x) + 2] = 100;
cbuffer[4 * ((y * width) + x) + 3] = 255;
}
- else if (current_pixel == GroundpieceData::GP_SOLID)
+ else if (current_pixel == Groundtype::GP_SOLID)
{
cbuffer[4 * ((y * width) + x) + 0] = 255;
cbuffer[4 * ((y * width) + x) + 1] = 100;
Index: smallmap_image.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap_image.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- smallmap_image.cxx 14 Sep 2002 22:41:31 -0000 1.6
+++ smallmap_image.cxx 16 Sep 2002 20:31:09 -0000 1.7
@@ -76,28 +76,28 @@
current_pixel = buffer[tx + (ty * colmap->get_width())];
- if (current_pixel == GroundpieceData::GP_NOTHING)
+ if (current_pixel == Groundtype::GP_NOTHING)
{
cbuffer[4 * ((y * width) + x) + 0] = 150;
cbuffer[4 * ((y * width) + x) + 1] = 0;
cbuffer[4 * ((y * width) + x) + 2] = 0;
cbuffer[4 * ((y * width) + x) + 3] = 0;
}
- else if (current_pixel == GroundpieceData::GP_BRIDGE)
+ else if (current_pixel == Groundtype::GP_BRIDGE)
{
cbuffer[4 * ((y * width) + x) + 0] = 255;
cbuffer[4 * ((y * width) + x) + 1] = 100;
cbuffer[4 * ((y * width) + x) + 2] = 255;
cbuffer[4 * ((y * width) + x) + 3] = 0;
}
- else if (current_pixel == GroundpieceData::GP_LAVA)
+ else if (current_pixel == Groundtype::GP_LAVA)
{
cbuffer[4 * ((y * width) + x) + 0] = 255;
cbuffer[4 * ((y * width) + x) + 1] = 100;
cbuffer[4 * ((y * width) + x) + 2] = 100;
cbuffer[4 * ((y * width) + x) + 3] = 255;
}
- else if (current_pixel == GroundpieceData::GP_SOLID)
+ else if (current_pixel == Groundtype::GP_SOLID)
{
cbuffer[4 * ((y * width) + x) + 0] = 255;
cbuffer[4 * ((y * width) + x) + 1] = 100;
Index: spot_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- spot_map.cxx 16 Sep 2002 15:47:35 -0000 1.14
+++ spot_map.cxx 16 Sep 2002 20:31:09 -0000 1.15
@@ -31,6 +31,7 @@
#include "col_map.hxx"
#include "math.hxx"
+using namespace WorldObjsData;
using namespace std;
MapTileSurface::MapTileSurface () : empty(true)
@@ -197,7 +198,7 @@
// test cause png
if (i->surface.get_provider()->get_depth() == 8)
{
- if (i->gptype == GroundpieceData::GP_REMOVE)
+ if (i->gptype == Groundtype::GP_REMOVE)
{
Blitter::put_alpha_surface(map_canvas, i->surface.get_provider (),
(int) i->pos.x, (int) i->pos.y);
@@ -399,7 +400,7 @@
{
if (pingus_debug_flags & PINGUS_DEBUG_ACTIONS)
{
- if (!(colmap->getpixel(real_x, real_y) ==
GroundpieceData::GP_SOLID))
+ if (!(colmap->getpixel(real_x, real_y) ==
Groundtype::GP_SOLID))
{
tbuffer[i + 0] = 255;
tbuffer[i + 1] = 255;
@@ -416,7 +417,7 @@
}
else
{
- if (!(colmap->getpixel(real_x, real_y) ==
GroundpieceData::GP_SOLID))
+ if (!(colmap->getpixel(real_x, real_y) ==
Groundtype::GP_SOLID))
{
tbuffer[i + 0] = 0;
}
@@ -509,7 +510,7 @@
}
for(int i=0; i < width * height; ++i)
{
- buffer[i] = GroundpieceData::GP_NOTHING;
+ buffer[i] = Groundtype::GP_NOTHING;
}
if (verbose) std::cout << "done " << timer.stop() << std::endl;
@@ -526,7 +527,7 @@
i2 != surfaces.end();
i2++)
{
- if (i2->gptype == GroundpieceData::GP_REMOVE)
+ if (i2->gptype == Groundtype::GP_REMOVE)
colmap->remove(i2->surface.get_provider (), (int) i2->pos.x, (int)
i2->pos.y);
else
colmap->put(i2->surface, (int) i2->pos.x, (int) i2->pos.y,
i2->gptype);
Index: spot_map.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/spot_map.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spot_map.hxx 4 Sep 2002 19:40:19 -0000 1.5
+++ spot_map.hxx 16 Sep 2002 20:31:09 -0000 1.6
@@ -24,7 +24,7 @@
#include <vector>
#include "globals.hxx"
#include "pingu_map.hxx"
-#include "groundpiece_data.hxx"
+#include "worldobjsdata/groundpiece_data.hxx"
class PLF;
class ColMap;
@@ -61,7 +61,7 @@
typedef std::vector<MapTileSurface>::size_type TileIter;
- std::vector<GroundpieceData> surfaces;
+ std::vector<WorldObjsData::GroundpieceData> surfaces;
CL_Canvas* provider;
CL_Surface map_surface;
Index: worldobj_data_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobj_data_factory.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- worldobj_data_factory.cxx 16 Sep 2002 19:18:56 -0000 1.17
+++ worldobj_data_factory.cxx 16 Sep 2002 20:31:09 -0000 1.18
@@ -48,7 +48,7 @@
#include "worldobjsdata/teleporter_data.hxx"
#include "worldobjsdata/rain_generator_data.hxx"
#include "worldobjsdata/snow_generator_data.hxx"
-#include "groundpiece_data.hxx"
+#include "worldobjsdata/groundpiece_data.hxx"
using namespace WorldObjsData;
Index: xml_plf.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/xml_plf.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- xml_plf.cxx 16 Sep 2002 15:47:35 -0000 1.18
+++ xml_plf.cxx 16 Sep 2002 20:31:09 -0000 1.19
@@ -412,7 +412,7 @@
void
XMLPLF::parse_groundpiece (xmlNodePtr cur)
{
- groundpieces.push_back(GroundpieceData (doc, cur));
+ groundpieces.push_back(WorldObjsData::GroundpieceData (doc, cur));
}
void
--- psm_parser.cxx DELETED ---
--- psm_parser.hxx DELETED ---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src groundtype.cxx,NONE,1.1 groundtype.hxx,NONE,1.1 Makefile.am,1.100,1.101 col_map.cxx,1.8,1.9 col_map.hxx,1.6,1.7 liquid.cxx,1.6,1.7 pingu.cxx,1.25,1.26 pingu_action.cxx,1.7,1.8 pingu_map.cxx,1.3,1.4 plf.cxx,1.8,1.9 plf.hxx,1.6,1.7 smallmap.cxx,1.16,1.17 smallmap_image.cxx,1.6,1.7 spot_map.cxx,1.14,1.15 spot_map.hxx,1.5,1.6 worldobj_data_factory.cxx,1.17,1.18 xml_plf.cxx,1.18,1.19 psm_parser.cxx,1.5,NONE psm_parser.hxx,1.3,NONE,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx,1.15,1.16 blocker.cxx,1.9,1.10 bridger.cxx,1.15,1.16 climber.cxx,1.11,1.12 digger.cxx,1.13,1.14 faller.cxx,1.23,1.24 floater.cxx,1.15,1.16 miner.cxx,1.11,1.12 slider.cxx,1.9,1.10 walker.cxx,1.22,1.23
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src groundpiece_data.cxx,1.11,NONE groundpiece_data.hxx,1.14,NONE
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/actions basher.cxx,1.15,1.16 blocker.cxx,1.9,1.10 bridger.cxx,1.15,1.16 climber.cxx,1.11,1.12 digger.cxx,1.13,1.14 faller.cxx,1.23,1.24 floater.cxx,1.15,1.16 miner.cxx,1.11,1.12 slider.cxx,1.9,1.10 walker.cxx,1.22,1.23
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src groundpiece_data.cxx,1.11,NONE groundpiece_data.hxx,1.14,NONE
- Index(es):