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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines