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.10 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.198 by root, Mon Oct 22 02:52:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines