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.22 by root, Sun Sep 10 00:51:23 2006 UTC vs.
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines