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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.22 by root, Sun Sep 10 00:51:23 2006 UTC vs.
Revision 1.34 by root, Tue Sep 12 01:09:53 2006 UTC

1/*
2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.22 2006/09/10 00:51:23 root Exp $";
4 */
5 1
6/* 2/*
7 CrossFire, A Multiplayer game for X-windows 3 CrossFire, A Multiplayer game for X-windows
8 4
9 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
… …
28 24
29/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
30 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
31 variable. */ 27 variable. */
32#include <global.h> 28#include <global.h>
33#ifndef WIN32 /* ---win32 exclude headers */
34#include <stdio.h> 29#include <stdio.h>
35#include <sys/types.h> 30#include <sys/types.h>
36#include <sys/uio.h> 31#include <sys/uio.h>
37#endif /* win32 */
38#include <object.h> 32#include <object.h>
39#include <funcpoint.h> 33#include <funcpoint.h>
40#include <skills.h>
41#include <loader.h> 34#include <loader.h>
35
42int nrofallocobjects = 0; 36int nrofallocobjects = 0;
43 37
44object *objects; /* Pointer to the list of used objects */ 38object *objects; /* Pointer to the list of used objects */
45object *active_objects; /* List of active objects that need to be processed */ 39object *active_objects; /* List of active objects that need to be processed */
46 40
47short freearr_x[SIZEOFFREE]= 41short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
48 {0,0,1,1,1,0,-1,-1,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,-2,-2,-2,-1,
49 0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-2,-1}; 42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50short freearr_y[SIZEOFFREE]= 43};
51 {0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2, 44short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52 -3,-3,-3,-3,-2,-1,0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3}; 45 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53int maxfree[SIZEOFFREE]= 46};
54 {0,9,10,13,14,17,18,21,22,25,26,27,30,31,32,33,36,37,39,39,42,43,44,45, 47int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
55 48,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49}; 48 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
49};
56int freedir[SIZEOFFREE]= { 50int freedir[SIZEOFFREE] = {
57 0,1,2,3,4,5,6,7,8,1,2,2,2,3,4,4,4,5,6,6,6,7,8,8,8, 51 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
58 1,2,2,2,2,2,3,4,4,4,4,4,5,6,6,6,6,6,7,8,8,8,8,8}; 52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53};
59 54
60/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 55/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56static int
61static int compare_ob_value_lists_one(const object * wants, const object * has) { 57compare_ob_value_lists_one (const object *wants, const object *has)
58{
62 key_value * wants_field; 59 key_value *wants_field;
63 60
64 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 61 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
65 * objects with lists are rare, and lists stay short. If not, use a 62 * objects with lists are rare, and lists stay short. If not, use a
66 * different structure or at least keep the lists sorted... 63 * different structure or at least keep the lists sorted...
67 */ 64 */
68 65
69 /* For each field in wants, */ 66 /* For each field in wants, */
70 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) { 67 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)
68 {
71 key_value * has_field; 69 key_value *has_field;
72 70
73 /* Look for a field in has with the same key. */ 71 /* Look for a field in has with the same key. */
74 has_field = get_ob_key_link(has, wants_field->key); 72 has_field = get_ob_key_link (has, wants_field->key);
73
74 if (has_field == NULL)
75 75 {
76 if (has_field == NULL) {
77 /* No field with that name. */ 76 /* No field with that name. */
78 return FALSE; 77 return FALSE;
79 }
80 78 }
79
81 /* Found the matching field. */ 80 /* Found the matching field. */
82 if (has_field->value != wants_field->value) { 81 if (has_field->value != wants_field->value)
82 {
83 /* Values don't match, so this half of the comparison is false. */ 83 /* Values don't match, so this half of the comparison is false. */
84 return FALSE; 84 return FALSE;
85 } 85 }
86 86
87 /* If we get here, we found a match. Now for the next field in wants. */ 87 /* If we get here, we found a match. Now for the next field in wants. */
88 }
89 88 }
89
90 /* If we get here, every field in wants has a matching field in has. */ 90 /* If we get here, every field in wants has a matching field in has. */
91 return TRUE; 91 return TRUE;
92} 92}
93 93
94/* Returns TRUE if ob1 has the same key_values as ob2. */ 94/* Returns TRUE if ob1 has the same key_values as ob2. */
95static int
95static int compare_ob_value_lists(const object * ob1, const object * ob2) { 96compare_ob_value_lists (const object *ob1, const object *ob2)
97{
96 /* However, there may be fields in has which aren't partnered in wants, 98 /* However, there may be fields in has which aren't partnered in wants,
97 * so we need to run the comparison *twice*. :( 99 * so we need to run the comparison *twice*. :(
98 */ 100 */
99 return compare_ob_value_lists_one(ob1, ob2) && compare_ob_value_lists_one(ob2, ob1); 101 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);
100} 102}
101 103
102/* Function examines the 2 objects given to it, and returns true if 104/* Function examines the 2 objects given to it, and returns true if
103 * they can be merged together. 105 * they can be merged together.
104 * 106 *
… …
110 * 112 *
111 * Improvements made with merge: Better checking on potion, and also 113 * Improvements made with merge: Better checking on potion, and also
112 * check weight 114 * check weight
113 */ 115 */
114 116
115bool
116object::can_merge (object *ob1, object *ob2) 117bool object::can_merge (object *ob1, object *ob2)
117{ 118{
118 /* A couple quicksanity checks */ 119 /* A couple quicksanity checks */
119 if ((ob1 == ob2) || (ob1->type != ob2->type)) 120 if ((ob1 == ob2) || (ob1->type != ob2->type))
120 return 0; 121 return 0;
121 122
… …
169 (ob1->subtype != ob2->subtype) || 170 (ob1->subtype != ob2->subtype) ||
170 (ob1->move_type != ob2->move_type) || 171 (ob1->move_type != ob2->move_type) ||
171 (ob1->move_block != ob2->move_block) || 172 (ob1->move_block != ob2->move_block) ||
172 (ob1->move_allow != ob2->move_allow) || 173 (ob1->move_allow != ob2->move_allow) ||
173 (ob1->move_on != ob2->move_on) || 174 (ob1->move_on != ob2->move_on) ||
174 (ob1->move_off != ob2->move_off) || 175 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))
175 (ob1->move_slow != ob2->move_slow) ||
176 (ob1->move_slow_penalty != ob2->move_slow_penalty))
177 return 0; 176 return 0;
178 177
179 /* This is really a spellbook check - really, we should 178 /* This is really a spellbook check - really, we should
180 * check all objects in the inventory. 179 * check all objects in the inventory.
181 */ 180 */
182 if (ob1->inv || ob2->inv) 181 if (ob1->inv || ob2->inv)
183 { 182 {
184 /* if one object has inventory but the other doesn't, not equiv */ 183 /* if one object has inventory but the other doesn't, not equiv */
185 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 184 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
186 return 0; 185 return 0;
187 186
188 /* Now check to see if the two inventory objects could merge */ 187 /* Now check to see if the two inventory objects could merge */
189 if (!CAN_MERGE (ob1->inv, ob2->inv)) 188 if (!CAN_MERGE (ob1->inv, ob2->inv))
190 return 0; 189 return 0;
191 190
192 /* inventory ok - still need to check rest of this object to see 191 /* inventory ok - still need to check rest of this object to see
193 * if it is valid. 192 * if it is valid.
194 */ 193 */
195 } 194 }
… …
203 202
204 /* Note sure why the following is the case - either the object has to 203 /* Note sure why the following is the case - either the object has to
205 * be animated or have a very low speed. Is this an attempted monster 204 * be animated or have a very low speed. Is this an attempted monster
206 * check? 205 * check?
207 */ 206 */
208 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) 207 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
209 && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
210 return 0; 208 return 0;
211 209
212 switch (ob1->type) 210 switch (ob1->type)
213 { 211 {
214 case SCROLL: 212 case SCROLL:
215 if (ob1->level != ob2->level) 213 if (ob1->level != ob2->level)
216 return 0; 214 return 0;
217 break; 215 break;
218 } 216 }
219 217
220 if (ob1->key_values != NULL || ob2->key_values != NULL) 218 if (ob1->key_values != NULL || ob2->key_values != NULL)
221 { 219 {
222 /* At least one of these has key_values. */ 220 /* At least one of these has key_values. */
223 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 221 if ((ob1->key_values == NULL) != (ob2->key_values == NULL))
224 /* One has fields, but the other one doesn't. */ 222 /* One has fields, but the other one doesn't. */
225 return 0; 223 return 0;
226 else if (!compare_ob_value_lists (ob1, ob2)) 224 else if (!compare_ob_value_lists (ob1, ob2))
227 return 0; 225 return 0;
228 } 226 }
229 227
230 //TODO: generate an event or call into perl for additional checks 228 //TODO: generate an event or call into perl for additional checks
231 if (ob1->self || ob2->self) 229 if (ob1->self || ob2->self)
232 { 230 {
233 ob1->optimise (); 231 ob1->optimise ();
234 ob2->optimise (); 232 ob2->optimise ();
235 233
236 if (ob1->self || ob2->self) 234 if (ob1->self || ob2->self)
237 return 0; 235 return 0;
238 } 236 }
239 237
240 /* Everything passes, must be OK. */ 238 /* Everything passes, must be OK. */
241 return 1; 239 return 1;
242} 240}
241
243/* 242/*
244 * sum_weight() is a recursive function which calculates the weight 243 * sum_weight() is a recursive function which calculates the weight
245 * an object is carrying. It goes through in figures out how much 244 * an object is carrying. It goes through in figures out how much
246 * containers are carrying, and sums it up. 245 * containers are carrying, and sums it up.
247 */ 246 */
248signed long sum_weight(object *op) { 247long
248sum_weight (object *op)
249{
249 signed long sum; 250 long sum;
250 object *inv; 251 object *inv;
252
251 for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) { 253 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
254 {
252 if (inv->inv) 255 if (inv->inv)
253 sum_weight(inv); 256 sum_weight (inv);
254 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 257 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
255 } 258 }
256 if (op->type == CONTAINER && op->stats.Str) 259 if (op->type == CONTAINER && op->stats.Str)
257 sum = (sum * (100 - op->stats.Str))/100; 260 sum = (sum * (100 - op->stats.Str)) / 100;
258 if(op->carrying != sum) 261 if (op->carrying != sum)
259 op->carrying = sum; 262 op->carrying = sum;
260 return sum; 263 return sum;
261} 264}
262 265
263/** 266/**
264 * Return the outermost environment object for a given object. 267 * Return the outermost environment object for a given object.
265 */ 268 */
266 269
270object *
267object *object_get_env_recursive (object *op) { 271object_get_env_recursive (object *op)
272{
268 while (op->env != NULL) 273 while (op->env != NULL)
269 op = op->env; 274 op = op->env;
270 return op; 275 return op;
271} 276}
272 277
273/* 278/*
274 * Eneq(@csd.uu.se): Since we can have items buried in a character we need 279 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
275 * a better check. We basically keeping traversing up until we can't 280 * a better check. We basically keeping traversing up until we can't
276 * or find a player. 281 * or find a player.
277 */ 282 */
278 283
284object *
279object *is_player_inv (object *op) { 285is_player_inv (object *op)
286{
280 for (;op!=NULL&&op->type!=PLAYER; op=op->env) 287 for (; op != NULL && op->type != PLAYER; op = op->env)
281 if (op->env==op) 288 if (op->env == op)
282 op->env = NULL; 289 op->env = NULL;
283 return op; 290 return op;
284} 291}
285 292
286/* 293/*
287 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 294 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
288 * Some error messages. 295 * Some error messages.
289 * The result of the dump is stored in the static global errmsg array. 296 * The result of the dump is stored in the static global errmsg array.
290 */ 297 */
291 298
299void
292void dump_object2(object *op) { 300dump_object2 (object *op)
301{
293errmsg[0] = 0; 302 errmsg[0] = 0;
294return; 303 return;
295 //TODO//D#d# 304 //TODO//D#d#
296#if 0 305#if 0
297 char *cp; 306 char *cp;
307
298/* object *tmp;*/ 308/* object *tmp;*/
299 309
300 if(op->arch!=NULL) { 310 if (op->arch != NULL)
311 {
301 strcat(errmsg,"arch "); 312 strcat (errmsg, "arch ");
302 strcat(errmsg,op->arch->name?op->arch->name:"(null)"); 313 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
303 strcat(errmsg,"\n"); 314 strcat (errmsg, "\n");
304 if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) 315 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
305 strcat(errmsg,cp); 316 strcat (errmsg, cp);
306#if 0 317# if 0
307 /* Don't dump player diffs - they are too long, mostly meaningless, and 318 /* Don't dump player diffs - they are too long, mostly meaningless, and
308 * will overflow the buffer. 319 * will overflow the buffer.
309 * Changed so that we don't dump inventory either. This may 320 * Changed so that we don't dump inventory either. This may
310 * also overflow the buffer. 321 * also overflow the buffer.
311 */ 322 */
312 if(op->type!=PLAYER && (cp=get_ob_diff(op,&empty_archetype->clone))!=NULL) 323 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
313 strcat(errmsg,cp); 324 strcat (errmsg, cp);
314 for (tmp=op->inv; tmp; tmp=tmp->below) 325 for (tmp = op->inv; tmp; tmp = tmp->below)
315 dump_object2(tmp); 326 dump_object2 (tmp);
327# endif
328 strcat (errmsg, "end\n");
329 }
330 else
331 {
332 strcat (errmsg, "Object ");
333 if (op->name == NULL)
334 strcat (errmsg, "(null)");
335 else
336 strcat (errmsg, op->name);
337 strcat (errmsg, "\n");
338# if 0
339 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340 strcat (errmsg, cp);
341 for (tmp = op->inv; tmp; tmp = tmp->below)
342 dump_object2 (tmp);
343# endif
344 strcat (errmsg, "end\n");
345 }
316#endif 346#endif
317 strcat(errmsg,"end\n");
318 } else {
319 strcat(errmsg,"Object ");
320 if (op->name==NULL) strcat(errmsg, "(null)");
321 else strcat(errmsg,op->name);
322 strcat(errmsg,"\n");
323#if 0
324 if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
325 strcat(errmsg,cp);
326 for (tmp=op->inv; tmp; tmp=tmp->below)
327 dump_object2(tmp);
328#endif
329 strcat(errmsg,"end\n");
330 }
331#endif
332} 347}
333 348
334/* 349/*
335 * Dumps an object. Returns output in the static global errmsg array. 350 * Dumps an object. Returns output in the static global errmsg array.
336 */ 351 */
337 352
353void
338void dump_object(object *op) { 354dump_object (object *op)
355{
339 if(op==NULL) { 356 if (op == NULL)
357 {
340 strcpy(errmsg,"[NULL pointer]"); 358 strcpy (errmsg, "[NULL pointer]");
341 return; 359 return;
342 } 360 }
343 errmsg[0]='\0'; 361 errmsg[0] = '\0';
344 dump_object2(op); 362 dump_object2 (op);
345} 363}
346 364
365void
347void dump_all_objects(void) { 366dump_all_objects (void)
367{
348 object *op; 368 object *op;
369
349 for(op=objects;op!=NULL;op=op->next) { 370 for (op = objects; op != NULL; op = op->next)
371 {
350 dump_object(op); 372 dump_object (op);
351 fprintf(logfile, "Object %d\n:%s\n", op->count, errmsg); 373 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
352 } 374 }
353} 375}
354 376
355/* 377/*
356 * get_nearest_part(multi-object, object 2) returns the part of the 378 * get_nearest_part(multi-object, object 2) returns the part of the
357 * multi-object 1 which is closest to the second object. 379 * multi-object 1 which is closest to the second object.
358 * If it's not a multi-object, it is returned. 380 * If it's not a multi-object, it is returned.
359 */ 381 */
360 382
383object *
361object *get_nearest_part(object *op, const object *pl) { 384get_nearest_part (object *op, const object *pl)
385{
362 object *tmp,*closest; 386 object *tmp, *closest;
363 int last_dist,i; 387 int last_dist, i;
388
364 if(op->more==NULL) 389 if (op->more == NULL)
365 return op; 390 return op;
366 for(last_dist=distance(op,pl),closest=op,tmp=op->more;tmp!=NULL;tmp=tmp->more) 391 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
367 if((i=distance(tmp,pl))<last_dist) 392 if ((i = distance (tmp, pl)) < last_dist)
368 closest=tmp,last_dist=i; 393 closest = tmp, last_dist = i;
369 return closest; 394 return closest;
370} 395}
371 396
372/* 397/*
373 * Returns the object which has the count-variable equal to the argument. 398 * Returns the object which has the count-variable equal to the argument.
374 */ 399 */
375 400
401object *
376object *find_object(tag_t i) { 402find_object (tag_t i)
403{
377 object *op; 404 object *op;
405
378 for(op=objects;op!=NULL;op=op->next) 406 for (op = objects; op != NULL; op = op->next)
379 if(op->count==i) 407 if (op->count == i)
380 break; 408 break;
381 return op; 409 return op;
382} 410}
383 411
384/* 412/*
385 * Returns the first object which has a name equal to the argument. 413 * Returns the first object which has a name equal to the argument.
386 * Used only by the patch command, but not all that useful. 414 * Used only by the patch command, but not all that useful.
387 * Enables features like "patch <name-of-other-player> food 999" 415 * Enables features like "patch <name-of-other-player> food 999"
388 */ 416 */
389 417
418object *
390object *find_object_name(const char *str) { 419find_object_name (const char *str)
420{
391 const char *name = shstr::find (str); 421 const char *name = shstr::find (str);
392 object *op; 422 object *op;
423
393 for(op=objects;op!=NULL;op=op->next) 424 for (op = objects; op != NULL; op = op->next)
394 if(&op->name == name) 425 if (&op->name == name)
395 break; 426 break;
396 427
397 return op; 428 return op;
398} 429}
399 430
431void
400void free_all_object_data () 432free_all_object_data ()
401{ 433{
402 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects); 434 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
403} 435}
404 436
405/* 437/*
… …
410 * Changed 2004-02-12 - if the player is setting at the play again 442 * Changed 2004-02-12 - if the player is setting at the play again
411 * prompt, he is removed, and we don't want to treat him as an owner of 443 * prompt, he is removed, and we don't want to treat him as an owner of
412 * anything, so check removed flag. I don't expect that this should break 444 * anything, so check removed flag. I don't expect that this should break
413 * anything - once an object is removed, it is basically dead anyways. 445 * anything - once an object is removed, it is basically dead anyways.
414 */ 446 */
415 447object *
416object *get_owner(object *op) { 448object::get_owner ()
417 if(op->owner==NULL)
418 return NULL;
419
420 if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&
421 op->owner->count==op->ownercount)
422 return op->owner;
423
424 op->owner=NULL;
425 op->ownercount=0;
426 return NULL;
427}
428
429void clear_owner(object *op)
430{ 449{
431 if (!op) return; 450 if (!owner
432 451 || QUERY_FLAG (owner, FLAG_FREED)
433 if (op->owner && op->ownercount == op->owner->count) 452 || QUERY_FLAG (owner, FLAG_REMOVED))
434 op->owner->refcount--;
435
436 op->owner = NULL;
437 op->ownercount = 0; 453 owner = 0;
454
455 return owner;
438} 456}
439 457
440/* 458/*
441 * Sets the owner and sets the skill and exp pointers to owner's current 459 * Sets the owner and sets the skill and exp pointers to owner's current
442 * skill and experience objects. 460 * skill and experience objects.
443 */ 461 */
444void set_owner (object *op, object *owner) 462void
463object::set_owner (object *owner)
445{ 464{
446 if(owner==NULL||op==NULL) 465 if (!owner)
447 return; 466 return;
448 467
449 /* next line added to allow objects which own objects */ 468 /* next line added to allow objects which own objects */
450 /* Add a check for ownercounts in here, as I got into an endless loop 469 /* Add a check for ownercounts in here, as I got into an endless loop
451 * with the fireball owning a poison cloud which then owned the 470 * with the fireball owning a poison cloud which then owned the
452 * fireball. I believe that was caused by one of the objects getting 471 * fireball. I believe that was caused by one of the objects getting
453 * freed and then another object replacing it. Since the ownercounts 472 * freed and then another object replacing it. Since the ownercounts
454 * didn't match, this check is valid and I believe that cause is valid. 473 * didn't match, this check is valid and I believe that cause is valid.
455 */ 474 */
456 while (owner->owner && owner!=owner->owner && 475 while (owner->owner)
457 owner->ownercount==owner->owner->count) owner=owner->owner; 476 owner = owner->owner;
458 477
459 /* IF the owner still has an owner, we did not resolve to a final owner.
460 * so lets not add to that.
461 */
462 if (owner->owner) return;
463
464 op->owner=owner; 478 this->owner = owner;
465
466 op->ownercount=owner->count;
467 owner->refcount++;
468
469}
470
471/* Set the owner to clone's current owner and set the skill and experience
472 * objects to clone's objects (typically those objects that where the owner's
473 * current skill and experience objects at the time when clone's owner was
474 * set - not the owner's current skill and experience objects).
475 *
476 * Use this function if player created an object (e.g. fire bullet, swarm
477 * spell), and this object creates further objects whose kills should be
478 * accounted for the player's original skill, even if player has changed
479 * skills meanwhile.
480 */
481void copy_owner (object *op, object *clone)
482{
483 object *owner = get_owner (clone);
484 if (owner == NULL) {
485 /* players don't have owners - they own themselves. Update
486 * as appropriate.
487 */
488 if (clone->type == PLAYER) owner=clone;
489 else return;
490 }
491 set_owner(op, owner);
492
493} 479}
494 480
495/* Zero the key_values on op, decrementing the shared-string 481/* Zero the key_values on op, decrementing the shared-string
496 * refcounts and freeing the links. 482 * refcounts and freeing the links.
497 */ 483 */
484static void
498static void free_key_values(object * op) 485free_key_values (object *op)
499{ 486{
500 for (key_value *i = op->key_values; i != 0; ) 487 for (key_value *i = op->key_values; i != 0;)
501 { 488 {
502 key_value *next = i->next; 489 key_value *next = i->next;
503 delete i; 490 delete i;
491
504 i = next; 492 i = next;
505 } 493 }
506 494
507 op->key_values = 0; 495 op->key_values = 0;
508} 496}
509 497
510void object::clear () 498void object::clear ()
511{ 499{
512 attachable_base::clear (); 500 attachable_base::clear ();
513 501
514 free_key_values (this); 502 free_key_values (this);
515 503
516 name = 0; 504 owner = 0;
505 name = 0;
517 name_pl = 0; 506 name_pl = 0;
518 title = 0; 507 title = 0;
519 race = 0; 508 race = 0;
520 slaying = 0; 509 slaying = 0;
521 skill = 0; 510 skill = 0;
522 msg = 0; 511 msg = 0;
523 lore = 0; 512 lore = 0;
524 custom_name = 0; 513 custom_name = 0;
525 materialname = 0; 514 materialname = 0;
515 contr = 0;
516 below = 0;
517 above = 0;
518 inv = 0;
519 container = 0;
520 env = 0;
521 more = 0;
522 head = 0;
523 map = 0;
524 active_next = 0;
525 active_prev = 0;
526 526
527 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod)); 527 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
528 528
529 SET_FLAG (this, FLAG_REMOVED); 529 SET_FLAG (this, FLAG_REMOVED);
530
531 /* What is not cleared is next, prev, and count */
532
533 expmul = 1.0;
534 face = blank_face;
535 attacked_by_count = -1;
536
537 if (settings.casting_time)
538 casting_time = -1;
530} 539}
531 540
532void object::clone (object *destination) 541void object::clone (object *destination)
533{ 542{
534 *(object_copy *)destination = *(object_copy *)this; 543 *(object_copy *)destination = *this;
535 *(object_pod *)destination = *(object_pod *)this; 544 *(object_pod *)destination = *this;
536 545
537 if (self || cb) 546 if (self || cb)
538 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination)); 547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
539}
540
541/*
542 * clear_object() frees everything allocated by an object, and also
543 * clears all variables and flags to default settings.
544 */
545
546void clear_object (object *op)
547{
548 op->clear ();
549
550 op->contr = NULL;
551 op->below = NULL;
552 op->above = NULL;
553 op->inv = NULL;
554 op->container=NULL;
555 op->env=NULL;
556 op->more=NULL;
557 op->head=NULL;
558 op->map=NULL;
559 op->refcount=0;
560 op->active_next = NULL;
561 op->active_prev = NULL;
562 /* What is not cleared is next, prev, and count */
563
564 op->expmul = 1.0;
565 op->face = blank_face;
566 op->attacked_by_count = -1;
567
568 if (settings.casting_time)
569 op->casting_time = -1;
570} 548}
571 549
572/* 550/*
573 * copy object first frees everything allocated by the second object, 551 * copy object first frees everything allocated by the second object,
574 * and then copies the contends of the first object into the second 552 * and then copies the contends of the first object into the second
575 * object, allocating what needs to be allocated. Basically, any 553 * object, allocating what needs to be allocated. Basically, any
576 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 554 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
577 * if the first object is freed, the pointers in the new object 555 * if the first object is freed, the pointers in the new object
578 * will point at garbage. 556 * will point at garbage.
579 */ 557 */
580 558void
581void copy_object (object *op2, object *op) 559copy_object (object *op2, object *op)
582{ 560{
583 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 561 bool is_freed = QUERY_FLAG (op, FLAG_FREED);
584 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 562 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
585 563
586 op2->clone (op); 564 op2->clone (op);
587 565
566 if (is_freed)
588 if (is_freed) SET_FLAG (op, FLAG_FREED); 567 SET_FLAG (op, FLAG_FREED);
568 if (is_removed)
589 if (is_removed) SET_FLAG (op, FLAG_REMOVED); 569 SET_FLAG (op, FLAG_REMOVED);
590 570
591 if (op2->speed < 0) 571 if (op2->speed < 0)
592 op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0; 572 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
593 573
594 /* Copy over key_values, if any. */ 574 /* Copy over key_values, if any. */
595 if (op2->key_values != NULL) 575 if (op2->key_values)
596 { 576 {
597 key_value *tail = NULL; 577 key_value *tail = 0;
598 key_value *i; 578 key_value *i;
599 579
600 op->key_values = NULL; 580 op->key_values = 0;
601 581
602 for (i = op2->key_values; i != NULL; i = i->next) 582 for (i = op2->key_values; i; i = i->next)
603 { 583 {
604 key_value *new_link = new key_value; 584 key_value *new_link = new key_value;
605 585
606 new_link->next = NULL; 586 new_link->next = 0;
607 new_link->key = i->key; 587 new_link->key = i->key;
608 new_link->value = i->value; 588 new_link->value = i->value;
609 589
610 /* Try and be clever here, too. */ 590 /* Try and be clever here, too. */
611 if (op->key_values == NULL) 591 if (!op->key_values)
612 { 592 {
613 op->key_values = new_link; 593 op->key_values = new_link;
614 tail = new_link; 594 tail = new_link;
615 } 595 }
616 else 596 else
… …
628 * If an object with the IS_TURNABLE() flag needs to be turned due 608 * If an object with the IS_TURNABLE() flag needs to be turned due
629 * to the closest player being on the other side, this function can 609 * to the closest player being on the other side, this function can
630 * be called to update the face variable, _and_ how it looks on the map. 610 * be called to update the face variable, _and_ how it looks on the map.
631 */ 611 */
632 612
613void
633void update_turn_face(object *op) { 614update_turn_face (object *op)
615{
634 if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL) 616 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)
635 return; 617 return;
636 SET_ANIMATION(op, op->direction); 618 SET_ANIMATION (op, op->direction);
637 update_object(op,UP_OBJ_FACE); 619 update_object (op, UP_OBJ_FACE);
638} 620}
639 621
640/* 622/*
641 * Updates the speed of an object. If the speed changes from 0 to another 623 * Updates the speed of an object. If the speed changes from 0 to another
642 * value, or vice versa, then add/remove the object from the active list. 624 * value, or vice versa, then add/remove the object from the active list.
643 * This function needs to be called whenever the speed of an object changes. 625 * This function needs to be called whenever the speed of an object changes.
644 */ 626 */
645 627void
646void update_ob_speed(object *op) { 628update_ob_speed (object *op)
629{
647 extern int arch_init; 630 extern int arch_init;
648 631
649 /* No reason putting the archetypes objects on the speed list, 632 /* No reason putting the archetypes objects on the speed list,
650 * since they never really need to be updated. 633 * since they never really need to be updated.
651 */ 634 */
652 635
653 if (QUERY_FLAG(op, FLAG_FREED) && op->speed) { 636 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
637 {
654 LOG(llevError,"Object %s is freed but has speed.\n", &op->name); 638 LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
655#ifdef MANY_CORES 639#ifdef MANY_CORES
656 abort(); 640 abort ();
657#else 641#else
658 op->speed = 0; 642 op->speed = 0;
659#endif 643#endif
660 } 644 }
645
661 if (arch_init) { 646 if (arch_init)
647 return;
648
649 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
650 {
651 /* If already on active list, don't do anything */
652 if (op->active_next || op->active_prev || op == active_objects)
662 return; 653 return;
663 }
664 if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
665 /* If already on active list, don't do anything */
666 if (op->active_next || op->active_prev || op==active_objects)
667 return;
668 654
669 /* process_events() expects us to insert the object at the beginning 655 /* process_events() expects us to insert the object at the beginning
670 * of the list. */ 656 * of the list. */
671 op->active_next = active_objects; 657 op->active_next = active_objects;
658
672 if (op->active_next!=NULL) 659 if (op->active_next != NULL)
673 op->active_next->active_prev = op; 660 op->active_next->active_prev = op;
661
674 active_objects = op; 662 active_objects = op;
663 }
664 else
675 } 665 {
676 else {
677 /* If not on the active list, nothing needs to be done */ 666 /* If not on the active list, nothing needs to be done */
678 if (!op->active_next && !op->active_prev && op!=active_objects) 667 if (!op->active_next && !op->active_prev && op != active_objects)
679 return; 668 return;
680 669
681 if (op->active_prev==NULL) { 670 if (op->active_prev == NULL)
671 {
682 active_objects = op->active_next; 672 active_objects = op->active_next;
673
683 if (op->active_next!=NULL) 674 if (op->active_next != NULL)
684 op->active_next->active_prev = NULL; 675 op->active_next->active_prev = NULL;
676 }
677 else
685 } 678 {
686 else {
687 op->active_prev->active_next = op->active_next; 679 op->active_prev->active_next = op->active_next;
680
688 if (op->active_next) 681 if (op->active_next)
689 op->active_next->active_prev = op->active_prev; 682 op->active_next->active_prev = op->active_prev;
690 } 683 }
684
691 op->active_next = NULL; 685 op->active_next = NULL;
692 op->active_prev = NULL; 686 op->active_prev = NULL;
693 } 687 }
694} 688}
695 689
696/* This function removes object 'op' from the list of active 690/* This function removes object 'op' from the list of active
697 * objects. 691 * objects.
… …
699 * reference maps where you don't want an object that isn't 693 * reference maps where you don't want an object that isn't
700 * in play chewing up cpu time getting processed. 694 * in play chewing up cpu time getting processed.
701 * The reverse of this is to call update_ob_speed, which 695 * The reverse of this is to call update_ob_speed, which
702 * will do the right thing based on the speed of the object. 696 * will do the right thing based on the speed of the object.
703 */ 697 */
698void
704void remove_from_active_list(object *op) 699remove_from_active_list (object *op)
705{ 700{
706 /* If not on the active list, nothing needs to be done */ 701 /* If not on the active list, nothing needs to be done */
707 if (!op->active_next && !op->active_prev && op!=active_objects) 702 if (!op->active_next && !op->active_prev && op != active_objects)
708 return; 703 return;
709 704
710 if (op->active_prev==NULL) { 705 if (op->active_prev == NULL)
706 {
711 active_objects = op->active_next; 707 active_objects = op->active_next;
712 if (op->active_next!=NULL) 708 if (op->active_next != NULL)
713 op->active_next->active_prev = NULL; 709 op->active_next->active_prev = NULL;
710 }
711 else
714 } 712 {
715 else {
716 op->active_prev->active_next = op->active_next; 713 op->active_prev->active_next = op->active_next;
717 if (op->active_next) 714 if (op->active_next)
718 op->active_next->active_prev = op->active_prev; 715 op->active_next->active_prev = op->active_prev;
719 } 716 }
720 op->active_next = NULL; 717 op->active_next = NULL;
721 op->active_prev = NULL; 718 op->active_prev = NULL;
722} 719}
723 720
724/* 721/*
725 * update_object() updates the array which represents the map. 722 * update_object() updates the array which represents the map.
726 * It takes into account invisible objects (and represent squares covered 723 * It takes into account invisible objects (and represent squares covered
… …
741 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 738 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
742 * as that is easier than trying to look at what may have changed. 739 * as that is easier than trying to look at what may have changed.
743 * UP_OBJ_FACE: only the objects face has changed. 740 * UP_OBJ_FACE: only the objects face has changed.
744 */ 741 */
745 742
743void
746void update_object(object *op, int action) { 744update_object (object *op, int action)
745{
747 int update_now=0, flags; 746 int update_now = 0, flags;
748 MoveType move_on, move_off, move_block, move_slow; 747 MoveType move_on, move_off, move_block, move_slow;
749 748
750 if (op == NULL) { 749 if (op == NULL)
750 {
751 /* this should never happen */ 751 /* this should never happen */
752 LOG(llevDebug,"update_object() called for NULL object.\n"); 752 LOG (llevDebug, "update_object() called for NULL object.\n");
753 return; 753 return;
754 }
755 754 }
755
756 if(op->env!=NULL) { 756 if (op->env != NULL)
757 {
757 /* Animation is currently handled by client, so nothing 758 /* Animation is currently handled by client, so nothing
758 * to do in this case. 759 * to do in this case.
759 */ 760 */
760 return; 761 return;
761 } 762 }
762 763
763 /* If the map is saving, don't do anything as everything is 764 /* If the map is saving, don't do anything as everything is
764 * going to get freed anyways. 765 * going to get freed anyways.
765 */ 766 */
766 if (!op->map || op->map->in_memory == MAP_SAVING) return; 767 if (!op->map || op->map->in_memory == MAP_SAVING)
767 768 return;
769
768 /* make sure the object is within map boundaries */ 770 /* make sure the object is within map boundaries */
769 if (op->x < 0 || op->x >= MAP_WIDTH(op->map) || 771 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))
770 op->y < 0 || op->y >= MAP_HEIGHT(op->map)) { 772 {
771 LOG(llevError,"update_object() called for object out of map!\n"); 773 LOG (llevError, "update_object() called for object out of map!\n");
772#ifdef MANY_CORES 774#ifdef MANY_CORES
773 abort(); 775 abort ();
774#endif 776#endif
775 return; 777 return;
776 }
777 778 }
779
778 flags = GET_MAP_FLAGS(op->map, op->x, op->y); 780 flags = GET_MAP_FLAGS (op->map, op->x, op->y);
779 SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE); 781 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
780 move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); 782 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
781 move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); 783 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
782 move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y); 784 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
783 move_off = GET_MAP_MOVE_OFF(op->map, op->x, op->y); 785 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
784 786
785 if (action == UP_OBJ_INSERT) { 787 if (action == UP_OBJ_INSERT)
788 {
786 if (QUERY_FLAG(op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 789 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))
787 update_now=1; 790 update_now = 1;
788 791
789 if (QUERY_FLAG(op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 792 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))
790 update_now=1; 793 update_now = 1;
791 794
792 if (QUERY_FLAG(op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 795 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))
793 update_now=1; 796 update_now = 1;
794 797
795 if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE)) 798 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
796 update_now=1; 799 update_now = 1;
797 800
798 if (op->type == SAFE_GROUND && !(flags & P_SAFE)) 801 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
799 update_now=1; 802 update_now = 1;
800 803
801 if ((move_on | op->move_on) != move_on) update_now=1; 804 if ((move_on | op->move_on) != move_on)
805 update_now = 1;
802 806
803 if ((move_off | op->move_off) != move_off) update_now=1; 807 if ((move_off | op->move_off) != move_off)
808 update_now = 1;
804 809
805 /* This isn't perfect, but I don't expect a lot of objects to 810 /* This isn't perfect, but I don't expect a lot of objects to
806 * to have move_allow right now. 811 * to have move_allow right now.
807 */ 812 */
808 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 813 if (((move_block | op->move_block) & ~op->move_allow) != move_block)
809 update_now=1; 814 update_now = 1;
810 815
811 if ((move_slow | op->move_slow) != move_slow) 816 if ((move_slow | op->move_slow) != move_slow)
812 update_now=1; 817 update_now = 1;
813 } 818 }
814 /* if the object is being removed, we can't make intelligent 819 /* if the object is being removed, we can't make intelligent
815 * decisions, because remove_ob can't really pass the object 820 * decisions, because remove_ob can't really pass the object
816 * that is being removed. 821 * that is being removed.
817 */ 822 */
818 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) { 823 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
819 update_now=1; 824 update_now = 1;
820 } else if (action == UP_OBJ_FACE) { 825 else if (action == UP_OBJ_FACE)
821 /* Nothing to do for that case */ 826 /* Nothing to do for that case */ ;
822 }
823 else { 827 else
824 LOG(llevError,"update_object called with invalid action: %d\n", action); 828 LOG (llevError, "update_object called with invalid action: %d\n", action);
825 }
826 829
827 if (update_now) { 830 if (update_now)
831 {
828 SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE); 832 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
829 update_position(op->map, op->x, op->y); 833 update_position (op->map, op->x, op->y);
830 } 834 }
831 835
832 if(op->more!=NULL) 836 if (op->more != NULL)
833 update_object(op->more, action); 837 update_object (op->more, action);
834} 838}
835 839
840static unordered_vector<object *> mortals;
836static std::vector<object *> mortals; 841static std::vector<object *> freed;
837 842
838void object::free_mortals () 843void object::free_mortals ()
839{ 844{
840 for (std::vector<object *>::iterator i = mortals.begin (); i != mortals.end (); ++i) 845 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
846 if ((*i)->refcnt)
847 ++i; // further delay freeing
848 else
849 {
850 freed.push_back (*i);//D
841 delete *i; 851 //delete *i;
852 mortals.erase (i);
853 }
842 854
843 mortals.clear (); 855 if (mortals.size())//D
856 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
844} 857}
845 858
846object::object () 859object::object ()
847{ 860{
848 SET_FLAG (this, FLAG_REMOVED); 861 SET_FLAG (this, FLAG_REMOVED);
… …
855object::~object () 868object::~object ()
856{ 869{
857 free_key_values (this); 870 free_key_values (this);
858} 871}
859 872
860void
861object::link () 873void object::link ()
862{ 874{
863 count = ++ob_count; 875 count = ++ob_count;
864 876
865 prev = 0; 877 prev = 0;
866 next = objects; 878 next = objects;
… …
869 objects->prev = this; 881 objects->prev = this;
870 882
871 objects = this; 883 objects = this;
872} 884}
873 885
874void
875object::unlink () 886void object::unlink ()
876{ 887{
877 count = 0; 888 count = 0;
878 889
879 /* Remove this object from the list of used objects */ 890 /* Remove this object from the list of used objects */
891 if (prev)
892 {
880 if (prev) prev->next = next; 893 prev->next = next;
894 prev = 0;
895 }
896
897 if (next)
898 {
881 if (next) next->prev = prev; 899 next->prev = prev;
882 if (this == objects) objects = next; 900 next = 0;
883} 901 }
902
903 if (this == objects)
904 objects = next;
905}
884 906
885object *object::create () 907object *object::create ()
886{ 908{
909 object *op;
910
911 if (freed.empty ())
887 object *op = new object; 912 op = new object;
913 else
914 {
915 // highly annoying, but the only way to get it stable right now
916 op = freed.back ();
917 freed.pop_back ();
918 op->~object ();
919 new ((void *) op) object;
920 }
921
888 op->link (); 922 op->link ();
889 return op; 923 return op;
890} 924}
891 925
892/* 926/*
… …
897 * this function to succeed. 931 * this function to succeed.
898 * 932 *
899 * If free_inventory is set, free inventory as well. Else drop items in 933 * If free_inventory is set, free inventory as well. Else drop items in
900 * inventory to the ground. 934 * inventory to the ground.
901 */ 935 */
902void
903object::free (bool free_inventory) 936void object::free (bool free_inventory)
904{ 937{
938 if (QUERY_FLAG (this, FLAG_FREED))
939 return;
940
941 if (QUERY_FLAG (this, FLAG_FRIENDLY))
942 remove_friendly_object (this);
943
905 if (!QUERY_FLAG (this, FLAG_REMOVED)) 944 if (!QUERY_FLAG (this, FLAG_REMOVED))
906 { 945 remove_ob (this);
907 LOG (llevDebug, "Free object called with non removed object\n");
908 dump_object (this);
909#ifdef MANY_CORES
910 abort ();
911#endif
912 }
913 946
914 if (QUERY_FLAG (this, FLAG_FRIENDLY))
915 {
916 LOG (llevMonster, "Warning: tried to free friendly object.\n");
917 remove_friendly_object (this);
918 }
919
920 if (QUERY_FLAG (this, FLAG_FREED)) 947 SET_FLAG (this, FLAG_FREED);
921 {
922 dump_object (this);
923 LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
924 return;
925 }
926 948
927 if (more) 949 if (more)
928 { 950 {
929 more->free (free_inventory); 951 more->free (free_inventory);
930 more = 0; 952 more = 0;
… …
934 { 956 {
935 /* Only if the space blocks everything do we not process - 957 /* Only if the space blocks everything do we not process -
936 * if some form of movement is allowed, let objects 958 * if some form of movement is allowed, let objects
937 * drop on that space. 959 * drop on that space.
938 */ 960 */
939 if (free_inventory || !map 961 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
940 || map->in_memory != MAP_IN_MEMORY 962 {
941 || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
942 {
943 object *op = inv; 963 object *op = inv;
944 964
945 while (op) 965 while (op)
946 { 966 {
947 object *tmp = op->below; 967 object *tmp = op->below;
948 remove_ob (op);
949 op->free (free_inventory); 968 op->free (free_inventory);
950 op = tmp; 969 op = tmp;
951 } 970 }
952 } 971 }
953 else 972 else
954 { /* Put objects in inventory onto this space */ 973 { /* Put objects in inventory onto this space */
955 object *op = inv; 974 object *op = inv;
956 975
957 while (op) 976 while (op)
958 { 977 {
959 object *tmp = op->below; 978 object *tmp = op->below;
979
960 remove_ob (op); 980 remove_ob (op);
961 981
962 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 982 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
963 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE 983 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
964 || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 984 free_object (op);
965 free_object (op); 985 else
966 else 986 {
967 { 987 op->x = x;
968 op->x = x; 988 op->y = y;
969 op->y = y;
970 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 989 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
971 } 990 }
972 991
973 op = tmp; 992 op = tmp;
993 }
994 }
974 } 995 }
975 } 996
976 } 997 owner = 0;
977 998
978 /* Remove object from the active list */ 999 /* Remove object from the active list */
979 speed = 0; 1000 speed = 0;
980 update_ob_speed (this); 1001 update_ob_speed (this);
981 1002
982 unlink (); 1003 unlink ();
983 1004
984 SET_FLAG (this, FLAG_FREED);
985
986 mortals.push_back (this); 1005 mortals.push_back (this);
987} 1006}
988 1007
989/* 1008/*
990 * sub_weight() recursively (outwards) subtracts a number from the 1009 * sub_weight() recursively (outwards) subtracts a number from the
991 * weight of an object (and what is carried by it's environment(s)). 1010 * weight of an object (and what is carried by it's environment(s)).
992 */ 1011 */
993 1012
1013void
994void sub_weight (object *op, signed long weight) { 1014sub_weight (object *op, signed long weight)
1015{
995 while (op != NULL) { 1016 while (op != NULL)
1017 {
996 if (op->type == CONTAINER) { 1018 if (op->type == CONTAINER)
1019 {
997 weight=(signed long)(weight*(100-op->stats.Str)/100); 1020 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
998 } 1021 }
999 op->carrying-=weight; 1022 op->carrying -= weight;
1000 op = op->env; 1023 op = op->env;
1001 } 1024 }
1002} 1025}
1003 1026
1004/* remove_ob(op): 1027/* remove_ob(op):
1005 * This function removes the object op from the linked list of objects 1028 * This function removes the object op from the linked list of objects
1006 * which it is currently tied to. When this function is done, the 1029 * which it is currently tied to. When this function is done, the
… …
1008 * environment, the x and y coordinates will be updated to 1031 * environment, the x and y coordinates will be updated to
1009 * the previous environment. 1032 * the previous environment.
1010 * Beware: This function is called from the editor as well! 1033 * Beware: This function is called from the editor as well!
1011 */ 1034 */
1012 1035
1036void
1013void remove_ob(object *op) { 1037remove_ob (object *op)
1014 object *tmp,*last=NULL; 1038{
1015 object *otmp; 1039 object *
1016 tag_t tag; 1040 tmp, *
1041 last = NULL;
1042 object *
1043 otmp;
1044
1045 tag_t
1046 tag;
1047 int
1017 int check_walk_off; 1048 check_walk_off;
1018 mapstruct *m; 1049 mapstruct *
1019 sint16 x,y;
1020 1050 m;
1021 1051
1052 sint16
1053 x,
1054 y;
1055
1022 if(QUERY_FLAG(op,FLAG_REMOVED)) { 1056 if (QUERY_FLAG (op, FLAG_REMOVED))
1023 dump_object(op); 1057 return;
1024 LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1025 1058
1026 /* Changed it to always dump core in this case. As has been learned
1027 * in the past, trying to recover from errors almost always
1028 * make things worse, and this is a real error here - something
1029 * that should not happen.
1030 * Yes, if this was a mission critical app, trying to do something
1031 * to recover may make sense, but that is because failure of the app
1032 * may have other disastrous problems. Cf runs out of a script
1033 * so is easily enough restarted without any real problems.
1034 * MSW 2001-07-01
1035 */
1036 abort();
1037 }
1038 if(op->more!=NULL)
1039 remove_ob(op->more);
1040
1041 SET_FLAG(op, FLAG_REMOVED); 1059 SET_FLAG (op, FLAG_REMOVED);
1042 1060
1061 if (op->more != NULL)
1062 remove_ob (op->more);
1063
1043 /* 1064 /*
1044 * In this case, the object to be removed is in someones 1065 * In this case, the object to be removed is in someones
1045 * inventory. 1066 * inventory.
1046 */ 1067 */
1047 if(op->env!=NULL) { 1068 if (op->env != NULL)
1069 {
1048 if(op->nrof) 1070 if (op->nrof)
1049 sub_weight(op->env, op->weight*op->nrof); 1071 sub_weight (op->env, op->weight * op->nrof);
1050 else 1072 else
1051 sub_weight(op->env, op->weight+op->carrying); 1073 sub_weight (op->env, op->weight + op->carrying);
1052 1074
1053 /* NO_FIX_PLAYER is set when a great many changes are being 1075 /* NO_FIX_PLAYER is set when a great many changes are being
1054 * made to players inventory. If set, avoiding the call 1076 * made to players inventory. If set, avoiding the call
1055 * to save cpu time. 1077 * to save cpu time.
1056 */ 1078 */
1057 if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr && 1079 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1058 !QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1059 fix_player(otmp); 1080 fix_player (otmp);
1060 1081
1061 if(op->above!=NULL) 1082 if (op->above != NULL)
1062 op->above->below=op->below; 1083 op->above->below = op->below;
1063 else 1084 else
1064 op->env->inv=op->below; 1085 op->env->inv = op->below;
1065 1086
1066 if(op->below!=NULL) 1087 if (op->below != NULL)
1067 op->below->above=op->above; 1088 op->below->above = op->above;
1068 1089
1069 /* we set up values so that it could be inserted into 1090 /* we set up values so that it could be inserted into
1070 * the map, but we don't actually do that - it is up 1091 * the map, but we don't actually do that - it is up
1071 * to the caller to decide what we want to do. 1092 * to the caller to decide what we want to do.
1072 */ 1093 */
1073 op->x=op->env->x,op->y=op->env->y; 1094 op->x = op->env->x, op->y = op->env->y;
1074 op->map=op->env->map; 1095 op->map = op->env->map;
1075 op->above=NULL,op->below=NULL; 1096 op->above = NULL, op->below = NULL;
1076 op->env=NULL; 1097 op->env = NULL;
1098 }
1099 else if (op->map)
1100 {
1101 x = op->x;
1102 y = op->y;
1103 m = get_map_from_coord (op->map, &x, &y);
1104
1105 if (!m)
1106 {
1107 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1108 op->map->path, op->x, op->y);
1109 /* in old days, we used to set x and y to 0 and continue.
1110 * it seems if we get into this case, something is probablye
1111 * screwed up and should be fixed.
1112 */
1113 abort ();
1114 }
1115
1116 if (op->map != m)
1117 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118 op->map->path, m->path, op->x, op->y, x, y);
1119
1120 /* Re did the following section of code - it looks like it had
1121 * lots of logic for things we no longer care about
1122 */
1123
1124 /* link the object above us */
1125 if (op->above)
1126 op->above->below = op->below;
1127 else
1128 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1129
1130 /* Relink the object below us, if there is one */
1131 if (op->below)
1132 op->below->above = op->above;
1133 else
1134 {
1135 /* Nothing below, which means we need to relink map object for this space
1136 * use translated coordinates in case some oddness with map tiling is
1137 * evident
1138 */
1139 if (GET_MAP_OB (m, x, y) != op)
1140 {
1141 dump_object (op);
1142 LOG (llevError,
1143 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
1144 dump_object (GET_MAP_OB (m, x, y));
1145 LOG (llevError, "%s\n", errmsg);
1146 }
1147
1148 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1149 }
1150
1151 op->above = 0;
1152 op->below = 0;
1153
1154 if (op->map->in_memory == MAP_SAVING)
1077 return; 1155 return;
1078 }
1079 1156
1080 /* If we get here, we are removing it from a map */
1081 if (op->map == NULL) return;
1082
1083 x = op->x;
1084 y = op->y;
1085 m = get_map_from_coord(op->map, &x, &y);
1086
1087 if (!m) {
1088 LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1089 op->map->path, op->x, op->y);
1090 /* in old days, we used to set x and y to 0 and continue.
1091 * it seems if we get into this case, something is probablye
1092 * screwed up and should be fixed.
1093 */
1094 abort();
1095 }
1096 if (op->map != m) {
1097 LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1098 op->map->path, m->path, op->x, op->y, x, y);
1099 }
1100
1101 /* Re did the following section of code - it looks like it had
1102 * lots of logic for things we no longer care about
1103 */
1104
1105 /* link the object above us */
1106 if (op->above)
1107 op->above->below=op->below;
1108 else
1109 SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1110
1111 /* Relink the object below us, if there is one */
1112 if(op->below) {
1113 op->below->above=op->above;
1114 } else {
1115 /* Nothing below, which means we need to relink map object for this space
1116 * use translated coordinates in case some oddness with map tiling is
1117 * evident
1118 */
1119 if(GET_MAP_OB(m,x,y)!=op) {
1120 dump_object(op);
1121 LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
1122 dump_object(GET_MAP_OB(m,x,y));
1123 LOG(llevError,"%s\n",errmsg);
1124 }
1125 SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1126 }
1127 op->above=NULL;
1128 op->below=NULL;
1129
1130 if (op->map->in_memory == MAP_SAVING)
1131 return;
1132
1133 tag = op->count; 1157 tag = op->count;
1134 check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY); 1158 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1159
1135 for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) { 1160 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1161 {
1136 /* No point updating the players look faces if he is the object 1162 /* No point updating the players look faces if he is the object
1137 * being removed. 1163 * being removed.
1138 */ 1164 */
1139 1165
1140 if(tmp->type==PLAYER && tmp!=op) { 1166 if (tmp->type == PLAYER && tmp != op)
1167 {
1141 /* If a container that the player is currently using somehow gets 1168 /* If a container that the player is currently using somehow gets
1142 * removed (most likely destroyed), update the player view 1169 * removed (most likely destroyed), update the player view
1143 * appropriately. 1170 * appropriately.
1144 */ 1171 */
1145 if (tmp->container==op) { 1172 if (tmp->container == op)
1173 {
1146 CLEAR_FLAG(op, FLAG_APPLIED); 1174 CLEAR_FLAG (op, FLAG_APPLIED);
1147 tmp->container=NULL; 1175 tmp->container = NULL;
1176 }
1177
1178 tmp->contr->socket.update_look = 1;
1148 } 1179 }
1149 tmp->contr->socket.update_look=1; 1180
1150 }
1151 /* See if player moving off should effect something */ 1181 /* See if player moving off should effect something */
1152 if (check_walk_off && ((op->move_type & tmp->move_off) && 1182 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1153 (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) { 1183 {
1154
1155 move_apply(tmp, op, NULL); 1184 move_apply (tmp, op, NULL);
1185
1156 if (was_destroyed (op, tag)) { 1186 if (was_destroyed (op, tag))
1187 {
1157 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " 1188 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1158 "leaving object\n", &tmp->name, &tmp->arch->name); 1189 }
1159 } 1190 }
1160 }
1161 1191
1162 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1192 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1163 1193
1164 if(tmp->above == tmp) 1194 if (tmp->above == tmp)
1165 tmp->above = NULL; 1195 tmp->above = NULL;
1196
1166 last=tmp; 1197 last = tmp;
1167 } 1198 }
1199
1168 /* last == NULL of there are no objects on this space */ 1200 /* last == NULL of there are no objects on this space */
1169 if (last==NULL) { 1201 if (last == NULL)
1202 {
1170 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory, 1203 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1171 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures 1204 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1172 * those out anyways, and if there are any flags set right now, they won't 1205 * those out anyways, and if there are any flags set right now, they won't
1173 * be correct anyways. 1206 * be correct anyways.
1174 */ 1207 */
1175 SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE); 1208 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1176 update_position(op->map, op->x, op->y); 1209 update_position (op->map, op->x, op->y);
1177 } 1210 }
1178 else 1211 else
1179 update_object(last, UP_OBJ_REMOVE); 1212 update_object (last, UP_OBJ_REMOVE);
1180 1213
1181 if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0)) 1214 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1182 update_all_los(op->map, op->x, op->y); 1215 update_all_los (op->map, op->x, op->y);
1183 1216 }
1184} 1217}
1185 1218
1186/* 1219/*
1187 * merge_ob(op,top): 1220 * merge_ob(op,top):
1188 * 1221 *
… …
1190 * merges op to the first matching object. 1223 * merges op to the first matching object.
1191 * If top is NULL, it is calculated. 1224 * If top is NULL, it is calculated.
1192 * Returns pointer to object if it succeded in the merge, otherwise NULL 1225 * Returns pointer to object if it succeded in the merge, otherwise NULL
1193 */ 1226 */
1194 1227
1228object *
1195object *merge_ob(object *op, object *top) { 1229merge_ob (object *op, object *top)
1230{
1196 if(!op->nrof) 1231 if (!op->nrof)
1197 return 0; 1232 return 0;
1233
1198 if(top==NULL) 1234 if (top == NULL)
1199 for(top=op;top!=NULL&&top->above!=NULL;top=top->above); 1235 for (top = op; top != NULL && top->above != NULL; top = top->above);
1236
1200 for(;top!=NULL;top=top->below) { 1237 for (; top != NULL; top = top->below)
1238 {
1201 if(top==op) 1239 if (top == op)
1202 continue; 1240 continue;
1203 if (CAN_MERGE(op,top)) 1241 if (CAN_MERGE (op, top))
1204 { 1242 {
1205 top->nrof+=op->nrof; 1243 top->nrof += op->nrof;
1244
1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1245/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1207 op->weight = 0; /* Don't want any adjustements now */ 1246 op->weight = 0; /* Don't want any adjustements now */
1208 remove_ob(op); 1247 remove_ob (op);
1209 free_object(op); 1248 free_object (op);
1210 return top; 1249 return top;
1211 } 1250 }
1212 } 1251 }
1252
1213 return NULL; 1253 return NULL;
1214} 1254}
1215 1255
1216/* 1256/*
1217 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1257 * same as insert_ob_in_map except it handle separate coordinates and do a clean
1218 * job preparing multi-part monsters 1258 * job preparing multi-part monsters
1219 */ 1259 */
1260object *
1220object *insert_ob_in_map_at(object *op, mapstruct *m, object *originator, int flag, int x, int y){ 1261insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
1262{
1221 object* tmp; 1263 object *tmp;
1264
1222 if (op->head) 1265 if (op->head)
1223 op=op->head; 1266 op = op->head;
1267
1224 for (tmp=op;tmp;tmp=tmp->more){ 1268 for (tmp = op; tmp; tmp = tmp->more)
1269 {
1225 tmp->x=x+tmp->arch->clone.x; 1270 tmp->x = x + tmp->arch->clone.x;
1226 tmp->y=y+tmp->arch->clone.y; 1271 tmp->y = y + tmp->arch->clone.y;
1227 } 1272 }
1273
1228 return insert_ob_in_map (op, m, originator, flag); 1274 return insert_ob_in_map (op, m, originator, flag);
1229} 1275}
1230 1276
1231/* 1277/*
1232 * insert_ob_in_map (op, map, originator, flag): 1278 * insert_ob_in_map (op, map, originator, flag):
1233 * This function inserts the object in the two-way linked list 1279 * This function inserts the object in the two-way linked list
… …
1247 * new object if 'op' was merged with other object 1293 * new object if 'op' was merged with other object
1248 * NULL if 'op' was destroyed 1294 * NULL if 'op' was destroyed
1249 * just 'op' otherwise 1295 * just 'op' otherwise
1250 */ 1296 */
1251 1297
1298object *
1252object *insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1299insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)
1253{ 1300{
1254 object *tmp, *top, *floor=NULL; 1301 object *tmp, *top, *floor = NULL;
1255 sint16 x,y; 1302 sint16 x, y;
1256 1303
1257 if (QUERY_FLAG (op, FLAG_FREED)) { 1304 if (QUERY_FLAG (op, FLAG_FREED))
1305 {
1258 LOG (llevError, "Trying to insert freed object!\n"); 1306 LOG (llevError, "Trying to insert freed object!\n");
1307 return NULL;
1308 }
1309
1310 if (m == NULL)
1311 {
1312 dump_object (op);
1313 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1314 return op;
1315 }
1316
1317 if (out_of_map (m, op->x, op->y))
1318 {
1319 dump_object (op);
1320 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1321#ifdef MANY_CORES
1322 /* Better to catch this here, as otherwise the next use of this object
1323 * is likely to cause a crash. Better to find out where it is getting
1324 * improperly inserted.
1325 */
1326 abort ();
1327#endif
1328 return op;
1329 }
1330
1331 if (!QUERY_FLAG (op, FLAG_REMOVED))
1332 {
1333 dump_object (op);
1334 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1335 return op;
1336 }
1337
1338 if (op->more != NULL)
1339 {
1340 /* The part may be on a different map. */
1341
1342 object *more = op->more;
1343
1344 /* We really need the caller to normalize coordinates - if
1345 * we set the map, that doesn't work if the location is within
1346 * a map and this is straddling an edge. So only if coordinate
1347 * is clear wrong do we normalize it.
1348 */
1349 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1350 more->map = get_map_from_coord (m, &more->x, &more->y);
1351 else if (!more->map)
1352 {
1353 /* For backwards compatibility - when not dealing with tiled maps,
1354 * more->map should always point to the parent.
1355 */
1356 more->map = m;
1357 }
1358
1359 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1360 {
1361 if (!op->head)
1362 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1363
1364 return NULL;
1365 }
1366 }
1367
1368 CLEAR_FLAG (op, FLAG_REMOVED);
1369
1370 /* Ideally, the caller figures this out. However, it complicates a lot
1371 * of areas of callers (eg, anything that uses find_free_spot would now
1372 * need extra work
1373 */
1374 op->map = get_map_from_coord (m, &op->x, &op->y);
1375 x = op->x;
1376 y = op->y;
1377
1378 /* this has to be done after we translate the coordinates.
1379 */
1380 if (op->nrof && !(flag & INS_NO_MERGE))
1381 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1382 if (CAN_MERGE (op, tmp))
1383 {
1384 op->nrof += tmp->nrof;
1385 remove_ob (tmp);
1386 free_object (tmp);
1387 }
1388
1389 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1390 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391
1392 if (!QUERY_FLAG (op, FLAG_ALIVE))
1393 CLEAR_FLAG (op, FLAG_NO_STEAL);
1394
1395 if (flag & INS_BELOW_ORIGINATOR)
1396 {
1397 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1398 {
1399 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1400 abort ();
1401 }
1402
1403 op->above = originator;
1404 op->below = originator->below;
1405
1406 if (op->below)
1407 op->below->above = op;
1408 else
1409 SET_MAP_OB (op->map, op->x, op->y, op);
1410
1411 /* since *below* originator, no need to update top */
1412 originator->below = op;
1413 }
1414 else
1415 {
1416 /* If there are other objects, then */
1417 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1418 {
1419 object *last = NULL;
1420
1421 /*
1422 * If there are multiple objects on this space, we do some trickier handling.
1423 * We've already dealt with merging if appropriate.
1424 * Generally, we want to put the new object on top. But if
1425 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1426 * floor, we want to insert above that and no further.
1427 * Also, if there are spell objects on this space, we stop processing
1428 * once we get to them. This reduces the need to traverse over all of
1429 * them when adding another one - this saves quite a bit of cpu time
1430 * when lots of spells are cast in one area. Currently, it is presumed
1431 * that flying non pickable objects are spell objects.
1432 */
1433
1434 while (top != NULL)
1435 {
1436 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1437 floor = top;
1438
1439 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1440 {
1441 /* We insert above top, so we want this object below this */
1442 top = top->below;
1443 break;
1444 }
1445
1446 last = top;
1447 top = top->above;
1448 }
1449
1450 /* Don't want top to be NULL, so set it to the last valid object */
1451 top = last;
1452
1453 /* We let update_position deal with figuring out what the space
1454 * looks like instead of lots of conditions here.
1455 * makes things faster, and effectively the same result.
1456 */
1457
1458 /* Have object 'fall below' other objects that block view.
1459 * Unless those objects are exits, type 66
1460 * If INS_ON_TOP is used, don't do this processing
1461 * Need to find the object that in fact blocks view, otherwise
1462 * stacking is a bit odd.
1463 */
1464 if (!(flag & INS_ON_TOP) &&
1465 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1466 {
1467 for (last = top; last != floor; last = last->below)
1468 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1469 break;
1470 /* Check to see if we found the object that blocks view,
1471 * and make sure we have a below pointer for it so that
1472 * we can get inserted below this one, which requires we
1473 * set top to the object below us.
1474 */
1475 if (last && last->below && last != floor)
1476 top = last->below;
1477 }
1478 } /* If objects on this space */
1479
1480 if (flag & INS_MAP_LOAD)
1481 top = GET_MAP_TOP (op->map, op->x, op->y);
1482
1483 if (flag & INS_ABOVE_FLOOR_ONLY)
1484 top = floor;
1485
1486 /* Top is the object that our object (op) is going to get inserted above.
1487 */
1488
1489 /* First object on this space */
1490 if (!top)
1491 {
1492 op->above = GET_MAP_OB (op->map, op->x, op->y);
1493
1494 if (op->above)
1495 op->above->below = op;
1496
1497 op->below = NULL;
1498 SET_MAP_OB (op->map, op->x, op->y, op);
1499 }
1500 else
1501 { /* get inserted into the stack above top */
1502 op->above = top->above;
1503
1504 if (op->above)
1505 op->above->below = op;
1506
1507 op->below = top;
1508 top->above = op;
1509 }
1510
1511 if (op->above == NULL)
1512 SET_MAP_TOP (op->map, op->x, op->y, op);
1513 } /* else not INS_BELOW_ORIGINATOR */
1514
1515 if (op->type == PLAYER)
1516 op->contr->do_los = 1;
1517
1518 /* If we have a floor, we know the player, if any, will be above
1519 * it, so save a few ticks and start from there.
1520 */
1521 if (!(flag & INS_MAP_LOAD))
1522 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1523 if (tmp->type == PLAYER)
1524 tmp->contr->socket.update_look = 1;
1525
1526 /* If this object glows, it may affect lighting conditions that are
1527 * visible to others on this map. But update_all_los is really
1528 * an inefficient way to do this, as it means los for all players
1529 * on the map will get recalculated. The players could very well
1530 * be far away from this change and not affected in any way -
1531 * this should get redone to only look for players within range,
1532 * or just updating the P_NEED_UPDATE for spaces within this area
1533 * of effect may be sufficient.
1534 */
1535 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1536 update_all_los (op->map, op->x, op->y);
1537
1538 /* updates flags (blocked, alive, no magic, etc) for this map space */
1539 update_object (op, UP_OBJ_INSERT);
1540
1541 /* Don't know if moving this to the end will break anything. However,
1542 * we want to have update_look set above before calling this.
1543 *
1544 * check_move_on() must be after this because code called from
1545 * check_move_on() depends on correct map flags (so functions like
1546 * blocked() and wall() work properly), and these flags are updated by
1547 * update_object().
1548 */
1549
1550 /* if this is not the head or flag has been passed, don't check walk on status */
1551 if (!(flag & INS_NO_WALK_ON) && !op->head)
1552 {
1553 if (check_move_on (op, originator))
1259 return NULL; 1554 return NULL;
1260 }
1261 if(m==NULL) {
1262 dump_object(op);
1263 LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1264 return op;
1265 }
1266 if(out_of_map(m,op->x,op->y)) {
1267 dump_object(op);
1268 LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1269#ifdef MANY_CORES
1270 /* Better to catch this here, as otherwise the next use of this object
1271 * is likely to cause a crash. Better to find out where it is getting
1272 * improperly inserted.
1273 */
1274 abort();
1275#endif
1276 return op;
1277 }
1278 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1279 dump_object(op);
1280 LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1281 return op;
1282 }
1283 if(op->more!=NULL) {
1284 /* The part may be on a different map. */
1285 1555
1286 object *more = op->more;
1287
1288 /* We really need the caller to normalize coordinates - if
1289 * we set the map, that doesn't work if the location is within
1290 * a map and this is straddling an edge. So only if coordinate
1291 * is clear wrong do we normalize it.
1292 */
1293 if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1294 more->map = get_map_from_coord(m, &more->x, &more->y);
1295 } else if (!more->map) {
1296 /* For backwards compatibility - when not dealing with tiled maps,
1297 * more->map should always point to the parent.
1298 */
1299 more->map = m;
1300 }
1301
1302 if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1303 if ( ! op->head)
1304 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1305 return NULL;
1306 }
1307 }
1308 CLEAR_FLAG(op,FLAG_REMOVED);
1309
1310 /* Ideally, the caller figures this out. However, it complicates a lot
1311 * of areas of callers (eg, anything that uses find_free_spot would now
1312 * need extra work
1313 */
1314 op->map=get_map_from_coord(m, &op->x, &op->y);
1315 x = op->x;
1316 y = op->y;
1317
1318 /* this has to be done after we translate the coordinates.
1319 */
1320 if(op->nrof && !(flag & INS_NO_MERGE)) {
1321 for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1322 if (CAN_MERGE(op,tmp)) {
1323 op->nrof+=tmp->nrof;
1324 remove_ob(tmp);
1325 free_object(tmp);
1326 }
1327 }
1328
1329 CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1330 CLEAR_FLAG(op, FLAG_INV_LOCKED);
1331 if (!QUERY_FLAG(op, FLAG_ALIVE))
1332 CLEAR_FLAG(op, FLAG_NO_STEAL);
1333
1334 if (flag & INS_BELOW_ORIGINATOR) {
1335 if (originator->map != op->map || originator->x != op->x ||
1336 originator->y != op->y) {
1337 LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1338 abort();
1339 }
1340 op->above = originator;
1341 op->below = originator->below;
1342 if (op->below) op->below->above = op;
1343 else SET_MAP_OB(op->map, op->x, op->y, op);
1344 /* since *below* originator, no need to update top */
1345 originator->below = op;
1346 } else {
1347 /* If there are other objects, then */
1348 if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1349 object *last=NULL;
1350 /*
1351 * If there are multiple objects on this space, we do some trickier handling.
1352 * We've already dealt with merging if appropriate.
1353 * Generally, we want to put the new object on top. But if
1354 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1355 * floor, we want to insert above that and no further.
1356 * Also, if there are spell objects on this space, we stop processing
1357 * once we get to them. This reduces the need to traverse over all of
1358 * them when adding another one - this saves quite a bit of cpu time
1359 * when lots of spells are cast in one area. Currently, it is presumed
1360 * that flying non pickable objects are spell objects.
1361 */
1362
1363 while (top != NULL) {
1364 if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1365 QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1366 if (QUERY_FLAG(top, FLAG_NO_PICK)
1367 && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1368 && !QUERY_FLAG(top, FLAG_IS_FLOOR))
1369 {
1370 /* We insert above top, so we want this object below this */
1371 top=top->below;
1372 break;
1373 }
1374 last = top;
1375 top = top->above;
1376 }
1377 /* Don't want top to be NULL, so set it to the last valid object */
1378 top = last;
1379
1380 /* We let update_position deal with figuring out what the space
1381 * looks like instead of lots of conditions here.
1382 * makes things faster, and effectively the same result.
1383 */
1384
1385 /* Have object 'fall below' other objects that block view.
1386 * Unless those objects are exits, type 66
1387 * If INS_ON_TOP is used, don't do this processing
1388 * Need to find the object that in fact blocks view, otherwise
1389 * stacking is a bit odd.
1390 */
1391 if (!(flag & INS_ON_TOP) &&
1392 (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1393 (op->face && !op->face->visibility)) {
1394 for (last=top; last != floor; last=last->below)
1395 if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1396 /* Check to see if we found the object that blocks view,
1397 * and make sure we have a below pointer for it so that
1398 * we can get inserted below this one, which requires we
1399 * set top to the object below us.
1400 */
1401 if (last && last->below && last != floor) top=last->below;
1402 }
1403 } /* If objects on this space */
1404 if (flag & INS_MAP_LOAD)
1405 top = GET_MAP_TOP(op->map,op->x,op->y);
1406 if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1407
1408 /* Top is the object that our object (op) is going to get inserted above.
1409 */
1410
1411 /* First object on this space */
1412 if (!top) {
1413 op->above = GET_MAP_OB(op->map, op->x, op->y);
1414 if (op->above) op->above->below = op;
1415 op->below = NULL;
1416 SET_MAP_OB(op->map, op->x, op->y, op);
1417 } else { /* get inserted into the stack above top */
1418 op->above = top->above;
1419 if (op->above) op->above->below = op;
1420 op->below = top;
1421 top->above = op;
1422 }
1423 if (op->above==NULL)
1424 SET_MAP_TOP(op->map,op->x, op->y, op);
1425 } /* else not INS_BELOW_ORIGINATOR */
1426
1427 if(op->type==PLAYER)
1428 op->contr->do_los=1;
1429
1430 /* If we have a floor, we know the player, if any, will be above
1431 * it, so save a few ticks and start from there.
1432 */
1433 if (!(flag & INS_MAP_LOAD))
1434 for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1435 if (tmp->type == PLAYER)
1436 tmp->contr->socket.update_look=1;
1437 }
1438
1439 /* If this object glows, it may affect lighting conditions that are
1440 * visible to others on this map. But update_all_los is really
1441 * an inefficient way to do this, as it means los for all players
1442 * on the map will get recalculated. The players could very well
1443 * be far away from this change and not affected in any way -
1444 * this should get redone to only look for players within range,
1445 * or just updating the P_NEED_UPDATE for spaces within this area
1446 * of effect may be sufficient.
1447 */
1448 if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1449 update_all_los(op->map, op->x, op->y);
1450
1451
1452 /* updates flags (blocked, alive, no magic, etc) for this map space */
1453 update_object(op,UP_OBJ_INSERT);
1454
1455
1456 /* Don't know if moving this to the end will break anything. However,
1457 * we want to have update_look set above before calling this.
1458 *
1459 * check_move_on() must be after this because code called from
1460 * check_move_on() depends on correct map flags (so functions like
1461 * blocked() and wall() work properly), and these flags are updated by
1462 * update_object().
1463 */
1464
1465 /* if this is not the head or flag has been passed, don't check walk on status */
1466
1467 if (!(flag & INS_NO_WALK_ON) && !op->head) {
1468 if (check_move_on(op, originator))
1469 return NULL;
1470
1471 /* If we are a multi part object, lets work our way through the check 1556 /* If we are a multi part object, lets work our way through the check
1472 * walk on's. 1557 * walk on's.
1473 */ 1558 */
1474 for (tmp=op->more; tmp!=NULL; tmp=tmp->more) 1559 for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1475 if (check_move_on (tmp, originator)) 1560 if (check_move_on (tmp, originator))
1476 return NULL; 1561 return NULL;
1477 } 1562 }
1563
1478 return op; 1564 return op;
1479} 1565}
1480 1566
1481/* this function inserts an object in the map, but if it 1567/* this function inserts an object in the map, but if it
1482 * finds an object of its own type, it'll remove that one first. 1568 * finds an object of its own type, it'll remove that one first.
1483 * op is the object to insert it under: supplies x and the map. 1569 * op is the object to insert it under: supplies x and the map.
1484 */ 1570 */
1571void
1485void replace_insert_ob_in_map(const char *arch_string, object *op) { 1572replace_insert_ob_in_map (const char *arch_string, object *op)
1573{
1486 object *tmp; 1574 object *
1487 object *tmp1; 1575 tmp;
1576 object *
1577 tmp1;
1488 1578
1489 /* first search for itself and remove any old instances */ 1579 /* first search for itself and remove any old instances */
1490 1580
1491 for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) { 1581 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1582 {
1492 if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ { 1583 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1584 {
1493 remove_ob(tmp); 1585 remove_ob (tmp);
1494 free_object(tmp); 1586 free_object (tmp);
1495 } 1587 }
1496 } 1588 }
1497 1589
1498 tmp1=arch_to_object(find_archetype(arch_string)); 1590 tmp1 = arch_to_object (find_archetype (arch_string));
1499 1591
1500 1592 tmp1->x = op->x;
1501 tmp1->x = op->x; tmp1->y = op->y; 1593 tmp1->y = op->y;
1502 insert_ob_in_map(tmp1,op->map,op,0); 1594 insert_ob_in_map (tmp1, op->map, op, 0);
1503} 1595}
1504 1596
1505/* 1597/*
1506 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1598 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1507 * is returned contains nr objects, and the remaining parts contains 1599 * is returned contains nr objects, and the remaining parts contains
1508 * the rest (or is removed and freed if that number is 0). 1600 * the rest (or is removed and freed if that number is 0).
1509 * On failure, NULL is returned, and the reason put into the 1601 * On failure, NULL is returned, and the reason put into the
1510 * global static errmsg array. 1602 * global static errmsg array.
1511 */ 1603 */
1512 1604
1605object *
1513object *get_split_ob(object *orig_ob, uint32 nr) { 1606get_split_ob (object *orig_ob, uint32 nr)
1514 object *newob; 1607{
1608 object *
1609 newob;
1610 int
1515 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1611 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1516 1612
1517 if(orig_ob->nrof<nr) { 1613 if (orig_ob->nrof < nr)
1518 sprintf(errmsg,"There are only %d %ss.", 1614 {
1519 orig_ob->nrof?orig_ob->nrof:1, &orig_ob->name); 1615 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1520 return NULL; 1616 return NULL;
1521 } 1617 }
1618
1522 newob = object_create_clone(orig_ob); 1619 newob = object_create_clone (orig_ob);
1620
1523 if((orig_ob->nrof-=nr)<1) { 1621 if ((orig_ob->nrof -= nr) < 1)
1622 {
1524 if ( ! is_removed) 1623 if (!is_removed)
1525 remove_ob(orig_ob); 1624 remove_ob (orig_ob);
1526 free_object2(orig_ob, 1); 1625 free_object2 (orig_ob, 1);
1527 } 1626 }
1528 else if ( ! is_removed) { 1627 else if (!is_removed)
1628 {
1529 if(orig_ob->env!=NULL) 1629 if (orig_ob->env != NULL)
1530 sub_weight (orig_ob->env,orig_ob->weight*nr); 1630 sub_weight (orig_ob->env, orig_ob->weight * nr);
1531 if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) { 1631 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1632 {
1532 strcpy(errmsg, "Tried to split object whose map is not in memory."); 1633 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1533 LOG(llevDebug,
1534 "Error, Tried to split object whose map is not in memory.\n"); 1634 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1535 return NULL; 1635 return NULL;
1536 } 1636 }
1537 } 1637 }
1638
1538 newob->nrof=nr; 1639 newob->nrof = nr;
1539 1640
1540 return newob; 1641 return newob;
1541} 1642}
1542 1643
1543/* 1644/*
1544 * decrease_ob_nr(object, number) decreases a specified number from 1645 * decrease_ob_nr(object, number) decreases a specified number from
1545 * the amount of an object. If the amount reaches 0, the object 1646 * the amount of an object. If the amount reaches 0, the object
1546 * is subsequently removed and freed. 1647 * is subsequently removed and freed.
1547 * 1648 *
1548 * Return value: 'op' if something is left, NULL if the amount reached 0 1649 * Return value: 'op' if something is left, NULL if the amount reached 0
1549 */ 1650 */
1550 1651
1652object *
1551object *decrease_ob_nr (object *op, uint32 i) 1653decrease_ob_nr (object *op, uint32 i)
1552{ 1654{
1553 object *tmp; 1655 object *tmp;
1554 player *pl; 1656 player *pl;
1555 1657
1556 if (i == 0) /* objects with op->nrof require this check */ 1658 if (i == 0) /* objects with op->nrof require this check */
1557 return op; 1659 return op;
1558 1660
1559 if (i > op->nrof) 1661 if (i > op->nrof)
1560 i = op->nrof; 1662 i = op->nrof;
1561 1663
1562 if (QUERY_FLAG (op, FLAG_REMOVED)) 1664 if (QUERY_FLAG (op, FLAG_REMOVED))
1665 op->nrof -= i;
1666 else if (op->env != NULL)
1667 {
1668 /* is this object in the players inventory, or sub container
1669 * therein?
1670 */
1671 tmp = is_player_inv (op->env);
1672 /* nope. Is this a container the player has opened?
1673 * If so, set tmp to that player.
1674 * IMO, searching through all the players will mostly
1675 * likely be quicker than following op->env to the map,
1676 * and then searching the map for a player.
1677 */
1678 if (!tmp)
1679 {
1680 for (pl = first_player; pl; pl = pl->next)
1681 if (pl->ob->container == op->env)
1682 break;
1683 if (pl)
1684 tmp = pl->ob;
1685 else
1686 tmp = NULL;
1687 }
1688
1689 if (i < op->nrof)
1690 {
1691 sub_weight (op->env, op->weight * i);
1692 op->nrof -= i;
1693 if (tmp)
1694 {
1695 esrv_send_item (tmp, op);
1696 }
1697 }
1698 else
1699 {
1700 remove_ob (op);
1701 op->nrof = 0;
1702 if (tmp)
1703 {
1704 esrv_del_item (tmp->contr, op->count);
1705 }
1706 }
1563 { 1707 }
1708 else
1709 {
1710 object *above = op->above;
1711
1712 if (i < op->nrof)
1564 op->nrof -= i; 1713 op->nrof -= i;
1565 } 1714 else
1566 else if (op->env != NULL)
1567 {
1568 /* is this object in the players inventory, or sub container
1569 * therein?
1570 */
1571 tmp = is_player_inv (op->env);
1572 /* nope. Is this a container the player has opened?
1573 * If so, set tmp to that player.
1574 * IMO, searching through all the players will mostly
1575 * likely be quicker than following op->env to the map,
1576 * and then searching the map for a player.
1577 */
1578 if (!tmp) {
1579 for (pl=first_player; pl; pl=pl->next)
1580 if (pl->ob->container == op->env) break;
1581 if (pl) tmp=pl->ob;
1582 else tmp=NULL;
1583 } 1715 {
1584
1585 if (i < op->nrof) {
1586 sub_weight (op->env, op->weight * i);
1587 op->nrof -= i;
1588 if (tmp) {
1589 esrv_send_item(tmp, op);
1590 }
1591 } else {
1592 remove_ob (op); 1716 remove_ob (op);
1593 op->nrof = 0; 1717 op->nrof = 0;
1594 if (tmp) {
1595 esrv_del_item(tmp->contr, op->count);
1596 } 1718 }
1597 }
1598 }
1599 else
1600 {
1601 object *above = op->above;
1602 1719
1603 if (i < op->nrof) {
1604 op->nrof -= i;
1605 } else {
1606 remove_ob (op);
1607 op->nrof = 0;
1608 }
1609 /* Since we just removed op, op->above is null */ 1720 /* Since we just removed op, op->above is null */
1610 for (tmp = above; tmp != NULL; tmp = tmp->above) 1721 for (tmp = above; tmp != NULL; tmp = tmp->above)
1611 if (tmp->type == PLAYER) { 1722 if (tmp->type == PLAYER)
1723 {
1612 if (op->nrof) 1724 if (op->nrof)
1613 esrv_send_item(tmp, op); 1725 esrv_send_item (tmp, op);
1614 else 1726 else
1615 esrv_del_item(tmp->contr, op->count); 1727 esrv_del_item (tmp->contr, op->count);
1616 } 1728 }
1617 } 1729 }
1618 1730
1619 if (op->nrof) { 1731 if (op->nrof)
1620 return op; 1732 return op;
1621 } else { 1733 else
1734 {
1622 free_object (op); 1735 free_object (op);
1623 return NULL; 1736 return NULL;
1624 } 1737 }
1625} 1738}
1626 1739
1627/* 1740/*
1628 * add_weight(object, weight) adds the specified weight to an object, 1741 * add_weight(object, weight) adds the specified weight to an object,
1629 * and also updates how much the environment(s) is/are carrying. 1742 * and also updates how much the environment(s) is/are carrying.
1630 */ 1743 */
1631 1744
1745void
1632void add_weight (object *op, signed long weight) { 1746add_weight (object *op, signed long weight)
1747{
1633 while (op!=NULL) { 1748 while (op != NULL)
1749 {
1634 if (op->type == CONTAINER) { 1750 if (op->type == CONTAINER)
1635 weight=(signed long)(weight*(100-op->stats.Str)/100); 1751 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1636 } 1752
1637 op->carrying+=weight; 1753 op->carrying += weight;
1638 op=op->env; 1754 op = op->env;
1639 } 1755 }
1640} 1756}
1641 1757
1642/* 1758/*
1643 * insert_ob_in_ob(op,environment): 1759 * insert_ob_in_ob(op,environment):
1644 * This function inserts the object op in the linked list 1760 * This function inserts the object op in the linked list
… …
1651 * 1767 *
1652 * The function returns now pointer to inserted item, and return value can 1768 * The function returns now pointer to inserted item, and return value can
1653 * be != op, if items are merged. -Tero 1769 * be != op, if items are merged. -Tero
1654 */ 1770 */
1655 1771
1772object *
1656object *insert_ob_in_ob(object *op,object *where) { 1773insert_ob_in_ob (object *op, object *where)
1657 object *tmp, *otmp; 1774{
1775 object *
1776 tmp, *
1777 otmp;
1658 1778
1659 if(!QUERY_FLAG(op,FLAG_REMOVED)) { 1779 if (!QUERY_FLAG (op, FLAG_REMOVED))
1780 {
1660 dump_object(op); 1781 dump_object (op);
1661 LOG(llevError,"Trying to insert (ob) inserted object.\n%s\n", errmsg); 1782 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1662 return op; 1783 return op;
1663 } 1784 }
1785
1664 if(where==NULL) { 1786 if (where == NULL)
1787 {
1665 dump_object(op); 1788 dump_object (op);
1666 LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg); 1789 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1667 return op; 1790 return op;
1668 } 1791 }
1792
1669 if (where->head) { 1793 if (where->head)
1670 LOG(llevDebug, 1794 {
1671 "Warning: Tried to insert object wrong part of multipart object.\n"); 1795 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1672 where = where->head; 1796 where = where->head;
1673 } 1797 }
1798
1674 if (op->more) { 1799 if (op->more)
1800 {
1675 LOG(llevError, "Tried to insert multipart object %s (%d)\n", 1801 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1676 &op->name, op->count);
1677 return op; 1802 return op;
1678 } 1803 }
1804
1679 CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL); 1805 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1680 CLEAR_FLAG(op, FLAG_REMOVED); 1806 CLEAR_FLAG (op, FLAG_REMOVED);
1681 if(op->nrof) { 1807 if (op->nrof)
1808 {
1682 for(tmp=where->inv;tmp!=NULL;tmp=tmp->below) 1809 for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
1683 if ( CAN_MERGE(tmp,op) ) { 1810 if (CAN_MERGE (tmp, op))
1811 {
1684 /* return the original object and remove inserted object 1812 /* return the original object and remove inserted object
1685 (client needs the original object) */ 1813 (client needs the original object) */
1686 tmp->nrof += op->nrof; 1814 tmp->nrof += op->nrof;
1687 /* Weight handling gets pretty funky. Since we are adding to 1815 /* Weight handling gets pretty funky. Since we are adding to
1688 * tmp->nrof, we need to increase the weight. 1816 * tmp->nrof, we need to increase the weight.
1689 */ 1817 */
1690 add_weight (where, op->weight*op->nrof); 1818 add_weight (where, op->weight * op->nrof);
1691 SET_FLAG(op, FLAG_REMOVED); 1819 SET_FLAG (op, FLAG_REMOVED);
1692 free_object(op); /* free the inserted object */ 1820 free_object (op); /* free the inserted object */
1693 op = tmp; 1821 op = tmp;
1694 remove_ob (op); /* and fix old object's links */ 1822 remove_ob (op); /* and fix old object's links */
1695 CLEAR_FLAG(op, FLAG_REMOVED); 1823 CLEAR_FLAG (op, FLAG_REMOVED);
1696 break; 1824 break;
1697 } 1825 }
1698 1826
1699 /* I assume combined objects have no inventory 1827 /* I assume combined objects have no inventory
1700 * We add the weight - this object could have just been removed 1828 * We add the weight - this object could have just been removed
1701 * (if it was possible to merge). calling remove_ob will subtract 1829 * (if it was possible to merge). calling remove_ob will subtract
1702 * the weight, so we need to add it in again, since we actually do 1830 * the weight, so we need to add it in again, since we actually do
1703 * the linking below 1831 * the linking below
1704 */ 1832 */
1705 add_weight (where, op->weight*op->nrof); 1833 add_weight (where, op->weight * op->nrof);
1834 }
1706 } else 1835 else
1707 add_weight (where, (op->weight+op->carrying)); 1836 add_weight (where, (op->weight + op->carrying));
1708 1837
1709 otmp=is_player_inv(where); 1838 otmp = is_player_inv (where);
1710 if (otmp&&otmp->contr!=NULL) { 1839 if (otmp && otmp->contr != NULL)
1840 {
1711 if (!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER)) 1841 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1712 fix_player(otmp); 1842 fix_player (otmp);
1713 } 1843 }
1714 1844
1715 op->map=NULL; 1845 op->map = NULL;
1716 op->env=where; 1846 op->env = where;
1717 op->above=NULL; 1847 op->above = NULL;
1718 op->below=NULL; 1848 op->below = NULL;
1719 op->x=0,op->y=0; 1849 op->x = 0, op->y = 0;
1720 1850
1721 /* reset the light list and los of the players on the map */ 1851 /* reset the light list and los of the players on the map */
1722 if((op->glow_radius!=0)&&where->map) 1852 if ((op->glow_radius != 0) && where->map)
1723 { 1853 {
1724#ifdef DEBUG_LIGHTS 1854#ifdef DEBUG_LIGHTS
1725 LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", 1855 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1726 op->name);
1727#endif /* DEBUG_LIGHTS */ 1856#endif /* DEBUG_LIGHTS */
1857 if (MAP_DARKNESS (where->map))
1728 if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y); 1858 update_all_los (where->map, where->x, where->y);
1729 } 1859 }
1730 1860
1731 /* Client has no idea of ordering so lets not bother ordering it here. 1861 /* Client has no idea of ordering so lets not bother ordering it here.
1732 * It sure simplifies this function... 1862 * It sure simplifies this function...
1733 */ 1863 */
1734 if (where->inv==NULL) 1864 if (where->inv == NULL)
1735 where->inv=op; 1865 where->inv = op;
1736 else { 1866 else
1867 {
1737 op->below = where->inv; 1868 op->below = where->inv;
1738 op->below->above = op; 1869 op->below->above = op;
1739 where->inv = op; 1870 where->inv = op;
1740 } 1871 }
1741 return op; 1872 return op;
1742} 1873}
1743 1874
1744/* 1875/*
1745 * Checks if any objects has a move_type that matches objects 1876 * Checks if any objects has a move_type that matches objects
… …
1760 * MSW 2001-07-08: Check all objects on space, not just those below 1891 * MSW 2001-07-08: Check all objects on space, not just those below
1761 * object being inserted. insert_ob_in_map may not put new objects 1892 * object being inserted. insert_ob_in_map may not put new objects
1762 * on top. 1893 * on top.
1763 */ 1894 */
1764 1895
1896int
1765int check_move_on (object *op, object *originator) 1897check_move_on (object *op, object *originator)
1766{ 1898{
1767 object *tmp; 1899 object *
1768 tag_t tag; 1900 tmp;
1769 mapstruct *m=op->map; 1901 tag_t
1902 tag;
1903 mapstruct *
1904 m = op->map;
1905 int
1770 int x=op->x, y=op->y; 1906 x = op->x, y = op->y;
1771 MoveType move_on, move_slow, move_block;
1772 1907
1908 MoveType
1909 move_on,
1910 move_slow,
1911 move_block;
1912
1773 if(QUERY_FLAG(op,FLAG_NO_APPLY)) 1913 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1774 return 0; 1914 return 0;
1775 1915
1776 tag = op->count; 1916 tag = op->count;
1777 1917
1778 move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); 1918 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1779 move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); 1919 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1780 move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y); 1920 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1781 1921
1782 /* if nothing on this space will slow op down or be applied, 1922 /* if nothing on this space will slow op down or be applied,
1783 * no need to do checking below. have to make sure move_type 1923 * no need to do checking below. have to make sure move_type
1784 * is set, as lots of objects don't have it set - we treat that 1924 * is set, as lots of objects don't have it set - we treat that
1785 * as walking. 1925 * as walking.
1786 */ 1926 */
1787 if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow)) 1927 if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
1788 return 0; 1928 return 0;
1789 1929
1790 /* This is basically inverse logic of that below - basically, 1930 /* This is basically inverse logic of that below - basically,
1791 * if the object can avoid the move on or slow move, they do so, 1931 * if the object can avoid the move on or slow move, they do so,
1792 * but can't do it if the alternate movement they are using is 1932 * but can't do it if the alternate movement they are using is
1793 * blocked. Logic on this seems confusing, but does seem correct. 1933 * blocked. Logic on this seems confusing, but does seem correct.
1794 */ 1934 */
1795 if ((op->move_type & ~move_on & ~move_block) != 0 && 1935 if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1796 (op->move_type & ~move_slow & ~move_block) != 0) return 0; 1936 return 0;
1797 1937
1798 /* The objects have to be checked from top to bottom. 1938 /* The objects have to be checked from top to bottom.
1799 * Hence, we first go to the top: 1939 * Hence, we first go to the top:
1800 */ 1940 */
1801 1941
1802 for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL && 1942 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)
1803 tmp->above!=NULL; tmp=tmp->above) { 1943 {
1804 /* Trim the search when we find the first other spell effect 1944 /* Trim the search when we find the first other spell effect
1805 * this helps performance so that if a space has 50 spell objects, 1945 * this helps performance so that if a space has 50 spell objects,
1806 * we don't need to check all of them. 1946 * we don't need to check all of them.
1807 */ 1947 */
1808 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break; 1948 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1949 break;
1950 }
1951
1952 for (; tmp; tmp = tmp->below)
1809 } 1953 {
1810 for(;tmp!=NULL; tmp=tmp->below) { 1954 if (tmp == op)
1811 if (tmp == op) continue; /* Can't apply yourself */ 1955 continue; /* Can't apply yourself */
1812 1956
1813 /* Check to see if one of the movement types should be slowed down. 1957 /* Check to see if one of the movement types should be slowed down.
1814 * Second check makes sure that the movement types not being slowed 1958 * Second check makes sure that the movement types not being slowed
1815 * (~slow_move) is not blocked on this space - just because the 1959 * (~slow_move) is not blocked on this space - just because the
1816 * space doesn't slow down swimming (for example), if you can't actually 1960 * space doesn't slow down swimming (for example), if you can't actually
1817 * swim on that space, can't use it to avoid the penalty. 1961 * swim on that space, can't use it to avoid the penalty.
1818 */ 1962 */
1819 if (!QUERY_FLAG(op, FLAG_WIZPASS)) { 1963 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1964 {
1820 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1965 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1821 ((op->move_type & tmp->move_slow) &&
1822 (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) { 1966 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1967 {
1823 1968
1824 float diff; 1969 float
1825
1826 diff = tmp->move_slow_penalty*FABS(op->speed); 1970 diff = tmp->move_slow_penalty * FABS (op->speed);
1971
1827 if (op->type == PLAYER) { 1972 if (op->type == PLAYER)
1828 if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) || 1973 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1829 (QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) { 1974 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1830 diff /= 4.0; 1975 diff /= 4.0;
1831 } 1976
1832 }
1833 op->speed_left -= diff; 1977 op->speed_left -= diff;
1834 } 1978 }
1835 } 1979 }
1836 1980
1837 /* Basically same logic as above, except now for actual apply. */ 1981 /* Basically same logic as above, except now for actual apply. */
1838 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1982 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1839 ((op->move_type & tmp->move_on) &&
1840 (op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) { 1983 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1841 1984 {
1842 move_apply(tmp, op, originator); 1985 move_apply (tmp, op, originator);
1986
1843 if (was_destroyed (op, tag)) 1987 if (was_destroyed (op, tag))
1844 return 1; 1988 return 1;
1845 1989
1846 /* what the person/creature stepped onto has moved the object 1990 /* what the person/creature stepped onto has moved the object
1847 * someplace new. Don't process any further - if we did, 1991 * someplace new. Don't process any further - if we did,
1848 * have a feeling strange problems would result. 1992 * have a feeling strange problems would result.
1849 */ 1993 */
1850 if (op->map != m || op->x != x || op->y != y) return 0; 1994 if (op->map != m || op->x != x || op->y != y)
1995 return 0;
1851 } 1996 }
1852 } 1997 }
1998
1853 return 0; 1999 return 0;
1854} 2000}
1855 2001
1856/* 2002/*
1857 * present_arch(arch, map, x, y) searches for any objects with 2003 * present_arch(arch, map, x, y) searches for any objects with
1858 * a matching archetype at the given map and coordinates. 2004 * a matching archetype at the given map and coordinates.
1859 * The first matching object is returned, or NULL if none. 2005 * The first matching object is returned, or NULL if none.
1860 */ 2006 */
1861 2007
2008object *
1862object *present_arch(const archetype *at, mapstruct *m, int x, int y) { 2009present_arch (const archetype *at, mapstruct *m, int x, int y)
2010{
1863 object *tmp; 2011 object *
2012 tmp;
2013
1864 if(m==NULL || out_of_map(m,x,y)) { 2014 if (m == NULL || out_of_map (m, x, y))
2015 {
1865 LOG(llevError,"Present_arch called outside map.\n"); 2016 LOG (llevError, "Present_arch called outside map.\n");
1866 return NULL; 2017 return NULL;
1867 } 2018 }
1868 for(tmp=GET_MAP_OB(m,x,y); tmp != NULL; tmp = tmp->above) 2019 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1869 if(tmp->arch == at) 2020 if (tmp->arch == at)
1870 return tmp; 2021 return tmp;
1871 return NULL; 2022 return NULL;
1872} 2023}
1873 2024
1874/* 2025/*
1875 * present(type, map, x, y) searches for any objects with 2026 * present(type, map, x, y) searches for any objects with
1876 * a matching type variable at the given map and coordinates. 2027 * a matching type variable at the given map and coordinates.
1877 * The first matching object is returned, or NULL if none. 2028 * The first matching object is returned, or NULL if none.
1878 */ 2029 */
1879 2030
2031object *
1880object *present(unsigned char type,mapstruct *m, int x,int y) { 2032present (unsigned char type, mapstruct *m, int x, int y)
2033{
1881 object *tmp; 2034 object *
2035 tmp;
2036
1882 if(out_of_map(m,x,y)) { 2037 if (out_of_map (m, x, y))
2038 {
1883 LOG(llevError,"Present called outside map.\n"); 2039 LOG (llevError, "Present called outside map.\n");
1884 return NULL; 2040 return NULL;
1885 } 2041 }
1886 for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) 2042 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1887 if(tmp->type==type) 2043 if (tmp->type == type)
1888 return tmp; 2044 return tmp;
1889 return NULL; 2045 return NULL;
1890} 2046}
1891 2047
1892/* 2048/*
1893 * present_in_ob(type, object) searches for any objects with 2049 * present_in_ob(type, object) searches for any objects with
1894 * a matching type variable in the inventory of the given object. 2050 * a matching type variable in the inventory of the given object.
1895 * The first matching object is returned, or NULL if none. 2051 * The first matching object is returned, or NULL if none.
1896 */ 2052 */
1897 2053
2054object *
1898object *present_in_ob(unsigned char type, const object *op) { 2055present_in_ob (unsigned char type, const object *op)
2056{
1899 object *tmp; 2057 object *
2058 tmp;
2059
1900 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) 2060 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1901 if(tmp->type==type) 2061 if (tmp->type == type)
1902 return tmp; 2062 return tmp;
1903 return NULL; 2063 return NULL;
1904} 2064}
1905 2065
1906/* 2066/*
… …
1916 * the object name, not the archetype name. this is so that the 2076 * the object name, not the archetype name. this is so that the
1917 * spell code can use one object type (force), but change it's name 2077 * spell code can use one object type (force), but change it's name
1918 * to be unique. 2078 * to be unique.
1919 */ 2079 */
1920 2080
2081object *
1921object *present_in_ob_by_name(int type, const char *str, const object *op) { 2082present_in_ob_by_name (int type, const char *str, const object *op)
2083{
1922 object *tmp; 2084 object *
2085 tmp;
1923 2086
1924 for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 2087 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
2088 {
1925 if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name))) 2089 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1926 return tmp; 2090 return tmp;
1927 } 2091 }
1928 return NULL; 2092 return NULL;
1929} 2093}
1930 2094
1931/* 2095/*
1932 * present_arch_in_ob(archetype, object) searches for any objects with 2096 * present_arch_in_ob(archetype, object) searches for any objects with
1933 * a matching archetype in the inventory of the given object. 2097 * a matching archetype in the inventory of the given object.
1934 * The first matching object is returned, or NULL if none. 2098 * The first matching object is returned, or NULL if none.
1935 */ 2099 */
1936 2100
2101object *
1937object *present_arch_in_ob(const archetype *at, const object *op) { 2102present_arch_in_ob (const archetype *at, const object *op)
2103{
1938 object *tmp; 2104 object *
2105 tmp;
2106
1939 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) 2107 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1940 if( tmp->arch == at) 2108 if (tmp->arch == at)
1941 return tmp; 2109 return tmp;
1942 return NULL; 2110 return NULL;
1943} 2111}
1944 2112
1945/* 2113/*
1946 * activate recursively a flag on an object inventory 2114 * activate recursively a flag on an object inventory
1947 */ 2115 */
2116void
1948void flag_inv(object*op, int flag){ 2117flag_inv (object *op, int flag)
2118{
1949 object *tmp; 2119 object *
2120 tmp;
2121
1950 if(op->inv) 2122 if (op->inv)
1951 for(tmp = op->inv; tmp != NULL; tmp = tmp->below){ 2123 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
2124 {
1952 SET_FLAG(tmp, flag); 2125 SET_FLAG (tmp, flag);
1953 flag_inv(tmp,flag); 2126 flag_inv (tmp, flag);
1954 } 2127 }
1955}/* 2128} /*
1956 * desactivate recursively a flag on an object inventory 2129 * desactivate recursively a flag on an object inventory
1957 */ 2130 */
2131void
1958void unflag_inv(object*op, int flag){ 2132unflag_inv (object *op, int flag)
2133{
1959 object *tmp; 2134 object *
2135 tmp;
2136
1960 if(op->inv) 2137 if (op->inv)
1961 for(tmp = op->inv; tmp != NULL; tmp = tmp->below){ 2138 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
2139 {
1962 CLEAR_FLAG(tmp, flag); 2140 CLEAR_FLAG (tmp, flag);
1963 unflag_inv(tmp,flag); 2141 unflag_inv (tmp, flag);
1964 } 2142 }
1965} 2143}
1966 2144
1967/* 2145/*
1968 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in 2146 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1969 * all it's inventory (recursively). 2147 * all it's inventory (recursively).
1970 * If checksums are used, a player will get set_cheat called for 2148 * If checksums are used, a player will get set_cheat called for
1971 * him/her-self and all object carried by a call to this function. 2149 * him/her-self and all object carried by a call to this function.
1972 */ 2150 */
1973 2151
2152void
1974void set_cheat(object *op) { 2153set_cheat (object *op)
2154{
1975 SET_FLAG(op, FLAG_WAS_WIZ); 2155 SET_FLAG (op, FLAG_WAS_WIZ);
1976 flag_inv(op, FLAG_WAS_WIZ); 2156 flag_inv (op, FLAG_WAS_WIZ);
1977} 2157}
1978 2158
1979/* 2159/*
1980 * find_free_spot(object, map, x, y, start, stop) will search for 2160 * find_free_spot(object, map, x, y, start, stop) will search for
1981 * a spot at the given map and coordinates which will be able to contain 2161 * a spot at the given map and coordinates which will be able to contain
… …
1996 * to know if the space in question will block the object. We can't use 2176 * to know if the space in question will block the object. We can't use
1997 * the archetype because that isn't correct if the monster has been 2177 * the archetype because that isn't correct if the monster has been
1998 * customized, changed states, etc. 2178 * customized, changed states, etc.
1999 */ 2179 */
2000 2180
2181int
2001int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) { 2182find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)
2183{
2184 int
2185 i,
2002 int i,index=0, flag; 2186 index = 0, flag;
2187 static int
2003 static int altern[SIZEOFFREE]; 2188 altern[SIZEOFFREE];
2004 2189
2005 for(i=start;i<stop;i++) { 2190 for (i = start; i < stop; i++)
2191 {
2006 flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]); 2192 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2007 if(!flag) 2193 if (!flag)
2008 altern[index++]=i; 2194 altern[index++] = i;
2009 2195
2010 /* Basically, if we find a wall on a space, we cut down the search size. 2196 /* Basically, if we find a wall on a space, we cut down the search size.
2011 * In this way, we won't return spaces that are on another side of a wall. 2197 * In this way, we won't return spaces that are on another side of a wall.
2012 * This mostly work, but it cuts down the search size in all directions - 2198 * This mostly work, but it cuts down the search size in all directions -
2013 * if the space being examined only has a wall to the north and empty 2199 * if the space being examined only has a wall to the north and empty
2014 * spaces in all the other directions, this will reduce the search space 2200 * spaces in all the other directions, this will reduce the search space
2015 * to only the spaces immediately surrounding the target area, and 2201 * to only the spaces immediately surrounding the target area, and
2016 * won't look 2 spaces south of the target space. 2202 * won't look 2 spaces south of the target space.
2017 */ 2203 */
2018 else if ((flag & AB_NO_PASS) && maxfree[i]<stop) 2204 else if ((flag & AB_NO_PASS) && maxfree[i] < stop)
2019 stop=maxfree[i]; 2205 stop = maxfree[i];
2020 } 2206 }
2021 if(!index) return -1; 2207 if (!index)
2208 return -1;
2022 return altern[RANDOM()%index]; 2209 return altern[RANDOM () % index];
2023} 2210}
2024 2211
2025/* 2212/*
2026 * find_first_free_spot(archetype, mapstruct, x, y) works like 2213 * find_first_free_spot(archetype, mapstruct, x, y) works like
2027 * find_free_spot(), but it will search max number of squares. 2214 * find_free_spot(), but it will search max number of squares.
2028 * But it will return the first available spot, not a random choice. 2215 * But it will return the first available spot, not a random choice.
2029 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2216 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2030 */ 2217 */
2031 2218
2219int
2032int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) { 2220find_first_free_spot (const object *ob, mapstruct *m, int x, int y)
2221{
2222 int
2033 int i; 2223 i;
2224
2034 for(i=0;i<SIZEOFFREE;i++) { 2225 for (i = 0; i < SIZEOFFREE; i++)
2226 {
2035 if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i])) 2227 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2036 return i; 2228 return i;
2037 } 2229 }
2038 return -1; 2230 return -1;
2039} 2231}
2040 2232
2041/* 2233/*
2042 * The function permute(arr, begin, end) randomly reorders the array 2234 * The function permute(arr, begin, end) randomly reorders the array
2043 * arr[begin..end-1]. 2235 * arr[begin..end-1].
2044 */ 2236 */
2237static void
2045static void permute(int *arr, int begin, int end) 2238permute (int *arr, int begin, int end)
2046{ 2239{
2047 int i, j, tmp, len; 2240 int
2241 i,
2242 j,
2243 tmp,
2244 len;
2048 2245
2049 len = end-begin; 2246 len = end - begin;
2050 for(i = begin; i < end; i++) 2247 for (i = begin; i < end; i++)
2051 { 2248 {
2052 j = begin+RANDOM()%len; 2249 j = begin + RANDOM () % len;
2053 2250
2054 tmp = arr[i]; 2251 tmp = arr[i];
2055 arr[i] = arr[j]; 2252 arr[i] = arr[j];
2056 arr[j] = tmp; 2253 arr[j] = tmp;
2057 } 2254 }
2058} 2255}
2059 2256
2060/* new function to make monster searching more efficient, and effective! 2257/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2258 * This basically returns a randomized array (in the passed pointer) of
2062 * the spaces to find monsters. In this way, it won't always look for 2259 * the spaces to find monsters. In this way, it won't always look for
2063 * monsters to the north first. However, the size of the array passed 2260 * monsters to the north first. However, the size of the array passed
2064 * covers all the spaces, so within that size, all the spaces within 2261 * covers all the spaces, so within that size, all the spaces within
2065 * the 3x3 area will be searched, just not in a predictable order. 2262 * the 3x3 area will be searched, just not in a predictable order.
2066 */ 2263 */
2264void
2067void get_search_arr(int *search_arr) 2265get_search_arr (int *search_arr)
2068{ 2266{
2267 int
2069 int i; 2268 i;
2070 2269
2071 for(i = 0; i < SIZEOFFREE; i++) 2270 for (i = 0; i < SIZEOFFREE; i++)
2072 { 2271 {
2073 search_arr[i] = i; 2272 search_arr[i] = i;
2074 } 2273 }
2075 2274
2076 permute(search_arr, 1, SIZEOFFREE1+1); 2275 permute (search_arr, 1, SIZEOFFREE1 + 1);
2077 permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1); 2276 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2078 permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE); 2277 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2079} 2278}
2080 2279
2081/* 2280/*
2082 * find_dir(map, x, y, exclude) will search some close squares in the 2281 * find_dir(map, x, y, exclude) will search some close squares in the
2083 * given map at the given coordinates for live objects. 2282 * given map at the given coordinates for live objects.
… …
2089 * is actually want is going to try and move there. We need this info 2288 * is actually want is going to try and move there. We need this info
2090 * because we have to know what movement the thing looking to move 2289 * because we have to know what movement the thing looking to move
2091 * there is capable of. 2290 * there is capable of.
2092 */ 2291 */
2093 2292
2293int
2094int find_dir(mapstruct *m, int x, int y, object *exclude) { 2294find_dir (mapstruct *m, int x, int y, object *exclude)
2295{
2296 int
2297 i,
2095 int i,max=SIZEOFFREE, mflags; 2298 max = SIZEOFFREE, mflags;
2299
2096 sint16 nx, ny; 2300 sint16 nx, ny;
2097 object *tmp; 2301 object *
2302 tmp;
2098 mapstruct *mp; 2303 mapstruct *
2304 mp;
2305
2099 MoveType blocked, move_type; 2306 MoveType blocked, move_type;
2100 2307
2101 if (exclude && exclude->head) { 2308 if (exclude && exclude->head)
2309 {
2102 exclude = exclude->head; 2310 exclude = exclude->head;
2103 move_type = exclude->move_type; 2311 move_type = exclude->move_type;
2104 } else { 2312 }
2313 else
2314 {
2105 /* If we don't have anything, presume it can use all movement types. */ 2315 /* If we don't have anything, presume it can use all movement types. */
2106 move_type=MOVE_ALL; 2316 move_type = MOVE_ALL;
2317 }
2318
2319 for (i = 1; i < max; i++)
2107 } 2320 {
2108
2109 for(i=1;i<max;i++) {
2110 mp = m; 2321 mp = m;
2111 nx = x + freearr_x[i]; 2322 nx = x + freearr_x[i];
2112 ny = y + freearr_y[i]; 2323 ny = y + freearr_y[i];
2113 2324
2114 mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny); 2325 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2115 if (mflags & P_OUT_OF_MAP) { 2326 if (mflags & P_OUT_OF_MAP)
2327 {
2116 max = maxfree[i]; 2328 max = maxfree[i];
2329 }
2117 } else { 2330 else
2331 {
2118 blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny); 2332 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2119 2333
2120 if ((move_type & blocked) == move_type) { 2334 if ((move_type & blocked) == move_type)
2335 {
2121 max=maxfree[i]; 2336 max = maxfree[i];
2337 }
2122 } else if (mflags & P_IS_ALIVE) { 2338 else if (mflags & P_IS_ALIVE)
2339 {
2123 for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) { 2340 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)
2124 if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) && 2341 {
2125 (tmp != exclude ||(tmp->head && tmp->head != exclude))) { 2342 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2343 {
2126 break; 2344 break;
2127 } 2345 }
2128 } 2346 }
2129 if(tmp) { 2347 if (tmp)
2348 {
2130 return freedir[i]; 2349 return freedir[i];
2131 } 2350 }
2132 } 2351 }
2133 } 2352 }
2134 } 2353 }
2135 return 0; 2354 return 0;
2136} 2355}
2137 2356
2138/* 2357/*
2139 * distance(object 1, object 2) will return the square of the 2358 * distance(object 1, object 2) will return the square of the
2140 * distance between the two given objects. 2359 * distance between the two given objects.
2141 */ 2360 */
2142 2361
2362int
2143int distance(const object *ob1, const object *ob2) { 2363distance (const object *ob1, const object *ob2)
2364{
2144 int i; 2365 int
2145 i= (ob1->x - ob2->x)*(ob1->x - ob2->x)+ 2366 i;
2146 (ob1->y - ob2->y)*(ob1->y - ob2->y); 2367
2368 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2147 return i; 2369 return i;
2148} 2370}
2149 2371
2150/* 2372/*
2151 * find_dir_2(delta-x,delta-y) will return a direction in which 2373 * find_dir_2(delta-x,delta-y) will return a direction in which
2152 * an object which has subtracted the x and y coordinates of another 2374 * an object which has subtracted the x and y coordinates of another
2153 * object, needs to travel toward it. 2375 * object, needs to travel toward it.
2154 */ 2376 */
2155 2377
2378int
2156int find_dir_2(int x, int y) { 2379find_dir_2 (int x, int y)
2380{
2157 int q; 2381 int
2382 q;
2158 2383
2159 if(y) 2384 if (y)
2160 q=x*100/y; 2385 q = x * 100 / y;
2161 else if (x) 2386 else if (x)
2162 q= -300*x; 2387 q = -300 * x;
2163 else 2388 else
2164 return 0; 2389 return 0;
2165 2390
2166 if(y>0) { 2391 if (y > 0)
2392 {
2167 if(q < -242) 2393 if (q < -242)
2168 return 3 ; 2394 return 3;
2169 if (q < -41) 2395 if (q < -41)
2170 return 2 ; 2396 return 2;
2171 if (q < 41) 2397 if (q < 41)
2172 return 1 ; 2398 return 1;
2173 if (q < 242) 2399 if (q < 242)
2174 return 8 ; 2400 return 8;
2175 return 7 ; 2401 return 7;
2176 } 2402 }
2177 2403
2178 if (q < -242) 2404 if (q < -242)
2179 return 7 ; 2405 return 7;
2180 if (q < -41) 2406 if (q < -41)
2181 return 6 ; 2407 return 6;
2182 if (q < 41) 2408 if (q < 41)
2183 return 5 ; 2409 return 5;
2184 if (q < 242) 2410 if (q < 242)
2185 return 4 ; 2411 return 4;
2186 2412
2187 return 3 ; 2413 return 3;
2188} 2414}
2189 2415
2190/* 2416/*
2191 * absdir(int): Returns a number between 1 and 8, which represent 2417 * absdir(int): Returns a number between 1 and 8, which represent
2192 * the "absolute" direction of a number (it actually takes care of 2418 * the "absolute" direction of a number (it actually takes care of
2193 * "overflow" in previous calculations of a direction). 2419 * "overflow" in previous calculations of a direction).
2194 */ 2420 */
2195 2421
2422int
2196int absdir(int d) { 2423absdir (int d)
2197 while(d<1) d+=8; 2424{
2198 while(d>8) d-=8; 2425 while (d < 1)
2426 d += 8;
2427 while (d > 8)
2428 d -= 8;
2199 return d; 2429 return d;
2200} 2430}
2201 2431
2202/* 2432/*
2203 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2433 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2204 * between two directions (which are expected to be absolute (see absdir()) 2434 * between two directions (which are expected to be absolute (see absdir())
2205 */ 2435 */
2206 2436
2437int
2207int dirdiff(int dir1, int dir2) { 2438dirdiff (int dir1, int dir2)
2439{
2208 int d; 2440 int
2441 d;
2442
2209 d = abs(dir1 - dir2); 2443 d = abs (dir1 - dir2);
2210 if(d>4) 2444 if (d > 4)
2211 d = 8 - d; 2445 d = 8 - d;
2212 return d; 2446 return d;
2213} 2447}
2214 2448
2215/* peterm: 2449/* peterm:
… …
2220 * direction 4, 14, or 16 to get back to where we are. 2454 * direction 4, 14, or 16 to get back to where we are.
2221 * Moved from spell_util.c to object.c with the other related direction 2455 * Moved from spell_util.c to object.c with the other related direction
2222 * functions. 2456 * functions.
2223 */ 2457 */
2224 2458
2459int
2225int reduction_dir[SIZEOFFREE][3] = { 2460 reduction_dir[SIZEOFFREE][3] = {
2226 {0,0,0}, /* 0 */ 2461 {0, 0, 0}, /* 0 */
2227 {0,0,0}, /* 1 */ 2462 {0, 0, 0}, /* 1 */
2228 {0,0,0}, /* 2 */ 2463 {0, 0, 0}, /* 2 */
2229 {0,0,0}, /* 3 */ 2464 {0, 0, 0}, /* 3 */
2230 {0,0,0}, /* 4 */ 2465 {0, 0, 0}, /* 4 */
2231 {0,0,0}, /* 5 */ 2466 {0, 0, 0}, /* 5 */
2232 {0,0,0}, /* 6 */ 2467 {0, 0, 0}, /* 6 */
2233 {0,0,0}, /* 7 */ 2468 {0, 0, 0}, /* 7 */
2234 {0,0,0}, /* 8 */ 2469 {0, 0, 0}, /* 8 */
2235 {8,1,2}, /* 9 */ 2470 {8, 1, 2}, /* 9 */
2236 {1,2,-1}, /* 10 */ 2471 {1, 2, -1}, /* 10 */
2237 {2,10,12}, /* 11 */ 2472 {2, 10, 12}, /* 11 */
2238 {2,3,-1}, /* 12 */ 2473 {2, 3, -1}, /* 12 */
2239 {2,3,4}, /* 13 */ 2474 {2, 3, 4}, /* 13 */
2240 {3,4,-1}, /* 14 */ 2475 {3, 4, -1}, /* 14 */
2241 {4,14,16}, /* 15 */ 2476 {4, 14, 16}, /* 15 */
2242 {5,4,-1}, /* 16 */ 2477 {5, 4, -1}, /* 16 */
2243 {4,5,6}, /* 17 */ 2478 {4, 5, 6}, /* 17 */
2244 {6,5,-1}, /* 18 */ 2479 {6, 5, -1}, /* 18 */
2245 {6,20,18}, /* 19 */ 2480 {6, 20, 18}, /* 19 */
2246 {7,6,-1}, /* 20 */ 2481 {7, 6, -1}, /* 20 */
2247 {6,7,8}, /* 21 */ 2482 {6, 7, 8}, /* 21 */
2248 {7,8,-1}, /* 22 */ 2483 {7, 8, -1}, /* 22 */
2249 {8,22,24}, /* 23 */ 2484 {8, 22, 24}, /* 23 */
2250 {8,1,-1}, /* 24 */ 2485 {8, 1, -1}, /* 24 */
2251 {24,9,10}, /* 25 */ 2486 {24, 9, 10}, /* 25 */
2252 {9,10,-1}, /* 26 */ 2487 {9, 10, -1}, /* 26 */
2253 {10,11,-1}, /* 27 */ 2488 {10, 11, -1}, /* 27 */
2254 {27,11,29}, /* 28 */ 2489 {27, 11, 29}, /* 28 */
2255 {11,12,-1}, /* 29 */ 2490 {11, 12, -1}, /* 29 */
2256 {12,13,-1}, /* 30 */ 2491 {12, 13, -1}, /* 30 */
2257 {12,13,14}, /* 31 */ 2492 {12, 13, 14}, /* 31 */
2258 {13,14,-1}, /* 32 */ 2493 {13, 14, -1}, /* 32 */
2259 {14,15,-1}, /* 33 */ 2494 {14, 15, -1}, /* 33 */
2260 {33,15,35}, /* 34 */ 2495 {33, 15, 35}, /* 34 */
2261 {16,15,-1}, /* 35 */ 2496 {16, 15, -1}, /* 35 */
2262 {17,16,-1}, /* 36 */ 2497 {17, 16, -1}, /* 36 */
2263 {18,17,16}, /* 37 */ 2498 {18, 17, 16}, /* 37 */
2264 {18,17,-1}, /* 38 */ 2499 {18, 17, -1}, /* 38 */
2265 {18,19,-1}, /* 39 */ 2500 {18, 19, -1}, /* 39 */
2266 {41,19,39}, /* 40 */ 2501 {41, 19, 39}, /* 40 */
2267 {19,20,-1}, /* 41 */ 2502 {19, 20, -1}, /* 41 */
2268 {20,21,-1}, /* 42 */ 2503 {20, 21, -1}, /* 42 */
2269 {20,21,22}, /* 43 */ 2504 {20, 21, 22}, /* 43 */
2270 {21,22,-1}, /* 44 */ 2505 {21, 22, -1}, /* 44 */
2271 {23,22,-1}, /* 45 */ 2506 {23, 22, -1}, /* 45 */
2272 {45,47,23}, /* 46 */ 2507 {45, 47, 23}, /* 46 */
2273 {23,24,-1}, /* 47 */ 2508 {23, 24, -1}, /* 47 */
2274 {24,9,-1}}; /* 48 */ 2509 {24, 9, -1}
2510}; /* 48 */
2275 2511
2276/* Recursive routine to step back and see if we can 2512/* Recursive routine to step back and see if we can
2277 * find a path to that monster that we found. If not, 2513 * find a path to that monster that we found. If not,
2278 * we don't bother going toward it. Returns 1 if we 2514 * we don't bother going toward it. Returns 1 if we
2279 * can see a direct way to get it 2515 * can see a direct way to get it
2280 * Modified to be map tile aware -.MSW 2516 * Modified to be map tile aware -.MSW
2281 */ 2517 */
2282
2283 2518
2519
2520int
2284int can_see_monsterP(mapstruct *m, int x, int y,int dir) { 2521can_see_monsterP (mapstruct *m, int x, int y, int dir)
2522{
2285 sint16 dx, dy; 2523 sint16 dx, dy;
2524 int
2286 int mflags; 2525 mflags;
2287 2526
2527 if (dir < 0)
2288 if(dir<0) return 0; /* exit condition: invalid direction */ 2528 return 0; /* exit condition: invalid direction */
2289 2529
2290 dx = x + freearr_x[dir]; 2530 dx = x + freearr_x[dir];
2291 dy = y + freearr_y[dir]; 2531 dy = y + freearr_y[dir];
2292 2532
2293 mflags = get_map_flags(m, &m, dx, dy, &dx, &dy); 2533 mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2294 2534
2295 /* This functional arguably was incorrect before - it was 2535 /* This functional arguably was incorrect before - it was
2296 * checking for P_WALL - that was basically seeing if 2536 * checking for P_WALL - that was basically seeing if
2297 * we could move to the monster - this is being more 2537 * we could move to the monster - this is being more
2298 * literal on if we can see it. To know if we can actually 2538 * literal on if we can see it. To know if we can actually
2299 * move to the monster, we'd need the monster passed in or 2539 * move to the monster, we'd need the monster passed in or
2300 * at least its move type. 2540 * at least its move type.
2301 */ 2541 */
2302 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0; 2542 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
2543 return 0;
2303 2544
2304 /* yes, can see. */ 2545 /* yes, can see. */
2305 if(dir < 9) return 1; 2546 if (dir < 9)
2547 return 1;
2306 return can_see_monsterP(m, x, y, reduction_dir[dir][0]) | 2548 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2307 can_see_monsterP(m,x,y, reduction_dir[dir][1]) | 2549 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2308 can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2309} 2550}
2310 2551
2311 2552
2312 2553
2313/* 2554/*
2314 * can_pick(picker, item): finds out if an object is possible to be 2555 * can_pick(picker, item): finds out if an object is possible to be
2315 * picked up by the picker. Returnes 1 if it can be 2556 * picked up by the picker. Returnes 1 if it can be
2316 * picked up, otherwise 0. 2557 * picked up, otherwise 0.
2317 * 2558 *
… …
2319 * core dumps if they do. 2560 * core dumps if they do.
2320 * 2561 *
2321 * Add a check so we can't pick up invisible objects (0.93.8) 2562 * Add a check so we can't pick up invisible objects (0.93.8)
2322 */ 2563 */
2323 2564
2565int
2324int can_pick(const object *who, const object *item) { 2566can_pick (const object *who, const object *item)
2567{
2325 return /*QUERY_FLAG(who,FLAG_WIZ)||*/ 2568 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2326 (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&& 2569 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2327 !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible && 2570 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2328 (who->type==PLAYER||item->weight<who->weight/3));
2329} 2571}
2330 2572
2331 2573
2332/* 2574/*
2333 * create clone from object to another 2575 * create clone from object to another
2334 */ 2576 */
2577object *
2335object *object_create_clone (object *asrc) { 2578object_create_clone (object *asrc)
2579{
2580 object *
2336 object *dst = NULL,*tmp,*src,*part,*prev, *item; 2581 dst = NULL, *tmp, *src, *part, *prev, *item;
2337 2582
2583 if (!asrc)
2338 if(!asrc) return NULL; 2584 return NULL;
2339 src = asrc; 2585 src = asrc;
2340 if(src->head) 2586 if (src->head)
2341 src = src->head; 2587 src = src->head;
2342 2588
2343 prev = NULL; 2589 prev = NULL;
2344 for(part = src; part; part = part->more) { 2590 for (part = src; part; part = part->more)
2591 {
2345 tmp = get_object(); 2592 tmp = get_object ();
2346 copy_object(part,tmp); 2593 copy_object (part, tmp);
2347 tmp->x -= src->x; 2594 tmp->x -= src->x;
2348 tmp->y -= src->y; 2595 tmp->y -= src->y;
2349 if(!part->head) { 2596 if (!part->head)
2597 {
2350 dst = tmp; 2598 dst = tmp;
2351 tmp->head = NULL; 2599 tmp->head = NULL;
2600 }
2352 } else { 2601 else
2602 {
2353 tmp->head = dst; 2603 tmp->head = dst;
2354 } 2604 }
2355 tmp->more = NULL; 2605 tmp->more = NULL;
2356 if(prev) 2606 if (prev)
2357 prev->more = tmp; 2607 prev->more = tmp;
2358 prev = tmp; 2608 prev = tmp;
2359 } 2609 }
2610
2360 /*** copy inventory ***/ 2611 /*** copy inventory ***/
2361 for(item = src->inv; item; item = item->below) { 2612 for (item = src->inv; item; item = item->below)
2613 {
2362 (void) insert_ob_in_ob(object_create_clone(item),dst); 2614 (void) insert_ob_in_ob (object_create_clone (item), dst);
2363 } 2615 }
2364 2616
2365 return dst; 2617 return dst;
2366} 2618}
2367 2619
2368/* return true if the object was destroyed, 0 otherwise */ 2620/* return true if the object was destroyed, 0 otherwise */
2621int
2369int was_destroyed (const object *op, tag_t old_tag) 2622was_destroyed (const object *op, tag_t old_tag)
2370{ 2623{
2371 /* checking for FLAG_FREED isn't necessary, but makes this function more 2624 /* checking for FLAG_FREED isn't necessary, but makes this function more
2372 * robust */ 2625 * robust */
2373 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED); 2626 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2374} 2627}
2375 2628
2376/* GROS - Creates an object using a string representing its content. */ 2629/* GROS - Creates an object using a string representing its content. */
2630
2377/* Basically, we save the content of the string to a temp file, then call */ 2631/* Basically, we save the content of the string to a temp file, then call */
2632
2378/* load_object on it. I admit it is a highly inefficient way to make things, */ 2633/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2379/* but it was simple to make and allows reusing the load_object function. */ 2635/* but it was simple to make and allows reusing the load_object function. */
2636
2380/* Remember not to use load_object_str in a time-critical situation. */ 2637/* Remember not to use load_object_str in a time-critical situation. */
2638
2381/* Also remember that multiparts objects are not supported for now. */ 2639/* Also remember that multiparts objects are not supported for now. */
2382 2640
2641object *
2383object* load_object_str(const char *obstr) 2642load_object_str (const char *obstr)
2384{ 2643{
2385 object *op; 2644 object *
2645 op;
2646 char
2386 char filename[MAX_BUF]; 2647 filename[MAX_BUF];
2648
2387 sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir); 2649 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2388 2650
2651 FILE *
2389 FILE *tempfile=fopen(filename,"w"); 2652 tempfile = fopen (filename, "w");
2653
2390 if (tempfile == NULL) 2654 if (tempfile == NULL)
2391 { 2655 {
2392 LOG(llevError,"Error - Unable to access load object temp file\n"); 2656 LOG (llevError, "Error - Unable to access load object temp file\n");
2393 return NULL; 2657 return NULL;
2394 }; 2658 };
2395 fprintf(tempfile,obstr); 2659 fprintf (tempfile, obstr);
2396 fclose(tempfile); 2660 fclose (tempfile);
2397 2661
2398 op=get_object(); 2662 op = get_object ();
2399 2663
2400 object_thawer thawer (filename); 2664 object_thawer thawer (filename);
2401 2665
2402 if (thawer) 2666 if (thawer)
2403 load_object(thawer,op,0); 2667 load_object (thawer, op, 0);
2404 2668
2405 LOG(llevDebug," load str completed, object=%s\n", &op->name); 2669 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2406 CLEAR_FLAG(op,FLAG_REMOVED); 2670 CLEAR_FLAG (op, FLAG_REMOVED);
2407 2671
2408 return op; 2672 return op;
2409} 2673}
2410 2674
2411/* This returns the first object in who's inventory that 2675/* This returns the first object in who's inventory that
2412 * has the same type and subtype match. 2676 * has the same type and subtype match.
2413 * returns NULL if no match. 2677 * returns NULL if no match.
2414 */ 2678 */
2679object *
2415object *find_obj_by_type_subtype(const object *who, int type, int subtype) 2680find_obj_by_type_subtype (const object *who, int type, int subtype)
2416{ 2681{
2417 object *tmp; 2682 object *
2683 tmp;
2418 2684
2419 for (tmp=who->inv; tmp; tmp=tmp->below) 2685 for (tmp = who->inv; tmp; tmp = tmp->below)
2420 if (tmp->type == type && tmp->subtype == subtype) return tmp; 2686 if (tmp->type == type && tmp->subtype == subtype)
2687 return tmp;
2421 2688
2422 return NULL; 2689 return NULL;
2423} 2690}
2424 2691
2425/* If ob has a field named key, return the link from the list, 2692/* If ob has a field named key, return the link from the list,
2426 * otherwise return NULL. 2693 * otherwise return NULL.
2427 * 2694 *
2428 * key must be a passed in shared string - otherwise, this won't 2695 * key must be a passed in shared string - otherwise, this won't
2429 * do the desired thing. 2696 * do the desired thing.
2430 */ 2697 */
2698key_value *
2431key_value * get_ob_key_link(const object * ob, const char * key) { 2699get_ob_key_link (const object *ob, const char *key)
2700{
2432 key_value * link; 2701 key_value *
2433 2702 link;
2703
2434 for (link = ob->key_values; link != NULL; link = link->next) { 2704 for (link = ob->key_values; link != NULL; link = link->next)
2705 {
2435 if (link->key == key) { 2706 if (link->key == key)
2707 {
2436 return link; 2708 return link;
2437 } 2709 }
2438 }
2439 2710 }
2711
2440 return NULL; 2712 return NULL;
2441} 2713}
2442 2714
2443/* 2715/*
2444 * Returns the value of op has an extra_field for key, or NULL. 2716 * Returns the value of op has an extra_field for key, or NULL.
2445 * 2717 *
2446 * The argument doesn't need to be a shared string. 2718 * The argument doesn't need to be a shared string.
2447 * 2719 *
2448 * The returned string is shared. 2720 * The returned string is shared.
2449 */ 2721 */
2722const char *
2450const char * get_ob_key_value(const object * op, const char * const key) { 2723get_ob_key_value (const object *op, const char *const key)
2724{
2451 key_value * link; 2725 key_value *
2452 const char * canonical_key; 2726 link;
2453 2727 const char *
2728 canonical_key;
2729
2454 canonical_key = shstr::find (key); 2730 canonical_key = shstr::find (key);
2455 2731
2456 if (canonical_key == NULL) { 2732 if (canonical_key == NULL)
2733 {
2457 /* 1. There being a field named key on any object 2734 /* 1. There being a field named key on any object
2458 * implies there'd be a shared string to find. 2735 * implies there'd be a shared string to find.
2459 * 2. Since there isn't, no object has this field. 2736 * 2. Since there isn't, no object has this field.
2460 * 3. Therefore, *this* object doesn't have this field. 2737 * 3. Therefore, *this* object doesn't have this field.
2461 */ 2738 */
2462 return NULL; 2739 return NULL;
2463 } 2740 }
2464 2741
2465 /* This is copied from get_ob_key_link() above - 2742 /* This is copied from get_ob_key_link() above -
2466 * only 4 lines, and saves the function call overhead. 2743 * only 4 lines, and saves the function call overhead.
2467 */ 2744 */
2468 for (link = op->key_values; link != NULL; link = link->next) { 2745 for (link = op->key_values; link != NULL; link = link->next)
2746 {
2469 if (link->key == canonical_key) { 2747 if (link->key == canonical_key)
2748 {
2470 return link->value; 2749 return link->value;
2471 } 2750 }
2472 } 2751 }
2473 return NULL; 2752 return NULL;
2474} 2753}
2475 2754
2476 2755
2477/* 2756/*
2478 * Updates the canonical_key in op to value. 2757 * Updates the canonical_key in op to value.
… …
2482 * Unless add_key is TRUE, it won't add fields, only change the value of existing 2761 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2483 * keys. 2762 * keys.
2484 * 2763 *
2485 * Returns TRUE on success. 2764 * Returns TRUE on success.
2486 */ 2765 */
2766int
2487int set_ob_key_value_s(object * op, const shstr &canonical_key, const char * value, int add_key) { 2767set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2768{
2769 key_value *
2488 key_value * field = NULL, *last=NULL; 2770 field = NULL, *last = NULL;
2489 2771
2490 for (field=op->key_values; field != NULL; field=field->next) { 2772 for (field = op->key_values; field != NULL; field = field->next)
2773 {
2491 if (field->key != canonical_key) { 2774 if (field->key != canonical_key)
2775 {
2492 last = field; 2776 last = field;
2493 continue; 2777 continue;
2494 } 2778 }
2495 2779
2496 if (value) 2780 if (value)
2497 field->value = value; 2781 field->value = value;
2498 else { 2782 else
2783 {
2499 /* Basically, if the archetype has this key set, 2784 /* Basically, if the archetype has this key set,
2500 * we need to store the null value so when we save 2785 * we need to store the null value so when we save
2501 * it, we save the empty value so that when we load, 2786 * it, we save the empty value so that when we load,
2502 * we get this value back again. 2787 * we get this value back again.
2503 */ 2788 */
2504 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2789 if (get_ob_key_link (&op->arch->clone, canonical_key))
2505 field->value = 0; 2790 field->value = 0;
2791 else
2792 {
2793 if (last)
2794 last->next = field->next;
2506 else 2795 else
2507 {
2508 if (last) last->next = field->next;
2509 else op->key_values = field->next; 2796 op->key_values = field->next;
2510 2797
2511 delete field; 2798 delete field;
2512 } 2799 }
2513 } 2800 }
2514 return TRUE; 2801 return TRUE;
2515 } 2802 }
2516 /* IF we get here, key doesn't exist */ 2803 /* IF we get here, key doesn't exist */
2517 2804
2518 /* No field, we'll have to add it. */ 2805 /* No field, we'll have to add it. */
2806
2807 if (!add_key)
2519 2808 {
2520 if (!add_key) {
2521 return FALSE; 2809 return FALSE;
2522 } 2810 }
2523 /* There isn't any good reason to store a null 2811 /* There isn't any good reason to store a null
2524 * value in the key/value list. If the archetype has 2812 * value in the key/value list. If the archetype has
2525 * this key, then we should also have it, so shouldn't 2813 * this key, then we should also have it, so shouldn't
2526 * be here. If user wants to store empty strings, 2814 * be here. If user wants to store empty strings,
2527 * should pass in "" 2815 * should pass in ""
2528 */ 2816 */
2529 if (value == NULL) return TRUE; 2817 if (value == NULL)
2530
2531 field = new key_value;
2532
2533 field->key = canonical_key;
2534 field->value = value;
2535 /* Usual prepend-addition. */
2536 field->next = op->key_values;
2537 op->key_values = field;
2538
2539 return TRUE; 2818 return TRUE;
2819
2820 field = new key_value;
2821
2822 field->key = canonical_key;
2823 field->value = value;
2824 /* Usual prepend-addition. */
2825 field->next = op->key_values;
2826 op->key_values = field;
2827
2828 return TRUE;
2540} 2829}
2541 2830
2542/* 2831/*
2543 * Updates the key in op to value. 2832 * Updates the key in op to value.
2544 * 2833 *
… …
2546 * and not add new ones. 2835 * and not add new ones.
2547 * In general, should be little reason FALSE is ever passed in for add_key 2836 * In general, should be little reason FALSE is ever passed in for add_key
2548 * 2837 *
2549 * Returns TRUE on success. 2838 * Returns TRUE on success.
2550 */ 2839 */
2840int
2551int set_ob_key_value(object * op, const char *key, const char * value, int add_key) 2841set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2552{ 2842{
2553 shstr key_ (key); 2843 shstr key_ (key);
2844
2554 return set_ob_key_value_s (op, key_, value, add_key); 2845 return set_ob_key_value_s (op, key_, value, add_key);
2555} 2846}
2847
2848object::depth_iterator::depth_iterator (object *container)
2849: iterator_base (container)
2850{
2851 while (item->inv)
2852 item = item->inv;
2853}
2854
2855void
2856object::depth_iterator::next ()
2857{
2858 if (item->below)
2859 {
2860 item = item->below;
2861
2862 while (item->inv)
2863 item = item->inv;
2864 }
2865 else
2866 item = item->env;
2867}
2868

Diff Legend

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