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.33 by root, Tue Sep 12 00:53:56 2006 UTC vs.
Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 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-devel@real-time.com 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>
35 31
36int nrofallocobjects = 0; 32#include <bitset>
37 33
38object *objects; /* Pointer to the list of used objects */ 34UUID UUID::cur;
39object *active_objects; /* List of active objects that need to be processed */ 35static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000;
40 38
41short 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, 39objectvec objects;
40activevec actives;
41
42//+GPL
43
44short freearr_x[SIZEOFFREE] = {
45 0,
46 0, 1, 1, 1, 0, -1, -1, -1,
47 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 48 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43}; 49};
44short 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, 50short freearr_y[SIZEOFFREE] = {
51 0,
52 -1, -1, 0, 1, 1, 1, 0, -1,
53 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
45 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 54 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
46};
47int 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,
48 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
49}; 55};
50int freedir[SIZEOFFREE] = { 56int freedir[SIZEOFFREE] = {
51 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, 57 0,
58 1, 2, 3, 4, 5, 6, 7, 8,
59 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 60 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53}; 61};
54 62
63static int maxfree[SIZEOFFREE] = {
64 0,
65 9, 10, 13, 14, 17, 18, 21, 22,
66 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
67 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
68};
69
70static void
71write_uuid (uval64 skip, bool sync)
72{
73 CALL_BEGIN (2);
74 CALL_ARG_SV (newSVval64 (skip));
75 CALL_ARG_SV (boolSV (sync));
76 CALL_CALL ("cf::write_uuid", G_DISCARD);
77 CALL_END;
78}
79
80static void
81read_uuid ()
82{
83 char filename[MAX_BUF];
84
85 sprintf (filename, "%s/uuid", settings.localdir);
86
87 seq_next_save = 0;
88
89 FILE *fp;
90
91 if (!(fp = fopen (filename, "r")))
92 {
93 if (errno == ENOENT)
94 {
95 LOG (llevInfo, "RESET uid to 1\n");
96 UUID::cur.seq = 0;
97 write_uuid (UUID_GAP, true);
98 return;
99 }
100
101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
102 _exit (1);
103 }
104
105 char buf [UUID::MAX_LEN];
106 buf[0] = 0;
107 fgets (buf, sizeof (buf), fp);
108
109 if (!UUID::cur.parse (buf))
110 {
111 LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
112 _exit (1);
113 }
114
115 LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
116
117 write_uuid (UUID_GAP, true);
118 fclose (fp);
119}
120
121UUID
122UUID::gen ()
123{
124 UUID uid;
125
126 uid.seq = ++cur.seq;
127
128 if (expect_false (cur.seq >= seq_next_save))
129 {
130 seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131 write_uuid (UUID_GAP, false);
132 }
133
134
135 return uid;
136}
137
138void
139UUID::init ()
140{
141 read_uuid ();
142}
143
144bool
145UUID::parse (const char *s)
146{
147 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
148 return false;
149
150 seq = 0;
151
152 while (*s != '>')
153 {
154 if (*s < '0')
155 return false;
156
157 // this gives nice branchless code with gcc
158 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
159 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
160
161 seq = (seq << 4) | digit;
162
163 ++s;
164 }
165
166 return true;
167}
168
169char *
170UUID::append (char *buf) const
171{
172 *buf++ = '<';
173 *buf++ = '1';
174 *buf++ = '.';
175
176 uint64_t seq = this->seq;
177 const int bits = 64;
178 char nz = 0;
179 static const char tohex [] = "0123456789abcdef";
180
181 // assert (len >= 3 + bits / 4 + 1 + 1);
182 for (int i = bits / 4; --i; )
183 {
184 uint8_t digit = seq >> (bits - 4);
185
186 *buf = tohex [digit];
187 nz |= digit;
188 buf += nz ? 1 : 0;
189 seq <<= 4;
190 }
191
192 // last digit is special - always emit
193 uint8_t digit = seq >> (bits - 4);
194 *buf++ = tohex [digit];
195
196 *buf++ = '>';
197
198 return buf;
199}
200
201char *
202UUID::c_str () const
203{
204 static char buf [MAX_LEN];
205 *append (buf) = 0;
206 return buf;
207}
208
55/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 209/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56static int 210static bool
57compare_ob_value_lists_one (const object *wants, const object *has) 211compare_ob_value_lists_one (const object *wants, const object *has)
58{ 212{
59 key_value *wants_field;
60
61 /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both 213 /* n-squared behaviour (see kv_get), but I'm hoping both
62 * objects with lists are rare, and lists stay short. If not, use a 214 * objects with lists are rare, and lists stay short. If not, use a
63 * different structure or at least keep the lists sorted... 215 * different structure or at least keep the lists sorted...
64 */ 216 */
65 217
66 /* For each field in wants, */ 218 /* For each field in wants, */
67 for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) 219 for (key_value *kv = wants->key_values; kv; kv = kv->next)
68 { 220 if (has->kv_get (kv->key) != kv->value)
69 key_value *has_field; 221 return false;
70
71 /* Look for a field in has with the same key. */
72 has_field = get_ob_key_link (has, wants_field->key);
73
74 if (has_field == NULL)
75 {
76 /* No field with that name. */
77 return FALSE;
78 }
79
80 /* Found the matching field. */
81 if (has_field->value != wants_field->value)
82 {
83 /* Values don't match, so this half of the comparison is false. */
84 return FALSE;
85 }
86
87 /* If we get here, we found a match. Now for the next field in wants. */
88 }
89 222
90 /* If we get here, every field in wants has a matching field in has. */ 223 /* If we get here, every field in wants has a matching field in has. */
91 return TRUE; 224 return true;
92} 225}
93 226
94/* Returns TRUE if ob1 has the same key_values as ob2. */ 227/* Returns TRUE if ob1 has the same key_values as ob2. */
95static int 228static bool
96compare_ob_value_lists (const object *ob1, const object *ob2) 229compare_ob_value_lists (const object *ob1, const object *ob2)
97{ 230{
98 /* However, there may be fields in has which aren't partnered in wants, 231 /* However, there may be fields in has which aren't partnered in wants,
99 * so we need to run the comparison *twice*. :( 232 * so we need to run the comparison *twice*. :(
100 */ 233 */
101 return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); 234 return compare_ob_value_lists_one (ob1, ob2)
235 && compare_ob_value_lists_one (ob2, ob1);
102} 236}
103 237
104/* Function examines the 2 objects given to it, and returns true if 238/* Function examines the 2 objects given to it, and returns true if
105 * they can be merged together. 239 * they can be merged together.
106 * 240 *
107 * Note that this function appears a lot longer than the macro it 241 * Note that this function appears a lot longer than the macro it
108 * replaces - this is mostly for clarity - a decent compiler should hopefully 242 * replaces - this is mostly for clarity - a decent compiler should hopefully
109 * reduce this to the same efficiency. 243 * reduce this to the same efficiency.
110 * 244 *
111 * Check nrof variable *before* calling CAN_MERGE() 245 * Check nrof variable *before* calling can_merge()
112 * 246 *
113 * Improvements made with merge: Better checking on potion, and also 247 * Improvements made with merge: Better checking on potion, and also
114 * check weight 248 * check weight
115 */ 249 */
116
117bool object::can_merge (object *ob1, object *ob2) 250bool object::can_merge_slow (object *ob1, object *ob2)
118{ 251{
119 /* A couple quicksanity checks */ 252 /* A couple quick sanity checks */
120 if ((ob1 == ob2) || (ob1->type != ob2->type)) 253 if (ob1 == ob2
254 || ob1->type != ob2->type
255 || ob1->value != ob2->value
256 || ob1->name != ob2->name
257 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
121 return 0; 258 return 0;
122 259
123 if (ob1->speed != ob2->speed) 260 /* Do not merge objects if nrof would overflow, assume nrof
261 * is always 0 .. 2**31-1 */
262 if (ob1->nrof > 0x7fffffff - ob2->nrof)
124 return 0; 263 return 0;
125 264
126 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
127 * value could not be stored in a sint32 (which unfortunately sometimes is
128 * used to store nrof).
129 */
130 if (ob1->nrof + ob2->nrof >= 1UL << 31)
131 return 0;
132
133 /* If the objects have been identified, set the BEEN_APPLIED flag. 265 /* If the objects have been identified, set the BEEN_APPLIED flag.
134 * This is to the comparison of the flags below will be OK. We 266 * This is to the comparison of the flags below will be OK. We
135 * just can't ignore the been applied or identified flags, as they 267 * just can't ignore the been applied or identified flags, as they
136 * are not equal - just if it has been identified, the been_applied 268 * are not equal - just if it has been identified, the been_applied
137 * flags lose any meaning. 269 * flags lose any meaning.
138 */ 270 */
139 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) 271 if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
140 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 272 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141 273
142 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 274 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 275 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144 276
145 277 if (ob1->arch->archname != ob2->arch->archname
146 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
147 * being locked in inventory should prevent merging.
148 * 0x4 in flags3 is CLIENT_SENT
149 */
150 if ((ob1->arch != ob2->arch) ||
151 (ob1->flags[0] != ob2->flags[0]) ||
152 (ob1->flags[1] != ob2->flags[1]) ||
153 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155 (ob1->name != ob2->name) || 278 || ob1->name != ob2->name
156 (ob1->title != ob2->title) || 279 || ob1->title != ob2->title
157 (ob1->msg != ob2->msg) || 280 || ob1->msg != ob2->msg
158 (ob1->weight != ob2->weight) || 281 || ob1->weight != ob2->weight
159 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
160 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
161 (ob1->attacktype != ob2->attacktype) || 282 || ob1->attacktype != ob2->attacktype
162 (ob1->magic != ob2->magic) || 283 || ob1->magic != ob2->magic
163 (ob1->slaying != ob2->slaying) || 284 || ob1->slaying != ob2->slaying
164 (ob1->skill != ob2->skill) || 285 || ob1->skill != ob2->skill
165 (ob1->value != ob2->value) || 286 || ob1->value != ob2->value
166 (ob1->animation_id != ob2->animation_id) || 287 || ob1->animation_id != ob2->animation_id
288 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
167 (ob1->client_type != ob2->client_type) || 289 || ob1->client_type != ob2->client_type
168 (ob1->materialname != ob2->materialname) || 290 || ob1->material != ob2->material
169 (ob1->lore != ob2->lore) || 291 || ob1->lore != ob2->lore
170 (ob1->subtype != ob2->subtype) || 292 || ob1->subtype != ob2->subtype
171 (ob1->move_type != ob2->move_type) || 293 || ob1->move_type != ob2->move_type
172 (ob1->move_block != ob2->move_block) || 294 || ob1->move_block != ob2->move_block
173 (ob1->move_allow != ob2->move_allow) || 295 || ob1->move_allow != ob2->move_allow
174 (ob1->move_on != ob2->move_on) || 296 || ob1->move_on != ob2->move_on
175 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 297 || ob1->move_off != ob2->move_off
298 || ob1->move_slow != ob2->move_slow
299 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
300 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
301 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
176 return 0; 302 return 0;
177 303
304 if ((ob1->flag ^ ob2->flag)
305 .reset (FLAG_INV_LOCKED)
306 .reset (FLAG_REMOVED)
307 .any ())
308 return 0;
309
178 /* This is really a spellbook check - really, we should 310 /* This is really a spellbook check - we should in general
179 * check all objects in the inventory. 311 * not merge objects with real inventories, as splitting them
312 * is hard.
180 */ 313 */
181 if (ob1->inv || ob2->inv) 314 if (ob1->inv || ob2->inv)
182 { 315 {
183 /* if one object has inventory but the other doesn't, not equiv */
184 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185 return 0;
186
187 /* Now check to see if the two inventory objects could merge */
188 if (!CAN_MERGE (ob1->inv, ob2->inv)) 316 if (!(ob1->inv && ob2->inv))
189 return 0; 317 return 0; /* inventories differ in length */
318
319 if (ob1->inv->below || ob2->inv->below)
320 return 0; /* more than one object in inv */
321
322 if (!object::can_merge (ob1->inv, ob2->inv))
323 return 0; /* inventory objects differ */
190 324
191 /* inventory ok - still need to check rest of this object to see 325 /* inventory ok - still need to check rest of this object to see
192 * if it is valid. 326 * if it is valid.
193 */ 327 */
194 } 328 }
202 336
203 /* Note sure why the following is the case - either the object has to 337 /* Note sure why the following is the case - either the object has to
204 * be animated or have a very low speed. Is this an attempted monster 338 * be animated or have a very low speed. Is this an attempted monster
205 * check? 339 * check?
206 */ 340 */
207 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED) 341 if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
208 return 0; 342 return 0;
209 343
210 switch (ob1->type) 344 switch (ob1->type)
211 { 345 {
212 case SCROLL: 346 case SCROLL:
213 if (ob1->level != ob2->level) 347 if (ob1->level != ob2->level)
214 return 0; 348 return 0;
215 break; 349 break;
216 } 350 }
217 351
218 if (ob1->key_values != NULL || ob2->key_values != NULL) 352 if (ob1->key_values || ob2->key_values)
219 { 353 {
220 /* At least one of these has key_values. */ 354 /* At least one of these has key_values. */
221 if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) 355 if ((!ob1->key_values) != (!ob2->key_values))
222 /* One has fields, but the other one doesn't. */ 356 return 0; /* One has fields, but the other one doesn't. */
357
358 if (!compare_ob_value_lists (ob1, ob2))
223 return 0; 359 return 0;
224 else if (!compare_ob_value_lists (ob1, ob2))
225 return 0;
226 } 360 }
227 361
228 //TODO: generate an event or call into perl for additional checks
229 if (ob1->self || ob2->self) 362 if (ob1->self || ob2->self)
230 { 363 {
231 ob1->optimise (); 364 ob1->optimise ();
232 ob2->optimise (); 365 ob2->optimise ();
233 366
234 if (ob1->self || ob2->self) 367 if (ob1->self || ob2->self)
368 {
369 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
370 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
371
372 if (k1 != k2)
235 return 0; 373 return 0;
374
375 if (k1 == 0)
376 return 1;
377
378 if (!cfperl_can_merge (ob1, ob2))
379 return 0;
380 }
236 } 381 }
237 382
238 /* Everything passes, must be OK. */ 383 /* Everything passes, must be OK. */
239 return 1; 384 return 1;
240} 385}
241 386
387// find player who can see this object
388object *
389object::visible_to () const
390{
391 if (client_visible () && !flag [FLAG_REMOVED])
392 {
393 // see if we are in a container of sorts
394 if (env)
395 {
396 // the player inventory itself is always visible
397 if (env->is_player ())
398 return env;
399
400 // else a player could have our env open
401 object *envest = env->outer_env_or_self ();
402
403 // the player itself is always on a map, so we will find him here
404 // even if our inv is in a player.
405 if (envest->is_on_map ())
406 if (object *pl = envest->ms ().player ())
407 if (pl->container_ () == env)
408 return pl;
409 }
410 else
411 {
412 // maybe there is a player standing on the same mapspace
413 // this will catch the case where "this" is a player
414 if (object *pl = ms ().player ())
415 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
416 || pl->container_ () == this)
417 return pl;
418 }
419 }
420
421 return 0;
422}
423
424// adjust weight per container type ("of holding")
425static sint32
426weight_adjust_for (object *op, sint32 weight)
427{
428 return op->type == CONTAINER
429 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
430 : weight;
431}
432
242/* 433/*
434 * adjust_weight(object, weight) adds the specified weight to an object,
435 * and also updates how much the environment(s) is/are carrying.
436 */
437static void
438adjust_weight (object *op, sint32 weight)
439{
440 while (op)
441 {
442 // adjust by actual difference to account for rounding errors
443 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
444 weight = weight_adjust_for (op, op->carrying)
445 - weight_adjust_for (op, op->carrying - weight);
446
447 if (!weight)
448 return;
449
450 op->carrying += weight;
451
452 if (object *pl = op->visible_to ())
453 if (pl != op) // player is handled lazily
454 esrv_update_item (UPD_WEIGHT, pl, op);
455
456 op = op->env;
457 }
458}
459
460/*
243 * sum_weight() is a recursive function which calculates the weight 461 * this is a recursive function which calculates the weight
244 * an object is carrying. It goes through in figures out how much 462 * an object is carrying. It goes through op and figures out how much
245 * containers are carrying, and sums it up. 463 * containers are carrying, and sums it up.
246 */ 464 */
247long 465void
248sum_weight (object *op) 466object::update_weight ()
249{ 467{
250 long sum; 468 sint32 sum = 0;
251 object *inv;
252 469
253 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 470 for (object *op = inv; op; op = op->below)
254 { 471 {
255 if (inv->inv) 472 if (op->inv)
256 sum_weight (inv); 473 op->update_weight ();
257 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 474
475 sum += op->total_weight ();
476 }
477
478 sum = weight_adjust_for (this, sum);
479
480 if (sum != carrying)
258 } 481 {
259 if (op->type == CONTAINER && op->stats.Str)
260 sum = (sum * (100 - op->stats.Str)) / 100;
261 if (op->carrying != sum)
262 op->carrying = sum; 482 carrying = sum;
263 return sum;
264}
265 483
266/** 484 if (object *pl = visible_to ())
267 * Return the outermost environment object for a given object. 485 if (pl != this) // player is handled lazily
268 */ 486 esrv_update_item (UPD_WEIGHT, pl, this);
269
270object *
271object_get_env_recursive (object *op)
272{
273 while (op->env != NULL)
274 op = op->env;
275 return op;
276}
277
278/*
279 * Eneq(@csd.uu.se): Since we can have items buried in a character we need
280 * a better check. We basically keeping traversing up until we can't
281 * or find a player.
282 */
283
284object *
285is_player_inv (object *op)
286{
287 for (; op != NULL && op->type != PLAYER; op = op->env)
288 if (op->env == op)
289 op->env = NULL;
290 return op;
291}
292
293/*
294 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295 * Some error messages.
296 * The result of the dump is stored in the static global errmsg array.
297 */
298
299void
300dump_object2 (object *op)
301{
302 errmsg[0] = 0;
303 return;
304 //TODO//D#d#
305#if 0
306 char *cp;
307
308/* object *tmp;*/
309
310 if (op->arch != NULL)
311 { 487 }
312 strcat (errmsg, "arch ");
313 strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314 strcat (errmsg, "\n");
315 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316 strcat (errmsg, cp);
317# if 0
318 /* Don't dump player diffs - they are too long, mostly meaningless, and
319 * will overflow the buffer.
320 * Changed so that we don't dump inventory either. This may
321 * also overflow the buffer.
322 */
323 if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324 strcat (errmsg, cp);
325 for (tmp = op->inv; tmp; tmp = tmp->below)
326 dump_object2 (tmp);
327# endif
328 strcat (errmsg, "end\n");
329 }
330 else
331 {
332 strcat (errmsg, "Object ");
333 if (op->name == NULL)
334 strcat (errmsg, "(null)");
335 else
336 strcat (errmsg, op->name);
337 strcat (errmsg, "\n");
338# if 0
339 if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340 strcat (errmsg, cp);
341 for (tmp = op->inv; tmp; tmp = tmp->below)
342 dump_object2 (tmp);
343# endif
344 strcat (errmsg, "end\n");
345 }
346#endif
347} 488}
348 489
349/* 490/*
350 * Dumps an object. Returns output in the static global errmsg array. 491 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
351 */ 492 */
352 493char *
353void
354dump_object (object *op) 494dump_object (object *op)
355{ 495{
356 if (op == NULL) 496 if (!op)
357 { 497 return strdup ("[NULLOBJ]");
358 strcpy (errmsg, "[NULL pointer]");
359 return;
360 }
361 errmsg[0] = '\0';
362 dump_object2 (op);
363}
364 498
365void 499 object_freezer freezer;
366dump_all_objects (void) 500 op->write (freezer);
367{ 501 return freezer.as_string ();
368 object *op;
369
370 for (op = objects; op != NULL; op = op->next)
371 {
372 dump_object (op);
373 fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374 }
375} 502}
376 503
377/* 504char *
378 * get_nearest_part(multi-object, object 2) returns the part of the 505object::as_string ()
379 * multi-object 1 which is closest to the second object.
380 * If it's not a multi-object, it is returned.
381 */
382
383object *
384get_nearest_part (object *op, const object *pl)
385{ 506{
386 object *tmp, *closest; 507 return dump_object (this);
387 int last_dist, i;
388
389 if (op->more == NULL)
390 return op;
391 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
392 if ((i = distance (tmp, pl)) < last_dist)
393 closest = tmp, last_dist = i;
394 return closest;
395} 508}
396 509
397/* 510/*
398 * Returns the object which has the count-variable equal to the argument. 511 * Returns the object which has the count-variable equal to the argument.
512 * VERRRY slow.
399 */ 513 */
400
401object * 514object *
402find_object (tag_t i) 515find_object (tag_t i)
403{ 516{
404 object *op; 517 for_all_objects (op)
405
406 for (op = objects; op != NULL; op = op->next)
407 if (op->count == i) 518 if (op->count == i)
408 break;
409 return op; 519 return op;
520
521 return 0;
522}
523
524/*
525 * Returns the object which has the uuid equal to the argument.
526 * MOAR VERRRY slow.
527 */
528
529object *
530find_object_uuid (UUID i)
531{
532 for_all_objects (op)
533 if (op->uuid == i)
534 return op;
535
536 return 0;
410} 537}
411 538
412/* 539/*
413 * Returns the first object which has a name equal to the argument. 540 * Returns the first object which has a name equal to the argument.
414 * Used only by the patch command, but not all that useful. 541 * Used only by the patch command, but not all that useful.
415 * Enables features like "patch <name-of-other-player> food 999" 542 * Enables features like "patch <name-of-other-player> food 999"
416 */ 543 */
417
418object * 544object *
419find_object_name (const char *str) 545find_object_name (const char *str)
420{ 546{
421 const char *name = shstr::find (str); 547 shstr_cmp str_ (str);
422 object *op;
423 548
424 for (op = objects; op != NULL; op = op->next) 549 if (str_)
550 for_all_objects (op)
425 if (&op->name == name) 551 if (op->name == str_)
426 break; 552 return op;
427 553
428 return op; 554 return 0;
429}
430
431void
432free_all_object_data ()
433{
434 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435}
436
437/*
438 * Returns the object which this object marks as being the owner.
439 * A id-scheme is used to avoid pointing to objects which have been
440 * freed and are now reused. If this is detected, the owner is
441 * set to NULL, and NULL is returned.
442 * Changed 2004-02-12 - if the player is setting at the play again
443 * prompt, he is removed, and we don't want to treat him as an owner of
444 * anything, so check removed flag. I don't expect that this should break
445 * anything - once an object is removed, it is basically dead anyways.
446 */
447object *
448object::get_owner ()
449{
450 if (!owner
451 || QUERY_FLAG (owner, FLAG_FREED)
452 || QUERY_FLAG (owner, FLAG_REMOVED))
453 owner = 0;
454
455 return owner;
456} 555}
457 556
458/* 557/*
459 * Sets the owner and sets the skill and exp pointers to owner's current 558 * Sets the owner and sets the skill and exp pointers to owner's current
460 * skill and experience objects. 559 * skill and experience objects.
560 * ACTUALLY NO! investigate! TODO
461 */ 561 */
462void 562void
463object::set_owner (object *owner) 563object::set_owner (object *owner)
464{ 564{
565 // allow objects which own objects
465 if (!owner) 566 if (owner)
466 return;
467
468 /* next line added to allow objects which own objects */
469 /* Add a check for ownercounts in here, as I got into an endless loop
470 * with the fireball owning a poison cloud which then owned the
471 * fireball. I believe that was caused by one of the objects getting
472 * freed and then another object replacing it. Since the ownercounts
473 * didn't match, this check is valid and I believe that cause is valid.
474 */
475 while (owner->owner) 567 while (owner->owner)
476 owner = owner->owner; 568 owner = owner->owner;
569
570 if (flag [FLAG_FREED])
571 {
572 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
573 return;
574 }
477 575
478 this->owner = owner; 576 this->owner = owner;
479} 577}
480 578
481/* Zero the key_values on op, decrementing the shared-string 579/* Zero the key_values on op, decrementing the shared-string
482 * refcounts and freeing the links. 580 * refcounts and freeing the links.
483 */ 581 */
484static void 582static void
485free_key_values (object *op) 583free_key_values (object *op)
486{ 584{
487 for (key_value *i = op->key_values; i != 0;) 585 for (key_value *i = op->key_values; i; )
488 { 586 {
489 key_value *next = i->next; 587 key_value *next = i->next;
490 delete i; 588 delete i;
491 589
492 i = next; 590 i = next;
493 } 591 }
494 592
495 op->key_values = 0; 593 op->key_values = 0;
496} 594}
497 595
498void object::clear ()
499{
500 attachable_base::clear ();
501
502 free_key_values (this);
503
504 owner = 0;
505 name = 0;
506 name_pl = 0;
507 title = 0;
508 race = 0;
509 slaying = 0;
510 skill = 0;
511 msg = 0;
512 lore = 0;
513 custom_name = 0;
514 materialname = 0;
515 contr = 0;
516 below = 0;
517 above = 0;
518 inv = 0;
519 container = 0;
520 env = 0;
521 more = 0;
522 head = 0;
523 map = 0;
524 active_next = 0;
525 active_prev = 0;
526
527 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
528
529 SET_FLAG (this, FLAG_REMOVED);
530
531 /* What is not cleared is next, prev, and count */
532
533 expmul = 1.0;
534 face = blank_face;
535 attacked_by_count = -1;
536
537 if (settings.casting_time)
538 casting_time = -1;
539}
540
541void object::clone (object *destination)
542{
543 *(object_copy *)destination = *this;
544 *(object_pod *)destination = *this;
545
546 if (self || cb)
547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
548}
549
550/* 596/*
551 * copy object first frees everything allocated by the second object, 597 * copy_to first frees everything allocated by the dst object,
552 * and then copies the contends of the first object into the second 598 * and then copies the contents of itself into the second
553 * object, allocating what needs to be allocated. Basically, any 599 * object, allocating what needs to be allocated. Basically, any
554 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 600 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
555 * if the first object is freed, the pointers in the new object 601 * if the first object is freed, the pointers in the new object
556 * will point at garbage. 602 * will point at garbage.
557 */ 603 */
558void 604void
559copy_object (object *op2, object *op) 605object::copy_to (object *dst)
560{ 606{
561 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 607 dst->remove ();
562 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 608 *(object_copy *)dst = *this;
563 609 dst->flag [FLAG_REMOVED] = true;
564 op2->clone (op);
565
566 if (is_freed)
567 SET_FLAG (op, FLAG_FREED);
568 if (is_removed)
569 SET_FLAG (op, FLAG_REMOVED);
570
571 if (op2->speed < 0)
572 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
573 610
574 /* Copy over key_values, if any. */ 611 /* Copy over key_values, if any. */
575 if (op2->key_values) 612 if (key_values)
576 { 613 {
577 key_value *tail = 0; 614 key_value *tail = 0;
578 key_value *i;
579
580 op->key_values = 0; 615 dst->key_values = 0;
581 616
582 for (i = op2->key_values; i; i = i->next) 617 for (key_value *i = key_values; i; i = i->next)
583 { 618 {
584 key_value *new_link = new key_value; 619 key_value *new_link = new key_value;
585 620
586 new_link->next = 0; 621 new_link->next = 0;
587 new_link->key = i->key; 622 new_link->key = i->key;
588 new_link->value = i->value; 623 new_link->value = i->value;
589 624
590 /* Try and be clever here, too. */ 625 /* Try and be clever here, too. */
591 if (!op->key_values) 626 if (!dst->key_values)
592 { 627 {
593 op->key_values = new_link; 628 dst->key_values = new_link;
594 tail = new_link; 629 tail = new_link;
595 } 630 }
596 else 631 else
597 { 632 {
598 tail->next = new_link; 633 tail->next = new_link;
599 tail = new_link; 634 tail = new_link;
600 } 635 }
601 } 636 }
602 } 637 }
603 638
604 update_ob_speed (op); 639 dst->activate ();
640}
641
642void
643object::instantiate ()
644{
645 if (!uuid.seq) // HACK
646 uuid = UUID::gen ();
647
648 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
649 if (flag [FLAG_RANDOM_SPEED] && speed)
650 speed_left = - speed - rndm (); // TODO animation
651 else
652 speed_left = -1.;
653
654 /* copy the body_info to the body_used - this is only really
655 * need for monsters, but doesn't hurt to do it for everything.
656 * by doing so, when a monster is created, it has good starting
657 * values for the body_used info, so when items are created
658 * for it, they can be properly equipped.
659 */
660 for (int i = NUM_BODY_LOCATIONS; i--; )
661 slot[i].used = slot[i].info;
662
663 attachable::instantiate ();
664}
665
666object *
667object::clone ()
668{
669 object *neu = create ();
670 copy_to (neu);
671
672 // TODO: unclean state changes, should not be done in clone AND instantiate
673 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
674 neu->speed_left = - neu->speed - rndm (); // TODO animation
675
676 neu->map = map; // not copied by copy_to
677 return neu;
605} 678}
606 679
607/* 680/*
608 * If an object with the IS_TURNABLE() flag needs to be turned due 681 * If an object with the IS_TURNABLE() flag needs to be turned due
609 * to the closest player being on the other side, this function can 682 * to the closest player being on the other side, this function can
610 * be called to update the face variable, _and_ how it looks on the map. 683 * be called to update the face variable, _and_ how it looks on the map.
611 */ 684 */
612
613void 685void
614update_turn_face (object *op) 686update_turn_face (object *op)
615{ 687{
616 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 688 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
617 return; 689 return;
690
618 SET_ANIMATION (op, op->direction); 691 SET_ANIMATION (op, op->direction);
619 update_object (op, UP_OBJ_FACE); 692 update_object (op, UP_OBJ_FACE);
620} 693}
621 694
622/* 695/*
623 * Updates the speed of an object. If the speed changes from 0 to another 696 * Updates the speed of an object. If the speed changes from 0 to another
624 * value, or vice versa, then add/remove the object from the active list. 697 * value, or vice versa, then add/remove the object from the active list.
625 * This function needs to be called whenever the speed of an object changes. 698 * This function needs to be called whenever the speed of an object changes.
626 */ 699 */
627void 700void
628update_ob_speed (object *op) 701object::set_speed (float speed)
629{ 702{
630 extern int arch_init; 703 this->speed = speed;
631 704
632 /* No reason putting the archetypes objects on the speed list, 705 if (has_active_speed ())
633 * since they never really need to be updated. 706 activate ();
634 */
635
636 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
637 {
638 LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
639#ifdef MANY_CORES
640 abort ();
641#else
642 op->speed = 0;
643#endif
644 }
645
646 if (arch_init)
647 return;
648
649 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
650 {
651 /* If already on active list, don't do anything */
652 if (op->active_next || op->active_prev || op == active_objects)
653 return;
654
655 /* process_events() expects us to insert the object at the beginning
656 * of the list. */
657 op->active_next = active_objects;
658
659 if (op->active_next != NULL)
660 op->active_next->active_prev = op;
661
662 active_objects = op;
663 }
664 else 707 else
665 { 708 deactivate ();
666 /* If not on the active list, nothing needs to be done */
667 if (!op->active_next && !op->active_prev && op != active_objects)
668 return;
669
670 if (op->active_prev == NULL)
671 {
672 active_objects = op->active_next;
673
674 if (op->active_next != NULL)
675 op->active_next->active_prev = NULL;
676 }
677 else
678 {
679 op->active_prev->active_next = op->active_next;
680
681 if (op->active_next)
682 op->active_next->active_prev = op->active_prev;
683 }
684
685 op->active_next = NULL;
686 op->active_prev = NULL;
687 }
688} 709}
689 710
690/* This function removes object 'op' from the list of active
691 * objects.
692 * This should only be used for style maps or other such
693 * reference maps where you don't want an object that isn't
694 * in play chewing up cpu time getting processed.
695 * The reverse of this is to call update_ob_speed, which
696 * will do the right thing based on the speed of the object.
697 */
698void
699remove_from_active_list (object *op)
700{
701 /* If not on the active list, nothing needs to be done */
702 if (!op->active_next && !op->active_prev && op != active_objects)
703 return;
704
705 if (op->active_prev == NULL)
706 {
707 active_objects = op->active_next;
708 if (op->active_next != NULL)
709 op->active_next->active_prev = NULL;
710 }
711 else
712 {
713 op->active_prev->active_next = op->active_next;
714 if (op->active_next)
715 op->active_next->active_prev = op->active_prev;
716 }
717 op->active_next = NULL;
718 op->active_prev = NULL;
719}
720
721/* 711/*
722 * update_object() updates the array which represents the map. 712 * update_object() updates the the map.
723 * It takes into account invisible objects (and represent squares covered 713 * It takes into account invisible objects (and represent squares covered
724 * by invisible objects by whatever is below them (unless it's another 714 * by invisible objects by whatever is below them (unless it's another
725 * invisible object, etc...) 715 * invisible object, etc...)
726 * If the object being updated is beneath a player, the look-window 716 * If the object being updated is beneath a player, the look-window
727 * of that player is updated (this might be a suboptimal way of 717 * of that player is updated (this might be a suboptimal way of
728 * updating that window, though, since update_object() is called _often_) 718 * updating that window, though, since update_object() is called _often_)
729 * 719 *
730 * action is a hint of what the caller believes need to be done. 720 * action is a hint of what the caller believes need to be done.
731 * For example, if the only thing that has changed is the face (due to
732 * an animation), we don't need to call update_position until that actually
733 * comes into view of a player. OTOH, many other things, like addition/removal
734 * of walls or living creatures may need us to update the flags now.
735 * current action are: 721 * current action are:
736 * UP_OBJ_INSERT: op was inserted 722 * UP_OBJ_INSERT: op was inserted
737 * UP_OBJ_REMOVE: op was removed 723 * UP_OBJ_REMOVE: op was removed
738 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update 724 * UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
739 * as that is easier than trying to look at what may have changed. 725 * as that is easier than trying to look at what may have changed.
740 * UP_OBJ_FACE: only the objects face has changed. 726 * UP_OBJ_FACE: only the objects face has changed.
741 */ 727 */
742
743void 728void
744update_object (object *op, int action) 729update_object (object *op, int action)
745{ 730{
746 int update_now = 0, flags; 731 if (!op)
747 MoveType move_on, move_off, move_block, move_slow;
748
749 if (op == NULL)
750 { 732 {
751 /* this should never happen */ 733 /* this should never happen */
752 LOG (llevDebug, "update_object() called for NULL object.\n"); 734 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
753 return; 735 return;
754 } 736 }
755 737
756 if (op->env != NULL) 738 if (!op->is_on_map ())
757 { 739 {
758 /* Animation is currently handled by client, so nothing 740 /* Animation is currently handled by client, so nothing
759 * to do in this case. 741 * to do in this case.
760 */ 742 */
761 return; 743 return;
762 } 744 }
763 745
764 /* If the map is saving, don't do anything as everything is
765 * going to get freed anyways.
766 */
767 if (!op->map || op->map->in_memory == MAP_SAVING)
768 return;
769
770 /* make sure the object is within map boundaries */ 746 /* make sure the object is within map boundaries */
771 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 747 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
772 { 748 {
773 LOG (llevError, "update_object() called for object out of map!\n"); 749 LOG (llevError, "update_object() called for object out of map!\n");
774#ifdef MANY_CORES 750#ifdef MANY_CORES
775 abort (); 751 abort ();
776#endif 752#endif
777 return; 753 return;
778 } 754 }
779 755
780 flags = GET_MAP_FLAGS (op->map, op->x, op->y); 756 mapspace &m = op->ms ();
781 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
782 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
783 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
784 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
785 move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
786 757
758 if (!(m.flags_ & P_UPTODATE))
759 /* nop */;
787 if (action == UP_OBJ_INSERT) 760 else if (action == UP_OBJ_INSERT)
788 { 761 {
762#if 0
763 // this is likely overkill, TODO: revisit (schmorp)
789 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW)) 764 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
790 update_now = 1;
791
792 if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC)) 765 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
793 update_now = 1; 766 || (op->is_player () && !(m.flags_ & P_PLAYER))
794 767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
795 if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC)) 769 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
796 update_now = 1;
797
798 if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
799 update_now = 1;
800
801 if (op->type == SAFE_GROUND && !(flags & P_SAFE))
802 update_now = 1;
803
804 if ((move_on | op->move_on) != move_on) 770 || (m.move_on | op->move_on ) != m.move_on
805 update_now = 1;
806
807 if ((move_off | op->move_off) != move_off) 771 || (m.move_off | op->move_off ) != m.move_off
808 update_now = 1; 772 || (m.move_slow | op->move_slow) != m.move_slow
809
810 /* This isn't perfect, but I don't expect a lot of objects to 773 /* This isn't perfect, but I don't expect a lot of objects to
811 * to have move_allow right now. 774 * have move_allow right now.
812 */ 775 */
813 if (((move_block | op->move_block) & ~op->move_allow) != move_block) 776 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
814 update_now = 1; 777 m.invalidate ();
815 778#else
816 if ((move_slow | op->move_slow) != move_slow) 779 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
817 update_now = 1; 780 m.invalidate ();
781#endif
818 } 782 }
819 /* if the object is being removed, we can't make intelligent 783 /* if the object is being removed, we can't make intelligent
820 * decisions, because remove_ob can't really pass the object 784 * decisions, because remove_ob can't really pass the object
821 * that is being removed. 785 * that is being removed.
822 */ 786 */
823 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 787 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
824 update_now = 1; 788 m.invalidate ();
825 else if (action == UP_OBJ_FACE) 789 else if (action == UP_OBJ_FACE)
826 /* Nothing to do for that case */ ; 790 /* Nothing to do for that case */ ;
827 else 791 else
828 LOG (llevError, "update_object called with invalid action: %d\n", action); 792 LOG (llevError, "update_object called with invalid action: %d\n", action);
829 793
830 if (update_now)
831 {
832 SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
833 update_position (op->map, op->x, op->y);
834 }
835
836 if (op->more != NULL) 794 if (op->more)
837 update_object (op->more, action); 795 update_object (op->more, action);
838} 796}
839 797
840static unordered_vector<object *> mortals;
841static std::vector<object *> freed;
842
843void object::free_mortals ()
844{
845 for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
846 if ((*i)->refcnt)
847 ++i; // further delay freeing
848 else
849 {
850 freed.push_back (*i);//D
851 //delete *i;
852 mortals.erase (i);
853 }
854
855 if (mortals.size())//D
856 LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857}
858
859object::object () 798object::object ()
860{ 799{
861 SET_FLAG (this, FLAG_REMOVED); 800 SET_FLAG (this, FLAG_REMOVED);
862 801
863 expmul = 1.0; 802 //expmul = 1.0; declared const for the time being
864 face = blank_face; 803 face = blank_face;
865 attacked_by_count = -1; 804 material = MATERIAL_NULL;
866} 805}
867 806
868object::~object () 807object::~object ()
869{ 808{
809 unlink ();
810
870 free_key_values (this); 811 free_key_values (this);
871} 812}
872 813
814static int object_count;
815
873void object::link () 816void object::link ()
874{ 817{
818 assert (!index);//D
819 uuid = UUID::gen ();
875 count = ++ob_count; 820 count = ++object_count;
876 821
877 prev = 0; 822 refcnt_inc ();
878 next = objects; 823 objects.insert (this);
879
880 if (objects)
881 objects->prev = this;
882
883 objects = this;
884} 824}
885 825
886void object::unlink () 826void object::unlink ()
887{ 827{
888 count = 0;
889
890 /* Remove this object from the list of used objects */
891 if (prev)
892 {
893 prev->next = next;
894 prev = 0;
895 }
896
897 if (next) 828 if (!index)
898 { 829 return;
899 next->prev = prev; 830
900 next = 0; 831 objects.erase (this);
832 refcnt_dec ();
833}
834
835void
836object::activate ()
837{
838 /* If already on active list, don't do anything */
839 if (active)
840 return;
841
842 if (has_active_speed ())
901 } 843 {
844 if (flag [FLAG_FREED])
845 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
902 846
903 if (this == objects) 847 actives.insert (this);
904 objects = next; 848 }
849}
850
851void
852object::activate_recursive ()
853{
854 activate ();
855
856 for (object *op = inv; op; op = op->below)
857 op->activate_recursive ();
858}
859
860/* This function removes object 'op' from the list of active
861 * objects.
862 * This should only be used for style maps or other such
863 * reference maps where you don't want an object that isn't
864 * in play chewing up cpu time getting processed.
865 * The reverse of this is to call update_ob_speed, which
866 * will do the right thing based on the speed of the object.
867 */
868void
869object::deactivate ()
870{
871 /* If not on the active list, nothing needs to be done */
872 if (!active)
873 return;
874
875 actives.erase (this);
876}
877
878void
879object::deactivate_recursive ()
880{
881 for (object *op = inv; op; op = op->below)
882 op->deactivate_recursive ();
883
884 deactivate ();
885}
886
887void
888object::set_flag_inv (int flag, int value)
889{
890 for (object *op = inv; op; op = op->below)
891 {
892 op->flag [flag] = value;
893 op->set_flag_inv (flag, value);
894 }
895}
896
897/*
898 * Remove and free all objects in the inventory of the given object.
899 * object.c ?
900 */
901void
902object::destroy_inv (bool drop_to_ground)
903{
904 // need to check first, because the checks below might segfault
905 // as we might be on an invalid mapspace and crossfire code
906 // is too buggy to ensure that the inventory is empty.
907 // corollary: if you create arrows etc. with stuff in its inventory,
908 // cf will crash below with off-map x and y
909 if (!inv)
910 return;
911
912 /* Only if the space blocks everything do we not process -
913 * if some form of movement is allowed, let objects
914 * drop on that space.
915 */
916 if (!drop_to_ground
917 || !map
918 || map->in_memory != MAP_ACTIVE
919 || map->no_drop
920 || ms ().move_block == MOVE_ALL)
921 {
922 while (inv)
923 inv->destroy ();
924 }
925 else
926 { /* Put objects in inventory onto this space */
927 while (inv)
928 {
929 object *op = inv;
930
931 if (op->flag [FLAG_STARTEQUIP]
932 || op->flag [FLAG_NO_DROP]
933 || op->type == RUNE
934 || op->type == TRAP
935 || op->flag [FLAG_IS_A_TEMPLATE]
936 || op->flag [FLAG_DESTROY_ON_DEATH])
937 op->destroy ();
938 else
939 map->insert (op, x, y);
940 }
941 }
905} 942}
906 943
907object *object::create () 944object *object::create ()
908{ 945{
909 object *op;
910
911 if (freed.empty ())
912 op = new object; 946 object *op = new object;
913 else
914 {
915 // highly annoying, but the only way to get it stable right now
916 op = freed.back ();
917 freed.pop_back ();
918 op->~object ();
919 new ((void *) op) object;
920 }
921
922 op->link (); 947 op->link ();
923 return op; 948 return op;
924} 949}
925 950
926/* 951static struct freed_map : maptile
927 * free_object() frees everything allocated by an object, removes
928 * it from the list of used objects, and puts it on the list of
929 * free objects. The IS_FREED() flag is set in the object.
930 * The object must have been removed by remove_ob() first for
931 * this function to succeed.
932 *
933 * If free_inventory is set, free inventory as well. Else drop items in
934 * inventory to the ground.
935 */
936void object::free (bool free_inventory)
937{ 952{
938 if (QUERY_FLAG (this, FLAG_FREED)) 953 freed_map ()
954 {
955 path = "<freed objects map>";
956 name = "/internal/freed_objects_map";
957 width = 3;
958 height = 3;
959 no_drop = 1;
960 no_reset = 1;
961
962 alloc ();
963 in_memory = MAP_ACTIVE;
964 }
965
966 ~freed_map ()
967 {
968 destroy ();
969 }
970} freed_map; // freed objects are moved here to avoid crashes
971
972void
973object::do_destroy ()
974{
975 if (flag [FLAG_IS_LINKED])
976 remove_link ();
977
978 if (flag [FLAG_FRIENDLY])
979 remove_friendly_object (this);
980
981 remove ();
982
983 attachable::do_destroy ();
984
985 deactivate ();
986 unlink ();
987
988 flag [FLAG_FREED] = 1;
989
990 // hack to ensure that freed objects still have a valid map
991 map = &freed_map;
992 x = 1;
993 y = 1;
994
995 if (more)
996 {
997 more->destroy ();
998 more = 0;
999 }
1000
1001 head = 0;
1002
1003 // clear those pointers that likely might cause circular references
1004 owner = 0;
1005 enemy = 0;
1006 attacked_by = 0;
1007 current_weapon = 0;
1008}
1009
1010void
1011object::destroy ()
1012{
1013 if (destroyed ())
939 return; 1014 return;
940 1015
941 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 1016 if (!is_head () && !head->destroyed ())
942 remove_friendly_object (this);
943
944 if (!QUERY_FLAG (this, FLAG_REMOVED))
945 remove_ob (this);
946
947 SET_FLAG (this, FLAG_FREED);
948
949 if (more)
950 {
951 more->free (free_inventory);
952 more = 0;
953 } 1017 {
954 1018 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
955 if (inv) 1019 head->destroy ();
1020 return;
956 { 1021 }
957 /* Only if the space blocks everything do we not process -
958 * if some form of movement is allowed, let objects
959 * drop on that space.
960 */
961 if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
962 {
963 object *op = inv;
964 1022
965 while (op) 1023 destroy_inv (false);
966 {
967 object *tmp = op->below;
968 op->free (free_inventory);
969 op = tmp;
970 }
971 }
972 else
973 { /* Put objects in inventory onto this space */
974 object *op = inv;
975 1024
976 while (op) 1025 if (is_head ())
977 { 1026 if (sound_destroy)
978 object *tmp = op->below; 1027 play_sound (sound_destroy);
1028 else if (flag [FLAG_MONSTER])
1029 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
979 1030
980 remove_ob (op); 1031 attachable::destroy ();
981
982 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
983 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
984 free_object (op);
985 else
986 {
987 op->x = x;
988 op->y = y;
989 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
990 }
991
992 op = tmp;
993 }
994 }
995 }
996
997 owner = 0;
998
999 /* Remove object from the active list */
1000 speed = 0;
1001 update_ob_speed (this);
1002
1003 unlink ();
1004
1005 mortals.push_back (this);
1006} 1032}
1007 1033
1008/* 1034/* op->remove ():
1009 * sub_weight() recursively (outwards) subtracts a number from the
1010 * weight of an object (and what is carried by it's environment(s)).
1011 */
1012
1013void
1014sub_weight (object *op, signed long weight)
1015{
1016 while (op != NULL)
1017 {
1018 if (op->type == CONTAINER)
1019 {
1020 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021 }
1022 op->carrying -= weight;
1023 op = op->env;
1024 }
1025}
1026
1027/* remove_ob(op):
1028 * This function removes the object op from the linked list of objects 1035 * This function removes the object op from the linked list of objects
1029 * which it is currently tied to. When this function is done, the 1036 * which it is currently tied to. When this function is done, the
1030 * object will have no environment. If the object previously had an 1037 * object will have no environment. If the object previously had an
1031 * environment, the x and y coordinates will be updated to 1038 * environment, the x and y coordinates will be updated to
1032 * the previous environment. 1039 * the previous environment.
1033 * Beware: This function is called from the editor as well!
1034 */ 1040 */
1035
1036void 1041void
1037remove_ob (object *op) 1042object::do_remove ()
1038{ 1043{
1039 object * 1044 if (flag [FLAG_REMOVED])
1040 tmp, *
1041 last = NULL;
1042 object *
1043 otmp;
1044
1045 tag_t
1046 tag;
1047 int
1048 check_walk_off;
1049 mapstruct *
1050 m;
1051
1052 sint16
1053 x,
1054 y;
1055
1056 if (QUERY_FLAG (op, FLAG_REMOVED))
1057 return; 1045 return;
1058 1046
1059 SET_FLAG (op, FLAG_REMOVED); 1047 INVOKE_OBJECT (REMOVE, this);
1060 1048
1061 if (op->more != NULL) 1049 flag [FLAG_REMOVED] = true;
1062 remove_ob (op->more); 1050
1051 if (more)
1052 more->remove ();
1063 1053
1064 /* 1054 /*
1065 * In this case, the object to be removed is in someones 1055 * In this case, the object to be removed is in someones
1066 * inventory. 1056 * inventory.
1067 */ 1057 */
1068 if (op->env != NULL) 1058 if (env)
1069 { 1059 {
1070 if (op->nrof) 1060 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1071 sub_weight (op->env, op->weight * op->nrof); 1061 if (object *pl = visible_to ())
1072 else 1062 esrv_del_item (pl->contr, count);
1073 sub_weight (op->env, op->weight + op->carrying); 1063 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1074 1064
1075 /* NO_FIX_PLAYER is set when a great many changes are being 1065 adjust_weight (env, -total_weight ());
1076 * made to players inventory. If set, avoiding the call
1077 * to save cpu time.
1078 */
1079 if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1080 fix_player (otmp);
1081 1066
1082 if (op->above != NULL) 1067 object *pl = in_player ();
1083 op->above->below = op->below;
1084 else
1085 op->env->inv = op->below;
1086
1087 if (op->below != NULL)
1088 op->below->above = op->above;
1089 1068
1090 /* we set up values so that it could be inserted into 1069 /* we set up values so that it could be inserted into
1091 * the map, but we don't actually do that - it is up 1070 * the map, but we don't actually do that - it is up
1092 * to the caller to decide what we want to do. 1071 * to the caller to decide what we want to do.
1093 */ 1072 */
1094 op->x = op->env->x, op->y = op->env->y;
1095 op->map = op->env->map; 1073 map = env->map;
1096 op->above = NULL, op->below = NULL;
1097 op->env = NULL;
1098 }
1099 else if (op->map)
1100 {
1101 x = op->x; 1074 x = env->x;
1102 y = op->y; 1075 y = env->y;
1103 m = get_map_from_coord (op->map, &x, &y);
1104 1076
1105 if (!m) 1077 // make sure cmov optimisation is applicable
1078 *(above ? &above->below : &env->inv) = below;
1079 *(below ? &below->above : &above ) = above; // &above is just a dummy
1080
1081 above = 0;
1082 below = 0;
1083 env = 0;
1084
1085 if (pl && pl->is_player ())
1106 { 1086 {
1107 LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n", 1087 if (expect_false (pl->contr->combat_ob == this))
1108 op->map->path, op->x, op->y);
1109 /* in old days, we used to set x and y to 0 and continue.
1110 * it seems if we get into this case, something is probablye
1111 * screwed up and should be fixed.
1112 */ 1088 {
1113 abort (); 1089 pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
1090 pl->contr->combat_ob = 0;
1091 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1092 }
1093
1094 if (expect_false (pl->contr->ranged_ob == this))
1095 {
1096 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
1097 pl->contr->ranged_ob = 0;
1098 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1099 }
1100
1101 pl->contr->queue_stats_update ();
1102
1103 if (expect_false (glow_radius) && pl->is_on_map ())
1104 update_all_los (pl->map, pl->x, pl->y);
1114 } 1105 }
1106 }
1107 else if (map)
1108 {
1109 map->dirty = true;
1110 mapspace &ms = this->ms ();
1115 1111
1116 if (op->map != m) 1112 if (object *pl = ms.player ())
1117 LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118 op->map->path, m->path, op->x, op->y, x, y);
1119
1120 /* Re did the following section of code - it looks like it had
1121 * lots of logic for things we no longer care about
1122 */ 1113 {
1114 if (is_player ())
1115 {
1116 if (!flag [FLAG_WIZPASS])
1117 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1118
1119 // leaving a spot always closes any open container on the ground
1120 if (container && !container->env)
1121 // this causes spurious floorbox updates, but it ensures
1122 // that the CLOSE event is being sent.
1123 close_container ();
1124
1125 --map->players;
1126 map->touch ();
1127 }
1128 else if (pl->container_ () == this)
1129 {
1130 // removing a container should close it
1131 close_container ();
1132 }
1133
1134 esrv_del_item (pl->contr, count);
1135 }
1123 1136
1124 /* link the object above us */ 1137 /* link the object above us */
1125 if (op->above) 1138 // re-link, make sure compiler can easily use cmove
1126 op->above->below = op->below; 1139 *(above ? &above->below : &ms.top) = below;
1127 else 1140 *(below ? &below->above : &ms.bot) = above;
1128 SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1129 1141
1130 /* Relink the object below us, if there is one */ 1142 above = 0;
1131 if (op->below) 1143 below = 0;
1132 op->below->above = op->above; 1144
1133 else 1145 ms.invalidate ();
1146
1147 if (map->in_memory == MAP_SAVING)
1148 return;
1149
1150 int check_walk_off = !flag [FLAG_NO_APPLY];
1151
1152 if (object *pl = ms.player ())
1134 { 1153 {
1135 /* Nothing below, which means we need to relink map object for this space 1154 if (pl->container_ () == this)
1136 * use translated coordinates in case some oddness with map tiling is 1155 /* If a container that the player is currently using somehow gets
1137 * evident 1156 * removed (most likely destroyed), update the player view
1157 * appropriately.
1138 */ 1158 */
1139 if (GET_MAP_OB (m, x, y) != op) 1159 pl->close_container ();
1140 {
1141 dump_object (op);
1142 LOG (llevError,
1143 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
1144 dump_object (GET_MAP_OB (m, x, y));
1145 LOG (llevError, "%s\n", errmsg);
1146 }
1147 1160
1148 SET_MAP_OB (m, x, y, op->above); /* goes on above it. */ 1161 //TODO: the floorbox prev/next might need updating
1162 //esrv_del_item (pl->contr, count);
1163 //TODO: update floorbox to preserve ordering
1164 if (pl->contr->ns)
1165 pl->contr->ns->floorbox_update ();
1149 } 1166 }
1150 1167
1151 op->above = 0; 1168 if (check_walk_off)
1152 op->below = 0; 1169 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1153
1154 if (op->map->in_memory == MAP_SAVING)
1155 return;
1156
1157 tag = op->count;
1158 check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1159
1160 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1161 { 1170 {
1171 above = tmp->above;
1172
1162 /* No point updating the players look faces if he is the object 1173 /* No point updating the players look faces if he is the object
1163 * being removed. 1174 * being removed.
1164 */
1165
1166 if (tmp->type == PLAYER && tmp != op)
1167 {
1168 /* If a container that the player is currently using somehow gets
1169 * removed (most likely destroyed), update the player view
1170 * appropriately.
1171 */ 1175 */
1172 if (tmp->container == op)
1173 {
1174 CLEAR_FLAG (op, FLAG_APPLIED);
1175 tmp->container = NULL;
1176 }
1177 1176
1178 tmp->contr->socket.update_look = 1; 1177 /* See if object moving off should effect something */
1178 if ((move_type & tmp->move_off)
1179 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1180 move_apply (tmp, this, 0);
1179 } 1181 }
1180 1182
1181 /* See if player moving off should effect something */ 1183 if (affects_los ())
1182 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183 {
1184 move_apply (tmp, op, NULL);
1185
1186 if (was_destroyed (op, tag))
1187 {
1188 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1189 }
1190 }
1191
1192 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193
1194 if (tmp->above == tmp)
1195 tmp->above = NULL;
1196
1197 last = tmp;
1198 }
1199
1200 /* last == NULL of there are no objects on this space */
1201 if (last == NULL)
1202 {
1203 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1204 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1205 * those out anyways, and if there are any flags set right now, they won't
1206 * be correct anyways.
1207 */
1208 SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1209 update_position (op->map, op->x, op->y);
1210 }
1211 else
1212 update_object (last, UP_OBJ_REMOVE);
1213
1214 if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1215 update_all_los (op->map, op->x, op->y); 1184 update_all_los (map, x, y);
1216 } 1185 }
1217} 1186}
1218 1187
1219/* 1188/*
1220 * merge_ob(op,top): 1189 * merge_ob(op,top):
1222 * This function goes through all objects below and including top, and 1191 * This function goes through all objects below and including top, and
1223 * merges op to the first matching object. 1192 * merges op to the first matching object.
1224 * If top is NULL, it is calculated. 1193 * If top is NULL, it is calculated.
1225 * Returns pointer to object if it succeded in the merge, otherwise NULL 1194 * Returns pointer to object if it succeded in the merge, otherwise NULL
1226 */ 1195 */
1227
1228object * 1196object *
1229merge_ob (object *op, object *top) 1197merge_ob (object *op, object *top)
1230{ 1198{
1231 if (!op->nrof) 1199 if (!op->nrof)
1232 return 0; 1200 return 0;
1233 1201
1234 if (top == NULL) 1202 if (!top)
1235 for (top = op; top != NULL && top->above != NULL; top = top->above); 1203 for (top = op; top && top->above; top = top->above)
1204 ;
1236 1205
1237 for (; top != NULL; top = top->below) 1206 for (; top; top = top->below)
1238 { 1207 if (object::can_merge (op, top))
1239 if (top == op)
1240 continue;
1241 if (CAN_MERGE (op, top))
1242 { 1208 {
1243 top->nrof += op->nrof; 1209 top->nrof += op->nrof;
1244 1210
1245/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1211 if (object *pl = top->visible_to ())
1246 op->weight = 0; /* Don't want any adjustements now */ 1212 esrv_update_item (UPD_NROF, pl, top);
1247 remove_ob (op); 1213
1248 free_object (op); 1214 op->weight = 0; // cancel the addition above
1215 op->carrying = 0; // must be 0 already
1216
1217 op->destroy ();
1218
1249 return top; 1219 return top;
1250 } 1220 }
1251 }
1252 1221
1253 return NULL; 1222 return 0;
1254} 1223}
1255 1224
1225void
1226object::expand_tail ()
1227{
1228 if (more)
1229 return;
1230
1231 object *prev = this;
1232
1233 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1234 {
1235 object *op = at->instance ();
1236
1237 op->name = name;
1238 op->name_pl = name_pl;
1239 op->title = title;
1240
1241 op->head = this;
1242 prev->more = op;
1243
1244 prev = op;
1245 }
1246}
1247
1256/* 1248/*
1257 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1249 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1258 * job preparing multi-part monsters 1250 * job preparing multi-part monsters.
1259 */ 1251 */
1260object * 1252object *
1261insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y) 1253insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1262{ 1254{
1263 object *tmp; 1255 op->remove ();
1264 1256
1265 if (op->head)
1266 op = op->head;
1267
1268 for (tmp = op; tmp; tmp = tmp->more) 1257 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1269 { 1258 {
1270 tmp->x = x + tmp->arch->clone.x; 1259 tmp->x = x + tmp->arch->x;
1271 tmp->y = y + tmp->arch->clone.y; 1260 tmp->y = y + tmp->arch->y;
1272 } 1261 }
1273 1262
1274 return insert_ob_in_map (op, m, originator, flag); 1263 return insert_ob_in_map (op, m, originator, flag);
1275} 1264}
1276 1265
1289 * Passing 0 for flag gives proper default values, so flag really only needs 1278 * Passing 0 for flag gives proper default values, so flag really only needs
1290 * to be set if special handling is needed. 1279 * to be set if special handling is needed.
1291 * 1280 *
1292 * Return value: 1281 * Return value:
1293 * new object if 'op' was merged with other object 1282 * new object if 'op' was merged with other object
1294 * NULL if 'op' was destroyed 1283 * NULL if there was an error (destroyed, blocked etc.)
1295 * just 'op' otherwise 1284 * just 'op' otherwise
1296 */ 1285 */
1297
1298object * 1286object *
1299insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1287insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1300{ 1288{
1301 object *tmp, *top, *floor = NULL; 1289 op->remove ();
1302 sint16 x, y;
1303 1290
1304 if (QUERY_FLAG (op, FLAG_FREED)) 1291 if (m == &freed_map)//D TODO: remove soon
1305 { 1292 {//D
1306 LOG (llevError, "Trying to insert freed object!\n"); 1293 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1307 return NULL;
1308 } 1294 }//D
1309
1310 if (m == NULL)
1311 {
1312 dump_object (op);
1313 LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1314 return op;
1315 }
1316
1317 if (out_of_map (m, op->x, op->y))
1318 {
1319 dump_object (op);
1320 LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1321#ifdef MANY_CORES
1322 /* Better to catch this here, as otherwise the next use of this object
1323 * is likely to cause a crash. Better to find out where it is getting
1324 * improperly inserted.
1325 */
1326 abort ();
1327#endif
1328 return op;
1329 }
1330
1331 if (!QUERY_FLAG (op, FLAG_REMOVED))
1332 {
1333 dump_object (op);
1334 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1335 return op;
1336 }
1337
1338 if (op->more != NULL)
1339 {
1340 /* The part may be on a different map. */
1341
1342 object *more = op->more;
1343
1344 /* We really need the caller to normalize coordinates - if
1345 * we set the map, that doesn't work if the location is within
1346 * a map and this is straddling an edge. So only if coordinate
1347 * is clear wrong do we normalize it.
1348 */
1349 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1350 more->map = get_map_from_coord (m, &more->x, &more->y);
1351 else if (!more->map)
1352 {
1353 /* For backwards compatibility - when not dealing with tiled maps,
1354 * more->map should always point to the parent.
1355 */
1356 more->map = m;
1357 }
1358
1359 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1360 {
1361 if (!op->head)
1362 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1363
1364 return NULL;
1365 }
1366 }
1367
1368 CLEAR_FLAG (op, FLAG_REMOVED);
1369 1295
1370 /* Ideally, the caller figures this out. However, it complicates a lot 1296 /* Ideally, the caller figures this out. However, it complicates a lot
1371 * of areas of callers (eg, anything that uses find_free_spot would now 1297 * of areas of callers (eg, anything that uses find_free_spot would now
1372 * need extra work 1298 * need extra work
1373 */ 1299 */
1374 op->map = get_map_from_coord (m, &op->x, &op->y); 1300 maptile *newmap = m;
1375 x = op->x; 1301 if (!xy_normalise (newmap, op->x, op->y))
1376 y = op->y; 1302 {
1303 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1304 return 0;
1305 }
1306
1307 if (object *more = op->more)
1308 if (!insert_ob_in_map (more, m, originator, flag))
1309 return 0;
1310
1311 op->flag [FLAG_REMOVED] = false;
1312 op->env = 0;
1313 op->map = newmap;
1314
1315 mapspace &ms = op->ms ();
1377 1316
1378 /* this has to be done after we translate the coordinates. 1317 /* this has to be done after we translate the coordinates.
1379 */ 1318 */
1380 if (op->nrof && !(flag & INS_NO_MERGE)) 1319 if (op->nrof && !(flag & INS_NO_MERGE))
1381 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1320 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1382 if (CAN_MERGE (op, tmp)) 1321 if (object::can_merge (op, tmp))
1383 { 1322 {
1323 // TODO: we actually want to update tmp, not op,
1324 // but some caller surely breaks when we return tmp
1325 // from here :/
1384 op->nrof += tmp->nrof; 1326 op->nrof += tmp->nrof;
1385 remove_ob (tmp); 1327 tmp->destroy ();
1386 free_object (tmp);
1387 } 1328 }
1388 1329
1389 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1330 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1390 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1331 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391 1332
1398 { 1339 {
1399 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1340 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1400 abort (); 1341 abort ();
1401 } 1342 }
1402 1343
1344 if (!originator->is_on_map ())
1345 {
1346 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1347 op->debug_desc (), originator->debug_desc ());
1348 abort ();
1349 }
1350
1403 op->above = originator; 1351 op->above = originator;
1404 op->below = originator->below; 1352 op->below = originator->below;
1405
1406 if (op->below)
1407 op->below->above = op;
1408 else
1409 SET_MAP_OB (op->map, op->x, op->y, op);
1410
1411 /* since *below* originator, no need to update top */
1412 originator->below = op; 1353 originator->below = op;
1354
1355 *(op->below ? &op->below->above : &ms.bot) = op;
1413 } 1356 }
1414 else 1357 else
1415 { 1358 {
1359 object *floor = 0;
1360 object *top = ms.top;
1361
1416 /* If there are other objects, then */ 1362 /* If there are other objects, then */
1417 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1363 if (top)
1418 { 1364 {
1419 object *last = NULL;
1420
1421 /* 1365 /*
1422 * If there are multiple objects on this space, we do some trickier handling. 1366 * If there are multiple objects on this space, we do some trickier handling.
1423 * We've already dealt with merging if appropriate. 1367 * We've already dealt with merging if appropriate.
1424 * Generally, we want to put the new object on top. But if 1368 * Generally, we want to put the new object on top. But if
1425 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1369 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1428 * once we get to them. This reduces the need to traverse over all of 1372 * once we get to them. This reduces the need to traverse over all of
1429 * them when adding another one - this saves quite a bit of cpu time 1373 * them when adding another one - this saves quite a bit of cpu time
1430 * when lots of spells are cast in one area. Currently, it is presumed 1374 * when lots of spells are cast in one area. Currently, it is presumed
1431 * that flying non pickable objects are spell objects. 1375 * that flying non pickable objects are spell objects.
1432 */ 1376 */
1433 1377 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1434 while (top != NULL)
1435 { 1378 {
1436 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1379 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1437 floor = top; 1380 floor = tmp;
1438 1381
1439 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1382 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1440 { 1383 {
1441 /* We insert above top, so we want this object below this */ 1384 /* We insert above top, so we want this object below this */
1442 top = top->below; 1385 top = tmp->below;
1443 break; 1386 break;
1444 } 1387 }
1445 1388
1446 last = top;
1447 top = top->above; 1389 top = tmp;
1448 } 1390 }
1449
1450 /* Don't want top to be NULL, so set it to the last valid object */
1451 top = last;
1452 1391
1453 /* We let update_position deal with figuring out what the space 1392 /* We let update_position deal with figuring out what the space
1454 * looks like instead of lots of conditions here. 1393 * looks like instead of lots of conditions here.
1455 * makes things faster, and effectively the same result. 1394 * makes things faster, and effectively the same result.
1456 */ 1395 */
1457 1396
1458 /* Have object 'fall below' other objects that block view. 1397 /* Have object 'fall below' other objects that block view.
1459 * Unless those objects are exits, type 66 1398 * Unless those objects are exits.
1460 * If INS_ON_TOP is used, don't do this processing 1399 * If INS_ON_TOP is used, don't do this processing
1461 * Need to find the object that in fact blocks view, otherwise 1400 * Need to find the object that in fact blocks view, otherwise
1462 * stacking is a bit odd. 1401 * stacking is a bit odd.
1463 */ 1402 */
1464 if (!(flag & INS_ON_TOP) && 1403 if (!(flag & INS_ON_TOP)
1465 (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1404 && ms.flags () & P_BLOCKSVIEW
1405 && (op->face && !faces [op->face].visibility))
1466 { 1406 {
1407 object *last;
1408
1467 for (last = top; last != floor; last = last->below) 1409 for (last = top; last != floor; last = last->below)
1468 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1410 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1469 break; 1411 break;
1412
1470 /* Check to see if we found the object that blocks view, 1413 /* Check to see if we found the object that blocks view,
1471 * and make sure we have a below pointer for it so that 1414 * and make sure we have a below pointer for it so that
1472 * we can get inserted below this one, which requires we 1415 * we can get inserted below this one, which requires we
1473 * set top to the object below us. 1416 * set top to the object below us.
1474 */ 1417 */
1475 if (last && last->below && last != floor) 1418 if (last && last->below && last != floor)
1476 top = last->below; 1419 top = last->below;
1477 } 1420 }
1478 } /* If objects on this space */ 1421 } /* If objects on this space */
1479 1422
1480 if (flag & INS_MAP_LOAD)
1481 top = GET_MAP_TOP (op->map, op->x, op->y);
1482
1483 if (flag & INS_ABOVE_FLOOR_ONLY) 1423 if (flag & INS_ABOVE_FLOOR_ONLY)
1484 top = floor; 1424 top = floor;
1485 1425
1486 /* Top is the object that our object (op) is going to get inserted above. 1426 // insert object above top, or bottom-most if top = 0
1487 */
1488
1489 /* First object on this space */
1490 if (!top) 1427 if (!top)
1491 { 1428 {
1492 op->above = GET_MAP_OB (op->map, op->x, op->y);
1493
1494 if (op->above)
1495 op->above->below = op;
1496
1497 op->below = NULL; 1429 op->below = 0;
1498 SET_MAP_OB (op->map, op->x, op->y, op); 1430 op->above = ms.bot;
1431 ms.bot = op;
1432
1433 *(op->above ? &op->above->below : &ms.top) = op;
1499 } 1434 }
1500 else 1435 else
1501 { /* get inserted into the stack above top */ 1436 {
1502 op->above = top->above; 1437 op->above = top->above;
1503
1504 if (op->above)
1505 op->above->below = op; 1438 top->above = op;
1506 1439
1507 op->below = top; 1440 op->below = top;
1508 top->above = op; 1441 *(op->above ? &op->above->below : &ms.top) = op;
1509 } 1442 }
1443 }
1510 1444
1511 if (op->above == NULL) 1445 if (op->is_player ())
1512 SET_MAP_TOP (op->map, op->x, op->y, op); 1446 {
1513 } /* else not INS_BELOW_ORIGINATOR */
1514
1515 if (op->type == PLAYER)
1516 op->contr->do_los = 1; 1447 op->contr->do_los = 1;
1448 ++op->map->players;
1449 op->map->touch ();
1450 }
1517 1451
1518 /* If we have a floor, we know the player, if any, will be above 1452 op->map->dirty = true;
1519 * it, so save a few ticks and start from there. 1453
1520 */ 1454 if (object *pl = ms.player ())
1521 if (!(flag & INS_MAP_LOAD)) 1455 //TODO: the floorbox prev/next might need updating
1522 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1456 //esrv_send_item (pl, op);
1523 if (tmp->type == PLAYER) 1457 //TODO: update floorbox to preserve ordering
1524 tmp->contr->socket.update_look = 1; 1458 if (pl->contr->ns)
1459 pl->contr->ns->floorbox_update ();
1525 1460
1526 /* If this object glows, it may affect lighting conditions that are 1461 /* If this object glows, it may affect lighting conditions that are
1527 * visible to others on this map. But update_all_los is really 1462 * visible to others on this map. But update_all_los is really
1528 * an inefficient way to do this, as it means los for all players 1463 * an inefficient way to do this, as it means los for all players
1529 * on the map will get recalculated. The players could very well 1464 * on the map will get recalculated. The players could very well
1530 * be far away from this change and not affected in any way - 1465 * be far away from this change and not affected in any way -
1531 * this should get redone to only look for players within range, 1466 * this should get redone to only look for players within range,
1532 * or just updating the P_NEED_UPDATE for spaces within this area 1467 * or just updating the P_UPTODATE for spaces within this area
1533 * of effect may be sufficient. 1468 * of effect may be sufficient.
1534 */ 1469 */
1535 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1470 if (op->affects_los ())
1471 {
1472 op->ms ().invalidate ();
1536 update_all_los (op->map, op->x, op->y); 1473 update_all_los (op->map, op->x, op->y);
1474 }
1537 1475
1538 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1476 /* updates flags (blocked, alive, no magic, etc) for this map space */
1539 update_object (op, UP_OBJ_INSERT); 1477 update_object (op, UP_OBJ_INSERT);
1540 1478
1479 INVOKE_OBJECT (INSERT, op);
1480
1541 /* Don't know if moving this to the end will break anything. However, 1481 /* Don't know if moving this to the end will break anything. However,
1542 * we want to have update_look set above before calling this. 1482 * we want to have floorbox_update called before calling this.
1543 * 1483 *
1544 * check_move_on() must be after this because code called from 1484 * check_move_on() must be after this because code called from
1545 * check_move_on() depends on correct map flags (so functions like 1485 * check_move_on() depends on correct map flags (so functions like
1546 * blocked() and wall() work properly), and these flags are updated by 1486 * blocked() and wall() work properly), and these flags are updated by
1547 * update_object(). 1487 * update_object().
1548 */ 1488 */
1549 1489
1550 /* if this is not the head or flag has been passed, don't check walk on status */ 1490 /* if this is not the head or flag has been passed, don't check walk on status */
1551 if (!(flag & INS_NO_WALK_ON) && !op->head) 1491 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1552 { 1492 {
1553 if (check_move_on (op, originator)) 1493 if (check_move_on (op, originator))
1554 return NULL; 1494 return 0;
1555 1495
1556 /* If we are a multi part object, lets work our way through the check 1496 /* If we are a multi part object, lets work our way through the check
1557 * walk on's. 1497 * walk on's.
1558 */ 1498 */
1559 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1499 for (object *tmp = op->more; tmp; tmp = tmp->more)
1560 if (check_move_on (tmp, originator)) 1500 if (check_move_on (tmp, originator))
1561 return NULL; 1501 return 0;
1562 } 1502 }
1563 1503
1564 return op; 1504 return op;
1565} 1505}
1566 1506
1567/* this function inserts an object in the map, but if it 1507/* this function inserts an object in the map, but if it
1568 * finds an object of its own type, it'll remove that one first. 1508 * finds an object of its own type, it'll remove that one first.
1569 * op is the object to insert it under: supplies x and the map. 1509 * op is the object to insert it under: supplies x and the map.
1570 */ 1510 */
1571void 1511void
1572replace_insert_ob_in_map (const char *arch_string, object *op) 1512replace_insert_ob_in_map (shstr_tmp archname, object *op)
1573{ 1513{
1574 object *
1575 tmp;
1576 object *
1577 tmp1;
1578
1579 /* first search for itself and remove any old instances */ 1514 /* first search for itself and remove any old instances */
1580 1515
1581 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1516 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1582 {
1583 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1517 if (tmp->arch->archname == archname) /* same archetype */
1584 { 1518 tmp->destroy ();
1585 remove_ob (tmp);
1586 free_object (tmp);
1587 }
1588 }
1589 1519
1590 tmp1 = arch_to_object (find_archetype (arch_string)); 1520 object *tmp = archetype::find (archname)->instance ();
1591 1521
1592 tmp1->x = op->x; 1522 tmp->x = op->x;
1593 tmp1->y = op->y; 1523 tmp->y = op->y;
1524
1594 insert_ob_in_map (tmp1, op->map, op, 0); 1525 insert_ob_in_map (tmp, op->map, op, 0);
1595} 1526}
1596
1597/*
1598 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1599 * is returned contains nr objects, and the remaining parts contains
1600 * the rest (or is removed and freed if that number is 0).
1601 * On failure, NULL is returned, and the reason put into the
1602 * global static errmsg array.
1603 */
1604 1527
1605object * 1528object *
1606get_split_ob (object *orig_ob, uint32 nr) 1529object::insert_at (object *where, object *originator, int flags)
1607{ 1530{
1608 object * 1531 if (where->env)
1609 newob; 1532 return where->env->insert (this);
1610 int 1533 else
1611 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1534 return where->map->insert (this, where->x, where->y, originator, flags);
1612
1613 if (orig_ob->nrof < nr)
1614 {
1615 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1616 return NULL;
1617 }
1618
1619 newob = object_create_clone (orig_ob);
1620
1621 if ((orig_ob->nrof -= nr) < 1)
1622 {
1623 if (!is_removed)
1624 remove_ob (orig_ob);
1625 free_object2 (orig_ob, 1);
1626 }
1627 else if (!is_removed)
1628 {
1629 if (orig_ob->env != NULL)
1630 sub_weight (orig_ob->env, orig_ob->weight * nr);
1631 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1632 {
1633 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1634 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1635 return NULL;
1636 }
1637 }
1638
1639 newob->nrof = nr;
1640
1641 return newob;
1642} 1535}
1643 1536
1537// check whether we can put this into the map, respect max_volume, max_items
1538bool
1539object::can_drop_at (maptile *m, int x, int y, object *originator)
1540{
1541 mapspace &ms = m->at (x, y);
1542
1543 int items = ms.items ();
1544
1545 if (!items // testing !items ensures we can drop at least one item
1546 || (items < m->max_items
1547 && ms.volume () < m->max_volume))
1548 return true;
1549
1550 if (originator && originator->is_player ())
1551 originator->contr->failmsg (format (
1552 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1553 query_name ()
1554 ));
1555
1556 return false;
1557}
1558
1644/* 1559/*
1645 * decrease_ob_nr(object, number) decreases a specified number from 1560 * decrease(object, number) decreases a specified number from
1646 * the amount of an object. If the amount reaches 0, the object 1561 * the amount of an object. If the amount reaches 0, the object
1647 * is subsequently removed and freed. 1562 * is subsequently removed and freed.
1648 * 1563 *
1649 * Return value: 'op' if something is left, NULL if the amount reached 0 1564 * Return value: 'op' if something is left, NULL if the amount reached 0
1650 */ 1565 */
1566bool
1567object::decrease (sint32 nr)
1568{
1569 if (!nr)
1570 return true;
1651 1571
1572 nr = min (nr, nrof);
1573
1574 if (nrof > nr)
1575 {
1576 nrof -= nr;
1577 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1578
1579 if (object *pl = visible_to ())
1580 esrv_update_item (UPD_NROF, pl, this);
1581
1582 return true;
1583 }
1584 else
1585 {
1586 destroy ();
1587 return false;
1588 }
1589}
1590
1591/*
1592 * split(ob,nr) splits up ob into two parts. The part which
1593 * is returned contains nr objects, and the remaining parts contains
1594 * the rest (or is removed and returned if that number is 0).
1595 * On failure, NULL is returned.
1596 */
1652object * 1597object *
1653decrease_ob_nr (object *op, uint32 i) 1598object::split (sint32 nr)
1654{ 1599{
1655 object *tmp; 1600 int have = number_of ();
1656 player *pl;
1657 1601
1658 if (i == 0) /* objects with op->nrof require this check */ 1602 if (have < nr)
1659 return op; 1603 return 0;
1660 1604 else if (have == nr)
1661 if (i > op->nrof)
1662 i = op->nrof;
1663
1664 if (QUERY_FLAG (op, FLAG_REMOVED))
1665 op->nrof -= i;
1666 else if (op->env != NULL)
1667 { 1605 {
1668 /* is this object in the players inventory, or sub container
1669 * therein?
1670 */
1671 tmp = is_player_inv (op->env);
1672 /* nope. Is this a container the player has opened?
1673 * If so, set tmp to that player.
1674 * IMO, searching through all the players will mostly
1675 * likely be quicker than following op->env to the map,
1676 * and then searching the map for a player.
1677 */
1678 if (!tmp)
1679 {
1680 for (pl = first_player; pl; pl = pl->next)
1681 if (pl->ob->container == op->env)
1682 break;
1683 if (pl)
1684 tmp = pl->ob;
1685 else
1686 tmp = NULL;
1687 }
1688
1689 if (i < op->nrof)
1690 {
1691 sub_weight (op->env, op->weight * i);
1692 op->nrof -= i;
1693 if (tmp)
1694 {
1695 esrv_send_item (tmp, op);
1696 }
1697 }
1698 else
1699 {
1700 remove_ob (op); 1606 remove ();
1701 op->nrof = 0; 1607 return this;
1702 if (tmp)
1703 {
1704 esrv_del_item (tmp->contr, op->count);
1705 }
1706 }
1707 } 1608 }
1708 else 1609 else
1709 { 1610 {
1710 object *above = op->above; 1611 decrease (nr);
1711 1612
1712 if (i < op->nrof) 1613 object *op = deep_clone ();
1713 op->nrof -= i; 1614 op->nrof = nr;
1714 else
1715 {
1716 remove_ob (op);
1717 op->nrof = 0;
1718 }
1719
1720 /* Since we just removed op, op->above is null */
1721 for (tmp = above; tmp != NULL; tmp = tmp->above)
1722 if (tmp->type == PLAYER)
1723 {
1724 if (op->nrof)
1725 esrv_send_item (tmp, op);
1726 else
1727 esrv_del_item (tmp->contr, op->count);
1728 }
1729 }
1730
1731 if (op->nrof)
1732 return op; 1615 return op;
1733 else
1734 { 1616 }
1735 free_object (op); 1617}
1618
1619object *
1620insert_ob_in_ob (object *op, object *where)
1621{
1622 if (!where)
1623 {
1624 char *dump = dump_object (op);
1625 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1626 free (dump);
1736 return NULL; 1627 return op;
1737 }
1738}
1739
1740/*
1741 * add_weight(object, weight) adds the specified weight to an object,
1742 * and also updates how much the environment(s) is/are carrying.
1743 */
1744
1745void
1746add_weight (object *op, signed long weight)
1747{
1748 while (op != NULL)
1749 { 1628 }
1750 if (op->type == CONTAINER)
1751 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1752 1629
1753 op->carrying += weight; 1630 if (where->head_ () != where)
1754 op = op->env;
1755 } 1631 {
1756} 1632 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1633 where = where->head;
1634 }
1757 1635
1636 return where->insert (op);
1637}
1638
1758/* 1639/*
1759 * insert_ob_in_ob(op,environment): 1640 * env->insert (op)
1760 * This function inserts the object op in the linked list 1641 * This function inserts the object op in the linked list
1761 * inside the object environment. 1642 * inside the object environment.
1762 * 1643 *
1763 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1764 * the inventory at the last position or next to other objects of the same
1765 * type.
1766 * Frank: Now sorted by type, archetype and magic!
1767 *
1768 * The function returns now pointer to inserted item, and return value can 1644 * The function returns now pointer to inserted item, and return value can
1769 * be != op, if items are merged. -Tero 1645 * be != op, if items are merged. -Tero
1770 */ 1646 */
1771
1772object * 1647object *
1773insert_ob_in_ob (object *op, object *where) 1648object::insert (object *op)
1774{ 1649{
1775 object *
1776 tmp, *
1777 otmp;
1778
1779 if (!QUERY_FLAG (op, FLAG_REMOVED))
1780 {
1781 dump_object (op);
1782 LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1783 return op;
1784 }
1785
1786 if (where == NULL)
1787 {
1788 dump_object (op);
1789 LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1790 return op;
1791 }
1792
1793 if (where->head)
1794 {
1795 LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1796 where = where->head;
1797 }
1798
1799 if (op->more) 1650 if (op->more)
1800 { 1651 {
1801 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1652 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1802 return op; 1653 return op;
1803 } 1654 }
1804 1655
1805 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1656 op->remove ();
1806 CLEAR_FLAG (op, FLAG_REMOVED); 1657
1658 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1659
1807 if (op->nrof) 1660 if (op->nrof)
1808 {
1809 for (tmp = where->inv; tmp != NULL; tmp = tmp->below) 1661 for (object *tmp = inv; tmp; tmp = tmp->below)
1810 if (CAN_MERGE (tmp, op)) 1662 if (object::can_merge (tmp, op))
1811 { 1663 {
1812 /* return the original object and remove inserted object 1664 /* return the original object and remove inserted object
1813 (client needs the original object) */ 1665 (client needs the original object) */
1814 tmp->nrof += op->nrof; 1666 tmp->nrof += op->nrof;
1815 /* Weight handling gets pretty funky. Since we are adding to 1667
1816 * tmp->nrof, we need to increase the weight. 1668 if (object *pl = tmp->visible_to ())
1817 */ 1669 esrv_update_item (UPD_NROF, pl, tmp);
1818 add_weight (where, op->weight * op->nrof); 1670
1819 SET_FLAG (op, FLAG_REMOVED); 1671 adjust_weight (this, op->total_weight ());
1820 free_object (op); /* free the inserted object */ 1672
1673 op->destroy ();
1821 op = tmp; 1674 op = tmp;
1822 remove_ob (op); /* and fix old object's links */ 1675 goto inserted;
1823 CLEAR_FLAG (op, FLAG_REMOVED);
1824 break;
1825 } 1676 }
1826 1677
1827 /* I assume combined objects have no inventory 1678 op->owner = 0; // it's his/hers now. period.
1828 * We add the weight - this object could have just been removed
1829 * (if it was possible to merge). calling remove_ob will subtract
1830 * the weight, so we need to add it in again, since we actually do
1831 * the linking below
1832 */
1833 add_weight (where, op->weight * op->nrof);
1834 }
1835 else
1836 add_weight (where, (op->weight + op->carrying));
1837
1838 otmp = is_player_inv (where);
1839 if (otmp && otmp->contr != NULL)
1840 {
1841 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1842 fix_player (otmp);
1843 }
1844
1845 op->map = NULL; 1679 op->map = 0;
1846 op->env = where; 1680 op->x = 0;
1681 op->y = 0;
1682
1847 op->above = NULL; 1683 op->above = 0;
1848 op->below = NULL; 1684 op->below = inv;
1849 op->x = 0, op->y = 0; 1685 op->env = this;
1850 1686
1687 if (inv)
1688 inv->above = op;
1689
1690 inv = op;
1691
1692 op->flag [FLAG_REMOVED] = 0;
1693
1694 if (object *pl = op->visible_to ())
1695 esrv_send_item (pl, op);
1696
1697 adjust_weight (this, op->total_weight ());
1698
1699inserted:
1851 /* reset the light list and los of the players on the map */ 1700 /* reset the light list and los of the players on the map */
1852 if ((op->glow_radius != 0) && where->map) 1701 if (op->glow_radius && is_on_map ())
1853 {
1854#ifdef DEBUG_LIGHTS
1855 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1856#endif /* DEBUG_LIGHTS */
1857 if (MAP_DARKNESS (where->map))
1858 update_all_los (where->map, where->x, where->y);
1859 } 1702 {
1860 1703 update_stats ();
1861 /* Client has no idea of ordering so lets not bother ordering it here. 1704 update_all_los (map, x, y);
1862 * It sure simplifies this function...
1863 */
1864 if (where->inv == NULL)
1865 where->inv = op;
1866 else
1867 { 1705 }
1868 op->below = where->inv; 1706 else if (is_player ())
1869 op->below->above = op; 1707 // if this is a player's inventory, update stats
1870 where->inv = op; 1708 contr->queue_stats_update ();
1871 } 1709
1710 INVOKE_OBJECT (INSERT, this);
1711
1872 return op; 1712 return op;
1873} 1713}
1874 1714
1875/* 1715/*
1876 * Checks if any objects has a move_type that matches objects 1716 * Checks if any objects has a move_type that matches objects
1890 * 1730 *
1891 * MSW 2001-07-08: Check all objects on space, not just those below 1731 * MSW 2001-07-08: Check all objects on space, not just those below
1892 * object being inserted. insert_ob_in_map may not put new objects 1732 * object being inserted. insert_ob_in_map may not put new objects
1893 * on top. 1733 * on top.
1894 */ 1734 */
1895
1896int 1735int
1897check_move_on (object *op, object *originator) 1736check_move_on (object *op, object *originator)
1898{ 1737{
1899 object *
1900 tmp;
1901 tag_t
1902 tag;
1903 mapstruct *
1904 m = op->map;
1905 int
1906 x = op->x, y = op->y;
1907
1908 MoveType
1909 move_on,
1910 move_slow,
1911 move_block;
1912
1913 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1738 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914 return 0; 1739 return 0;
1915 1740
1916 tag = op->count; 1741 object *tmp;
1742 maptile *m = op->map;
1743 int x = op->x, y = op->y;
1917 1744
1918 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1745 mapspace &ms = m->at (x, y);
1919 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1746
1920 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1747 ms.update ();
1748
1749 MoveType move_on = ms.move_on;
1750 MoveType move_slow = ms.move_slow;
1751 MoveType move_block = ms.move_block;
1921 1752
1922 /* if nothing on this space will slow op down or be applied, 1753 /* if nothing on this space will slow op down or be applied,
1923 * no need to do checking below. have to make sure move_type 1754 * no need to do checking below. have to make sure move_type
1924 * is set, as lots of objects don't have it set - we treat that 1755 * is set, as lots of objects don't have it set - we treat that
1925 * as walking. 1756 * as walking.
1936 return 0; 1767 return 0;
1937 1768
1938 /* The objects have to be checked from top to bottom. 1769 /* The objects have to be checked from top to bottom.
1939 * Hence, we first go to the top: 1770 * Hence, we first go to the top:
1940 */ 1771 */
1941 1772 for (object *next, *tmp = ms.top; tmp; tmp = next)
1942 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)
1943 {
1944 /* Trim the search when we find the first other spell effect
1945 * this helps performance so that if a space has 50 spell objects,
1946 * we don't need to check all of them.
1947 */
1948 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1949 break;
1950 } 1773 {
1774 next = tmp->below;
1951 1775
1952 for (; tmp; tmp = tmp->below)
1953 {
1954 if (tmp == op) 1776 if (tmp == op)
1955 continue; /* Can't apply yourself */ 1777 continue; /* Can't apply yourself */
1956 1778
1957 /* Check to see if one of the movement types should be slowed down. 1779 /* Check to see if one of the movement types should be slowed down.
1958 * Second check makes sure that the movement types not being slowed 1780 * Second check makes sure that the movement types not being slowed
1963 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1785 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1964 { 1786 {
1965 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1787 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1966 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1788 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1967 { 1789 {
1968
1969 float
1970 diff = tmp->move_slow_penalty * FABS (op->speed); 1790 float diff = tmp->move_slow_penalty * fabs (op->speed);
1971 1791
1972 if (op->type == PLAYER) 1792 if (op->is_player ())
1973 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1793 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1974 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1794 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1975 diff /= 4.0; 1795 diff /= 4.0;
1976 1796
1977 op->speed_left -= diff; 1797 op->speed_left -= diff;
1978 } 1798 }
1979 } 1799 }
1982 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1802 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1983 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1803 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984 { 1804 {
1985 move_apply (tmp, op, originator); 1805 move_apply (tmp, op, originator);
1986 1806
1987 if (was_destroyed (op, tag)) 1807 if (op->destroyed ())
1988 return 1; 1808 return 1;
1989 1809
1990 /* what the person/creature stepped onto has moved the object 1810 /* what the person/creature stepped onto has moved the object
1991 * someplace new. Don't process any further - if we did, 1811 * someplace new. Don't process any further - if we did,
1992 * have a feeling strange problems would result. 1812 * have a feeling strange problems would result.
2002/* 1822/*
2003 * present_arch(arch, map, x, y) searches for any objects with 1823 * present_arch(arch, map, x, y) searches for any objects with
2004 * a matching archetype at the given map and coordinates. 1824 * a matching archetype at the given map and coordinates.
2005 * The first matching object is returned, or NULL if none. 1825 * The first matching object is returned, or NULL if none.
2006 */ 1826 */
2007
2008object * 1827object *
2009present_arch (const archetype *at, mapstruct *m, int x, int y) 1828present_arch (const archetype *at, maptile *m, int x, int y)
2010{ 1829{
2011 object *
2012 tmp;
2013
2014 if (m == NULL || out_of_map (m, x, y)) 1830 if (!m || out_of_map (m, x, y))
2015 { 1831 {
2016 LOG (llevError, "Present_arch called outside map.\n"); 1832 LOG (llevError, "Present_arch called outside map.\n");
2017 return NULL; 1833 return NULL;
2018 } 1834 }
2019 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1835
2020 if (tmp->arch == at) 1836 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837 if (tmp->arch->archname == at->archname)
2021 return tmp; 1838 return tmp;
1839
2022 return NULL; 1840 return NULL;
2023} 1841}
2024 1842
2025/* 1843/*
2026 * present(type, map, x, y) searches for any objects with 1844 * present(type, map, x, y) searches for any objects with
2027 * a matching type variable at the given map and coordinates. 1845 * a matching type variable at the given map and coordinates.
2028 * The first matching object is returned, or NULL if none. 1846 * The first matching object is returned, or NULL if none.
2029 */ 1847 */
2030
2031object * 1848object *
2032present (unsigned char type, mapstruct *m, int x, int y) 1849present (unsigned char type, maptile *m, int x, int y)
2033{ 1850{
2034 object *
2035 tmp;
2036
2037 if (out_of_map (m, x, y)) 1851 if (out_of_map (m, x, y))
2038 { 1852 {
2039 LOG (llevError, "Present called outside map.\n"); 1853 LOG (llevError, "Present called outside map.\n");
2040 return NULL; 1854 return NULL;
2041 } 1855 }
2042 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1856
1857 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2043 if (tmp->type == type) 1858 if (tmp->type == type)
2044 return tmp; 1859 return tmp;
1860
2045 return NULL; 1861 return NULL;
2046} 1862}
2047 1863
2048/* 1864/*
2049 * present_in_ob(type, object) searches for any objects with 1865 * present_in_ob(type, object) searches for any objects with
2050 * a matching type variable in the inventory of the given object. 1866 * a matching type variable in the inventory of the given object.
2051 * The first matching object is returned, or NULL if none. 1867 * The first matching object is returned, or NULL if none.
2052 */ 1868 */
2053
2054object * 1869object *
2055present_in_ob (unsigned char type, const object *op) 1870present_in_ob (unsigned char type, const object *op)
2056{ 1871{
2057 object *
2058 tmp;
2059
2060 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1872 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2061 if (tmp->type == type) 1873 if (tmp->type == type)
2062 return tmp; 1874 return tmp;
1875
2063 return NULL; 1876 return NULL;
2064} 1877}
2065 1878
2066/* 1879/*
2067 * present_in_ob (type, str, object) searches for any objects with 1880 * present_in_ob (type, str, object) searches for any objects with
2075 * str is the string to match against. Note that we match against 1888 * str is the string to match against. Note that we match against
2076 * the object name, not the archetype name. this is so that the 1889 * the object name, not the archetype name. this is so that the
2077 * spell code can use one object type (force), but change it's name 1890 * spell code can use one object type (force), but change it's name
2078 * to be unique. 1891 * to be unique.
2079 */ 1892 */
2080
2081object * 1893object *
2082present_in_ob_by_name (int type, const char *str, const object *op) 1894present_in_ob_by_name (int type, const char *str, const object *op)
2083{ 1895{
2084 object *
2085 tmp;
2086
2087 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1896 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2088 {
2089 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 1897 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2090 return tmp; 1898 return tmp;
2091 } 1899
2092 return NULL; 1900 return 0;
2093} 1901}
2094 1902
2095/* 1903/*
2096 * present_arch_in_ob(archetype, object) searches for any objects with 1904 * present_arch_in_ob(archetype, object) searches for any objects with
2097 * a matching archetype in the inventory of the given object. 1905 * a matching archetype in the inventory of the given object.
2098 * The first matching object is returned, or NULL if none. 1906 * The first matching object is returned, or NULL if none.
2099 */ 1907 */
2100
2101object * 1908object *
2102present_arch_in_ob (const archetype *at, const object *op) 1909present_arch_in_ob (const archetype *at, const object *op)
2103{ 1910{
2104 object *
2105 tmp;
2106
2107 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1911 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2108 if (tmp->arch == at) 1912 if (tmp->arch->archname == at->archname)
2109 return tmp; 1913 return tmp;
1914
2110 return NULL; 1915 return NULL;
2111} 1916}
2112 1917
2113/* 1918/*
2114 * activate recursively a flag on an object inventory 1919 * activate recursively a flag on an object inventory
2115 */ 1920 */
2116void 1921void
2117flag_inv (object *op, int flag) 1922flag_inv (object *op, int flag)
2118{ 1923{
2119 object *
2120 tmp;
2121
2122 if (op->inv)
2123 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1924 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2124 { 1925 {
2125 SET_FLAG (tmp, flag); 1926 SET_FLAG (tmp, flag);
2126 flag_inv (tmp, flag); 1927 flag_inv (tmp, flag);
2127 } 1928 }
2128} /* 1929}
1930
1931/*
2129 * desactivate recursively a flag on an object inventory 1932 * deactivate recursively a flag on an object inventory
2130 */ 1933 */
2131void 1934void
2132unflag_inv (object *op, int flag) 1935unflag_inv (object *op, int flag)
2133{ 1936{
2134 object *
2135 tmp;
2136
2137 if (op->inv)
2138 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1937 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2139 { 1938 {
2140 CLEAR_FLAG (tmp, flag); 1939 CLEAR_FLAG (tmp, flag);
2141 unflag_inv (tmp, flag); 1940 unflag_inv (tmp, flag);
2142 } 1941 }
2143}
2144
2145/*
2146 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2147 * all it's inventory (recursively).
2148 * If checksums are used, a player will get set_cheat called for
2149 * him/her-self and all object carried by a call to this function.
2150 */
2151
2152void
2153set_cheat (object *op)
2154{
2155 SET_FLAG (op, FLAG_WAS_WIZ);
2156 flag_inv (op, FLAG_WAS_WIZ);
2157} 1942}
2158 1943
2159/* 1944/*
2160 * find_free_spot(object, map, x, y, start, stop) will search for 1945 * find_free_spot(object, map, x, y, start, stop) will search for
2161 * a spot at the given map and coordinates which will be able to contain 1946 * a spot at the given map and coordinates which will be able to contain
2163 * to search (see the freearr_x/y[] definition). 1948 * to search (see the freearr_x/y[] definition).
2164 * It returns a random choice among the alternatives found. 1949 * It returns a random choice among the alternatives found.
2165 * start and stop are where to start relative to the free_arr array (1,9 1950 * start and stop are where to start relative to the free_arr array (1,9
2166 * does all 4 immediate directions). This returns the index into the 1951 * does all 4 immediate directions). This returns the index into the
2167 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1952 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2168 * Note - this only checks to see if there is space for the head of the
2169 * object - if it is a multispace object, this should be called for all
2170 * pieces.
2171 * Note2: This function does correctly handle tiled maps, but does not 1953 * Note: This function does correctly handle tiled maps, but does not
2172 * inform the caller. However, insert_ob_in_map will update as 1954 * inform the caller. However, insert_ob_in_map will update as
2173 * necessary, so the caller shouldn't need to do any special work. 1955 * necessary, so the caller shouldn't need to do any special work.
2174 * Note - updated to take an object instead of archetype - this is necessary 1956 * Note - updated to take an object instead of archetype - this is necessary
2175 * because arch_blocked (now ob_blocked) needs to know the movement type 1957 * because arch_blocked (now ob_blocked) needs to know the movement type
2176 * to know if the space in question will block the object. We can't use 1958 * to know if the space in question will block the object. We can't use
2177 * the archetype because that isn't correct if the monster has been 1959 * the archetype because that isn't correct if the monster has been
2178 * customized, changed states, etc. 1960 * customized, changed states, etc.
2179 */ 1961 */
2180
2181int 1962int
2182find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop) 1963find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2183{ 1964{
2184 int
2185 i,
2186 index = 0, flag;
2187 static int
2188 altern[SIZEOFFREE]; 1965 int altern[SIZEOFFREE];
1966 int index = 0, flag;
2189 1967
2190 for (i = start; i < stop; i++) 1968 for (int i = start; i < stop; i++)
2191 { 1969 {
2192 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 1970 mapxy pos (m, x, y); pos.move (i);
2193 if (!flag) 1971
1972 if (!pos.normalise ())
1973 continue;
1974
1975 mapspace &ms = *pos;
1976
1977 if (ms.flags () & P_IS_ALIVE)
1978 continue;
1979
1980 /* However, often
1981 * ob doesn't have any move type (when used to place exits)
1982 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
1983 */
1984 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
1985 {
2194 altern[index++] = i; 1986 altern [index++] = i;
1987 continue;
1988 }
2195 1989
2196 /* Basically, if we find a wall on a space, we cut down the search size. 1990 /* Basically, if we find a wall on a space, we cut down the search size.
2197 * In this way, we won't return spaces that are on another side of a wall. 1991 * In this way, we won't return spaces that are on another side of a wall.
2198 * This mostly work, but it cuts down the search size in all directions - 1992 * This mostly work, but it cuts down the search size in all directions -
2199 * if the space being examined only has a wall to the north and empty 1993 * if the space being examined only has a wall to the north and empty
2200 * spaces in all the other directions, this will reduce the search space 1994 * spaces in all the other directions, this will reduce the search space
2201 * to only the spaces immediately surrounding the target area, and 1995 * to only the spaces immediately surrounding the target area, and
2202 * won't look 2 spaces south of the target space. 1996 * won't look 2 spaces south of the target space.
2203 */ 1997 */
2204 else if ((flag & AB_NO_PASS) && maxfree[i] < stop) 1998 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
1999 {
2205 stop = maxfree[i]; 2000 stop = maxfree[i];
2001 continue;
2002 }
2003
2004 /* Note it is intentional that we check ob - the movement type of the
2005 * head of the object should correspond for the entire object.
2006 */
2007 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2008 continue;
2009
2010 if (ob->blocked (pos.m, pos.x, pos.y))
2011 continue;
2012
2013 altern [index++] = i;
2206 } 2014 }
2015
2207 if (!index) 2016 if (!index)
2208 return -1; 2017 return -1;
2018
2209 return altern[RANDOM () % index]; 2019 return altern [rndm (index)];
2210} 2020}
2211 2021
2212/* 2022/*
2213 * find_first_free_spot(archetype, mapstruct, x, y) works like 2023 * find_first_free_spot(archetype, maptile, x, y) works like
2214 * find_free_spot(), but it will search max number of squares. 2024 * find_free_spot(), but it will search max number of squares.
2215 * But it will return the first available spot, not a random choice. 2025 * But it will return the first available spot, not a random choice.
2216 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2026 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2217 */ 2027 */
2218
2219int 2028int
2220find_first_free_spot (const object *ob, mapstruct *m, int x, int y) 2029find_first_free_spot (const object *ob, maptile *m, int x, int y)
2221{ 2030{
2222 int
2223 i;
2224
2225 for (i = 0; i < SIZEOFFREE; i++) 2031 for (int i = 0; i < SIZEOFFREE; i++)
2226 {
2227 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2032 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2228 return i; 2033 return i;
2229 } 2034
2230 return -1; 2035 return -1;
2231} 2036}
2232 2037
2233/* 2038/*
2234 * The function permute(arr, begin, end) randomly reorders the array 2039 * The function permute(arr, begin, end) randomly reorders the array
2235 * arr[begin..end-1]. 2040 * arr[begin..end-1].
2041 * now uses a fisher-yates shuffle, old permute was broken
2236 */ 2042 */
2237static void 2043static void
2238permute (int *arr, int begin, int end) 2044permute (int *arr, int begin, int end)
2239{ 2045{
2240 int 2046 arr += begin;
2241 i,
2242 j,
2243 tmp,
2244 len;
2245
2246 len = end - begin; 2047 end -= begin;
2247 for (i = begin; i < end; i++)
2248 {
2249 j = begin + RANDOM () % len;
2250 2048
2251 tmp = arr[i]; 2049 while (--end)
2252 arr[i] = arr[j]; 2050 swap (arr [end], arr [rndm (end + 1)]);
2253 arr[j] = tmp;
2254 }
2255} 2051}
2256 2052
2257/* new function to make monster searching more efficient, and effective! 2053/* new function to make monster searching more efficient, and effective!
2258 * This basically returns a randomized array (in the passed pointer) of 2054 * This basically returns a randomized array (in the passed pointer) of
2259 * the spaces to find monsters. In this way, it won't always look for 2055 * the spaces to find monsters. In this way, it won't always look for
2262 * the 3x3 area will be searched, just not in a predictable order. 2058 * the 3x3 area will be searched, just not in a predictable order.
2263 */ 2059 */
2264void 2060void
2265get_search_arr (int *search_arr) 2061get_search_arr (int *search_arr)
2266{ 2062{
2267 int 2063 int i;
2268 i;
2269 2064
2270 for (i = 0; i < SIZEOFFREE; i++) 2065 for (i = 0; i < SIZEOFFREE; i++)
2271 {
2272 search_arr[i] = i; 2066 search_arr[i] = i;
2273 }
2274 2067
2275 permute (search_arr, 1, SIZEOFFREE1 + 1); 2068 permute (search_arr, 1, SIZEOFFREE1 + 1);
2276 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2069 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2277 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2070 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2278} 2071}
2287 * Perhaps incorrectly, but I'm making the assumption that exclude 2080 * Perhaps incorrectly, but I'm making the assumption that exclude
2288 * is actually want is going to try and move there. We need this info 2081 * is actually want is going to try and move there. We need this info
2289 * because we have to know what movement the thing looking to move 2082 * because we have to know what movement the thing looking to move
2290 * there is capable of. 2083 * there is capable of.
2291 */ 2084 */
2292
2293int 2085int
2294find_dir (mapstruct *m, int x, int y, object *exclude) 2086find_dir (maptile *m, int x, int y, object *exclude)
2295{ 2087{
2296 int
2297 i,
2298 max = SIZEOFFREE, mflags; 2088 int max = SIZEOFFREE, mflags;
2299
2300 sint16 nx, ny;
2301 object *
2302 tmp;
2303 mapstruct *
2304 mp;
2305
2306 MoveType blocked, move_type; 2089 MoveType move_type;
2307 2090
2308 if (exclude && exclude->head) 2091 if (exclude && exclude->head_ () != exclude)
2309 { 2092 {
2310 exclude = exclude->head; 2093 exclude = exclude->head;
2311 move_type = exclude->move_type; 2094 move_type = exclude->move_type;
2312 } 2095 }
2313 else 2096 else
2314 { 2097 {
2315 /* If we don't have anything, presume it can use all movement types. */ 2098 /* If we don't have anything, presume it can use all movement types. */
2316 move_type = MOVE_ALL; 2099 move_type = MOVE_ALL;
2317 } 2100 }
2318 2101
2319 for (i = 1; i < max; i++) 2102 for (int i = 1; i < max; i++)
2320 { 2103 {
2321 mp = m; 2104 mapxy pos (m, x, y);
2322 nx = x + freearr_x[i]; 2105 pos.move (i);
2323 ny = y + freearr_y[i];
2324 2106
2325 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2107 if (!pos.normalise ())
2326 if (mflags & P_OUT_OF_MAP)
2327 {
2328 max = maxfree[i]; 2108 max = maxfree[i];
2329 }
2330 else 2109 else
2331 { 2110 {
2332 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2111 mapspace &ms = *pos;
2333 2112
2334 if ((move_type & blocked) == move_type) 2113 if ((move_type & ms.move_block) == move_type)
2114 max = maxfree [i];
2115 else if (ms.flags () & P_IS_ALIVE)
2335 { 2116 {
2336 max = maxfree[i]; 2117 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2337 } 2118 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2338 else if (mflags & P_IS_ALIVE) 2119 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2339 {
2340 for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)
2341 {
2342 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2343 {
2344 break;
2345 }
2346 }
2347 if (tmp)
2348 {
2349 return freedir[i]; 2120 return freedir [i];
2350 }
2351 } 2121 }
2352 } 2122 }
2353 } 2123 }
2124
2354 return 0; 2125 return 0;
2355} 2126}
2356 2127
2357/* 2128/*
2358 * distance(object 1, object 2) will return the square of the 2129 * distance(object 1, object 2) will return the square of the
2359 * distance between the two given objects. 2130 * distance between the two given objects.
2360 */ 2131 */
2361
2362int 2132int
2363distance (const object *ob1, const object *ob2) 2133distance (const object *ob1, const object *ob2)
2364{ 2134{
2365 int
2366 i;
2367
2368 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2135 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2369 return i;
2370} 2136}
2371 2137
2372/* 2138/*
2373 * find_dir_2(delta-x,delta-y) will return a direction in which 2139 * find_dir_2(delta-x,delta-y) will return a direction in which
2374 * an object which has subtracted the x and y coordinates of another 2140 * an object which has subtracted the x and y coordinates of another
2375 * object, needs to travel toward it. 2141 * object, needs to travel toward it.
2376 */ 2142 */
2377
2378int 2143int
2379find_dir_2 (int x, int y) 2144find_dir_2 (int x, int y)
2380{ 2145{
2381 int 2146 int q;
2382 q;
2383 2147
2384 if (y) 2148 if (y)
2385 q = x * 100 / y; 2149 q = x * 100 / y;
2386 else if (x) 2150 else if (x)
2387 q = -300 * x; 2151 q = -300 * x;
2412 2176
2413 return 3; 2177 return 3;
2414} 2178}
2415 2179
2416/* 2180/*
2417 * absdir(int): Returns a number between 1 and 8, which represent
2418 * the "absolute" direction of a number (it actually takes care of
2419 * "overflow" in previous calculations of a direction).
2420 */
2421
2422int
2423absdir (int d)
2424{
2425 while (d < 1)
2426 d += 8;
2427 while (d > 8)
2428 d -= 8;
2429 return d;
2430}
2431
2432/*
2433 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2181 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2434 * between two directions (which are expected to be absolute (see absdir()) 2182 * between two directions (which are expected to be absolute (see absdir())
2435 */ 2183 */
2436
2437int 2184int
2438dirdiff (int dir1, int dir2) 2185dirdiff (int dir1, int dir2)
2439{ 2186{
2440 int 2187 int d;
2441 d;
2442 2188
2443 d = abs (dir1 - dir2); 2189 d = abs (dir1 - dir2);
2444 if (d > 4) 2190 if (d > 4)
2445 d = 8 - d; 2191 d = 8 - d;
2192
2446 return d; 2193 return d;
2447} 2194}
2448 2195
2449/* peterm: 2196/* peterm:
2450 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2197 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2453 * This basically means that if direction is 15, then it could either go 2200 * This basically means that if direction is 15, then it could either go
2454 * direction 4, 14, or 16 to get back to where we are. 2201 * direction 4, 14, or 16 to get back to where we are.
2455 * Moved from spell_util.c to object.c with the other related direction 2202 * Moved from spell_util.c to object.c with the other related direction
2456 * functions. 2203 * functions.
2457 */ 2204 */
2458
2459int
2460 reduction_dir[SIZEOFFREE][3] = { 2205static const int reduction_dir[SIZEOFFREE][3] = {
2461 {0, 0, 0}, /* 0 */ 2206 {0, 0, 0}, /* 0 */
2462 {0, 0, 0}, /* 1 */ 2207 {0, 0, 0}, /* 1 */
2463 {0, 0, 0}, /* 2 */ 2208 {0, 0, 0}, /* 2 */
2464 {0, 0, 0}, /* 3 */ 2209 {0, 0, 0}, /* 3 */
2465 {0, 0, 0}, /* 4 */ 2210 {0, 0, 0}, /* 4 */
2513 * find a path to that monster that we found. If not, 2258 * find a path to that monster that we found. If not,
2514 * we don't bother going toward it. Returns 1 if we 2259 * we don't bother going toward it. Returns 1 if we
2515 * can see a direct way to get it 2260 * can see a direct way to get it
2516 * Modified to be map tile aware -.MSW 2261 * Modified to be map tile aware -.MSW
2517 */ 2262 */
2518
2519
2520int 2263int
2521can_see_monsterP (mapstruct *m, int x, int y, int dir) 2264can_see_monsterP (maptile *m, int x, int y, int dir)
2522{ 2265{
2523 sint16 dx, dy; 2266 sint16 dx, dy;
2524 int
2525 mflags; 2267 int mflags;
2526 2268
2527 if (dir < 0) 2269 if (dir < 0)
2528 return 0; /* exit condition: invalid direction */ 2270 return 0; /* exit condition: invalid direction */
2529 2271
2530 dx = x + freearr_x[dir]; 2272 dx = x + freearr_x[dir];
2543 return 0; 2285 return 0;
2544 2286
2545 /* yes, can see. */ 2287 /* yes, can see. */
2546 if (dir < 9) 2288 if (dir < 9)
2547 return 1; 2289 return 1;
2290
2548 return can_see_monsterP (m, x, y, reduction_dir[dir][0]) | 2291 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2549 can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]); 2292 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2293 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2550} 2294}
2551
2552
2553 2295
2554/* 2296/*
2555 * can_pick(picker, item): finds out if an object is possible to be 2297 * can_pick(picker, item): finds out if an object is possible to be
2556 * picked up by the picker. Returnes 1 if it can be 2298 * picked up by the picker. Returnes 1 if it can be
2557 * picked up, otherwise 0. 2299 * picked up, otherwise 0.
2559 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2301 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2560 * core dumps if they do. 2302 * core dumps if they do.
2561 * 2303 *
2562 * Add a check so we can't pick up invisible objects (0.93.8) 2304 * Add a check so we can't pick up invisible objects (0.93.8)
2563 */ 2305 */
2564
2565int 2306int
2566can_pick (const object *who, const object *item) 2307can_pick (const object *who, const object *item)
2567{ 2308{
2568 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2309 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2569 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2310 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2570 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2311 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2571} 2312}
2572
2573 2313
2574/* 2314/*
2575 * create clone from object to another 2315 * create clone from object to another
2576 */ 2316 */
2577object * 2317object *
2578object_create_clone (object *asrc) 2318object::deep_clone ()
2579{ 2319{
2580 object * 2320 assert (("deep_clone called on non-head object", is_head ()));
2581 dst = NULL, *tmp, *src, *part, *prev, *item;
2582 2321
2583 if (!asrc) 2322 object *dst = clone ();
2584 return NULL;
2585 src = asrc;
2586 if (src->head)
2587 src = src->head;
2588 2323
2589 prev = NULL; 2324 object *prev = dst;
2590 for (part = src; part; part = part->more) 2325 for (object *part = this->more; part; part = part->more)
2591 { 2326 {
2592 tmp = get_object (); 2327 object *tmp = part->clone ();
2593 copy_object (part, tmp);
2594 tmp->x -= src->x;
2595 tmp->y -= src->y;
2596 if (!part->head)
2597 {
2598 dst = tmp;
2599 tmp->head = NULL;
2600 }
2601 else
2602 {
2603 tmp->head = dst; 2328 tmp->head = dst;
2604 }
2605 tmp->more = NULL;
2606 if (prev)
2607 prev->more = tmp; 2329 prev->more = tmp;
2608 prev = tmp; 2330 prev = tmp;
2609 } 2331 }
2610 2332
2611 /*** copy inventory ***/
2612 for (item = src->inv; item; item = item->below) 2333 for (object *item = inv; item; item = item->below)
2613 { 2334 insert_ob_in_ob (item->deep_clone (), dst);
2614 (void) insert_ob_in_ob (object_create_clone (item), dst);
2615 }
2616 2335
2617 return dst; 2336 return dst;
2618}
2619
2620/* return true if the object was destroyed, 0 otherwise */
2621int
2622was_destroyed (const object *op, tag_t old_tag)
2623{
2624 /* checking for FLAG_FREED isn't necessary, but makes this function more
2625 * robust */
2626 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2627}
2628
2629/* GROS - Creates an object using a string representing its content. */
2630
2631/* Basically, we save the content of the string to a temp file, then call */
2632
2633/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2635/* but it was simple to make and allows reusing the load_object function. */
2636
2637/* Remember not to use load_object_str in a time-critical situation. */
2638
2639/* Also remember that multiparts objects are not supported for now. */
2640
2641object *
2642load_object_str (const char *obstr)
2643{
2644 object *
2645 op;
2646 char
2647 filename[MAX_BUF];
2648
2649 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650
2651 FILE *
2652 tempfile = fopen (filename, "w");
2653
2654 if (tempfile == NULL)
2655 {
2656 LOG (llevError, "Error - Unable to access load object temp file\n");
2657 return NULL;
2658 };
2659 fprintf (tempfile, obstr);
2660 fclose (tempfile);
2661
2662 op = get_object ();
2663
2664 object_thawer thawer (filename);
2665
2666 if (thawer)
2667 load_object (thawer, op, 0);
2668
2669 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2670 CLEAR_FLAG (op, FLAG_REMOVED);
2671
2672 return op;
2673} 2337}
2674 2338
2675/* This returns the first object in who's inventory that 2339/* This returns the first object in who's inventory that
2676 * has the same type and subtype match. 2340 * has the same type and subtype match.
2677 * returns NULL if no match. 2341 * returns NULL if no match.
2678 */ 2342 */
2679object * 2343object *
2680find_obj_by_type_subtype (const object *who, int type, int subtype) 2344find_obj_by_type_subtype (const object *who, int type, int subtype)
2681{ 2345{
2682 object *
2683 tmp;
2684
2685 for (tmp = who->inv; tmp; tmp = tmp->below) 2346 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2686 if (tmp->type == type && tmp->subtype == subtype) 2347 if (tmp->type == type && tmp->subtype == subtype)
2687 return tmp; 2348 return tmp;
2688 2349
2689 return NULL; 2350 return 0;
2690} 2351}
2691 2352
2692/* If ob has a field named key, return the link from the list, 2353shstr_tmp
2693 * otherwise return NULL. 2354object::kv_get (shstr_tmp key) const
2694 *
2695 * key must be a passed in shared string - otherwise, this won't
2696 * do the desired thing.
2697 */
2698key_value *
2699get_ob_key_link (const object *ob, const char *key)
2700{ 2355{
2701 key_value * 2356 for (key_value *kv = key_values; kv; kv = kv->next)
2702 link;
2703
2704 for (link = ob->key_values; link != NULL; link = link->next)
2705 {
2706 if (link->key == key) 2357 if (kv->key == key)
2358 return kv->value;
2359
2360 return shstr ();
2361}
2362
2363void
2364object::kv_set (shstr_tmp key, shstr_tmp value)
2365{
2366 for (key_value *kv = key_values; kv; kv = kv->next)
2367 if (kv->key == key)
2368 {
2369 kv->value = value;
2370 return;
2371 }
2372
2373 key_value *kv = new key_value;
2374
2375 kv->next = key_values;
2376 kv->key = key;
2377 kv->value = value;
2378
2379 key_values = kv;
2380}
2381
2382void
2383object::kv_del (shstr_tmp key)
2384{
2385 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2386 if ((*kvp)->key == key)
2387 {
2388 key_value *kv = *kvp;
2389 *kvp = (*kvp)->next;
2390 delete kv;
2391 return;
2392 }
2393}
2394
2395object::depth_iterator::depth_iterator (object *container)
2396: iterator_base (container)
2397{
2398 while (item->inv)
2399 item = item->inv;
2400}
2401
2402void
2403object::depth_iterator::next ()
2404{
2405 if (item->below)
2406 {
2407 item = item->below;
2408
2409 while (item->inv)
2410 item = item->inv;
2411 }
2412 else
2413 item = item->env;
2414}
2415
2416const char *
2417object::flag_desc (char *desc, int len) const
2418{
2419 char *p = desc;
2420 bool first = true;
2421
2422 *p = 0;
2423
2424 for (int i = 0; i < NUM_FLAGS; i++)
2425 {
2426 if (len <= 10) // magic constant!
2707 { 2427 {
2708 return link; 2428 snprintf (p, len, ",...");
2429 break;
2709 } 2430 }
2710 }
2711 2431
2712 return NULL; 2432 if (flag [i])
2713} 2433 {
2434 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2435 len -= cnt;
2436 p += cnt;
2437 first = false;
2438 }
2439 }
2714 2440
2715/* 2441 return desc;
2716 * Returns the value of op has an extra_field for key, or NULL. 2442}
2717 * 2443
2718 * The argument doesn't need to be a shared string. 2444// return a suitable string describing an object in enough detail to find it
2719 *
2720 * The returned string is shared.
2721 */
2722const char * 2445const char *
2723get_ob_key_value (const object *op, const char *const key) 2446object::debug_desc (char *info) const
2724{ 2447{
2725 key_value * 2448 char flagdesc[512];
2726 link; 2449 char info2[256 * 4];
2450 char *p = info;
2451
2452 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2453 count,
2454 uuid.c_str (),
2455 &name,
2456 title ? ",title:\"" : "",
2457 title ? (const char *)title : "",
2458 title ? "\"" : "",
2459 flag_desc (flagdesc, 512), type);
2460
2461 if (!flag[FLAG_REMOVED] && env)
2462 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2463
2464 if (map)
2465 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2466
2467 return info;
2468}
2469
2727 const char * 2470const char *
2728 canonical_key; 2471object::debug_desc () const
2472{
2473 static char info[3][256 * 4];
2474 static int info_idx;
2729 2475
2730 canonical_key = shstr::find (key); 2476 return debug_desc (info [++info_idx % 3]);
2477}
2731 2478
2732 if (canonical_key == NULL) 2479struct region *
2733 { 2480object::region () const
2734 /* 1. There being a field named key on any object 2481{
2735 * implies there'd be a shared string to find. 2482 return map ? map->region (x, y)
2736 * 2. Since there isn't, no object has this field. 2483 : region::default_region ();
2737 * 3. Therefore, *this* object doesn't have this field. 2484}
2738 */ 2485
2486void
2487object::open_container (object *new_container)
2488{
2489 if (container == new_container)
2739 return NULL; 2490 return;
2491
2492 object *old_container = container;
2493
2494 if (old_container)
2740 } 2495 {
2496 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2497 return;
2741 2498
2742 /* This is copied from get_ob_key_link() above - 2499#if 0
2743 * only 4 lines, and saves the function call overhead. 2500 // remove the "Close old_container" object.
2501 if (object *closer = old_container->inv)
2502 if (closer->type == CLOSE_CON)
2503 closer->destroy ();
2504#endif
2505
2506 // make sure the container is available
2507 esrv_send_item (this, old_container);
2508
2509 old_container->flag [FLAG_APPLIED] = false;
2510 container = 0;
2511
2512 // client needs item update to make it work, client bug requires this to be separate
2513 esrv_update_item (UPD_FLAGS, this, old_container);
2514
2515 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2516 play_sound (sound_find ("chest_close"));
2517 }
2518
2519 if (new_container)
2520 {
2521 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2522 return;
2523
2524 // TODO: this does not seem to serve any purpose anymore?
2525#if 0
2526 // insert the "Close Container" object.
2527 if (archetype *closer = new_container->other_arch)
2528 {
2529 object *closer = new_container->other_arch->instance ();
2530 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2531 new_container->insert (closer);
2532 }
2533#endif
2534
2535 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2536
2537 // make sure the container is available, client bug requires this to be separate
2538 esrv_send_item (this, new_container);
2539
2540 new_container->flag [FLAG_APPLIED] = true;
2541 container = new_container;
2542
2543 // client needs flag change
2544 esrv_update_item (UPD_FLAGS, this, new_container);
2545 esrv_send_inventory (this, new_container);
2546 play_sound (sound_find ("chest_open"));
2547 }
2548// else if (!old_container->env && contr && contr->ns)
2549// contr->ns->floorbox_reset ();
2550}
2551
2552object *
2553object::force_find (shstr_tmp name)
2554{
2555 /* cycle through his inventory to look for the MARK we want to
2556 * place
2744 */ 2557 */
2745 for (link = op->key_values; link != NULL; link = link->next) 2558 for (object *tmp = inv; tmp; tmp = tmp->below)
2746 { 2559 if (tmp->type == FORCE && tmp->slaying == name)
2747 if (link->key == canonical_key) 2560 return splay (tmp);
2748 { 2561
2749 return link->value;
2750 }
2751 }
2752 return NULL; 2562 return 0;
2753} 2563}
2754 2564
2565//-GPL
2755 2566
2756/* 2567void
2757 * Updates the canonical_key in op to value. 2568object::force_set_timer (int duration)
2758 *
2759 * canonical_key is a shared string (value doesn't have to be).
2760 *
2761 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2762 * keys.
2763 *
2764 * Returns TRUE on success.
2765 */
2766int
2767set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2768{ 2569{
2769 key_value * 2570 this->duration = 1;
2770 field = NULL, *last = NULL; 2571 this->speed_left = -1.f;
2771 2572
2772 for (field = op->key_values; field != NULL; field = field->next) 2573 this->set_speed (duration ? 1.f / duration : 0.f);
2773 { 2574}
2774 if (field->key != canonical_key)
2775 {
2776 last = field;
2777 continue;
2778 }
2779 2575
2780 if (value) 2576object *
2781 field->value = value; 2577object::force_add (shstr_tmp name, int duration)
2782 else 2578{
2783 { 2579 if (object *force = force_find (name))
2784 /* Basically, if the archetype has this key set, 2580 force->destroy ();
2785 * we need to store the null value so when we save
2786 * it, we save the empty value so that when we load,
2787 * we get this value back again.
2788 */
2789 if (get_ob_key_link (&op->arch->clone, canonical_key))
2790 field->value = 0;
2791 else
2792 {
2793 if (last)
2794 last->next = field->next;
2795 else
2796 op->key_values = field->next;
2797 2581
2798 delete field; 2582 object *force = get_archetype (FORCE_NAME);
2799 }
2800 }
2801 return TRUE;
2802 }
2803 /* IF we get here, key doesn't exist */
2804 2583
2805 /* No field, we'll have to add it. */ 2584 force->slaying = name;
2585 force->force_set_timer (duration);
2586 force->flag [FLAG_APPLIED] = true;
2806 2587
2807 if (!add_key) 2588 return insert (force);
2808 { 2589}
2809 return FALSE; 2590
2810 } 2591void
2811 /* There isn't any good reason to store a null 2592object::play_sound (faceidx sound) const
2812 * value in the key/value list. If the archetype has 2593{
2813 * this key, then we should also have it, so shouldn't 2594 if (!sound)
2814 * be here. If user wants to store empty strings,
2815 * should pass in ""
2816 */
2817 if (value == NULL)
2818 return TRUE; 2595 return;
2819 2596
2820 field = new key_value; 2597 if (is_on_map ())
2821 2598 map->play_sound (sound, x, y);
2822 field->key = canonical_key; 2599 else if (object *pl = in_player ())
2823 field->value = value; 2600 pl->contr->play_sound (sound);
2824 /* Usual prepend-addition. */
2825 field->next = op->key_values;
2826 op->key_values = field;
2827
2828 return TRUE;
2829} 2601}
2830 2602
2831/*
2832 * Updates the key in op to value.
2833 *
2834 * If add_key is FALSE, this will only update existing keys,
2835 * and not add new ones.
2836 * In general, should be little reason FALSE is ever passed in for add_key
2837 *
2838 * Returns TRUE on success.
2839 */
2840int
2841set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2842{
2843 shstr key_ (key);
2844
2845 return set_ob_key_value_s (op, key_, value, add_key);
2846}
2847
2848void 2603void
2849object::deep_iterator::next () 2604object::say_msg (const char *msg) const
2850{ 2605{
2851 if (item->inv) 2606 if (is_on_map ())
2852 item = item->inv; 2607 map->say_msg (msg, x, y);
2853 else if (item->below) 2608 else if (object *pl = in_player ())
2854 item = item->below; 2609 pl->contr->play_sound (sound);
2610}
2611
2612void
2613object::make_noise ()
2614{
2615 // we do not model noise in the map, so instead put
2616 // a temporary light into the noise source
2617 // could use the map instead, but that's less reliable for our
2618 // goal, which is to make invisibility a bit harder to exploit
2619
2620 // currently only works sensibly for players
2621 if (!is_player ())
2622 return;
2623
2624 // find old force, or create new one
2625 object *force = force_find (shstr_noise_force);
2626
2627 if (force)
2628 force->speed_left = -1.f; // patch old speed up
2855 else 2629 else
2856 item = item->env->below; 2630 {
2631 force = archetype::get (shstr_noise_force);
2632
2633 force->slaying = shstr_noise_force;
2634 force->stats.food = 1;
2635 force->speed_left = -1.f;
2636
2637 force->set_speed (1.f / 4.f);
2638 force->flag [FLAG_IS_USED_UP] = true;
2639 force->flag [FLAG_APPLIED] = true;
2640
2641 insert (force);
2642 }
2857} 2643}
2644
2645void object::change_move_type (MoveType mt)
2646{
2647 if (move_type == mt)
2648 return;
2649
2650 if (is_on_map ())
2651 {
2652 // we are on the map, so handle move_on/off effects
2653 remove ();
2654 move_type = mt;
2655 map->insert (this, x, y, this);
2656 }
2657 else
2658 move_type = mt;
2659}
2660

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines