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

Diff Legend

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