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.8 by root, Tue Aug 29 08:01:35 2006 UTC vs.
Revision 1.59 by root, Wed Dec 6 13:59:00 2006 UTC

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