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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.19 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.27 by root, Mon Sep 11 12:08:45 2006 UTC

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

Diff Legend

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