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.118 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 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,2009 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
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> 25#include <global.h>
29#include <stdio.h> 26#include <stdio.h>
30#include <sys/types.h> 27#include <sys/types.h>
31#include <sys/uio.h> 28#include <sys/uio.h>
32#include <object.h> 29#include <object.h>
33#include <funcpoint.h> 30#include <sproto.h>
34#include <loader.h> 31#include <loader.h>
35 32
36#include <bitset> 33#include <bitset>
37 34
38int nrofallocobjects = 0; 35UUID UUID::cur;
39static UUID uuid; 36static uint64_t seq_next_save;
40const uint64 UUID_SKIP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
38uint32_t mapspace::smellcount = 10000;
41 39
42objectvec objects; 40objectvec objects;
43activevec actives; 41activevec actives;
44 42
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 43//+GPL
44
45short freearr_x[SIZEOFFREE] = {
46 0,
47 0, 1, 1, 1, 0, -1, -1, -1,
48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47}; 50};
48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 51short freearr_y[SIZEOFFREE] = {
52 0,
53 -1, -1, 0, 1, 1, 1, 0, -1,
54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50};
51int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
52 48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53}; 56};
54int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
55 0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 58 0,
59 1, 2, 3, 4, 5, 6, 7, 8,
60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57}; 62};
58 63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
69};
70
59static void 71static void
60write_uuid (void) 72write_uuid (uval64 skip, bool sync)
61{ 73{
62 char filename1[MAX_BUF], filename2[MAX_BUF]; 74 CALL_BEGIN (2);
63 75 CALL_ARG_SV (newSVval64 (skip));
64 sprintf (filename1, "%s/uuid", settings.localdir); 76 CALL_ARG_SV (boolSV (sync));
65 sprintf (filename2, "%s/uuid~", settings.localdir); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
66 78 CALL_END;
67 FILE *fp;
68
69 if (!(fp = fopen (filename2, "w")))
70 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return;
73 }
74
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76 fclose (fp);
77 rename (filename2, filename1);
78} 79}
79 80
80static void 81static void
81read_uuid (void) 82read_uuid (void)
82{ 83{
83 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
84 85
85 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
87
88 seq_next_save = 0;
86 89
87 FILE *fp; 90 FILE *fp;
88 91
89 if (!(fp = fopen (filename, "r"))) 92 if (!(fp = fopen (filename, "r")))
90 { 93 {
91 if (errno == ENOENT) 94 if (errno == ENOENT)
92 { 95 {
93 LOG (llevInfo, "RESET uid to 1\n"); 96 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 97 UUID::cur.seq = 0;
95 write_uuid (); 98 write_uuid (UUID_GAP, true);
96 return; 99 return;
97 } 100 }
98 101
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100 _exit (1); 103 _exit (1);
101 } 104 }
102 105
103 int version; 106 UUID::BUF buf;
104 unsigned long long uid; 107 buf[0] = 0;
105 if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1) 108 fgets (buf, sizeof (buf), fp);
109
110 if (!UUID::cur.parse (buf))
106 { 111 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 112 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108 _exit (1); 113 _exit (1);
109 } 114 }
110 115
111 uuid.seq = uid; 116 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112 write_uuid (); 117
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 118 write_uuid (UUID_GAP, true);
114 fclose (fp); 119 fclose (fp);
115} 120}
116 121
117UUID 122UUID
118gen_uuid () 123UUID::gen ()
119{ 124{
120 UUID uid; 125 UUID uid;
121 126
122 uid.seq = ++uuid.seq; 127 uid.seq = ++cur.seq;
123 128
124 if (!(uuid.seq & (UUID_SKIP - 1))) 129 if (expect_false (cur.seq >= seq_next_save))
125 write_uuid (); 130 {
131 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
132 write_uuid (UUID_GAP, false);
133 }
134
126 135
127 return uid; 136 return uid;
128} 137}
129 138
130void 139void
131init_uuid () 140UUID::init ()
132{ 141{
133 read_uuid (); 142 read_uuid ();
134} 143}
135 144
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 145/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137static int 146static bool
138compare_ob_value_lists_one (const object *wants, const object *has) 147compare_ob_value_lists_one (const object *wants, const object *has)
139{ 148{
140 key_value *wants_field;
141
142 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 149 /* n-squared behaviour (see kv_get), but I'm hoping both
143 * objects with lists are rare, and lists stay short. If not, use a 150 * objects with lists are rare, and lists stay short. If not, use a
144 * different structure or at least keep the lists sorted... 151 * different structure or at least keep the lists sorted...
145 */ 152 */
146 153
147 /* For each field in wants, */ 154 /* For each field in wants, */
148 for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) 155 for (key_value *kv = wants->key_values; kv; kv = kv->next)
149 { 156 if (has->kv_get (kv->key) != kv->value)
150 key_value *has_field; 157 return false;
151
152 /* Look for a field in has with the same key. */
153 has_field = get_ob_key_link (has, wants_field->key);
154
155 if (has_field == NULL)
156 {
157 /* No field with that name. */
158 return FALSE;
159 }
160
161 /* Found the matching field. */
162 if (has_field->value != wants_field->value)
163 {
164 /* Values don't match, so this half of the comparison is false. */
165 return FALSE;
166 }
167
168 /* If we get here, we found a match. Now for the next field in wants. */
169 }
170 158
171 /* If we get here, every field in wants has a matching field in has. */ 159 /* If we get here, every field in wants has a matching field in has. */
172 return TRUE; 160 return true;
173} 161}
174 162
175/* Returns TRUE if ob1 has the same key_values as ob2. */ 163/* Returns TRUE if ob1 has the same key_values as ob2. */
176static int 164static bool
177compare_ob_value_lists (const object *ob1, const object *ob2) 165compare_ob_value_lists (const object *ob1, const object *ob2)
178{ 166{
179 /* However, there may be fields in has which aren't partnered in wants, 167 /* However, there may be fields in has which aren't partnered in wants,
180 * so we need to run the comparison *twice*. :( 168 * so we need to run the comparison *twice*. :(
181 */ 169 */
182 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 170 return compare_ob_value_lists_one (ob1, ob2)
171 && compare_ob_value_lists_one (ob2, ob1);
183} 172}
184 173
185/* Function examines the 2 objects given to it, and returns true if 174/* Function examines the 2 objects given to it, and returns true if
186 * they can be merged together. 175 * they can be merged together.
187 * 176 *
202 || ob1->speed != ob2->speed 191 || ob1->speed != ob2->speed
203 || ob1->value != ob2->value 192 || ob1->value != ob2->value
204 || ob1->name != ob2->name) 193 || ob1->name != ob2->name)
205 return 0; 194 return 0;
206 195
207 //TODO: this ain't working well, use nicer and correct overflow check
208 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 196 /* Do not merge objects if nrof would overflow, assume nrof
209 * value could not be stored in a sint32 (which unfortunately sometimes is 197 * is always 0 .. 2**31-1 */
210 * used to store nrof). 198 if (ob1->nrof > 0x7fffffff - ob2->nrof)
211 */
212 if (ob1->nrof + ob2->nrof >= 1UL << 31)
213 return 0; 199 return 0;
214 200
215 /* If the objects have been identified, set the BEEN_APPLIED flag. 201 /* If the objects have been identified, set the BEEN_APPLIED flag.
216 * This is to the comparison of the flags below will be OK. We 202 * This is to the comparison of the flags below will be OK. We
217 * just can't ignore the been applied or identified flags, as they 203 * just can't ignore the been applied or identified flags, as they
218 * are not equal - just if it has been identified, the been_applied 204 * are not equal - just if it has been identified, the been_applied
219 * flags lose any meaning. 205 * flags lose any meaning.
220 */ 206 */
221 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 207 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 208 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223 209
224 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 210 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 211 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226 212
227 if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any () 213 if (ob1->arch->archname != ob2->arch->archname
228 || ob1->arch != ob2->arch
229 || ob1->name != ob2->name 214 || ob1->name != ob2->name
230 || ob1->title != ob2->title 215 || ob1->title != ob2->title
231 || ob1->msg != ob2->msg 216 || ob1->msg != ob2->msg
232 || ob1->weight != ob2->weight 217 || ob1->weight != ob2->weight
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235 || ob1->attacktype != ob2->attacktype 218 || ob1->attacktype != ob2->attacktype
236 || ob1->magic != ob2->magic 219 || ob1->magic != ob2->magic
237 || ob1->slaying != ob2->slaying 220 || ob1->slaying != ob2->slaying
238 || ob1->skill != ob2->skill 221 || ob1->skill != ob2->skill
239 || ob1->value != ob2->value 222 || ob1->value != ob2->value
240 || ob1->animation_id != ob2->animation_id 223 || ob1->animation_id != ob2->animation_id
224 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
241 || ob1->client_type != ob2->client_type 225 || ob1->client_type != ob2->client_type
242 || ob1->materialname != ob2->materialname 226 || ob1->materialname != ob2->materialname
243 || ob1->lore != ob2->lore 227 || ob1->lore != ob2->lore
244 || ob1->subtype != ob2->subtype 228 || ob1->subtype != ob2->subtype
245 || ob1->move_type != ob2->move_type 229 || ob1->move_type != ob2->move_type
246 || ob1->move_block != ob2->move_block 230 || ob1->move_block != ob2->move_block
247 || ob1->move_allow != ob2->move_allow 231 || ob1->move_allow != ob2->move_allow
248 || ob1->move_on != ob2->move_on 232 || ob1->move_on != ob2->move_on
249 || ob1->move_off != ob2->move_off 233 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow 234 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty) 235 || ob1->move_slow_penalty != ob2->move_slow_penalty
236 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252 return 0; 238 return 0;
253 239
240 if ((ob1->flag ^ ob2->flag)
241 .reset (FLAG_INV_LOCKED)
242 .reset (FLAG_REMOVED)
243 .any ())
244 return 0;
245
254 /* This is really a spellbook check - really, we should 246 /* This is really a spellbook check - we should in general
255 * check all objects in the inventory. 247 * not merge objects with real inventories, as splitting them
248 * is hard.
256 */ 249 */
257 if (ob1->inv || ob2->inv) 250 if (ob1->inv || ob2->inv)
258 { 251 {
259 /* if one object has inventory but the other doesn't, not equiv */ 252 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 253 return 0; /* inventories differ in length */
261 return 0;
262 254
263 /* Now check to see if the two inventory objects could merge */ 255 if (ob1->inv->below || ob2->inv->below)
256 return 0; /* more than one object in inv */
257
264 if (!object::can_merge (ob1->inv, ob2->inv)) 258 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 259 return 0; /* inventory objects differ */
266 260
267 /* inventory ok - still need to check rest of this object to see 261 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 262 * if it is valid.
269 */ 263 */
270 } 264 }
289 if (ob1->level != ob2->level) 283 if (ob1->level != ob2->level)
290 return 0; 284 return 0;
291 break; 285 break;
292 } 286 }
293 287
294 if (ob1->key_values != NULL || ob2->key_values != NULL) 288 if (ob1->key_values || ob2->key_values)
295 { 289 {
296 /* At least one of these has key_values. */ 290 /* At least one of these has key_values. */
297 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 291 if ((!ob1->key_values) != (!ob2->key_values))
298 /* One has fields, but the other one doesn't. */ 292 return 0; /* One has fields, but the other one doesn't. */
293
294 if (!compare_ob_value_lists (ob1, ob2))
299 return 0; 295 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0;
302 } 296 }
303 297
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 298 if (ob1->self || ob2->self)
306 { 299 {
307 ob1->optimise (); 300 ob1->optimise ();
308 ob2->optimise (); 301 ob2->optimise ();
309 302
310 if (ob1->self || ob2->self) 303 if (ob1->self || ob2->self)
304 {
305 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
306 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
307
308 if (k1 != k2)
311 return 0; 309 return 0;
310
311 if (k1 == 0)
312 return 1;
313
314 if (!cfperl_can_merge (ob1, ob2))
315 return 0;
316 }
312 } 317 }
313 318
314 /* Everything passes, must be OK. */ 319 /* Everything passes, must be OK. */
315 return 1; 320 return 1;
316} 321}
317 322
323// find player who can see this object
324object *
325object::visible_to () const
326{
327 if (client_visible () && !flag [FLAG_REMOVED])
328 {
329 // see if we are in a container of sorts
330 if (env)
331 {
332 // the player inventory itself is always visible
333 if (env->is_player ())
334 return env;
335
336 // else a player could have our env open
337 object *envest = env->outer_env_or_self ();
338
339 // the player itself is always on a map, so we will find him here
340 // even if our inv is in a player.
341 if (envest->is_on_map ())
342 if (object *pl = envest->ms ().player ())
343 if (pl->container_ () == env)
344 return pl;
345 }
346 else
347 {
348 // maybe there is a player standing on the same mapspace
349 // this will catch the case where "this" is a player
350 if (object *pl = ms ().player ())
351 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
352 || pl->container_ () == this)
353 return pl;
354 }
355 }
356
357 return 0;
358}
359
360// adjust weight per container type ("of holding")
361static sint32
362weight_adjust_for (object *op, sint32 weight)
363{
364 return op->type == CONTAINER
365 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
366 : weight;
367}
368
318/* 369/*
370 * adjust_weight(object, weight) adds the specified weight to an object,
371 * and also updates how much the environment(s) is/are carrying.
372 */
373static void
374adjust_weight (object *op, sint32 weight)
375{
376 while (op)
377 {
378 // adjust by actual difference to account for rounding errors
379 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
380 weight = weight_adjust_for (op, op->carrying)
381 - weight_adjust_for (op, op->carrying - weight);
382
383 if (!weight)
384 return;
385
386 op->carrying += weight;
387
388 if (object *pl = op->visible_to ())
389 if (pl != op) // player is handled lazily
390 esrv_update_item (UPD_WEIGHT, pl, op);
391
392 op = op->env;
393 }
394}
395
396/*
319 * sum_weight() is a recursive function which calculates the weight 397 * this is a recursive function which calculates the weight
320 * an object is carrying. It goes through in figures out how much 398 * an object is carrying. It goes through op and figures out how much
321 * containers are carrying, and sums it up. 399 * containers are carrying, and sums it up.
322 */ 400 */
323long 401void
324sum_weight (object *op) 402object::update_weight ()
325{ 403{
326 long sum; 404 sint32 sum = 0;
327 object *inv;
328 405
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 406 for (object *op = inv; op; op = op->below)
330 { 407 {
331 if (inv->inv) 408 if (op->inv)
332 sum_weight (inv); 409 op->update_weight ();
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 410
411 sum += op->total_weight ();
412 }
413
414 sum = weight_adjust_for (this, sum);
415
416 if (sum != carrying)
334 } 417 {
335
336 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100;
338
339 if (op->carrying != sum)
340 op->carrying = sum; 418 carrying = sum;
341 419
342 return sum; 420 if (object *pl = visible_to ())
421 if (pl != this) // player is handled lazily
422 esrv_update_item (UPD_WEIGHT, pl, this);
423 }
343} 424}
344 425
345/** 426/*
346 * Return the outermost environment object for a given object. 427 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
347 */ 428 */
348
349object *
350object_get_env_recursive (object *op)
351{
352 while (op->env != NULL)
353 op = op->env;
354 return op;
355}
356
357/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array.
361 */
362
363char * 429char *
364dump_object (object *op) 430dump_object (object *op)
365{ 431{
366 if (!op) 432 if (!op)
367 return strdup ("[NULLOBJ]"); 433 return strdup ("[NULLOBJ]");
368 434
369 object_freezer freezer; 435 object_freezer freezer;
370 save_object (freezer, op, 1); 436 op->write (freezer);
371 return freezer.as_string (); 437 return freezer.as_string ();
372} 438}
373 439
374/* 440char *
375 * get_nearest_part(multi-object, object 2) returns the part of the 441object::as_string ()
376 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned.
378 */
379
380object *
381get_nearest_part (object *op, const object *pl)
382{ 442{
383 object *tmp, *closest; 443 return dump_object (this);
384 int last_dist, i;
385
386 if (op->more == NULL)
387 return op;
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i;
391 return closest;
392} 444}
393 445
394/* 446/*
395 * Returns the object which has the count-variable equal to the argument. 447 * Returns the object which has the count-variable equal to the argument.
448 * VERRRY slow.
396 */ 449 */
397object * 450object *
398find_object (tag_t i) 451find_object (tag_t i)
399{ 452{
400 for_all_objects (op) 453 for_all_objects (op)
411 */ 464 */
412object * 465object *
413find_object_name (const char *str) 466find_object_name (const char *str)
414{ 467{
415 shstr_cmp str_ (str); 468 shstr_cmp str_ (str);
416 object *op;
417 469
470 if (str_)
418 for_all_objects (op) 471 for_all_objects (op)
419 if (op->name == str_) 472 if (op->name == str_)
420 break; 473 return op;
421 474
422 return op; 475 return 0;
423}
424
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429} 476}
430 477
431/* 478/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 479 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 480 * skill and experience objects.
481 * ACTUALLY NO! investigate! TODO
434 */ 482 */
435void 483void
436object::set_owner (object *owner) 484object::set_owner (object *owner)
437{ 485{
486 // allow objects which own objects
438 if (!owner) 487 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 488 while (owner->owner)
449 owner = owner->owner; 489 owner = owner->owner;
490
491 if (flag [FLAG_FREED])
492 {
493 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
494 return;
495 }
450 496
451 this->owner = owner; 497 this->owner = owner;
498}
499
500int
501object::slottype () const
502{
503 if (type == SKILL)
504 {
505 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
506 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
507 }
508 else
509 {
510 if (slot [body_combat].info) return slot_combat;
511 if (slot [body_range ].info) return slot_ranged;
512 }
513
514 return slot_none;
515}
516
517bool
518object::change_weapon (object *ob)
519{
520 if (current_weapon == ob)
521 return true;
522
523 if (chosen_skill)
524 chosen_skill->flag [FLAG_APPLIED] = false;
525
526 current_weapon = ob;
527 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
528
529 if (chosen_skill)
530 chosen_skill->flag [FLAG_APPLIED] = true;
531
532 update_stats ();
533
534 if (ob)
535 {
536 // now check wether any body locations became invalid, in which case
537 // we cannot apply the weapon at the moment.
538 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
539 if (slot[i].used < 0)
540 {
541 current_weapon = chosen_skill = 0;
542 update_stats ();
543
544 new_draw_info_format (NDI_UNIQUE, 0, this,
545 "You try to balance all your items at once, "
546 "but the %s is just too much for your body. "
547 "[You need to unapply some items first - use the 'body' command to see "
548 "how many items you cna wera on a specific body part.]", &ob->name);
549 return false;
550 }
551
552 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
553 }
554 else
555 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
556
557 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
558 {
559 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
560 &name, ob->debug_desc ());
561 return false;
562 }
563
564 return true;
452} 565}
453 566
454/* Zero the key_values on op, decrementing the shared-string 567/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 568 * refcounts and freeing the links.
456 */ 569 */
457static void 570static void
458free_key_values (object *op) 571free_key_values (object *op)
459{ 572{
460 for (key_value *i = op->key_values; i != 0;) 573 for (key_value *i = op->key_values; i; )
461 { 574 {
462 key_value *next = i->next; 575 key_value *next = i->next;
463 delete i; 576 delete i;
464 577
465 i = next; 578 i = next;
477 * will point at garbage. 590 * will point at garbage.
478 */ 591 */
479void 592void
480object::copy_to (object *dst) 593object::copy_to (object *dst)
481{ 594{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 595 dst->remove ();
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
484
485 *(object_copy *)dst = *this; 596 *(object_copy *)dst = *this;
486 597 dst->flag [FLAG_REMOVED] = true;
487 if (is_freed)
488 SET_FLAG (dst, FLAG_FREED);
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - rndm ();
495 598
496 /* Copy over key_values, if any. */ 599 /* Copy over key_values, if any. */
497 if (key_values) 600 if (key_values)
498 { 601 {
499 key_value *tail = 0; 602 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 603 dst->key_values = 0;
503 604
504 for (i = key_values; i; i = i->next) 605 for (key_value *i = key_values; i; i = i->next)
505 { 606 {
506 key_value *new_link = new key_value; 607 key_value *new_link = new key_value;
507 608
508 new_link->next = 0; 609 new_link->next = 0;
509 new_link->key = i->key; 610 new_link->key = i->key;
510 new_link->value = i->value; 611 new_link->value = i->value;
511 612
512 /* Try and be clever here, too. */ 613 /* Try and be clever here, too. */
513 if (!dst->key_values) 614 if (!dst->key_values)
514 { 615 {
521 tail = new_link; 622 tail = new_link;
522 } 623 }
523 } 624 }
524 } 625 }
525 626
526 dst->set_speed (dst->speed); 627 if (speed < 0)
628 dst->speed_left -= rndm ();
629
630 dst->activate ();
631}
632
633void
634object::instantiate ()
635{
636 if (!uuid.seq) // HACK
637 uuid = UUID::gen ();
638
639 speed_left = -0.1f;
640 /* copy the body_info to the body_used - this is only really
641 * need for monsters, but doesn't hurt to do it for everything.
642 * by doing so, when a monster is created, it has good starting
643 * values for the body_used info, so when items are created
644 * for it, they can be properly equipped.
645 */
646 for (int i = NUM_BODY_LOCATIONS; i--; )
647 slot[i].used = slot[i].info;
648
649 attachable::instantiate ();
527} 650}
528 651
529object * 652object *
530object::clone () 653object::clone ()
531{ 654{
532 object *neu = create (); 655 object *neu = create ();
533 copy_to (neu); 656 copy_to (neu);
657 neu->map = map; // not copied by copy_to
534 return neu; 658 return neu;
535} 659}
536 660
537/* 661/*
538 * If an object with the IS_TURNABLE() flag needs to be turned due 662 * If an object with the IS_TURNABLE() flag needs to be turned due
589 * UP_OBJ_FACE: only the objects face has changed. 713 * UP_OBJ_FACE: only the objects face has changed.
590 */ 714 */
591void 715void
592update_object (object *op, int action) 716update_object (object *op, int action)
593{ 717{
594 MoveType move_on, move_off, move_block, move_slow; 718 if (!op)
595
596 if (op == NULL)
597 { 719 {
598 /* this should never happen */ 720 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 721 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
600 return; 722 return;
601 } 723 }
602 724
603 if (op->env) 725 if (!op->is_on_map ())
604 { 726 {
605 /* Animation is currently handled by client, so nothing 727 /* Animation is currently handled by client, so nothing
606 * to do in this case. 728 * to do in this case.
607 */ 729 */
608 return; 730 return;
609 } 731 }
610
611 /* If the map is saving, don't do anything as everything is
612 * going to get freed anyways.
613 */
614 if (!op->map || op->map->in_memory == MAP_SAVING)
615 return;
616 732
617 /* make sure the object is within map boundaries */ 733 /* make sure the object is within map boundaries */
618 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 734 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
619 { 735 {
620 LOG (llevError, "update_object() called for object out of map!\n"); 736 LOG (llevError, "update_object() called for object out of map!\n");
631 else if (action == UP_OBJ_INSERT) 747 else if (action == UP_OBJ_INSERT)
632 { 748 {
633 // this is likely overkill, TODO: revisit (schmorp) 749 // this is likely overkill, TODO: revisit (schmorp)
634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 750 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
635 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 751 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
636 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 752 || (op->is_player () && !(m.flags_ & P_PLAYER))
637 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 753 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
638 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 754 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
639 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 755 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
640 || (m.move_on | op->move_on ) != m.move_on 756 || (m.move_on | op->move_on ) != m.move_on
641 || (m.move_off | op->move_off ) != m.move_off 757 || (m.move_off | op->move_off ) != m.move_off
642 || (m.move_slow | op->move_slow) != m.move_slow 758 || (m.move_slow | op->move_slow) != m.move_slow
643 /* This isn't perfect, but I don't expect a lot of objects to 759 /* This isn't perfect, but I don't expect a lot of objects to
644 * to have move_allow right now. 760 * have move_allow right now.
645 */ 761 */
646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 762 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 763 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648 m.flags_ = 0; 764 m.invalidate ();
649 } 765 }
650 /* if the object is being removed, we can't make intelligent 766 /* if the object is being removed, we can't make intelligent
651 * decisions, because remove_ob can't really pass the object 767 * decisions, because remove_ob can't really pass the object
652 * that is being removed. 768 * that is being removed.
653 */ 769 */
654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 770 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655 m.flags_ = 0; 771 m.invalidate ();
656 else if (action == UP_OBJ_FACE) 772 else if (action == UP_OBJ_FACE)
657 /* Nothing to do for that case */ ; 773 /* Nothing to do for that case */ ;
658 else 774 else
659 LOG (llevError, "update_object called with invalid action: %d\n", action); 775 LOG (llevError, "update_object called with invalid action: %d\n", action);
660 776
664 780
665object::object () 781object::object ()
666{ 782{
667 SET_FLAG (this, FLAG_REMOVED); 783 SET_FLAG (this, FLAG_REMOVED);
668 784
669 expmul = 1.0; 785 //expmul = 1.0; declared const for the time being
670 face = blank_face; 786 face = blank_face;
671} 787}
672 788
673object::~object () 789object::~object ()
674{ 790{
791 unlink ();
792
675 free_key_values (this); 793 free_key_values (this);
676} 794}
677 795
678static int object_count; 796static int object_count;
679 797
680void object::link () 798void object::link ()
681{ 799{
682 assert (!index);//D 800 assert (!index);//D
683 uuid = gen_uuid (); 801 uuid = UUID::gen ();
684 count = ++object_count; 802 count = ++object_count;
685 803
686 refcnt_inc (); 804 refcnt_inc ();
687 objects.insert (this); 805 objects.insert (this);
688} 806}
689 807
690void object::unlink () 808void object::unlink ()
691{ 809{
692 assert (index);//D 810 if (!index)
811 return;
812
693 objects.erase (this); 813 objects.erase (this);
694 refcnt_dec (); 814 refcnt_dec ();
695} 815}
696 816
697void 817void
700 /* If already on active list, don't do anything */ 820 /* If already on active list, don't do anything */
701 if (active) 821 if (active)
702 return; 822 return;
703 823
704 if (has_active_speed ()) 824 if (has_active_speed ())
825 {
826 if (flag [FLAG_FREED])
827 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
828
705 actives.insert (this); 829 actives.insert (this);
830 }
706} 831}
707 832
708void 833void
709object::activate_recursive () 834object::activate_recursive ()
710{ 835{
759object::destroy_inv (bool drop_to_ground) 884object::destroy_inv (bool drop_to_ground)
760{ 885{
761 // need to check first, because the checks below might segfault 886 // need to check first, because the checks below might segfault
762 // as we might be on an invalid mapspace and crossfire code 887 // as we might be on an invalid mapspace and crossfire code
763 // is too buggy to ensure that the inventory is empty. 888 // is too buggy to ensure that the inventory is empty.
764 // corollary: if you create arrows etc. with stuff in tis inventory, 889 // corollary: if you create arrows etc. with stuff in its inventory,
765 // cf will crash below with off-map x and y 890 // cf will crash below with off-map x and y
766 if (!inv) 891 if (!inv)
767 return; 892 return;
768 893
769 /* Only if the space blocks everything do we not process - 894 /* Only if the space blocks everything do we not process -
770 * if some form of movement is allowed, let objects 895 * if some form of movement is allowed, let objects
771 * drop on that space. 896 * drop on that space.
772 */ 897 */
773 if (!drop_to_ground 898 if (!drop_to_ground
774 || !map 899 || !map
775 || map->in_memory != MAP_IN_MEMORY 900 || map->in_memory != MAP_ACTIVE
901 || map->no_drop
776 || ms ().move_block == MOVE_ALL) 902 || ms ().move_block == MOVE_ALL)
777 { 903 {
778 while (inv) 904 while (inv)
779 {
780 inv->destroy_inv (drop_to_ground);
781 inv->destroy (); 905 inv->destroy ();
782 }
783 } 906 }
784 else 907 else
785 { /* Put objects in inventory onto this space */ 908 { /* Put objects in inventory onto this space */
786 while (inv) 909 while (inv)
787 { 910 {
805 object *op = new object; 928 object *op = new object;
806 op->link (); 929 op->link ();
807 return op; 930 return op;
808} 931}
809 932
933static struct freed_map : maptile
934{
935 freed_map ()
936 {
937 path = "<freed objects map>";
938 name = "/internal/freed_objects_map";
939 width = 3;
940 height = 3;
941 no_drop = 1;
942 no_reset = 1;
943
944 alloc ();
945 in_memory = MAP_ACTIVE;
946 }
947
948 ~freed_map ()
949 {
950 destroy ();
951 }
952} freed_map; // freed objects are moved here to avoid crashes
953
810void 954void
811object::do_destroy () 955object::do_destroy ()
812{ 956{
813 attachable::do_destroy ();
814
815 if (flag [FLAG_IS_LINKED]) 957 if (flag [FLAG_IS_LINKED])
816 remove_button_link (this); 958 remove_link ();
817 959
818 if (flag [FLAG_FRIENDLY]) 960 if (flag [FLAG_FRIENDLY])
819 remove_friendly_object (this); 961 remove_friendly_object (this);
820 962
821 if (!flag [FLAG_REMOVED])
822 remove (); 963 remove ();
823 964
824 destroy_inv (true); 965 attachable::do_destroy ();
825 966
826 deactivate (); 967 deactivate ();
827 unlink (); 968 unlink ();
828 969
829 flag [FLAG_FREED] = 1; 970 flag [FLAG_FREED] = 1;
830 971
831 // hack to ensure that freed objects still have a valid map 972 // hack to ensure that freed objects still have a valid map
832 {
833 static maptile *freed_map; // freed objects are moved here to avoid crashes
834
835 if (!freed_map)
836 {
837 freed_map = new maptile;
838
839 freed_map->name = "/internal/freed_objects_map";
840 freed_map->width = 3;
841 freed_map->height = 3;
842
843 freed_map->alloc ();
844 freed_map->in_memory = MAP_IN_MEMORY;
845 }
846
847 map = freed_map; 973 map = &freed_map;
848 x = 1; 974 x = 1;
849 y = 1; 975 y = 1;
850 }
851
852 head = 0;
853 976
854 if (more) 977 if (more)
855 { 978 {
856 more->destroy (); 979 more->destroy ();
857 more = 0; 980 more = 0;
858 } 981 }
859 982
983 head = 0;
984
860 // clear those pointers that likely might have circular references to us 985 // clear those pointers that likely might cause circular references
861 owner = 0; 986 owner = 0;
862 enemy = 0; 987 enemy = 0;
863 attacked_by = 0; 988 attacked_by = 0;
989 current_weapon = 0;
864} 990}
865 991
866void 992void
867object::destroy (bool destroy_inventory) 993object::destroy ()
868{ 994{
869 if (destroyed ()) 995 if (destroyed ())
870 return; 996 return;
871 997
872 if (destroy_inventory) 998 if (!is_head () && !head->destroyed ())
999 {
1000 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1001 head->destroy ();
1002 return;
1003 }
1004
873 destroy_inv (false); 1005 destroy_inv (false);
1006
1007 if (is_head ())
1008 if (sound_destroy)
1009 play_sound (sound_destroy);
1010 else if (flag [FLAG_MONSTER])
1011 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
874 1012
875 attachable::destroy (); 1013 attachable::destroy ();
876}
877
878/*
879 * sub_weight() recursively (outwards) subtracts a number from the
880 * weight of an object (and what is carried by it's environment(s)).
881 */
882void
883sub_weight (object *op, signed long weight)
884{
885 while (op != NULL)
886 {
887 if (op->type == CONTAINER)
888 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
889
890 op->carrying -= weight;
891 op = op->env;
892 }
893} 1014}
894 1015
895/* op->remove (): 1016/* op->remove ():
896 * This function removes the object op from the linked list of objects 1017 * This function removes the object op from the linked list of objects
897 * which it is currently tied to. When this function is done, the 1018 * which it is currently tied to. When this function is done, the
898 * object will have no environment. If the object previously had an 1019 * object will have no environment. If the object previously had an
899 * environment, the x and y coordinates will be updated to 1020 * environment, the x and y coordinates will be updated to
900 * the previous environment. 1021 * the previous environment.
901 * Beware: This function is called from the editor as well!
902 */ 1022 */
903void 1023void
904object::remove_slow () 1024object::do_remove ()
905{ 1025{
906 object *tmp, *last = 0; 1026 if (flag [FLAG_REMOVED])
907 object *otmp;
908
909 if (QUERY_FLAG (this, FLAG_REMOVED))
910 return; 1027 return;
911 1028
912 SET_FLAG (this, FLAG_REMOVED);
913 INVOKE_OBJECT (REMOVE, this); 1029 INVOKE_OBJECT (REMOVE, this);
1030
1031 flag [FLAG_REMOVED] = true;
914 1032
915 if (more) 1033 if (more)
916 more->remove (); 1034 more->remove ();
917 1035
918 /* 1036 /*
919 * In this case, the object to be removed is in someones 1037 * In this case, the object to be removed is in someones
920 * inventory. 1038 * inventory.
921 */ 1039 */
922 if (env) 1040 if (env)
923 { 1041 {
924 if (nrof) 1042 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
925 sub_weight (env, weight * nrof); 1043 if (object *pl = visible_to ())
926 else 1044 esrv_del_item (pl->contr, count);
927 sub_weight (env, weight + carrying); 1045 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1046
1047 adjust_weight (env, -total_weight ());
1048
1049 object *pl = in_player ();
1050
1051 /* we set up values so that it could be inserted into
1052 * the map, but we don't actually do that - it is up
1053 * to the caller to decide what we want to do.
1054 */
1055 map = env->map;
1056 x = env->x;
1057 y = env->y;
1058
1059 // make sure cmov optimisation is applicable
1060 *(above ? &above->below : &env->inv) = below;
1061 *(below ? &below->above : &above ) = above; // &above is just a dummy
1062
1063 above = 0;
1064 below = 0;
1065 env = 0;
928 1066
929 /* NO_FIX_PLAYER is set when a great many changes are being 1067 /* NO_FIX_PLAYER is set when a great many changes are being
930 * made to players inventory. If set, avoiding the call 1068 * made to players inventory. If set, avoiding the call
931 * to save cpu time. 1069 * to save cpu time.
932 */ 1070 */
933 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1071 if (pl)
1072 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1073 {
934 otmp->update_stats (); 1074 pl->update_stats ();
935 1075
936 if (above) 1076 if (glow_radius && pl->is_on_map ())
937 above->below = below; 1077 update_all_los (pl->map, pl->x, pl->y);
938 else 1078 }
939 env->inv = below;
940
941 if (below)
942 below->above = above;
943
944 /* we set up values so that it could be inserted into
945 * the map, but we don't actually do that - it is up
946 * to the caller to decide what we want to do.
947 */
948 x = env->x, y = env->y;
949 map = env->map;
950 above = 0, below = 0;
951 env = 0;
952 } 1079 }
953 else if (map) 1080 else if (map)
954 { 1081 {
955 if (type == PLAYER)
956 {
957 --map->players;
958 map->touch ();
959 }
960
961 map->dirty = true; 1082 map->dirty = true;
962 mapspace &ms = this->ms (); 1083 mapspace &ms = this->ms ();
963 1084
1085 if (object *pl = ms.player ())
1086 {
1087 if (is_player ())
1088 {
1089 if (!flag [FLAG_WIZPASS])
1090 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1091
1092 // leaving a spot always closes any open container on the ground
1093 if (container && !container->env)
1094 // this causes spurious floorbox updates, but it ensures
1095 // that the CLOSE event is being sent.
1096 close_container ();
1097
1098 --map->players;
1099 map->touch ();
1100 }
1101 else if (pl->container_ () == this)
1102 {
1103 // removing a container should close it
1104 close_container ();
1105 }
1106
1107 esrv_del_item (pl->contr, count);
1108 }
1109
964 /* link the object above us */ 1110 /* link the object above us */
965 if (above) 1111 // re-link, make sure compiler can easily use cmove
966 above->below = below; 1112 *(above ? &above->below : &ms.top) = below;
967 else 1113 *(below ? &below->above : &ms.bot) = above;
968 ms.top = below; /* we were top, set new top */
969
970 /* Relink the object below us, if there is one */
971 if (below)
972 below->above = above;
973 else
974 {
975 /* Nothing below, which means we need to relink map object for this space
976 * use translated coordinates in case some oddness with map tiling is
977 * evident
978 */
979 if (GET_MAP_OB (map, x, y) != this)
980 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
981
982 ms.bot = above; /* goes on above it. */
983 }
984 1114
985 above = 0; 1115 above = 0;
986 below = 0; 1116 below = 0;
987 1117
1118 ms.invalidate ();
1119
988 if (map->in_memory == MAP_SAVING) 1120 if (map->in_memory == MAP_SAVING)
989 return; 1121 return;
990 1122
991 int check_walk_off = !flag [FLAG_NO_APPLY]; 1123 int check_walk_off = !flag [FLAG_NO_APPLY];
992 1124
993 for (tmp = ms.bot; tmp; tmp = tmp->above) 1125 if (object *pl = ms.player ())
994 { 1126 {
995 /* No point updating the players look faces if he is the object 1127 if (pl->container_ () == this)
996 * being removed.
997 */
998
999 if (tmp->type == PLAYER && tmp != this)
1000 {
1001 /* If a container that the player is currently using somehow gets 1128 /* If a container that the player is currently using somehow gets
1002 * removed (most likely destroyed), update the player view 1129 * removed (most likely destroyed), update the player view
1003 * appropriately. 1130 * appropriately.
1004 */ 1131 */
1005 if (tmp->container == this) 1132 pl->close_container ();
1006 {
1007 flag [FLAG_APPLIED] = 0;
1008 tmp->container = 0;
1009 }
1010 1133
1134 //TODO: the floorbox prev/next might need updating
1135 //esrv_del_item (pl->contr, count);
1136 //TODO: update floorbox to preserve ordering
1011 if (tmp->contr->ns) 1137 if (pl->contr->ns)
1012 tmp->contr->ns->floorbox_update (); 1138 pl->contr->ns->floorbox_update ();
1139 }
1140
1141 if (check_walk_off)
1142 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1143 {
1144 above = tmp->above;
1145
1146 /* No point updating the players look faces if he is the object
1147 * being removed.
1013 } 1148 */
1014 1149
1015 /* See if object moving off should effect something */ 1150 /* See if object moving off should effect something */
1016 if (check_walk_off
1017 && ((move_type & tmp->move_off) 1151 if ((move_type & tmp->move_off)
1018 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1152 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1019 {
1020 move_apply (tmp, this, 0); 1153 move_apply (tmp, this, 0);
1021
1022 if (destroyed ())
1023 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1024 } 1154 }
1025 1155
1026 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1156 if (affects_los ())
1027 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1028 if (tmp->above == tmp)
1029 tmp->above = 0;
1030
1031 last = tmp;
1032 }
1033
1034 /* last == NULL if there are no objects on this space */
1035 //TODO: this makes little sense, why only update the topmost object?
1036 if (!last)
1037 map->at (x, y).flags_ = 0;
1038 else
1039 update_object (last, UP_OBJ_REMOVE);
1040
1041 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1042 update_all_los (map, x, y); 1157 update_all_los (map, x, y);
1043 } 1158 }
1044} 1159}
1045 1160
1046/* 1161/*
1055merge_ob (object *op, object *top) 1170merge_ob (object *op, object *top)
1056{ 1171{
1057 if (!op->nrof) 1172 if (!op->nrof)
1058 return 0; 1173 return 0;
1059 1174
1060 if (top) 1175 if (!top)
1061 for (top = op; top && top->above; top = top->above) 1176 for (top = op; top && top->above; top = top->above)
1062 ; 1177 ;
1063 1178
1064 for (; top; top = top->below) 1179 for (; top; top = top->below)
1065 {
1066 if (top == op)
1067 continue;
1068
1069 if (object::can_merge (op, top)) 1180 if (object::can_merge (op, top))
1070 { 1181 {
1071 top->nrof += op->nrof; 1182 top->nrof += op->nrof;
1072 1183
1073/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1184 if (object *pl = top->visible_to ())
1074 op->weight = 0; /* Don't want any adjustements now */ 1185 esrv_update_item (UPD_NROF, pl, top);
1186
1187 op->weight = 0; // cancel the addition above
1188 op->carrying = 0; // must be 0 already
1189
1075 op->destroy (); 1190 op->destroy ();
1191
1076 return top; 1192 return top;
1077 } 1193 }
1078 }
1079 1194
1080 return 0; 1195 return 0;
1196}
1197
1198void
1199object::expand_tail ()
1200{
1201 if (more)
1202 return;
1203
1204 object *prev = this;
1205
1206 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1207 {
1208 object *op = arch_to_object (at);
1209
1210 op->name = name;
1211 op->name_pl = name_pl;
1212 op->title = title;
1213
1214 op->head = this;
1215 prev->more = op;
1216
1217 prev = op;
1218 }
1081} 1219}
1082 1220
1083/* 1221/*
1084 * same as insert_ob_in_map except it handles separate coordinates and does a clean 1222 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1085 * job preparing multi-part monsters. 1223 * job preparing multi-part monsters.
1086 */ 1224 */
1087object * 1225object *
1088insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1226insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1089{ 1227{
1228 op->remove ();
1229
1090 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1230 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1091 { 1231 {
1092 tmp->x = x + tmp->arch->clone.x; 1232 tmp->x = x + tmp->arch->x;
1093 tmp->y = y + tmp->arch->clone.y; 1233 tmp->y = y + tmp->arch->y;
1094 } 1234 }
1095 1235
1096 return insert_ob_in_map (op, m, originator, flag); 1236 return insert_ob_in_map (op, m, originator, flag);
1097} 1237}
1098 1238
1117 * just 'op' otherwise 1257 * just 'op' otherwise
1118 */ 1258 */
1119object * 1259object *
1120insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1260insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1121{ 1261{
1122 object *tmp, *top, *floor = NULL;
1123
1124 if (QUERY_FLAG (op, FLAG_FREED))
1125 {
1126 LOG (llevError, "Trying to insert freed object!\n");
1127 return NULL;
1128 }
1129
1130 if (!QUERY_FLAG (op, FLAG_REMOVED))
1131 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1132
1133 op->remove (); 1262 op->remove ();
1134 1263
1135 if (!m) 1264 if (m == &freed_map)//D TODO: remove soon
1136 { 1265 {//D
1137 char *dump = dump_object (op); 1266 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1139 free (dump);
1140 return op;
1141 } 1267 }//D
1142
1143 if (out_of_map (m, op->x, op->y))
1144 {
1145 char *dump = dump_object (op);
1146 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1147#ifdef MANY_CORES
1148 /* Better to catch this here, as otherwise the next use of this object
1149 * is likely to cause a crash. Better to find out where it is getting
1150 * improperly inserted.
1151 */
1152 abort ();
1153#endif
1154 free (dump);
1155 return op;
1156 }
1157
1158 if (object *more = op->more)
1159 {
1160 if (!insert_ob_in_map (more, m, originator, flag))
1161 {
1162 if (!op->head)
1163 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1164
1165 return 0;
1166 }
1167 }
1168
1169 CLEAR_FLAG (op, FLAG_REMOVED);
1170 1268
1171 /* Ideally, the caller figures this out. However, it complicates a lot 1269 /* Ideally, the caller figures this out. However, it complicates a lot
1172 * of areas of callers (eg, anything that uses find_free_spot would now 1270 * of areas of callers (eg, anything that uses find_free_spot would now
1173 * need extra work 1271 * need extra work
1174 */ 1272 */
1273 maptile *newmap = m;
1175 if (!xy_normalise (m, op->x, op->y)) 1274 if (!xy_normalise (newmap, op->x, op->y))
1275 {
1276 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1176 return 0; 1277 return 0;
1278 }
1177 1279
1280 if (object *more = op->more)
1281 if (!insert_ob_in_map (more, m, originator, flag))
1282 return 0;
1283
1284 op->flag [FLAG_REMOVED] = false;
1285 op->env = 0;
1178 op->map = m; 1286 op->map = newmap;
1287
1179 mapspace &ms = op->ms (); 1288 mapspace &ms = op->ms ();
1180 1289
1181 /* this has to be done after we translate the coordinates. 1290 /* this has to be done after we translate the coordinates.
1182 */ 1291 */
1183 if (op->nrof && !(flag & INS_NO_MERGE)) 1292 if (op->nrof && !(flag & INS_NO_MERGE))
1184 for (tmp = ms.bot; tmp; tmp = tmp->above) 1293 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1185 if (object::can_merge (op, tmp)) 1294 if (object::can_merge (op, tmp))
1186 { 1295 {
1296 // TODO: we actually want to update tmp, not op,
1297 // but some caller surely breaks when we return tmp
1298 // from here :/
1187 op->nrof += tmp->nrof; 1299 op->nrof += tmp->nrof;
1188 tmp->destroy (); 1300 tmp->destroy ();
1189 } 1301 }
1190 1302
1191 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1303 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1200 { 1312 {
1201 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1313 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1202 abort (); 1314 abort ();
1203 } 1315 }
1204 1316
1317 if (!originator->is_on_map ())
1318 {
1319 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1320 op->debug_desc (), originator->debug_desc ());
1321 abort ();
1322 }
1323
1205 op->above = originator; 1324 op->above = originator;
1206 op->below = originator->below; 1325 op->below = originator->below;
1207
1208 if (op->below)
1209 op->below->above = op;
1210 else
1211 ms.bot = op;
1212
1213 /* since *below* originator, no need to update top */
1214 originator->below = op; 1326 originator->below = op;
1327
1328 *(op->below ? &op->below->above : &ms.bot) = op;
1215 } 1329 }
1216 else 1330 else
1217 { 1331 {
1218 top = ms.bot; 1332 object *floor = 0;
1333 object *top = ms.top;
1219 1334
1220 /* If there are other objects, then */ 1335 /* If there are other objects, then */
1221 if ((!(flag & INS_MAP_LOAD)) && top) 1336 if (top)
1222 { 1337 {
1223 object *last = 0;
1224
1225 /* 1338 /*
1226 * If there are multiple objects on this space, we do some trickier handling. 1339 * If there are multiple objects on this space, we do some trickier handling.
1227 * We've already dealt with merging if appropriate. 1340 * We've already dealt with merging if appropriate.
1228 * Generally, we want to put the new object on top. But if 1341 * Generally, we want to put the new object on top. But if
1229 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1342 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1232 * once we get to them. This reduces the need to traverse over all of 1345 * once we get to them. This reduces the need to traverse over all of
1233 * them when adding another one - this saves quite a bit of cpu time 1346 * them when adding another one - this saves quite a bit of cpu time
1234 * when lots of spells are cast in one area. Currently, it is presumed 1347 * when lots of spells are cast in one area. Currently, it is presumed
1235 * that flying non pickable objects are spell objects. 1348 * that flying non pickable objects are spell objects.
1236 */ 1349 */
1237 for (top = ms.bot; top; top = top->above) 1350 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1238 { 1351 {
1239 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1352 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1240 floor = top; 1353 floor = tmp;
1241 1354
1242 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1355 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1243 { 1356 {
1244 /* We insert above top, so we want this object below this */ 1357 /* We insert above top, so we want this object below this */
1245 top = top->below; 1358 top = tmp->below;
1246 break; 1359 break;
1247 } 1360 }
1248 1361
1249 last = top; 1362 top = tmp;
1250 } 1363 }
1251
1252 /* Don't want top to be NULL, so set it to the last valid object */
1253 top = last;
1254 1364
1255 /* We let update_position deal with figuring out what the space 1365 /* We let update_position deal with figuring out what the space
1256 * looks like instead of lots of conditions here. 1366 * looks like instead of lots of conditions here.
1257 * makes things faster, and effectively the same result. 1367 * makes things faster, and effectively the same result.
1258 */ 1368 */
1259 1369
1260 /* Have object 'fall below' other objects that block view. 1370 /* Have object 'fall below' other objects that block view.
1261 * Unless those objects are exits, type 66 1371 * Unless those objects are exits.
1262 * If INS_ON_TOP is used, don't do this processing 1372 * If INS_ON_TOP is used, don't do this processing
1263 * Need to find the object that in fact blocks view, otherwise 1373 * Need to find the object that in fact blocks view, otherwise
1264 * stacking is a bit odd. 1374 * stacking is a bit odd.
1265 */ 1375 */
1266 if (!(flag & INS_ON_TOP) 1376 if (!(flag & INS_ON_TOP)
1267 && ms.flags () & P_BLOCKSVIEW 1377 && ms.flags () & P_BLOCKSVIEW
1268 && (op->face && !op->face->visibility)) 1378 && (op->face && !faces [op->face].visibility))
1269 { 1379 {
1380 object *last;
1381
1270 for (last = top; last != floor; last = last->below) 1382 for (last = top; last != floor; last = last->below)
1271 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1383 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1272 break; 1384 break;
1273 1385
1274 /* Check to see if we found the object that blocks view, 1386 /* Check to see if we found the object that blocks view,
1279 if (last && last->below && last != floor) 1391 if (last && last->below && last != floor)
1280 top = last->below; 1392 top = last->below;
1281 } 1393 }
1282 } /* If objects on this space */ 1394 } /* If objects on this space */
1283 1395
1284 if (flag & INS_MAP_LOAD)
1285 top = ms.top;
1286
1287 if (flag & INS_ABOVE_FLOOR_ONLY) 1396 if (flag & INS_ABOVE_FLOOR_ONLY)
1288 top = floor; 1397 top = floor;
1289 1398
1290 /* Top is the object that our object (op) is going to get inserted above. 1399 // insert object above top, or bottom-most if top = 0
1291 */
1292
1293 /* First object on this space */
1294 if (!top) 1400 if (!top)
1295 { 1401 {
1402 op->below = 0;
1296 op->above = ms.bot; 1403 op->above = ms.bot;
1297
1298 if (op->above)
1299 op->above->below = op;
1300
1301 op->below = 0;
1302 ms.bot = op; 1404 ms.bot = op;
1405
1406 *(op->above ? &op->above->below : &ms.top) = op;
1303 } 1407 }
1304 else 1408 else
1305 { /* get inserted into the stack above top */ 1409 {
1306 op->above = top->above; 1410 op->above = top->above;
1307
1308 if (op->above)
1309 op->above->below = op; 1411 top->above = op;
1310 1412
1311 op->below = top; 1413 op->below = top;
1312 top->above = op; 1414 *(op->above ? &op->above->below : &ms.top) = op;
1313 } 1415 }
1416 }
1314 1417
1315 if (!op->above) 1418 if (op->is_player ())
1316 ms.top = op;
1317 } /* else not INS_BELOW_ORIGINATOR */
1318
1319 if (op->type == PLAYER)
1320 { 1419 {
1321 op->contr->do_los = 1; 1420 op->contr->do_los = 1;
1322 ++op->map->players; 1421 ++op->map->players;
1323 op->map->touch (); 1422 op->map->touch ();
1324 } 1423 }
1325 1424
1326 op->map->dirty = true; 1425 op->map->dirty = true;
1327 1426
1328 /* If we have a floor, we know the player, if any, will be above
1329 * it, so save a few ticks and start from there.
1330 */
1331 if (!(flag & INS_MAP_LOAD))
1332 if (object *pl = ms.player ()) 1427 if (object *pl = ms.player ())
1428 //TODO: the floorbox prev/next might need updating
1429 //esrv_send_item (pl, op);
1430 //TODO: update floorbox to preserve ordering
1333 if (pl->contr->ns) 1431 if (pl->contr->ns)
1334 pl->contr->ns->floorbox_update (); 1432 pl->contr->ns->floorbox_update ();
1335 1433
1336 /* If this object glows, it may affect lighting conditions that are 1434 /* If this object glows, it may affect lighting conditions that are
1337 * visible to others on this map. But update_all_los is really 1435 * visible to others on this map. But update_all_los is really
1338 * an inefficient way to do this, as it means los for all players 1436 * an inefficient way to do this, as it means los for all players
1339 * on the map will get recalculated. The players could very well 1437 * on the map will get recalculated. The players could very well
1340 * be far away from this change and not affected in any way - 1438 * be far away from this change and not affected in any way -
1341 * this should get redone to only look for players within range, 1439 * this should get redone to only look for players within range,
1342 * or just updating the P_UPTODATE for spaces within this area 1440 * or just updating the P_UPTODATE for spaces within this area
1343 * of effect may be sufficient. 1441 * of effect may be sufficient.
1344 */ 1442 */
1345 if (op->map->darkness && (op->glow_radius != 0)) 1443 if (op->affects_los ())
1444 {
1445 op->ms ().invalidate ();
1346 update_all_los (op->map, op->x, op->y); 1446 update_all_los (op->map, op->x, op->y);
1447 }
1347 1448
1348 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1449 /* updates flags (blocked, alive, no magic, etc) for this map space */
1349 update_object (op, UP_OBJ_INSERT); 1450 update_object (op, UP_OBJ_INSERT);
1350 1451
1351 INVOKE_OBJECT (INSERT, op); 1452 INVOKE_OBJECT (INSERT, op);
1358 * blocked() and wall() work properly), and these flags are updated by 1459 * blocked() and wall() work properly), and these flags are updated by
1359 * update_object(). 1460 * update_object().
1360 */ 1461 */
1361 1462
1362 /* if this is not the head or flag has been passed, don't check walk on status */ 1463 /* if this is not the head or flag has been passed, don't check walk on status */
1363 if (!(flag & INS_NO_WALK_ON) && !op->head) 1464 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1364 { 1465 {
1365 if (check_move_on (op, originator)) 1466 if (check_move_on (op, originator))
1366 return 0; 1467 return 0;
1367 1468
1368 /* If we are a multi part object, lets work our way through the check 1469 /* If we are a multi part object, lets work our way through the check
1369 * walk on's. 1470 * walk on's.
1370 */ 1471 */
1371 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1472 for (object *tmp = op->more; tmp; tmp = tmp->more)
1372 if (check_move_on (tmp, originator)) 1473 if (check_move_on (tmp, originator))
1373 return 0; 1474 return 0;
1374 } 1475 }
1375 1476
1376 return op; 1477 return op;
1379/* this function inserts an object in the map, but if it 1480/* this function inserts an object in the map, but if it
1380 * finds an object of its own type, it'll remove that one first. 1481 * finds an object of its own type, it'll remove that one first.
1381 * op is the object to insert it under: supplies x and the map. 1482 * op is the object to insert it under: supplies x and the map.
1382 */ 1483 */
1383void 1484void
1384replace_insert_ob_in_map (const char *arch_string, object *op) 1485replace_insert_ob_in_map (shstr_tmp archname, object *op)
1385{ 1486{
1386 object *tmp, *tmp1;
1387
1388 /* first search for itself and remove any old instances */ 1487 /* first search for itself and remove any old instances */
1389 1488
1390 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1489 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1391 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1490 if (tmp->arch->archname == archname) /* same archetype */
1392 tmp->destroy (); 1491 tmp->destroy ();
1393 1492
1394 tmp1 = arch_to_object (archetype::find (arch_string)); 1493 object *tmp = arch_to_object (archetype::find (archname));
1395 1494
1396 tmp1->x = op->x; 1495 tmp->x = op->x;
1397 tmp1->y = op->y; 1496 tmp->y = op->y;
1497
1398 insert_ob_in_map (tmp1, op->map, op, 0); 1498 insert_ob_in_map (tmp, op->map, op, 0);
1399} 1499}
1400 1500
1401object * 1501object *
1402object::insert_at (object *where, object *originator, int flags) 1502object::insert_at (object *where, object *originator, int flags)
1403{ 1503{
1504 if (where->env)
1505 return where->env->insert (this);
1506 else
1404 where->map->insert (this, where->x, where->y, originator, flags); 1507 return where->map->insert (this, where->x, where->y, originator, flags);
1405} 1508}
1406 1509
1407/* 1510/*
1408 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1409 * is returned contains nr objects, and the remaining parts contains
1410 * the rest (or is removed and freed if that number is 0).
1411 * On failure, NULL is returned, and the reason put into the
1412 * global static errmsg array.
1413 */
1414object *
1415get_split_ob (object *orig_ob, uint32 nr)
1416{
1417 object *newob;
1418 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1419
1420 if (orig_ob->nrof < nr)
1421 {
1422 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1423 return NULL;
1424 }
1425
1426 newob = object_create_clone (orig_ob);
1427
1428 if ((orig_ob->nrof -= nr) < 1)
1429 orig_ob->destroy (1);
1430 else if (!is_removed)
1431 {
1432 if (orig_ob->env != NULL)
1433 sub_weight (orig_ob->env, orig_ob->weight * nr);
1434 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1435 {
1436 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1437 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1438 return NULL;
1439 }
1440 }
1441
1442 newob->nrof = nr;
1443
1444 return newob;
1445}
1446
1447/*
1448 * decrease_ob_nr(object, number) decreases a specified number from 1511 * decrease(object, number) decreases a specified number from
1449 * the amount of an object. If the amount reaches 0, the object 1512 * the amount of an object. If the amount reaches 0, the object
1450 * is subsequently removed and freed. 1513 * is subsequently removed and freed.
1451 * 1514 *
1452 * Return value: 'op' if something is left, NULL if the amount reached 0 1515 * Return value: 'op' if something is left, NULL if the amount reached 0
1453 */ 1516 */
1517bool
1518object::decrease (sint32 nr)
1519{
1520 if (!nr)
1521 return true;
1454 1522
1523 nr = min (nr, nrof);
1524
1525 if (nrof > nr)
1526 {
1527 nrof -= nr;
1528 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1529
1530 if (object *pl = visible_to ())
1531 esrv_update_item (UPD_NROF, pl, this);
1532
1533 return true;
1534 }
1535 else
1536 {
1537 destroy ();
1538 return false;
1539 }
1540}
1541
1542/*
1543 * split(ob,nr) splits up ob into two parts. The part which
1544 * is returned contains nr objects, and the remaining parts contains
1545 * the rest (or is removed and returned if that number is 0).
1546 * On failure, NULL is returned.
1547 */
1455object * 1548object *
1456decrease_ob_nr (object *op, uint32 i) 1549object::split (sint32 nr)
1457{ 1550{
1458 object *tmp; 1551 int have = number_of ();
1459 1552
1460 if (i == 0) /* objects with op->nrof require this check */ 1553 if (have < nr)
1461 return op; 1554 return 0;
1462 1555 else if (have == nr)
1463 if (i > op->nrof)
1464 i = op->nrof;
1465
1466 if (QUERY_FLAG (op, FLAG_REMOVED))
1467 op->nrof -= i;
1468 else if (op->env)
1469 { 1556 {
1470 /* is this object in the players inventory, or sub container
1471 * therein?
1472 */
1473 tmp = op->in_player ();
1474 /* nope. Is this a container the player has opened?
1475 * If so, set tmp to that player.
1476 * IMO, searching through all the players will mostly
1477 * likely be quicker than following op->env to the map,
1478 * and then searching the map for a player.
1479 */
1480 if (!tmp)
1481 for_all_players (pl)
1482 if (pl->ob->container == op->env)
1483 {
1484 tmp = pl->ob;
1485 break;
1486 }
1487
1488 if (i < op->nrof)
1489 {
1490 sub_weight (op->env, op->weight * i);
1491 op->nrof -= i;
1492 if (tmp)
1493 esrv_send_item (tmp, op);
1494 }
1495 else
1496 {
1497 op->remove (); 1557 remove ();
1498 op->nrof = 0; 1558 return this;
1499 if (tmp)
1500 esrv_del_item (tmp->contr, op->count);
1501 }
1502 } 1559 }
1503 else 1560 else
1504 { 1561 {
1505 object *above = op->above; 1562 decrease (nr);
1506 1563
1507 if (i < op->nrof) 1564 object *op = deep_clone ();
1508 op->nrof -= i; 1565 op->nrof = nr;
1509 else
1510 {
1511 op->remove ();
1512 op->nrof = 0;
1513 }
1514
1515 /* Since we just removed op, op->above is null */
1516 for (tmp = above; tmp; tmp = tmp->above)
1517 if (tmp->type == PLAYER)
1518 {
1519 if (op->nrof)
1520 esrv_send_item (tmp, op);
1521 else
1522 esrv_del_item (tmp->contr, op->count);
1523 }
1524 }
1525
1526 if (op->nrof)
1527 return op; 1566 return op;
1528 else
1529 {
1530 op->destroy ();
1531 return 0;
1532 }
1533}
1534
1535/*
1536 * add_weight(object, weight) adds the specified weight to an object,
1537 * and also updates how much the environment(s) is/are carrying.
1538 */
1539
1540void
1541add_weight (object *op, signed long weight)
1542{
1543 while (op != NULL)
1544 {
1545 if (op->type == CONTAINER)
1546 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1547
1548 op->carrying += weight;
1549 op = op->env;
1550 } 1567 }
1551} 1568}
1552 1569
1553object * 1570object *
1554insert_ob_in_ob (object *op, object *where) 1571insert_ob_in_ob (object *op, object *where)
1559 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1576 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1560 free (dump); 1577 free (dump);
1561 return op; 1578 return op;
1562 } 1579 }
1563 1580
1564 if (where->head) 1581 if (where->head_ () != where)
1565 { 1582 {
1566 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1583 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1567 where = where->head; 1584 where = where->head;
1568 } 1585 }
1569 1586
1570 return where->insert (op); 1587 return where->insert (op);
1571} 1588}
1576 * inside the object environment. 1593 * inside the object environment.
1577 * 1594 *
1578 * The function returns now pointer to inserted item, and return value can 1595 * The function returns now pointer to inserted item, and return value can
1579 * be != op, if items are merged. -Tero 1596 * be != op, if items are merged. -Tero
1580 */ 1597 */
1581
1582object * 1598object *
1583object::insert (object *op) 1599object::insert (object *op)
1584{ 1600{
1585 object *tmp, *otmp;
1586
1587 if (!QUERY_FLAG (op, FLAG_REMOVED))
1588 op->remove ();
1589
1590 if (op->more) 1601 if (op->more)
1591 { 1602 {
1592 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1603 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1593 return op; 1604 return op;
1594 } 1605 }
1595 1606
1596 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1607 op->remove ();
1597 CLEAR_FLAG (op, FLAG_REMOVED); 1608
1609 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1610
1598 if (op->nrof) 1611 if (op->nrof)
1599 {
1600 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1612 for (object *tmp = inv; tmp; tmp = tmp->below)
1601 if (object::can_merge (tmp, op)) 1613 if (object::can_merge (tmp, op))
1602 { 1614 {
1603 /* return the original object and remove inserted object 1615 /* return the original object and remove inserted object
1604 (client needs the original object) */ 1616 (client needs the original object) */
1605 tmp->nrof += op->nrof; 1617 tmp->nrof += op->nrof;
1606 /* Weight handling gets pretty funky. Since we are adding to 1618
1607 * tmp->nrof, we need to increase the weight. 1619 if (object *pl = tmp->visible_to ())
1608 */ 1620 esrv_update_item (UPD_NROF, pl, tmp);
1621
1609 add_weight (this, op->weight * op->nrof); 1622 adjust_weight (this, op->total_weight ());
1610 SET_FLAG (op, FLAG_REMOVED); 1623
1611 op->destroy (); /* free the inserted object */ 1624 op->destroy ();
1612 op = tmp; 1625 op = tmp;
1613 op->remove (); /* and fix old object's links */ 1626 goto inserted;
1614 CLEAR_FLAG (op, FLAG_REMOVED);
1615 break;
1616 } 1627 }
1617 1628
1618 /* I assume combined objects have no inventory 1629 op->owner = 0; // it's his/hers now. period.
1619 * We add the weight - this object could have just been removed
1620 * (if it was possible to merge). calling remove_ob will subtract
1621 * the weight, so we need to add it in again, since we actually do
1622 * the linking below
1623 */
1624 add_weight (this, op->weight * op->nrof);
1625 }
1626 else
1627 add_weight (this, (op->weight + op->carrying));
1628
1629 otmp = this->in_player ();
1630 if (otmp && otmp->contr)
1631 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1632 otmp->update_stats ();
1633
1634 op->map = 0; 1630 op->map = 0;
1635 op->env = this; 1631 op->x = 0;
1632 op->y = 0;
1633
1636 op->above = 0; 1634 op->above = 0;
1637 op->below = 0; 1635 op->below = inv;
1638 op->x = 0, op->y = 0; 1636 op->env = this;
1639 1637
1638 if (inv)
1639 inv->above = op;
1640
1641 inv = op;
1642
1643 op->flag [FLAG_REMOVED] = 0;
1644
1645 if (object *pl = op->visible_to ())
1646 esrv_send_item (pl, op);
1647
1648 adjust_weight (this, op->total_weight ());
1649
1650inserted:
1640 /* reset the light list and los of the players on the map */ 1651 /* reset the light list and los of the players on the map */
1641 if ((op->glow_radius != 0) && map) 1652 if (op->glow_radius && is_on_map ())
1642 { 1653 {
1643#ifdef DEBUG_LIGHTS 1654 update_stats ();
1644 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1645#endif /* DEBUG_LIGHTS */
1646 if (map->darkness)
1647 update_all_los (map, x, y); 1655 update_all_los (map, x, y);
1648 }
1649
1650 /* Client has no idea of ordering so lets not bother ordering it here.
1651 * It sure simplifies this function...
1652 */
1653 if (!inv)
1654 inv = op;
1655 else
1656 { 1656 }
1657 op->below = inv; 1657 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1658 op->below->above = op; 1658 // if this is a player's inventory, update stats
1659 inv = op; 1659 update_stats ();
1660 }
1661 1660
1662 INVOKE_OBJECT (INSERT, this); 1661 INVOKE_OBJECT (INSERT, this);
1663 1662
1664 return op; 1663 return op;
1665} 1664}
1685 * on top. 1684 * on top.
1686 */ 1685 */
1687int 1686int
1688check_move_on (object *op, object *originator) 1687check_move_on (object *op, object *originator)
1689{ 1688{
1689 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1690 return 0;
1691
1690 object *tmp; 1692 object *tmp;
1691 maptile *m = op->map; 1693 maptile *m = op->map;
1692 int x = op->x, y = op->y; 1694 int x = op->x, y = op->y;
1693 1695
1694 MoveType move_on, move_slow, move_block; 1696 mapspace &ms = m->at (x, y);
1695 1697
1696 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1698 ms.update ();
1697 return 0;
1698 1699
1699 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1700 MoveType move_on = ms.move_on;
1700 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1701 MoveType move_slow = ms.move_slow;
1701 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1702 MoveType move_block = ms.move_block;
1702 1703
1703 /* if nothing on this space will slow op down or be applied, 1704 /* if nothing on this space will slow op down or be applied,
1704 * no need to do checking below. have to make sure move_type 1705 * no need to do checking below. have to make sure move_type
1705 * is set, as lots of objects don't have it set - we treat that 1706 * is set, as lots of objects don't have it set - we treat that
1706 * as walking. 1707 * as walking.
1717 return 0; 1718 return 0;
1718 1719
1719 /* The objects have to be checked from top to bottom. 1720 /* The objects have to be checked from top to bottom.
1720 * Hence, we first go to the top: 1721 * Hence, we first go to the top:
1721 */ 1722 */
1722 1723 for (object *next, *tmp = ms.top; tmp; tmp = next)
1723 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1724 {
1725 /* Trim the search when we find the first other spell effect
1726 * this helps performance so that if a space has 50 spell objects,
1727 * we don't need to check all of them.
1728 */
1729 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1730 break;
1731 } 1724 {
1725 next = tmp->below;
1732 1726
1733 for (; tmp; tmp = tmp->below)
1734 {
1735 if (tmp == op) 1727 if (tmp == op)
1736 continue; /* Can't apply yourself */ 1728 continue; /* Can't apply yourself */
1737 1729
1738 /* Check to see if one of the movement types should be slowed down. 1730 /* Check to see if one of the movement types should be slowed down.
1739 * Second check makes sure that the movement types not being slowed 1731 * Second check makes sure that the movement types not being slowed
1744 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1736 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1745 { 1737 {
1746 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1738 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1747 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1739 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1748 { 1740 {
1749
1750 float
1751 diff = tmp->move_slow_penalty * FABS (op->speed); 1741 float diff = tmp->move_slow_penalty * fabs (op->speed);
1752 1742
1753 if (op->type == PLAYER) 1743 if (op->is_player ())
1754 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1744 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1755 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1745 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1756 diff /= 4.0; 1746 diff /= 4.0;
1757 1747
1758 op->speed_left -= diff; 1748 op->speed_left -= diff;
1759 } 1749 }
1760 } 1750 }
1793 LOG (llevError, "Present_arch called outside map.\n"); 1783 LOG (llevError, "Present_arch called outside map.\n");
1794 return NULL; 1784 return NULL;
1795 } 1785 }
1796 1786
1797 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1787 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1798 if (tmp->arch == at) 1788 if (tmp->arch->archname == at->archname)
1799 return tmp; 1789 return tmp;
1800 1790
1801 return NULL; 1791 return NULL;
1802} 1792}
1803 1793
1867 * The first matching object is returned, or NULL if none. 1857 * The first matching object is returned, or NULL if none.
1868 */ 1858 */
1869object * 1859object *
1870present_arch_in_ob (const archetype *at, const object *op) 1860present_arch_in_ob (const archetype *at, const object *op)
1871{ 1861{
1872 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1862 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1873 if (tmp->arch == at) 1863 if (tmp->arch->archname == at->archname)
1874 return tmp; 1864 return tmp;
1875 1865
1876 return NULL; 1866 return NULL;
1877} 1867}
1878 1868
1880 * activate recursively a flag on an object inventory 1870 * activate recursively a flag on an object inventory
1881 */ 1871 */
1882void 1872void
1883flag_inv (object *op, int flag) 1873flag_inv (object *op, int flag)
1884{ 1874{
1885 if (op->inv)
1886 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1875 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1887 { 1876 {
1888 SET_FLAG (tmp, flag); 1877 SET_FLAG (tmp, flag);
1889 flag_inv (tmp, flag); 1878 flag_inv (tmp, flag);
1890 } 1879 }
1891} 1880}
1892 1881
1893/* 1882/*
1894 * deactivate recursively a flag on an object inventory 1883 * deactivate recursively a flag on an object inventory
1895 */ 1884 */
1896void 1885void
1897unflag_inv (object *op, int flag) 1886unflag_inv (object *op, int flag)
1898{ 1887{
1899 if (op->inv)
1900 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1888 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1901 { 1889 {
1902 CLEAR_FLAG (tmp, flag); 1890 CLEAR_FLAG (tmp, flag);
1903 unflag_inv (tmp, flag); 1891 unflag_inv (tmp, flag);
1904 } 1892 }
1905}
1906
1907/*
1908 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1909 * all it's inventory (recursively).
1910 * If checksums are used, a player will get set_cheat called for
1911 * him/her-self and all object carried by a call to this function.
1912 */
1913void
1914set_cheat (object *op)
1915{
1916 SET_FLAG (op, FLAG_WAS_WIZ);
1917 flag_inv (op, FLAG_WAS_WIZ);
1918} 1893}
1919 1894
1920/* 1895/*
1921 * find_free_spot(object, map, x, y, start, stop) will search for 1896 * find_free_spot(object, map, x, y, start, stop) will search for
1922 * a spot at the given map and coordinates which will be able to contain 1897 * a spot at the given map and coordinates which will be able to contain
1924 * to search (see the freearr_x/y[] definition). 1899 * to search (see the freearr_x/y[] definition).
1925 * It returns a random choice among the alternatives found. 1900 * It returns a random choice among the alternatives found.
1926 * start and stop are where to start relative to the free_arr array (1,9 1901 * start and stop are where to start relative to the free_arr array (1,9
1927 * does all 4 immediate directions). This returns the index into the 1902 * does all 4 immediate directions). This returns the index into the
1928 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1903 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1929 * Note - this only checks to see if there is space for the head of the
1930 * object - if it is a multispace object, this should be called for all
1931 * pieces.
1932 * Note2: This function does correctly handle tiled maps, but does not 1904 * Note: This function does correctly handle tiled maps, but does not
1933 * inform the caller. However, insert_ob_in_map will update as 1905 * inform the caller. However, insert_ob_in_map will update as
1934 * necessary, so the caller shouldn't need to do any special work. 1906 * necessary, so the caller shouldn't need to do any special work.
1935 * Note - updated to take an object instead of archetype - this is necessary 1907 * Note - updated to take an object instead of archetype - this is necessary
1936 * because arch_blocked (now ob_blocked) needs to know the movement type 1908 * because arch_blocked (now ob_blocked) needs to know the movement type
1937 * to know if the space in question will block the object. We can't use 1909 * to know if the space in question will block the object. We can't use
1939 * customized, changed states, etc. 1911 * customized, changed states, etc.
1940 */ 1912 */
1941int 1913int
1942find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1914find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1943{ 1915{
1916 int altern[SIZEOFFREE];
1944 int index = 0, flag; 1917 int index = 0, flag;
1945 int altern[SIZEOFFREE];
1946 1918
1947 for (int i = start; i < stop; i++) 1919 for (int i = start; i < stop; i++)
1948 { 1920 {
1949 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1921 mapxy pos (m, x, y); pos.move (i);
1950 if (!flag) 1922
1923 if (!pos.normalise ())
1924 continue;
1925
1926 mapspace &ms = *pos;
1927
1928 if (ms.flags () & P_IS_ALIVE)
1929 continue;
1930
1931 /* However, often
1932 * ob doesn't have any move type (when used to place exits)
1933 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1934 */
1935 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1936 {
1951 altern [index++] = i; 1937 altern [index++] = i;
1938 continue;
1939 }
1952 1940
1953 /* Basically, if we find a wall on a space, we cut down the search size. 1941 /* Basically, if we find a wall on a space, we cut down the search size.
1954 * In this way, we won't return spaces that are on another side of a wall. 1942 * In this way, we won't return spaces that are on another side of a wall.
1955 * This mostly work, but it cuts down the search size in all directions - 1943 * This mostly work, but it cuts down the search size in all directions -
1956 * if the space being examined only has a wall to the north and empty 1944 * if the space being examined only has a wall to the north and empty
1957 * spaces in all the other directions, this will reduce the search space 1945 * spaces in all the other directions, this will reduce the search space
1958 * to only the spaces immediately surrounding the target area, and 1946 * to only the spaces immediately surrounding the target area, and
1959 * won't look 2 spaces south of the target space. 1947 * won't look 2 spaces south of the target space.
1960 */ 1948 */
1961 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 1949 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1950 {
1962 stop = maxfree[i]; 1951 stop = maxfree[i];
1952 continue;
1953 }
1954
1955 /* Note it is intentional that we check ob - the movement type of the
1956 * head of the object should correspond for the entire object.
1957 */
1958 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1959 continue;
1960
1961 if (ob->blocked (pos.m, pos.x, pos.y))
1962 continue;
1963
1964 altern [index++] = i;
1963 } 1965 }
1964 1966
1965 if (!index) 1967 if (!index)
1966 return -1; 1968 return -1;
1967 1969
1968 return altern[RANDOM () % index]; 1970 return altern [rndm (index)];
1969} 1971}
1970 1972
1971/* 1973/*
1972 * find_first_free_spot(archetype, maptile, x, y) works like 1974 * find_first_free_spot(archetype, maptile, x, y) works like
1973 * find_free_spot(), but it will search max number of squares. 1975 * find_free_spot(), but it will search max number of squares.
1976 */ 1978 */
1977int 1979int
1978find_first_free_spot (const object *ob, maptile *m, int x, int y) 1980find_first_free_spot (const object *ob, maptile *m, int x, int y)
1979{ 1981{
1980 for (int i = 0; i < SIZEOFFREE; i++) 1982 for (int i = 0; i < SIZEOFFREE; i++)
1981 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 1983 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
1982 return i; 1984 return i;
1983 1985
1984 return -1; 1986 return -1;
1985} 1987}
1986 1988
1994{ 1996{
1995 arr += begin; 1997 arr += begin;
1996 end -= begin; 1998 end -= begin;
1997 1999
1998 while (--end) 2000 while (--end)
1999 swap (arr [end], arr [RANDOM () % (end + 1)]); 2001 swap (arr [end], arr [rndm (end + 1)]);
2000} 2002}
2001 2003
2002/* new function to make monster searching more efficient, and effective! 2004/* new function to make monster searching more efficient, and effective!
2003 * This basically returns a randomized array (in the passed pointer) of 2005 * This basically returns a randomized array (in the passed pointer) of
2004 * the spaces to find monsters. In this way, it won't always look for 2006 * the spaces to find monsters. In this way, it won't always look for
2032 * there is capable of. 2034 * there is capable of.
2033 */ 2035 */
2034int 2036int
2035find_dir (maptile *m, int x, int y, object *exclude) 2037find_dir (maptile *m, int x, int y, object *exclude)
2036{ 2038{
2037 int i, max = SIZEOFFREE, mflags; 2039 int max = SIZEOFFREE, mflags;
2038
2039 sint16 nx, ny;
2040 object *tmp;
2041 maptile *mp;
2042
2043 MoveType blocked, move_type; 2040 MoveType move_type;
2044 2041
2045 if (exclude && exclude->head) 2042 if (exclude && exclude->head_ () != exclude)
2046 { 2043 {
2047 exclude = exclude->head; 2044 exclude = exclude->head;
2048 move_type = exclude->move_type; 2045 move_type = exclude->move_type;
2049 } 2046 }
2050 else 2047 else
2051 { 2048 {
2052 /* If we don't have anything, presume it can use all movement types. */ 2049 /* If we don't have anything, presume it can use all movement types. */
2053 move_type = MOVE_ALL; 2050 move_type = MOVE_ALL;
2054 } 2051 }
2055 2052
2056 for (i = 1; i < max; i++) 2053 for (int i = 1; i < max; i++)
2057 { 2054 {
2058 mp = m; 2055 mapxy pos (m, x, y);
2059 nx = x + freearr_x[i]; 2056 pos.move (i);
2060 ny = y + freearr_y[i];
2061 2057
2062 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2058 if (!pos.normalise ())
2063
2064 if (mflags & P_OUT_OF_MAP)
2065 max = maxfree[i]; 2059 max = maxfree[i];
2066 else 2060 else
2067 { 2061 {
2068 mapspace &ms = mp->at (nx, ny); 2062 mapspace &ms = *pos;
2069 2063
2070 blocked = ms.move_block;
2071
2072 if ((move_type & blocked) == move_type) 2064 if ((move_type & ms.move_block) == move_type)
2073 max = maxfree[i]; 2065 max = maxfree [i];
2074 else if (mflags & P_IS_ALIVE) 2066 else if (ms.flags () & P_IS_ALIVE)
2075 { 2067 {
2076 for (tmp = ms.bot; tmp; tmp = tmp->above) 2068 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2077 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2069 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2078 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2070 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2079 break;
2080
2081 if (tmp)
2082 return freedir[i]; 2071 return freedir [i];
2083 } 2072 }
2084 } 2073 }
2085 } 2074 }
2086 2075
2087 return 0; 2076 return 0;
2162 * This basically means that if direction is 15, then it could either go 2151 * This basically means that if direction is 15, then it could either go
2163 * direction 4, 14, or 16 to get back to where we are. 2152 * direction 4, 14, or 16 to get back to where we are.
2164 * Moved from spell_util.c to object.c with the other related direction 2153 * Moved from spell_util.c to object.c with the other related direction
2165 * functions. 2154 * functions.
2166 */ 2155 */
2167int reduction_dir[SIZEOFFREE][3] = { 2156static const int reduction_dir[SIZEOFFREE][3] = {
2168 {0, 0, 0}, /* 0 */ 2157 {0, 0, 0}, /* 0 */
2169 {0, 0, 0}, /* 1 */ 2158 {0, 0, 0}, /* 1 */
2170 {0, 0, 0}, /* 2 */ 2159 {0, 0, 0}, /* 2 */
2171 {0, 0, 0}, /* 3 */ 2160 {0, 0, 0}, /* 3 */
2172 {0, 0, 0}, /* 4 */ 2161 {0, 0, 0}, /* 4 */
2263 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2252 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2264 * core dumps if they do. 2253 * core dumps if they do.
2265 * 2254 *
2266 * Add a check so we can't pick up invisible objects (0.93.8) 2255 * Add a check so we can't pick up invisible objects (0.93.8)
2267 */ 2256 */
2268
2269int 2257int
2270can_pick (const object *who, const object *item) 2258can_pick (const object *who, const object *item)
2271{ 2259{
2272 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2260 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2273 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2261 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2274 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2262 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2275} 2263}
2276 2264
2277/* 2265/*
2278 * create clone from object to another 2266 * create clone from object to another
2279 */ 2267 */
2280object * 2268object *
2281object_create_clone (object *asrc) 2269object::deep_clone ()
2282{ 2270{
2283 object *dst = 0, *tmp, *src, *part, *prev, *item; 2271 assert (("deep_clone called on non-head object", is_head ()));
2284 2272
2285 if (!asrc) 2273 object *dst = clone ();
2286 return 0;
2287 2274
2288 src = asrc; 2275 object *prev = dst;
2289 if (src->head)
2290 src = src->head;
2291
2292 prev = 0;
2293 for (part = src; part; part = part->more) 2276 for (object *part = this->more; part; part = part->more)
2294 { 2277 {
2295 tmp = part->clone (); 2278 object *tmp = part->clone ();
2296 tmp->x -= src->x;
2297 tmp->y -= src->y;
2298
2299 if (!part->head)
2300 {
2301 dst = tmp;
2302 tmp->head = 0;
2303 }
2304 else
2305 tmp->head = dst; 2279 tmp->head = dst;
2306
2307 tmp->more = 0;
2308
2309 if (prev)
2310 prev->more = tmp; 2280 prev->more = tmp;
2311
2312 prev = tmp; 2281 prev = tmp;
2313 } 2282 }
2314 2283
2315 for (item = src->inv; item; item = item->below) 2284 for (object *item = inv; item; item = item->below)
2316 insert_ob_in_ob (object_create_clone (item), dst); 2285 insert_ob_in_ob (item->deep_clone (), dst);
2317 2286
2318 return dst; 2287 return dst;
2319}
2320
2321/* GROS - Creates an object using a string representing its content. */
2322/* Basically, we save the content of the string to a temp file, then call */
2323/* load_object on it. I admit it is a highly inefficient way to make things, */
2324/* but it was simple to make and allows reusing the load_object function. */
2325/* Remember not to use load_object_str in a time-critical situation. */
2326/* Also remember that multiparts objects are not supported for now. */
2327object *
2328load_object_str (const char *obstr)
2329{
2330 object *op;
2331 char filename[MAX_BUF];
2332
2333 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2334
2335 FILE *tempfile = fopen (filename, "w");
2336
2337 if (tempfile == NULL)
2338 {
2339 LOG (llevError, "Error - Unable to access load object temp file\n");
2340 return NULL;
2341 }
2342
2343 fprintf (tempfile, obstr);
2344 fclose (tempfile);
2345
2346 op = object::create ();
2347
2348 object_thawer thawer (filename);
2349
2350 if (thawer)
2351 load_object (thawer, op, 0);
2352
2353 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2354 CLEAR_FLAG (op, FLAG_REMOVED);
2355
2356 return op;
2357} 2288}
2358 2289
2359/* This returns the first object in who's inventory that 2290/* This returns the first object in who's inventory that
2360 * has the same type and subtype match. 2291 * has the same type and subtype match.
2361 * returns NULL if no match. 2292 * returns NULL if no match.
2368 return tmp; 2299 return tmp;
2369 2300
2370 return 0; 2301 return 0;
2371} 2302}
2372 2303
2373/* If ob has a field named key, return the link from the list, 2304shstr_tmp
2374 * otherwise return NULL. 2305object::kv_get (shstr_tmp key) const
2375 *
2376 * key must be a passed in shared string - otherwise, this won't
2377 * do the desired thing.
2378 */
2379key_value *
2380get_ob_key_link (const object *ob, const char *key)
2381{ 2306{
2382 for (key_value *link = ob->key_values; link; link = link->next) 2307 for (key_value *kv = key_values; kv; kv = kv->next)
2383 if (link->key == key) 2308 if (kv->key == key)
2384 return link;
2385
2386 return 0;
2387}
2388
2389/*
2390 * Returns the value of op has an extra_field for key, or NULL.
2391 *
2392 * The argument doesn't need to be a shared string.
2393 *
2394 * The returned string is shared.
2395 */
2396const char *
2397get_ob_key_value (const object *op, const char *const key)
2398{
2399 key_value *link;
2400 shstr_cmp canonical_key (key);
2401
2402 if (!canonical_key)
2403 {
2404 /* 1. There being a field named key on any object
2405 * implies there'd be a shared string to find.
2406 * 2. Since there isn't, no object has this field.
2407 * 3. Therefore, *this* object doesn't have this field.
2408 */
2409 return 0;
2410 }
2411
2412 /* This is copied from get_ob_key_link() above -
2413 * only 4 lines, and saves the function call overhead.
2414 */
2415 for (link = op->key_values; link; link = link->next)
2416 if (link->key == canonical_key)
2417 return link->value; 2309 return kv->value;
2418 2310
2419 return 0; 2311 return shstr ();
2420} 2312}
2421 2313
2422 2314void
2423/* 2315object::kv_set (shstr_tmp key, shstr_tmp value)
2424 * Updates the canonical_key in op to value.
2425 *
2426 * canonical_key is a shared string (value doesn't have to be).
2427 *
2428 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2429 * keys.
2430 *
2431 * Returns TRUE on success.
2432 */
2433int
2434set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2435{ 2316{
2436 key_value *field = NULL, *last = NULL; 2317 for (key_value *kv = key_values; kv; kv = kv->next)
2437 2318 if (kv->key == key)
2438 for (field = op->key_values; field != NULL; field = field->next)
2439 {
2440 if (field->key != canonical_key)
2441 { 2319 {
2442 last = field; 2320 kv->value = value;
2443 continue; 2321 return;
2444 } 2322 }
2445 2323
2446 if (value) 2324 key_value *kv = new key_value;
2447 field->value = value; 2325
2448 else 2326 kv->next = key_values;
2327 kv->key = key;
2328 kv->value = value;
2329
2330 key_values = kv;
2331}
2332
2333void
2334object::kv_del (shstr_tmp key)
2335{
2336 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2337 if ((*kvp)->key == key)
2449 { 2338 {
2450 /* Basically, if the archetype has this key set, 2339 key_value *kv = *kvp;
2451 * we need to store the null value so when we save 2340 *kvp = (*kvp)->next;
2452 * it, we save the empty value so that when we load, 2341 delete kv;
2453 * we get this value back again. 2342 return;
2454 */
2455 if (get_ob_key_link (&op->arch->clone, canonical_key))
2456 field->value = 0;
2457 else
2458 {
2459 if (last)
2460 last->next = field->next;
2461 else
2462 op->key_values = field->next;
2463
2464 delete field;
2465 }
2466 } 2343 }
2467 return TRUE;
2468 }
2469 /* IF we get here, key doesn't exist */
2470
2471 /* No field, we'll have to add it. */
2472
2473 if (!add_key)
2474 return FALSE;
2475
2476 /* There isn't any good reason to store a null
2477 * value in the key/value list. If the archetype has
2478 * this key, then we should also have it, so shouldn't
2479 * be here. If user wants to store empty strings,
2480 * should pass in ""
2481 */
2482 if (value == NULL)
2483 return TRUE;
2484
2485 field = new key_value;
2486
2487 field->key = canonical_key;
2488 field->value = value;
2489 /* Usual prepend-addition. */
2490 field->next = op->key_values;
2491 op->key_values = field;
2492
2493 return TRUE;
2494}
2495
2496/*
2497 * Updates the key in op to value.
2498 *
2499 * If add_key is FALSE, this will only update existing keys,
2500 * and not add new ones.
2501 * In general, should be little reason FALSE is ever passed in for add_key
2502 *
2503 * Returns TRUE on success.
2504 */
2505int
2506set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2507{
2508 shstr key_ (key);
2509
2510 return set_ob_key_value_s (op, key_, value, add_key);
2511} 2344}
2512 2345
2513object::depth_iterator::depth_iterator (object *container) 2346object::depth_iterator::depth_iterator (object *container)
2514: iterator_base (container) 2347: iterator_base (container)
2515{ 2348{
2528 item = item->inv; 2361 item = item->inv;
2529 } 2362 }
2530 else 2363 else
2531 item = item->env; 2364 item = item->env;
2532} 2365}
2533
2534 2366
2535const char * 2367const char *
2536object::flag_desc (char *desc, int len) const 2368object::flag_desc (char *desc, int len) const
2537{ 2369{
2538 char *p = desc; 2370 char *p = desc;
2566{ 2398{
2567 char flagdesc[512]; 2399 char flagdesc[512];
2568 char info2[256 * 4]; 2400 char info2[256 * 4];
2569 char *p = info; 2401 char *p = info;
2570 2402
2571 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2403 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2572 count, uuid.seq, 2404 count,
2405 uuid.c_str (),
2573 &name, 2406 &name,
2574 title ? "\",title:\"" : "", 2407 title ? ",title:\"" : "",
2575 title ? (const char *)title : "", 2408 title ? (const char *)title : "",
2409 title ? "\"" : "",
2576 flag_desc (flagdesc, 512), type); 2410 flag_desc (flagdesc, 512), type);
2577 2411
2578 if (env) 2412 if (!flag[FLAG_REMOVED] && env)
2579 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2413 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2580 2414
2581 if (map) 2415 if (map)
2582 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2416 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2583 2417
2585} 2419}
2586 2420
2587const char * 2421const char *
2588object::debug_desc () const 2422object::debug_desc () const
2589{ 2423{
2590 static char info[256 * 4]; 2424 static char info[3][256 * 4];
2425 static int info_idx;
2426
2591 return debug_desc (info); 2427 return debug_desc (info [++info_idx % 3]);
2592} 2428}
2593 2429
2594const char * 2430struct region *
2595object::debug_desc2 () const 2431object::region () const
2596{ 2432{
2597 static char info[256 * 4]; 2433 return map ? map->region (x, y)
2598 return debug_desc (info); 2434 : region::default_region ();
2599} 2435}
2600 2436
2437const materialtype_t *
2438object::dominant_material () const
2439{
2440 if (materialtype_t *mt = name_to_material (materialname))
2441 return mt;
2442
2443 return name_to_material (shstr_unknown);
2444}
2445
2446void
2447object::open_container (object *new_container)
2448{
2449 if (container == new_container)
2450 return;
2451
2452 object *old_container = container;
2453
2454 if (old_container)
2455 {
2456 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2457 return;
2458
2459#if 0
2460 // remove the "Close old_container" object.
2461 if (object *closer = old_container->inv)
2462 if (closer->type == CLOSE_CON)
2463 closer->destroy ();
2464#endif
2465
2466 // make sure the container is available
2467 esrv_send_item (this, old_container);
2468
2469 old_container->flag [FLAG_APPLIED] = false;
2470 container = 0;
2471
2472 // client needs item update to make it work, client bug requires this to be separate
2473 esrv_update_item (UPD_FLAGS, this, old_container);
2474
2475 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2476 play_sound (sound_find ("chest_close"));
2477 }
2478
2479 if (new_container)
2480 {
2481 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2482 return;
2483
2484 // TODO: this does not seem to serve any purpose anymore?
2485#if 0
2486 // insert the "Close Container" object.
2487 if (archetype *closer = new_container->other_arch)
2488 {
2489 object *closer = arch_to_object (new_container->other_arch);
2490 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2491 new_container->insert (closer);
2492 }
2493#endif
2494
2495 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2496
2497 // make sure the container is available, client bug requires this to be separate
2498 esrv_send_item (this, new_container);
2499
2500 new_container->flag [FLAG_APPLIED] = true;
2501 container = new_container;
2502
2503 // client needs flag change
2504 esrv_update_item (UPD_FLAGS, this, new_container);
2505 esrv_send_inventory (this, new_container);
2506 play_sound (sound_find ("chest_open"));
2507 }
2508// else if (!old_container->env && contr && contr->ns)
2509// contr->ns->floorbox_reset ();
2510}
2511
2512object *
2513object::force_find (shstr_tmp name)
2514{
2515 /* cycle through his inventory to look for the MARK we want to
2516 * place
2517 */
2518 for (object *tmp = inv; tmp; tmp = tmp->below)
2519 if (tmp->type == FORCE && tmp->slaying == name)
2520 return splay (tmp);
2521
2522 return 0;
2523}
2524
2525//-GPL
2526
2527void
2528object::force_set_timer (int duration)
2529{
2530 this->duration = 1;
2531 this->speed_left = -1.f;
2532
2533 this->set_speed (duration ? 1.f / duration : 0.f);
2534}
2535
2536object *
2537object::force_add (shstr_tmp name, int duration)
2538{
2539 if (object *force = force_find (name))
2540 force->destroy ();
2541
2542 object *force = get_archetype (FORCE_NAME);
2543
2544 force->slaying = name;
2545 force->force_set_timer (duration);
2546 force->flag [FLAG_APPLIED] = true;
2547
2548 return insert (force);
2549}
2550
2551void
2552object::play_sound (faceidx sound) const
2553{
2554 if (!sound)
2555 return;
2556
2557 if (is_on_map ())
2558 map->play_sound (sound, x, y);
2559 else if (object *pl = in_player ())
2560 pl->contr->play_sound (sound);
2561}
2562
2563void
2564object::say_msg (const char *msg) const
2565{
2566 if (is_on_map ())
2567 map->say_msg (msg, x, y);
2568 else if (object *pl = in_player ())
2569 pl->contr->play_sound (sound);
2570}
2571
2572void
2573object::make_noise ()
2574{
2575 // we do not model noise in the map, so instead put
2576 // a temporary light into the noise source
2577 // could use the map instead, but that's less reliable for our
2578 // goal, which is to make invisibility a bit harder to exploit
2579
2580 // currently only works sensibly for players
2581 if (!is_player ())
2582 return;
2583
2584 // find old force, or create new one
2585 object *force = force_find (shstr_noise_force);
2586
2587 if (force)
2588 force->speed_left = -1.f; // patch old speed up
2589 else
2590 {
2591 force = archetype::get (shstr_noise_force);
2592
2593 force->slaying = shstr_noise_force;
2594 force->stats.food = 1;
2595 force->speed_left = -1.f;
2596
2597 force->set_speed (1.f / 4.f);
2598 force->flag [FLAG_IS_USED_UP] = true;
2599 force->flag [FLAG_APPLIED] = true;
2600
2601 insert (force);
2602 }
2603}
2604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines