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.10 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.78 by root, Mon Oct 22 03:11:46 2007 UTC

1
2/* 1/*
3 * static char *rcsid_attack_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
4 * "$Id: attack.C,v 1.10 2006/09/11 11:46:52 root Exp $"; 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
5 */ 22 */
6 23
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);
106 if (mt == NULL) 90
91 if (!mt)
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
… …
174 * function if the object doesnt contain a material that can burn. 161 * function if the object doesnt contain a material that can burn.
175 * So forget lighting magical swords on fire with this!) -b.t. 162 * So forget lighting magical swords on fire with this!) -b.t.
176 */ 163 */
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->archname;
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 }
295 284
296 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) 285 if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
297 { 286 {
298 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name); 287 LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
299 return 0; 288 return 0;
300 } 289 }
301 290
302 if (!op->map) 291 if (!op->map)
303 { 292 {
… …
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);
618
641 if (dam != 0) 619 if (dam != 0)
642 { 620 {
643 if (dam < 10) 621 if (dam < 10)
644 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0); 622 op->contr->play_sound (sound_find ("player_is_hit1"));
645 else if (dam < 20) 623 else if (dam < 20)
646 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0); 624 op->contr->play_sound (sound_find ("player_is_hit2"));
647 else 625 else
648 play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0); 626 op->contr->play_sound (sound_find ("player_is_hit3"));
649 } 627 }
650 } 628 }
629
651 new_draw_info (NDI_BLACK, 0, op, buf); 630 new_draw_info (NDI_BLACK, 0, op, buf);
652 } /* end of player hitting player */ 631 } /* end of player hitting player */
653 632
654 if (hitter->type == PLAYER) 633 if (hitter->type == PLAYER)
655 { 634 {
656 sprintf (buf, "You %s.", buf1); 635 sprintf (buf, "You %s.", buf1);
636
657 if (dam != 0) 637 if (dam != 0)
658 { 638 {
659 if (dam < 10) 639 if (dam < 10)
660 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0); 640 op->play_sound (sound_find ("player_hits1"));
661 else if (dam < 20) 641 else if (dam < 20)
662 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0); 642 op->play_sound (sound_find ("player_hits2"));
663 else 643 else
664 play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0); 644 op->play_sound (sound_find ("player_hits3"));
665 } 645 }
646
666 new_draw_info (NDI_BLACK, 0, hitter, buf); 647 new_draw_info (NDI_BLACK, 0, hitter, buf);
667 } 648 }
668 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 649 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
669 { 650 {
670 /* look for stacked spells and start reducing the message chances */ 651 /* 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)) 652 if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))
672 { 653 {
673 i = 4; 654 i = 4;
674 map = hitter->map; 655 map = hitter->map;
675 if (out_of_map (map, hitter->x, hitter->y)) 656 if (out_of_map (map, hitter->x, hitter->y))
676 return; 657 return;
658
677 next = get_map_ob (map, hitter->x, hitter->y); 659 next = GET_MAP_OB (map, hitter->x, hitter->y);
678 if (next) 660 if (next)
679 while (next) 661 while (next)
680 { 662 {
681 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE)) 663 if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
682 i *= 3; 664 i *= 3;
665
683 tmp = next; 666 tmp = next;
684 next = tmp->above; 667 next = tmp->above;
685 } 668 }
669
686 if (i < 0) 670 if (i < 0)
687 return; 671 return;
672
688 if (rndm (0, i) != 0) 673 if (rndm (0, i) != 0)
689 return; 674 return;
690 } 675 }
691 else if (rndm (0, 5) != 0) 676 else if (rndm (0, 5) != 0)
692 return; 677 return;
678
693 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name); 679 sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
694 play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4); 680 op->play_sound (sound_find ("player_hits4"));
695 new_draw_info (NDI_BLACK, 0, hitter->owner, buf); 681 new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
696 } 682 }
697} 683}
698 684
699 685
… …
703 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED)) 689 if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
704 { 690 {
705 LOG (llevError, "BUG: get_attack_mode(): freed object\n"); 691 LOG (llevError, "BUG: get_attack_mode(): freed object\n");
706 return 1; 692 return 1;
707 } 693 }
694
708 if ((*target)->head) 695 if ((*target)->head)
709 *target = (*target)->head; 696 *target = (*target)->head;
697
710 if ((*hitter)->head) 698 if ((*hitter)->head)
711 *hitter = (*hitter)->head; 699 *hitter = (*hitter)->head;
700
712 if ((*hitter)->env != NULL || (*target)->env != NULL) 701 if ((*hitter)->env != NULL || (*target)->env != NULL)
713 { 702 {
714 *simple_attack = 1; 703 *simple_attack = 1;
715 return 0; 704 return 0;
716 } 705 }
706
717 if (QUERY_FLAG (*target, FLAG_REMOVED) 707 if (QUERY_FLAG (*target, FLAG_REMOVED)
718 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 708 || QUERY_FLAG (*hitter, FLAG_REMOVED)
709 || !(*hitter)->map
710 || !on_same_map (*hitter, *target))
719 { 711 {
720 LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); 712 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
713 (*hitter)->debug_desc (), (*target)->debug_desc ());
721 return 1; 714 return 1;
722 } 715 }
716
723 *simple_attack = 0; 717 *simple_attack = 0;
724 return 0; 718 return 0;
725} 719}
726 720
727static int 721static int
… …
748attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc) 742attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
749{ 743{
750 int simple_attack, roll, dam = 0; 744 int simple_attack, roll, dam = 0;
751 uint32 type; 745 uint32 type;
752 shstr op_name; 746 shstr op_name;
753 tag_t op_tag, hitter_tag;
754 747
755 if (get_attack_mode (&op, &hitter, &simple_attack)) 748 if (get_attack_mode (&op, &hitter, &simple_attack))
756 goto error; 749 goto error;
757 750
758 if (hitter->current_weapon) 751 if (hitter->current_weapon)
759 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op))) 752 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
760 return RESULT_INT (0); 753 return RESULT_INT (0);
761 754
762 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter))) 755 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
763 return RESULT_INT (0); 756 return RESULT_INT (0);
764
765 op_tag = op->count;
766 hitter_tag = hitter->count;
767 757
768 /* 758 /*
769 * A little check to make it more difficult to dance forward and back 759 * A little check to make it more difficult to dance forward and back
770 * to avoid ever being hit by monsters. 760 * to avoid ever being hit by monsters.
771 */ 761 */
772 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3) 762 if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
773 { 763 {
774 /* Decrease speed BEFORE calling process_object. Otherwise, an 764 /* Decrease speed BEFORE calling process_object. Otherwise, an
775 * infinite loop occurs, with process_object calling move_monster, 765 * infinite loop occurs, with process_object calling move_monster,
776 * which then gets here again. By decreasing the speed before 766 * which then gets here again. By decreasing the speed before
777 * we call process_object, the 'if' statement above will fail. 767 * we call process_object, the 'if' statement above will fail.
778 */ 768 */
779 op->speed_left--; 769 --op->speed_left;
780 process_object (op); 770 process_object (op);
771
781 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 772 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
782 goto error; 773 goto error;
783 } 774 }
784 775
785 op_name = op->name; 776 op_name = op->name;
786 777
… …
793 /* See if we hit the creature */ 784 /* See if we hit the creature */
794 if (roll == 20 || op->stats.ac >= base_wc - roll) 785 if (roll == 20 || op->stats.ac >= base_wc - roll)
795 { 786 {
796 int hitdam = base_dam; 787 int hitdam = base_dam;
797 788
798 if (settings.casting_time == TRUE)
799 {
800 if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
801 {
802 hitter->casting_time = -1;
803 new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
804 }
805 if ((op->casting_time > -1) && (hitdam > 0))
806 {
807 op->casting_time = -1;
808 if (op->type == PLAYER)
809 {
810 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);
812 }
813 }
814 }
815 if (!simple_attack) 789 if (!simple_attack)
816 { 790 {
817 /* If you hit something, the victim should *always* wake up. 791 /* If you hit something, the victim should *always* wake up.
818 * Before, invisible hitters could avoid doing this. 792 * Before, invisible hitters could avoid doing this.
819 * -b.t. */ 793 * -b.t. */
820 if (QUERY_FLAG (op, FLAG_SLEEP)) 794 if (QUERY_FLAG (op, FLAG_SLEEP))
821 CLEAR_FLAG (op, FLAG_SLEEP); 795 CLEAR_FLAG (op, FLAG_SLEEP);
822 796
823 /* If the victim can't see the attacker, it may alert others 797 /* If the victim can't see the attacker, it may alert others
824 * for help. */ 798 * for help. */
825 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !get_owner (op) && rndm (0, op->stats.Int)) 799 if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
826 npc_call_help (op); 800 npc_call_help (op);
827 801
828 /* if you were hidden and hit by a creature, you are discovered */ 802 /* if you were hidden and hit by a creature, you are discovered */
829 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE)) 803 if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
830 { 804 {
831 make_visible (op); 805 make_visible (op);
806
832 if (op->type == PLAYER) 807 if (op->type == PLAYER)
833 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!"); 808 new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
834 } 809 }
835 810
836 /* thrown items (hitter) will have various effects 811 /* thrown items (hitter) will have various effects
837 * when they hit the victim. For things like thrown daggers, 812 * when they hit the victim. For things like thrown daggers,
838 * this sets 'hitter' to the actual dagger, and not the 813 * this sets 'hitter' to the actual dagger, and not the
839 * wrapper object. 814 * wrapper object.
840 */ 815 */
841 thrown_item_effect (hitter, op); 816 thrown_item_effect (hitter, op);
817
842 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack)) 818 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
843 goto leave; 819 goto leave;
844 } 820 }
845 821
846 /* Need to do at least 1 damage, otherwise there is no point 822 /* Need to do at least 1 damage, otherwise there is no point
847 * to go further and it will cause FPE's below. 823 * to go further and it will cause FPE's below.
848 */ 824 */
849 if (hitdam <= 0) 825 if (hitdam <= 0)
850 hitdam = 1; 826 hitdam = 1;
851 827
852 type = hitter->attacktype; 828 type = hitter->attacktype;
829
853 if (!type) 830 if (!type)
854 type = AT_PHYSICAL; 831 type = AT_PHYSICAL;
832
855 /* Handle monsters that hit back */ 833 /* Handle monsters that hit back */
856 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE)) 834 if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
857 { 835 {
858 if (op->attacktype & AT_ACID && hitter->type == PLAYER) 836 if (op->attacktype & AT_ACID && hitter->type == PLAYER)
859 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n"); 837 new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
838
860 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1); 839 hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
840
861 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 841 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
862 goto leave; 842 goto leave;
863 } 843 }
864 844
865 /* In the new attack code, it should handle multiple attack 845 /* In the new attack code, it should handle multiple attack
866 * types in its area, so remove it from here. 846 * types in its area, so remove it from here.
867 */ 847 */
868 dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1); 848 dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);
849
869 if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack)) 850 if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
870 goto leave; 851 goto leave;
871 } /* end of if hitter hit op */ 852 } /* end of if hitter hit op */
872 /* if we missed, dam=0 */ 853 /* if we missed, dam=0 */
873 854
874 /*attack_message(dam, type, op, hitter); */ 855 /*attack_message(dam, type, op, hitter); */
… …
884} 865}
885 866
886int 867int
887attack_ob (object *op, object *hitter) 868attack_ob (object *op, object *hitter)
888{ 869{
889
890 if (hitter->head)
891 hitter = hitter->head; 870 hitter = hitter->head_ ();
871
892 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc); 872 return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
893} 873}
894 874
895/* op is the arrow, tmp is what is stopping the arrow. 875/* op is the arrow, tmp is what is stopping the arrow.
896 * 876 *
… …
905 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons 885 * debate - 5000 is 5 kg, so arrows, knives, and other light weapons
906 * stick around. 886 * stick around.
907 */ 887 */
908 if (op->weight <= 5000 && tmp->stats.hp >= 0) 888 if (op->weight <= 5000 && tmp->stats.hp >= 0)
909 { 889 {
910 if (tmp->head != NULL)
911 tmp = tmp->head; 890 tmp = tmp->head_ ();
912 891
913 remove_ob (op); 892 op->remove ();
914 op = insert_ob_in_ob (op, tmp); 893 op = insert_ob_in_ob (op, tmp);
915 894
916 if (tmp->type == PLAYER) 895 if (tmp->type == PLAYER)
917 esrv_send_item (tmp, op); 896 esrv_send_item (tmp, op);
918 897
… …
931object * 910object *
932hit_with_arrow (object *op, object *victim) 911hit_with_arrow (object *op, object *victim)
933{ 912{
934 object *container, *hitter; 913 object *container, *hitter;
935 int hit_something = 0; 914 int hit_something = 0;
936 tag_t victim_tag, hitter_tag;
937 sint16 victim_x, victim_y;
938 915
939 /* Disassemble missile */ 916 /* Disassemble missile */
940 if (op->inv) 917 if (op->inv)
941 { 918 {
942 container = op; 919 container = op;
943 hitter = op->inv; 920 hitter = op->inv;
944 remove_ob (hitter); 921 hitter->remove ();
945 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON); 922 insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
946 /* Note that we now have an empty THROWN_OBJ on the map. Code that 923 /* Note that we now have an empty THROWN_OBJ on the map. Code that
947 * might be called until this THROWN_OBJ is either reassembled or 924 * might be called until this THROWN_OBJ is either reassembled or
948 * removed at the end of this function must be able to deal with empty 925 * removed at the end of this function must be able to deal with empty
949 * THROWN_OBJs. */ 926 * THROWN_OBJs. */
950 } 927 }
951 else 928 else
952 { 929 {
953 container = NULL; 930 container = 0;
954 hitter = op; 931 hitter = op;
955 } 932 }
956 933
957 /* Try to hit victim */ 934 /* Try to hit victim */
958 victim_x = victim->x;
959 victim_y = victim->y;
960 victim_tag = victim->count;
961 hitter_tag = hitter->count;
962
963 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc); 935 hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);
964 936
965 /* Arrow attacks door, rune of summoning is triggered, demon is put on 937 /* Arrow attacks door, rune of summoning is triggered, demon is put on
966 * arrow, move_apply() calls this function, arrow sticks in demon, 938 * arrow, move_apply() calls this function, arrow sticks in demon,
967 * attack_ob_simple() returns, and we've got an arrow that still exists 939 * attack_ob_simple() returns, and we've got an arrow that still exists
968 * but is no longer on the map. Ugh. (Beware: Such things can happen at 940 * but is no longer on the map. Ugh. (Beware: Such things can happen at
969 * other places as well!) 941 * other places as well!)
970 */ 942 */
971 if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL) 943 if (hitter->destroyed () || hitter->env != NULL)
972 { 944 {
973 if (container) 945 if (container)
974 { 946 {
975 remove_ob (container); 947 container->remove ();
976 free_object (container); 948 container->destroy ();
977 } 949 }
950
978 return NULL; 951 return 0;
979 } 952 }
980 953
981 /* Missile hit victim */ 954 /* Missile hit victim */
982 /* if the speed is > 10, then this is a fast moving arrow, we go straight 955 /* if the speed is > 10, then this is a fast moving arrow, we go straight
983 * through the target 956 * through the target
984 */ 957 */
985 if (hit_something && op->speed <= 10.0) 958 if (hit_something && op->speed <= 10.0)
986 { 959 {
987 /* Stop arrow */ 960 /* Stop arrow */
988 if (container == NULL) 961 if (!container)
989 { 962 {
990 hitter = fix_stopped_arrow (hitter); 963 hitter = fix_stopped_arrow (hitter);
991 if (hitter == NULL) 964 if (!hitter)
992 return NULL; 965 return 0;
993 } 966 }
994 else 967 else
995 { 968 container->destroy ();
996 remove_ob (container);
997 free_object (container);
998 }
999 969
1000 /* Try to stick arrow into victim */ 970 /* Try to stick arrow into victim */
1001 if (!was_destroyed (victim, victim_tag) && stick_arrow (hitter, victim)) 971 if (!victim->destroyed () && stick_arrow (hitter, victim))
1002 return NULL; 972 return 0;
1003 973
1004 /* Else try to put arrow on victim's map square 974 /* Else try to put arrow on victim's map square
1005 * remove check for P_WALL here. If the arrow got to this 975 * remove check for P_WALL here. If the arrow got to this
1006 * space, that is good enough - with the new movement code, 976 * space, that is good enough - with the new movement code,
1007 * there is now the potential for lots of spaces where something 977 * there is now the potential for lots of spaces where something
1008 * can fly over but not otherwise move over. What is the correct 978 * can fly over but not otherwise move over. What is the correct
1009 * way to handle those otherwise? 979 * way to handle those otherwise?
1010 */ 980 */
1011 if (victim_x != hitter->x || victim_y != hitter->y) 981 if (victim->x != hitter->x || victim->y != hitter->y)
1012 { 982 {
1013 remove_ob (hitter); 983 hitter->remove ();
1014 hitter->x = victim_x; 984 hitter->x = victim->x;
1015 hitter->y = victim_y; 985 hitter->y = victim->y;
1016 insert_ob_in_map (hitter, victim->map, hitter, 0); 986 insert_ob_in_map (hitter, victim->map, hitter, 0);
1017 } 987 }
1018 else 988 else
1019 {
1020 /* Else leave arrow where it is */ 989 /* Else leave arrow where it is */
1021 merge_ob (hitter, NULL); 990 merge_ob (hitter, NULL);
1022 } 991
1023 return NULL; 992 return 0;
1024 } 993 }
1025 994
1026 if (hit_something && op->speed >= 10.0) 995 if (hit_something && op->speed >= 10.0)
1027 op->speed -= 1.0; 996 op->speed -= 1.0;
1028 997
1029 /* Missile missed victim - reassemble missile */ 998 /* Missile missed victim - reassemble missile */
1030 if (container) 999 if (container)
1031 { 1000 {
1032 remove_ob (hitter); 1001 hitter->remove ();
1033 insert_ob_in_ob (hitter, container); 1002 insert_ob_in_ob (hitter, container);
1034 } 1003 }
1004
1035 return op; 1005 return op;
1036} 1006}
1037
1038 1007
1039void 1008void
1040tear_down_wall (object *op) 1009tear_down_wall (object *op)
1041{ 1010{
1042 int perc = 0; 1011 int perc = 0;
… …
1048 } 1017 }
1049 else if (!GET_ANIM_ID (op)) 1018 else if (!GET_ANIM_ID (op))
1050 { 1019 {
1051 /* Object has been called - no animations, so remove it */ 1020 /* Object has been called - no animations, so remove it */
1052 if (op->stats.hp < 0) 1021 if (op->stats.hp < 0)
1022 op->destroy ();
1053 { 1023
1054 remove_ob (op); /* Should update LOS */
1055 free_object (op);
1056 /* Don't know why this is here - remove_ob should do it for us */
1057 /*update_position(m, x, y); */
1058 }
1059 return; /* no animations, so nothing more to do */ 1024 return; /* no animations, so nothing more to do */
1060 } 1025 }
1026
1061 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp; 1027 perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;
1028
1062 if (perc >= (int) NUM_ANIMATIONS (op)) 1029 if (perc >= (int) NUM_ANIMATIONS (op))
1063 perc = NUM_ANIMATIONS (op) - 1; 1030 perc = NUM_ANIMATIONS (op) - 1;
1064 else if (perc < 1) 1031 else if (perc < 1)
1065 perc = 1; 1032 perc = 1;
1033
1066 SET_ANIMATION (op, perc); 1034 SET_ANIMATION (op, perc);
1067 update_object (op, UP_OBJ_FACE); 1035 update_object (op, UP_OBJ_FACE);
1036
1068 if (perc == NUM_ANIMATIONS (op) - 1) 1037 if (perc == NUM_ANIMATIONS (op) - 1)
1069 { /* Reached the last animation */ 1038 { /* Reached the last animation */
1070 if (op->face == blank_face) 1039 if (op->face == blank_face)
1071 {
1072 /* If the last face is blank, remove the ob */ 1040 /* If the last face is blank, remove the ob */
1073 remove_ob (op); /* Should update LOS */ 1041 op->destroy ();
1074 free_object (op);
1075
1076 /* remove_ob should call update_position for us */
1077 /*update_position(m, x, y); */
1078
1079 }
1080 else 1042 else
1081 { /* The last face was not blank, leave an image */ 1043 { /* The last face was not blank, leave an image */
1082 CLEAR_FLAG (op, FLAG_BLOCKSVIEW); 1044 CLEAR_FLAG (op, FLAG_BLOCKSVIEW);
1083 update_all_los (op->map, op->x, op->y); 1045 update_all_los (op->map, op->x, op->y);
1084 op->move_block = 0; 1046 op->move_block = 0;
… …
1088} 1050}
1089 1051
1090void 1052void
1091scare_creature (object *target, object *hitter) 1053scare_creature (object *target, object *hitter)
1092{ 1054{
1093 object *owner = get_owner (hitter); 1055 object *owner = hitter->owner;
1094 1056
1095 if (!owner) 1057 if (!owner)
1096 owner = hitter; 1058 owner = hitter;
1097 1059
1098 SET_FLAG (target, FLAG_SCARED); 1060 SET_FLAG (target, FLAG_SCARED);
1099 if (!target->enemy) 1061 if (!target->enemy)
1100 target->enemy = owner; 1062 target->enemy = owner;
1101} 1063}
1102
1103 1064
1104/* This returns the amount of damage hitter does to op with the 1065/* This returns the amount of damage hitter does to op with the
1105 * appropriate attacktype. Only 1 attacktype should be set at a time. 1066 * appropriate attacktype. Only 1 attacktype should be set at a time.
1106 * This doesn't damage the player, but returns how much it should 1067 * This doesn't damage the player, but returns how much it should
1107 * take. However, it will do other effects (paralyzation, slow, etc.) 1068 * take. However, it will do other effects (paralyzation, slow, etc.)
1108 * Note - changed for PR code - we now pass the attack number and not 1069 * Note - changed for PR code - we now pass the attack number and not
1109 * the attacktype. Makes it easier for the PR code. */ 1070 * the attacktype. Makes it easier for the PR code. */
1110
1111int 1071int
1112hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic) 1072hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1113{ 1073{
1114
1115 int doesnt_slay = 1; 1074 int doesnt_slay = 1;
1116 1075
1117 /* Catch anyone that may be trying to send us a bitmask instead of the number */ 1076 /* Catch anyone that may be trying to send us a bitmask instead of the number */
1118 if (attacknum >= NROFATTACKS) 1077 if (attacknum >= NROFATTACKS)
1119 { 1078 {
… …
1121 return 0; 1080 return 0;
1122 } 1081 }
1123 1082
1124 if (dam < 0) 1083 if (dam < 0)
1125 { 1084 {
1126 LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam); 1085 LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
1086 dam, hitter->debug_desc (), op->debug_desc ());
1127 return 0; 1087 return 0;
1128 } 1088 }
1129 1089
1130 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so 1090 /* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1131 * people can't mess with that or it otherwise get confused. */ 1091 * people can't mess with that or it otherwise get confused. */
1132 if (attacknum == ATNR_INTERNAL) 1092 if (attacknum == ATNR_INTERNAL)
1133 return dam; 1093 return dam;
1134 1094
1135 if (hitter->slaying) 1095 if (hitter->slaying)
1136 { 1096 {
1137 if (((op->race != NULL) && strstr (hitter->slaying, op->race)) || 1097 if ((op->race && strstr (hitter->slaying, op->race))
1138 (op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying))) 1098 || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
1139 { 1099 {
1140 doesnt_slay = 0; 1100 doesnt_slay = 0;
1141 dam *= 3; 1101 dam *= 3;
1142 } 1102 }
1143 } 1103 }
… …
1157 /* Special hack. By default, if immune to something, you 1117 /* Special hack. By default, if immune to something, you
1158 * shouldn't need to worry. However, acid is an exception, since 1118 * shouldn't need to worry. However, acid is an exception, since
1159 * it can still damage your items. Only include attacktypes if 1119 * it can still damage your items. Only include attacktypes if
1160 * special processing is needed */ 1120 * special processing is needed */
1161 1121
1162 if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID)) 1122 if (op->resist[attacknum] >= 100
1123 && doesnt_slay
1124 && attacknum != ATNR_ACID)
1163 return 0; 1125 return 0;
1164 1126
1165 /* Keep this in order - makes things easier to find */ 1127 /* Keep this in order - makes things easier to find */
1166 1128
1167 switch (attacknum) 1129 switch (attacknum)
1168 { 1130 {
1169 case ATNR_PHYSICAL: 1131 case ATNR_PHYSICAL:
1170 /* here also check for diseases */ 1132 /* here also check for diseases */
1171 check_physically_infect (op, hitter); 1133 check_physically_infect (op, hitter);
1172 break; 1134 break;
1173 1135
1174 /* Don't need to do anything for: 1136 /* Don't need to do anything for:
1175 magic, 1137 magic,
1176 fire, 1138 fire,
1177 electricity, 1139 electricity,
1178 cold */ 1140 cold */
1179 1141
1180 case ATNR_CONFUSION: 1142 case ATNR_CONFUSION:
1181 case ATNR_POISON: 1143 case ATNR_POISON:
1182 case ATNR_SLOW: 1144 case ATNR_SLOW:
1183 case ATNR_PARALYZE: 1145 case ATNR_PARALYZE:
1184 case ATNR_FEAR: 1146 case ATNR_FEAR:
1185 case ATNR_CANCELLATION: 1147 case ATNR_CANCELLATION:
1186 case ATNR_DEPLETE: 1148 case ATNR_DEPLETE:
1187 case ATNR_BLIND: 1149 case ATNR_BLIND:
1188 { 1150 {
1189 /* chance for inflicting a special attack depends on the 1151 /* chance for inflicting a special attack depends on the
1190 * difference between attacker's and defender's level 1152 * difference between attacker's and defender's level
1191 */ 1153 */
1192 int level_diff = MIN (110, MAX (0, op->level - hitter->level)); 1154 int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1193 1155
1194 /* First, only creatures/players with speed can be affected. 1156 /* First, only creatures/players with speed can be affected.
1195 * Second, just getting hit doesn't mean it always affects 1157 * Second, just getting hit doesn't mean it always affects
1196 * you. Third, you still get a saving through against the 1158 * you. Third, you still get a saving through against the
1197 * effect. 1159 * effect.
1198 */ 1160 */
1199 if (op->speed && 1161 if (op->speed &&
1200 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) && 1162 (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1201 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10)) 1163 !(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1202 { 1164 {
1203 1165
1204 /* Player has been hit by something */ 1166 /* Player has been hit by something */
1205 if (attacknum == ATNR_CONFUSION) 1167 if (attacknum == ATNR_CONFUSION)
1206 confuse_player (op, hitter, dam); 1168 confuse_player (op, hitter, dam);
1207 else if (attacknum == ATNR_POISON) 1169 else if (attacknum == ATNR_POISON)
1208 poison_player (op, hitter, dam); 1170 poison_player (op, hitter, dam);
1209 else if (attacknum == ATNR_SLOW) 1171 else if (attacknum == ATNR_SLOW)
1210 slow_player (op, hitter, dam); 1172 slow_player (op, hitter, dam);
1211 else if (attacknum == ATNR_PARALYZE) 1173 else if (attacknum == ATNR_PARALYZE)
1212 paralyze_player (op, hitter, dam); 1174 paralyze_player (op, hitter, dam);
1213 else if (attacknum == ATNR_FEAR) 1175 else if (attacknum == ATNR_FEAR)
1214 scare_creature (op, hitter); 1176 scare_creature (op, hitter);
1215 else if (attacknum == ATNR_CANCELLATION) 1177 else if (attacknum == ATNR_CANCELLATION)
1216 cancellation (op); 1178 cancellation (op);
1217 else if (attacknum == ATNR_DEPLETE) 1179 else if (attacknum == ATNR_DEPLETE)
1218 drain_stat (op); 1180 op->drain_stat ();
1219 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR)) 1181 else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1220 blind_player (op, hitter, dam); 1182 blind_player (op, hitter, dam);
1221 } 1183 }
1184
1222 dam = 0; /* These are all effects and don't do real damage */ 1185 dam = 0; /* These are all effects and don't do real damage */
1223 } 1186 }
1224 break; 1187 break;
1188
1225 case ATNR_ACID: 1189 case ATNR_ACID:
1226 { 1190 {
1227 int flag = 0; 1191 int flag = 0;
1228 1192
1229 /* Items only get corroded if you're not on a battleground and 1193 /* Items only get corroded if you're not on a battleground and
1230 * if your acid resistance is below 50%. */ 1194 * if your acid resistance is below 50%. */
1231 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50)) 1195 if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1232 { 1196 {
1233 object *tmp;
1234
1235 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1197 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1236 { 1198 {
1237 if (tmp->invisible) 1199 if (tmp->invisible)
1238 continue; 1200 continue;
1239 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10)) 1201 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1240 /* >= 10% acid res. on itmes will protect these */ 1202 /* >= 10% acid res. on items will protect these */
1241 continue; 1203 continue;
1242 if (!(tmp->material & M_IRON)) 1204 if (!(tmp->materials & M_IRON))
1243 continue; 1205 continue;
1244 if (tmp->magic < -4) /* Let's stop at -5 */ 1206 if (tmp->magic < -4) /* Let's stop at -5 */
1245 continue; 1207 continue;
1246 if (tmp->type == RING || 1208 if (tmp->type == RING
1247 /* removed boots and gloves from exclusion list in 1209 /* removed boots and gloves from exclusion list in PR */
1248 PR */ 1210 || tmp->type == GIRDLE
1249 tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1211 || tmp->type == AMULET
1212 || tmp->type == WAND
1213 || tmp->type == ROD
1214 || tmp->type == HORN)
1250 continue; /* To avoid some strange effects */ 1215 continue; /* To avoid some strange effects */
1251 1216
1252 /* High damage acid has better chance of corroding 1217 /* High damage acid has better chance of corroding
1253 objects */ 1218 objects */
1254 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic) 1219 if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1255 { 1220 {
1256 if (op->type == PLAYER) 1221 if (op->type == PLAYER)
1257 /* Make this more visible */ 1222 /* Make this more visible */
1258 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, 1223 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,
1259 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp)); 1224 "The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1260 flag = 1; 1225 flag = 1;
1261 tmp->magic--; 1226 tmp->magic--;
1262 if (op->type == PLAYER) 1227 if (op->type == PLAYER)
1263 esrv_send_item (op, tmp); 1228 esrv_send_item (op, tmp);
1264 } 1229 }
1265 } 1230 }
1266 if (flag)
1267 fix_player (op); /* Something was corroded */
1268 } 1231
1232 if (flag)
1233 op->update_stats (); /* Something was corroded */
1269 } 1234 }
1235 }
1270 break; 1236 break;
1237
1271 case ATNR_DRAIN: 1238 case ATNR_DRAIN:
1272 { 1239 {
1273 /* rate is the proportion of exp drained. High rate means 1240 /* rate is the proportion of exp drained. High rate means
1274 * not much is drained, low rate means a lot is drained. 1241 * not much is drained, low rate means a lot is drained.
1275 */ 1242 */
1276 int rate; 1243 int rate;
1277 1244
1278 if (op->resist[ATNR_DRAIN] >= 0) 1245 if (op->resist[ATNR_DRAIN] >= 0)
1279 rate = 400 + op->resist[ATNR_DRAIN] * 3; 1246 rate = 400 + op->resist[ATNR_DRAIN] * 3;
1280 else 1247 else
1281 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]); 1248 rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1282 1249
1283 if (op->stats.exp <= rate) 1250 if (op->stats.exp <= rate)
1284 { 1251 {
1285 if (op->type == GOLEM) 1252 if (op->type == GOLEM)
1286 dam = 999; /* Its force is "sucked" away. 8) */ 1253 dam = 999; /* Its force is "sucked" away. 8) */
1287 else 1254 else
1288 /* If we can't drain, lets try to do physical damage */ 1255 /* If we can't drain, lets try to do physical damage */
1289 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic); 1256 dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1290 } 1257 }
1291 else 1258 else
1292 { 1259 {
1293 /* Randomly give the hitter some hp */ 1260 /* Randomly give the hitter some hp */
1294 if (hitter->stats.hp < hitter->stats.maxhp && 1261 if (hitter->stats.hp < hitter->stats.maxhp &&
1295 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3) 1262 (op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1296 hitter->stats.hp++; 1263 hitter->stats.hp++;
1297 1264
1298 /* Can't do drains on battleground spaces. 1265 /* Can't do drains on battleground spaces.
1299 * Move the wiz check up here - before, the hitter wouldn't gain exp 1266 * Move the wiz check up here - before, the hitter wouldn't gain exp
1300 * exp, but the wiz would still lose exp! If drainee is a wiz, 1267 * exp, but the wiz would still lose exp! If drainee is a wiz,
1301 * nothing happens. 1268 * nothing happens.
1302 * Try to credit the owner. We try to display player -> player drain 1269 * Try to credit the owner. We try to display player -> player drain
1303 * attacks, hence all the != PLAYER checks. 1270 * attacks, hence all the != PLAYER checks.
1304 */ 1271 */
1305 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1272 if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1306 { 1273 {
1307 object *owner = get_owner (hitter); 1274 object *owner = hitter->owner;
1308 1275
1309 if (owner && owner != hitter) 1276 if (owner && owner != hitter)
1310 { 1277 {
1311 if (op->type != PLAYER || owner->type != PLAYER) 1278 if (op->type != PLAYER || owner->type != PLAYER)
1312 change_exp (owner, op->stats.exp / (rate * 2), 1279 change_exp (owner, op->stats.exp / (rate * 2),
1313 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL); 1280 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1314 } 1281 }
1315 else if (op->type != PLAYER || hitter->type != PLAYER) 1282 else if (op->type != PLAYER || hitter->type != PLAYER)
1316 {
1317 change_exp (hitter, op->stats.exp / (rate * 2), 1283 change_exp (hitter, op->stats.exp / (rate * 2),
1318 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0); 1284 hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1319 } 1285
1320 change_exp (op, -op->stats.exp / rate, NULL, 0); 1286 change_exp (op, -op->stats.exp / rate, NULL, 0);
1321 } 1287 }
1288
1322 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure 1289 dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1323 * drain attack, you won't know that you are actually sucking out EXP, 1290 * drain attack, you won't know that you are actually sucking out EXP,
1324 * as the messages will say you missed 1291 * as the messages will say you missed
1325 */ 1292 */
1326 } 1293 }
1327 } 1294 }
1328 break; 1295 break;
1296
1329 case ATNR_TURN_UNDEAD: 1297 case ATNR_TURN_UNDEAD:
1330 { 1298 {
1331 if (QUERY_FLAG (op, FLAG_UNDEAD)) 1299 if (QUERY_FLAG (op, FLAG_UNDEAD))
1332 { 1300 {
1333 object *owner = get_owner (hitter) == NULL ? hitter : get_owner (hitter); 1301 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1334 object *god = find_god (determine_god (owner)); 1302 object *god = find_god (determine_god (owner));
1335 int div = 1; 1303 int div = 1;
1336 1304
1337 /* if undead are not an enemy of your god, you turn them 1305 /* if undead are not an enemy of your god, you turn them
1338 * at half strength */ 1306 * at half strength */
1339 if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL) 1307 if (!god || !god->slaying || strstr (god->slaying, shstr_undead) == NULL)
1340 div = 2; 1308 div = 2;
1309
1341 /* Give a bonus if you resist turn undead */ 1310 /* Give a bonus if you resist turn undead */
1342 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100))) 1311 if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1343 scare_creature (op, owner); 1312 scare_creature (op, owner);
1344 } 1313 }
1345 else 1314 else
1346 dam = 0; /* don't damage non undead - should we damage 1315 dam = 0; /* don't damage non undead - should we damage
1347 undead? */ 1316 undead? */
1348 } 1317 }
1349 break; 1318 break;
1319
1350 case ATNR_DEATH: 1320 case ATNR_DEATH:
1351 deathstrike_player (op, hitter, &dam); 1321 deathstrike_player (op, hitter, &dam);
1352 break; 1322 break;
1323
1353 case ATNR_CHAOS: 1324 case ATNR_CHAOS:
1354 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter)); 1325 LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1355 dam = 0; 1326 dam = 0;
1356 break; 1327 break;
1328
1357 case ATNR_COUNTERSPELL: 1329 case ATNR_COUNTERSPELL:
1358 LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter)); 1330 LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1359 dam = 0; 1331 dam = 0;
1360 /* This should never happen. Counterspell is handled 1332 /* This should never happen. Counterspell is handled
1361 * seperately and filtered out. If this does happen, 1333 * seperately and filtered out. If this does happen,
1362 * Counterspell has no effect on anything but spells, so it 1334 * Counterspell has no effect on anything but spells, so it
1363 * does no damage. */ 1335 * does no damage. */
1364 break; 1336 break;
1337
1365 case ATNR_HOLYWORD: 1338 case ATNR_HOLYWORD:
1366 { 1339 {
1367 /* This has already been handled by hit_player, 1340 /* This has already been handled by hit_player,
1368 * no need to check twice -- DAMN */ 1341 * no need to check twice -- DAMN */
1342 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1369 1343
1370 object *owner = get_owner (hitter) == NULL ? hitter : get_owner (hitter);
1371
1372 /* As with turn undead above, give a bonus on the saving throw */ 1344 /* As with turn undead above, give a bonus on the saving throw */
1373 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis]) 1345 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1374 scare_creature (op, owner); 1346 scare_creature (op, owner);
1375 } 1347 }
1376 break; 1348 break;
1349
1377 case ATNR_LIFE_STEALING: 1350 case ATNR_LIFE_STEALING:
1378 { 1351 {
1379 int new_hp; 1352 int new_hp;
1380 1353
1381 /* this is replacement to drain for players, instead of taking 1354 /* this is replacement to drain for players, instead of taking
1382 * exp it takes hp. It is geared for players, probably not 1355 * exp it takes hp. It is geared for players, probably not
1383 * much use giving it to monsters 1356 * much use giving it to monsters
1384 * 1357 *
1385 * life stealing doesn't do a lot of damage, but it gives the 1358 * life stealing doesn't do a lot of damage, but it gives the
1386 * damage it does do to the player. Given that, 1359 * damage it does do to the player. Given that,
1387 * it only does 1/10'th normal damage (hence the divide by 1360 * it only does 1/10'th normal damage (hence the divide by
1388 * 1000). 1361 * 1000).
1389 */ 1362 */
1390 /* You can't steal life from something undead */ 1363 /* You can't steal life from something undead */
1391 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD))) 1364 if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1392 return 0; 1365 return 0;
1366
1393 /* If drain protection is higher than life stealing, use that */ 1367 /* If drain protection is higher than life stealing, use that */
1394 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING]) 1368 if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1395 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000; 1369 dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1396 else 1370 else
1397 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000; 1371 dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
1372
1398 /* You die at -1 hp, not zero. */ 1373 /* You die at -1 hp, not zero. */
1399 if (dam > (op->stats.hp + 1)) 1374 if (dam > (op->stats.hp + 1))
1400 dam = op->stats.hp + 1; 1375 dam = op->stats.hp + 1;
1376
1401 new_hp = hitter->stats.hp + dam; 1377 new_hp = hitter->stats.hp + dam;
1402 if (new_hp > hitter->stats.maxhp) 1378 if (new_hp > hitter->stats.maxhp)
1403 new_hp = hitter->stats.maxhp; 1379 new_hp = hitter->stats.maxhp;
1380
1404 if (new_hp > hitter->stats.hp) 1381 if (new_hp > hitter->stats.hp)
1405 hitter->stats.hp = new_hp; 1382 hitter->stats.hp = new_hp;
1406 } 1383 }
1407 } 1384 }
1385
1408 return dam; 1386 return dam;
1409} 1387}
1410
1411 1388
1412/* GROS: This code comes from hit_player. It has been made external to 1389/* GROS: This code comes from hit_player. It has been made external to
1413 * allow script procedures to "kill" objects in a combat-like fashion. 1390 * allow script procedures to "kill" objects in a combat-like fashion.
1414 * It was initially used by (kill-object) developed for the Collector's 1391 * It was initially used by (kill-object) developed for the Collector's
1415 * Sword. Note that nothing has been changed from the original version 1392 * Sword. Note that nothing has been changed from the original version
… …
1430 char buf[MAX_BUF]; 1407 char buf[MAX_BUF];
1431 const char *skill; 1408 const char *skill;
1432 int maxdam = 0; 1409 int maxdam = 0;
1433 int battleg = 0; /* true if op standing on battleground */ 1410 int battleg = 0; /* true if op standing on battleground */
1434 int pk = 0; /* true if op and what controls hitter are both players */ 1411 int pk = 0; /* true if op and what controls hitter are both players */
1435 object *owner = NULL; 1412 object *owner = 0;
1436 object *skop = NULL; 1413 object *skop = 0;
1437 1414
1438 if (op->stats.hp >= 0) 1415 if (op->stats.hp >= 0)
1439 return -1; 1416 return -1;
1440 1417
1441 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter))) 1418 if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
… …
1450 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW)) 1427 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1451 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */ 1428 update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1452 1429
1453 if (op->type == DOOR) 1430 if (op->type == DOOR)
1454 { 1431 {
1455 op->speed = 0.1; 1432 op->set_speed (0.1f);
1456 update_ob_speed (op);
1457 op->speed_left = -0.05; 1433 op->speed_left = -0.05f;
1458 return maxdam; 1434 return maxdam;
1459 } 1435 }
1436
1460 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1437 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1461 { 1438 {
1462 remove_friendly_object (op); 1439 op->destroy ();
1463 if (get_owner (op) != NULL && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1464 {
1465 op->owner->contr->ranges[range_golem] = NULL;
1466 op->owner->contr->golem_count = 0;
1467 }
1468
1469 remove_ob (op);
1470 free_object (op);
1471 return maxdam; 1440 return maxdam;
1472 } 1441 }
1473 1442
1474 /* Now lets start dealing with experience we get for killing something */ 1443 /* Now lets start dealing with experience we get for killing something */
1475 1444
1476 owner = get_owner (hitter); 1445 owner = hitter->owner;
1477 if (owner == NULL) 1446 if (!owner)
1478 owner = hitter; 1447 owner = hitter;
1479 1448
1480 /* is the victim (op) standing on battleground? */ 1449 /* is the victim (op) standing on battleground? */
1481 if (op_on_battleground (op, NULL, NULL)) 1450 if (op_on_battleground (op, NULL, NULL))
1482 battleg = 1; 1451 battleg = 1;
… …
1502 char buf[256]; 1471 char buf[256];
1503 1472
1504 tmv = localtime (&t); 1473 tmv = localtime (&t);
1505 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv); 1474 strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);
1506 1475
1507 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->socket.host, query_name (op)); 1476 LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->ns->host, query_name (op));
1508 } 1477 }
1509 1478
1510 /* try to filter some things out - basically, if you are 1479 /* try to filter some things out - basically, if you are
1511 * killing a level 1 creature and your level 20, you 1480 * killing a level 1 creature and your level 20, you
1512 * probably don't want to see that. 1481 * probably don't want to see that.
1513 */ 1482 */
1514 if (owner->level < op->level * 2 || op->stats.exp > 1000) 1483 if (owner->level < op->level * 2 || op->stats.exp > 1000)
1515 { 1484 {
1516 if (owner != hitter) 1485 if (owner != hitter)
1517 {
1518 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter)); 1486 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));
1519 }
1520 else 1487 else
1521 {
1522 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op)); 1488 new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1523 } 1489
1524 /* Only play sounds for melee kills */ 1490 /* Only play sounds for melee kills */
1525 if (hitter->type == PLAYER) 1491 if (hitter->type == PLAYER)
1526 play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS); 1492 owner->play_sound (sound_find ("player_kills"));
1527 } 1493 }
1528 1494
1529 /* If a player kills another player, not on 1495 /* If a player kills another player, not on
1530 * battleground, the "killer" looses 1 luck. Since this is 1496 * battleground, the "killer" looses 1 luck. Since this is
1531 * not reversible, it's actually quite a pain IMHO. -AV 1497 * not reversible, it's actually quite a pain IMHO. -AV
… …
1533 * player that the object belonged to - so if you killed another player 1499 * player that the object belonged to - so if you killed another player
1534 * with spells, pets, whatever, there was no penalty. 1500 * with spells, pets, whatever, there was no penalty.
1535 * Changed to make luck penalty configurable in settings. 1501 * Changed to make luck penalty configurable in settings.
1536 */ 1502 */
1537 if (op->type == PLAYER && owner != op && !battleg) 1503 if (op->type == PLAYER && owner != op && !battleg)
1538 change_luck (owner, -settings.pk_luck_penalty); 1504 owner->change_luck (-settings.pk_luck_penalty);
1539 1505
1540 /* This code below deals with finding the appropriate skill 1506 /* This code below deals with finding the appropriate skill
1541 * to credit exp to. This is a bit problematic - we should 1507 * to credit exp to. This is a bit problematic - we should
1542 * probably never really have to look at current_weapon->skill 1508 * probably never really have to look at current_weapon->skill
1543 */ 1509 */
1544 skill = NULL; 1510 skill = 0;
1511
1545 if (hitter->skill && hitter->type != PLAYER) 1512 if (hitter->skill && hitter->type != PLAYER)
1546 skill = hitter->skill; 1513 skill = hitter->skill;
1547 else if (owner->chosen_skill) 1514 else if (owner->chosen_skill)
1548 { 1515 {
1549 skill = owner->chosen_skill->skill;
1550 skop = owner->chosen_skill; 1516 skop = owner->chosen_skill;
1517 skill = skop->skill;
1551 } 1518 }
1552 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON)) 1519 else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1553 skill = owner->current_weapon->skill; 1520 skill = owner->current_weapon->skill;
1554 else 1521 else
1555 LOG (llevError, "kill_object - unable to find skill that killed monster\n"); 1522 LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1556 1523
1557 /* We have the skill we want to credit to - now find the object this goes 1524 /* We have the skill we want to credit to - now find the object this goes
1558 * to. Make sure skop is an actual skill, and not a skill tool! 1525 * to. Make sure skop is an actual skill, and not a skill tool!
1559 */ 1526 */
1560 if ((!skop || skop->type != SKILL) && skill) 1527 if ((!skop || skop->type != SKILL) && skill)
1561 { 1528 {
1562 int i; 1529 int i;
1563 1530
… …
1568 break; 1535 break;
1569 } 1536 }
1570 } 1537 }
1571 } /* Was it a player that hit somethign */ 1538 } /* Was it a player that hit somethign */
1572 else 1539 else
1573 {
1574 skill = NULL; 1540 skill = 0;
1575 }
1576 1541
1577 /* Pet (or spell) killed something. */ 1542 /* Pet (or spell) killed something. */
1578 if (owner != hitter) 1543 if (owner != hitter)
1579 {
1580 (void) sprintf (buf, "%s killed %s with %s%s%s.", &owner->name, 1544 sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1581 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : ""); 1545 query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1582 }
1583 else 1546 else
1584 {
1585 (void) sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name, 1547 sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1586 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ? 1548 (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1587 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : ""); 1549 " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1588 } 1550
1589 /* These may have been set in the player code section above */ 1551 /* These may have been set in the player code section above */
1590 if (!skop) 1552 if (!skop)
1591 skop = hitter->chosen_skill; 1553 skop = hitter->chosen_skill;
1554
1592 if (!skill && skop) 1555 if (!skill && skop)
1593 skill = skop->skill; 1556 skill = skop->skill;
1594 1557
1595 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf); 1558 new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1596 1559
1597
1598 /* If you didn't kill yourself, and your not the wizard */ 1560 /* If you didn't kill yourself, and your not the wizard */
1599 if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ)) 1561 if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1600 { 1562 {
1601 int exp; 1563 int exp;
1602 1564
1603 /* Really don't give much experience for killing other players */ 1565 /* Really don't give much experience for killing other players */
1604 // schmorp: temporary? reduce the amount of exp gained for pking enourmously 1566 // schmorp: temporarily? reduce the amount of exp gained for pking enourmously
1605 if (op->type == PLAYER) 1567 if (op->type == PLAYER)
1606 { 1568 {
1607 if (battleg) 1569 if (battleg)
1608 { 1570 {
1609 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!"); 1571 new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
… …
1627 1589
1628 if (!settings.simple_exp) 1590 if (!settings.simple_exp)
1629 exp = exp / 2; 1591 exp = exp / 2;
1630 1592
1631 if (owner->type != PLAYER || owner->contr->party == NULL) 1593 if (owner->type != PLAYER || owner->contr->party == NULL)
1632 {
1633 change_exp (owner, exp, skill, 0); 1594 change_exp (owner, exp, skill, 0);
1634 }
1635 else 1595 else
1636 { 1596 {
1637 int shares = 0, count = 0; 1597 int shares = 0, count = 0;
1638
1639 player *pl;
1640
1641 partylist *party = owner->contr->party; 1598 partylist *party = owner->contr->party;
1642 1599
1643#ifdef PARTY_KILL_LOG
1644 add_kill_to_party (party, query_name (owner), query_name (op), exp); 1600 add_kill_to_party (party, query_name (owner), query_name (op), exp);
1645#endif 1601
1646 for (pl = first_player; pl != NULL; pl = pl->next) 1602 for_all_players (pl)
1647 {
1648 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1603 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1649 { 1604 {
1650 count++; 1605 count++;
1651 shares += (pl->ob->level + 4); 1606 shares += (pl->ob->level + 4);
1652 } 1607 }
1653 } 1608
1654 if (count == 1 || shares > exp) 1609 if (count == 1 || shares > exp || !shares)
1655 change_exp (owner, exp, skill, SK_EXP_TOTAL); 1610 change_exp (owner, exp, skill, SK_EXP_TOTAL);
1656 else 1611 else
1657 { 1612 {
1658 int share = exp / shares, given = 0, nexp; 1613 int share = exp / shares, given = 0, nexp;
1659 1614
1660 for (pl = first_player; pl != NULL; pl = pl->next) 1615 for_all_players (pl)
1661 {
1662 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner)) 1616 if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1663 { 1617 {
1664 nexp = (pl->ob->level + 4) * share; 1618 nexp = (pl->ob->level + 4) * share;
1665 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL); 1619 change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1666 given += nexp; 1620 given += nexp;
1667 } 1621 }
1668 } 1622
1669 exp -= given; 1623 exp -= given;
1670 /* give any remainder to the player */ 1624 /* give any remainder to the player */
1671 change_exp (owner, exp, skill, SK_EXP_ADD_SKILL); 1625 change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);
1672 } 1626 }
1673 } /* else part of a party */ 1627 } /* else part of a party */
1674
1675 } /* end if person didn't kill himself */ 1628 } /* end if person didn't kill himself */
1676 1629
1677 if (op->type != PLAYER) 1630 if (op->type != PLAYER)
1678 { 1631 {
1679 if (QUERY_FLAG (op, FLAG_FRIENDLY)) 1632 if (QUERY_FLAG (op, FLAG_FRIENDLY))
1680 { 1633 {
1681 object *owner1 = get_owner (op); 1634 object *owner1 = op->owner;
1682 1635
1683 if (owner1 != NULL && owner1->type == PLAYER) 1636 if (owner1 && owner1->type == PLAYER)
1684 { 1637 {
1685 play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); 1638 owner1->contr->play_sound (sound_find ("pet_is_killed"));
1686 /* Maybe we should include the owner that killed this, maybe not */ 1639 /* Maybe we should include the owner that killed this, maybe not */
1687 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); 1640 new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1688 } 1641 }
1642
1689 remove_friendly_object (op); 1643 remove_friendly_object (op);
1690 } 1644 }
1691 remove_ob (op); 1645
1692 free_object (op); 1646 op->destroy ();
1693 } 1647 }
1694 /* Player has been killed! */
1695 else 1648 else
1696 { 1649 {
1650 /* Player has been killed! */
1697 if (owner->type == PLAYER) 1651 if (owner->type == PLAYER)
1698 {
1699 snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title); 1652 snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title);
1700 }
1701 else 1653 else
1702 {
1703 strncpy (op->contr->killer, hitter->name, BIG_NAME); 1654 assign (op->contr->killer, hitter->name);
1704 op->contr->killer[BIG_NAME - 1] = '\0';
1705 }
1706 } 1655 }
1656
1707 /* This was return -1 - that doesn't seem correct - if we return -1, process 1657 /* This was return -1 - that doesn't seem correct - if we return -1, process
1708 * continues in the calling function. 1658 * continues in the calling function.
1709 */ 1659 */
1710 return maxdam; 1660 return maxdam;
1711} 1661}
1712 1662
1713/* Find out if this is friendly fire (PVP and attacker is peaceful) or not 1663/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1714 * Returns 0 this is not friendly fire 1664 * Returns 0 this is not friendly fire
1715 */ 1665 */
1716
1717int 1666int
1718friendly_fire (object *op, object *hitter) 1667friendly_fire (object *op, object *hitter)
1719{ 1668{
1720 object *owner; 1669 object *owner;
1721 int friendlyfire; 1670 int friendlyfire;
… …
1731 return 0; 1680 return 0;
1732 1681
1733 if (hitter->type == PLAYER && hitter->contr->peaceful == 1) 1682 if (hitter->type == PLAYER && hitter->contr->peaceful == 1)
1734 return 1; 1683 return 1;
1735 1684
1736 if ((owner = get_owner (hitter)) != NULL) 1685 if ((owner = hitter->owner) != NULL)
1737 { 1686 {
1738 if (owner->type == PLAYER && owner->contr->peaceful == 1) 1687 if (owner->type == PLAYER && owner->contr->peaceful == 1)
1739 friendlyfire = 2; 1688 friendlyfire = 2;
1740 } 1689 }
1741 1690
1742 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE) 1691 if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1743 friendlyfire = 0; 1692 friendlyfire = 0;
1744 } 1693 }
1694
1745 return friendlyfire; 1695 return friendlyfire;
1746} 1696}
1747
1748 1697
1749/* This isn't used just for players, but in fact most objects. 1698/* This isn't used just for players, but in fact most objects.
1750 * op is the object to be hit, dam is the amount of damage, hitter 1699 * op is the object to be hit, dam is the amount of damage, hitter
1751 * is what is hitting the object, type is the attacktype, and 1700 * is what is hitting the object, type is the attacktype, and
1752 * full_hit is set if monster area does not matter. 1701 * full_hit is set if monster area does not matter.
1753 * dam is base damage - protections/vulnerabilities/slaying matches can 1702 * dam is base damage - protections/vulnerabilities/slaying matches can
1754 * modify it. 1703 * modify it.
1755 */ 1704 */
1756
1757 /* Oct 95 - altered the following slightly for MULTIPLE_GODS hack 1705/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1758 * which needs new attacktype AT_HOLYWORD to work . b.t. */ 1706 * which needs new attacktype AT_HOLYWORD to work . b.t. */
1759
1760int 1707int
1761hit_player (object *op, int dam, object *hitter, int type, int full_hit) 1708hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1762{ 1709{
1763 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC); 1710 int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1764 int maxattacktype, attacknum; 1711 int maxattacktype, attacknum;
1765 int body_attack = op && op->head; /* Did we hit op's head? */ 1712 int body_attack = op && op->head; /* Did we hit op's head? */
1766 int simple_attack; 1713 int simple_attack;
1767 tag_t op_tag, hitter_tag;
1768 int rtn_kill = 0; 1714 int rtn_kill = 0;
1769 int friendlyfire; 1715 int friendlyfire;
1770 1716
1771 if (get_attack_mode (&op, &hitter, &simple_attack)) 1717 if (get_attack_mode (&op, &hitter, &simple_attack))
1772 return 0; 1718 return 0;
1773 1719
1774 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */ 1720 /* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1775 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE)) 1721 if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1776 return 0; 1722 return 0;
1777 1723
1778#ifdef PROHIBIT_PLAYERKILL 1724 // only allow pk for hostile players
1779 if (op->type == PLAYER) 1725 if (op->type == PLAYER)
1780 { 1726 {
1781 object *owner = get_owner (hitter); 1727 object *owner = hitter->owner;
1782 1728
1783 if (!owner) 1729 if (!owner)
1784 owner = hitter; 1730 owner = hitter;
1785 if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner) 1731
1786 { 1732 if (owner->type == PLAYER
1733 && (!op_on_battleground (op, 0, 0)
1734 && (op->contr->peaceful || owner->contr->peaceful))
1735 && op != owner)
1787 return 0; 1736 return 0;
1788 }
1789 } 1737 }
1790#endif
1791
1792 op_tag = op->count;
1793 hitter_tag = hitter->count;
1794 1738
1795 if (body_attack) 1739 if (body_attack)
1796 { 1740 {
1797 /* slow and paralyze must hit the head. But we don't want to just 1741 /* slow and paralyze must hit the head. But we don't want to just
1798 * return - we still need to process other attacks the spell still 1742 * return - we still need to process other attacks the spell still
… …
1804 * attack so we don't cancel out things like magic bullet. 1748 * attack so we don't cancel out things like magic bullet.
1805 */ 1749 */
1806 if (type & (AT_PARALYZE | AT_SLOW)) 1750 if (type & (AT_PARALYZE | AT_SLOW))
1807 { 1751 {
1808 type &= ~(AT_PARALYZE | AT_SLOW); 1752 type &= ~(AT_PARALYZE | AT_SLOW);
1753
1809 if (!type || type == AT_MAGIC) 1754 if (!type || type == AT_MAGIC)
1810 return 0; 1755 return 0;
1811 } 1756 }
1812 } 1757 }
1813 1758
1814 if (!simple_attack && op->type == DOOR) 1759 if (!simple_attack && op->type == DOOR)
1815 { 1760 {
1816 object *tmp;
1817
1818 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1761 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1819 if (tmp->type == RUNE || tmp->type == TRAP) 1762 if (tmp->type == RUNE || tmp->type == TRAP)
1820 { 1763 {
1821 spring_trap (tmp, hitter); 1764 spring_trap (tmp, hitter);
1765
1822 if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack)) 1766 if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
1823 return 0; 1767 return 0;
1768
1824 break; 1769 break;
1825 } 1770 }
1826 } 1771 }
1827 1772
1828 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0) 1773 if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1829 { 1774 {
1830 /* FIXME: If a player is killed by a rune in a door, the 1775 /* FIXME: If a player is killed by a rune in a door, the
1831 * was_destroyed() check above doesn't return, and might get here. 1776 * destroyed() check above doesn't return, and might get here.
1832 */ 1777 */
1778
1779 /* FIXME: This for example happens when a dead door is on a mover and
1780 gets it's speed_left raised on each mover-tick.
1781 Doors are removed in a kinda funny way by giving them speed and speed_left
1782 and waiting for that to run out.
1783 */
1833 LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name); 1784 LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1834 return 0; 1785 return 0;
1835 } 1786 }
1836 1787
1837#ifdef ATTACK_DEBUG 1788#ifdef ATTACK_DEBUG
1838 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam); 1789 LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
… …
1844 * in case 0>dam>1, we try to "simulate" a float value-effect */ 1795 * in case 0>dam>1, we try to "simulate" a float value-effect */
1845 dam = dam * (100 - op->resist[ATNR_MAGIC]); 1796 dam = dam * (100 - op->resist[ATNR_MAGIC]);
1846 if (dam >= 100) 1797 if (dam >= 100)
1847 dam /= 100; 1798 dam /= 100;
1848 else 1799 else
1849 dam = (dam > (rndm (0, 99))) ? 1 : 0; 1800 dam = (dam > rndm (0, 99)) ? 1 : 0;
1850 } 1801 }
1851 1802
1852 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map 1803 /* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1853 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit 1804 * If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1854 */ 1805 */
… …
1870 if ((!hitter->slaying || 1821 if ((!hitter->slaying ||
1871 (!(op->race && strstr (hitter->slaying, op->race)) && 1822 (!(op->race && strstr (hitter->slaying, op->race)) &&
1872 !(op->name && strstr (hitter->slaying, op->name)))) && 1823 !(op->name && strstr (hitter->slaying, op->name)))) &&
1873 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1824 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1874 (hitter->title != NULL 1825 (hitter->title != NULL
1875 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL))) 1826 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1876 return 0; 1827 return 0;
1877 } 1828 }
1878 1829
1879 maxattacktype = type; /* initialize this to something */ 1830 maxattacktype = type; /* initialise this to something */
1880 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1831 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1881 { 1832 {
1882 /* Magic isn't really a true attack type - it gets combined with other 1833 /* Magic isn't really a true attack type - it gets combined with other
1883 * attack types. As such, skip it over. However, if magic is 1834 * attack types. As such, skip it over. However, if magic is
1884 * the only attacktype in the group, then still attack with it 1835 * the only attacktype in the group, then still attack with it
… …
1912 */ 1863 */
1913 friendlyfire = friendly_fire (op, hitter); 1864 friendlyfire = friendly_fire (op, hitter);
1914 if (friendlyfire && maxdam) 1865 if (friendlyfire && maxdam)
1915 { 1866 {
1916 maxdam = ((dam * settings.set_friendly_fire) / 100); 1867 maxdam = ((dam * settings.set_friendly_fire) / 100);
1917#ifndef COZY_SERVER
1918 maxdam++;
1919#endif
1920 1868
1921#ifdef ATTACK_DEBUG 1869#ifdef ATTACK_DEBUG
1922 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1870 LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1923 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1871 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1924#endif 1872#endif
1925 } 1873 }
1926 1874
1927 if (!full_hit) 1875 if (!full_hit)
1928 { 1876 {
1929 archetype *at;
1930 int area; 1877 int area;
1931 int remainder; 1878 int remainder;
1932 1879
1933 area = 0; 1880 area = 0;
1934 for (at = op->arch; at != NULL; at = at->more) 1881
1882 for (archetype *at = op->arch; at; at = (archetype *)at->more)
1935 area++; 1883 area++;
1884
1936 assert (area > 0); 1885 assert (area > 0);
1937 1886
1938 /* basically: maxdam /= area; we try to "simulate" a float 1887 /* basically: maxdam /= area; we try to "simulate" a float
1939 value-effect */ 1888 value-effect */
1940 remainder = 100 * (maxdam % area) / area; 1889 remainder = 100 * (maxdam % area) / area;
1941 maxdam /= area; 1890 maxdam /= area;
1942 if (RANDOM () % 100 < remainder) 1891 if (rndm (100) < remainder)
1943 maxdam++; 1892 maxdam++;
1944 } 1893 }
1945 1894
1946#ifdef ATTACK_DEBUG 1895#ifdef ATTACK_DEBUG
1947 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam); 1896 LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1948#endif 1897#endif
1949 1898
1950 if (get_owner (hitter)) 1899 // for now, only do this for active objects, otherwise they
1900 // keep a refcount for a long time and I see no usefulness
1901 // for an non-active objetc to know its enemy.
1902 if (op->active)
1903 if (hitter->owner)
1951 op->enemy = hitter->owner; 1904 op->enemy = hitter->owner;
1952 else if (QUERY_FLAG (hitter, FLAG_ALIVE)) 1905 else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1953 op->enemy = hitter; 1906 op->enemy = hitter;
1954 1907
1955 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER) 1908 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1956 { 1909 {
1957 /* The unaggressives look after themselves 8) */ 1910 /* The unaggressives look after themselves 8) */
1958 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE); 1911 CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
… …
1980 1933
1981 if (QUERY_FLAG (op, FLAG_TEAR_DOWN)) 1934 if (QUERY_FLAG (op, FLAG_TEAR_DOWN))
1982 { 1935 {
1983 if (maxdam) 1936 if (maxdam)
1984 tear_down_wall (op); 1937 tear_down_wall (op);
1938
1985 return maxdam; /* nothing more to do for wall */ 1939 return maxdam; /* nothing more to do for wall */
1986 } 1940 }
1987 1941
1988 /* See if the creature has been killed */ 1942 /* See if the creature has been killed */
1989 rtn_kill = kill_object (op, maxdam, hitter, type); 1943 rtn_kill = kill_object (op, maxdam, hitter, type);
… …
1994 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note 1948 /* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1995 * that before if the player was immune to ghosthit, the monster 1949 * that before if the player was immune to ghosthit, the monster
1996 * remained - that is no longer the case. 1950 * remained - that is no longer the case.
1997 */ 1951 */
1998 if (QUERY_FLAG (hitter, FLAG_ONE_HIT)) 1952 if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1999 { 1953 hitter->destroy ();
2000 if (QUERY_FLAG (hitter, FLAG_FRIENDLY)) 1954
2001 remove_friendly_object (hitter);
2002 remove_ob (hitter);
2003 free_object (hitter);
2004 }
2005 /* Lets handle creatures that are splitting now */ 1955 /* Lets handle creatures that are splitting now */
2006 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING)) 1956 else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
2007 { 1957 {
2008 int i; 1958 int i;
2009 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY); 1959 int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
2010 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE); 1960 int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);
2011 object *owner = get_owner (op); 1961 object *owner = op->owner;
2012 1962
2013 if (!op->other_arch) 1963 if (!op->other_arch)
2014 { 1964 {
2015 LOG (llevError, "SPLITTING without other_arch error.\n"); 1965 LOG (llevError, "SPLITTING without other_arch error.\n");
2016 return maxdam; 1966 return maxdam;
2017 } 1967 }
1968
2018 remove_ob (op); 1969 op->remove ();
2019 for (i = 0; i < NROFNEWOBJS (op); i++) 1970
1971 for (i = 0; i < op->stats.food; i++)
2020 { /* This doesn't handle op->more yet */ 1972 { /* This doesn't handle op->more yet */
2021 object *tmp = arch_to_object (op->other_arch); 1973 object *tmp = arch_to_object (op->other_arch);
2022 int j; 1974 int j;
2023 1975
2024 tmp->stats.hp = op->stats.hp; 1976 tmp->stats.hp = op->stats.hp;
1977
2025 if (friendly) 1978 if (friendly)
2026 { 1979 {
2027 SET_FLAG (tmp, FLAG_FRIENDLY);
2028 add_friendly_object (tmp); 1980 add_friendly_object (tmp);
2029 tmp->attack_movement = PETMOVE; 1981 tmp->attack_movement = PETMOVE;
1982
2030 if (owner != NULL) 1983 if (owner)
2031 set_owner (tmp, owner); 1984 tmp->set_owner (owner);
2032 } 1985 }
1986
2033 if (unaggressive) 1987 if (unaggressive)
2034 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 1988 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
1989
2035 j = find_first_free_spot (tmp, op->map, op->x, op->y); 1990 j = find_first_free_spot (tmp, op->map, op->x, op->y);
1991
2036 if (j == -1) /* No spot to put this monster */ 1992 if (j == -1) /* No spot to put this monster */
2037 free_object (tmp); 1993 tmp->destroy ();
2038 else 1994 else
2039 { 1995 {
2040 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j]; 1996 tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
2041 insert_ob_in_map (tmp, op->map, NULL, 0); 1997 insert_ob_in_map (tmp, op->map, NULL, 0);
2042 } 1998 }
2043 } 1999 }
2044 if (friendly) 2000
2045 remove_friendly_object (op); 2001 op->destroy ();
2046 free_object (op);
2047 } 2002 }
2048 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10) 2003 else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2049 { 2004 hitter->destroy ();
2050 remove_ob (hitter); 2005
2051 free_object (hitter);
2052 }
2053 return maxdam; 2006 return maxdam;
2054} 2007}
2055
2056 2008
2057void 2009void
2058poison_player (object *op, object *hitter, int dam) 2010poison_player (object *op, object *hitter, int dam)
2059{ 2011{
2060 archetype *at = find_archetype ("poisoning"); 2012 archetype *at = archetype::find ("poisoning");
2061 object *tmp = present_arch_in_ob (at, op); 2013 object *tmp = present_arch_in_ob (at, op);
2062 2014
2063 if (tmp == NULL) 2015 if (tmp == NULL)
2064 { 2016 {
2065 if ((tmp = arch_to_object (at)) == NULL) 2017 if ((tmp = arch_to_object (at)) == NULL)
… …
2078 if (QUERY_FLAG (hitter, FLAG_ALIVE)) 2030 if (QUERY_FLAG (hitter, FLAG_ALIVE))
2079 tmp->stats.dam += hitter->level / 2; 2031 tmp->stats.dam += hitter->level / 2;
2080 else 2032 else
2081 tmp->stats.dam = dam; 2033 tmp->stats.dam = dam;
2082 2034
2083 copy_owner (tmp, hitter); /* so we get credit for poisoning kills */ 2035 tmp->set_owner (hitter); /* so we get credit for poisoning kills */
2084 if (hitter->skill && hitter->skill != tmp->skill) 2036 if (hitter->skill && hitter->skill != tmp->skill)
2085 { 2037 {
2086 tmp->skill = hitter->skill; 2038 tmp->skill = hitter->skill;
2087 } 2039 }
2088 2040
… …
2094 tmp->stats.Con = MAX (-(dam / 4 + 1), -10); 2046 tmp->stats.Con = MAX (-(dam / 4 + 1), -10);
2095 tmp->stats.Str = MAX (-(dam / 3 + 2), -10); 2047 tmp->stats.Str = MAX (-(dam / 3 + 2), -10);
2096 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10); 2048 tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2097 tmp->stats.Int = MAX (-dam / 7, -10); 2049 tmp->stats.Int = MAX (-dam / 7, -10);
2098 SET_FLAG (tmp, FLAG_APPLIED); 2050 SET_FLAG (tmp, FLAG_APPLIED);
2099 fix_player (op); 2051 op->update_stats ();
2100 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill."); 2052 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
2053 op->play_sound (tmp->sound);
2101 } 2054 }
2055
2102 if (hitter->type == PLAYER) 2056 if (hitter->type == PLAYER)
2103 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name); 2057 new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2104 else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER) 2058 else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2105 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name); 2059 new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2106 } 2060 }
2061
2107 tmp->speed_left = 0; 2062 tmp->speed_left = 0;
2108 } 2063 }
2109 else 2064 else
2110 tmp->stats.food++; 2065 tmp->stats.food++;
2111} 2066}
2112 2067
2113void 2068void
2114slow_player (object *op, object *hitter, int dam) 2069slow_player (object *op, object *hitter, int dam)
2115{ 2070{
2116 archetype *at = find_archetype ("slowness"); 2071 archetype *at = archetype::find ("slowness");
2117 object *tmp; 2072 object *tmp;
2118 2073
2119 if (at == NULL) 2074 if (at == NULL)
2120 {
2121 LOG (llevError, "Can't find slowness archetype.\n"); 2075 LOG (llevError, "Can't find slowness archetype.\n");
2122 } 2076
2123 if ((tmp = present_arch_in_ob (at, op)) == NULL) 2077 if ((tmp = present_arch_in_ob (at, op)) == NULL)
2124 { 2078 {
2125 tmp = arch_to_object (at); 2079 tmp = arch_to_object (at);
2126 tmp = insert_ob_in_ob (tmp, op); 2080 tmp = insert_ob_in_ob (tmp, op);
2127 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!"); 2081 new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2128 } 2082 }
2129 else 2083 else
2130 tmp->stats.food++; 2084 tmp->stats.food++;
2085
2131 SET_FLAG (tmp, FLAG_APPLIED); 2086 SET_FLAG (tmp, FLAG_APPLIED);
2132 tmp->speed_left = 0; 2087 tmp->speed_left = 0;
2133 fix_player (op); 2088 op->update_stats ();
2134} 2089}
2135 2090
2136void 2091void
2137confuse_player (object *op, object *hitter, int dam) 2092confuse_player (object *op, object *hitter, int dam)
2138{ 2093{
… …
2152 tmp->speed = 0.05; 2107 tmp->speed = 0.05;
2153 tmp->subtype = FORCE_CONFUSION; 2108 tmp->subtype = FORCE_CONFUSION;
2154 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2109 tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2155 tmp->name = "confusion"; 2110 tmp->name = "confusion";
2156 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100); 2111 maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2112
2157 if (tmp->duration > maxduration) 2113 if (tmp->duration > maxduration)
2158 tmp->duration = maxduration; 2114 tmp->duration = maxduration;
2159 2115
2160 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED)) 2116 if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2161 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!"); 2117 new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
2118
2162 SET_FLAG (op, FLAG_CONFUSED); 2119 SET_FLAG (op, FLAG_CONFUSED);
2163} 2120}
2164 2121
2165void 2122void
2166blind_player (object *op, object *hitter, int dam) 2123blind_player (object *op, object *hitter, int dam)
… …
2182 */ 2139 */
2183 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100; 2140 tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
2184 2141
2185 tmp = insert_ob_in_ob (tmp, op); 2142 tmp = insert_ob_in_ob (tmp, op);
2186 change_abil (op, tmp); /* Mostly to display any messages */ 2143 change_abil (op, tmp); /* Mostly to display any messages */
2187 fix_player (op); /* This takes care of some other stuff */ 2144 op->update_stats (); /* This takes care of some other stuff */
2188 2145
2189 if (hitter->owner) 2146 if (hitter->owner)
2190 owner = get_owner (hitter); 2147 owner = hitter->owner;
2191 else 2148 else
2192 owner = hitter; 2149 owner = hitter;
2193 2150
2194 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op)); 2151 new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
2195 } 2152 }
… …
2232 op->speed_left = (float) -(FABS (op->speed) * max); 2189 op->speed_left = (float) -(FABS (op->speed) * max);
2233 2190
2234/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */ 2191/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2235} 2192}
2236 2193
2237
2238/* Attempts to kill 'op'. hitter is the attack object, dam is 2194/* Attempts to kill 'op'. hitter is the attack object, dam is
2239 * the computed damaged. 2195 * the computed damaged.
2240 */ 2196 */
2241void 2197void
2242deathstrike_player (object *op, object *hitter, int *dam) 2198deathstrike_player (object *op, object *hitter, int *dam)
… …
2250 ** field of the deathstriking object */ 2206 ** field of the deathstriking object */
2251 2207
2252 int atk_lev, def_lev, kill_lev; 2208 int atk_lev, def_lev, kill_lev;
2253 2209
2254 if (hitter->slaying) 2210 if (hitter->slaying)
2255 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race)))) 2211 if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) || (op->race && strstr (hitter->slaying, op->race))))
2256 return; 2212 return;
2257 2213
2258 def_lev = op->level; 2214 def_lev = op->level;
2259 if (def_lev < 1) 2215 if (def_lev < 1)
2260 { 2216 {
2261 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); 2217 LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
2262 def_lev = 1; 2218 def_lev = 1;
2263 } 2219 }
2220
2264 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; 2221 atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2265 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", 2222 /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2266 atk_lev, def_lev); */ 2223 atk_lev, def_lev); */
2267 2224
2268 if (atk_lev >= def_lev) 2225 if (atk_lev >= def_lev)
… …
2283 */ 2240 */
2284 *dam *= kill_lev / def_lev; 2241 *dam *= kill_lev / def_lev;
2285 } 2242 }
2286 } 2243 }
2287 else 2244 else
2288 {
2289 *dam = 0; /* no harm done */ 2245 *dam = 0; /* no harm done */
2290 }
2291} 2246}
2292 2247
2293/* thrown_item_effect() - handles any special effects of thrown 2248/* thrown_item_effect() - handles any special effects of thrown
2294 * items (like attacking living creatures--a potion thrown at a 2249 * items (like attacking living creatures--a potion thrown at a
2295 * monster). 2250 * monster).
… …
2324 } 2279 }
2325 } 2280 }
2326} 2281}
2327 2282
2328/* adj_attackroll() - adjustments to attacks by various conditions */ 2283/* adj_attackroll() - adjustments to attacks by various conditions */
2329
2330int 2284int
2331adj_attackroll (object *hitter, object *target) 2285adj_attackroll (object *hitter, object *target)
2332{ 2286{
2333 object *attacker = hitter; 2287 object *attacker = hitter;
2334 int adjust = 0; 2288 int adjust = 0;
… …
2341 } 2295 }
2342 2296
2343 /* aimed missiles use the owning object's sight */ 2297 /* aimed missiles use the owning object's sight */
2344 if (is_aimed_missile (hitter)) 2298 if (is_aimed_missile (hitter))
2345 { 2299 {
2346 if ((attacker = get_owner (hitter)) == NULL) 2300 if ((attacker = hitter->owner) == NULL)
2347 attacker = hitter; 2301 attacker = hitter;
2348 /* A player who saves but hasn't quit still could have objects 2302 /* A player who saves but hasn't quit still could have objects
2349 * owned by him - need to handle that case to avoid crashes. 2303 * owned by him - need to handle that case to avoid crashes.
2350 */ 2304 */
2351 if (QUERY_FLAG (attacker, FLAG_REMOVED)) 2305 if (QUERY_FLAG (attacker, FLAG_REMOVED))
… …
2399#endif 2353#endif
2400 2354
2401 return adjust; 2355 return adjust;
2402} 2356}
2403 2357
2404
2405/* determine if the object is an 'aimed' missile */ 2358/* determine if the object is an 'aimed' missile */
2406int 2359int
2407is_aimed_missile (object *op) 2360is_aimed_missile (object *op)
2408{ 2361{
2409 2362
2410 /* I broke what used to be one big if into a few nested 2363 /* I broke what used to be one big if into a few nested
2411 * ones so that figuring out the logic is at least possible. 2364 * ones so that figuring out the logic is at least possible.
2412 */ 2365 */
2413 if (op && (op->move_type & MOVE_FLYING)) 2366 if (op && (op->move_type & MOVE_FLYING))
2414 {
2415 if (op->type == ARROW || op->type == THROWN_OBJ) 2367 if (op->type == ARROW || op->type == THROWN_OBJ)
2416 return 1; 2368 return 1;
2417 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION)) 2369 else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2418 return 1; 2370 return 1;
2419 } 2371
2420 return 0; 2372 return 0;
2421} 2373}

Diff Legend

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