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.181 by elmex, Sun Aug 19 19:34:05 2007 UTC vs.
Revision 1.218 by root, Wed Apr 23 07:25:54 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 if (pl != op) // player is handled lazily
397 esrv_update_item (UPD_WEIGHT, pl, op);
398
399 op = op->env;
400 }
401}
402
403/*
319 * sum_weight() is a recursive function which calculates the weight 404 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 405 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 406 * containers are carrying, and sums it up.
322 */ 407 */
323long 408void
324sum_weight (object *op) 409object::update_weight ()
325{ 410{
326 long sum; 411 sint32 sum = 0;
327 object *inv;
328 412
329 for (sum = 0, inv = op->inv; inv; inv = inv->below) 413 for (object *op = inv; op; op = op->below)
330 { 414 {
331 if (inv->inv) 415 if (op->inv)
332 sum_weight (inv); 416 op->update_weight ();
333 417
334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 418 sum += op->total_weight ();
419 }
420
421 sum = weight_adjust (this, sum);
422
423 if (sum != carrying)
335 } 424 {
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; 425 carrying = sum;
342 426
343 return sum; 427 if (object *pl = visible_to ())
428 if (pl != this) // player is handled lazily
429 esrv_update_item (UPD_WEIGHT, pl, this);
430 }
344} 431}
345 432
346/** 433/*
347 * Return the outermost environment object for a given object. 434 * 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 */ 435 */
363char * 436char *
364dump_object (object *op) 437dump_object (object *op)
365{ 438{
366 if (!op) 439 if (!op)
374/* 447/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 448 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 449 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 450 * If it's not a multi-object, it is returned.
378 */ 451 */
379
380object * 452object *
381get_nearest_part (object *op, const object *pl) 453get_nearest_part (object *op, const object *pl)
382{ 454{
383 object *tmp, *closest; 455 object *tmp, *closest;
384 int last_dist, i; 456 int last_dist, i;
385 457
386 if (op->more == NULL) 458 if (!op->more)
387 return op; 459 return op;
460
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 461 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
462 tmp;
463 tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist) 464 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i; 465 closest = tmp, last_dist = i;
466
391 return closest; 467 return closest;
392} 468}
393 469
394/* 470/*
395 * Returns the object which has the count-variable equal to the argument. 471 * Returns the object which has the count-variable equal to the argument.
472 * VERRRY slow.
396 */ 473 */
397object * 474object *
398find_object (tag_t i) 475find_object (tag_t i)
399{ 476{
400 for_all_objects (op) 477 for_all_objects (op)
420 break; 497 break;
421 498
422 return op; 499 return op;
423} 500}
424 501
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 502/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 503 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 504 * skill and experience objects.
505 * ACTUALLY NO! investigate! TODO
434 */ 506 */
435void 507void
436object::set_owner (object *owner) 508object::set_owner (object *owner)
437{ 509{
510 // allow objects which own objects
438 if (!owner) 511 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 512 while (owner->owner)
449 owner = owner->owner; 513 owner = owner->owner;
514
515 if (flag [FLAG_FREED])
516 {
517 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
518 return;
519 }
450 520
451 this->owner = owner; 521 this->owner = owner;
452} 522}
453 523
454int 524int
586object::copy_to (object *dst) 656object::copy_to (object *dst)
587{ 657{
588 *dst = *this; 658 *dst = *this;
589 659
590 if (speed < 0) 660 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 661 dst->speed_left -= rndm ();
592 662
593 dst->set_speed (dst->speed); 663 dst->set_speed (dst->speed);
594} 664}
595 665
596void 666void
597object::instantiate () 667object::instantiate ()
598{ 668{
599 if (!uuid.seq) // HACK 669 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 670 uuid = UUID::gen ();
601 671
602 speed_left = -0.1f; 672 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 673 /* 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. 674 * 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 675 * by doing so, when a monster is created, it has good starting
764static int object_count; 834static int object_count;
765 835
766void object::link () 836void object::link ()
767{ 837{
768 assert (!index);//D 838 assert (!index);//D
769 uuid = gen_uuid (); 839 uuid = UUID::gen ();
770 count = ++object_count; 840 count = ++object_count;
771 841
772 refcnt_inc (); 842 refcnt_inc ();
773 objects.insert (this); 843 objects.insert (this);
774} 844}
847object::destroy_inv (bool drop_to_ground) 917object::destroy_inv (bool drop_to_ground)
848{ 918{
849 // need to check first, because the checks below might segfault 919 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code 920 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty. 921 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory, 922 // corollary: if you create arrows etc. with stuff in its inventory,
853 // cf will crash below with off-map x and y 923 // cf will crash below with off-map x and y
854 if (!inv) 924 if (!inv)
855 return; 925 return;
856 926
857 /* Only if the space blocks everything do we not process - 927 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects 928 * if some form of movement is allowed, let objects
859 * drop on that space. 929 * drop on that space.
860 */ 930 */
861 if (!drop_to_ground 931 if (!drop_to_ground
862 || !map 932 || !map
863 || map->in_memory != MAP_IN_MEMORY 933 || map->in_memory != MAP_ACTIVE
864 || map->nodrop 934 || map->nodrop
865 || ms ().move_block == MOVE_ALL) 935 || ms ().move_block == MOVE_ALL)
866 { 936 {
867 while (inv) 937 while (inv)
868 { 938 {
869 inv->destroy_inv (drop_to_ground); 939 inv->destroy_inv (false);
870 inv->destroy (); 940 inv->destroy ();
871 } 941 }
872 } 942 }
873 else 943 else
874 { /* Put objects in inventory onto this space */ 944 { /* Put objects in inventory onto this space */
880 || op->flag [FLAG_NO_DROP] 950 || op->flag [FLAG_NO_DROP]
881 || op->type == RUNE 951 || op->type == RUNE
882 || op->type == TRAP 952 || op->type == TRAP
883 || op->flag [FLAG_IS_A_TEMPLATE] 953 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH]) 954 || op->flag [FLAG_DESTROY_ON_DEATH])
885 op->destroy (); 955 op->destroy (true);
886 else 956 else
887 map->insert (op, x, y); 957 map->insert (op, x, y);
888 } 958 }
889 } 959 }
890} 960}
897} 967}
898 968
899void 969void
900object::do_destroy () 970object::do_destroy ()
901{ 971{
902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED]) 972 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this); 973 remove_button_link (this);
906 974
907 if (flag [FLAG_FRIENDLY]) 975 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this); 976 remove_friendly_object (this);
909 977
910 if (!flag [FLAG_REMOVED])
911 remove (); 978 remove ();
912 979
913 destroy_inv (true); 980 attachable::do_destroy ();
914 981
915 deactivate (); 982 deactivate ();
916 unlink (); 983 unlink ();
917 984
918 flag [FLAG_FREED] = 1; 985 flag [FLAG_FREED] = 1;
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;
957object::destroy (bool destroy_inventory) 1026object::destroy (bool destroy_inventory)
958{ 1027{
959 if (destroyed ()) 1028 if (destroyed ())
960 return; 1029 return;
961 1030
962 if (destroy_inventory) 1031 destroy_inv (!destroy_inventory);
963 destroy_inv (false);
964 1032
965 if (is_head ()) 1033 if (is_head ())
966 if (sound_destroy) 1034 if (sound_destroy)
967 play_sound (sound_destroy); 1035 play_sound (sound_destroy);
968 else if (flag [FLAG_MONSTER]) 1036 else if (flag [FLAG_MONSTER])
969 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 1037 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
970 1038
971 attachable::destroy (); 1039 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} 1040}
990 1041
991/* op->remove (): 1042/* op->remove ():
992 * This function removes the object op from the linked list of objects 1043 * 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 1044 * which it is currently tied to. When this function is done, the
999object::do_remove () 1050object::do_remove ()
1000{ 1051{
1001 object *tmp, *last = 0; 1052 object *tmp, *last = 0;
1002 object *otmp; 1053 object *otmp;
1003 1054
1004 if (QUERY_FLAG (this, FLAG_REMOVED)) 1055 if (flag [FLAG_REMOVED])
1005 return; 1056 return;
1006 1057
1007 SET_FLAG (this, FLAG_REMOVED);
1008 INVOKE_OBJECT (REMOVE, this); 1058 INVOKE_OBJECT (REMOVE, this);
1059
1060 if (object *pl = visible_to ())
1061 esrv_del_item (pl->contr, count);
1062
1063 flag [FLAG_REMOVED] = true;
1009 1064
1010 if (more) 1065 if (more)
1011 more->remove (); 1066 more->remove ();
1012 1067
1013 /* 1068 /*
1014 * In this case, the object to be removed is in someones 1069 * In this case, the object to be removed is in someones
1015 * inventory. 1070 * inventory.
1016 */ 1071 */
1017 if (env) 1072 if (env)
1018 { 1073 {
1074 adjust_weight (env, -total_weight ());
1075
1076 *(above ? &above->below : &env->inv) = below;
1077
1019 if (nrof) 1078 if (below)
1020 sub_weight (env, weight * nrof); 1079 below->above = above;
1021 else 1080
1022 sub_weight (env, weight + carrying); 1081 /* we set up values so that it could be inserted into
1082 * the map, but we don't actually do that - it is up
1083 * to the caller to decide what we want to do.
1084 */
1085 map = env->map;
1086 x = env->x;
1087 y = env->y;
1088 above = 0;
1089 below = 0;
1090 env = 0;
1023 1091
1024 /* NO_FIX_PLAYER is set when a great many changes are being 1092 /* NO_FIX_PLAYER is set when a great many changes are being
1025 * made to players inventory. If set, avoiding the call 1093 * made to players inventory. If set, avoiding the call
1026 * to save cpu time. 1094 * to save cpu time.
1027 */ 1095 */
1028 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1096 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1029 otmp->update_stats (); 1097 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 } 1098 }
1048 else if (map) 1099 else if (map)
1049 { 1100 {
1050 if (type == PLAYER) 1101 if (type == PLAYER)
1051 { 1102 {
1098 * removed (most likely destroyed), update the player view 1149 * removed (most likely destroyed), update the player view
1099 * appropriately. 1150 * appropriately.
1100 */ 1151 */
1101 pl->close_container (); 1152 pl->close_container ();
1102 1153
1103 pl->contr->ns->floorbox_update (); 1154 //TODO: the floorbox prev/next might need updating
1155 esrv_del_item (pl->contr, count);
1104 } 1156 }
1105 1157
1106 for (tmp = ms.bot; tmp; tmp = tmp->above) 1158 for (tmp = ms.bot; tmp; tmp = tmp->above)
1107 { 1159 {
1108 /* No point updating the players look faces if he is the object 1160 /* No point updating the players look faces if he is the object
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
1234object * 1286object *
1235insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1287insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236{ 1288{
1237 assert (!op->flag [FLAG_FREED]); 1289 assert (!op->flag [FLAG_FREED]);
1238 1290
1239 object *top, *floor = NULL;
1240
1241 op->remove (); 1291 op->remove ();
1242
1243 if (out_of_map (m, op->x, op->y))
1244 {
1245 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1246#ifdef MANY_CORES
1247 /* Better to catch this here, as otherwise the next use of this object
1248 * is likely to cause a crash. Better to find out where it is getting
1249 * improperly inserted.
1250 */
1251 abort ();
1252#endif
1253 return op;
1254 }
1255
1256 if (object *more = op->more)
1257 if (!insert_ob_in_map (more, m, originator, flag))
1258 return 0;
1259
1260 CLEAR_FLAG (op, FLAG_REMOVED);
1261 1292
1262 /* Ideally, the caller figures this out. However, it complicates a lot 1293 /* Ideally, the caller figures this out. However, it complicates a lot
1263 * of areas of callers (eg, anything that uses find_free_spot would now 1294 * of areas of callers (eg, anything that uses find_free_spot would now
1264 * need extra work 1295 * need extra work
1265 */ 1296 */
1266 if (!xy_normalise (m, op->x, op->y)) 1297 if (!xy_normalise (m, op->x, op->y))
1298 {
1299 op->destroy (1);
1267 return 0; 1300 return 0;
1301 }
1302
1303 if (object *more = op->more)
1304 if (!insert_ob_in_map (more, m, originator, flag))
1305 return 0;
1306
1307 CLEAR_FLAG (op, FLAG_REMOVED);
1268 1308
1269 op->map = m; 1309 op->map = m;
1270 mapspace &ms = op->ms (); 1310 mapspace &ms = op->ms ();
1271 1311
1272 /* this has to be done after we translate the coordinates. 1312 /* this has to be done after we translate the coordinates.
1273 */ 1313 */
1274 if (op->nrof && !(flag & INS_NO_MERGE)) 1314 if (op->nrof && !(flag & INS_NO_MERGE))
1275 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1315 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1276 if (object::can_merge (op, tmp)) 1316 if (object::can_merge (op, tmp))
1277 { 1317 {
1318 // TODO: we atcually want to update tmp, not op,
1319 // but some caller surely breaks when we return tmp
1320 // from here :/
1278 op->nrof += tmp->nrof; 1321 op->nrof += tmp->nrof;
1279 tmp->destroy (); 1322 tmp->destroy (1);
1280 } 1323 }
1281 1324
1282 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1325 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1283 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1326 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1284 1327
1304 /* since *below* originator, no need to update top */ 1347 /* since *below* originator, no need to update top */
1305 originator->below = op; 1348 originator->below = op;
1306 } 1349 }
1307 else 1350 else
1308 { 1351 {
1352 object *top, *floor = NULL;
1353
1309 top = ms.bot; 1354 top = ms.bot;
1310 1355
1311 /* If there are other objects, then */ 1356 /* If there are other objects, then */
1312 if ((!(flag & INS_MAP_LOAD)) && top) 1357 if (top)
1313 { 1358 {
1314 object *last = 0; 1359 object *last = 0;
1315 1360
1316 /* 1361 /*
1317 * If there are multiple objects on this space, we do some trickier handling. 1362 * If there are multiple objects on this space, we do some trickier handling.
1369 */ 1414 */
1370 if (last && last->below && last != floor) 1415 if (last && last->below && last != floor)
1371 top = last->below; 1416 top = last->below;
1372 } 1417 }
1373 } /* If objects on this space */ 1418 } /* If objects on this space */
1374 if (flag & INS_MAP_LOAD)
1375 top = ms.top;
1376 1419
1377 if (flag & INS_ABOVE_FLOOR_ONLY) 1420 if (flag & INS_ABOVE_FLOOR_ONLY)
1378 top = floor; 1421 top = floor;
1379 1422
1380 /* Top is the object that our object (op) is going to get inserted above. 1423 /* Top is the object that our object (op) is going to get inserted above.
1413 op->map->touch (); 1456 op->map->touch ();
1414 } 1457 }
1415 1458
1416 op->map->dirty = true; 1459 op->map->dirty = true;
1417 1460
1418 if (!(flag & INS_MAP_LOAD))
1419 if (object *pl = ms.player ()) 1461 if (object *pl = ms.player ())
1420 pl->contr->ns->floorbox_update (); 1462 //TODO: the floorbox prev/next might need updating
1463 esrv_send_item (pl, op);
1421 1464
1422 /* If this object glows, it may affect lighting conditions that are 1465 /* If this object glows, it may affect lighting conditions that are
1423 * visible to others on this map. But update_all_los is really 1466 * visible to others on this map. But update_all_los is really
1424 * an inefficient way to do this, as it means los for all players 1467 * an inefficient way to do this, as it means los for all players
1425 * on the map will get recalculated. The players could very well 1468 * on the map will get recalculated. The players could very well
1467 * op is the object to insert it under: supplies x and the map. 1510 * op is the object to insert it under: supplies x and the map.
1468 */ 1511 */
1469void 1512void
1470replace_insert_ob_in_map (const char *arch_string, object *op) 1513replace_insert_ob_in_map (const char *arch_string, object *op)
1471{ 1514{
1472 object *tmp, *tmp1;
1473
1474 /* first search for itself and remove any old instances */ 1515 /* first search for itself and remove any old instances */
1475 1516
1476 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1517 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1477 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1518 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1478 tmp->destroy (); 1519 tmp->destroy (1);
1479 1520
1480 tmp1 = arch_to_object (archetype::find (arch_string)); 1521 object *tmp = arch_to_object (archetype::find (arch_string));
1481 1522
1482 tmp1->x = op->x; 1523 tmp->x = op->x;
1483 tmp1->y = op->y; 1524 tmp->y = op->y;
1525
1484 insert_ob_in_map (tmp1, op->map, op, 0); 1526 insert_ob_in_map (tmp, op->map, op, 0);
1485} 1527}
1486 1528
1487object * 1529object *
1488object::insert_at (object *where, object *originator, int flags) 1530object::insert_at (object *where, object *originator, int flags)
1489{ 1531{
1532 if (where->env)
1533 return where->env->insert (this);
1534 else
1490 return where->map->insert (this, where->x, where->y, originator, flags); 1535 return where->map->insert (this, where->x, where->y, originator, flags);
1491} 1536}
1492 1537
1493/* 1538/*
1494 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1495 * is returned contains nr objects, and the remaining parts contains
1496 * the rest (or is removed and freed if that number is 0).
1497 * On failure, NULL is returned, and the reason put into the
1498 * global static errmsg array.
1499 */
1500object *
1501get_split_ob (object *orig_ob, uint32 nr)
1502{
1503 object *newob;
1504 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1505
1506 if (orig_ob->nrof < nr)
1507 {
1508 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1509 return NULL;
1510 }
1511
1512 newob = object_create_clone (orig_ob);
1513
1514 if ((orig_ob->nrof -= nr) < 1)
1515 orig_ob->destroy (1);
1516 else if (!is_removed)
1517 {
1518 if (orig_ob->env != NULL)
1519 sub_weight (orig_ob->env, orig_ob->weight * nr);
1520 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1521 {
1522 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1523 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1524 return NULL;
1525 }
1526 }
1527
1528 newob->nrof = nr;
1529
1530 return newob;
1531}
1532
1533/*
1534 * decrease_ob_nr(object, number) decreases a specified number from 1539 * decrease(object, number) decreases a specified number from
1535 * the amount of an object. If the amount reaches 0, the object 1540 * the amount of an object. If the amount reaches 0, the object
1536 * is subsequently removed and freed. 1541 * is subsequently removed and freed.
1537 * 1542 *
1538 * Return value: 'op' if something is left, NULL if the amount reached 0 1543 * Return value: 'op' if something is left, NULL if the amount reached 0
1539 */ 1544 */
1545bool
1546object::decrease (sint32 nr)
1547{
1548 if (!nr)
1549 return true;
1550
1551 nr = min (nr, nrof);
1552
1553 nrof -= nr;
1554
1555 if (nrof)
1556 {
1557 adjust_weight (env, -weight * nr); // carrying == 0
1558
1559 if (object *pl = visible_to ())
1560 esrv_update_item (UPD_NROF, pl, this);
1561
1562 return true;
1563 }
1564 else
1565 {
1566 destroy (1);
1567 return false;
1568 }
1569}
1570
1571/*
1572 * split(ob,nr) splits up ob into two parts. The part which
1573 * is returned contains nr objects, and the remaining parts contains
1574 * the rest (or is removed and returned if that number is 0).
1575 * On failure, NULL is returned.
1576 */
1540object * 1577object *
1541decrease_ob_nr (object *op, uint32 i) 1578object::split (sint32 nr)
1542{ 1579{
1543 object *tmp; 1580 int have = number_of ();
1544 1581
1545 if (i == 0) /* objects with op->nrof require this check */ 1582 if (have < nr)
1546 return op; 1583 return 0;
1547 1584 else if (have == nr)
1548 if (i > op->nrof)
1549 i = op->nrof;
1550
1551 if (QUERY_FLAG (op, FLAG_REMOVED))
1552 op->nrof -= i;
1553 else if (op->env)
1554 { 1585 {
1555 /* is this object in the players inventory, or sub container
1556 * therein?
1557 */
1558 tmp = op->in_player ();
1559 /* nope. Is this a container the player has opened?
1560 * If so, set tmp to that player.
1561 * IMO, searching through all the players will mostly
1562 * likely be quicker than following op->env to the map,
1563 * and then searching the map for a player.
1564 */
1565 if (!tmp)
1566 for_all_players (pl)
1567 if (pl->ob->container == op->env)
1568 {
1569 tmp = pl->ob;
1570 break;
1571 }
1572
1573 if (i < op->nrof)
1574 {
1575 sub_weight (op->env, op->weight * i);
1576 op->nrof -= i;
1577 if (tmp)
1578 esrv_send_item (tmp, op);
1579 }
1580 else
1581 {
1582 op->remove (); 1586 remove ();
1583 op->nrof = 0; 1587 return this;
1584 if (tmp)
1585 esrv_del_item (tmp->contr, op->count);
1586 }
1587 } 1588 }
1588 else 1589 else
1589 { 1590 {
1590 object *above = op->above; 1591 decrease (nr);
1591 1592
1592 if (i < op->nrof) 1593 object *op = object_create_clone (this);
1593 op->nrof -= i; 1594 op->nrof = nr;
1594 else
1595 {
1596 op->remove ();
1597 op->nrof = 0;
1598 }
1599
1600 /* Since we just removed op, op->above is null */
1601 for (tmp = above; tmp; tmp = tmp->above)
1602 if (tmp->type == PLAYER)
1603 {
1604 if (op->nrof)
1605 esrv_send_item (tmp, op);
1606 else
1607 esrv_del_item (tmp->contr, op->count);
1608 }
1609 }
1610
1611 if (op->nrof)
1612 return op; 1595 return op;
1613 else
1614 {
1615 op->destroy ();
1616 return 0;
1617 }
1618}
1619
1620/*
1621 * add_weight(object, weight) adds the specified weight to an object,
1622 * and also updates how much the environment(s) is/are carrying.
1623 */
1624void
1625add_weight (object *op, signed long weight)
1626{
1627 while (op != NULL)
1628 {
1629 if (op->type == CONTAINER)
1630 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1631
1632 op->carrying += weight;
1633 op = op->env;
1634 } 1596 }
1635} 1597}
1636 1598
1637object * 1599object *
1638insert_ob_in_ob (object *op, object *where) 1600insert_ob_in_ob (object *op, object *where)
1663 * be != op, if items are merged. -Tero 1625 * be != op, if items are merged. -Tero
1664 */ 1626 */
1665object * 1627object *
1666object::insert (object *op) 1628object::insert (object *op)
1667{ 1629{
1668 object *tmp, *otmp;
1669
1670 if (!QUERY_FLAG (op, FLAG_REMOVED))
1671 op->remove ();
1672
1673 if (op->more) 1630 if (op->more)
1674 { 1631 {
1675 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1632 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1676 return op; 1633 return op;
1677 } 1634 }
1678 1635
1679 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1636 op->remove ();
1680 CLEAR_FLAG (op, FLAG_REMOVED); 1637
1638 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1639
1681 if (op->nrof) 1640 if (op->nrof)
1682 {
1683 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1641 for (object *tmp = inv; tmp; tmp = tmp->below)
1684 if (object::can_merge (tmp, op)) 1642 if (object::can_merge (tmp, op))
1685 { 1643 {
1686 /* return the original object and remove inserted object 1644 /* return the original object and remove inserted object
1687 (client needs the original object) */ 1645 (client needs the original object) */
1688 tmp->nrof += op->nrof; 1646 tmp->nrof += op->nrof;
1689 /* Weight handling gets pretty funky. Since we are adding to 1647
1690 * tmp->nrof, we need to increase the weight. 1648 if (object *pl = tmp->visible_to ())
1691 */ 1649 esrv_update_item (UPD_NROF, pl, tmp);
1650
1692 add_weight (this, op->weight * op->nrof); 1651 adjust_weight (this, op->total_weight ());
1693 SET_FLAG (op, FLAG_REMOVED); 1652
1694 op->destroy (); /* free the inserted object */ 1653 op->destroy (1);
1695 op = tmp; 1654 op = tmp;
1696 op->remove (); /* and fix old object's links */ 1655 goto inserted;
1697 CLEAR_FLAG (op, FLAG_REMOVED);
1698 break;
1699 } 1656 }
1700 1657
1701 /* I assume combined objects have no inventory 1658 op->owner = 0; // it's his/hers now. period.
1702 * We add the weight - this object could have just been removed
1703 * (if it was possible to merge). calling remove_ob will subtract
1704 * the weight, so we need to add it in again, since we actually do
1705 * the linking below
1706 */
1707 add_weight (this, op->weight * op->nrof);
1708 }
1709 else
1710 add_weight (this, (op->weight + op->carrying));
1711
1712 otmp = this->in_player ();
1713 if (otmp && otmp->contr)
1714 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1715 otmp->update_stats ();
1716
1717 op->map = 0; 1659 op->map = 0;
1718 op->env = this; 1660 op->x = 0;
1661 op->y = 0;
1662
1719 op->above = 0; 1663 op->above = 0;
1720 op->below = 0; 1664 op->below = inv;
1721 op->x = 0, op->y = 0; 1665 op->env = this;
1722 1666
1667 if (inv)
1668 inv->above = op;
1669
1670 inv = op;
1671
1672 op->flag [FLAG_REMOVED] = 0;
1673
1674 if (object *pl = op->visible_to ())
1675 esrv_send_item (pl, op);
1676
1677 adjust_weight (this, op->total_weight ());
1678
1679inserted:
1723 /* reset the light list and los of the players on the map */ 1680 /* reset the light list and los of the players on the map */
1724 if ((op->glow_radius != 0) && map) 1681 if (op->glow_radius && map && map->darkness)
1725 {
1726#ifdef DEBUG_LIGHTS
1727 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1728#endif /* DEBUG_LIGHTS */
1729 if (map->darkness)
1730 update_all_los (map, x, y); 1682 update_all_los (map, x, y);
1731 }
1732 1683
1733 /* Client has no idea of ordering so lets not bother ordering it here. 1684 // if this is a player's inventory, update stats
1734 * It sure simplifies this function... 1685 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1735 */ 1686 update_stats ();
1736 if (!inv)
1737 inv = op;
1738 else
1739 {
1740 op->below = inv;
1741 op->below->above = op;
1742 inv = op;
1743 }
1744 1687
1745 INVOKE_OBJECT (INSERT, this); 1688 INVOKE_OBJECT (INSERT, this);
1746 1689
1747 return op; 1690 return op;
1748} 1691}
1963 * activate recursively a flag on an object inventory 1906 * activate recursively a flag on an object inventory
1964 */ 1907 */
1965void 1908void
1966flag_inv (object *op, int flag) 1909flag_inv (object *op, int flag)
1967{ 1910{
1968 if (op->inv)
1969 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1911 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1970 { 1912 {
1971 SET_FLAG (tmp, flag); 1913 SET_FLAG (tmp, flag);
1972 flag_inv (tmp, flag); 1914 flag_inv (tmp, flag);
1973 } 1915 }
1974} 1916}
1975 1917
1976/* 1918/*
1977 * deactivate recursively a flag on an object inventory 1919 * deactivate recursively a flag on an object inventory
1978 */ 1920 */
1979void 1921void
1980unflag_inv (object *op, int flag) 1922unflag_inv (object *op, int flag)
1981{ 1923{
1982 if (op->inv)
1983 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1924 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1984 { 1925 {
1985 CLEAR_FLAG (tmp, flag); 1926 CLEAR_FLAG (tmp, flag);
1986 unflag_inv (tmp, flag); 1927 unflag_inv (tmp, flag);
1987 } 1928 }
1988} 1929}
1989 1930
1990/* 1931/*
1991 * find_free_spot(object, map, x, y, start, stop) will search for 1932 * find_free_spot(object, map, x, y, start, stop) will search for
1992 * a spot at the given map and coordinates which will be able to contain 1933 * a spot at the given map and coordinates which will be able to contain
1994 * to search (see the freearr_x/y[] definition). 1935 * to search (see the freearr_x/y[] definition).
1995 * It returns a random choice among the alternatives found. 1936 * It returns a random choice among the alternatives found.
1996 * start and stop are where to start relative to the free_arr array (1,9 1937 * start and stop are where to start relative to the free_arr array (1,9
1997 * does all 4 immediate directions). This returns the index into the 1938 * does all 4 immediate directions). This returns the index into the
1998 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1939 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1999 * Note - this only checks to see if there is space for the head of the
2000 * object - if it is a multispace object, this should be called for all
2001 * pieces.
2002 * Note2: This function does correctly handle tiled maps, but does not 1940 * Note: This function does correctly handle tiled maps, but does not
2003 * inform the caller. However, insert_ob_in_map will update as 1941 * inform the caller. However, insert_ob_in_map will update as
2004 * necessary, so the caller shouldn't need to do any special work. 1942 * necessary, so the caller shouldn't need to do any special work.
2005 * Note - updated to take an object instead of archetype - this is necessary 1943 * Note - updated to take an object instead of archetype - this is necessary
2006 * because arch_blocked (now ob_blocked) needs to know the movement type 1944 * because arch_blocked (now ob_blocked) needs to know the movement type
2007 * to know if the space in question will block the object. We can't use 1945 * to know if the space in question will block the object. We can't use
2009 * customized, changed states, etc. 1947 * customized, changed states, etc.
2010 */ 1948 */
2011int 1949int
2012find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1950find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2013{ 1951{
1952 int altern[SIZEOFFREE];
2014 int index = 0, flag; 1953 int index = 0, flag;
2015 int altern[SIZEOFFREE];
2016 1954
2017 for (int i = start; i < stop; i++) 1955 for (int i = start; i < stop; i++)
2018 { 1956 {
2019 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1957 mapxy pos (m, x, y); pos.move (i);
2020 if (!flag) 1958
1959 if (!pos.normalise ())
1960 continue;
1961
1962 mapspace &ms = *pos;
1963
1964 if (ms.flags () & P_IS_ALIVE)
1965 continue;
1966
1967 /* However, often
1968 * ob doesn't have any move type (when used to place exits)
1969 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1970 */
1971 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1972 {
2021 altern [index++] = i; 1973 altern [index++] = i;
1974 continue;
1975 }
2022 1976
2023 /* Basically, if we find a wall on a space, we cut down the search size. 1977 /* Basically, if we find a wall on a space, we cut down the search size.
2024 * In this way, we won't return spaces that are on another side of a wall. 1978 * In this way, we won't return spaces that are on another side of a wall.
2025 * This mostly work, but it cuts down the search size in all directions - 1979 * This mostly work, but it cuts down the search size in all directions -
2026 * if the space being examined only has a wall to the north and empty 1980 * if the space being examined only has a wall to the north and empty
2027 * spaces in all the other directions, this will reduce the search space 1981 * spaces in all the other directions, this will reduce the search space
2028 * to only the spaces immediately surrounding the target area, and 1982 * to only the spaces immediately surrounding the target area, and
2029 * won't look 2 spaces south of the target space. 1983 * won't look 2 spaces south of the target space.
2030 */ 1984 */
2031 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1985 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1986 {
2032 stop = maxfree[i]; 1987 stop = maxfree[i];
1988 continue;
1989 }
1990
1991 /* Note it is intentional that we check ob - the movement type of the
1992 * head of the object should correspond for the entire object.
1993 */
1994 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1995 continue;
1996
1997 if (ob->blocked (m, pos.x, pos.y))
1998 continue;
1999
2000 altern [index++] = i;
2033 } 2001 }
2034 2002
2035 if (!index) 2003 if (!index)
2036 return -1; 2004 return -1;
2037 2005
2046 */ 2014 */
2047int 2015int
2048find_first_free_spot (const object *ob, maptile *m, int x, int y) 2016find_first_free_spot (const object *ob, maptile *m, int x, int y)
2049{ 2017{
2050 for (int i = 0; i < SIZEOFFREE; i++) 2018 for (int i = 0; i < SIZEOFFREE; i++)
2051 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2019 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2052 return i; 2020 return i;
2053 2021
2054 return -1; 2022 return -1;
2055} 2023}
2056 2024
2593{ 2561{
2594 char flagdesc[512]; 2562 char flagdesc[512];
2595 char info2[256 * 4]; 2563 char info2[256 * 4];
2596 char *p = info; 2564 char *p = info;
2597 2565
2598 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2566 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2599 count, uuid.seq, 2567 count,
2568 uuid.c_str (),
2600 &name, 2569 &name,
2601 title ? "\",title:\"" : "", 2570 title ? "\",title:\"" : "",
2602 title ? (const char *)title : "", 2571 title ? (const char *)title : "",
2603 flag_desc (flagdesc, 512), type); 2572 flag_desc (flagdesc, 512), type);
2604 2573
2605 if (!this->flag[FLAG_REMOVED] && env) 2574 if (!flag[FLAG_REMOVED] && env)
2606 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2575 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2607 2576
2608 if (map) 2577 if (map)
2609 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2578 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2610 2579
2652 if (object *closer = old_container->inv) 2621 if (object *closer = old_container->inv)
2653 if (closer->type == CLOSE_CON) 2622 if (closer->type == CLOSE_CON)
2654 closer->destroy (); 2623 closer->destroy ();
2655#endif 2624#endif
2656 2625
2657 old_container->flag [FLAG_APPLIED] = 0; 2626 old_container->flag [FLAG_APPLIED] = false;
2658 container = 0; 2627 container = 0;
2659 2628
2660 esrv_update_item (UPD_FLAGS, this, old_container); 2629 esrv_update_item (UPD_FLAGS, this, old_container);
2661 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2630 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2662 play_sound (sound_find ("chest_close")); 2631 play_sound (sound_find ("chest_close"));
2678 } 2647 }
2679#endif 2648#endif
2680 2649
2681 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2650 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2682 2651
2683 new_container->flag [FLAG_APPLIED] = 1; 2652 new_container->flag [FLAG_APPLIED] = true;
2684 container = new_container; 2653 container = new_container;
2685 2654
2686 esrv_update_item (UPD_FLAGS, this, new_container); 2655 esrv_update_item (UPD_FLAGS, this, new_container);
2687 esrv_send_inventory (this, new_container); 2656 esrv_send_inventory (this, new_container);
2688 play_sound (sound_find ("chest_open")); 2657 play_sound (sound_find ("chest_open"));
2720 2689
2721 insert (force); 2690 insert (force);
2722} 2691}
2723 2692
2724void 2693void
2725object::play_sound (faceidx sound) const 2694object::play_sound (faceidx sound)
2726{ 2695{
2727 if (!sound) 2696 if (!sound)
2728 return; 2697 return;
2729 2698
2730 if (flag [FLAG_REMOVED]) 2699 if (flag [FLAG_REMOVED])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines