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.193 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.213 by root, Tue Apr 22 01:18:10 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
32#include <funcpoint.h>
33#include <sproto.h> 29#include <sproto.h>
34#include <loader.h> 30#include <loader.h>
35 31
36#include <bitset> 32#include <bitset>
37 33
38int nrofallocobjects = 0; 34UUID UUID::cur;
39static UUID uuid; 35static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
41 37
42objectvec objects; 38objectvec objects;
43activevec actives; 39activevec actives;
44 40
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = {
42 0,
43 0, 1, 1, 1, 0, -1, -1, -1,
44 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 45 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 46};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 47short freearr_y[SIZEOFFREE] = {
48 0,
49 -1, -1, 0, 1, 1, 1, 0, -1,
50 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 51 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50}; 52};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 58};
54int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 0,
61 1, 2, 3, 4, 5, 6, 7, 8,
62 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 63 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 64};
58 65
59static void 66static void
60write_uuid (void) 67write_uuid (uval64 skip, bool sync)
61{ 68{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
63 70 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 73 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 74}
79 75
80static void 76static void
81read_uuid (void) 77read_uuid (void)
82{ 78{
83 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
84 80
85 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
86 82
83 seq_next_save = 0;
84
87 FILE *fp; 85 FILE *fp;
88 86
89 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
90 { 88 {
91 if (errno == ENOENT) 89 if (errno == ENOENT)
92 { 90 {
93 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 92 UUID::cur.seq = 0;
95 write_uuid (); 93 write_uuid (UUID_GAP, true);
96 return; 94 return;
97 } 95 }
98 96
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 98 _exit (1);
101 } 99 }
102 100
103 int version; 101 UUID::BUF buf;
104 unsigned long long uid; 102 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
106 { 106 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 108 _exit (1);
109 } 109 }
110 110
111 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 112
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
114 fclose (fp); 114 fclose (fp);
115} 115}
116 116
117UUID 117UUID
118gen_uuid () 118UUID::gen ()
119{ 119{
120 UUID uid; 120 UUID uid;
121 121
122 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
123 123
124 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
126 130
127 return uid; 131 return uid;
128} 132}
129 133
130void 134void
131init_uuid () 135UUID::init ()
132{ 136{
133 read_uuid (); 137 read_uuid ();
134} 138}
135 139
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137static int 141static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
139{ 143{
140 key_value *wants_field; 144 key_value *wants_field;
141 145
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 146 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
150 key_value *has_field; 154 key_value *has_field;
151 155
152 /* Look for a field in has with the same key. */ 156 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 157 has_field = get_ob_key_link (has, wants_field->key);
154 158
155 if (has_field == NULL) 159 if (!has_field)
156 {
157 /* No field with that name. */ 160 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 161
161 /* Found the matching field. */ 162 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 163 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */ 164 return 0; /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167 165
168 /* If we get here, we found a match. Now for the next field in wants. */ 166 /* If we get here, we found a match. Now for the next field in wants. */
169 } 167 }
170 168
171 /* If we get here, every field in wants has a matching field in has. */ 169 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 170 return 1;
173} 171}
174 172
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 173/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 174static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 175compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 176{
179 /* However, there may be fields in has which aren't partnered in wants, 177 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 178 * so we need to run the comparison *twice*. :(
181 */ 179 */
202 || ob1->speed != ob2->speed 200 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 201 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 202 || ob1->name != ob2->name)
205 return 0; 203 return 0;
206 204
207 //TODO: this ain't working well, use nicer and correct overflow check 205 /* Do not merge objects if nrof would overflow. First part checks
208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 206 * for unsigned overflow (2c), second part checks whether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 207 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 208 * nrof values.
211 */ 209 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 210 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 211 return 0;
214 212
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 213 /* If the objects have been identified, set the BEEN_APPLIED flag.
216 * This is to the comparison of the flags below will be OK. We 214 * This is to the comparison of the flags below will be OK. We
217 * just can't ignore the been applied or identified flags, as they 215 * just can't ignore the been applied or identified flags, as they
218 * are not equal - just if it has been identified, the been_applied 216 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 217 * flags lose any meaning.
220 */ 218 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 219 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 220 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 221
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 224
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 225 if (ob1->arch->name != ob2->arch->name
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 226 || ob1->name != ob2->name
230 || ob1->title != ob2->title 227 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 228 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 229 || ob1->weight != ob2->weight
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235 || ob1->attacktype != ob2->attacktype 230 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 231 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 232 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 233 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 234 || ob1->value != ob2->value
246 || ob1->move_block != ob2->move_block 241 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 242 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 243 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 244 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 245 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 246 || ob1->move_slow_penalty != ob2->move_slow_penalty
247 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 249 return 0;
253 250
251 if ((ob1->flag ^ ob2->flag)
252 .reset (FLAG_INV_LOCKED)
253 .reset (FLAG_CLIENT_SENT)
254 .reset (FLAG_REMOVED)
255 .any ())
256 return 0;
257
254 /* This is really a spellbook check - really, we should 258 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 259 * not merge objects with real inventories, as splitting them
260 * is hard.
256 */ 261 */
257 if (ob1->inv || ob2->inv) 262 if (ob1->inv || ob2->inv)
258 { 263 {
259 if (!(ob1->inv && ob2->inv)) 264 if (!(ob1->inv && ob2->inv))
260 return 0; /* inventories differ in length */ 265 return 0; /* inventories differ in length */
261 266
262 if (ob1->inv->below || ob2->inv->below) 267 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */ 268 return 0; /* more than one object in inv */
264 269
265 if (!object::can_merge (ob1->inv, ob2->inv)) 270 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; /* inventory objexts differ */ 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. */
300 return 0; 305
301 else if (!compare_ob_value_lists (ob1, ob2)) 306 if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 307 return 0;
303 } 308 }
304 309
305 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
306 { 311 {
307 ob1->optimise (); 312 ob1->optimise ();
308 ob2->optimise (); 313 ob2->optimise ();
309 314
310 if (ob1->self || ob2->self) 315 if (ob1->self || ob2->self)
311 { 316 {
312 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0; 317 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0; 318 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314 319
315 if (k1 != k2) 320 if (k1 != k2)
316 return 0; 321 return 0;
322
317 else if (k1 == 0) 323 if (k1 == 0)
318 return 1; 324 return 1;
325
319 else if (!cfperl_can_merge (ob1, ob2)) 326 if (!cfperl_can_merge (ob1, ob2))
320 return 0; 327 return 0;
321 } 328 }
322 } 329 }
323 330
324 /* Everything passes, must be OK. */ 331 /* Everything passes, must be OK. */
325 return 1; 332 return 1;
326} 333}
327 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
328/* 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/*
329 * sum_weight() is a recursive function which calculates the weight 368 * this is a recursive function which calculates the weight
330 * 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
331 * containers are carrying, and sums it up. 370 * containers are carrying, and sums it up.
332 */ 371 */
333long 372void
334sum_weight (object *op) 373object::update_weight ()
335{ 374{
336 long sum; 375 sint32 sum = 0;
337 object *inv;
338 376
339 for (sum = 0, inv = op->inv; inv; inv = inv->below) 377 for (object *op = inv; op; op = op->below)
340 { 378 {
341 if (inv->inv) 379 if (op->inv)
342 sum_weight (inv); 380 op->update_weight ();
343 381
344 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)
345 } 388 {
346
347 if (op->type == CONTAINER && op->stats.Str)
348 sum = (sum * (100 - op->stats.Str)) / 100;
349
350 if (op->carrying != sum)
351 op->carrying = sum; 389 carrying = sum;
352 390
353 return sum; 391 if (object *pl = visible_to ())
392 esrv_update_item (UPD_WEIGHT, pl, this);
393 }
354} 394}
355 395
356/** 396/*
357 * Return the outermost environment object for a given object. 397 * 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 */ 398 */
373char * 399char *
374dump_object (object *op) 400dump_object (object *op)
375{ 401{
376 if (!op) 402 if (!op)
390get_nearest_part (object *op, const object *pl) 416get_nearest_part (object *op, const object *pl)
391{ 417{
392 object *tmp, *closest; 418 object *tmp, *closest;
393 int last_dist, i; 419 int last_dist, i;
394 420
395 if (op->more == NULL) 421 if (!op->more)
396 return op; 422 return op;
423
397 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)
398 if ((i = distance (tmp, pl)) < last_dist) 427 if ((i = distance (tmp, pl)) < last_dist)
399 closest = tmp, last_dist = i; 428 closest = tmp, last_dist = i;
429
400 return closest; 430 return closest;
401} 431}
402 432
403/* 433/*
404 * 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.
405 */ 436 */
406object * 437object *
407find_object (tag_t i) 438find_object (tag_t i)
408{ 439{
409 for_all_objects (op) 440 for_all_objects (op)
427 for_all_objects (op) 458 for_all_objects (op)
428 if (op->name == str_) 459 if (op->name == str_)
429 break; 460 break;
430 461
431 return op; 462 return op;
432}
433
434void
435free_all_object_data ()
436{
437 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438} 463}
439 464
440/* 465/*
441 * 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
442 * skill and experience objects. 467 * skill and experience objects.
447{ 472{
448 // allow objects which own objects 473 // allow objects which own objects
449 if (owner) 474 if (owner)
450 while (owner->owner) 475 while (owner->owner)
451 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 }
452 483
453 this->owner = owner; 484 this->owner = owner;
454} 485}
455 486
456int 487int
597 628
598void 629void
599object::instantiate () 630object::instantiate ()
600{ 631{
601 if (!uuid.seq) // HACK 632 if (!uuid.seq) // HACK
602 uuid = gen_uuid (); 633 uuid = UUID::gen ();
603 634
604 speed_left = -0.1f; 635 speed_left = -0.1f;
605 /* 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
606 * 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.
607 * 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
766static int object_count; 797static int object_count;
767 798
768void object::link () 799void object::link ()
769{ 800{
770 assert (!index);//D 801 assert (!index);//D
771 uuid = gen_uuid (); 802 uuid = UUID::gen ();
772 count = ++object_count; 803 count = ++object_count;
773 804
774 refcnt_inc (); 805 refcnt_inc ();
775 objects.insert (this); 806 objects.insert (this);
776} 807}
860 * if some form of movement is allowed, let objects 891 * if some form of movement is allowed, let objects
861 * drop on that space. 892 * drop on that space.
862 */ 893 */
863 if (!drop_to_ground 894 if (!drop_to_ground
864 || !map 895 || !map
865 || map->in_memory != MAP_IN_MEMORY 896 || map->in_memory != MAP_ACTIVE
866 || map->nodrop 897 || map->nodrop
867 || ms ().move_block == MOVE_ALL) 898 || ms ().move_block == MOVE_ALL)
868 { 899 {
869 while (inv) 900 while (inv)
870 { 901 {
899} 930}
900 931
901void 932void
902object::do_destroy () 933object::do_destroy ()
903{ 934{
904 attachable::do_destroy ();
905
906 if (flag [FLAG_IS_LINKED]) 935 if (flag [FLAG_IS_LINKED])
907 remove_button_link (this); 936 remove_button_link (this);
908 937
909 if (flag [FLAG_FRIENDLY]) 938 if (flag [FLAG_FRIENDLY])
910 remove_friendly_object (this); 939 remove_friendly_object (this);
911 940
912 if (!flag [FLAG_REMOVED])
913 remove (); 941 remove ();
942
943 attachable::do_destroy ();
914 944
915 destroy_inv (true); 945 destroy_inv (true);
916 946
917 deactivate (); 947 deactivate ();
918 unlink (); 948 unlink ();
929 959
930 freed_map->path = "<freed objects map>"; 960 freed_map->path = "<freed objects map>";
931 freed_map->name = "/internal/freed_objects_map"; 961 freed_map->name = "/internal/freed_objects_map";
932 freed_map->width = 3; 962 freed_map->width = 3;
933 freed_map->height = 3; 963 freed_map->height = 3;
964 freed_map->nodrop = 1;
934 965
935 freed_map->alloc (); 966 freed_map->alloc ();
936 freed_map->in_memory = MAP_IN_MEMORY; 967 freed_map->in_memory = MAP_ACTIVE;
937 } 968 }
938 969
939 map = freed_map; 970 map = freed_map;
940 x = 1; 971 x = 1;
941 y = 1; 972 y = 1;
970 play_sound (sound_destroy); 1001 play_sound (sound_destroy);
971 else if (flag [FLAG_MONSTER]) 1002 else if (flag [FLAG_MONSTER])
972 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 1003 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
973 1004
974 attachable::destroy (); 1005 attachable::destroy ();
975}
976
977/*
978 * sub_weight() recursively (outwards) subtracts a number from the
979 * weight of an object (and what is carried by it's environment(s)).
980 */
981void
982sub_weight (object *op, signed long weight)
983{
984 while (op != NULL)
985 {
986 if (op->type == CONTAINER)
987 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
988
989 op->carrying -= weight;
990 op = op->env;
991 }
992} 1006}
993 1007
994/* op->remove (): 1008/* op->remove ():
995 * This function removes the object op from the linked list of objects 1009 * This function removes the object op from the linked list of objects
996 * which it is currently tied to. When this function is done, the 1010 * which it is currently tied to. When this function is done, the
1002object::do_remove () 1016object::do_remove ()
1003{ 1017{
1004 object *tmp, *last = 0; 1018 object *tmp, *last = 0;
1005 object *otmp; 1019 object *otmp;
1006 1020
1007 if (QUERY_FLAG (this, FLAG_REMOVED)) 1021 if (flag [FLAG_REMOVED])
1008 return; 1022 return;
1009 1023
1010 SET_FLAG (this, FLAG_REMOVED);
1011 INVOKE_OBJECT (REMOVE, this); 1024 INVOKE_OBJECT (REMOVE, this);
1025
1026 if (object *pl = visible_to ())
1027 esrv_del_item (pl->contr, count);
1028
1029 flag [FLAG_REMOVED] = true;
1012 1030
1013 if (more) 1031 if (more)
1014 more->remove (); 1032 more->remove ();
1015 1033
1016 /* 1034 /*
1017 * In this case, the object to be removed is in someones 1035 * In this case, the object to be removed is in someones
1018 * inventory. 1036 * inventory.
1019 */ 1037 */
1020 if (env) 1038 if (env)
1021 { 1039 {
1040 adjust_weight (env, -total_weight ());
1041
1042 *(above ? &above->below : &env->inv) = below;
1043
1022 if (nrof) 1044 if (below)
1023 sub_weight (env, weight * nrof); 1045 below->above = above;
1024 else 1046
1025 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;
1026 1057
1027 /* 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
1028 * made to players inventory. If set, avoiding the call 1059 * made to players inventory. If set, avoiding the call
1029 * to save cpu time. 1060 * to save cpu time.
1030 */ 1061 */
1031 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))
1032 otmp->update_stats (); 1063 otmp->update_stats ();
1033
1034 if (above)
1035 above->below = below;
1036 else
1037 env->inv = below;
1038
1039 if (below)
1040 below->above = above;
1041
1042 /* we set up values so that it could be inserted into
1043 * the map, but we don't actually do that - it is up
1044 * to the caller to decide what we want to do.
1045 */
1046 x = env->x, y = env->y;
1047 map = env->map;
1048 above = 0, below = 0;
1049 env = 0;
1050 } 1064 }
1051 else if (map) 1065 else if (map)
1052 { 1066 {
1053 if (type == PLAYER) 1067 if (type == PLAYER)
1054 { 1068 {
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 {
1267 if (op->nrof && !(flag & INS_NO_MERGE)) 1281 if (op->nrof && !(flag & INS_NO_MERGE))
1268 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1282 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269 if (object::can_merge (op, tmp)) 1283 if (object::can_merge (op, tmp))
1270 { 1284 {
1271 op->nrof += tmp->nrof; 1285 op->nrof += tmp->nrof;
1272 tmp->destroy (); 1286 tmp->destroy (1);
1273 } 1287 }
1274 1288
1275 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 */
1276 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1290 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1277 1291
1457 * 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.
1458 */ 1472 */
1459void 1473void
1460replace_insert_ob_in_map (const char *arch_string, object *op) 1474replace_insert_ob_in_map (const char *arch_string, object *op)
1461{ 1475{
1462 object *tmp, *tmp1;
1463
1464 /* first search for itself and remove any old instances */ 1476 /* first search for itself and remove any old instances */
1465 1477
1466 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1478 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1467 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1479 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1468 tmp->destroy (); 1480 tmp->destroy (1);
1469 1481
1470 tmp1 = arch_to_object (archetype::find (arch_string)); 1482 object *tmp = arch_to_object (archetype::find (arch_string));
1471 1483
1472 tmp1->x = op->x; 1484 tmp->x = op->x;
1473 tmp1->y = op->y; 1485 tmp->y = op->y;
1486
1474 insert_ob_in_map (tmp1, op->map, op, 0); 1487 insert_ob_in_map (tmp, op->map, op, 0);
1475} 1488}
1476 1489
1477object * 1490object *
1478object::insert_at (object *where, object *originator, int flags) 1491object::insert_at (object *where, object *originator, int flags)
1479{ 1492{
1493 if (where->env)
1494 return where->env->insert (this);
1495 else
1480 return where->map->insert (this, where->x, where->y, originator, flags); 1496 return where->map->insert (this, where->x, where->y, originator, flags);
1481} 1497}
1482 1498
1483/* 1499// find player who can see this object
1484 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1485 * is returned contains nr objects, and the remaining parts contains
1486 * the rest (or is removed and freed if that number is 0).
1487 * On failure, NULL is returned, and the reason put into the
1488 * global static errmsg array.
1489 */
1490object * 1500object *
1491get_split_ob (object *orig_ob, uint32 nr) 1501object::visible_to () const
1492{ 1502{
1493 object *newob; 1503 if (!flag [FLAG_REMOVED])
1494 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1495
1496 if (orig_ob->nrof < nr)
1497 {
1498 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1499 return NULL;
1500 } 1504 {
1501 1505 // see if we are in a container of sorts
1502 newob = object_create_clone (orig_ob); 1506 if (env)
1503
1504 if ((orig_ob->nrof -= nr) < 1)
1505 orig_ob->destroy (1);
1506 else if (!is_removed)
1507 {
1508 if (orig_ob->env != NULL)
1509 sub_weight (orig_ob->env, orig_ob->weight * nr);
1510 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1511 {
1512 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1513 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1514 return NULL;
1515 } 1507 {
1516 } 1508 // the player inventory itself is always visible
1509 if (env->type == PLAYER)
1510 return env;
1517 1511
1518 newob->nrof = nr; 1512 // else a player could have our env open
1513 object *envest = env->outer_env ();
1519 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
1520 return newob; 1531 return 0;
1521} 1532}
1522 1533
1523/* 1534/*
1524 * decrease_ob_nr(object, number) decreases a specified number from 1535 * decrease(object, number) decreases a specified number from
1525 * 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
1526 * is subsequently removed and freed. 1537 * is subsequently removed and freed.
1527 * 1538 *
1528 * 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
1529 */ 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 */
1530object * 1573object *
1531decrease_ob_nr (object *op, uint32 i) 1574object::split (sint32 nr)
1532{ 1575{
1533 object *tmp; 1576 int have = number_of ();
1534 1577
1535 if (i == 0) /* objects with op->nrof require this check */ 1578 if (have < nr)
1536 return op; 1579 return 0;
1537 1580 else if (have == nr)
1538 if (i > op->nrof)
1539 i = op->nrof;
1540
1541 if (QUERY_FLAG (op, FLAG_REMOVED))
1542 op->nrof -= i;
1543 else if (op->env)
1544 { 1581 {
1545 /* is this object in the players inventory, or sub container
1546 * therein?
1547 */
1548 tmp = op->in_player ();
1549 /* nope. Is this a container the player has opened?
1550 * If so, set tmp to that player.
1551 * IMO, searching through all the players will mostly
1552 * likely be quicker than following op->env to the map,
1553 * and then searching the map for a player.
1554 */
1555 if (!tmp)
1556 for_all_players (pl)
1557 if (pl->ob->container == op->env)
1558 {
1559 tmp = pl->ob;
1560 break;
1561 }
1562
1563 if (i < op->nrof)
1564 {
1565 sub_weight (op->env, op->weight * i);
1566 op->nrof -= i;
1567 if (tmp)
1568 esrv_send_item (tmp, op);
1569 }
1570 else
1571 {
1572 op->remove (); 1582 remove ();
1573 op->nrof = 0; 1583 return this;
1574 if (tmp)
1575 esrv_del_item (tmp->contr, op->count);
1576 }
1577 } 1584 }
1578 else 1585 else
1579 { 1586 {
1580 object *above = op->above; 1587 decrease (nr);
1581 1588
1582 if (i < op->nrof) 1589 object *op = object_create_clone (this);
1583 op->nrof -= i; 1590 op->nrof = nr;
1584 else
1585 {
1586 op->remove ();
1587 op->nrof = 0;
1588 }
1589
1590 /* Since we just removed op, op->above is null */
1591 for (tmp = above; tmp; tmp = tmp->above)
1592 if (tmp->type == PLAYER)
1593 {
1594 if (op->nrof)
1595 esrv_send_item (tmp, op);
1596 else
1597 esrv_del_item (tmp->contr, op->count);
1598 }
1599 }
1600
1601 if (op->nrof)
1602 return op; 1591 return op;
1603 else
1604 {
1605 op->destroy ();
1606 return 0;
1607 }
1608}
1609
1610/*
1611 * add_weight(object, weight) adds the specified weight to an object,
1612 * and also updates how much the environment(s) is/are carrying.
1613 */
1614void
1615add_weight (object *op, signed long weight)
1616{
1617 while (op != NULL)
1618 {
1619 if (op->type == CONTAINER)
1620 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1621
1622 op->carrying += weight;
1623 op = op->env;
1624 } 1592 }
1625} 1593}
1626 1594
1627object * 1595object *
1628insert_ob_in_ob (object *op, object *where) 1596insert_ob_in_ob (object *op, object *where)
1653 * be != op, if items are merged. -Tero 1621 * be != op, if items are merged. -Tero
1654 */ 1622 */
1655object * 1623object *
1656object::insert (object *op) 1624object::insert (object *op)
1657{ 1625{
1658 if (!QUERY_FLAG (op, FLAG_REMOVED))
1659 op->remove ();
1660
1661 if (op->more) 1626 if (op->more)
1662 { 1627 {
1663 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);
1664 return op; 1629 return op;
1665 } 1630 }
1666 1631
1667 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1632 op->remove ();
1668 CLEAR_FLAG (op, FLAG_REMOVED); 1633
1634 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1669 1635
1670 if (op->nrof) 1636 if (op->nrof)
1671 {
1672 for (object *tmp = inv; tmp; tmp = tmp->below) 1637 for (object *tmp = inv; tmp; tmp = tmp->below)
1673 if (object::can_merge (tmp, op)) 1638 if (object::can_merge (tmp, op))
1674 { 1639 {
1675 /* return the original object and remove inserted object 1640 /* return the original object and remove inserted object
1676 (client needs the original object) */ 1641 (client needs the original object) */
1677 tmp->nrof += op->nrof; 1642 tmp->nrof += op->nrof;
1678 /* Weight handling gets pretty funky. Since we are adding to
1679 * tmp->nrof, we need to increase the weight.
1680 */
1681 add_weight (this, op->weight * op->nrof); 1643 adjust_weight (this, op->total_weight ());
1682 SET_FLAG (op, FLAG_REMOVED); 1644
1683 op->destroy (); /* free the inserted object */ 1645 op->destroy (1);
1684 op = tmp; 1646 op = tmp;
1685 op->remove (); /* and fix old object's links */ 1647 goto inserted;
1686 CLEAR_FLAG (op, FLAG_REMOVED);
1687 break;
1688 } 1648 }
1689 1649
1690 /* I assume combined objects have no inventory 1650 op->owner = 0; // it's his/hers now. period.
1691 * We add the weight - this object could have just been removed 1651 op->map = 0;
1692 * (if it was possible to merge). calling remove_ob will subtract 1652 op->x = 0;
1693 * the weight, so we need to add it in again, since we actually do 1653 op->y = 0;
1694 * the linking below
1695 */
1696 add_weight (this, op->weight * op->nrof);
1697 }
1698 else
1699 add_weight (this, (op->weight + op->carrying));
1700 1654
1655 op->above = 0;
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
1701 if (object *otmp = this->in_player ()) 1673 if (object *otmp = in_player ())
1702 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1674 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1703 otmp->update_stats (); 1675 otmp->update_stats ();
1704
1705 op->owner = 0; // its his/hers now. period.
1706 op->map = 0;
1707 op->env = this;
1708 op->above = 0;
1709 op->below = 0;
1710 op->x = op->y = 0;
1711
1712 /* reset the light list and los of the players on the map */
1713 if (op->glow_radius && map)
1714 {
1715#ifdef DEBUG_LIGHTS
1716 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1717#endif /* DEBUG_LIGHTS */
1718 if (map->darkness)
1719 update_all_los (map, x, y);
1720 }
1721
1722 /* Client has no idea of ordering so lets not bother ordering it here.
1723 * It sure simplifies this function...
1724 */
1725 if (!inv)
1726 inv = op;
1727 else
1728 {
1729 op->below = inv;
1730 op->below->above = op;
1731 inv = op;
1732 }
1733 1676
1734 INVOKE_OBJECT (INSERT, this); 1677 INVOKE_OBJECT (INSERT, this);
1735 1678
1736 return op; 1679 return op;
1737} 1680}
1952 * activate recursively a flag on an object inventory 1895 * activate recursively a flag on an object inventory
1953 */ 1896 */
1954void 1897void
1955flag_inv (object *op, int flag) 1898flag_inv (object *op, int flag)
1956{ 1899{
1957 if (op->inv)
1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1900 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 1901 {
1960 SET_FLAG (tmp, flag); 1902 SET_FLAG (tmp, flag);
1961 flag_inv (tmp, flag); 1903 flag_inv (tmp, flag);
1962 } 1904 }
1963} 1905}
1964 1906
1965/* 1907/*
1966 * deactivate recursively a flag on an object inventory 1908 * deactivate recursively a flag on an object inventory
1967 */ 1909 */
1968void 1910void
1969unflag_inv (object *op, int flag) 1911unflag_inv (object *op, int flag)
1970{ 1912{
1971 if (op->inv)
1972 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1913 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1973 { 1914 {
1974 CLEAR_FLAG (tmp, flag); 1915 CLEAR_FLAG (tmp, flag);
1975 unflag_inv (tmp, flag); 1916 unflag_inv (tmp, flag);
1976 } 1917 }
1977} 1918}
1978 1919
1979/* 1920/*
1980 * 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
1981 * 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
1983 * to search (see the freearr_x/y[] definition). 1924 * to search (see the freearr_x/y[] definition).
1984 * It returns a random choice among the alternatives found. 1925 * It returns a random choice among the alternatives found.
1985 * 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
1986 * does all 4 immediate directions). This returns the index into the 1927 * does all 4 immediate directions). This returns the index into the
1987 * 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)
1988 * Note - this only checks to see if there is space for the head of the
1989 * object - if it is a multispace object, this should be called for all
1990 * pieces.
1991 * Note2: This function does correctly handle tiled maps, but does not 1929 * Note: This function does correctly handle tiled maps, but does not
1992 * inform the caller. However, insert_ob_in_map will update as 1930 * inform the caller. However, insert_ob_in_map will update as
1993 * 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.
1994 * 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
1995 * 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
1996 * 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
2017 1955
2018 /* However, often 1956 /* However, often
2019 * ob doesn't have any move type (when used to place exits) 1957 * ob doesn't have any move type (when used to place exits)
2020 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 1958 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2021 */ 1959 */
2022 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 1960 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2023 { 1961 {
2024 altern [index++] = i; 1962 altern [index++] = i;
2025 continue; 1963 continue;
2026 } 1964 }
2027 1965
2041 1979
2042 /* Note it is intentional that we check ob - the movement type of the 1980 /* Note it is intentional that we check ob - the movement type of the
2043 * head of the object should correspond for the entire object. 1981 * head of the object should correspond for the entire object.
2044 */ 1982 */
2045 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 1983 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1984 continue;
1985
1986 if (ob->blocked (m, pos.x, pos.y))
2046 continue; 1987 continue;
2047 1988
2048 altern [index++] = i; 1989 altern [index++] = i;
2049 } 1990 }
2050 1991
2609{ 2550{
2610 char flagdesc[512]; 2551 char flagdesc[512];
2611 char info2[256 * 4]; 2552 char info2[256 * 4];
2612 char *p = info; 2553 char *p = info;
2613 2554
2614 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}",
2615 count, uuid.seq, 2556 count,
2557 uuid.c_str (),
2616 &name, 2558 &name,
2617 title ? "\",title:\"" : "", 2559 title ? "\",title:\"" : "",
2618 title ? (const char *)title : "", 2560 title ? (const char *)title : "",
2619 flag_desc (flagdesc, 512), type); 2561 flag_desc (flagdesc, 512), type);
2620 2562
2736 2678
2737 insert (force); 2679 insert (force);
2738} 2680}
2739 2681
2740void 2682void
2741object::play_sound (faceidx sound) const 2683object::play_sound (faceidx sound)
2742{ 2684{
2743 if (!sound) 2685 if (!sound)
2744 return; 2686 return;
2745 2687
2746 if (flag [FLAG_REMOVED]) 2688 if (flag [FLAG_REMOVED])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines