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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines