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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.148 by root, Mon May 14 19:08:25 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines