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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines