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.102 by root, Mon Jan 1 17:34:11 2007 UTC vs.
Revision 1.215 by root, Tue Apr 22 07:28:05 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
32#include <funcpoint.h> 29#include <sproto.h>
33#include <loader.h> 30#include <loader.h>
34 31
35#include <bitset> 32#include <bitset>
36 33
37int nrofallocobjects = 0; 34UUID UUID::cur;
38static UUID uuid; 35static uint64_t seq_next_save;
39const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
40 37
41object *active_objects; /* List of active objects that need to be processed */ 38objectvec objects;
39activevec actives;
42 40
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 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,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 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
45}; 46};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 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,
47 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 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
48}; 52};
49int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 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,
50 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 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
51}; 58};
52int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
53 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 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,
54 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 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
55}; 64};
56 65
57static void 66static void
58write_uuid (void) 67write_uuid (uval64 skip, bool sync)
59{ 68{
60 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
61 70 CALL_ARG_SV (newSVval64 (skip));
62 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
63 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
64 73 CALL_END;
65 FILE *fp;
66
67 if (!(fp = fopen (filename2, "w")))
68 {
69 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70 return;
71 }
72
73 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74 fclose (fp);
75 rename (filename2, filename1);
76} 74}
77 75
78static void 76static void
79read_uuid (void) 77read_uuid (void)
80{ 78{
81 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
82 80
83 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 seq_next_save = 0;
84 84
85 FILE *fp; 85 FILE *fp;
86 86
87 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
88 { 88 {
89 if (errno == ENOENT) 89 if (errno == ENOENT)
90 { 90 {
91 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
92 uuid.seq = 0; 92 UUID::cur.seq = 0;
93 write_uuid (); 93 write_uuid (UUID_GAP, true);
94 return; 94 return;
95 } 95 }
96 96
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 98 _exit (1);
99 } 99 }
100 100
101 int version; 101 UUID::BUF buf;
102 unsigned long long uid; 102 buf[0] = 0;
103 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
104 { 106 {
105 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106 _exit (1); 108 _exit (1);
107 } 109 }
108 110
109 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110 write_uuid (); 112
111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
112 fclose (fp); 114 fclose (fp);
113} 115}
114 116
115UUID 117UUID
116gen_uuid () 118UUID::gen ()
117{ 119{
118 UUID uid; 120 UUID uid;
119 121
120 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
121 123
122 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
123 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
124 130
125 return uid; 131 return uid;
126} 132}
127 133
128void 134void
129init_uuid () 135UUID::init ()
130{ 136{
131 read_uuid (); 137 read_uuid ();
132} 138}
133 139
134/* 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. */
135static int 141static bool
136compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
137{ 143{
138 key_value *wants_field; 144 key_value *wants_field;
139 145
140 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 146 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
148 key_value *has_field; 154 key_value *has_field;
149 155
150 /* Look for a field in has with the same key. */ 156 /* Look for a field in has with the same key. */
151 has_field = get_ob_key_link (has, wants_field->key); 157 has_field = get_ob_key_link (has, wants_field->key);
152 158
153 if (has_field == NULL) 159 if (!has_field)
154 {
155 /* No field with that name. */ 160 return 0; /* No field with that name. */
156 return FALSE;
157 }
158 161
159 /* Found the matching field. */ 162 /* Found the matching field. */
160 if (has_field->value != wants_field->value) 163 if (has_field->value != wants_field->value)
161 {
162 /* Values don't match, so this half of the comparison is false. */ 164 return 0; /* Values don't match, so this half of the comparison is false. */
163 return FALSE;
164 }
165 165
166 /* If we get here, we found a match. Now for the next field in wants. */ 166 /* If we get here, we found a match. Now for the next field in wants. */
167 } 167 }
168 168
169 /* If we get here, every field in wants has a matching field in has. */ 169 /* If we get here, every field in wants has a matching field in has. */
170 return TRUE; 170 return 1;
171} 171}
172 172
173/* Returns TRUE if ob1 has the same key_values as ob2. */ 173/* Returns TRUE if ob1 has the same key_values as ob2. */
174static int 174static bool
175compare_ob_value_lists (const object *ob1, const object *ob2) 175compare_ob_value_lists (const object *ob1, const object *ob2)
176{ 176{
177 /* However, there may be fields in has which aren't partnered in wants, 177 /* However, there may be fields in has which aren't partnered in wants,
178 * so we need to run the comparison *twice*. :( 178 * so we need to run the comparison *twice*. :(
179 */ 179 */
200 || ob1->speed != ob2->speed 200 || ob1->speed != ob2->speed
201 || ob1->value != ob2->value 201 || ob1->value != ob2->value
202 || ob1->name != ob2->name) 202 || ob1->name != ob2->name)
203 return 0; 203 return 0;
204 204
205 //TODO: this ain't working well, use nicer and correct overflow check 205 /* Do not merge objects if nrof would overflow. First part checks
206 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 206 * for unsigned overflow (2c), second part checks whether the result
207 * value could not be stored in a sint32 (which unfortunately sometimes is 207 * would fit into a 32 bit signed int, which is often used to hold
208 * used to store nrof). 208 * nrof values.
209 */ 209 */
210 if (ob1->nrof + ob2->nrof >= 1UL << 31) 210 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
211 return 0; 211 return 0;
212 212
213 /* If the objects have been identified, set the BEEN_APPLIED flag. 213 /* If the objects have been identified, set the BEEN_APPLIED flag.
214 * This is to the comparison of the flags below will be OK. We 214 * This is to the comparison of the flags below will be OK. We
215 * just can't ignore the been applied or identified flags, as they 215 * just can't ignore the been applied or identified flags, as they
216 * are not equal - just if it has been identified, the been_applied 216 * are not equal - just if it has been identified, the been_applied
217 * flags lose any meaning. 217 * flags lose any meaning.
218 */ 218 */
219 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 219 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
220 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 220 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221 221
222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224 224
225 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 225 if (ob1->arch->name != ob2->arch->name
226 || ob1->arch != ob2->arch
227 || ob1->name != ob2->name 226 || ob1->name != ob2->name
228 || ob1->title != ob2->title 227 || ob1->title != ob2->title
229 || ob1->msg != ob2->msg 228 || ob1->msg != ob2->msg
230 || ob1->weight != ob2->weight 229 || ob1->weight != ob2->weight
231 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
233 || ob1->attacktype != ob2->attacktype 230 || ob1->attacktype != ob2->attacktype
234 || ob1->magic != ob2->magic 231 || ob1->magic != ob2->magic
235 || ob1->slaying != ob2->slaying 232 || ob1->slaying != ob2->slaying
236 || ob1->skill != ob2->skill 233 || ob1->skill != ob2->skill
237 || ob1->value != ob2->value 234 || ob1->value != ob2->value
244 || ob1->move_block != ob2->move_block 241 || ob1->move_block != ob2->move_block
245 || ob1->move_allow != ob2->move_allow 242 || ob1->move_allow != ob2->move_allow
246 || ob1->move_on != ob2->move_on 243 || ob1->move_on != ob2->move_on
247 || ob1->move_off != ob2->move_off 244 || ob1->move_off != ob2->move_off
248 || ob1->move_slow != ob2->move_slow 245 || ob1->move_slow != ob2->move_slow
249 || ob1->move_slow_penalty != ob2->move_slow_penalty) 246 || ob1->move_slow_penalty != ob2->move_slow_penalty
247 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250 return 0; 249 return 0;
251 250
251 if ((ob1->flag ^ ob2->flag)
252 .reset (FLAG_INV_LOCKED)
253 .reset (FLAG_CLIENT_SENT)
254 .reset (FLAG_REMOVED)
255 .any ())
256 return 0;
257
252 /* This is really a spellbook check - really, we should 258 /* This is really a spellbook check - we should in general
253 * check all objects in the inventory. 259 * not merge objects with real inventories, as splitting them
260 * is hard.
254 */ 261 */
255 if (ob1->inv || ob2->inv) 262 if (ob1->inv || ob2->inv)
256 { 263 {
257 /* if one object has inventory but the other doesn't, not equiv */ 264 if (!(ob1->inv && ob2->inv))
258 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 265 return 0; /* inventories differ in length */
259 return 0;
260 266
261 /* Now check to see if the two inventory objects could merge */ 267 if (ob1->inv->below || ob2->inv->below)
268 return 0; /* more than one object in inv */
269
262 if (!object::can_merge (ob1->inv, ob2->inv)) 270 if (!object::can_merge (ob1->inv, ob2->inv))
263 return 0; 271 return 0; /* inventory objects differ */
264 272
265 /* inventory ok - still need to check rest of this object to see 273 /* inventory ok - still need to check rest of this object to see
266 * if it is valid. 274 * if it is valid.
267 */ 275 */
268 } 276 }
287 if (ob1->level != ob2->level) 295 if (ob1->level != ob2->level)
288 return 0; 296 return 0;
289 break; 297 break;
290 } 298 }
291 299
292 if (ob1->key_values != NULL || ob2->key_values != NULL) 300 if (ob1->key_values || ob2->key_values)
293 { 301 {
294 /* At least one of these has key_values. */ 302 /* At least one of these has key_values. */
295 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 303 if ((!ob1->key_values) != (!ob2->key_values))
296 /* One has fields, but the other one doesn't. */ 304 return 0; /* One has fields, but the other one doesn't. */
305
306 if (!compare_ob_value_lists (ob1, ob2))
297 return 0; 307 return 0;
298 else if (!compare_ob_value_lists (ob1, ob2))
299 return 0;
300 } 308 }
301 309
302 //TODO: generate an event or call into perl for additional checks
303 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
304 { 311 {
305 ob1->optimise (); 312 ob1->optimise ();
306 ob2->optimise (); 313 ob2->optimise ();
307 314
308 if (ob1->self || ob2->self) 315 if (ob1->self || ob2->self)
316 {
317 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
318 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
319
320 if (k1 != k2)
309 return 0; 321 return 0;
322
323 if (k1 == 0)
324 return 1;
325
326 if (!cfperl_can_merge (ob1, ob2))
327 return 0;
328 }
310 } 329 }
311 330
312 /* Everything passes, must be OK. */ 331 /* Everything passes, must be OK. */
313 return 1; 332 return 1;
314} 333}
315 334
335// find player who can see this object
336object *
337object::visible_to () const
338{
339 if (!flag [FLAG_REMOVED])
340 {
341 // see if we are in a container of sorts
342 if (env)
343 {
344 // the player inventory itself is always visible
345 if (env->type == PLAYER)
346 return env;
347
348 // else a player could have our env open
349 object *envest = env->outer_env ();
350
351 // the player itself is always on a map, so we will find him here
352 // even if our inv is in a player.
353 if (envest->is_on_map ())
354 if (object *pl = envest->ms ().player ())
355 if (pl->container == env)
356 return pl;
357 }
358 else
359 {
360 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ())
363 return pl;
364 }
365 }
366
367 return 0;
368}
369
370// adjust weight per container type ("of holding")
371static sint32
372weight_adjust (object *op, sint32 weight)
373{
374 return op->type == CONTAINER
375 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376 : weight;
377}
378
316/* 379/*
380 * adjust_weight(object, weight) adds the specified weight to an object,
381 * and also updates how much the environment(s) is/are carrying.
382 */
383static void
384adjust_weight (object *op, sint32 weight)
385{
386 while (op)
387 {
388 weight = weight_adjust (op, weight);
389
390 if (!weight)
391 return;
392
393 op->carrying += weight;
394
395 if (object *pl = op->visible_to ())
396 if (pl != op) // player is handled lazily
397 esrv_update_item (UPD_WEIGHT, pl, op);
398
399 op = op->env;
400 }
401}
402
403/*
317 * sum_weight() is a recursive function which calculates the weight 404 * this is a recursive function which calculates the weight
318 * an object is carrying. It goes through in figures out how much 405 * an object is carrying. It goes through op and figures out how much
319 * containers are carrying, and sums it up. 406 * containers are carrying, and sums it up.
320 */ 407 */
321long 408void
322sum_weight (object *op) 409object::update_weight ()
323{ 410{
324 long sum; 411 sint32 sum = 0;
325 object *inv;
326 412
327 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 413 for (object *op = inv; op; op = op->below)
328 { 414 {
329 if (inv->inv) 415 if (op->inv)
330 sum_weight (inv); 416 op->update_weight ();
331 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 417
418 sum += op->total_weight ();
419 }
420
421 sum = weight_adjust (this, sum);
422
423 if (sum != carrying)
332 } 424 {
333
334 if (op->type == CONTAINER && op->stats.Str)
335 sum = (sum * (100 - op->stats.Str)) / 100;
336
337 if (op->carrying != sum)
338 op->carrying = sum; 425 carrying = sum;
339 426
340 return sum; 427 if (object *pl = visible_to ())
428 if (pl != this) // player is handled lazily
429 esrv_update_item (UPD_WEIGHT, pl, this);
430 }
341} 431}
342 432
343/** 433/*
344 * Return the outermost environment object for a given object. 434 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
345 */ 435 */
346
347object *
348object_get_env_recursive (object *op)
349{
350 while (op->env != NULL)
351 op = op->env;
352 return op;
353}
354
355/*
356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357 * Some error messages.
358 * The result of the dump is stored in the static global errmsg array.
359 */
360
361char * 436char *
362dump_object (object *op) 437dump_object (object *op)
363{ 438{
364 if (!op) 439 if (!op)
365 return strdup ("[NULLOBJ]"); 440 return strdup ("[NULLOBJ]");
366 441
367 object_freezer freezer; 442 object_freezer freezer;
368 save_object (freezer, op, 1); 443 op->write (freezer);
369 return freezer.as_string (); 444 return freezer.as_string ();
370} 445}
371 446
372/* 447/*
373 * get_nearest_part(multi-object, object 2) returns the part of the 448 * get_nearest_part(multi-object, object 2) returns the part of the
374 * multi-object 1 which is closest to the second object. 449 * multi-object 1 which is closest to the second object.
375 * If it's not a multi-object, it is returned. 450 * If it's not a multi-object, it is returned.
376 */ 451 */
377
378object * 452object *
379get_nearest_part (object *op, const object *pl) 453get_nearest_part (object *op, const object *pl)
380{ 454{
381 object *tmp, *closest; 455 object *tmp, *closest;
382 int last_dist, i; 456 int last_dist, i;
383 457
384 if (op->more == NULL) 458 if (!op->more)
385 return op; 459 return op;
460
386 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 461 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
462 tmp;
463 tmp = tmp->more)
387 if ((i = distance (tmp, pl)) < last_dist) 464 if ((i = distance (tmp, pl)) < last_dist)
388 closest = tmp, last_dist = i; 465 closest = tmp, last_dist = i;
466
389 return closest; 467 return closest;
390} 468}
391 469
392/* 470/*
393 * Returns the object which has the count-variable equal to the argument. 471 * Returns the object which has the count-variable equal to the argument.
472 * VERRRY slow.
394 */ 473 */
395
396object * 474object *
397find_object (tag_t i) 475find_object (tag_t i)
398{ 476{
399 for (object *op = object::first; op; op = op->next) 477 for_all_objects (op)
400 if (op->count == i) 478 if (op->count == i)
401 return op; 479 return op;
402 480
403 return 0; 481 return 0;
404} 482}
405 483
406/* 484/*
407 * Returns the first object which has a name equal to the argument. 485 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 486 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 487 * Enables features like "patch <name-of-other-player> food 999"
410 */ 488 */
411
412object * 489object *
413find_object_name (const char *str) 490find_object_name (const char *str)
414{ 491{
415 shstr_cmp str_ (str); 492 shstr_cmp str_ (str);
416 object *op; 493 object *op;
417 494
418 for (op = object::first; op != NULL; op = op->next) 495 for_all_objects (op)
419 if (op->name == str_) 496 if (op->name == str_)
420 break; 497 break;
421 498
422 return op; 499 return op;
423} 500}
424 501
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 502/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 503 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 504 * skill and experience objects.
505 * ACTUALLY NO! investigate! TODO
434 */ 506 */
435void 507void
436object::set_owner (object *owner) 508object::set_owner (object *owner)
437{ 509{
510 // allow objects which own objects
438 if (!owner) 511 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 512 while (owner->owner)
449 owner = owner->owner; 513 owner = owner->owner;
514
515 if (flag [FLAG_FREED])
516 {
517 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
518 return;
519 }
450 520
451 this->owner = owner; 521 this->owner = owner;
522}
523
524int
525object::slottype () const
526{
527 if (type == SKILL)
528 {
529 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
530 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
531 }
532 else
533 {
534 if (slot [body_combat].info) return slot_combat;
535 if (slot [body_range ].info) return slot_ranged;
536 }
537
538 return slot_none;
539}
540
541bool
542object::change_weapon (object *ob)
543{
544 if (current_weapon == ob)
545 return true;
546
547 if (chosen_skill)
548 chosen_skill->flag [FLAG_APPLIED] = false;
549
550 current_weapon = ob;
551 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
552
553 if (chosen_skill)
554 chosen_skill->flag [FLAG_APPLIED] = true;
555
556 update_stats ();
557
558 if (ob)
559 {
560 // now check wether any body locations became invalid, in which case
561 // we cannot apply the weapon at the moment.
562 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
563 if (slot[i].used < 0)
564 {
565 current_weapon = chosen_skill = 0;
566 update_stats ();
567
568 new_draw_info_format (NDI_UNIQUE, 0, this,
569 "You try to balance all your items at once, "
570 "but the %s is just too much for your body. "
571 "[You need to unapply some items first.]", &ob->name);
572 return false;
573 }
574
575 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
576 }
577 else
578 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
579
580 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
581 {
582 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
583 &name, ob->debug_desc ());
584 return false;
585 }
586
587 return true;
452} 588}
453 589
454/* Zero the key_values on op, decrementing the shared-string 590/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 591 * refcounts and freeing the links.
456 */ 592 */
457static void 593static void
458free_key_values (object *op) 594free_key_values (object *op)
459{ 595{
460 for (key_value *i = op->key_values; i != 0;) 596 for (key_value *i = op->key_values; i; )
461 { 597 {
462 key_value *next = i->next; 598 key_value *next = i->next;
463 delete i; 599 delete i;
464 600
465 i = next; 601 i = next;
466 } 602 }
467 603
468 op->key_values = 0; 604 op->key_values = 0;
469} 605}
470 606
471/* 607object &
472 * copy_to first frees everything allocated by the dst object, 608object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 609{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 610 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 611 bool is_removed = flag [FLAG_REMOVED];
484 612
485 *(object_copy *)dst = *this; 613 *(object_copy *)this = src;
486 614
487 if (is_freed) 615 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 616 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495 617
496 /* Copy over key_values, if any. */ 618 /* Copy over key_values, if any. */
497 if (key_values) 619 if (src.key_values)
498 { 620 {
499 key_value *tail = 0; 621 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 622 key_values = 0;
503 623
504 for (i = key_values; i; i = i->next) 624 for (key_value *i = src.key_values; i; i = i->next)
505 { 625 {
506 key_value *new_link = new key_value; 626 key_value *new_link = new key_value;
507 627
508 new_link->next = 0; 628 new_link->next = 0;
509 new_link->key = i->key; 629 new_link->key = i->key;
510 new_link->value = i->value; 630 new_link->value = i->value;
511 631
512 /* Try and be clever here, too. */ 632 /* Try and be clever here, too. */
513 if (!dst->key_values) 633 if (!key_values)
514 { 634 {
515 dst->key_values = new_link; 635 key_values = new_link;
516 tail = new_link; 636 tail = new_link;
517 } 637 }
518 else 638 else
519 { 639 {
520 tail->next = new_link; 640 tail->next = new_link;
521 tail = new_link; 641 tail = new_link;
522 } 642 }
523 } 643 }
524 } 644 }
645}
646
647/*
648 * copy_to first frees everything allocated by the dst object,
649 * and then copies the contents of itself into the second
650 * object, allocating what needs to be allocated. Basically, any
651 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
652 * if the first object is freed, the pointers in the new object
653 * will point at garbage.
654 */
655void
656object::copy_to (object *dst)
657{
658 *dst = *this;
659
660 if (speed < 0)
661 dst->speed_left -= rndm ();
525 662
526 dst->set_speed (dst->speed); 663 dst->set_speed (dst->speed);
664}
665
666void
667object::instantiate ()
668{
669 if (!uuid.seq) // HACK
670 uuid = UUID::gen ();
671
672 speed_left = -0.1f;
673 /* copy the body_info to the body_used - this is only really
674 * need for monsters, but doesn't hurt to do it for everything.
675 * by doing so, when a monster is created, it has good starting
676 * values for the body_used info, so when items are created
677 * for it, they can be properly equipped.
678 */
679 for (int i = NUM_BODY_LOCATIONS; i--; )
680 slot[i].used = slot[i].info;
681
682 attachable::instantiate ();
527} 683}
528 684
529object * 685object *
530object::clone () 686object::clone ()
531{ 687{
589 * UP_OBJ_FACE: only the objects face has changed. 745 * UP_OBJ_FACE: only the objects face has changed.
590 */ 746 */
591void 747void
592update_object (object *op, int action) 748update_object (object *op, int action)
593{ 749{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 750 if (op == NULL)
597 { 751 {
598 /* this should never happen */ 752 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 753 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 754 return;
660 814
661 if (op->more) 815 if (op->more)
662 update_object (op->more, action); 816 update_object (op->more, action);
663} 817}
664 818
665object *object::first;
666
667object::object () 819object::object ()
668{ 820{
669 SET_FLAG (this, FLAG_REMOVED); 821 SET_FLAG (this, FLAG_REMOVED);
670 822
671 expmul = 1.0; 823 expmul = 1.0;
672 face = blank_face; 824 face = blank_face;
673} 825}
674 826
675object::~object () 827object::~object ()
676{ 828{
829 unlink ();
830
677 free_key_values (this); 831 free_key_values (this);
678} 832}
679 833
834static int object_count;
835
680void object::link () 836void object::link ()
681{ 837{
838 assert (!index);//D
839 uuid = UUID::gen ();
682 count = ++ob_count; 840 count = ++object_count;
683 uuid = gen_uuid ();
684 841
685 prev = 0; 842 refcnt_inc ();
686 next = object::first; 843 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 844}
693 845
694void object::unlink () 846void object::unlink ()
695{ 847{
696 if (this == object::first) 848 if (!index)
697 object::first = next; 849 return;
698 850
699 /* Remove this object from the list of used objects */ 851 objects.erase (this);
700 if (prev) prev->next = next; 852 refcnt_dec ();
701 if (next) next->prev = prev;
702
703 prev = 0;
704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711} 853}
712 854
713void 855void
714object::activate () 856object::activate ()
715{ 857{
716 /* If already on active list, don't do anything */ 858 /* If already on active list, don't do anything */
717 if (active ()) 859 if (active)
718 return; 860 return;
719 861
720 if (has_active_speed ()) 862 if (has_active_speed ())
721 { 863 actives.insert (this);
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731} 864}
732 865
733void 866void
734object::activate_recursive () 867object::activate_recursive ()
735{ 868{
736 activate (); 869 activate ();
737 870
738 for (object *op = inv; op; op = op->above) 871 for (object *op = inv; op; op = op->below)
739 op->activate_recursive (); 872 op->activate_recursive ();
740} 873}
741 874
742/* This function removes object 'op' from the list of active 875/* This function removes object 'op' from the list of active
743 * objects. 876 * objects.
749 */ 882 */
750void 883void
751object::deactivate () 884object::deactivate ()
752{ 885{
753 /* If not on the active list, nothing needs to be done */ 886 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 887 if (!active)
755 return; 888 return;
756 889
757 if (active_prev == 0) 890 actives.erase (this);
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772} 891}
773 892
774void 893void
775object::deactivate_recursive () 894object::deactivate_recursive ()
776{ 895{
777 for (object *op = inv; op; op = op->above) 896 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 897 op->deactivate_recursive ();
779 898
780 deactivate (); 899 deactivate ();
900}
901
902void
903object::set_flag_inv (int flag, int value)
904{
905 for (object *op = inv; op; op = op->below)
906 {
907 op->flag [flag] = value;
908 op->set_flag_inv (flag, value);
909 }
781} 910}
782 911
783/* 912/*
784 * Remove and free all objects in the inventory of the given object. 913 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 914 * object.c ?
799 * if some form of movement is allowed, let objects 928 * if some form of movement is allowed, let objects
800 * drop on that space. 929 * drop on that space.
801 */ 930 */
802 if (!drop_to_ground 931 if (!drop_to_ground
803 || !map 932 || !map
804 || map->in_memory != MAP_IN_MEMORY 933 || map->in_memory != MAP_ACTIVE
934 || map->nodrop
805 || ms ().move_block == MOVE_ALL) 935 || ms ().move_block == MOVE_ALL)
806 { 936 {
807 while (inv) 937 while (inv)
808 { 938 {
809 inv->destroy_inv (drop_to_ground); 939 inv->destroy_inv (drop_to_ground);
818 948
819 if (op->flag [FLAG_STARTEQUIP] 949 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 950 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 951 || op->type == RUNE
822 || op->type == TRAP 952 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 953 || op->flag [FLAG_IS_A_TEMPLATE]
954 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 955 op->destroy ();
825 else 956 else
826 map->insert (op, x, y); 957 map->insert (op, x, y);
827 } 958 }
828 } 959 }
842 remove_button_link (this); 973 remove_button_link (this);
843 974
844 if (flag [FLAG_FRIENDLY]) 975 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this); 976 remove_friendly_object (this);
846 977
847 if (!flag [FLAG_REMOVED])
848 remove (); 978 remove ();
849 979
850 if (flag [FLAG_FREED]) 980 attachable::do_destroy ();
851 return;
852 981
853 set_speed (0); 982 destroy_inv (true);
983
984 deactivate ();
985 unlink ();
854 986
855 flag [FLAG_FREED] = 1; 987 flag [FLAG_FREED] = 1;
856
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861 988
862 // hack to ensure that freed objects still have a valid map 989 // hack to ensure that freed objects still have a valid map
863 { 990 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes 991 static maptile *freed_map; // freed objects are moved here to avoid crashes
865 992
866 if (!freed_map) 993 if (!freed_map)
867 { 994 {
868 freed_map = new maptile; 995 freed_map = new maptile;
869 996
997 freed_map->path = "<freed objects map>";
870 freed_map->name = "/internal/freed_objects_map"; 998 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 999 freed_map->width = 3;
872 freed_map->height = 3; 1000 freed_map->height = 3;
1001 freed_map->nodrop = 1;
873 1002
874 freed_map->alloc (); 1003 freed_map->alloc ();
1004 freed_map->in_memory = MAP_ACTIVE;
875 } 1005 }
876 1006
877 map = freed_map; 1007 map = freed_map;
878 x = 1; 1008 x = 1;
879 y = 1; 1009 y = 1;
880 } 1010 }
881 1011
882 head = 0;
883
884 if (more) 1012 if (more)
885 { 1013 {
886 more->destroy (); 1014 more->destroy ();
887 more = 0; 1015 more = 0;
888 } 1016 }
889 1017
1018 head = 0;
1019
890 // clear those pointers that likely might have circular references to us 1020 // clear those pointers that likely might cause circular references
891 owner = 0; 1021 owner = 0;
892 enemy = 0; 1022 enemy = 0;
893 attacked_by = 0; 1023 attacked_by = 0;
894 1024 current_weapon = 0;
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
897} 1025}
898 1026
899void 1027void
900object::destroy (bool destroy_inventory) 1028object::destroy (bool destroy_inventory)
901{ 1029{
903 return; 1031 return;
904 1032
905 if (destroy_inventory) 1033 if (destroy_inventory)
906 destroy_inv (false); 1034 destroy_inv (false);
907 1035
1036 if (is_head ())
1037 if (sound_destroy)
1038 play_sound (sound_destroy);
1039 else if (flag [FLAG_MONSTER])
1040 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
1041
908 attachable::destroy (); 1042 attachable::destroy ();
909}
910
911/*
912 * sub_weight() recursively (outwards) subtracts a number from the
913 * weight of an object (and what is carried by it's environment(s)).
914 */
915void
916sub_weight (object *op, signed long weight)
917{
918 while (op != NULL)
919 {
920 if (op->type == CONTAINER)
921 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
922
923 op->carrying -= weight;
924 op = op->env;
925 }
926} 1043}
927 1044
928/* op->remove (): 1045/* op->remove ():
929 * This function removes the object op from the linked list of objects 1046 * This function removes the object op from the linked list of objects
930 * which it is currently tied to. When this function is done, the 1047 * which it is currently tied to. When this function is done, the
931 * object will have no environment. If the object previously had an 1048 * object will have no environment. If the object previously had an
932 * environment, the x and y coordinates will be updated to 1049 * environment, the x and y coordinates will be updated to
933 * the previous environment. 1050 * the previous environment.
934 * Beware: This function is called from the editor as well!
935 */ 1051 */
936void 1052void
937object::remove () 1053object::do_remove ()
938{ 1054{
939 object *tmp, *last = 0; 1055 object *tmp, *last = 0;
940 object *otmp; 1056 object *otmp;
941 1057
942 if (QUERY_FLAG (this, FLAG_REMOVED)) 1058 if (flag [FLAG_REMOVED])
943 return; 1059 return;
944 1060
945 SET_FLAG (this, FLAG_REMOVED);
946 INVOKE_OBJECT (REMOVE, this); 1061 INVOKE_OBJECT (REMOVE, this);
1062
1063 if (object *pl = visible_to ())
1064 esrv_del_item (pl->contr, count);
1065
1066 flag [FLAG_REMOVED] = true;
947 1067
948 if (more) 1068 if (more)
949 more->remove (); 1069 more->remove ();
950 1070
951 /* 1071 /*
952 * In this case, the object to be removed is in someones 1072 * In this case, the object to be removed is in someones
953 * inventory. 1073 * inventory.
954 */ 1074 */
955 if (env) 1075 if (env)
956 { 1076 {
1077 adjust_weight (env, -total_weight ());
1078
1079 *(above ? &above->below : &env->inv) = below;
1080
957 if (nrof) 1081 if (below)
958 sub_weight (env, weight * nrof); 1082 below->above = above;
959 else 1083
960 sub_weight (env, weight + carrying); 1084 /* we set up values so that it could be inserted into
1085 * the map, but we don't actually do that - it is up
1086 * to the caller to decide what we want to do.
1087 */
1088 map = env->map;
1089 x = env->x;
1090 y = env->y;
1091 above = 0;
1092 below = 0;
1093 env = 0;
961 1094
962 /* NO_FIX_PLAYER is set when a great many changes are being 1095 /* NO_FIX_PLAYER is set when a great many changes are being
963 * made to players inventory. If set, avoiding the call 1096 * made to players inventory. If set, avoiding the call
964 * to save cpu time. 1097 * to save cpu time.
965 */ 1098 */
966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1099 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967 otmp->update_stats (); 1100 otmp->update_stats ();
968
969 if (above)
970 above->below = below;
971 else
972 env->inv = below;
973
974 if (below)
975 below->above = above;
976
977 /* we set up values so that it could be inserted into
978 * the map, but we don't actually do that - it is up
979 * to the caller to decide what we want to do.
980 */
981 x = env->x, y = env->y;
982 map = env->map;
983 above = 0, below = 0;
984 env = 0;
985 } 1101 }
986 else if (map) 1102 else if (map)
987 { 1103 {
988 if (type == PLAYER) 1104 if (type == PLAYER)
989 { 1105 {
1106 // leaving a spot always closes any open container on the ground
1107 if (container && !container->env)
1108 // this causes spurious floorbox updates, but it ensures
1109 // that the CLOSE event is being sent.
1110 close_container ();
1111
990 --map->players; 1112 --map->players;
991 map->touch (); 1113 map->touch ();
992 } 1114 }
993 1115
994 map->dirty = true; 1116 map->dirty = true;
1117 mapspace &ms = this->ms ();
995 1118
996 /* link the object above us */ 1119 /* link the object above us */
997 if (above) 1120 if (above)
998 above->below = below; 1121 above->below = below;
999 else 1122 else
1000 map->at (x, y).top = below; /* we were top, set new top */ 1123 ms.top = below; /* we were top, set new top */
1001 1124
1002 /* Relink the object below us, if there is one */ 1125 /* Relink the object below us, if there is one */
1003 if (below) 1126 if (below)
1004 below->above = above; 1127 below->above = above;
1005 else 1128 else
1007 /* Nothing below, which means we need to relink map object for this space 1130 /* Nothing below, which means we need to relink map object for this space
1008 * use translated coordinates in case some oddness with map tiling is 1131 * use translated coordinates in case some oddness with map tiling is
1009 * evident 1132 * evident
1010 */ 1133 */
1011 if (GET_MAP_OB (map, x, y) != this) 1134 if (GET_MAP_OB (map, x, y) != this)
1012 {
1013 char *dump = dump_object (this);
1014 LOG (llevError,
1015 "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); 1135 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 ());
1016 free (dump);
1017 dump = dump_object (GET_MAP_OB (map, x, y));
1018 LOG (llevError, "%s\n", dump);
1019 free (dump);
1020 }
1021 1136
1022 map->at (x, y).bot = above; /* goes on above it. */ 1137 ms.bot = above; /* goes on above it. */
1023 } 1138 }
1024 1139
1025 above = 0; 1140 above = 0;
1026 below = 0; 1141 below = 0;
1027 1142
1028 if (map->in_memory == MAP_SAVING) 1143 if (map->in_memory == MAP_SAVING)
1029 return; 1144 return;
1030 1145
1031 int check_walk_off = !flag [FLAG_NO_APPLY]; 1146 int check_walk_off = !flag [FLAG_NO_APPLY];
1032 1147
1148 if (object *pl = ms.player ())
1149 {
1150 if (pl->container == this)
1151 /* If a container that the player is currently using somehow gets
1152 * removed (most likely destroyed), update the player view
1153 * appropriately.
1154 */
1155 pl->close_container ();
1156
1157 pl->contr->ns->floorbox_update ();
1158 }
1159
1033 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1160 for (tmp = ms.bot; tmp; tmp = tmp->above)
1034 { 1161 {
1035 /* No point updating the players look faces if he is the object 1162 /* No point updating the players look faces if he is the object
1036 * being removed. 1163 * being removed.
1037 */ 1164 */
1038
1039 if (tmp->type == PLAYER && tmp != this)
1040 {
1041 /* If a container that the player is currently using somehow gets
1042 * removed (most likely destroyed), update the player view
1043 * appropriately.
1044 */
1045 if (tmp->container == this)
1046 {
1047 flag [FLAG_APPLIED] = 0;
1048 tmp->container = 0;
1049 }
1050
1051 if (tmp->contr->ns)
1052 tmp->contr->ns->floorbox_update ();
1053 }
1054 1165
1055 /* See if object moving off should effect something */ 1166 /* See if object moving off should effect something */
1056 if (check_walk_off 1167 if (check_walk_off
1057 && ((move_type & tmp->move_off) 1168 && ((move_type & tmp->move_off)
1058 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1169 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061 1172
1062 if (destroyed ()) 1173 if (destroyed ())
1063 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1174 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1064 } 1175 }
1065 1176
1066 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1067 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1068 if (tmp->above == tmp)
1069 tmp->above = 0;
1070
1071 last = tmp; 1177 last = tmp;
1072 } 1178 }
1073 1179
1074 /* last == NULL if there are no objects on this space */ 1180 /* last == NULL if there are no objects on this space */
1075 //TODO: this makes little sense, why only update the topmost object? 1181 //TODO: this makes little sense, why only update the topmost object?
1095merge_ob (object *op, object *top) 1201merge_ob (object *op, object *top)
1096{ 1202{
1097 if (!op->nrof) 1203 if (!op->nrof)
1098 return 0; 1204 return 0;
1099 1205
1100 if (top) 1206 if (!top)
1101 for (top = op; top && top->above; top = top->above) 1207 for (top = op; top && top->above; top = top->above)
1102 ; 1208 ;
1103 1209
1104 for (; top; top = top->below) 1210 for (; top; top = top->below)
1105 {
1106 if (top == op)
1107 continue;
1108
1109 if (object::can_merge (op, top)) 1211 if (object::can_merge (op, top))
1110 { 1212 {
1111 top->nrof += op->nrof; 1213 top->nrof += op->nrof;
1112 1214
1113/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1215 if (object *pl = top->visible_to ())
1114 op->weight = 0; /* Don't want any adjustements now */ 1216 esrv_update_item (UPD_NROF, pl, top);
1217
1218 op->weight = 0; // cancel the addition above
1219 op->carrying = 0; // must be 0 already
1220
1115 op->destroy (); 1221 op->destroy (1);
1222
1116 return top; 1223 return top;
1117 } 1224 }
1118 }
1119 1225
1120 return 0; 1226 return 0;
1121} 1227}
1122 1228
1229void
1230object::expand_tail ()
1231{
1232 if (more)
1233 return;
1234
1235 object *prev = this;
1236
1237 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1238 {
1239 object *op = arch_to_object (at);
1240
1241 op->name = name;
1242 op->name_pl = name_pl;
1243 op->title = title;
1244
1245 op->head = this;
1246 prev->more = op;
1247
1248 prev = op;
1249 }
1250}
1251
1123/* 1252/*
1124 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1253 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1125 * job preparing multi-part monsters 1254 * job preparing multi-part monsters.
1126 */ 1255 */
1127object * 1256object *
1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1257insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129{ 1258{
1130 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1259 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1131 { 1260 {
1132 tmp->x = x + tmp->arch->clone.x; 1261 tmp->x = x + tmp->arch->x;
1133 tmp->y = y + tmp->arch->clone.y; 1262 tmp->y = y + tmp->arch->y;
1134 } 1263 }
1135 1264
1136 return insert_ob_in_map (op, m, originator, flag); 1265 return insert_ob_in_map (op, m, originator, flag);
1137} 1266}
1138 1267
1157 * just 'op' otherwise 1286 * just 'op' otherwise
1158 */ 1287 */
1159object * 1288object *
1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1289insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161{ 1290{
1291 assert (!op->flag [FLAG_FREED]);
1292
1162 object *tmp, *top, *floor = NULL; 1293 object *top, *floor = NULL;
1163 sint16 x, y;
1164 1294
1165 if (QUERY_FLAG (op, FLAG_FREED)) 1295 op->remove ();
1166 {
1167 LOG (llevError, "Trying to insert freed object!\n");
1168 return NULL;
1169 }
1170
1171 if (!m)
1172 {
1173 char *dump = dump_object (op);
1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1175 free (dump);
1176 return op;
1177 }
1178
1179 if (out_of_map (m, op->x, op->y))
1180 {
1181 char *dump = dump_object (op);
1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1183#ifdef MANY_CORES
1184 /* Better to catch this here, as otherwise the next use of this object
1185 * is likely to cause a crash. Better to find out where it is getting
1186 * improperly inserted.
1187 */
1188 abort ();
1189#endif
1190 free (dump);
1191 return op;
1192 }
1193
1194 if (!QUERY_FLAG (op, FLAG_REMOVED))
1195 {
1196 char *dump = dump_object (op);
1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198 free (dump);
1199 return op;
1200 }
1201
1202 if (op->more)
1203 {
1204 /* The part may be on a different map. */
1205
1206 object *more = op->more;
1207
1208 /* We really need the caller to normalize coordinates - if
1209 * we set the map, that doesn't work if the location is within
1210 * a map and this is straddling an edge. So only if coordinate
1211 * is clear wrong do we normalize it.
1212 */
1213 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214 more->map = get_map_from_coord (m, &more->x, &more->y);
1215 else if (!more->map)
1216 {
1217 /* For backwards compatibility - when not dealing with tiled maps,
1218 * more->map should always point to the parent.
1219 */
1220 more->map = m;
1221 }
1222
1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1224 {
1225 if (!op->head)
1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228 return 0;
1229 }
1230 }
1231
1232 CLEAR_FLAG (op, FLAG_REMOVED);
1233 1296
1234 /* Ideally, the caller figures this out. However, it complicates a lot 1297 /* Ideally, the caller figures this out. However, it complicates a lot
1235 * of areas of callers (eg, anything that uses find_free_spot would now 1298 * of areas of callers (eg, anything that uses find_free_spot would now
1236 * need extra work 1299 * need extra work
1237 */ 1300 */
1238 op->map = get_map_from_coord (m, &op->x, &op->y); 1301 if (!xy_normalise (m, op->x, op->y))
1239 x = op->x; 1302 {
1240 y = op->y; 1303 op->destroy ();
1304 return 0;
1305 }
1306
1307 if (object *more = op->more)
1308 if (!insert_ob_in_map (more, m, originator, flag))
1309 return 0;
1310
1311 CLEAR_FLAG (op, FLAG_REMOVED);
1312
1313 op->map = m;
1314 mapspace &ms = op->ms ();
1241 1315
1242 /* this has to be done after we translate the coordinates. 1316 /* this has to be done after we translate the coordinates.
1243 */ 1317 */
1244 if (op->nrof && !(flag & INS_NO_MERGE)) 1318 if (op->nrof && !(flag & INS_NO_MERGE))
1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1319 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1246 if (object::can_merge (op, tmp)) 1320 if (object::can_merge (op, tmp))
1247 { 1321 {
1248 op->nrof += tmp->nrof; 1322 op->nrof += tmp->nrof;
1249 tmp->destroy (); 1323 tmp->destroy (1);
1250 } 1324 }
1251 1325
1252 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1326 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1253 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1327 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1254 1328
1267 op->below = originator->below; 1341 op->below = originator->below;
1268 1342
1269 if (op->below) 1343 if (op->below)
1270 op->below->above = op; 1344 op->below->above = op;
1271 else 1345 else
1272 op->ms ().bot = op; 1346 ms.bot = op;
1273 1347
1274 /* since *below* originator, no need to update top */ 1348 /* since *below* originator, no need to update top */
1275 originator->below = op; 1349 originator->below = op;
1276 } 1350 }
1277 else 1351 else
1278 { 1352 {
1353 top = ms.bot;
1354
1279 /* If there are other objects, then */ 1355 /* If there are other objects, then */
1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1356 if (top)
1281 { 1357 {
1282 object *last = 0; 1358 object *last = 0;
1283 1359
1284 /* 1360 /*
1285 * 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.
1291 * 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
1292 * 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
1293 * 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
1294 * that flying non pickable objects are spell objects. 1370 * that flying non pickable objects are spell objects.
1295 */ 1371 */
1296 while (top) 1372 for (top = ms.bot; top; top = top->above)
1297 { 1373 {
1298 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))
1299 floor = top; 1375 floor = top;
1300 1376
1301 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))
1304 top = top->below; 1380 top = top->below;
1305 break; 1381 break;
1306 } 1382 }
1307 1383
1308 last = top; 1384 last = top;
1309 top = top->above;
1310 } 1385 }
1311 1386
1312 /* 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 */
1313 top = last; 1388 top = last;
1314 1389
1316 * looks like instead of lots of conditions here. 1391 * looks like instead of lots of conditions here.
1317 * makes things faster, and effectively the same result. 1392 * makes things faster, and effectively the same result.
1318 */ 1393 */
1319 1394
1320 /* Have object 'fall below' other objects that block view. 1395 /* Have object 'fall below' other objects that block view.
1321 * Unless those objects are exits, type 66 1396 * Unless those objects are exits.
1322 * If INS_ON_TOP is used, don't do this processing 1397 * If INS_ON_TOP is used, don't do this processing
1323 * Need to find the object that in fact blocks view, otherwise 1398 * Need to find the object that in fact blocks view, otherwise
1324 * stacking is a bit odd. 1399 * stacking is a bit odd.
1325 */ 1400 */
1326 if (!(flag & INS_ON_TOP) && 1401 if (!(flag & INS_ON_TOP)
1327 (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))
1328 { 1404 {
1329 for (last = top; last != floor; last = last->below) 1405 for (last = top; last != floor; last = last->below)
1330 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1406 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1331 break; 1407 break;
1408
1332 /* Check to see if we found the object that blocks view, 1409 /* Check to see if we found the object that blocks view,
1333 * 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
1334 * we can get inserted below this one, which requires we 1411 * we can get inserted below this one, which requires we
1335 * set top to the object below us. 1412 * set top to the object below us.
1336 */ 1413 */
1337 if (last && last->below && last != floor) 1414 if (last && last->below && last != floor)
1338 top = last->below; 1415 top = last->below;
1339 } 1416 }
1340 } /* If objects on this space */ 1417 } /* If objects on this space */
1341 1418
1342 if (flag & INS_MAP_LOAD)
1343 top = GET_MAP_TOP (op->map, op->x, op->y);
1344
1345 if (flag & INS_ABOVE_FLOOR_ONLY) 1419 if (flag & INS_ABOVE_FLOOR_ONLY)
1346 top = floor; 1420 top = floor;
1347 1421
1348 /* 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.
1349 */ 1423 */
1350 1424
1351 /* First object on this space */ 1425 /* First object on this space */
1352 if (!top) 1426 if (!top)
1353 { 1427 {
1354 op->above = GET_MAP_OB (op->map, op->x, op->y); 1428 op->above = ms.bot;
1355 1429
1356 if (op->above) 1430 if (op->above)
1357 op->above->below = op; 1431 op->above->below = op;
1358 1432
1359 op->below = 0; 1433 op->below = 0;
1360 op->ms ().bot = op; 1434 ms.bot = op;
1361 } 1435 }
1362 else 1436 else
1363 { /* get inserted into the stack above top */ 1437 { /* get inserted into the stack above top */
1364 op->above = top->above; 1438 op->above = top->above;
1365 1439
1369 op->below = top; 1443 op->below = top;
1370 top->above = op; 1444 top->above = op;
1371 } 1445 }
1372 1446
1373 if (!op->above) 1447 if (!op->above)
1374 op->ms ().top = op; 1448 ms.top = op;
1375 } /* else not INS_BELOW_ORIGINATOR */ 1449 } /* else not INS_BELOW_ORIGINATOR */
1376 1450
1377 if (op->type == PLAYER) 1451 if (op->type == PLAYER)
1378 { 1452 {
1379 op->contr->do_los = 1; 1453 op->contr->do_los = 1;
1381 op->map->touch (); 1455 op->map->touch ();
1382 } 1456 }
1383 1457
1384 op->map->dirty = true; 1458 op->map->dirty = true;
1385 1459
1386 /* If we have a floor, we know the player, if any, will be above
1387 * it, so save a few ticks and start from there.
1388 */
1389 if (!(flag & INS_MAP_LOAD))
1390 if (object *pl = op->ms ().player ()) 1460 if (object *pl = ms.player ())
1391 if (pl->contr->ns)
1392 pl->contr->ns->floorbox_update (); 1461 pl->contr->ns->floorbox_update ();
1393 1462
1394 /* If this object glows, it may affect lighting conditions that are 1463 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1464 * visible to others on this map. But update_all_los is really
1396 * an inefficient way to do this, as it means los for all players 1465 * an inefficient way to do this, as it means los for all players
1397 * on the map will get recalculated. The players could very well 1466 * on the map will get recalculated. The players could very well
1416 * blocked() and wall() work properly), and these flags are updated by 1485 * blocked() and wall() work properly), and these flags are updated by
1417 * update_object(). 1486 * update_object().
1418 */ 1487 */
1419 1488
1420 /* if this is not the head or flag has been passed, don't check walk on status */ 1489 /* if this is not the head or flag has been passed, don't check walk on status */
1421 if (!(flag & INS_NO_WALK_ON) && !op->head) 1490 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1422 { 1491 {
1423 if (check_move_on (op, originator)) 1492 if (check_move_on (op, originator))
1424 return 0; 1493 return 0;
1425 1494
1426 /* If we are a multi part object, lets work our way through the check 1495 /* If we are a multi part object, lets work our way through the check
1427 * walk on's. 1496 * walk on's.
1428 */ 1497 */
1429 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1498 for (object *tmp = op->more; tmp; tmp = tmp->more)
1430 if (check_move_on (tmp, originator)) 1499 if (check_move_on (tmp, originator))
1431 return 0; 1500 return 0;
1432 } 1501 }
1433 1502
1434 return op; 1503 return op;
1439 * op is the object to insert it under: supplies x and the map. 1508 * op is the object to insert it under: supplies x and the map.
1440 */ 1509 */
1441void 1510void
1442replace_insert_ob_in_map (const char *arch_string, object *op) 1511replace_insert_ob_in_map (const char *arch_string, object *op)
1443{ 1512{
1444 object *tmp, *tmp1;
1445
1446 /* first search for itself and remove any old instances */ 1513 /* first search for itself and remove any old instances */
1447 1514
1448 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1515 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1516 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1450 tmp->destroy (); 1517 tmp->destroy (1);
1451 1518
1452 tmp1 = arch_to_object (archetype::find (arch_string)); 1519 object *tmp = arch_to_object (archetype::find (arch_string));
1453 1520
1454 tmp1->x = op->x; 1521 tmp->x = op->x;
1455 tmp1->y = op->y; 1522 tmp->y = op->y;
1523
1456 insert_ob_in_map (tmp1, op->map, op, 0); 1524 insert_ob_in_map (tmp, op->map, op, 0);
1457} 1525}
1458 1526
1459object * 1527object *
1460object::insert_at (object *where, object *originator, int flags) 1528object::insert_at (object *where, object *originator, int flags)
1461{ 1529{
1530 if (where->env)
1531 return where->env->insert (this);
1532 else
1462 where->map->insert (this, where->x, where->y, originator, flags); 1533 return where->map->insert (this, where->x, where->y, originator, flags);
1463} 1534}
1464 1535
1465/* 1536/*
1466 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1467 * is returned contains nr objects, and the remaining parts contains
1468 * the rest (or is removed and freed if that number is 0).
1469 * On failure, NULL is returned, and the reason put into the
1470 * global static errmsg array.
1471 */
1472object *
1473get_split_ob (object *orig_ob, uint32 nr)
1474{
1475 object *newob;
1476 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1477
1478 if (orig_ob->nrof < nr)
1479 {
1480 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1481 return NULL;
1482 }
1483
1484 newob = object_create_clone (orig_ob);
1485
1486 if ((orig_ob->nrof -= nr) < 1)
1487 orig_ob->destroy (1);
1488 else if (!is_removed)
1489 {
1490 if (orig_ob->env != NULL)
1491 sub_weight (orig_ob->env, orig_ob->weight * nr);
1492 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1493 {
1494 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1495 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1496 return NULL;
1497 }
1498 }
1499
1500 newob->nrof = nr;
1501
1502 return newob;
1503}
1504
1505/*
1506 * decrease_ob_nr(object, number) decreases a specified number from 1537 * decrease(object, number) decreases a specified number from
1507 * the amount of an object. If the amount reaches 0, the object 1538 * the amount of an object. If the amount reaches 0, the object
1508 * is subsequently removed and freed. 1539 * is subsequently removed and freed.
1509 * 1540 *
1510 * Return value: 'op' if something is left, NULL if the amount reached 0 1541 * Return value: 'op' if something is left, NULL if the amount reached 0
1511 */ 1542 */
1543bool
1544object::decrease (sint32 nr)
1545{
1546 if (!nr)
1547 return true;
1512 1548
1549 nr = min (nr, nrof);
1550
1551 nrof -= nr;
1552
1553 if (nrof)
1554 {
1555 adjust_weight (env, -weight * nr); // carrying == 0
1556
1557 if (object *pl = visible_to ())
1558 esrv_update_item (UPD_NROF, pl, this);
1559
1560 return true;
1561 }
1562 else
1563 {
1564 destroy (1);
1565 return false;
1566 }
1567}
1568
1569/*
1570 * split(ob,nr) splits up ob into two parts. The part which
1571 * is returned contains nr objects, and the remaining parts contains
1572 * the rest (or is removed and returned if that number is 0).
1573 * On failure, NULL is returned.
1574 */
1513object * 1575object *
1514decrease_ob_nr (object *op, uint32 i) 1576object::split (sint32 nr)
1515{ 1577{
1516 object *tmp; 1578 int have = number_of ();
1517 1579
1518 if (i == 0) /* objects with op->nrof require this check */ 1580 if (have < nr)
1519 return op; 1581 return 0;
1520 1582 else if (have == nr)
1521 if (i > op->nrof)
1522 i = op->nrof;
1523
1524 if (QUERY_FLAG (op, FLAG_REMOVED))
1525 op->nrof -= i;
1526 else if (op->env)
1527 { 1583 {
1528 /* is this object in the players inventory, or sub container
1529 * therein?
1530 */
1531 tmp = op->in_player ();
1532 /* nope. Is this a container the player has opened?
1533 * If so, set tmp to that player.
1534 * IMO, searching through all the players will mostly
1535 * likely be quicker than following op->env to the map,
1536 * and then searching the map for a player.
1537 */
1538 if (!tmp)
1539 for_all_players (pl)
1540 if (pl->ob->container == op->env)
1541 {
1542 tmp = pl->ob;
1543 break;
1544 }
1545
1546 if (i < op->nrof)
1547 {
1548 sub_weight (op->env, op->weight * i);
1549 op->nrof -= i;
1550 if (tmp)
1551 esrv_send_item (tmp, op);
1552 }
1553 else
1554 {
1555 op->remove (); 1584 remove ();
1556 op->nrof = 0; 1585 return this;
1557 if (tmp)
1558 esrv_del_item (tmp->contr, op->count);
1559 }
1560 } 1586 }
1561 else 1587 else
1562 { 1588 {
1563 object *above = op->above; 1589 decrease (nr);
1564 1590
1565 if (i < op->nrof) 1591 object *op = object_create_clone (this);
1566 op->nrof -= i; 1592 op->nrof = nr;
1567 else
1568 {
1569 op->remove ();
1570 op->nrof = 0;
1571 }
1572
1573 /* Since we just removed op, op->above is null */
1574 for (tmp = above; tmp; tmp = tmp->above)
1575 if (tmp->type == PLAYER)
1576 {
1577 if (op->nrof)
1578 esrv_send_item (tmp, op);
1579 else
1580 esrv_del_item (tmp->contr, op->count);
1581 }
1582 }
1583
1584 if (op->nrof)
1585 return op; 1593 return op;
1586 else
1587 {
1588 op->destroy ();
1589 return 0;
1590 }
1591}
1592
1593/*
1594 * add_weight(object, weight) adds the specified weight to an object,
1595 * and also updates how much the environment(s) is/are carrying.
1596 */
1597
1598void
1599add_weight (object *op, signed long weight)
1600{
1601 while (op != NULL)
1602 {
1603 if (op->type == CONTAINER)
1604 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1605
1606 op->carrying += weight;
1607 op = op->env;
1608 } 1594 }
1609} 1595}
1610 1596
1611object * 1597object *
1612insert_ob_in_ob (object *op, object *where) 1598insert_ob_in_ob (object *op, object *where)
1617 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1603 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1618 free (dump); 1604 free (dump);
1619 return op; 1605 return op;
1620 } 1606 }
1621 1607
1622 if (where->head) 1608 if (where->head_ () != where)
1623 { 1609 {
1624 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1610 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1625 where = where->head; 1611 where = where->head;
1626 } 1612 }
1627 1613
1628 return where->insert (op); 1614 return where->insert (op);
1629} 1615}
1634 * inside the object environment. 1620 * inside the object environment.
1635 * 1621 *
1636 * The function returns now pointer to inserted item, and return value can 1622 * The function returns now pointer to inserted item, and return value can
1637 * be != op, if items are merged. -Tero 1623 * be != op, if items are merged. -Tero
1638 */ 1624 */
1639
1640object * 1625object *
1641object::insert (object *op) 1626object::insert (object *op)
1642{ 1627{
1643 object *tmp, *otmp;
1644
1645 if (!QUERY_FLAG (op, FLAG_REMOVED))
1646 op->remove ();
1647
1648 if (op->more) 1628 if (op->more)
1649 { 1629 {
1650 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1630 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1651 return op; 1631 return op;
1652 } 1632 }
1653 1633
1654 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1634 op->remove ();
1655 CLEAR_FLAG (op, FLAG_REMOVED); 1635
1636 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1637
1656 if (op->nrof) 1638 if (op->nrof)
1657 {
1658 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1639 for (object *tmp = inv; tmp; tmp = tmp->below)
1659 if (object::can_merge (tmp, op)) 1640 if (object::can_merge (tmp, op))
1660 { 1641 {
1661 /* return the original object and remove inserted object 1642 /* return the original object and remove inserted object
1662 (client needs the original object) */ 1643 (client needs the original object) */
1663 tmp->nrof += op->nrof; 1644 tmp->nrof += op->nrof;
1664 /* Weight handling gets pretty funky. Since we are adding to 1645
1665 * tmp->nrof, we need to increase the weight. 1646 if (object *pl = tmp->visible_to ())
1666 */ 1647 esrv_update_item (UPD_NROF, pl, tmp);
1648
1667 add_weight (this, op->weight * op->nrof); 1649 adjust_weight (this, op->total_weight ());
1668 SET_FLAG (op, FLAG_REMOVED); 1650
1669 op->destroy (); /* free the inserted object */ 1651 op->destroy (1);
1670 op = tmp; 1652 op = tmp;
1671 op->remove (); /* and fix old object's links */ 1653 goto inserted;
1672 CLEAR_FLAG (op, FLAG_REMOVED);
1673 break;
1674 } 1654 }
1675 1655
1676 /* I assume combined objects have no inventory 1656 op->owner = 0; // it's his/hers now. period.
1677 * We add the weight - this object could have just been removed
1678 * (if it was possible to merge). calling remove_ob will subtract
1679 * the weight, so we need to add it in again, since we actually do
1680 * the linking below
1681 */
1682 add_weight (this, op->weight * op->nrof);
1683 }
1684 else
1685 add_weight (this, (op->weight + op->carrying));
1686
1687 otmp = this->in_player ();
1688 if (otmp && otmp->contr)
1689 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1690 otmp->update_stats ();
1691
1692 op->map = 0; 1657 op->map = 0;
1693 op->env = this; 1658 op->x = 0;
1659 op->y = 0;
1660
1694 op->above = 0; 1661 op->above = 0;
1695 op->below = 0; 1662 op->below = inv;
1696 op->x = 0, op->y = 0; 1663 op->env = this;
1697 1664
1665 if (inv)
1666 inv->above = op;
1667
1668 inv = op;
1669
1670 op->flag [FLAG_REMOVED] = 0;
1671
1672 if (object *pl = op->visible_to ())
1673 esrv_send_item (pl, op);
1674
1675 adjust_weight (this, op->total_weight ());
1676
1677inserted:
1698 /* reset the light list and los of the players on the map */ 1678 /* reset the light list and los of the players on the map */
1699 if ((op->glow_radius != 0) && map) 1679 if (op->glow_radius && map && map->darkness)
1700 {
1701#ifdef DEBUG_LIGHTS
1702 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1703#endif /* DEBUG_LIGHTS */
1704 if (map->darkness)
1705 update_all_los (map, x, y); 1680 update_all_los (map, x, y);
1706 }
1707 1681
1708 /* Client has no idea of ordering so lets not bother ordering it here. 1682 // if this is a player's inventory, update stats
1709 * It sure simplifies this function... 1683 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1710 */ 1684 update_stats ();
1711 if (!inv)
1712 inv = op;
1713 else
1714 {
1715 op->below = inv;
1716 op->below->above = op;
1717 inv = op;
1718 }
1719 1685
1720 INVOKE_OBJECT (INSERT, this); 1686 INVOKE_OBJECT (INSERT, this);
1721 1687
1722 return op; 1688 return op;
1723} 1689}
1776 1742
1777 /* The objects have to be checked from top to bottom. 1743 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1744 * Hence, we first go to the top:
1779 */ 1745 */
1780 1746
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1747 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1748 {
1783 /* Trim the search when we find the first other spell effect 1749 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1750 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1751 * we don't need to check all of them.
1786 */ 1752 */
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1770 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1771 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1772 {
1807 1773
1808 float 1774 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1775 diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1776
1811 if (op->type == PLAYER) 1777 if (op->type == PLAYER)
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1778 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1813 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1779 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1780 diff /= 4.0;
1844 * The first matching object is returned, or NULL if none. 1810 * The first matching object is returned, or NULL if none.
1845 */ 1811 */
1846object * 1812object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1813present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1814{
1849 if (m == NULL || out_of_map (m, x, y)) 1815 if (!m || out_of_map (m, x, y))
1850 { 1816 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1817 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1818 return NULL;
1853 } 1819 }
1854 1820
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1821 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1822 if (tmp->arch == at)
1857 return tmp; 1823 return tmp;
1858 1824
1859 return NULL; 1825 return NULL;
1860} 1826}
1871 { 1837 {
1872 LOG (llevError, "Present called outside map.\n"); 1838 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1839 return NULL;
1874 } 1840 }
1875 1841
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1842 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1843 if (tmp->type == type)
1878 return tmp; 1844 return tmp;
1879 1845
1880 return NULL; 1846 return NULL;
1881} 1847}
1938 * activate recursively a flag on an object inventory 1904 * activate recursively a flag on an object inventory
1939 */ 1905 */
1940void 1906void
1941flag_inv (object *op, int flag) 1907flag_inv (object *op, int flag)
1942{ 1908{
1943 if (op->inv)
1944 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1909 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1945 { 1910 {
1946 SET_FLAG (tmp, flag); 1911 SET_FLAG (tmp, flag);
1947 flag_inv (tmp, flag); 1912 flag_inv (tmp, flag);
1948 } 1913 }
1949} 1914}
1950 1915
1951/* 1916/*
1952 * deactivate recursively a flag on an object inventory 1917 * deactivate recursively a flag on an object inventory
1953 */ 1918 */
1954void 1919void
1955unflag_inv (object *op, int flag) 1920unflag_inv (object *op, int flag)
1956{ 1921{
1957 if (op->inv)
1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1922 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 1923 {
1960 CLEAR_FLAG (tmp, flag); 1924 CLEAR_FLAG (tmp, flag);
1961 unflag_inv (tmp, flag); 1925 unflag_inv (tmp, flag);
1962 } 1926 }
1963}
1964
1965/*
1966 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1967 * all it's inventory (recursively).
1968 * If checksums are used, a player will get set_cheat called for
1969 * him/her-self and all object carried by a call to this function.
1970 */
1971void
1972set_cheat (object *op)
1973{
1974 SET_FLAG (op, FLAG_WAS_WIZ);
1975 flag_inv (op, FLAG_WAS_WIZ);
1976} 1927}
1977 1928
1978/* 1929/*
1979 * find_free_spot(object, map, x, y, start, stop) will search for 1930 * find_free_spot(object, map, x, y, start, stop) will search for
1980 * a spot at the given map and coordinates which will be able to contain 1931 * a spot at the given map and coordinates which will be able to contain
1982 * to search (see the freearr_x/y[] definition). 1933 * to search (see the freearr_x/y[] definition).
1983 * It returns a random choice among the alternatives found. 1934 * It returns a random choice among the alternatives found.
1984 * start and stop are where to start relative to the free_arr array (1,9 1935 * start and stop are where to start relative to the free_arr array (1,9
1985 * does all 4 immediate directions). This returns the index into the 1936 * does all 4 immediate directions). This returns the index into the
1986 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1937 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1987 * Note - this only checks to see if there is space for the head of the
1988 * object - if it is a multispace object, this should be called for all
1989 * pieces.
1990 * Note2: This function does correctly handle tiled maps, but does not 1938 * Note: This function does correctly handle tiled maps, but does not
1991 * inform the caller. However, insert_ob_in_map will update as 1939 * inform the caller. However, insert_ob_in_map will update as
1992 * necessary, so the caller shouldn't need to do any special work. 1940 * necessary, so the caller shouldn't need to do any special work.
1993 * Note - updated to take an object instead of archetype - this is necessary 1941 * Note - updated to take an object instead of archetype - this is necessary
1994 * because arch_blocked (now ob_blocked) needs to know the movement type 1942 * because arch_blocked (now ob_blocked) needs to know the movement type
1995 * to know if the space in question will block the object. We can't use 1943 * to know if the space in question will block the object. We can't use
1997 * customized, changed states, etc. 1945 * customized, changed states, etc.
1998 */ 1946 */
1999int 1947int
2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1948find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2001{ 1949{
1950 int altern[SIZEOFFREE];
2002 int index = 0, flag; 1951 int index = 0, flag;
2003 int altern[SIZEOFFREE];
2004 1952
2005 for (int i = start; i < stop; i++) 1953 for (int i = start; i < stop; i++)
2006 { 1954 {
2007 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1955 mapxy pos (m, x, y); pos.move (i);
2008 if (!flag) 1956
1957 if (!pos.normalise ())
1958 continue;
1959
1960 mapspace &ms = *pos;
1961
1962 if (ms.flags () & P_IS_ALIVE)
1963 continue;
1964
1965 /* However, often
1966 * ob doesn't have any move type (when used to place exits)
1967 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1968 */
1969 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1970 {
2009 altern [index++] = i; 1971 altern [index++] = i;
1972 continue;
1973 }
2010 1974
2011 /* Basically, if we find a wall on a space, we cut down the search size. 1975 /* Basically, if we find a wall on a space, we cut down the search size.
2012 * In this way, we won't return spaces that are on another side of a wall. 1976 * In this way, we won't return spaces that are on another side of a wall.
2013 * This mostly work, but it cuts down the search size in all directions - 1977 * This mostly work, but it cuts down the search size in all directions -
2014 * if the space being examined only has a wall to the north and empty 1978 * if the space being examined only has a wall to the north and empty
2015 * spaces in all the other directions, this will reduce the search space 1979 * spaces in all the other directions, this will reduce the search space
2016 * to only the spaces immediately surrounding the target area, and 1980 * to only the spaces immediately surrounding the target area, and
2017 * won't look 2 spaces south of the target space. 1981 * won't look 2 spaces south of the target space.
2018 */ 1982 */
2019 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1983 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1984 {
2020 stop = maxfree[i]; 1985 stop = maxfree[i];
1986 continue;
1987 }
1988
1989 /* Note it is intentional that we check ob - the movement type of the
1990 * head of the object should correspond for the entire object.
1991 */
1992 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1993 continue;
1994
1995 if (ob->blocked (m, pos.x, pos.y))
1996 continue;
1997
1998 altern [index++] = i;
2021 } 1999 }
2022 2000
2023 if (!index) 2001 if (!index)
2024 return -1; 2002 return -1;
2025 2003
2026 return altern[RANDOM () % index]; 2004 return altern [rndm (index)];
2027} 2005}
2028 2006
2029/* 2007/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2008 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2009 * find_free_spot(), but it will search max number of squares.
2034 */ 2012 */
2035int 2013int
2036find_first_free_spot (const object *ob, maptile *m, int x, int y) 2014find_first_free_spot (const object *ob, maptile *m, int x, int y)
2037{ 2015{
2038 for (int i = 0; i < SIZEOFFREE; i++) 2016 for (int i = 0; i < SIZEOFFREE; i++)
2039 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2017 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2040 return i; 2018 return i;
2041 2019
2042 return -1; 2020 return -1;
2043} 2021}
2044 2022
2052{ 2030{
2053 arr += begin; 2031 arr += begin;
2054 end -= begin; 2032 end -= begin;
2055 2033
2056 while (--end) 2034 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2035 swap (arr [end], arr [rndm (end + 1)]);
2058} 2036}
2059 2037
2060/* new function to make monster searching more efficient, and effective! 2038/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2039 * This basically returns a randomized array (in the passed pointer) of
2062 * the spaces to find monsters. In this way, it won't always look for 2040 * the spaces to find monsters. In this way, it won't always look for
2098 object *tmp; 2076 object *tmp;
2099 maptile *mp; 2077 maptile *mp;
2100 2078
2101 MoveType blocked, move_type; 2079 MoveType blocked, move_type;
2102 2080
2103 if (exclude && exclude->head) 2081 if (exclude && exclude->head_ () != exclude)
2104 { 2082 {
2105 exclude = exclude->head; 2083 exclude = exclude->head;
2106 move_type = exclude->move_type; 2084 move_type = exclude->move_type;
2107 } 2085 }
2108 else 2086 else
2131 max = maxfree[i]; 2109 max = maxfree[i];
2132 else if (mflags & P_IS_ALIVE) 2110 else if (mflags & P_IS_ALIVE)
2133 { 2111 {
2134 for (tmp = ms.bot; tmp; tmp = tmp->above) 2112 for (tmp = ms.bot; tmp; tmp = tmp->above)
2135 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2113 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2136 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2114 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2137 break; 2115 break;
2138 2116
2139 if (tmp) 2117 if (tmp)
2140 return freedir[i]; 2118 return freedir[i];
2141 } 2119 }
2196 2174
2197 return 3; 2175 return 3;
2198} 2176}
2199 2177
2200/* 2178/*
2201 * absdir(int): Returns a number between 1 and 8, which represent
2202 * the "absolute" direction of a number (it actually takes care of
2203 * "overflow" in previous calculations of a direction).
2204 */
2205
2206int
2207absdir (int d)
2208{
2209 while (d < 1)
2210 d += 8;
2211
2212 while (d > 8)
2213 d -= 8;
2214
2215 return d;
2216}
2217
2218/*
2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2179 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2180 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2181 */
2222
2223int 2182int
2224dirdiff (int dir1, int dir2) 2183dirdiff (int dir1, int dir2)
2225{ 2184{
2226 int d; 2185 int d;
2227 2186
2340 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2299 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2341 * core dumps if they do. 2300 * core dumps if they do.
2342 * 2301 *
2343 * Add a check so we can't pick up invisible objects (0.93.8) 2302 * Add a check so we can't pick up invisible objects (0.93.8)
2344 */ 2303 */
2345
2346int 2304int
2347can_pick (const object *who, const object *item) 2305can_pick (const object *who, const object *item)
2348{ 2306{
2349 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2307 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2350 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2308 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2355 * create clone from object to another 2313 * create clone from object to another
2356 */ 2314 */
2357object * 2315object *
2358object_create_clone (object *asrc) 2316object_create_clone (object *asrc)
2359{ 2317{
2360 object *dst = 0, *tmp, *src, *part, *prev, *item; 2318 object *dst = 0, *tmp, *src, *prev, *item;
2361 2319
2362 if (!asrc) 2320 if (!asrc)
2363 return 0; 2321 return 0;
2364 2322
2365 src = asrc;
2366 if (src->head)
2367 src = src->head; 2323 src = asrc->head_ ();
2368 2324
2369 prev = 0; 2325 prev = 0;
2370 for (part = src; part; part = part->more) 2326 for (object *part = src; part; part = part->more)
2371 { 2327 {
2372 tmp = part->clone (); 2328 tmp = part->clone ();
2373 tmp->x -= src->x; 2329 tmp->x -= src->x;
2374 tmp->y -= src->y; 2330 tmp->y -= src->y;
2375 2331
2393 insert_ob_in_ob (object_create_clone (item), dst); 2349 insert_ob_in_ob (object_create_clone (item), dst);
2394 2350
2395 return dst; 2351 return dst;
2396} 2352}
2397 2353
2398/* GROS - Creates an object using a string representing its content. */
2399/* Basically, we save the content of the string to a temp file, then call */
2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2401/* but it was simple to make and allows reusing the load_object function. */
2402/* Remember not to use load_object_str in a time-critical situation. */
2403/* Also remember that multiparts objects are not supported for now. */
2404object *
2405load_object_str (const char *obstr)
2406{
2407 object *op;
2408 char filename[MAX_BUF];
2409
2410 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412 FILE *tempfile = fopen (filename, "w");
2413
2414 if (tempfile == NULL)
2415 {
2416 LOG (llevError, "Error - Unable to access load object temp file\n");
2417 return NULL;
2418 }
2419
2420 fprintf (tempfile, obstr);
2421 fclose (tempfile);
2422
2423 op = object::create ();
2424
2425 object_thawer thawer (filename);
2426
2427 if (thawer)
2428 load_object (thawer, op, 0);
2429
2430 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431 CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433 return op;
2434}
2435
2436/* This returns the first object in who's inventory that 2354/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2355 * has the same type and subtype match.
2438 * returns NULL if no match. 2356 * returns NULL if no match.
2439 */ 2357 */
2440object * 2358object *
2493 if (link->key == canonical_key) 2411 if (link->key == canonical_key)
2494 return link->value; 2412 return link->value;
2495 2413
2496 return 0; 2414 return 0;
2497} 2415}
2498
2499 2416
2500/* 2417/*
2501 * Updates the canonical_key in op to value. 2418 * Updates the canonical_key in op to value.
2502 * 2419 *
2503 * canonical_key is a shared string (value doesn't have to be). 2420 * canonical_key is a shared string (value doesn't have to be).
2527 /* Basically, if the archetype has this key set, 2444 /* Basically, if the archetype has this key set,
2528 * we need to store the null value so when we save 2445 * we need to store the null value so when we save
2529 * it, we save the empty value so that when we load, 2446 * it, we save the empty value so that when we load,
2530 * we get this value back again. 2447 * we get this value back again.
2531 */ 2448 */
2532 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2449 if (get_ob_key_link (op->arch, canonical_key))
2533 field->value = 0; 2450 field->value = 0;
2534 else 2451 else
2535 { 2452 {
2536 if (last) 2453 if (last)
2537 last->next = field->next; 2454 last->next = field->next;
2606 } 2523 }
2607 else 2524 else
2608 item = item->env; 2525 item = item->env;
2609} 2526}
2610 2527
2611
2612const char * 2528const char *
2613object::flag_desc (char *desc, int len) const 2529object::flag_desc (char *desc, int len) const
2614{ 2530{
2615 char *p = desc; 2531 char *p = desc;
2616 bool first = true; 2532 bool first = true;
2643{ 2559{
2644 char flagdesc[512]; 2560 char flagdesc[512];
2645 char info2[256 * 4]; 2561 char info2[256 * 4];
2646 char *p = info; 2562 char *p = info;
2647 2563
2648 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2564 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2649 count, uuid.seq, 2565 count,
2566 uuid.c_str (),
2650 &name, 2567 &name,
2651 title ? "\",title:" : "", 2568 title ? "\",title:\"" : "",
2652 title ? (const char *)title : "", 2569 title ? (const char *)title : "",
2653 flag_desc (flagdesc, 512), type); 2570 flag_desc (flagdesc, 512), type);
2654 2571
2655 if (env) 2572 if (!this->flag[FLAG_REMOVED] && env)
2656 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2573 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2657 2574
2658 if (map) 2575 if (map)
2659 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2576 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2660 2577
2662} 2579}
2663 2580
2664const char * 2581const char *
2665object::debug_desc () const 2582object::debug_desc () const
2666{ 2583{
2667 static char info[256 * 4]; 2584 static char info[3][256 * 4];
2585 static int info_idx;
2586
2668 return debug_desc (info); 2587 return debug_desc (info [++info_idx % 3]);
2669} 2588}
2670 2589
2590struct region *
2591object::region () const
2592{
2593 return map ? map->region (x, y)
2594 : region::default_region ();
2595}
2596
2597const materialtype_t *
2598object::dominant_material () const
2599{
2600 if (materialtype_t *mt = name_to_material (materialname))
2601 return mt;
2602
2603 return name_to_material (shstr_unknown);
2604}
2605
2606void
2607object::open_container (object *new_container)
2608{
2609 if (container == new_container)
2610 return;
2611
2612 if (object *old_container = container)
2613 {
2614 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2615 return;
2616
2617#if 0
2618 // remove the "Close old_container" object.
2619 if (object *closer = old_container->inv)
2620 if (closer->type == CLOSE_CON)
2621 closer->destroy ();
2622#endif
2623
2624 old_container->flag [FLAG_APPLIED] = 0;
2625 container = 0;
2626
2627 esrv_update_item (UPD_FLAGS, this, old_container);
2628 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2629 play_sound (sound_find ("chest_close"));
2630 }
2631
2632 if (new_container)
2633 {
2634 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2635 return;
2636
2637 // TODO: this does not seem to serve any purpose anymore?
2638#if 0
2639 // insert the "Close Container" object.
2640 if (archetype *closer = new_container->other_arch)
2641 {
2642 object *closer = arch_to_object (new_container->other_arch);
2643 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2644 new_container->insert (closer);
2645 }
2646#endif
2647
2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2649
2650 new_container->flag [FLAG_APPLIED] = 1;
2651 container = new_container;
2652
2653 esrv_update_item (UPD_FLAGS, this, new_container);
2654 esrv_send_inventory (this, new_container);
2655 play_sound (sound_find ("chest_open"));
2656 }
2657}
2658
2659object *
2660object::force_find (const shstr name)
2661{
2662 /* cycle through his inventory to look for the MARK we want to
2663 * place
2664 */
2665 for (object *tmp = inv; tmp; tmp = tmp->below)
2666 if (tmp->type == FORCE && tmp->slaying == name)
2667 return splay (tmp);
2668
2669 return 0;
2670}
2671
2672void
2673object::force_add (const shstr name, int duration)
2674{
2675 if (object *force = force_find (name))
2676 force->destroy ();
2677
2678 object *force = get_archetype (FORCE_NAME);
2679
2680 force->slaying = name;
2681 force->stats.food = 1;
2682 force->speed_left = -1.f;
2683
2684 force->set_speed (duration ? 1.f / duration : 0.f);
2685 force->flag [FLAG_IS_USED_UP] = true;
2686 force->flag [FLAG_APPLIED] = true;
2687
2688 insert (force);
2689}
2690
2691void
2692object::play_sound (faceidx sound)
2693{
2694 if (!sound)
2695 return;
2696
2697 if (flag [FLAG_REMOVED])
2698 return;
2699
2700 if (env)
2701 {
2702 if (object *pl = in_player ())
2703 pl->contr->play_sound (sound);
2704 }
2705 else
2706 map->play_sound (sound, x, y);
2707}
2708

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines