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.6 by root, Mon Aug 28 14:05:23 2006 UTC vs.
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines