ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.3 by root, Sat Aug 26 08:44:05 2006 UTC vs.
Revision 1.61 by root, Mon Dec 11 21:32:16 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines