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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines