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.8 by root, Tue Aug 29 08:01:35 2006 UTC vs.
Revision 1.162 by root, Sat Jun 16 00:12:20 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines