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.128 by root, Mon Feb 5 01:24:45 2007 UTC vs.
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines