ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/attack.C
(Generate patch)

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.9 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.61 by root, Tue May 1 05:48:20 2007 UTC

1
2/* 1/*
3 * static char *rcsid_attack_c = 2 * CrossFire, A Multiplayer game
4 * "$Id: attack.C,v 1.9 2006/09/10 15:59:57 root Exp $"; 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
5 */ 23 */
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen
12
13 This program is free software; you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by
15 the Free Software Foundation; either version 2 of the License, or
16 (at your option) any later version.
17
18 This program is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details.
22
23 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26
27 The authors can be reached via e-mail to crossfire-devel@real-time.com
28*/
29#include <assert.h> 24#include <assert.h>
30#include <global.h> 25#include <global.h>
31#include <living.h> 26#include <living.h>
32#include <material.h> 27#include <material.h>
33#include <skills.h> 28#include <skills.h>
34
35#ifndef __CEXTRACT__
36# include <sproto.h>
37#endif
38
39#include <sounds.h> 29#include <sounds.h>
30#include <sproto.h>
40 31
41typedef struct att_msg_str 32typedef struct att_msg_str
42{ 33{
43 char *msg1; 34 char *msg1;
44 char *msg2; 35 char *msg2;
… …
50 * its magical benefits. 41 * its magical benefits.
51 */ 42 */
52void 43void
53cancellation (object *op) 44cancellation (object *op)
54{ 45{
55 object *tmp;
56
57 if (op->invisible) 46 if (op->invisible)
58 return; 47 return;
59 48
60 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ) 49 if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
61 { 50 {
62 /* Recur through the inventory */ 51 /* Recurse through the inventory */
63 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 52 for (object *tmp = op->inv; tmp; tmp = tmp->below)
64 if (!did_make_save_item (tmp, AT_CANCELLATION, op)) 53 if (!did_make_save_item (tmp, AT_CANCELLATION, op))
65 cancellation (tmp); 54 cancellation (tmp);
66 } 55 }
67 else if (FABS (op->magic) <= (rndm (0, 5))) 56 else if (FABS (op->magic) <= rndm (0, 5))
68 { 57 {
69 /* Nullify this object. This code could probably be more complete */ 58 /* Nullify this object. This code could probably be more complete */
70 /* in what abilities it should cancel */ 59 /* in what abilities it should cancel */
71 op->magic = 0; 60 op->magic = 0;
61
72 CLEAR_FLAG (op, FLAG_DAMNED); 62 CLEAR_FLAG (op, FLAG_DAMNED);
73 CLEAR_FLAG (op, FLAG_CURSED); 63 CLEAR_FLAG (op, FLAG_CURSED);
74 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 64 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
75 CLEAR_FLAG (op, FLAG_KNOWN_CURSED); 65 CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
66
76 if (op->env && op->env->type == PLAYER) 67 if (op->env && op->env->type == PLAYER)
77 {
78 esrv_send_item (op->env, op); 68 esrv_send_item (op->env, op);
79 }
80 } 69 }
81} 70}
82
83
84 71
85/* did_make_save_item just checks to make sure the item actually 72/* did_make_save_item just checks to make sure the item actually
86 * made its saving throw based on the tables. It does not take 73 * made its saving throw based on the tables. It does not take
87 * any further action (like destroying the item). 74 * any further action (like destroying the item).
88 */ 75 */
89
90int 76int
91did_make_save_item (object *op, int type, object *originator) 77did_make_save_item (object *op, int type, object *originator)
92{ 78{
93 int i, roll, saves = 0, attacks = 0, number; 79 int i, roll, saves = 0, attacks = 0, number;
94 materialtype_t *mt; 80 materialtype_t *mt;
95 81
96 if (op->materialname == NULL) 82 if (op->materialname == NULL)
97 { 83 {
98 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 84 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)
99 {
100 if (op->material & mt->material) 85 if (op->materials & mt->material)
101 break; 86 break;
102 }
103 } 87 }
104 else 88 else
105 mt = name_to_material (op->materialname); 89 mt = name_to_material (op->materialname);
90
106 if (mt == NULL) 91 if (mt == NULL)
107 return TRUE; 92 return TRUE;
93
108 roll = rndm (1, 20); 94 roll = rndm (1, 20);
109 95
110 /* the attacktypes have no meaning for object saves 96 /* the attacktypes have no meaning for object saves
111 * If the type is only magic, don't adjust type - basically, if 97 * If the type is only magic, don't adjust type - basically, if
112 * pure magic is hitting an object, it should save. However, if it 98 * pure magic is hitting an object, it should save. However, if it
… …
141 saves++; 127 saves++;
142 } 128 }
143 129
144 if (saves == attacks || attacks == 0) 130 if (saves == attacks || attacks == 0)
145 return TRUE; 131 return TRUE;
132
146 if ((saves == 0) || (rndm (1, attacks) > saves)) 133 if (saves == 0 || (rndm (1, attacks) > saves))
147 return FALSE; 134 return FALSE;
135
148 return TRUE; 136 return TRUE;
149} 137}
150 138
151/* This function calls did_make_save_item. It then performs the 139/* This function calls did_make_save_item. It then performs the
152 * appropriate actions to the item (such as burning the item up, 140 * appropriate actions to the item (such as burning the item up,
153 * calling cancellation, etc.) 141 * calling cancellation, etc.)
154 */ 142 */
155
156void 143void
157save_throw_object (object *op, int type, object *originator) 144save_throw_object (object *op, int type, object *originator)
158{ 145{
159 if (!did_make_save_item (op, type, originator)) 146 if (!did_make_save_item (op, type, originator))
160 { 147 {
161 object *env = op->env; 148 object *env = op->env;
162 int x = op->x, y = op->y; 149 int x = op->x, y = op->y;
163 mapstruct *m = op->map; 150 maptile *m = op->map;
164 151
165 op = stop_item (op); 152 op = stop_item (op);
166 if (op == NULL) 153 if (op == NULL)
167 return; 154 return;
168 155
… …
177 if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE)) 164 if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE))
178 { 165 {
179 const char *arch = op->other_arch->name; 166 const char *arch = op->other_arch->name;
180 167
181 op = decrease_ob_nr (op, 1); 168 op = decrease_ob_nr (op, 1);
169
182 if (op) 170 if (op)
183 fix_stopped_item (op, m, originator); 171 fix_stopped_item (op, m, originator);
172
184 if ((op = get_archetype (arch)) != NULL) 173 if ((op = get_archetype (arch)) != NULL)
185 { 174 {
186 if (env) 175 if (env)
187 { 176 {
188 op->x = env->x, op->y = env->y; 177 op->x = env->x, op->y = env->y;
… …
194 { 183 {
195 op->x = x, op->y = y; 184 op->x = x, op->y = y;
196 insert_ob_in_map (op, m, originator, 0); 185 insert_ob_in_map (op, m, originator, 0);
197 } 186 }
198 } 187 }
188
199 return; 189 return;
200 } 190 }
191
201 if (type & AT_CANCELLATION) 192 if (type & AT_CANCELLATION)
202 { /* Cancellation. */ 193 { /* Cancellation. */
203 cancellation (op); 194 cancellation (op);
204 fix_stopped_item (op, m, originator); 195 fix_stopped_item (op, m, originator);
205 return; 196 return;
206 } 197 }
198
207 if (op->nrof > 1) 199 if (op->nrof > 1)
208 { 200 {
209 op = decrease_ob_nr (op, rndm (0, op->nrof - 1)); 201 op = decrease_ob_nr (op, rndm (0, op->nrof - 1));
202
210 if (op) 203 if (op)
211 fix_stopped_item (op, m, originator); 204 fix_stopped_item (op, m, originator);
212 } 205 }
213 else 206 else
214 { 207 {
215 if (op->env) 208 if (op->env)
216 { 209 {
217 object *tmp = is_player_inv (op->env); 210 object *tmp = op->in_player ();
218 211
219 if (tmp) 212 if (tmp)
220 {
221 esrv_del_item (tmp->contr, op->count); 213 esrv_del_item (tmp->contr, op->count);
222 }
223 } 214 }
224 if (!QUERY_FLAG (op, FLAG_REMOVED)) 215
225 remove_ob (op); 216 op->destroy ();
226 free_object (op);
227 } 217 }
218
228 if (type & (AT_FIRE | AT_ELECTRICITY)) 219 if (type & (AT_FIRE | AT_ELECTRICITY))
229 {
230 if (env) 220 if (env)
231 { 221 {
232 op = get_archetype ("burnout"); 222 op = get_archetype ("burnout");
233 op->x = env->x, op->y = env->y; 223 op->x = env->x, op->y = env->y;
234 insert_ob_in_ob (op, env); 224 insert_ob_in_ob (op, env);
235 } 225 }
236 else 226 else
237 {
238 replace_insert_ob_in_map ("burnout", originator); 227 replace_insert_ob_in_map ("burnout", originator);
239 } 228
240 }
241 return; 229 return;
242 } 230 }
231
243 /* The value of 50 is arbitrary. */ 232 /* The value of 50 is arbitrary. */
244 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 233 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
245 { 234 {
246 object *tmp; 235 object *tmp;
247 archetype *at = find_archetype ("icecube"); 236 archetype *at = archetype::find ("icecube");
248 237
249 if (at == NULL) 238 if (at == NULL)
250 return; 239 return;
240
251 op = stop_item (op); 241 op = stop_item (op);
252 if (op == NULL) 242 if (op == NULL)
253 return; 243 return;
244
254 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL) 245 if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL)
255 { 246 {
256 tmp = arch_to_object (at); 247 tmp = arch_to_object (at);
257 tmp->x = op->x, tmp->y = op->y; 248 tmp->x = op->x, tmp->y = op->y;
258 /* This was in the old (pre new movement code) - 249 /* This was in the old (pre new movement code) -
… …
261 */ 252 */
262 tmp->move_slow_penalty = 0; 253 tmp->move_slow_penalty = 0;
263 tmp->move_slow = 0; 254 tmp->move_slow = 0;
264 insert_ob_in_map (tmp, op->map, originator, 0); 255 insert_ob_in_map (tmp, op->map, originator, 0);
265 } 256 }
257
266 if (!QUERY_FLAG (op, FLAG_REMOVED)) 258 if (!QUERY_FLAG (op, FLAG_REMOVED))
267 remove_ob (op); 259 op->remove ();
260
268 (void) insert_ob_in_ob (op, tmp); 261 insert_ob_in_ob (op, tmp);
269 return; 262 return;
270 } 263 }
271} 264}
272 265
273/* Object op is hitting the map. 266/* Object op is hitting the map.
274 * op is going in direction 'dir' 267 * op is going in direction 'dir'
275 * type is the attacktype of the object. 268 * type is the attacktype of the object.
276 * full_hit is set if monster area does not matter. 269 * full_hit is set if monster area does not matter.
277 * returns 1 if it hits something, 0 otherwise. 270 * returns 1 if it hits something, 0 otherwise.
278 */ 271 */
279
280int 272int
281hit_map (object *op, int dir, int type, int full_hit) 273hit_map (object *op, int dir, int type, int full_hit)
282{ 274{
283 object *tmp, *next;
284 mapstruct *map; 275 maptile *map;
285 sint16 x, y; 276 sint16 x, y;
286 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */ 277 int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
287 278
288 tag_t op_tag, next_tag = 0;
289
290 if (QUERY_FLAG (op, FLAG_FREED)) 279 if (QUERY_FLAG (op, FLAG_FREED))
291 { 280 {
292 LOG (llevError, "BUG: hit_map(): free object\n"); 281 LOG (llevError, "BUG: hit_map(): free object\n");
293 return 0; 282 return 0;
294 } 283 }
… …
305 return 0; 294 return 0;
306 } 295 }
307 296
308 if (op->head) 297 if (op->head)
309 op = op->head; 298 op = op->head;
310
311 op_tag = op->count;
312 299
313 map = op->map; 300 map = op->map;
314 x = op->x + freearr_x[dir]; 301 x = op->x + freearr_x[dir];
315 y = op->y + freearr_y[dir]; 302 y = op->y + freearr_y[dir];
316 303
317 int mflags = get_map_flags (map, &map, x, y, &x, &y); 304 if (!xy_normalise (map, x, y))
305 return 0;
318 306
319 // elmex: a safe map tile can't be hit! 307 // elmex: a safe map tile can't be hit!
320 // this should prevent most harmful effects on items and players there. 308 // this should prevent most harmful effects on items and players there.
321 if ((mflags & P_OUT_OF_MAP) || (mflags & P_SAFE)) 309 mapspace &ms = map->at (x, y);
310
311 if (ms.flags () & P_SAFE)
322 return 0; 312 return 0;
323 313
324 /* peterm: a few special cases for special attacktypes --counterspell 314 /* peterm: a few special cases for special attacktypes --counterspell
325 * must be out here because it strikes things which are not alive 315 * must be out here because it strikes things which are not alive
326 */ 316 */
327 317 if (type & (AT_COUNTERSPELL | AT_CHAOS))
318 {
328 if (type & AT_COUNTERSPELL) 319 if (type & AT_COUNTERSPELL)
329 { 320 {
330 counterspell (op, dir); /* see spell_effect.c */ 321 counterspell (op, dir); /* see spell_effect.c */
331 322
332 /* If the only attacktype is counterspell or magic, don't need 323 /* If the only attacktype is counterspell or magic, don't need
333 * to do any further processing. 324 * to do any further processing.
334 */
335 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
336 {
337 return 0;
338 }
339 type &= ~AT_COUNTERSPELL;
340 }
341
342 if (type & AT_CHAOS)
343 {
344 shuffle_attack (op, 1); /*1 flag tells it to change the face */
345 update_object (op, UP_OBJ_FACE);
346 type &= ~AT_CHAOS;
347 }
348
349 next = get_map_ob (map, x, y);
350 if (next)
351 next_tag = next->count;
352
353 while (next)
354 {
355 if (was_destroyed (next, next_tag))
356 {
357 /* There may still be objects that were above 'next', but there is no
358 * simple way to find out short of copying all object references and
359 * tags into a temporary array before we start processing the first
360 * object. That's why we just abort.
361 *
362 * This happens whenever attack spells (like fire) hit a pile
363 * of objects. This is not a bug - nor an error. The errormessage
364 * below was spamming the logs for absolutely no reason.
365 */ 325 */
366 /* LOG (llevDebug, "hit_map(): next object destroyed\n"); */ 326 if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
367 break; 327 return 0;
328
329 type &= ~AT_COUNTERSPELL;
330 }
331
332 if (type & AT_CHAOS)
368 } 333 {
334 shuffle_attack (op, 1); /* flag tells it to change the face */
335 update_object (op, UP_OBJ_FACE);
336 type &= ~AT_CHAOS;
337 }
338 }
339
340 /* There may still be objects that were above 'next', but there is no
341 * simple way to find out short of copying all object references and
342 * tags into a temporary array before we start processing the first
343 * object. That's why we just abort on destroy.
344 *
345 * This happens whenever attack spells (like fire) hit a pile
346 * of objects. This is not a bug - nor an error.
347 */
348 for (object *next = ms.bot; next && !next->destroyed (); )
349 {
369 tmp = next; 350 object *tmp = next;
370 next = tmp->above; 351 next = tmp->above;
371 if (next)
372 next_tag = next->count;
373
374 if (QUERY_FLAG (tmp, FLAG_FREED))
375 {
376 LOG (llevError, "BUG: hit_map(): found freed object\n");
377 break;
378 }
379 352
380 /* Something could have happened to 'tmp' while 'tmp->below' was processed. 353 /* Something could have happened to 'tmp' while 'tmp->below' was processed.
381 * For example, 'tmp' was put in an icecube. 354 * For example, 'tmp' was put in an icecube.
382 * This is one of the few cases where on_same_map should not be used. 355 * This is one of the few cases where on_same_map should not be used.
383 */ 356 */
… …
386 359
387 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 360 if (QUERY_FLAG (tmp, FLAG_ALIVE))
388 { 361 {
389 hit_player (tmp, op->stats.dam, op, type, full_hit); 362 hit_player (tmp, op->stats.dam, op, type, full_hit);
390 retflag |= 1; 363 retflag |= 1;
364
391 if (was_destroyed (op, op_tag)) 365 if (op->destroyed ())
392 break; 366 break;
393 } 367 }
394 /* Here we are potentially destroying an object. If the object has 368 /* Here we are potentially destroying an object. If the object has
395 * NO_PASS set, it is also immune - you can't destroy walls. Note 369 * NO_PASS set, it is also immune - you can't destroy walls. Note
396 * that weak walls have is_alive set, which prevent objects from 370 * that weak walls have is_alive set, which prevent objects from
397 * passing over/through them. We don't care what type of movement 371 * passing over/through them. We don't care what type of movement
398 * the wall blocks - if it blocks any type of movement, can't be 372 * the wall blocks - if it blocks any type of movement, can't be
399 * destroyed right now. 373 * destroyed right now.
400 */ 374 */
401 else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block) 375 else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
402 { 376 {
403 save_throw_object (tmp, type, op); 377 save_throw_object (tmp, type, op);
378
404 if (was_destroyed (op, op_tag)) 379 if (op->destroyed ())
405 break; 380 break;
406 } 381 }
407 } 382 }
383
408 return 0; 384 return 0;
409} 385}
410 386
411void 387void
412attack_message (int dam, int type, object *op, object *hitter) 388attack_message (int dam, int type, object *op, object *hitter)
413{ 389{
414 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF]; 390 char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];
415 int i, found = 0; 391 int i, found = 0;
416 mapstruct *map; 392 maptile *map;
417 object *next, *tmp; 393 object *next, *tmp;
418 394
419 /* put in a few special messages for some of the common attacktypes 395 /* put in a few special messages for some of the common attacktypes
420 * a player might have. For example, fire, electric, cold, etc 396 * a player might have. For example, fire, electric, cold, etc
421 * [garbled 20010919] 397 * [garbled 20010919]
… …
438 sprintf (buf1, "missed %s", &op->name); 414 sprintf (buf1, "missed %s", &op->name);
439 sprintf (buf2, " misses"); 415 sprintf (buf2, " misses");
440 found++; 416 found++;
441 } 417 }
442 else if ((hitter->type == DISEASE || hitter->type == SYMPTOM || 418 else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||
443 hitter->type == POISONING || (type & AT_POISON && IS_LIVE (op))) && !found) 419 hitter->type == POISONING || (type & AT_POISON && op->is_alive ())) && !found)
444 { 420 {
445 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++) 421 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)
446 if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1) 422 if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)
447 { 423 {
448 sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2); 424 sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);
… …
460 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3); 436 strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);
461 found++; 437 found++;
462 break; 438 break;
463 } 439 }
464 } 440 }
465 else if (hitter->type == PLAYER && IS_LIVE (op)) 441 else if (hitter->type == PLAYER && op->is_alive ())
466 { 442 {
467 if (USING_SKILL (hitter, SK_KARATE)) 443 if (USING_SKILL (hitter, SK_KARATE))
468 { 444 {
469 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++) 445 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)
470 if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1) 446 if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)
… …
496 found++; 472 found++;
497 break; 473 break;
498 } 474 }
499 } 475 }
500 } 476 }
477
501 if (found) 478 if (found)
502 { 479 {
503 /* done */ 480 /* done */
504 } 481 }
505 else if (IS_ARROW (hitter) && (type == AT_PHYSICAL || type == AT_MAGIC)) 482 else if (hitter->is_arrow () && (type == AT_PHYSICAL || type == AT_MAGIC))
506 { 483 {
507 sprintf (buf1, "hit"); /* just in case */ 484 sprintf (buf1, "hit"); /* just in case */
508 for (i = 0; i < MAXATTACKMESS; i++) 485 for (i = 0; i < MAXATTACKMESS; i++)
509 if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1) 486 if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)
510 { 487 {
511 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3); 488 strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);
512 found++; 489 found++;
513 break; 490 break;
514 } 491 }
515 } 492 }
516 else if (type & AT_DRAIN && IS_LIVE (op)) 493 else if (type & AT_DRAIN && op->is_alive ())
517 { 494 {
518 /* drain is first, because some items have multiple attypes */ 495 /* drain is first, because some items have multiple attypes */
519 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++) 496 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)
520 if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1) 497 if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)
521 { 498 {
… …
523 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3); 500 strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);
524 found++; 501 found++;
525 break; 502 break;
526 } 503 }
527 } 504 }
528 else if (type & AT_ELECTRICITY && IS_LIVE (op)) 505 else if (type & AT_ELECTRICITY && op->is_alive ())
529 { 506 {
530 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++) 507 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)
531 if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1) 508 if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)
532 { 509 {
533 sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2); 510 sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);
534 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3); 511 strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);
535 found++; 512 found++;
536 break; 513 break;
537 } 514 }
538 } 515 }
539 else if (type & AT_COLD && IS_LIVE (op)) 516 else if (type & AT_COLD && op->is_alive ())
540 { 517 {
541 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++) 518 for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)
542 if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1) 519 if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)
543 { 520 {
544 sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2); 521 sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);
… …
621 strcpy (buf1, "hit"); 598 strcpy (buf1, "hit");
622 strcpy (buf2, " hits"); 599 strcpy (buf2, " hits");
623 } 600 }
624 601
625 /* bail out if a monster is casting spells */ 602 /* bail out if a monster is casting spells */
626 if (!(hitter->type == PLAYER || (get_owner (hitter) != NULL && hitter->owner->type == PLAYER))) 603 if (!(hitter->type == PLAYER || (hitter->owner != NULL && hitter->owner->type == PLAYER)))
627 return; 604 return;
628 605
629 /* scale down magic considerably. */ 606 /* scale down magic considerably. */
630 if (type & AT_MAGIC && rndm (0, 5)) 607 if (type & AT_MAGIC && rndm (0, 5))
631 return; 608 return;
632 609
633 /* Did a player hurt another player? Inform both! */ 610 /* Did a player hurt another player? Inform both! */
634 if (op->type == PLAYER && (get_owner (hitter) == NULL ? hitter->type : hitter->owner->type) == PLAYER) 611 if (op->type == PLAYER && (hitter->owner == NULL ? hitter->type : hitter->owner->type) == PLAYER)
635 { 612 {
636 if (get_owner (hitter) != NULL) 613 if (hitter->owner != NULL)
637 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2); 614 sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
638 else 615 else
639 { 616 {
640 sprintf (buf, "%s%s you.", &hitter->name, buf2); 617 sprintf (buf, "%s%s you.", &hitter->name, buf2);
641 if (dam != 0) 618 if (dam != 0)
… …
663 else 640 else
664 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 641 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0);
665 } 642 }
666 new_draw_info (NDI_BLACK, 0, hitter, buf); 643 new_draw_info (NDI_BLACK, 0, hitter, buf);
667 } 644 }
668 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 645 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
669 { 646 {
670 /* look for stacked spells and start reducing the message chances */ 647 /* look for stacked spells and start reducing the message chances */
671 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE)) 648 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))
672 { 649 {
673 i = 4; 650 i = 4;
674 map = hitter->map; 651 map = hitter->map;
675 if (out_of_map (map, hitter->x, hitter->y)) 652 if (out_of_map (map, hitter->x, hitter->y))
676 return; 653 return;
654
677 next = get_map_ob (map, hitter->x, hitter->y); 655 next = GET_MAP_OB (map, hitter->x, hitter->y);
678 if (next) 656 if (next)
679 while (next) 657 while (next)
680 { 658 {
681 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 659 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
682 i *= 3; 660 i *= 3;
683 tmp = next; 661 tmp = next;
684 next = tmp->above; 662 next = tmp->above;
685 } 663 }
664
686 if (i < 0) 665 if (i < 0)
687 return; 666 return;
667
688 if (rndm (0, i) != 0) 668 if (rndm (0, i) != 0)
689 return; 669 return;
690 } 670 }
691 else if (rndm (0, 5) != 0) 671 else if (rndm (0, 5) != 0)
692 return; 672 return;
673
693 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 674 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
694 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 675 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);
695 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 676 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
696 } 677 }
697} 678}
… …
748attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc) 729attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
749{ 730{
750 int simple_attack, roll, dam = 0; 731 int simple_attack, roll, dam = 0;
751 uint32 type; 732 uint32 type;
752 shstr op_name; 733 shstr op_name;
753 tag_t op_tag, hitter_tag;
754 734
755 if (get_attack_mode (&op, &hitter, &simple_attack)) 735 if (get_attack_mode (&op, &hitter, &simple_attack))
756 goto error; 736 goto error;
757 737
758 if (hitter->current_weapon) 738 if (hitter->current_weapon)
759 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op))) 739 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
760 return RESULT_INT (0); 740 return RESULT_INT (0);
761 741
762 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter))) 742 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
763 return RESULT_INT (0); 743 return RESULT_INT (0);
764
765 op_tag = op->count;
766 hitter_tag = hitter->count;
767 744
768 /* 745 /*
769 * A little check to make it more difficult to dance forward and back 746 * A little check to make it more difficult to dance forward and back
770 * to avoid ever being hit by monsters. 747 * to avoid ever being hit by monsters.
771 */ 748 */
… …
776 * which then gets here again. By decreasing the speed before 753 * which then gets here again. By decreasing the speed before
777 * we call process_object, the 'if' statement above will fail. 754 * we call process_object, the 'if' statement above will fail.
778 */ 755 */
779 op->speed_left--; 756 op->speed_left--;
780 process_object (op); 757 process_object (op);
758
781 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 759 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
782 goto error; 760 goto error;
783 } 761 }
784 762
785 op_name = op->name; 763 op_name = op->name;
786 764
… …
795 { 773 {
796 int hitdam = base_dam; 774 int hitdam = base_dam;
797 775
798 if (settings.casting_time == TRUE) 776 if (settings.casting_time == TRUE)
799 { 777 {
800 if ((hitter->type == PLAYER) && (hitter->casting_time > -1)) 778 if (hitter->type == PLAYER && hitter->casting_time > -1)
801 { 779 {
802 hitter->casting_time = -1; 780 hitter->casting_time = -1;
803 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!"); 781 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost your spell!");
804 } 782 }
783
805 if ((op->casting_time > -1) && (hitdam > 0)) 784 if (op->casting_time > -1 && hitdam > 0)
806 { 785 {
807 op->casting_time = -1; 786 op->casting_time = -1;
808 if (op->type == PLAYER) 787 if (op->type == PLAYER)
809 { 788 {
810 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!"); 789 new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost your spell!");
811 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name); 790 new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
812 } 791 }
813 } 792 }
814 } 793 }
794
815 if (!simple_attack) 795 if (!simple_attack)
816 { 796 {
817 /* If you hit something, the victim should *always* wake up. 797 /* If you hit something, the victim should *always* wake up.
818 * Before, invisible hitters could avoid doing this. 798 * Before, invisible hitters could avoid doing this.
819 * -b.t. */ 799 * -b.t. */
820 if (QUERY_FLAG (op, FLAG_SLEEP)) 800 if (QUERY_FLAG (op, FLAG_SLEEP))
821 CLEAR_FLAG (op, FLAG_SLEEP); 801 CLEAR_FLAG (op, FLAG_SLEEP);
822 802
823 /* If the victim can't see the attacker, it may alert others 803 /* If the victim can't see the attacker, it may alert others
824 * for help. */ 804 * for help. */
825 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !get_owner (op) && rndm (0, op->stats.Int)) 805 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
826 npc_call_help (op); 806 npc_call_help (op);
827 807
828 /* if you were hidden and hit by a creature, you are discovered */ 808 /* if you were hidden and hit by a creature, you are discovered */
829 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 809 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
830 { 810 {
831 make_visible (op); 811 make_visible (op);
812
832 if (op->type == PLAYER) 813 if (op->type == PLAYER)
833 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 814 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
834 } 815 }
835 816
836 /* thrown items (hitter) will have various effects 817 /* thrown items (hitter) will have various effects
837 * when they hit the victim. For things like thrown daggers, 818 * when they hit the victim. For things like thrown daggers,
838 * this sets 'hitter' to the actual dagger, and not the 819 * this sets 'hitter' to the actual dagger, and not the
839 * wrapper object. 820 * wrapper object.
840 */ 821 */
841 thrown_item_effect (hitter, op); 822 thrown_item_effect (hitter, op);
823
842 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack)) 824 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
843 goto leave; 825 goto leave;
844 } 826 }
845 827
846 /* Need to do at least 1 damage, otherwise there is no point 828 /* Need to do at least 1 damage, otherwise there is no point
847 * to go further and it will cause FPE's below. 829 * to go further and it will cause FPE's below.
848 */ 830 */
849 if (hitdam <= 0) 831 if (hitdam <= 0)
850 hitdam = 1; 832 hitdam = 1;
851 833
852 type = hitter->attacktype; 834 type = hitter->attacktype;
835
853 if (!type) 836 if (!type)
854 type = AT_PHYSICAL; 837 type = AT_PHYSICAL;
838
855 /* Handle monsters that hit back */ 839 /* Handle monsters that hit back */
856 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE)) 840 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
857 { 841 {
858 if (op->attacktype & AT_ACID && hitter->type == PLAYER) 842 if (op->attacktype & AT_ACID && hitter->type == PLAYER)
859 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n"); 843 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
844
860 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1); 845 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
846
861 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 847 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
862 goto leave; 848 goto leave;
863 } 849 }
864 850
865 /* In the new attack code, it should handle multiple attack 851 /* In the new attack code, it should handle multiple attack
866 * types in its area, so remove it from here. 852 * types in its area, so remove it from here.
867 */ 853 */
868 dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1); 854 dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);
855
869 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 856 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
870 goto leave; 857 goto leave;
871 } /* end of if hitter hit op */ 858 } /* end of if hitter hit op */
872 /* if we missed, dam=0 */ 859 /* if we missed, dam=0 */
873 860
874 /*attack_message(dam, type, op, hitter); */ 861 /*attack_message(dam, type, op, hitter); */
… …
884} 871}
885 872
886int 873int
887attack_ob (object *op, object *hitter) 874attack_ob (object *op, object *hitter)
888{ 875{
889
890 if (hitter->head)
891 hitter = hitter->head; 876 hitter = hitter->head_ ();
877
892 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 878 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
893} 879}
894 880
895/* op is the arrow, tmp is what is stopping the arrow. 881/* op is the arrow, tmp is what is stopping the arrow.
896 * 882 *
… …
905 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 891 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
906 * stick around. 892 * stick around.
907 */ 893 */
908 if (op->weight <= 5000 && tmp->stats.hp >= 0) 894 if (op->weight <= 5000 && tmp->stats.hp >= 0)
909 { 895 {
910 if (tmp->head != NULL)
911 tmp = tmp->head; 896 tmp = tmp->head_ ();
897
912 remove_ob (op); 898 op->remove ();
913 op = insert_ob_in_ob (op, tmp); 899 op = insert_ob_in_ob (op, tmp);
900
914 if (tmp->type == PLAYER) 901 if (tmp->type == PLAYER)
915 esrv_send_item (tmp, op); 902 esrv_send_item (tmp, op);
903
916 return 1; 904 return 1;
917 } 905 }
918 else 906 else
919 return 0; 907 return 0;
920} 908}
… …
928object * 916object *
929hit_with_arrow (object *op, object *victim) 917hit_with_arrow (object *op, object *victim)
930{ 918{
931 object *container, *hitter; 919 object *container, *hitter;
932 int hit_something = 0; 920 int hit_something = 0;
933 tag_t victim_tag, hitter_tag;
934 sint16 victim_x, victim_y;
935 921
936 /* Disassemble missile */ 922 /* Disassemble missile */
937 if (op->inv) 923 if (op->inv)
938 { 924 {
939 container = op; 925 container = op;
940 hitter = op->inv; 926 hitter = op->inv;
941 remove_ob (hitter); 927 hitter->remove ();
942 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON); 928 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
943 /* Note that we now have an empty THROWN_OBJ on the map. Code that 929 /* Note that we now have an empty THROWN_OBJ on the map. Code that
944 * might be called until this THROWN_OBJ is either reassembled or 930 * might be called until this THROWN_OBJ is either reassembled or
945 * removed at the end of this function must be able to deal with empty 931 * removed at the end of this function must be able to deal with empty
946 * THROWN_OBJs. */ 932 * THROWN_OBJs. */
947 } 933 }
948 else 934 else
949 { 935 {
950 container = NULL; 936 container = 0;
951 hitter = op; 937 hitter = op;
952 } 938 }
953 939
954 /* Try to hit victim */ 940 /* Try to hit victim */
955 victim_x = victim->x;
956 victim_y = victim->y;
957 victim_tag = victim->count;
958 hitter_tag = hitter->count;
959
960 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc); 941 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);
961 942
962 /* Arrow attacks door, rune of summoning is triggered, demon is put on 943 /* Arrow attacks door, rune of summoning is triggered, demon is put on
963 * arrow, move_apply() calls this function, arrow sticks in demon, 944 * arrow, move_apply() calls this function, arrow sticks in demon,
964 * attack_ob_simple() returns, and we've got an arrow that still exists 945 * attack_ob_simple() returns, and we've got an arrow that still exists
965 * but is no longer on the map. Ugh. (Beware: Such things can happen at 946 * but is no longer on the map. Ugh. (Beware: Such things can happen at
966 * other places as well!) 947 * other places as well!)
967 */ 948 */
968 if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL) 949 if (hitter->destroyed () || hitter->env != NULL)
969 { 950 {
970 if (container) 951 if (container)
971 { 952 {
972 remove_ob (container); 953 container->remove ();
973 free_object (container); 954 container->destroy ();
974 } 955 }
956
975 return NULL; 957 return 0;
976 } 958 }
977 959
978 /* Missile hit victim */ 960 /* Missile hit victim */
979 /* if the speed is > 10, then this is a fast moving arrow, we go straight 961 /* if the speed is > 10, then this is a fast moving arrow, we go straight
980 * through the target 962 * through the target
981 */ 963 */
982 if (hit_something && op->speed <= 10.0) 964 if (hit_something && op->speed <= 10.0)
983 { 965 {
984 /* Stop arrow */ 966 /* Stop arrow */
985 if (container == NULL) 967 if (!container)
986 { 968 {
987 hitter = fix_stopped_arrow (hitter); 969 hitter = fix_stopped_arrow (hitter);
988 if (hitter == NULL) 970 if (!hitter)
989 return NULL; 971 return 0;
990 } 972 }
991 else 973 else
992 { 974 container->destroy ();
993 remove_ob (container);
994 free_object (container);
995 }
996 975
997 /* Try to stick arrow into victim */ 976 /* Try to stick arrow into victim */
998 if (!was_destroyed (victim, victim_tag) && stick_arrow (hitter, victim)) 977 if (!victim->destroyed () && stick_arrow (hitter, victim))
999 return NULL; 978 return 0;
1000 979
1001 /* Else try to put arrow on victim's map square 980 /* Else try to put arrow on victim's map square
1002 * remove check for P_WALL here. If the arrow got to this 981 * remove check for P_WALL here. If the arrow got to this
1003 * space, that is good enough - with the new movement code, 982 * space, that is good enough - with the new movement code,
1004 * there is now the potential for lots of spaces where something 983 * there is now the potential for lots of spaces where something
1005 * can fly over but not otherwise move over. What is the correct 984 * can fly over but not otherwise move over. What is the correct
1006 * way to handle those otherwise? 985 * way to handle those otherwise?
1007 */ 986 */
1008 if (victim_x != hitter->x || victim_y != hitter->y) 987 if (victim->x != hitter->x || victim->y != hitter->y)
1009 { 988 {
1010 remove_ob (hitter); 989 hitter->remove ();
1011 hitter->x = victim_x; 990 hitter->x = victim->x;
1012 hitter->y = victim_y; 991 hitter->y = victim->y;
1013 insert_ob_in_map (hitter, victim->map, hitter, 0); 992 insert_ob_in_map (hitter, victim->map, hitter, 0);
1014 } 993 }
1015 else 994 else
1016 {
1017 /* Else leave arrow where it is */ 995 /* Else leave arrow where it is */
1018 merge_ob (hitter, NULL); 996 merge_ob (hitter, NULL);
1019 } 997
1020 return NULL; 998 return 0;
1021 } 999 }
1022 1000
1023 if (hit_something && op->speed >= 10.0) 1001 if (hit_something && op->speed >= 10.0)
1024 op->speed -= 1.0; 1002 op->speed -= 1.0;
1025 1003
1026 /* Missile missed victim - reassemble missile */ 1004 /* Missile missed victim - reassemble missile */
1027 if (container) 1005 if (container)
1028 { 1006 {
1029 remove_ob (hitter); 1007 hitter->remove ();
1030 insert_ob_in_ob (hitter, container); 1008 insert_ob_in_ob (hitter, container);
1031 } 1009 }
1010
1032 return op; 1011 return op;
1033} 1012}
1034
1035 1013
1036void 1014void
1037tear_down_wall (object *op) 1015tear_down_wall (object *op)
1038{ 1016{
1039 int perc = 0; 1017 int perc = 0;
… …
1045 } 1023 }
1046 else if (!GET_ANIM_ID (op)) 1024 else if (!GET_ANIM_ID (op))
1047 { 1025 {
1048 /* Object has been called - no animations, so remove it */ 1026 /* Object has been called - no animations, so remove it */
1049 if (op->stats.hp < 0) 1027 if (op->stats.hp < 0)
1028 op->destroy ();
1050 { 1029
1051 remove_ob (op); /* Should update LOS */
1052 free_object (op);
1053 /* Don't know why this is here - remove_ob should do it for us */
1054 /*update_position(m, x, y); */
1055 }
1056 return; /* no animations, so nothing more to do */ 1030 return; /* no animations, so nothing more to do */
1057 } 1031 }
1032
1058 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp; 1033 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;
1034
1059 if (perc >= (int) NUM_ANIMATIONS (op)) 1035 if (perc >= (int) NUM_ANIMATIONS (op))
1060 perc = NUM_ANIMATIONS (op) - 1; 1036 perc = NUM_ANIMATIONS (op) - 1;
1061 else if (perc < 1) 1037 else if (perc < 1)
1062 perc = 1; 1038 perc = 1;
1039
1063 SET_ANIMATION (op, perc); 1040 SET_ANIMATION (op, perc);
1064 update_object (op, UP_OBJ_FACE); 1041 update_object (op, UP_OBJ_FACE);
1042
1065 if (perc == NUM_ANIMATIONS (op) - 1) 1043 if (perc == NUM_ANIMATIONS (op) - 1)
1066 { /* Reached the last animation */ 1044 { /* Reached the last animation */
1067 if (op->face == blank_face) 1045 if (op->face == blank_face)
1068 {
1069 /* If the last face is blank, remove the ob */ 1046 /* If the last face is blank, remove the ob */
1070 remove_ob (op); /* Should update LOS */ 1047 op->destroy ();
1071 free_object (op);
1072
1073 /* remove_ob should call update_position for us */
1074 /*update_position(m, x, y); */
1075
1076 }
1077 else 1048 else
1078 { /* The last face was not blank, leave an image */ 1049 { /* The last face was not blank, leave an image */
1079 CLEAR_FLAG (op, FLAG_BLOCKSVIEW); 1050 CLEAR_FLAG (op, FLAG_BLOCKSVIEW);
1080 update_all_los (op->map, op->x, op->y); 1051 update_all_los (op->map, op->x, op->y);
1081 op->move_block = 0; 1052 op->move_block = 0;
… …
1085} 1056}
1086 1057
1087void 1058void
1088scare_creature (object *target, object *hitter) 1059scare_creature (object *target, object *hitter)
1089{ 1060{
1090 object *owner = get_owner (hitter); 1061 object *owner = hitter->owner;
1091 1062
1092 if (!owner) 1063 if (!owner)
1093 owner = hitter; 1064 owner = hitter;
1094 1065
1095 SET_FLAG (target, FLAG_SCARED); 1066 SET_FLAG (target, FLAG_SCARED);
1096 if (!target->enemy) 1067 if (!target->enemy)
1097 target->enemy = owner; 1068 target->enemy = owner;
1098} 1069}
1099
1100 1070
1101/* This returns the amount of damage hitter does to op with the 1071/* This returns the amount of damage hitter does to op with the
1102 * appropriate attacktype. Only 1 attacktype should be set at a time. 1072 * appropriate attacktype. Only 1 attacktype should be set at a time.
1103 * This doesn't damage the player, but returns how much it should 1073 * This doesn't damage the player, but returns how much it should
1104 * take. However, it will do other effects (paralyzation, slow, etc.) 1074 * take. However, it will do other effects (paralyzation, slow, etc.)
1105 * Note - changed for PR code - we now pass the attack number and not 1075 * Note - changed for PR code - we now pass the attack number and not
1106 * the attacktype. Makes it easier for the PR code. */ 1076 * the attacktype. Makes it easier for the PR code. */
1107
1108int 1077int
1109hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic) 1078hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1110{ 1079{
1111
1112 int doesnt_slay = 1; 1080 int doesnt_slay = 1;
1113 1081
1114 /* Catch anyone that may be trying to send us a bitmask instead of the number */ 1082 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1115 if (attacknum >= NROFATTACKS) 1083 if (attacknum >= NROFATTACKS)
1116 { 1084 {
… …
1118 return 0; 1086 return 0;
1119 } 1087 }
1120 1088
1121 if (dam < 0) 1089 if (dam < 0)
1122 { 1090 {
1123 LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam); 1091 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1092 dam, hitter->debug_desc (), op->debug_desc ());
1124 return 0; 1093 return 0;
1125 } 1094 }
1126 1095
1127 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1096 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1128 * people can't mess with that or it otherwise get confused. */ 1097 * people can't mess with that or it otherwise get confused. */
1129 if (attacknum == ATNR_INTERNAL) 1098 if (attacknum == ATNR_INTERNAL)
1130 return dam; 1099 return dam;
1131 1100
1132 if (hitter->slaying) 1101 if (hitter->slaying)
1133 { 1102 {
1134 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1103 if ((op->race && strstr (hitter->slaying, op->race))
1135 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1104 || (op->arch && op->arch->name && strstr (op->arch->name, hitter->slaying)))
1136 { 1105 {
1137 doesnt_slay = 0; 1106 doesnt_slay = 0;
1138 dam *= 3; 1107 dam *= 3;
1139 } 1108 }
1140 } 1109 }
… …
1154 /* Special hack. By default, if immune to something, you 1123 /* Special hack. By default, if immune to something, you
1155 * shouldn't need to worry. However, acid is an exception, since 1124 * shouldn't need to worry. However, acid is an exception, since
1156 * it can still damage your items. Only include attacktypes if 1125 * it can still damage your items. Only include attacktypes if
1157 * special processing is needed */ 1126 * special processing is needed */
1158 1127
1159 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1128 if (op->resist[attacknum] >= 100
1129 && doesnt_slay
1130 && attacknum != ATNR_ACID)
1160 return 0; 1131 return 0;
1161 1132
1162 /* Keep this in order - makes things easier to find */ 1133 /* Keep this in order - makes things easier to find */
1163 1134
1164 switch (attacknum) 1135 switch (attacknum)
1165 { 1136 {
1166 case ATNR_PHYSICAL: 1137 case ATNR_PHYSICAL:
1167 /* here also check for diseases */ 1138 /* here also check for diseases */
1168 check_physically_infect (op, hitter); 1139 check_physically_infect (op, hitter);
1169 break; 1140 break;
1170 1141
1171 /* Don't need to do anything for: 1142 /* Don't need to do anything for:
1172 magic, 1143 magic,
1173 fire, 1144 fire,
1174 electricity, 1145 electricity,
1175 cold */ 1146 cold */
1176 1147
1177 case ATNR_CONFUSION: 1148 case ATNR_CONFUSION:
1178 case ATNR_POISON: 1149 case ATNR_POISON:
1179 case ATNR_SLOW: 1150 case ATNR_SLOW:
1180 case ATNR_PARALYZE: 1151 case ATNR_PARALYZE:
1181 case ATNR_FEAR: 1152 case ATNR_FEAR:
1182 case ATNR_CANCELLATION: 1153 case ATNR_CANCELLATION:
1183 case ATNR_DEPLETE: 1154 case ATNR_DEPLETE:
1184 case ATNR_BLIND: 1155 case ATNR_BLIND:
1185 { 1156 {
1186 /* chance for inflicting a special attack depends on the 1157 /* chance for inflicting a special attack depends on the
1187 * difference between attacker's and defender's level 1158 * difference between attacker's and defender's level
1188 */ 1159 */
1189 int level_diff = MIN (110, MAX (0, op->level - hitter->level)); 1160 int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1190 1161
1191 /* First, only creatures/players with speed can be affected. 1162 /* First, only creatures/players with speed can be affected.
1192 * Second, just getting hit doesn't mean it always affects 1163 * Second, just getting hit doesn't mean it always affects
1193 * you. Third, you still get a saving through against the 1164 * you. Third, you still get a saving through against the
1194 * effect. 1165 * effect.
1195 */ 1166 */
1196 if (op->speed && 1167 if (op->speed &&
1197 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) && 1168 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1198 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10)) 1169 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1199 { 1170 {
1200 1171
1201 /* Player has been hit by something */ 1172 /* Player has been hit by something */
1202 if (attacknum == ATNR_CONFUSION) 1173 if (attacknum == ATNR_CONFUSION)
1203 confuse_player (op, hitter, dam); 1174 confuse_player (op, hitter, dam);
1204 else if (attacknum == ATNR_POISON) 1175 else if (attacknum == ATNR_POISON)
1205 poison_player (op, hitter, dam); 1176 poison_player (op, hitter, dam);
1206 else if (attacknum == ATNR_SLOW) 1177 else if (attacknum == ATNR_SLOW)
1207 slow_player (op, hitter, dam); 1178 slow_player (op, hitter, dam);
1208 else if (attacknum == ATNR_PARALYZE) 1179 else if (attacknum == ATNR_PARALYZE)
1209 paralyze_player (op, hitter, dam); 1180 paralyze_player (op, hitter, dam);
1210 else if (attacknum == ATNR_FEAR) 1181 else if (attacknum == ATNR_FEAR)
1211 scare_creature (op, hitter); 1182 scare_creature (op, hitter);
1212 else if (attacknum == ATNR_CANCELLATION) 1183 else if (attacknum == ATNR_CANCELLATION)
1213 cancellation (op); 1184 cancellation (op);
1214 else if (attacknum == ATNR_DEPLETE) 1185 else if (attacknum == ATNR_DEPLETE)
1215 drain_stat (op); 1186 op->drain_stat ();
1216 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1187 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1217 blind_player (op, hitter, dam); 1188 blind_player (op, hitter, dam);
1218 } 1189 }
1190
1219 dam = 0; /* These are all effects and don't do real damage */ 1191 dam = 0; /* These are all effects and don't do real damage */
1220 } 1192 }
1221 break; 1193 break;
1194
1222 case ATNR_ACID: 1195 case ATNR_ACID:
1223 { 1196 {
1224 int flag = 0; 1197 int flag = 0;
1225 1198
1226 /* Items only get corroded if you're not on a battleground and 1199 /* Items only get corroded if you're not on a battleground and
1227 * if your acid resistance is below 50%. */ 1200 * if your acid resistance is below 50%. */
1228 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50)) 1201 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1229 { 1202 {
1230 object *tmp;
1231
1232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1203 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1233 { 1204 {
1234 if (tmp->invisible) 1205 if (tmp->invisible)
1235 continue; 1206 continue;
1236 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) 1207 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1237 /* >= 10% acid res. on itmes will protect these */ 1208 /* >= 10% acid res. on items will protect these */
1238 continue; 1209 continue;
1239 if (!(tmp->material & M_IRON)) 1210 if (!(tmp->materials & M_IRON))
1240 continue; 1211 continue;
1241 if (tmp->magic < -4) /* Let's stop at -5 */ 1212 if (tmp->magic < -4) /* Let's stop at -5 */
1242 continue; 1213 continue;
1243 if (tmp->type == RING || 1214 if (tmp->type == RING
1244 /* removed boots and gloves from exclusion list in 1215 /* removed boots and gloves from exclusion list in PR */
1245 PR */ 1216 || tmp->type == GIRDLE
1246 tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1217 || tmp->type == AMULET
1218 || tmp->type == WAND
1219 || tmp->type == ROD
1220 || tmp->type == HORN)
1247 continue; /* To avoid some strange effects */ 1221 continue; /* To avoid some strange effects */
1248 1222
1249 /* High damage acid has better chance of corroding 1223 /* High damage acid has better chance of corroding
1250 objects */ 1224 objects */
1251 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1225 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1252 { 1226 {
1253 if (op->type == PLAYER) 1227 if (op->type == PLAYER)
1254 /* Make this more visible */ 1228 /* Make this more visible */
1255 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, 1229 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1256 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp)); 1230 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1257 flag = 1; 1231 flag = 1;
1258 tmp->magic--; 1232 tmp->magic--;
1259 if (op->type == PLAYER) 1233 if (op->type == PLAYER)
1260 esrv_send_item (op, tmp); 1234 esrv_send_item (op, tmp);
1261 } 1235 }
1262 } 1236 }
1263 if (flag)
1264 fix_player (op); /* Something was corroded */
1265 } 1237
1238 if (flag)
1239 op->update_stats (); /* Something was corroded */
1266 } 1240 }
1241 }
1267 break; 1242 break;
1243
1268 case ATNR_DRAIN: 1244 case ATNR_DRAIN:
1269 { 1245 {
1270 /* rate is the proportion of exp drained. High rate means 1246 /* rate is the proportion of exp drained. High rate means
1271 * not much is drained, low rate means a lot is drained. 1247 * not much is drained, low rate means a lot is drained.
1272 */ 1248 */
1273 int rate; 1249 int rate;
1274 1250
1275 if (op->resist[ATNR_DRAIN] >= 0) 1251 if (op->resist[ATNR_DRAIN] >= 0)
1276 rate = 400 + op->resist[ATNR_DRAIN] * 3; 1252 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1277 else 1253 else
1278 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]); 1254 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1279 1255
1280 if (op->stats.exp <= rate) 1256 if (op->stats.exp <= rate)
1281 { 1257 {
1282 if (op->type == GOLEM) 1258 if (op->type == GOLEM)
1283 dam = 999; /* Its force is "sucked" away. 8) */ 1259 dam = 999; /* Its force is "sucked" away. 8) */
1284 else 1260 else
1285 /* If we can't drain, lets try to do physical damage */ 1261 /* If we can't drain, lets try to do physical damage */
1286 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic); 1262 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1287 } 1263 }
1288 else 1264 else
1289 { 1265 {
1290 /* Randomly give the hitter some hp */ 1266 /* Randomly give the hitter some hp */
1291 if (hitter->stats.hp < hitter->stats.maxhp && 1267 if (hitter->stats.hp < hitter->stats.maxhp &&
1292 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3) 1268 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1293 hitter->stats.hp++; 1269 hitter->stats.hp++;
1294 1270
1295 /* Can't do drains on battleground spaces. 1271 /* Can't do drains on battleground spaces.
1296 * Move the wiz check up here - before, the hitter wouldn't gain exp 1272 * Move the wiz check up here - before, the hitter wouldn't gain exp
1297 * exp, but the wiz would still lose exp! If drainee is a wiz, 1273 * exp, but the wiz would still lose exp! If drainee is a wiz,
1298 * nothing happens. 1274 * nothing happens.
1299 * Try to credit the owner. We try to display player -> player drain 1275 * Try to credit the owner. We try to display player -> player drain
1300 * attacks, hence all the != PLAYER checks. 1276 * attacks, hence all the != PLAYER checks.
1301 */ 1277 */
1302 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1278 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ))
1303 { 1279 {
1304 object *owner = get_owner (hitter); 1280 object *owner = hitter->owner;
1305 1281
1306 if (owner && owner != hitter) 1282 if (owner && owner != hitter)
1307 { 1283 {
1308 if (op->type != PLAYER || owner->type != PLAYER) 1284 if (op->type != PLAYER || owner->type != PLAYER)
1309 change_exp (owner, op->stats.exp / (rate * 2), 1285 change_exp (owner, op->stats.exp / (rate * 2),
1310 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1286 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1311 } 1287 }
1312 else if (op->type != PLAYER || hitter->type != PLAYER) 1288 else if (op->type != PLAYER || hitter->type != PLAYER)
1313 {
1314 change_exp (hitter, op->stats.exp / (rate * 2), 1289 change_exp (hitter, op->stats.exp / (rate * 2),
1315 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1290 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1316 } 1291
1317 change_exp (op, -op->stats.exp / rate, NULL, 0); 1292 change_exp (op, -op->stats.exp / rate, NULL, 0);
1318 } 1293 }
1294
1319 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1295 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1320 * drain attack, you won't know that you are actually sucking out EXP, 1296 * drain attack, you won't know that you are actually sucking out EXP,
1321 * as the messages will say you missed 1297 * as the messages will say you missed
1322 */ 1298 */
1323 } 1299 }
1324 } 1300 }
1325 break; 1301 break;
1302
1326 case ATNR_TURN_UNDEAD: 1303 case ATNR_TURN_UNDEAD:
1327 { 1304 {
1328 if (QUERY_FLAG (op, FLAG_UNDEAD)) 1305 if (QUERY_FLAG (op, FLAG_UNDEAD))
1329 { 1306 {
1330 object *owner = get_owner (hitter) == NULL ? hitter : get_owner (hitter); 1307 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1331 object *god = find_god (determine_god (owner)); 1308 object *god = find_god (determine_god (owner));
1332 int div = 1; 1309 int div = 1;
1333 1310
1334 /* if undead are not an enemy of your god, you turn them 1311 /* if undead are not an enemy of your god, you turn them
1335 * at half strength */ 1312 * at half strength */
1336 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1313 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL)
1337 div = 2; 1314 div = 2;
1315
1338 /* Give a bonus if you resist turn undead */ 1316 /* Give a bonus if you resist turn undead */
1339 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1317 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1340 scare_creature (op, owner); 1318 scare_creature (op, owner);
1341 } 1319 }
1342 else 1320 else
1343 dam = 0; /* don't damage non undead - should we damage 1321 dam = 0; /* don't damage non undead - should we damage
1344 undead? */ 1322 undead? */
1345 } 1323 }
1346 break; 1324 break;
1325
1347 case ATNR_DEATH: 1326 case ATNR_DEATH:
1348 deathstrike_player (op, hitter, &dam); 1327 deathstrike_player (op, hitter, &dam);
1349 break; 1328 break;
1329
1350 case ATNR_CHAOS: 1330 case ATNR_CHAOS:
1351 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter)); 1331 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1352 dam = 0; 1332 dam = 0;
1353 break; 1333 break;
1334
1354 case ATNR_COUNTERSPELL: 1335 case ATNR_COUNTERSPELL:
1355 LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter)); 1336 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1356 dam = 0; 1337 dam = 0;
1357 /* This should never happen. Counterspell is handled 1338 /* This should never happen. Counterspell is handled
1358 * seperately and filtered out. If this does happen, 1339 * seperately and filtered out. If this does happen,
1359 * Counterspell has no effect on anything but spells, so it 1340 * Counterspell has no effect on anything but spells, so it
1360 * does no damage. */ 1341 * does no damage. */
1361 break; 1342 break;
1343
1362 case ATNR_HOLYWORD: 1344 case ATNR_HOLYWORD:
1363 { 1345 {
1364 /* This has already been handled by hit_player, 1346 /* This has already been handled by hit_player,
1365 * no need to check twice -- DAMN */ 1347 * no need to check twice -- DAMN */
1348 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1366 1349
1367 object *owner = get_owner (hitter) == NULL ? hitter : get_owner (hitter);
1368
1369 /* As with turn undead above, give a bonus on the saving throw */ 1350 /* As with turn undead above, give a bonus on the saving throw */
1370 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis]) 1351 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1371 scare_creature (op, owner); 1352 scare_creature (op, owner);
1372 } 1353 }
1373 break; 1354 break;
1355
1374 case ATNR_LIFE_STEALING: 1356 case ATNR_LIFE_STEALING:
1375 { 1357 {
1376 int new_hp; 1358 int new_hp;
1377 1359
1378 /* this is replacement to drain for players, instead of taking 1360 /* this is replacement to drain for players, instead of taking
1379 * exp it takes hp. It is geared for players, probably not 1361 * exp it takes hp. It is geared for players, probably not
1380 * much use giving it to monsters 1362 * much use giving it to monsters
1381 * 1363 *
1382 * life stealing doesn't do a lot of damage, but it gives the 1364 * life stealing doesn't do a lot of damage, but it gives the
1383 * damage it does do to the player. Given that, 1365 * damage it does do to the player. Given that,
1384 * it only does 1/10'th normal damage (hence the divide by 1366 * it only does 1/10'th normal damage (hence the divide by
1385 * 1000). 1367 * 1000).
1386 */ 1368 */
1387 /* You can't steal life from something undead */ 1369 /* You can't steal life from something undead */
1388 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD))) 1370 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1389 return 0; 1371 return 0;
1372
1390 /* If drain protection is higher than life stealing, use that */ 1373 /* If drain protection is higher than life stealing, use that */
1391 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING]) 1374 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1392 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000; 1375 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1393 else 1376 else
1394 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000; 1377 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
1378
1395 /* You die at -1 hp, not zero. */ 1379 /* You die at -1 hp, not zero. */
1396 if (dam > (op->stats.hp + 1)) 1380 if (dam > (op->stats.hp + 1))
1397 dam = op->stats.hp + 1; 1381 dam = op->stats.hp + 1;
1382
1398 new_hp = hitter->stats.hp + dam; 1383 new_hp = hitter->stats.hp + dam;
1399 if (new_hp > hitter->stats.maxhp) 1384 if (new_hp > hitter->stats.maxhp)
1400 new_hp = hitter->stats.maxhp; 1385 new_hp = hitter->stats.maxhp;
1386
1401 if (new_hp > hitter->stats.hp) 1387 if (new_hp > hitter->stats.hp)
1402 hitter->stats.hp = new_hp; 1388 hitter->stats.hp = new_hp;
1403 } 1389 }
1404 } 1390 }
1391
1405 return dam; 1392 return dam;
1406} 1393}
1407
1408 1394
1409/* GROS: This code comes from hit_player. It has been made external to 1395/* GROS: This code comes from hit_player. It has been made external to
1410 * allow script procedures to "kill" objects in a combat-like fashion. 1396 * allow script procedures to "kill" objects in a combat-like fashion.
1411 * It was initially used by (kill-object) developed for the Collector's 1397 * It was initially used by (kill-object) developed for the Collector's
1412 * Sword. Note that nothing has been changed from the original version 1398 * Sword. Note that nothing has been changed from the original version
… …
1427 char buf[MAX_BUF]; 1413 char buf[MAX_BUF];
1428 const char *skill; 1414 const char *skill;
1429 int maxdam = 0; 1415 int maxdam = 0;
1430 int battleg = 0; /* true if op standing on battleground */ 1416 int battleg = 0; /* true if op standing on battleground */
1431 int pk = 0; /* true if op and what controls hitter are both players */ 1417 int pk = 0; /* true if op and what controls hitter are both players */
1432 object *owner = NULL; 1418 object *owner = 0;
1433 object *skop = NULL; 1419 object *skop = 0;
1434 1420
1435 if (op->stats.hp >= 0) 1421 if (op->stats.hp >= 0)
1436 return -1; 1422 return -1;
1437 1423
1438 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1424 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1447 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1433 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1448 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1434 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1449 1435
1450 if (op->type == DOOR) 1436 if (op->type == DOOR)
1451 { 1437 {
1452 op->speed = 0.1; 1438 op->set_speed (0.1);
1453 update_ob_speed (op);
1454 op->speed_left = -0.05; 1439 op->speed_left = -0.05;
1455 return maxdam; 1440 return maxdam;
1456 } 1441 }
1442
1457 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1443 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1458 { 1444 {
1459 remove_friendly_object (op); 1445 op->destroy ();
1460 if (get_owner (op) != NULL && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1461 {
1462 op->owner->contr->ranges[range_golem] = NULL;
1463 op->owner->contr->golem_count = 0;
1464 }
1465
1466 remove_ob (op);
1467 free_object (op);
1468 return maxdam; 1446 return maxdam;
1469 } 1447 }
1470 1448
1471 /* Now lets start dealing with experience we get for killing something */ 1449 /* Now lets start dealing with experience we get for killing something */
1472 1450
1473 owner = get_owner (hitter); 1451 owner = hitter->owner;
1474 if (owner == NULL) 1452 if (!owner)
1475 owner = hitter; 1453 owner = hitter;
1476 1454
1477 /* is the victim (op) standing on battleground? */ 1455 /* is the victim (op) standing on battleground? */
1478 if (op_on_battleground (op, NULL, NULL)) 1456 if (op_on_battleground (op, NULL, NULL))
1479 battleg = 1; 1457 battleg = 1;
… …
1499 char buf[256]; 1477 char buf[256];
1500 1478
1501 tmv = localtime (&t); 1479 tmv = localtime (&t);
1502 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv); 1480 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);
1503 1481
1504 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->socket.host, query_name (op)); 1482 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->ns->host, query_name (op));
1505 } 1483 }
1506 1484
1507 /* try to filter some things out - basically, if you are 1485 /* try to filter some things out - basically, if you are
1508 * killing a level 1 creature and your level 20, you 1486 * killing a level 1 creature and your level 20, you
1509 * probably don't want to see that. 1487 * probably don't want to see that.
1510 */ 1488 */
1511 if (owner->level < op->level * 2 || op->stats.exp > 1000) 1489 if (owner->level < op->level * 2 || op->stats.exp > 1000)
1512 { 1490 {
1513 if (owner != hitter) 1491 if (owner != hitter)
1514 {
1515 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter)); 1492 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));
1516 }
1517 else 1493 else
1518 {
1519 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1494 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1520 } 1495
1521 /* Only play sounds for melee kills */ 1496 /* Only play sounds for melee kills */
1522 if (hitter->type == PLAYER) 1497 if (hitter->type == PLAYER)
1523 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1498 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS);
1524 } 1499 }
1525 1500
… …
1530 * player that the object belonged to - so if you killed another player 1505 * player that the object belonged to - so if you killed another player
1531 * with spells, pets, whatever, there was no penalty. 1506 * with spells, pets, whatever, there was no penalty.
1532 * Changed to make luck penalty configurable in settings. 1507 * Changed to make luck penalty configurable in settings.
1533 */ 1508 */
1534 if (op->type == PLAYER && owner != op && !battleg) 1509 if (op->type == PLAYER && owner != op && !battleg)
1535 change_luck (owner, -settings.pk_luck_penalty); 1510 owner->change_luck (-settings.pk_luck_penalty);
1536 1511
1537 /* This code below deals with finding the appropriate skill 1512 /* This code below deals with finding the appropriate skill
1538 * to credit exp to. This is a bit problematic - we should 1513 * to credit exp to. This is a bit problematic - we should
1539 * probably never really have to look at current_weapon->skill 1514 * probably never really have to look at current_weapon->skill
1540 */ 1515 */
1541 skill = NULL; 1516 skill = 0;
1517
1542 if (hitter->skill && hitter->type != PLAYER) 1518 if (hitter->skill && hitter->type != PLAYER)
1543 skill = hitter->skill; 1519 skill = hitter->skill;
1544 else if (owner->chosen_skill) 1520 else if (owner->chosen_skill)
1545 { 1521 {
1546 skill = owner->chosen_skill->skill;
1547 skop = owner->chosen_skill; 1522 skop = owner->chosen_skill;
1523 skill = skop->skill;
1548 } 1524 }
1549 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1525 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1550 skill = owner->current_weapon->skill; 1526 skill = owner->current_weapon->skill;
1551 else 1527 else
1552 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1528 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1553 1529
1554 /* We have the skill we want to credit to - now find the object this goes 1530 /* We have the skill we want to credit to - now find the object this goes
1555 * to. Make sure skop is an actual skill, and not a skill tool! 1531 * to. Make sure skop is an actual skill, and not a skill tool!
1556 */ 1532 */
1557 if ((!skop || skop->type != SKILL) && skill) 1533 if ((!skop || skop->type != SKILL) && skill)
1558 { 1534 {
1559 int i; 1535 int i;
1560 1536
… …
1565 break; 1541 break;
1566 } 1542 }
1567 } 1543 }
1568 } /* Was it a player that hit somethign */ 1544 } /* Was it a player that hit somethign */
1569 else 1545 else
1570 {
1571 skill = NULL; 1546 skill = 0;
1572 }
1573 1547
1574 /* Pet (or spell) killed something. */ 1548 /* Pet (or spell) killed something. */
1575 if (owner != hitter) 1549 if (owner != hitter)
1576 {
1577 (void) sprintf (buf, "%s killed %s with %s%s%s.", &owner->name, 1550 sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1578 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : ""); 1551 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1579 }
1580 else 1552 else
1581 {
1582 (void) sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name, 1553 sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1583 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ? 1554 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1584 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : ""); 1555 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1585 } 1556
1586 /* These may have been set in the player code section above */ 1557 /* These may have been set in the player code section above */
1587 if (!skop) 1558 if (!skop)
1588 skop = hitter->chosen_skill; 1559 skop = hitter->chosen_skill;
1560
1589 if (!skill && skop) 1561 if (!skill && skop)
1590 skill = skop->skill; 1562 skill = skop->skill;
1591 1563
1592 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf); 1564 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1593 1565
1594
1595 /* If you didn't kill yourself, and your not the wizard */ 1566 /* If you didn't kill yourself, and your not the wizard */
1596 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1567 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ))
1597 { 1568 {
1598 int exp; 1569 int exp;
1599 1570
1600 /* Really don't give much experience for killing other players */ 1571 /* Really don't give much experience for killing other players */
1601 // schmorp: temporary? reduce the amount of exp gained for pking enourmously 1572 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
1602 if (op->type == PLAYER) 1573 if (op->type == PLAYER)
1603 { 1574 {
1604 if (battleg) 1575 if (battleg)
1605 { 1576 {
1606 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!"); 1577 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
… …
1624 1595
1625 if (!settings.simple_exp) 1596 if (!settings.simple_exp)
1626 exp = exp / 2; 1597 exp = exp / 2;
1627 1598
1628 if (owner->type != PLAYER || owner->contr->party == NULL) 1599 if (owner->type != PLAYER || owner->contr->party == NULL)
1629 {
1630 change_exp (owner, exp, skill, 0); 1600 change_exp (owner, exp, skill, 0);
1631 }
1632 else 1601 else
1633 { 1602 {
1634 int shares = 0, count = 0; 1603 int shares = 0, count = 0;
1635
1636 player *pl;
1637
1638 partylist *party = owner->contr->party; 1604 partylist *party = owner->contr->party;
1639 1605
1640#ifdef PARTY_KILL_LOG
1641 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1606 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1642#endif 1607
1643 for (pl = first_player; pl != NULL; pl = pl->next) 1608 for_all_players (pl)
1644 {
1645 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1609 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1646 { 1610 {
1647 count++; 1611 count++;
1648 shares += (pl->ob->level + 4); 1612 shares += (pl->ob->level + 4);
1649 } 1613 }
1650 } 1614
1651 if (count == 1 || shares > exp) 1615 if (count == 1 || shares > exp || !shares)
1652 change_exp (owner, exp, skill, SK_EXP_TOTAL); 1616 change_exp (owner, exp, skill, SK_EXP_TOTAL);
1653 else 1617 else
1654 { 1618 {
1655 int share = exp / shares, given = 0, nexp; 1619 int share = exp / shares, given = 0, nexp;
1656 1620
1657 for (pl = first_player; pl != NULL; pl = pl->next) 1621 for_all_players (pl)
1658 {
1659 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1622 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1660 { 1623 {
1661 nexp = (pl->ob->level + 4) * share; 1624 nexp = (pl->ob->level + 4) * share;
1662 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL); 1625 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1663 given += nexp; 1626 given += nexp;
1664 } 1627 }
1665 } 1628
1666 exp -= given; 1629 exp -= given;
1667 /* give any remainder to the player */ 1630 /* give any remainder to the player */
1668 change_exp (owner, exp, skill, SK_EXP_ADD_SKILL); 1631 change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);
1669 } 1632 }
1670 } /* else part of a party */ 1633 } /* else part of a party */
1671
1672 } /* end if person didn't kill himself */ 1634 } /* end if person didn't kill himself */
1673 1635
1674 if (op->type != PLAYER) 1636 if (op->type != PLAYER)
1675 { 1637 {
1676 if (QUERY_FLAG (op, FLAG_FRIENDLY)) 1638 if (QUERY_FLAG (op, FLAG_FRIENDLY))
1677 { 1639 {
1678 object *owner1 = get_owner (op); 1640 object *owner1 = op->owner;
1679 1641
1680 if (owner1 != NULL && owner1->type == PLAYER) 1642 if (owner1 && owner1->type == PLAYER)
1681 { 1643 {
1682 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1644 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0);
1683 /* Maybe we should include the owner that killed this, maybe not */ 1645 /* Maybe we should include the owner that killed this, maybe not */
1684 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1646 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1685 } 1647 }
1648
1686 remove_friendly_object (op); 1649 remove_friendly_object (op);
1687 } 1650 }
1688 remove_ob (op); 1651
1689 free_object (op); 1652 op->destroy ();
1690 } 1653 }
1691 /* Player has been killed! */
1692 else 1654 else
1693 { 1655 {
1656 /* Player has been killed! */
1694 if (owner->type == PLAYER) 1657 if (owner->type == PLAYER)
1695 {
1696 snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title); 1658 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1697 }
1698 else 1659 else
1699 {
1700 strncpy (op->contr->killer, hitter->name, BIG_NAME); 1660 assign (op->contr->killer, hitter->name);
1701 op->contr->killer[BIG_NAME - 1] = '\0';
1702 }
1703 } 1661 }
1662
1704 /* This was return -1 - that doesn't seem correct - if we return -1, process 1663 /* This was return -1 - that doesn't seem correct - if we return -1, process
1705 * continues in the calling function. 1664 * continues in the calling function.
1706 */ 1665 */
1707 return maxdam; 1666 return maxdam;
1708} 1667}
1709 1668
1710/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1669/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1711 * Returns 0 this is not friendly fire 1670 * Returns 0 this is not friendly fire
1712 */ 1671 */
1713
1714int 1672int
1715friendly_fire (object *op, object *hitter) 1673friendly_fire (object *op, object *hitter)
1716{ 1674{
1717 object *owner; 1675 object *owner;
1718 int friendlyfire; 1676 int friendlyfire;
… …
1728 return 0; 1686 return 0;
1729 1687
1730 if (hitter->type == PLAYER && hitter->contr->peaceful == 1) 1688 if (hitter->type == PLAYER && hitter->contr->peaceful == 1)
1731 return 1; 1689 return 1;
1732 1690
1733 if ((owner = get_owner (hitter)) != NULL) 1691 if ((owner = hitter->owner) != NULL)
1734 { 1692 {
1735 if (owner->type == PLAYER && owner->contr->peaceful == 1) 1693 if (owner->type == PLAYER && owner->contr->peaceful == 1)
1736 friendlyfire = 2; 1694 friendlyfire = 2;
1737 } 1695 }
1738 1696
… …
1748 * is what is hitting the object, type is the attacktype, and 1706 * is what is hitting the object, type is the attacktype, and
1749 * full_hit is set if monster area does not matter. 1707 * full_hit is set if monster area does not matter.
1750 * dam is base damage - protections/vulnerabilities/slaying matches can 1708 * dam is base damage - protections/vulnerabilities/slaying matches can
1751 * modify it. 1709 * modify it.
1752 */ 1710 */
1753
1754 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack 1711/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1755 * which needs new attacktype AT_HOLYWORD to work . b.t. */ 1712 * which needs new attacktype AT_HOLYWORD to work . b.t. */
1756
1757int 1713int
1758hit_player (object *op, int dam, object *hitter, int type, int full_hit) 1714hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1759{ 1715{
1760 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC); 1716 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1761 int maxattacktype, attacknum; 1717 int maxattacktype, attacknum;
1762 int body_attack = op && op->head; /* Did we hit op's head? */ 1718 int body_attack = op && op->head; /* Did we hit op's head? */
1763 int simple_attack; 1719 int simple_attack;
1764 tag_t op_tag, hitter_tag;
1765 int rtn_kill = 0; 1720 int rtn_kill = 0;
1766 int friendlyfire; 1721 int friendlyfire;
1767 1722
1768 if (get_attack_mode (&op, &hitter, &simple_attack)) 1723 if (get_attack_mode (&op, &hitter, &simple_attack))
1769 return 0; 1724 return 0;
… …
1773 return 0; 1728 return 0;
1774 1729
1775#ifdef PROHIBIT_PLAYERKILL 1730#ifdef PROHIBIT_PLAYERKILL
1776 if (op->type == PLAYER) 1731 if (op->type == PLAYER)
1777 { 1732 {
1778 object *owner = get_owner (hitter); 1733 object *owner = hitter->owner;
1779 1734
1780 if (!owner) 1735 if (!owner)
1781 owner = hitter; 1736 owner = hitter;
1782 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1737
1783 { 1738 if (owner->type == PLAYER
1739 && (!op_on_battleground (op, 0, 0)
1740 && (op->contr->peaceful || owner->contr->peaceful))
1741 && op != owner)
1784 return 0; 1742 return 0;
1785 }
1786 } 1743 }
1787#endif 1744#endif
1788
1789 op_tag = op->count;
1790 hitter_tag = hitter->count;
1791 1745
1792 if (body_attack) 1746 if (body_attack)
1793 { 1747 {
1794 /* slow and paralyze must hit the head. But we don't want to just 1748 /* slow and paralyze must hit the head. But we don't want to just
1795 * return - we still need to process other attacks the spell still 1749 * return - we still need to process other attacks the spell still
… …
1801 * attack so we don't cancel out things like magic bullet. 1755 * attack so we don't cancel out things like magic bullet.
1802 */ 1756 */
1803 if (type & (AT_PARALYZE | AT_SLOW)) 1757 if (type & (AT_PARALYZE | AT_SLOW))
1804 { 1758 {
1805 type &= ~(AT_PARALYZE | AT_SLOW); 1759 type &= ~(AT_PARALYZE | AT_SLOW);
1760
1806 if (!type || type == AT_MAGIC) 1761 if (!type || type == AT_MAGIC)
1807 return 0; 1762 return 0;
1808 } 1763 }
1809 } 1764 }
1810 1765
1811 if (!simple_attack && op->type == DOOR) 1766 if (!simple_attack && op->type == DOOR)
1812 { 1767 {
1813 object *tmp;
1814
1815 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1768 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1816 if (tmp->type == RUNE || tmp->type == TRAP) 1769 if (tmp->type == RUNE || tmp->type == TRAP)
1817 { 1770 {
1818 spring_trap (tmp, hitter); 1771 spring_trap (tmp, hitter);
1772
1819 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack)) 1773 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
1820 return 0; 1774 return 0;
1775
1821 break; 1776 break;
1822 } 1777 }
1823 } 1778 }
1824 1779
1825 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1780 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1826 { 1781 {
1827 /* FIXME: If a player is killed by a rune in a door, the 1782 /* FIXME: If a player is killed by a rune in a door, the
1828 * was_destroyed() check above doesn't return, and might get here. 1783 * destroyed() check above doesn't return, and might get here.
1829 */ 1784 */
1785
1786 /* FIXME: This for example happens when a dead door is on a mover and
1787 gets it's speed_left raised on each mover-tick.
1788 Doors are removed in a kinda funny way by giving them speed and speed_left
1789 and waiting for that to run out.
1790 */
1830 LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name); 1791 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1831 return 0; 1792 return 0;
1832 } 1793 }
1833 1794
1834#ifdef ATTACK_DEBUG 1795#ifdef ATTACK_DEBUG
1835 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1796 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1841 * in case 0>dam>1, we try to "simulate" a float value-effect */ 1802 * in case 0>dam>1, we try to "simulate" a float value-effect */
1842 dam = dam * (100 - op->resist[ATNR_MAGIC]); 1803 dam = dam * (100 - op->resist[ATNR_MAGIC]);
1843 if (dam >= 100) 1804 if (dam >= 100)
1844 dam /= 100; 1805 dam /= 100;
1845 else 1806 else
1846 dam = (dam > (rndm (0, 99))) ? 1 : 0; 1807 dam = (dam > rndm (0, 99)) ? 1 : 0;
1847 } 1808 }
1848 1809
1849 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map 1810 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1850 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit 1811 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1851 */ 1812 */
… …
1871 (hitter->title != NULL 1832 (hitter->title != NULL
1872 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1833 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL)))
1873 return 0; 1834 return 0;
1874 } 1835 }
1875 1836
1876 maxattacktype = type; /* initialize this to something */ 1837 maxattacktype = type; /* initialise this to something */
1877 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1838 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1878 { 1839 {
1879 /* Magic isn't really a true attack type - it gets combined with other 1840 /* Magic isn't really a true attack type - it gets combined with other
1880 * attack types. As such, skip it over. However, if magic is 1841 * attack types. As such, skip it over. However, if magic is
1881 * the only attacktype in the group, then still attack with it 1842 * the only attacktype in the group, then still attack with it
… …
1934 1895
1935 /* basically: maxdam /= area; we try to "simulate" a float 1896 /* basically: maxdam /= area; we try to "simulate" a float
1936 value-effect */ 1897 value-effect */
1937 remainder = 100 * (maxdam % area) / area; 1898 remainder = 100 * (maxdam % area) / area;
1938 maxdam /= area; 1899 maxdam /= area;
1939 if (RANDOM () % 100 < remainder) 1900 if (rndm (100) < remainder)
1940 maxdam++; 1901 maxdam++;
1941 } 1902 }
1942 1903
1943#ifdef ATTACK_DEBUG 1904#ifdef ATTACK_DEBUG
1944 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1905 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1945#endif 1906#endif
1946 1907
1947 if (get_owner (hitter)) 1908 // for now, only do this for active objects, otherwise they
1909 // keep a refcount for a long time and I see no usefulness
1910 // for an non-active objetc to know its enemy.
1911 if (op->active)
1912 if (hitter->owner)
1948 op->enemy = hitter->owner; 1913 op->enemy = hitter->owner;
1949 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1914 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1950 op->enemy = hitter; 1915 op->enemy = hitter;
1951 1916
1952 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1917 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1953 { 1918 {
1954 /* The unaggressives look after themselves 8) */ 1919 /* The unaggressives look after themselves 8) */
1955 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1920 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1977 1942
1978 if (QUERY_FLAG (op, FLAG_TEAR_DOWN)) 1943 if (QUERY_FLAG (op, FLAG_TEAR_DOWN))
1979 { 1944 {
1980 if (maxdam) 1945 if (maxdam)
1981 tear_down_wall (op); 1946 tear_down_wall (op);
1947
1982 return maxdam; /* nothing more to do for wall */ 1948 return maxdam; /* nothing more to do for wall */
1983 } 1949 }
1984 1950
1985 /* See if the creature has been killed */ 1951 /* See if the creature has been killed */
1986 rtn_kill = kill_object (op, maxdam, hitter, type); 1952 rtn_kill = kill_object (op, maxdam, hitter, type);
… …
1991 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1957 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1992 * that before if the player was immune to ghosthit, the monster 1958 * that before if the player was immune to ghosthit, the monster
1993 * remained - that is no longer the case. 1959 * remained - that is no longer the case.
1994 */ 1960 */
1995 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1961 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1996 { 1962 hitter->destroy ();
1997 if (QUERY_FLAG (hitter, FLAG_FRIENDLY)) 1963
1998 remove_friendly_object (hitter);
1999 remove_ob (hitter);
2000 free_object (hitter);
2001 }
2002 /* Lets handle creatures that are splitting now */ 1964 /* Lets handle creatures that are splitting now */
2003 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1965 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
2004 { 1966 {
2005 int i; 1967 int i;
2006 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1968 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
2007 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE); 1969 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);
2008 object *owner = get_owner (op); 1970 object *owner = op->owner;
2009 1971
2010 if (!op->other_arch) 1972 if (!op->other_arch)
2011 { 1973 {
2012 LOG (llevError, "SPLITTING without other_arch error.\n"); 1974 LOG (llevError, "SPLITTING without other_arch error.\n");
2013 return maxdam; 1975 return maxdam;
2014 } 1976 }
1977
2015 remove_ob (op); 1978 op->remove ();
1979
2016 for (i = 0; i < NROFNEWOBJS (op); i++) 1980 for (i = 0; i < NROFNEWOBJS (op); i++)
2017 { /* This doesn't handle op->more yet */ 1981 { /* This doesn't handle op->more yet */
2018 object *tmp = arch_to_object (op->other_arch); 1982 object *tmp = arch_to_object (op->other_arch);
2019 int j; 1983 int j;
2020 1984
2021 tmp->stats.hp = op->stats.hp; 1985 tmp->stats.hp = op->stats.hp;
1986
2022 if (friendly) 1987 if (friendly)
2023 { 1988 {
2024 SET_FLAG (tmp, FLAG_FRIENDLY);
2025 add_friendly_object (tmp); 1989 add_friendly_object (tmp);
2026 tmp->attack_movement = PETMOVE; 1990 tmp->attack_movement = PETMOVE;
1991
2027 if (owner != NULL) 1992 if (owner)
2028 set_owner (tmp, owner); 1993 tmp->set_owner (owner);
2029 } 1994 }
1995
2030 if (unaggressive) 1996 if (unaggressive)
2031 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 1997 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
1998
2032 j = find_first_free_spot (tmp, op->map, op->x, op->y); 1999 j = find_first_free_spot (tmp, op->map, op->x, op->y);
2000
2033 if (j == -1) /* No spot to put this monster */ 2001 if (j == -1) /* No spot to put this monster */
2034 free_object (tmp); 2002 tmp->destroy ();
2035 else 2003 else
2036 { 2004 {
2037 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j]; 2005 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
2038 insert_ob_in_map (tmp, op->map, NULL, 0); 2006 insert_ob_in_map (tmp, op->map, NULL, 0);
2039 } 2007 }
2040 } 2008 }
2041 if (friendly) 2009
2042 remove_friendly_object (op); 2010 op->destroy ();
2043 free_object (op);
2044 } 2011 }
2045 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 2012 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2046 { 2013 hitter->destroy ();
2047 remove_ob (hitter); 2014
2048 free_object (hitter);
2049 }
2050 return maxdam; 2015 return maxdam;
2051} 2016}
2052 2017
2053 2018
2054void 2019void
2055poison_player (object *op, object *hitter, int dam) 2020poison_player (object *op, object *hitter, int dam)
2056{ 2021{
2057 archetype *at = find_archetype ("poisoning"); 2022 archetype *at = archetype::find ("poisoning");
2058 object *tmp = present_arch_in_ob (at, op); 2023 object *tmp = present_arch_in_ob (at, op);
2059 2024
2060 if (tmp == NULL) 2025 if (tmp == NULL)
2061 { 2026 {
2062 if ((tmp = arch_to_object (at)) == NULL) 2027 if ((tmp = arch_to_object (at)) == NULL)
… …
2075 if (QUERY_FLAG (hitter, FLAG_ALIVE)) 2040 if (QUERY_FLAG (hitter, FLAG_ALIVE))
2076 tmp->stats.dam += hitter->level / 2; 2041 tmp->stats.dam += hitter->level / 2;
2077 else 2042 else
2078 tmp->stats.dam = dam; 2043 tmp->stats.dam = dam;
2079 2044
2080 copy_owner (tmp, hitter); /* so we get credit for poisoning kills */ 2045 tmp->set_owner (hitter); /* so we get credit for poisoning kills */
2081 if (hitter->skill && hitter->skill != tmp->skill) 2046 if (hitter->skill && hitter->skill != tmp->skill)
2082 { 2047 {
2083 tmp->skill = hitter->skill; 2048 tmp->skill = hitter->skill;
2084 } 2049 }
2085 2050
… …
2091 tmp->stats.Con = MAX (-(dam / 4 + 1), -10); 2056 tmp->stats.Con = MAX (-(dam / 4 + 1), -10);
2092 tmp->stats.Str = MAX (-(dam / 3 + 2), -10); 2057 tmp->stats.Str = MAX (-(dam / 3 + 2), -10);
2093 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2058 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2094 tmp->stats.Int = MAX (-dam / 7, -10); 2059 tmp->stats.Int = MAX (-dam / 7, -10);
2095 SET_FLAG (tmp, FLAG_APPLIED); 2060 SET_FLAG (tmp, FLAG_APPLIED);
2096 fix_player (op); 2061 op->update_stats ();
2097 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2062 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2098 } 2063 }
2099 if (hitter->type == PLAYER) 2064 if (hitter->type == PLAYER)
2100 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2065 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2101 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 2066 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2102 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 2067 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2103 } 2068 }
2104 tmp->speed_left = 0; 2069 tmp->speed_left = 0;
2105 } 2070 }
2106 else 2071 else
… …
2108} 2073}
2109 2074
2110void 2075void
2111slow_player (object *op, object *hitter, int dam) 2076slow_player (object *op, object *hitter, int dam)
2112{ 2077{
2113 archetype *at = find_archetype ("slowness"); 2078 archetype *at = archetype::find ("slowness");
2114 object *tmp; 2079 object *tmp;
2115 2080
2116 if (at == NULL) 2081 if (at == NULL)
2117 { 2082 {
2118 LOG (llevError, "Can't find slowness archetype.\n"); 2083 LOG (llevError, "Can't find slowness archetype.\n");
… …
2125 } 2090 }
2126 else 2091 else
2127 tmp->stats.food++; 2092 tmp->stats.food++;
2128 SET_FLAG (tmp, FLAG_APPLIED); 2093 SET_FLAG (tmp, FLAG_APPLIED);
2129 tmp->speed_left = 0; 2094 tmp->speed_left = 0;
2130 fix_player (op); 2095 op->update_stats ();
2131} 2096}
2132 2097
2133void 2098void
2134confuse_player (object *op, object *hitter, int dam) 2099confuse_player (object *op, object *hitter, int dam)
2135{ 2100{
… …
2179 */ 2144 */
2180 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100; 2145 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
2181 2146
2182 tmp = insert_ob_in_ob (tmp, op); 2147 tmp = insert_ob_in_ob (tmp, op);
2183 change_abil (op, tmp); /* Mostly to display any messages */ 2148 change_abil (op, tmp); /* Mostly to display any messages */
2184 fix_player (op); /* This takes care of some other stuff */ 2149 op->update_stats (); /* This takes care of some other stuff */
2185 2150
2186 if (hitter->owner) 2151 if (hitter->owner)
2187 owner = get_owner (hitter); 2152 owner = hitter->owner;
2188 else 2153 else
2189 owner = hitter; 2154 owner = hitter;
2190 2155
2191 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op)); 2156 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
2192 } 2157 }
… …
2229 op->speed_left = (float) -(FABS (op->speed) * max); 2194 op->speed_left = (float) -(FABS (op->speed) * max);
2230 2195
2231/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2196/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2232} 2197}
2233 2198
2234
2235/* Attempts to kill 'op'. hitter is the attack object, dam is 2199/* Attempts to kill 'op'. hitter is the attack object, dam is
2236 * the computed damaged. 2200 * the computed damaged.
2237 */ 2201 */
2238void 2202void
2239deathstrike_player (object *op, object *hitter, int *dam) 2203deathstrike_player (object *op, object *hitter, int *dam)
… …
2256 if (def_lev < 1) 2220 if (def_lev < 1)
2257 { 2221 {
2258 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2222 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name);
2259 def_lev = 1; 2223 def_lev = 1;
2260 } 2224 }
2225
2261 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2226 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2262 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2227 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2263 atk_lev, def_lev); */ 2228 atk_lev, def_lev); */
2264 2229
2265 if (atk_lev >= def_lev) 2230 if (atk_lev >= def_lev)
… …
2280 */ 2245 */
2281 *dam *= kill_lev / def_lev; 2246 *dam *= kill_lev / def_lev;
2282 } 2247 }
2283 } 2248 }
2284 else 2249 else
2285 {
2286 *dam = 0; /* no harm done */ 2250 *dam = 0; /* no harm done */
2287 }
2288} 2251}
2289 2252
2290/* thrown_item_effect() - handles any special effects of thrown 2253/* thrown_item_effect() - handles any special effects of thrown
2291 * items (like attacking living creatures--a potion thrown at a 2254 * items (like attacking living creatures--a potion thrown at a
2292 * monster). 2255 * monster).
… …
2338 } 2301 }
2339 2302
2340 /* aimed missiles use the owning object's sight */ 2303 /* aimed missiles use the owning object's sight */
2341 if (is_aimed_missile (hitter)) 2304 if (is_aimed_missile (hitter))
2342 { 2305 {
2343 if ((attacker = get_owner (hitter)) == NULL) 2306 if ((attacker = hitter->owner) == NULL)
2344 attacker = hitter; 2307 attacker = hitter;
2345 /* A player who saves but hasn't quit still could have objects 2308 /* A player who saves but hasn't quit still could have objects
2346 * owned by him - need to handle that case to avoid crashes. 2309 * owned by him - need to handle that case to avoid crashes.
2347 */ 2310 */
2348 if (QUERY_FLAG (attacker, FLAG_REMOVED)) 2311 if (QUERY_FLAG (attacker, FLAG_REMOVED))
… …
2396#endif 2359#endif
2397 2360
2398 return adjust; 2361 return adjust;
2399} 2362}
2400 2363
2401
2402/* determine if the object is an 'aimed' missile */ 2364/* determine if the object is an 'aimed' missile */
2403int 2365int
2404is_aimed_missile (object *op) 2366is_aimed_missile (object *op)
2405{ 2367{
2406 2368
… …
2412 if (op->type == ARROW || op->type == THROWN_OBJ) 2374 if (op->type == ARROW || op->type == THROWN_OBJ)
2413 return 1; 2375 return 1;
2414 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2376 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2415 return 1; 2377 return 1;
2416 } 2378 }
2379
2417 return 0; 2380 return 0;
2418} 2381}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines