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.23 by root, Sun Sep 10 14:54:02 2006 UTC vs.
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC

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

Diff Legend

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