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.13 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.336 by root, Wed Apr 28 11:19:09 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines