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.187 by root, Tue Sep 4 08:42:55 2007 UTC vs.
Revision 1.211 by root, Mon Apr 21 21:32:32 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>
33#include <sproto.h> 30#include <sproto.h>
34#include <loader.h> 31#include <loader.h>
35 32
36#include <bitset> 33#include <bitset>
37 34
38int nrofallocobjects = 0; 35UUID UUID::cur;
39static UUID uuid; 36static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
41 38
42objectvec objects; 39objectvec objects;
43activevec actives; 40activevec actives;
44 41
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 42short freearr_x[SIZEOFFREE] = {
43 0,
44 0, 1, 1, 1, 0, -1, -1, -1,
45 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 47};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 48short freearr_y[SIZEOFFREE] = {
49 0,
50 -1, -1, 0, 1, 1, 1, 0, -1,
51 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 52 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50}; 53};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 58 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 59};
54int freedir[SIZEOFFREE] = { 60int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 61 0,
62 1, 2, 3, 4, 5, 6, 7, 8,
63 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 64 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 65};
58 66
59static void 67static void
60write_uuid (void) 68write_uuid (uval64 skip, bool sync)
61{ 69{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 70 CALL_BEGIN (2);
63 71 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 72 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 73 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 74 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 75}
79 76
80static void 77static void
81read_uuid (void) 78read_uuid (void)
82{ 79{
83 char filename[MAX_BUF]; 80 char filename[MAX_BUF];
84 81
85 sprintf (filename, "%s/uuid", settings.localdir); 82 sprintf (filename, "%s/uuid", settings.localdir);
86 83
84 seq_next_save = 0;
85
87 FILE *fp; 86 FILE *fp;
88 87
89 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
90 { 89 {
91 if (errno == ENOENT) 90 if (errno == ENOENT)
92 { 91 {
93 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 93 UUID::cur.seq = 0;
95 write_uuid (); 94 write_uuid (UUID_GAP, true);
96 return; 95 return;
97 } 96 }
98 97
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 99 _exit (1);
101 } 100 }
102 101
103 int version; 102 UUID::BUF buf;
104 unsigned long long uid; 103 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 104 fgets (buf, sizeof (buf), fp);
105
106 if (!UUID::cur.parse (buf))
106 { 107 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 108 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 109 _exit (1);
109 } 110 }
110 111
111 uuid.seq = uid; 112 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 113
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 114 write_uuid (UUID_GAP, true);
114 fclose (fp); 115 fclose (fp);
115} 116}
116 117
117UUID 118UUID
118gen_uuid () 119UUID::gen ()
119{ 120{
120 UUID uid; 121 UUID uid;
121 122
122 uid.seq = ++uuid.seq; 123 uid.seq = ++cur.seq;
123 124
124 if (!(uuid.seq & (UUID_SKIP - 1))) 125 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 126 {
127 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
128 write_uuid (UUID_GAP, false);
129 }
130
126 131
127 return uid; 132 return uid;
128} 133}
129 134
130void 135void
131init_uuid () 136UUID::init ()
132{ 137{
133 read_uuid (); 138 read_uuid ();
134} 139}
135 140
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 141/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137static int 142static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 143compare_ob_value_lists_one (const object *wants, const object *has)
139{ 144{
140 key_value *wants_field; 145 key_value *wants_field;
141 146
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 147 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
150 key_value *has_field; 155 key_value *has_field;
151 156
152 /* Look for a field in has with the same key. */ 157 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key); 158 has_field = get_ob_key_link (has, wants_field->key);
154 159
155 if (has_field == NULL) 160 if (!has_field)
156 {
157 /* No field with that name. */ 161 return 0; /* No field with that name. */
158 return FALSE;
159 }
160 162
161 /* Found the matching field. */ 163 /* Found the matching field. */
162 if (has_field->value != wants_field->value) 164 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */ 165 return 0; /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167 166
168 /* If we get here, we found a match. Now for the next field in wants. */ 167 /* If we get here, we found a match. Now for the next field in wants. */
169 } 168 }
170 169
171 /* If we get here, every field in wants has a matching field in has. */ 170 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 171 return 1;
173} 172}
174 173
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 174/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 175static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 176compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 177{
179 /* However, there may be fields in has which aren't partnered in wants, 178 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 179 * so we need to run the comparison *twice*. :(
181 */ 180 */
202 || ob1->speed != ob2->speed 201 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 202 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 203 || ob1->name != ob2->name)
205 return 0; 204 return 0;
206 205
207 //TODO: this ain't working well, use nicer and correct overflow check 206 /* Do not merge objects if nrof would overflow. First part checks
208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 * for unsigned overflow (2c), second part checks whether the result
209 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * would fit into a 32 bit signed int, which is often used to hold
210 * used to store nrof). 209 * nrof values.
211 */ 210 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213 return 0; 212 return 0;
214 213
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 214 /* If the objects have been identified, set the BEEN_APPLIED flag.
216 * This is to the comparison of the flags below will be OK. We 215 * This is to the comparison of the flags below will be OK. We
217 * just can't ignore the been applied or identified flags, as they 216 * just can't ignore the been applied or identified flags, as they
218 * are not equal - just if it has been identified, the been_applied 217 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 218 * flags lose any meaning.
220 */ 219 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 220 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 222
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 225
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 226 if (ob1->arch->name != ob2->arch->name
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 227 || ob1->name != ob2->name
230 || ob1->title != ob2->title 228 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 229 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 230 || ob1->weight != ob2->weight
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235 || ob1->attacktype != ob2->attacktype 231 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 232 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 233 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 234 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 235 || ob1->value != ob2->value
246 || ob1->move_block != ob2->move_block 242 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 243 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 244 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 245 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 246 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 247 || ob1->move_slow_penalty != ob2->move_slow_penalty
248 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
249 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 250 return 0;
253 251
252 if ((ob1->flag ^ ob2->flag)
253 .reset (FLAG_INV_LOCKED)
254 .reset (FLAG_CLIENT_SENT)
255 .reset (FLAG_REMOVED)
256 .any ())
257 return 0;
258
254 /* This is really a spellbook check - really, we should 259 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 260 * not merge objects with real inventories, as splitting them
261 * is hard.
256 */ 262 */
257 if (ob1->inv || ob2->inv) 263 if (ob1->inv || ob2->inv)
258 { 264 {
259 /* if one object has inventory but the other doesn't, not equiv */ 265 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 266 return 0; /* inventories differ in length */
261 return 0;
262 267
263 /* Now check to see if the two inventory objects could merge */ 268 if (ob1->inv->below || ob2->inv->below)
269 return 0; /* more than one object in inv */
270
264 if (!object::can_merge (ob1->inv, ob2->inv)) 271 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 272 return 0; /* inventory objects differ */
266 273
267 /* inventory ok - still need to check rest of this object to see 274 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 275 * if it is valid.
269 */ 276 */
270 } 277 }
289 if (ob1->level != ob2->level) 296 if (ob1->level != ob2->level)
290 return 0; 297 return 0;
291 break; 298 break;
292 } 299 }
293 300
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 301 if (ob1->key_values || ob2->key_values)
295 { 302 {
296 /* At least one of these has key_values. */ 303 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 304 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 305 return 0; /* One has fields, but the other one doesn't. */
299 return 0; 306
300 else if (!compare_ob_value_lists (ob1, ob2)) 307 if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 308 return 0;
302 } 309 }
303 310
304 if (ob1->self || ob2->self) 311 if (ob1->self || ob2->self)
305 { 312 {
306 ob1->optimise (); 313 ob1->optimise ();
307 ob2->optimise (); 314 ob2->optimise ();
308 315
309 if (ob1->self || ob2->self) 316 if (ob1->self || ob2->self)
317 {
318 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
319 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
320
321 if (k1 != k2)
322 return 0;
323
324 if (k1 == 0)
325 return 1;
326
310 if (!cfperl_can_merge (ob1, ob2)) 327 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 328 return 0;
329 }
312 } 330 }
313 331
314 /* Everything passes, must be OK. */ 332 /* Everything passes, must be OK. */
315 return 1; 333 return 1;
316} 334}
317 335
336// adjust weight per container type ("of holding")
337static sint32
338weight_adjust (object *op, sint32 weight)
339{
340 return op->type == CONTAINER
341 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342 : weight;
343}
344
318/* 345/*
346 * adjust_weight(object, weight) adds the specified weight to an object,
347 * and also updates how much the environment(s) is/are carrying.
348 */
349static void
350adjust_weight (object *op, sint32 weight)
351{
352 while (op)
353 {
354 weight = weight_adjust (op, weight);
355
356 op->carrying += weight;
357 op = op->env;
358 }
359}
360
361/*
319 * sum_weight() is a recursive function which calculates the weight 362 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 363 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 364 * containers are carrying, and sums it up.
322 */ 365 */
323long 366void
324sum_weight (object *op) 367object::update_weight ()
325{ 368{
326 long sum; 369 sint32 sum = 0;
327 object *inv;
328 370
329 for (sum = 0, inv = op->inv; inv; inv = inv->below) 371 for (object *op = inv; op; op = op->below)
330 { 372 {
331 if (inv->inv) 373 if (op->inv)
332 sum_weight (inv); 374 op->update_weight ();
333 375
334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 376 sum += op->total_weight ();
335 } 377 }
336 378
337 if (op->type == CONTAINER && op->stats.Str) 379 carrying = weight_adjust (this, sum);
338 sum = (sum * (100 - op->stats.Str)) / 100;
339
340 if (op->carrying != sum)
341 op->carrying = sum;
342
343 return sum;
344} 380}
345 381
346/** 382/*
347 * Return the outermost environment object for a given object. 383 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
348 */
349
350object *
351object_get_env_recursive (object *op)
352{
353 while (op->env != NULL)
354 op = op->env;
355 return op;
356}
357
358/*
359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360 * Some error messages.
361 * The result of the dump is stored in the static global errmsg array.
362 */ 384 */
363char * 385char *
364dump_object (object *op) 386dump_object (object *op)
365{ 387{
366 if (!op) 388 if (!op)
380get_nearest_part (object *op, const object *pl) 402get_nearest_part (object *op, const object *pl)
381{ 403{
382 object *tmp, *closest; 404 object *tmp, *closest;
383 int last_dist, i; 405 int last_dist, i;
384 406
385 if (op->more == NULL) 407 if (!op->more)
386 return op; 408 return op;
409
387 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 410 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
411 tmp;
412 tmp = tmp->more)
388 if ((i = distance (tmp, pl)) < last_dist) 413 if ((i = distance (tmp, pl)) < last_dist)
389 closest = tmp, last_dist = i; 414 closest = tmp, last_dist = i;
415
390 return closest; 416 return closest;
391} 417}
392 418
393/* 419/*
394 * Returns the object which has the count-variable equal to the argument. 420 * Returns the object which has the count-variable equal to the argument.
421 * VERRRY slow.
395 */ 422 */
396object * 423object *
397find_object (tag_t i) 424find_object (tag_t i)
398{ 425{
399 for_all_objects (op) 426 for_all_objects (op)
417 for_all_objects (op) 444 for_all_objects (op)
418 if (op->name == str_) 445 if (op->name == str_)
419 break; 446 break;
420 447
421 return op; 448 return op;
422}
423
424void
425free_all_object_data ()
426{
427 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428} 449}
429 450
430/* 451/*
431 * Sets the owner and sets the skill and exp pointers to owner's current 452 * Sets the owner and sets the skill and exp pointers to owner's current
432 * skill and experience objects. 453 * skill and experience objects.
437{ 458{
438 // allow objects which own objects 459 // allow objects which own objects
439 if (owner) 460 if (owner)
440 while (owner->owner) 461 while (owner->owner)
441 owner = owner->owner; 462 owner = owner->owner;
463
464 if (flag [FLAG_FREED])
465 {
466 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
467 return;
468 }
442 469
443 this->owner = owner; 470 this->owner = owner;
444} 471}
445 472
446int 473int
587 614
588void 615void
589object::instantiate () 616object::instantiate ()
590{ 617{
591 if (!uuid.seq) // HACK 618 if (!uuid.seq) // HACK
592 uuid = gen_uuid (); 619 uuid = UUID::gen ();
593 620
594 speed_left = -0.1f; 621 speed_left = -0.1f;
595 /* copy the body_info to the body_used - this is only really 622 /* copy the body_info to the body_used - this is only really
596 * need for monsters, but doesn't hurt to do it for everything. 623 * need for monsters, but doesn't hurt to do it for everything.
597 * by doing so, when a monster is created, it has good starting 624 * by doing so, when a monster is created, it has good starting
756static int object_count; 783static int object_count;
757 784
758void object::link () 785void object::link ()
759{ 786{
760 assert (!index);//D 787 assert (!index);//D
761 uuid = gen_uuid (); 788 uuid = UUID::gen ();
762 count = ++object_count; 789 count = ++object_count;
763 790
764 refcnt_inc (); 791 refcnt_inc ();
765 objects.insert (this); 792 objects.insert (this);
766} 793}
850 * if some form of movement is allowed, let objects 877 * if some form of movement is allowed, let objects
851 * drop on that space. 878 * drop on that space.
852 */ 879 */
853 if (!drop_to_ground 880 if (!drop_to_ground
854 || !map 881 || !map
855 || map->in_memory != MAP_IN_MEMORY 882 || map->in_memory != MAP_ACTIVE
856 || map->nodrop 883 || map->nodrop
857 || ms ().move_block == MOVE_ALL) 884 || ms ().move_block == MOVE_ALL)
858 { 885 {
859 while (inv) 886 while (inv)
860 { 887 {
919 946
920 freed_map->path = "<freed objects map>"; 947 freed_map->path = "<freed objects map>";
921 freed_map->name = "/internal/freed_objects_map"; 948 freed_map->name = "/internal/freed_objects_map";
922 freed_map->width = 3; 949 freed_map->width = 3;
923 freed_map->height = 3; 950 freed_map->height = 3;
951 freed_map->nodrop = 1;
924 952
925 freed_map->alloc (); 953 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY; 954 freed_map->in_memory = MAP_ACTIVE;
927 } 955 }
928 956
929 map = freed_map; 957 map = freed_map;
930 x = 1; 958 x = 1;
931 y = 1; 959 y = 1;
960 play_sound (sound_destroy); 988 play_sound (sound_destroy);
961 else if (flag [FLAG_MONSTER]) 989 else if (flag [FLAG_MONSTER])
962 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 990 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963 991
964 attachable::destroy (); 992 attachable::destroy ();
965}
966
967/*
968 * sub_weight() recursively (outwards) subtracts a number from the
969 * weight of an object (and what is carried by it's environment(s)).
970 */
971void
972sub_weight (object *op, signed long weight)
973{
974 while (op != NULL)
975 {
976 if (op->type == CONTAINER)
977 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
978
979 op->carrying -= weight;
980 op = op->env;
981 }
982} 993}
983 994
984/* op->remove (): 995/* op->remove ():
985 * This function removes the object op from the linked list of objects 996 * This function removes the object op from the linked list of objects
986 * which it is currently tied to. When this function is done, the 997 * which it is currently tied to. When this function is done, the
1007 * In this case, the object to be removed is in someones 1018 * In this case, the object to be removed is in someones
1008 * inventory. 1019 * inventory.
1009 */ 1020 */
1010 if (env) 1021 if (env)
1011 { 1022 {
1023 adjust_weight (env, -total_weight ());
1024
1025 *(above ? &above->below : &env->inv) = below;
1026
1012 if (nrof) 1027 if (below)
1013 sub_weight (env, weight * nrof); 1028 below->above = above;
1014 else 1029
1015 sub_weight (env, weight + carrying); 1030 /* we set up values so that it could be inserted into
1031 * the map, but we don't actually do that - it is up
1032 * to the caller to decide what we want to do.
1033 */
1034 map = env->map;
1035 x = env->x;
1036 y = env->y;
1037 above = 0;
1038 below = 0;
1039 env = 0;
1016 1040
1017 /* NO_FIX_PLAYER is set when a great many changes are being 1041 /* NO_FIX_PLAYER is set when a great many changes are being
1018 * made to players inventory. If set, avoiding the call 1042 * made to players inventory. If set, avoiding the call
1019 * to save cpu time. 1043 * to save cpu time.
1020 */ 1044 */
1021 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1045 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1022 otmp->update_stats (); 1046 otmp->update_stats ();
1023
1024 if (above)
1025 above->below = below;
1026 else
1027 env->inv = below;
1028
1029 if (below)
1030 below->above = above;
1031
1032 /* we set up values so that it could be inserted into
1033 * the map, but we don't actually do that - it is up
1034 * to the caller to decide what we want to do.
1035 */
1036 x = env->x, y = env->y;
1037 map = env->map;
1038 above = 0, below = 0;
1039 env = 0;
1040 } 1047 }
1041 else if (map) 1048 else if (map)
1042 { 1049 {
1043 if (type == PLAYER) 1050 if (type == PLAYER)
1044 { 1051 {
1140merge_ob (object *op, object *top) 1147merge_ob (object *op, object *top)
1141{ 1148{
1142 if (!op->nrof) 1149 if (!op->nrof)
1143 return 0; 1150 return 0;
1144 1151
1145 if (top) 1152 if (!top)
1146 for (top = op; top && top->above; top = top->above) 1153 for (top = op; top && top->above; top = top->above)
1147 ; 1154 ;
1148 1155
1149 for (; top; top = top->below) 1156 for (; top; top = top->below)
1150 { 1157 {
1257 if (op->nrof && !(flag & INS_NO_MERGE)) 1264 if (op->nrof && !(flag & INS_NO_MERGE))
1258 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1265 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1259 if (object::can_merge (op, tmp)) 1266 if (object::can_merge (op, tmp))
1260 { 1267 {
1261 op->nrof += tmp->nrof; 1268 op->nrof += tmp->nrof;
1262 tmp->destroy (); 1269 tmp->destroy (1);
1263 } 1270 }
1264 1271
1265 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1272 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1266 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1273 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1267 1274
1290 else 1297 else
1291 { 1298 {
1292 top = ms.bot; 1299 top = ms.bot;
1293 1300
1294 /* If there are other objects, then */ 1301 /* If there are other objects, then */
1295 if ((!(flag & INS_MAP_LOAD)) && top) 1302 if (top)
1296 { 1303 {
1297 object *last = 0; 1304 object *last = 0;
1298 1305
1299 /* 1306 /*
1300 * If there are multiple objects on this space, we do some trickier handling. 1307 * If there are multiple objects on this space, we do some trickier handling.
1352 */ 1359 */
1353 if (last && last->below && last != floor) 1360 if (last && last->below && last != floor)
1354 top = last->below; 1361 top = last->below;
1355 } 1362 }
1356 } /* If objects on this space */ 1363 } /* If objects on this space */
1357 if (flag & INS_MAP_LOAD)
1358 top = ms.top;
1359 1364
1360 if (flag & INS_ABOVE_FLOOR_ONLY) 1365 if (flag & INS_ABOVE_FLOOR_ONLY)
1361 top = floor; 1366 top = floor;
1362 1367
1363 /* Top is the object that our object (op) is going to get inserted above. 1368 /* Top is the object that our object (op) is going to get inserted above.
1396 op->map->touch (); 1401 op->map->touch ();
1397 } 1402 }
1398 1403
1399 op->map->dirty = true; 1404 op->map->dirty = true;
1400 1405
1401 if (!(flag & INS_MAP_LOAD))
1402 if (object *pl = ms.player ()) 1406 if (object *pl = ms.player ())
1403 pl->contr->ns->floorbox_update (); 1407 pl->contr->ns->floorbox_update ();
1404 1408
1405 /* If this object glows, it may affect lighting conditions that are 1409 /* If this object glows, it may affect lighting conditions that are
1406 * visible to others on this map. But update_all_los is really 1410 * visible to others on this map. But update_all_los is really
1407 * an inefficient way to do this, as it means los for all players 1411 * an inefficient way to do this, as it means los for all players
1408 * on the map will get recalculated. The players could very well 1412 * on the map will get recalculated. The players could very well
1450 * op is the object to insert it under: supplies x and the map. 1454 * op is the object to insert it under: supplies x and the map.
1451 */ 1455 */
1452void 1456void
1453replace_insert_ob_in_map (const char *arch_string, object *op) 1457replace_insert_ob_in_map (const char *arch_string, object *op)
1454{ 1458{
1455 object *tmp, *tmp1;
1456
1457 /* first search for itself and remove any old instances */ 1459 /* first search for itself and remove any old instances */
1458 1460
1459 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1461 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1460 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1462 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1461 tmp->destroy (); 1463 tmp->destroy (1);
1462 1464
1463 tmp1 = arch_to_object (archetype::find (arch_string)); 1465 object *tmp = arch_to_object (archetype::find (arch_string));
1464 1466
1465 tmp1->x = op->x; 1467 tmp->x = op->x;
1466 tmp1->y = op->y; 1468 tmp->y = op->y;
1469
1467 insert_ob_in_map (tmp1, op->map, op, 0); 1470 insert_ob_in_map (tmp, op->map, op, 0);
1468} 1471}
1469 1472
1470object * 1473object *
1471object::insert_at (object *where, object *originator, int flags) 1474object::insert_at (object *where, object *originator, int flags)
1472{ 1475{
1476 if (where->env)
1477 return where->env->insert (this);
1478 else
1473 return where->map->insert (this, where->x, where->y, originator, flags); 1479 return where->map->insert (this, where->x, where->y, originator, flags);
1474} 1480}
1475 1481
1476/* 1482// find player who can see this object
1477 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1483static object *
1478 * is returned contains nr objects, and the remaining parts contains 1484visible_to (object *op)
1479 * the rest (or is removed and freed if that number is 0).
1480 * On failure, NULL is returned, and the reason put into the
1481 * global static errmsg array.
1482 */
1483object *
1484get_split_ob (object *orig_ob, uint32 nr)
1485{ 1485{
1486 object *newob; 1486 if (!op->flag [FLAG_REMOVED])
1487 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1488
1489 if (orig_ob->nrof < nr)
1490 {
1491 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1492 return NULL;
1493 } 1487 {
1494 1488 // see if we are in a container of sorts
1495 newob = object_create_clone (orig_ob); 1489 if (object *env = op->env)
1496
1497 if ((orig_ob->nrof -= nr) < 1)
1498 orig_ob->destroy (1);
1499 else if (!is_removed)
1500 {
1501 if (orig_ob->env != NULL)
1502 sub_weight (orig_ob->env, orig_ob->weight * nr);
1503 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1504 {
1505 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1506 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1507 return NULL;
1508 } 1490 {
1509 } 1491 // the player inventory itself is always visible
1492 if (env->type == PLAYER)
1493 return env;
1510 1494
1511 newob->nrof = nr; 1495 // else a player could have our env open
1496 env = env->outer_env ();
1512 1497
1498 // the player itself is always on a map, so we will find him here
1499 // even if our inv is in a player.
1500 if (env->is_on_map ())
1501 if (object *pl = env->ms ().player ())
1502 if (pl->container == op->env)
1503 return pl;
1504 }
1505 else
1506 {
1507 // maybe there is a player standing on the same mapspace
1508 if (object *pl = op->ms ().player ())
1509 return pl;
1510 }
1511 }
1512
1513 return newob; 1513 return 0;
1514} 1514}
1515 1515
1516/* 1516/*
1517 * decrease_ob_nr(object, number) decreases a specified number from 1517 * decrease(object, number) decreases a specified number from
1518 * the amount of an object. If the amount reaches 0, the object 1518 * the amount of an object. If the amount reaches 0, the object
1519 * is subsequently removed and freed. 1519 * is subsequently removed and freed.
1520 * 1520 *
1521 * Return value: 'op' if something is left, NULL if the amount reached 0 1521 * Return value: 'op' if something is left, NULL if the amount reached 0
1522 */ 1522 */
1523bool
1524object::decrease (sint32 nr)
1525{
1526 nr = min (nr, nrof);
1527
1528 if (!nr)
1529 return 1;
1530
1531 nrof -= nr;
1532
1533 object *visible = visible_to (this);
1534
1535 if (nrof)
1536 {
1537 adjust_weight (env, -weight * nr); // carrying == 0
1538
1539 if (visible)
1540 esrv_send_item (visible, this);
1541
1542 return 1;
1543 }
1544 else
1545 {
1546 if (visible)
1547 esrv_del_item (visible->contr, count);
1548
1549 this->destroy (1);
1550 return 0;
1551 }
1552}
1553
1554/*
1555 * split(ob,nr) splits up ob into two parts. The part which
1556 * is returned contains nr objects, and the remaining parts contains
1557 * the rest (or is removed and returned if that number is 0).
1558 * On failure, NULL is returned.
1559 */
1523object * 1560object *
1524decrease_ob_nr (object *op, uint32 i) 1561object::split (sint32 nr)
1525{ 1562{
1526 object *tmp; 1563 if (nrof < nr)
1527
1528 if (i == 0) /* objects with op->nrof require this check */
1529 return op; 1564 return 0;
1530 1565 else if (nrof == nr)
1531 if (i > op->nrof)
1532 i = op->nrof;
1533
1534 if (QUERY_FLAG (op, FLAG_REMOVED))
1535 op->nrof -= i;
1536 else if (op->env)
1537 { 1566 {
1538 /* is this object in the players inventory, or sub container
1539 * therein?
1540 */
1541 tmp = op->in_player ();
1542 /* nope. Is this a container the player has opened?
1543 * If so, set tmp to that player.
1544 * IMO, searching through all the players will mostly
1545 * likely be quicker than following op->env to the map,
1546 * and then searching the map for a player.
1547 */
1548 if (!tmp)
1549 for_all_players (pl)
1550 if (pl->ob->container == op->env)
1551 {
1552 tmp = pl->ob;
1553 break;
1554 }
1555
1556 if (i < op->nrof)
1557 {
1558 sub_weight (op->env, op->weight * i);
1559 op->nrof -= i;
1560 if (tmp)
1561 esrv_send_item (tmp, op);
1562 }
1563 else
1564 {
1565 op->remove (); 1567 remove ();
1566 op->nrof = 0; 1568 return this;
1567 if (tmp)
1568 esrv_del_item (tmp->contr, op->count);
1569 }
1570 } 1569 }
1571 else 1570 else
1572 { 1571 {
1573 object *above = op->above; 1572 decrease (nr);
1574 1573
1575 if (i < op->nrof) 1574 object *op = object_create_clone (this);
1576 op->nrof -= i; 1575 op->nrof = nr;
1577 else
1578 {
1579 op->remove ();
1580 op->nrof = 0;
1581 }
1582
1583 /* Since we just removed op, op->above is null */
1584 for (tmp = above; tmp; tmp = tmp->above)
1585 if (tmp->type == PLAYER)
1586 {
1587 if (op->nrof)
1588 esrv_send_item (tmp, op);
1589 else
1590 esrv_del_item (tmp->contr, op->count);
1591 }
1592 }
1593
1594 if (op->nrof)
1595 return op; 1576 return op;
1596 else
1597 {
1598 op->destroy ();
1599 return 0;
1600 }
1601}
1602
1603/*
1604 * add_weight(object, weight) adds the specified weight to an object,
1605 * and also updates how much the environment(s) is/are carrying.
1606 */
1607void
1608add_weight (object *op, signed long weight)
1609{
1610 while (op != NULL)
1611 {
1612 if (op->type == CONTAINER)
1613 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1614
1615 op->carrying += weight;
1616 op = op->env;
1617 } 1577 }
1618} 1578}
1619 1579
1620object * 1580object *
1621insert_ob_in_ob (object *op, object *where) 1581insert_ob_in_ob (object *op, object *where)
1646 * be != op, if items are merged. -Tero 1606 * be != op, if items are merged. -Tero
1647 */ 1607 */
1648object * 1608object *
1649object::insert (object *op) 1609object::insert (object *op)
1650{ 1610{
1651 if (!QUERY_FLAG (op, FLAG_REMOVED))
1652 op->remove ();
1653
1654 if (op->more) 1611 if (op->more)
1655 { 1612 {
1656 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1613 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1657 return op; 1614 return op;
1658 } 1615 }
1659 1616
1660 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1617 op->remove ();
1661 CLEAR_FLAG (op, FLAG_REMOVED); 1618
1619 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1662 1620
1663 if (op->nrof) 1621 if (op->nrof)
1664 {
1665 for (object *tmp = inv; tmp; tmp = tmp->below) 1622 for (object *tmp = inv; tmp; tmp = tmp->below)
1666 if (object::can_merge (tmp, op)) 1623 if (object::can_merge (tmp, op))
1667 { 1624 {
1668 /* return the original object and remove inserted object 1625 /* return the original object and remove inserted object
1669 (client needs the original object) */ 1626 (client needs the original object) */
1670 tmp->nrof += op->nrof; 1627 tmp->nrof += op->nrof;
1671 /* Weight handling gets pretty funky. Since we are adding to
1672 * tmp->nrof, we need to increase the weight.
1673 */
1674 add_weight (this, op->weight * op->nrof); 1628 adjust_weight (this, op->total_weight ());
1675 SET_FLAG (op, FLAG_REMOVED); 1629
1676 op->destroy (); /* free the inserted object */ 1630 op->destroy (1);
1677 op = tmp; 1631 op = tmp;
1678 op->remove (); /* and fix old object's links */ 1632 goto inserted;
1679 CLEAR_FLAG (op, FLAG_REMOVED);
1680 break;
1681 } 1633 }
1682 1634
1683 /* I assume combined objects have no inventory 1635 op->owner = 0; // it's his/hers now. period.
1684 * We add the weight - this object could have just been removed 1636 op->map = 0;
1685 * (if it was possible to merge). calling remove_ob will subtract 1637 op->x = 0;
1686 * the weight, so we need to add it in again, since we actually do 1638 op->y = 0;
1687 * the linking below
1688 */
1689 add_weight (this, op->weight * op->nrof);
1690 }
1691 else
1692 add_weight (this, (op->weight + op->carrying));
1693 1639
1640 op->above = 0;
1641 op->below = inv;
1642 op->env = this;
1643
1644 if (inv)
1645 inv->above = op;
1646
1647 inv = op;
1648
1649 op->flag [FLAG_REMOVED] = 0;
1650
1651 adjust_weight (this, op->total_weight ());
1652
1653inserted:
1654 /* reset the light list and los of the players on the map */
1655 if (op->glow_radius && map && map->darkness)
1656 update_all_los (map, x, y);
1657
1694 if (object *otmp = this->in_player ()) 1658 if (object *otmp = in_player ())
1695 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1659 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1696 otmp->update_stats (); 1660 otmp->update_stats ();
1697
1698 op->owner = 0; // its his/hers now. period.
1699 op->map = 0;
1700 op->env = this;
1701 op->above = 0;
1702 op->below = 0;
1703 op->x = op->y = 0;
1704
1705 /* reset the light list and los of the players on the map */
1706 if (op->glow_radius && map)
1707 {
1708#ifdef DEBUG_LIGHTS
1709 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1710#endif /* DEBUG_LIGHTS */
1711 if (map->darkness)
1712 update_all_los (map, x, y);
1713 }
1714
1715 /* Client has no idea of ordering so lets not bother ordering it here.
1716 * It sure simplifies this function...
1717 */
1718 if (!inv)
1719 inv = op;
1720 else
1721 {
1722 op->below = inv;
1723 op->below->above = op;
1724 inv = op;
1725 }
1726 1661
1727 INVOKE_OBJECT (INSERT, this); 1662 INVOKE_OBJECT (INSERT, this);
1728 1663
1729 return op; 1664 return op;
1730} 1665}
1945 * activate recursively a flag on an object inventory 1880 * activate recursively a flag on an object inventory
1946 */ 1881 */
1947void 1882void
1948flag_inv (object *op, int flag) 1883flag_inv (object *op, int flag)
1949{ 1884{
1950 if (op->inv)
1951 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1885 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952 { 1886 {
1953 SET_FLAG (tmp, flag); 1887 SET_FLAG (tmp, flag);
1954 flag_inv (tmp, flag); 1888 flag_inv (tmp, flag);
1955 } 1889 }
1956} 1890}
1957 1891
1958/* 1892/*
1959 * deactivate recursively a flag on an object inventory 1893 * deactivate recursively a flag on an object inventory
1960 */ 1894 */
1961void 1895void
1962unflag_inv (object *op, int flag) 1896unflag_inv (object *op, int flag)
1963{ 1897{
1964 if (op->inv)
1965 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1898 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1966 { 1899 {
1967 CLEAR_FLAG (tmp, flag); 1900 CLEAR_FLAG (tmp, flag);
1968 unflag_inv (tmp, flag); 1901 unflag_inv (tmp, flag);
1969 } 1902 }
1970} 1903}
1971 1904
1972/* 1905/*
1973 * find_free_spot(object, map, x, y, start, stop) will search for 1906 * find_free_spot(object, map, x, y, start, stop) will search for
1974 * a spot at the given map and coordinates which will be able to contain 1907 * a spot at the given map and coordinates which will be able to contain
1976 * to search (see the freearr_x/y[] definition). 1909 * to search (see the freearr_x/y[] definition).
1977 * It returns a random choice among the alternatives found. 1910 * It returns a random choice among the alternatives found.
1978 * start and stop are where to start relative to the free_arr array (1,9 1911 * start and stop are where to start relative to the free_arr array (1,9
1979 * does all 4 immediate directions). This returns the index into the 1912 * does all 4 immediate directions). This returns the index into the
1980 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1913 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1981 * Note - this only checks to see if there is space for the head of the
1982 * object - if it is a multispace object, this should be called for all
1983 * pieces.
1984 * Note2: This function does correctly handle tiled maps, but does not 1914 * Note: This function does correctly handle tiled maps, but does not
1985 * inform the caller. However, insert_ob_in_map will update as 1915 * inform the caller. However, insert_ob_in_map will update as
1986 * necessary, so the caller shouldn't need to do any special work. 1916 * necessary, so the caller shouldn't need to do any special work.
1987 * Note - updated to take an object instead of archetype - this is necessary 1917 * Note - updated to take an object instead of archetype - this is necessary
1988 * because arch_blocked (now ob_blocked) needs to know the movement type 1918 * because arch_blocked (now ob_blocked) needs to know the movement type
1989 * to know if the space in question will block the object. We can't use 1919 * to know if the space in question will block the object. We can't use
1991 * customized, changed states, etc. 1921 * customized, changed states, etc.
1992 */ 1922 */
1993int 1923int
1994find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1924find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1995{ 1925{
1926 int altern[SIZEOFFREE];
1996 int index = 0, flag; 1927 int index = 0, flag;
1997 int altern[SIZEOFFREE];
1998 1928
1999 for (int i = start; i < stop; i++) 1929 for (int i = start; i < stop; i++)
2000 { 1930 {
2001 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1931 mapxy pos (m, x, y); pos.move (i);
2002 if (!flag) 1932
1933 if (!pos.normalise ())
1934 continue;
1935
1936 mapspace &ms = *pos;
1937
1938 if (ms.flags () & P_IS_ALIVE)
1939 continue;
1940
1941 /* However, often
1942 * ob doesn't have any move type (when used to place exits)
1943 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1944 */
1945 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1946 {
2003 altern [index++] = i; 1947 altern [index++] = i;
1948 continue;
1949 }
2004 1950
2005 /* Basically, if we find a wall on a space, we cut down the search size. 1951 /* Basically, if we find a wall on a space, we cut down the search size.
2006 * In this way, we won't return spaces that are on another side of a wall. 1952 * In this way, we won't return spaces that are on another side of a wall.
2007 * This mostly work, but it cuts down the search size in all directions - 1953 * This mostly work, but it cuts down the search size in all directions -
2008 * if the space being examined only has a wall to the north and empty 1954 * if the space being examined only has a wall to the north and empty
2009 * spaces in all the other directions, this will reduce the search space 1955 * spaces in all the other directions, this will reduce the search space
2010 * to only the spaces immediately surrounding the target area, and 1956 * to only the spaces immediately surrounding the target area, and
2011 * won't look 2 spaces south of the target space. 1957 * won't look 2 spaces south of the target space.
2012 */ 1958 */
2013 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1959 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1960 {
2014 stop = maxfree[i]; 1961 stop = maxfree[i];
1962 continue;
1963 }
1964
1965 /* Note it is intentional that we check ob - the movement type of the
1966 * head of the object should correspond for the entire object.
1967 */
1968 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1969 continue;
1970
1971 if (ob->blocked (m, pos.x, pos.y))
1972 continue;
1973
1974 altern [index++] = i;
2015 } 1975 }
2016 1976
2017 if (!index) 1977 if (!index)
2018 return -1; 1978 return -1;
2019 1979
2028 */ 1988 */
2029int 1989int
2030find_first_free_spot (const object *ob, maptile *m, int x, int y) 1990find_first_free_spot (const object *ob, maptile *m, int x, int y)
2031{ 1991{
2032 for (int i = 0; i < SIZEOFFREE; i++) 1992 for (int i = 0; i < SIZEOFFREE; i++)
2033 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1993 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2034 return i; 1994 return i;
2035 1995
2036 return -1; 1996 return -1;
2037} 1997}
2038 1998
2575{ 2535{
2576 char flagdesc[512]; 2536 char flagdesc[512];
2577 char info2[256 * 4]; 2537 char info2[256 * 4];
2578 char *p = info; 2538 char *p = info;
2579 2539
2580 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2540 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2581 count, uuid.seq, 2541 count,
2542 uuid.c_str (),
2582 &name, 2543 &name,
2583 title ? "\",title:\"" : "", 2544 title ? "\",title:\"" : "",
2584 title ? (const char *)title : "", 2545 title ? (const char *)title : "",
2585 flag_desc (flagdesc, 512), type); 2546 flag_desc (flagdesc, 512), type);
2586 2547
2702 2663
2703 insert (force); 2664 insert (force);
2704} 2665}
2705 2666
2706void 2667void
2707object::play_sound (faceidx sound) const 2668object::play_sound (faceidx sound)
2708{ 2669{
2709 if (!sound) 2670 if (!sound)
2710 return; 2671 return;
2711 2672
2712 if (flag [FLAG_REMOVED]) 2673 if (flag [FLAG_REMOVED])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines