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.23 by root, Sun Sep 10 14:54:02 2006 UTC vs.
Revision 1.43 by root, Thu Sep 14 17:10:24 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines