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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines