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.17 by root, Mon Sep 4 17:27:13 2006 UTC vs.
Revision 1.24 by root, Sun Sep 10 16:00:23 2006 UTC

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

Diff Legend

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