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.160 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28#include <global.h> 24#include <global.h>
29#include <stdio.h> 25#include <stdio.h>
30#include <sys/types.h> 26#include <sys/types.h>
31#include <sys/uio.h> 27#include <sys/uio.h>
32#include <object.h> 28#include <object.h>
33#include <funcpoint.h>
34#include <sproto.h> 29#include <sproto.h>
35#include <loader.h> 30#include <loader.h>
36 31
37#include <bitset> 32#include <bitset>
38 33
39int nrofallocobjects = 0; 34UUID UUID::cur;
40static UUID uuid; 35static uint64_t seq_next_save;
41const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
42 37
43objectvec objects; 38objectvec objects;
44activevec actives; 39activevec actives;
45 40
46short 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,
47 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
48}; 46};
49short 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,
50 -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
51}; 52};
52int 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,
53 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
54}; 58};
55int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
56 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,
57 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
58}; 64};
59 65
60static void 66static void
61write_uuid (void) 67write_uuid (uval64 skip, bool sync)
62{ 68{
63 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
64 70 CALL_ARG_SV (newSVval64 (skip));
65 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
66 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
67 73 CALL_END;
68 FILE *fp;
69
70 if (!(fp = fopen (filename2, "w")))
71 {
72 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73 return;
74 }
75
76 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77 fclose (fp);
78 rename (filename2, filename1);
79} 74}
80 75
81static void 76static void
82read_uuid (void) 77read_uuid (void)
83{ 78{
84 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
85 80
86 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
87 82
83 seq_next_save = 0;
84
88 FILE *fp; 85 FILE *fp;
89 86
90 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
91 { 88 {
92 if (errno == ENOENT) 89 if (errno == ENOENT)
93 { 90 {
94 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
95 uuid.seq = 0; 92 UUID::cur.seq = 0;
96 write_uuid (); 93 write_uuid (UUID_GAP, true);
97 return; 94 return;
98 } 95 }
99 96
100 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101 _exit (1); 98 _exit (1);
102 } 99 }
103 100
104 int version; 101 UUID::BUF buf;
105 unsigned long long uid; 102 buf[0] = 0;
106 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
107 { 106 {
108 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109 _exit (1); 108 _exit (1);
110 } 109 }
111 110
112 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113 write_uuid (); 112
114 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
115 fclose (fp); 114 fclose (fp);
116} 115}
117 116
118UUID 117UUID
119gen_uuid () 118UUID::gen ()
120{ 119{
121 UUID uid; 120 UUID uid;
122 121
123 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
124 123
125 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
126 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
127 130
128 return uid; 131 return uid;
129} 132}
130 133
131void 134void
132init_uuid () 135UUID::init ()
133{ 136{
134 read_uuid (); 137 read_uuid ();
135} 138}
136 139
137/* 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. */
138static int 141static bool
139compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
140{ 143{
141 key_value *wants_field; 144 key_value *wants_field;
142 145
143 /* 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
151 key_value *has_field; 154 key_value *has_field;
152 155
153 /* Look for a field in has with the same key. */ 156 /* Look for a field in has with the same key. */
154 has_field = get_ob_key_link (has, wants_field->key); 157 has_field = get_ob_key_link (has, wants_field->key);
155 158
156 if (has_field == NULL) 159 if (!has_field)
157 {
158 /* No field with that name. */ 160 return 0; /* No field with that name. */
159 return FALSE;
160 }
161 161
162 /* Found the matching field. */ 162 /* Found the matching field. */
163 if (has_field->value != wants_field->value) 163 if (has_field->value != wants_field->value)
164 {
165 /* 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. */
166 return FALSE;
167 }
168 165
169 /* 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. */
170 } 167 }
171 168
172 /* 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. */
173 return TRUE; 170 return 1;
174} 171}
175 172
176/* Returns TRUE if ob1 has the same key_values as ob2. */ 173/* Returns TRUE if ob1 has the same key_values as ob2. */
177static int 174static bool
178compare_ob_value_lists (const object *ob1, const object *ob2) 175compare_ob_value_lists (const object *ob1, const object *ob2)
179{ 176{
180 /* 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,
181 * so we need to run the comparison *twice*. :( 178 * so we need to run the comparison *twice*. :(
182 */ 179 */
203 || ob1->speed != ob2->speed 200 || ob1->speed != ob2->speed
204 || ob1->value != ob2->value 201 || ob1->value != ob2->value
205 || ob1->name != ob2->name) 202 || ob1->name != ob2->name)
206 return 0; 203 return 0;
207 204
208 //TODO: this ain't working well, use nicer and correct overflow check 205 /* Do not merge objects if nrof would overflow. First part checks
209 /* 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
210 * 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
211 * used to store nrof). 208 * nrof values.
212 */ 209 */
213 if (ob1->nrof + ob2->nrof >= 1UL << 31) 210 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214 return 0; 211 return 0;
215 212
216 /* If the objects have been identified, set the BEEN_APPLIED flag. 213 /* If the objects have been identified, set the BEEN_APPLIED flag.
217 * 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
218 * 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
219 * 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
220 * flags lose any meaning. 217 * flags lose any meaning.
221 */ 218 */
222 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 219 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 220 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224 221
225 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227 224
228 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 225 if (ob1->arch->name != ob2->arch->name
229 || ob1->arch != ob2->arch
230 || ob1->name != ob2->name 226 || ob1->name != ob2->name
231 || ob1->title != ob2->title 227 || ob1->title != ob2->title
232 || ob1->msg != ob2->msg 228 || ob1->msg != ob2->msg
233 || ob1->weight != ob2->weight 229 || ob1->weight != ob2->weight
234 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236 || ob1->attacktype != ob2->attacktype 230 || ob1->attacktype != ob2->attacktype
237 || ob1->magic != ob2->magic 231 || ob1->magic != ob2->magic
238 || ob1->slaying != ob2->slaying 232 || ob1->slaying != ob2->slaying
239 || ob1->skill != ob2->skill 233 || ob1->skill != ob2->skill
240 || ob1->value != ob2->value 234 || ob1->value != ob2->value
247 || ob1->move_block != ob2->move_block 241 || ob1->move_block != ob2->move_block
248 || ob1->move_allow != ob2->move_allow 242 || ob1->move_allow != ob2->move_allow
249 || ob1->move_on != ob2->move_on 243 || ob1->move_on != ob2->move_on
250 || ob1->move_off != ob2->move_off 244 || ob1->move_off != ob2->move_off
251 || ob1->move_slow != ob2->move_slow 245 || ob1->move_slow != ob2->move_slow
252 || 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)))
253 return 0; 249 return 0;
254 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
255 /* This is really a spellbook check - really, we should 258 /* This is really a spellbook check - we should in general
256 * check all objects in the inventory. 259 * not merge objects with real inventories, as splitting them
260 * is hard.
257 */ 261 */
258 if (ob1->inv || ob2->inv) 262 if (ob1->inv || ob2->inv)
259 { 263 {
260 /* if one object has inventory but the other doesn't, not equiv */ 264 if (!(ob1->inv && ob2->inv))
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 265 return 0; /* inventories differ in length */
262 return 0;
263 266
264 /* 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
265 if (!object::can_merge (ob1->inv, ob2->inv)) 270 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 271 return 0; /* inventory objects differ */
267 272
268 /* 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
269 * if it is valid. 274 * if it is valid.
270 */ 275 */
271 } 276 }
290 if (ob1->level != ob2->level) 295 if (ob1->level != ob2->level)
291 return 0; 296 return 0;
292 break; 297 break;
293 } 298 }
294 299
295 if (ob1->key_values != NULL || ob2->key_values != NULL) 300 if (ob1->key_values || ob2->key_values)
296 { 301 {
297 /* At least one of these has key_values. */ 302 /* At least one of these has key_values. */
298 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 303 if ((!ob1->key_values) != (!ob2->key_values))
299 /* One has fields, but the other one doesn't. */ 304 return 0; /* One has fields, but the other one doesn't. */
305
306 if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 307 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0;
303 } 308 }
304 309
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
307 { 311 {
308 ob1->optimise (); 312 ob1->optimise ();
309 ob2->optimise (); 313 ob2->optimise ();
310 314
311 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)
312 return 0; 321 return 0;
322
323 if (k1 == 0)
324 return 1;
325
326 if (!cfperl_can_merge (ob1, ob2))
327 return 0;
328 }
313 } 329 }
314 330
315 /* Everything passes, must be OK. */ 331 /* Everything passes, must be OK. */
316 return 1; 332 return 1;
317} 333}
318 334
335// adjust weight per container type ("of holding")
336static sint32
337weight_adjust (object *op, sint32 weight)
338{
339 return op->type == CONTAINER
340 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
341 : weight;
342}
343
319/* 344/*
345 * adjust_weight(object, weight) adds the specified weight to an object,
346 * and also updates how much the environment(s) is/are carrying.
347 */
348static void
349adjust_weight (object *op, sint32 weight)
350{
351 while (op)
352 {
353 weight = weight_adjust (op, weight);
354
355 if (!weight)
356 return;
357
358 op->carrying += weight;
359
360 if (object *pl = op->visible_to ())
361 esrv_update_item (UPD_WEIGHT, pl, op);
362
363 op = op->env;
364 }
365}
366
367/*
320 * sum_weight() is a recursive function which calculates the weight 368 * this is a recursive function which calculates the weight
321 * an object is carrying. It goes through in figures out how much 369 * an object is carrying. It goes through op and figures out how much
322 * containers are carrying, and sums it up. 370 * containers are carrying, and sums it up.
323 */ 371 */
324long 372void
325sum_weight (object *op) 373object::update_weight ()
326{ 374{
327 long sum; 375 sint32 sum = 0;
328 object *inv;
329 376
330 for (sum = 0, inv = op->inv; inv; inv = inv->below) 377 for (object *op = inv; op; op = op->below)
331 { 378 {
332 if (inv->inv) 379 if (op->inv)
333 sum_weight (inv); 380 op->update_weight ();
334 381
335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 382 sum += op->total_weight ();
383 }
384
385 sum = weight_adjust (this, sum);
386
387 if (sum != carrying)
336 } 388 {
337
338 if (op->type == CONTAINER && op->stats.Str)
339 sum = (sum * (100 - op->stats.Str)) / 100;
340
341 if (op->carrying != sum)
342 op->carrying = sum; 389 carrying = sum;
343 390
344 return sum; 391 if (object *pl = visible_to ())
392 esrv_update_item (UPD_WEIGHT, pl, this);
393 }
345} 394}
346 395
347/** 396/*
348 * Return the outermost environment object for a given object. 397 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
349 */
350
351object *
352object_get_env_recursive (object *op)
353{
354 while (op->env != NULL)
355 op = op->env;
356 return op;
357}
358
359/*
360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361 * Some error messages.
362 * The result of the dump is stored in the static global errmsg array.
363 */ 398 */
364char * 399char *
365dump_object (object *op) 400dump_object (object *op)
366{ 401{
367 if (!op) 402 if (!op)
375/* 410/*
376 * get_nearest_part(multi-object, object 2) returns the part of the 411 * get_nearest_part(multi-object, object 2) returns the part of the
377 * multi-object 1 which is closest to the second object. 412 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 413 * If it's not a multi-object, it is returned.
379 */ 414 */
380
381object * 415object *
382get_nearest_part (object *op, const object *pl) 416get_nearest_part (object *op, const object *pl)
383{ 417{
384 object *tmp, *closest; 418 object *tmp, *closest;
385 int last_dist, i; 419 int last_dist, i;
386 420
387 if (op->more == NULL) 421 if (!op->more)
388 return op; 422 return op;
423
389 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 424 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
425 tmp;
426 tmp = tmp->more)
390 if ((i = distance (tmp, pl)) < last_dist) 427 if ((i = distance (tmp, pl)) < last_dist)
391 closest = tmp, last_dist = i; 428 closest = tmp, last_dist = i;
429
392 return closest; 430 return closest;
393} 431}
394 432
395/* 433/*
396 * Returns the object which has the count-variable equal to the argument. 434 * Returns the object which has the count-variable equal to the argument.
435 * VERRRY slow.
397 */ 436 */
398object * 437object *
399find_object (tag_t i) 438find_object (tag_t i)
400{ 439{
401 for_all_objects (op) 440 for_all_objects (op)
421 break; 460 break;
422 461
423 return op; 462 return op;
424} 463}
425 464
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 465/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 466 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 467 * skill and experience objects.
468 * ACTUALLY NO! investigate! TODO
435 */ 469 */
436void 470void
437object::set_owner (object *owner) 471object::set_owner (object *owner)
438{ 472{
473 // allow objects which own objects
439 if (!owner) 474 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 475 while (owner->owner)
450 owner = owner->owner; 476 owner = owner->owner;
477
478 if (flag [FLAG_FREED])
479 {
480 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
481 return;
482 }
451 483
452 this->owner = owner; 484 this->owner = owner;
453} 485}
454 486
455int 487int
587object::copy_to (object *dst) 619object::copy_to (object *dst)
588{ 620{
589 *dst = *this; 621 *dst = *this;
590 622
591 if (speed < 0) 623 if (speed < 0)
592 dst->speed_left = speed_left - rndm (); 624 dst->speed_left -= rndm ();
593 625
594 dst->set_speed (dst->speed); 626 dst->set_speed (dst->speed);
595} 627}
596 628
597void 629void
598object::instantiate () 630object::instantiate ()
599{ 631{
600 if (!uuid.seq) // HACK 632 if (!uuid.seq) // HACK
601 uuid = gen_uuid (); 633 uuid = UUID::gen ();
602 634
603 speed_left = -0.1f; 635 speed_left = -0.1f;
604 /* copy the body_info to the body_used - this is only really 636 /* copy the body_info to the body_used - this is only really
605 * need for monsters, but doesn't hurt to do it for everything. 637 * need for monsters, but doesn't hurt to do it for everything.
606 * by doing so, when a monster is created, it has good starting 638 * by doing so, when a monster is created, it has good starting
765static int object_count; 797static int object_count;
766 798
767void object::link () 799void object::link ()
768{ 800{
769 assert (!index);//D 801 assert (!index);//D
770 uuid = gen_uuid (); 802 uuid = UUID::gen ();
771 count = ++object_count; 803 count = ++object_count;
772 804
773 refcnt_inc (); 805 refcnt_inc ();
774 objects.insert (this); 806 objects.insert (this);
775} 807}
859 * if some form of movement is allowed, let objects 891 * if some form of movement is allowed, let objects
860 * drop on that space. 892 * drop on that space.
861 */ 893 */
862 if (!drop_to_ground 894 if (!drop_to_ground
863 || !map 895 || !map
864 || map->in_memory != MAP_IN_MEMORY 896 || map->in_memory != MAP_ACTIVE
865 || map->nodrop 897 || map->nodrop
866 || ms ().move_block == MOVE_ALL) 898 || ms ().move_block == MOVE_ALL)
867 { 899 {
868 while (inv) 900 while (inv)
869 { 901 {
898} 930}
899 931
900void 932void
901object::do_destroy () 933object::do_destroy ()
902{ 934{
935 if (object *pl = visible_to ())
936 esrv_del_item (pl->contr, count);
937
903 attachable::do_destroy (); 938 attachable::do_destroy ();
904 939
905 if (flag [FLAG_IS_LINKED]) 940 if (flag [FLAG_IS_LINKED])
906 remove_button_link (this); 941 remove_button_link (this);
907 942
924 959
925 if (!freed_map) 960 if (!freed_map)
926 { 961 {
927 freed_map = new maptile; 962 freed_map = new maptile;
928 963
964 freed_map->path = "<freed objects map>";
929 freed_map->name = "/internal/freed_objects_map"; 965 freed_map->name = "/internal/freed_objects_map";
930 freed_map->width = 3; 966 freed_map->width = 3;
931 freed_map->height = 3; 967 freed_map->height = 3;
968 freed_map->nodrop = 1;
932 969
933 freed_map->alloc (); 970 freed_map->alloc ();
934 freed_map->in_memory = MAP_IN_MEMORY; 971 freed_map->in_memory = MAP_ACTIVE;
935 } 972 }
936 973
937 map = freed_map; 974 map = freed_map;
938 x = 1; 975 x = 1;
939 y = 1; 976 y = 1;
940 } 977 }
941 978
942 head = 0;
943
944 if (more) 979 if (more)
945 { 980 {
946 more->destroy (); 981 more->destroy ();
947 more = 0; 982 more = 0;
948 } 983 }
949 984
985 head = 0;
986
950 // clear those pointers that likely might have circular references to us 987 // clear those pointers that likely might cause circular references
951 owner = 0; 988 owner = 0;
952 enemy = 0; 989 enemy = 0;
953 attacked_by = 0; 990 attacked_by = 0;
991 current_weapon = 0;
954} 992}
955 993
956void 994void
957object::destroy (bool destroy_inventory) 995object::destroy (bool destroy_inventory)
958{ 996{
960 return; 998 return;
961 999
962 if (destroy_inventory) 1000 if (destroy_inventory)
963 destroy_inv (false); 1001 destroy_inv (false);
964 1002
1003 if (is_head ())
1004 if (sound_destroy)
1005 play_sound (sound_destroy);
1006 else if (flag [FLAG_MONSTER])
1007 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
1008
965 attachable::destroy (); 1009 attachable::destroy ();
966}
967
968/*
969 * sub_weight() recursively (outwards) subtracts a number from the
970 * weight of an object (and what is carried by it's environment(s)).
971 */
972void
973sub_weight (object *op, signed long weight)
974{
975 while (op != NULL)
976 {
977 if (op->type == CONTAINER)
978 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
979
980 op->carrying -= weight;
981 op = op->env;
982 }
983} 1010}
984 1011
985/* op->remove (): 1012/* op->remove ():
986 * This function removes the object op from the linked list of objects 1013 * This function removes the object op from the linked list of objects
987 * which it is currently tied to. When this function is done, the 1014 * which it is currently tied to. When this function is done, the
1008 * In this case, the object to be removed is in someones 1035 * In this case, the object to be removed is in someones
1009 * inventory. 1036 * inventory.
1010 */ 1037 */
1011 if (env) 1038 if (env)
1012 { 1039 {
1040 adjust_weight (env, -total_weight ());
1041
1042 *(above ? &above->below : &env->inv) = below;
1043
1013 if (nrof) 1044 if (below)
1014 sub_weight (env, weight * nrof); 1045 below->above = above;
1015 else 1046
1016 sub_weight (env, weight + carrying); 1047 /* we set up values so that it could be inserted into
1048 * the map, but we don't actually do that - it is up
1049 * to the caller to decide what we want to do.
1050 */
1051 map = env->map;
1052 x = env->x;
1053 y = env->y;
1054 above = 0;
1055 below = 0;
1056 env = 0;
1017 1057
1018 /* NO_FIX_PLAYER is set when a great many changes are being 1058 /* NO_FIX_PLAYER is set when a great many changes are being
1019 * made to players inventory. If set, avoiding the call 1059 * made to players inventory. If set, avoiding the call
1020 * to save cpu time. 1060 * to save cpu time.
1021 */ 1061 */
1022 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1062 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1023 otmp->update_stats (); 1063 otmp->update_stats ();
1024
1025 if (above)
1026 above->below = below;
1027 else
1028 env->inv = below;
1029
1030 if (below)
1031 below->above = above;
1032
1033 /* we set up values so that it could be inserted into
1034 * the map, but we don't actually do that - it is up
1035 * to the caller to decide what we want to do.
1036 */
1037 x = env->x, y = env->y;
1038 map = env->map;
1039 above = 0, below = 0;
1040 env = 0;
1041 } 1064 }
1042 else if (map) 1065 else if (map)
1043 { 1066 {
1044 if (type == PLAYER) 1067 if (type == PLAYER)
1045 { 1068 {
1083 if (map->in_memory == MAP_SAVING) 1106 if (map->in_memory == MAP_SAVING)
1084 return; 1107 return;
1085 1108
1086 int check_walk_off = !flag [FLAG_NO_APPLY]; 1109 int check_walk_off = !flag [FLAG_NO_APPLY];
1087 1110
1111 if (object *pl = ms.player ())
1112 {
1113 if (pl->container == this)
1114 /* If a container that the player is currently using somehow gets
1115 * removed (most likely destroyed), update the player view
1116 * appropriately.
1117 */
1118 pl->close_container ();
1119
1120 pl->contr->ns->floorbox_update ();
1121 }
1122
1088 for (tmp = ms.bot; tmp; tmp = tmp->above) 1123 for (tmp = ms.bot; tmp; tmp = tmp->above)
1089 { 1124 {
1090 /* No point updating the players look faces if he is the object 1125 /* No point updating the players look faces if he is the object
1091 * being removed. 1126 * being removed.
1092 */ 1127 */
1093
1094 if (tmp->type == PLAYER && tmp != this)
1095 {
1096 /* If a container that the player is currently using somehow gets
1097 * removed (most likely destroyed), update the player view
1098 * appropriately.
1099 */
1100 if (tmp->container == this)
1101 {
1102 flag [FLAG_APPLIED] = 0;
1103 tmp->container = 0;
1104 }
1105
1106 if (tmp->contr->ns)
1107 tmp->contr->ns->floorbox_update ();
1108 }
1109 1128
1110 /* See if object moving off should effect something */ 1129 /* See if object moving off should effect something */
1111 if (check_walk_off 1130 if (check_walk_off
1112 && ((move_type & tmp->move_off) 1131 && ((move_type & tmp->move_off)
1113 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1132 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1116 1135
1117 if (destroyed ()) 1136 if (destroyed ())
1118 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1137 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1119 } 1138 }
1120 1139
1121 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1122 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1123 if (tmp->above == tmp)
1124 tmp->above = 0;
1125
1126 last = tmp; 1140 last = tmp;
1127 } 1141 }
1128 1142
1129 /* last == NULL if there are no objects on this space */ 1143 /* last == NULL if there are no objects on this space */
1130 //TODO: this makes little sense, why only update the topmost object? 1144 //TODO: this makes little sense, why only update the topmost object?
1150merge_ob (object *op, object *top) 1164merge_ob (object *op, object *top)
1151{ 1165{
1152 if (!op->nrof) 1166 if (!op->nrof)
1153 return 0; 1167 return 0;
1154 1168
1155 if (top) 1169 if (!top)
1156 for (top = op; top && top->above; top = top->above) 1170 for (top = op; top && top->above; top = top->above)
1157 ; 1171 ;
1158 1172
1159 for (; top; top = top->below) 1173 for (; top; top = top->below)
1160 { 1174 {
1241 1255
1242 object *top, *floor = NULL; 1256 object *top, *floor = NULL;
1243 1257
1244 op->remove (); 1258 op->remove ();
1245 1259
1246#if 0
1247 if (!m->active != !op->active)
1248 if (m->active)
1249 op->activate_recursive ();
1250 else
1251 op->deactivate_recursive ();
1252#endif
1253
1254 if (out_of_map (m, op->x, op->y))
1255 {
1256 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1257#ifdef MANY_CORES
1258 /* Better to catch this here, as otherwise the next use of this object
1259 * is likely to cause a crash. Better to find out where it is getting
1260 * improperly inserted.
1261 */
1262 abort ();
1263#endif
1264 return op;
1265 }
1266
1267 if (object *more = op->more)
1268 if (!insert_ob_in_map (more, m, originator, flag))
1269 return 0;
1270
1271 CLEAR_FLAG (op, FLAG_REMOVED);
1272
1273 /* Ideally, the caller figures this out. However, it complicates a lot 1260 /* Ideally, the caller figures this out. However, it complicates a lot
1274 * of areas of callers (eg, anything that uses find_free_spot would now 1261 * of areas of callers (eg, anything that uses find_free_spot would now
1275 * need extra work 1262 * need extra work
1276 */ 1263 */
1277 if (!xy_normalise (m, op->x, op->y)) 1264 if (!xy_normalise (m, op->x, op->y))
1265 {
1266 op->destroy ();
1278 return 0; 1267 return 0;
1268 }
1269
1270 if (object *more = op->more)
1271 if (!insert_ob_in_map (more, m, originator, flag))
1272 return 0;
1273
1274 CLEAR_FLAG (op, FLAG_REMOVED);
1279 1275
1280 op->map = m; 1276 op->map = m;
1281 mapspace &ms = op->ms (); 1277 mapspace &ms = op->ms ();
1282 1278
1283 /* this has to be done after we translate the coordinates. 1279 /* this has to be done after we translate the coordinates.
1285 if (op->nrof && !(flag & INS_NO_MERGE)) 1281 if (op->nrof && !(flag & INS_NO_MERGE))
1286 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1282 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1287 if (object::can_merge (op, tmp)) 1283 if (object::can_merge (op, tmp))
1288 { 1284 {
1289 op->nrof += tmp->nrof; 1285 op->nrof += tmp->nrof;
1290 tmp->destroy (); 1286 tmp->destroy (1);
1291 } 1287 }
1292 1288
1293 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1289 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1294 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1290 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1295 1291
1318 else 1314 else
1319 { 1315 {
1320 top = ms.bot; 1316 top = ms.bot;
1321 1317
1322 /* If there are other objects, then */ 1318 /* If there are other objects, then */
1323 if ((!(flag & INS_MAP_LOAD)) && top) 1319 if (top)
1324 { 1320 {
1325 object *last = 0; 1321 object *last = 0;
1326 1322
1327 /* 1323 /*
1328 * If there are multiple objects on this space, we do some trickier handling. 1324 * If there are multiple objects on this space, we do some trickier handling.
1381 if (last && last->below && last != floor) 1377 if (last && last->below && last != floor)
1382 top = last->below; 1378 top = last->below;
1383 } 1379 }
1384 } /* If objects on this space */ 1380 } /* If objects on this space */
1385 1381
1386 if (flag & INS_MAP_LOAD)
1387 top = ms.top;
1388
1389 if (flag & INS_ABOVE_FLOOR_ONLY) 1382 if (flag & INS_ABOVE_FLOOR_ONLY)
1390 top = floor; 1383 top = floor;
1391 1384
1392 /* Top is the object that our object (op) is going to get inserted above. 1385 /* Top is the object that our object (op) is going to get inserted above.
1393 */ 1386 */
1425 op->map->touch (); 1418 op->map->touch ();
1426 } 1419 }
1427 1420
1428 op->map->dirty = true; 1421 op->map->dirty = true;
1429 1422
1430 /* If we have a floor, we know the player, if any, will be above
1431 * it, so save a few ticks and start from there.
1432 */
1433 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = ms.player ()) 1423 if (object *pl = ms.player ())
1435 if (pl->contr->ns)
1436 pl->contr->ns->floorbox_update (); 1424 pl->contr->ns->floorbox_update ();
1437 1425
1438 /* If this object glows, it may affect lighting conditions that are 1426 /* If this object glows, it may affect lighting conditions that are
1439 * visible to others on this map. But update_all_los is really 1427 * visible to others on this map. But update_all_los is really
1440 * an inefficient way to do this, as it means los for all players 1428 * an inefficient way to do this, as it means los for all players
1441 * on the map will get recalculated. The players could very well 1429 * on the map will get recalculated. The players could very well
1483 * op is the object to insert it under: supplies x and the map. 1471 * op is the object to insert it under: supplies x and the map.
1484 */ 1472 */
1485void 1473void
1486replace_insert_ob_in_map (const char *arch_string, object *op) 1474replace_insert_ob_in_map (const char *arch_string, object *op)
1487{ 1475{
1488 object *tmp, *tmp1;
1489
1490 /* first search for itself and remove any old instances */ 1476 /* first search for itself and remove any old instances */
1491 1477
1492 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1478 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1493 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1479 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1494 tmp->destroy (); 1480 tmp->destroy (1);
1495 1481
1496 tmp1 = arch_to_object (archetype::find (arch_string)); 1482 object *tmp = arch_to_object (archetype::find (arch_string));
1497 1483
1498 tmp1->x = op->x; 1484 tmp->x = op->x;
1499 tmp1->y = op->y; 1485 tmp->y = op->y;
1486
1500 insert_ob_in_map (tmp1, op->map, op, 0); 1487 insert_ob_in_map (tmp, op->map, op, 0);
1501} 1488}
1502 1489
1503object * 1490object *
1504object::insert_at (object *where, object *originator, int flags) 1491object::insert_at (object *where, object *originator, int flags)
1505{ 1492{
1493 if (where->env)
1494 return where->env->insert (this);
1495 else
1506 return where->map->insert (this, where->x, where->y, originator, flags); 1496 return where->map->insert (this, where->x, where->y, originator, flags);
1507} 1497}
1508 1498
1509/* 1499// find player who can see this object
1510 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1511 * is returned contains nr objects, and the remaining parts contains
1512 * the rest (or is removed and freed if that number is 0).
1513 * On failure, NULL is returned, and the reason put into the
1514 * global static errmsg array.
1515 */
1516object * 1500object *
1517get_split_ob (object *orig_ob, uint32 nr) 1501object::visible_to () const
1518{ 1502{
1519 object *newob; 1503 if (!flag [FLAG_REMOVED])
1520 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1521
1522 if (orig_ob->nrof < nr)
1523 {
1524 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1525 return NULL;
1526 } 1504 {
1527 1505 // see if we are in a container of sorts
1528 newob = object_create_clone (orig_ob); 1506 if (env)
1529
1530 if ((orig_ob->nrof -= nr) < 1)
1531 orig_ob->destroy (1);
1532 else if (!is_removed)
1533 {
1534 if (orig_ob->env != NULL)
1535 sub_weight (orig_ob->env, orig_ob->weight * nr);
1536 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1537 {
1538 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1539 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1540 return NULL;
1541 } 1507 {
1542 } 1508 // the player inventory itself is always visible
1509 if (env->type == PLAYER)
1510 return env;
1543 1511
1544 newob->nrof = nr; 1512 // else a player could have our env open
1513 object *envest = env->outer_env ();
1545 1514
1515 // the player itself is always on a map, so we will find him here
1516 // even if our inv is in a player.
1517 if (envest->is_on_map ())
1518 if (object *pl = envest->ms ().player ())
1519 if (pl->container == env)
1520 return pl;
1521 }
1522 else
1523 {
1524 // maybe there is a player standing on the same mapspace
1525 // this will catch the case where "this" is a player
1526 if (object *pl = ms ().player ())
1527 return pl;
1528 }
1529 }
1530
1546 return newob; 1531 return 0;
1547} 1532}
1548 1533
1549/* 1534/*
1550 * decrease_ob_nr(object, number) decreases a specified number from 1535 * decrease(object, number) decreases a specified number from
1551 * the amount of an object. If the amount reaches 0, the object 1536 * the amount of an object. If the amount reaches 0, the object
1552 * is subsequently removed and freed. 1537 * is subsequently removed and freed.
1553 * 1538 *
1554 * Return value: 'op' if something is left, NULL if the amount reached 0 1539 * Return value: 'op' if something is left, NULL if the amount reached 0
1555 */ 1540 */
1541bool
1542object::decrease (sint32 nr)
1543{
1544 if (!nr)
1545 return true;
1546
1547 nr = min (nr, nrof);
1548
1549 nrof -= nr;
1550
1551 if (nrof)
1552 {
1553 adjust_weight (env, -weight * nr); // carrying == 0
1554
1555 if (object *pl = visible_to ())
1556 esrv_update_item (UPD_NROF, pl, this);
1557
1558 return true;
1559 }
1560 else
1561 {
1562 destroy (1);
1563 return false;
1564 }
1565}
1566
1567/*
1568 * split(ob,nr) splits up ob into two parts. The part which
1569 * is returned contains nr objects, and the remaining parts contains
1570 * the rest (or is removed and returned if that number is 0).
1571 * On failure, NULL is returned.
1572 */
1556object * 1573object *
1557decrease_ob_nr (object *op, uint32 i) 1574object::split (sint32 nr)
1558{ 1575{
1559 object *tmp; 1576 int have = number_of ();
1560 1577
1561 if (i == 0) /* objects with op->nrof require this check */ 1578 if (have < nr)
1562 return op; 1579 return 0;
1563 1580 else if (have == nr)
1564 if (i > op->nrof)
1565 i = op->nrof;
1566
1567 if (QUERY_FLAG (op, FLAG_REMOVED))
1568 op->nrof -= i;
1569 else if (op->env)
1570 { 1581 {
1571 /* is this object in the players inventory, or sub container
1572 * therein?
1573 */
1574 tmp = op->in_player ();
1575 /* nope. Is this a container the player has opened?
1576 * If so, set tmp to that player.
1577 * IMO, searching through all the players will mostly
1578 * likely be quicker than following op->env to the map,
1579 * and then searching the map for a player.
1580 */
1581 if (!tmp)
1582 for_all_players (pl)
1583 if (pl->ob->container == op->env)
1584 {
1585 tmp = pl->ob;
1586 break;
1587 }
1588
1589 if (i < op->nrof)
1590 {
1591 sub_weight (op->env, op->weight * i);
1592 op->nrof -= i;
1593 if (tmp)
1594 esrv_send_item (tmp, op);
1595 }
1596 else
1597 {
1598 op->remove (); 1582 remove ();
1599 op->nrof = 0; 1583 return this;
1600 if (tmp)
1601 esrv_del_item (tmp->contr, op->count);
1602 }
1603 } 1584 }
1604 else 1585 else
1605 { 1586 {
1606 object *above = op->above; 1587 decrease (nr);
1607 1588
1608 if (i < op->nrof) 1589 object *op = object_create_clone (this);
1609 op->nrof -= i; 1590 op->nrof = nr;
1610 else
1611 {
1612 op->remove ();
1613 op->nrof = 0;
1614 }
1615
1616 /* Since we just removed op, op->above is null */
1617 for (tmp = above; tmp; tmp = tmp->above)
1618 if (tmp->type == PLAYER)
1619 {
1620 if (op->nrof)
1621 esrv_send_item (tmp, op);
1622 else
1623 esrv_del_item (tmp->contr, op->count);
1624 }
1625 }
1626
1627 if (op->nrof)
1628 return op; 1591 return op;
1629 else
1630 {
1631 op->destroy ();
1632 return 0;
1633 }
1634}
1635
1636/*
1637 * add_weight(object, weight) adds the specified weight to an object,
1638 * and also updates how much the environment(s) is/are carrying.
1639 */
1640void
1641add_weight (object *op, signed long weight)
1642{
1643 while (op != NULL)
1644 {
1645 if (op->type == CONTAINER)
1646 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1647
1648 op->carrying += weight;
1649 op = op->env;
1650 } 1592 }
1651} 1593}
1652 1594
1653object * 1595object *
1654insert_ob_in_ob (object *op, object *where) 1596insert_ob_in_ob (object *op, object *where)
1679 * be != op, if items are merged. -Tero 1621 * be != op, if items are merged. -Tero
1680 */ 1622 */
1681object * 1623object *
1682object::insert (object *op) 1624object::insert (object *op)
1683{ 1625{
1684 object *tmp, *otmp;
1685
1686 if (!QUERY_FLAG (op, FLAG_REMOVED))
1687 op->remove ();
1688
1689 if (op->more) 1626 if (op->more)
1690 { 1627 {
1691 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1628 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1692 return op; 1629 return op;
1693 } 1630 }
1694 1631
1695 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1632 op->remove ();
1696 CLEAR_FLAG (op, FLAG_REMOVED); 1633
1634 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1635
1697 if (op->nrof) 1636 if (op->nrof)
1698 {
1699 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1637 for (object *tmp = inv; tmp; tmp = tmp->below)
1700 if (object::can_merge (tmp, op)) 1638 if (object::can_merge (tmp, op))
1701 { 1639 {
1702 /* return the original object and remove inserted object 1640 /* return the original object and remove inserted object
1703 (client needs the original object) */ 1641 (client needs the original object) */
1704 tmp->nrof += op->nrof; 1642 tmp->nrof += op->nrof;
1705 /* Weight handling gets pretty funky. Since we are adding to
1706 * tmp->nrof, we need to increase the weight.
1707 */
1708 add_weight (this, op->weight * op->nrof); 1643 adjust_weight (this, op->total_weight ());
1709 SET_FLAG (op, FLAG_REMOVED); 1644
1710 op->destroy (); /* free the inserted object */ 1645 op->destroy (1);
1711 op = tmp; 1646 op = tmp;
1712 op->remove (); /* and fix old object's links */ 1647 goto inserted;
1713 CLEAR_FLAG (op, FLAG_REMOVED);
1714 break;
1715 } 1648 }
1716 1649
1717 /* I assume combined objects have no inventory 1650 op->owner = 0; // it's his/hers now. period.
1718 * We add the weight - this object could have just been removed 1651 op->map = 0;
1719 * (if it was possible to merge). calling remove_ob will subtract 1652 op->x = 0;
1720 * the weight, so we need to add it in again, since we actually do 1653 op->y = 0;
1721 * the linking below
1722 */
1723 add_weight (this, op->weight * op->nrof);
1724 }
1725 else
1726 add_weight (this, (op->weight + op->carrying));
1727 1654
1728 otmp = this->in_player (); 1655 op->above = 0;
1729 if (otmp && otmp->contr) 1656 op->below = inv;
1657 op->env = this;
1658
1659 if (inv)
1660 inv->above = op;
1661
1662 inv = op;
1663
1664 op->flag [FLAG_REMOVED] = 0;
1665
1666 adjust_weight (this, op->total_weight ());
1667
1668inserted:
1669 /* reset the light list and los of the players on the map */
1670 if (op->glow_radius && map && map->darkness)
1671 update_all_los (map, x, y);
1672
1673 if (object *otmp = in_player ())
1730 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1674 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1731 otmp->update_stats (); 1675 otmp->update_stats ();
1732
1733 op->map = 0;
1734 op->env = this;
1735 op->above = 0;
1736 op->below = 0;
1737 op->x = 0, op->y = 0;
1738
1739 /* reset the light list and los of the players on the map */
1740 if ((op->glow_radius != 0) && map)
1741 {
1742#ifdef DEBUG_LIGHTS
1743 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1744#endif /* DEBUG_LIGHTS */
1745 if (map->darkness)
1746 update_all_los (map, x, y);
1747 }
1748
1749 /* Client has no idea of ordering so lets not bother ordering it here.
1750 * It sure simplifies this function...
1751 */
1752 if (!inv)
1753 inv = op;
1754 else
1755 {
1756 op->below = inv;
1757 op->below->above = op;
1758 inv = op;
1759 }
1760 1676
1761 INVOKE_OBJECT (INSERT, this); 1677 INVOKE_OBJECT (INSERT, this);
1762 1678
1763 return op; 1679 return op;
1764} 1680}
1979 * activate recursively a flag on an object inventory 1895 * activate recursively a flag on an object inventory
1980 */ 1896 */
1981void 1897void
1982flag_inv (object *op, int flag) 1898flag_inv (object *op, int flag)
1983{ 1899{
1984 if (op->inv)
1985 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1900 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1986 { 1901 {
1987 SET_FLAG (tmp, flag); 1902 SET_FLAG (tmp, flag);
1988 flag_inv (tmp, flag); 1903 flag_inv (tmp, flag);
1989 } 1904 }
1990} 1905}
1991 1906
1992/* 1907/*
1993 * deactivate recursively a flag on an object inventory 1908 * deactivate recursively a flag on an object inventory
1994 */ 1909 */
1995void 1910void
1996unflag_inv (object *op, int flag) 1911unflag_inv (object *op, int flag)
1997{ 1912{
1998 if (op->inv)
1999 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1913 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2000 { 1914 {
2001 CLEAR_FLAG (tmp, flag); 1915 CLEAR_FLAG (tmp, flag);
2002 unflag_inv (tmp, flag); 1916 unflag_inv (tmp, flag);
2003 } 1917 }
2004} 1918}
2005 1919
2006/* 1920/*
2007 * find_free_spot(object, map, x, y, start, stop) will search for 1921 * find_free_spot(object, map, x, y, start, stop) will search for
2008 * a spot at the given map and coordinates which will be able to contain 1922 * a spot at the given map and coordinates which will be able to contain
2010 * to search (see the freearr_x/y[] definition). 1924 * to search (see the freearr_x/y[] definition).
2011 * It returns a random choice among the alternatives found. 1925 * It returns a random choice among the alternatives found.
2012 * start and stop are where to start relative to the free_arr array (1,9 1926 * start and stop are where to start relative to the free_arr array (1,9
2013 * does all 4 immediate directions). This returns the index into the 1927 * does all 4 immediate directions). This returns the index into the
2014 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1928 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2015 * Note - this only checks to see if there is space for the head of the
2016 * object - if it is a multispace object, this should be called for all
2017 * pieces.
2018 * Note2: This function does correctly handle tiled maps, but does not 1929 * Note: This function does correctly handle tiled maps, but does not
2019 * inform the caller. However, insert_ob_in_map will update as 1930 * inform the caller. However, insert_ob_in_map will update as
2020 * necessary, so the caller shouldn't need to do any special work. 1931 * necessary, so the caller shouldn't need to do any special work.
2021 * Note - updated to take an object instead of archetype - this is necessary 1932 * Note - updated to take an object instead of archetype - this is necessary
2022 * because arch_blocked (now ob_blocked) needs to know the movement type 1933 * because arch_blocked (now ob_blocked) needs to know the movement type
2023 * to know if the space in question will block the object. We can't use 1934 * to know if the space in question will block the object. We can't use
2025 * customized, changed states, etc. 1936 * customized, changed states, etc.
2026 */ 1937 */
2027int 1938int
2028find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1939find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2029{ 1940{
1941 int altern[SIZEOFFREE];
2030 int index = 0, flag; 1942 int index = 0, flag;
2031 int altern[SIZEOFFREE];
2032 1943
2033 for (int i = start; i < stop; i++) 1944 for (int i = start; i < stop; i++)
2034 { 1945 {
2035 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1946 mapxy pos (m, x, y); pos.move (i);
2036 if (!flag) 1947
1948 if (!pos.normalise ())
1949 continue;
1950
1951 mapspace &ms = *pos;
1952
1953 if (ms.flags () & P_IS_ALIVE)
1954 continue;
1955
1956 /* However, often
1957 * ob doesn't have any move type (when used to place exits)
1958 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1959 */
1960 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1961 {
2037 altern [index++] = i; 1962 altern [index++] = i;
1963 continue;
1964 }
2038 1965
2039 /* Basically, if we find a wall on a space, we cut down the search size. 1966 /* Basically, if we find a wall on a space, we cut down the search size.
2040 * In this way, we won't return spaces that are on another side of a wall. 1967 * In this way, we won't return spaces that are on another side of a wall.
2041 * This mostly work, but it cuts down the search size in all directions - 1968 * This mostly work, but it cuts down the search size in all directions -
2042 * if the space being examined only has a wall to the north and empty 1969 * if the space being examined only has a wall to the north and empty
2043 * spaces in all the other directions, this will reduce the search space 1970 * spaces in all the other directions, this will reduce the search space
2044 * to only the spaces immediately surrounding the target area, and 1971 * to only the spaces immediately surrounding the target area, and
2045 * won't look 2 spaces south of the target space. 1972 * won't look 2 spaces south of the target space.
2046 */ 1973 */
2047 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1974 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1975 {
2048 stop = maxfree[i]; 1976 stop = maxfree[i];
1977 continue;
1978 }
1979
1980 /* Note it is intentional that we check ob - the movement type of the
1981 * head of the object should correspond for the entire object.
1982 */
1983 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1984 continue;
1985
1986 if (ob->blocked (m, pos.x, pos.y))
1987 continue;
1988
1989 altern [index++] = i;
2049 } 1990 }
2050 1991
2051 if (!index) 1992 if (!index)
2052 return -1; 1993 return -1;
2053 1994
2062 */ 2003 */
2063int 2004int
2064find_first_free_spot (const object *ob, maptile *m, int x, int y) 2005find_first_free_spot (const object *ob, maptile *m, int x, int y)
2065{ 2006{
2066 for (int i = 0; i < SIZEOFFREE; i++) 2007 for (int i = 0; i < SIZEOFFREE; i++)
2067 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2008 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2068 return i; 2009 return i;
2069 2010
2070 return -1; 2011 return -1;
2071} 2012}
2072 2013
2349 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2290 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2350 * core dumps if they do. 2291 * core dumps if they do.
2351 * 2292 *
2352 * Add a check so we can't pick up invisible objects (0.93.8) 2293 * Add a check so we can't pick up invisible objects (0.93.8)
2353 */ 2294 */
2354
2355int 2295int
2356can_pick (const object *who, const object *item) 2296can_pick (const object *who, const object *item)
2357{ 2297{
2358 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2298 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2359 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2299 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2574 } 2514 }
2575 else 2515 else
2576 item = item->env; 2516 item = item->env;
2577} 2517}
2578 2518
2579
2580const char * 2519const char *
2581object::flag_desc (char *desc, int len) const 2520object::flag_desc (char *desc, int len) const
2582{ 2521{
2583 char *p = desc; 2522 char *p = desc;
2584 bool first = true; 2523 bool first = true;
2611{ 2550{
2612 char flagdesc[512]; 2551 char flagdesc[512];
2613 char info2[256 * 4]; 2552 char info2[256 * 4];
2614 char *p = info; 2553 char *p = info;
2615 2554
2616 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2555 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2617 count, uuid.seq, 2556 count,
2557 uuid.c_str (),
2618 &name, 2558 &name,
2619 title ? "\",title:\"" : "", 2559 title ? "\",title:\"" : "",
2620 title ? (const char *)title : "", 2560 title ? (const char *)title : "",
2621 flag_desc (flagdesc, 512), type); 2561 flag_desc (flagdesc, 512), type);
2622 2562
2623 if (env) 2563 if (!this->flag[FLAG_REMOVED] && env)
2624 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2564 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2625 2565
2626 if (map) 2566 if (map)
2627 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2567 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2628 2568
2646} 2586}
2647 2587
2648const materialtype_t * 2588const materialtype_t *
2649object::dominant_material () const 2589object::dominant_material () const
2650{ 2590{
2651 if (materialtype_t *mat = name_to_material (materialname)) 2591 if (materialtype_t *mt = name_to_material (materialname))
2652 return mat; 2592 return mt;
2653 2593
2654 // omfg this is slow, this has to be temporary :)
2655 shstr unknown ("unknown");
2656
2657 return name_to_material (unknown); 2594 return name_to_material (shstr_unknown);
2658} 2595}
2659 2596
2660void 2597void
2661object::open_container (object *new_container) 2598object::open_container (object *new_container)
2662{ 2599{
2678 old_container->flag [FLAG_APPLIED] = 0; 2615 old_container->flag [FLAG_APPLIED] = 0;
2679 container = 0; 2616 container = 0;
2680 2617
2681 esrv_update_item (UPD_FLAGS, this, old_container); 2618 esrv_update_item (UPD_FLAGS, this, old_container);
2682 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2619 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2620 play_sound (sound_find ("chest_close"));
2683 } 2621 }
2684 2622
2685 if (new_container) 2623 if (new_container)
2686 { 2624 {
2687 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2625 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2703 new_container->flag [FLAG_APPLIED] = 1; 2641 new_container->flag [FLAG_APPLIED] = 1;
2704 container = new_container; 2642 container = new_container;
2705 2643
2706 esrv_update_item (UPD_FLAGS, this, new_container); 2644 esrv_update_item (UPD_FLAGS, this, new_container);
2707 esrv_send_inventory (this, new_container); 2645 esrv_send_inventory (this, new_container);
2646 play_sound (sound_find ("chest_open"));
2647 }
2648}
2649
2650object *
2651object::force_find (const shstr name)
2652{
2653 /* cycle through his inventory to look for the MARK we want to
2654 * place
2655 */
2656 for (object *tmp = inv; tmp; tmp = tmp->below)
2657 if (tmp->type == FORCE && tmp->slaying == name)
2658 return splay (tmp);
2659
2660 return 0;
2661}
2662
2663void
2664object::force_add (const shstr name, int duration)
2665{
2666 if (object *force = force_find (name))
2667 force->destroy ();
2668
2669 object *force = get_archetype (FORCE_NAME);
2670
2671 force->slaying = name;
2672 force->stats.food = 1;
2673 force->speed_left = -1.f;
2674
2675 force->set_speed (duration ? 1.f / duration : 0.f);
2676 force->flag [FLAG_IS_USED_UP] = true;
2677 force->flag [FLAG_APPLIED] = true;
2678
2679 insert (force);
2680}
2681
2682void
2683object::play_sound (faceidx sound)
2684{
2685 if (!sound)
2686 return;
2687
2688 if (flag [FLAG_REMOVED])
2689 return;
2690
2691 if (env)
2708 } 2692 {
2693 if (object *pl = in_player ())
2694 pl->contr->play_sound (sound);
2695 }
2696 else
2697 map->play_sound (sound, x, y);
2709} 2698}
2710 2699
2711

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines