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.192 by root, Fri Oct 12 19:13:25 2007 UTC vs.
Revision 1.215 by root, Tue Apr 22 07:28:05 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27#include <global.h> 24#include <global.h>
28#include <stdio.h> 25#include <stdio.h>
29#include <sys/types.h> 26#include <sys/types.h>
30#include <sys/uio.h> 27#include <sys/uio.h>
31#include <object.h> 28#include <object.h>
32#include <funcpoint.h>
33#include <sproto.h> 29#include <sproto.h>
34#include <loader.h> 30#include <loader.h>
35 31
36#include <bitset> 32#include <bitset>
37 33
38int nrofallocobjects = 0; 34UUID UUID::cur;
39static UUID uuid; 35static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
41 37
42objectvec objects; 38objectvec objects;
43activevec actives; 39activevec actives;
44 40
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = {
42 0,
43 0, 1, 1, 1, 0, -1, -1, -1,
44 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 45 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 46};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 47short freearr_y[SIZEOFFREE] = {
48 0,
49 -1, -1, 0, 1, 1, 1, 0, -1,
50 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 51 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50}; 52};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 58};
54int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 0,
61 1, 2, 3, 4, 5, 6, 7, 8,
62 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 63 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 64};
58 65
59static void 66static void
60write_uuid (void) 67write_uuid (uval64 skip, bool sync)
61{ 68{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
63 70 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 73 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 74}
79 75
80static void 76static void
81read_uuid (void) 77read_uuid (void)
82{ 78{
83 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
84 80
85 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 seq_next_save = 0;
86 84
87 FILE *fp; 85 FILE *fp;
88 86
89 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
90 { 88 {
91 if (errno == ENOENT) 89 if (errno == ENOENT)
92 { 90 {
93 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 92 UUID::cur.seq = 0;
95 write_uuid (); 93 write_uuid (UUID_GAP, true);
96 return; 94 return;
97 } 95 }
98 96
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 98 _exit (1);
101 } 99 }
102 100
103 int version; 101 UUID::BUF buf;
104 unsigned long long uid; 102 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
106 { 106 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 108 _exit (1);
109 } 109 }
110 110
111 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 112
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
114 fclose (fp); 114 fclose (fp);
115} 115}
116 116
117UUID 117UUID
118gen_uuid () 118UUID::gen ()
119{ 119{
120 UUID uid; 120 UUID uid;
121 121
122 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
123 123
124 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
126 130
127 return uid; 131 return uid;
128} 132}
129 133
130void 134void
131init_uuid () 135UUID::init ()
132{ 136{
133 read_uuid (); 137 read_uuid ();
134} 138}
135 139
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137static int 141static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
139{ 143{
140 key_value *wants_field; 144 key_value *wants_field;
141 145
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 146 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
150 key_value *has_field; 154 key_value *has_field;
151 155
152 /* Look for a field in has with the same key. */ 156 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 157 has_field = get_ob_key_link (has, wants_field->key);
154 158
155 if (has_field == NULL) 159 if (!has_field)
156 {
157 /* No field with that name. */ 160 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 161
161 /* Found the matching field. */ 162 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 163 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */ 164 return 0; /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167 165
168 /* If we get here, we found a match. Now for the next field in wants. */ 166 /* If we get here, we found a match. Now for the next field in wants. */
169 } 167 }
170 168
171 /* If we get here, every field in wants has a matching field in has. */ 169 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 170 return 1;
173} 171}
174 172
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 173/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 174static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 175compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 176{
179 /* However, there may be fields in has which aren't partnered in wants, 177 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 178 * so we need to run the comparison *twice*. :(
181 */ 179 */
202 || ob1->speed != ob2->speed 200 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 201 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 202 || ob1->name != ob2->name)
205 return 0; 203 return 0;
206 204
207 //TODO: this ain't working well, use nicer and correct overflow check 205 /* Do not merge objects if nrof would overflow. First part checks
208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 206 * for unsigned overflow (2c), second part checks whether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 207 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 208 * nrof values.
211 */ 209 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 210 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 211 return 0;
214 212
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 213 /* If the objects have been identified, set the BEEN_APPLIED flag.
216 * This is to the comparison of the flags below will be OK. We 214 * This is to the comparison of the flags below will be OK. We
217 * just can't ignore the been applied or identified flags, as they 215 * just can't ignore the been applied or identified flags, as they
218 * are not equal - just if it has been identified, the been_applied 216 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 217 * flags lose any meaning.
220 */ 218 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 219 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 220 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 221
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 223 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 224
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 225 if (ob1->arch->name != ob2->arch->name
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 226 || ob1->name != ob2->name
230 || ob1->title != ob2->title 227 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 228 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 229 || ob1->weight != ob2->weight
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235 || ob1->attacktype != ob2->attacktype 230 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 231 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 232 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 233 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 234 || ob1->value != ob2->value
246 || ob1->move_block != ob2->move_block 241 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 242 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 243 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 244 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 245 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 246 || ob1->move_slow_penalty != ob2->move_slow_penalty
247 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 249 return 0;
253 250
251 if ((ob1->flag ^ ob2->flag)
252 .reset (FLAG_INV_LOCKED)
253 .reset (FLAG_CLIENT_SENT)
254 .reset (FLAG_REMOVED)
255 .any ())
256 return 0;
257
254 /* This is really a spellbook check - really, we should 258 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 259 * not merge objects with real inventories, as splitting them
260 * is hard.
256 */ 261 */
257 if (ob1->inv || ob2->inv) 262 if (ob1->inv || ob2->inv)
258 { 263 {
259 /* if one object has inventory but the other doesn't, not equiv */ 264 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 265 return 0; /* inventories differ in length */
261 return 0;
262 266
263 /* Now check to see if the two inventory objects could merge */ 267 if (ob1->inv->below || ob2->inv->below)
268 return 0; /* more than one object in inv */
269
264 if (!object::can_merge (ob1->inv, ob2->inv)) 270 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 271 return 0; /* inventory objects differ */
266 272
267 /* inventory ok - still need to check rest of this object to see 273 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 274 * if it is valid.
269 */ 275 */
270 } 276 }
289 if (ob1->level != ob2->level) 295 if (ob1->level != ob2->level)
290 return 0; 296 return 0;
291 break; 297 break;
292 } 298 }
293 299
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 300 if (ob1->key_values || ob2->key_values)
295 { 301 {
296 /* At least one of these has key_values. */ 302 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 303 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 304 return 0; /* One has fields, but the other one doesn't. */
299 return 0; 305
300 else if (!compare_ob_value_lists (ob1, ob2)) 306 if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 307 return 0;
302 } 308 }
303 309
304 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
305 { 311 {
306 ob1->optimise (); 312 ob1->optimise ();
307 ob2->optimise (); 313 ob2->optimise ();
308 314
309 if (ob1->self || ob2->self) 315 if (ob1->self || ob2->self)
310 { 316 {
311 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0; 317 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0; 318 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
313 319
314 if (k1 != k2) 320 if (k1 != k2)
315 return 0; 321 return 0;
322
316 else if (k1 == 0) 323 if (k1 == 0)
317 return 1; 324 return 1;
325
318 else if (!cfperl_can_merge (ob1, ob2)) 326 if (!cfperl_can_merge (ob1, ob2))
319 return 0; 327 return 0;
320 } 328 }
321 } 329 }
322 330
323 /* Everything passes, must be OK. */ 331 /* Everything passes, must be OK. */
324 return 1; 332 return 1;
325} 333}
326 334
335// find player who can see this object
336object *
337object::visible_to () const
338{
339 if (!flag [FLAG_REMOVED])
340 {
341 // see if we are in a container of sorts
342 if (env)
343 {
344 // the player inventory itself is always visible
345 if (env->type == PLAYER)
346 return env;
347
348 // else a player could have our env open
349 object *envest = env->outer_env ();
350
351 // the player itself is always on a map, so we will find him here
352 // even if our inv is in a player.
353 if (envest->is_on_map ())
354 if (object *pl = envest->ms ().player ())
355 if (pl->container == env)
356 return pl;
357 }
358 else
359 {
360 // maybe there is a player standing on the same mapspace
361 // this will catch the case where "this" is a player
362 if (object *pl = ms ().player ())
363 return pl;
364 }
365 }
366
367 return 0;
368}
369
370// adjust weight per container type ("of holding")
371static sint32
372weight_adjust (object *op, sint32 weight)
373{
374 return op->type == CONTAINER
375 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376 : weight;
377}
378
327/* 379/*
380 * adjust_weight(object, weight) adds the specified weight to an object,
381 * and also updates how much the environment(s) is/are carrying.
382 */
383static void
384adjust_weight (object *op, sint32 weight)
385{
386 while (op)
387 {
388 weight = weight_adjust (op, weight);
389
390 if (!weight)
391 return;
392
393 op->carrying += weight;
394
395 if (object *pl = op->visible_to ())
396 if (pl != op) // player is handled lazily
397 esrv_update_item (UPD_WEIGHT, pl, op);
398
399 op = op->env;
400 }
401}
402
403/*
328 * sum_weight() is a recursive function which calculates the weight 404 * this is a recursive function which calculates the weight
329 * an object is carrying. It goes through in figures out how much 405 * an object is carrying. It goes through op and figures out how much
330 * containers are carrying, and sums it up. 406 * containers are carrying, and sums it up.
331 */ 407 */
332long 408void
333sum_weight (object *op) 409object::update_weight ()
334{ 410{
335 long sum; 411 sint32 sum = 0;
336 object *inv;
337 412
338 for (sum = 0, inv = op->inv; inv; inv = inv->below) 413 for (object *op = inv; op; op = op->below)
339 { 414 {
340 if (inv->inv) 415 if (op->inv)
341 sum_weight (inv); 416 op->update_weight ();
342 417
343 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 418 sum += op->total_weight ();
419 }
420
421 sum = weight_adjust (this, sum);
422
423 if (sum != carrying)
344 } 424 {
345
346 if (op->type == CONTAINER && op->stats.Str)
347 sum = (sum * (100 - op->stats.Str)) / 100;
348
349 if (op->carrying != sum)
350 op->carrying = sum; 425 carrying = sum;
351 426
352 return sum; 427 if (object *pl = visible_to ())
428 if (pl != this) // player is handled lazily
429 esrv_update_item (UPD_WEIGHT, pl, this);
430 }
353} 431}
354 432
355/** 433/*
356 * Return the outermost environment object for a given object. 434 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
357 */
358
359object *
360object_get_env_recursive (object *op)
361{
362 while (op->env != NULL)
363 op = op->env;
364 return op;
365}
366
367/*
368 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
369 * Some error messages.
370 * The result of the dump is stored in the static global errmsg array.
371 */ 435 */
372char * 436char *
373dump_object (object *op) 437dump_object (object *op)
374{ 438{
375 if (!op) 439 if (!op)
389get_nearest_part (object *op, const object *pl) 453get_nearest_part (object *op, const object *pl)
390{ 454{
391 object *tmp, *closest; 455 object *tmp, *closest;
392 int last_dist, i; 456 int last_dist, i;
393 457
394 if (op->more == NULL) 458 if (!op->more)
395 return op; 459 return op;
460
396 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 461 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
462 tmp;
463 tmp = tmp->more)
397 if ((i = distance (tmp, pl)) < last_dist) 464 if ((i = distance (tmp, pl)) < last_dist)
398 closest = tmp, last_dist = i; 465 closest = tmp, last_dist = i;
466
399 return closest; 467 return closest;
400} 468}
401 469
402/* 470/*
403 * Returns the object which has the count-variable equal to the argument. 471 * Returns the object which has the count-variable equal to the argument.
472 * VERRRY slow.
404 */ 473 */
405object * 474object *
406find_object (tag_t i) 475find_object (tag_t i)
407{ 476{
408 for_all_objects (op) 477 for_all_objects (op)
426 for_all_objects (op) 495 for_all_objects (op)
427 if (op->name == str_) 496 if (op->name == str_)
428 break; 497 break;
429 498
430 return op; 499 return op;
431}
432
433void
434free_all_object_data ()
435{
436 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
437} 500}
438 501
439/* 502/*
440 * Sets the owner and sets the skill and exp pointers to owner's current 503 * Sets the owner and sets the skill and exp pointers to owner's current
441 * skill and experience objects. 504 * skill and experience objects.
446{ 509{
447 // allow objects which own objects 510 // allow objects which own objects
448 if (owner) 511 if (owner)
449 while (owner->owner) 512 while (owner->owner)
450 owner = owner->owner; 513 owner = owner->owner;
514
515 if (flag [FLAG_FREED])
516 {
517 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
518 return;
519 }
451 520
452 this->owner = owner; 521 this->owner = owner;
453} 522}
454 523
455int 524int
596 665
597void 666void
598object::instantiate () 667object::instantiate ()
599{ 668{
600 if (!uuid.seq) // HACK 669 if (!uuid.seq) // HACK
601 uuid = gen_uuid (); 670 uuid = UUID::gen ();
602 671
603 speed_left = -0.1f; 672 speed_left = -0.1f;
604 /* copy the body_info to the body_used - this is only really 673 /* copy the body_info to the body_used - this is only really
605 * need for monsters, but doesn't hurt to do it for everything. 674 * need for monsters, but doesn't hurt to do it for everything.
606 * by doing so, when a monster is created, it has good starting 675 * by doing so, when a monster is created, it has good starting
765static int object_count; 834static int object_count;
766 835
767void object::link () 836void object::link ()
768{ 837{
769 assert (!index);//D 838 assert (!index);//D
770 uuid = gen_uuid (); 839 uuid = UUID::gen ();
771 count = ++object_count; 840 count = ++object_count;
772 841
773 refcnt_inc (); 842 refcnt_inc ();
774 objects.insert (this); 843 objects.insert (this);
775} 844}
859 * if some form of movement is allowed, let objects 928 * if some form of movement is allowed, let objects
860 * drop on that space. 929 * drop on that space.
861 */ 930 */
862 if (!drop_to_ground 931 if (!drop_to_ground
863 || !map 932 || !map
864 || map->in_memory != MAP_IN_MEMORY 933 || map->in_memory != MAP_ACTIVE
865 || map->nodrop 934 || map->nodrop
866 || ms ().move_block == MOVE_ALL) 935 || ms ().move_block == MOVE_ALL)
867 { 936 {
868 while (inv) 937 while (inv)
869 { 938 {
898} 967}
899 968
900void 969void
901object::do_destroy () 970object::do_destroy ()
902{ 971{
903 attachable::do_destroy ();
904
905 if (flag [FLAG_IS_LINKED]) 972 if (flag [FLAG_IS_LINKED])
906 remove_button_link (this); 973 remove_button_link (this);
907 974
908 if (flag [FLAG_FRIENDLY]) 975 if (flag [FLAG_FRIENDLY])
909 remove_friendly_object (this); 976 remove_friendly_object (this);
910 977
911 if (!flag [FLAG_REMOVED])
912 remove (); 978 remove ();
979
980 attachable::do_destroy ();
913 981
914 destroy_inv (true); 982 destroy_inv (true);
915 983
916 deactivate (); 984 deactivate ();
917 unlink (); 985 unlink ();
928 996
929 freed_map->path = "<freed objects map>"; 997 freed_map->path = "<freed objects map>";
930 freed_map->name = "/internal/freed_objects_map"; 998 freed_map->name = "/internal/freed_objects_map";
931 freed_map->width = 3; 999 freed_map->width = 3;
932 freed_map->height = 3; 1000 freed_map->height = 3;
1001 freed_map->nodrop = 1;
933 1002
934 freed_map->alloc (); 1003 freed_map->alloc ();
935 freed_map->in_memory = MAP_IN_MEMORY; 1004 freed_map->in_memory = MAP_ACTIVE;
936 } 1005 }
937 1006
938 map = freed_map; 1007 map = freed_map;
939 x = 1; 1008 x = 1;
940 y = 1; 1009 y = 1;
969 play_sound (sound_destroy); 1038 play_sound (sound_destroy);
970 else if (flag [FLAG_MONSTER]) 1039 else if (flag [FLAG_MONSTER])
971 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 1040 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
972 1041
973 attachable::destroy (); 1042 attachable::destroy ();
974}
975
976/*
977 * sub_weight() recursively (outwards) subtracts a number from the
978 * weight of an object (and what is carried by it's environment(s)).
979 */
980void
981sub_weight (object *op, signed long weight)
982{
983 while (op != NULL)
984 {
985 if (op->type == CONTAINER)
986 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
987
988 op->carrying -= weight;
989 op = op->env;
990 }
991} 1043}
992 1044
993/* op->remove (): 1045/* op->remove ():
994 * This function removes the object op from the linked list of objects 1046 * This function removes the object op from the linked list of objects
995 * which it is currently tied to. When this function is done, the 1047 * which it is currently tied to. When this function is done, the
1001object::do_remove () 1053object::do_remove ()
1002{ 1054{
1003 object *tmp, *last = 0; 1055 object *tmp, *last = 0;
1004 object *otmp; 1056 object *otmp;
1005 1057
1006 if (QUERY_FLAG (this, FLAG_REMOVED)) 1058 if (flag [FLAG_REMOVED])
1007 return; 1059 return;
1008 1060
1009 SET_FLAG (this, FLAG_REMOVED);
1010 INVOKE_OBJECT (REMOVE, this); 1061 INVOKE_OBJECT (REMOVE, this);
1062
1063 if (object *pl = visible_to ())
1064 esrv_del_item (pl->contr, count);
1065
1066 flag [FLAG_REMOVED] = true;
1011 1067
1012 if (more) 1068 if (more)
1013 more->remove (); 1069 more->remove ();
1014 1070
1015 /* 1071 /*
1016 * In this case, the object to be removed is in someones 1072 * In this case, the object to be removed is in someones
1017 * inventory. 1073 * inventory.
1018 */ 1074 */
1019 if (env) 1075 if (env)
1020 { 1076 {
1077 adjust_weight (env, -total_weight ());
1078
1079 *(above ? &above->below : &env->inv) = below;
1080
1021 if (nrof) 1081 if (below)
1022 sub_weight (env, weight * nrof); 1082 below->above = above;
1023 else 1083
1024 sub_weight (env, weight + carrying); 1084 /* we set up values so that it could be inserted into
1085 * the map, but we don't actually do that - it is up
1086 * to the caller to decide what we want to do.
1087 */
1088 map = env->map;
1089 x = env->x;
1090 y = env->y;
1091 above = 0;
1092 below = 0;
1093 env = 0;
1025 1094
1026 /* NO_FIX_PLAYER is set when a great many changes are being 1095 /* NO_FIX_PLAYER is set when a great many changes are being
1027 * made to players inventory. If set, avoiding the call 1096 * made to players inventory. If set, avoiding the call
1028 * to save cpu time. 1097 * to save cpu time.
1029 */ 1098 */
1030 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1099 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1031 otmp->update_stats (); 1100 otmp->update_stats ();
1032
1033 if (above)
1034 above->below = below;
1035 else
1036 env->inv = below;
1037
1038 if (below)
1039 below->above = above;
1040
1041 /* we set up values so that it could be inserted into
1042 * the map, but we don't actually do that - it is up
1043 * to the caller to decide what we want to do.
1044 */
1045 x = env->x, y = env->y;
1046 map = env->map;
1047 above = 0, below = 0;
1048 env = 0;
1049 } 1101 }
1050 else if (map) 1102 else if (map)
1051 { 1103 {
1052 if (type == PLAYER) 1104 if (type == PLAYER)
1053 { 1105 {
1149merge_ob (object *op, object *top) 1201merge_ob (object *op, object *top)
1150{ 1202{
1151 if (!op->nrof) 1203 if (!op->nrof)
1152 return 0; 1204 return 0;
1153 1205
1154 if (top) 1206 if (!top)
1155 for (top = op; top && top->above; top = top->above) 1207 for (top = op; top && top->above; top = top->above)
1156 ; 1208 ;
1157 1209
1158 for (; top; top = top->below) 1210 for (; top; top = top->below)
1159 {
1160 if (top == op)
1161 continue;
1162
1163 if (object::can_merge (op, top)) 1211 if (object::can_merge (op, top))
1164 { 1212 {
1165 top->nrof += op->nrof; 1213 top->nrof += op->nrof;
1166 1214
1167/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1215 if (object *pl = top->visible_to ())
1168 op->weight = 0; /* Don't want any adjustements now */ 1216 esrv_update_item (UPD_NROF, pl, top);
1217
1218 op->weight = 0; // cancel the addition above
1219 op->carrying = 0; // must be 0 already
1220
1169 op->destroy (); 1221 op->destroy (1);
1222
1170 return top; 1223 return top;
1171 } 1224 }
1172 }
1173 1225
1174 return 0; 1226 return 0;
1175} 1227}
1176 1228
1177void 1229void
1266 if (op->nrof && !(flag & INS_NO_MERGE)) 1318 if (op->nrof && !(flag & INS_NO_MERGE))
1267 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1319 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1268 if (object::can_merge (op, tmp)) 1320 if (object::can_merge (op, tmp))
1269 { 1321 {
1270 op->nrof += tmp->nrof; 1322 op->nrof += tmp->nrof;
1271 tmp->destroy (); 1323 tmp->destroy (1);
1272 } 1324 }
1273 1325
1274 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1326 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1275 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1327 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1276 1328
1456 * op is the object to insert it under: supplies x and the map. 1508 * op is the object to insert it under: supplies x and the map.
1457 */ 1509 */
1458void 1510void
1459replace_insert_ob_in_map (const char *arch_string, object *op) 1511replace_insert_ob_in_map (const char *arch_string, object *op)
1460{ 1512{
1461 object *tmp, *tmp1;
1462
1463 /* first search for itself and remove any old instances */ 1513 /* first search for itself and remove any old instances */
1464 1514
1465 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1515 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1466 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1516 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1467 tmp->destroy (); 1517 tmp->destroy (1);
1468 1518
1469 tmp1 = arch_to_object (archetype::find (arch_string)); 1519 object *tmp = arch_to_object (archetype::find (arch_string));
1470 1520
1471 tmp1->x = op->x; 1521 tmp->x = op->x;
1472 tmp1->y = op->y; 1522 tmp->y = op->y;
1523
1473 insert_ob_in_map (tmp1, op->map, op, 0); 1524 insert_ob_in_map (tmp, op->map, op, 0);
1474} 1525}
1475 1526
1476object * 1527object *
1477object::insert_at (object *where, object *originator, int flags) 1528object::insert_at (object *where, object *originator, int flags)
1478{ 1529{
1530 if (where->env)
1531 return where->env->insert (this);
1532 else
1479 return where->map->insert (this, where->x, where->y, originator, flags); 1533 return where->map->insert (this, where->x, where->y, originator, flags);
1480} 1534}
1481 1535
1482/* 1536/*
1483 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1484 * is returned contains nr objects, and the remaining parts contains
1485 * the rest (or is removed and freed if that number is 0).
1486 * On failure, NULL is returned, and the reason put into the
1487 * global static errmsg array.
1488 */
1489object *
1490get_split_ob (object *orig_ob, uint32 nr)
1491{
1492 object *newob;
1493 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1494
1495 if (orig_ob->nrof < nr)
1496 {
1497 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1498 return NULL;
1499 }
1500
1501 newob = object_create_clone (orig_ob);
1502
1503 if ((orig_ob->nrof -= nr) < 1)
1504 orig_ob->destroy (1);
1505 else if (!is_removed)
1506 {
1507 if (orig_ob->env != NULL)
1508 sub_weight (orig_ob->env, orig_ob->weight * nr);
1509 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1510 {
1511 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1512 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1513 return NULL;
1514 }
1515 }
1516
1517 newob->nrof = nr;
1518
1519 return newob;
1520}
1521
1522/*
1523 * decrease_ob_nr(object, number) decreases a specified number from 1537 * decrease(object, number) decreases a specified number from
1524 * the amount of an object. If the amount reaches 0, the object 1538 * the amount of an object. If the amount reaches 0, the object
1525 * is subsequently removed and freed. 1539 * is subsequently removed and freed.
1526 * 1540 *
1527 * Return value: 'op' if something is left, NULL if the amount reached 0 1541 * Return value: 'op' if something is left, NULL if the amount reached 0
1528 */ 1542 */
1543bool
1544object::decrease (sint32 nr)
1545{
1546 if (!nr)
1547 return true;
1548
1549 nr = min (nr, nrof);
1550
1551 nrof -= nr;
1552
1553 if (nrof)
1554 {
1555 adjust_weight (env, -weight * nr); // carrying == 0
1556
1557 if (object *pl = visible_to ())
1558 esrv_update_item (UPD_NROF, pl, this);
1559
1560 return true;
1561 }
1562 else
1563 {
1564 destroy (1);
1565 return false;
1566 }
1567}
1568
1569/*
1570 * split(ob,nr) splits up ob into two parts. The part which
1571 * is returned contains nr objects, and the remaining parts contains
1572 * the rest (or is removed and returned if that number is 0).
1573 * On failure, NULL is returned.
1574 */
1529object * 1575object *
1530decrease_ob_nr (object *op, uint32 i) 1576object::split (sint32 nr)
1531{ 1577{
1532 object *tmp; 1578 int have = number_of ();
1533 1579
1534 if (i == 0) /* objects with op->nrof require this check */ 1580 if (have < nr)
1535 return op; 1581 return 0;
1536 1582 else if (have == nr)
1537 if (i > op->nrof)
1538 i = op->nrof;
1539
1540 if (QUERY_FLAG (op, FLAG_REMOVED))
1541 op->nrof -= i;
1542 else if (op->env)
1543 { 1583 {
1544 /* is this object in the players inventory, or sub container
1545 * therein?
1546 */
1547 tmp = op->in_player ();
1548 /* nope. Is this a container the player has opened?
1549 * If so, set tmp to that player.
1550 * IMO, searching through all the players will mostly
1551 * likely be quicker than following op->env to the map,
1552 * and then searching the map for a player.
1553 */
1554 if (!tmp)
1555 for_all_players (pl)
1556 if (pl->ob->container == op->env)
1557 {
1558 tmp = pl->ob;
1559 break;
1560 }
1561
1562 if (i < op->nrof)
1563 {
1564 sub_weight (op->env, op->weight * i);
1565 op->nrof -= i;
1566 if (tmp)
1567 esrv_send_item (tmp, op);
1568 }
1569 else
1570 {
1571 op->remove (); 1584 remove ();
1572 op->nrof = 0; 1585 return this;
1573 if (tmp)
1574 esrv_del_item (tmp->contr, op->count);
1575 }
1576 } 1586 }
1577 else 1587 else
1578 { 1588 {
1579 object *above = op->above; 1589 decrease (nr);
1580 1590
1581 if (i < op->nrof) 1591 object *op = object_create_clone (this);
1582 op->nrof -= i; 1592 op->nrof = nr;
1583 else
1584 {
1585 op->remove ();
1586 op->nrof = 0;
1587 }
1588
1589 /* Since we just removed op, op->above is null */
1590 for (tmp = above; tmp; tmp = tmp->above)
1591 if (tmp->type == PLAYER)
1592 {
1593 if (op->nrof)
1594 esrv_send_item (tmp, op);
1595 else
1596 esrv_del_item (tmp->contr, op->count);
1597 }
1598 }
1599
1600 if (op->nrof)
1601 return op; 1593 return op;
1602 else
1603 {
1604 op->destroy ();
1605 return 0;
1606 }
1607}
1608
1609/*
1610 * add_weight(object, weight) adds the specified weight to an object,
1611 * and also updates how much the environment(s) is/are carrying.
1612 */
1613void
1614add_weight (object *op, signed long weight)
1615{
1616 while (op != NULL)
1617 {
1618 if (op->type == CONTAINER)
1619 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1620
1621 op->carrying += weight;
1622 op = op->env;
1623 } 1594 }
1624} 1595}
1625 1596
1626object * 1597object *
1627insert_ob_in_ob (object *op, object *where) 1598insert_ob_in_ob (object *op, object *where)
1652 * be != op, if items are merged. -Tero 1623 * be != op, if items are merged. -Tero
1653 */ 1624 */
1654object * 1625object *
1655object::insert (object *op) 1626object::insert (object *op)
1656{ 1627{
1657 if (!QUERY_FLAG (op, FLAG_REMOVED))
1658 op->remove ();
1659
1660 if (op->more) 1628 if (op->more)
1661 { 1629 {
1662 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1630 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1663 return op; 1631 return op;
1664 } 1632 }
1665 1633
1666 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1634 op->remove ();
1667 CLEAR_FLAG (op, FLAG_REMOVED); 1635
1636 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1668 1637
1669 if (op->nrof) 1638 if (op->nrof)
1670 {
1671 for (object *tmp = inv; tmp; tmp = tmp->below) 1639 for (object *tmp = inv; tmp; tmp = tmp->below)
1672 if (object::can_merge (tmp, op)) 1640 if (object::can_merge (tmp, op))
1673 { 1641 {
1674 /* return the original object and remove inserted object 1642 /* return the original object and remove inserted object
1675 (client needs the original object) */ 1643 (client needs the original object) */
1676 tmp->nrof += op->nrof; 1644 tmp->nrof += op->nrof;
1677 /* Weight handling gets pretty funky. Since we are adding to 1645
1678 * tmp->nrof, we need to increase the weight. 1646 if (object *pl = tmp->visible_to ())
1679 */ 1647 esrv_update_item (UPD_NROF, pl, tmp);
1648
1680 add_weight (this, op->weight * op->nrof); 1649 adjust_weight (this, op->total_weight ());
1681 SET_FLAG (op, FLAG_REMOVED); 1650
1682 op->destroy (); /* free the inserted object */ 1651 op->destroy (1);
1683 op = tmp; 1652 op = tmp;
1684 op->remove (); /* and fix old object's links */ 1653 goto inserted;
1685 CLEAR_FLAG (op, FLAG_REMOVED);
1686 break;
1687 } 1654 }
1688 1655
1689 /* I assume combined objects have no inventory
1690 * We add the weight - this object could have just been removed
1691 * (if it was possible to merge). calling remove_ob will subtract
1692 * the weight, so we need to add it in again, since we actually do
1693 * the linking below
1694 */
1695 add_weight (this, op->weight * op->nrof);
1696 }
1697 else
1698 add_weight (this, (op->weight + op->carrying));
1699
1700 if (object *otmp = this->in_player ())
1701 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1702 otmp->update_stats ();
1703
1704 op->owner = 0; // its his/hers now. period. 1656 op->owner = 0; // it's his/hers now. period.
1705 op->map = 0; 1657 op->map = 0;
1658 op->x = 0;
1659 op->y = 0;
1660
1661 op->above = 0;
1662 op->below = inv;
1706 op->env = this; 1663 op->env = this;
1707 op->above = 0;
1708 op->below = 0;
1709 op->x = op->y = 0;
1710 1664
1665 if (inv)
1666 inv->above = op;
1667
1668 inv = op;
1669
1670 op->flag [FLAG_REMOVED] = 0;
1671
1672 if (object *pl = op->visible_to ())
1673 esrv_send_item (pl, op);
1674
1675 adjust_weight (this, op->total_weight ());
1676
1677inserted:
1711 /* reset the light list and los of the players on the map */ 1678 /* reset the light list and los of the players on the map */
1712 if (op->glow_radius && map) 1679 if (op->glow_radius && map && map->darkness)
1713 {
1714#ifdef DEBUG_LIGHTS
1715 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1716#endif /* DEBUG_LIGHTS */
1717 if (map->darkness)
1718 update_all_los (map, x, y); 1680 update_all_los (map, x, y);
1719 }
1720 1681
1721 /* Client has no idea of ordering so lets not bother ordering it here. 1682 // if this is a player's inventory, update stats
1722 * It sure simplifies this function... 1683 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1723 */ 1684 update_stats ();
1724 if (!inv)
1725 inv = op;
1726 else
1727 {
1728 op->below = inv;
1729 op->below->above = op;
1730 inv = op;
1731 }
1732 1685
1733 INVOKE_OBJECT (INSERT, this); 1686 INVOKE_OBJECT (INSERT, this);
1734 1687
1735 return op; 1688 return op;
1736} 1689}
1951 * activate recursively a flag on an object inventory 1904 * activate recursively a flag on an object inventory
1952 */ 1905 */
1953void 1906void
1954flag_inv (object *op, int flag) 1907flag_inv (object *op, int flag)
1955{ 1908{
1956 if (op->inv)
1957 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1909 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1958 { 1910 {
1959 SET_FLAG (tmp, flag); 1911 SET_FLAG (tmp, flag);
1960 flag_inv (tmp, flag); 1912 flag_inv (tmp, flag);
1961 } 1913 }
1962} 1914}
1963 1915
1964/* 1916/*
1965 * deactivate recursively a flag on an object inventory 1917 * deactivate recursively a flag on an object inventory
1966 */ 1918 */
1967void 1919void
1968unflag_inv (object *op, int flag) 1920unflag_inv (object *op, int flag)
1969{ 1921{
1970 if (op->inv)
1971 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1922 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1972 { 1923 {
1973 CLEAR_FLAG (tmp, flag); 1924 CLEAR_FLAG (tmp, flag);
1974 unflag_inv (tmp, flag); 1925 unflag_inv (tmp, flag);
1975 } 1926 }
1976} 1927}
1977 1928
1978/* 1929/*
1979 * find_free_spot(object, map, x, y, start, stop) will search for 1930 * find_free_spot(object, map, x, y, start, stop) will search for
1980 * a spot at the given map and coordinates which will be able to contain 1931 * a spot at the given map and coordinates which will be able to contain
1982 * to search (see the freearr_x/y[] definition). 1933 * to search (see the freearr_x/y[] definition).
1983 * It returns a random choice among the alternatives found. 1934 * It returns a random choice among the alternatives found.
1984 * start and stop are where to start relative to the free_arr array (1,9 1935 * start and stop are where to start relative to the free_arr array (1,9
1985 * does all 4 immediate directions). This returns the index into the 1936 * does all 4 immediate directions). This returns the index into the
1986 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1937 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1987 * Note - this only checks to see if there is space for the head of the
1988 * object - if it is a multispace object, this should be called for all
1989 * pieces.
1990 * Note2: This function does correctly handle tiled maps, but does not 1938 * Note: This function does correctly handle tiled maps, but does not
1991 * inform the caller. However, insert_ob_in_map will update as 1939 * inform the caller. However, insert_ob_in_map will update as
1992 * necessary, so the caller shouldn't need to do any special work. 1940 * necessary, so the caller shouldn't need to do any special work.
1993 * Note - updated to take an object instead of archetype - this is necessary 1941 * Note - updated to take an object instead of archetype - this is necessary
1994 * because arch_blocked (now ob_blocked) needs to know the movement type 1942 * because arch_blocked (now ob_blocked) needs to know the movement type
1995 * to know if the space in question will block the object. We can't use 1943 * to know if the space in question will block the object. We can't use
2016 1964
2017 /* However, often 1965 /* However, often
2018 * ob doesn't have any move type (when used to place exits) 1966 * ob doesn't have any move type (when used to place exits)
2019 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 1967 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2020 */ 1968 */
2021 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 1969 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022 { 1970 {
2023 altern [index++] = i; 1971 altern [index++] = i;
2024 continue; 1972 continue;
2025 } 1973 }
2026 1974
2040 1988
2041 /* Note it is intentional that we check ob - the movement type of the 1989 /* Note it is intentional that we check ob - the movement type of the
2042 * head of the object should correspond for the entire object. 1990 * head of the object should correspond for the entire object.
2043 */ 1991 */
2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 1992 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1993 continue;
1994
1995 if (ob->blocked (m, pos.x, pos.y))
2045 continue; 1996 continue;
2046 1997
2047 altern [index++] = i; 1998 altern [index++] = i;
2048 } 1999 }
2049 2000
2608{ 2559{
2609 char flagdesc[512]; 2560 char flagdesc[512];
2610 char info2[256 * 4]; 2561 char info2[256 * 4];
2611 char *p = info; 2562 char *p = info;
2612 2563
2613 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2564 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2614 count, uuid.seq, 2565 count,
2566 uuid.c_str (),
2615 &name, 2567 &name,
2616 title ? "\",title:\"" : "", 2568 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "", 2569 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type); 2570 flag_desc (flagdesc, 512), type);
2619 2571
2735 2687
2736 insert (force); 2688 insert (force);
2737} 2689}
2738 2690
2739void 2691void
2740object::play_sound (faceidx sound) const 2692object::play_sound (faceidx sound)
2741{ 2693{
2742 if (!sound) 2694 if (!sound)
2743 return; 2695 return;
2744 2696
2745 if (flag [FLAG_REMOVED]) 2697 if (flag [FLAG_REMOVED])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines