r72 - in trunk: . src src/objects

[DONOTREPLY at icculus.org]

Author: jonas
Date: 2004-10-05 08:20:13 -0400 (Tue, 05 Oct 2004)
New Revision: 72

Modified:
   trunk/TODO
   trunk/src/characters_common.cpp
   trunk/src/objectpools.cpp
   trunk/src/objects/Makefile
   trunk/src/objects_common.h
   trunk/src/weapons.h
Log:
added spikes

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2004-10-05 08:42:53 UTC (rev 71)
+++ trunk/TODO	2004-10-05 12:20:13 UTC (rev 72)
@@ -8,10 +8,15 @@
 ====
 
  o General:
-    o pointers => references where possible
-    o Describe everything using Doxygen styles, move the documentation from
+     o pointers => references where possible
+     o Describe everything using Doxygen styles, move the documentation from
       *.cpp to the headers...
 
+ o Fall/push/crash/collisions:
+     o the character should have more information what he hits
+     o movements into dense objects should involve a push()
+     o the collision detection and the move/fall code is all a big mess
+
  o Animations/Events:
      o Make all events quite short, ie. almost all events become animation
        events

Modified: trunk/src/characters_common.cpp
===================================================================
--- trunk/src/characters_common.cpp	2004-10-05 08:42:53 UTC (rev 71)
+++ trunk/src/characters_common.cpp	2004-10-05 12:20:13 UTC (rev 72)
@@ -169,7 +169,7 @@
 Uint8 Character::addHealth(Sint8 dhealth) {
     if (health==0) return 0;
     if ((health+dhealth)>=0) return setHealth(health+dhealth);
-    else return health;
+    else return setHealth(0);
 }
 
 inline Hit Character::checkHit(const SDL_Rect& dest, Object* destobj, bool tele) const {

Modified: trunk/src/objectpools.cpp
===================================================================
--- trunk/src/objectpools.cpp	2004-10-05 08:42:53 UTC (rev 71)
+++ trunk/src/objectpools.cpp	2004-10-05 12:20:13 UTC (rev 72)
@@ -5,24 +5,26 @@
 #include "objectpools.h"
 //HACK!!!!!!
 #include "monsters_common.h"
-#include "objects/baleog.h"
 #include "objects/bomb.h"
 #include "objects/door.h"
-#include "objects/eric.h"
 #include "objects/exit.h"
-#include "objects/fang.h"
 #include "objects/geyser.h"
 #include "objects/heart.h"
 #include "objects/key.h"
-#include "objects/olaf.h"
-#include "objects/scorch.h"
 #include "objects/teleport.h"
 #include "objects/trigger.h"
-#include "objects/triggered_bomb.h"
-#include "objects/plant.h"
 #include "objects/wall.h"
 #include "objects/water.h"
 #include "objects/wind.h"
+#include "objects/spike.h"
+//Characters
+#include "objects/triggered_bomb.h"
+#include "objects/plant.h"
+#include "objects/baleog.h"
+#include "objects/eric.h"
+#include "objects/olaf.h"
+#include "objects/scorch.h"
+#include "objects/fang.h"
 #include "objects/zombie.h"
 
 
@@ -39,7 +41,7 @@
     string name=obj;
     if (arg1!="0") {
         //one additional parameter
-        if (name=="Trigger" || name=="Door" || name=="Bomb" || name=="TriggeredBomb" || name=="Plant" || name=="Geyser" || name=="Wind") {
+        if (name=="Trigger" || name=="Door" || name=="Bomb" || name=="TriggeredBomb" || name=="Plant" || name=="Geyser" || name=="Wind" || name=="Spike") {
             if (arg2!="0") name=arg2;
         //two additional parameter
         } else if (name=="Teleporter") {
@@ -58,6 +60,7 @@
     else if (obj=="Geyser")  return (addObject(new Geyser(image,x,y,atoi(arg1.c_str()),name)));
     else if (obj=="Trigger") return (addObject(new Trigger(image,x,y,arg1,name,arg3)));
     else if (obj=="Door")    return (addObject(new Door(image,x,y,arg1,name)));
+    else if (obj=="Spike")   return (addObject(new Spike(image,x,y,atoi(arg1.c_str()),name)));
     //Items
     else if (obj=="Heart")   return (addObject(new Heart(image,x,y,name)));
     else if (obj=="Key")     return (addObject(new Key(image,x,y,name)));

Modified: trunk/src/objects/Makefile
===================================================================
--- trunk/src/objects/Makefile	2004-10-05 08:42:53 UTC (rev 71)
+++ trunk/src/objects/Makefile	2004-10-05 12:20:13 UTC (rev 72)
@@ -9,7 +9,7 @@
 
 OBJS  = baleog.o bomb.o door.o eric.o exit.o fang.o geyser.o heart.o\
         key.o olaf.o scorch.o teleport.o trigger.o triggered_bomb.o\
-        wall.o water.o wind.o zombie.o plant.o
+        wall.o water.o wind.o zombie.o plant.o spike.o
 PLUGS = ../objects.a
 
 

Modified: trunk/src/objects_common.h
===================================================================
--- trunk/src/objects_common.h	2004-10-05 08:42:53 UTC (rev 71)
+++ trunk/src/objects_common.h	2004-10-05 12:20:13 UTC (rev 72)
@@ -2,6 +2,7 @@
 #define _OBJECTS_COMMON_H 1
 
 //Object types
+//dense types are the same as directions (that fact is beeing used)
 #define OTYPE_DENSE_R   0x00000001
 #define OTYPE_DENSE_L   0x00000002
 #define OTYPE_DENSE_U   0x00000004

Modified: trunk/src/weapons.h
===================================================================
--- trunk/src/weapons.h	2004-10-05 08:42:53 UTC (rev 71)
+++ trunk/src/weapons.h	2004-10-05 12:20:13 UTC (rev 72)
@@ -20,7 +20,8 @@
 #define WS_FIRE          0x00000004
 #define WS_WATER         0x00000008
 #define WS_PRESSURE      0x00000010
-#define WS_HEAL          0x00000020
+#define WS_SPIKE         0x00000020
+#define WS_HEAL          0x00000040
 
 #define TSTRIKE          600