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

Diff Legend

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