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.24 by root, Sat Dec 9 16:11:09 2006 UTC vs.
Revision 1.94 by root, Mon Sep 29 10:20:49 2008 UTC

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

Diff Legend

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