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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines