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.89 by root, Tue Dec 26 09:52:40 2006 UTC vs.
Revision 1.297 by root, Sat Nov 7 18:30:05 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; 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 || fabs (ob1->speed - ob2->speed) < MIN_ACTIVE_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 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) < (1.f / 1024.f)
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, 1); 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 dst->set_speed (dst->speed); 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/*
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
559object::set_speed (float speed) 682object::set_speed (float speed)
560{ 683{
561 extern int arch_init;
562
563 /* No reason putting the archetypes objects on the speed list,
564 * since they never really need to be updated.
565 */
566 if (flag [FLAG_FREED] && speed)
567 {
568 LOG (llevError, "Object %s is freed but has speed.\n", &name);
569 speed = 0;
570 }
571
572 this->speed = speed; 684 this->speed = speed;
573 685
574 if (arch_init) 686 if (has_active_speed ())
575 return; 687 activate ();
576
577 if (FABS (speed) > MIN_ACTIVE_SPEED)
578 {
579 /* If already on active list, don't do anything */
580 if (active_next || active_prev || this == active_objects)
581 return;
582
583 /* process_events() expects us to insert the object at the beginning
584 * of the list. */
585 active_next = active_objects;
586
587 if (active_next)
588 active_next->active_prev = this;
589
590 active_objects = this;
591 }
592 else 688 else
593 { 689 deactivate ();
594 /* If not on the active list, nothing needs to be done */
595 if (!active_next && !active_prev && this != active_objects)
596 return;
597
598 if (!active_prev)
599 {
600 active_objects = active_next;
601
602 if (active_next)
603 active_next->active_prev = 0;
604 }
605 else
606 {
607 active_prev->active_next = active_next;
608
609 if (active_next)
610 active_next->active_prev = active_prev;
611 }
612
613 active_next = 0;
614 active_prev = 0;
615 }
616}
617
618/* This function removes object 'op' from the list of active
619 * objects.
620 * This should only be used for style maps or other such
621 * reference maps where you don't want an object that isn't
622 * in play chewing up cpu time getting processed.
623 * The reverse of this is to call update_ob_speed, which
624 * will do the right thing based on the speed of the object.
625 */
626void
627remove_from_active_list (object *op)
628{
629 /* If not on the active list, nothing needs to be done */
630 if (!op->active_next && !op->active_prev && op != active_objects)
631 return;
632
633 if (op->active_prev == NULL)
634 {
635 active_objects = op->active_next;
636 if (op->active_next != NULL)
637 op->active_next->active_prev = NULL;
638 }
639 else
640 {
641 op->active_prev->active_next = op->active_next;
642 if (op->active_next)
643 op->active_next->active_prev = op->active_prev;
644 }
645 op->active_next = NULL;
646 op->active_prev = NULL;
647} 690}
648 691
649/* 692/*
650 * update_object() updates the the map. 693 * update_object() updates the the map.
651 * It takes into account invisible objects (and represent squares covered 694 * It takes into account invisible objects (and represent squares covered
664 * UP_OBJ_FACE: only the objects face has changed. 707 * UP_OBJ_FACE: only the objects face has changed.
665 */ 708 */
666void 709void
667update_object (object *op, int action) 710update_object (object *op, int action)
668{ 711{
669 MoveType move_on, move_off, move_block, move_slow; 712 if (!op)
670
671 if (op == NULL)
672 { 713 {
673 /* this should never happen */ 714 /* this should never happen */
674 LOG (llevDebug, "update_object() called for NULL object.\n"); 715 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
675 return; 716 return;
676 } 717 }
677 718
678 if (op->env) 719 if (!op->is_on_map ())
679 { 720 {
680 /* Animation is currently handled by client, so nothing 721 /* Animation is currently handled by client, so nothing
681 * to do in this case. 722 * to do in this case.
682 */ 723 */
683 return; 724 return;
684 } 725 }
685
686 /* If the map is saving, don't do anything as everything is
687 * going to get freed anyways.
688 */
689 if (!op->map || op->map->in_memory == MAP_SAVING)
690 return;
691 726
692 /* make sure the object is within map boundaries */ 727 /* make sure the object is within map boundaries */
693 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 728 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
694 { 729 {
695 LOG (llevError, "update_object() called for object out of map!\n"); 730 LOG (llevError, "update_object() called for object out of map!\n");
699 return; 734 return;
700 } 735 }
701 736
702 mapspace &m = op->ms (); 737 mapspace &m = op->ms ();
703 738
704 if (m.flags_ & P_NEED_UPDATE) 739 if (!(m.flags_ & P_UPTODATE))
705 /* nop */; 740 /* nop */;
706 else if (action == UP_OBJ_INSERT) 741 else if (action == UP_OBJ_INSERT)
707 { 742 {
743#if 0
708 // this is likely overkill, TODO: revisit (schmorp) 744 // this is likely overkill, TODO: revisit (schmorp)
709 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 745 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
710 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 746 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
711 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 747 || (op->is_player () && !(m.flags_ & P_PLAYER))
712 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 748 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
713 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 749 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
714 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 750 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
715 || (m.move_on | op->move_on ) != m.move_on 751 || (m.move_on | op->move_on ) != m.move_on
716 || (m.move_off | op->move_off ) != m.move_off 752 || (m.move_off | op->move_off ) != m.move_off
717 || (m.move_slow | op->move_slow) != m.move_slow 753 || (m.move_slow | op->move_slow) != m.move_slow
718 /* This isn't perfect, but I don't expect a lot of objects to 754 /* This isn't perfect, but I don't expect a lot of objects to
719 * to have move_allow right now. 755 * have move_allow right now.
720 */ 756 */
721 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 757 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
758 m.invalidate ();
759#else
722 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 760 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
723 m.flags_ = P_NEED_UPDATE; 761 m.invalidate ();
762#endif
724 } 763 }
725 /* if the object is being removed, we can't make intelligent 764 /* if the object is being removed, we can't make intelligent
726 * decisions, because remove_ob can't really pass the object 765 * decisions, because remove_ob can't really pass the object
727 * that is being removed. 766 * that is being removed.
728 */ 767 */
729 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 768 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730 m.flags_ = P_NEED_UPDATE; 769 m.invalidate ();
731 else if (action == UP_OBJ_FACE) 770 else if (action == UP_OBJ_FACE)
732 /* Nothing to do for that case */ ; 771 /* Nothing to do for that case */ ;
733 else 772 else
734 LOG (llevError, "update_object called with invalid action: %d\n", action); 773 LOG (llevError, "update_object called with invalid action: %d\n", action);
735 774
736 if (op->more) 775 if (op->more)
737 update_object (op->more, action); 776 update_object (op->more, action);
738} 777}
739 778
740object::vector object::objects; // not yet used
741object *object::first;
742
743object::object () 779object::object ()
744{ 780{
745 SET_FLAG (this, FLAG_REMOVED); 781 SET_FLAG (this, FLAG_REMOVED);
746 782
747 expmul = 1.0; 783 //expmul = 1.0; declared const for the time being
748 face = blank_face; 784 face = blank_face;
749} 785}
750 786
751object::~object () 787object::~object ()
752{ 788{
789 unlink ();
790
753 free_key_values (this); 791 free_key_values (this);
754} 792}
755 793
794static int object_count;
795
756void object::link () 796void object::link ()
757{ 797{
798 assert (!index);//D
799 uuid = UUID::gen ();
758 count = ++ob_count; 800 count = ++object_count;
759 uuid = gen_uuid ();
760 801
761 prev = 0; 802 refcnt_inc ();
762 next = object::first; 803 objects.insert (this);
763
764 if (object::first)
765 object::first->prev = this;
766
767 object::first = this;
768} 804}
769 805
770void object::unlink () 806void object::unlink ()
771{ 807{
772 if (this == object::first) 808 if (!index)
773 object::first = next; 809 return;
774 810
775 /* Remove this object from the list of used objects */ 811 objects.erase (this);
776 if (prev) prev->next = next; 812 refcnt_dec ();
777 if (next) next->prev = prev; 813}
778 814
779 prev = 0; 815void
780 next = 0; 816object::activate ()
817{
818 /* If already on active list, don't do anything */
819 if (active)
820 return;
821
822 if (has_active_speed ())
823 {
824 if (flag [FLAG_FREED])
825 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
826
827 actives.insert (this);
828 }
829}
830
831void
832object::activate_recursive ()
833{
834 activate ();
835
836 for (object *op = inv; op; op = op->below)
837 op->activate_recursive ();
838}
839
840/* This function removes object 'op' from the list of active
841 * objects.
842 * This should only be used for style maps or other such
843 * reference maps where you don't want an object that isn't
844 * in play chewing up cpu time getting processed.
845 * The reverse of this is to call update_ob_speed, which
846 * will do the right thing based on the speed of the object.
847 */
848void
849object::deactivate ()
850{
851 /* If not on the active list, nothing needs to be done */
852 if (!active)
853 return;
854
855 actives.erase (this);
856}
857
858void
859object::deactivate_recursive ()
860{
861 for (object *op = inv; op; op = op->below)
862 op->deactivate_recursive ();
863
864 deactivate ();
865}
866
867void
868object::set_flag_inv (int flag, int value)
869{
870 for (object *op = inv; op; op = op->below)
871 {
872 op->flag [flag] = value;
873 op->set_flag_inv (flag, value);
874 }
781} 875}
782 876
783/* 877/*
784 * Remove and free all objects in the inventory of the given object. 878 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 879 * object.c ?
786 */ 880 */
787void 881void
788object::destroy_inv (bool drop_to_ground) 882object::destroy_inv (bool drop_to_ground)
789{ 883{
884 // need to check first, because the checks below might segfault
885 // as we might be on an invalid mapspace and crossfire code
886 // is too buggy to ensure that the inventory is empty.
887 // corollary: if you create arrows etc. with stuff in its inventory,
888 // cf will crash below with off-map x and y
889 if (!inv)
890 return;
891
790 /* Only if the space blocks everything do we not process - 892 /* Only if the space blocks everything do we not process -
791 * if some form of movement is allowed, let objects 893 * if some form of movement is allowed, let objects
792 * drop on that space. 894 * drop on that space.
793 */ 895 */
794 if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 896 if (!drop_to_ground
897 || !map
898 || map->in_memory != MAP_ACTIVE
899 || map->no_drop
900 || ms ().move_block == MOVE_ALL)
795 { 901 {
796 while (inv) 902 while (inv)
797 inv->destroy (); 903 inv->destroy ();
798 } 904 }
799 else 905 else
804 910
805 if (op->flag [FLAG_STARTEQUIP] 911 if (op->flag [FLAG_STARTEQUIP]
806 || op->flag [FLAG_NO_DROP] 912 || op->flag [FLAG_NO_DROP]
807 || op->type == RUNE 913 || op->type == RUNE
808 || op->type == TRAP 914 || op->type == TRAP
809 || op->flag [FLAG_IS_A_TEMPLATE]) 915 || op->flag [FLAG_IS_A_TEMPLATE]
916 || op->flag [FLAG_DESTROY_ON_DEATH])
810 op->destroy (); 917 op->destroy ();
811 else 918 else
812 { 919 map->insert (op, x, y);
813 op->remove ();
814 op->x = x;
815 op->y = y;
816 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
817 }
818 } 920 }
819 } 921 }
820} 922}
821 923
822object *object::create () 924object *object::create ()
824 object *op = new object; 926 object *op = new object;
825 op->link (); 927 op->link ();
826 return op; 928 return op;
827} 929}
828 930
931static struct freed_map : maptile
932{
933 freed_map ()
934 {
935 path = "<freed objects map>";
936 name = "/internal/freed_objects_map";
937 width = 3;
938 height = 3;
939 no_drop = 1;
940 no_reset = 1;
941
942 alloc ();
943 in_memory = MAP_ACTIVE;
944 }
945
946 ~freed_map ()
947 {
948 destroy ();
949 }
950} freed_map; // freed objects are moved here to avoid crashes
951
829void 952void
830object::do_destroy () 953object::do_destroy ()
831{ 954{
832 attachable::do_destroy ();
833
834 if (flag [FLAG_IS_LINKED]) 955 if (flag [FLAG_IS_LINKED])
835 remove_button_link (this); 956 remove_link ();
836 957
837 if (flag [FLAG_FRIENDLY]) 958 if (flag [FLAG_FRIENDLY])
838 remove_friendly_object (this); 959 remove_friendly_object (this);
839 960
840 if (!flag [FLAG_REMOVED])
841 remove (); 961 remove ();
842 962
843 if (flag [FLAG_FREED]) 963 attachable::do_destroy ();
844 return; 964
965 deactivate ();
966 unlink ();
845 967
846 flag [FLAG_FREED] = 1; 968 flag [FLAG_FREED] = 1;
847 969
848 destroy_inv (true);
849 set_speed (0);
850 unlink ();
851
852 // hack to ensure that freed objects still have a valid map 970 // hack to ensure that freed objects still have a valid map
853 {
854 static maptile *freed_map; // freed objects are moved here to avoid crashes
855
856 if (!freed_map)
857 {
858 freed_map = new maptile;
859
860 freed_map->name = "/internal/freed_objects_map";
861 freed_map->width = 3;
862 freed_map->height = 3;
863
864 freed_map->allocate ();
865 }
866
867 map = freed_map; 971 map = &freed_map;
868 x = 1; 972 x = 1;
869 y = 1; 973 y = 1;
870 }
871
872 head = 0;
873 974
874 if (more) 975 if (more)
875 { 976 {
876 more->destroy (); 977 more->destroy ();
877 more = 0; 978 more = 0;
878 } 979 }
879 980
981 head = 0;
982
880 // clear those pointers that likely might have circular references to us 983 // clear those pointers that likely might cause circular references
881 owner = 0; 984 owner = 0;
882 enemy = 0; 985 enemy = 0;
883 attacked_by = 0; 986 attacked_by = 0;
884 987 current_weapon = 0;
885 // only relevant for players(?), but make sure of it anyways
886 contr = 0;
887} 988}
888 989
889void 990void
890object::destroy (bool destroy_inventory) 991object::destroy ()
891{ 992{
892 if (destroyed ()) 993 if (destroyed ())
893 return; 994 return;
894 995
895 if (destroy_inventory) 996 if (!is_head () && !head->destroyed ())
997 {
998 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
999 head->destroy ();
1000 return;
1001 }
1002
896 destroy_inv (false); 1003 destroy_inv (false);
1004
1005 if (is_head ())
1006 if (sound_destroy)
1007 play_sound (sound_destroy);
1008 else if (flag [FLAG_MONSTER])
1009 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
897 1010
898 attachable::destroy (); 1011 attachable::destroy ();
899}
900
901/*
902 * sub_weight() recursively (outwards) subtracts a number from the
903 * weight of an object (and what is carried by it's environment(s)).
904 */
905void
906sub_weight (object *op, signed long weight)
907{
908 while (op != NULL)
909 {
910 if (op->type == CONTAINER)
911 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
912
913 op->carrying -= weight;
914 op = op->env;
915 }
916} 1012}
917 1013
918/* op->remove (): 1014/* op->remove ():
919 * This function removes the object op from the linked list of objects 1015 * This function removes the object op from the linked list of objects
920 * which it is currently tied to. When this function is done, the 1016 * which it is currently tied to. When this function is done, the
921 * object will have no environment. If the object previously had an 1017 * object will have no environment. If the object previously had an
922 * environment, the x and y coordinates will be updated to 1018 * environment, the x and y coordinates will be updated to
923 * the previous environment. 1019 * the previous environment.
924 * Beware: This function is called from the editor as well!
925 */ 1020 */
926void 1021void
927object::remove () 1022object::do_remove ()
928{ 1023{
929 object *tmp, *last = 0; 1024 if (flag [FLAG_REMOVED])
930 object *otmp;
931
932 if (QUERY_FLAG (this, FLAG_REMOVED))
933 return; 1025 return;
934 1026
935 SET_FLAG (this, FLAG_REMOVED);
936 INVOKE_OBJECT (REMOVE, this); 1027 INVOKE_OBJECT (REMOVE, this);
1028
1029 flag [FLAG_REMOVED] = true;
937 1030
938 if (more) 1031 if (more)
939 more->remove (); 1032 more->remove ();
940 1033
941 /* 1034 /*
942 * In this case, the object to be removed is in someones 1035 * In this case, the object to be removed is in someones
943 * inventory. 1036 * inventory.
944 */ 1037 */
945 if (env) 1038 if (env)
946 { 1039 {
947 if (nrof) 1040 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
948 sub_weight (env, weight * nrof); 1041 if (object *pl = visible_to ())
949 else 1042 esrv_del_item (pl->contr, count);
950 sub_weight (env, weight + carrying); 1043 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1044
1045 adjust_weight (env, -total_weight ());
1046
1047 object *pl = in_player ();
1048
1049 /* we set up values so that it could be inserted into
1050 * the map, but we don't actually do that - it is up
1051 * to the caller to decide what we want to do.
1052 */
1053 map = env->map;
1054 x = env->x;
1055 y = env->y;
1056
1057 // make sure cmov optimisation is applicable
1058 *(above ? &above->below : &env->inv) = below;
1059 *(below ? &below->above : &above ) = above; // &above is just a dummy
1060
1061 above = 0;
1062 below = 0;
1063 env = 0;
951 1064
952 /* NO_FIX_PLAYER is set when a great many changes are being 1065 /* NO_FIX_PLAYER is set when a great many changes are being
953 * made to players inventory. If set, avoiding the call 1066 * made to players inventory. If set, avoiding the call
954 * to save cpu time. 1067 * to save cpu time.
955 */ 1068 */
956 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1069 if (pl)
1070 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1071 {
957 otmp->update_stats (); 1072 pl->update_stats ();
958 1073
959 if (above != NULL) 1074 if (glow_radius && pl->is_on_map ())
960 above->below = below; 1075 update_all_los (pl->map, pl->x, pl->y);
961 else 1076 }
962 env->inv = below;
963
964 if (below != NULL)
965 below->above = above;
966
967 /* we set up values so that it could be inserted into
968 * the map, but we don't actually do that - it is up
969 * to the caller to decide what we want to do.
970 */
971 x = env->x, y = env->y;
972 map = env->map;
973 above = 0, below = 0;
974 env = 0;
975 } 1077 }
976 else if (map) 1078 else if (map)
977 { 1079 {
978 /* Re did the following section of code - it looks like it had 1080 map->dirty = true;
979 * lots of logic for things we no longer care about 1081 mapspace &ms = this->ms ();
1082
1083 if (object *pl = ms.player ())
980 */ 1084 {
1085 if (is_player ())
1086 {
1087 if (!flag [FLAG_WIZPASS])
1088 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1089
1090 // leaving a spot always closes any open container on the ground
1091 if (container && !container->env)
1092 // this causes spurious floorbox updates, but it ensures
1093 // that the CLOSE event is being sent.
1094 close_container ();
1095
1096 --map->players;
1097 map->touch ();
1098 }
1099 else if (pl->container_ () == this)
1100 {
1101 // removing a container should close it
1102 close_container ();
1103 }
1104
1105 esrv_del_item (pl->contr, count);
1106 }
981 1107
982 /* link the object above us */ 1108 /* link the object above us */
983 if (above) 1109 // re-link, make sure compiler can easily use cmove
984 above->below = below; 1110 *(above ? &above->below : &ms.top) = below;
985 else 1111 *(below ? &below->above : &ms.bot) = above;
986 map->at (x, y).top = below; /* we were top, set new top */
987
988 /* Relink the object below us, if there is one */
989 if (below)
990 below->above = above;
991 else
992 {
993 /* Nothing below, which means we need to relink map object for this space
994 * use translated coordinates in case some oddness with map tiling is
995 * evident
996 */
997 if (GET_MAP_OB (map, x, y) != this)
998 {
999 char *dump = dump_object (this);
1000 LOG (llevError,
1001 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1002 free (dump);
1003 dump = dump_object (GET_MAP_OB (map, x, y));
1004 LOG (llevError, "%s\n", dump);
1005 free (dump);
1006 }
1007
1008 map->at (x, y).bot = above; /* goes on above it. */
1009 }
1010 1112
1011 above = 0; 1113 above = 0;
1012 below = 0; 1114 below = 0;
1013 1115
1116 ms.invalidate ();
1117
1014 if (map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1015 return; 1119 return;
1016 1120
1017 int check_walk_off = !flag [FLAG_NO_APPLY]; 1121 int check_walk_off = !flag [FLAG_NO_APPLY];
1018 1122
1019 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1123 if (object *pl = ms.player ())
1020 { 1124 {
1021 /* No point updating the players look faces if he is the object 1125 if (pl->container_ () == this)
1022 * being removed.
1023 */
1024
1025 if (tmp->type == PLAYER && tmp != this)
1026 {
1027 /* If a container that the player is currently using somehow gets 1126 /* If a container that the player is currently using somehow gets
1028 * removed (most likely destroyed), update the player view 1127 * removed (most likely destroyed), update the player view
1029 * appropriately. 1128 * appropriately.
1030 */ 1129 */
1031 if (tmp->container == this) 1130 pl->close_container ();
1032 {
1033 flag [FLAG_APPLIED] = 0;
1034 tmp->container = 0;
1035 }
1036 1131
1132 //TODO: the floorbox prev/next might need updating
1133 //esrv_del_item (pl->contr, count);
1134 //TODO: update floorbox to preserve ordering
1037 if (tmp->contr->ns) 1135 if (pl->contr->ns)
1038 tmp->contr->ns->floorbox_update (); 1136 pl->contr->ns->floorbox_update ();
1137 }
1138
1139 if (check_walk_off)
1140 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1141 {
1142 above = tmp->above;
1143
1144 /* No point updating the players look faces if he is the object
1145 * being removed.
1039 } 1146 */
1040 1147
1041 /* See if player moving off should effect something */ 1148 /* See if object moving off should effect something */
1042 if (check_walk_off
1043 && ((move_type & tmp->move_off) 1149 if ((move_type & tmp->move_off)
1044 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1150 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1045 {
1046 move_apply (tmp, this, 0); 1151 move_apply (tmp, this, 0);
1047
1048 if (destroyed ())
1049 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1050 } 1152 }
1051 1153
1052 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1154 if (affects_los ())
1053
1054 if (tmp->above == tmp)
1055 tmp->above = 0;
1056
1057 last = tmp;
1058 }
1059
1060 /* last == NULL of there are no objects on this space */
1061 if (!last)
1062 map->at (x, y).flags_ = P_NEED_UPDATE;
1063 else
1064 update_object (last, UP_OBJ_REMOVE);
1065
1066 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1067 update_all_los (map, x, y); 1155 update_all_los (map, x, y);
1068 } 1156 }
1069} 1157}
1070 1158
1071/* 1159/*
1080merge_ob (object *op, object *top) 1168merge_ob (object *op, object *top)
1081{ 1169{
1082 if (!op->nrof) 1170 if (!op->nrof)
1083 return 0; 1171 return 0;
1084 1172
1085 if (top) 1173 if (!top)
1086 for (top = op; top && top->above; top = top->above) 1174 for (top = op; top && top->above; top = top->above)
1087 ; 1175 ;
1088 1176
1089 for (; top; top = top->below) 1177 for (; top; top = top->below)
1090 {
1091 if (top == op)
1092 continue;
1093
1094 if (object::can_merge (op, top)) 1178 if (object::can_merge (op, top))
1095 { 1179 {
1096 top->nrof += op->nrof; 1180 top->nrof += op->nrof;
1097 1181
1098/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1182 if (object *pl = top->visible_to ())
1099 op->weight = 0; /* Don't want any adjustements now */ 1183 esrv_update_item (UPD_NROF, pl, top);
1184
1185 op->weight = 0; // cancel the addition above
1186 op->carrying = 0; // must be 0 already
1187
1100 op->destroy (); 1188 op->destroy ();
1189
1101 return top; 1190 return top;
1102 } 1191 }
1103 }
1104 1192
1105 return 0; 1193 return 0;
1106} 1194}
1107 1195
1196void
1197object::expand_tail ()
1198{
1199 if (more)
1200 return;
1201
1202 object *prev = this;
1203
1204 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1205 {
1206 object *op = arch_to_object (at);
1207
1208 op->name = name;
1209 op->name_pl = name_pl;
1210 op->title = title;
1211
1212 op->head = this;
1213 prev->more = op;
1214
1215 prev = op;
1216 }
1217}
1218
1108/* 1219/*
1109 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1220 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1110 * job preparing multi-part monsters 1221 * job preparing multi-part monsters.
1111 */ 1222 */
1112object * 1223object *
1113insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1224insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1114{ 1225{
1115 object *tmp; 1226 op->remove ();
1116 1227
1117 if (op->head)
1118 op = op->head;
1119
1120 for (tmp = op; tmp; tmp = tmp->more) 1228 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1121 { 1229 {
1122 tmp->x = x + tmp->arch->clone.x; 1230 tmp->x = x + tmp->arch->x;
1123 tmp->y = y + tmp->arch->clone.y; 1231 tmp->y = y + tmp->arch->y;
1124 } 1232 }
1125 1233
1126 return insert_ob_in_map (op, m, originator, flag); 1234 return insert_ob_in_map (op, m, originator, flag);
1127} 1235}
1128 1236
1147 * just 'op' otherwise 1255 * just 'op' otherwise
1148 */ 1256 */
1149object * 1257object *
1150insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1258insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1151{ 1259{
1152 object *tmp, *top, *floor = NULL; 1260 op->remove ();
1153 sint16 x, y;
1154 1261
1155 if (QUERY_FLAG (op, FLAG_FREED)) 1262 if (m == &freed_map)//D TODO: remove soon
1156 { 1263 {//D
1157 LOG (llevError, "Trying to insert freed object!\n"); 1264 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1158 return NULL;
1159 } 1265 }//D
1160
1161 if (m == NULL)
1162 {
1163 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1165 free (dump);
1166 return op;
1167 }
1168
1169 if (out_of_map (m, op->x, op->y))
1170 {
1171 char *dump = dump_object (op);
1172 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1173#ifdef MANY_CORES
1174 /* Better to catch this here, as otherwise the next use of this object
1175 * is likely to cause a crash. Better to find out where it is getting
1176 * improperly inserted.
1177 */
1178 abort ();
1179#endif
1180 free (dump);
1181 return op;
1182 }
1183
1184 if (!QUERY_FLAG (op, FLAG_REMOVED))
1185 {
1186 char *dump = dump_object (op);
1187 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1188 free (dump);
1189 return op;
1190 }
1191
1192 if (op->more)
1193 {
1194 /* The part may be on a different map. */
1195
1196 object *more = op->more;
1197
1198 /* We really need the caller to normalize coordinates - if
1199 * we set the map, that doesn't work if the location is within
1200 * a map and this is straddling an edge. So only if coordinate
1201 * is clear wrong do we normalize it.
1202 */
1203 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1204 more->map = get_map_from_coord (m, &more->x, &more->y);
1205 else if (!more->map)
1206 {
1207 /* For backwards compatibility - when not dealing with tiled maps,
1208 * more->map should always point to the parent.
1209 */
1210 more->map = m;
1211 }
1212
1213 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1214 {
1215 if (!op->head)
1216 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1217
1218 return 0;
1219 }
1220 }
1221
1222 CLEAR_FLAG (op, FLAG_REMOVED);
1223 1266
1224 /* Ideally, the caller figures this out. However, it complicates a lot 1267 /* Ideally, the caller figures this out. However, it complicates a lot
1225 * of areas of callers (eg, anything that uses find_free_spot would now 1268 * of areas of callers (eg, anything that uses find_free_spot would now
1226 * need extra work 1269 * need extra work
1227 */ 1270 */
1228 op->map = get_map_from_coord (m, &op->x, &op->y); 1271 maptile *newmap = m;
1229 x = op->x; 1272 if (!xy_normalise (newmap, op->x, op->y))
1230 y = op->y; 1273 {
1274 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1275 return 0;
1276 }
1277
1278 if (object *more = op->more)
1279 if (!insert_ob_in_map (more, m, originator, flag))
1280 return 0;
1281
1282 op->flag [FLAG_REMOVED] = false;
1283 op->env = 0;
1284 op->map = newmap;
1285
1286 mapspace &ms = op->ms ();
1231 1287
1232 /* this has to be done after we translate the coordinates. 1288 /* this has to be done after we translate the coordinates.
1233 */ 1289 */
1234 if (op->nrof && !(flag & INS_NO_MERGE)) 1290 if (op->nrof && !(flag & INS_NO_MERGE))
1235 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1291 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1236 if (object::can_merge (op, tmp)) 1292 if (object::can_merge (op, tmp))
1237 { 1293 {
1294 // TODO: we actually want to update tmp, not op,
1295 // but some caller surely breaks when we return tmp
1296 // from here :/
1238 op->nrof += tmp->nrof; 1297 op->nrof += tmp->nrof;
1239 tmp->destroy (); 1298 tmp->destroy ();
1240 } 1299 }
1241 1300
1242 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1301 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1251 { 1310 {
1252 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1311 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1253 abort (); 1312 abort ();
1254 } 1313 }
1255 1314
1315 if (!originator->is_on_map ())
1316 {
1317 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1318 op->debug_desc (), originator->debug_desc ());
1319 abort ();
1320 }
1321
1256 op->above = originator; 1322 op->above = originator;
1257 op->below = originator->below; 1323 op->below = originator->below;
1258
1259 if (op->below)
1260 op->below->above = op;
1261 else
1262 op->ms ().bot = op;
1263
1264 /* since *below* originator, no need to update top */
1265 originator->below = op; 1324 originator->below = op;
1325
1326 *(op->below ? &op->below->above : &ms.bot) = op;
1266 } 1327 }
1267 else 1328 else
1268 { 1329 {
1330 object *floor = 0;
1331 object *top = ms.top;
1332
1269 /* If there are other objects, then */ 1333 /* If there are other objects, then */
1270 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1334 if (top)
1271 { 1335 {
1272 object *last = NULL;
1273
1274 /* 1336 /*
1275 * If there are multiple objects on this space, we do some trickier handling. 1337 * If there are multiple objects on this space, we do some trickier handling.
1276 * We've already dealt with merging if appropriate. 1338 * We've already dealt with merging if appropriate.
1277 * Generally, we want to put the new object on top. But if 1339 * Generally, we want to put the new object on top. But if
1278 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1340 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1281 * once we get to them. This reduces the need to traverse over all of 1343 * once we get to them. This reduces the need to traverse over all of
1282 * them when adding another one - this saves quite a bit of cpu time 1344 * them when adding another one - this saves quite a bit of cpu time
1283 * when lots of spells are cast in one area. Currently, it is presumed 1345 * when lots of spells are cast in one area. Currently, it is presumed
1284 * that flying non pickable objects are spell objects. 1346 * that flying non pickable objects are spell objects.
1285 */ 1347 */
1286 1348 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1287 while (top != NULL)
1288 { 1349 {
1289 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1350 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1290 floor = top; 1351 floor = tmp;
1291 1352
1292 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1353 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1293 { 1354 {
1294 /* We insert above top, so we want this object below this */ 1355 /* We insert above top, so we want this object below this */
1295 top = top->below; 1356 top = tmp->below;
1296 break; 1357 break;
1297 } 1358 }
1298 1359
1299 last = top;
1300 top = top->above; 1360 top = tmp;
1301 } 1361 }
1302
1303 /* Don't want top to be NULL, so set it to the last valid object */
1304 top = last;
1305 1362
1306 /* We let update_position deal with figuring out what the space 1363 /* We let update_position deal with figuring out what the space
1307 * looks like instead of lots of conditions here. 1364 * looks like instead of lots of conditions here.
1308 * makes things faster, and effectively the same result. 1365 * makes things faster, and effectively the same result.
1309 */ 1366 */
1310 1367
1311 /* Have object 'fall below' other objects that block view. 1368 /* Have object 'fall below' other objects that block view.
1312 * Unless those objects are exits, type 66 1369 * Unless those objects are exits.
1313 * If INS_ON_TOP is used, don't do this processing 1370 * If INS_ON_TOP is used, don't do this processing
1314 * Need to find the object that in fact blocks view, otherwise 1371 * Need to find the object that in fact blocks view, otherwise
1315 * stacking is a bit odd. 1372 * stacking is a bit odd.
1316 */ 1373 */
1317 if (!(flag & INS_ON_TOP) && 1374 if (!(flag & INS_ON_TOP)
1318 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1375 && ms.flags () & P_BLOCKSVIEW
1376 && (op->face && !faces [op->face].visibility))
1319 { 1377 {
1378 object *last;
1379
1320 for (last = top; last != floor; last = last->below) 1380 for (last = top; last != floor; last = last->below)
1321 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1381 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1322 break; 1382 break;
1383
1323 /* Check to see if we found the object that blocks view, 1384 /* Check to see if we found the object that blocks view,
1324 * and make sure we have a below pointer for it so that 1385 * and make sure we have a below pointer for it so that
1325 * we can get inserted below this one, which requires we 1386 * we can get inserted below this one, which requires we
1326 * set top to the object below us. 1387 * set top to the object below us.
1327 */ 1388 */
1328 if (last && last->below && last != floor) 1389 if (last && last->below && last != floor)
1329 top = last->below; 1390 top = last->below;
1330 } 1391 }
1331 } /* If objects on this space */ 1392 } /* If objects on this space */
1332 1393
1333 if (flag & INS_MAP_LOAD)
1334 top = GET_MAP_TOP (op->map, op->x, op->y);
1335
1336 if (flag & INS_ABOVE_FLOOR_ONLY) 1394 if (flag & INS_ABOVE_FLOOR_ONLY)
1337 top = floor; 1395 top = floor;
1338 1396
1339 /* Top is the object that our object (op) is going to get inserted above. 1397 // insert object above top, or bottom-most if top = 0
1340 */
1341
1342 /* First object on this space */
1343 if (!top) 1398 if (!top)
1344 { 1399 {
1345 op->above = GET_MAP_OB (op->map, op->x, op->y);
1346
1347 if (op->above)
1348 op->above->below = op;
1349
1350 op->below = NULL; 1400 op->below = 0;
1401 op->above = ms.bot;
1351 op->ms ().bot = op; 1402 ms.bot = op;
1403
1404 *(op->above ? &op->above->below : &ms.top) = op;
1352 } 1405 }
1353 else 1406 else
1354 { /* get inserted into the stack above top */ 1407 {
1355 op->above = top->above; 1408 op->above = top->above;
1356
1357 if (op->above)
1358 op->above->below = op; 1409 top->above = op;
1359 1410
1360 op->below = top; 1411 op->below = top;
1361 top->above = op; 1412 *(op->above ? &op->above->below : &ms.top) = op;
1362 } 1413 }
1414 }
1363 1415
1364 if (op->above == NULL) 1416 if (op->is_player ())
1365 op->ms ().top = op; 1417 {
1366 } /* else not INS_BELOW_ORIGINATOR */
1367
1368 if (op->type == PLAYER)
1369 op->contr->do_los = 1; 1418 op->contr->do_los = 1;
1419 ++op->map->players;
1420 op->map->touch ();
1421 }
1370 1422
1371 /* If we have a floor, we know the player, if any, will be above 1423 op->map->dirty = true;
1372 * it, so save a few ticks and start from there. 1424
1373 */
1374 if (!(flag & INS_MAP_LOAD))
1375 if (object *pl = op->ms ().player ()) 1425 if (object *pl = ms.player ())
1426 //TODO: the floorbox prev/next might need updating
1427 //esrv_send_item (pl, op);
1428 //TODO: update floorbox to preserve ordering
1376 if (pl->contr->ns) 1429 if (pl->contr->ns)
1377 pl->contr->ns->floorbox_update (); 1430 pl->contr->ns->floorbox_update ();
1378 1431
1379 /* If this object glows, it may affect lighting conditions that are 1432 /* If this object glows, it may affect lighting conditions that are
1380 * visible to others on this map. But update_all_los is really 1433 * visible to others on this map. But update_all_los is really
1381 * an inefficient way to do this, as it means los for all players 1434 * an inefficient way to do this, as it means los for all players
1382 * on the map will get recalculated. The players could very well 1435 * on the map will get recalculated. The players could very well
1383 * be far away from this change and not affected in any way - 1436 * be far away from this change and not affected in any way -
1384 * this should get redone to only look for players within range, 1437 * this should get redone to only look for players within range,
1385 * or just updating the P_NEED_UPDATE for spaces within this area 1438 * or just updating the P_UPTODATE for spaces within this area
1386 * of effect may be sufficient. 1439 * of effect may be sufficient.
1387 */ 1440 */
1388 if (op->map->darkness && (op->glow_radius != 0)) 1441 if (op->affects_los ())
1442 {
1443 op->ms ().invalidate ();
1389 update_all_los (op->map, op->x, op->y); 1444 update_all_los (op->map, op->x, op->y);
1445 }
1390 1446
1391 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1447 /* updates flags (blocked, alive, no magic, etc) for this map space */
1392 update_object (op, UP_OBJ_INSERT); 1448 update_object (op, UP_OBJ_INSERT);
1393 1449
1394 INVOKE_OBJECT (INSERT, op); 1450 INVOKE_OBJECT (INSERT, op);
1401 * blocked() and wall() work properly), and these flags are updated by 1457 * blocked() and wall() work properly), and these flags are updated by
1402 * update_object(). 1458 * update_object().
1403 */ 1459 */
1404 1460
1405 /* if this is not the head or flag has been passed, don't check walk on status */ 1461 /* if this is not the head or flag has been passed, don't check walk on status */
1406 if (!(flag & INS_NO_WALK_ON) && !op->head) 1462 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1407 { 1463 {
1408 if (check_move_on (op, originator)) 1464 if (check_move_on (op, originator))
1409 return 0; 1465 return 0;
1410 1466
1411 /* If we are a multi part object, lets work our way through the check 1467 /* If we are a multi part object, lets work our way through the check
1412 * walk on's. 1468 * walk on's.
1413 */ 1469 */
1414 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1470 for (object *tmp = op->more; tmp; tmp = tmp->more)
1415 if (check_move_on (tmp, originator)) 1471 if (check_move_on (tmp, originator))
1416 return 0; 1472 return 0;
1417 } 1473 }
1418 1474
1419 return op; 1475 return op;
1422/* this function inserts an object in the map, but if it 1478/* this function inserts an object in the map, but if it
1423 * finds an object of its own type, it'll remove that one first. 1479 * finds an object of its own type, it'll remove that one first.
1424 * op is the object to insert it under: supplies x and the map. 1480 * op is the object to insert it under: supplies x and the map.
1425 */ 1481 */
1426void 1482void
1427replace_insert_ob_in_map (const char *arch_string, object *op) 1483replace_insert_ob_in_map (shstr_tmp archname, object *op)
1428{ 1484{
1429 object *tmp, *tmp1;
1430
1431 /* first search for itself and remove any old instances */ 1485 /* first search for itself and remove any old instances */
1432 1486
1433 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1434 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1488 if (tmp->arch->archname == archname) /* same archetype */
1435 tmp->destroy (); 1489 tmp->destroy ();
1436 1490
1437 tmp1 = arch_to_object (archetype::find (arch_string)); 1491 object *tmp = arch_to_object (archetype::find (archname));
1438 1492
1439 tmp1->x = op->x; 1493 tmp->x = op->x;
1440 tmp1->y = op->y; 1494 tmp->y = op->y;
1495
1441 insert_ob_in_map (tmp1, op->map, op, 0); 1496 insert_ob_in_map (tmp, op->map, op, 0);
1442} 1497}
1443
1444/*
1445 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1446 * is returned contains nr objects, and the remaining parts contains
1447 * the rest (or is removed and freed if that number is 0).
1448 * On failure, NULL is returned, and the reason put into the
1449 * global static errmsg array.
1450 */
1451 1498
1452object * 1499object *
1453get_split_ob (object *orig_ob, uint32 nr) 1500object::insert_at (object *where, object *originator, int flags)
1454{ 1501{
1455 object *newob; 1502 if (where->env)
1456 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1503 return where->env->insert (this);
1457 1504 else
1458 if (orig_ob->nrof < nr) 1505 return where->map->insert (this, where->x, where->y, originator, flags);
1459 {
1460 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1461 return NULL;
1462 }
1463
1464 newob = object_create_clone (orig_ob);
1465
1466 if ((orig_ob->nrof -= nr) < 1)
1467 orig_ob->destroy (1);
1468 else if (!is_removed)
1469 {
1470 if (orig_ob->env != NULL)
1471 sub_weight (orig_ob->env, orig_ob->weight * nr);
1472 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1473 {
1474 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1475 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1476 return NULL;
1477 }
1478 }
1479
1480 newob->nrof = nr;
1481
1482 return newob;
1483} 1506}
1484 1507
1485/* 1508/*
1486 * decrease_ob_nr(object, number) decreases a specified number from 1509 * decrease(object, number) decreases a specified number from
1487 * the amount of an object. If the amount reaches 0, the object 1510 * the amount of an object. If the amount reaches 0, the object
1488 * is subsequently removed and freed. 1511 * is subsequently removed and freed.
1489 * 1512 *
1490 * Return value: 'op' if something is left, NULL if the amount reached 0 1513 * Return value: 'op' if something is left, NULL if the amount reached 0
1491 */ 1514 */
1515bool
1516object::decrease (sint32 nr)
1517{
1518 if (!nr)
1519 return true;
1492 1520
1521 nr = min (nr, nrof);
1522
1523 if (nrof > nr)
1524 {
1525 nrof -= nr;
1526 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1527
1528 if (object *pl = visible_to ())
1529 esrv_update_item (UPD_NROF, pl, this);
1530
1531 return true;
1532 }
1533 else
1534 {
1535 destroy ();
1536 return false;
1537 }
1538}
1539
1540/*
1541 * split(ob,nr) splits up ob into two parts. The part which
1542 * is returned contains nr objects, and the remaining parts contains
1543 * the rest (or is removed and returned if that number is 0).
1544 * On failure, NULL is returned.
1545 */
1493object * 1546object *
1494decrease_ob_nr (object *op, uint32 i) 1547object::split (sint32 nr)
1495{ 1548{
1496 object *tmp; 1549 int have = number_of ();
1497 1550
1498 if (i == 0) /* objects with op->nrof require this check */ 1551 if (have < nr)
1499 return op; 1552 return 0;
1500 1553 else if (have == nr)
1501 if (i > op->nrof)
1502 i = op->nrof;
1503
1504 if (QUERY_FLAG (op, FLAG_REMOVED))
1505 op->nrof -= i;
1506 else if (op->env)
1507 { 1554 {
1508 /* is this object in the players inventory, or sub container
1509 * therein?
1510 */
1511 tmp = op->in_player ();
1512 /* nope. Is this a container the player has opened?
1513 * If so, set tmp to that player.
1514 * IMO, searching through all the players will mostly
1515 * likely be quicker than following op->env to the map,
1516 * and then searching the map for a player.
1517 */
1518 if (!tmp)
1519 for_all_players (pl)
1520 if (pl->ob->container == op->env)
1521 {
1522 tmp = pl->ob;
1523 break;
1524 }
1525
1526 if (i < op->nrof)
1527 {
1528 sub_weight (op->env, op->weight * i);
1529 op->nrof -= i;
1530 if (tmp)
1531 esrv_send_item (tmp, op);
1532 }
1533 else
1534 {
1535 op->remove (); 1555 remove ();
1536 op->nrof = 0; 1556 return this;
1537 if (tmp)
1538 esrv_del_item (tmp->contr, op->count);
1539 }
1540 } 1557 }
1541 else 1558 else
1542 { 1559 {
1543 object *above = op->above; 1560 decrease (nr);
1544 1561
1545 if (i < op->nrof) 1562 object *op = deep_clone ();
1546 op->nrof -= i; 1563 op->nrof = nr;
1547 else
1548 {
1549 op->remove ();
1550 op->nrof = 0;
1551 }
1552
1553 /* Since we just removed op, op->above is null */
1554 for (tmp = above; tmp; tmp = tmp->above)
1555 if (tmp->type == PLAYER)
1556 {
1557 if (op->nrof)
1558 esrv_send_item (tmp, op);
1559 else
1560 esrv_del_item (tmp->contr, op->count);
1561 }
1562 }
1563
1564 if (op->nrof)
1565 return op; 1564 return op;
1566 else
1567 {
1568 op->destroy ();
1569 return 0;
1570 }
1571}
1572
1573/*
1574 * add_weight(object, weight) adds the specified weight to an object,
1575 * and also updates how much the environment(s) is/are carrying.
1576 */
1577
1578void
1579add_weight (object *op, signed long weight)
1580{
1581 while (op != NULL)
1582 {
1583 if (op->type == CONTAINER)
1584 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1585
1586 op->carrying += weight;
1587 op = op->env;
1588 } 1565 }
1589} 1566}
1590 1567
1591object * 1568object *
1592insert_ob_in_ob (object *op, object *where) 1569insert_ob_in_ob (object *op, object *where)
1597 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1574 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1598 free (dump); 1575 free (dump);
1599 return op; 1576 return op;
1600 } 1577 }
1601 1578
1602 if (where->head) 1579 if (where->head_ () != where)
1603 { 1580 {
1604 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1581 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1605 where = where->head; 1582 where = where->head;
1606 } 1583 }
1607 1584
1608 return where->insert (op); 1585 return where->insert (op);
1609} 1586}
1614 * inside the object environment. 1591 * inside the object environment.
1615 * 1592 *
1616 * The function returns now pointer to inserted item, and return value can 1593 * The function returns now pointer to inserted item, and return value can
1617 * be != op, if items are merged. -Tero 1594 * be != op, if items are merged. -Tero
1618 */ 1595 */
1619
1620object * 1596object *
1621object::insert (object *op) 1597object::insert (object *op)
1622{ 1598{
1623 object *tmp, *otmp;
1624
1625 if (!QUERY_FLAG (op, FLAG_REMOVED))
1626 op->remove ();
1627
1628 if (op->more) 1599 if (op->more)
1629 { 1600 {
1630 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1601 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1631 return op; 1602 return op;
1632 } 1603 }
1633 1604
1634 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1605 op->remove ();
1635 CLEAR_FLAG (op, FLAG_REMOVED); 1606
1607 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1608
1636 if (op->nrof) 1609 if (op->nrof)
1637 {
1638 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1610 for (object *tmp = inv; tmp; tmp = tmp->below)
1639 if (object::can_merge (tmp, op)) 1611 if (object::can_merge (tmp, op))
1640 { 1612 {
1641 /* return the original object and remove inserted object 1613 /* return the original object and remove inserted object
1642 (client needs the original object) */ 1614 (client needs the original object) */
1643 tmp->nrof += op->nrof; 1615 tmp->nrof += op->nrof;
1644 /* Weight handling gets pretty funky. Since we are adding to 1616
1645 * tmp->nrof, we need to increase the weight. 1617 if (object *pl = tmp->visible_to ())
1646 */ 1618 esrv_update_item (UPD_NROF, pl, tmp);
1619
1647 add_weight (this, op->weight * op->nrof); 1620 adjust_weight (this, op->total_weight ());
1648 SET_FLAG (op, FLAG_REMOVED); 1621
1649 op->destroy (); /* free the inserted object */ 1622 op->destroy ();
1650 op = tmp; 1623 op = tmp;
1651 op->remove (); /* and fix old object's links */ 1624 goto inserted;
1652 CLEAR_FLAG (op, FLAG_REMOVED);
1653 break;
1654 } 1625 }
1655 1626
1656 /* I assume combined objects have no inventory 1627 op->owner = 0; // it's his/hers now. period.
1657 * We add the weight - this object could have just been removed
1658 * (if it was possible to merge). calling remove_ob will subtract
1659 * the weight, so we need to add it in again, since we actually do
1660 * the linking below
1661 */
1662 add_weight (this, op->weight * op->nrof);
1663 }
1664 else
1665 add_weight (this, (op->weight + op->carrying));
1666
1667 otmp = this->in_player ();
1668 if (otmp && otmp->contr)
1669 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1670 otmp->update_stats ();
1671
1672 op->map = 0; 1628 op->map = 0;
1673 op->env = this; 1629 op->x = 0;
1630 op->y = 0;
1631
1674 op->above = 0; 1632 op->above = 0;
1675 op->below = 0; 1633 op->below = inv;
1676 op->x = 0, op->y = 0; 1634 op->env = this;
1677 1635
1636 if (inv)
1637 inv->above = op;
1638
1639 inv = op;
1640
1641 op->flag [FLAG_REMOVED] = 0;
1642
1643 if (object *pl = op->visible_to ())
1644 esrv_send_item (pl, op);
1645
1646 adjust_weight (this, op->total_weight ());
1647
1648inserted:
1678 /* reset the light list and los of the players on the map */ 1649 /* reset the light list and los of the players on the map */
1679 if ((op->glow_radius != 0) && map) 1650 if (op->glow_radius && is_on_map ())
1680 { 1651 {
1681#ifdef DEBUG_LIGHTS 1652 update_stats ();
1682 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1683#endif /* DEBUG_LIGHTS */
1684 if (map->darkness)
1685 update_all_los (map, x, y); 1653 update_all_los (map, x, y);
1686 }
1687
1688 /* Client has no idea of ordering so lets not bother ordering it here.
1689 * It sure simplifies this function...
1690 */
1691 if (!inv)
1692 inv = op;
1693 else
1694 { 1654 }
1695 op->below = inv; 1655 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1696 op->below->above = op; 1656 // if this is a player's inventory, update stats
1697 inv = op; 1657 update_stats ();
1698 }
1699 1658
1700 INVOKE_OBJECT (INSERT, this); 1659 INVOKE_OBJECT (INSERT, this);
1701 1660
1702 return op; 1661 return op;
1703} 1662}
1720 * 1679 *
1721 * MSW 2001-07-08: Check all objects on space, not just those below 1680 * MSW 2001-07-08: Check all objects on space, not just those below
1722 * object being inserted. insert_ob_in_map may not put new objects 1681 * object being inserted. insert_ob_in_map may not put new objects
1723 * on top. 1682 * on top.
1724 */ 1683 */
1725
1726int 1684int
1727check_move_on (object *op, object *originator) 1685check_move_on (object *op, object *originator)
1728{ 1686{
1687 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1688 return 0;
1689
1729 object *tmp; 1690 object *tmp;
1730 maptile *m = op->map; 1691 maptile *m = op->map;
1731 int x = op->x, y = op->y; 1692 int x = op->x, y = op->y;
1732 1693
1733 MoveType move_on, move_slow, move_block; 1694 mapspace &ms = m->at (x, y);
1734 1695
1735 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1696 ms.update ();
1736 return 0;
1737 1697
1738 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1698 MoveType move_on = ms.move_on;
1739 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1699 MoveType move_slow = ms.move_slow;
1740 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1700 MoveType move_block = ms.move_block;
1741 1701
1742 /* if nothing on this space will slow op down or be applied, 1702 /* if nothing on this space will slow op down or be applied,
1743 * no need to do checking below. have to make sure move_type 1703 * no need to do checking below. have to make sure move_type
1744 * is set, as lots of objects don't have it set - we treat that 1704 * is set, as lots of objects don't have it set - we treat that
1745 * as walking. 1705 * as walking.
1756 return 0; 1716 return 0;
1757 1717
1758 /* The objects have to be checked from top to bottom. 1718 /* The objects have to be checked from top to bottom.
1759 * Hence, we first go to the top: 1719 * Hence, we first go to the top:
1760 */ 1720 */
1761 1721 for (object *next, *tmp = ms.top; tmp; tmp = next)
1762 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1763 {
1764 /* Trim the search when we find the first other spell effect
1765 * this helps performance so that if a space has 50 spell objects,
1766 * we don't need to check all of them.
1767 */
1768 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1769 break;
1770 } 1722 {
1723 next = tmp->below;
1771 1724
1772 for (; tmp; tmp = tmp->below)
1773 {
1774 if (tmp == op) 1725 if (tmp == op)
1775 continue; /* Can't apply yourself */ 1726 continue; /* Can't apply yourself */
1776 1727
1777 /* Check to see if one of the movement types should be slowed down. 1728 /* Check to see if one of the movement types should be slowed down.
1778 * Second check makes sure that the movement types not being slowed 1729 * Second check makes sure that the movement types not being slowed
1783 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1734 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1784 { 1735 {
1785 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1736 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1786 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1737 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1787 { 1738 {
1788
1789 float
1790 diff = tmp->move_slow_penalty * FABS (op->speed); 1739 float diff = tmp->move_slow_penalty * fabs (op->speed);
1791 1740
1792 if (op->type == PLAYER) 1741 if (op->is_player ())
1793 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1742 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1794 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1743 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1795 diff /= 4.0; 1744 diff /= 4.0;
1796 1745
1797 op->speed_left -= diff; 1746 op->speed_left -= diff;
1798 } 1747 }
1799 } 1748 }
1825 * The first matching object is returned, or NULL if none. 1774 * The first matching object is returned, or NULL if none.
1826 */ 1775 */
1827object * 1776object *
1828present_arch (const archetype *at, maptile *m, int x, int y) 1777present_arch (const archetype *at, maptile *m, int x, int y)
1829{ 1778{
1830 if (m == NULL || out_of_map (m, x, y)) 1779 if (!m || out_of_map (m, x, y))
1831 { 1780 {
1832 LOG (llevError, "Present_arch called outside map.\n"); 1781 LOG (llevError, "Present_arch called outside map.\n");
1833 return NULL; 1782 return NULL;
1834 } 1783 }
1835 1784
1836 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1785 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837 if (tmp->arch == at) 1786 if (tmp->arch->archname == at->archname)
1838 return tmp; 1787 return tmp;
1839 1788
1840 return NULL; 1789 return NULL;
1841} 1790}
1842 1791
1852 { 1801 {
1853 LOG (llevError, "Present called outside map.\n"); 1802 LOG (llevError, "Present called outside map.\n");
1854 return NULL; 1803 return NULL;
1855 } 1804 }
1856 1805
1857 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1806 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1858 if (tmp->type == type) 1807 if (tmp->type == type)
1859 return tmp; 1808 return tmp;
1860 1809
1861 return NULL; 1810 return NULL;
1862} 1811}
1906 * The first matching object is returned, or NULL if none. 1855 * The first matching object is returned, or NULL if none.
1907 */ 1856 */
1908object * 1857object *
1909present_arch_in_ob (const archetype *at, const object *op) 1858present_arch_in_ob (const archetype *at, const object *op)
1910{ 1859{
1911 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1860 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912 if (tmp->arch == at) 1861 if (tmp->arch->archname == at->archname)
1913 return tmp; 1862 return tmp;
1914 1863
1915 return NULL; 1864 return NULL;
1916} 1865}
1917 1866
1919 * activate recursively a flag on an object inventory 1868 * activate recursively a flag on an object inventory
1920 */ 1869 */
1921void 1870void
1922flag_inv (object *op, int flag) 1871flag_inv (object *op, int flag)
1923{ 1872{
1924 if (op->inv)
1925 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1873 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1926 { 1874 {
1927 SET_FLAG (tmp, flag); 1875 SET_FLAG (tmp, flag);
1928 flag_inv (tmp, flag); 1876 flag_inv (tmp, flag);
1929 } 1877 }
1930} 1878}
1931 1879
1932/* 1880/*
1933 * deactivate recursively a flag on an object inventory 1881 * deactivate recursively a flag on an object inventory
1934 */ 1882 */
1935void 1883void
1936unflag_inv (object *op, int flag) 1884unflag_inv (object *op, int flag)
1937{ 1885{
1938 if (op->inv)
1939 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1886 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1940 { 1887 {
1941 CLEAR_FLAG (tmp, flag); 1888 CLEAR_FLAG (tmp, flag);
1942 unflag_inv (tmp, flag); 1889 unflag_inv (tmp, flag);
1943 } 1890 }
1944}
1945
1946/*
1947 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1948 * all it's inventory (recursively).
1949 * If checksums are used, a player will get set_cheat called for
1950 * him/her-self and all object carried by a call to this function.
1951 */
1952void
1953set_cheat (object *op)
1954{
1955 SET_FLAG (op, FLAG_WAS_WIZ);
1956 flag_inv (op, FLAG_WAS_WIZ);
1957} 1891}
1958 1892
1959/* 1893/*
1960 * find_free_spot(object, map, x, y, start, stop) will search for 1894 * find_free_spot(object, map, x, y, start, stop) will search for
1961 * a spot at the given map and coordinates which will be able to contain 1895 * a spot at the given map and coordinates which will be able to contain
1963 * to search (see the freearr_x/y[] definition). 1897 * to search (see the freearr_x/y[] definition).
1964 * It returns a random choice among the alternatives found. 1898 * It returns a random choice among the alternatives found.
1965 * start and stop are where to start relative to the free_arr array (1,9 1899 * start and stop are where to start relative to the free_arr array (1,9
1966 * does all 4 immediate directions). This returns the index into the 1900 * does all 4 immediate directions). This returns the index into the
1967 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1901 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1968 * Note - this only checks to see if there is space for the head of the
1969 * object - if it is a multispace object, this should be called for all
1970 * pieces.
1971 * Note2: This function does correctly handle tiled maps, but does not 1902 * Note: This function does correctly handle tiled maps, but does not
1972 * inform the caller. However, insert_ob_in_map will update as 1903 * inform the caller. However, insert_ob_in_map will update as
1973 * necessary, so the caller shouldn't need to do any special work. 1904 * necessary, so the caller shouldn't need to do any special work.
1974 * Note - updated to take an object instead of archetype - this is necessary 1905 * Note - updated to take an object instead of archetype - this is necessary
1975 * because arch_blocked (now ob_blocked) needs to know the movement type 1906 * because arch_blocked (now ob_blocked) needs to know the movement type
1976 * to know if the space in question will block the object. We can't use 1907 * to know if the space in question will block the object. We can't use
1978 * customized, changed states, etc. 1909 * customized, changed states, etc.
1979 */ 1910 */
1980int 1911int
1981find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1912find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1982{ 1913{
1914 int altern[SIZEOFFREE];
1983 int index = 0, flag; 1915 int index = 0, flag;
1984 int altern[SIZEOFFREE];
1985 1916
1986 for (int i = start; i < stop; i++) 1917 for (int i = start; i < stop; i++)
1987 { 1918 {
1988 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1919 mapxy pos (m, x, y); pos.move (i);
1989 if (!flag) 1920
1921 if (!pos.normalise ())
1922 continue;
1923
1924 mapspace &ms = *pos;
1925
1926 if (ms.flags () & P_IS_ALIVE)
1927 continue;
1928
1929 /* However, often
1930 * ob doesn't have any move type (when used to place exits)
1931 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1932 */
1933 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1934 {
1990 altern [index++] = i; 1935 altern [index++] = i;
1936 continue;
1937 }
1991 1938
1992 /* Basically, if we find a wall on a space, we cut down the search size. 1939 /* Basically, if we find a wall on a space, we cut down the search size.
1993 * In this way, we won't return spaces that are on another side of a wall. 1940 * In this way, we won't return spaces that are on another side of a wall.
1994 * This mostly work, but it cuts down the search size in all directions - 1941 * This mostly work, but it cuts down the search size in all directions -
1995 * if the space being examined only has a wall to the north and empty 1942 * if the space being examined only has a wall to the north and empty
1996 * spaces in all the other directions, this will reduce the search space 1943 * spaces in all the other directions, this will reduce the search space
1997 * to only the spaces immediately surrounding the target area, and 1944 * to only the spaces immediately surrounding the target area, and
1998 * won't look 2 spaces south of the target space. 1945 * won't look 2 spaces south of the target space.
1999 */ 1946 */
2000 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1947 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1948 {
2001 stop = maxfree[i]; 1949 stop = maxfree[i];
1950 continue;
1951 }
1952
1953 /* Note it is intentional that we check ob - the movement type of the
1954 * head of the object should correspond for the entire object.
1955 */
1956 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1957 continue;
1958
1959 if (ob->blocked (pos.m, pos.x, pos.y))
1960 continue;
1961
1962 altern [index++] = i;
2002 } 1963 }
2003 1964
2004 if (!index) 1965 if (!index)
2005 return -1; 1966 return -1;
2006 1967
2007 return altern[RANDOM () % index]; 1968 return altern [rndm (index)];
2008} 1969}
2009 1970
2010/* 1971/*
2011 * find_first_free_spot(archetype, maptile, x, y) works like 1972 * find_first_free_spot(archetype, maptile, x, y) works like
2012 * find_free_spot(), but it will search max number of squares. 1973 * find_free_spot(), but it will search max number of squares.
2015 */ 1976 */
2016int 1977int
2017find_first_free_spot (const object *ob, maptile *m, int x, int y) 1978find_first_free_spot (const object *ob, maptile *m, int x, int y)
2018{ 1979{
2019 for (int i = 0; i < SIZEOFFREE; i++) 1980 for (int i = 0; i < SIZEOFFREE; i++)
2020 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1981 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2021 return i; 1982 return i;
2022 1983
2023 return -1; 1984 return -1;
2024} 1985}
2025 1986
2033{ 1994{
2034 arr += begin; 1995 arr += begin;
2035 end -= begin; 1996 end -= begin;
2036 1997
2037 while (--end) 1998 while (--end)
2038 swap (arr [end], arr [RANDOM () % (end + 1)]); 1999 swap (arr [end], arr [rndm (end + 1)]);
2039} 2000}
2040 2001
2041/* new function to make monster searching more efficient, and effective! 2002/* new function to make monster searching more efficient, and effective!
2042 * This basically returns a randomized array (in the passed pointer) of 2003 * This basically returns a randomized array (in the passed pointer) of
2043 * the spaces to find monsters. In this way, it won't always look for 2004 * the spaces to find monsters. In this way, it won't always look for
2071 * there is capable of. 2032 * there is capable of.
2072 */ 2033 */
2073int 2034int
2074find_dir (maptile *m, int x, int y, object *exclude) 2035find_dir (maptile *m, int x, int y, object *exclude)
2075{ 2036{
2076 int i, max = SIZEOFFREE, mflags; 2037 int max = SIZEOFFREE, mflags;
2077
2078 sint16 nx, ny;
2079 object *tmp;
2080 maptile *mp;
2081
2082 MoveType blocked, move_type; 2038 MoveType move_type;
2083 2039
2084 if (exclude && exclude->head) 2040 if (exclude && exclude->head_ () != exclude)
2085 { 2041 {
2086 exclude = exclude->head; 2042 exclude = exclude->head;
2087 move_type = exclude->move_type; 2043 move_type = exclude->move_type;
2088 } 2044 }
2089 else 2045 else
2090 { 2046 {
2091 /* If we don't have anything, presume it can use all movement types. */ 2047 /* If we don't have anything, presume it can use all movement types. */
2092 move_type = MOVE_ALL; 2048 move_type = MOVE_ALL;
2093 } 2049 }
2094 2050
2095 for (i = 1; i < max; i++) 2051 for (int i = 1; i < max; i++)
2096 { 2052 {
2097 mp = m; 2053 mapxy pos (m, x, y);
2098 nx = x + freearr_x[i]; 2054 pos.move (i);
2099 ny = y + freearr_y[i];
2100 2055
2101 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2056 if (!pos.normalise ())
2102
2103 if (mflags & P_OUT_OF_MAP)
2104 max = maxfree[i]; 2057 max = maxfree[i];
2105 else 2058 else
2106 { 2059 {
2107 mapspace &ms = mp->at (nx, ny); 2060 mapspace &ms = *pos;
2108 2061
2109 blocked = ms.move_block;
2110
2111 if ((move_type & blocked) == move_type) 2062 if ((move_type & ms.move_block) == move_type)
2112 max = maxfree[i]; 2063 max = maxfree [i];
2113 else if (mflags & P_IS_ALIVE) 2064 else if (ms.flags () & P_IS_ALIVE)
2114 { 2065 {
2115 for (tmp = ms.bot; tmp; tmp = tmp->above) 2066 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2116 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2067 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2117 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2068 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2118 break;
2119
2120 if (tmp)
2121 return freedir[i]; 2069 return freedir [i];
2122 } 2070 }
2123 } 2071 }
2124 } 2072 }
2125 2073
2126 return 0; 2074 return 0;
2177 2125
2178 return 3; 2126 return 3;
2179} 2127}
2180 2128
2181/* 2129/*
2182 * absdir(int): Returns a number between 1 and 8, which represent
2183 * the "absolute" direction of a number (it actually takes care of
2184 * "overflow" in previous calculations of a direction).
2185 */
2186
2187int
2188absdir (int d)
2189{
2190 while (d < 1)
2191 d += 8;
2192
2193 while (d > 8)
2194 d -= 8;
2195
2196 return d;
2197}
2198
2199/*
2200 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2130 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2201 * between two directions (which are expected to be absolute (see absdir()) 2131 * between two directions (which are expected to be absolute (see absdir())
2202 */ 2132 */
2203
2204int 2133int
2205dirdiff (int dir1, int dir2) 2134dirdiff (int dir1, int dir2)
2206{ 2135{
2207 int d; 2136 int d;
2208 2137
2220 * This basically means that if direction is 15, then it could either go 2149 * This basically means that if direction is 15, then it could either go
2221 * direction 4, 14, or 16 to get back to where we are. 2150 * direction 4, 14, or 16 to get back to where we are.
2222 * Moved from spell_util.c to object.c with the other related direction 2151 * Moved from spell_util.c to object.c with the other related direction
2223 * functions. 2152 * functions.
2224 */ 2153 */
2225int reduction_dir[SIZEOFFREE][3] = { 2154static const int reduction_dir[SIZEOFFREE][3] = {
2226 {0, 0, 0}, /* 0 */ 2155 {0, 0, 0}, /* 0 */
2227 {0, 0, 0}, /* 1 */ 2156 {0, 0, 0}, /* 1 */
2228 {0, 0, 0}, /* 2 */ 2157 {0, 0, 0}, /* 2 */
2229 {0, 0, 0}, /* 3 */ 2158 {0, 0, 0}, /* 3 */
2230 {0, 0, 0}, /* 4 */ 2159 {0, 0, 0}, /* 4 */
2321 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2250 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2322 * core dumps if they do. 2251 * core dumps if they do.
2323 * 2252 *
2324 * Add a check so we can't pick up invisible objects (0.93.8) 2253 * Add a check so we can't pick up invisible objects (0.93.8)
2325 */ 2254 */
2326
2327int 2255int
2328can_pick (const object *who, const object *item) 2256can_pick (const object *who, const object *item)
2329{ 2257{
2330 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2258 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2331 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2259 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2332 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2260 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2333} 2261}
2334 2262
2335/* 2263/*
2336 * create clone from object to another 2264 * create clone from object to another
2337 */ 2265 */
2338object * 2266object *
2339object_create_clone (object *asrc) 2267object::deep_clone ()
2340{ 2268{
2341 object *dst = 0, *tmp, *src, *part, *prev, *item; 2269 assert (("deep_clone called on non-head object", is_head ()));
2342 2270
2343 if (!asrc) 2271 object *dst = clone ();
2344 return 0;
2345 2272
2346 src = asrc; 2273 object *prev = dst;
2347 if (src->head)
2348 src = src->head;
2349
2350 prev = 0;
2351 for (part = src; part; part = part->more) 2274 for (object *part = this->more; part; part = part->more)
2352 { 2275 {
2353 tmp = part->clone (); 2276 object *tmp = part->clone ();
2354 tmp->x -= src->x;
2355 tmp->y -= src->y;
2356
2357 if (!part->head)
2358 {
2359 dst = tmp;
2360 tmp->head = 0;
2361 }
2362 else
2363 tmp->head = dst; 2277 tmp->head = dst;
2364
2365 tmp->more = 0;
2366
2367 if (prev)
2368 prev->more = tmp; 2278 prev->more = tmp;
2369
2370 prev = tmp; 2279 prev = tmp;
2371 } 2280 }
2372 2281
2373 for (item = src->inv; item; item = item->below) 2282 for (object *item = inv; item; item = item->below)
2374 insert_ob_in_ob (object_create_clone (item), dst); 2283 insert_ob_in_ob (item->deep_clone (), dst);
2375 2284
2376 return dst; 2285 return dst;
2377}
2378
2379/* GROS - Creates an object using a string representing its content. */
2380/* Basically, we save the content of the string to a temp file, then call */
2381/* load_object on it. I admit it is a highly inefficient way to make things, */
2382/* but it was simple to make and allows reusing the load_object function. */
2383/* Remember not to use load_object_str in a time-critical situation. */
2384/* Also remember that multiparts objects are not supported for now. */
2385object *
2386load_object_str (const char *obstr)
2387{
2388 object *op;
2389 char filename[MAX_BUF];
2390
2391 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2392
2393 FILE *tempfile = fopen (filename, "w");
2394
2395 if (tempfile == NULL)
2396 {
2397 LOG (llevError, "Error - Unable to access load object temp file\n");
2398 return NULL;
2399 }
2400
2401 fprintf (tempfile, obstr);
2402 fclose (tempfile);
2403
2404 op = object::create ();
2405
2406 object_thawer thawer (filename);
2407
2408 if (thawer)
2409 load_object (thawer, op, 0);
2410
2411 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2412 CLEAR_FLAG (op, FLAG_REMOVED);
2413
2414 return op;
2415} 2286}
2416 2287
2417/* This returns the first object in who's inventory that 2288/* This returns the first object in who's inventory that
2418 * has the same type and subtype match. 2289 * has the same type and subtype match.
2419 * returns NULL if no match. 2290 * returns NULL if no match.
2426 return tmp; 2297 return tmp;
2427 2298
2428 return 0; 2299 return 0;
2429} 2300}
2430 2301
2431/* If ob has a field named key, return the link from the list, 2302shstr_tmp
2432 * otherwise return NULL. 2303object::kv_get (shstr_tmp key) const
2433 *
2434 * key must be a passed in shared string - otherwise, this won't
2435 * do the desired thing.
2436 */
2437key_value *
2438get_ob_key_link (const object *ob, const char *key)
2439{ 2304{
2440 for (key_value *link = ob->key_values; link; link = link->next) 2305 for (key_value *kv = key_values; kv; kv = kv->next)
2441 if (link->key == key) 2306 if (kv->key == key)
2442 return link;
2443
2444 return 0;
2445}
2446
2447/*
2448 * Returns the value of op has an extra_field for key, or NULL.
2449 *
2450 * The argument doesn't need to be a shared string.
2451 *
2452 * The returned string is shared.
2453 */
2454const char *
2455get_ob_key_value (const object *op, const char *const key)
2456{
2457 key_value *link;
2458 shstr_cmp canonical_key (key);
2459
2460 if (!canonical_key)
2461 {
2462 /* 1. There being a field named key on any object
2463 * implies there'd be a shared string to find.
2464 * 2. Since there isn't, no object has this field.
2465 * 3. Therefore, *this* object doesn't have this field.
2466 */
2467 return 0;
2468 }
2469
2470 /* This is copied from get_ob_key_link() above -
2471 * only 4 lines, and saves the function call overhead.
2472 */
2473 for (link = op->key_values; link; link = link->next)
2474 if (link->key == canonical_key)
2475 return link->value; 2307 return kv->value;
2476 2308
2477 return 0; 2309 return shstr ();
2478} 2310}
2479 2311
2480 2312void
2481/* 2313object::kv_set (shstr_tmp key, shstr_tmp value)
2482 * Updates the canonical_key in op to value.
2483 *
2484 * canonical_key is a shared string (value doesn't have to be).
2485 *
2486 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2487 * keys.
2488 *
2489 * Returns TRUE on success.
2490 */
2491int
2492set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2493{ 2314{
2494 key_value *field = NULL, *last = NULL; 2315 for (key_value *kv = key_values; kv; kv = kv->next)
2495 2316 if (kv->key == key)
2496 for (field = op->key_values; field != NULL; field = field->next)
2497 {
2498 if (field->key != canonical_key)
2499 { 2317 {
2500 last = field; 2318 kv->value = value;
2501 continue; 2319 return;
2502 } 2320 }
2503 2321
2504 if (value) 2322 key_value *kv = new key_value;
2505 field->value = value; 2323
2506 else 2324 kv->next = key_values;
2325 kv->key = key;
2326 kv->value = value;
2327
2328 key_values = kv;
2329}
2330
2331void
2332object::kv_del (shstr_tmp key)
2333{
2334 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2335 if ((*kvp)->key == key)
2507 { 2336 {
2508 /* Basically, if the archetype has this key set, 2337 key_value *kv = *kvp;
2509 * we need to store the null value so when we save 2338 *kvp = (*kvp)->next;
2510 * it, we save the empty value so that when we load, 2339 delete kv;
2511 * we get this value back again. 2340 return;
2512 */
2513 if (get_ob_key_link (&op->arch->clone, canonical_key))
2514 field->value = 0;
2515 else
2516 {
2517 if (last)
2518 last->next = field->next;
2519 else
2520 op->key_values = field->next;
2521
2522 delete field;
2523 }
2524 } 2341 }
2525 return TRUE;
2526 }
2527 /* IF we get here, key doesn't exist */
2528
2529 /* No field, we'll have to add it. */
2530
2531 if (!add_key)
2532 return FALSE;
2533
2534 /* There isn't any good reason to store a null
2535 * value in the key/value list. If the archetype has
2536 * this key, then we should also have it, so shouldn't
2537 * be here. If user wants to store empty strings,
2538 * should pass in ""
2539 */
2540 if (value == NULL)
2541 return TRUE;
2542
2543 field = new key_value;
2544
2545 field->key = canonical_key;
2546 field->value = value;
2547 /* Usual prepend-addition. */
2548 field->next = op->key_values;
2549 op->key_values = field;
2550
2551 return TRUE;
2552}
2553
2554/*
2555 * Updates the key in op to value.
2556 *
2557 * If add_key is FALSE, this will only update existing keys,
2558 * and not add new ones.
2559 * In general, should be little reason FALSE is ever passed in for add_key
2560 *
2561 * Returns TRUE on success.
2562 */
2563int
2564set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2565{
2566 shstr key_ (key);
2567
2568 return set_ob_key_value_s (op, key_, value, add_key);
2569} 2342}
2570 2343
2571object::depth_iterator::depth_iterator (object *container) 2344object::depth_iterator::depth_iterator (object *container)
2572: iterator_base (container) 2345: iterator_base (container)
2573{ 2346{
2587 } 2360 }
2588 else 2361 else
2589 item = item->env; 2362 item = item->env;
2590} 2363}
2591 2364
2365const char *
2366object::flag_desc (char *desc, int len) const
2367{
2368 char *p = desc;
2369 bool first = true;
2370
2371 *p = 0;
2372
2373 for (int i = 0; i < NUM_FLAGS; i++)
2374 {
2375 if (len <= 10) // magic constant!
2376 {
2377 snprintf (p, len, ",...");
2378 break;
2379 }
2380
2381 if (flag [i])
2382 {
2383 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2384 len -= cnt;
2385 p += cnt;
2386 first = false;
2387 }
2388 }
2389
2390 return desc;
2391}
2392
2592// return a suitable string describing an objetc in enough detail to find it 2393// return a suitable string describing an object in enough detail to find it
2593const char * 2394const char *
2594object::debug_desc (char *info) const 2395object::debug_desc (char *info) const
2595{ 2396{
2397 char flagdesc[512];
2596 char info2[256 * 3]; 2398 char info2[256 * 4];
2597 char *p = info; 2399 char *p = info;
2598 2400
2599 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2401 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2600 count, 2402 count,
2403 uuid.c_str (),
2601 &name, 2404 &name,
2602 title ? " " : "", 2405 title ? ",title:\"" : "",
2603 title ? (const char *)title : ""); 2406 title ? (const char *)title : "",
2407 title ? "\"" : "",
2408 flag_desc (flagdesc, 512), type);
2604 2409
2605 if (env) 2410 if (!flag[FLAG_REMOVED] && env)
2606 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2411 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2607 2412
2608 if (map) 2413 if (map)
2609 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2414 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2610 2415
2611 return info; 2416 return info;
2612} 2417}
2613 2418
2614const char * 2419const char *
2615object::debug_desc () const 2420object::debug_desc () const
2616{ 2421{
2617 static char info[256 * 3]; 2422 static char info[3][256 * 4];
2423 static int info_idx;
2424
2618 return debug_desc (info); 2425 return debug_desc (info [++info_idx % 3]);
2619} 2426}
2620 2427
2428struct region *
2429object::region () const
2430{
2431 return map ? map->region (x, y)
2432 : region::default_region ();
2433}
2434
2435const materialtype_t *
2436object::dominant_material () const
2437{
2438 if (materialtype_t *mt = name_to_material (materialname))
2439 return mt;
2440
2441 return name_to_material (shstr_unknown);
2442}
2443
2444void
2445object::open_container (object *new_container)
2446{
2447 if (container == new_container)
2448 return;
2449
2450 object *old_container = container;
2451
2452 if (old_container)
2453 {
2454 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2455 return;
2456
2457#if 0
2458 // remove the "Close old_container" object.
2459 if (object *closer = old_container->inv)
2460 if (closer->type == CLOSE_CON)
2461 closer->destroy ();
2462#endif
2463
2464 // make sure the container is available
2465 esrv_send_item (this, old_container);
2466
2467 old_container->flag [FLAG_APPLIED] = false;
2468 container = 0;
2469
2470 // client needs item update to make it work, client bug requires this to be separate
2471 esrv_update_item (UPD_FLAGS, this, old_container);
2472
2473 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2474 play_sound (sound_find ("chest_close"));
2475 }
2476
2477 if (new_container)
2478 {
2479 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2480 return;
2481
2482 // TODO: this does not seem to serve any purpose anymore?
2483#if 0
2484 // insert the "Close Container" object.
2485 if (archetype *closer = new_container->other_arch)
2486 {
2487 object *closer = arch_to_object (new_container->other_arch);
2488 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2489 new_container->insert (closer);
2490 }
2491#endif
2492
2493 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2494
2495 // make sure the container is available, client bug requires this to be separate
2496 esrv_send_item (this, new_container);
2497
2498 new_container->flag [FLAG_APPLIED] = true;
2499 container = new_container;
2500
2501 // client needs flag change
2502 esrv_update_item (UPD_FLAGS, this, new_container);
2503 esrv_send_inventory (this, new_container);
2504 play_sound (sound_find ("chest_open"));
2505 }
2506// else if (!old_container->env && contr && contr->ns)
2507// contr->ns->floorbox_reset ();
2508}
2509
2510object *
2511object::force_find (shstr_tmp name)
2512{
2513 /* cycle through his inventory to look for the MARK we want to
2514 * place
2515 */
2516 for (object *tmp = inv; tmp; tmp = tmp->below)
2517 if (tmp->type == FORCE && tmp->slaying == name)
2518 return splay (tmp);
2519
2520 return 0;
2521}
2522
2523//-GPL
2524
2525void
2526object::force_set_timer (int duration)
2527{
2528 this->duration = 1;
2529 this->speed_left = -1.f;
2530
2531 this->set_speed (duration ? 1.f / duration : 0.f);
2532}
2533
2534object *
2535object::force_add (shstr_tmp name, int duration)
2536{
2537 if (object *force = force_find (name))
2538 force->destroy ();
2539
2540 object *force = get_archetype (FORCE_NAME);
2541
2542 force->slaying = name;
2543 force->force_set_timer (duration);
2544 force->flag [FLAG_APPLIED] = true;
2545
2546 return insert (force);
2547}
2548
2549void
2550object::play_sound (faceidx sound) const
2551{
2552 if (!sound)
2553 return;
2554
2555 if (is_on_map ())
2556 map->play_sound (sound, x, y);
2557 else if (object *pl = in_player ())
2558 pl->contr->play_sound (sound);
2559}
2560
2561void
2562object::say_msg (const char *msg) const
2563{
2564 if (is_on_map ())
2565 map->say_msg (msg, x, y);
2566 else if (object *pl = in_player ())
2567 pl->contr->play_sound (sound);
2568}
2569
2570void
2571object::make_noise ()
2572{
2573 // we do not model noise in the map, so instead put
2574 // a temporary light into the noise source
2575 // could use the map instead, but that's less reliable for our
2576 // goal, which is to make invisibility a bit harder to exploit
2577
2578 // currently only works sensibly for players
2579 if (!is_player ())
2580 return;
2581
2582 // find old force, or create new one
2583 object *force = force_find (shstr_noise_force);
2584
2585 if (force)
2586 force->speed_left = -1.f; // patch old speed up
2587 else
2588 {
2589 force = archetype::get (shstr_noise_force);
2590
2591 force->slaying = shstr_noise_force;
2592 force->stats.food = 1;
2593 force->speed_left = -1.f;
2594
2595 force->set_speed (1.f / 4.f);
2596 force->flag [FLAG_IS_USED_UP] = true;
2597 force->flag [FLAG_APPLIED] = true;
2598
2599 insert (force);
2600 }
2601}
2602

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines