? pingus/data/images/backgrounds/junglebg.pcx ? pingus/src/actions/teleported.cc ? pingus/src/actions/teleported.hh ? pingus/src/traps/Teleport.cc ? pingus/src/traps/Teleport.hh Index: pingus/data/data/global.scr =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/data/data/global.scr,v retrieving revision 1.46 diff -u -r1.46 global.scr --- global.scr 2000/01/06 22:47:39 1.46 +++ global.scr 2000/01/07 17:50:53 @@ -118,7 +118,7 @@ guillotinekill = ../images/traps/guillotinekill.pcx (type=surface, x=0, y=0, width=80, height=96, tcol=0, array=12x2); guillotineidle = ../images/traps/guillotineidle.pcx (type=surface, x=0, y=0, width=80, height=96, tcol=0, array=7x1); laser_exit = ../images/traps/laser_exit.pcx (type=surface, x=0, y=0, width=75, height=60, tcol=0, array=6x1); - teleporter = ../images/traps/teleporter.tga (type=surface, x=0, y=0, width=35, height=52, array=6x1); + teleporter = ../images/traps/teleporter.tga (type=surface, x=0, y=0, width=35, height=52, tcol = 0, array=6x1); } section Textures @@ -190,8 +190,6 @@ bpice4 = ../images/groundpieces/bpice4.pcx (type=surface, x=0, y=0, width=156, height=215, tcol=0); bpice5 = ../images/groundpieces/bpice5.pcx (type=surface, x=0, y=0, width=226, height=100, tcol=0); bpice6 = ../images/groundpieces/bpice6.pcx (type=surface, x=0, y=0, width=161, height=168, tcol=0); - bpice7 = ../images/groundpieces/bpice7.pcx (type=surface, x=0, y=0, width=200, height=141, tcol=0); - bpice8 = ../images/groundpieces/bpice8.pcx (type=surface, x=0, y=0, width=177, height=106, tcol=0); pice1 = ../images/groundpieces/gpice1.pcx (type=surface, x=0, y=0, width=190, height=109, tcol=0); pice2 = ../images/groundpieces/gpice2.pcx (type=surface, x=0, y=0, width=125, height=222, tcol=0); Index: pingus/data/images/Makefile.am =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/data/images/Makefile.am,v retrieving revision 1.38 diff -u -r1.38 Makefile.am --- Makefile.am 2000/01/05 23:19:09 1.38 +++ Makefile.am 2000/01/07 17:50:53 @@ -135,10 +135,12 @@ CURSORS = \ - cursors/cursor.pcx \ - cursors/scroll.pcx \ - cursors/cap.tga \ - cursors/capwrong.tga + Cursors/cursor.pcx \ + Cursors/scroll.pcx \ + Cursors/left_arrow.pcx \ + Cursors/right_arrow.pcx \ + Cursors/cap.tga \ + Cursors/capwrong.tga ENTRANCES = \ entrances/woodthing_mov.tga \ Index: pingus/data/images/cursors/Makefile.am =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/data/images/cursors/Makefile.am,v retrieving revision 1.1 diff -u -r1.1 Makefile.am --- Makefile.am 1999/08/02 21:16:59 1.1 +++ Makefile.am 2000/01/07 17:50:53 @@ -15,4 +15,5 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -EXTRA_DIST = cursor.pcx scroll.pcx +EXTRA_DIST = cursor.pcx scroll.pcx arrow_left.pcx \ + cap.tga arrow_right.pcx capwrong.tga Index: pingus/data/images/traps/Makefile.am =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/data/images/traps/Makefile.am,v retrieving revision 1.1 diff -u -r1.1 Makefile.am --- Makefile.am 1999/08/07 12:41:36 1.1 +++ Makefile.am 2000/01/07 17:50:54 @@ -15,4 +15,4 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -EXTRA_DIST = hammer.pcx fake_exit.pcx smasher.pcx +EXTRA_DIST = hammer.pcx fake_exit.pcx smasher.pcx teleporter.pcx Index: pingus/data/levels/level9.plf =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/data/levels/level9.plf,v retrieving revision 1.20 diff -u -r1.20 level9.plf --- level9.plf 2000/01/06 22:47:40 1.20 +++ level9.plf 2000/01/07 17:50:54 @@ -83,7 +83,14 @@ y_pos = 207; z_pos = 100; } - +trap { + name = teleport; + x_pos = 700; + y_pos = 360; + z_pos = 100; + x_target = 530; + y_target = 360; +} liquid { image = (resource)"Liquid/water2"; x_pos = 268; Index: pingus/src/CaptureRectangle.cc =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/src/CaptureRectangle.cc,v retrieving revision 1.17 diff -u -r1.17 CaptureRectangle.cc --- CaptureRectangle.cc 2000/01/06 22:41:12 1.17 +++ CaptureRectangle.cc 2000/01/07 17:50:54 @@ -35,14 +35,16 @@ CaptureRectangle::CaptureRectangle() { - good = CL_Surface::load("Cursors/capgood", PingusResource::get("global.dat")); - bad = CL_Surface::load("Cursors/capbad", PingusResource::get("global.dat")); + font = CL_Font::load("Fonts/courier_small", PingusResource::get("global.dat")); button_action = 0; arrow_left = CL_Surface::load("Cursors/arrow_left", PingusResource::get("global.dat")); arrow_right = CL_Surface::load("Cursors/arrow_right", PingusResource::get("global.dat")); + + good = CL_Surface::load("Cursors/capgood", PingusResource::get("global.dat")); + bad = CL_Surface::load("Cursors/capbad", PingusResource::get("global.dat")); } CaptureRectangle::~CaptureRectangle() Index: pingus/src/PLF.cc =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/src/PLF.cc,v retrieving revision 1.16 diff -u -r1.16 PLF.cc --- PLF.cc 2000/01/03 23:53:38 1.16 +++ PLF.cc 2000/01/07 17:50:54 @@ -193,6 +193,10 @@ case PLF::TRAP: if (valueid == "name") { trap_s.name = value; + } else if (valueid == "x_target") { + trap_s.x_target = str_to_int(value); + } else if (valueid == "y_target") { + trap_s.y_target = str_to_int(value); } else if (valueid == "x_pos") { trap_s.x_pos = str_to_int(value); } else if (valueid == "y_pos") { Index: pingus/src/Trap.hh =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/src/Trap.hh,v retrieving revision 1.12 diff -u -r1.12 Trap.hh --- Trap.hh 2000/01/03 23:43:47 1.12 +++ Trap.hh 2000/01/07 17:50:55 @@ -31,6 +31,8 @@ string name; int x_pos; int y_pos; + int x_target; + int y_target; int z_pos; // Additional data for the trap (i.e. speed, etc.). Its // interprentation is complitly done by the trap itself. @@ -39,6 +41,8 @@ void clean() { x_pos = 0; y_pos = 0; + x_target = 0; + y_target = 0; z_pos = 0; name = "Unset trap name, bug in level file"; } @@ -54,6 +58,7 @@ GameCounter counter; int x_pos; int y_pos; + static ParticleHolder* particle; public: Trap(); Index: pingus/src/actions/Makefile.am =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/src/actions/Makefile.am,v retrieving revision 1.10 diff -u -r1.10 Makefile.am --- Makefile.am 1999/12/02 17:59:23 1.10 +++ Makefile.am 2000/01/07 17:50:55 @@ -59,6 +59,7 @@ exiter.cc exiter.hh \ floater.cc floater.hh \ Jumper.cc Jumper.hh \ + teleported.cc teleported.hh \ miner.cc miner.hh \ smashed.cc smashed.hh \ LaserKill.cc LaserKill.hh \ Index: pingus/src/traps/Makefile.am =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/src/traps/Makefile.am,v retrieving revision 1.10 diff -u -r1.10 Makefile.am --- Makefile.am 1999/12/02 17:59:25 1.10 +++ Makefile.am 2000/01/07 17:50:55 @@ -26,6 +26,7 @@ FakeExit.cc FakeExit.hh \ Spike.cc Spike.hh \ Guillotine.cc Guillotine.hh \ + Teleport.cc Teleport.hh \ LaserExit.cc LaserExit.hh Index: pingus/src/traps/traps.cc =================================================================== RCS file: /home/mbn/public_cvsroot/pingus/src/traps/traps.cc,v retrieving revision 1.6 diff -u -r1.6 traps.cc --- traps.cc 1999/10/03 19:24:20 1.6 +++ traps.cc 2000/01/07 17:50:55 @@ -27,10 +27,13 @@ #include "Guillotine.hh" #include "LaserExit.hh" #include "Spike.hh" +#include "Teleport.hh" Trap* get_trap(trap_data data) { - if (data.name == "smasher") { + if (data.name == "teleport") { + return (new Teleport(data)); + } else if (data.name == "smasher") { return (new Smasher(data)); } else if (data.name == "hammer") { return (new Hammer(data));