ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.21 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.49 by root, Sat Sep 16 22:24:12 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines