[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2764 - in branches/pingus_sdl/src: worldmap worldobjs
From: |
jsalmon3 |
Subject: |
[Pingus-CVS] r2764 - in branches/pingus_sdl/src: worldmap worldobjs |
Date: |
Thu, 19 Jul 2007 18:27:39 +0200 |
Author: jsalmon3
Date: 2007-07-19 18:27:27 +0200 (Thu, 19 Jul 2007)
New Revision: 2764
Modified:
branches/pingus_sdl/src/worldmap/worldmap.cpp
branches/pingus_sdl/src/worldobjs/exit.cpp
branches/pingus_sdl/src/worldobjs/guillotine.cpp
branches/pingus_sdl/src/worldobjs/ice_block.cpp
branches/pingus_sdl/src/worldobjs/ice_block.hpp
branches/pingus_sdl/src/worldobjs/switch_door.cpp
branches/pingus_sdl/src/worldobjs/switch_door.hpp
Log:
Enabled collision masks
Modified: branches/pingus_sdl/src/worldmap/worldmap.cpp
===================================================================
--- branches/pingus_sdl/src/worldmap/worldmap.cpp 2007-07-19 06:50:40 UTC
(rev 2763)
+++ branches/pingus_sdl/src/worldmap/worldmap.cpp 2007-07-19 16:27:27 UTC
(rev 2764)
@@ -58,13 +58,6 @@
mouse_x(0),
mouse_y(0)
{
-#if 0
- CL_InputSourceProvider_File provider(".");
- CL_DomDocument doc(provider.open_source(filename), true);
- CL_DomElement root = doc.get_document_element();
-
- parse_file(XMLFileReader(root));
-#endif
parse_file(FileReader::parse(filename));
pingus = new Pingus(path_graph);
Modified: branches/pingus_sdl/src/worldobjs/exit.cpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/exit.cpp 2007-07-19 06:50:40 UTC (rev
2763)
+++ branches/pingus_sdl/src/worldobjs/exit.cpp 2007-07-19 16:27:27 UTC (rev
2764)
@@ -58,11 +58,10 @@
void
Exit::on_startup ()
{
-#if 0
- world->get_colmap()->remove(sprite.get_frame_pixeldata(0),
+ CollisionMask mask =
Resource::load_collision_mask("core/misc/smallmap_exit");
+ world->get_colmap()->remove(mask,
static_cast<int>(pos.x) - sprite.get_width()/2,
static_cast<int>(pos.y) - sprite.get_height());
-#endif
}
void
Modified: branches/pingus_sdl/src/worldobjs/guillotine.cpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/guillotine.cpp 2007-07-19 06:50:40 UTC
(rev 2763)
+++ branches/pingus_sdl/src/worldobjs/guillotine.cpp 2007-07-19 16:27:27 UTC
(rev 2764)
@@ -34,11 +34,9 @@
{
reader.read_vector("position", pos);
-#if 0
sprite_kill_right.set_play_loop(false);
sprite_kill_left.set_play_loop(false);
sprite_idle.set_play_loop(true);
-#endif
}
void
Modified: branches/pingus_sdl/src/worldobjs/ice_block.cpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/ice_block.cpp 2007-07-19 06:50:40 UTC
(rev 2763)
+++ branches/pingus_sdl/src/worldobjs/ice_block.cpp 2007-07-19 16:27:27 UTC
(rev 2764)
@@ -33,7 +33,8 @@
: thickness(1.0),
is_finished(false),
last_contact(0),
- block_sur(Resource::load_sprite ("worldobjs/iceblock"))
+ block_sur(Resource::load_sprite("worldobjs/iceblock")),
+ block_sur_cmap(Resource::load_collision_mask("worldobjs/iceblock"))
{
reader.read_vector("position", pos);
reader.read_int ("width", width);
@@ -42,9 +43,7 @@
void
IceBlock::on_startup ()
{
- CollisionMask surf =
Resource::load_collision_mask("worldobjs/iceblock_cmap");
-
- world->put(surf,
+ world->put(block_sur_cmap,
static_cast<int>(pos.x),
static_cast<int>(pos.y),
Groundtype::GP_GROUND);
@@ -88,8 +87,7 @@
is_finished = true;
thickness = 0;
- CollisionMask mask =
Resource::load_collision_mask("worldobjs/iceblock_cmap");
- world->remove(mask, static_cast<int>(pos.x), static_cast<int>(pos.y));
+ world->remove(block_sur_cmap, static_cast<int>(pos.x),
static_cast<int>(pos.y));
return;
}
}
Modified: branches/pingus_sdl/src/worldobjs/ice_block.hpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/ice_block.hpp 2007-07-19 06:50:40 UTC
(rev 2763)
+++ branches/pingus_sdl/src/worldobjs/ice_block.hpp 2007-07-19 16:27:27 UTC
(rev 2764)
@@ -41,6 +41,7 @@
bool is_finished;
int last_contact;
Sprite block_sur;
+ CollisionMask block_sur_cmap;
public:
IceBlock(const FileReader& reader);
Modified: branches/pingus_sdl/src/worldobjs/switch_door.cpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/switch_door.cpp 2007-07-19 06:50:40 UTC
(rev 2763)
+++ branches/pingus_sdl/src/worldobjs/switch_door.cpp 2007-07-19 16:27:27 UTC
(rev 2764)
@@ -29,6 +29,7 @@
SwitchDoor::SwitchDoor(const FileReader& reader)
: door_box (Resource::load_sprite("worldobjs/switchdoor_box")),
+ door_box_cmap (Resource::load_collision_mask("worldobjs/switchdoor_box")),
door_tile (Resource::load_sprite("worldobjs/switchdoor_tile")),
door_tile_cmap(Resource::load_collision_mask("worldobjs/switchdoor_tile_cmap")),
switch_sur (Resource::load_sprite("worldobjs/switchdoor_switch")),
@@ -48,8 +49,7 @@
void
SwitchDoor::on_startup ()
{
-#if 0
- world->get_colmap()->put(door_box.get_frame_pixeldata(0),
+ world->get_colmap()->put(door_box_cmap,
static_cast<int>(door_pos.x),
static_cast<int>(door_pos.y),
Groundtype::GP_SOLID);
@@ -61,7 +61,6 @@
+ i * door_tile.get_height()
+ door_box.get_height(),
Groundtype::GP_SOLID);
-#endif
}
void
@@ -105,8 +104,7 @@
// it, we remove the door from the colmap
if (current_door_height + 10 < door_height)
{
-#if 0
-
world->get_colmap()->put(door_box.get_frame_pixeldata(0),
+ world->get_colmap()->put(door_box_cmap,
static_cast<int>(door_pos.x),
static_cast<int>(door_pos.y),
Groundtype::GP_NOTHING);
@@ -116,7 +114,6 @@
static_cast<int>(door_pos.y) + i *
door_tile.get_height()
+ door_box.get_height(),
Groundtype::GP_NOTHING);
-#endif
}
}
}
Modified: branches/pingus_sdl/src/worldobjs/switch_door.hpp
===================================================================
--- branches/pingus_sdl/src/worldobjs/switch_door.hpp 2007-07-19 06:50:40 UTC
(rev 2763)
+++ branches/pingus_sdl/src/worldobjs/switch_door.hpp 2007-07-19 16:27:27 UTC
(rev 2764)
@@ -43,6 +43,7 @@
int door_height;
Sprite door_box;
+ CollisionMask door_box_cmap;
Sprite door_tile;
CollisionMask door_tile_cmap;
Sprite switch_sur;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2764 - in branches/pingus_sdl/src: worldmap worldobjs,
jsalmon3 <=