[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.4,1.5 conveyor
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.4,1.5 conveyor_belt.cxx,1.14,1.15 groundpiece.cxx,1.1,1.2 groundpiece.hxx,1.1,1.2 ice_block.cxx,1.14,1.15 smasher.cxx,1.5,1.6 switch_door.cxx,1.16,1.17 |
Date: |
16 Sep 2002 20:31:11 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/worldobjs
In directory dark:/tmp/cvs-serv10000/worldobjs
Modified Files:
bumper.cxx conveyor_belt.cxx groundpiece.cxx groundpiece.hxx
ice_block.cxx smasher.cxx switch_door.cxx
Log Message:
- some groundpiece splitting/moving
Index: bumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/bumper.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- bumper.cxx 14 Sep 2002 19:06:34 -0000 1.4
+++ bumper.cxx 16 Sep 2002 20:31:09 -0000 1.5
@@ -74,7 +74,7 @@
std::cout << "Drawing colmap entry" << std::endl;
CL_SurfaceProvider* prov = CL_SurfaceProvider::load("Traps/bumper_cmap",
PingusResource::get("traps"));
- world->get_colmap()->put(prov, static_cast<int>(data->pos.x),
static_cast<int>(data->pos.y), GroundpieceData::GP_SOLID);
+ world->get_colmap()->put(prov, static_cast<int>(data->pos.x),
static_cast<int>(data->pos.y), Groundtype::GP_SOLID);
}
void
Index: conveyor_belt.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/conveyor_belt.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- conveyor_belt.cxx 15 Sep 2002 11:02:24 -0000 1.14
+++ conveyor_belt.cxx 16 Sep 2002 20:31:09 -0000 1.15
@@ -61,7 +61,7 @@
world->get_colmap()->put(sur,
static_cast<int>(data->pos.x) + (15 * i),
static_cast<int>(data->pos.y),
- GroundpieceData::GP_SOLID);
+ Groundtype::GP_SOLID);
}
void
Index: groundpiece.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/groundpiece.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- groundpiece.cxx 16 Sep 2002 19:18:56 -0000 1.1
+++ groundpiece.cxx 16 Sep 2002 20:31:09 -0000 1.2
@@ -25,7 +25,7 @@
namespace WorldObjs {
-Groundpiece::Groundpiece(const GroundpieceData& data_)
+Groundpiece::Groundpiece(const WorldObjsData::GroundpieceData& data_)
: data(data_),
surface (PingusResource::load_surface(data.desc))
{
@@ -38,12 +38,12 @@
{
// FIXME: overdrawing of bridges and similar things aren't handled
// FIXME: here
- if (data.gptype == GroundpieceData::GP_REMOVE)
+ if (data.gptype == Groundtype::GP_REMOVE)
get_world()->get_gfx_map()->remove(surface, int(data.pos.x),
int(data.pos.y));
else
get_world()->get_gfx_map()->put(surface, int(data.pos.x), int(data.pos.y));
- if (data.gptype == GroundpieceData::GP_REMOVE)
+ if (data.gptype == Groundtype::GP_REMOVE)
get_world()->get_colmap()->remove(surface, int(data.pos.x),
int(data.pos.y));
else
get_world()->get_colmap()->put(surface, int(data.pos.x), int(data.pos.y),
Index: groundpiece.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/groundpiece.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- groundpiece.hxx 16 Sep 2002 19:18:56 -0000 1.1
+++ groundpiece.hxx 16 Sep 2002 20:31:09 -0000 1.2
@@ -21,7 +21,7 @@
#define HEADER_GROUNDPIECE_HXX
#include "../worldobj.hxx"
-#include "../groundpiece_data.hxx"
+#include "../worldobjsdata/groundpiece_data.hxx"
namespace WorldObjs {
@@ -30,11 +30,11 @@
class Groundpiece : public WorldObj
{
private:
- GroundpieceData data;
+ WorldObjsData::GroundpieceData data;
CL_Surface surface;
public:
- Groundpiece(const GroundpieceData& data_);
+ Groundpiece(const WorldObjsData::GroundpieceData& data_);
~Groundpiece() {};
float get_z_pos () const { return 0; }
Index: ice_block.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/ice_block.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ice_block.cxx 15 Sep 2002 11:02:24 -0000 1.14
+++ ice_block.cxx 16 Sep 2002 20:31:09 -0000 1.15
@@ -53,7 +53,7 @@
world->get_colmap()->put(surf,
static_cast<int>(data->pos.x),
static_cast<int>(data->pos.y),
- GroundpieceData::GP_GROUND);
+ Groundtype::GP_GROUND);
}
void
Index: smasher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/smasher.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- smasher.cxx 16 Sep 2002 16:47:41 -0000 1.5
+++ smasher.cxx 16 Sep 2002 20:31:09 -0000 1.6
@@ -116,7 +116,7 @@
world->get_colmap()->put(PingusResource::load_surface("Traps/smasher_cmap",
"traps"),
static_cast<int>(data->pos.x),
static_cast<int>(data->pos.y),
- GroundpieceData::GP_SOLID);
+ Groundtype::GP_SOLID);
}
void
Index: switch_door.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/switch_door.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- switch_door.cxx 15 Sep 2002 11:02:24 -0000 1.16
+++ switch_door.cxx 16 Sep 2002 20:31:09 -0000 1.17
@@ -51,7 +51,7 @@
world->get_colmap()->put(door_box,
static_cast<int>(data->door_pos.x),
static_cast<int>(data->door_pos.y),
- GroundpieceData::GP_SOLID);
+ Groundtype::GP_SOLID);
for (int i=0; i < data->door_height; ++i)
world->get_colmap()->put(door_tile_cmap,
@@ -59,7 +59,7 @@
static_cast<int>(data->door_pos.y)
+ i * door_tile.get_height()
+ door_box.get_height(),
- GroundpieceData::GP_SOLID);
+ Groundtype::GP_SOLID);
}
void
@@ -109,13 +109,13 @@
world->get_colmap()->put(door_box,
static_cast<int>(data->door_pos.x),
static_cast<int>(data->door_pos.y),
- GroundpieceData::GP_NOTHING);
+ Groundtype::GP_NOTHING);
for (int i=0; i < data->door_height; ++i)
world->get_colmap()->put(door_tile_cmap,
static_cast<int>(data->door_pos.x),
static_cast<int>(data->door_pos.y) + i
* door_tile.get_height()
+
door_box.get_height(),
- GroundpieceData::GP_NOTHING);
+ Groundtype::GP_NOTHING);
}
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/worldobjs bumper.cxx,1.4,1.5 conveyor_belt.cxx,1.14,1.15 groundpiece.cxx,1.1,1.2 groundpiece.hxx,1.1,1.2 ice_block.cxx,1.14,1.15 smasher.cxx,1.5,1.6 switch_door.cxx,1.16,1.17,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_groundpiece_obj.cxx,1.12,1.13 editor_groundpiece_obj.hxx,1.9,1.10 groundpiece_window.cxx,1.8,1.9 object_manager.cxx,1.33,1.34 object_selector.cxx,1.20,1.21 object_selector.hxx,1.10,1.11
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata groundpiece_data.cxx,NONE,1.1 groundpiece_data.hxx,NONE,1.1 Makefile.am,1.9,1.10
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor_groundpiece_obj.cxx,1.12,1.13 editor_groundpiece_obj.hxx,1.9,1.10 groundpiece_window.cxx,1.8,1.9 object_manager.cxx,1.33,1.34 object_selector.cxx,1.20,1.21 object_selector.hxx,1.10,1.11
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata groundpiece_data.cxx,NONE,1.1 groundpiece_data.hxx,NONE,1.1 Makefile.am,1.9,1.10
- Index(es):