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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines