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.21 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.46 by root, Thu Sep 14 21:16:11 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines