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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.2 by root, Fri Aug 25 17:11:52 2006 UTC vs.
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines