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.110 by root, Sun Jan 7 23:12:03 2007 UTC vs.
Revision 1.234 by root, Tue May 6 18:47:52 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. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
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 return ((unsigned int)i) < objects.size () 467 for_all_objects (op)
401 ? objects [i] 468 if (op->count == i)
402 : 0; 469 return op;
470
471 return 0;
403} 472}
404 473
405/* 474/*
406 * Returns the first object which has a name equal to the argument. 475 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 476 * Used only by the patch command, but not all that useful.
418 break; 487 break;
419 488
420 return op; 489 return op;
421} 490}
422 491
423void
424free_all_object_data ()
425{
426 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
427}
428
429/* 492/*
430 * 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
431 * skill and experience objects. 494 * skill and experience objects.
495 * ACTUALLY NO! investigate! TODO
432 */ 496 */
433void 497void
434object::set_owner (object *owner) 498object::set_owner (object *owner)
435{ 499{
500 // allow objects which own objects
436 if (!owner) 501 if (owner)
437 return;
438
439 /* next line added to allow objects which own objects */
440 /* Add a check for ownercounts in here, as I got into an endless loop
441 * with the fireball owning a poison cloud which then owned the
442 * fireball. I believe that was caused by one of the objects getting
443 * freed and then another object replacing it. Since the ownercounts
444 * didn't match, this check is valid and I believe that cause is valid.
445 */
446 while (owner->owner) 502 while (owner->owner)
447 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 }
448 510
449 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;
450} 578}
451 579
452/* Zero the key_values on op, decrementing the shared-string 580/* Zero the key_values on op, decrementing the shared-string
453 * refcounts and freeing the links. 581 * refcounts and freeing the links.
454 */ 582 */
455static void 583static void
456free_key_values (object *op) 584free_key_values (object *op)
457{ 585{
458 for (key_value *i = op->key_values; i != 0;) 586 for (key_value *i = op->key_values; i; )
459 { 587 {
460 key_value *next = i->next; 588 key_value *next = i->next;
461 delete i; 589 delete i;
462 590
463 i = next; 591 i = next;
475 * will point at garbage. 603 * will point at garbage.
476 */ 604 */
477void 605void
478object::copy_to (object *dst) 606object::copy_to (object *dst)
479{ 607{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 608 dst->remove ();
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
482
483 *(object_copy *)dst = *this; 609 *(object_copy *)dst = *this;
484 610 dst->flag [FLAG_REMOVED] = true;
485 if (is_freed)
486 SET_FLAG (dst, FLAG_FREED);
487
488 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED);
490
491 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493 611
494 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
495 if (key_values) 613 if (key_values)
496 { 614 {
497 key_value *tail = 0; 615 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 616 dst->key_values = 0;
501 617
502 for (i = key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
503 { 619 {
504 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
505 621
506 new_link->next = 0; 622 new_link->next = 0;
507 new_link->key = i->key; 623 new_link->key = i->key;
508 new_link->value = i->value; 624 new_link->value = i->value;
509 625
510 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
511 if (!dst->key_values) 627 if (!dst->key_values)
512 { 628 {
519 tail = new_link; 635 tail = new_link;
520 } 636 }
521 } 637 }
522 } 638 }
523 639
640 if (speed < 0)
641 dst->speed_left -= rndm ();
642
524 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 ();
525} 663}
526 664
527object * 665object *
528object::clone () 666object::clone ()
529{ 667{
530 object *neu = create (); 668 object *neu = create ();
531 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
532 return neu; 671 return neu;
533} 672}
534 673
535/* 674/*
536 * 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
587 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
588 */ 727 */
589void 728void
590update_object (object *op, int action) 729update_object (object *op, int action)
591{ 730{
592 MoveType move_on, move_off, move_block, move_slow; 731 if (!op)
593
594 if (op == NULL)
595 { 732 {
596 /* this should never happen */ 733 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
598 return; 735 return;
599 } 736 }
600 737
601 if (op->env) 738 if (!op->is_on_map ())
602 { 739 {
603 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
604 * to do in this case. 741 * to do in this case.
605 */ 742 */
606 return; 743 return;
607 } 744 }
608
609 /* If the map is saving, don't do anything as everything is
610 * going to get freed anyways.
611 */
612 if (!op->map || op->map->in_memory == MAP_SAVING)
613 return;
614 745
615 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
616 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)
617 { 748 {
618 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
658 789
659 if (op->more) 790 if (op->more)
660 update_object (op->more, action); 791 update_object (op->more, action);
661} 792}
662 793
663object *object::first;
664
665object::object () 794object::object ()
666{ 795{
667 SET_FLAG (this, FLAG_REMOVED); 796 SET_FLAG (this, FLAG_REMOVED);
668 797
669 expmul = 1.0; 798 expmul = 1.0;
670 face = blank_face; 799 face = blank_face;
671} 800}
672 801
673object::~object () 802object::~object ()
674{ 803{
804 unlink ();
805
675 free_key_values (this); 806 free_key_values (this);
676} 807}
677 808
809static int object_count;
810
678void object::link () 811void object::link ()
679{ 812{
680 uuid = gen_uuid (); 813 assert (!index);//D
814 uuid = UUID::gen ();
815 count = ++object_count;
681 816
682 refcnt_inc (); 817 refcnt_inc ();
683 objects.insert (this); 818 objects.insert (this);
684} 819}
685 820
686void object::unlink () 821void object::unlink ()
687{ 822{
823 if (!index)
824 return;
825
688 objects.erase (this); 826 objects.erase (this);
689 refcnt_dec (); 827 refcnt_dec ();
690} 828}
691 829
692void 830void
754object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
755{ 893{
756 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
757 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
758 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
759 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
760 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
761 if (!inv) 899 if (!inv)
762 return; 900 return;
763 901
764 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
765 * if some form of movement is allowed, let objects 903 * if some form of movement is allowed, let objects
766 * drop on that space. 904 * drop on that space.
767 */ 905 */
768 if (!drop_to_ground 906 if (!drop_to_ground
769 || !map 907 || !map
770 || map->in_memory != MAP_IN_MEMORY 908 || map->in_memory != MAP_ACTIVE
909 || map->nodrop
771 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
772 { 911 {
773 while (inv) 912 while (inv)
774 { 913 {
775 inv->destroy_inv (drop_to_ground); 914 inv->destroy_inv (false);
776 inv->destroy (); 915 inv->destroy ();
777 } 916 }
778 } 917 }
779 else 918 else
780 { /* Put objects in inventory onto this space */ 919 { /* Put objects in inventory onto this space */
786 || op->flag [FLAG_NO_DROP] 925 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE 926 || op->type == RUNE
788 || op->type == TRAP 927 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE] 928 || op->flag [FLAG_IS_A_TEMPLATE]
790 || op->flag [FLAG_DESTROY_ON_DEATH]) 929 || op->flag [FLAG_DESTROY_ON_DEATH])
791 op->destroy (); 930 op->destroy (true);
792 else 931 else
793 map->insert (op, x, y); 932 map->insert (op, x, y);
794 } 933 }
795 } 934 }
796} 935}
800 object *op = new object; 939 object *op = new object;
801 op->link (); 940 op->link ();
802 return op; 941 return op;
803} 942}
804 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 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
805void 964void
806object::do_destroy () 965object::do_destroy ()
807{ 966{
808 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
809 remove_button_link (this); 968 remove_button_link (this);
810 969
811 if (flag [FLAG_FRIENDLY]) 970 if (flag [FLAG_FRIENDLY])
812 remove_friendly_object (this); 971 remove_friendly_object (this);
813 972
814 if (!flag [FLAG_REMOVED])
815 remove (); 973 remove ();
816 974
817 if (flag [FLAG_FREED]) 975 attachable::do_destroy ();
818 return;
819 976
820 set_speed (0); 977 deactivate ();
978 unlink ();
821 979
822 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
823 981
824 attachable::do_destroy ();
825
826 destroy_inv (true);
827 unlink ();
828
829 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
830 {
831 static maptile *freed_map; // freed objects are moved here to avoid crashes
832
833 if (!freed_map)
834 {
835 freed_map = new maptile;
836
837 freed_map->name = "/internal/freed_objects_map";
838 freed_map->width = 3;
839 freed_map->height = 3;
840
841 freed_map->alloc ();
842 freed_map->in_memory = MAP_IN_MEMORY;
843 }
844
845 map = freed_map; 983 map = &freed_map;
846 x = 1; 984 x = 1;
847 y = 1; 985 y = 1;
848 }
849
850 head = 0;
851 986
852 if (more) 987 if (more)
853 { 988 {
854 more->destroy (); 989 more->destroy ();
855 more = 0; 990 more = 0;
856 } 991 }
857 992
993 head = 0;
994
858 // clear those pointers that likely might have circular references to us 995 // clear those pointers that likely might cause circular references
859 owner = 0; 996 owner = 0;
860 enemy = 0; 997 enemy = 0;
861 attacked_by = 0; 998 attacked_by = 0;
999 current_weapon = 0;
862} 1000}
863 1001
864void 1002void
865object::destroy (bool destroy_inventory) 1003object::destroy (bool destroy_inventory)
866{ 1004{
867 if (destroyed ()) 1005 if (destroyed ())
868 return; 1006 return;
869 1007
1008 if (!is_head () && !head->destroyed ())
1009 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory);
1012 return;
1013 }
1014
870 if (destroy_inventory) 1015 destroy_inv (!destroy_inventory);
871 destroy_inv (false); 1016
1017 if (is_head ())
1018 if (sound_destroy)
1019 play_sound (sound_destroy);
1020 else if (flag [FLAG_MONSTER])
1021 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
872 1022
873 attachable::destroy (); 1023 attachable::destroy ();
874}
875
876/*
877 * sub_weight() recursively (outwards) subtracts a number from the
878 * weight of an object (and what is carried by it's environment(s)).
879 */
880void
881sub_weight (object *op, signed long weight)
882{
883 while (op != NULL)
884 {
885 if (op->type == CONTAINER)
886 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
887
888 op->carrying -= weight;
889 op = op->env;
890 }
891} 1024}
892 1025
893/* op->remove (): 1026/* op->remove ():
894 * This function removes the object op from the linked list of objects 1027 * This function removes the object op from the linked list of objects
895 * which it is currently tied to. When this function is done, the 1028 * which it is currently tied to. When this function is done, the
896 * object will have no environment. If the object previously had an 1029 * object will have no environment. If the object previously had an
897 * environment, the x and y coordinates will be updated to 1030 * environment, the x and y coordinates will be updated to
898 * the previous environment. 1031 * the previous environment.
899 * Beware: This function is called from the editor as well!
900 */ 1032 */
901void 1033void
902object::remove () 1034object::do_remove ()
903{ 1035{
904 object *tmp, *last = 0; 1036 object *tmp, *last = 0;
905 object *otmp; 1037 object *otmp;
906 1038
907 if (QUERY_FLAG (this, FLAG_REMOVED)) 1039 if (flag [FLAG_REMOVED])
908 return; 1040 return;
909 1041
910 SET_FLAG (this, FLAG_REMOVED);
911 INVOKE_OBJECT (REMOVE, this); 1042 INVOKE_OBJECT (REMOVE, this);
1043
1044 flag [FLAG_REMOVED] = true;
912 1045
913 if (more) 1046 if (more)
914 more->remove (); 1047 more->remove ();
915 1048
916 /* 1049 /*
917 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
918 * inventory. 1051 * inventory.
919 */ 1052 */
920 if (env) 1053 if (env)
921 { 1054 {
1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059
1060 adjust_weight (env, -total_weight ());
1061
1062 *(above ? &above->below : &env->inv) = below;
1063
922 if (nrof) 1064 if (below)
923 sub_weight (env, weight * nrof); 1065 below->above = above;
924 else 1066
925 sub_weight (env, weight + carrying); 1067 /* we set up values so that it could be inserted into
1068 * the map, but we don't actually do that - it is up
1069 * to the caller to decide what we want to do.
1070 */
1071 map = env->map;
1072 x = env->x;
1073 y = env->y;
1074 above = 0;
1075 below = 0;
1076 env = 0;
926 1077
927 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
928 * made to players inventory. If set, avoiding the call 1079 * made to players inventory. If set, avoiding the call
929 * to save cpu time. 1080 * to save cpu time.
930 */ 1081 */
931 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
932 otmp->update_stats (); 1083 otmp->update_stats ();
933
934 if (above)
935 above->below = below;
936 else
937 env->inv = below;
938
939 if (below)
940 below->above = above;
941
942 /* we set up values so that it could be inserted into
943 * the map, but we don't actually do that - it is up
944 * to the caller to decide what we want to do.
945 */
946 x = env->x, y = env->y;
947 map = env->map;
948 above = 0, below = 0;
949 env = 0;
950 } 1084 }
951 else if (map) 1085 else if (map)
952 { 1086 {
953 if (type == PLAYER) 1087 map->dirty = true;
1088 mapspace &ms = this->ms ();
1089
1090 if (object *pl = ms.player ())
954 { 1091 {
1092 if (type == PLAYER) // this == pl(!)
1093 {
1094 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent.
1098 close_container ();
1099
955 --map->players; 1100 --map->players;
956 map->touch (); 1101 map->touch ();
1102 }
1103 else if (pl->container == this)
1104 {
1105 // removing a container should close it
1106 close_container ();
1107 }
1108
1109 esrv_del_item (pl->contr, count);
957 } 1110 }
958
959 map->dirty = true;
960 1111
961 /* link the object above us */ 1112 /* link the object above us */
962 if (above) 1113 if (above)
963 above->below = below; 1114 above->below = below;
964 else 1115 else
965 map->at (x, y).top = below; /* we were top, set new top */ 1116 ms.top = below; /* we were top, set new top */
966 1117
967 /* Relink the object below us, if there is one */ 1118 /* Relink the object below us, if there is one */
968 if (below) 1119 if (below)
969 below->above = above; 1120 below->above = above;
970 else 1121 else
972 /* Nothing below, which means we need to relink map object for this space 1123 /* Nothing below, which means we need to relink map object for this space
973 * use translated coordinates in case some oddness with map tiling is 1124 * use translated coordinates in case some oddness with map tiling is
974 * evident 1125 * evident
975 */ 1126 */
976 if (GET_MAP_OB (map, x, y) != this) 1127 if (GET_MAP_OB (map, x, y) != this)
977 {
978 char *dump = dump_object (this);
979 LOG (llevError,
980 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1128 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 ());
981 free (dump);
982 dump = dump_object (GET_MAP_OB (map, x, y));
983 LOG (llevError, "%s\n", dump);
984 free (dump);
985 }
986 1129
987 map->at (x, y).bot = above; /* goes on above it. */ 1130 ms.bot = above; /* goes on above it. */
988 } 1131 }
989 1132
990 above = 0; 1133 above = 0;
991 below = 0; 1134 below = 0;
992 1135
993 if (map->in_memory == MAP_SAVING) 1136 if (map->in_memory == MAP_SAVING)
994 return; 1137 return;
995 1138
996 int check_walk_off = !flag [FLAG_NO_APPLY]; 1139 int check_walk_off = !flag [FLAG_NO_APPLY];
997 1140
1141 if (object *pl = ms.player ())
1142 {
1143 if (pl->container == this)
1144 /* If a container that the player is currently using somehow gets
1145 * removed (most likely destroyed), update the player view
1146 * appropriately.
1147 */
1148 pl->close_container ();
1149
1150 //TODO: the floorbox prev/next might need updating
1151 //esrv_del_item (pl->contr, count);
1152 //TODO: update floorbox to preserve ordering
1153 if (pl->contr->ns)
1154 pl->contr->ns->floorbox_update ();
1155 }
1156
998 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1157 for (tmp = ms.bot; tmp; tmp = tmp->above)
999 { 1158 {
1000 /* No point updating the players look faces if he is the object 1159 /* No point updating the players look faces if he is the object
1001 * being removed. 1160 * being removed.
1002 */ 1161 */
1003
1004 if (tmp->type == PLAYER && tmp != this)
1005 {
1006 /* If a container that the player is currently using somehow gets
1007 * removed (most likely destroyed), update the player view
1008 * appropriately.
1009 */
1010 if (tmp->container == this)
1011 {
1012 flag [FLAG_APPLIED] = 0;
1013 tmp->container = 0;
1014 }
1015
1016 if (tmp->contr->ns)
1017 tmp->contr->ns->floorbox_update ();
1018 }
1019 1162
1020 /* See if object moving off should effect something */ 1163 /* See if object moving off should effect something */
1021 if (check_walk_off 1164 if (check_walk_off
1022 && ((move_type & tmp->move_off) 1165 && ((move_type & tmp->move_off)
1023 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1166 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1026 1169
1027 if (destroyed ()) 1170 if (destroyed ())
1028 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1171 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1029 } 1172 }
1030 1173
1031 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1032 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1033 if (tmp->above == tmp)
1034 tmp->above = 0;
1035
1036 last = tmp; 1174 last = tmp;
1037 } 1175 }
1038 1176
1039 /* last == NULL if there are no objects on this space */ 1177 /* last == NULL if there are no objects on this space */
1040 //TODO: this makes little sense, why only update the topmost object? 1178 //TODO: this makes little sense, why only update the topmost object?
1060merge_ob (object *op, object *top) 1198merge_ob (object *op, object *top)
1061{ 1199{
1062 if (!op->nrof) 1200 if (!op->nrof)
1063 return 0; 1201 return 0;
1064 1202
1065 if (top) 1203 if (!top)
1066 for (top = op; top && top->above; top = top->above) 1204 for (top = op; top && top->above; top = top->above)
1067 ; 1205 ;
1068 1206
1069 for (; top; top = top->below) 1207 for (; top; top = top->below)
1070 {
1071 if (top == op)
1072 continue;
1073
1074 if (object::can_merge (op, top)) 1208 if (object::can_merge (op, top))
1075 { 1209 {
1076 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1077 1211
1078/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212 if (object *pl = top->visible_to ())
1079 op->weight = 0; /* Don't want any adjustements now */ 1213 esrv_update_item (UPD_NROF, pl, top);
1214
1215 op->weight = 0; // cancel the addition above
1216 op->carrying = 0; // must be 0 already
1217
1080 op->destroy (); 1218 op->destroy (1);
1219
1081 return top; 1220 return top;
1082 } 1221 }
1083 }
1084 1222
1085 return 0; 1223 return 0;
1086} 1224}
1087 1225
1226void
1227object::expand_tail ()
1228{
1229 if (more)
1230 return;
1231
1232 object *prev = this;
1233
1234 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1235 {
1236 object *op = arch_to_object (at);
1237
1238 op->name = name;
1239 op->name_pl = name_pl;
1240 op->title = title;
1241
1242 op->head = this;
1243 prev->more = op;
1244
1245 prev = op;
1246 }
1247}
1248
1088/* 1249/*
1089 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1250 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1090 * job preparing multi-part monsters 1251 * job preparing multi-part monsters.
1091 */ 1252 */
1092object * 1253object *
1093insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1254insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1094{ 1255{
1095 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1256 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1096 { 1257 {
1097 tmp->x = x + tmp->arch->clone.x; 1258 tmp->x = x + tmp->arch->x;
1098 tmp->y = y + tmp->arch->clone.y; 1259 tmp->y = y + tmp->arch->y;
1099 } 1260 }
1100 1261
1101 return insert_ob_in_map (op, m, originator, flag); 1262 return insert_ob_in_map (op, m, originator, flag);
1102} 1263}
1103 1264
1122 * just 'op' otherwise 1283 * just 'op' otherwise
1123 */ 1284 */
1124object * 1285object *
1125insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1286insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1126{ 1287{
1127 object *tmp, *top, *floor = NULL; 1288 assert (!op->flag [FLAG_FREED]);
1128 sint16 x, y;
1129 1289
1130 if (QUERY_FLAG (op, FLAG_FREED)) 1290 op->remove ();
1131 {
1132 LOG (llevError, "Trying to insert freed object!\n");
1133 return NULL;
1134 }
1135
1136 if (!m)
1137 {
1138 char *dump = dump_object (op);
1139 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1140 free (dump);
1141 return op;
1142 }
1143
1144 if (out_of_map (m, op->x, op->y))
1145 {
1146 char *dump = dump_object (op);
1147 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1148#ifdef MANY_CORES
1149 /* Better to catch this here, as otherwise the next use of this object
1150 * is likely to cause a crash. Better to find out where it is getting
1151 * improperly inserted.
1152 */
1153 abort ();
1154#endif
1155 free (dump);
1156 return op;
1157 }
1158
1159 if (!QUERY_FLAG (op, FLAG_REMOVED))
1160 {
1161 char *dump = dump_object (op);
1162 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1163 free (dump);
1164 return op;
1165 }
1166
1167 if (op->more)
1168 {
1169 /* The part may be on a different map. */
1170
1171 object *more = op->more;
1172
1173 /* We really need the caller to normalise coordinates - if
1174 * we set the map, that doesn't work if the location is within
1175 * a map and this is straddling an edge. So only if coordinate
1176 * is clear wrong do we normalise it.
1177 */
1178 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1179 more->map = get_map_from_coord (m, &more->x, &more->y);
1180 else if (!more->map)
1181 {
1182 /* For backwards compatibility - when not dealing with tiled maps,
1183 * more->map should always point to the parent.
1184 */
1185 more->map = m;
1186 }
1187
1188 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1189 {
1190 if (!op->head)
1191 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1192
1193 return 0;
1194 }
1195 }
1196
1197 CLEAR_FLAG (op, FLAG_REMOVED);
1198 1291
1199 /* Ideally, the caller figures this out. However, it complicates a lot 1292 /* Ideally, the caller figures this out. However, it complicates a lot
1200 * of areas of callers (eg, anything that uses find_free_spot would now 1293 * of areas of callers (eg, anything that uses find_free_spot would now
1201 * need extra work 1294 * need extra work
1202 */ 1295 */
1203 op->map = get_map_from_coord (m, &op->x, &op->y); 1296 if (!xy_normalise (m, op->x, op->y))
1204 x = op->x; 1297 {
1205 y = op->y; 1298 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1299 return 0;
1300 }
1301
1302 if (object *more = op->more)
1303 if (!insert_ob_in_map (more, m, originator, flag))
1304 return 0;
1305
1306 CLEAR_FLAG (op, FLAG_REMOVED);
1307
1308 op->map = m;
1309 mapspace &ms = op->ms ();
1206 1310
1207 /* this has to be done after we translate the coordinates. 1311 /* this has to be done after we translate the coordinates.
1208 */ 1312 */
1209 if (op->nrof && !(flag & INS_NO_MERGE)) 1313 if (op->nrof && !(flag & INS_NO_MERGE))
1210 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1314 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1211 if (object::can_merge (op, tmp)) 1315 if (object::can_merge (op, tmp))
1212 { 1316 {
1317 // TODO: we atcually want to update tmp, not op,
1318 // but some caller surely breaks when we return tmp
1319 // from here :/
1213 op->nrof += tmp->nrof; 1320 op->nrof += tmp->nrof;
1214 tmp->destroy (); 1321 tmp->destroy (1);
1215 } 1322 }
1216 1323
1217 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1324 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1218 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1325 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1219 1326
1232 op->below = originator->below; 1339 op->below = originator->below;
1233 1340
1234 if (op->below) 1341 if (op->below)
1235 op->below->above = op; 1342 op->below->above = op;
1236 else 1343 else
1237 op->ms ().bot = op; 1344 ms.bot = op;
1238 1345
1239 /* since *below* originator, no need to update top */ 1346 /* since *below* originator, no need to update top */
1240 originator->below = op; 1347 originator->below = op;
1241 } 1348 }
1242 else 1349 else
1243 { 1350 {
1351 object *top, *floor = NULL;
1352
1353 top = ms.bot;
1354
1244 /* If there are other objects, then */ 1355 /* If there are other objects, then */
1245 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1356 if (top)
1246 { 1357 {
1247 object *last = 0; 1358 object *last = 0;
1248 1359
1249 /* 1360 /*
1250 * If there are multiple objects on this space, we do some trickier handling. 1361 * If there are multiple objects on this space, we do some trickier handling.
1256 * once we get to them. This reduces the need to traverse over all of 1367 * once we get to them. This reduces the need to traverse over all of
1257 * them when adding another one - this saves quite a bit of cpu time 1368 * them when adding another one - this saves quite a bit of cpu time
1258 * when lots of spells are cast in one area. Currently, it is presumed 1369 * when lots of spells are cast in one area. Currently, it is presumed
1259 * that flying non pickable objects are spell objects. 1370 * that flying non pickable objects are spell objects.
1260 */ 1371 */
1261 while (top) 1372 for (top = ms.bot; top; top = top->above)
1262 { 1373 {
1263 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1374 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1264 floor = top; 1375 floor = top;
1265 1376
1266 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1377 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1269 top = top->below; 1380 top = top->below;
1270 break; 1381 break;
1271 } 1382 }
1272 1383
1273 last = top; 1384 last = top;
1274 top = top->above;
1275 } 1385 }
1276 1386
1277 /* Don't want top to be NULL, so set it to the last valid object */ 1387 /* Don't want top to be NULL, so set it to the last valid object */
1278 top = last; 1388 top = last;
1279 1389
1281 * looks like instead of lots of conditions here. 1391 * looks like instead of lots of conditions here.
1282 * makes things faster, and effectively the same result. 1392 * makes things faster, and effectively the same result.
1283 */ 1393 */
1284 1394
1285 /* Have object 'fall below' other objects that block view. 1395 /* Have object 'fall below' other objects that block view.
1286 * Unless those objects are exits, type 66 1396 * Unless those objects are exits.
1287 * If INS_ON_TOP is used, don't do this processing 1397 * If INS_ON_TOP is used, don't do this processing
1288 * Need to find the object that in fact blocks view, otherwise 1398 * Need to find the object that in fact blocks view, otherwise
1289 * stacking is a bit odd. 1399 * stacking is a bit odd.
1290 */ 1400 */
1291 if (!(flag & INS_ON_TOP) && 1401 if (!(flag & INS_ON_TOP)
1292 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1402 && ms.flags () & P_BLOCKSVIEW
1403 && (op->face && !faces [op->face].visibility))
1293 { 1404 {
1294 for (last = top; last != floor; last = last->below) 1405 for (last = top; last != floor; last = last->below)
1295 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1406 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1296 break; 1407 break;
1408
1297 /* Check to see if we found the object that blocks view, 1409 /* Check to see if we found the object that blocks view,
1298 * and make sure we have a below pointer for it so that 1410 * and make sure we have a below pointer for it so that
1299 * we can get inserted below this one, which requires we 1411 * we can get inserted below this one, which requires we
1300 * set top to the object below us. 1412 * set top to the object below us.
1301 */ 1413 */
1302 if (last && last->below && last != floor) 1414 if (last && last->below && last != floor)
1303 top = last->below; 1415 top = last->below;
1304 } 1416 }
1305 } /* If objects on this space */ 1417 } /* If objects on this space */
1306 1418
1307 if (flag & INS_MAP_LOAD)
1308 top = GET_MAP_TOP (op->map, op->x, op->y);
1309
1310 if (flag & INS_ABOVE_FLOOR_ONLY) 1419 if (flag & INS_ABOVE_FLOOR_ONLY)
1311 top = floor; 1420 top = floor;
1312 1421
1313 /* Top is the object that our object (op) is going to get inserted above. 1422 /* Top is the object that our object (op) is going to get inserted above.
1314 */ 1423 */
1315 1424
1316 /* First object on this space */ 1425 /* First object on this space */
1317 if (!top) 1426 if (!top)
1318 { 1427 {
1319 op->above = GET_MAP_OB (op->map, op->x, op->y); 1428 op->above = ms.bot;
1320 1429
1321 if (op->above) 1430 if (op->above)
1322 op->above->below = op; 1431 op->above->below = op;
1323 1432
1324 op->below = 0; 1433 op->below = 0;
1325 op->ms ().bot = op; 1434 ms.bot = op;
1326 } 1435 }
1327 else 1436 else
1328 { /* get inserted into the stack above top */ 1437 { /* get inserted into the stack above top */
1329 op->above = top->above; 1438 op->above = top->above;
1330 1439
1334 op->below = top; 1443 op->below = top;
1335 top->above = op; 1444 top->above = op;
1336 } 1445 }
1337 1446
1338 if (!op->above) 1447 if (!op->above)
1339 op->ms ().top = op; 1448 ms.top = op;
1340 } /* else not INS_BELOW_ORIGINATOR */ 1449 } /* else not INS_BELOW_ORIGINATOR */
1341 1450
1342 if (op->type == PLAYER) 1451 if (op->type == PLAYER)
1343 { 1452 {
1344 op->contr->do_los = 1; 1453 op->contr->do_los = 1;
1346 op->map->touch (); 1455 op->map->touch ();
1347 } 1456 }
1348 1457
1349 op->map->dirty = true; 1458 op->map->dirty = true;
1350 1459
1351 /* If we have a floor, we know the player, if any, will be above
1352 * it, so save a few ticks and start from there.
1353 */
1354 if (!(flag & INS_MAP_LOAD))
1355 if (object *pl = op->ms ().player ()) 1460 if (object *pl = ms.player ())
1461 //TODO: the floorbox prev/next might need updating
1462 //esrv_send_item (pl, op);
1463 //TODO: update floorbox to preserve ordering
1356 if (pl->contr->ns) 1464 if (pl->contr->ns)
1357 pl->contr->ns->floorbox_update (); 1465 pl->contr->ns->floorbox_update ();
1358 1466
1359 /* If this object glows, it may affect lighting conditions that are 1467 /* If this object glows, it may affect lighting conditions that are
1360 * visible to others on this map. But update_all_los is really 1468 * visible to others on this map. But update_all_los is really
1361 * an inefficient way to do this, as it means los for all players 1469 * an inefficient way to do this, as it means los for all players
1362 * on the map will get recalculated. The players could very well 1470 * on the map will get recalculated. The players could very well
1381 * blocked() and wall() work properly), and these flags are updated by 1489 * blocked() and wall() work properly), and these flags are updated by
1382 * update_object(). 1490 * update_object().
1383 */ 1491 */
1384 1492
1385 /* if this is not the head or flag has been passed, don't check walk on status */ 1493 /* if this is not the head or flag has been passed, don't check walk on status */
1386 if (!(flag & INS_NO_WALK_ON) && !op->head) 1494 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1387 { 1495 {
1388 if (check_move_on (op, originator)) 1496 if (check_move_on (op, originator))
1389 return 0; 1497 return 0;
1390 1498
1391 /* If we are a multi part object, lets work our way through the check 1499 /* If we are a multi part object, lets work our way through the check
1392 * walk on's. 1500 * walk on's.
1393 */ 1501 */
1394 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1502 for (object *tmp = op->more; tmp; tmp = tmp->more)
1395 if (check_move_on (tmp, originator)) 1503 if (check_move_on (tmp, originator))
1396 return 0; 1504 return 0;
1397 } 1505 }
1398 1506
1399 return op; 1507 return op;
1404 * op is the object to insert it under: supplies x and the map. 1512 * op is the object to insert it under: supplies x and the map.
1405 */ 1513 */
1406void 1514void
1407replace_insert_ob_in_map (const char *arch_string, object *op) 1515replace_insert_ob_in_map (const char *arch_string, object *op)
1408{ 1516{
1409 object *tmp, *tmp1;
1410
1411 /* first search for itself and remove any old instances */ 1517 /* first search for itself and remove any old instances */
1412 1518
1413 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1519 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1414 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1520 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1415 tmp->destroy (); 1521 tmp->destroy (1);
1416 1522
1417 tmp1 = arch_to_object (archetype::find (arch_string)); 1523 object *tmp = arch_to_object (archetype::find (arch_string));
1418 1524
1419 tmp1->x = op->x; 1525 tmp->x = op->x;
1420 tmp1->y = op->y; 1526 tmp->y = op->y;
1527
1421 insert_ob_in_map (tmp1, op->map, op, 0); 1528 insert_ob_in_map (tmp, op->map, op, 0);
1422} 1529}
1423 1530
1424object * 1531object *
1425object::insert_at (object *where, object *originator, int flags) 1532object::insert_at (object *where, object *originator, int flags)
1426{ 1533{
1534 if (where->env)
1535 return where->env->insert (this);
1536 else
1427 where->map->insert (this, where->x, where->y, originator, flags); 1537 return where->map->insert (this, where->x, where->y, originator, flags);
1428} 1538}
1429 1539
1430/* 1540/*
1431 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1432 * is returned contains nr objects, and the remaining parts contains
1433 * the rest (or is removed and freed if that number is 0).
1434 * On failure, NULL is returned, and the reason put into the
1435 * global static errmsg array.
1436 */
1437object *
1438get_split_ob (object *orig_ob, uint32 nr)
1439{
1440 object *newob;
1441 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1442
1443 if (orig_ob->nrof < nr)
1444 {
1445 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1446 return NULL;
1447 }
1448
1449 newob = object_create_clone (orig_ob);
1450
1451 if ((orig_ob->nrof -= nr) < 1)
1452 orig_ob->destroy (1);
1453 else if (!is_removed)
1454 {
1455 if (orig_ob->env != NULL)
1456 sub_weight (orig_ob->env, orig_ob->weight * nr);
1457 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1458 {
1459 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1460 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1461 return NULL;
1462 }
1463 }
1464
1465 newob->nrof = nr;
1466
1467 return newob;
1468}
1469
1470/*
1471 * decrease_ob_nr(object, number) decreases a specified number from 1541 * decrease(object, number) decreases a specified number from
1472 * the amount of an object. If the amount reaches 0, the object 1542 * the amount of an object. If the amount reaches 0, the object
1473 * is subsequently removed and freed. 1543 * is subsequently removed and freed.
1474 * 1544 *
1475 * Return value: 'op' if something is left, NULL if the amount reached 0 1545 * Return value: 'op' if something is left, NULL if the amount reached 0
1476 */ 1546 */
1547bool
1548object::decrease (sint32 nr)
1549{
1550 if (!nr)
1551 return true;
1477 1552
1553 nr = min (nr, nrof);
1554
1555 nrof -= nr;
1556
1557 if (nrof)
1558 {
1559 adjust_weight (env, -weight * nr); // carrying == 0
1560
1561 if (object *pl = visible_to ())
1562 esrv_update_item (UPD_NROF, pl, this);
1563
1564 return true;
1565 }
1566 else
1567 {
1568 destroy (1);
1569 return false;
1570 }
1571}
1572
1573/*
1574 * split(ob,nr) splits up ob into two parts. The part which
1575 * is returned contains nr objects, and the remaining parts contains
1576 * the rest (or is removed and returned if that number is 0).
1577 * On failure, NULL is returned.
1578 */
1478object * 1579object *
1479decrease_ob_nr (object *op, uint32 i) 1580object::split (sint32 nr)
1480{ 1581{
1481 object *tmp; 1582 int have = number_of ();
1482 1583
1483 if (i == 0) /* objects with op->nrof require this check */ 1584 if (have < nr)
1484 return op; 1585 return 0;
1485 1586 else if (have == nr)
1486 if (i > op->nrof)
1487 i = op->nrof;
1488
1489 if (QUERY_FLAG (op, FLAG_REMOVED))
1490 op->nrof -= i;
1491 else if (op->env)
1492 { 1587 {
1493 /* is this object in the players inventory, or sub container
1494 * therein?
1495 */
1496 tmp = op->in_player ();
1497 /* nope. Is this a container the player has opened?
1498 * If so, set tmp to that player.
1499 * IMO, searching through all the players will mostly
1500 * likely be quicker than following op->env to the map,
1501 * and then searching the map for a player.
1502 */
1503 if (!tmp)
1504 for_all_players (pl)
1505 if (pl->ob->container == op->env)
1506 {
1507 tmp = pl->ob;
1508 break;
1509 }
1510
1511 if (i < op->nrof)
1512 {
1513 sub_weight (op->env, op->weight * i);
1514 op->nrof -= i;
1515 if (tmp)
1516 esrv_send_item (tmp, op);
1517 }
1518 else
1519 {
1520 op->remove (); 1588 remove ();
1521 op->nrof = 0; 1589 return this;
1522 if (tmp)
1523 esrv_del_item (tmp->contr, op->count);
1524 }
1525 } 1590 }
1526 else 1591 else
1527 { 1592 {
1528 object *above = op->above; 1593 decrease (nr);
1529 1594
1530 if (i < op->nrof) 1595 object *op = deep_clone ();
1531 op->nrof -= i; 1596 op->nrof = nr;
1532 else
1533 {
1534 op->remove ();
1535 op->nrof = 0;
1536 }
1537
1538 /* Since we just removed op, op->above is null */
1539 for (tmp = above; tmp; tmp = tmp->above)
1540 if (tmp->type == PLAYER)
1541 {
1542 if (op->nrof)
1543 esrv_send_item (tmp, op);
1544 else
1545 esrv_del_item (tmp->contr, op->count);
1546 }
1547 }
1548
1549 if (op->nrof)
1550 return op; 1597 return op;
1551 else
1552 {
1553 op->destroy ();
1554 return 0;
1555 }
1556}
1557
1558/*
1559 * add_weight(object, weight) adds the specified weight to an object,
1560 * and also updates how much the environment(s) is/are carrying.
1561 */
1562
1563void
1564add_weight (object *op, signed long weight)
1565{
1566 while (op != NULL)
1567 {
1568 if (op->type == CONTAINER)
1569 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1570
1571 op->carrying += weight;
1572 op = op->env;
1573 } 1598 }
1574} 1599}
1575 1600
1576object * 1601object *
1577insert_ob_in_ob (object *op, object *where) 1602insert_ob_in_ob (object *op, object *where)
1582 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1607 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1583 free (dump); 1608 free (dump);
1584 return op; 1609 return op;
1585 } 1610 }
1586 1611
1587 if (where->head) 1612 if (where->head_ () != where)
1588 { 1613 {
1589 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1614 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1590 where = where->head; 1615 where = where->head;
1591 } 1616 }
1592 1617
1593 return where->insert (op); 1618 return where->insert (op);
1594} 1619}
1599 * inside the object environment. 1624 * inside the object environment.
1600 * 1625 *
1601 * The function returns now pointer to inserted item, and return value can 1626 * The function returns now pointer to inserted item, and return value can
1602 * be != op, if items are merged. -Tero 1627 * be != op, if items are merged. -Tero
1603 */ 1628 */
1604
1605object * 1629object *
1606object::insert (object *op) 1630object::insert (object *op)
1607{ 1631{
1608 object *tmp, *otmp;
1609
1610 if (!QUERY_FLAG (op, FLAG_REMOVED))
1611 op->remove ();
1612
1613 if (op->more) 1632 if (op->more)
1614 { 1633 {
1615 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1634 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1616 return op; 1635 return op;
1617 } 1636 }
1618 1637
1619 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1638 op->remove ();
1620 CLEAR_FLAG (op, FLAG_REMOVED); 1639
1640 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1641
1621 if (op->nrof) 1642 if (op->nrof)
1622 {
1623 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1643 for (object *tmp = inv; tmp; tmp = tmp->below)
1624 if (object::can_merge (tmp, op)) 1644 if (object::can_merge (tmp, op))
1625 { 1645 {
1626 /* return the original object and remove inserted object 1646 /* return the original object and remove inserted object
1627 (client needs the original object) */ 1647 (client needs the original object) */
1628 tmp->nrof += op->nrof; 1648 tmp->nrof += op->nrof;
1629 /* Weight handling gets pretty funky. Since we are adding to 1649
1630 * tmp->nrof, we need to increase the weight. 1650 if (object *pl = tmp->visible_to ())
1631 */ 1651 esrv_update_item (UPD_NROF, pl, tmp);
1652
1632 add_weight (this, op->weight * op->nrof); 1653 adjust_weight (this, op->total_weight ());
1633 SET_FLAG (op, FLAG_REMOVED); 1654
1634 op->destroy (); /* free the inserted object */ 1655 op->destroy (1);
1635 op = tmp; 1656 op = tmp;
1636 op->remove (); /* and fix old object's links */ 1657 goto inserted;
1637 CLEAR_FLAG (op, FLAG_REMOVED);
1638 break;
1639 } 1658 }
1640 1659
1641 /* I assume combined objects have no inventory 1660 op->owner = 0; // it's his/hers now. period.
1642 * We add the weight - this object could have just been removed
1643 * (if it was possible to merge). calling remove_ob will subtract
1644 * the weight, so we need to add it in again, since we actually do
1645 * the linking below
1646 */
1647 add_weight (this, op->weight * op->nrof);
1648 }
1649 else
1650 add_weight (this, (op->weight + op->carrying));
1651
1652 otmp = this->in_player ();
1653 if (otmp && otmp->contr)
1654 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1655 otmp->update_stats ();
1656
1657 op->map = 0; 1661 op->map = 0;
1658 op->env = this; 1662 op->x = 0;
1663 op->y = 0;
1664
1659 op->above = 0; 1665 op->above = 0;
1660 op->below = 0; 1666 op->below = inv;
1661 op->x = 0, op->y = 0; 1667 op->env = this;
1662 1668
1669 if (inv)
1670 inv->above = op;
1671
1672 inv = op;
1673
1674 op->flag [FLAG_REMOVED] = 0;
1675
1676 if (object *pl = op->visible_to ())
1677 esrv_send_item (pl, op);
1678
1679 adjust_weight (this, op->total_weight ());
1680
1681inserted:
1663 /* reset the light list and los of the players on the map */ 1682 /* reset the light list and los of the players on the map */
1664 if ((op->glow_radius != 0) && map) 1683 if (op->glow_radius && map && map->darkness)
1665 {
1666#ifdef DEBUG_LIGHTS
1667 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1668#endif /* DEBUG_LIGHTS */
1669 if (map->darkness)
1670 update_all_los (map, x, y); 1684 update_all_los (map, x, y);
1671 }
1672 1685
1673 /* Client has no idea of ordering so lets not bother ordering it here. 1686 // if this is a player's inventory, update stats
1674 * It sure simplifies this function... 1687 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1675 */ 1688 update_stats ();
1676 if (!inv)
1677 inv = op;
1678 else
1679 {
1680 op->below = inv;
1681 op->below->above = op;
1682 inv = op;
1683 }
1684 1689
1685 INVOKE_OBJECT (INSERT, this); 1690 INVOKE_OBJECT (INSERT, this);
1686 1691
1687 return op; 1692 return op;
1688} 1693}
1769 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1774 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1770 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1775 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1771 { 1776 {
1772 1777
1773 float 1778 float
1774 diff = tmp->move_slow_penalty * FABS (op->speed); 1779 diff = tmp->move_slow_penalty * fabs (op->speed);
1775 1780
1776 if (op->type == PLAYER) 1781 if (op->type == PLAYER)
1777 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1782 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1778 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1783 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1779 diff /= 4.0; 1784 diff /= 4.0;
1816 LOG (llevError, "Present_arch called outside map.\n"); 1821 LOG (llevError, "Present_arch called outside map.\n");
1817 return NULL; 1822 return NULL;
1818 } 1823 }
1819 1824
1820 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1825 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1821 if (tmp->arch == at) 1826 if (tmp->arch->archname == at->archname)
1822 return tmp; 1827 return tmp;
1823 1828
1824 return NULL; 1829 return NULL;
1825} 1830}
1826 1831
1890 * The first matching object is returned, or NULL if none. 1895 * The first matching object is returned, or NULL if none.
1891 */ 1896 */
1892object * 1897object *
1893present_arch_in_ob (const archetype *at, const object *op) 1898present_arch_in_ob (const archetype *at, const object *op)
1894{ 1899{
1895 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1900 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1896 if (tmp->arch == at) 1901 if (tmp->arch->archname == at->archname)
1897 return tmp; 1902 return tmp;
1898 1903
1899 return NULL; 1904 return NULL;
1900} 1905}
1901 1906
1903 * activate recursively a flag on an object inventory 1908 * activate recursively a flag on an object inventory
1904 */ 1909 */
1905void 1910void
1906flag_inv (object *op, int flag) 1911flag_inv (object *op, int flag)
1907{ 1912{
1908 if (op->inv)
1909 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1913 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1910 { 1914 {
1911 SET_FLAG (tmp, flag); 1915 SET_FLAG (tmp, flag);
1912 flag_inv (tmp, flag); 1916 flag_inv (tmp, flag);
1913 } 1917 }
1914} 1918}
1915 1919
1916/* 1920/*
1917 * deactivate recursively a flag on an object inventory 1921 * deactivate recursively a flag on an object inventory
1918 */ 1922 */
1919void 1923void
1920unflag_inv (object *op, int flag) 1924unflag_inv (object *op, int flag)
1921{ 1925{
1922 if (op->inv)
1923 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1926 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1924 { 1927 {
1925 CLEAR_FLAG (tmp, flag); 1928 CLEAR_FLAG (tmp, flag);
1926 unflag_inv (tmp, flag); 1929 unflag_inv (tmp, flag);
1927 } 1930 }
1928}
1929
1930/*
1931 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1932 * all it's inventory (recursively).
1933 * If checksums are used, a player will get set_cheat called for
1934 * him/her-self and all object carried by a call to this function.
1935 */
1936void
1937set_cheat (object *op)
1938{
1939 SET_FLAG (op, FLAG_WAS_WIZ);
1940 flag_inv (op, FLAG_WAS_WIZ);
1941} 1931}
1942 1932
1943/* 1933/*
1944 * find_free_spot(object, map, x, y, start, stop) will search for 1934 * find_free_spot(object, map, x, y, start, stop) will search for
1945 * a spot at the given map and coordinates which will be able to contain 1935 * a spot at the given map and coordinates which will be able to contain
1947 * to search (see the freearr_x/y[] definition). 1937 * to search (see the freearr_x/y[] definition).
1948 * It returns a random choice among the alternatives found. 1938 * It returns a random choice among the alternatives found.
1949 * start and stop are where to start relative to the free_arr array (1,9 1939 * start and stop are where to start relative to the free_arr array (1,9
1950 * does all 4 immediate directions). This returns the index into the 1940 * does all 4 immediate directions). This returns the index into the
1951 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1941 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1952 * Note - this only checks to see if there is space for the head of the
1953 * object - if it is a multispace object, this should be called for all
1954 * pieces.
1955 * Note2: This function does correctly handle tiled maps, but does not 1942 * Note: This function does correctly handle tiled maps, but does not
1956 * inform the caller. However, insert_ob_in_map will update as 1943 * inform the caller. However, insert_ob_in_map will update as
1957 * necessary, so the caller shouldn't need to do any special work. 1944 * necessary, so the caller shouldn't need to do any special work.
1958 * Note - updated to take an object instead of archetype - this is necessary 1945 * Note - updated to take an object instead of archetype - this is necessary
1959 * because arch_blocked (now ob_blocked) needs to know the movement type 1946 * because arch_blocked (now ob_blocked) needs to know the movement type
1960 * to know if the space in question will block the object. We can't use 1947 * to know if the space in question will block the object. We can't use
1962 * customized, changed states, etc. 1949 * customized, changed states, etc.
1963 */ 1950 */
1964int 1951int
1965find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1952find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1966{ 1953{
1954 int altern[SIZEOFFREE];
1967 int index = 0, flag; 1955 int index = 0, flag;
1968 int altern[SIZEOFFREE];
1969 1956
1970 for (int i = start; i < stop; i++) 1957 for (int i = start; i < stop; i++)
1971 { 1958 {
1972 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1959 mapxy pos (m, x, y); pos.move (i);
1973 if (!flag) 1960
1961 if (!pos.normalise ())
1962 continue;
1963
1964 mapspace &ms = *pos;
1965
1966 if (ms.flags () & P_IS_ALIVE)
1967 continue;
1968
1969 /* However, often
1970 * ob doesn't have any move type (when used to place exits)
1971 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1972 */
1973 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1974 {
1974 altern [index++] = i; 1975 altern [index++] = i;
1976 continue;
1977 }
1975 1978
1976 /* Basically, if we find a wall on a space, we cut down the search size. 1979 /* Basically, if we find a wall on a space, we cut down the search size.
1977 * In this way, we won't return spaces that are on another side of a wall. 1980 * In this way, we won't return spaces that are on another side of a wall.
1978 * This mostly work, but it cuts down the search size in all directions - 1981 * This mostly work, but it cuts down the search size in all directions -
1979 * if the space being examined only has a wall to the north and empty 1982 * if the space being examined only has a wall to the north and empty
1980 * spaces in all the other directions, this will reduce the search space 1983 * spaces in all the other directions, this will reduce the search space
1981 * to only the spaces immediately surrounding the target area, and 1984 * to only the spaces immediately surrounding the target area, and
1982 * won't look 2 spaces south of the target space. 1985 * won't look 2 spaces south of the target space.
1983 */ 1986 */
1984 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1987 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1988 {
1985 stop = maxfree[i]; 1989 stop = maxfree[i];
1990 continue;
1991 }
1992
1993 /* Note it is intentional that we check ob - the movement type of the
1994 * head of the object should correspond for the entire object.
1995 */
1996 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1997 continue;
1998
1999 if (ob->blocked (m, pos.x, pos.y))
2000 continue;
2001
2002 altern [index++] = i;
1986 } 2003 }
1987 2004
1988 if (!index) 2005 if (!index)
1989 return -1; 2006 return -1;
1990 2007
1991 return altern[RANDOM () % index]; 2008 return altern [rndm (index)];
1992} 2009}
1993 2010
1994/* 2011/*
1995 * find_first_free_spot(archetype, maptile, x, y) works like 2012 * find_first_free_spot(archetype, maptile, x, y) works like
1996 * find_free_spot(), but it will search max number of squares. 2013 * find_free_spot(), but it will search max number of squares.
1999 */ 2016 */
2000int 2017int
2001find_first_free_spot (const object *ob, maptile *m, int x, int y) 2018find_first_free_spot (const object *ob, maptile *m, int x, int y)
2002{ 2019{
2003 for (int i = 0; i < SIZEOFFREE; i++) 2020 for (int i = 0; i < SIZEOFFREE; i++)
2004 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2021 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2005 return i; 2022 return i;
2006 2023
2007 return -1; 2024 return -1;
2008} 2025}
2009 2026
2017{ 2034{
2018 arr += begin; 2035 arr += begin;
2019 end -= begin; 2036 end -= begin;
2020 2037
2021 while (--end) 2038 while (--end)
2022 swap (arr [end], arr [RANDOM () % (end + 1)]); 2039 swap (arr [end], arr [rndm (end + 1)]);
2023} 2040}
2024 2041
2025/* new function to make monster searching more efficient, and effective! 2042/* new function to make monster searching more efficient, and effective!
2026 * This basically returns a randomized array (in the passed pointer) of 2043 * This basically returns a randomized array (in the passed pointer) of
2027 * the spaces to find monsters. In this way, it won't always look for 2044 * the spaces to find monsters. In this way, it won't always look for
2063 object *tmp; 2080 object *tmp;
2064 maptile *mp; 2081 maptile *mp;
2065 2082
2066 MoveType blocked, move_type; 2083 MoveType blocked, move_type;
2067 2084
2068 if (exclude && exclude->head) 2085 if (exclude && exclude->head_ () != exclude)
2069 { 2086 {
2070 exclude = exclude->head; 2087 exclude = exclude->head;
2071 move_type = exclude->move_type; 2088 move_type = exclude->move_type;
2072 } 2089 }
2073 else 2090 else
2096 max = maxfree[i]; 2113 max = maxfree[i];
2097 else if (mflags & P_IS_ALIVE) 2114 else if (mflags & P_IS_ALIVE)
2098 { 2115 {
2099 for (tmp = ms.bot; tmp; tmp = tmp->above) 2116 for (tmp = ms.bot; tmp; tmp = tmp->above)
2100 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2117 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2101 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2118 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102 break; 2119 break;
2103 2120
2104 if (tmp) 2121 if (tmp)
2105 return freedir[i]; 2122 return freedir[i];
2106 } 2123 }
2161 2178
2162 return 3; 2179 return 3;
2163} 2180}
2164 2181
2165/* 2182/*
2166 * absdir(int): Returns a number between 1 and 8, which represent
2167 * the "absolute" direction of a number (it actually takes care of
2168 * "overflow" in previous calculations of a direction).
2169 */
2170
2171int
2172absdir (int d)
2173{
2174 while (d < 1)
2175 d += 8;
2176
2177 while (d > 8)
2178 d -= 8;
2179
2180 return d;
2181}
2182
2183/*
2184 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2185 * between two directions (which are expected to be absolute (see absdir()) 2184 * between two directions (which are expected to be absolute (see absdir())
2186 */ 2185 */
2187
2188int 2186int
2189dirdiff (int dir1, int dir2) 2187dirdiff (int dir1, int dir2)
2190{ 2188{
2191 int d; 2189 int d;
2192 2190
2305 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2303 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2306 * core dumps if they do. 2304 * core dumps if they do.
2307 * 2305 *
2308 * Add a check so we can't pick up invisible objects (0.93.8) 2306 * Add a check so we can't pick up invisible objects (0.93.8)
2309 */ 2307 */
2310
2311int 2308int
2312can_pick (const object *who, const object *item) 2309can_pick (const object *who, const object *item)
2313{ 2310{
2314 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2311 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2315 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2312 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2318 2315
2319/* 2316/*
2320 * create clone from object to another 2317 * create clone from object to another
2321 */ 2318 */
2322object * 2319object *
2323object_create_clone (object *asrc) 2320object::deep_clone ()
2324{ 2321{
2325 object *dst = 0, *tmp, *src, *part, *prev, *item; 2322 assert (("deep_clone called on non-head object", is_head ()));
2326 2323
2327 if (!asrc) 2324 object *dst = clone ();
2328 return 0;
2329 2325
2330 src = asrc; 2326 object *prev = dst;
2331 if (src->head)
2332 src = src->head;
2333
2334 prev = 0;
2335 for (part = src; part; part = part->more) 2327 for (object *part = this->more; part; part = part->more)
2336 { 2328 {
2337 tmp = part->clone (); 2329 object *tmp = part->clone ();
2338 tmp->x -= src->x;
2339 tmp->y -= src->y;
2340
2341 if (!part->head)
2342 {
2343 dst = tmp;
2344 tmp->head = 0;
2345 }
2346 else
2347 tmp->head = dst; 2330 tmp->head = dst;
2348
2349 tmp->more = 0;
2350
2351 if (prev)
2352 prev->more = tmp; 2331 prev->more = tmp;
2353
2354 prev = tmp; 2332 prev = tmp;
2355 } 2333 }
2356 2334
2357 for (item = src->inv; item; item = item->below) 2335 for (object *item = inv; item; item = item->below)
2358 insert_ob_in_ob (object_create_clone (item), dst); 2336 insert_ob_in_ob (item->deep_clone (), dst);
2359 2337
2360 return dst; 2338 return dst;
2361}
2362
2363/* GROS - Creates an object using a string representing its content. */
2364/* Basically, we save the content of the string to a temp file, then call */
2365/* load_object on it. I admit it is a highly inefficient way to make things, */
2366/* but it was simple to make and allows reusing the load_object function. */
2367/* Remember not to use load_object_str in a time-critical situation. */
2368/* Also remember that multiparts objects are not supported for now. */
2369object *
2370load_object_str (const char *obstr)
2371{
2372 object *op;
2373 char filename[MAX_BUF];
2374
2375 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2376
2377 FILE *tempfile = fopen (filename, "w");
2378
2379 if (tempfile == NULL)
2380 {
2381 LOG (llevError, "Error - Unable to access load object temp file\n");
2382 return NULL;
2383 }
2384
2385 fprintf (tempfile, obstr);
2386 fclose (tempfile);
2387
2388 op = object::create ();
2389
2390 object_thawer thawer (filename);
2391
2392 if (thawer)
2393 load_object (thawer, op, 0);
2394
2395 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2396 CLEAR_FLAG (op, FLAG_REMOVED);
2397
2398 return op;
2399} 2339}
2400 2340
2401/* This returns the first object in who's inventory that 2341/* This returns the first object in who's inventory that
2402 * has the same type and subtype match. 2342 * has the same type and subtype match.
2403 * returns NULL if no match. 2343 * returns NULL if no match.
2410 return tmp; 2350 return tmp;
2411 2351
2412 return 0; 2352 return 0;
2413} 2353}
2414 2354
2415/* If ob has a field named key, return the link from the list, 2355const shstr &
2416 * otherwise return NULL. 2356object::kv_get (const shstr &key) const
2417 *
2418 * key must be a passed in shared string - otherwise, this won't
2419 * do the desired thing.
2420 */
2421key_value *
2422get_ob_key_link (const object *ob, const char *key)
2423{ 2357{
2424 for (key_value *link = ob->key_values; link; link = link->next) 2358 for (key_value *kv = key_values; kv; kv = kv->next)
2425 if (link->key == key) 2359 if (kv->key == key)
2426 return link;
2427
2428 return 0;
2429}
2430
2431/*
2432 * Returns the value of op has an extra_field for key, or NULL.
2433 *
2434 * The argument doesn't need to be a shared string.
2435 *
2436 * The returned string is shared.
2437 */
2438const char *
2439get_ob_key_value (const object *op, const char *const key)
2440{
2441 key_value *link;
2442 shstr_cmp canonical_key (key);
2443
2444 if (!canonical_key)
2445 {
2446 /* 1. There being a field named key on any object
2447 * implies there'd be a shared string to find.
2448 * 2. Since there isn't, no object has this field.
2449 * 3. Therefore, *this* object doesn't have this field.
2450 */
2451 return 0;
2452 }
2453
2454 /* This is copied from get_ob_key_link() above -
2455 * only 4 lines, and saves the function call overhead.
2456 */
2457 for (link = op->key_values; link; link = link->next)
2458 if (link->key == canonical_key)
2459 return link->value; 2360 return kv->value;
2460 2361
2461 return 0; 2362 return shstr_null;
2462} 2363}
2463 2364
2464 2365void
2465/* 2366object::kv_set (const shstr &key, const shstr &value)
2466 * Updates the canonical_key in op to value.
2467 *
2468 * canonical_key is a shared string (value doesn't have to be).
2469 *
2470 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2471 * keys.
2472 *
2473 * Returns TRUE on success.
2474 */
2475int
2476set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2477{ 2367{
2478 key_value *field = NULL, *last = NULL; 2368 for (key_value *kv = key_values; kv; kv = kv->next)
2479 2369 if (kv->key == key)
2480 for (field = op->key_values; field != NULL; field = field->next)
2481 {
2482 if (field->key != canonical_key)
2483 { 2370 {
2484 last = field; 2371 kv->value = value;
2485 continue; 2372 return;
2486 } 2373 }
2487 2374
2488 if (value) 2375 key_value *kv = new key_value;
2489 field->value = value; 2376
2490 else 2377 kv->next = key_values;
2378 kv->key = key;
2379 kv->value = value;
2380
2381 key_values = kv;
2382}
2383
2384void
2385object::kv_del (const shstr &key)
2386{
2387 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2388 if ((*kvp)->key == key)
2491 { 2389 {
2492 /* Basically, if the archetype has this key set, 2390 key_value *kv = *kvp;
2493 * we need to store the null value so when we save 2391 *kvp = (*kvp)->next;
2494 * it, we save the empty value so that when we load, 2392 delete kv;
2495 * we get this value back again. 2393 return;
2496 */
2497 if (get_ob_key_link (&op->arch->clone, canonical_key))
2498 field->value = 0;
2499 else
2500 {
2501 if (last)
2502 last->next = field->next;
2503 else
2504 op->key_values = field->next;
2505
2506 delete field;
2507 }
2508 } 2394 }
2509 return TRUE;
2510 }
2511 /* IF we get here, key doesn't exist */
2512
2513 /* No field, we'll have to add it. */
2514
2515 if (!add_key)
2516 return FALSE;
2517
2518 /* There isn't any good reason to store a null
2519 * value in the key/value list. If the archetype has
2520 * this key, then we should also have it, so shouldn't
2521 * be here. If user wants to store empty strings,
2522 * should pass in ""
2523 */
2524 if (value == NULL)
2525 return TRUE;
2526
2527 field = new key_value;
2528
2529 field->key = canonical_key;
2530 field->value = value;
2531 /* Usual prepend-addition. */
2532 field->next = op->key_values;
2533 op->key_values = field;
2534
2535 return TRUE;
2536}
2537
2538/*
2539 * Updates the key in op to value.
2540 *
2541 * If add_key is FALSE, this will only update existing keys,
2542 * and not add new ones.
2543 * In general, should be little reason FALSE is ever passed in for add_key
2544 *
2545 * Returns TRUE on success.
2546 */
2547int
2548set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2549{
2550 shstr key_ (key);
2551
2552 return set_ob_key_value_s (op, key_, value, add_key);
2553} 2395}
2554 2396
2555object::depth_iterator::depth_iterator (object *container) 2397object::depth_iterator::depth_iterator (object *container)
2556: iterator_base (container) 2398: iterator_base (container)
2557{ 2399{
2570 item = item->inv; 2412 item = item->inv;
2571 } 2413 }
2572 else 2414 else
2573 item = item->env; 2415 item = item->env;
2574} 2416}
2575
2576 2417
2577const char * 2418const char *
2578object::flag_desc (char *desc, int len) const 2419object::flag_desc (char *desc, int len) const
2579{ 2420{
2580 char *p = desc; 2421 char *p = desc;
2608{ 2449{
2609 char flagdesc[512]; 2450 char flagdesc[512];
2610 char info2[256 * 4]; 2451 char info2[256 * 4];
2611 char *p = info; 2452 char *p = info;
2612 2453
2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2454 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614 count, uuid.seq, 2455 count,
2456 uuid.c_str (),
2615 &name, 2457 &name,
2616 title ? "\",title:" : "", 2458 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "", 2459 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type); 2460 flag_desc (flagdesc, 512), type);
2619 2461
2620 if (env) 2462 if (!flag[FLAG_REMOVED] && env)
2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2463 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2622 2464
2623 if (map) 2465 if (map)
2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2466 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2625 2467
2627} 2469}
2628 2470
2629const char * 2471const char *
2630object::debug_desc () const 2472object::debug_desc () const
2631{ 2473{
2632 static char info[256 * 4]; 2474 static char info[3][256 * 4];
2475 static int info_idx;
2476
2633 return debug_desc (info); 2477 return debug_desc (info [++info_idx % 3]);
2634} 2478}
2635 2479
2480struct region *
2481object::region () const
2482{
2483 return map ? map->region (x, y)
2484 : region::default_region ();
2485}
2486
2487const materialtype_t *
2488object::dominant_material () const
2489{
2490 if (materialtype_t *mt = name_to_material (materialname))
2491 return mt;
2492
2493 return name_to_material (shstr_unknown);
2494}
2495
2496void
2497object::open_container (object *new_container)
2498{
2499 if (container == new_container)
2500 return;
2501
2502 object *old_container = container;
2503
2504 if (old_container)
2505 {
2506 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2507 return;
2508
2509#if 0
2510 // remove the "Close old_container" object.
2511 if (object *closer = old_container->inv)
2512 if (closer->type == CLOSE_CON)
2513 closer->destroy ();
2514#endif
2515
2516 // make sure the container is available
2517 esrv_send_item (this, old_container);
2518
2519 old_container->flag [FLAG_APPLIED] = false;
2520 container = 0;
2521
2522 // client needs item update to make it work, client bug requires this to be separate
2523 esrv_update_item (UPD_FLAGS, this, old_container);
2524
2525 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2526 play_sound (sound_find ("chest_close"));
2527 }
2528
2529 if (new_container)
2530 {
2531 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2532 return;
2533
2534 // TODO: this does not seem to serve any purpose anymore?
2535#if 0
2536 // insert the "Close Container" object.
2537 if (archetype *closer = new_container->other_arch)
2538 {
2539 object *closer = arch_to_object (new_container->other_arch);
2540 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2541 new_container->insert (closer);
2542 }
2543#endif
2544
2545 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2546
2547 // make sure the container is available, client bug requires this to be separate
2548 esrv_send_item (this, new_container);
2549
2550 new_container->flag [FLAG_APPLIED] = true;
2551 container = new_container;
2552
2553 // client needs flag change
2554 esrv_update_item (UPD_FLAGS, this, new_container);
2555 esrv_send_inventory (this, new_container);
2556 play_sound (sound_find ("chest_open"));
2557 }
2558// else if (!old_container->env && contr && contr->ns)
2559// contr->ns->floorbox_reset ();
2560}
2561
2562object *
2563object::force_find (const shstr name)
2564{
2565 /* cycle through his inventory to look for the MARK we want to
2566 * place
2567 */
2568 for (object *tmp = inv; tmp; tmp = tmp->below)
2569 if (tmp->type == FORCE && tmp->slaying == name)
2570 return splay (tmp);
2571
2572 return 0;
2573}
2574
2575void
2576object::force_add (const shstr name, int duration)
2577{
2578 if (object *force = force_find (name))
2579 force->destroy ();
2580
2581 object *force = get_archetype (FORCE_NAME);
2582
2583 force->slaying = name;
2584 force->stats.food = 1;
2585 force->speed_left = -1.f;
2586
2587 force->set_speed (duration ? 1.f / duration : 0.f);
2588 force->flag [FLAG_IS_USED_UP] = true;
2589 force->flag [FLAG_APPLIED] = true;
2590
2591 insert (force);
2592}
2593
2594void
2595object::play_sound (faceidx sound)
2596{
2597 if (!sound)
2598 return;
2599
2600 if (flag [FLAG_REMOVED])
2601 return;
2602
2603 if (env)
2604 {
2605 if (object *pl = in_player ())
2606 pl->contr->play_sound (sound);
2607 }
2608 else
2609 map->play_sound (sound, x, y);
2610}
2611

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines