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.20 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.32 by root, Mon Sep 11 23:53:30 2006 UTC

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

Diff Legend

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