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.4 by root, Sat Aug 26 23:36:30 2006 UTC vs.
Revision 1.131 by root, Sat Feb 10 15:20:23 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines