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.12 by elmex, Sun Sep 3 14:33:47 2006 UTC vs.
Revision 1.42 by root, Thu Sep 14 01:19:47 2006 UTC

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

Diff Legend

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