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

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.20 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.50 by root, Thu Jan 1 15:43:35 2009 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27 26
28/* given that 'pet' is a friendly object, this function returns a 27/* given that 'pet' is a friendly object, this function returns a
… …
32 * this is now tilemap aware. 31 * this is now tilemap aware.
33 */ 32 */
34object * 33object *
35get_pet_enemy (object *pet, rv_vector * rv) 34get_pet_enemy (object *pet, rv_vector * rv)
36{ 35{
37 object *owner, *tmp, *attacker, *tmp3; 36 object *tmp, *attacker, *tmp3;
38 int i; 37 int i;
39 sint16 x, y; 38 sint16 x, y;
40 maptile *nm; 39 maptile *nm;
41 int search_arr[SIZEOFFREE]; 40 int search_arr[SIZEOFFREE];
42 int mflags; 41 int mflags;
43 42
44 attacker = pet->attacked_by; /*pointer to attacking enemy */ 43 attacker = pet->attacked_by; /*pointer to attacking enemy */
45 pet->attacked_by = NULL; /*clear this, since we are dealing with it */ 44 pet->attacked_by = NULL; /*clear this, since we are dealing with it */
46 45
47 if ((owner = pet->owner) != NULL) 46 object *owner = pet->owner;
48 { 47
49 /* If the owner has turned on the pet, make the pet 48 if (!owner)
50 * unfriendly.
51 */
52 if ((check_enemy (owner, rv)) == pet)
53 {
54 CLEAR_FLAG (pet, FLAG_FRIENDLY);
55 remove_friendly_object (pet);
56 pet->attack_movement &= ~PETMOVE;
57 return owner;
58 }
59 } 49 {
60 else
61 {
62 /* else the owner is no longer around, so the 50 /* the owner is no longer around, so the
63 * pet no longer needs to be friendly. 51 * pet no longer needs to be friendly.
64 */ 52 */
65 CLEAR_FLAG (pet, FLAG_FRIENDLY);
66 remove_friendly_object (pet); 53 remove_friendly_object (pet);
67 pet->attack_movement &= ~PETMOVE; 54 pet->attack_movement &= ~PETMOVE;
68 return NULL; 55 return 0;
56 }
57
58 /* If the owner has turned on the pet, make the pet
59 * unfriendly.
60 */
61 if (check_enemy (owner, rv) == pet)
69 } 62 {
63 remove_friendly_object (pet);
64 pet->attack_movement &= ~PETMOVE;
65 return owner;
66 }
67
70 /* If they are not on the same map, the pet won't be agressive */ 68 /* If they are not on the same map, the pet won't be agressive */
71 if (!on_same_map (pet, owner)) 69 //if (!on_same_map (pet, owner))
72 return NULL; 70 // return 0;
73 71
74 /* See if the pet has an existing enemy. If so, don't start a new one */ 72 /* See if the pet has an existing enemy. If so, don't start a new one */
75 if ((tmp = check_enemy (pet, rv)) != NULL) 73 if (tmp = check_enemy (pet, rv))
76 { 74 {
77 if (tmp == owner && !QUERY_FLAG (pet, FLAG_CONFUSED) && QUERY_FLAG (pet, FLAG_FRIENDLY)) 75 if (tmp == owner && !QUERY_FLAG (pet, FLAG_CONFUSED) && QUERY_FLAG (pet, FLAG_FRIENDLY))
78 /* without this check, you can actually get pets with 76 /* without this check, you can actually get pets with
79 * enemy set to owner! 77 * enemy set to owner!
80 */ 78 */
81 pet->enemy = NULL; 79 pet->enemy = 0;
82 else 80 else
83 return tmp; 81 return tmp;
84 } 82 }
85 83
86 get_search_arr (search_arr); 84 get_search_arr (search_arr);
… …
88 if (owner->type == PLAYER && owner->contr->petmode > pet_normal) 86 if (owner->type == PLAYER && owner->contr->petmode > pet_normal)
89 { 87 {
90 if (owner->contr->petmode == pet_sad) 88 if (owner->contr->petmode == pet_sad)
91 { 89 {
92 tmp = find_nearest_living_creature (pet); 90 tmp = find_nearest_living_creature (pet);
93 if (tmp != NULL) 91 if (tmp != 0)
94 { 92 {
95 get_rangevector (pet, tmp, rv, 0); 93 get_rangevector (pet, tmp, rv, 0);
96 if (check_enemy (pet, rv) != NULL) 94 if (check_enemy (pet, rv) != 0)
97 return tmp; 95 return tmp;
98 else 96 else
99 pet->enemy = NULL; 97 pet->enemy = 0;
100 } 98 }
101 /* if we got here we have no enemy */ 99 /* if we got here we have no enemy */
102 /* we return NULL to avoid heading back to the owner */ 100 /* we return 0 to avoid heading back to the owner */
103 pet->enemy = NULL; 101 pet->enemy = 0;
104 return NULL; 102 return 0;
105 } 103 }
106 } 104 }
107 105
108 /* Since the pet has no existing enemy, look for anything nasty 106 /* Since the pet has no existing enemy, look for anything nasty
109 * around the owner that it should go and attack. 107 * around the owner that it should go and attack. (if the owner is
108 * still on a map)
110 */ 109 */
111 tmp3 = NULL; 110 // owners sometimes are not on a map but in the inventory of somehting else
111 if (!owner->flag [FLAG_REMOVED] && owner->map)
112 {
113 tmp3 = 0;
114
112 for (i = 0; i < SIZEOFFREE; i++) 115 for (i = 0; i < SIZEOFFREE; i++)
113 { 116 {
114 x = owner->x + freearr_x[search_arr[i]]; 117 x = owner->x + freearr_x[search_arr[i]];
115 y = owner->y + freearr_y[search_arr[i]]; 118 y = owner->y + freearr_y[search_arr[i]];
116 nm = owner->map; 119 nm = owner->map;
117 /* Only look on the space if there is something alive there. */ 120 /* Only look on the space if there is something alive there. */
118 mflags = get_map_flags (nm, &nm, x, y, &x, &y); 121 mflags = get_map_flags (nm, &nm, x, y, &x, &y);
119 122
120 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 123 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
121 { 124 {
122 for (tmp = GET_MAP_OB (nm, x, y); tmp != NULL; tmp = tmp->above) 125 for (tmp = GET_MAP_OB (nm, x, y); tmp != 0; tmp = tmp->above)
123 {
124 object *tmp2 = tmp->head == NULL ? tmp : tmp->head;
125
126 if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) &&
127 (tmp2->type != PLAYER)) ||
128 should_arena_attack (pet, owner, tmp2))
129 && !QUERY_FLAG (tmp2, FLAG_UNAGGRESSIVE) && tmp2 != pet && tmp2 != owner && can_detect_enemy (pet, tmp2, rv))
130 { 126 {
127 object *tmp2 = tmp->head == 0 ? tmp : tmp->head;
131 128
132 if (!can_see_enemy (pet, tmp2)) 129 if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) &&
130 (tmp2->type != PLAYER)) ||
131 should_arena_attack (pet, owner, tmp2))
132 && !QUERY_FLAG (tmp2, FLAG_UNAGGRESSIVE) && tmp2 != pet && tmp2 != owner && can_detect_enemy (pet, tmp2, rv))
133 { 133 {
134
135 if (!can_see_enemy (pet, tmp2))
136 {
134 if (tmp3 != NULL) 137 if (tmp3 != 0)
135 tmp3 = tmp2; 138 tmp3 = tmp2;
136 } 139 }
137 else
138 {
139 pet->enemy = tmp2;
140 if (check_enemy (pet, rv) != NULL)
141 return tmp2;
142 else 140 else
141 {
142 pet->enemy = tmp2;
143 if (check_enemy (pet, rv) != 0)
144 return tmp2;
145 else
143 pet->enemy = NULL; 146 pet->enemy = 0;
144 } 147 }
145 } /* if this is a valid enemy */ 148 } /* if this is a valid enemy */
146 } /* for objects on this space */ 149 } /* for objects on this space */
147 } /* if there is something living on this space */ 150 } /* if there is something living on this space */
148 } /* for loop of spaces around the owner */ 151 } /* for loop of spaces around the owner */
149 152
150 /* fine, we went through the whole loop and didn't find one we could 153 /* fine, we went through the whole loop and didn't find one we could
151 see, take what we have */ 154 see, take what we have */
152 if (tmp3 != NULL) 155 if (tmp3 != 0)
153 { 156 {
154 pet->enemy = tmp3; 157 pet->enemy = tmp3;
155 if (check_enemy (pet, rv) != NULL) 158 if (check_enemy (pet, rv) != 0)
156 return tmp3; 159 return tmp3;
157 else 160 else
158 pet->enemy = NULL; 161 pet->enemy = 0;
162 }
159 } 163 }
160 164
161 /* No threat to owner, check to see if the pet has an attacker */ 165 /* No threat to owner, check to see if the pet has an attacker */
162 if (attacker) 166 if (attacker)
163 { 167 {
… …
165 /* or otherwise non-hostile, and is an appropriate target */ 169 /* or otherwise non-hostile, and is an appropriate target */
166 if (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && on_same_map (pet, attacker)) 170 if (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && on_same_map (pet, attacker))
167 { 171 {
168 pet->enemy = attacker; 172 pet->enemy = attacker;
169 173
170 if (check_enemy (pet, rv) != NULL) 174 if (check_enemy (pet, rv) != 0)
171 return attacker; 175 return attacker;
172 else 176 else
173 pet->enemy = NULL; 177 pet->enemy = 0;
174 } 178 }
175 } 179 }
176 180
177 /* Don't have an attacker or legal enemy, so look for a new one!. 181 /* Don't have an attacker or legal enemy, so look for a new one!.
178 * This looks for one around where the pet is. Thus, you could lead 182 * This looks for one around where the pet is. Thus, you could lead
179 * a pet to danger, then take a few steps back. This code is basically 183 * a pet to danger, then take a few steps back. This code is basically
180 * the same as the code that looks around the owner. 184 * the same as the code that looks around the owner.
181 */ 185 */
182 if (owner->type == PLAYER && owner->contr->petmode != pet_defend) 186 if (owner->type == PLAYER && owner->contr->petmode != pet_defend)
183 { 187 {
184 tmp3 = NULL; 188 tmp3 = 0;
185 for (i = 0; i < SIZEOFFREE; i++) 189 for (i = 0; i < SIZEOFFREE; i++)
186 { 190 {
187 x = pet->x + freearr_x[search_arr[i]]; 191 x = pet->x + freearr_x[search_arr[i]];
188 y = pet->y + freearr_y[search_arr[i]]; 192 y = pet->y + freearr_y[search_arr[i]];
189 nm = pet->map; 193 nm = pet->map;
190 /* Only look on the space if there is something alive there. */ 194 /* Only look on the space if there is something alive there. */
191 mflags = get_map_flags (nm, &nm, x, y, &x, &y); 195 mflags = get_map_flags (nm, &nm, x, y, &x, &y);
192 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 196 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
193 { 197 {
194 for (tmp = GET_MAP_OB (nm, x, y); tmp != NULL; tmp = tmp->above) 198 for (tmp = GET_MAP_OB (nm, x, y); tmp != 0; tmp = tmp->above)
195 { 199 {
196 object *tmp2 = tmp->head == NULL ? tmp : tmp->head; 200 object *tmp2 = tmp->head == 0 ? tmp : tmp->head;
197 201
198 if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) && 202 if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) &&
199 (tmp2->type != PLAYER)) || 203 (tmp2->type != PLAYER)) ||
200 should_arena_attack (pet, owner, tmp2)) 204 should_arena_attack (pet, owner, tmp2))
201 && !QUERY_FLAG (tmp2, FLAG_UNAGGRESSIVE) && tmp2 != pet && tmp2 != owner && can_detect_enemy (pet, tmp2, rv)) 205 && !QUERY_FLAG (tmp2, FLAG_UNAGGRESSIVE) && tmp2 != pet && tmp2 != owner && can_detect_enemy (pet, tmp2, rv))
202 { 206 {
203 207
204 if (!can_see_enemy (pet, tmp2)) 208 if (!can_see_enemy (pet, tmp2))
205 { 209 {
206 if (tmp3 != NULL) 210 if (tmp3 != 0)
207 tmp3 = tmp2; 211 tmp3 = tmp2;
208 } 212 }
209 else 213 else
210 { 214 {
211 pet->enemy = tmp2; 215 pet->enemy = tmp2;
212 if (check_enemy (pet, rv) != NULL) 216 if (check_enemy (pet, rv) != 0)
213 return tmp2; 217 return tmp2;
214 else 218 else
215 pet->enemy = NULL; 219 pet->enemy = 0;
216 } 220 }
217 } /* make sure we can get to the bugger */ 221 } /* make sure we can get to the bugger */
218 } /* for objects on this space */ 222 } /* for objects on this space */
219 } /* if there is something living on this space */ 223 } /* if there is something living on this space */
220 } /* for loop of spaces around the pet */ 224 } /* for loop of spaces around the pet */
225
226 /* fine, we went through the whole loop and didn't find one we could
227 see, take what we have */
228 if (tmp3 != 0)
229 {
230 pet->enemy = tmp3;
231 if (check_enemy (pet, rv) != 0)
232 return tmp3;
233 else
234 pet->enemy = 0;
235 }
221 } /* pet in defence mode */ 236 } /* pet in defence mode */
222 237
223 /* fine, we went through the whole loop and didn't find one we could 238 object *enemy = check_enemy (pet, rv);
224 see, take what we have */ 239 // we have a summoned pet here and the owners enemy isn't set or can't
225 if (tmp3 != NULL) 240 // be reached => search for a player around us and set it as our new enemy!!
226 { 241 if (!enemy && pet->owner && pet->owner->type != PLAYER)
227 pet->enemy = tmp3; 242 enemy = get_nearest_player (pet);
228 if (check_enemy (pet, rv) != NULL)
229 return tmp3;
230 else
231 pet->enemy = NULL;
232 }
233 243
234 /* Didn't find anything - return the owner's enemy or NULL */ 244 /* Didn't find anything - return the owner's enemy or 0 */
235 return check_enemy (pet, rv); 245 return enemy;
236} 246}
237 247
238void 248void
239terminate_all_pets (object *owner) 249terminate_all_pets (object *owner)
240{ 250{
241 objectlink *obl, *next; 251 objectlink *obl, *next;
242 252
243 for (obl = first_friendly_object; obl != NULL; obl = next) 253 for (obl = first_friendly_object; obl; obl = next)
244 { 254 {
245 object *ob = obl->ob; 255 object *ob = obl->ob;
246
247 next = obl->next; 256 next = obl->next;
257
248 if (ob->owner == owner) 258 if (ob->owner == owner)
249 {
250 if (!QUERY_FLAG (ob, FLAG_REMOVED))
251 ob->remove ();
252 remove_friendly_object (ob);
253 ob->destroy (); 259 ob->drop_and_destroy ();
254 }
255 } 260 }
256} 261}
257 262
258/* 263/*
259 * Unfortunately, sometimes, the owner of a pet is in the 264 * Unfortunately, sometimes, the owner of a pet is in the
… …
267remove_all_pets (maptile *map) 272remove_all_pets (maptile *map)
268{ 273{
269 objectlink *obl, *next; 274 objectlink *obl, *next;
270 object *owner; 275 object *owner;
271 276
272 for (obl = first_friendly_object; obl != NULL; obl = next) 277 for (obl = first_friendly_object; obl; obl = next)
273 { 278 {
274 next = obl->next; 279 next = obl->next;
275 if (obl->ob->type != PLAYER && QUERY_FLAG (obl->ob, FLAG_FRIENDLY) && 280
276 (owner = obl->ob->owner) != NULL && !on_same_map (owner, obl->ob)) 281 if (obl->ob->type != PLAYER
282 && QUERY_FLAG (obl->ob, FLAG_FRIENDLY)
283 && (owner = obl->ob->owner) != 0
284 && !on_same_map (owner, obl->ob))
277 { 285 {
278 /* follow owner checks map status for us */ 286 /* follow owner checks map status for us */
279 follow_owner (obl->ob, owner); 287 follow_owner (obl->ob, owner);
280 } 288 }
281 } 289 }
282} 290}
283 291
284int 292int
285follow_owner (object *ob, object *owner) 293follow_owner (object *ob, object *owner)
286{ 294{
287 object *tmp; 295 if (owner->flag [FLAG_REMOVED])
288 int dir; 296 return 0; // do nothing if the owner is removed
289 297 else if (!owner->map || owner->map->in_memory != MAP_ACTIVE)
290 if (!QUERY_FLAG (ob, FLAG_REMOVED)) 298 LOG (llevError, "owner '%s' of the pet '%s' not on a map in memory!?\n", &owner->name, &ob->name);
291 ob->remove (); 299 else
292
293 if (owner->map == NULL)
294 {
295 LOG (llevError, "Can't follow owner (%d): no map.\n", &owner->name);
296 goto fail;
297 } 300 {
298 if (owner->map->in_memory != MAP_IN_MEMORY)
299 {
300 LOG (llevError, "Owner of the pet not on a map in memory!?\n");
301 goto fail;
302 }
303
304 dir = find_free_spot (ob, owner->map, owner->x, owner->y, 1, SIZEOFFREE); 301 int dir = find_free_spot (ob, owner->map, owner->x, owner->y, 1, SIZEOFFREE);
305 302
306 if (dir == -1) 303 if (dir >= 0)
307 {
308 LOG (llevMonster, "No space for pet to follow, freeing %s.\n", &ob->name);
309 goto fail;
310 }
311 for (tmp = ob; tmp != NULL; tmp = tmp->more)
312 {
313 tmp->x = owner->x + freearr_x[dir] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
314 tmp->y = owner->y + freearr_y[dir] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
315 tmp->map = owner->map;
316 if (OUT_OF_REAL_MAP (tmp->map, tmp->x, tmp->y))
317 {
318 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y);
319 } 304 {
320 } 305 owner->map->insert (ob, owner->x + freearr_x[dir], owner->y + freearr_y[dir]);
321 insert_ob_in_map (ob, ob->map, NULL, 0); 306
322 if (owner->type == PLAYER) /* Uh, I hope this is always true... */ 307 if (owner->type == PLAYER) /* Uh, I hope this is always true... */
323 new_draw_info (NDI_UNIQUE, 0, owner, "Your pet magically appears next to you"); 308 new_draw_info (NDI_UNIQUE, 0, owner, "Your pet magically appears next to you");
324 309
325 return 0; 310 return 0;
311 }
312 }
326 313
327fail:
328 remove_friendly_object (ob);
329 ob->destroy (); 314 ob->drop_and_destroy ();
330 315
331 return 1; 316 return 1;
332} 317}
333 318
334void 319void
335pet_move (object *ob) 320pet_move (object *ob)
336{ 321{
337 int dir, i; 322 int dir = 0, i;
338 sint16 dx, dy; 323 sint16 dx, dy;
339 object *ob2, *owner; 324 object *ob2, *owner;
340 maptile *m; 325 maptile *m;
341 326
342 /* Check to see if player pulled out */ 327 /* Check to see if player pulled out */
343 if ((owner = ob->owner) == NULL) 328 if ((owner = ob->owner) == NULL)
344 { 329 {
345 ob->remove (); /* Will be freed when returning */
346 remove_friendly_object (ob);
347 ob->destroy (); 330 ob->drop_and_destroy ();
348 LOG (llevMonster, "Pet: no owner, leaving.\n"); 331 LOG (llevMonster, "Pet: no owner, leaving.\n");
349 return; 332 return;
350 } 333 }
351 334
352 /* move monster into the owners map if not in the same map */ 335 /* move monster into the owners map if not in the same map
353 if (!on_same_map (ob, owner)) 336 * except when the owner is removed.
337 */
338 if (!on_same_map (ob, owner) && !owner->flag [FLAG_REMOVED])
354 { 339 {
355 follow_owner (ob, owner); 340 follow_owner (ob, owner);
356 return; 341 return;
357 } 342 }
358 /* Calculate Direction */ 343 /* Calculate Direction */
… …
371 continue; 356 continue;
372 else 357 else
373 break; 358 break;
374 } 359 }
375 } 360 }
376 else 361 else if (!owner->flag [FLAG_REMOVED]) // only get vector to owner when owner not removed
377 { 362 {
378 struct rv_vector rv; 363 struct rv_vector rv;
379 364
380 get_rangevector (ob, ob->owner, &rv, 0); 365 get_rangevector (ob, ob->owner, &rv, 0);
381 dir = rv.direction; 366 dir = rv.direction;
… …
431 return; 416 return;
432 } 417 }
433 } 418 }
434 } 419 }
435 /* Try a different course */ 420 /* Try a different course */
436 dir = absdir (dir + 4 - (RANDOM () % 5) - (RANDOM () % 5)); 421 dir = absdir (dir + 4 - (rndm (5)) - (rndm (5)));
437 (void) move_ob (ob, dir, ob); 422 (void) move_ob (ob, dir, ob);
438 } 423 }
439 return; 424 return;
440} 425}
441 426
… …
452 * is_golem is to note that this is a golem spell. 437 * is_golem is to note that this is a golem spell.
453 */ 438 */
454object * 439object *
455fix_summon_pet (archetype *at, object *op, int dir, int is_golem) 440fix_summon_pet (archetype *at, object *op, int dir, int is_golem)
456{ 441{
457 archetype *atmp;
458 object *tmp = NULL, *prev = NULL, *head = NULL; 442 object *tmp = NULL, *prev = NULL, *head = NULL;
459 443
460 for (atmp = at; atmp; atmp = atmp->more) 444 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
461 { 445 {
462 tmp = arch_to_object (atmp); 446 tmp = arch_to_object (atmp);
463 447
464 if (atmp == at) 448 if (atmp == at)
465 { 449 {
466 if (!is_golem) 450 if (!is_golem)
467 SET_FLAG (tmp, FLAG_MONSTER); 451 SET_FLAG (tmp, FLAG_MONSTER);
468 452
469 tmp->set_owner (op); 453 tmp->set_owner (op);
454
470 if (op->type == PLAYER) 455 if (op->type == PLAYER)
471 { 456 {
472 tmp->stats.exp = 0; 457 tmp->stats.exp = 0;
473 add_friendly_object (tmp); 458 add_friendly_object (tmp);
474 SET_FLAG (tmp, FLAG_FRIENDLY);
475 if (is_golem) 459 if (is_golem)
476 CLEAR_FLAG (tmp, FLAG_MONSTER); 460 CLEAR_FLAG (tmp, FLAG_MONSTER);
477 } 461 }
478 else 462 else
479 { 463 {
… …
484 if (owner) 468 if (owner)
485 { /* For now, we transfer ownership */ 469 { /* For now, we transfer ownership */
486 tmp->set_owner (owner); 470 tmp->set_owner (owner);
487 tmp->attack_movement = PETMOVE; 471 tmp->attack_movement = PETMOVE;
488 add_friendly_object (tmp); 472 add_friendly_object (tmp);
489 SET_FLAG (tmp, FLAG_FRIENDLY);
490 } 473 }
491 } 474 }
492 } 475 }
493 476
494 if (op->type != PLAYER || !is_golem) 477 if (op->type != PLAYER || !is_golem)
… …
504 } 487 }
505 488
506 if (!head) 489 if (!head)
507 head = tmp; 490 head = tmp;
508 491
509 tmp->x = op->x + freearr_x[dir] + tmp->arch->clone.x; 492 tmp->x = op->x + freearr_x[dir] + tmp->arch->x;
510 tmp->y = op->y + freearr_y[dir] + tmp->arch->clone.y; 493 tmp->y = op->y + freearr_y[dir] + tmp->arch->y;
511 tmp->map = op->map; 494 tmp->map = op->map;
512 495
513 if (tmp->invisible) 496 if (tmp->invisible)
514 tmp->invisible = 0; 497 tmp->invisible = 0;
515 498
… …
547 object *tmp; 530 object *tmp;
548 531
549 if (QUERY_FLAG (op, FLAG_MONSTER)) 532 if (QUERY_FLAG (op, FLAG_MONSTER))
550 return; /* Has already been moved */ 533 return; /* Has already been moved */
551 534
552 if (op->owner == NULL) 535 if (!op->owner)
553 { 536 {
554 LOG (llevDebug, "Golem without owner destructed.\n"); 537 LOG (llevDebug, "Golem without owner destructed.\n");
555 op->remove ();
556 op->destroy (); 538 op->drop_and_destroy ();
557 return; 539 return;
558 } 540 }
559 541
560 /* It would be nice to have a cleaner way of what message to print 542 /* It would be nice to have a cleaner way of what message to print
561 * when the golem expires than these hard coded entries. 543 * when the golem expires than these hard coded entries.
… …
565 if (--op->stats.hp < 0) 547 if (--op->stats.hp < 0)
566 { 548 {
567 if (op->msg) 549 if (op->msg)
568 new_draw_info (NDI_UNIQUE, 0, op->owner, op->msg); 550 new_draw_info (NDI_UNIQUE, 0, op->owner, op->msg);
569 551
570 op->owner->contr->ranges[range_golem] = 0;
571 remove_friendly_object (op);
572 op->remove ();
573 op->destroy (); 552 op->drop_and_destroy ();
574 return; 553 return;
575 } 554 }
576 555
577 /* Do golem attacks/movement for single & multisq golems. 556 /* Do golem attacks/movement for single & multisq golems.
578 * Assuming here that op is the 'head' object. Pass only op to 557 * Assuming here that op is the 'head' object. Pass only op to
… …
596 mflags = get_map_flags (m, &m, x, y, &x, &y); 575 mflags = get_map_flags (m, &m, x, y, &x, &y);
597 576
598 if (mflags & P_OUT_OF_MAP) 577 if (mflags & P_OUT_OF_MAP)
599 continue; 578 continue;
600 579
601 for (victim = GET_MAP_OB (op->map, x, y); victim; victim = victim->above) 580 for (victim = GET_MAP_OB (m, x, y); victim; victim = victim->above)
602 if (QUERY_FLAG (victim, FLAG_ALIVE)) 581 if (QUERY_FLAG (victim, FLAG_ALIVE))
603 break; 582 break;
604 583
605 /* We used to call will_hit_self to make sure we don't 584 /* We used to call will_hit_self to make sure we don't
606 * hit ourselves, but that didn't work, and I don't really 585 * hit ourselves, but that didn't work, and I don't really
… …
609 * but since we are not trying to dereferance that pointer, 588 * but since we are not trying to dereferance that pointer,
610 * that isn't a problem. 589 * that isn't a problem.
611 */ 590 */
612 if (victim && victim != op && victim->head != op) 591 if (victim && victim != op && victim->head != op)
613 { 592 {
614
615 /* for golems with race fields, we don't attack 593 /* for golems with race fields, we don't attack
616 * aligned races 594 * aligned races
617 */ 595 */
618 596
619 if (victim->race && op->race && strstr (op->race, victim->race)) 597 if (victim->race && op->race && op->race.contains (victim->race))
620 { 598 {
621 if (op->owner) 599 if (op->owner)
622 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s avoids damaging %s.", &op->name, &victim->name); 600 new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s avoids damaging %s.", &op->name, &victim->name);
623 } 601 }
624 else if (victim == op->owner) 602 else if (victim == op->owner)
… …
631 attack_ob (victim, op); 609 attack_ob (victim, op);
632 made_attack = 1; 610 made_attack = 1;
633 } 611 }
634 } /* If victim */ 612 } /* If victim */
635 } 613 }
614
636 if (made_attack) 615 if (made_attack)
637 update_object (op, UP_OBJ_FACE); 616 update_object (op, UP_OBJ_FACE);
638} 617}
639 618
640/* this is a really stupid function when you get down and 619/* this is a really stupid function when you get down and
… …
646control_golem (object *op, int dir) 625control_golem (object *op, int dir)
647{ 626{
648 op->direction = dir; 627 op->direction = dir;
649} 628}
650 629
651/* summon golem: summons a monster for 'op'. caster is the object 630/* summon golem: summons a monster for 'op'. caster is the object
652 * casting the spell, dir is the direction to place the monster, 631 * casting the spell, dir is the direction to place the monster,
653 * at is the archetype of the monster, and spob is the spell 632 * at is the archetype of the monster, and spob is the spell
654 * object. At this stage, all spob is really used for is to 633 * object. At this stage, all spob is really used for is to
655 * adjust some values in the monster. 634 * adjust some values in the monster.
656 */ 635 */
… …
662 char buf[MAX_BUF]; 641 char buf[MAX_BUF];
663 642
664 /* Because there can be different golem spells, player may want to 643 /* Because there can be different golem spells, player may want to
665 * 'lose' their old golem. 644 * 'lose' their old golem.
666 */ 645 */
667 if (op->type == PLAYER && op->contr->ranges[range_golem]) 646 if (op->type == PLAYER && op->contr->golem)
668 { 647 {
669 new_draw_info (NDI_UNIQUE, 0, op, "You dismiss your existing golem."); 648 new_draw_info (NDI_UNIQUE, 0, op, "You dismiss your existing golem.");
670 op->contr->ranges[range_golem]->remove ();
671 op->contr->ranges[range_golem]->destroy (); 649 op->contr->golem->drop_and_destroy ();
672 op->contr->ranges[range_golem] = 0; 650 op->contr->golem = 0;
673 } 651 }
674 652
675 if (spob->other_arch) 653 if (spob->other_arch)
676 at = spob->other_arch; 654 at = spob->other_arch;
677 else if (spob->race) 655 else if (spob->race)
… …
697 LOG (llevError, "Spell %s lacks other_arch\n", &spob->name); 675 LOG (llevError, "Spell %s lacks other_arch\n", &spob->name);
698 return 0; 676 return 0;
699 } 677 }
700 678
701 if (!dir) 679 if (!dir)
702 dir = find_free_spot (NULL, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1); 680 dir = find_free_spot (at, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
703 681
704 if (dir == -1 || ob_blocked (&at->clone, op->map, op->x + freearr_x[dir], op->y + freearr_y[dir])) 682 if (dir < 0 || at->blocked (op->map, op->x + freearr_x[dir], op->y + freearr_y[dir]))
705 { 683 {
706 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 684 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
707 return 0; 685 return 0;
708 } 686 }
709 687
… …
716 } 694 }
717 695
718 if (op->type == PLAYER) 696 if (op->type == PLAYER)
719 { 697 {
720 tmp->type = GOLEM; 698 tmp->type = GOLEM;
721 tmp->set_owner (op); 699 op->contr->golem = tmp;
700 /* give the player control of the golem */
722 set_spell_skill (op, caster, spob, tmp); 701 set_spell_skill (op, caster, spob, tmp);
723 op->contr->ranges[range_golem] = tmp;
724 /* give the player control of the golem */
725 op->contr->shoottype = range_golem;
726 }
727 else
728 {
729 if (QUERY_FLAG (op, FLAG_FRIENDLY))
730 {
731 object *owner = op->owner;
732
733 if (owner)
734 { /* For now, we transfer ownership */
735 tmp->set_owner (owner);
736 tmp->attack_movement = PETMOVE;
737 add_friendly_object (tmp);
738 SET_FLAG (tmp, FLAG_FRIENDLY);
739 }
740 }
741
742 SET_FLAG (tmp, FLAG_MONSTER);
743 } 702 }
744 703
745 /* make the speed positive. */ 704 /* make the speed positive. */
746 tmp->speed = FABS (tmp->speed); 705 tmp->speed = fabs (tmp->speed);
747 706
748 /* This sets the level dependencies on dam and hp for monsters */ 707 /* This sets the level dependencies on dam and hp for monsters */
749 /* players can't cope with too strong summonings. */ 708 /* players can't cope with too strong summonings. */
750 /* but monsters can. reserve these for players. */ 709 /* but monsters can. reserve these for players. */
751 if (op->type == PLAYER) 710 if (op->type == PLAYER)
… …
756 tmp->stats.dam += SP_level_dam_adjust (caster, spob); 715 tmp->stats.dam += SP_level_dam_adjust (caster, spob);
757 else 716 else
758 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 717 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
759 718
760 tmp->speed += .02 * SP_level_range_adjust (caster, spob); 719 tmp->speed += .02 * SP_level_range_adjust (caster, spob);
761 tmp->speed = MIN (tmp->speed, 1.0); 720 tmp->speed = min (tmp->speed, 1.0);
762 721
763 if (spob->attacktype) 722 if (spob->attacktype)
764 tmp->attacktype = spob->attacktype; 723 tmp->attacktype = spob->attacktype;
765 } 724 }
766 725
… …
770 729
771 /* make experience increase in proportion to the strength. 730 /* make experience increase in proportion to the strength.
772 * this is a bit simplistic - we are basically just looking at how 731 * this is a bit simplistic - we are basically just looking at how
773 * often the sp doubles and use that as the ratio. 732 * often the sp doubles and use that as the ratio.
774 */ 733 */
775 tmp->stats.exp *= 1 + (MAX (spob->stats.maxgrace, spob->stats.sp) / caster_level (caster, spob)); 734 tmp->stats.exp *= 1 + max (spob->stats.maxgrace, spob->stats.sp) / casting_level (caster, spob);
776 tmp->speed_left = 0; 735 tmp->speed_left = 0;
777 tmp->direction = dir; 736 tmp->direction = dir;
778 737
779 /* Holy spell - some additional tailoring */ 738 /* Holy spell - some additional tailoring */
780 if (god) 739 if (god)
… …
796 if (!(tmp->attacktype & AT_PHYSICAL)) 755 if (!(tmp->attacktype & AT_PHYSICAL))
797 tmp->attacktype |= AT_PHYSICAL; 756 tmp->attacktype |= AT_PHYSICAL;
798 } 757 }
799 758
800 insert_ob_in_map (tmp, tmp->map, op, 0); 759 insert_ob_in_map (tmp, tmp->map, op, 0);
760
801 return 1; 761 return 1;
802} 762}
803 763
804 764
805/*************************************************************************** 765/***************************************************************************
… …
811/* Returns a monster (chosen at random) that this particular player (and his 771/* Returns a monster (chosen at random) that this particular player (and his
812 * god) find acceptable. This checks level, races allowed by god, etc 772 * god) find acceptable. This checks level, races allowed by god, etc
813 * to determine what is acceptable. 773 * to determine what is acceptable.
814 * This returns NULL if no match was found. 774 * This returns NULL if no match was found.
815 */ 775 */
816
817object * 776object *
818choose_cult_monster (object *pl, object *god, int summon_level) 777choose_cult_monster (object *pl, object *god, int summon_level)
819{ 778{
820 char buf[MAX_BUF]; 779 char buf[MAX_BUF];
821 const char *race; 780 const char *race;
… …
876 * a valid entry, assuming nothing is available and quit. 835 * a valid entry, assuming nothing is available and quit.
877 */ 836 */
878 if (!mon_nr) 837 if (!mon_nr)
879 return NULL; 838 return NULL;
880 839
881 mon_nr = rndm (0, mon_nr - 1); 840 mon_nr = rndm (mon_nr - 1);
882 for (tobl = list->member; tobl; tobl = tobl->next) 841 for (tobl = list->member; tobl; tobl = tobl->next)
883 { 842 {
884 otmp = tobl->ob; 843 otmp = tobl->ob;
885 if (!otmp || !QUERY_FLAG (otmp, FLAG_MONSTER)) 844 if (!otmp || !QUERY_FLAG (otmp, FLAG_MONSTER))
886 continue; 845 continue;
846
887 if (otmp->level <= summon_level && !mon_nr--) 847 if (otmp->level <= summon_level && !mon_nr--)
888 return otmp; 848 return otmp;
889 } 849 }
850
890 /* This should not happen */ 851 /* This should not happen */
891 LOG (llevDebug, "choose_cult_monster() mon_nr was set, but did not find a monster\n"); 852 LOG (llevDebug, "choose_cult_monster() mon_nr was set, but did not find a monster\n");
892 return NULL; 853 return NULL;
893} 854}
894 855
… …
901 862
902 if (spell_ob->other_arch) 863 if (spell_ob->other_arch)
903 summon_arch = spell_ob->other_arch; 864 summon_arch = spell_ob->other_arch;
904 else if (spell_ob->randomitems) 865 else if (spell_ob->randomitems)
905 { 866 {
906 int level = caster_level (caster, spell_ob); 867 int level = casting_level (caster, spell_ob);
907 treasure *tr, *lasttr = NULL; 868 treasure *tr, *lasttr = NULL;
908 869
909 shstr_cmp sparam (stringarg); 870 shstr_cmp sparam (stringarg);
910 871
911 /* In old code, this was a very convoluted for statement, 872 /* In old code, this was a very convoluted for statement,
… …
920 if (level < tr->magic) 881 if (level < tr->magic)
921 break; 882 break;
922 883
923 lasttr = tr; 884 lasttr = tr;
924 885
925 if (tr->item->name == sparam) 886 if (tr->item->archname == sparam)
926 break; 887 break;
927 } 888 }
928 889
929 if (!lasttr) 890 if (!lasttr)
930 { 891 {
… …
953 new_draw_info_format (NDI_UNIQUE, 0, op, "%s has no creatures that you may summon!", &god->name); 914 new_draw_info_format (NDI_UNIQUE, 0, op, "%s has no creatures that you may summon!", &god->name);
954 return 0; 915 return 0;
955 } 916 }
956 917
957 /* the summon level */ 918 /* the summon level */
958 summon_level = caster_level (caster, spell_ob); 919 summon_level = casting_level (caster, spell_ob);
959 if (summon_level == 0) 920 if (summon_level == 0)
960 summon_level = 1; 921 summon_level = 1;
961 922
962 tries = 0; 923 tries = 0;
963 do 924 do
… …
972 ndir = dir; 933 ndir = dir;
973 934
974 if (!ndir) 935 if (!ndir)
975 ndir = find_free_spot (mon, op->map, op->x, op->y, 1, SIZEOFFREE); 936 ndir = find_free_spot (mon, op->map, op->x, op->y, 1, SIZEOFFREE);
976 937
977 if (ndir == -1 || ob_blocked (mon, op->map, op->x + freearr_x[ndir], op->y + freearr_y[ndir])) 938 if (ndir < 0 || mon->blocked (op->map, op->x + freearr_x[ndir], op->y + freearr_y[ndir]))
978 { 939 {
979 ndir = -1; 940 ndir = -1;
980 if (++tries == 5) 941 if (++tries == 5)
981 { 942 {
982 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 943 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1005 return 0; 966 return 0;
1006 } 967 }
1007 968
1008 for (i = 1; i <= nrof; i++) 969 for (i = 1; i <= nrof; i++)
1009 { 970 {
1010 archetype *atmp;
1011 object *prev = NULL, *head = NULL, *tmp; 971 object *prev = NULL, *head = NULL, *tmp;
1012 972
1013 if (dir) 973 if (dir)
1014 { 974 {
1015 ndir = dir; 975 ndir = dir;
1016 dir = absdir (dir + 1); 976 dir = absdir (dir + 1);
1017 } 977 }
1018 else 978 else
1019 ndir = find_free_spot (&summon_arch->clone, op->map, op->x, op->y, 1, SIZEOFFREE); 979 ndir = find_free_spot (summon_arch, op->map, op->x, op->y, 1, SIZEOFFREE);
1020 980
1021 if (ndir > 0) 981 if (ndir > 0)
1022 { 982 {
1023 x = freearr_x[ndir]; 983 x = freearr_x[ndir];
1024 y = freearr_y[ndir]; 984 y = freearr_y[ndir];
1025 } 985 }
1026 986
1027 if (ndir == -1 || ob_blocked (&summon_arch->clone, op->map, op->x + x, op->y + y)) 987 if (ndir < 0 || summon_arch->blocked (op->map, op->x + x, op->y + y))
1028 { 988 {
1029 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 989 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1030 if (nrof > 1) 990 if (nrof > 1)
1031 new_draw_info (NDI_UNIQUE, 0, op, "No more pets for this casting."); 991 new_draw_info (NDI_UNIQUE, 0, op, "No more pets for this casting.");
1032 992
1033 return nrof > 1; 993 return nrof > 1;
1034 } 994 }
1035 995
1036 for (atmp = summon_arch; atmp != NULL; atmp = atmp->more) 996 for (archetype *atmp = summon_arch; atmp != NULL; atmp = (archetype *)atmp->more)
1037 { 997 {
1038 tmp = arch_to_object (atmp); 998 tmp = arch_to_object (atmp);
1039 if (atmp == summon_arch) 999 if (atmp == summon_arch)
1040 { 1000 {
1041 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1001 if (QUERY_FLAG (tmp, FLAG_MONSTER))
… …
1049 if (op->type == PLAYER || QUERY_FLAG (op, FLAG_FRIENDLY)) 1009 if (op->type == PLAYER || QUERY_FLAG (op, FLAG_FRIENDLY))
1050 { 1010 {
1051 /* If this is not set, we make it friendly */ 1011 /* If this is not set, we make it friendly */
1052 if (!QUERY_FLAG (spell_ob, FLAG_MONSTER)) 1012 if (!QUERY_FLAG (spell_ob, FLAG_MONSTER))
1053 { 1013 {
1054 SET_FLAG (tmp, FLAG_FRIENDLY);
1055 add_friendly_object (tmp); 1014 add_friendly_object (tmp);
1056 tmp->stats.exp = 0; 1015 tmp->stats.exp = 0;
1057 1016
1058 if (spell_ob->attack_movement) 1017 if (spell_ob->attack_movement)
1059 tmp->attack_movement = spell_ob->attack_movement; 1018 tmp->attack_movement = spell_ob->attack_movement;
… …
1075 tmp->head = head; 1034 tmp->head = head;
1076 prev->more = tmp; 1035 prev->more = tmp;
1077 } 1036 }
1078 1037
1079 prev = tmp; 1038 prev = tmp;
1080 tmp->x = op->x + x + tmp->arch->clone.x; 1039 tmp->x = op->x + x + tmp->arch->x;
1081 tmp->y = op->y + y + tmp->arch->clone.y; 1040 tmp->y = op->y + y + tmp->arch->y;
1082 tmp->map = op->map; 1041 tmp->map = op->map;
1083 } 1042 }
1084 1043
1085 head->direction = freedir[ndir]; 1044 head->direction = freedir[ndir];
1086 head->stats.exp = 0; 1045 head->stats.exp = 0;
… …
1089 if (head && head->randomitems) 1048 if (head && head->randomitems)
1090 { 1049 {
1091 create_treasure (head->randomitems, head, GT_APPLY | GT_STARTEQUIP, 6, 0); 1050 create_treasure (head->randomitems, head, GT_APPLY | GT_STARTEQUIP, 6, 0);
1092 1051
1093 for (object *tmp = head->inv; tmp; tmp = tmp->below) 1052 for (object *tmp = head->inv; tmp; tmp = tmp->below)
1094 SET_FLAG (tmp, FLAG_NO_DROP); 1053 SET_FLAG (tmp, FLAG_DESTROY_ON_DEATH);
1095 } 1054 }
1096 } /* for i < nrof */ 1055 } /* for i < nrof */
1097 1056
1098 return 1; 1057 return 1;
1099}
1100
1101/* recursively look through the owner property of objects until the real owner
1102is found */
1103object *
1104get_real_owner (object *ob)
1105{
1106 object *realowner = ob;
1107
1108 if (realowner == NULL)
1109 return NULL;
1110
1111 while (realowner->owner != NULL)
1112 {
1113 realowner = realowner->owner;
1114 }
1115 return realowner;
1116} 1058}
1117 1059
1118/* determines if checks so pets don't attack players or other pets should be 1060/* determines if checks so pets don't attack players or other pets should be
1119overruled by the arena petmode */ 1061overruled by the arena petmode */
1120int 1062int
… …
1126 if ((target == NULL) || (pet == NULL) || (owner == NULL)) 1068 if ((target == NULL) || (pet == NULL) || (owner == NULL))
1127 return 0; 1069 return 0;
1128 1070
1129 /* get the owners of itself and the target, this is to deal with pets of 1071 /* get the owners of itself and the target, this is to deal with pets of
1130 pets */ 1072 pets */
1131 rowner = get_real_owner (owner); 1073 rowner = owner->outer_owner ();
1132 if (target->type != PLAYER) 1074 towner = target->is_player () ? 0 : target->outer_owner ();
1133 {
1134 towner = get_real_owner (target);
1135 }
1136 else
1137 {
1138 towner = 0;
1139 }
1140 1075
1141 /* if the pet has now owner, exit with error */ 1076 /* if the pet has now owner, exit with error */
1142 if (rowner == NULL) 1077 if (!rowner)
1143 { 1078 {
1144 LOG (llevError, "Pet has no owner.\n"); 1079 LOG (llevError, "Pet has no owner.\n");
1145 return 0; 1080 return 0;
1146 } 1081 }
1147 1082
1148 /* if the target is not a player, and has no owner, we shouldn't be here 1083 /* if the target is not a player, and has no owner, we shouldn't be here
1149 */ 1084 */
1150 if ((towner == NULL) && (target->type != PLAYER)) 1085 if (!towner && !target->is_player ())
1151 { 1086 {
1152 LOG (llevError, "Target is not a player but has no owner. We should not be here.\n"); 1087 LOG (llevError, "Target is not a player but has no owner. We should not be here.\n");
1153 return 0; 1088 return 0;
1154 } 1089 }
1155 1090
1156 /* make sure that the owner is a player */ 1091 /* make sure that the owner is a player */
1157 if (rowner->type != PLAYER) 1092 if (!rowner->is_player ())
1158 return 0; 1093 return 0;
1159 1094
1160 /* abort if the petmode is not arena */ 1095 /* abort if the petmode is not arena */
1161 if (rowner->contr->petmode != pet_arena) 1096 if (rowner->contr->petmode != pet_arena)
1162 return 0; 1097 return 0;
… …
1164 /* abort if the pet, it's owner, or the target is not on battleground */ 1099 /* abort if the pet, it's owner, or the target is not on battleground */
1165 if (!(op_on_battleground (pet, NULL, NULL) && op_on_battleground (owner, NULL, NULL) && op_on_battleground (target, NULL, NULL))) 1100 if (!(op_on_battleground (pet, NULL, NULL) && op_on_battleground (owner, NULL, NULL) && op_on_battleground (target, NULL, NULL)))
1166 return 0; 1101 return 0;
1167 1102
1168 /* if the target is a monster, make sure it's owner is not the same */ 1103 /* if the target is a monster, make sure it's owner is not the same */
1169 if ((target->type != PLAYER) && (rowner == towner)) 1104 if (!target->is_player () && rowner == towner)
1170 return 0; 1105 return 0;
1171 1106
1172 /* check if the target is a player which affects how it will handle 1107 /* check if the target is a player which affects how it will handle
1173 parties */ 1108 parties */
1174 if (target->type != PLAYER) 1109 if (!target->is_player ())
1175 { 1110 {
1176 /* if the target is owned by a player make sure than make sure 1111 /* if the target is owned by a player make sure than make sure
1177 it's not in the same party */ 1112 it's not in the same party */
1178 if ((towner->type == PLAYER) && (rowner->contr->party != NULL)) 1113 if (towner->is_player () && rowner->contr->party)
1179 {
1180 if (rowner->contr->party == towner->contr->party) 1114 if (rowner->contr->party == towner->contr->party)
1181 return 0; 1115 return 0;
1182 }
1183 } 1116 }
1184 else 1117 else
1185 { 1118 {
1186 /* if the target is a player make sure than make sure it's not 1119 /* if the target is a player make sure than make sure it's not
1187 in the same party */ 1120 in the same party */
1188 if (rowner->contr->party != NULL) 1121 if (rowner->contr->party)
1189 {
1190 if (rowner->contr->party == target->contr->party) 1122 if (rowner->contr->party == target->contr->party)
1191 return 0; 1123 return 0;
1192 }
1193 } 1124 }
1194 1125
1195 return 1; 1126 return 1;
1196} 1127}
1128

Diff Legend

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