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