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.17 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.38 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <sproto.h> 25#include <sproto.h>
26 26
27/* given that 'pet' is a friendly object, this function returns a 27/* given that 'pet' is a friendly object, this function returns a
… …
41 int mflags; 41 int mflags;
42 42
43 attacker = pet->attacked_by; /*pointer to attacking enemy */ 43 attacker = pet->attacked_by; /*pointer to attacking enemy */
44 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 */
45 45
46 if ((owner = pet->owner) != NULL) 46 if (owner = pet->owner)
47 { 47 {
48 /* If the owner has turned on the pet, make the pet 48 /* If the owner has turned on the pet, make the pet
49 * unfriendly. 49 * unfriendly.
50 */ 50 */
51 if ((check_enemy (owner, rv)) == pet) 51 if (check_enemy (owner, rv) == pet)
52 { 52 {
53 CLEAR_FLAG (pet, FLAG_FRIENDLY);
54 remove_friendly_object (pet); 53 remove_friendly_object (pet);
55 pet->attack_movement &= ~PETMOVE; 54 pet->attack_movement &= ~PETMOVE;
56 return owner; 55 return owner;
57 } 56 }
58 } 57 }
59 else 58 else
60 { 59 {
61 /* else the owner is no longer around, so the 60 /* else the owner is no longer around, so the
62 * pet no longer needs to be friendly. 61 * pet no longer needs to be friendly.
63 */ 62 */
64 CLEAR_FLAG (pet, FLAG_FRIENDLY);
65 remove_friendly_object (pet); 63 remove_friendly_object (pet);
66 pet->attack_movement &= ~PETMOVE; 64 pet->attack_movement &= ~PETMOVE;
67 return NULL; 65 return 0;
68 } 66 }
67
69 /* 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 */
70 if (!on_same_map (pet, owner)) 69 //if (!on_same_map (pet, owner))
71 return NULL; 70 // return 0;
72 71
73 /* 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 */
74 if ((tmp = check_enemy (pet, rv)) != NULL) 73 if (tmp = check_enemy (pet, rv))
75 { 74 {
76 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))
77 /* without this check, you can actually get pets with 76 /* without this check, you can actually get pets with
78 * enemy set to owner! 77 * enemy set to owner!
79 */ 78 */
80 pet->enemy = NULL; 79 pet->enemy = 0;
81 else 80 else
82 return tmp; 81 return tmp;
83 } 82 }
83
84 get_search_arr (search_arr); 84 get_search_arr (search_arr);
85 85
86 if (owner->type == PLAYER && owner->contr->petmode > pet_normal) 86 if (owner->type == PLAYER && owner->contr->petmode > pet_normal)
87 { 87 {
88 if (owner->contr->petmode == pet_sad) 88 if (owner->contr->petmode == pet_sad)
89 { 89 {
90 tmp = find_nearest_living_creature (pet); 90 tmp = find_nearest_living_creature (pet);
91 if (tmp != NULL) 91 if (tmp != 0)
92 { 92 {
93 get_rangevector (pet, tmp, rv, 0); 93 get_rangevector (pet, tmp, rv, 0);
94 if (check_enemy (pet, rv) != NULL) 94 if (check_enemy (pet, rv) != 0)
95 return tmp; 95 return tmp;
96 else 96 else
97 pet->enemy = NULL; 97 pet->enemy = 0;
98 } 98 }
99 /* if we got here we have no enemy */ 99 /* if we got here we have no enemy */
100 /* we return NULL to avoid heading back to the owner */ 100 /* we return 0 to avoid heading back to the owner */
101 pet->enemy = NULL; 101 pet->enemy = 0;
102 return NULL; 102 return 0;
103 } 103 }
104 } 104 }
105 105
106 /* Since the pet has no existing enemy, look for anything nasty 106 /* Since the pet has no existing enemy, look for anything nasty
107 * 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)
108 */ 109 */
109 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
110 for (i = 0; i < SIZEOFFREE; i++) 115 for (i = 0; i < SIZEOFFREE; i++)
111 { 116 {
112 x = owner->x + freearr_x[search_arr[i]]; 117 x = owner->x + freearr_x[search_arr[i]];
113 y = owner->y + freearr_y[search_arr[i]]; 118 y = owner->y + freearr_y[search_arr[i]];
114 nm = owner->map; 119 nm = owner->map;
115 /* Only look on the space if there is something alive there. */ 120 /* Only look on the space if there is something alive there. */
116 mflags = get_map_flags (nm, &nm, x, y, &x, &y); 121 mflags = get_map_flags (nm, &nm, x, y, &x, &y);
122
117 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 123 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
118 { 124 {
119 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)
120 {
121 object *tmp2 = tmp->head == NULL ? tmp : tmp->head;
122
123 if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) &&
124 (tmp2->type != PLAYER)) ||
125 should_arena_attack (pet, owner, tmp2))
126 && !QUERY_FLAG (tmp2, FLAG_UNAGGRESSIVE) && tmp2 != pet && tmp2 != owner && can_detect_enemy (pet, tmp2, rv))
127 { 126 {
127 object *tmp2 = tmp->head == 0 ? tmp : tmp->head;
128 128
129 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))
130 { 133 {
134
135 if (!can_see_enemy (pet, tmp2))
136 {
131 if (tmp3 != NULL) 137 if (tmp3 != 0)
132 tmp3 = tmp2; 138 tmp3 = tmp2;
133 } 139 }
134 else
135 {
136 pet->enemy = tmp2;
137 if (check_enemy (pet, rv) != NULL)
138 return tmp2;
139 else 140 else
141 {
142 pet->enemy = tmp2;
143 if (check_enemy (pet, rv) != 0)
144 return tmp2;
145 else
140 pet->enemy = NULL; 146 pet->enemy = 0;
141 } 147 }
142 } /* if this is a valid enemy */ 148 } /* if this is a valid enemy */
143 } /* for objects on this space */ 149 } /* for objects on this space */
144 } /* if there is something living on this space */ 150 } /* if there is something living on this space */
145 } /* for loop of spaces around the owner */ 151 } /* for loop of spaces around the owner */
146 152
147 /* 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
148 see, take what we have */ 154 see, take what we have */
149 if (tmp3 != NULL) 155 if (tmp3 != 0)
150 { 156 {
151 pet->enemy = tmp3; 157 pet->enemy = tmp3;
152 if (check_enemy (pet, rv) != NULL) 158 if (check_enemy (pet, rv) != 0)
153 return tmp3; 159 return tmp3;
154 else 160 else
155 pet->enemy = NULL; 161 pet->enemy = 0;
162 }
156 } 163 }
157 164
158 /* 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 */
159 if (attacker) 166 if (attacker)
160 { 167 {
… …
162 /* or otherwise non-hostile, and is an appropriate target */ 169 /* or otherwise non-hostile, and is an appropriate target */
163 if (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && on_same_map (pet, attacker)) 170 if (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && on_same_map (pet, attacker))
164 { 171 {
165 pet->enemy = attacker; 172 pet->enemy = attacker;
166 173
167 if (check_enemy (pet, rv) != NULL) 174 if (check_enemy (pet, rv) != 0)
168 return attacker; 175 return attacker;
169 else 176 else
170 pet->enemy = NULL; 177 pet->enemy = 0;
171 } 178 }
172 } 179 }
173 180
174 /* 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!.
175 * 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
176 * 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
177 * the same as the code that looks around the owner. 184 * the same as the code that looks around the owner.
178 */ 185 */
179 if (owner->type == PLAYER && owner->contr->petmode != pet_defend) 186 if (owner->type == PLAYER && owner->contr->petmode != pet_defend)
180 { 187 {
181 tmp3 = NULL; 188 tmp3 = 0;
182 for (i = 0; i < SIZEOFFREE; i++) 189 for (i = 0; i < SIZEOFFREE; i++)
183 { 190 {
184 x = pet->x + freearr_x[search_arr[i]]; 191 x = pet->x + freearr_x[search_arr[i]];
185 y = pet->y + freearr_y[search_arr[i]]; 192 y = pet->y + freearr_y[search_arr[i]];
186 nm = pet->map; 193 nm = pet->map;
187 /* Only look on the space if there is something alive there. */ 194 /* Only look on the space if there is something alive there. */
188 mflags = get_map_flags (nm, &nm, x, y, &x, &y); 195 mflags = get_map_flags (nm, &nm, x, y, &x, &y);
189 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE) 196 if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
190 { 197 {
191 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)
192 { 199 {
193 object *tmp2 = tmp->head == NULL ? tmp : tmp->head; 200 object *tmp2 = tmp->head == 0 ? tmp : tmp->head;
194 201
195 if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) && 202 if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) &&
196 (tmp2->type != PLAYER)) || 203 (tmp2->type != PLAYER)) ||
197 should_arena_attack (pet, owner, tmp2)) 204 should_arena_attack (pet, owner, tmp2))
198 && !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))
199 { 206 {
200 207
201 if (!can_see_enemy (pet, tmp2)) 208 if (!can_see_enemy (pet, tmp2))
202 { 209 {
203 if (tmp3 != NULL) 210 if (tmp3 != 0)
204 tmp3 = tmp2; 211 tmp3 = tmp2;
205 } 212 }
206 else 213 else
207 { 214 {
208 pet->enemy = tmp2; 215 pet->enemy = tmp2;
209 if (check_enemy (pet, rv) != NULL) 216 if (check_enemy (pet, rv) != 0)
210 return tmp2; 217 return tmp2;
211 else 218 else
212 pet->enemy = NULL; 219 pet->enemy = 0;
213 } 220 }
214 } /* make sure we can get to the bugger */ 221 } /* make sure we can get to the bugger */
215 } /* for objects on this space */ 222 } /* for objects on this space */
216 } /* if there is something living on this space */ 223 } /* if there is something living on this space */
217 } /* 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 }
218 } /* pet in defence mode */ 236 } /* pet in defence mode */
219 237
220 /* fine, we went through the whole loop and didn't find one we could 238 object *enemy = check_enemy (pet, rv);
221 see, take what we have */ 239 // we have a summoned pet here and the owners enemy isn't set or can't
222 if (tmp3 != NULL) 240 // be reached => search for a player around us and set it as our new enemy!!
223 { 241 if (!enemy && pet->owner && pet->owner->type != PLAYER)
224 pet->enemy = tmp3; 242 enemy = get_nearest_player (pet);
225 if (check_enemy (pet, rv) != NULL)
226 return tmp3;
227 else
228 pet->enemy = NULL;
229 }
230 243
231 /* Didn't find anything - return the owner's enemy or NULL */ 244 /* Didn't find anything - return the owner's enemy or 0 */
232 return check_enemy (pet, rv); 245 return enemy;
233} 246}
234 247
235void 248void
236terminate_all_pets (object *owner) 249terminate_all_pets (object *owner)
237{ 250{
238 objectlink *obl, *next; 251 objectlink *obl, *next;
239 252
240 for (obl = first_friendly_object; obl != NULL; obl = next) 253 for (obl = first_friendly_object; obl; obl = next)
241 { 254 {
242 object *ob = obl->ob; 255 object *ob = obl->ob;
243
244 next = obl->next; 256 next = obl->next;
257
245 if (ob->owner == owner) 258 if (ob->owner == owner)
246 {
247 if (!QUERY_FLAG (ob, FLAG_REMOVED))
248 ob->remove ();
249 remove_friendly_object (ob);
250 ob->destroy (); 259 ob->destroy ();
251 }
252 } 260 }
253} 261}
254 262
255/* 263/*
256 * Unfortunately, sometimes, the owner of a pet is in the 264 * Unfortunately, sometimes, the owner of a pet is in the
… …
258 * Thus the map isn't loaded yet, and we have to remove 266 * Thus the map isn't loaded yet, and we have to remove
259 * the pet... 267 * the pet...
260 * Interesting enough, we don't use the passed map structure in 268 * Interesting enough, we don't use the passed map structure in
261 * this function. 269 * this function.
262 */ 270 */
263
264void 271void
265remove_all_pets (maptile *map) 272remove_all_pets (maptile *map)
266{ 273{
267 objectlink *obl, *next; 274 objectlink *obl, *next;
268 object *owner; 275 object *owner;
269 276
270 for (obl = first_friendly_object; obl != NULL; obl = next) 277 for (obl = first_friendly_object; obl; obl = next)
271 { 278 {
272 next = obl->next; 279 next = obl->next;
273 if (obl->ob->type != PLAYER && QUERY_FLAG (obl->ob, FLAG_FRIENDLY) && 280
274 (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))
275 { 285 {
276 /* follow owner checks map status for us */ 286 /* follow owner checks map status for us */
277 follow_owner (obl->ob, owner); 287 follow_owner (obl->ob, owner);
278 } 288 }
279 } 289 }
280} 290}
281 291
282int 292int
283follow_owner (object *ob, object *owner) 293follow_owner (object *ob, object *owner)
284{ 294{
285 object *tmp; 295 if (owner->flag [FLAG_REMOVED])
286 int dir; 296 return 0; // do nothing if the owner is removed
287
288 if (!QUERY_FLAG (ob, FLAG_REMOVED))
289 ob->remove ();
290
291 if (owner->map == NULL)
292 {
293 LOG (llevError, "Can't follow owner (%d): no map.\n", &owner->name);
294 goto fail;
295 }
296 if (owner->map->in_memory != MAP_IN_MEMORY) 297 else if (!owner->map || owner->map->in_memory != MAP_IN_MEMORY)
297 {
298 LOG (llevError, "Owner of the pet not on a map in memory!?\n"); 298 LOG (llevError, "owner '%s' of the pet '%s' not on a map in memory!?\n", &owner->name, &ob->name);
299 goto fail; 299 else
300 } 300 {
301
302 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);
303 302
304 if (dir == -1) 303 if (dir >= 0)
305 {
306 LOG (llevMonster, "No space for pet to follow, freeing %s.\n", &ob->name);
307 goto fail;
308 }
309 for (tmp = ob; tmp != NULL; tmp = tmp->more)
310 {
311 tmp->x = owner->x + freearr_x[dir] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
312 tmp->y = owner->y + freearr_y[dir] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
313 tmp->map = owner->map;
314 if (OUT_OF_REAL_MAP (tmp->map, tmp->x, tmp->y))
315 {
316 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y);
317 } 304 {
318 } 305 owner->map->insert (ob, owner->x + freearr_x[dir], owner->y + freearr_y[dir]);
319 insert_ob_in_map (ob, ob->map, NULL, 0); 306
320 if (owner->type == PLAYER) /* Uh, I hope this is always true... */ 307 if (owner->type == PLAYER) /* Uh, I hope this is always true... */
321 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");
322 309
323 return 0; 310 return 0;
311 }
312 }
324 313
325fail:
326 remove_friendly_object (ob);
327 ob->destroy (); 314 ob->destroy ();
328
329 return 1; 315 return 1;
330} 316}
331 317
332void 318void
333pet_move (object *ob) 319pet_move (object *ob)
334{ 320{
335 int dir, i; 321 int dir = 0, i;
336 sint16 dx, dy; 322 sint16 dx, dy;
337 object *ob2, *owner; 323 object *ob2, *owner;
338 maptile *m; 324 maptile *m;
339 325
340 /* Check to see if player pulled out */ 326 /* Check to see if player pulled out */
341 if ((owner = ob->owner) == NULL) 327 if ((owner = ob->owner) == NULL)
342 { 328 {
343 ob->remove (); /* Will be freed when returning */
344 remove_friendly_object (ob);
345 ob->destroy (); 329 ob->destroy ();
346 LOG (llevMonster, "Pet: no owner, leaving.\n"); 330 LOG (llevMonster, "Pet: no owner, leaving.\n");
347 return; 331 return;
348 } 332 }
349 333
350 /* move monster into the owners map if not in the same map */ 334 /* move monster into the owners map if not in the same map
351 if (!on_same_map (ob, owner)) 335 * except when the owner is removed.
336 */
337 if (!on_same_map (ob, owner) && !owner->flag [FLAG_REMOVED])
352 { 338 {
353 follow_owner (ob, owner); 339 follow_owner (ob, owner);
354 return; 340 return;
355 } 341 }
356 /* Calculate Direction */ 342 /* Calculate Direction */
… …
369 continue; 355 continue;
370 else 356 else
371 break; 357 break;
372 } 358 }
373 } 359 }
374 else 360 else if (!owner->flag [FLAG_REMOVED]) // only get vector to owner when owner not removed
375 { 361 {
376 struct rv_vector rv; 362 struct rv_vector rv;
377 363
378 get_rangevector (ob, ob->owner, &rv, 0); 364 get_rangevector (ob, ob->owner, &rv, 0);
379 dir = rv.direction; 365 dir = rv.direction;
… …
429 return; 415 return;
430 } 416 }
431 } 417 }
432 } 418 }
433 /* Try a different course */ 419 /* Try a different course */
434 dir = absdir (dir + 4 - (RANDOM () % 5) - (RANDOM () % 5)); 420 dir = absdir (dir + 4 - (rndm (5)) - (rndm (5)));
435 (void) move_ob (ob, dir, ob); 421 (void) move_ob (ob, dir, ob);
436 } 422 }
437 return; 423 return;
438} 424}
439 425
… …
450 * is_golem is to note that this is a golem spell. 436 * is_golem is to note that this is a golem spell.
451 */ 437 */
452object * 438object *
453fix_summon_pet (archetype *at, object *op, int dir, int is_golem) 439fix_summon_pet (archetype *at, object *op, int dir, int is_golem)
454{ 440{
455 archetype *atmp;
456 object *tmp = NULL, *prev = NULL, *head = NULL; 441 object *tmp = NULL, *prev = NULL, *head = NULL;
457 442
458 for (atmp = at; atmp != NULL; atmp = atmp->more) 443 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
459 { 444 {
460 tmp = arch_to_object (atmp); 445 tmp = arch_to_object (atmp);
446
461 if (atmp == at) 447 if (atmp == at)
462 { 448 {
463 if (!is_golem) 449 if (!is_golem)
464 SET_FLAG (tmp, FLAG_MONSTER); 450 SET_FLAG (tmp, FLAG_MONSTER);
451
465 tmp->set_owner (op); 452 tmp->set_owner (op);
453
466 if (op->type == PLAYER) 454 if (op->type == PLAYER)
467 { 455 {
468 tmp->stats.exp = 0; 456 tmp->stats.exp = 0;
469 add_friendly_object (tmp); 457 add_friendly_object (tmp);
470 SET_FLAG (tmp, FLAG_FRIENDLY);
471 if (is_golem) 458 if (is_golem)
472 CLEAR_FLAG (tmp, FLAG_MONSTER); 459 CLEAR_FLAG (tmp, FLAG_MONSTER);
473 } 460 }
474 else 461 else
475 { 462 {
476 if (QUERY_FLAG (op, FLAG_FRIENDLY)) 463 if (QUERY_FLAG (op, FLAG_FRIENDLY))
477 { 464 {
478 object *owner = op->owner; 465 object *owner = op->owner;
479 466
480 if (owner != NULL) 467 if (owner)
481 { /* For now, we transfer ownership */ 468 { /* For now, we transfer ownership */
482 tmp->set_owner (owner); 469 tmp->set_owner (owner);
483 tmp->attack_movement = PETMOVE; 470 tmp->attack_movement = PETMOVE;
484 add_friendly_object (tmp); 471 add_friendly_object (tmp);
485 SET_FLAG (tmp, FLAG_FRIENDLY);
486 } 472 }
487 } 473 }
488 } 474 }
475
489 if (op->type != PLAYER || !is_golem) 476 if (op->type != PLAYER || !is_golem)
490 { 477 {
491 tmp->attack_movement = PETMOVE; 478 tmp->attack_movement = PETMOVE;
492 tmp->speed_left = -1; 479 tmp->speed_left = -1;
493 tmp->type = 0; 480 tmp->type = 0;
… …
495 } 482 }
496 else 483 else
497 tmp->type = GOLEM; 484 tmp->type = GOLEM;
498 485
499 } 486 }
487
500 if (head == NULL) 488 if (!head)
501 head = tmp; 489 head = tmp;
490
502 tmp->x = op->x + freearr_x[dir] + tmp->arch->clone.x; 491 tmp->x = op->x + freearr_x[dir] + tmp->arch->x;
503 tmp->y = op->y + freearr_y[dir] + tmp->arch->clone.y; 492 tmp->y = op->y + freearr_y[dir] + tmp->arch->y;
504 tmp->map = op->map; 493 tmp->map = op->map;
494
505 if (tmp->invisible) 495 if (tmp->invisible)
506 tmp->invisible = 0; 496 tmp->invisible = 0;
497
507 if (head != tmp) 498 if (head != tmp)
508 tmp->head = head, prev->more = tmp; 499 tmp->head = head, prev->more = tmp;
500
509 prev = tmp; 501 prev = tmp;
510 } 502 }
503
511 head->direction = dir; 504 head->direction = dir;
512 505
513 /* need to change some monster attr to prevent problems/crashing */ 506 /* need to change some monster attr to prevent problems/crashing */
514 head->last_heal = 0; 507 head->last_heal = 0;
515 head->last_eat = 0; 508 head->last_eat = 0;
… …
526 519
527 return head; 520 return head;
528} 521}
529 522
530/* updated this to allow more than the golem 'head' to attack */ 523/* updated this to allow more than the golem 'head' to attack */
531
532/* op is the golem to be moved. */ 524/* op is the golem to be moved. */
533
534void 525void
535move_golem (object *op) 526move_golem (object *op)
536{ 527{
537 int made_attack = 0; 528 int made_attack = 0;
538 object *tmp; 529 object *tmp;
539 530
540 if (QUERY_FLAG (op, FLAG_MONSTER)) 531 if (QUERY_FLAG (op, FLAG_MONSTER))
541 return; /* Has already been moved */ 532 return; /* Has already been moved */
542 533
543 if (op->owner == NULL) 534 if (!op->owner)
544 { 535 {
545 LOG (llevDebug, "Golem without owner destructed.\n"); 536 LOG (llevDebug, "Golem without owner destructed.\n");
546 op->remove (); 537 op->remove ();
547 op->destroy (); 538 op->destroy ();
548 return; 539 return;
… …
556 if (--op->stats.hp < 0) 547 if (--op->stats.hp < 0)
557 { 548 {
558 if (op->msg) 549 if (op->msg)
559 new_draw_info (NDI_UNIQUE, 0, op->owner, op->msg); 550 new_draw_info (NDI_UNIQUE, 0, op->owner, op->msg);
560 551
561 op->owner->contr->ranges[range_golem] = 0;
562 remove_friendly_object (op);
563 op->remove ();
564 op->destroy (); 552 op->destroy ();
565 return; 553 return;
566 } 554 }
567 555
568 /* Do golem attacks/movement for single & multisq golems. 556 /* Do golem attacks/movement for single & multisq golems.
… …
600 * but since we are not trying to dereferance that pointer, 588 * but since we are not trying to dereferance that pointer,
601 * that isn't a problem. 589 * that isn't a problem.
602 */ 590 */
603 if (victim && victim != op && victim->head != op) 591 if (victim && victim != op && victim->head != op)
604 { 592 {
605
606 /* for golems with race fields, we don't attack 593 /* for golems with race fields, we don't attack
607 * aligned races 594 * aligned races
608 */ 595 */
609 596
610 if (victim->race && op->race && strstr (op->race, victim->race)) 597 if (victim->race && op->race && strstr (op->race, victim->race))
… …
622 attack_ob (victim, op); 609 attack_ob (victim, op);
623 made_attack = 1; 610 made_attack = 1;
624 } 611 }
625 } /* If victim */ 612 } /* If victim */
626 } 613 }
614
627 if (made_attack) 615 if (made_attack)
628 update_object (op, UP_OBJ_FACE); 616 update_object (op, UP_OBJ_FACE);
629} 617}
630 618
631/* this is a really stupid function when you get down and 619/* this is a really stupid function when you get down and
… …
653 char buf[MAX_BUF]; 641 char buf[MAX_BUF];
654 642
655 /* Because there can be different golem spells, player may want to 643 /* Because there can be different golem spells, player may want to
656 * 'lose' their old golem. 644 * 'lose' their old golem.
657 */ 645 */
658 if (op->type == PLAYER && op->contr->ranges[range_golem]) 646 if (op->type == PLAYER && op->contr->golem)
659 { 647 {
660 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.");
661 op->contr->ranges[range_golem]->remove (); 649 op->contr->golem->remove ();
662 op->contr->ranges[range_golem]->destroy (); 650 op->contr->golem->destroy ();
663 op->contr->ranges[range_golem] = 0; 651 op->contr->golem = 0;
664 } 652 }
665 653
666 if (spob->other_arch) 654 if (spob->other_arch)
667 at = spob->other_arch; 655 at = spob->other_arch;
668 else if (spob->race) 656 else if (spob->race)
… …
688 LOG (llevError, "Spell %s lacks other_arch\n", &spob->name); 676 LOG (llevError, "Spell %s lacks other_arch\n", &spob->name);
689 return 0; 677 return 0;
690 } 678 }
691 679
692 if (!dir) 680 if (!dir)
693 dir = find_free_spot (NULL, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1); 681 dir = find_free_spot (at, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
694 682
695 if (dir == -1 || ob_blocked (&at->clone, op->map, op->x + freearr_x[dir], op->y + freearr_y[dir])) 683 if (dir < 0 || ob_blocked (at, op->map, op->x + freearr_x[dir], op->y + freearr_y[dir]))
696 { 684 {
697 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 685 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
698 return 0; 686 return 0;
699 } 687 }
688
700 /* basically want to get proper map/coordinates for this object */ 689 /* basically want to get proper map/coordinates for this object */
701 690
702 if (!(tmp = fix_summon_pet (at, op, dir, GOLEM))) 691 if (!(tmp = fix_summon_pet (at, op, dir, GOLEM)))
703 { 692 {
704 new_draw_info (NDI_UNIQUE, 0, op, "Your spell fails."); 693 new_draw_info (NDI_UNIQUE, 0, op, "Your spell fails.");
… …
707 696
708 if (op->type == PLAYER) 697 if (op->type == PLAYER)
709 { 698 {
710 tmp->type = GOLEM; 699 tmp->type = GOLEM;
711 tmp->set_owner (op); 700 tmp->set_owner (op);
701 op->contr->golem = tmp;
702 /* give the player control of the golem */
712 set_spell_skill (op, caster, spob, tmp); 703 set_spell_skill (op, caster, spob, tmp);
713 op->contr->ranges[range_golem] = tmp;
714 /* give the player control of the golem */
715 op->contr->shoottype = range_golem;
716 } 704 }
717 else 705 else
718 { 706 {
719 if (QUERY_FLAG (op, FLAG_FRIENDLY)) 707 if (QUERY_FLAG (op, FLAG_FRIENDLY))
720 { 708 {
721 object *owner = op->owner; 709 object *owner = op->owner;
722 710
723 if (owner != NULL) 711 if (owner)
724 { /* For now, we transfer ownership */ 712 { /* For now, we transfer ownership */
725 tmp->set_owner (owner); 713 tmp->set_owner (owner);
726 tmp->attack_movement = PETMOVE; 714 tmp->attack_movement = PETMOVE;
727 add_friendly_object (tmp); 715 add_friendly_object (tmp);
728 SET_FLAG (tmp, FLAG_FRIENDLY);
729 } 716 }
730 } 717 }
731 718
732 SET_FLAG (tmp, FLAG_MONSTER); 719 SET_FLAG (tmp, FLAG_MONSTER);
733 } 720 }
… …
902 * with all the checks in the 'for' portion itself. Much 889 * with all the checks in the 'for' portion itself. Much
903 * more readable to break some of the conditions out. 890 * more readable to break some of the conditions out.
904 */ 891 */
905 for (tr = spell_ob->randomitems->items; tr; tr = tr->next) 892 for (tr = spell_ob->randomitems->items; tr; tr = tr->next)
906 { 893 {
894 if (!tr->item)
895 continue;
896
907 if (level < tr->magic) 897 if (level < tr->magic)
908 break; 898 break;
909 899
910 lasttr = tr; 900 lasttr = tr;
911 901
912 if (tr->item->name == sparam) 902 if (tr->item->archname == sparam)
913 break;
914
915 if (!tr->next || !tr->next->item)
916 break; 903 break;
917 } 904 }
918 905
919 if (!lasttr) 906 if (!lasttr)
920 { 907 {
… …
922 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to summon any monsters."); 909 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to summon any monsters.");
923 return 0; 910 return 0;
924 } 911 }
925 912
926 summon_arch = lasttr->item; 913 summon_arch = lasttr->item;
927 nrof = lasttr->nrof; 914 nrof = lasttr->nrof;
928 } 915 }
929 else if (spell_ob->race && !strcmp (spell_ob->race, "GODCULTMON")) 916 else if (spell_ob->race && !strcmp (spell_ob->race, "GODCULTMON"))
930 { 917 {
931 object *god = find_god (determine_god (op)), *mon, *owner; 918 object *god = find_god (determine_god (op)), *mon, *owner;
932 int summon_level, tries; 919 int summon_level, tries;
… …
962 ndir = dir; 949 ndir = dir;
963 950
964 if (!ndir) 951 if (!ndir)
965 ndir = find_free_spot (mon, op->map, op->x, op->y, 1, SIZEOFFREE); 952 ndir = find_free_spot (mon, op->map, op->x, op->y, 1, SIZEOFFREE);
966 953
967 if (ndir == -1 || ob_blocked (mon, op->map, op->x + freearr_x[ndir], op->y + freearr_y[ndir])) 954 if (ndir < 0 || ob_blocked (mon, op->map, op->x + freearr_x[ndir], op->y + freearr_y[ndir]))
968 { 955 {
969 ndir = -1; 956 ndir = -1;
970 if (++tries == 5) 957 if (++tries == 5)
971 { 958 {
972 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 959 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
995 return 0; 982 return 0;
996 } 983 }
997 984
998 for (i = 1; i <= nrof; i++) 985 for (i = 1; i <= nrof; i++)
999 { 986 {
1000 archetype *atmp;
1001 object *prev = NULL, *head = NULL, *tmp; 987 object *prev = NULL, *head = NULL, *tmp;
1002 988
1003 if (dir) 989 if (dir)
1004 { 990 {
1005 ndir = dir; 991 ndir = dir;
1006 dir = absdir (dir + 1); 992 dir = absdir (dir + 1);
1007 } 993 }
1008 else 994 else
1009 ndir = find_free_spot (&summon_arch->clone, op->map, op->x, op->y, 1, SIZEOFFREE); 995 ndir = find_free_spot (summon_arch, op->map, op->x, op->y, 1, SIZEOFFREE);
1010 996
1011 if (ndir > 0) 997 if (ndir > 0)
1012 { 998 {
1013 x = freearr_x[ndir]; 999 x = freearr_x[ndir];
1014 y = freearr_y[ndir]; 1000 y = freearr_y[ndir];
1015 } 1001 }
1016 1002
1017 if (ndir == -1 || ob_blocked (&summon_arch->clone, op->map, op->x + x, op->y + y)) 1003 if (ndir < 0 || ob_blocked (summon_arch, op->map, op->x + x, op->y + y))
1018 { 1004 {
1019 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1005 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1020 if (nrof > 1) 1006 if (nrof > 1)
1021 new_draw_info (NDI_UNIQUE, 0, op, "No more pets for this casting."); 1007 new_draw_info (NDI_UNIQUE, 0, op, "No more pets for this casting.");
1022 1008
1023 return nrof > 1; 1009 return nrof > 1;
1024 } 1010 }
1025 1011
1026 for (atmp = summon_arch; atmp != NULL; atmp = atmp->more) 1012 for (archetype *atmp = summon_arch; atmp != NULL; atmp = (archetype *)atmp->more)
1027 { 1013 {
1028 tmp = arch_to_object (atmp); 1014 tmp = arch_to_object (atmp);
1029 if (atmp == summon_arch) 1015 if (atmp == summon_arch)
1030 { 1016 {
1031 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1017 if (QUERY_FLAG (tmp, FLAG_MONSTER))
… …
1039 if (op->type == PLAYER || QUERY_FLAG (op, FLAG_FRIENDLY)) 1025 if (op->type == PLAYER || QUERY_FLAG (op, FLAG_FRIENDLY))
1040 { 1026 {
1041 /* If this is not set, we make it friendly */ 1027 /* If this is not set, we make it friendly */
1042 if (!QUERY_FLAG (spell_ob, FLAG_MONSTER)) 1028 if (!QUERY_FLAG (spell_ob, FLAG_MONSTER))
1043 { 1029 {
1044 SET_FLAG (tmp, FLAG_FRIENDLY);
1045 add_friendly_object (tmp); 1030 add_friendly_object (tmp);
1046 tmp->stats.exp = 0; 1031 tmp->stats.exp = 0;
1047 1032
1048 if (spell_ob->attack_movement) 1033 if (spell_ob->attack_movement)
1049 tmp->attack_movement = spell_ob->attack_movement; 1034 tmp->attack_movement = spell_ob->attack_movement;
… …
1065 tmp->head = head; 1050 tmp->head = head;
1066 prev->more = tmp; 1051 prev->more = tmp;
1067 } 1052 }
1068 1053
1069 prev = tmp; 1054 prev = tmp;
1070 tmp->x = op->x + x + tmp->arch->clone.x; 1055 tmp->x = op->x + x + tmp->arch->x;
1071 tmp->y = op->y + y + tmp->arch->clone.y; 1056 tmp->y = op->y + y + tmp->arch->y;
1072 tmp->map = op->map; 1057 tmp->map = op->map;
1073 } 1058 }
1074 1059
1075 head->direction = freedir[ndir]; 1060 head->direction = freedir[ndir];
1076 head->stats.exp = 0; 1061 head->stats.exp = 0;
1077 head = insert_ob_in_map (head, head->map, op, 0); 1062 head = insert_ob_in_map (head, head->map, op, 0);
1078 1063
1079 if (head && head->randomitems) 1064 if (head && head->randomitems)
1080 { 1065 {
1081 object *tmp;
1082
1083 create_treasure (head->randomitems, head, GT_APPLY | GT_STARTEQUIP, 6, 0); 1066 create_treasure (head->randomitems, head, GT_APPLY | GT_STARTEQUIP, 6, 0);
1067
1084 for (tmp = head->inv; tmp; tmp = tmp->below) 1068 for (object *tmp = head->inv; tmp; tmp = tmp->below)
1085 if (!tmp->nrof)
1086 SET_FLAG (tmp, FLAG_NO_DROP); 1069 SET_FLAG (tmp, FLAG_DESTROY_ON_DEATH);
1087 } 1070 }
1088 } /* for i < nrof */ 1071 } /* for i < nrof */
1089 1072
1090 return 1; 1073 return 1;
1091} 1074}
… …
1119 return 0; 1102 return 0;
1120 1103
1121 /* get the owners of itself and the target, this is to deal with pets of 1104 /* get the owners of itself and the target, this is to deal with pets of
1122 pets */ 1105 pets */
1123 rowner = get_real_owner (owner); 1106 rowner = get_real_owner (owner);
1124 if (target->type != PLAYER) 1107 towner = target->type == PLAYER ? 0 : get_real_owner (target);
1125 {
1126 towner = get_real_owner (target);
1127 }
1128 else
1129 {
1130 towner = 0;
1131 }
1132 1108
1133 /* if the pet has now owner, exit with error */ 1109 /* if the pet has now owner, exit with error */
1134 if (rowner == NULL) 1110 if (!rowner)
1135 { 1111 {
1136 LOG (llevError, "Pet has no owner.\n"); 1112 LOG (llevError, "Pet has no owner.\n");
1137 return 0; 1113 return 0;
1138 } 1114 }
1139 1115

Diff Legend

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