Add destructible objects

Author: marex

cfg.h

@@ -126,6 +126,7 @@
 #define MEDIKIT_RESPAWN_TIME 30000000  /* in microseconds */
 #define WEAPON_RESPAWN_TIME 30000000   /* in microseconds */
 #define AMMO_RESPAWN_TIME 25000000   /* in microseconds */
+#define PS_RESPAWN_TIME 3000000   /* in microseconds */
 
 #define TOP_PLAYERS_N 10
 

data.c

@@ -173,6 +173,7 @@ switch(c) {
 	case 'x': return T_BIOMED;
 	case 'r': return T_BLOODRAIN;
 	case 'J': return T_JETPACK;
+	case 'P': return T_PS;
 
 /* birthplace */
 	case 'B': return TYPE_BIRTHPLACE;

data.h

@@ -27,7 +27,7 @@
 #define TYPE_BIRTHPLACE 666
 
 /* object types */
-#define N_TYPES 31
+#define N_TYPES 32
 
 #define T_PLAYER	0
 #define T_BULLET	1
@@ -60,6 +60,7 @@
 #define T_BLOODRAIN	28
 #define T_JETPACK	29
 #define T_JETFIRE	30
+#define T_PS		31
 
 #define E_INCOMPATIBLE_VERSION 0
 #define E_PLAYER_REFUSED 1

data/level.dat

@@ -1,2 +1,3 @@
 level1
 level2
+level3

data/level1.dn

@@ -1,5 +1,5 @@
 klesani F 727 229
-pivrnec F 354 176
+pivrnec P 354 176
 zarivka N 902 476
 zarivka N 177 192
 zarivka N 49 192
@@ -68,7 +68,7 @@ water F 975 472
 blood r 79 192
 swing_lamp N 539 0
 swing_lamp F 478 0
-smoker F 317 428
+smoker P 317 428
 fan N 809 445
 --BIRTHPLACE-- B 880 479
 --BIRTHPLACE-- B 638 108

server.c

@@ -2077,7 +2077,7 @@ static void update_game(void)
 {
 	static char packet[64];
 	char txt[256];
-        struct object_list *p;
+        struct object_list *p, *p2;
 	struct player_list *q;
         int w,h,b,a;
 	unsigned char stop_x,stop_y;
@@ -2358,6 +2358,20 @@ br:					offset = 0;
 			if (!(p->next))break;
 			continue;
 		}
+
+		/* Anything crashing into PS makes him into bloody goo */
+		for (p2=&objects;p2->next;p2=p2->next)
+		if ((p2->next->member.type == T_PS) && (!(p2->next->member.status & S_INVISIBLE)) &&
+			((p->next->member.type == T_BULLET) || (p->next->member.type == T_SHRAPNEL) ||
+			(p->next->member.type == T_CHAIN) || (p->next->member.type == T_BFGCELL)) &&
+			collision(
+			double2int(p2->next->member.x),double2int(p2->next->member.y),p2->next->member.type,p2->next->member.status,sprites[p2->next->member.sprite].positions,
+			double2int(p->next->member.x),double2int(p->next->member.y),p->next->member.type,p->next->member.status,sprites[p->next->member.sprite].positions)) {
+			p2->next->member.status |= S_INVISIBLE;
+			create_mess(double2int(p2->next->member.x),double2int(p2->next->member.y)+PLAYER_HEIGHT-MESS_HEIGHT,double2int(p2->next->member.y));
+			add_to_timeq(p2->next->member.id,T_PS,0,p2->next->member.sprite,0,0,p2->next->member.x,p2->next->member.y,0,0,0,PS_RESPAWN_TIME);
+			sendall_update_status(&(p2->next->member),0);
+		}
 dc:
 		/* compute collision with other objects */
 		a=dynamic_collision(&(p->next->member));