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.141 by root, Sun Apr 29 21:44:34 2007 UTC vs.
Revision 1.223 by root, Wed Apr 30 08:29:31 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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 (client_visible () && !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 if (!pl->container || this == pl->container)
364 return pl;
365 }
366 }
367
368 return 0;
369}
370
371// adjust weight per container type ("of holding")
372static sint32
373weight_adjust (object *op, sint32 weight)
374{
375 return op->type == CONTAINER
376 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377 : weight;
378}
379
380/*
381 * adjust_weight(object, weight) adds the specified weight to an object,
382 * and also updates how much the environment(s) is/are carrying.
383 */
384static void
385adjust_weight (object *op, sint32 weight)
386{
387 while (op)
388 {
389 weight = weight_adjust (op, weight);
390
391 if (!weight)
392 return;
393
394 op->carrying += weight;
395
396 if (object *pl = op->visible_to ())
397 if (pl != op) // player is handled lazily
398 esrv_update_item (UPD_WEIGHT, pl, op);
399
400 op = op->env;
401 }
402}
403
404/*
405 * this is a recursive function which calculates the weight
406 * an object is carrying. It goes through op and figures out how much
407 * containers are carrying, and sums it up.
408 */
318void 409void
319player::set_range (rangetype r) 410object::update_weight ()
320{ 411{
321 shoottype = r; 412 sint32 sum = 0;
322}
323 413
324/* 414 for (object *op = inv; op; op = op->below)
325 * sum_weight() is a recursive function which calculates the weight
326 * an object is carrying. It goes through in figures out how much
327 * containers are carrying, and sums it up.
328 */
329long
330sum_weight (object *op)
331{
332 long sum;
333 object *inv;
334
335 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
336 { 415 {
337 if (inv->inv) 416 if (op->inv)
338 sum_weight (inv); 417 op->update_weight ();
339 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 418
419 sum += op->total_weight ();
420 }
421
422 sum = weight_adjust (this, sum);
423
424 if (sum != carrying)
340 } 425 {
341
342 if (op->type == CONTAINER && op->stats.Str)
343 sum = (sum * (100 - op->stats.Str)) / 100;
344
345 if (op->carrying != sum)
346 op->carrying = sum; 426 carrying = sum;
347 427
348 return sum; 428 if (object *pl = visible_to ())
429 if (pl != this) // player is handled lazily
430 esrv_update_item (UPD_WEIGHT, pl, this);
431 }
349} 432}
350 433
351/** 434/*
352 * Return the outermost environment object for a given object. 435 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
353 */
354
355object *
356object_get_env_recursive (object *op)
357{
358 while (op->env != NULL)
359 op = op->env;
360 return op;
361}
362
363/*
364 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
365 * Some error messages.
366 * The result of the dump is stored in the static global errmsg array.
367 */ 436 */
368char * 437char *
369dump_object (object *op) 438dump_object (object *op)
370{ 439{
371 if (!op) 440 if (!op)
379/* 448/*
380 * get_nearest_part(multi-object, object 2) returns the part of the 449 * get_nearest_part(multi-object, object 2) returns the part of the
381 * multi-object 1 which is closest to the second object. 450 * multi-object 1 which is closest to the second object.
382 * If it's not a multi-object, it is returned. 451 * If it's not a multi-object, it is returned.
383 */ 452 */
384
385object * 453object *
386get_nearest_part (object *op, const object *pl) 454get_nearest_part (object *op, const object *pl)
387{ 455{
388 object *tmp, *closest; 456 object *tmp, *closest;
389 int last_dist, i; 457 int last_dist, i;
390 458
391 if (op->more == NULL) 459 if (!op->more)
392 return op; 460 return op;
461
393 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 462 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
463 tmp;
464 tmp = tmp->more)
394 if ((i = distance (tmp, pl)) < last_dist) 465 if ((i = distance (tmp, pl)) < last_dist)
395 closest = tmp, last_dist = i; 466 closest = tmp, last_dist = i;
467
396 return closest; 468 return closest;
397} 469}
398 470
399/* 471/*
400 * Returns the object which has the count-variable equal to the argument. 472 * Returns the object which has the count-variable equal to the argument.
473 * VERRRY slow.
401 */ 474 */
402object * 475object *
403find_object (tag_t i) 476find_object (tag_t i)
404{ 477{
405 for_all_objects (op) 478 for_all_objects (op)
425 break; 498 break;
426 499
427 return op; 500 return op;
428} 501}
429 502
430void
431free_all_object_data ()
432{
433 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
434}
435
436/* 503/*
437 * Sets the owner and sets the skill and exp pointers to owner's current 504 * Sets the owner and sets the skill and exp pointers to owner's current
438 * skill and experience objects. 505 * skill and experience objects.
506 * ACTUALLY NO! investigate! TODO
439 */ 507 */
440void 508void
441object::set_owner (object *owner) 509object::set_owner (object *owner)
442{ 510{
511 // allow objects which own objects
443 if (!owner) 512 if (owner)
444 return;
445
446 /* next line added to allow objects which own objects */
447 /* Add a check for ownercounts in here, as I got into an endless loop
448 * with the fireball owning a poison cloud which then owned the
449 * fireball. I believe that was caused by one of the objects getting
450 * freed and then another object replacing it. Since the ownercounts
451 * didn't match, this check is valid and I believe that cause is valid.
452 */
453 while (owner->owner) 513 while (owner->owner)
454 owner = owner->owner; 514 owner = owner->owner;
515
516 if (flag [FLAG_FREED])
517 {
518 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
519 return;
520 }
455 521
456 this->owner = owner; 522 this->owner = owner;
523}
524
525int
526object::slottype () const
527{
528 if (type == SKILL)
529 {
530 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
531 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
532 }
533 else
534 {
535 if (slot [body_combat].info) return slot_combat;
536 if (slot [body_range ].info) return slot_ranged;
537 }
538
539 return slot_none;
540}
541
542bool
543object::change_weapon (object *ob)
544{
545 if (current_weapon == ob)
546 return true;
547
548 if (chosen_skill)
549 chosen_skill->flag [FLAG_APPLIED] = false;
550
551 current_weapon = ob;
552 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
553
554 if (chosen_skill)
555 chosen_skill->flag [FLAG_APPLIED] = true;
556
557 update_stats ();
558
559 if (ob)
560 {
561 // now check wether any body locations became invalid, in which case
562 // we cannot apply the weapon at the moment.
563 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
564 if (slot[i].used < 0)
565 {
566 current_weapon = chosen_skill = 0;
567 update_stats ();
568
569 new_draw_info_format (NDI_UNIQUE, 0, this,
570 "You try to balance all your items at once, "
571 "but the %s is just too much for your body. "
572 "[You need to unapply some items first.]", &ob->name);
573 return false;
574 }
575
576 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
577 }
578 else
579 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
580
581 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
582 {
583 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
584 &name, ob->debug_desc ());
585 return false;
586 }
587
588 return true;
457} 589}
458 590
459/* Zero the key_values on op, decrementing the shared-string 591/* Zero the key_values on op, decrementing the shared-string
460 * refcounts and freeing the links. 592 * refcounts and freeing the links.
461 */ 593 */
525object::copy_to (object *dst) 657object::copy_to (object *dst)
526{ 658{
527 *dst = *this; 659 *dst = *this;
528 660
529 if (speed < 0) 661 if (speed < 0)
530 dst->speed_left = speed_left - rndm (); 662 dst->speed_left -= rndm ();
531 663
532 dst->set_speed (dst->speed); 664 dst->set_speed (dst->speed);
533} 665}
534 666
535void 667void
536object::instantiate () 668object::instantiate ()
537{ 669{
538 if (!uuid.seq) // HACK 670 if (!uuid.seq) // HACK
539 uuid = gen_uuid (); 671 uuid = UUID::gen ();
540 672
541 speed_left = -0.1f; 673 speed_left = -0.1f;
542 /* copy the body_info to the body_used - this is only really 674 /* copy the body_info to the body_used - this is only really
543 * need for monsters, but doesn't hurt to do it for everything. 675 * need for monsters, but doesn't hurt to do it for everything.
544 * by doing so, when a monster is created, it has good starting 676 * by doing so, when a monster is created, it has good starting
545 * values for the body_used info, so when items are created 677 * values for the body_used info, so when items are created
546 * for it, they can be properly equipped. 678 * for it, they can be properly equipped.
547 */ 679 */
548 memcpy (body_used, body_info, sizeof (body_used)); 680 for (int i = NUM_BODY_LOCATIONS; i--; )
681 slot[i].used = slot[i].info;
549 682
550 attachable::instantiate (); 683 attachable::instantiate ();
551} 684}
552 685
553object * 686object *
613 * UP_OBJ_FACE: only the objects face has changed. 746 * UP_OBJ_FACE: only the objects face has changed.
614 */ 747 */
615void 748void
616update_object (object *op, int action) 749update_object (object *op, int action)
617{ 750{
618 if (op == NULL) 751 if (!op)
619 { 752 {
620 /* this should never happen */ 753 /* this should never happen */
621 LOG (llevDebug, "update_object() called for NULL object.\n"); 754 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
622 return; 755 return;
623 } 756 }
624 757
625 if (op->env) 758 if (!op->is_on_map ())
626 { 759 {
627 /* Animation is currently handled by client, so nothing 760 /* Animation is currently handled by client, so nothing
628 * to do in this case. 761 * to do in this case.
629 */ 762 */
630 return; 763 return;
631 } 764 }
632
633 /* If the map is saving, don't do anything as everything is
634 * going to get freed anyways.
635 */
636 if (!op->map || op->map->in_memory == MAP_SAVING)
637 return;
638 765
639 /* make sure the object is within map boundaries */ 766 /* make sure the object is within map boundaries */
640 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 767 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
641 { 768 {
642 LOG (llevError, "update_object() called for object out of map!\n"); 769 LOG (llevError, "update_object() called for object out of map!\n");
702static int object_count; 829static int object_count;
703 830
704void object::link () 831void object::link ()
705{ 832{
706 assert (!index);//D 833 assert (!index);//D
707 uuid = gen_uuid (); 834 uuid = UUID::gen ();
708 count = ++object_count; 835 count = ++object_count;
709 836
710 refcnt_inc (); 837 refcnt_inc ();
711 objects.insert (this); 838 objects.insert (this);
712} 839}
785object::destroy_inv (bool drop_to_ground) 912object::destroy_inv (bool drop_to_ground)
786{ 913{
787 // need to check first, because the checks below might segfault 914 // need to check first, because the checks below might segfault
788 // as we might be on an invalid mapspace and crossfire code 915 // as we might be on an invalid mapspace and crossfire code
789 // is too buggy to ensure that the inventory is empty. 916 // is too buggy to ensure that the inventory is empty.
790 // corollary: if you create arrows etc. with stuff in tis inventory, 917 // corollary: if you create arrows etc. with stuff in its inventory,
791 // cf will crash below with off-map x and y 918 // cf will crash below with off-map x and y
792 if (!inv) 919 if (!inv)
793 return; 920 return;
794 921
795 /* Only if the space blocks everything do we not process - 922 /* Only if the space blocks everything do we not process -
796 * if some form of movement is allowed, let objects 923 * if some form of movement is allowed, let objects
797 * drop on that space. 924 * drop on that space.
798 */ 925 */
799 if (!drop_to_ground 926 if (!drop_to_ground
800 || !map 927 || !map
801 || map->in_memory != MAP_IN_MEMORY 928 || map->in_memory != MAP_ACTIVE
802 || map->nodrop 929 || map->nodrop
803 || ms ().move_block == MOVE_ALL) 930 || ms ().move_block == MOVE_ALL)
804 { 931 {
805 while (inv) 932 while (inv)
806 { 933 {
807 inv->destroy_inv (drop_to_ground); 934 inv->destroy_inv (false);
808 inv->destroy (); 935 inv->destroy ();
809 } 936 }
810 } 937 }
811 else 938 else
812 { /* Put objects in inventory onto this space */ 939 { /* Put objects in inventory onto this space */
818 || op->flag [FLAG_NO_DROP] 945 || op->flag [FLAG_NO_DROP]
819 || op->type == RUNE 946 || op->type == RUNE
820 || op->type == TRAP 947 || op->type == TRAP
821 || op->flag [FLAG_IS_A_TEMPLATE] 948 || op->flag [FLAG_IS_A_TEMPLATE]
822 || op->flag [FLAG_DESTROY_ON_DEATH]) 949 || op->flag [FLAG_DESTROY_ON_DEATH])
823 op->destroy (); 950 op->destroy (true);
824 else 951 else
825 map->insert (op, x, y); 952 map->insert (op, x, y);
826 } 953 }
827 } 954 }
828} 955}
832 object *op = new object; 959 object *op = new object;
833 op->link (); 960 op->link ();
834 return op; 961 return op;
835} 962}
836 963
964static struct freed_map : maptile
965{
966 freed_map ()
967 {
968 path = "<freed objects map>";
969 name = "/internal/freed_objects_map";
970 width = 3;
971 height = 3;
972 nodrop = 1;
973
974 alloc ();
975 in_memory = MAP_ACTIVE;
976 }
977} freed_map; // freed objects are moved here to avoid crashes
978
837void 979void
838object::do_destroy () 980object::do_destroy ()
839{ 981{
840 attachable::do_destroy ();
841
842 if (flag [FLAG_IS_LINKED]) 982 if (flag [FLAG_IS_LINKED])
843 remove_button_link (this); 983 remove_button_link (this);
844 984
845 if (flag [FLAG_FRIENDLY]) 985 if (flag [FLAG_FRIENDLY])
846 remove_friendly_object (this); 986 remove_friendly_object (this);
847 987
848 if (!flag [FLAG_REMOVED])
849 remove (); 988 remove ();
850 989
851 destroy_inv (true); 990 attachable::do_destroy ();
852 991
853 deactivate (); 992 deactivate ();
854 unlink (); 993 unlink ();
855 994
856 flag [FLAG_FREED] = 1; 995 flag [FLAG_FREED] = 1;
857 996
858 // hack to ensure that freed objects still have a valid map 997 // hack to ensure that freed objects still have a valid map
859 {
860 static maptile *freed_map; // freed objects are moved here to avoid crashes
861
862 if (!freed_map)
863 {
864 freed_map = new maptile;
865
866 freed_map->name = "/internal/freed_objects_map";
867 freed_map->width = 3;
868 freed_map->height = 3;
869
870 freed_map->alloc ();
871 freed_map->in_memory = MAP_IN_MEMORY;
872 }
873
874 map = freed_map; 998 map = &freed_map;
875 x = 1; 999 x = 1;
876 y = 1; 1000 y = 1;
877 }
878
879 head = 0;
880 1001
881 if (more) 1002 if (more)
882 { 1003 {
883 more->destroy (); 1004 more->destroy ();
884 more = 0; 1005 more = 0;
885 } 1006 }
886 1007
1008 head = 0;
1009
887 // clear those pointers that likely might have circular references to us 1010 // clear those pointers that likely might cause circular references
888 owner = 0; 1011 owner = 0;
889 enemy = 0; 1012 enemy = 0;
890 attacked_by = 0; 1013 attacked_by = 0;
1014 current_weapon = 0;
891} 1015}
892 1016
893void 1017void
894object::destroy (bool destroy_inventory) 1018object::destroy (bool destroy_inventory)
895{ 1019{
896 if (destroyed ()) 1020 if (destroyed ())
897 return; 1021 return;
898 1022
1023 if (!is_head () && !head->destroyed ())
1024 {
1025 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1026 head->destroy (destroy_inventory);
1027 return;
1028 }
1029
899 if (destroy_inventory) 1030 destroy_inv (!destroy_inventory);
900 destroy_inv (false); 1031
1032 if (is_head ())
1033 if (sound_destroy)
1034 play_sound (sound_destroy);
1035 else if (flag [FLAG_MONSTER])
1036 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
901 1037
902 attachable::destroy (); 1038 attachable::destroy ();
903}
904
905/*
906 * sub_weight() recursively (outwards) subtracts a number from the
907 * weight of an object (and what is carried by it's environment(s)).
908 */
909void
910sub_weight (object *op, signed long weight)
911{
912 while (op != NULL)
913 {
914 if (op->type == CONTAINER)
915 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
916
917 op->carrying -= weight;
918 op = op->env;
919 }
920} 1039}
921 1040
922/* op->remove (): 1041/* op->remove ():
923 * This function removes the object op from the linked list of objects 1042 * This function removes the object op from the linked list of objects
924 * which it is currently tied to. When this function is done, the 1043 * which it is currently tied to. When this function is done, the
930object::do_remove () 1049object::do_remove ()
931{ 1050{
932 object *tmp, *last = 0; 1051 object *tmp, *last = 0;
933 object *otmp; 1052 object *otmp;
934 1053
935 if (QUERY_FLAG (this, FLAG_REMOVED)) 1054 if (flag [FLAG_REMOVED])
936 return; 1055 return;
937 1056
938 SET_FLAG (this, FLAG_REMOVED);
939 INVOKE_OBJECT (REMOVE, this); 1057 INVOKE_OBJECT (REMOVE, this);
1058
1059 flag [FLAG_REMOVED] = true;
940 1060
941 if (more) 1061 if (more)
942 more->remove (); 1062 more->remove ();
943 1063
944 /* 1064 /*
945 * In this case, the object to be removed is in someones 1065 * In this case, the object to be removed is in someones
946 * inventory. 1066 * inventory.
947 */ 1067 */
948 if (env) 1068 if (env)
949 { 1069 {
1070 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1071 if (object *pl = visible_to ())
1072 esrv_del_item (pl->contr, count);
1073 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1074
1075 adjust_weight (env, -total_weight ());
1076
1077 *(above ? &above->below : &env->inv) = below;
1078
950 if (nrof) 1079 if (below)
951 sub_weight (env, weight * nrof); 1080 below->above = above;
952 else 1081
953 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;
954 1092
955 /* 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
956 * made to players inventory. If set, avoiding the call 1094 * made to players inventory. If set, avoiding the call
957 * to save cpu time. 1095 * to save cpu time.
958 */ 1096 */
959 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))
960 otmp->update_stats (); 1098 otmp->update_stats ();
961
962 if (above)
963 above->below = below;
964 else
965 env->inv = below;
966
967 if (below)
968 below->above = above;
969
970 /* we set up values so that it could be inserted into
971 * the map, but we don't actually do that - it is up
972 * to the caller to decide what we want to do.
973 */
974 x = env->x, y = env->y;
975 map = env->map;
976 above = 0, below = 0;
977 env = 0;
978 } 1099 }
979 else if (map) 1100 else if (map)
980 { 1101 {
981 if (type == PLAYER)
982 {
983 // leaving a spot always closes any open container on the ground
984 if (container && !container->env)
985 // this causes spurious floorbox updates, but it ensures
986 // that the CLOSE event is being sent.
987 close_container ();
988
989 --map->players;
990 map->touch ();
991 }
992
993 map->dirty = true; 1102 map->dirty = true;
994 mapspace &ms = this->ms (); 1103 mapspace &ms = this->ms ();
1104
1105 if (object *pl = ms.player ())
1106 {
1107 if (type == PLAYER) // this == pl(!)
1108 {
1109 // leaving a spot always closes any open container on the ground
1110 if (container && !container->env)
1111 // this causes spurious floorbox updates, but it ensures
1112 // that the CLOSE event is being sent.
1113 close_container ();
1114
1115 --map->players;
1116 map->touch ();
1117 }
1118 else if (pl->container == this)
1119 {
1120 // removing a container should close it
1121 close_container ();
1122 }
1123
1124 esrv_del_item (pl->contr, count);
1125 }
995 1126
996 /* link the object above us */ 1127 /* link the object above us */
997 if (above) 1128 if (above)
998 above->below = below; 1129 above->below = below;
999 else 1130 else
1020 if (map->in_memory == MAP_SAVING) 1151 if (map->in_memory == MAP_SAVING)
1021 return; 1152 return;
1022 1153
1023 int check_walk_off = !flag [FLAG_NO_APPLY]; 1154 int check_walk_off = !flag [FLAG_NO_APPLY];
1024 1155
1156 if (object *pl = ms.player ())
1157 {
1158 if (pl->container == this)
1159 /* If a container that the player is currently using somehow gets
1160 * removed (most likely destroyed), update the player view
1161 * appropriately.
1162 */
1163 pl->close_container ();
1164
1165 //TODO: the floorbox prev/next might need updating
1166 esrv_del_item (pl->contr, count);
1167 }
1168
1025 for (tmp = ms.bot; tmp; tmp = tmp->above) 1169 for (tmp = ms.bot; tmp; tmp = tmp->above)
1026 { 1170 {
1027 /* No point updating the players look faces if he is the object 1171 /* No point updating the players look faces if he is the object
1028 * being removed. 1172 * being removed.
1029 */ 1173 */
1030
1031 if (tmp->type == PLAYER && tmp != this)
1032 {
1033 /* If a container that the player is currently using somehow gets
1034 * removed (most likely destroyed), update the player view
1035 * appropriately.
1036 */
1037 if (tmp->container == this)
1038 {
1039 flag [FLAG_APPLIED] = 0;
1040 tmp->container = 0;
1041 }
1042
1043 if (tmp->contr->ns)
1044 tmp->contr->ns->floorbox_update ();
1045 }
1046 1174
1047 /* See if object moving off should effect something */ 1175 /* See if object moving off should effect something */
1048 if (check_walk_off 1176 if (check_walk_off
1049 && ((move_type & tmp->move_off) 1177 && ((move_type & tmp->move_off)
1050 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1178 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1053 1181
1054 if (destroyed ()) 1182 if (destroyed ())
1055 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1183 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1056 } 1184 }
1057 1185
1058 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1059 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1060 if (tmp->above == tmp)
1061 tmp->above = 0;
1062
1063 last = tmp; 1186 last = tmp;
1064 } 1187 }
1065 1188
1066 /* last == NULL if there are no objects on this space */ 1189 /* last == NULL if there are no objects on this space */
1067 //TODO: this makes little sense, why only update the topmost object? 1190 //TODO: this makes little sense, why only update the topmost object?
1087merge_ob (object *op, object *top) 1210merge_ob (object *op, object *top)
1088{ 1211{
1089 if (!op->nrof) 1212 if (!op->nrof)
1090 return 0; 1213 return 0;
1091 1214
1092 if (top) 1215 if (!top)
1093 for (top = op; top && top->above; top = top->above) 1216 for (top = op; top && top->above; top = top->above)
1094 ; 1217 ;
1095 1218
1096 for (; top; top = top->below) 1219 for (; top; top = top->below)
1097 {
1098 if (top == op)
1099 continue;
1100
1101 if (object::can_merge (op, top)) 1220 if (object::can_merge (op, top))
1102 { 1221 {
1103 top->nrof += op->nrof; 1222 top->nrof += op->nrof;
1104 1223
1105/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1224 if (object *pl = top->visible_to ())
1106 op->weight = 0; /* Don't want any adjustements now */ 1225 esrv_update_item (UPD_NROF, pl, top);
1226
1227 op->weight = 0; // cancel the addition above
1228 op->carrying = 0; // must be 0 already
1229
1107 op->destroy (); 1230 op->destroy (1);
1231
1108 return top; 1232 return top;
1109 } 1233 }
1110 }
1111 1234
1112 return 0; 1235 return 0;
1113} 1236}
1114 1237
1115void 1238void
1118 if (more) 1241 if (more)
1119 return; 1242 return;
1120 1243
1121 object *prev = this; 1244 object *prev = this;
1122 1245
1123 for (archetype *at = arch->more; at; at = at->more) 1246 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1124 { 1247 {
1125 object *op = arch_to_object (at); 1248 object *op = arch_to_object (at);
1126 1249
1127 op->name = name; 1250 op->name = name;
1128 op->name_pl = name_pl; 1251 op->name_pl = name_pl;
1142object * 1265object *
1143insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1266insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1144{ 1267{
1145 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1268 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1146 { 1269 {
1147 tmp->x = x + tmp->arch->clone.x; 1270 tmp->x = x + tmp->arch->x;
1148 tmp->y = y + tmp->arch->clone.y; 1271 tmp->y = y + tmp->arch->y;
1149 } 1272 }
1150 1273
1151 return insert_ob_in_map (op, m, originator, flag); 1274 return insert_ob_in_map (op, m, originator, flag);
1152} 1275}
1153 1276
1174object * 1297object *
1175insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1298insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1176{ 1299{
1177 assert (!op->flag [FLAG_FREED]); 1300 assert (!op->flag [FLAG_FREED]);
1178 1301
1179 object *tmp, *top, *floor = NULL;
1180
1181 op->remove (); 1302 op->remove ();
1182
1183#if 0
1184 if (!m->active != !op->active)
1185 if (m->active)
1186 op->activate_recursive ();
1187 else
1188 op->deactivate_recursive ();
1189#endif
1190
1191 if (out_of_map (m, op->x, op->y))
1192 {
1193 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1194#ifdef MANY_CORES
1195 /* Better to catch this here, as otherwise the next use of this object
1196 * is likely to cause a crash. Better to find out where it is getting
1197 * improperly inserted.
1198 */
1199 abort ();
1200#endif
1201 return op;
1202 }
1203
1204 if (object *more = op->more)
1205 {
1206 if (!insert_ob_in_map (more, m, originator, flag))
1207 {
1208 if (!op->head)
1209 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1210
1211 return 0;
1212 }
1213 }
1214
1215 CLEAR_FLAG (op, FLAG_REMOVED);
1216 1303
1217 /* Ideally, the caller figures this out. However, it complicates a lot 1304 /* Ideally, the caller figures this out. However, it complicates a lot
1218 * of areas of callers (eg, anything that uses find_free_spot would now 1305 * of areas of callers (eg, anything that uses find_free_spot would now
1219 * need extra work 1306 * need extra work
1220 */ 1307 */
1221 if (!xy_normalise (m, op->x, op->y)) 1308 if (!xy_normalise (m, op->x, op->y))
1309 {
1310 op->destroy (1);
1222 return 0; 1311 return 0;
1312 }
1313
1314 if (object *more = op->more)
1315 if (!insert_ob_in_map (more, m, originator, flag))
1316 return 0;
1317
1318 CLEAR_FLAG (op, FLAG_REMOVED);
1223 1319
1224 op->map = m; 1320 op->map = m;
1225 mapspace &ms = op->ms (); 1321 mapspace &ms = op->ms ();
1226 1322
1227 /* this has to be done after we translate the coordinates. 1323 /* this has to be done after we translate the coordinates.
1228 */ 1324 */
1229 if (op->nrof && !(flag & INS_NO_MERGE)) 1325 if (op->nrof && !(flag & INS_NO_MERGE))
1230 for (tmp = ms.bot; tmp; tmp = tmp->above) 1326 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1231 if (object::can_merge (op, tmp)) 1327 if (object::can_merge (op, tmp))
1232 { 1328 {
1329 // TODO: we atcually want to update tmp, not op,
1330 // but some caller surely breaks when we return tmp
1331 // from here :/
1233 op->nrof += tmp->nrof; 1332 op->nrof += tmp->nrof;
1234 tmp->destroy (); 1333 tmp->destroy (1);
1235 } 1334 }
1236 1335
1237 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1336 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1238 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1337 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1239 1338
1259 /* since *below* originator, no need to update top */ 1358 /* since *below* originator, no need to update top */
1260 originator->below = op; 1359 originator->below = op;
1261 } 1360 }
1262 else 1361 else
1263 { 1362 {
1363 object *top, *floor = NULL;
1364
1264 top = ms.bot; 1365 top = ms.bot;
1265 1366
1266 /* If there are other objects, then */ 1367 /* If there are other objects, then */
1267 if ((!(flag & INS_MAP_LOAD)) && top) 1368 if (top)
1268 { 1369 {
1269 object *last = 0; 1370 object *last = 0;
1270 1371
1271 /* 1372 /*
1272 * If there are multiple objects on this space, we do some trickier handling. 1373 * If there are multiple objects on this space, we do some trickier handling.
1325 if (last && last->below && last != floor) 1426 if (last && last->below && last != floor)
1326 top = last->below; 1427 top = last->below;
1327 } 1428 }
1328 } /* If objects on this space */ 1429 } /* If objects on this space */
1329 1430
1330 if (flag & INS_MAP_LOAD)
1331 top = ms.top;
1332
1333 if (flag & INS_ABOVE_FLOOR_ONLY) 1431 if (flag & INS_ABOVE_FLOOR_ONLY)
1334 top = floor; 1432 top = floor;
1335 1433
1336 /* Top is the object that our object (op) is going to get inserted above. 1434 /* Top is the object that our object (op) is going to get inserted above.
1337 */ 1435 */
1369 op->map->touch (); 1467 op->map->touch ();
1370 } 1468 }
1371 1469
1372 op->map->dirty = true; 1470 op->map->dirty = true;
1373 1471
1374 /* If we have a floor, we know the player, if any, will be above
1375 * it, so save a few ticks and start from there.
1376 */
1377 if (!(flag & INS_MAP_LOAD))
1378 if (object *pl = ms.player ()) 1472 if (object *pl = ms.player ())
1379 if (pl->contr->ns) 1473 //TODO: the floorbox prev/next might need updating
1380 pl->contr->ns->floorbox_update (); 1474 esrv_send_item (pl, op);
1381 1475
1382 /* If this object glows, it may affect lighting conditions that are 1476 /* If this object glows, it may affect lighting conditions that are
1383 * visible to others on this map. But update_all_los is really 1477 * visible to others on this map. But update_all_los is really
1384 * an inefficient way to do this, as it means los for all players 1478 * an inefficient way to do this, as it means los for all players
1385 * on the map will get recalculated. The players could very well 1479 * on the map will get recalculated. The players could very well
1404 * blocked() and wall() work properly), and these flags are updated by 1498 * blocked() and wall() work properly), and these flags are updated by
1405 * update_object(). 1499 * update_object().
1406 */ 1500 */
1407 1501
1408 /* if this is not the head or flag has been passed, don't check walk on status */ 1502 /* if this is not the head or flag has been passed, don't check walk on status */
1409 if (!(flag & INS_NO_WALK_ON) && !op->head) 1503 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1410 { 1504 {
1411 if (check_move_on (op, originator)) 1505 if (check_move_on (op, originator))
1412 return 0; 1506 return 0;
1413 1507
1414 /* If we are a multi part object, lets work our way through the check 1508 /* If we are a multi part object, lets work our way through the check
1415 * walk on's. 1509 * walk on's.
1416 */ 1510 */
1417 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1511 for (object *tmp = op->more; tmp; tmp = tmp->more)
1418 if (check_move_on (tmp, originator)) 1512 if (check_move_on (tmp, originator))
1419 return 0; 1513 return 0;
1420 } 1514 }
1421 1515
1422 return op; 1516 return op;
1427 * op is the object to insert it under: supplies x and the map. 1521 * op is the object to insert it under: supplies x and the map.
1428 */ 1522 */
1429void 1523void
1430replace_insert_ob_in_map (const char *arch_string, object *op) 1524replace_insert_ob_in_map (const char *arch_string, object *op)
1431{ 1525{
1432 object *tmp, *tmp1;
1433
1434 /* first search for itself and remove any old instances */ 1526 /* first search for itself and remove any old instances */
1435 1527
1436 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1528 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1437 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1529 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1438 tmp->destroy (); 1530 tmp->destroy (1);
1439 1531
1440 tmp1 = arch_to_object (archetype::find (arch_string)); 1532 object *tmp = arch_to_object (archetype::find (arch_string));
1441 1533
1442 tmp1->x = op->x; 1534 tmp->x = op->x;
1443 tmp1->y = op->y; 1535 tmp->y = op->y;
1536
1444 insert_ob_in_map (tmp1, op->map, op, 0); 1537 insert_ob_in_map (tmp, op->map, op, 0);
1445} 1538}
1446 1539
1447object * 1540object *
1448object::insert_at (object *where, object *originator, int flags) 1541object::insert_at (object *where, object *originator, int flags)
1449{ 1542{
1543 if (where->env)
1544 return where->env->insert (this);
1545 else
1450 return where->map->insert (this, where->x, where->y, originator, flags); 1546 return where->map->insert (this, where->x, where->y, originator, flags);
1451} 1547}
1452 1548
1453/* 1549/*
1454 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1455 * is returned contains nr objects, and the remaining parts contains
1456 * the rest (or is removed and freed if that number is 0).
1457 * On failure, NULL is returned, and the reason put into the
1458 * global static errmsg array.
1459 */
1460object *
1461get_split_ob (object *orig_ob, uint32 nr)
1462{
1463 object *newob;
1464 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1465
1466 if (orig_ob->nrof < nr)
1467 {
1468 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1469 return NULL;
1470 }
1471
1472 newob = object_create_clone (orig_ob);
1473
1474 if ((orig_ob->nrof -= nr) < 1)
1475 orig_ob->destroy (1);
1476 else if (!is_removed)
1477 {
1478 if (orig_ob->env != NULL)
1479 sub_weight (orig_ob->env, orig_ob->weight * nr);
1480 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1481 {
1482 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1483 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1484 return NULL;
1485 }
1486 }
1487
1488 newob->nrof = nr;
1489
1490 return newob;
1491}
1492
1493/*
1494 * decrease_ob_nr(object, number) decreases a specified number from 1550 * decrease(object, number) decreases a specified number from
1495 * the amount of an object. If the amount reaches 0, the object 1551 * the amount of an object. If the amount reaches 0, the object
1496 * is subsequently removed and freed. 1552 * is subsequently removed and freed.
1497 * 1553 *
1498 * Return value: 'op' if something is left, NULL if the amount reached 0 1554 * Return value: 'op' if something is left, NULL if the amount reached 0
1499 */ 1555 */
1556bool
1557object::decrease (sint32 nr)
1558{
1559 if (!nr)
1560 return true;
1561
1562 nr = min (nr, nrof);
1563
1564 nrof -= nr;
1565
1566 if (nrof)
1567 {
1568 adjust_weight (env, -weight * nr); // carrying == 0
1569
1570 if (object *pl = visible_to ())
1571 esrv_update_item (UPD_NROF, pl, this);
1572
1573 return true;
1574 }
1575 else
1576 {
1577 destroy (1);
1578 return false;
1579 }
1580}
1581
1582/*
1583 * split(ob,nr) splits up ob into two parts. The part which
1584 * is returned contains nr objects, and the remaining parts contains
1585 * the rest (or is removed and returned if that number is 0).
1586 * On failure, NULL is returned.
1587 */
1500object * 1588object *
1501decrease_ob_nr (object *op, uint32 i) 1589object::split (sint32 nr)
1502{ 1590{
1503 object *tmp; 1591 int have = number_of ();
1504 1592
1505 if (i == 0) /* objects with op->nrof require this check */ 1593 if (have < nr)
1506 return op; 1594 return 0;
1507 1595 else if (have == nr)
1508 if (i > op->nrof)
1509 i = op->nrof;
1510
1511 if (QUERY_FLAG (op, FLAG_REMOVED))
1512 op->nrof -= i;
1513 else if (op->env)
1514 { 1596 {
1515 /* is this object in the players inventory, or sub container
1516 * therein?
1517 */
1518 tmp = op->in_player ();
1519 /* nope. Is this a container the player has opened?
1520 * If so, set tmp to that player.
1521 * IMO, searching through all the players will mostly
1522 * likely be quicker than following op->env to the map,
1523 * and then searching the map for a player.
1524 */
1525 if (!tmp)
1526 for_all_players (pl)
1527 if (pl->ob->container == op->env)
1528 {
1529 tmp = pl->ob;
1530 break;
1531 }
1532
1533 if (i < op->nrof)
1534 {
1535 sub_weight (op->env, op->weight * i);
1536 op->nrof -= i;
1537 if (tmp)
1538 esrv_send_item (tmp, op);
1539 }
1540 else
1541 {
1542 op->remove (); 1597 remove ();
1543 op->nrof = 0; 1598 return this;
1544 if (tmp)
1545 esrv_del_item (tmp->contr, op->count);
1546 }
1547 } 1599 }
1548 else 1600 else
1549 { 1601 {
1550 object *above = op->above; 1602 decrease (nr);
1551 1603
1552 if (i < op->nrof) 1604 object *op = object_create_clone (this);
1553 op->nrof -= i; 1605 op->nrof = nr;
1554 else
1555 {
1556 op->remove ();
1557 op->nrof = 0;
1558 }
1559
1560 /* Since we just removed op, op->above is null */
1561 for (tmp = above; tmp; tmp = tmp->above)
1562 if (tmp->type == PLAYER)
1563 {
1564 if (op->nrof)
1565 esrv_send_item (tmp, op);
1566 else
1567 esrv_del_item (tmp->contr, op->count);
1568 }
1569 }
1570
1571 if (op->nrof)
1572 return op; 1606 return op;
1573 else
1574 {
1575 op->destroy ();
1576 return 0;
1577 }
1578}
1579
1580/*
1581 * add_weight(object, weight) adds the specified weight to an object,
1582 * and also updates how much the environment(s) is/are carrying.
1583 */
1584void
1585add_weight (object *op, signed long weight)
1586{
1587 while (op != NULL)
1588 {
1589 if (op->type == CONTAINER)
1590 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1591
1592 op->carrying += weight;
1593 op = op->env;
1594 } 1607 }
1595} 1608}
1596 1609
1597object * 1610object *
1598insert_ob_in_ob (object *op, object *where) 1611insert_ob_in_ob (object *op, object *where)
1603 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1616 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1604 free (dump); 1617 free (dump);
1605 return op; 1618 return op;
1606 } 1619 }
1607 1620
1608 if (where->head) 1621 if (where->head_ () != where)
1609 { 1622 {
1610 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1623 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1611 where = where->head; 1624 where = where->head;
1612 } 1625 }
1613 1626
1614 return where->insert (op); 1627 return where->insert (op);
1615} 1628}
1623 * be != op, if items are merged. -Tero 1636 * be != op, if items are merged. -Tero
1624 */ 1637 */
1625object * 1638object *
1626object::insert (object *op) 1639object::insert (object *op)
1627{ 1640{
1628 object *tmp, *otmp;
1629
1630 if (!QUERY_FLAG (op, FLAG_REMOVED))
1631 op->remove ();
1632
1633 if (op->more) 1641 if (op->more)
1634 { 1642 {
1635 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1643 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1636 return op; 1644 return op;
1637 } 1645 }
1638 1646
1639 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1647 op->remove ();
1640 CLEAR_FLAG (op, FLAG_REMOVED); 1648
1649 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1650
1641 if (op->nrof) 1651 if (op->nrof)
1642 {
1643 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1652 for (object *tmp = inv; tmp; tmp = tmp->below)
1644 if (object::can_merge (tmp, op)) 1653 if (object::can_merge (tmp, op))
1645 { 1654 {
1646 /* return the original object and remove inserted object 1655 /* return the original object and remove inserted object
1647 (client needs the original object) */ 1656 (client needs the original object) */
1648 tmp->nrof += op->nrof; 1657 tmp->nrof += op->nrof;
1649 /* Weight handling gets pretty funky. Since we are adding to 1658
1650 * tmp->nrof, we need to increase the weight. 1659 if (object *pl = tmp->visible_to ())
1651 */ 1660 esrv_update_item (UPD_NROF, pl, tmp);
1661
1652 add_weight (this, op->weight * op->nrof); 1662 adjust_weight (this, op->total_weight ());
1653 SET_FLAG (op, FLAG_REMOVED); 1663
1654 op->destroy (); /* free the inserted object */ 1664 op->destroy (1);
1655 op = tmp; 1665 op = tmp;
1656 op->remove (); /* and fix old object's links */ 1666 goto inserted;
1657 CLEAR_FLAG (op, FLAG_REMOVED);
1658 break;
1659 } 1667 }
1660 1668
1661 /* I assume combined objects have no inventory 1669 op->owner = 0; // it's his/hers now. period.
1662 * We add the weight - this object could have just been removed
1663 * (if it was possible to merge). calling remove_ob will subtract
1664 * the weight, so we need to add it in again, since we actually do
1665 * the linking below
1666 */
1667 add_weight (this, op->weight * op->nrof);
1668 }
1669 else
1670 add_weight (this, (op->weight + op->carrying));
1671
1672 otmp = this->in_player ();
1673 if (otmp && otmp->contr)
1674 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1675 otmp->update_stats ();
1676
1677 op->map = 0; 1670 op->map = 0;
1678 op->env = this; 1671 op->x = 0;
1672 op->y = 0;
1673
1679 op->above = 0; 1674 op->above = 0;
1680 op->below = 0; 1675 op->below = inv;
1681 op->x = 0, op->y = 0; 1676 op->env = this;
1682 1677
1678 if (inv)
1679 inv->above = op;
1680
1681 inv = op;
1682
1683 op->flag [FLAG_REMOVED] = 0;
1684
1685 if (object *pl = op->visible_to ())
1686 esrv_send_item (pl, op);
1687
1688 adjust_weight (this, op->total_weight ());
1689
1690inserted:
1683 /* reset the light list and los of the players on the map */ 1691 /* reset the light list and los of the players on the map */
1684 if ((op->glow_radius != 0) && map) 1692 if (op->glow_radius && map && map->darkness)
1685 {
1686#ifdef DEBUG_LIGHTS
1687 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1688#endif /* DEBUG_LIGHTS */
1689 if (map->darkness)
1690 update_all_los (map, x, y); 1693 update_all_los (map, x, y);
1691 }
1692 1694
1693 /* Client has no idea of ordering so lets not bother ordering it here. 1695 // if this is a player's inventory, update stats
1694 * It sure simplifies this function... 1696 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1695 */ 1697 update_stats ();
1696 if (!inv)
1697 inv = op;
1698 else
1699 {
1700 op->below = inv;
1701 op->below->above = op;
1702 inv = op;
1703 }
1704 1698
1705 INVOKE_OBJECT (INSERT, this); 1699 INVOKE_OBJECT (INSERT, this);
1706 1700
1707 return op; 1701 return op;
1708} 1702}
1923 * activate recursively a flag on an object inventory 1917 * activate recursively a flag on an object inventory
1924 */ 1918 */
1925void 1919void
1926flag_inv (object *op, int flag) 1920flag_inv (object *op, int flag)
1927{ 1921{
1928 if (op->inv)
1929 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1922 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930 { 1923 {
1931 SET_FLAG (tmp, flag); 1924 SET_FLAG (tmp, flag);
1932 flag_inv (tmp, flag); 1925 flag_inv (tmp, flag);
1933 } 1926 }
1934} 1927}
1935 1928
1936/* 1929/*
1937 * deactivate recursively a flag on an object inventory 1930 * deactivate recursively a flag on an object inventory
1938 */ 1931 */
1939void 1932void
1940unflag_inv (object *op, int flag) 1933unflag_inv (object *op, int flag)
1941{ 1934{
1942 if (op->inv)
1943 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1935 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1944 { 1936 {
1945 CLEAR_FLAG (tmp, flag); 1937 CLEAR_FLAG (tmp, flag);
1946 unflag_inv (tmp, flag); 1938 unflag_inv (tmp, flag);
1947 } 1939 }
1948}
1949
1950/*
1951 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1952 * all it's inventory (recursively).
1953 * If checksums are used, a player will get set_cheat called for
1954 * him/her-self and all object carried by a call to this function.
1955 */
1956void
1957set_cheat (object *op)
1958{
1959 SET_FLAG (op, FLAG_WAS_WIZ);
1960 flag_inv (op, FLAG_WAS_WIZ);
1961} 1940}
1962 1941
1963/* 1942/*
1964 * find_free_spot(object, map, x, y, start, stop) will search for 1943 * find_free_spot(object, map, x, y, start, stop) will search for
1965 * a spot at the given map and coordinates which will be able to contain 1944 * a spot at the given map and coordinates which will be able to contain
1967 * to search (see the freearr_x/y[] definition). 1946 * to search (see the freearr_x/y[] definition).
1968 * It returns a random choice among the alternatives found. 1947 * It returns a random choice among the alternatives found.
1969 * start and stop are where to start relative to the free_arr array (1,9 1948 * start and stop are where to start relative to the free_arr array (1,9
1970 * does all 4 immediate directions). This returns the index into the 1949 * does all 4 immediate directions). This returns the index into the
1971 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1950 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1972 * Note - this only checks to see if there is space for the head of the
1973 * object - if it is a multispace object, this should be called for all
1974 * pieces.
1975 * Note2: This function does correctly handle tiled maps, but does not 1951 * Note: This function does correctly handle tiled maps, but does not
1976 * inform the caller. However, insert_ob_in_map will update as 1952 * inform the caller. However, insert_ob_in_map will update as
1977 * necessary, so the caller shouldn't need to do any special work. 1953 * necessary, so the caller shouldn't need to do any special work.
1978 * Note - updated to take an object instead of archetype - this is necessary 1954 * Note - updated to take an object instead of archetype - this is necessary
1979 * because arch_blocked (now ob_blocked) needs to know the movement type 1955 * because arch_blocked (now ob_blocked) needs to know the movement type
1980 * to know if the space in question will block the object. We can't use 1956 * to know if the space in question will block the object. We can't use
1982 * customized, changed states, etc. 1958 * customized, changed states, etc.
1983 */ 1959 */
1984int 1960int
1985find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1961find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1986{ 1962{
1963 int altern[SIZEOFFREE];
1987 int index = 0, flag; 1964 int index = 0, flag;
1988 int altern[SIZEOFFREE];
1989 1965
1990 for (int i = start; i < stop; i++) 1966 for (int i = start; i < stop; i++)
1991 { 1967 {
1992 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1968 mapxy pos (m, x, y); pos.move (i);
1993 if (!flag) 1969
1970 if (!pos.normalise ())
1971 continue;
1972
1973 mapspace &ms = *pos;
1974
1975 if (ms.flags () & P_IS_ALIVE)
1976 continue;
1977
1978 /* However, often
1979 * ob doesn't have any move type (when used to place exits)
1980 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1981 */
1982 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1983 {
1994 altern [index++] = i; 1984 altern [index++] = i;
1985 continue;
1986 }
1995 1987
1996 /* Basically, if we find a wall on a space, we cut down the search size. 1988 /* Basically, if we find a wall on a space, we cut down the search size.
1997 * In this way, we won't return spaces that are on another side of a wall. 1989 * In this way, we won't return spaces that are on another side of a wall.
1998 * This mostly work, but it cuts down the search size in all directions - 1990 * This mostly work, but it cuts down the search size in all directions -
1999 * if the space being examined only has a wall to the north and empty 1991 * if the space being examined only has a wall to the north and empty
2000 * spaces in all the other directions, this will reduce the search space 1992 * spaces in all the other directions, this will reduce the search space
2001 * to only the spaces immediately surrounding the target area, and 1993 * to only the spaces immediately surrounding the target area, and
2002 * won't look 2 spaces south of the target space. 1994 * won't look 2 spaces south of the target space.
2003 */ 1995 */
2004 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1996 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1997 {
2005 stop = maxfree[i]; 1998 stop = maxfree[i];
1999 continue;
2000 }
2001
2002 /* Note it is intentional that we check ob - the movement type of the
2003 * head of the object should correspond for the entire object.
2004 */
2005 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2006 continue;
2007
2008 if (ob->blocked (m, pos.x, pos.y))
2009 continue;
2010
2011 altern [index++] = i;
2006 } 2012 }
2007 2013
2008 if (!index) 2014 if (!index)
2009 return -1; 2015 return -1;
2010 2016
2019 */ 2025 */
2020int 2026int
2021find_first_free_spot (const object *ob, maptile *m, int x, int y) 2027find_first_free_spot (const object *ob, maptile *m, int x, int y)
2022{ 2028{
2023 for (int i = 0; i < SIZEOFFREE; i++) 2029 for (int i = 0; i < SIZEOFFREE; i++)
2024 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2030 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2025 return i; 2031 return i;
2026 2032
2027 return -1; 2033 return -1;
2028} 2034}
2029 2035
2083 object *tmp; 2089 object *tmp;
2084 maptile *mp; 2090 maptile *mp;
2085 2091
2086 MoveType blocked, move_type; 2092 MoveType blocked, move_type;
2087 2093
2088 if (exclude && exclude->head) 2094 if (exclude && exclude->head_ () != exclude)
2089 { 2095 {
2090 exclude = exclude->head; 2096 exclude = exclude->head;
2091 move_type = exclude->move_type; 2097 move_type = exclude->move_type;
2092 } 2098 }
2093 else 2099 else
2116 max = maxfree[i]; 2122 max = maxfree[i];
2117 else if (mflags & P_IS_ALIVE) 2123 else if (mflags & P_IS_ALIVE)
2118 { 2124 {
2119 for (tmp = ms.bot; tmp; tmp = tmp->above) 2125 for (tmp = ms.bot; tmp; tmp = tmp->above)
2120 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2126 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2121 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2127 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2122 break; 2128 break;
2123 2129
2124 if (tmp) 2130 if (tmp)
2125 return freedir[i]; 2131 return freedir[i];
2126 } 2132 }
2306 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2312 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2307 * core dumps if they do. 2313 * core dumps if they do.
2308 * 2314 *
2309 * Add a check so we can't pick up invisible objects (0.93.8) 2315 * Add a check so we can't pick up invisible objects (0.93.8)
2310 */ 2316 */
2311
2312int 2317int
2313can_pick (const object *who, const object *item) 2318can_pick (const object *who, const object *item)
2314{ 2319{
2315 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2320 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2316 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2321 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2321 * create clone from object to another 2326 * create clone from object to another
2322 */ 2327 */
2323object * 2328object *
2324object_create_clone (object *asrc) 2329object_create_clone (object *asrc)
2325{ 2330{
2326 object *dst = 0, *tmp, *src, *part, *prev, *item; 2331 object *dst = 0, *tmp, *src, *prev, *item;
2327 2332
2328 if (!asrc) 2333 if (!asrc)
2329 return 0; 2334 return 0;
2330 2335
2331 src = asrc;
2332 if (src->head)
2333 src = src->head; 2336 src = asrc->head_ ();
2334 2337
2335 prev = 0; 2338 prev = 0;
2336 for (part = src; part; part = part->more) 2339 for (object *part = src; part; part = part->more)
2337 { 2340 {
2338 tmp = part->clone (); 2341 tmp = part->clone ();
2339 tmp->x -= src->x; 2342 tmp->x -= src->x;
2340 tmp->y -= src->y; 2343 tmp->y -= src->y;
2341 2344
2454 /* Basically, if the archetype has this key set, 2457 /* Basically, if the archetype has this key set,
2455 * we need to store the null value so when we save 2458 * we need to store the null value so when we save
2456 * it, we save the empty value so that when we load, 2459 * it, we save the empty value so that when we load,
2457 * we get this value back again. 2460 * we get this value back again.
2458 */ 2461 */
2459 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2462 if (get_ob_key_link (op->arch, canonical_key))
2460 field->value = 0; 2463 field->value = 0;
2461 else 2464 else
2462 { 2465 {
2463 if (last) 2466 if (last)
2464 last->next = field->next; 2467 last->next = field->next;
2533 } 2536 }
2534 else 2537 else
2535 item = item->env; 2538 item = item->env;
2536} 2539}
2537 2540
2538
2539const char * 2541const char *
2540object::flag_desc (char *desc, int len) const 2542object::flag_desc (char *desc, int len) const
2541{ 2543{
2542 char *p = desc; 2544 char *p = desc;
2543 bool first = true; 2545 bool first = true;
2570{ 2572{
2571 char flagdesc[512]; 2573 char flagdesc[512];
2572 char info2[256 * 4]; 2574 char info2[256 * 4];
2573 char *p = info; 2575 char *p = info;
2574 2576
2575 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2577 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2576 count, uuid.seq, 2578 count,
2579 uuid.c_str (),
2577 &name, 2580 &name,
2578 title ? "\",title:\"" : "", 2581 title ? "\",title:\"" : "",
2579 title ? (const char *)title : "", 2582 title ? (const char *)title : "",
2580 flag_desc (flagdesc, 512), type); 2583 flag_desc (flagdesc, 512), type);
2581 2584
2582 if (env) 2585 if (!flag[FLAG_REMOVED] && env)
2583 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2586 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2584 2587
2585 if (map) 2588 if (map)
2586 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2589 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2587 2590
2589} 2592}
2590 2593
2591const char * 2594const char *
2592object::debug_desc () const 2595object::debug_desc () const
2593{ 2596{
2594 static char info[256 * 4]; 2597 static char info[3][256 * 4];
2598 static int info_idx;
2599
2595 return debug_desc (info); 2600 return debug_desc (info [++info_idx % 3]);
2596}
2597
2598const char *
2599object::debug_desc2 () const
2600{
2601 static char info[256 * 4];
2602 return debug_desc (info);
2603} 2601}
2604 2602
2605struct region * 2603struct region *
2606object::region () const 2604object::region () const
2607{ 2605{
2610} 2608}
2611 2609
2612const materialtype_t * 2610const materialtype_t *
2613object::dominant_material () const 2611object::dominant_material () const
2614{ 2612{
2615 if (materialtype_t *mat = name_to_material (materialname)) 2613 if (materialtype_t *mt = name_to_material (materialname))
2616 return mat; 2614 return mt;
2617 2615
2618 // omfg this is slow, this has to be temporary :)
2619 shstr unknown ("unknown");
2620
2621 return name_to_material (unknown); 2616 return name_to_material (shstr_unknown);
2622} 2617}
2623 2618
2624void 2619void
2625object::open_container (object *new_container) 2620object::open_container (object *new_container)
2626{ 2621{
2627 if (container == new_container) 2622 if (container == new_container)
2628 return; 2623 return;
2629 2624
2630 if (object *old_container = container) 2625 object *old_container = container;
2626
2627 if (old_container)
2631 { 2628 {
2632 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2629 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2633 return; 2630 return;
2634 2631
2635#if 0 2632#if 0
2637 if (object *closer = old_container->inv) 2634 if (object *closer = old_container->inv)
2638 if (closer->type == CLOSE_CON) 2635 if (closer->type == CLOSE_CON)
2639 closer->destroy (); 2636 closer->destroy ();
2640#endif 2637#endif
2641 2638
2639 // make sure the container is available
2640 esrv_send_item (this, old_container);
2641
2642 old_container->flag [FLAG_APPLIED] = 0; 2642 old_container->flag [FLAG_APPLIED] = false;
2643 container = 0; 2643 container = 0;
2644 2644
2645 // client needs item update to make it work, client bug requires this to be separate
2645 esrv_update_item (UPD_FLAGS, this, old_container); 2646 esrv_update_item (UPD_FLAGS, this, old_container);
2647
2646 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2649 play_sound (sound_find ("chest_close"));
2647 } 2650 }
2648 2651
2649 if (new_container) 2652 if (new_container)
2650 { 2653 {
2651 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2654 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2662 } 2665 }
2663#endif 2666#endif
2664 2667
2665 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2668 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2666 2669
2670 // make sure the container is available, client bug requires this to be separate
2671 esrv_send_item (this, new_container);
2672
2667 new_container->flag [FLAG_APPLIED] = 1; 2673 new_container->flag [FLAG_APPLIED] = true;
2668 container = new_container; 2674 container = new_container;
2669 2675
2676 // client needs flag change
2670 esrv_update_item (UPD_FLAGS, this, new_container); 2677 esrv_update_item (UPD_FLAGS, this, new_container);
2671 esrv_send_inventory (this, new_container); 2678 esrv_send_inventory (this, new_container);
2679 play_sound (sound_find ("chest_open"));
2680 }
2681// else if (!old_container->env && contr && contr->ns)
2682// contr->ns->floorbox_reset ();
2683}
2684
2685object *
2686object::force_find (const shstr name)
2687{
2688 /* cycle through his inventory to look for the MARK we want to
2689 * place
2690 */
2691 for (object *tmp = inv; tmp; tmp = tmp->below)
2692 if (tmp->type == FORCE && tmp->slaying == name)
2693 return splay (tmp);
2694
2695 return 0;
2696}
2697
2698void
2699object::force_add (const shstr name, int duration)
2700{
2701 if (object *force = force_find (name))
2702 force->destroy ();
2703
2704 object *force = get_archetype (FORCE_NAME);
2705
2706 force->slaying = name;
2707 force->stats.food = 1;
2708 force->speed_left = -1.f;
2709
2710 force->set_speed (duration ? 1.f / duration : 0.f);
2711 force->flag [FLAG_IS_USED_UP] = true;
2712 force->flag [FLAG_APPLIED] = true;
2713
2714 insert (force);
2715}
2716
2717void
2718object::play_sound (faceidx sound)
2719{
2720 if (!sound)
2721 return;
2722
2723 if (flag [FLAG_REMOVED])
2724 return;
2725
2726 if (env)
2672 } 2727 {
2728 if (object *pl = in_player ())
2729 pl->contr->play_sound (sound);
2730 }
2731 else
2732 map->play_sound (sound, x, y);
2673} 2733}
2674 2734
2675

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines