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.201 by root, Tue Jan 22 16:22:45 2008 UTC vs.
Revision 1.208 by root, Mon Apr 21 06:16:01 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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
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 <support@deliantra.net> 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>
33#include <sproto.h> 30#include <sproto.h>
34#include <loader.h> 31#include <loader.h>
35 32
36#include <bitset> 33#include <bitset>
37 34
38int nrofallocobjects = 0; 35UUID UUID::cur;
39static UUID uuid; 36static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
41 38
42objectvec objects; 39objectvec objects;
43activevec actives; 40activevec actives;
44 41
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, 42short freearr_x[SIZEOFFREE] = {
43 0,
44 0, 1, 1, 1, 0, -1, -1, -1,
45 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 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
47}; 47};
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, 48short freearr_y[SIZEOFFREE] = {
49 0,
50 -1, -1, 0, 1, 1, 1, 0, -1,
51 -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 52 -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}; 53};
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, 54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 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 58 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}; 59};
54int freedir[SIZEOFFREE] = { 60int 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, 61 0,
62 1, 2, 3, 4, 5, 6, 7, 8,
63 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 64 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}; 65};
58 66
59static void 67static void
60write_uuid (void) 68write_uuid (uval64 skip, bool sync)
61{ 69{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 70 CALL_BEGIN (2);
63 71 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 72 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 73 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 74 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} 75}
79 76
80static void 77static void
81read_uuid (void) 78read_uuid (void)
82{ 79{
83 char filename[MAX_BUF]; 80 char filename[MAX_BUF];
84 81
85 sprintf (filename, "%s/uuid", settings.localdir); 82 sprintf (filename, "%s/uuid", settings.localdir);
83
84 seq_next_save = 0;
86 85
87 FILE *fp; 86 FILE *fp;
88 87
89 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
90 { 89 {
91 if (errno == ENOENT) 90 if (errno == ENOENT)
92 { 91 {
93 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 93 UUID::cur.seq = 0;
95 write_uuid (); 94 write_uuid (UUID_GAP, true);
96 return; 95 return;
97 } 96 }
98 97
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 99 _exit (1);
101 } 100 }
102 101
103 int version; 102 UUID::BUF buf;
104 unsigned long long uid; 103 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 104 fgets (buf, sizeof (buf), fp);
105
106 if (!UUID::cur.parse (buf))
106 { 107 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 108 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 109 _exit (1);
109 } 110 }
110 111
111 uuid.seq = uid; 112 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 113
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 114 write_uuid (UUID_GAP, true);
114 fclose (fp); 115 fclose (fp);
115} 116}
116 117
117UUID 118UUID
118gen_uuid () 119UUID::gen ()
119{ 120{
120 UUID uid; 121 UUID uid;
121 122
122 uid.seq = ++uuid.seq; 123 uid.seq = ++cur.seq;
123 124
124 if (!(uuid.seq & (UUID_SKIP - 1))) 125 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 126 {
127 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
128 write_uuid (UUID_GAP, false);
129 }
130
126 131
127 return uid; 132 return uid;
128} 133}
129 134
130void 135void
131init_uuid () 136UUID::init ()
132{ 137{
133 read_uuid (); 138 read_uuid ();
134} 139}
135 140
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 141/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137static int 142static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 143compare_ob_value_lists_one (const object *wants, const object *has)
139{ 144{
140 key_value *wants_field; 145 key_value *wants_field;
141 146
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 147 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
150 key_value *has_field; 155 key_value *has_field;
151 156
152 /* Look for a field in has with the same key. */ 157 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 158 has_field = get_ob_key_link (has, wants_field->key);
154 159
155 if (has_field == NULL) 160 if (!has_field)
156 {
157 /* No field with that name. */ 161 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 162
161 /* Found the matching field. */ 163 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 164 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */ 165 return 0; /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167 166
168 /* If we get here, we found a match. Now for the next field in wants. */ 167 /* If we get here, we found a match. Now for the next field in wants. */
169 } 168 }
170 169
171 /* If we get here, every field in wants has a matching field in has. */ 170 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 171 return 1;
173} 172}
174 173
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 174/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 175static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 176compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 177{
179 /* However, there may be fields in has which aren't partnered in wants, 178 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 179 * so we need to run the comparison *twice*. :(
181 */ 180 */
202 || ob1->speed != ob2->speed 201 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 202 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 203 || ob1->name != ob2->name)
205 return 0; 204 return 0;
206 205
207 //TODO: this ain't working well, use nicer and correct overflow check 206 /* 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 207 * for unsigned overflow (2c), second part checks whether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 209 * nrof values.
211 */ 210 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 212 return 0;
214 213
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 214 /* 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 215 * 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 216 * 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 217 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 218 * flags lose any meaning.
220 */ 219 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 220 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 222
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 225
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if (ob1->arch->name != ob2->arch->name
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 227 || ob1->name != ob2->name
230 || ob1->title != ob2->title 228 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 229 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 230 || 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 231 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 232 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 233 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 234 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 235 || ob1->value != ob2->value
246 || ob1->move_block != ob2->move_block 242 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 243 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 244 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 245 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 246 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 247 || ob1->move_slow_penalty != ob2->move_slow_penalty
248 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
249 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 250 return 0;
253 251
252 if ((ob1->flag ^ ob2->flag)
253 .reset (FLAG_INV_LOCKED)
254 .reset (FLAG_CLIENT_SENT)
255 .reset (FLAG_REMOVED)
256 .any ())
257 return 0;
258
254 /* This is really a spellbook check - really, we should 259 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 260 * not merge objects with real inventories, as splitting them
261 * is hard.
256 */ 262 */
257 if (ob1->inv || ob2->inv) 263 if (ob1->inv || ob2->inv)
258 { 264 {
259 if (!(ob1->inv && ob2->inv)) 265 if (!(ob1->inv && ob2->inv))
260 return 0; /* inventories differ in length */ 266 return 0; /* inventories differ in length */
261 267
262 if (ob1->inv->below || ob2->inv->below) 268 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */ 269 return 0; /* more than one object in inv */
264 270
265 if (!object::can_merge (ob1->inv, ob2->inv)) 271 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; /* inventory objexts differ */ 272 return 0; /* inventory objects differ */
267 273
268 /* inventory ok - still need to check rest of this object to see 274 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 275 * if it is valid.
270 */ 276 */
271 } 277 }
290 if (ob1->level != ob2->level) 296 if (ob1->level != ob2->level)
291 return 0; 297 return 0;
292 break; 298 break;
293 } 299 }
294 300
295 if (ob1->key_values != NULL || ob2->key_values != NULL) 301 if (ob1->key_values || ob2->key_values)
296 { 302 {
297 /* At least one of these has key_values. */ 303 /* At least one of these has key_values. */
298 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 304 if ((!ob1->key_values) != (!ob2->key_values))
299 /* One has fields, but the other one doesn't. */ 305 return 0; /* One has fields, but the other one doesn't. */
300 return 0; 306
301 else if (!compare_ob_value_lists (ob1, ob2)) 307 if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 308 return 0;
303 } 309 }
304 310
305 if (ob1->self || ob2->self) 311 if (ob1->self || ob2->self)
306 { 312 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0; 318 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0; 319 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314 320
315 if (k1 != k2) 321 if (k1 != k2)
316 return 0; 322 return 0;
323
317 else if (k1 == 0) 324 if (k1 == 0)
318 return 1; 325 return 1;
326
319 else if (!cfperl_can_merge (ob1, ob2)) 327 if (!cfperl_can_merge (ob1, ob2))
320 return 0; 328 return 0;
321 } 329 }
322 } 330 }
323 331
324 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
325 return 1; 333 return 1;
326} 334}
327 335
336// adjust weight per container type ("of holding")
337static sint32
338weight_adjust (object *op, sint32 weight)
339{
340 return op->type == CONTAINER
341 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342 : weight;
343}
344
328/* 345/*
346 * adjust_weight(object, weight) adds the specified weight to an object,
347 * and also updates how much the environment(s) is/are carrying.
348 */
349static void
350adjust_weight (object *op, sint32 weight)
351{
352 while (op)
353 {
354 weight = weight_adjust (op, weight);
355
356 op->carrying += weight;
357 op = op->env;
358 }
359}
360
361/*
329 * sum_weight() is a recursive function which calculates the weight 362 * this is a recursive function which calculates the weight
330 * an object is carrying. It goes through in figures out how much 363 * an object is carrying. It goes through op and figures out how much
331 * containers are carrying, and sums it up. 364 * containers are carrying, and sums it up.
332 */ 365 */
333long 366void
334sum_weight (object *op) 367object::update_weight ()
335{ 368{
336 long sum; 369 sint32 sum = 0;
337 object *inv;
338 370
339 for (sum = 0, inv = op->inv; inv; inv = inv->below) 371 for (object *op = inv; op; op = op->below)
340 { 372 {
341 if (inv->inv) 373 if (op->inv)
342 sum_weight (inv); 374 op->update_weight ();
343 375
344 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 376 sum += op->total_weight ();
345 } 377 }
346 378
347 if (op->type == CONTAINER && op->stats.Str) 379 carrying = weight_adjust (this, sum);
348 sum = (sum * (100 - op->stats.Str)) / 100;
349
350 if (op->carrying != sum)
351 op->carrying = sum;
352
353 return sum;
354} 380}
355 381
356/** 382/*
357 * Return the outermost environment object for a given object. 383 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
358 */
359
360object *
361object_get_env_recursive (object *op)
362{
363 while (op->env != NULL)
364 op = op->env;
365 return op;
366}
367
368/*
369 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
370 * Some error messages.
371 * The result of the dump is stored in the static global errmsg array.
372 */ 384 */
373char * 385char *
374dump_object (object *op) 386dump_object (object *op)
375{ 387{
376 if (!op) 388 if (!op)
390get_nearest_part (object *op, const object *pl) 402get_nearest_part (object *op, const object *pl)
391{ 403{
392 object *tmp, *closest; 404 object *tmp, *closest;
393 int last_dist, i; 405 int last_dist, i;
394 406
395 if (op->more == NULL) 407 if (!op->more)
396 return op; 408 return op;
409
397 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 410 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
411 tmp;
412 tmp = tmp->more)
398 if ((i = distance (tmp, pl)) < last_dist) 413 if ((i = distance (tmp, pl)) < last_dist)
399 closest = tmp, last_dist = i; 414 closest = tmp, last_dist = i;
415
400 return closest; 416 return closest;
401} 417}
402 418
403/* 419/*
404 * Returns the object which has the count-variable equal to the argument. 420 * Returns the object which has the count-variable equal to the argument.
421 * VERRRY slow.
405 */ 422 */
406object * 423object *
407find_object (tag_t i) 424find_object (tag_t i)
408{ 425{
409 for_all_objects (op) 426 for_all_objects (op)
427 for_all_objects (op) 444 for_all_objects (op)
428 if (op->name == str_) 445 if (op->name == str_)
429 break; 446 break;
430 447
431 return op; 448 return op;
432}
433
434void
435free_all_object_data ()
436{
437 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438} 449}
439 450
440/* 451/*
441 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
442 * skill and experience objects. 453 * skill and experience objects.
603 614
604void 615void
605object::instantiate () 616object::instantiate ()
606{ 617{
607 if (!uuid.seq) // HACK 618 if (!uuid.seq) // HACK
608 uuid = gen_uuid (); 619 uuid = UUID::gen ();
609 620
610 speed_left = -0.1f; 621 speed_left = -0.1f;
611 /* copy the body_info to the body_used - this is only really 622 /* copy the body_info to the body_used - this is only really
612 * need for monsters, but doesn't hurt to do it for everything. 623 * need for monsters, but doesn't hurt to do it for everything.
613 * by doing so, when a monster is created, it has good starting 624 * by doing so, when a monster is created, it has good starting
772static int object_count; 783static int object_count;
773 784
774void object::link () 785void object::link ()
775{ 786{
776 assert (!index);//D 787 assert (!index);//D
777 uuid = gen_uuid (); 788 uuid = UUID::gen ();
778 count = ++object_count; 789 count = ++object_count;
779 790
780 refcnt_inc (); 791 refcnt_inc ();
781 objects.insert (this); 792 objects.insert (this);
782} 793}
866 * if some form of movement is allowed, let objects 877 * if some form of movement is allowed, let objects
867 * drop on that space. 878 * drop on that space.
868 */ 879 */
869 if (!drop_to_ground 880 if (!drop_to_ground
870 || !map 881 || !map
871 || map->in_memory != MAP_IN_MEMORY 882 || map->in_memory != MAP_ACTIVE
872 || map->nodrop 883 || map->nodrop
873 || ms ().move_block == MOVE_ALL) 884 || ms ().move_block == MOVE_ALL)
874 { 885 {
875 while (inv) 886 while (inv)
876 { 887 {
938 freed_map->width = 3; 949 freed_map->width = 3;
939 freed_map->height = 3; 950 freed_map->height = 3;
940 freed_map->nodrop = 1; 951 freed_map->nodrop = 1;
941 952
942 freed_map->alloc (); 953 freed_map->alloc ();
943 freed_map->in_memory = MAP_IN_MEMORY; 954 freed_map->in_memory = MAP_ACTIVE;
944 } 955 }
945 956
946 map = freed_map; 957 map = freed_map;
947 x = 1; 958 x = 1;
948 y = 1; 959 y = 1;
977 play_sound (sound_destroy); 988 play_sound (sound_destroy);
978 else if (flag [FLAG_MONSTER]) 989 else if (flag [FLAG_MONSTER])
979 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 990 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
980 991
981 attachable::destroy (); 992 attachable::destroy ();
982}
983
984/*
985 * sub_weight() recursively (outwards) subtracts a number from the
986 * weight of an object (and what is carried by it's environment(s)).
987 */
988void
989sub_weight (object *op, signed long weight)
990{
991 while (op != NULL)
992 {
993 if (op->type == CONTAINER)
994 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
995
996 op->carrying -= weight;
997 op = op->env;
998 }
999} 993}
1000 994
1001/* op->remove (): 995/* op->remove ():
1002 * This function removes the object op from the linked list of objects 996 * This function removes the object op from the linked list of objects
1003 * which it is currently tied to. When this function is done, the 997 * which it is currently tied to. When this function is done, the
1024 * In this case, the object to be removed is in someones 1018 * In this case, the object to be removed is in someones
1025 * inventory. 1019 * inventory.
1026 */ 1020 */
1027 if (env) 1021 if (env)
1028 { 1022 {
1023 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
1029 if (nrof) 1027 if (below)
1030 sub_weight (env, weight * nrof); 1028 below->above = above;
1031 else 1029
1032 sub_weight (env, weight + carrying); 1030 /* we set up values so that it could be inserted into
1031 * the map, but we don't actually do that - it is up
1032 * to the caller to decide what we want to do.
1033 */
1034 map = env->map;
1035 x = env->x;
1036 y = env->y;
1037 above = 0;
1038 below = 0;
1039 env = 0;
1033 1040
1034 /* NO_FIX_PLAYER is set when a great many changes are being 1041 /* NO_FIX_PLAYER is set when a great many changes are being
1035 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
1036 * to save cpu time. 1043 * to save cpu time.
1037 */ 1044 */
1038 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1039 otmp->update_stats (); 1046 otmp->update_stats ();
1040
1041 if (above)
1042 above->below = below;
1043 else
1044 env->inv = below;
1045
1046 if (below)
1047 below->above = above;
1048
1049 /* we set up values so that it could be inserted into
1050 * the map, but we don't actually do that - it is up
1051 * to the caller to decide what we want to do.
1052 */
1053 x = env->x, y = env->y;
1054 map = env->map;
1055 above = 0, below = 0;
1056 env = 0;
1057 } 1047 }
1058 else if (map) 1048 else if (map)
1059 { 1049 {
1060 if (type == PLAYER) 1050 if (type == PLAYER)
1061 { 1051 {
1274 if (op->nrof && !(flag & INS_NO_MERGE)) 1264 if (op->nrof && !(flag & INS_NO_MERGE))
1275 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1276 if (object::can_merge (op, tmp)) 1266 if (object::can_merge (op, tmp))
1277 { 1267 {
1278 op->nrof += tmp->nrof; 1268 op->nrof += tmp->nrof;
1279 tmp->destroy (); 1269 tmp->destroy (1);
1280 } 1270 }
1281 1271
1282 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1272 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1283 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1273 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1284 1274
1464 * op is the object to insert it under: supplies x and the map. 1454 * op is the object to insert it under: supplies x and the map.
1465 */ 1455 */
1466void 1456void
1467replace_insert_ob_in_map (const char *arch_string, object *op) 1457replace_insert_ob_in_map (const char *arch_string, object *op)
1468{ 1458{
1469 object *tmp, *tmp1;
1470
1471 /* first search for itself and remove any old instances */ 1459 /* first search for itself and remove any old instances */
1472 1460
1473 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1461 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1474 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1462 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1475 tmp->destroy (); 1463 tmp->destroy (1);
1476 1464
1477 tmp1 = arch_to_object (archetype::find (arch_string)); 1465 object *tmp = arch_to_object (archetype::find (arch_string));
1478 1466
1479 tmp1->x = op->x; 1467 tmp->x = op->x;
1480 tmp1->y = op->y; 1468 tmp->y = op->y;
1469
1481 insert_ob_in_map (tmp1, op->map, op, 0); 1470 insert_ob_in_map (tmp, op->map, op, 0);
1482} 1471}
1483 1472
1484object * 1473object *
1485object::insert_at (object *where, object *originator, int flags) 1474object::insert_at (object *where, object *originator, int flags)
1486{ 1475{
1476 if (where->env)
1477 return where->env->insert (this);
1478 else
1487 return where->map->insert (this, where->x, where->y, originator, flags); 1479 return where->map->insert (this, where->x, where->y, originator, flags);
1488} 1480}
1489 1481
1490/* 1482/*
1491 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1483 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1492 * is returned contains nr objects, and the remaining parts contains 1484 * is returned contains nr objects, and the remaining parts contains
1493 * the rest (or is removed and freed if that number is 0). 1485 * the rest (or is removed and freed if that number is 0).
1494 * On failure, NULL is returned, and the reason put into the 1486 * On failure, NULL is returned, and the reason put into the
1495 * global static errmsg array. 1487 * global static errmsg array.
1496 */ 1488 */
1497object * 1489object *
1490object::split_nr (sint32 nr)
1491{
1492 if (nrof < nr)
1493 return 0;
1494 else if (nrof == nr)
1495 {
1496 remove ();
1497 return this;
1498 }
1499 else
1500 {
1501 decrease_nr (nr);
1502
1503 object *op = object_create_clone (this);
1504 op->nrof = nr;
1505 return op;
1506 }
1507}
1508
1509//TODO: remove, but semantics differs from split_nr
1510object *
1498get_split_ob (object *orig_ob, uint32 nr) 1511get_split_ob (object *orig_ob, uint32 nr)
1499{ 1512{
1500 object *newob;
1501 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1502
1503 if (orig_ob->nrof < nr) 1513 if (orig_ob->nrof < nr)
1504 { 1514 {
1505 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1515 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1506 return NULL; 1516 return 0;
1507 }
1508
1509 newob = object_create_clone (orig_ob);
1510
1511 if ((orig_ob->nrof -= nr) < 1)
1512 orig_ob->destroy (1);
1513 else if (!is_removed)
1514 { 1517 }
1515 if (orig_ob->env != NULL) 1518
1516 sub_weight (orig_ob->env, orig_ob->weight * nr); 1519 return orig_ob->split_nr (nr);
1517 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1520}
1521
1522// find player who can see this object
1523static object *
1524visible_to (object *op)
1525{
1526 if (!op->flag [FLAG_REMOVED])
1527 {
1528 // see if we are in a container of sorts
1529 if (object *env = op->env)
1518 { 1530 {
1519 strcpy (errmsg, "Tried to split object whose map is not in memory."); 1531 // the player inventory itself is always visible
1520 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n"); 1532 if (env->type == PLAYER)
1521 return NULL; 1533 return env;
1534
1535 // else a player could have our env open
1536 env = env->outer_env ();
1537
1538 // the player itself is always on a map, so we will find him here
1539 // even if our inv is in a player.
1540 if (env->is_on_map ())
1541 if (object *pl = env->ms ().player ())
1542 if (pl->container == op->env)
1543 return pl;
1522 } 1544 }
1545 else
1546 {
1547 // maybe there is a player standing on the same mapspace
1548 if (object *pl = env->ms ().player ())
1549 return pl;
1550 }
1523 } 1551 }
1524 1552
1525 newob->nrof = nr;
1526
1527 return newob; 1553 return 0;
1528} 1554}
1529 1555
1530/* 1556/*
1531 * decrease_ob_nr(object, number) decreases a specified number from 1557 * decrease_ob_nr(object, number) decreases a specified number from
1532 * the amount of an object. If the amount reaches 0, the object 1558 * the amount of an object. If the amount reaches 0, the object
1533 * is subsequently removed and freed. 1559 * is subsequently removed and freed.
1534 * 1560 *
1535 * Return value: 'op' if something is left, NULL if the amount reached 0 1561 * Return value: 'op' if something is left, NULL if the amount reached 0
1536 */ 1562 */
1563bool
1564object::decrease_nr (sint32 nr)
1565{
1566 nr = min (nr, nrof);
1567
1568 if (!nr)
1569 return 1;
1570
1571 nrof -= nr;
1572
1573 object *visible = visible_to (this);
1574
1575 if (nrof)
1576 {
1577 adjust_weight (env, -weight * nr); // carrying == 0
1578
1579 if (visible)
1580 esrv_send_item (visible, this);
1581
1582 return 1;
1583 }
1584 else
1585 {
1586 if (visible)
1587 esrv_del_item (visible->contr, count);
1588
1589 this->destroy (1);
1590 return 0;
1591 }
1592}
1593
1594//TODO: remove
1537object * 1595object *
1538decrease_ob_nr (object *op, uint32 i) 1596decrease_ob_nr (object *op, uint32 i)
1539{ 1597{
1540 object *tmp; 1598 return op->decrease_nr (i) ? op : 0;
1541
1542 if (i == 0) /* objects with op->nrof require this check */
1543 return op;
1544
1545 if (i > op->nrof)
1546 i = op->nrof;
1547
1548 if (QUERY_FLAG (op, FLAG_REMOVED))
1549 op->nrof -= i;
1550 else if (op->env)
1551 {
1552 /* is this object in the players inventory, or sub container
1553 * therein?
1554 */
1555 tmp = op->in_player ();
1556 /* nope. Is this a container the player has opened?
1557 * If so, set tmp to that player.
1558 * IMO, searching through all the players will mostly
1559 * likely be quicker than following op->env to the map,
1560 * and then searching the map for a player.
1561 */
1562 if (!tmp)
1563 for_all_players (pl)
1564 if (pl->ob->container == op->env)
1565 {
1566 tmp = pl->ob;
1567 break;
1568 }
1569
1570 if (i < op->nrof)
1571 {
1572 sub_weight (op->env, op->weight * i);
1573 op->nrof -= i;
1574 if (tmp)
1575 esrv_send_item (tmp, op);
1576 }
1577 else
1578 {
1579 op->remove ();
1580 op->nrof = 0;
1581 if (tmp)
1582 esrv_del_item (tmp->contr, op->count);
1583 }
1584 }
1585 else
1586 {
1587 object *above = op->above;
1588
1589 if (i < op->nrof)
1590 op->nrof -= i;
1591 else
1592 {
1593 op->remove ();
1594 op->nrof = 0;
1595 }
1596
1597 /* Since we just removed op, op->above is null */
1598 for (tmp = above; tmp; tmp = tmp->above)
1599 if (tmp->type == PLAYER)
1600 {
1601 if (op->nrof)
1602 esrv_send_item (tmp, op);
1603 else
1604 esrv_del_item (tmp->contr, op->count);
1605 }
1606 }
1607
1608 if (op->nrof)
1609 return op;
1610 else
1611 {
1612 op->destroy ();
1613 return 0;
1614 }
1615}
1616
1617/*
1618 * add_weight(object, weight) adds the specified weight to an object,
1619 * and also updates how much the environment(s) is/are carrying.
1620 */
1621void
1622add_weight (object *op, signed long weight)
1623{
1624 while (op != NULL)
1625 {
1626 if (op->type == CONTAINER)
1627 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1628
1629 op->carrying += weight;
1630 op = op->env;
1631 }
1632} 1599}
1633 1600
1634object * 1601object *
1635insert_ob_in_ob (object *op, object *where) 1602insert_ob_in_ob (object *op, object *where)
1636{ 1603{
1660 * be != op, if items are merged. -Tero 1627 * be != op, if items are merged. -Tero
1661 */ 1628 */
1662object * 1629object *
1663object::insert (object *op) 1630object::insert (object *op)
1664{ 1631{
1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1666 op->remove ();
1667
1668 if (op->more) 1632 if (op->more)
1669 { 1633 {
1670 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1634 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1671 return op; 1635 return op;
1672 } 1636 }
1673 1637
1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1638 op->remove ();
1675 CLEAR_FLAG (op, FLAG_REMOVED); 1639
1640 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676 1641
1677 if (op->nrof) 1642 if (op->nrof)
1678 {
1679 for (object *tmp = inv; tmp; tmp = tmp->below) 1643 for (object *tmp = inv; tmp; tmp = tmp->below)
1680 if (object::can_merge (tmp, op)) 1644 if (object::can_merge (tmp, op))
1681 { 1645 {
1682 /* return the original object and remove inserted object 1646 /* return the original object and remove inserted object
1683 (client needs the original object) */ 1647 (client needs the original object) */
1684 tmp->nrof += op->nrof; 1648 tmp->nrof += op->nrof;
1685 /* Weight handling gets pretty funky. Since we are adding to 1649 op->destroy (1);
1686 * tmp->nrof, we need to increase the weight.
1687 */
1688 add_weight (this, op->weight * op->nrof);
1689 SET_FLAG (op, FLAG_REMOVED);
1690 op->destroy (); /* free the inserted object */
1691 op = tmp; 1650 op = tmp;
1692 op->remove (); /* and fix old object's links */ 1651 goto inserted;
1693 CLEAR_FLAG (op, FLAG_REMOVED);
1694 break;
1695 } 1652 }
1696 1653
1697 /* I assume combined objects have no inventory 1654 op->owner = 0; // it's his/hers now. period.
1698 * We add the weight - this object could have just been removed 1655 op->map = 0;
1699 * (if it was possible to merge). calling remove_ob will subtract 1656 op->x = 0;
1700 * the weight, so we need to add it in again, since we actually do 1657 op->y = 0;
1701 * the linking below
1702 */
1703 add_weight (this, op->weight * op->nrof);
1704 }
1705 else
1706 add_weight (this, (op->weight + op->carrying));
1707 1658
1659 op->above = 0;
1660 op->below = inv;
1661 op->env = this;
1662
1663 if (inv)
1664 inv->above = op;
1665
1666 inv = op;
1667
1668 op->flag [FLAG_REMOVED] = 0;
1669
1670 adjust_weight (this, op->total_weight ());
1671
1672inserted:
1673 /* reset the light list and los of the players on the map */
1674 if (op->glow_radius && map && map->darkness)
1675 update_all_los (map, x, y);
1676
1708 if (object *otmp = this->in_player ()) 1677 if (object *otmp = in_player ())
1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1678 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710 otmp->update_stats (); 1679 otmp->update_stats ();
1711
1712 op->owner = 0; // its his/hers now. period.
1713 op->map = 0;
1714 op->env = this;
1715 op->above = 0;
1716 op->below = 0;
1717 op->x = op->y = 0;
1718
1719 /* reset the light list and los of the players on the map */
1720 if (op->glow_radius && map)
1721 {
1722#ifdef DEBUG_LIGHTS
1723 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1724#endif /* DEBUG_LIGHTS */
1725 if (map->darkness)
1726 update_all_los (map, x, y);
1727 }
1728
1729 /* Client has no idea of ordering so lets not bother ordering it here.
1730 * It sure simplifies this function...
1731 */
1732 if (!inv)
1733 inv = op;
1734 else
1735 {
1736 op->below = inv;
1737 op->below->above = op;
1738 inv = op;
1739 }
1740 1680
1741 INVOKE_OBJECT (INSERT, this); 1681 INVOKE_OBJECT (INSERT, this);
1742 1682
1743 return op; 1683 return op;
1744} 1684}
2614{ 2554{
2615 char flagdesc[512]; 2555 char flagdesc[512];
2616 char info2[256 * 4]; 2556 char info2[256 * 4];
2617 char *p = info; 2557 char *p = info;
2618 2558
2619 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2559 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2620 count, uuid.seq, 2560 count,
2561 uuid.c_str (),
2621 &name, 2562 &name,
2622 title ? "\",title:\"" : "", 2563 title ? "\",title:\"" : "",
2623 title ? (const char *)title : "", 2564 title ? (const char *)title : "",
2624 flag_desc (flagdesc, 512), type); 2565 flag_desc (flagdesc, 512), type);
2625 2566
2741 2682
2742 insert (force); 2683 insert (force);
2743} 2684}
2744 2685
2745void 2686void
2746object::play_sound (faceidx sound) const 2687object::play_sound (faceidx sound)
2747{ 2688{
2748 if (!sound) 2689 if (!sound)
2749 return; 2690 return;
2750 2691
2751 if (flag [FLAG_REMOVED]) 2692 if (flag [FLAG_REMOVED])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines