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.152 by root, Thu May 17 14:14:54 2007 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28#include <global.h> 24#include <global.h>
29#include <stdio.h> 25#include <stdio.h>
30#include <sys/types.h> 26#include <sys/types.h>
31#include <sys/uio.h> 27#include <sys/uio.h>
32#include <object.h> 28#include <object.h>
33#include <funcpoint.h>
34#include <sproto.h> 29#include <sproto.h>
35#include <loader.h> 30#include <loader.h>
36 31
37#include <bitset> 32#include <bitset>
38 33
39int nrofallocobjects = 0; 34UUID UUID::cur;
40static UUID uuid; 35static uint64_t seq_next_save;
41const uint64 UUID_SKIP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
42 37
43objectvec objects; 38objectvec objects;
44activevec actives; 39activevec actives;
45 40
46short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 41short freearr_x[SIZEOFFREE] = {
42 0,
43 0, 1, 1, 1, 0, -1, -1, -1,
44 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 45 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
48}; 46};
49short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 47short freearr_y[SIZEOFFREE] = {
48 0,
49 -1, -1, 0, 1, 1, 1, 0, -1,
50 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
50 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 51 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
51}; 52};
52int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
53 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
54}; 58};
55int freedir[SIZEOFFREE] = { 59int freedir[SIZEOFFREE] = {
56 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 0,
61 1, 2, 3, 4, 5, 6, 7, 8,
62 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
57 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 63 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
58}; 64};
59 65
60static void 66static void
61write_uuid (void) 67write_uuid (uval64 skip, bool sync)
62{ 68{
63 char filename1[MAX_BUF], filename2[MAX_BUF]; 69 CALL_BEGIN (2);
64 70 CALL_ARG_SV (newSVval64 (skip));
65 sprintf (filename1, "%s/uuid", settings.localdir); 71 CALL_ARG_SV (boolSV (sync));
66 sprintf (filename2, "%s/uuid~", settings.localdir); 72 CALL_CALL ("cf::write_uuid", G_DISCARD);
67 73 CALL_END;
68 FILE *fp;
69
70 if (!(fp = fopen (filename2, "w")))
71 {
72 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73 return;
74 }
75
76 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77 fclose (fp);
78 rename (filename2, filename1);
79} 74}
80 75
81static void 76static void
82read_uuid (void) 77read_uuid (void)
83{ 78{
84 char filename[MAX_BUF]; 79 char filename[MAX_BUF];
85 80
86 sprintf (filename, "%s/uuid", settings.localdir); 81 sprintf (filename, "%s/uuid", settings.localdir);
82
83 seq_next_save = 0;
87 84
88 FILE *fp; 85 FILE *fp;
89 86
90 if (!(fp = fopen (filename, "r"))) 87 if (!(fp = fopen (filename, "r")))
91 { 88 {
92 if (errno == ENOENT) 89 if (errno == ENOENT)
93 { 90 {
94 LOG (llevInfo, "RESET uid to 1\n"); 91 LOG (llevInfo, "RESET uid to 1\n");
95 uuid.seq = 0; 92 UUID::cur.seq = 0;
96 write_uuid (); 93 write_uuid (UUID_GAP, true);
97 return; 94 return;
98 } 95 }
99 96
100 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101 _exit (1); 98 _exit (1);
102 } 99 }
103 100
104 int version; 101 UUID::BUF buf;
105 unsigned long long uid; 102 buf[0] = 0;
106 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 103 fgets (buf, sizeof (buf), fp);
104
105 if (!UUID::cur.parse (buf))
107 { 106 {
108 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 107 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109 _exit (1); 108 _exit (1);
110 } 109 }
111 110
112 uuid.seq = uid; 111 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113 write_uuid (); 112
114 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 113 write_uuid (UUID_GAP, true);
115 fclose (fp); 114 fclose (fp);
116} 115}
117 116
118UUID 117UUID
119gen_uuid () 118UUID::gen ()
120{ 119{
121 UUID uid; 120 UUID uid;
122 121
123 uid.seq = ++uuid.seq; 122 uid.seq = ++cur.seq;
124 123
125 if (!(uuid.seq & (UUID_SKIP - 1))) 124 if (expect_false (cur.seq >= seq_next_save))
126 write_uuid (); 125 {
126 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
127 write_uuid (UUID_GAP, false);
128 }
129
127 130
128 return uid; 131 return uid;
129} 132}
130 133
131void 134void
132init_uuid () 135UUID::init ()
133{ 136{
134 read_uuid (); 137 read_uuid ();
135} 138}
136 139
137/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138static int 141static bool
139compare_ob_value_lists_one (const object *wants, const object *has) 142compare_ob_value_lists_one (const object *wants, const object *has)
140{ 143{
141 key_value *wants_field;
142
143 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 144 /* n-squared behaviour (see kv_get), but I'm hoping both
144 * objects with lists are rare, and lists stay short. If not, use a 145 * objects with lists are rare, and lists stay short. If not, use a
145 * different structure or at least keep the lists sorted... 146 * different structure or at least keep the lists sorted...
146 */ 147 */
147 148
148 /* For each field in wants, */ 149 /* For each field in wants, */
149 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) 150 for (key_value *kv = wants->key_values; kv; kv = kv->next)
150 { 151 if (has->kv_get (kv->key) != kv->value)
151 key_value *has_field; 152 return false;
152
153 /* Look for a field in has with the same key. */
154 has_field = get_ob_key_link (has, wants_field->key);
155
156 if (has_field == NULL)
157 {
158 /* No field with that name. */
159 return FALSE;
160 }
161
162 /* Found the matching field. */
163 if (has_field->value != wants_field->value)
164 {
165 /* Values don't match, so this half of the comparison is false. */
166 return FALSE;
167 }
168
169 /* If we get here, we found a match. Now for the next field in wants. */
170 }
171 153
172 /* If we get here, every field in wants has a matching field in has. */ 154 /* If we get here, every field in wants has a matching field in has. */
173 return TRUE; 155 return true;
174} 156}
175 157
176/* Returns TRUE if ob1 has the same key_values as ob2. */ 158/* Returns TRUE if ob1 has the same key_values as ob2. */
177static int 159static bool
178compare_ob_value_lists (const object *ob1, const object *ob2) 160compare_ob_value_lists (const object *ob1, const object *ob2)
179{ 161{
180 /* However, there may be fields in has which aren't partnered in wants, 162 /* However, there may be fields in has which aren't partnered in wants,
181 * so we need to run the comparison *twice*. :( 163 * so we need to run the comparison *twice*. :(
182 */ 164 */
183 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 165 return compare_ob_value_lists_one (ob1, ob2)
166 && compare_ob_value_lists_one (ob2, ob1);
184} 167}
185 168
186/* Function examines the 2 objects given to it, and returns true if 169/* Function examines the 2 objects given to it, and returns true if
187 * they can be merged together. 170 * they can be merged together.
188 * 171 *
203 || ob1->speed != ob2->speed 186 || ob1->speed != ob2->speed
204 || ob1->value != ob2->value 187 || ob1->value != ob2->value
205 || ob1->name != ob2->name) 188 || ob1->name != ob2->name)
206 return 0; 189 return 0;
207 190
208 //TODO: this ain't working well, use nicer and correct overflow check 191 /* Do not merge objects if nrof would overflow. First part checks
209 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 192 * for unsigned overflow (2c), second part checks whether the result
210 * value could not be stored in a sint32 (which unfortunately sometimes is 193 * would fit into a 32 bit signed int, which is often used to hold
211 * used to store nrof). 194 * nrof values.
212 */ 195 */
213 if (ob1->nrof + ob2->nrof >= 1UL << 31) 196 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214 return 0; 197 return 0;
215 198
216 /* If the objects have been identified, set the BEEN_APPLIED flag. 199 /* If the objects have been identified, set the BEEN_APPLIED flag.
217 * This is to the comparison of the flags below will be OK. We 200 * This is to the comparison of the flags below will be OK. We
218 * just can't ignore the been applied or identified flags, as they 201 * just can't ignore the been applied or identified flags, as they
219 * are not equal - just if it has been identified, the been_applied 202 * are not equal - just if it has been identified, the been_applied
220 * flags lose any meaning. 203 * flags lose any meaning.
221 */ 204 */
222 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 205 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 206 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224 207
225 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 209 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227 210
228 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 211 if (ob1->arch->name != ob2->arch->name
229 || ob1->arch != ob2->arch
230 || ob1->name != ob2->name 212 || ob1->name != ob2->name
231 || ob1->title != ob2->title 213 || ob1->title != ob2->title
232 || ob1->msg != ob2->msg 214 || ob1->msg != ob2->msg
233 || ob1->weight != ob2->weight 215 || ob1->weight != ob2->weight
234 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236 || ob1->attacktype != ob2->attacktype 216 || ob1->attacktype != ob2->attacktype
237 || ob1->magic != ob2->magic 217 || ob1->magic != ob2->magic
238 || ob1->slaying != ob2->slaying 218 || ob1->slaying != ob2->slaying
239 || ob1->skill != ob2->skill 219 || ob1->skill != ob2->skill
240 || ob1->value != ob2->value 220 || ob1->value != ob2->value
247 || ob1->move_block != ob2->move_block 227 || ob1->move_block != ob2->move_block
248 || ob1->move_allow != ob2->move_allow 228 || ob1->move_allow != ob2->move_allow
249 || ob1->move_on != ob2->move_on 229 || ob1->move_on != ob2->move_on
250 || ob1->move_off != ob2->move_off 230 || ob1->move_off != ob2->move_off
251 || ob1->move_slow != ob2->move_slow 231 || ob1->move_slow != ob2->move_slow
252 || ob1->move_slow_penalty != ob2->move_slow_penalty) 232 || ob1->move_slow_penalty != ob2->move_slow_penalty
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253 return 0; 235 return 0;
254 236
237 if ((ob1->flag ^ ob2->flag)
238 .reset (FLAG_INV_LOCKED)
239 .reset (FLAG_CLIENT_SENT)
240 .reset (FLAG_REMOVED)
241 .any ())
242 return 0;
243
255 /* This is really a spellbook check - really, we should 244 /* This is really a spellbook check - we should in general
256 * check all objects in the inventory. 245 * not merge objects with real inventories, as splitting them
246 * is hard.
257 */ 247 */
258 if (ob1->inv || ob2->inv) 248 if (ob1->inv || ob2->inv)
259 { 249 {
260 /* if one object has inventory but the other doesn't, not equiv */ 250 if (!(ob1->inv && ob2->inv))
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 251 return 0; /* inventories differ in length */
262 return 0;
263 252
264 /* Now check to see if the two inventory objects could merge */ 253 if (ob1->inv->below || ob2->inv->below)
254 return 0; /* more than one object in inv */
255
265 if (!object::can_merge (ob1->inv, ob2->inv)) 256 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 257 return 0; /* inventory objects differ */
267 258
268 /* inventory ok - still need to check rest of this object to see 259 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 260 * if it is valid.
270 */ 261 */
271 } 262 }
290 if (ob1->level != ob2->level) 281 if (ob1->level != ob2->level)
291 return 0; 282 return 0;
292 break; 283 break;
293 } 284 }
294 285
295 if (ob1->key_values != NULL || ob2->key_values != NULL) 286 if (ob1->key_values || ob2->key_values)
296 { 287 {
297 /* At least one of these has key_values. */ 288 /* At least one of these has key_values. */
298 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 289 if ((!ob1->key_values) != (!ob2->key_values))
299 /* One has fields, but the other one doesn't. */ 290 return 0; /* One has fields, but the other one doesn't. */
291
292 if (!compare_ob_value_lists (ob1, ob2))
300 return 0; 293 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0;
303 } 294 }
304 295
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 296 if (ob1->self || ob2->self)
307 { 297 {
308 ob1->optimise (); 298 ob1->optimise ();
309 ob2->optimise (); 299 ob2->optimise ();
310 300
311 if (ob1->self || ob2->self) 301 if (ob1->self || ob2->self)
302 {
303 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
304 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
305
306 if (k1 != k2)
312 return 0; 307 return 0;
308
309 if (k1 == 0)
310 return 1;
311
312 if (!cfperl_can_merge (ob1, ob2))
313 return 0;
314 }
313 } 315 }
314 316
315 /* Everything passes, must be OK. */ 317 /* Everything passes, must be OK. */
316 return 1; 318 return 1;
317} 319}
318 320
321// find player who can see this object
322object *
323object::visible_to () const
324{
325 if (client_visible () && !flag [FLAG_REMOVED])
326 {
327 // see if we are in a container of sorts
328 if (env)
329 {
330 // the player inventory itself is always visible
331 if (env->type == PLAYER)
332 return env;
333
334 // else a player could have our env open
335 object *envest = env->outer_env ();
336
337 // the player itself is always on a map, so we will find him here
338 // even if our inv is in a player.
339 if (envest->is_on_map ())
340 if (object *pl = envest->ms ().player ())
341 if (pl->container == env)
342 return pl;
343 }
344 else
345 {
346 // maybe there is a player standing on the same mapspace
347 // this will catch the case where "this" is a player
348 if (object *pl = ms ().player ())
349 if (!pl->container || this == pl->container)
350 return pl;
351 }
352 }
353
354 return 0;
355}
356
357// adjust weight per container type ("of holding")
358static sint32
359weight_adjust (object *op, sint32 weight)
360{
361 return op->type == CONTAINER
362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363 : weight;
364}
365
319/* 366/*
367 * adjust_weight(object, weight) adds the specified weight to an object,
368 * and also updates how much the environment(s) is/are carrying.
369 */
370static void
371adjust_weight (object *op, sint32 weight)
372{
373 while (op)
374 {
375 weight = weight_adjust (op, weight);
376
377 if (!weight)
378 return;
379
380 op->carrying += weight;
381
382 if (object *pl = op->visible_to ())
383 if (pl != op) // player is handled lazily
384 esrv_update_item (UPD_WEIGHT, pl, op);
385
386 op = op->env;
387 }
388}
389
390/*
320 * sum_weight() is a recursive function which calculates the weight 391 * this is a recursive function which calculates the weight
321 * an object is carrying. It goes through in figures out how much 392 * an object is carrying. It goes through op and figures out how much
322 * containers are carrying, and sums it up. 393 * containers are carrying, and sums it up.
323 */ 394 */
324long 395void
325sum_weight (object *op) 396object::update_weight ()
326{ 397{
327 long sum; 398 sint32 sum = 0;
328 object *inv;
329 399
330 for (sum = 0, inv = op->inv; inv; inv = inv->below) 400 for (object *op = inv; op; op = op->below)
331 { 401 {
332 if (inv->inv) 402 if (op->inv)
333 sum_weight (inv); 403 op->update_weight ();
334 404
335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 405 sum += op->total_weight ();
406 }
407
408 sum = weight_adjust (this, sum);
409
410 if (sum != carrying)
336 } 411 {
337
338 if (op->type == CONTAINER && op->stats.Str)
339 sum = (sum * (100 - op->stats.Str)) / 100;
340
341 if (op->carrying != sum)
342 op->carrying = sum; 412 carrying = sum;
343 413
344 return sum; 414 if (object *pl = visible_to ())
415 if (pl != this) // player is handled lazily
416 esrv_update_item (UPD_WEIGHT, pl, this);
417 }
345} 418}
346 419
347/** 420/*
348 * Return the outermost environment object for a given object. 421 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
349 */
350
351object *
352object_get_env_recursive (object *op)
353{
354 while (op->env != NULL)
355 op = op->env;
356 return op;
357}
358
359/*
360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361 * Some error messages.
362 * The result of the dump is stored in the static global errmsg array.
363 */ 422 */
364char * 423char *
365dump_object (object *op) 424dump_object (object *op)
366{ 425{
367 if (!op) 426 if (!op)
375/* 434/*
376 * get_nearest_part(multi-object, object 2) returns the part of the 435 * get_nearest_part(multi-object, object 2) returns the part of the
377 * multi-object 1 which is closest to the second object. 436 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 437 * If it's not a multi-object, it is returned.
379 */ 438 */
380
381object * 439object *
382get_nearest_part (object *op, const object *pl) 440get_nearest_part (object *op, const object *pl)
383{ 441{
384 object *tmp, *closest; 442 object *tmp, *closest;
385 int last_dist, i; 443 int last_dist, i;
386 444
387 if (op->more == NULL) 445 if (!op->more)
388 return op; 446 return op;
447
389 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 448 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
449 tmp;
450 tmp = tmp->more)
390 if ((i = distance (tmp, pl)) < last_dist) 451 if ((i = distance (tmp, pl)) < last_dist)
391 closest = tmp, last_dist = i; 452 closest = tmp, last_dist = i;
453
392 return closest; 454 return closest;
393} 455}
394 456
395/* 457/*
396 * Returns the object which has the count-variable equal to the argument. 458 * Returns the object which has the count-variable equal to the argument.
459 * VERRRY slow.
397 */ 460 */
398object * 461object *
399find_object (tag_t i) 462find_object (tag_t i)
400{ 463{
401 for_all_objects (op) 464 for_all_objects (op)
421 break; 484 break;
422 485
423 return op; 486 return op;
424} 487}
425 488
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 489/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 490 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 491 * skill and experience objects.
492 * ACTUALLY NO! investigate! TODO
435 */ 493 */
436void 494void
437object::set_owner (object *owner) 495object::set_owner (object *owner)
438{ 496{
497 // allow objects which own objects
439 if (!owner) 498 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 499 while (owner->owner)
450 owner = owner->owner; 500 owner = owner->owner;
501
502 if (flag [FLAG_FREED])
503 {
504 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
505 return;
506 }
451 507
452 this->owner = owner; 508 this->owner = owner;
453} 509}
454 510
455int 511int
495 { 551 {
496 current_weapon = chosen_skill = 0; 552 current_weapon = chosen_skill = 0;
497 update_stats (); 553 update_stats ();
498 554
499 new_draw_info_format (NDI_UNIQUE, 0, this, 555 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance your applied items all at once, but the %s is too much. " 556 "You try to balance all your items at once, "
557 "but the %s is just too much for your body. "
501 "You need to unapply some items first.", &ob->name); 558 "[You need to unapply some items first.]", &ob->name);
502 return false; 559 return false;
503 } 560 }
504 561
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 562 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 } 563 }
532 } 589 }
533 590
534 op->key_values = 0; 591 op->key_values = 0;
535} 592}
536 593
537object & 594/*
538object::operator =(const object &src) 595 * copy_to first frees everything allocated by the dst object,
596 * and then copies the contents of itself into the second
597 * object, allocating what needs to be allocated. Basically, any
598 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
599 * if the first object is freed, the pointers in the new object
600 * will point at garbage.
601 */
602void
603object::copy_to (object *dst)
539{ 604{
540 bool is_freed = flag [FLAG_FREED]; 605 dst->remove ();
541 bool is_removed = flag [FLAG_REMOVED];
542
543 *(object_copy *)this = src; 606 *(object_copy *)dst = *this;
544
545 flag [FLAG_FREED] = is_freed;
546 flag [FLAG_REMOVED] = is_removed; 607 dst->flag [FLAG_REMOVED] = true;
547 608
548 /* Copy over key_values, if any. */ 609 /* Copy over key_values, if any. */
549 if (src.key_values) 610 if (key_values)
550 { 611 {
551 key_value *tail = 0; 612 key_value *tail = 0;
552 key_values = 0; 613 dst->key_values = 0;
553 614
554 for (key_value *i = src.key_values; i; i = i->next) 615 for (key_value *i = key_values; i; i = i->next)
555 { 616 {
556 key_value *new_link = new key_value; 617 key_value *new_link = new key_value;
557 618
558 new_link->next = 0; 619 new_link->next = 0;
559 new_link->key = i->key; 620 new_link->key = i->key;
560 new_link->value = i->value; 621 new_link->value = i->value;
561 622
562 /* Try and be clever here, too. */ 623 /* Try and be clever here, too. */
563 if (!key_values) 624 if (!dst->key_values)
564 { 625 {
565 key_values = new_link; 626 dst->key_values = new_link;
566 tail = new_link; 627 tail = new_link;
567 } 628 }
568 else 629 else
569 { 630 {
570 tail->next = new_link; 631 tail->next = new_link;
571 tail = new_link; 632 tail = new_link;
572 } 633 }
573 } 634 }
574 } 635 }
575}
576
577/*
578 * copy_to first frees everything allocated by the dst object,
579 * and then copies the contents of itself into the second
580 * object, allocating what needs to be allocated. Basically, any
581 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
582 * if the first object is freed, the pointers in the new object
583 * will point at garbage.
584 */
585void
586object::copy_to (object *dst)
587{
588 *dst = *this;
589 636
590 if (speed < 0) 637 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 638 dst->speed_left -= rndm ();
592 639
593 dst->set_speed (dst->speed); 640 dst->set_speed (dst->speed);
594} 641}
595 642
596void 643void
597object::instantiate () 644object::instantiate ()
598{ 645{
599 if (!uuid.seq) // HACK 646 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 647 uuid = UUID::gen ();
601 648
602 speed_left = -0.1f; 649 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 650 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything. 651 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting 652 * by doing so, when a monster is created, it has good starting
615object * 662object *
616object::clone () 663object::clone ()
617{ 664{
618 object *neu = create (); 665 object *neu = create ();
619 copy_to (neu); 666 copy_to (neu);
667 neu->map = map; // not copied by copy_to
620 return neu; 668 return neu;
621} 669}
622 670
623/* 671/*
624 * If an object with the IS_TURNABLE() flag needs to be turned due 672 * If an object with the IS_TURNABLE() flag needs to be turned due
675 * UP_OBJ_FACE: only the objects face has changed. 723 * UP_OBJ_FACE: only the objects face has changed.
676 */ 724 */
677void 725void
678update_object (object *op, int action) 726update_object (object *op, int action)
679{ 727{
680 if (op == NULL) 728 if (!op)
681 { 729 {
682 /* this should never happen */ 730 /* this should never happen */
683 LOG (llevDebug, "update_object() called for NULL object.\n"); 731 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
684 return; 732 return;
685 } 733 }
686 734
687 if (op->env) 735 if (!op->is_on_map ())
688 { 736 {
689 /* Animation is currently handled by client, so nothing 737 /* Animation is currently handled by client, so nothing
690 * to do in this case. 738 * to do in this case.
691 */ 739 */
692 return; 740 return;
693 } 741 }
694
695 /* If the map is saving, don't do anything as everything is
696 * going to get freed anyways.
697 */
698 if (!op->map || op->map->in_memory == MAP_SAVING)
699 return;
700 742
701 /* make sure the object is within map boundaries */ 743 /* make sure the object is within map boundaries */
702 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 744 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
703 { 745 {
704 LOG (llevError, "update_object() called for object out of map!\n"); 746 LOG (llevError, "update_object() called for object out of map!\n");
764static int object_count; 806static int object_count;
765 807
766void object::link () 808void object::link ()
767{ 809{
768 assert (!index);//D 810 assert (!index);//D
769 uuid = gen_uuid (); 811 uuid = UUID::gen ();
770 count = ++object_count; 812 count = ++object_count;
771 813
772 refcnt_inc (); 814 refcnt_inc ();
773 objects.insert (this); 815 objects.insert (this);
774} 816}
847object::destroy_inv (bool drop_to_ground) 889object::destroy_inv (bool drop_to_ground)
848{ 890{
849 // need to check first, because the checks below might segfault 891 // need to check first, because the checks below might segfault
850 // as we might be on an invalid mapspace and crossfire code 892 // as we might be on an invalid mapspace and crossfire code
851 // is too buggy to ensure that the inventory is empty. 893 // is too buggy to ensure that the inventory is empty.
852 // corollary: if you create arrows etc. with stuff in tis inventory, 894 // corollary: if you create arrows etc. with stuff in its inventory,
853 // cf will crash below with off-map x and y 895 // cf will crash below with off-map x and y
854 if (!inv) 896 if (!inv)
855 return; 897 return;
856 898
857 /* Only if the space blocks everything do we not process - 899 /* Only if the space blocks everything do we not process -
858 * if some form of movement is allowed, let objects 900 * if some form of movement is allowed, let objects
859 * drop on that space. 901 * drop on that space.
860 */ 902 */
861 if (!drop_to_ground 903 if (!drop_to_ground
862 || !map 904 || !map
863 || map->in_memory != MAP_IN_MEMORY 905 || map->in_memory != MAP_ACTIVE
864 || map->nodrop 906 || map->nodrop
865 || ms ().move_block == MOVE_ALL) 907 || ms ().move_block == MOVE_ALL)
866 { 908 {
867 while (inv) 909 while (inv)
868 { 910 {
869 inv->destroy_inv (drop_to_ground); 911 inv->destroy_inv (false);
870 inv->destroy (); 912 inv->destroy ();
871 } 913 }
872 } 914 }
873 else 915 else
874 { /* Put objects in inventory onto this space */ 916 { /* Put objects in inventory onto this space */
880 || op->flag [FLAG_NO_DROP] 922 || op->flag [FLAG_NO_DROP]
881 || op->type == RUNE 923 || op->type == RUNE
882 || op->type == TRAP 924 || op->type == TRAP
883 || op->flag [FLAG_IS_A_TEMPLATE] 925 || op->flag [FLAG_IS_A_TEMPLATE]
884 || op->flag [FLAG_DESTROY_ON_DEATH]) 926 || op->flag [FLAG_DESTROY_ON_DEATH])
885 op->destroy (); 927 op->destroy (true);
886 else 928 else
887 map->insert (op, x, y); 929 map->insert (op, x, y);
888 } 930 }
889 } 931 }
890} 932}
894 object *op = new object; 936 object *op = new object;
895 op->link (); 937 op->link ();
896 return op; 938 return op;
897} 939}
898 940
941static struct freed_map : maptile
942{
943 freed_map ()
944 {
945 path = "<freed objects map>";
946 name = "/internal/freed_objects_map";
947 width = 3;
948 height = 3;
949 nodrop = 1;
950
951 alloc ();
952 in_memory = MAP_ACTIVE;
953 }
954} freed_map; // freed objects are moved here to avoid crashes
955
899void 956void
900object::do_destroy () 957object::do_destroy ()
901{ 958{
902 attachable::do_destroy ();
903
904 if (flag [FLAG_IS_LINKED]) 959 if (flag [FLAG_IS_LINKED])
905 remove_button_link (this); 960 remove_button_link (this);
906 961
907 if (flag [FLAG_FRIENDLY]) 962 if (flag [FLAG_FRIENDLY])
908 remove_friendly_object (this); 963 remove_friendly_object (this);
909 964
910 if (!flag [FLAG_REMOVED])
911 remove (); 965 remove ();
912 966
913 destroy_inv (true); 967 attachable::do_destroy ();
914 968
915 deactivate (); 969 deactivate ();
916 unlink (); 970 unlink ();
917 971
918 flag [FLAG_FREED] = 1; 972 flag [FLAG_FREED] = 1;
919 973
920 // hack to ensure that freed objects still have a valid map 974 // hack to ensure that freed objects still have a valid map
921 {
922 static maptile *freed_map; // freed objects are moved here to avoid crashes
923
924 if (!freed_map)
925 {
926 freed_map = new maptile;
927
928 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3;
930 freed_map->height = 3;
931
932 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY;
934 }
935
936 map = freed_map; 975 map = &freed_map;
937 x = 1; 976 x = 1;
938 y = 1; 977 y = 1;
939 }
940
941 head = 0;
942 978
943 if (more) 979 if (more)
944 { 980 {
945 more->destroy (); 981 more->destroy ();
946 more = 0; 982 more = 0;
947 } 983 }
948 984
985 head = 0;
986
949 // clear those pointers that likely might have circular references to us 987 // clear those pointers that likely might cause circular references
950 owner = 0; 988 owner = 0;
951 enemy = 0; 989 enemy = 0;
952 attacked_by = 0; 990 attacked_by = 0;
991 current_weapon = 0;
953} 992}
954 993
955void 994void
956object::destroy (bool destroy_inventory) 995object::destroy (bool destroy_inventory)
957{ 996{
958 if (destroyed ()) 997 if (destroyed ())
959 return; 998 return;
960 999
1000 if (!is_head () && !head->destroyed ())
1001 {
1002 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1003 head->destroy (destroy_inventory);
1004 return;
1005 }
1006
961 if (destroy_inventory) 1007 destroy_inv (!destroy_inventory);
962 destroy_inv (false); 1008
1009 if (is_head ())
1010 if (sound_destroy)
1011 play_sound (sound_destroy);
1012 else if (flag [FLAG_MONSTER])
1013 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963 1014
964 attachable::destroy (); 1015 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} 1016}
983 1017
984/* op->remove (): 1018/* op->remove ():
985 * This function removes the object op from the linked list of objects 1019 * 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 1020 * which it is currently tied to. When this function is done, the
992object::do_remove () 1026object::do_remove ()
993{ 1027{
994 object *tmp, *last = 0; 1028 object *tmp, *last = 0;
995 object *otmp; 1029 object *otmp;
996 1030
997 if (QUERY_FLAG (this, FLAG_REMOVED)) 1031 if (flag [FLAG_REMOVED])
998 return; 1032 return;
999 1033
1000 SET_FLAG (this, FLAG_REMOVED);
1001 INVOKE_OBJECT (REMOVE, this); 1034 INVOKE_OBJECT (REMOVE, this);
1035
1036 flag [FLAG_REMOVED] = true;
1002 1037
1003 if (more) 1038 if (more)
1004 more->remove (); 1039 more->remove ();
1005 1040
1006 /* 1041 /*
1007 * In this case, the object to be removed is in someones 1042 * In this case, the object to be removed is in someones
1008 * inventory. 1043 * inventory.
1009 */ 1044 */
1010 if (env) 1045 if (env)
1011 { 1046 {
1047 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1048 if (object *pl = visible_to ())
1049 esrv_del_item (pl->contr, count);
1050 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1051
1052 adjust_weight (env, -total_weight ());
1053
1054 *(above ? &above->below : &env->inv) = below;
1055
1012 if (nrof) 1056 if (below)
1013 sub_weight (env, weight * nrof); 1057 below->above = above;
1014 else 1058
1015 sub_weight (env, weight + carrying); 1059 /* we set up values so that it could be inserted into
1060 * the map, but we don't actually do that - it is up
1061 * to the caller to decide what we want to do.
1062 */
1063 map = env->map;
1064 x = env->x;
1065 y = env->y;
1066 above = 0;
1067 below = 0;
1068 env = 0;
1016 1069
1017 /* NO_FIX_PLAYER is set when a great many changes are being 1070 /* NO_FIX_PLAYER is set when a great many changes are being
1018 * made to players inventory. If set, avoiding the call 1071 * made to players inventory. If set, avoiding the call
1019 * to save cpu time. 1072 * to save cpu time.
1020 */ 1073 */
1021 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1074 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1022 otmp->update_stats (); 1075 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 } 1076 }
1041 else if (map) 1077 else if (map)
1042 { 1078 {
1043 if (type == PLAYER)
1044 {
1045 // leaving a spot always closes any open container on the ground
1046 if (container && !container->env)
1047 // this causes spurious floorbox updates, but it ensures
1048 // that the CLOSE event is being sent.
1049 close_container ();
1050
1051 --map->players;
1052 map->touch ();
1053 }
1054
1055 map->dirty = true; 1079 map->dirty = true;
1056 mapspace &ms = this->ms (); 1080 mapspace &ms = this->ms ();
1081
1082 if (object *pl = ms.player ())
1083 {
1084 if (type == PLAYER) // this == pl(!)
1085 {
1086 // leaving a spot always closes any open container on the ground
1087 if (container && !container->env)
1088 // this causes spurious floorbox updates, but it ensures
1089 // that the CLOSE event is being sent.
1090 close_container ();
1091
1092 --map->players;
1093 map->touch ();
1094 }
1095 else if (pl->container == this)
1096 {
1097 // removing a container should close it
1098 close_container ();
1099 }
1100
1101 esrv_del_item (pl->contr, count);
1102 }
1057 1103
1058 /* link the object above us */ 1104 /* link the object above us */
1059 if (above) 1105 if (above)
1060 above->below = below; 1106 above->below = below;
1061 else 1107 else
1082 if (map->in_memory == MAP_SAVING) 1128 if (map->in_memory == MAP_SAVING)
1083 return; 1129 return;
1084 1130
1085 int check_walk_off = !flag [FLAG_NO_APPLY]; 1131 int check_walk_off = !flag [FLAG_NO_APPLY];
1086 1132
1133 if (object *pl = ms.player ())
1134 {
1135 if (pl->container == this)
1136 /* If a container that the player is currently using somehow gets
1137 * removed (most likely destroyed), update the player view
1138 * appropriately.
1139 */
1140 pl->close_container ();
1141
1142 //TODO: the floorbox prev/next might need updating
1143 //esrv_del_item (pl->contr, count);
1144 //TODO: update floorbox to preserve ordering
1145 if (pl->contr->ns)
1146 pl->contr->ns->floorbox_update ();
1147 }
1148
1087 for (tmp = ms.bot; tmp; tmp = tmp->above) 1149 for (tmp = ms.bot; tmp; tmp = tmp->above)
1088 { 1150 {
1089 /* No point updating the players look faces if he is the object 1151 /* No point updating the players look faces if he is the object
1090 * being removed. 1152 * being removed.
1091 */ 1153 */
1092
1093 if (tmp->type == PLAYER && tmp != this)
1094 {
1095 /* If a container that the player is currently using somehow gets
1096 * removed (most likely destroyed), update the player view
1097 * appropriately.
1098 */
1099 if (tmp->container == this)
1100 {
1101 flag [FLAG_APPLIED] = 0;
1102 tmp->container = 0;
1103 }
1104
1105 if (tmp->contr->ns)
1106 tmp->contr->ns->floorbox_update ();
1107 }
1108 1154
1109 /* See if object moving off should effect something */ 1155 /* See if object moving off should effect something */
1110 if (check_walk_off 1156 if (check_walk_off
1111 && ((move_type & tmp->move_off) 1157 && ((move_type & tmp->move_off)
1112 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1158 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1115 1161
1116 if (destroyed ()) 1162 if (destroyed ())
1117 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1163 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1118 } 1164 }
1119 1165
1120 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1121 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1122 if (tmp->above == tmp)
1123 tmp->above = 0;
1124
1125 last = tmp; 1166 last = tmp;
1126 } 1167 }
1127 1168
1128 /* last == NULL if there are no objects on this space */ 1169 /* last == NULL if there are no objects on this space */
1129 //TODO: this makes little sense, why only update the topmost object? 1170 //TODO: this makes little sense, why only update the topmost object?
1149merge_ob (object *op, object *top) 1190merge_ob (object *op, object *top)
1150{ 1191{
1151 if (!op->nrof) 1192 if (!op->nrof)
1152 return 0; 1193 return 0;
1153 1194
1154 if (top) 1195 if (!top)
1155 for (top = op; top && top->above; top = top->above) 1196 for (top = op; top && top->above; top = top->above)
1156 ; 1197 ;
1157 1198
1158 for (; top; top = top->below) 1199 for (; top; top = top->below)
1159 {
1160 if (top == op)
1161 continue;
1162
1163 if (object::can_merge (op, top)) 1200 if (object::can_merge (op, top))
1164 { 1201 {
1165 top->nrof += op->nrof; 1202 top->nrof += op->nrof;
1166 1203
1167/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1204 if (object *pl = top->visible_to ())
1168 op->weight = 0; /* Don't want any adjustements now */ 1205 esrv_update_item (UPD_NROF, pl, top);
1206
1207 op->weight = 0; // cancel the addition above
1208 op->carrying = 0; // must be 0 already
1209
1169 op->destroy (); 1210 op->destroy (1);
1211
1170 return top; 1212 return top;
1171 } 1213 }
1172 }
1173 1214
1174 return 0; 1215 return 0;
1175} 1216}
1176 1217
1177void 1218void
1180 if (more) 1221 if (more)
1181 return; 1222 return;
1182 1223
1183 object *prev = this; 1224 object *prev = this;
1184 1225
1185 for (archetype *at = arch->more; at; at = at->more) 1226 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1186 { 1227 {
1187 object *op = arch_to_object (at); 1228 object *op = arch_to_object (at);
1188 1229
1189 op->name = name; 1230 op->name = name;
1190 op->name_pl = name_pl; 1231 op->name_pl = name_pl;
1204object * 1245object *
1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1246insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1206{ 1247{
1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1248 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1208 { 1249 {
1209 tmp->x = x + tmp->arch->clone.x; 1250 tmp->x = x + tmp->arch->x;
1210 tmp->y = y + tmp->arch->clone.y; 1251 tmp->y = y + tmp->arch->y;
1211 } 1252 }
1212 1253
1213 return insert_ob_in_map (op, m, originator, flag); 1254 return insert_ob_in_map (op, m, originator, flag);
1214} 1255}
1215 1256
1236object * 1277object *
1237insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1278insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1238{ 1279{
1239 assert (!op->flag [FLAG_FREED]); 1280 assert (!op->flag [FLAG_FREED]);
1240 1281
1241 object *tmp, *top, *floor = NULL;
1242
1243 op->remove (); 1282 op->remove ();
1244
1245#if 0
1246 if (!m->active != !op->active)
1247 if (m->active)
1248 op->activate_recursive ();
1249 else
1250 op->deactivate_recursive ();
1251#endif
1252
1253 if (out_of_map (m, op->x, op->y))
1254 {
1255 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1256#ifdef MANY_CORES
1257 /* Better to catch this here, as otherwise the next use of this object
1258 * is likely to cause a crash. Better to find out where it is getting
1259 * improperly inserted.
1260 */
1261 abort ();
1262#endif
1263 return op;
1264 }
1265
1266 if (object *more = op->more)
1267 {
1268 if (!insert_ob_in_map (more, m, originator, flag))
1269 {
1270 if (!op->head)
1271 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1272
1273 return 0;
1274 }
1275 }
1276
1277 CLEAR_FLAG (op, FLAG_REMOVED);
1278 1283
1279 /* Ideally, the caller figures this out. However, it complicates a lot 1284 /* Ideally, the caller figures this out. However, it complicates a lot
1280 * of areas of callers (eg, anything that uses find_free_spot would now 1285 * of areas of callers (eg, anything that uses find_free_spot would now
1281 * need extra work 1286 * need extra work
1282 */ 1287 */
1283 if (!xy_normalise (m, op->x, op->y)) 1288 if (!xy_normalise (m, op->x, op->y))
1289 {
1290 op->destroy (1);
1284 return 0; 1291 return 0;
1292 }
1293
1294 if (object *more = op->more)
1295 if (!insert_ob_in_map (more, m, originator, flag))
1296 return 0;
1297
1298 CLEAR_FLAG (op, FLAG_REMOVED);
1285 1299
1286 op->map = m; 1300 op->map = m;
1287 mapspace &ms = op->ms (); 1301 mapspace &ms = op->ms ();
1288 1302
1289 /* this has to be done after we translate the coordinates. 1303 /* this has to be done after we translate the coordinates.
1290 */ 1304 */
1291 if (op->nrof && !(flag & INS_NO_MERGE)) 1305 if (op->nrof && !(flag & INS_NO_MERGE))
1292 for (tmp = ms.bot; tmp; tmp = tmp->above) 1306 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1293 if (object::can_merge (op, tmp)) 1307 if (object::can_merge (op, tmp))
1294 { 1308 {
1309 // TODO: we atcually want to update tmp, not op,
1310 // but some caller surely breaks when we return tmp
1311 // from here :/
1295 op->nrof += tmp->nrof; 1312 op->nrof += tmp->nrof;
1296 tmp->destroy (); 1313 tmp->destroy (1);
1297 } 1314 }
1298 1315
1299 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1316 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1300 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1317 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1301 1318
1321 /* since *below* originator, no need to update top */ 1338 /* since *below* originator, no need to update top */
1322 originator->below = op; 1339 originator->below = op;
1323 } 1340 }
1324 else 1341 else
1325 { 1342 {
1343 object *top, *floor = NULL;
1344
1326 top = ms.bot; 1345 top = ms.bot;
1327 1346
1328 /* If there are other objects, then */ 1347 /* If there are other objects, then */
1329 if ((!(flag & INS_MAP_LOAD)) && top) 1348 if (top)
1330 { 1349 {
1331 object *last = 0; 1350 object *last = 0;
1332 1351
1333 /* 1352 /*
1334 * If there are multiple objects on this space, we do some trickier handling. 1353 * If there are multiple objects on this space, we do some trickier handling.
1387 if (last && last->below && last != floor) 1406 if (last && last->below && last != floor)
1388 top = last->below; 1407 top = last->below;
1389 } 1408 }
1390 } /* If objects on this space */ 1409 } /* If objects on this space */
1391 1410
1392 if (flag & INS_MAP_LOAD)
1393 top = ms.top;
1394
1395 if (flag & INS_ABOVE_FLOOR_ONLY) 1411 if (flag & INS_ABOVE_FLOOR_ONLY)
1396 top = floor; 1412 top = floor;
1397 1413
1398 /* Top is the object that our object (op) is going to get inserted above. 1414 /* Top is the object that our object (op) is going to get inserted above.
1399 */ 1415 */
1431 op->map->touch (); 1447 op->map->touch ();
1432 } 1448 }
1433 1449
1434 op->map->dirty = true; 1450 op->map->dirty = true;
1435 1451
1436 /* If we have a floor, we know the player, if any, will be above
1437 * it, so save a few ticks and start from there.
1438 */
1439 if (!(flag & INS_MAP_LOAD))
1440 if (object *pl = ms.player ()) 1452 if (object *pl = ms.player ())
1453 //TODO: the floorbox prev/next might need updating
1454 //esrv_send_item (pl, op);
1455 //TODO: update floorbox to preserve ordering
1441 if (pl->contr->ns) 1456 if (pl->contr->ns)
1442 pl->contr->ns->floorbox_update (); 1457 pl->contr->ns->floorbox_update ();
1443 1458
1444 /* If this object glows, it may affect lighting conditions that are 1459 /* If this object glows, it may affect lighting conditions that are
1445 * visible to others on this map. But update_all_los is really 1460 * visible to others on this map. But update_all_los is really
1446 * an inefficient way to do this, as it means los for all players 1461 * an inefficient way to do this, as it means los for all players
1447 * on the map will get recalculated. The players could very well 1462 * on the map will get recalculated. The players could very well
1466 * blocked() and wall() work properly), and these flags are updated by 1481 * blocked() and wall() work properly), and these flags are updated by
1467 * update_object(). 1482 * update_object().
1468 */ 1483 */
1469 1484
1470 /* if this is not the head or flag has been passed, don't check walk on status */ 1485 /* if this is not the head or flag has been passed, don't check walk on status */
1471 if (!(flag & INS_NO_WALK_ON) && !op->head) 1486 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1472 { 1487 {
1473 if (check_move_on (op, originator)) 1488 if (check_move_on (op, originator))
1474 return 0; 1489 return 0;
1475 1490
1476 /* If we are a multi part object, lets work our way through the check 1491 /* If we are a multi part object, lets work our way through the check
1477 * walk on's. 1492 * walk on's.
1478 */ 1493 */
1479 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1494 for (object *tmp = op->more; tmp; tmp = tmp->more)
1480 if (check_move_on (tmp, originator)) 1495 if (check_move_on (tmp, originator))
1481 return 0; 1496 return 0;
1482 } 1497 }
1483 1498
1484 return op; 1499 return op;
1489 * op is the object to insert it under: supplies x and the map. 1504 * op is the object to insert it under: supplies x and the map.
1490 */ 1505 */
1491void 1506void
1492replace_insert_ob_in_map (const char *arch_string, object *op) 1507replace_insert_ob_in_map (const char *arch_string, object *op)
1493{ 1508{
1494 object *tmp, *tmp1;
1495
1496 /* first search for itself and remove any old instances */ 1509 /* first search for itself and remove any old instances */
1497 1510
1498 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1511 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1499 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1512 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1500 tmp->destroy (); 1513 tmp->destroy (1);
1501 1514
1502 tmp1 = arch_to_object (archetype::find (arch_string)); 1515 object *tmp = arch_to_object (archetype::find (arch_string));
1503 1516
1504 tmp1->x = op->x; 1517 tmp->x = op->x;
1505 tmp1->y = op->y; 1518 tmp->y = op->y;
1519
1506 insert_ob_in_map (tmp1, op->map, op, 0); 1520 insert_ob_in_map (tmp, op->map, op, 0);
1507} 1521}
1508 1522
1509object * 1523object *
1510object::insert_at (object *where, object *originator, int flags) 1524object::insert_at (object *where, object *originator, int flags)
1511{ 1525{
1526 if (where->env)
1527 return where->env->insert (this);
1528 else
1512 return where->map->insert (this, where->x, where->y, originator, flags); 1529 return where->map->insert (this, where->x, where->y, originator, flags);
1513} 1530}
1514 1531
1515/* 1532/*
1516 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1517 * is returned contains nr objects, and the remaining parts contains
1518 * the rest (or is removed and freed if that number is 0).
1519 * On failure, NULL is returned, and the reason put into the
1520 * global static errmsg array.
1521 */
1522object *
1523get_split_ob (object *orig_ob, uint32 nr)
1524{
1525 object *newob;
1526 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1527
1528 if (orig_ob->nrof < nr)
1529 {
1530 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1531 return NULL;
1532 }
1533
1534 newob = object_create_clone (orig_ob);
1535
1536 if ((orig_ob->nrof -= nr) < 1)
1537 orig_ob->destroy (1);
1538 else if (!is_removed)
1539 {
1540 if (orig_ob->env != NULL)
1541 sub_weight (orig_ob->env, orig_ob->weight * nr);
1542 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1543 {
1544 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1545 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1546 return NULL;
1547 }
1548 }
1549
1550 newob->nrof = nr;
1551
1552 return newob;
1553}
1554
1555/*
1556 * decrease_ob_nr(object, number) decreases a specified number from 1533 * decrease(object, number) decreases a specified number from
1557 * the amount of an object. If the amount reaches 0, the object 1534 * the amount of an object. If the amount reaches 0, the object
1558 * is subsequently removed and freed. 1535 * is subsequently removed and freed.
1559 * 1536 *
1560 * Return value: 'op' if something is left, NULL if the amount reached 0 1537 * Return value: 'op' if something is left, NULL if the amount reached 0
1561 */ 1538 */
1539bool
1540object::decrease (sint32 nr)
1541{
1542 if (!nr)
1543 return true;
1544
1545 nr = min (nr, nrof);
1546
1547 nrof -= nr;
1548
1549 if (nrof)
1550 {
1551 adjust_weight (env, -weight * nr); // carrying == 0
1552
1553 if (object *pl = visible_to ())
1554 esrv_update_item (UPD_NROF, pl, this);
1555
1556 return true;
1557 }
1558 else
1559 {
1560 destroy (1);
1561 return false;
1562 }
1563}
1564
1565/*
1566 * split(ob,nr) splits up ob into two parts. The part which
1567 * is returned contains nr objects, and the remaining parts contains
1568 * the rest (or is removed and returned if that number is 0).
1569 * On failure, NULL is returned.
1570 */
1562object * 1571object *
1563decrease_ob_nr (object *op, uint32 i) 1572object::split (sint32 nr)
1564{ 1573{
1565 object *tmp; 1574 int have = number_of ();
1566 1575
1567 if (i == 0) /* objects with op->nrof require this check */ 1576 if (have < nr)
1568 return op; 1577 return 0;
1569 1578 else if (have == nr)
1570 if (i > op->nrof)
1571 i = op->nrof;
1572
1573 if (QUERY_FLAG (op, FLAG_REMOVED))
1574 op->nrof -= i;
1575 else if (op->env)
1576 { 1579 {
1577 /* is this object in the players inventory, or sub container
1578 * therein?
1579 */
1580 tmp = op->in_player ();
1581 /* nope. Is this a container the player has opened?
1582 * If so, set tmp to that player.
1583 * IMO, searching through all the players will mostly
1584 * likely be quicker than following op->env to the map,
1585 * and then searching the map for a player.
1586 */
1587 if (!tmp)
1588 for_all_players (pl)
1589 if (pl->ob->container == op->env)
1590 {
1591 tmp = pl->ob;
1592 break;
1593 }
1594
1595 if (i < op->nrof)
1596 {
1597 sub_weight (op->env, op->weight * i);
1598 op->nrof -= i;
1599 if (tmp)
1600 esrv_send_item (tmp, op);
1601 }
1602 else
1603 {
1604 op->remove (); 1580 remove ();
1605 op->nrof = 0; 1581 return this;
1606 if (tmp)
1607 esrv_del_item (tmp->contr, op->count);
1608 }
1609 } 1582 }
1610 else 1583 else
1611 { 1584 {
1612 object *above = op->above; 1585 decrease (nr);
1613 1586
1614 if (i < op->nrof) 1587 object *op = object_create_clone (this);
1615 op->nrof -= i; 1588 op->nrof = nr;
1616 else
1617 {
1618 op->remove ();
1619 op->nrof = 0;
1620 }
1621
1622 /* Since we just removed op, op->above is null */
1623 for (tmp = above; tmp; tmp = tmp->above)
1624 if (tmp->type == PLAYER)
1625 {
1626 if (op->nrof)
1627 esrv_send_item (tmp, op);
1628 else
1629 esrv_del_item (tmp->contr, op->count);
1630 }
1631 }
1632
1633 if (op->nrof)
1634 return op; 1589 return op;
1635 else
1636 {
1637 op->destroy ();
1638 return 0;
1639 }
1640}
1641
1642/*
1643 * add_weight(object, weight) adds the specified weight to an object,
1644 * and also updates how much the environment(s) is/are carrying.
1645 */
1646void
1647add_weight (object *op, signed long weight)
1648{
1649 while (op != NULL)
1650 {
1651 if (op->type == CONTAINER)
1652 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1653
1654 op->carrying += weight;
1655 op = op->env;
1656 } 1590 }
1657} 1591}
1658 1592
1659object * 1593object *
1660insert_ob_in_ob (object *op, object *where) 1594insert_ob_in_ob (object *op, object *where)
1665 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1599 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1666 free (dump); 1600 free (dump);
1667 return op; 1601 return op;
1668 } 1602 }
1669 1603
1670 if (where->head) 1604 if (where->head_ () != where)
1671 { 1605 {
1672 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1606 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1673 where = where->head; 1607 where = where->head;
1674 } 1608 }
1675 1609
1676 return where->insert (op); 1610 return where->insert (op);
1677} 1611}
1685 * be != op, if items are merged. -Tero 1619 * be != op, if items are merged. -Tero
1686 */ 1620 */
1687object * 1621object *
1688object::insert (object *op) 1622object::insert (object *op)
1689{ 1623{
1690 object *tmp, *otmp;
1691
1692 if (!QUERY_FLAG (op, FLAG_REMOVED))
1693 op->remove ();
1694
1695 if (op->more) 1624 if (op->more)
1696 { 1625 {
1697 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1626 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1698 return op; 1627 return op;
1699 } 1628 }
1700 1629
1701 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1630 op->remove ();
1702 CLEAR_FLAG (op, FLAG_REMOVED); 1631
1632 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1633
1703 if (op->nrof) 1634 if (op->nrof)
1704 {
1705 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1635 for (object *tmp = inv; tmp; tmp = tmp->below)
1706 if (object::can_merge (tmp, op)) 1636 if (object::can_merge (tmp, op))
1707 { 1637 {
1708 /* return the original object and remove inserted object 1638 /* return the original object and remove inserted object
1709 (client needs the original object) */ 1639 (client needs the original object) */
1710 tmp->nrof += op->nrof; 1640 tmp->nrof += op->nrof;
1711 /* Weight handling gets pretty funky. Since we are adding to 1641
1712 * tmp->nrof, we need to increase the weight. 1642 if (object *pl = tmp->visible_to ())
1713 */ 1643 esrv_update_item (UPD_NROF, pl, tmp);
1644
1714 add_weight (this, op->weight * op->nrof); 1645 adjust_weight (this, op->total_weight ());
1715 SET_FLAG (op, FLAG_REMOVED); 1646
1716 op->destroy (); /* free the inserted object */ 1647 op->destroy (1);
1717 op = tmp; 1648 op = tmp;
1718 op->remove (); /* and fix old object's links */ 1649 goto inserted;
1719 CLEAR_FLAG (op, FLAG_REMOVED);
1720 break;
1721 } 1650 }
1722 1651
1723 /* I assume combined objects have no inventory 1652 op->owner = 0; // it's his/hers now. period.
1724 * We add the weight - this object could have just been removed
1725 * (if it was possible to merge). calling remove_ob will subtract
1726 * the weight, so we need to add it in again, since we actually do
1727 * the linking below
1728 */
1729 add_weight (this, op->weight * op->nrof);
1730 }
1731 else
1732 add_weight (this, (op->weight + op->carrying));
1733
1734 otmp = this->in_player ();
1735 if (otmp && otmp->contr)
1736 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1737 otmp->update_stats ();
1738
1739 op->map = 0; 1653 op->map = 0;
1740 op->env = this; 1654 op->x = 0;
1655 op->y = 0;
1656
1741 op->above = 0; 1657 op->above = 0;
1742 op->below = 0; 1658 op->below = inv;
1743 op->x = 0, op->y = 0; 1659 op->env = this;
1744 1660
1661 if (inv)
1662 inv->above = op;
1663
1664 inv = op;
1665
1666 op->flag [FLAG_REMOVED] = 0;
1667
1668 if (object *pl = op->visible_to ())
1669 esrv_send_item (pl, op);
1670
1671 adjust_weight (this, op->total_weight ());
1672
1673inserted:
1745 /* reset the light list and los of the players on the map */ 1674 /* reset the light list and los of the players on the map */
1746 if ((op->glow_radius != 0) && map) 1675 if (op->glow_radius && map && map->darkness)
1747 {
1748#ifdef DEBUG_LIGHTS
1749 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1750#endif /* DEBUG_LIGHTS */
1751 if (map->darkness)
1752 update_all_los (map, x, y); 1676 update_all_los (map, x, y);
1753 }
1754 1677
1755 /* Client has no idea of ordering so lets not bother ordering it here. 1678 // if this is a player's inventory, update stats
1756 * It sure simplifies this function... 1679 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1757 */ 1680 update_stats ();
1758 if (!inv)
1759 inv = op;
1760 else
1761 {
1762 op->below = inv;
1763 op->below->above = op;
1764 inv = op;
1765 }
1766 1681
1767 INVOKE_OBJECT (INSERT, this); 1682 INVOKE_OBJECT (INSERT, this);
1768 1683
1769 return op; 1684 return op;
1770} 1685}
1985 * activate recursively a flag on an object inventory 1900 * activate recursively a flag on an object inventory
1986 */ 1901 */
1987void 1902void
1988flag_inv (object *op, int flag) 1903flag_inv (object *op, int flag)
1989{ 1904{
1990 if (op->inv)
1991 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1905 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1992 { 1906 {
1993 SET_FLAG (tmp, flag); 1907 SET_FLAG (tmp, flag);
1994 flag_inv (tmp, flag); 1908 flag_inv (tmp, flag);
1995 } 1909 }
1996} 1910}
1997 1911
1998/* 1912/*
1999 * deactivate recursively a flag on an object inventory 1913 * deactivate recursively a flag on an object inventory
2000 */ 1914 */
2001void 1915void
2002unflag_inv (object *op, int flag) 1916unflag_inv (object *op, int flag)
2003{ 1917{
2004 if (op->inv)
2005 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1918 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006 { 1919 {
2007 CLEAR_FLAG (tmp, flag); 1920 CLEAR_FLAG (tmp, flag);
2008 unflag_inv (tmp, flag); 1921 unflag_inv (tmp, flag);
2009 } 1922 }
2010} 1923}
2011 1924
2012/* 1925/*
2013 * find_free_spot(object, map, x, y, start, stop) will search for 1926 * find_free_spot(object, map, x, y, start, stop) will search for
2014 * a spot at the given map and coordinates which will be able to contain 1927 * a spot at the given map and coordinates which will be able to contain
2016 * to search (see the freearr_x/y[] definition). 1929 * to search (see the freearr_x/y[] definition).
2017 * It returns a random choice among the alternatives found. 1930 * It returns a random choice among the alternatives found.
2018 * start and stop are where to start relative to the free_arr array (1,9 1931 * start and stop are where to start relative to the free_arr array (1,9
2019 * does all 4 immediate directions). This returns the index into the 1932 * does all 4 immediate directions). This returns the index into the
2020 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1933 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2021 * Note - this only checks to see if there is space for the head of the
2022 * object - if it is a multispace object, this should be called for all
2023 * pieces.
2024 * Note2: This function does correctly handle tiled maps, but does not 1934 * Note: This function does correctly handle tiled maps, but does not
2025 * inform the caller. However, insert_ob_in_map will update as 1935 * inform the caller. However, insert_ob_in_map will update as
2026 * necessary, so the caller shouldn't need to do any special work. 1936 * necessary, so the caller shouldn't need to do any special work.
2027 * Note - updated to take an object instead of archetype - this is necessary 1937 * Note - updated to take an object instead of archetype - this is necessary
2028 * because arch_blocked (now ob_blocked) needs to know the movement type 1938 * because arch_blocked (now ob_blocked) needs to know the movement type
2029 * to know if the space in question will block the object. We can't use 1939 * to know if the space in question will block the object. We can't use
2031 * customized, changed states, etc. 1941 * customized, changed states, etc.
2032 */ 1942 */
2033int 1943int
2034find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1944find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2035{ 1945{
1946 int altern[SIZEOFFREE];
2036 int index = 0, flag; 1947 int index = 0, flag;
2037 int altern[SIZEOFFREE];
2038 1948
2039 for (int i = start; i < stop; i++) 1949 for (int i = start; i < stop; i++)
2040 { 1950 {
2041 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1951 mapxy pos (m, x, y); pos.move (i);
2042 if (!flag) 1952
1953 if (!pos.normalise ())
1954 continue;
1955
1956 mapspace &ms = *pos;
1957
1958 if (ms.flags () & P_IS_ALIVE)
1959 continue;
1960
1961 /* However, often
1962 * ob doesn't have any move type (when used to place exits)
1963 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1964 */
1965 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1966 {
2043 altern [index++] = i; 1967 altern [index++] = i;
1968 continue;
1969 }
2044 1970
2045 /* Basically, if we find a wall on a space, we cut down the search size. 1971 /* Basically, if we find a wall on a space, we cut down the search size.
2046 * In this way, we won't return spaces that are on another side of a wall. 1972 * In this way, we won't return spaces that are on another side of a wall.
2047 * This mostly work, but it cuts down the search size in all directions - 1973 * This mostly work, but it cuts down the search size in all directions -
2048 * if the space being examined only has a wall to the north and empty 1974 * if the space being examined only has a wall to the north and empty
2049 * spaces in all the other directions, this will reduce the search space 1975 * spaces in all the other directions, this will reduce the search space
2050 * to only the spaces immediately surrounding the target area, and 1976 * to only the spaces immediately surrounding the target area, and
2051 * won't look 2 spaces south of the target space. 1977 * won't look 2 spaces south of the target space.
2052 */ 1978 */
2053 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1979 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1980 {
2054 stop = maxfree[i]; 1981 stop = maxfree[i];
1982 continue;
1983 }
1984
1985 /* Note it is intentional that we check ob - the movement type of the
1986 * head of the object should correspond for the entire object.
1987 */
1988 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1989 continue;
1990
1991 if (ob->blocked (m, pos.x, pos.y))
1992 continue;
1993
1994 altern [index++] = i;
2055 } 1995 }
2056 1996
2057 if (!index) 1997 if (!index)
2058 return -1; 1998 return -1;
2059 1999
2068 */ 2008 */
2069int 2009int
2070find_first_free_spot (const object *ob, maptile *m, int x, int y) 2010find_first_free_spot (const object *ob, maptile *m, int x, int y)
2071{ 2011{
2072 for (int i = 0; i < SIZEOFFREE; i++) 2012 for (int i = 0; i < SIZEOFFREE; i++)
2073 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2013 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2074 return i; 2014 return i;
2075 2015
2076 return -1; 2016 return -1;
2077} 2017}
2078 2018
2132 object *tmp; 2072 object *tmp;
2133 maptile *mp; 2073 maptile *mp;
2134 2074
2135 MoveType blocked, move_type; 2075 MoveType blocked, move_type;
2136 2076
2137 if (exclude && exclude->head) 2077 if (exclude && exclude->head_ () != exclude)
2138 { 2078 {
2139 exclude = exclude->head; 2079 exclude = exclude->head;
2140 move_type = exclude->move_type; 2080 move_type = exclude->move_type;
2141 } 2081 }
2142 else 2082 else
2165 max = maxfree[i]; 2105 max = maxfree[i];
2166 else if (mflags & P_IS_ALIVE) 2106 else if (mflags & P_IS_ALIVE)
2167 { 2107 {
2168 for (tmp = ms.bot; tmp; tmp = tmp->above) 2108 for (tmp = ms.bot; tmp; tmp = tmp->above)
2169 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2109 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2170 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2110 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171 break; 2111 break;
2172 2112
2173 if (tmp) 2113 if (tmp)
2174 return freedir[i]; 2114 return freedir[i];
2175 } 2115 }
2355 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2295 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2356 * core dumps if they do. 2296 * core dumps if they do.
2357 * 2297 *
2358 * Add a check so we can't pick up invisible objects (0.93.8) 2298 * Add a check so we can't pick up invisible objects (0.93.8)
2359 */ 2299 */
2360
2361int 2300int
2362can_pick (const object *who, const object *item) 2301can_pick (const object *who, const object *item)
2363{ 2302{
2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2303 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2304 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2370 * create clone from object to another 2309 * create clone from object to another
2371 */ 2310 */
2372object * 2311object *
2373object_create_clone (object *asrc) 2312object_create_clone (object *asrc)
2374{ 2313{
2375 object *dst = 0, *tmp, *src, *part, *prev, *item; 2314 object *dst = 0;
2376 2315
2377 if (!asrc) 2316 if (!asrc)
2378 return 0; 2317 return 0;
2379 2318
2380 src = asrc; 2319 object *src = asrc->head_ ();
2381 if (src->head)
2382 src = src->head;
2383 2320
2384 prev = 0; 2321 object *prev = 0;
2385 for (part = src; part; part = part->more) 2322 for (object *part = src; part; part = part->more)
2386 { 2323 {
2387 tmp = part->clone (); 2324 object *tmp = part->clone ();
2325
2388 tmp->x -= src->x; 2326 tmp->x -= src->x;
2389 tmp->y -= src->y; 2327 tmp->y -= src->y;
2390 2328
2391 if (!part->head) 2329 if (!part->head)
2392 { 2330 {
2402 prev->more = tmp; 2340 prev->more = tmp;
2403 2341
2404 prev = tmp; 2342 prev = tmp;
2405 } 2343 }
2406 2344
2407 for (item = src->inv; item; item = item->below) 2345 for (object *item = src->inv; item; item = item->below)
2408 insert_ob_in_ob (object_create_clone (item), dst); 2346 insert_ob_in_ob (object_create_clone (item), dst);
2409 2347
2410 return dst; 2348 return dst;
2411} 2349}
2412 2350
2422 return tmp; 2360 return tmp;
2423 2361
2424 return 0; 2362 return 0;
2425} 2363}
2426 2364
2427/* If ob has a field named key, return the link from the list, 2365const shstr &
2428 * otherwise return NULL. 2366object::kv_get (const shstr &key) const
2429 *
2430 * key must be a passed in shared string - otherwise, this won't
2431 * do the desired thing.
2432 */
2433key_value *
2434get_ob_key_link (const object *ob, const char *key)
2435{ 2367{
2436 for (key_value *link = ob->key_values; link; link = link->next) 2368 for (key_value *kv = key_values; kv; kv = kv->next)
2437 if (link->key == key) 2369 if (kv->key == key)
2438 return link;
2439
2440 return 0;
2441}
2442
2443/*
2444 * Returns the value of op has an extra_field for key, or NULL.
2445 *
2446 * The argument doesn't need to be a shared string.
2447 *
2448 * The returned string is shared.
2449 */
2450const char *
2451get_ob_key_value (const object *op, const char *const key)
2452{
2453 key_value *link;
2454 shstr_cmp canonical_key (key);
2455
2456 if (!canonical_key)
2457 {
2458 /* 1. There being a field named key on any object
2459 * implies there'd be a shared string to find.
2460 * 2. Since there isn't, no object has this field.
2461 * 3. Therefore, *this* object doesn't have this field.
2462 */
2463 return 0;
2464 }
2465
2466 /* This is copied from get_ob_key_link() above -
2467 * only 4 lines, and saves the function call overhead.
2468 */
2469 for (link = op->key_values; link; link = link->next)
2470 if (link->key == canonical_key)
2471 return link->value; 2370 return kv->value;
2472 2371
2473 return 0; 2372 return shstr_null;
2474} 2373}
2475 2374
2476/* 2375void
2477 * Updates the canonical_key in op to value. 2376object::kv_set (const shstr &key, const shstr &value)
2478 *
2479 * canonical_key is a shared string (value doesn't have to be).
2480 *
2481 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2482 * keys.
2483 *
2484 * Returns TRUE on success.
2485 */
2486int
2487set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2488{ 2377{
2489 key_value *field = NULL, *last = NULL; 2378 for (key_value *kv = key_values; kv; kv = kv->next)
2490 2379 if (kv->key == key)
2491 for (field = op->key_values; field != NULL; field = field->next)
2492 {
2493 if (field->key != canonical_key)
2494 { 2380 {
2495 last = field; 2381 kv->value = value;
2496 continue; 2382 return;
2497 } 2383 }
2498 2384
2499 if (value) 2385 key_value *kv = new key_value;
2500 field->value = value; 2386
2501 else 2387 kv->next = key_values;
2388 kv->key = key;
2389 kv->value = value;
2390
2391 key_values = kv;
2392}
2393
2394void
2395object::kv_del (const shstr &key)
2396{
2397 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2398 if ((*kvp)->key == key)
2502 { 2399 {
2503 /* Basically, if the archetype has this key set, 2400 key_value *kv = *kvp;
2504 * we need to store the null value so when we save 2401 *kvp = (*kvp)->next;
2505 * it, we save the empty value so that when we load, 2402 delete kv;
2506 * we get this value back again. 2403 return;
2507 */
2508 if (get_ob_key_link (&op->arch->clone, canonical_key))
2509 field->value = 0;
2510 else
2511 {
2512 if (last)
2513 last->next = field->next;
2514 else
2515 op->key_values = field->next;
2516
2517 delete field;
2518 }
2519 } 2404 }
2520 return TRUE;
2521 }
2522 /* IF we get here, key doesn't exist */
2523
2524 /* No field, we'll have to add it. */
2525
2526 if (!add_key)
2527 return FALSE;
2528
2529 /* There isn't any good reason to store a null
2530 * value in the key/value list. If the archetype has
2531 * this key, then we should also have it, so shouldn't
2532 * be here. If user wants to store empty strings,
2533 * should pass in ""
2534 */
2535 if (value == NULL)
2536 return TRUE;
2537
2538 field = new key_value;
2539
2540 field->key = canonical_key;
2541 field->value = value;
2542 /* Usual prepend-addition. */
2543 field->next = op->key_values;
2544 op->key_values = field;
2545
2546 return TRUE;
2547}
2548
2549/*
2550 * Updates the key in op to value.
2551 *
2552 * If add_key is FALSE, this will only update existing keys,
2553 * and not add new ones.
2554 * In general, should be little reason FALSE is ever passed in for add_key
2555 *
2556 * Returns TRUE on success.
2557 */
2558int
2559set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2560{
2561 shstr key_ (key);
2562
2563 return set_ob_key_value_s (op, key_, value, add_key);
2564} 2405}
2565 2406
2566object::depth_iterator::depth_iterator (object *container) 2407object::depth_iterator::depth_iterator (object *container)
2567: iterator_base (container) 2408: iterator_base (container)
2568{ 2409{
2581 item = item->inv; 2422 item = item->inv;
2582 } 2423 }
2583 else 2424 else
2584 item = item->env; 2425 item = item->env;
2585} 2426}
2586
2587 2427
2588const char * 2428const char *
2589object::flag_desc (char *desc, int len) const 2429object::flag_desc (char *desc, int len) const
2590{ 2430{
2591 char *p = desc; 2431 char *p = desc;
2619{ 2459{
2620 char flagdesc[512]; 2460 char flagdesc[512];
2621 char info2[256 * 4]; 2461 char info2[256 * 4];
2622 char *p = info; 2462 char *p = info;
2623 2463
2624 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2464 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2625 count, uuid.seq, 2465 count,
2466 uuid.c_str (),
2626 &name, 2467 &name,
2627 title ? "\",title:\"" : "", 2468 title ? "\",title:\"" : "",
2628 title ? (const char *)title : "", 2469 title ? (const char *)title : "",
2629 flag_desc (flagdesc, 512), type); 2470 flag_desc (flagdesc, 512), type);
2630 2471
2631 if (env) 2472 if (!flag[FLAG_REMOVED] && env)
2632 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2473 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2633 2474
2634 if (map) 2475 if (map)
2635 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2476 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2636 2477
2654} 2495}
2655 2496
2656const materialtype_t * 2497const materialtype_t *
2657object::dominant_material () const 2498object::dominant_material () const
2658{ 2499{
2659 if (materialtype_t *mat = name_to_material (materialname)) 2500 if (materialtype_t *mt = name_to_material (materialname))
2660 return mat; 2501 return mt;
2661 2502
2662 // omfg this is slow, this has to be temporary :)
2663 shstr unknown ("unknown");
2664
2665 return name_to_material (unknown); 2503 return name_to_material (shstr_unknown);
2666} 2504}
2667 2505
2668void 2506void
2669object::open_container (object *new_container) 2507object::open_container (object *new_container)
2670{ 2508{
2671 if (container == new_container) 2509 if (container == new_container)
2672 return; 2510 return;
2673 2511
2674 if (object *old_container = container) 2512 object *old_container = container;
2513
2514 if (old_container)
2675 { 2515 {
2676 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2516 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2677 return; 2517 return;
2678 2518
2679#if 0 2519#if 0
2681 if (object *closer = old_container->inv) 2521 if (object *closer = old_container->inv)
2682 if (closer->type == CLOSE_CON) 2522 if (closer->type == CLOSE_CON)
2683 closer->destroy (); 2523 closer->destroy ();
2684#endif 2524#endif
2685 2525
2526 // make sure the container is available
2527 esrv_send_item (this, old_container);
2528
2686 old_container->flag [FLAG_APPLIED] = 0; 2529 old_container->flag [FLAG_APPLIED] = false;
2687 container = 0; 2530 container = 0;
2688 2531
2532 // client needs item update to make it work, client bug requires this to be separate
2689 esrv_update_item (UPD_FLAGS, this, old_container); 2533 esrv_update_item (UPD_FLAGS, this, old_container);
2534
2690 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2535 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2536 play_sound (sound_find ("chest_close"));
2691 } 2537 }
2692 2538
2693 if (new_container) 2539 if (new_container)
2694 { 2540 {
2695 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2541 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2706 } 2552 }
2707#endif 2553#endif
2708 2554
2709 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2555 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2710 2556
2557 // make sure the container is available, client bug requires this to be separate
2558 esrv_send_item (this, new_container);
2559
2711 new_container->flag [FLAG_APPLIED] = 1; 2560 new_container->flag [FLAG_APPLIED] = true;
2712 container = new_container; 2561 container = new_container;
2713 2562
2563 // client needs flag change
2714 esrv_update_item (UPD_FLAGS, this, new_container); 2564 esrv_update_item (UPD_FLAGS, this, new_container);
2715 esrv_send_inventory (this, new_container); 2565 esrv_send_inventory (this, new_container);
2566 play_sound (sound_find ("chest_open"));
2567 }
2568// else if (!old_container->env && contr && contr->ns)
2569// contr->ns->floorbox_reset ();
2570}
2571
2572object *
2573object::force_find (const shstr name)
2574{
2575 /* cycle through his inventory to look for the MARK we want to
2576 * place
2577 */
2578 for (object *tmp = inv; tmp; tmp = tmp->below)
2579 if (tmp->type == FORCE && tmp->slaying == name)
2580 return splay (tmp);
2581
2582 return 0;
2583}
2584
2585void
2586object::force_add (const shstr name, int duration)
2587{
2588 if (object *force = force_find (name))
2589 force->destroy ();
2590
2591 object *force = get_archetype (FORCE_NAME);
2592
2593 force->slaying = name;
2594 force->stats.food = 1;
2595 force->speed_left = -1.f;
2596
2597 force->set_speed (duration ? 1.f / duration : 0.f);
2598 force->flag [FLAG_IS_USED_UP] = true;
2599 force->flag [FLAG_APPLIED] = true;
2600
2601 insert (force);
2602}
2603
2604void
2605object::play_sound (faceidx sound)
2606{
2607 if (!sound)
2608 return;
2609
2610 if (flag [FLAG_REMOVED])
2611 return;
2612
2613 if (env)
2716 } 2614 {
2615 if (object *pl = in_player ())
2616 pl->contr->play_sound (sound);
2617 }
2618 else
2619 map->play_sound (sound, x, y);
2717} 2620}
2718 2621
2719

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines