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.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.53 by root, Tue Nov 7 16:30:54 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines