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.148 by root, Mon May 14 19:08:25 2007 UTC vs.
Revision 1.233 by root, Tue May 6 18:47:32 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_for (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 // adjust by actual difference to account for rounding errors
376 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
377 weight = weight_adjust_for (op, op->carrying)
378 - weight_adjust_for (op, op->carrying - weight);
379
380 if (!weight)
381 return;
382
383 op->carrying += weight;
384
385 if (object *pl = op->visible_to ())
386 if (pl != op) // player is handled lazily
387 esrv_update_item (UPD_WEIGHT, pl, op);
388
389 op = op->env;
390 }
391}
392
393/*
320 * sum_weight() is a recursive function which calculates the weight 394 * this is a recursive function which calculates the weight
321 * an object is carrying. It goes through in figures out how much 395 * an object is carrying. It goes through op and figures out how much
322 * containers are carrying, and sums it up. 396 * containers are carrying, and sums it up.
323 */ 397 */
324long 398void
325sum_weight (object *op) 399object::update_weight ()
326{ 400{
327 long sum; 401 sint32 sum = 0;
328 object *inv;
329 402
330 for (sum = 0, inv = op->inv; inv; inv = inv->below) 403 for (object *op = inv; op; op = op->below)
331 { 404 {
332 if (inv->inv) 405 if (op->inv)
333 sum_weight (inv); 406 op->update_weight ();
334 407
335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 408 sum += op->total_weight ();
409 }
410
411 sum = weight_adjust (this, sum);
412
413 if (sum != carrying)
336 } 414 {
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; 415 carrying = sum;
343 416
344 return sum; 417 if (object *pl = visible_to ())
418 if (pl != this) // player is handled lazily
419 esrv_update_item (UPD_WEIGHT, pl, this);
420 }
345} 421}
346 422
347/** 423/*
348 * Return the outermost environment object for a given object. 424 * 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 */ 425 */
364char * 426char *
365dump_object (object *op) 427dump_object (object *op)
366{ 428{
367 if (!op) 429 if (!op)
375/* 437/*
376 * get_nearest_part(multi-object, object 2) returns the part of the 438 * get_nearest_part(multi-object, object 2) returns the part of the
377 * multi-object 1 which is closest to the second object. 439 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 440 * If it's not a multi-object, it is returned.
379 */ 441 */
380
381object * 442object *
382get_nearest_part (object *op, const object *pl) 443get_nearest_part (object *op, const object *pl)
383{ 444{
384 object *tmp, *closest; 445 object *tmp, *closest;
385 int last_dist, i; 446 int last_dist, i;
386 447
387 if (op->more == NULL) 448 if (!op->more)
388 return op; 449 return op;
450
389 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more) 451 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
452 tmp;
453 tmp = tmp->more)
390 if ((i = distance (tmp, pl)) < last_dist) 454 if ((i = distance (tmp, pl)) < last_dist)
391 closest = tmp, last_dist = i; 455 closest = tmp, last_dist = i;
456
392 return closest; 457 return closest;
393} 458}
394 459
395/* 460/*
396 * Returns the object which has the count-variable equal to the argument. 461 * Returns the object which has the count-variable equal to the argument.
462 * VERRRY slow.
397 */ 463 */
398object * 464object *
399find_object (tag_t i) 465find_object (tag_t i)
400{ 466{
401 for_all_objects (op) 467 for_all_objects (op)
421 break; 487 break;
422 488
423 return op; 489 return op;
424} 490}
425 491
426void
427free_all_object_data ()
428{
429 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430}
431
432/* 492/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 493 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 494 * skill and experience objects.
495 * ACTUALLY NO! investigate! TODO
435 */ 496 */
436void 497void
437object::set_owner (object *owner) 498object::set_owner (object *owner)
438{ 499{
500 // allow objects which own objects
439 if (!owner) 501 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) 502 while (owner->owner)
450 owner = owner->owner; 503 owner = owner->owner;
504
505 if (flag [FLAG_FREED])
506 {
507 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
508 return;
509 }
451 510
452 this->owner = owner; 511 this->owner = owner;
453} 512}
454 513
455int 514int
495 { 554 {
496 current_weapon = chosen_skill = 0; 555 current_weapon = chosen_skill = 0;
497 update_stats (); 556 update_stats ();
498 557
499 new_draw_info_format (NDI_UNIQUE, 0, this, 558 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. " 559 "You try to balance all your items at once, "
560 "but the %s is just too much for your body. "
501 "You need to unapply some items first.", &ob->name); 561 "[You need to unapply some items first.]", &ob->name);
502 return false; 562 return false;
503 } 563 }
504 564
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 565 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 } 566 }
507 else 567 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); 568 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509 569
570 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
571 {
572 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
573 &name, ob->debug_desc ());
574 return false;
575 }
576
510 return true; 577 return true;
511} 578}
512 579
513/* Zero the key_values on op, decrementing the shared-string 580/* Zero the key_values on op, decrementing the shared-string
514 * refcounts and freeing the links. 581 * refcounts and freeing the links.
525 } 592 }
526 593
527 op->key_values = 0; 594 op->key_values = 0;
528} 595}
529 596
530object & 597/*
531object::operator =(const object &src) 598 * copy_to first frees everything allocated by the dst object,
599 * and then copies the contents of itself into the second
600 * object, allocating what needs to be allocated. Basically, any
601 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
602 * if the first object is freed, the pointers in the new object
603 * will point at garbage.
604 */
605void
606object::copy_to (object *dst)
532{ 607{
533 bool is_freed = flag [FLAG_FREED]; 608 dst->remove ();
534 bool is_removed = flag [FLAG_REMOVED];
535
536 *(object_copy *)this = src; 609 *(object_copy *)dst = *this;
537
538 flag [FLAG_FREED] = is_freed;
539 flag [FLAG_REMOVED] = is_removed; 610 dst->flag [FLAG_REMOVED] = true;
540 611
541 /* Copy over key_values, if any. */ 612 /* Copy over key_values, if any. */
542 if (src.key_values) 613 if (key_values)
543 { 614 {
544 key_value *tail = 0; 615 key_value *tail = 0;
545 key_values = 0; 616 dst->key_values = 0;
546 617
547 for (key_value *i = src.key_values; i; i = i->next) 618 for (key_value *i = key_values; i; i = i->next)
548 { 619 {
549 key_value *new_link = new key_value; 620 key_value *new_link = new key_value;
550 621
551 new_link->next = 0; 622 new_link->next = 0;
552 new_link->key = i->key; 623 new_link->key = i->key;
553 new_link->value = i->value; 624 new_link->value = i->value;
554 625
555 /* Try and be clever here, too. */ 626 /* Try and be clever here, too. */
556 if (!key_values) 627 if (!dst->key_values)
557 { 628 {
558 key_values = new_link; 629 dst->key_values = new_link;
559 tail = new_link; 630 tail = new_link;
560 } 631 }
561 else 632 else
562 { 633 {
563 tail->next = new_link; 634 tail->next = new_link;
564 tail = new_link; 635 tail = new_link;
565 } 636 }
566 } 637 }
567 } 638 }
568}
569
570/*
571 * copy_to first frees everything allocated by the dst object,
572 * and then copies the contents of itself into the second
573 * object, allocating what needs to be allocated. Basically, any
574 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
575 * if the first object is freed, the pointers in the new object
576 * will point at garbage.
577 */
578void
579object::copy_to (object *dst)
580{
581 *dst = *this;
582 639
583 if (speed < 0) 640 if (speed < 0)
584 dst->speed_left = speed_left - rndm (); 641 dst->speed_left -= rndm ();
585 642
586 dst->set_speed (dst->speed); 643 dst->set_speed (dst->speed);
587} 644}
588 645
589void 646void
590object::instantiate () 647object::instantiate ()
591{ 648{
592 if (!uuid.seq) // HACK 649 if (!uuid.seq) // HACK
593 uuid = gen_uuid (); 650 uuid = UUID::gen ();
594 651
595 speed_left = -0.1f; 652 speed_left = -0.1f;
596 /* copy the body_info to the body_used - this is only really 653 /* copy the body_info to the body_used - this is only really
597 * need for monsters, but doesn't hurt to do it for everything. 654 * need for monsters, but doesn't hurt to do it for everything.
598 * by doing so, when a monster is created, it has good starting 655 * by doing so, when a monster is created, it has good starting
608object * 665object *
609object::clone () 666object::clone ()
610{ 667{
611 object *neu = create (); 668 object *neu = create ();
612 copy_to (neu); 669 copy_to (neu);
670 neu->map = map; // not copied by copy_to
613 return neu; 671 return neu;
614} 672}
615 673
616/* 674/*
617 * If an object with the IS_TURNABLE() flag needs to be turned due 675 * If an object with the IS_TURNABLE() flag needs to be turned due
668 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
669 */ 727 */
670void 728void
671update_object (object *op, int action) 729update_object (object *op, int action)
672{ 730{
673 if (op == NULL) 731 if (!op)
674 { 732 {
675 /* this should never happen */ 733 /* this should never happen */
676 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
677 return; 735 return;
678 } 736 }
679 737
680 if (op->env) 738 if (!op->is_on_map ())
681 { 739 {
682 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
683 * to do in this case. 741 * to do in this case.
684 */ 742 */
685 return; 743 return;
686 } 744 }
687
688 /* If the map is saving, don't do anything as everything is
689 * going to get freed anyways.
690 */
691 if (!op->map || op->map->in_memory == MAP_SAVING)
692 return;
693 745
694 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
695 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
696 { 748 {
697 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
757static int object_count; 809static int object_count;
758 810
759void object::link () 811void object::link ()
760{ 812{
761 assert (!index);//D 813 assert (!index);//D
762 uuid = gen_uuid (); 814 uuid = UUID::gen ();
763 count = ++object_count; 815 count = ++object_count;
764 816
765 refcnt_inc (); 817 refcnt_inc ();
766 objects.insert (this); 818 objects.insert (this);
767} 819}
840object::destroy_inv (bool drop_to_ground) 892object::destroy_inv (bool drop_to_ground)
841{ 893{
842 // need to check first, because the checks below might segfault 894 // need to check first, because the checks below might segfault
843 // as we might be on an invalid mapspace and crossfire code 895 // as we might be on an invalid mapspace and crossfire code
844 // is too buggy to ensure that the inventory is empty. 896 // is too buggy to ensure that the inventory is empty.
845 // corollary: if you create arrows etc. with stuff in tis inventory, 897 // corollary: if you create arrows etc. with stuff in its inventory,
846 // cf will crash below with off-map x and y 898 // cf will crash below with off-map x and y
847 if (!inv) 899 if (!inv)
848 return; 900 return;
849 901
850 /* Only if the space blocks everything do we not process - 902 /* Only if the space blocks everything do we not process -
851 * if some form of movement is allowed, let objects 903 * if some form of movement is allowed, let objects
852 * drop on that space. 904 * drop on that space.
853 */ 905 */
854 if (!drop_to_ground 906 if (!drop_to_ground
855 || !map 907 || !map
856 || map->in_memory != MAP_IN_MEMORY 908 || map->in_memory != MAP_ACTIVE
857 || map->nodrop 909 || map->nodrop
858 || ms ().move_block == MOVE_ALL) 910 || ms ().move_block == MOVE_ALL)
859 { 911 {
860 while (inv) 912 while (inv)
861 { 913 {
862 inv->destroy_inv (drop_to_ground); 914 inv->destroy_inv (false);
863 inv->destroy (); 915 inv->destroy ();
864 } 916 }
865 } 917 }
866 else 918 else
867 { /* Put objects in inventory onto this space */ 919 { /* Put objects in inventory onto this space */
873 || op->flag [FLAG_NO_DROP] 925 || op->flag [FLAG_NO_DROP]
874 || op->type == RUNE 926 || op->type == RUNE
875 || op->type == TRAP 927 || op->type == TRAP
876 || op->flag [FLAG_IS_A_TEMPLATE] 928 || op->flag [FLAG_IS_A_TEMPLATE]
877 || op->flag [FLAG_DESTROY_ON_DEATH]) 929 || op->flag [FLAG_DESTROY_ON_DEATH])
878 op->destroy (); 930 op->destroy (true);
879 else 931 else
880 map->insert (op, x, y); 932 map->insert (op, x, y);
881 } 933 }
882 } 934 }
883} 935}
887 object *op = new object; 939 object *op = new object;
888 op->link (); 940 op->link ();
889 return op; 941 return op;
890} 942}
891 943
944static struct freed_map : maptile
945{
946 freed_map ()
947 {
948 path = "<freed objects map>";
949 name = "/internal/freed_objects_map";
950 width = 3;
951 height = 3;
952 nodrop = 1;
953
954 alloc ();
955 in_memory = MAP_ACTIVE;
956 }
957
958 ~freed_map ()
959 {
960 destroy ();
961 }
962} freed_map; // freed objects are moved here to avoid crashes
963
892void 964void
893object::do_destroy () 965object::do_destroy ()
894{ 966{
895 attachable::do_destroy ();
896
897 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
898 remove_button_link (this); 968 remove_button_link (this);
899 969
900 if (flag [FLAG_FRIENDLY]) 970 if (flag [FLAG_FRIENDLY])
901 remove_friendly_object (this); 971 remove_friendly_object (this);
902 972
903 if (!flag [FLAG_REMOVED])
904 remove (); 973 remove ();
905 974
906 destroy_inv (true); 975 attachable::do_destroy ();
907 976
908 deactivate (); 977 deactivate ();
909 unlink (); 978 unlink ();
910 979
911 flag [FLAG_FREED] = 1; 980 flag [FLAG_FREED] = 1;
912 981
913 // hack to ensure that freed objects still have a valid map 982 // hack to ensure that freed objects still have a valid map
914 {
915 static maptile *freed_map; // freed objects are moved here to avoid crashes
916
917 if (!freed_map)
918 {
919 freed_map = new maptile;
920
921 freed_map->name = "/internal/freed_objects_map";
922 freed_map->width = 3;
923 freed_map->height = 3;
924
925 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY;
927 }
928
929 map = freed_map; 983 map = &freed_map;
930 x = 1; 984 x = 1;
931 y = 1; 985 y = 1;
932 }
933
934 head = 0;
935 986
936 if (more) 987 if (more)
937 { 988 {
938 more->destroy (); 989 more->destroy ();
939 more = 0; 990 more = 0;
940 } 991 }
941 992
993 head = 0;
994
942 // clear those pointers that likely might have circular references to us 995 // clear those pointers that likely might cause circular references
943 owner = 0; 996 owner = 0;
944 enemy = 0; 997 enemy = 0;
945 attacked_by = 0; 998 attacked_by = 0;
999 current_weapon = 0;
946} 1000}
947 1001
948void 1002void
949object::destroy (bool destroy_inventory) 1003object::destroy (bool destroy_inventory)
950{ 1004{
951 if (destroyed ()) 1005 if (destroyed ())
952 return; 1006 return;
953 1007
1008 if (!is_head () && !head->destroyed ())
1009 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory);
1012 return;
1013 }
1014
954 if (destroy_inventory) 1015 destroy_inv (!destroy_inventory);
955 destroy_inv (false); 1016
1017 if (is_head ())
1018 if (sound_destroy)
1019 play_sound (sound_destroy);
1020 else if (flag [FLAG_MONSTER])
1021 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
956 1022
957 attachable::destroy (); 1023 attachable::destroy ();
958}
959
960/*
961 * sub_weight() recursively (outwards) subtracts a number from the
962 * weight of an object (and what is carried by it's environment(s)).
963 */
964void
965sub_weight (object *op, signed long weight)
966{
967 while (op != NULL)
968 {
969 if (op->type == CONTAINER)
970 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
971
972 op->carrying -= weight;
973 op = op->env;
974 }
975} 1024}
976 1025
977/* op->remove (): 1026/* op->remove ():
978 * This function removes the object op from the linked list of objects 1027 * This function removes the object op from the linked list of objects
979 * which it is currently tied to. When this function is done, the 1028 * which it is currently tied to. When this function is done, the
985object::do_remove () 1034object::do_remove ()
986{ 1035{
987 object *tmp, *last = 0; 1036 object *tmp, *last = 0;
988 object *otmp; 1037 object *otmp;
989 1038
990 if (QUERY_FLAG (this, FLAG_REMOVED)) 1039 if (flag [FLAG_REMOVED])
991 return; 1040 return;
992 1041
993 SET_FLAG (this, FLAG_REMOVED);
994 INVOKE_OBJECT (REMOVE, this); 1042 INVOKE_OBJECT (REMOVE, this);
1043
1044 flag [FLAG_REMOVED] = true;
995 1045
996 if (more) 1046 if (more)
997 more->remove (); 1047 more->remove ();
998 1048
999 /* 1049 /*
1000 * In this case, the object to be removed is in someones 1050 * In this case, the object to be removed is in someones
1001 * inventory. 1051 * inventory.
1002 */ 1052 */
1003 if (env) 1053 if (env)
1004 { 1054 {
1055 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059
1060 adjust_weight (env, -total_weight ());
1061
1062 *(above ? &above->below : &env->inv) = below;
1063
1005 if (nrof) 1064 if (below)
1006 sub_weight (env, weight * nrof); 1065 below->above = above;
1007 else 1066
1008 sub_weight (env, weight + carrying); 1067 /* we set up values so that it could be inserted into
1068 * the map, but we don't actually do that - it is up
1069 * to the caller to decide what we want to do.
1070 */
1071 map = env->map;
1072 x = env->x;
1073 y = env->y;
1074 above = 0;
1075 below = 0;
1076 env = 0;
1009 1077
1010 /* NO_FIX_PLAYER is set when a great many changes are being 1078 /* NO_FIX_PLAYER is set when a great many changes are being
1011 * made to players inventory. If set, avoiding the call 1079 * made to players inventory. If set, avoiding the call
1012 * to save cpu time. 1080 * to save cpu time.
1013 */ 1081 */
1014 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1015 otmp->update_stats (); 1083 otmp->update_stats ();
1016
1017 if (above)
1018 above->below = below;
1019 else
1020 env->inv = below;
1021
1022 if (below)
1023 below->above = above;
1024
1025 /* we set up values so that it could be inserted into
1026 * the map, but we don't actually do that - it is up
1027 * to the caller to decide what we want to do.
1028 */
1029 x = env->x, y = env->y;
1030 map = env->map;
1031 above = 0, below = 0;
1032 env = 0;
1033 } 1084 }
1034 else if (map) 1085 else if (map)
1035 { 1086 {
1036 if (type == PLAYER)
1037 {
1038 // leaving a spot always closes any open container on the ground
1039 if (container && !container->env)
1040 // this causes spurious floorbox updates, but it ensures
1041 // that the CLOSE event is being sent.
1042 close_container ();
1043
1044 --map->players;
1045 map->touch ();
1046 }
1047
1048 map->dirty = true; 1087 map->dirty = true;
1049 mapspace &ms = this->ms (); 1088 mapspace &ms = this->ms ();
1089
1090 if (object *pl = ms.player ())
1091 {
1092 if (type == PLAYER) // this == pl(!)
1093 {
1094 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent.
1098 close_container ();
1099
1100 --map->players;
1101 map->touch ();
1102 }
1103 else if (pl->container == this)
1104 {
1105 // removing a container should close it
1106 close_container ();
1107 }
1108
1109 esrv_del_item (pl->contr, count);
1110 }
1050 1111
1051 /* link the object above us */ 1112 /* link the object above us */
1052 if (above) 1113 if (above)
1053 above->below = below; 1114 above->below = below;
1054 else 1115 else
1075 if (map->in_memory == MAP_SAVING) 1136 if (map->in_memory == MAP_SAVING)
1076 return; 1137 return;
1077 1138
1078 int check_walk_off = !flag [FLAG_NO_APPLY]; 1139 int check_walk_off = !flag [FLAG_NO_APPLY];
1079 1140
1141 if (object *pl = ms.player ())
1142 {
1143 if (pl->container == this)
1144 /* If a container that the player is currently using somehow gets
1145 * removed (most likely destroyed), update the player view
1146 * appropriately.
1147 */
1148 pl->close_container ();
1149
1150 //TODO: the floorbox prev/next might need updating
1151 //esrv_del_item (pl->contr, count);
1152 //TODO: update floorbox to preserve ordering
1153 if (pl->contr->ns)
1154 pl->contr->ns->floorbox_update ();
1155 }
1156
1080 for (tmp = ms.bot; tmp; tmp = tmp->above) 1157 for (tmp = ms.bot; tmp; tmp = tmp->above)
1081 { 1158 {
1082 /* No point updating the players look faces if he is the object 1159 /* No point updating the players look faces if he is the object
1083 * being removed. 1160 * being removed.
1084 */ 1161 */
1085
1086 if (tmp->type == PLAYER && tmp != this)
1087 {
1088 /* If a container that the player is currently using somehow gets
1089 * removed (most likely destroyed), update the player view
1090 * appropriately.
1091 */
1092 if (tmp->container == this)
1093 {
1094 flag [FLAG_APPLIED] = 0;
1095 tmp->container = 0;
1096 }
1097
1098 if (tmp->contr->ns)
1099 tmp->contr->ns->floorbox_update ();
1100 }
1101 1162
1102 /* See if object moving off should effect something */ 1163 /* See if object moving off should effect something */
1103 if (check_walk_off 1164 if (check_walk_off
1104 && ((move_type & tmp->move_off) 1165 && ((move_type & tmp->move_off)
1105 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1166 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1108 1169
1109 if (destroyed ()) 1170 if (destroyed ())
1110 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1171 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1111 } 1172 }
1112 1173
1113 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1114 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1115 if (tmp->above == tmp)
1116 tmp->above = 0;
1117
1118 last = tmp; 1174 last = tmp;
1119 } 1175 }
1120 1176
1121 /* last == NULL if there are no objects on this space */ 1177 /* last == NULL if there are no objects on this space */
1122 //TODO: this makes little sense, why only update the topmost object? 1178 //TODO: this makes little sense, why only update the topmost object?
1142merge_ob (object *op, object *top) 1198merge_ob (object *op, object *top)
1143{ 1199{
1144 if (!op->nrof) 1200 if (!op->nrof)
1145 return 0; 1201 return 0;
1146 1202
1147 if (top) 1203 if (!top)
1148 for (top = op; top && top->above; top = top->above) 1204 for (top = op; top && top->above; top = top->above)
1149 ; 1205 ;
1150 1206
1151 for (; top; top = top->below) 1207 for (; top; top = top->below)
1152 {
1153 if (top == op)
1154 continue;
1155
1156 if (object::can_merge (op, top)) 1208 if (object::can_merge (op, top))
1157 { 1209 {
1158 top->nrof += op->nrof; 1210 top->nrof += op->nrof;
1159 1211
1160/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1212 if (object *pl = top->visible_to ())
1161 op->weight = 0; /* Don't want any adjustements now */ 1213 esrv_update_item (UPD_NROF, pl, top);
1214
1215 op->weight = 0; // cancel the addition above
1216 op->carrying = 0; // must be 0 already
1217
1162 op->destroy (); 1218 op->destroy (1);
1219
1163 return top; 1220 return top;
1164 } 1221 }
1165 }
1166 1222
1167 return 0; 1223 return 0;
1168} 1224}
1169 1225
1170void 1226void
1173 if (more) 1229 if (more)
1174 return; 1230 return;
1175 1231
1176 object *prev = this; 1232 object *prev = this;
1177 1233
1178 for (archetype *at = arch->more; at; at = at->more) 1234 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1179 { 1235 {
1180 object *op = arch_to_object (at); 1236 object *op = arch_to_object (at);
1181 1237
1182 op->name = name; 1238 op->name = name;
1183 op->name_pl = name_pl; 1239 op->name_pl = name_pl;
1197object * 1253object *
1198insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1254insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1199{ 1255{
1200 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1256 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1201 { 1257 {
1202 tmp->x = x + tmp->arch->clone.x; 1258 tmp->x = x + tmp->arch->x;
1203 tmp->y = y + tmp->arch->clone.y; 1259 tmp->y = y + tmp->arch->y;
1204 } 1260 }
1205 1261
1206 return insert_ob_in_map (op, m, originator, flag); 1262 return insert_ob_in_map (op, m, originator, flag);
1207} 1263}
1208 1264
1229object * 1285object *
1230insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1286insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1231{ 1287{
1232 assert (!op->flag [FLAG_FREED]); 1288 assert (!op->flag [FLAG_FREED]);
1233 1289
1234 object *tmp, *top, *floor = NULL;
1235
1236 op->remove (); 1290 op->remove ();
1237
1238#if 0
1239 if (!m->active != !op->active)
1240 if (m->active)
1241 op->activate_recursive ();
1242 else
1243 op->deactivate_recursive ();
1244#endif
1245
1246 if (out_of_map (m, op->x, op->y))
1247 {
1248 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1249#ifdef MANY_CORES
1250 /* Better to catch this here, as otherwise the next use of this object
1251 * is likely to cause a crash. Better to find out where it is getting
1252 * improperly inserted.
1253 */
1254 abort ();
1255#endif
1256 return op;
1257 }
1258
1259 if (object *more = op->more)
1260 {
1261 if (!insert_ob_in_map (more, m, originator, flag))
1262 {
1263 if (!op->head)
1264 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1265
1266 return 0;
1267 }
1268 }
1269
1270 CLEAR_FLAG (op, FLAG_REMOVED);
1271 1291
1272 /* Ideally, the caller figures this out. However, it complicates a lot 1292 /* Ideally, the caller figures this out. However, it complicates a lot
1273 * of areas of callers (eg, anything that uses find_free_spot would now 1293 * of areas of callers (eg, anything that uses find_free_spot would now
1274 * need extra work 1294 * need extra work
1275 */ 1295 */
1276 if (!xy_normalise (m, op->x, op->y)) 1296 if (!xy_normalise (m, op->x, op->y))
1297 {
1298 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1277 return 0; 1299 return 0;
1300 }
1301
1302 if (object *more = op->more)
1303 if (!insert_ob_in_map (more, m, originator, flag))
1304 return 0;
1305
1306 CLEAR_FLAG (op, FLAG_REMOVED);
1278 1307
1279 op->map = m; 1308 op->map = m;
1280 mapspace &ms = op->ms (); 1309 mapspace &ms = op->ms ();
1281 1310
1282 /* this has to be done after we translate the coordinates. 1311 /* this has to be done after we translate the coordinates.
1283 */ 1312 */
1284 if (op->nrof && !(flag & INS_NO_MERGE)) 1313 if (op->nrof && !(flag & INS_NO_MERGE))
1285 for (tmp = ms.bot; tmp; tmp = tmp->above) 1314 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1286 if (object::can_merge (op, tmp)) 1315 if (object::can_merge (op, tmp))
1287 { 1316 {
1317 // TODO: we atcually want to update tmp, not op,
1318 // but some caller surely breaks when we return tmp
1319 // from here :/
1288 op->nrof += tmp->nrof; 1320 op->nrof += tmp->nrof;
1289 tmp->destroy (); 1321 tmp->destroy (1);
1290 } 1322 }
1291 1323
1292 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1324 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1293 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1325 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1294 1326
1314 /* since *below* originator, no need to update top */ 1346 /* since *below* originator, no need to update top */
1315 originator->below = op; 1347 originator->below = op;
1316 } 1348 }
1317 else 1349 else
1318 { 1350 {
1351 object *top, *floor = NULL;
1352
1319 top = ms.bot; 1353 top = ms.bot;
1320 1354
1321 /* If there are other objects, then */ 1355 /* If there are other objects, then */
1322 if ((!(flag & INS_MAP_LOAD)) && top) 1356 if (top)
1323 { 1357 {
1324 object *last = 0; 1358 object *last = 0;
1325 1359
1326 /* 1360 /*
1327 * If there are multiple objects on this space, we do some trickier handling. 1361 * If there are multiple objects on this space, we do some trickier handling.
1380 if (last && last->below && last != floor) 1414 if (last && last->below && last != floor)
1381 top = last->below; 1415 top = last->below;
1382 } 1416 }
1383 } /* If objects on this space */ 1417 } /* If objects on this space */
1384 1418
1385 if (flag & INS_MAP_LOAD)
1386 top = ms.top;
1387
1388 if (flag & INS_ABOVE_FLOOR_ONLY) 1419 if (flag & INS_ABOVE_FLOOR_ONLY)
1389 top = floor; 1420 top = floor;
1390 1421
1391 /* Top is the object that our object (op) is going to get inserted above. 1422 /* Top is the object that our object (op) is going to get inserted above.
1392 */ 1423 */
1424 op->map->touch (); 1455 op->map->touch ();
1425 } 1456 }
1426 1457
1427 op->map->dirty = true; 1458 op->map->dirty = true;
1428 1459
1429 /* If we have a floor, we know the player, if any, will be above
1430 * it, so save a few ticks and start from there.
1431 */
1432 if (!(flag & INS_MAP_LOAD))
1433 if (object *pl = ms.player ()) 1460 if (object *pl = ms.player ())
1461 //TODO: the floorbox prev/next might need updating
1462 //esrv_send_item (pl, op);
1463 //TODO: update floorbox to preserve ordering
1434 if (pl->contr->ns) 1464 if (pl->contr->ns)
1435 pl->contr->ns->floorbox_update (); 1465 pl->contr->ns->floorbox_update ();
1436 1466
1437 /* If this object glows, it may affect lighting conditions that are 1467 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1468 * visible to others on this map. But update_all_los is really
1439 * an inefficient way to do this, as it means los for all players 1469 * an inefficient way to do this, as it means los for all players
1440 * on the map will get recalculated. The players could very well 1470 * on the map will get recalculated. The players could very well
1459 * blocked() and wall() work properly), and these flags are updated by 1489 * blocked() and wall() work properly), and these flags are updated by
1460 * update_object(). 1490 * update_object().
1461 */ 1491 */
1462 1492
1463 /* if this is not the head or flag has been passed, don't check walk on status */ 1493 /* if this is not the head or flag has been passed, don't check walk on status */
1464 if (!(flag & INS_NO_WALK_ON) && !op->head) 1494 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1465 { 1495 {
1466 if (check_move_on (op, originator)) 1496 if (check_move_on (op, originator))
1467 return 0; 1497 return 0;
1468 1498
1469 /* If we are a multi part object, lets work our way through the check 1499 /* If we are a multi part object, lets work our way through the check
1470 * walk on's. 1500 * walk on's.
1471 */ 1501 */
1472 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1502 for (object *tmp = op->more; tmp; tmp = tmp->more)
1473 if (check_move_on (tmp, originator)) 1503 if (check_move_on (tmp, originator))
1474 return 0; 1504 return 0;
1475 } 1505 }
1476 1506
1477 return op; 1507 return op;
1482 * op is the object to insert it under: supplies x and the map. 1512 * op is the object to insert it under: supplies x and the map.
1483 */ 1513 */
1484void 1514void
1485replace_insert_ob_in_map (const char *arch_string, object *op) 1515replace_insert_ob_in_map (const char *arch_string, object *op)
1486{ 1516{
1487 object *tmp, *tmp1;
1488
1489 /* first search for itself and remove any old instances */ 1517 /* first search for itself and remove any old instances */
1490 1518
1491 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1519 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1492 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1520 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1493 tmp->destroy (); 1521 tmp->destroy (1);
1494 1522
1495 tmp1 = arch_to_object (archetype::find (arch_string)); 1523 object *tmp = arch_to_object (archetype::find (arch_string));
1496 1524
1497 tmp1->x = op->x; 1525 tmp->x = op->x;
1498 tmp1->y = op->y; 1526 tmp->y = op->y;
1527
1499 insert_ob_in_map (tmp1, op->map, op, 0); 1528 insert_ob_in_map (tmp, op->map, op, 0);
1500} 1529}
1501 1530
1502object * 1531object *
1503object::insert_at (object *where, object *originator, int flags) 1532object::insert_at (object *where, object *originator, int flags)
1504{ 1533{
1534 if (where->env)
1535 return where->env->insert (this);
1536 else
1505 return where->map->insert (this, where->x, where->y, originator, flags); 1537 return where->map->insert (this, where->x, where->y, originator, flags);
1506} 1538}
1507 1539
1508/* 1540/*
1509 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1510 * is returned contains nr objects, and the remaining parts contains
1511 * the rest (or is removed and freed if that number is 0).
1512 * On failure, NULL is returned, and the reason put into the
1513 * global static errmsg array.
1514 */
1515object *
1516get_split_ob (object *orig_ob, uint32 nr)
1517{
1518 object *newob;
1519 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1520
1521 if (orig_ob->nrof < nr)
1522 {
1523 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1524 return NULL;
1525 }
1526
1527 newob = object_create_clone (orig_ob);
1528
1529 if ((orig_ob->nrof -= nr) < 1)
1530 orig_ob->destroy (1);
1531 else if (!is_removed)
1532 {
1533 if (orig_ob->env != NULL)
1534 sub_weight (orig_ob->env, orig_ob->weight * nr);
1535 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1536 {
1537 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1538 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1539 return NULL;
1540 }
1541 }
1542
1543 newob->nrof = nr;
1544
1545 return newob;
1546}
1547
1548/*
1549 * decrease_ob_nr(object, number) decreases a specified number from 1541 * decrease(object, number) decreases a specified number from
1550 * the amount of an object. If the amount reaches 0, the object 1542 * the amount of an object. If the amount reaches 0, the object
1551 * is subsequently removed and freed. 1543 * is subsequently removed and freed.
1552 * 1544 *
1553 * Return value: 'op' if something is left, NULL if the amount reached 0 1545 * Return value: 'op' if something is left, NULL if the amount reached 0
1554 */ 1546 */
1547bool
1548object::decrease (sint32 nr)
1549{
1550 if (!nr)
1551 return true;
1552
1553 nr = min (nr, nrof);
1554
1555 nrof -= nr;
1556
1557 if (nrof)
1558 {
1559 adjust_weight (env, -weight * nr); // carrying == 0
1560
1561 if (object *pl = visible_to ())
1562 esrv_update_item (UPD_NROF, pl, this);
1563
1564 return true;
1565 }
1566 else
1567 {
1568 destroy (1);
1569 return false;
1570 }
1571}
1572
1573/*
1574 * split(ob,nr) splits up ob into two parts. The part which
1575 * is returned contains nr objects, and the remaining parts contains
1576 * the rest (or is removed and returned if that number is 0).
1577 * On failure, NULL is returned.
1578 */
1555object * 1579object *
1556decrease_ob_nr (object *op, uint32 i) 1580object::split (sint32 nr)
1557{ 1581{
1558 object *tmp; 1582 int have = number_of ();
1559 1583
1560 if (i == 0) /* objects with op->nrof require this check */ 1584 if (have < nr)
1561 return op; 1585 return 0;
1562 1586 else if (have == nr)
1563 if (i > op->nrof)
1564 i = op->nrof;
1565
1566 if (QUERY_FLAG (op, FLAG_REMOVED))
1567 op->nrof -= i;
1568 else if (op->env)
1569 { 1587 {
1570 /* is this object in the players inventory, or sub container
1571 * therein?
1572 */
1573 tmp = op->in_player ();
1574 /* nope. Is this a container the player has opened?
1575 * If so, set tmp to that player.
1576 * IMO, searching through all the players will mostly
1577 * likely be quicker than following op->env to the map,
1578 * and then searching the map for a player.
1579 */
1580 if (!tmp)
1581 for_all_players (pl)
1582 if (pl->ob->container == op->env)
1583 {
1584 tmp = pl->ob;
1585 break;
1586 }
1587
1588 if (i < op->nrof)
1589 {
1590 sub_weight (op->env, op->weight * i);
1591 op->nrof -= i;
1592 if (tmp)
1593 esrv_send_item (tmp, op);
1594 }
1595 else
1596 {
1597 op->remove (); 1588 remove ();
1598 op->nrof = 0; 1589 return this;
1599 if (tmp)
1600 esrv_del_item (tmp->contr, op->count);
1601 }
1602 } 1590 }
1603 else 1591 else
1604 { 1592 {
1605 object *above = op->above; 1593 decrease (nr);
1606 1594
1607 if (i < op->nrof) 1595 object *op = deep_clone ();
1608 op->nrof -= i; 1596 op->nrof = nr;
1609 else
1610 {
1611 op->remove ();
1612 op->nrof = 0;
1613 }
1614
1615 /* Since we just removed op, op->above is null */
1616 for (tmp = above; tmp; tmp = tmp->above)
1617 if (tmp->type == PLAYER)
1618 {
1619 if (op->nrof)
1620 esrv_send_item (tmp, op);
1621 else
1622 esrv_del_item (tmp->contr, op->count);
1623 }
1624 }
1625
1626 if (op->nrof)
1627 return op; 1597 return op;
1628 else
1629 {
1630 op->destroy ();
1631 return 0;
1632 }
1633}
1634
1635/*
1636 * add_weight(object, weight) adds the specified weight to an object,
1637 * and also updates how much the environment(s) is/are carrying.
1638 */
1639void
1640add_weight (object *op, signed long weight)
1641{
1642 while (op != NULL)
1643 {
1644 if (op->type == CONTAINER)
1645 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1646
1647 op->carrying += weight;
1648 op = op->env;
1649 } 1598 }
1650} 1599}
1651 1600
1652object * 1601object *
1653insert_ob_in_ob (object *op, object *where) 1602insert_ob_in_ob (object *op, object *where)
1658 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1607 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1659 free (dump); 1608 free (dump);
1660 return op; 1609 return op;
1661 } 1610 }
1662 1611
1663 if (where->head) 1612 if (where->head_ () != where)
1664 { 1613 {
1665 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1614 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1666 where = where->head; 1615 where = where->head;
1667 } 1616 }
1668 1617
1669 return where->insert (op); 1618 return where->insert (op);
1670} 1619}
1678 * be != op, if items are merged. -Tero 1627 * be != op, if items are merged. -Tero
1679 */ 1628 */
1680object * 1629object *
1681object::insert (object *op) 1630object::insert (object *op)
1682{ 1631{
1683 object *tmp, *otmp;
1684
1685 if (!QUERY_FLAG (op, FLAG_REMOVED))
1686 op->remove ();
1687
1688 if (op->more) 1632 if (op->more)
1689 { 1633 {
1690 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1634 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1691 return op; 1635 return op;
1692 } 1636 }
1693 1637
1694 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1638 op->remove ();
1695 CLEAR_FLAG (op, FLAG_REMOVED); 1639
1640 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1641
1696 if (op->nrof) 1642 if (op->nrof)
1697 {
1698 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1643 for (object *tmp = inv; tmp; tmp = tmp->below)
1699 if (object::can_merge (tmp, op)) 1644 if (object::can_merge (tmp, op))
1700 { 1645 {
1701 /* return the original object and remove inserted object 1646 /* return the original object and remove inserted object
1702 (client needs the original object) */ 1647 (client needs the original object) */
1703 tmp->nrof += op->nrof; 1648 tmp->nrof += op->nrof;
1704 /* Weight handling gets pretty funky. Since we are adding to 1649
1705 * tmp->nrof, we need to increase the weight. 1650 if (object *pl = tmp->visible_to ())
1706 */ 1651 esrv_update_item (UPD_NROF, pl, tmp);
1652
1707 add_weight (this, op->weight * op->nrof); 1653 adjust_weight (this, op->total_weight ());
1708 SET_FLAG (op, FLAG_REMOVED); 1654
1709 op->destroy (); /* free the inserted object */ 1655 op->destroy (1);
1710 op = tmp; 1656 op = tmp;
1711 op->remove (); /* and fix old object's links */ 1657 goto inserted;
1712 CLEAR_FLAG (op, FLAG_REMOVED);
1713 break;
1714 } 1658 }
1715 1659
1716 /* I assume combined objects have no inventory 1660 op->owner = 0; // it's his/hers now. period.
1717 * We add the weight - this object could have just been removed
1718 * (if it was possible to merge). calling remove_ob will subtract
1719 * the weight, so we need to add it in again, since we actually do
1720 * the linking below
1721 */
1722 add_weight (this, op->weight * op->nrof);
1723 }
1724 else
1725 add_weight (this, (op->weight + op->carrying));
1726
1727 otmp = this->in_player ();
1728 if (otmp && otmp->contr)
1729 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1730 otmp->update_stats ();
1731
1732 op->map = 0; 1661 op->map = 0;
1733 op->env = this; 1662 op->x = 0;
1663 op->y = 0;
1664
1734 op->above = 0; 1665 op->above = 0;
1735 op->below = 0; 1666 op->below = inv;
1736 op->x = 0, op->y = 0; 1667 op->env = this;
1737 1668
1669 if (inv)
1670 inv->above = op;
1671
1672 inv = op;
1673
1674 op->flag [FLAG_REMOVED] = 0;
1675
1676 if (object *pl = op->visible_to ())
1677 esrv_send_item (pl, op);
1678
1679 adjust_weight (this, op->total_weight ());
1680
1681inserted:
1738 /* reset the light list and los of the players on the map */ 1682 /* reset the light list and los of the players on the map */
1739 if ((op->glow_radius != 0) && map) 1683 if (op->glow_radius && map && map->darkness)
1740 {
1741#ifdef DEBUG_LIGHTS
1742 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1743#endif /* DEBUG_LIGHTS */
1744 if (map->darkness)
1745 update_all_los (map, x, y); 1684 update_all_los (map, x, y);
1746 }
1747 1685
1748 /* Client has no idea of ordering so lets not bother ordering it here. 1686 // if this is a player's inventory, update stats
1749 * It sure simplifies this function... 1687 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1750 */ 1688 update_stats ();
1751 if (!inv)
1752 inv = op;
1753 else
1754 {
1755 op->below = inv;
1756 op->below->above = op;
1757 inv = op;
1758 }
1759 1689
1760 INVOKE_OBJECT (INSERT, this); 1690 INVOKE_OBJECT (INSERT, this);
1761 1691
1762 return op; 1692 return op;
1763} 1693}
1891 LOG (llevError, "Present_arch called outside map.\n"); 1821 LOG (llevError, "Present_arch called outside map.\n");
1892 return NULL; 1822 return NULL;
1893 } 1823 }
1894 1824
1895 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1825 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1896 if (tmp->arch == at) 1826 if (tmp->arch->archname == at->archname)
1897 return tmp; 1827 return tmp;
1898 1828
1899 return NULL; 1829 return NULL;
1900} 1830}
1901 1831
1965 * The first matching object is returned, or NULL if none. 1895 * The first matching object is returned, or NULL if none.
1966 */ 1896 */
1967object * 1897object *
1968present_arch_in_ob (const archetype *at, const object *op) 1898present_arch_in_ob (const archetype *at, const object *op)
1969{ 1899{
1970 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1900 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1971 if (tmp->arch == at) 1901 if (tmp->arch->archname == at->archname)
1972 return tmp; 1902 return tmp;
1973 1903
1974 return NULL; 1904 return NULL;
1975} 1905}
1976 1906
1978 * activate recursively a flag on an object inventory 1908 * activate recursively a flag on an object inventory
1979 */ 1909 */
1980void 1910void
1981flag_inv (object *op, int flag) 1911flag_inv (object *op, int flag)
1982{ 1912{
1983 if (op->inv)
1984 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1913 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1985 { 1914 {
1986 SET_FLAG (tmp, flag); 1915 SET_FLAG (tmp, flag);
1987 flag_inv (tmp, flag); 1916 flag_inv (tmp, flag);
1988 } 1917 }
1989} 1918}
1990 1919
1991/* 1920/*
1992 * deactivate recursively a flag on an object inventory 1921 * deactivate recursively a flag on an object inventory
1993 */ 1922 */
1994void 1923void
1995unflag_inv (object *op, int flag) 1924unflag_inv (object *op, int flag)
1996{ 1925{
1997 if (op->inv)
1998 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1926 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1999 { 1927 {
2000 CLEAR_FLAG (tmp, flag); 1928 CLEAR_FLAG (tmp, flag);
2001 unflag_inv (tmp, flag); 1929 unflag_inv (tmp, flag);
2002 } 1930 }
2003}
2004
2005/*
2006 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2007 * all it's inventory (recursively).
2008 * If checksums are used, a player will get set_cheat called for
2009 * him/her-self and all object carried by a call to this function.
2010 */
2011void
2012set_cheat (object *op)
2013{
2014 SET_FLAG (op, FLAG_WAS_WIZ);
2015 flag_inv (op, FLAG_WAS_WIZ);
2016} 1931}
2017 1932
2018/* 1933/*
2019 * find_free_spot(object, map, x, y, start, stop) will search for 1934 * find_free_spot(object, map, x, y, start, stop) will search for
2020 * a spot at the given map and coordinates which will be able to contain 1935 * a spot at the given map and coordinates which will be able to contain
2022 * to search (see the freearr_x/y[] definition). 1937 * to search (see the freearr_x/y[] definition).
2023 * It returns a random choice among the alternatives found. 1938 * It returns a random choice among the alternatives found.
2024 * start and stop are where to start relative to the free_arr array (1,9 1939 * start and stop are where to start relative to the free_arr array (1,9
2025 * does all 4 immediate directions). This returns the index into the 1940 * does all 4 immediate directions). This returns the index into the
2026 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1941 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2027 * Note - this only checks to see if there is space for the head of the
2028 * object - if it is a multispace object, this should be called for all
2029 * pieces.
2030 * Note2: This function does correctly handle tiled maps, but does not 1942 * Note: This function does correctly handle tiled maps, but does not
2031 * inform the caller. However, insert_ob_in_map will update as 1943 * inform the caller. However, insert_ob_in_map will update as
2032 * necessary, so the caller shouldn't need to do any special work. 1944 * necessary, so the caller shouldn't need to do any special work.
2033 * Note - updated to take an object instead of archetype - this is necessary 1945 * Note - updated to take an object instead of archetype - this is necessary
2034 * because arch_blocked (now ob_blocked) needs to know the movement type 1946 * because arch_blocked (now ob_blocked) needs to know the movement type
2035 * to know if the space in question will block the object. We can't use 1947 * to know if the space in question will block the object. We can't use
2037 * customized, changed states, etc. 1949 * customized, changed states, etc.
2038 */ 1950 */
2039int 1951int
2040find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1952find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2041{ 1953{
1954 int altern[SIZEOFFREE];
2042 int index = 0, flag; 1955 int index = 0, flag;
2043 int altern[SIZEOFFREE];
2044 1956
2045 for (int i = start; i < stop; i++) 1957 for (int i = start; i < stop; i++)
2046 { 1958 {
2047 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1959 mapxy pos (m, x, y); pos.move (i);
2048 if (!flag) 1960
1961 if (!pos.normalise ())
1962 continue;
1963
1964 mapspace &ms = *pos;
1965
1966 if (ms.flags () & P_IS_ALIVE)
1967 continue;
1968
1969 /* However, often
1970 * ob doesn't have any move type (when used to place exits)
1971 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1972 */
1973 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1974 {
2049 altern [index++] = i; 1975 altern [index++] = i;
1976 continue;
1977 }
2050 1978
2051 /* Basically, if we find a wall on a space, we cut down the search size. 1979 /* Basically, if we find a wall on a space, we cut down the search size.
2052 * In this way, we won't return spaces that are on another side of a wall. 1980 * In this way, we won't return spaces that are on another side of a wall.
2053 * This mostly work, but it cuts down the search size in all directions - 1981 * This mostly work, but it cuts down the search size in all directions -
2054 * if the space being examined only has a wall to the north and empty 1982 * if the space being examined only has a wall to the north and empty
2055 * spaces in all the other directions, this will reduce the search space 1983 * spaces in all the other directions, this will reduce the search space
2056 * to only the spaces immediately surrounding the target area, and 1984 * to only the spaces immediately surrounding the target area, and
2057 * won't look 2 spaces south of the target space. 1985 * won't look 2 spaces south of the target space.
2058 */ 1986 */
2059 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1987 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1988 {
2060 stop = maxfree[i]; 1989 stop = maxfree[i];
1990 continue;
1991 }
1992
1993 /* Note it is intentional that we check ob - the movement type of the
1994 * head of the object should correspond for the entire object.
1995 */
1996 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1997 continue;
1998
1999 if (ob->blocked (m, pos.x, pos.y))
2000 continue;
2001
2002 altern [index++] = i;
2061 } 2003 }
2062 2004
2063 if (!index) 2005 if (!index)
2064 return -1; 2006 return -1;
2065 2007
2074 */ 2016 */
2075int 2017int
2076find_first_free_spot (const object *ob, maptile *m, int x, int y) 2018find_first_free_spot (const object *ob, maptile *m, int x, int y)
2077{ 2019{
2078 for (int i = 0; i < SIZEOFFREE; i++) 2020 for (int i = 0; i < SIZEOFFREE; i++)
2079 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2021 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2080 return i; 2022 return i;
2081 2023
2082 return -1; 2024 return -1;
2083} 2025}
2084 2026
2138 object *tmp; 2080 object *tmp;
2139 maptile *mp; 2081 maptile *mp;
2140 2082
2141 MoveType blocked, move_type; 2083 MoveType blocked, move_type;
2142 2084
2143 if (exclude && exclude->head) 2085 if (exclude && exclude->head_ () != exclude)
2144 { 2086 {
2145 exclude = exclude->head; 2087 exclude = exclude->head;
2146 move_type = exclude->move_type; 2088 move_type = exclude->move_type;
2147 } 2089 }
2148 else 2090 else
2171 max = maxfree[i]; 2113 max = maxfree[i];
2172 else if (mflags & P_IS_ALIVE) 2114 else if (mflags & P_IS_ALIVE)
2173 { 2115 {
2174 for (tmp = ms.bot; tmp; tmp = tmp->above) 2116 for (tmp = ms.bot; tmp; tmp = tmp->above)
2175 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2117 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2176 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2118 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2177 break; 2119 break;
2178 2120
2179 if (tmp) 2121 if (tmp)
2180 return freedir[i]; 2122 return freedir[i];
2181 } 2123 }
2361 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2303 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2362 * core dumps if they do. 2304 * core dumps if they do.
2363 * 2305 *
2364 * Add a check so we can't pick up invisible objects (0.93.8) 2306 * Add a check so we can't pick up invisible objects (0.93.8)
2365 */ 2307 */
2366
2367int 2308int
2368can_pick (const object *who, const object *item) 2309can_pick (const object *who, const object *item)
2369{ 2310{
2370 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2311 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2371 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2312 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2374 2315
2375/* 2316/*
2376 * create clone from object to another 2317 * create clone from object to another
2377 */ 2318 */
2378object * 2319object *
2379object_create_clone (object *asrc) 2320object::deep_clone ()
2380{ 2321{
2381 object *dst = 0, *tmp, *src, *part, *prev, *item; 2322 assert (("deep_clone called on non-head object", is_head ()));
2382 2323
2383 if (!asrc) 2324 object *dst = clone ();
2384 return 0;
2385 2325
2386 src = asrc; 2326 object *prev = dst;
2387 if (src->head)
2388 src = src->head;
2389
2390 prev = 0;
2391 for (part = src; part; part = part->more) 2327 for (object *part = this->more; part; part = part->more)
2392 { 2328 {
2393 tmp = part->clone (); 2329 object *tmp = part->clone ();
2394 tmp->x -= src->x;
2395 tmp->y -= src->y;
2396
2397 if (!part->head)
2398 {
2399 dst = tmp;
2400 tmp->head = 0;
2401 }
2402 else
2403 tmp->head = dst; 2330 tmp->head = dst;
2404
2405 tmp->more = 0;
2406
2407 if (prev)
2408 prev->more = tmp; 2331 prev->more = tmp;
2409
2410 prev = tmp; 2332 prev = tmp;
2411 } 2333 }
2412 2334
2413 for (item = src->inv; item; item = item->below) 2335 for (object *item = inv; item; item = item->below)
2414 insert_ob_in_ob (object_create_clone (item), dst); 2336 insert_ob_in_ob (item->deep_clone (), dst);
2415 2337
2416 return dst; 2338 return dst;
2417} 2339}
2418 2340
2419/* This returns the first object in who's inventory that 2341/* This returns the first object in who's inventory that
2428 return tmp; 2350 return tmp;
2429 2351
2430 return 0; 2352 return 0;
2431} 2353}
2432 2354
2433/* If ob has a field named key, return the link from the list, 2355const shstr &
2434 * otherwise return NULL. 2356object::kv_get (const shstr &key) const
2435 *
2436 * key must be a passed in shared string - otherwise, this won't
2437 * do the desired thing.
2438 */
2439key_value *
2440get_ob_key_link (const object *ob, const char *key)
2441{ 2357{
2442 for (key_value *link = ob->key_values; link; link = link->next) 2358 for (key_value *kv = key_values; kv; kv = kv->next)
2443 if (link->key == key) 2359 if (kv->key == key)
2444 return link;
2445
2446 return 0;
2447}
2448
2449/*
2450 * Returns the value of op has an extra_field for key, or NULL.
2451 *
2452 * The argument doesn't need to be a shared string.
2453 *
2454 * The returned string is shared.
2455 */
2456const char *
2457get_ob_key_value (const object *op, const char *const key)
2458{
2459 key_value *link;
2460 shstr_cmp canonical_key (key);
2461
2462 if (!canonical_key)
2463 {
2464 /* 1. There being a field named key on any object
2465 * implies there'd be a shared string to find.
2466 * 2. Since there isn't, no object has this field.
2467 * 3. Therefore, *this* object doesn't have this field.
2468 */
2469 return 0;
2470 }
2471
2472 /* This is copied from get_ob_key_link() above -
2473 * only 4 lines, and saves the function call overhead.
2474 */
2475 for (link = op->key_values; link; link = link->next)
2476 if (link->key == canonical_key)
2477 return link->value; 2360 return kv->value;
2478 2361
2479 return 0; 2362 return shstr_null;
2480} 2363}
2481 2364
2482/* 2365void
2483 * Updates the canonical_key in op to value. 2366object::kv_set (const shstr &key, const shstr &value)
2484 *
2485 * canonical_key is a shared string (value doesn't have to be).
2486 *
2487 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2488 * keys.
2489 *
2490 * Returns TRUE on success.
2491 */
2492int
2493set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2494{ 2367{
2495 key_value *field = NULL, *last = NULL; 2368 for (key_value *kv = key_values; kv; kv = kv->next)
2496 2369 if (kv->key == key)
2497 for (field = op->key_values; field != NULL; field = field->next)
2498 {
2499 if (field->key != canonical_key)
2500 { 2370 {
2501 last = field; 2371 kv->value = value;
2502 continue; 2372 return;
2503 } 2373 }
2504 2374
2505 if (value) 2375 key_value *kv = new key_value;
2506 field->value = value; 2376
2507 else 2377 kv->next = key_values;
2378 kv->key = key;
2379 kv->value = value;
2380
2381 key_values = kv;
2382}
2383
2384void
2385object::kv_del (const shstr &key)
2386{
2387 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2388 if ((*kvp)->key == key)
2508 { 2389 {
2509 /* Basically, if the archetype has this key set, 2390 key_value *kv = *kvp;
2510 * we need to store the null value so when we save 2391 *kvp = (*kvp)->next;
2511 * it, we save the empty value so that when we load, 2392 delete kv;
2512 * we get this value back again. 2393 return;
2513 */
2514 if (get_ob_key_link (&op->arch->clone, canonical_key))
2515 field->value = 0;
2516 else
2517 {
2518 if (last)
2519 last->next = field->next;
2520 else
2521 op->key_values = field->next;
2522
2523 delete field;
2524 }
2525 } 2394 }
2526 return TRUE;
2527 }
2528 /* IF we get here, key doesn't exist */
2529
2530 /* No field, we'll have to add it. */
2531
2532 if (!add_key)
2533 return FALSE;
2534
2535 /* There isn't any good reason to store a null
2536 * value in the key/value list. If the archetype has
2537 * this key, then we should also have it, so shouldn't
2538 * be here. If user wants to store empty strings,
2539 * should pass in ""
2540 */
2541 if (value == NULL)
2542 return TRUE;
2543
2544 field = new key_value;
2545
2546 field->key = canonical_key;
2547 field->value = value;
2548 /* Usual prepend-addition. */
2549 field->next = op->key_values;
2550 op->key_values = field;
2551
2552 return TRUE;
2553}
2554
2555/*
2556 * Updates the key in op to value.
2557 *
2558 * If add_key is FALSE, this will only update existing keys,
2559 * and not add new ones.
2560 * In general, should be little reason FALSE is ever passed in for add_key
2561 *
2562 * Returns TRUE on success.
2563 */
2564int
2565set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2566{
2567 shstr key_ (key);
2568
2569 return set_ob_key_value_s (op, key_, value, add_key);
2570} 2395}
2571 2396
2572object::depth_iterator::depth_iterator (object *container) 2397object::depth_iterator::depth_iterator (object *container)
2573: iterator_base (container) 2398: iterator_base (container)
2574{ 2399{
2587 item = item->inv; 2412 item = item->inv;
2588 } 2413 }
2589 else 2414 else
2590 item = item->env; 2415 item = item->env;
2591} 2416}
2592
2593 2417
2594const char * 2418const char *
2595object::flag_desc (char *desc, int len) const 2419object::flag_desc (char *desc, int len) const
2596{ 2420{
2597 char *p = desc; 2421 char *p = desc;
2625{ 2449{
2626 char flagdesc[512]; 2450 char flagdesc[512];
2627 char info2[256 * 4]; 2451 char info2[256 * 4];
2628 char *p = info; 2452 char *p = info;
2629 2453
2630 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2454 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2631 count, uuid.seq, 2455 count,
2456 uuid.c_str (),
2632 &name, 2457 &name,
2633 title ? "\",title:\"" : "", 2458 title ? "\",title:\"" : "",
2634 title ? (const char *)title : "", 2459 title ? (const char *)title : "",
2635 flag_desc (flagdesc, 512), type); 2460 flag_desc (flagdesc, 512), type);
2636 2461
2637 if (env) 2462 if (!flag[FLAG_REMOVED] && env)
2638 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2463 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2639 2464
2640 if (map) 2465 if (map)
2641 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2466 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2642 2467
2660} 2485}
2661 2486
2662const materialtype_t * 2487const materialtype_t *
2663object::dominant_material () const 2488object::dominant_material () const
2664{ 2489{
2665 if (materialtype_t *mat = name_to_material (materialname)) 2490 if (materialtype_t *mt = name_to_material (materialname))
2666 return mat; 2491 return mt;
2667 2492
2668 // omfg this is slow, this has to be temporary :)
2669 shstr unknown ("unknown");
2670
2671 return name_to_material (unknown); 2493 return name_to_material (shstr_unknown);
2672} 2494}
2673 2495
2674void 2496void
2675object::open_container (object *new_container) 2497object::open_container (object *new_container)
2676{ 2498{
2677 if (container == new_container) 2499 if (container == new_container)
2678 return; 2500 return;
2679 2501
2680 if (object *old_container = container) 2502 object *old_container = container;
2503
2504 if (old_container)
2681 { 2505 {
2682 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2506 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2683 return; 2507 return;
2684 2508
2685#if 0 2509#if 0
2687 if (object *closer = old_container->inv) 2511 if (object *closer = old_container->inv)
2688 if (closer->type == CLOSE_CON) 2512 if (closer->type == CLOSE_CON)
2689 closer->destroy (); 2513 closer->destroy ();
2690#endif 2514#endif
2691 2515
2516 // make sure the container is available
2517 esrv_send_item (this, old_container);
2518
2692 old_container->flag [FLAG_APPLIED] = 0; 2519 old_container->flag [FLAG_APPLIED] = false;
2693 container = 0; 2520 container = 0;
2694 2521
2522 // client needs item update to make it work, client bug requires this to be separate
2695 esrv_update_item (UPD_FLAGS, this, old_container); 2523 esrv_update_item (UPD_FLAGS, this, old_container);
2524
2696 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2525 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2526 play_sound (sound_find ("chest_close"));
2697 } 2527 }
2698 2528
2699 if (new_container) 2529 if (new_container)
2700 { 2530 {
2701 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2531 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2712 } 2542 }
2713#endif 2543#endif
2714 2544
2715 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2545 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2716 2546
2547 // make sure the container is available, client bug requires this to be separate
2548 esrv_send_item (this, new_container);
2549
2717 new_container->flag [FLAG_APPLIED] = 1; 2550 new_container->flag [FLAG_APPLIED] = true;
2718 container = new_container; 2551 container = new_container;
2719 2552
2553 // client needs flag change
2720 esrv_update_item (UPD_FLAGS, this, new_container); 2554 esrv_update_item (UPD_FLAGS, this, new_container);
2721 esrv_send_inventory (this, new_container); 2555 esrv_send_inventory (this, new_container);
2556 play_sound (sound_find ("chest_open"));
2557 }
2558// else if (!old_container->env && contr && contr->ns)
2559// contr->ns->floorbox_reset ();
2560}
2561
2562object *
2563object::force_find (const shstr name)
2564{
2565 /* cycle through his inventory to look for the MARK we want to
2566 * place
2567 */
2568 for (object *tmp = inv; tmp; tmp = tmp->below)
2569 if (tmp->type == FORCE && tmp->slaying == name)
2570 return splay (tmp);
2571
2572 return 0;
2573}
2574
2575void
2576object::force_add (const shstr name, int duration)
2577{
2578 if (object *force = force_find (name))
2579 force->destroy ();
2580
2581 object *force = get_archetype (FORCE_NAME);
2582
2583 force->slaying = name;
2584 force->stats.food = 1;
2585 force->speed_left = -1.f;
2586
2587 force->set_speed (duration ? 1.f / duration : 0.f);
2588 force->flag [FLAG_IS_USED_UP] = true;
2589 force->flag [FLAG_APPLIED] = true;
2590
2591 insert (force);
2592}
2593
2594void
2595object::play_sound (faceidx sound)
2596{
2597 if (!sound)
2598 return;
2599
2600 if (flag [FLAG_REMOVED])
2601 return;
2602
2603 if (env)
2722 } 2604 {
2605 if (object *pl = in_player ())
2606 pl->contr->play_sound (sound);
2607 }
2608 else
2609 map->play_sound (sound, x, y);
2723} 2610}
2724 2611
2725

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines