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.20 by root, Fri Sep 8 18:26:22 2006 UTC vs.
Revision 1.64 by root, Tue Dec 12 21:39:56 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines