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.19 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.49 by root, Sat Sep 16 22:24:12 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines