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.7 by root, Tue Aug 29 05:03:54 2006 UTC vs.
Revision 1.93 by root, Tue Dec 26 20:04:09 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines