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

Diff Legend

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