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.10 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.96 by root, Sat Dec 30 10:16:10 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines