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.90 by root, Tue Dec 26 10:14:24 2006 UTC vs.
Revision 1.294 by root, Thu Nov 5 15:43:21 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines