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.176 by root, Fri Aug 10 11:02:43 2007 UTC vs.
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 3 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,
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
32#include <funcpoint.h>
33#include <sproto.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. */
299 return 0; 305
300 else if (!compare_ob_value_lists (ob1, ob2)) 306 if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 307 return 0;
302 } 308 }
303 309
304 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
305 { 311 {
306 ob1->optimise (); 312 ob1->optimise ();
307 ob2->optimise (); 313 ob2->optimise ();
308 314
309 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)
321 return 0;
322
323 if (k1 == 0)
324 return 1;
325
310 if (!cfperl_can_merge (ob1, ob2)) 326 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 327 return 0;
328 }
312 } 329 }
313 330
314 /* Everything passes, must be OK. */ 331 /* Everything passes, must be OK. */
315 return 1; 332 return 1;
316} 333}
317 334
335// find player who can see this object
336object *
337object::visible_to () const
338{
339 if (!flag [FLAG_REMOVED])
340 {
341 // see if we are in a container of sorts
342 if (env)
343 {
344 // the player inventory itself is always visible
345 if (env->type == PLAYER)
346 return env;
347
348 // else a player could have our env open
349 object *envest = env->outer_env ();
350
351 // the player itself is always on a map, so we will find him here
352 // even if our inv is in a player.
353 if (envest->is_on_map ())
354 if (object *pl = envest->ms ().player ())
355 if (pl->container == env)
356 return pl;
357 }
358 else
359 {
360 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ())
363 return pl;
364 }
365 }
366
367 return 0;
368}
369
370// adjust weight per container type ("of holding")
371static sint32
372weight_adjust (object *op, sint32 weight)
373{
374 return op->type == CONTAINER
375 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376 : weight;
377}
378
318/* 379/*
380 * adjust_weight(object, weight) adds the specified weight to an object,
381 * and also updates how much the environment(s) is/are carrying.
382 */
383static void
384adjust_weight (object *op, sint32 weight)
385{
386 while (op)
387 {
388 weight = weight_adjust (op, weight);
389
390 if (!weight)
391 return;
392
393 op->carrying += weight;
394
395 if (object *pl = op->visible_to ())
396 esrv_update_item (UPD_WEIGHT, pl, op);
397
398 op = op->env;
399 }
400}
401
402/*
319 * sum_weight() is a recursive function which calculates the weight 403 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 404 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 405 * containers are carrying, and sums it up.
322 */ 406 */
323long 407void
324sum_weight (object *op) 408object::update_weight ()
325{ 409{
326 long sum; 410 sint32 sum = 0;
327 object *inv;
328 411
329 for (sum = 0, inv = op->inv; inv; inv = inv->below) 412 for (object *op = inv; op; op = op->below)
330 { 413 {
331 if (inv->inv) 414 if (op->inv)
332 sum_weight (inv); 415 op->update_weight ();
333 416
334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 417 sum += op->total_weight ();
418 }
419
420 sum = weight_adjust (this, sum);
421
422 if (sum != carrying)
335 } 423 {
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; 424 carrying = sum;
342 425
343 return sum; 426 if (object *pl = visible_to ())
427 esrv_update_item (UPD_WEIGHT, pl, this);
428 }
344} 429}
345 430
346/** 431/*
347 * Return the outermost environment object for a given object. 432 * 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 */ 433 */
363char * 434char *
364dump_object (object *op) 435dump_object (object *op)
365{ 436{
366 if (!op) 437 if (!op)
374/* 445/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 446 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 447 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 448 * If it's not a multi-object, it is returned.
378 */ 449 */
379
380object * 450object *
381get_nearest_part (object *op, const object *pl) 451get_nearest_part (object *op, const object *pl)
382{ 452{
383 object *tmp, *closest; 453 object *tmp, *closest;
384 int last_dist, i; 454 int last_dist, i;
385 455
386 if (op->more == NULL) 456 if (!op->more)
387 return op; 457 return op;
458
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 459 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
460 tmp;
461 tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist) 462 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i; 463 closest = tmp, last_dist = i;
464
391 return closest; 465 return closest;
392} 466}
393 467
394/* 468/*
395 * Returns the object which has the count-variable equal to the argument. 469 * Returns the object which has the count-variable equal to the argument.
470 * VERRRY slow.
396 */ 471 */
397object * 472object *
398find_object (tag_t i) 473find_object (tag_t i)
399{ 474{
400 for_all_objects (op) 475 for_all_objects (op)
420 break; 495 break;
421 496
422 return op; 497 return op;
423} 498}
424 499
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 500/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 501 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 502 * skill and experience objects.
503 * ACTUALLY NO! investigate! TODO
434 */ 504 */
435void 505void
436object::set_owner (object *owner) 506object::set_owner (object *owner)
437{ 507{
508 // allow objects which own objects
438 if (!owner) 509 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 510 while (owner->owner)
449 owner = owner->owner; 511 owner = owner->owner;
512
513 if (flag [FLAG_FREED])
514 {
515 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
516 return;
517 }
450 518
451 this->owner = owner; 519 this->owner = owner;
452} 520}
453 521
454int 522int
586object::copy_to (object *dst) 654object::copy_to (object *dst)
587{ 655{
588 *dst = *this; 656 *dst = *this;
589 657
590 if (speed < 0) 658 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 659 dst->speed_left -= rndm ();
592 660
593 dst->set_speed (dst->speed); 661 dst->set_speed (dst->speed);
594} 662}
595 663
596void 664void
597object::instantiate () 665object::instantiate ()
598{ 666{
599 if (!uuid.seq) // HACK 667 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 668 uuid = UUID::gen ();
601 669
602 speed_left = -0.1f; 670 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 671 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything. 672 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting 673 * by doing so, when a monster is created, it has good starting
764static int object_count; 832static int object_count;
765 833
766void object::link () 834void object::link ()
767{ 835{
768 assert (!index);//D 836 assert (!index);//D
769 uuid = gen_uuid (); 837 uuid = UUID::gen ();
770 count = ++object_count; 838 count = ++object_count;
771 839
772 refcnt_inc (); 840 refcnt_inc ();
773 objects.insert (this); 841 objects.insert (this);
774} 842}
858 * if some form of movement is allowed, let objects 926 * if some form of movement is allowed, let objects
859 * drop on that space. 927 * drop on that space.
860 */ 928 */
861 if (!drop_to_ground 929 if (!drop_to_ground
862 || !map 930 || !map
863 || map->in_memory != MAP_IN_MEMORY 931 || map->in_memory != MAP_ACTIVE
864 || map->nodrop 932 || map->nodrop
865 || ms ().move_block == MOVE_ALL) 933 || ms ().move_block == MOVE_ALL)
866 { 934 {
867 while (inv) 935 while (inv)
868 { 936 {
897} 965}
898 966
899void 967void
900object::do_destroy () 968object::do_destroy ()
901{ 969{
902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED]) 970 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this); 971 remove_button_link (this);
906 972
907 if (flag [FLAG_FRIENDLY]) 973 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this); 974 remove_friendly_object (this);
909 975
910 if (!flag [FLAG_REMOVED])
911 remove (); 976 remove ();
977
978 attachable::do_destroy ();
912 979
913 destroy_inv (true); 980 destroy_inv (true);
914 981
915 deactivate (); 982 deactivate ();
916 unlink (); 983 unlink ();
923 990
924 if (!freed_map) 991 if (!freed_map)
925 { 992 {
926 freed_map = new maptile; 993 freed_map = new maptile;
927 994
995 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 996 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 997 freed_map->width = 3;
930 freed_map->height = 3; 998 freed_map->height = 3;
999 freed_map->nodrop = 1;
931 1000
932 freed_map->alloc (); 1001 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY; 1002 freed_map->in_memory = MAP_ACTIVE;
934 } 1003 }
935 1004
936 map = freed_map; 1005 map = freed_map;
937 x = 1; 1006 x = 1;
938 y = 1; 1007 y = 1;
967 play_sound (sound_destroy); 1036 play_sound (sound_destroy);
968 else if (flag [FLAG_MONSTER]) 1037 else if (flag [FLAG_MONSTER])
969 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 1038 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
970 1039
971 attachable::destroy (); 1040 attachable::destroy ();
972}
973
974/*
975 * sub_weight() recursively (outwards) subtracts a number from the
976 * weight of an object (and what is carried by it's environment(s)).
977 */
978void
979sub_weight (object *op, signed long weight)
980{
981 while (op != NULL)
982 {
983 if (op->type == CONTAINER)
984 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
985
986 op->carrying -= weight;
987 op = op->env;
988 }
989} 1041}
990 1042
991/* op->remove (): 1043/* op->remove ():
992 * This function removes the object op from the linked list of objects 1044 * This function removes the object op from the linked list of objects
993 * which it is currently tied to. When this function is done, the 1045 * which it is currently tied to. When this function is done, the
999object::do_remove () 1051object::do_remove ()
1000{ 1052{
1001 object *tmp, *last = 0; 1053 object *tmp, *last = 0;
1002 object *otmp; 1054 object *otmp;
1003 1055
1004 if (QUERY_FLAG (this, FLAG_REMOVED)) 1056 if (flag [FLAG_REMOVED])
1005 return; 1057 return;
1006 1058
1007 SET_FLAG (this, FLAG_REMOVED);
1008 INVOKE_OBJECT (REMOVE, this); 1059 INVOKE_OBJECT (REMOVE, this);
1060
1061 if (object *pl = visible_to ())
1062 esrv_del_item (pl->contr, count);
1063
1064 flag [FLAG_REMOVED] = true;
1009 1065
1010 if (more) 1066 if (more)
1011 more->remove (); 1067 more->remove ();
1012 1068
1013 /* 1069 /*
1014 * In this case, the object to be removed is in someones 1070 * In this case, the object to be removed is in someones
1015 * inventory. 1071 * inventory.
1016 */ 1072 */
1017 if (env) 1073 if (env)
1018 { 1074 {
1075 adjust_weight (env, -total_weight ());
1076
1077 *(above ? &above->below : &env->inv) = below;
1078
1019 if (nrof) 1079 if (below)
1020 sub_weight (env, weight * nrof); 1080 below->above = above;
1021 else 1081
1022 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;
1023 1092
1024 /* 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
1025 * made to players inventory. If set, avoiding the call 1094 * made to players inventory. If set, avoiding the call
1026 * to save cpu time. 1095 * to save cpu time.
1027 */ 1096 */
1028 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))
1029 otmp->update_stats (); 1098 otmp->update_stats ();
1030
1031 if (above)
1032 above->below = below;
1033 else
1034 env->inv = below;
1035
1036 if (below)
1037 below->above = above;
1038
1039 /* we set up values so that it could be inserted into
1040 * the map, but we don't actually do that - it is up
1041 * to the caller to decide what we want to do.
1042 */
1043 x = env->x, y = env->y;
1044 map = env->map;
1045 above = 0, below = 0;
1046 env = 0;
1047 } 1099 }
1048 else if (map) 1100 else if (map)
1049 { 1101 {
1050 if (type == PLAYER) 1102 if (type == PLAYER)
1051 { 1103 {
1147merge_ob (object *op, object *top) 1199merge_ob (object *op, object *top)
1148{ 1200{
1149 if (!op->nrof) 1201 if (!op->nrof)
1150 return 0; 1202 return 0;
1151 1203
1152 if (top) 1204 if (!top)
1153 for (top = op; top && top->above; top = top->above) 1205 for (top = op; top && top->above; top = top->above)
1154 ; 1206 ;
1155 1207
1156 for (; top; top = top->below) 1208 for (; top; top = top->below)
1157 {
1158 if (top == op)
1159 continue;
1160
1161 if (object::can_merge (op, top)) 1209 if (object::can_merge (op, top))
1162 { 1210 {
1163 top->nrof += op->nrof; 1211 top->nrof += op->nrof;
1164 1212
1165/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1213 if (object *pl = top->visible_to ())
1166 op->weight = 0; /* Don't want any adjustements now */ 1214 esrv_update_item (UPD_NROF, pl, top);
1215
1216 op->weight = 0; // cancel the addition above
1217 op->carrying = 0; // must be 0 already
1218
1167 op->destroy (); 1219 op->destroy (1);
1220
1168 return top; 1221 return top;
1169 } 1222 }
1170 }
1171 1223
1172 return 0; 1224 return 0;
1173} 1225}
1174 1226
1175void 1227void
1238 1290
1239 object *top, *floor = NULL; 1291 object *top, *floor = NULL;
1240 1292
1241 op->remove (); 1293 op->remove ();
1242 1294
1243#if 0
1244 if (!m->active != !op->active)
1245 if (m->active)
1246 op->activate_recursive ();
1247 else
1248 op->deactivate_recursive ();
1249#endif
1250
1251 if (out_of_map (m, op->x, op->y))
1252 {
1253 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1254#ifdef MANY_CORES
1255 /* Better to catch this here, as otherwise the next use of this object
1256 * is likely to cause a crash. Better to find out where it is getting
1257 * improperly inserted.
1258 */
1259 abort ();
1260#endif
1261 return op;
1262 }
1263
1264 if (object *more = op->more)
1265 if (!insert_ob_in_map (more, m, originator, flag))
1266 return 0;
1267
1268 CLEAR_FLAG (op, FLAG_REMOVED);
1269
1270 /* Ideally, the caller figures this out. However, it complicates a lot 1295 /* Ideally, the caller figures this out. However, it complicates a lot
1271 * of areas of callers (eg, anything that uses find_free_spot would now 1296 * of areas of callers (eg, anything that uses find_free_spot would now
1272 * need extra work 1297 * need extra work
1273 */ 1298 */
1274 if (!xy_normalise (m, op->x, op->y)) 1299 if (!xy_normalise (m, op->x, op->y))
1300 {
1301 op->destroy ();
1275 return 0; 1302 return 0;
1303 }
1304
1305 if (object *more = op->more)
1306 if (!insert_ob_in_map (more, m, originator, flag))
1307 return 0;
1308
1309 CLEAR_FLAG (op, FLAG_REMOVED);
1276 1310
1277 op->map = m; 1311 op->map = m;
1278 mapspace &ms = op->ms (); 1312 mapspace &ms = op->ms ();
1279 1313
1280 /* this has to be done after we translate the coordinates. 1314 /* this has to be done after we translate the coordinates.
1282 if (op->nrof && !(flag & INS_NO_MERGE)) 1316 if (op->nrof && !(flag & INS_NO_MERGE))
1283 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1317 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1284 if (object::can_merge (op, tmp)) 1318 if (object::can_merge (op, tmp))
1285 { 1319 {
1286 op->nrof += tmp->nrof; 1320 op->nrof += tmp->nrof;
1287 tmp->destroy (); 1321 tmp->destroy (1);
1288 } 1322 }
1289 1323
1290 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1324 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1291 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1325 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1292 1326
1315 else 1349 else
1316 { 1350 {
1317 top = ms.bot; 1351 top = ms.bot;
1318 1352
1319 /* If there are other objects, then */ 1353 /* If there are other objects, then */
1320 if ((!(flag & INS_MAP_LOAD)) && top) 1354 if (top)
1321 { 1355 {
1322 object *last = 0; 1356 object *last = 0;
1323 1357
1324 /* 1358 /*
1325 * If there are multiple objects on this space, we do some trickier handling. 1359 * If there are multiple objects on this space, we do some trickier handling.
1377 */ 1411 */
1378 if (last && last->below && last != floor) 1412 if (last && last->below && last != floor)
1379 top = last->below; 1413 top = last->below;
1380 } 1414 }
1381 } /* If objects on this space */ 1415 } /* If objects on this space */
1382 if (flag & INS_MAP_LOAD)
1383 top = ms.top;
1384 1416
1385 if (flag & INS_ABOVE_FLOOR_ONLY) 1417 if (flag & INS_ABOVE_FLOOR_ONLY)
1386 top = floor; 1418 top = floor;
1387 1419
1388 /* Top is the object that our object (op) is going to get inserted above. 1420 /* Top is the object that our object (op) is going to get inserted above.
1421 op->map->touch (); 1453 op->map->touch ();
1422 } 1454 }
1423 1455
1424 op->map->dirty = true; 1456 op->map->dirty = true;
1425 1457
1426 /* If we have a floor, we know the player, if any, will be above
1427 * it, so save a few ticks and start from there.
1428 */
1429 if (!(flag & INS_MAP_LOAD))
1430 if (object *pl = ms.player ()) 1458 if (object *pl = ms.player ())
1431 pl->contr->ns->floorbox_update (); 1459 pl->contr->ns->floorbox_update ();
1432 1460
1433 /* If this object glows, it may affect lighting conditions that are 1461 /* If this object glows, it may affect lighting conditions that are
1434 * visible to others on this map. But update_all_los is really 1462 * visible to others on this map. But update_all_los is really
1435 * an inefficient way to do this, as it means los for all players 1463 * an inefficient way to do this, as it means los for all players
1436 * on the map will get recalculated. The players could very well 1464 * on the map will get recalculated. The players could very well
1478 * op is the object to insert it under: supplies x and the map. 1506 * op is the object to insert it under: supplies x and the map.
1479 */ 1507 */
1480void 1508void
1481replace_insert_ob_in_map (const char *arch_string, object *op) 1509replace_insert_ob_in_map (const char *arch_string, object *op)
1482{ 1510{
1483 object *tmp, *tmp1;
1484
1485 /* first search for itself and remove any old instances */ 1511 /* first search for itself and remove any old instances */
1486 1512
1487 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1513 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1514 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1489 tmp->destroy (); 1515 tmp->destroy (1);
1490 1516
1491 tmp1 = arch_to_object (archetype::find (arch_string)); 1517 object *tmp = arch_to_object (archetype::find (arch_string));
1492 1518
1493 tmp1->x = op->x; 1519 tmp->x = op->x;
1494 tmp1->y = op->y; 1520 tmp->y = op->y;
1521
1495 insert_ob_in_map (tmp1, op->map, op, 0); 1522 insert_ob_in_map (tmp, op->map, op, 0);
1496} 1523}
1497 1524
1498object * 1525object *
1499object::insert_at (object *where, object *originator, int flags) 1526object::insert_at (object *where, object *originator, int flags)
1500{ 1527{
1528 if (where->env)
1529 return where->env->insert (this);
1530 else
1501 return where->map->insert (this, where->x, where->y, originator, flags); 1531 return where->map->insert (this, where->x, where->y, originator, flags);
1502} 1532}
1503 1533
1504/* 1534/*
1505 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1506 * is returned contains nr objects, and the remaining parts contains
1507 * the rest (or is removed and freed if that number is 0).
1508 * On failure, NULL is returned, and the reason put into the
1509 * global static errmsg array.
1510 */
1511object *
1512get_split_ob (object *orig_ob, uint32 nr)
1513{
1514 object *newob;
1515 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1516
1517 if (orig_ob->nrof < nr)
1518 {
1519 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1520 return NULL;
1521 }
1522
1523 newob = object_create_clone (orig_ob);
1524
1525 if ((orig_ob->nrof -= nr) < 1)
1526 orig_ob->destroy (1);
1527 else if (!is_removed)
1528 {
1529 if (orig_ob->env != NULL)
1530 sub_weight (orig_ob->env, orig_ob->weight * nr);
1531 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1532 {
1533 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1534 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1535 return NULL;
1536 }
1537 }
1538
1539 newob->nrof = nr;
1540
1541 return newob;
1542}
1543
1544/*
1545 * decrease_ob_nr(object, number) decreases a specified number from 1535 * decrease(object, number) decreases a specified number from
1546 * the amount of an object. If the amount reaches 0, the object 1536 * the amount of an object. If the amount reaches 0, the object
1547 * is subsequently removed and freed. 1537 * is subsequently removed and freed.
1548 * 1538 *
1549 * Return value: 'op' if something is left, NULL if the amount reached 0 1539 * Return value: 'op' if something is left, NULL if the amount reached 0
1550 */ 1540 */
1541bool
1542object::decrease (sint32 nr)
1543{
1544 if (!nr)
1545 return true;
1546
1547 nr = min (nr, nrof);
1548
1549 nrof -= nr;
1550
1551 if (nrof)
1552 {
1553 adjust_weight (env, -weight * nr); // carrying == 0
1554
1555 if (object *pl = visible_to ())
1556 esrv_update_item (UPD_NROF, pl, this);
1557
1558 return true;
1559 }
1560 else
1561 {
1562 destroy (1);
1563 return false;
1564 }
1565}
1566
1567/*
1568 * split(ob,nr) splits up ob into two parts. The part which
1569 * is returned contains nr objects, and the remaining parts contains
1570 * the rest (or is removed and returned if that number is 0).
1571 * On failure, NULL is returned.
1572 */
1551object * 1573object *
1552decrease_ob_nr (object *op, uint32 i) 1574object::split (sint32 nr)
1553{ 1575{
1554 object *tmp; 1576 int have = number_of ();
1555 1577
1556 if (i == 0) /* objects with op->nrof require this check */ 1578 if (have < nr)
1557 return op; 1579 return 0;
1558 1580 else if (have == nr)
1559 if (i > op->nrof)
1560 i = op->nrof;
1561
1562 if (QUERY_FLAG (op, FLAG_REMOVED))
1563 op->nrof -= i;
1564 else if (op->env)
1565 { 1581 {
1566 /* is this object in the players inventory, or sub container
1567 * therein?
1568 */
1569 tmp = op->in_player ();
1570 /* nope. Is this a container the player has opened?
1571 * If so, set tmp to that player.
1572 * IMO, searching through all the players will mostly
1573 * likely be quicker than following op->env to the map,
1574 * and then searching the map for a player.
1575 */
1576 if (!tmp)
1577 for_all_players (pl)
1578 if (pl->ob->container == op->env)
1579 {
1580 tmp = pl->ob;
1581 break;
1582 }
1583
1584 if (i < op->nrof)
1585 {
1586 sub_weight (op->env, op->weight * i);
1587 op->nrof -= i;
1588 if (tmp)
1589 esrv_send_item (tmp, op);
1590 }
1591 else
1592 {
1593 op->remove (); 1582 remove ();
1594 op->nrof = 0; 1583 return this;
1595 if (tmp)
1596 esrv_del_item (tmp->contr, op->count);
1597 }
1598 } 1584 }
1599 else 1585 else
1600 { 1586 {
1601 object *above = op->above; 1587 decrease (nr);
1602 1588
1603 if (i < op->nrof) 1589 object *op = object_create_clone (this);
1604 op->nrof -= i; 1590 op->nrof = nr;
1605 else
1606 {
1607 op->remove ();
1608 op->nrof = 0;
1609 }
1610
1611 /* Since we just removed op, op->above is null */
1612 for (tmp = above; tmp; tmp = tmp->above)
1613 if (tmp->type == PLAYER)
1614 {
1615 if (op->nrof)
1616 esrv_send_item (tmp, op);
1617 else
1618 esrv_del_item (tmp->contr, op->count);
1619 }
1620 }
1621
1622 if (op->nrof)
1623 return op; 1591 return op;
1624 else
1625 {
1626 op->destroy ();
1627 return 0;
1628 }
1629}
1630
1631/*
1632 * add_weight(object, weight) adds the specified weight to an object,
1633 * and also updates how much the environment(s) is/are carrying.
1634 */
1635void
1636add_weight (object *op, signed long weight)
1637{
1638 while (op != NULL)
1639 {
1640 if (op->type == CONTAINER)
1641 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1642
1643 op->carrying += weight;
1644 op = op->env;
1645 } 1592 }
1646} 1593}
1647 1594
1648object * 1595object *
1649insert_ob_in_ob (object *op, object *where) 1596insert_ob_in_ob (object *op, object *where)
1674 * be != op, if items are merged. -Tero 1621 * be != op, if items are merged. -Tero
1675 */ 1622 */
1676object * 1623object *
1677object::insert (object *op) 1624object::insert (object *op)
1678{ 1625{
1679 object *tmp, *otmp;
1680
1681 if (!QUERY_FLAG (op, FLAG_REMOVED))
1682 op->remove ();
1683
1684 if (op->more) 1626 if (op->more)
1685 { 1627 {
1686 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1628 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1687 return op; 1629 return op;
1688 } 1630 }
1689 1631
1690 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1632 op->remove ();
1691 CLEAR_FLAG (op, FLAG_REMOVED); 1633
1634 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1635
1692 if (op->nrof) 1636 if (op->nrof)
1693 {
1694 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1637 for (object *tmp = inv; tmp; tmp = tmp->below)
1695 if (object::can_merge (tmp, op)) 1638 if (object::can_merge (tmp, op))
1696 { 1639 {
1697 /* return the original object and remove inserted object 1640 /* return the original object and remove inserted object
1698 (client needs the original object) */ 1641 (client needs the original object) */
1699 tmp->nrof += op->nrof; 1642 tmp->nrof += op->nrof;
1700 /* Weight handling gets pretty funky. Since we are adding to 1643
1701 * tmp->nrof, we need to increase the weight. 1644 if (object *pl = tmp->visible_to ())
1702 */ 1645 esrv_update_item (UPD_NROF, pl, tmp);
1646
1703 add_weight (this, op->weight * op->nrof); 1647 adjust_weight (this, op->total_weight ());
1704 SET_FLAG (op, FLAG_REMOVED); 1648
1705 op->destroy (); /* free the inserted object */ 1649 op->destroy (1);
1706 op = tmp; 1650 op = tmp;
1707 op->remove (); /* and fix old object's links */ 1651 goto inserted;
1708 CLEAR_FLAG (op, FLAG_REMOVED);
1709 break;
1710 } 1652 }
1711 1653
1712 /* I assume combined objects have no inventory 1654 op->owner = 0; // it's his/hers now. period.
1713 * We add the weight - this object could have just been removed
1714 * (if it was possible to merge). calling remove_ob will subtract
1715 * the weight, so we need to add it in again, since we actually do
1716 * the linking below
1717 */
1718 add_weight (this, op->weight * op->nrof);
1719 }
1720 else
1721 add_weight (this, (op->weight + op->carrying));
1722
1723 otmp = this->in_player ();
1724 if (otmp && otmp->contr)
1725 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1726 otmp->update_stats ();
1727
1728 op->map = 0; 1655 op->map = 0;
1729 op->env = this; 1656 op->x = 0;
1657 op->y = 0;
1658
1730 op->above = 0; 1659 op->above = 0;
1731 op->below = 0; 1660 op->below = inv;
1732 op->x = 0, op->y = 0; 1661 op->env = this;
1733 1662
1663 if (inv)
1664 inv->above = op;
1665
1666 inv = op;
1667
1668 op->flag [FLAG_REMOVED] = 0;
1669
1670 if (object *pl = op->visible_to ())
1671 esrv_send_item (pl, op);
1672
1673 adjust_weight (this, op->total_weight ());
1674
1675inserted:
1734 /* reset the light list and los of the players on the map */ 1676 /* reset the light list and los of the players on the map */
1735 if ((op->glow_radius != 0) && map) 1677 if (op->glow_radius && map && map->darkness)
1736 {
1737#ifdef DEBUG_LIGHTS
1738 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1739#endif /* DEBUG_LIGHTS */
1740 if (map->darkness)
1741 update_all_los (map, x, y); 1678 update_all_los (map, x, y);
1742 }
1743 1679
1744 /* Client has no idea of ordering so lets not bother ordering it here. 1680 // if this is a player's inventory, update stats
1745 * It sure simplifies this function... 1681 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1746 */ 1682 update_stats ();
1747 if (!inv)
1748 inv = op;
1749 else
1750 {
1751 op->below = inv;
1752 op->below->above = op;
1753 inv = op;
1754 }
1755 1683
1756 INVOKE_OBJECT (INSERT, this); 1684 INVOKE_OBJECT (INSERT, this);
1757 1685
1758 return op; 1686 return op;
1759} 1687}
1974 * activate recursively a flag on an object inventory 1902 * activate recursively a flag on an object inventory
1975 */ 1903 */
1976void 1904void
1977flag_inv (object *op, int flag) 1905flag_inv (object *op, int flag)
1978{ 1906{
1979 if (op->inv)
1980 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1907 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1981 { 1908 {
1982 SET_FLAG (tmp, flag); 1909 SET_FLAG (tmp, flag);
1983 flag_inv (tmp, flag); 1910 flag_inv (tmp, flag);
1984 } 1911 }
1985} 1912}
1986 1913
1987/* 1914/*
1988 * deactivate recursively a flag on an object inventory 1915 * deactivate recursively a flag on an object inventory
1989 */ 1916 */
1990void 1917void
1991unflag_inv (object *op, int flag) 1918unflag_inv (object *op, int flag)
1992{ 1919{
1993 if (op->inv)
1994 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1920 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1995 { 1921 {
1996 CLEAR_FLAG (tmp, flag); 1922 CLEAR_FLAG (tmp, flag);
1997 unflag_inv (tmp, flag); 1923 unflag_inv (tmp, flag);
1998 } 1924 }
1999} 1925}
2000 1926
2001/* 1927/*
2002 * find_free_spot(object, map, x, y, start, stop) will search for 1928 * find_free_spot(object, map, x, y, start, stop) will search for
2003 * a spot at the given map and coordinates which will be able to contain 1929 * a spot at the given map and coordinates which will be able to contain
2005 * to search (see the freearr_x/y[] definition). 1931 * to search (see the freearr_x/y[] definition).
2006 * It returns a random choice among the alternatives found. 1932 * It returns a random choice among the alternatives found.
2007 * start and stop are where to start relative to the free_arr array (1,9 1933 * start and stop are where to start relative to the free_arr array (1,9
2008 * does all 4 immediate directions). This returns the index into the 1934 * does all 4 immediate directions). This returns the index into the
2009 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1935 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2010 * Note - this only checks to see if there is space for the head of the
2011 * object - if it is a multispace object, this should be called for all
2012 * pieces.
2013 * Note2: This function does correctly handle tiled maps, but does not 1936 * Note: This function does correctly handle tiled maps, but does not
2014 * inform the caller. However, insert_ob_in_map will update as 1937 * inform the caller. However, insert_ob_in_map will update as
2015 * necessary, so the caller shouldn't need to do any special work. 1938 * necessary, so the caller shouldn't need to do any special work.
2016 * Note - updated to take an object instead of archetype - this is necessary 1939 * Note - updated to take an object instead of archetype - this is necessary
2017 * because arch_blocked (now ob_blocked) needs to know the movement type 1940 * because arch_blocked (now ob_blocked) needs to know the movement type
2018 * to know if the space in question will block the object. We can't use 1941 * to know if the space in question will block the object. We can't use
2020 * customized, changed states, etc. 1943 * customized, changed states, etc.
2021 */ 1944 */
2022int 1945int
2023find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1946find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2024{ 1947{
1948 int altern[SIZEOFFREE];
2025 int index = 0, flag; 1949 int index = 0, flag;
2026 int altern[SIZEOFFREE];
2027 1950
2028 for (int i = start; i < stop; i++) 1951 for (int i = start; i < stop; i++)
2029 { 1952 {
2030 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1953 mapxy pos (m, x, y); pos.move (i);
2031 if (!flag) 1954
1955 if (!pos.normalise ())
1956 continue;
1957
1958 mapspace &ms = *pos;
1959
1960 if (ms.flags () & P_IS_ALIVE)
1961 continue;
1962
1963 /* However, often
1964 * ob doesn't have any move type (when used to place exits)
1965 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1966 */
1967 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1968 {
2032 altern [index++] = i; 1969 altern [index++] = i;
1970 continue;
1971 }
2033 1972
2034 /* Basically, if we find a wall on a space, we cut down the search size. 1973 /* Basically, if we find a wall on a space, we cut down the search size.
2035 * In this way, we won't return spaces that are on another side of a wall. 1974 * In this way, we won't return spaces that are on another side of a wall.
2036 * This mostly work, but it cuts down the search size in all directions - 1975 * This mostly work, but it cuts down the search size in all directions -
2037 * if the space being examined only has a wall to the north and empty 1976 * if the space being examined only has a wall to the north and empty
2038 * spaces in all the other directions, this will reduce the search space 1977 * spaces in all the other directions, this will reduce the search space
2039 * to only the spaces immediately surrounding the target area, and 1978 * to only the spaces immediately surrounding the target area, and
2040 * won't look 2 spaces south of the target space. 1979 * won't look 2 spaces south of the target space.
2041 */ 1980 */
2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1981 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1982 {
2043 stop = maxfree[i]; 1983 stop = maxfree[i];
1984 continue;
1985 }
1986
1987 /* Note it is intentional that we check ob - the movement type of the
1988 * head of the object should correspond for the entire object.
1989 */
1990 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1991 continue;
1992
1993 if (ob->blocked (m, pos.x, pos.y))
1994 continue;
1995
1996 altern [index++] = i;
2044 } 1997 }
2045 1998
2046 if (!index) 1999 if (!index)
2047 return -1; 2000 return -1;
2048 2001
2057 */ 2010 */
2058int 2011int
2059find_first_free_spot (const object *ob, maptile *m, int x, int y) 2012find_first_free_spot (const object *ob, maptile *m, int x, int y)
2060{ 2013{
2061 for (int i = 0; i < SIZEOFFREE; i++) 2014 for (int i = 0; i < SIZEOFFREE; i++)
2062 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2015 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063 return i; 2016 return i;
2064 2017
2065 return -1; 2018 return -1;
2066} 2019}
2067 2020
2604{ 2557{
2605 char flagdesc[512]; 2558 char flagdesc[512];
2606 char info2[256 * 4]; 2559 char info2[256 * 4];
2607 char *p = info; 2560 char *p = info;
2608 2561
2609 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2562 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2610 count, uuid.seq, 2563 count,
2564 uuid.c_str (),
2611 &name, 2565 &name,
2612 title ? "\",title:\"" : "", 2566 title ? "\",title:\"" : "",
2613 title ? (const char *)title : "", 2567 title ? (const char *)title : "",
2614 flag_desc (flagdesc, 512), type); 2568 flag_desc (flagdesc, 512), type);
2615 2569
2616 if (env) 2570 if (!this->flag[FLAG_REMOVED] && env)
2617 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2571 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2618 2572
2619 if (map) 2573 if (map)
2620 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2574 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2621 2575
2668 old_container->flag [FLAG_APPLIED] = 0; 2622 old_container->flag [FLAG_APPLIED] = 0;
2669 container = 0; 2623 container = 0;
2670 2624
2671 esrv_update_item (UPD_FLAGS, this, old_container); 2625 esrv_update_item (UPD_FLAGS, this, old_container);
2672 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2626 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627 play_sound (sound_find ("chest_close"));
2673 } 2628 }
2674 2629
2675 if (new_container) 2630 if (new_container)
2676 { 2631 {
2677 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2632 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2693 new_container->flag [FLAG_APPLIED] = 1; 2648 new_container->flag [FLAG_APPLIED] = 1;
2694 container = new_container; 2649 container = new_container;
2695 2650
2696 esrv_update_item (UPD_FLAGS, this, new_container); 2651 esrv_update_item (UPD_FLAGS, this, new_container);
2697 esrv_send_inventory (this, new_container); 2652 esrv_send_inventory (this, new_container);
2653 play_sound (sound_find ("chest_open"));
2698 } 2654 }
2699} 2655}
2700 2656
2701object * 2657object *
2702object::force_find (const shstr name) 2658object::force_find (const shstr name)
2728 force->flag [FLAG_APPLIED] = true; 2684 force->flag [FLAG_APPLIED] = true;
2729 2685
2730 insert (force); 2686 insert (force);
2731} 2687}
2732 2688
2689void
2690object::play_sound (faceidx sound)
2691{
2692 if (!sound)
2693 return;
2694
2695 if (flag [FLAG_REMOVED])
2696 return;
2697
2698 if (env)
2699 {
2700 if (object *pl = in_player ())
2701 pl->contr->play_sound (sound);
2702 }
2703 else
2704 map->play_sound (sound, x, y);
2705}
2706

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines