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.3 by root, Sat Aug 26 08:44:05 2006 UTC vs.
Revision 1.55 by root, Sun Dec 3 00:41:33 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines