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.5 by root, Sun Aug 27 16:15:11 2006 UTC vs.
Revision 1.77 by root, Thu Dec 21 23:37:05 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines