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.11 by root, Sun Sep 3 00:18:40 2006 UTC vs.
Revision 1.330 by root, Sun Apr 18 14:01:33 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.11 2006/09/03 00:18:40 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)
451 - weight_adjust_for (op, op->carrying - weight);
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 weight 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->ox=op->x,op->oy=op->y; 1158 x = env->x;
1164 op->map=op->env->map; 1159 y = env->y;
1165 op->above=NULL,op->below=NULL; 1160
1166 op->env=NULL; 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)
1167 return; 1232 return;
1168 }
1169 1233
1170 /* If we get here, we are removing it from a map */ 1234 int check_walk_off = !flag [FLAG_NO_APPLY];
1171 if (op->map == NULL) return;
1172 1235
1173 x = op->x; 1236 if (object *pl = ms.player ())
1174 y = op->y;
1175 m = get_map_from_coord(op->map, &x, &y);
1176
1177 if (!m) {
1178 LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1179 op->map->path, op->x, op->y);
1180 /* in old days, we used to set x and y to 0 and continue.
1181 * it seems if we get into this case, something is probablye
1182 * screwed up and should be fixed.
1183 */
1184 abort();
1185 }
1186 if (op->map != m) {
1187 LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1188 op->map->path, m->path, op->x, op->y, x, y);
1189 }
1190
1191 /* Re did the following section of code - it looks like it had
1192 * lots of logic for things we no longer care about
1193 */
1194
1195 /* link the object above us */
1196 if (op->above)
1197 op->above->below=op->below;
1198 else
1199 SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1200
1201 /* Relink the object below us, if there is one */
1202 if(op->below) {
1203 op->below->above=op->above;
1204 } else {
1205 /* Nothing below, which means we need to relink map object for this space
1206 * use translated coordinates in case some oddness with map tiling is
1207 * evident
1208 */
1209 if(GET_MAP_OB(m,x,y)!=op) {
1210 dump_object(op);
1211 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);
1212 dump_object(GET_MAP_OB(m,x,y));
1213 LOG(llevError,"%s\n",errmsg);
1214 } 1237 {
1215 SET_MAP_OB(m,x,y,op->above); /* goes on above it. */ 1238 if (pl->container_ () == this)
1216 }
1217 op->above=NULL;
1218 op->below=NULL;
1219
1220 if (op->map->in_memory == MAP_SAVING)
1221 return;
1222
1223 tag = op->count;
1224 check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);
1225 for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {
1226 /* No point updating the players look faces if he is the object
1227 * being removed.
1228 */
1229
1230 if(tmp->type==PLAYER && tmp!=op) {
1231 /* If a container that the player is currently using somehow gets 1239 /* If a container that the player is currently using somehow gets
1232 * removed (most likely destroyed), update the player view 1240 * removed (most likely destroyed), update the player view
1233 * appropriately. 1241 * appropriately.
1234 */ 1242 */
1235 if (tmp->container==op) { 1243 pl->close_container ();
1236 CLEAR_FLAG(op, FLAG_APPLIED); 1244
1237 tmp->container=NULL; 1245 //TODO: the floorbox prev/next might need updating
1238 } 1246 //esrv_del_item (pl->contr, count);
1239 tmp->contr->socket.update_look=1; 1247 //TODO: update floorbox to preserve ordering
1248 if (pl->contr->ns)
1249 pl->contr->ns->floorbox_update ();
1240 } 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
1241 /* See if player moving off should effect something */ 1261 /* See if object moving off should effect something */
1242 if (check_walk_off && ((op->move_type & tmp->move_off) && 1262 if ((move_type & tmp->move_off)
1243 (op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) { 1263 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1244
1245 move_apply(tmp, op, NULL); 1264 move_apply (tmp, this, 0);
1246 if (was_destroyed (op, tag)) {
1247 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "
1248 "leaving object\n", &tmp->name, &tmp->arch->name);
1249 } 1265 }
1250 }
1251 1266
1252 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1267 if (affects_los ())
1253
1254 if(tmp->above == tmp)
1255 tmp->above = NULL;
1256 last=tmp;
1257 }
1258 /* last == NULL of there are no objects on this space */
1259 if (last==NULL) {
1260 /* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1261 * we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1262 * those out anyways, and if there are any flags set right now, they won't
1263 * be correct anyways.
1264 */
1265 SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);
1266 update_position(op->map, op->x, op->y);
1267 }
1268 else
1269 update_object(last, UP_OBJ_REMOVE);
1270
1271 if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))
1272 update_all_los(op->map, op->x, op->y); 1268 update_all_los (map, x, y);
1273 1269 }
1274} 1270}
1275 1271
1276/* 1272/*
1277 * merge_ob(op,top): 1273 * merge_ob(op,top):
1278 * 1274 *
1279 * This function goes through all objects below and including top, and 1275 * This function goes through all objects below and including top, and
1280 * merges op to the first matching object. 1276 * merges op to the first matching object.
1281 * If top is NULL, it is calculated. 1277 * If top is NULL, it is calculated.
1282 * 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
1283 */ 1279 */
1284 1280object *
1285object *merge_ob(object *op, object *top) { 1281merge_ob (object *op, object *top)
1282{
1286 if(!op->nrof) 1283 if (!op->nrof)
1287 return 0; 1284 return 0;
1288 if(top==NULL) 1285
1286 if (!top)
1289 for(top=op;top!=NULL&&top->above!=NULL;top=top->above); 1287 for (top = op; top && top->above; top = top->above)
1288 ;
1289
1290 for(;top!=NULL;top=top->below) { 1290 for (; top; top = top->below)
1291 if(top==op) 1291 if (object::can_merge (op, top))
1292 continue;
1293 if (CAN_MERGE(op,top))
1294 { 1292 {
1295 top->nrof+=op->nrof; 1293 top->nrof += op->nrof;
1296/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1294
1297 op->weight = 0; /* Don't want any adjustements now */ 1295 if (object *pl = top->visible_to ())
1298 remove_ob(op); 1296 esrv_update_item (UPD_NROF, pl, top);
1299 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
1300 return top; 1303 return top;
1301 } 1304 }
1302 } 1305
1303 return NULL; 1306 return 0;
1304} 1307}
1305 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
1306/* 1332/*
1307 * 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
1308 * job preparing multi-part monsters 1334 * job preparing multi-part monsters.
1309 */ 1335 */
1336object *
1310object *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)
1311 object* tmp; 1338{
1312 if (op->head) 1339 op->remove ();
1313 op=op->head; 1340
1314 for (tmp=op;tmp;tmp=tmp->more){ 1341 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1342 {
1315 tmp->x=x+tmp->arch->clone.x; 1343 tmp->x = x + tmp->arch->x;
1316 tmp->y=y+tmp->arch->clone.y; 1344 tmp->y = y + tmp->arch->y;
1317 } 1345 }
1346
1318 return insert_ob_in_map (op, m, originator, flag); 1347 return insert_ob_in_map (op, m, originator, flag);
1319} 1348}
1320 1349
1321/* 1350/*
1322 * insert_ob_in_map (op, map, originator, flag): 1351 * insert_ob_in_map (op, map, originator, flag):
1323 * This function inserts the object in the two-way linked list 1352 * This function inserts the object in the two-way linked list
1333 * 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
1334 * to be set if special handling is needed. 1363 * to be set if special handling is needed.
1335 * 1364 *
1336 * Return value: 1365 * Return value:
1337 * new object if 'op' was merged with other object 1366 * new object if 'op' was merged with other object
1338 * NULL if 'op' was destroyed 1367 * NULL if there was an error (destroyed, blocked etc.)
1339 * just 'op' otherwise 1368 * just 'op' otherwise
1340 */ 1369 */
1341 1370object *
1342object *insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag) 1371insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1343{ 1372{
1344 object *tmp, *top, *floor=NULL; 1373 op->remove ();
1345 sint16 x,y;
1346 1374
1347 if (QUERY_FLAG (op, FLAG_FREED)) { 1375 if (m == &freed_map)//D TODO: remove soon
1348 LOG (llevError, "Trying to insert freed object!\n"); 1376 {//D
1349 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))
1350 } 1386 {
1351 if(m==NULL) { 1387 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1352 dump_object(op);
1353 LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1354 return op; 1388 return 0;
1355 } 1389 }
1356 if(out_of_map(m,op->x,op->y)) { 1390
1357 dump_object(op); 1391 if (object *more = op->more)
1358 LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg); 1392 if (!insert_ob_in_map (more, m, originator, flag))
1359#ifdef MANY_CORES
1360 /* Better to catch this here, as otherwise the next use of this object
1361 * is likely to cause a crash. Better to find out where it is getting
1362 * improperly inserted.
1363 */
1364 abort();
1365#endif
1366 return op; 1393 return 0;
1367 }
1368 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1369 dump_object(op);
1370 LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1371 return op;
1372 }
1373 if(op->more!=NULL) {
1374 /* The part may be on a different map. */
1375 1394
1376 object *more = op->more; 1395 op->flag [FLAG_REMOVED] = false;
1396 op->env = 0;
1397 op->map = newmap;
1377 1398
1378 /* We really need the caller to normalize coordinates - if 1399 mapspace &ms = op->ms ();
1379 * we set the map, that doesn't work if the location is within 1400
1380 * a map and this is straddling an edge. So only if coordinate 1401 /* this has to be done after we translate the coordinates.
1381 * 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))
1382 */ 1406 {
1383 if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) { 1407 // TODO: we actually want to update tmp, not op,
1384 /* Debugging information so you can see the last coordinates this object had */ 1408 // but some caller surely breaks when we return tmp
1385 more->ox = more->x; 1409 // from here :/
1386 more->oy = more->y; 1410 op->nrof += tmp->nrof;
1387 more->map = get_map_from_coord(m, &more->x, &more->y); 1411 tmp->destroy ();
1388 } else if (!more->map) {
1389 /* For backwards compatibility - when not dealing with tiled maps,
1390 * more->map should always point to the parent.
1391 */
1392 more->map = m;
1393 } 1412 }
1394 1413
1395 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 */
1396 if ( ! op->head) 1415 op->clr_flag (FLAG_INV_LOCKED);
1397 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1416
1398 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 ();
1399 } 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
1400 } 1442 {
1401 CLEAR_FLAG(op,FLAG_REMOVED); 1443 object *floor = 0;
1444 object *top = ms.top;
1402 1445
1403 /* Debugging information so you can see the last coordinates this object had */ 1446 /* If there are other objects, then */
1404 op->ox=op->x; 1447 if (top)
1405 op->oy=op->y; 1448 {
1449 /*
1450 * If there are multiple objects on this space, we do some trickier handling.
1451 * We've already dealt with merging if appropriate.
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 /* Ideally, the caller figures this out. However, it complicates a lot 1466 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1408 * of areas of callers (eg, anything that uses find_free_spot would now 1467 {
1409 * need extra work 1468 /* We insert above top, so we want this object below this */
1410 */ 1469 top = tmp->below;
1411 op->map=get_map_from_coord(m, &op->x, &op->y); 1470 break;
1412 x = op->x; 1471 }
1413 y = op->y;
1414 1472
1415 /* this has to be done after we translate the coordinates. 1473 top = tmp;
1416 */
1417 if(op->nrof && !(flag & INS_NO_MERGE)) {
1418 for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1419 if (CAN_MERGE(op,tmp)) {
1420 op->nrof+=tmp->nrof;
1421 remove_ob(tmp);
1422 free_object(tmp);
1423 } 1474 }
1424 }
1425 1475
1426 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
1427 CLEAR_FLAG(op, FLAG_INV_LOCKED); 1477 * looks like instead of lots of conditions here.
1428 if (!QUERY_FLAG(op, FLAG_ALIVE)) 1478 * makes things faster, and effectively the same result.
1429 CLEAR_FLAG(op, FLAG_NO_STEAL); 1479 */
1430 1480
1431 if (flag & INS_BELOW_ORIGINATOR) { 1481 /* Have object 'fall below' other objects that block view.
1432 if (originator->map != op->map || originator->x != op->x || 1482 * Unless those objects are exits.
1433 originator->y != op->y) { 1483 * If INS_ON_TOP is used, don't do this processing
1434 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
1435 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;
1436 } 1518 }
1437 op->above = originator;
1438 op->below = originator->below;
1439 if (op->below) op->below->above = op;
1440 else SET_MAP_OB(op->map, op->x, op->y, op);
1441 /* since *below* originator, no need to update top */
1442 originator->below = op;
1443 } else { 1519 else
1444 /* If there are other objects, then */
1445 if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1446 object *last=NULL;
1447 /*
1448 * If there are multiple objects on this space, we do some trickier handling.
1449 * We've already dealt with merging if appropriate.
1450 * Generally, we want to put the new object on top. But if
1451 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1452 * floor, we want to insert above that and no further.
1453 * Also, if there are spell objects on this space, we stop processing
1454 * once we get to them. This reduces the need to traverse over all of
1455 * them when adding another one - this saves quite a bit of cpu time
1456 * when lots of spells are cast in one area. Currently, it is presumed
1457 * that flying non pickable objects are spell objects.
1458 */
1459
1460 while (top != NULL) {
1461 if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1462 QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1463 if (QUERY_FLAG(top, FLAG_NO_PICK)
1464 && (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1465 && !QUERY_FLAG(top, FLAG_IS_FLOOR))
1466 {
1467 /* We insert above top, so we want this object below this */
1468 top=top->below;
1469 break;
1470 }
1471 last = top;
1472 top = top->above;
1473 }
1474 /* Don't want top to be NULL, so set it to the last valid object */
1475 top = last;
1476
1477 /* We let update_position deal with figuring out what the space
1478 * looks like instead of lots of conditions here.
1479 * makes things faster, and effectively the same result.
1480 */
1481
1482 /* Have object 'fall below' other objects that block view.
1483 * Unless those objects are exits, type 66
1484 * If INS_ON_TOP is used, don't do this processing
1485 * Need to find the object that in fact blocks view, otherwise
1486 * stacking is a bit odd.
1487 */
1488 if (!(flag & INS_ON_TOP) &&
1489 (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1490 (op->face && !op->face->visibility)) {
1491 for (last=top; last != floor; last=last->below)
1492 if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1493 /* Check to see if we found the object that blocks view,
1494 * and make sure we have a below pointer for it so that
1495 * we can get inserted below this one, which requires we
1496 * set top to the object below us.
1497 */
1498 if (last && last->below && last != floor) top=last->below;
1499 }
1500 } /* If objects on this space */
1501 if (flag & INS_MAP_LOAD)
1502 top = GET_MAP_TOP(op->map,op->x,op->y);
1503 if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1504
1505 /* Top is the object that our object (op) is going to get inserted above.
1506 */ 1520 {
1507
1508 /* First object on this space */
1509 if (!top) {
1510 op->above = GET_MAP_OB(op->map, op->x, op->y);
1511 if (op->above) op->above->below = op;
1512 op->below = NULL;
1513 SET_MAP_OB(op->map, op->x, op->y, op);
1514 } else { /* get inserted into the stack above top */
1515 op->above = top->above; 1521 op->above = top->above;
1516 if (op->above) op->above->below = op;
1517 op->below = top;
1518 top->above = op; 1522 top->above = op;
1523
1524 op->below = top;
1525 *(op->above ? &op->above->below : &ms.top) = op;
1519 } 1526 }
1520 if (op->above==NULL) 1527 }
1521 SET_MAP_TOP(op->map,op->x, op->y, op);
1522 } /* else not INS_BELOW_ORIGINATOR */
1523 1528
1524 if(op->type==PLAYER) 1529 if (op->is_player ())
1530 {
1525 op->contr->do_los=1; 1531 op->contr->do_los = 1;
1532 ++op->map->players;
1533 op->map->touch ();
1534 }
1526 1535
1527 /* If we have a floor, we know the player, if any, will be above 1536 op->map->dirty = true;
1528 * it, so save a few ticks and start from there.
1529 */
1530 if (!(flag & INS_MAP_LOAD))
1531 for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1532 if (tmp->type == PLAYER)
1533 tmp->contr->socket.update_look=1;
1534 }
1535 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
1536 /* If this object glows, it may affect lighting conditions that are 1545 /* If this object glows, it may affect lighting conditions that are
1537 * 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
1538 * 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
1539 * on the map will get recalculated. The players could very well 1548 * on the map will get recalculated. The players could very well
1540 * 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 -
1541 * this should get redone to only look for players within range, 1550 * this should get redone to only look for players within range,
1542 * or just updating the P_NEED_UPDATE for spaces within this area 1551 * or just updating the P_UPTODATE for spaces within this area
1543 * of effect may be sufficient. 1552 * of effect may be sufficient.
1544 */ 1553 */
1545 if(MAP_DARKNESS(op->map) && (op->glow_radius != 0)) 1554 if (op->affects_los ())
1555 {
1556 op->ms ().invalidate ();
1546 update_all_los(op->map, op->x, op->y); 1557 update_all_los (op->map, op->x, op->y);
1558 }
1547 1559
1548
1549 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1560 /* updates flags (blocked, alive, no magic, etc) for this map space */
1550 update_object(op,UP_OBJ_INSERT); 1561 update_object (op, UP_OBJ_INSERT);
1551 1562
1563 INVOKE_OBJECT (INSERT, op);
1552 1564
1553 /* 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,
1554 * we want to have update_look set above before calling this. 1566 * we want to have floorbox_update called before calling this.
1555 * 1567 *
1556 * check_move_on() must be after this because code called from 1568 * check_move_on() must be after this because code called from
1557 * check_move_on() depends on correct map flags (so functions like 1569 * check_move_on() depends on correct map flags (so functions like
1558 * blocked() and wall() work properly), and these flags are updated by 1570 * blocked() and wall() work properly), and these flags are updated by
1559 * update_object(). 1571 * update_object().
1560 */ 1572 */
1561 1573
1562 /* 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 */
1563
1564 if (!(flag & INS_NO_WALK_ON) && !op->head) { 1575 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1576 {
1565 if (check_move_on(op, originator)) 1577 if (check_move_on (op, originator))
1566 return NULL; 1578 return 0;
1567 1579
1568 /* If we are a multi part object, lets work our way through the check 1580 /* If we are a multi part object, lets work our way through the check
1569 * walk on's. 1581 * walk on's.
1570 */ 1582 */
1571 for (tmp=op->more; tmp!=NULL; tmp=tmp->more) 1583 for (object *tmp = op->more; tmp; tmp = tmp->more)
1572 if (check_move_on (tmp, originator)) 1584 if (check_move_on (tmp, originator))
1573 return NULL; 1585 return 0;
1574 } 1586 }
1587
1575 return op; 1588 return op;
1576} 1589}
1577 1590
1578/* this function inserts an object in the map, but if it 1591/* this function inserts an object in the map, but if it
1579 * 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.
1580 * 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.
1581 */ 1594 */
1582void replace_insert_ob_in_map(const char *arch_string, object *op) { 1595void
1583 object *tmp; 1596replace_insert_ob_in_map (shstr_tmp archname, object *op)
1584 object *tmp1; 1597{
1585
1586 /* first search for itself and remove any old instances */ 1598 /* first search for itself and remove any old instances */
1587 1599
1588 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)
1589 if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ { 1601 if (tmp->arch->archname == archname) /* same archetype */
1590 remove_ob(tmp); 1602 tmp->destroy ();
1591 free_object(tmp);
1592 }
1593 }
1594 1603
1595 tmp1=arch_to_object(find_archetype(arch_string)); 1604 object *tmp = archetype::find (archname)->instance ();
1596 1605
1597 1606 tmp->x = op->x;
1598 tmp1->x = op->x; tmp1->y = op->y; 1607 tmp->y = op->y;
1608
1599 insert_ob_in_map(tmp1,op->map,op,0); 1609 insert_ob_in_map (tmp, op->map, op, 0);
1600} 1610}
1601 1611
1602/* 1612object *
1603 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1613object::insert_at (object *where, object *originator, int flags)
1604 * is returned contains nr objects, and the remaining parts contains 1614{
1605 * the rest (or is removed and freed if that number is 0). 1615 if (where->env)
1606 * On failure, NULL is returned, and the reason put into the 1616 return where->env->insert (this);
1607 * global static errmsg array. 1617 else
1608 */ 1618 return where->map->insert (this, where->x, where->y, originator, flags);
1619}
1609 1620
1610object *get_split_ob(object *orig_ob, uint32 nr) { 1621// check whether we can put this into the map, respect max_volume, max_items
1611 object *newob; 1622bool
1612 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);
1613 1626
1614 if(orig_ob->nrof<nr) { 1627 int items = ms.items ();
1615 sprintf(errmsg,"There are only %d %ss.",
1616 orig_ob->nrof?orig_ob->nrof:1, &orig_ob->name);
1617 return NULL;
1618 }
1619 newob = object_create_clone(orig_ob);
1620 if((orig_ob->nrof-=nr)<1) {
1621 if ( ! is_removed)
1622 remove_ob(orig_ob);
1623 free_object2(orig_ob, 1);
1624 }
1625 else if ( ! is_removed) {
1626 if(orig_ob->env!=NULL)
1627 sub_weight (orig_ob->env,orig_ob->weight*nr);
1628 if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {
1629 strcpy(errmsg, "Tried to split object whose map is not in memory.");
1630 LOG(llevDebug,
1631 "Error, Tried to split object whose map is not in memory.\n");
1632 return NULL;
1633 }
1634 }
1635 newob->nrof=nr;
1636 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))
1637 return newob; 1632 return true;
1638}
1639 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
1640/* 1643/*
1641 * decrease_ob_nr(object, number) decreases a specified number from 1644 * decrease(object, number) decreases a specified number from
1642 * 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
1643 * is subsequently removed and freed. 1646 * is subsequently removed and freed.
1644 * 1647 *
1645 * 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
1646 */ 1649 */
1647 1650bool
1648object *decrease_ob_nr (object *op, uint32 i) 1651object::decrease (sint32 nr)
1649{ 1652{
1650 object *tmp; 1653 if (!nr)
1651 player *pl; 1654 return true;
1652 1655
1653 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;
1654 return op; 1699 return op;
1655
1656 if (i > op->nrof)
1657 i = op->nrof;
1658
1659 if (QUERY_FLAG (op, FLAG_REMOVED))
1660 { 1700 }
1661 op->nrof -= i; 1701}
1702
1703object *
1704insert_ob_in_ob (object *op, object *where)
1705{
1706 if (!where)
1662 } 1707 {
1663 else if (op->env != NULL) 1708 char *dump = dump_object (op);
1664 { 1709 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1665 /* is this object in the players inventory, or sub container 1710 free (dump);
1666 * therein?
1667 */
1668 tmp = is_player_inv (op->env);
1669 /* nope. Is this a container the player has opened?
1670 * If so, set tmp to that player.
1671 * IMO, searching through all the players will mostly
1672 * likely be quicker than following op->env to the map,
1673 * and then searching the map for a player.
1674 */
1675 if (!tmp) {
1676 for (pl=first_player; pl; pl=pl->next)
1677 if (pl->ob->container == op->env) break;
1678 if (pl) tmp=pl->ob;
1679 else tmp=NULL;
1680 }
1681
1682 if (i < op->nrof) {
1683 sub_weight (op->env, op->weight * i);
1684 op->nrof -= i;
1685 if (tmp) {
1686 esrv_send_item(tmp, op);
1687 }
1688 } else {
1689 remove_ob (op);
1690 op->nrof = 0;
1691 if (tmp) {
1692 esrv_del_item(tmp->contr, op->count);
1693 }
1694 }
1695 }
1696 else
1697 {
1698 object *above = op->above;
1699
1700 if (i < op->nrof) {
1701 op->nrof -= i;
1702 } else {
1703 remove_ob (op);
1704 op->nrof = 0;
1705 }
1706 /* Since we just removed op, op->above is null */
1707 for (tmp = above; tmp != NULL; tmp = tmp->above)
1708 if (tmp->type == PLAYER) {
1709 if (op->nrof)
1710 esrv_send_item(tmp, op);
1711 else
1712 esrv_del_item(tmp->contr, op->count);
1713 }
1714 }
1715
1716 if (op->nrof) {
1717 return op; 1711 return op;
1718 } else { 1712 }
1719 free_object (op); 1713
1720 return NULL; 1714 if (where->head_ () != where)
1721 } 1715 {
1722} 1716 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1723 1717 where = where->head;
1724/*
1725 * add_weight(object, weight) adds the specified weight to an object,
1726 * and also updates how much the environment(s) is/are carrying.
1727 */
1728
1729void add_weight (object *op, signed long weight) {
1730 while (op!=NULL) {
1731 if (op->type == CONTAINER) {
1732 weight=(signed long)(weight*(100-op->stats.Str)/100);
1733 }
1734 op->carrying+=weight;
1735 op=op->env;
1736 } 1718 }
1737}
1738 1719
1720 return where->insert (op);
1721}
1722
1739/* 1723/*
1740 * insert_ob_in_ob(op,environment): 1724 * env->insert (op)
1741 * This function inserts the object op in the linked list 1725 * This function inserts the object op in the linked list
1742 * inside the object environment. 1726 * inside the object environment.
1743 * 1727 *
1744 * Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1745 * the inventory at the last position or next to other objects of the same
1746 * type.
1747 * Frank: Now sorted by type, archetype and magic!
1748 *
1749 * 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
1750 * be != op, if items are merged. -Tero 1729 * be != op, if items are merged. -Tero
1751 */ 1730 */
1752 1731object *
1753object *insert_ob_in_ob(object *op,object *where) { 1732object::insert (object *op)
1754 object *tmp, *otmp; 1733{
1755
1756 if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1757 dump_object(op);
1758 LOG(llevError,"Trying to insert (ob) inserted object.\n%s\n", errmsg);
1759 return op;
1760 }
1761 if(where==NULL) {
1762 dump_object(op);
1763 LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);
1764 return op;
1765 }
1766 if (where->head) {
1767 LOG(llevDebug,
1768 "Warning: Tried to insert object wrong part of multipart object.\n");
1769 where = where->head;
1770 }
1771 if (op->more) { 1734 if (op->more)
1735 {
1772 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);
1773 &op->name, op->count);
1774 return op; 1737 return op;
1775 } 1738 }
1776 CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL); 1739
1777 CLEAR_FLAG(op, FLAG_REMOVED); 1740 op->remove ();
1741
1742 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1743
1778 if(op->nrof) { 1744 if (op->nrof)
1779 for(tmp=where->inv;tmp!=NULL;tmp=tmp->below) 1745 for (object *tmp = inv; tmp; tmp = tmp->below)
1780 if ( CAN_MERGE(tmp,op) ) { 1746 if (object::can_merge (tmp, op))
1747 {
1781 /* return the original object and remove inserted object 1748 /* return the original object and remove inserted object
1782 (client needs the original object) */ 1749 (client needs the original object) */
1783 tmp->nrof += op->nrof; 1750 tmp->nrof += op->nrof;
1784 /* Weight handling gets pretty funky. Since we are adding to 1751
1785 * tmp->nrof, we need to increase the weight. 1752 if (object *pl = tmp->visible_to ())
1786 */ 1753 esrv_update_item (UPD_NROF, pl, tmp);
1787 add_weight (where, op->weight*op->nrof); 1754
1788 SET_FLAG(op, FLAG_REMOVED); 1755 adjust_weight (this, op->total_weight ());
1789 free_object(op); /* free the inserted object */ 1756
1757 op->destroy ();
1790 op = tmp; 1758 op = tmp;
1791 remove_ob (op); /* and fix old object's links */ 1759 goto inserted;
1792 CLEAR_FLAG(op, FLAG_REMOVED);
1793 break;
1794 } 1760 }
1795 1761
1796 /* I assume combined objects have no inventory 1762 op->owner = 0; // it's his/hers now. period.
1797 * We add the weight - this object could have just been removed 1763 op->map = 0;
1798 * (if it was possible to merge). calling remove_ob will subtract 1764 op->x = 0;
1799 * the weight, so we need to add it in again, since we actually do 1765 op->y = 0;
1800 * the linking below
1801 */
1802 add_weight (where, op->weight*op->nrof);
1803 } else
1804 add_weight (where, (op->weight+op->carrying));
1805 1766
1806 otmp=is_player_inv(where);
1807 if (otmp&&otmp->contr!=NULL) {
1808 if (!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1809 fix_player(otmp);
1810 }
1811
1812 op->map=NULL;
1813 op->env=where;
1814 op->above=NULL; 1767 op->above = 0;
1815 op->below=NULL; 1768 op->below = inv;
1816 op->x=0,op->y=0; 1769 op->env = this;
1817 op->ox=0,op->oy=0;
1818 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:
1819 /* 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 */
1820 if((op->glow_radius!=0)&&where->map) 1785 if (op->glow_radius && is_on_map ())
1821 { 1786 {
1822#ifdef DEBUG_LIGHTS 1787 update_stats ();
1823 LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", 1788 update_all_los (map, x, y);
1824 op->name);
1825#endif /* DEBUG_LIGHTS */
1826 if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);
1827 } 1789 }
1790 else if (is_player ())
1791 // if this is a player's inventory, update stats
1792 contr->queue_stats_update ();
1828 1793
1829 /* Client has no idea of ordering so lets not bother ordering it here. 1794 INVOKE_OBJECT (INSERT, this);
1830 * It sure simplifies this function... 1795
1831 */
1832 if (where->inv==NULL)
1833 where->inv=op;
1834 else {
1835 op->below = where->inv;
1836 op->below->above = op;
1837 where->inv = op;
1838 }
1839 return op; 1796 return op;
1840} 1797}
1841 1798
1842/* 1799/*
1843 * Checks if any objects has a move_type that matches objects 1800 * Checks if any objects has a move_type that matches objects
1857 * 1814 *
1858 * 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
1859 * 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
1860 * on top. 1817 * on top.
1861 */ 1818 */
1862 1819int
1863int check_move_on (object *op, object *originator) 1820check_move_on (object *op, object *originator)
1864{ 1821{
1822 if (op->flag [FLAG_NO_APPLY])
1823 return 0;
1824
1865 object *tmp; 1825 object *tmp;
1866 tag_t tag;
1867 mapstruct *m=op->map; 1826 maptile *m = op->map;
1868 int x=op->x, y=op->y; 1827 int x = op->x, y = op->y;
1869 MoveType move_on, move_slow, move_block;
1870 1828
1871 if(QUERY_FLAG(op,FLAG_NO_APPLY)) 1829 mapspace &ms = m->at (x, y);
1872 return 0;
1873 1830
1874 tag = op->count; 1831 ms.update ();
1875 1832
1876 move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y); 1833 MoveType move_on = ms.move_on;
1877 move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y); 1834 MoveType move_slow = ms.move_slow;
1878 move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y); 1835 MoveType move_block = ms.move_block;
1879 1836
1880 /* 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,
1881 * 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
1882 * 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
1883 * as walking. 1840 * as walking.
1884 */ 1841 */
1885 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))
1886 return 0; 1843 return 0;
1887 1844
1888 /* This is basically inverse logic of that below - basically, 1845 /* This is basically inverse logic of that below - basically,
1889 * 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,
1890 * 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
1891 * blocked. Logic on this seems confusing, but does seem correct. 1848 * blocked. Logic on this seems confusing, but does seem correct.
1892 */ 1849 */
1893 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)
1894 (op->move_type & ~move_slow & ~move_block) != 0) return 0; 1851 return 0;
1895 1852
1896 /* The objects have to be checked from top to bottom. 1853 /* The objects have to be checked from top to bottom.
1897 * Hence, we first go to the top: 1854 * Hence, we first go to the top:
1898 */ 1855 */
1899 1856 for (object *next, *tmp = ms.top; tmp; tmp = next)
1900 for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&
1901 tmp->above!=NULL; tmp=tmp->above) {
1902 /* Trim the search when we find the first other spell effect
1903 * this helps performance so that if a space has 50 spell objects,
1904 * we don't need to check all of them.
1905 */
1906 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;
1907 } 1857 {
1908 for(;tmp!=NULL; tmp=tmp->below) { 1858 next = tmp->below;
1859
1860 if (tmp == op)
1909 if (tmp == op) continue; /* Can't apply yourself */ 1861 continue; /* Can't apply yourself */
1910 1862
1911 /* 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.
1912 * Second check makes sure that the movement types not being slowed 1864 * Second check makes sure that the movement types not being slowed
1913 * (~slow_move) is not blocked on this space - just because the 1865 * (~slow_move) is not blocked on this space - just because the
1914 * 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
1915 * 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.
1916 */ 1868 */
1917 if (!QUERY_FLAG(op, FLAG_WIZPASS)) { 1869 if (!op->flag [FLAG_WIZPASS])
1870 {
1918 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1871 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1919 ((op->move_type & tmp->move_slow) &&
1920 (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))
1921 1873 {
1922 float diff;
1923
1924 diff = tmp->move_slow_penalty*FABS(op->speed); 1874 float diff = tmp->move_slow_penalty * fabs (op->speed);
1925 if (op->type == PLAYER) { 1875
1876 if (op->is_player ())
1926 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)) ||
1927 (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)))
1928 diff /= 4.0; 1879 diff /= 4.0;
1929 } 1880
1930 }
1931 op->speed_left -= diff; 1881 op->speed_left -= diff;
1932 } 1882 }
1933 } 1883 }
1934 1884
1935 /* Basically same logic as above, except now for actual apply. */ 1885 /* Basically same logic as above, except now for actual apply. */
1936 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1886 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1937 ((op->move_type & tmp->move_on) &&
1938 (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))
1939 1888 {
1940 move_apply(tmp, op, originator); 1889 move_apply (tmp, op, originator);
1890
1941 if (was_destroyed (op, tag)) 1891 if (op->destroyed ())
1942 return 1; 1892 return 1;
1943 1893
1944 /* what the person/creature stepped onto has moved the object 1894 /* what the person/creature stepped onto has moved the object
1945 * someplace new. Don't process any further - if we did, 1895 * someplace new. Don't process any further - if we did,
1946 * have a feeling strange problems would result. 1896 * have a feeling strange problems would result.
1947 */ 1897 */
1948 if (op->map != m || op->x != x || op->y != y) return 0; 1898 if (op->map != m || op->x != x || op->y != y)
1899 return 0;
1949 } 1900 }
1950 } 1901 }
1902
1951 return 0; 1903 return 0;
1952} 1904}
1953 1905
1954/* 1906/*
1955 * present_arch(arch, map, x, y) searches for any objects with 1907 * present_arch(arch, map, x, y) searches for any objects with
1956 * a matching archetype at the given map and coordinates. 1908 * a matching archetype at the given map and coordinates.
1957 * The first matching object is returned, or NULL if none. 1909 * The first matching object is returned, or NULL if none.
1958 */ 1910 */
1959 1911object *
1960object *present_arch(const archetype *at, mapstruct *m, int x, int y) { 1912present_arch (const archetype *at, maptile *m, int x, int y)
1961 object *tmp; 1913{
1962 if(m==NULL || out_of_map(m,x,y)) { 1914 if (!m || out_of_map (m, x, y))
1915 {
1963 LOG(llevError,"Present_arch called outside map.\n"); 1916 LOG (llevError, "Present_arch called outside map.\n");
1964 return NULL; 1917 return NULL;
1965 } 1918 }
1966 for(tmp=GET_MAP_OB(m,x,y); tmp != NULL; tmp = tmp->above) 1919
1967 if(tmp->arch == at) 1920 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1921 if (tmp->arch->archname == at->archname)
1968 return tmp; 1922 return tmp;
1923
1969 return NULL; 1924 return NULL;
1970} 1925}
1971 1926
1972/* 1927/*
1973 * present(type, map, x, y) searches for any objects with 1928 * present(type, map, x, y) searches for any objects with
1974 * a matching type variable at the given map and coordinates. 1929 * a matching type variable at the given map and coordinates.
1975 * The first matching object is returned, or NULL if none. 1930 * The first matching object is returned, or NULL if none.
1976 */ 1931 */
1977 1932object *
1978object *present(unsigned char type,mapstruct *m, int x,int y) { 1933present (unsigned char type, maptile *m, int x, int y)
1979 object *tmp; 1934{
1980 if(out_of_map(m,x,y)) { 1935 if (out_of_map (m, x, y))
1936 {
1981 LOG(llevError,"Present called outside map.\n"); 1937 LOG (llevError, "Present called outside map.\n");
1982 return NULL; 1938 return NULL;
1983 } 1939 }
1984 for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) 1940
1941 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1985 if(tmp->type==type) 1942 if (tmp->type == type)
1986 return tmp; 1943 return tmp;
1944
1987 return NULL; 1945 return NULL;
1988} 1946}
1989 1947
1990/* 1948/*
1991 * present_in_ob(type, object) searches for any objects with 1949 * present_in_ob(type, object) searches for any objects with
1992 * a matching type variable in the inventory of the given object. 1950 * a matching type variable in the inventory of the given object.
1993 * The first matching object is returned, or NULL if none. 1951 * The first matching object is returned, or NULL if none.
1994 */ 1952 */
1995 1953object *
1996object *present_in_ob(unsigned char type, const object *op) { 1954present_in_ob (unsigned char type, const object *op)
1997 object *tmp; 1955{
1998 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) 1956 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1999 if(tmp->type==type) 1957 if (tmp->type == type)
2000 return tmp; 1958 return tmp;
1959
2001 return NULL; 1960 return NULL;
2002} 1961}
2003 1962
2004/* 1963/*
2005 * present_in_ob (type, str, object) searches for any objects with 1964 * present_in_ob (type, str, object) searches for any objects with
2013 * str is the string to match against. Note that we match against 1972 * str is the string to match against. Note that we match against
2014 * the object name, not the archetype name. this is so that the 1973 * the object name, not the archetype name. this is so that the
2015 * spell code can use one object type (force), but change it's name 1974 * spell code can use one object type (force), but change it's name
2016 * to be unique. 1975 * to be unique.
2017 */ 1976 */
2018 1977object *
2019object *present_in_ob_by_name(int type, const char *str, const object *op) { 1978present_in_ob_by_name (int type, const char *str, const object *op)
2020 object *tmp; 1979{
2021
2022 for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 1980 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2023 if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name))) 1981 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2024 return tmp; 1982 return tmp;
2025 } 1983
2026 return NULL; 1984 return 0;
2027} 1985}
2028 1986
2029/* 1987/*
2030 * present_arch_in_ob(archetype, object) searches for any objects with 1988 * present_arch_in_ob(archetype, object) searches for any objects with
2031 * a matching archetype in the inventory of the given object. 1989 * a matching archetype in the inventory of the given object.
2032 * The first matching object is returned, or NULL if none. 1990 * The first matching object is returned, or NULL if none.
2033 */ 1991 */
2034 1992object *
2035object *present_arch_in_ob(const archetype *at, const object *op) { 1993present_arch_in_ob (const archetype *at, const object *op)
2036 object *tmp; 1994{
2037 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) 1995 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2038 if( tmp->arch == at) 1996 if (tmp->arch->archname == at->archname)
2039 return tmp; 1997 return tmp;
1998
2040 return NULL; 1999 return NULL;
2041} 2000}
2042 2001
2043/* 2002/*
2044 * activate recursively a flag on an object inventory 2003 * activate recursively a flag on an object inventory
2045 */ 2004 */
2005void
2046void flag_inv(object*op, int flag){ 2006flag_inv (object *op, int flag)
2047 object *tmp; 2007{
2048 if(op->inv)
2049 for(tmp = op->inv; tmp != NULL; tmp = tmp->below){ 2008 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2050 SET_FLAG(tmp, flag); 2009 {
2010 tmp->set_flag (flag);
2051 flag_inv(tmp,flag); 2011 flag_inv (tmp, flag);
2052 } 2012 }
2013}
2014
2053}/* 2015/*
2054 * desactivate recursively a flag on an object inventory 2016 * deactivate recursively a flag on an object inventory
2055 */ 2017 */
2018void
2056void unflag_inv(object*op, int flag){ 2019unflag_inv (object *op, int flag)
2057 object *tmp; 2020{
2058 if(op->inv)
2059 for(tmp = op->inv; tmp != NULL; tmp = tmp->below){ 2021 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2060 CLEAR_FLAG(tmp, flag); 2022 {
2023 tmp->clr_flag (flag);
2061 unflag_inv(tmp,flag); 2024 unflag_inv (tmp, flag);
2062 } 2025 }
2063}
2064
2065/*
2066 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2067 * all it's inventory (recursively).
2068 * If checksums are used, a player will get set_cheat called for
2069 * him/her-self and all object carried by a call to this function.
2070 */
2071
2072void set_cheat(object *op) {
2073 SET_FLAG(op, FLAG_WAS_WIZ);
2074 flag_inv(op, FLAG_WAS_WIZ);
2075} 2026}
2076 2027
2077/* 2028/*
2078 * find_free_spot(object, map, x, y, start, stop) will search for 2029 * find_free_spot(object, map, x, y, start, stop) will search for
2079 * a spot at the given map and coordinates which will be able to contain 2030 * a spot at the given map and coordinates which will be able to contain
2081 * to search (see the freearr_x/y[] definition). 2032 * to search (see the freearr_x/y[] definition).
2082 * It returns a random choice among the alternatives found. 2033 * It returns a random choice among the alternatives found.
2083 * start and stop are where to start relative to the free_arr array (1,9 2034 * start and stop are where to start relative to the free_arr array (1,9
2084 * does all 4 immediate directions). This returns the index into the 2035 * does all 4 immediate directions). This returns the index into the
2085 * array of the free spot, -1 if no spot available (dir 0 = x,y) 2036 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2086 * Note - this only checks to see if there is space for the head of the
2087 * object - if it is a multispace object, this should be called for all
2088 * pieces.
2089 * Note2: This function does correctly handle tiled maps, but does not 2037 * Note: This function does correctly handle tiled maps, but does not
2090 * inform the caller. However, insert_ob_in_map will update as 2038 * inform the caller. However, insert_ob_in_map will update as
2091 * necessary, so the caller shouldn't need to do any special work. 2039 * necessary, so the caller shouldn't need to do any special work.
2092 * Note - updated to take an object instead of archetype - this is necessary 2040 * Note - updated to take an object instead of archetype - this is necessary
2093 * because arch_blocked (now ob_blocked) needs to know the movement type 2041 * because arch_blocked (now ob_blocked) needs to know the movement type
2094 * to know if the space in question will block the object. We can't use 2042 * to know if the space in question will block the object. We can't use
2095 * the archetype because that isn't correct if the monster has been 2043 * the archetype because that isn't correct if the monster has been
2096 * customized, changed states, etc. 2044 * customized, changed states, etc.
2097 */ 2045 */
2098 2046int
2099int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) { 2047find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2048{
2049 int altern[SIZEOFFREE];
2100 int i,index=0, flag; 2050 int index = 0, flag;
2101 static int altern[SIZEOFFREE];
2102 2051
2103 for(i=start;i<stop;i++) { 2052 for (int i = start; i < stop; i++)
2104 flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]); 2053 {
2105 if(!flag) 2054 mapxy pos (m, x, y); pos.move (i);
2055
2056 if (!pos.normalise ())
2057 continue;
2058
2059 mapspace &ms = *pos;
2060
2061 if (ms.flags () & P_IS_ALIVE)
2062 continue;
2063
2064 /* However, often
2065 * ob doesn't have any move type (when used to place exits)
2066 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2067 */
2068 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2069 {
2106 altern[index++]=i; 2070 altern [index++] = i;
2071 continue;
2072 }
2107 2073
2108 /* Basically, if we find a wall on a space, we cut down the search size. 2074 /* Basically, if we find a wall on a space, we cut down the search size.
2109 * In this way, we won't return spaces that are on another side of a wall. 2075 * In this way, we won't return spaces that are on another side of a wall.
2110 * This mostly work, but it cuts down the search size in all directions - 2076 * This mostly work, but it cuts down the search size in all directions -
2111 * if the space being examined only has a wall to the north and empty 2077 * if the space being examined only has a wall to the north and empty
2112 * spaces in all the other directions, this will reduce the search space 2078 * spaces in all the other directions, this will reduce the search space
2113 * to only the spaces immediately surrounding the target area, and 2079 * to only the spaces immediately surrounding the target area, and
2114 * won't look 2 spaces south of the target space. 2080 * won't look 2 spaces south of the target space.
2115 */ 2081 */
2116 else if ((flag & AB_NO_PASS) && maxfree[i]<stop) 2082 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2083 {
2117 stop=maxfree[i]; 2084 stop = maxfree[i];
2118 } 2085 continue;
2119 if(!index) return -1; 2086 }
2120 return altern[RANDOM()%index];
2121}
2122 2087
2088 /* Note it is intentional that we check ob - the movement type of the
2089 * head of the object should correspond for the entire object.
2090 */
2091 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2092 continue;
2093
2094 if (ob->blocked (pos.m, pos.x, pos.y))
2095 continue;
2096
2097 altern [index++] = i;
2098 }
2099
2100 if (!index)
2101 return -1;
2102
2103 return altern [rndm (index)];
2104}
2105
2123/* 2106/*
2124 * find_first_free_spot(archetype, mapstruct, x, y) works like 2107 * find_first_free_spot(archetype, maptile, x, y) works like
2125 * find_free_spot(), but it will search max number of squares. 2108 * find_free_spot(), but it will search max number of squares.
2126 * But it will return the first available spot, not a random choice. 2109 * But it will return the first available spot, not a random choice.
2127 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2110 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2128 */ 2111 */
2129 2112int
2130int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) { 2113find_first_free_spot (const object *ob, maptile *m, int x, int y)
2131 int i; 2114{
2132 for(i=0;i<SIZEOFFREE;i++) { 2115 for (int i = 0; i < SIZEOFFREE; i++)
2133 if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i])) 2116 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2134 return i; 2117 return i;
2135 } 2118
2136 return -1; 2119 return -1;
2137} 2120}
2138 2121
2139/* 2122/*
2140 * The function permute(arr, begin, end) randomly reorders the array 2123 * The function permute(arr, begin, end) randomly reorders the array
2141 * arr[begin..end-1]. 2124 * arr[begin..end-1].
2125 * now uses a fisher-yates shuffle, old permute was broken
2142 */ 2126 */
2127static void
2143static void permute(int *arr, int begin, int end) 2128permute (int *arr, int begin, int end)
2144{ 2129{
2145 int i, j, tmp, len; 2130 arr += begin;
2131 end -= begin;
2146 2132
2147 len = end-begin; 2133 while (--end)
2148 for(i = begin; i < end; i++) 2134 swap (arr [end], arr [rndm (end + 1)]);
2149 {
2150 j = begin+RANDOM()%len;
2151
2152 tmp = arr[i];
2153 arr[i] = arr[j];
2154 arr[j] = tmp;
2155 }
2156} 2135}
2157 2136
2158/* new function to make monster searching more efficient, and effective! 2137/* new function to make monster searching more efficient, and effective!
2159 * This basically returns a randomized array (in the passed pointer) of 2138 * This basically returns a randomized array (in the passed pointer) of
2160 * the spaces to find monsters. In this way, it won't always look for 2139 * the spaces to find monsters. In this way, it won't always look for
2161 * monsters to the north first. However, the size of the array passed 2140 * monsters to the north first. However, the size of the array passed
2162 * covers all the spaces, so within that size, all the spaces within 2141 * covers all the spaces, so within that size, all the spaces within
2163 * the 3x3 area will be searched, just not in a predictable order. 2142 * the 3x3 area will be searched, just not in a predictable order.
2164 */ 2143 */
2144void
2165void get_search_arr(int *search_arr) 2145get_search_arr (int *search_arr)
2166{ 2146{
2167 int i; 2147 int i;
2168 2148
2169 for(i = 0; i < SIZEOFFREE; i++) 2149 for (i = 0; i < SIZEOFFREE; i++)
2170 {
2171 search_arr[i] = i; 2150 search_arr[i] = i;
2172 }
2173 2151
2174 permute(search_arr, 1, SIZEOFFREE1+1); 2152 permute (search_arr, 1, SIZEOFFREE1 + 1);
2175 permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1); 2153 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2176 permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE); 2154 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2177} 2155}
2178 2156
2179/* 2157/*
2180 * find_dir(map, x, y, exclude) will search some close squares in the 2158 * find_dir(map, x, y, exclude) will search some close squares in the
2181 * given map at the given coordinates for live objects. 2159 * given map at the given coordinates for live objects.
2186 * Perhaps incorrectly, but I'm making the assumption that exclude 2164 * Perhaps incorrectly, but I'm making the assumption that exclude
2187 * is actually want is going to try and move there. We need this info 2165 * is actually want is going to try and move there. We need this info
2188 * because we have to know what movement the thing looking to move 2166 * because we have to know what movement the thing looking to move
2189 * there is capable of. 2167 * there is capable of.
2190 */ 2168 */
2191 2169int
2192int find_dir(mapstruct *m, int x, int y, object *exclude) { 2170find_dir (maptile *m, int x, int y, object *exclude)
2171{
2193 int i,max=SIZEOFFREE, mflags; 2172 int max = SIZEOFFREE, mflags;
2194 sint16 nx, ny;
2195 object *tmp;
2196 mapstruct *mp;
2197 MoveType blocked, move_type; 2173 MoveType move_type;
2198 2174
2199 if (exclude && exclude->head) { 2175 if (exclude && exclude->head_ () != exclude)
2176 {
2200 exclude = exclude->head; 2177 exclude = exclude->head;
2201 move_type = exclude->move_type; 2178 move_type = exclude->move_type;
2202 } else { 2179 }
2180 else
2181 {
2203 /* If we don't have anything, presume it can use all movement types. */ 2182 /* If we don't have anything, presume it can use all movement types. */
2204 move_type=MOVE_ALL; 2183 move_type = MOVE_ALL;
2184 }
2185
2186 for (int i = 1; i < max; i++)
2205 } 2187 {
2188 mapxy pos (m, x, y);
2189 pos.move (i);
2206 2190
2207 for(i=1;i<max;i++) { 2191 if (!pos.normalise ())
2208 mp = m;
2209 nx = x + freearr_x[i]; 2192 max = maxfree[i];
2210 ny = y + freearr_y[i]; 2193 else
2194 {
2195 mapspace &ms = *pos;
2211 2196
2212 mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny); 2197 if ((move_type & ms.move_block) == move_type)
2213 if (mflags & P_OUT_OF_MAP) {
2214 max = maxfree[i]; 2198 max = maxfree [i];
2215 } else {
2216 blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);
2217
2218 if ((move_type & blocked) == move_type) {
2219 max=maxfree[i];
2220 } else if (mflags & P_IS_ALIVE) { 2199 else if (ms.flags () & P_IS_ALIVE)
2221 for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) { 2200 {
2222 if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) && 2201 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2202 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2223 (tmp != exclude ||(tmp->head && tmp->head != exclude))) { 2203 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2224 break;
2225 }
2226 }
2227 if(tmp) {
2228 return freedir[i]; 2204 return freedir [i];
2229 }
2230 } 2205 }
2231 } 2206 }
2232 } 2207 }
2208
2233 return 0; 2209 return 0;
2234} 2210}
2235 2211
2236/* 2212/*
2237 * distance(object 1, object 2) will return the square of the 2213 * distance(object 1, object 2) will return the square of the
2238 * distance between the two given objects. 2214 * distance between the two given objects.
2239 */ 2215 */
2240 2216int
2241int distance(const object *ob1, const object *ob2) { 2217distance (const object *ob1, const object *ob2)
2242 int i; 2218{
2243 i= (ob1->x - ob2->x)*(ob1->x - ob2->x)+ 2219 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2244 (ob1->y - ob2->y)*(ob1->y - ob2->y);
2245 return i;
2246} 2220}
2247 2221
2248/* 2222/*
2249 * find_dir_2(delta-x,delta-y) will return a direction in which 2223 * find_dir_2(delta-x,delta-y) will return a direction value
2250 * an object which has subtracted the x and y coordinates of another 2224 * for running into direct [dx, dy].
2251 * object, needs to travel toward it. 2225 * (the opposite of crossfire's find_dir_2!)
2252 */ 2226 */
2253 2227int
2254int find_dir_2(int x, int y) { 2228find_dir_2 (int x, int y)
2229{
2230#if 1 // new algorithm
2231 // this works by putting x, y into 16 sectors, which
2232 // are not equal sized, but are a better approximation
2233 // then the old algorithm, and then using a mapping
2234 // table to map it into a direction value.
2235
2236 static const uint8 dir[16] = {
2237 4, 5, 4, 3,
2238 2, 1, 2, 3,
2239 6, 5, 6, 7,
2240 8, 1, 8, 7,
2241 };
2242 int sector = 0;
2243
2244 // this is a bit ugly, but more likely to result in branchless code
2245 sector |= x < 0 ? 8 : 0;
2246 x = x < 0 ? -x : x; // abs
2247
2248 sector |= y < 0 ? 4 : 0;
2249 y = y < 0 ? -y : y; // abs
2250
2251 if (x > y)
2252 {
2253 sector |= 2;
2254
2255 if (x > y * 2)
2256 sector |= 1;
2257 }
2258 else
2259 {
2260 if (y > x * 2)
2261 sector |= 1;
2262 else if (!y)
2263 return 0; // x == 0 here
2264 }
2265
2266 return dir [sector];
2267#else // old algorithm
2255 int q; 2268 int q;
2256 2269
2257 if(y) 2270 if (y)
2258 q=x*100/y; 2271 q = 128 * x / y;
2259 else if (x) 2272 else if (x)
2260 q= -300*x; 2273 q = -512 * x; // to make it > 309
2261 else 2274 else
2262 return 0; 2275 return 0;
2263 2276
2264 if(y>0) { 2277 if (y > 0)
2265 if(q < -242) 2278 {
2279 if (q < -309) return 7;
2280 if (q < -52) return 6;
2281 if (q < 52) return 5;
2282 if (q < 309) return 4;
2283
2266 return 3 ; 2284 return 3;
2267 if (q < -41) 2285 }
2286 else
2287 {
2288 if (q < -309) return 3;
2289 if (q < -52) return 2;
2290 if (q < 52) return 1;
2291 if (q < 309) return 8;
2292
2268 return 2 ; 2293 return 7;
2269 if (q < 41)
2270 return 1 ;
2271 if (q < 242)
2272 return 8 ;
2273 return 7 ;
2274 } 2294 }
2275 2295#endif
2276 if (q < -242)
2277 return 7 ;
2278 if (q < -41)
2279 return 6 ;
2280 if (q < 41)
2281 return 5 ;
2282 if (q < 242)
2283 return 4 ;
2284
2285 return 3 ;
2286}
2287
2288/*
2289 * absdir(int): Returns a number between 1 and 8, which represent
2290 * the "absolute" direction of a number (it actually takes care of
2291 * "overflow" in previous calculations of a direction).
2292 */
2293
2294int absdir(int d) {
2295 while(d<1) d+=8;
2296 while(d>8) d-=8;
2297 return d;
2298} 2296}
2299 2297
2300/* 2298/*
2301 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2299 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2302 * between two directions (which are expected to be absolute (see absdir()) 2300 * between two directions (which are expected to be absolute (see absdir())
2303 */ 2301 */
2304 2302int
2305int dirdiff(int dir1, int dir2) { 2303dirdiff (int dir1, int dir2)
2306 int d; 2304{
2307 d = abs(dir1 - dir2); 2305 int d = abs (dir1 - dir2);
2308 if(d>4) 2306
2309 d = 8 - d; 2307 return d > 4 ? 8 - d : d;
2310 return d;
2311} 2308}
2312 2309
2313/* peterm: 2310/* peterm:
2314 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2311 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2315 * Basically, this is a table of directions, and what directions 2312 * Basically, this is a table of directions, and what directions
2317 * This basically means that if direction is 15, then it could either go 2314 * This basically means that if direction is 15, then it could either go
2318 * direction 4, 14, or 16 to get back to where we are. 2315 * direction 4, 14, or 16 to get back to where we are.
2319 * Moved from spell_util.c to object.c with the other related direction 2316 * Moved from spell_util.c to object.c with the other related direction
2320 * functions. 2317 * functions.
2321 */ 2318 */
2322
2323int reduction_dir[SIZEOFFREE][3] = { 2319static const int reduction_dir[SIZEOFFREE][3] = {
2324 {0,0,0}, /* 0 */ 2320 {0, 0, 0}, /* 0 */
2325 {0,0,0}, /* 1 */ 2321 {0, 0, 0}, /* 1 */
2326 {0,0,0}, /* 2 */ 2322 {0, 0, 0}, /* 2 */
2327 {0,0,0}, /* 3 */ 2323 {0, 0, 0}, /* 3 */
2328 {0,0,0}, /* 4 */ 2324 {0, 0, 0}, /* 4 */
2329 {0,0,0}, /* 5 */ 2325 {0, 0, 0}, /* 5 */
2330 {0,0,0}, /* 6 */ 2326 {0, 0, 0}, /* 6 */
2331 {0,0,0}, /* 7 */ 2327 {0, 0, 0}, /* 7 */
2332 {0,0,0}, /* 8 */ 2328 {0, 0, 0}, /* 8 */
2333 {8,1,2}, /* 9 */ 2329 {8, 1, 2}, /* 9 */
2334 {1,2,-1}, /* 10 */ 2330 {1, 2, -1}, /* 10 */
2335 {2,10,12}, /* 11 */ 2331 {2, 10, 12}, /* 11 */
2336 {2,3,-1}, /* 12 */ 2332 {2, 3, -1}, /* 12 */
2337 {2,3,4}, /* 13 */ 2333 {2, 3, 4}, /* 13 */
2338 {3,4,-1}, /* 14 */ 2334 {3, 4, -1}, /* 14 */
2339 {4,14,16}, /* 15 */ 2335 {4, 14, 16}, /* 15 */
2340 {5,4,-1}, /* 16 */ 2336 {5, 4, -1}, /* 16 */
2341 {4,5,6}, /* 17 */ 2337 {4, 5, 6}, /* 17 */
2342 {6,5,-1}, /* 18 */ 2338 {6, 5, -1}, /* 18 */
2343 {6,20,18}, /* 19 */ 2339 {6, 20, 18}, /* 19 */
2344 {7,6,-1}, /* 20 */ 2340 {7, 6, -1}, /* 20 */
2345 {6,7,8}, /* 21 */ 2341 {6, 7, 8}, /* 21 */
2346 {7,8,-1}, /* 22 */ 2342 {7, 8, -1}, /* 22 */
2347 {8,22,24}, /* 23 */ 2343 {8, 22, 24}, /* 23 */
2348 {8,1,-1}, /* 24 */ 2344 {8, 1, -1}, /* 24 */
2349 {24,9,10}, /* 25 */ 2345 {24, 9, 10}, /* 25 */
2350 {9,10,-1}, /* 26 */ 2346 {9, 10, -1}, /* 26 */
2351 {10,11,-1}, /* 27 */ 2347 {10, 11, -1}, /* 27 */
2352 {27,11,29}, /* 28 */ 2348 {27, 11, 29}, /* 28 */
2353 {11,12,-1}, /* 29 */ 2349 {11, 12, -1}, /* 29 */
2354 {12,13,-1}, /* 30 */ 2350 {12, 13, -1}, /* 30 */
2355 {12,13,14}, /* 31 */ 2351 {12, 13, 14}, /* 31 */
2356 {13,14,-1}, /* 32 */ 2352 {13, 14, -1}, /* 32 */
2357 {14,15,-1}, /* 33 */ 2353 {14, 15, -1}, /* 33 */
2358 {33,15,35}, /* 34 */ 2354 {33, 15, 35}, /* 34 */
2359 {16,15,-1}, /* 35 */ 2355 {16, 15, -1}, /* 35 */
2360 {17,16,-1}, /* 36 */ 2356 {17, 16, -1}, /* 36 */
2361 {18,17,16}, /* 37 */ 2357 {18, 17, 16}, /* 37 */
2362 {18,17,-1}, /* 38 */ 2358 {18, 17, -1}, /* 38 */
2363 {18,19,-1}, /* 39 */ 2359 {18, 19, -1}, /* 39 */
2364 {41,19,39}, /* 40 */ 2360 {41, 19, 39}, /* 40 */
2365 {19,20,-1}, /* 41 */ 2361 {19, 20, -1}, /* 41 */
2366 {20,21,-1}, /* 42 */ 2362 {20, 21, -1}, /* 42 */
2367 {20,21,22}, /* 43 */ 2363 {20, 21, 22}, /* 43 */
2368 {21,22,-1}, /* 44 */ 2364 {21, 22, -1}, /* 44 */
2369 {23,22,-1}, /* 45 */ 2365 {23, 22, -1}, /* 45 */
2370 {45,47,23}, /* 46 */ 2366 {45, 47, 23}, /* 46 */
2371 {23,24,-1}, /* 47 */ 2367 {23, 24, -1}, /* 47 */
2372 {24,9,-1}}; /* 48 */ 2368 {24, 9, -1}
2369}; /* 48 */
2373 2370
2374/* Recursive routine to step back and see if we can 2371/* Recursive routine to step back and see if we can
2375 * find a path to that monster that we found. If not, 2372 * find a path to that monster that we found. If not,
2376 * we don't bother going toward it. Returns 1 if we 2373 * we don't bother going toward it. Returns 1 if we
2377 * can see a direct way to get it 2374 * can see a direct way to get it
2378 * Modified to be map tile aware -.MSW 2375 * Modified to be map tile aware -.MSW
2379 */ 2376 */
2380 2377int
2381
2382int can_see_monsterP(mapstruct *m, int x, int y,int dir) { 2378can_see_monsterP (maptile *m, int x, int y, int dir)
2379{
2383 sint16 dx, dy; 2380 sint16 dx, dy;
2384 int mflags; 2381 int mflags;
2385 2382
2383 if (dir < 0)
2386 if(dir<0) return 0; /* exit condition: invalid direction */ 2384 return 0; /* exit condition: invalid direction */
2387 2385
2388 dx = x + freearr_x[dir]; 2386 dx = x + freearr_x[dir];
2389 dy = y + freearr_y[dir]; 2387 dy = y + freearr_y[dir];
2390 2388
2391 mflags = get_map_flags(m, &m, dx, dy, &dx, &dy); 2389 mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2392 2390
2393 /* This functional arguably was incorrect before - it was 2391 /* This functional arguably was incorrect before - it was
2394 * checking for P_WALL - that was basically seeing if 2392 * checking for P_WALL - that was basically seeing if
2395 * we could move to the monster - this is being more 2393 * we could move to the monster - this is being more
2396 * literal on if we can see it. To know if we can actually 2394 * literal on if we can see it. To know if we can actually
2397 * move to the monster, we'd need the monster passed in or 2395 * move to the monster, we'd need the monster passed in or
2398 * at least its move type. 2396 * at least its move type.
2399 */ 2397 */
2400 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0; 2398 if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
2399 return 0;
2401 2400
2402 /* yes, can see. */ 2401 /* yes, can see. */
2403 if(dir < 9) return 1; 2402 if (dir < 9)
2403 return 1;
2404
2404 return can_see_monsterP(m, x, y, reduction_dir[dir][0]) | 2405 return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2405 can_see_monsterP(m,x,y, reduction_dir[dir][1]) | 2406 | can_see_monsterP (m, x, y, reduction_dir[dir][1])
2406 can_see_monsterP(m,x,y, reduction_dir[dir][2]); 2407 | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2407} 2408}
2408 2409
2409
2410
2411/* 2410/*
2412 * can_pick(picker, item): finds out if an object is possible to be 2411 * can_pick(picker, item): finds out if an object is possible to be
2413 * picked up by the picker. Returnes 1 if it can be 2412 * picked up by the picker. Returnes 1 if it can be
2414 * picked up, otherwise 0. 2413 * picked up, otherwise 0.
2415 * 2414 *
2416 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2415 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2417 * core dumps if they do. 2416 * core dumps if they do.
2418 * 2417 *
2419 * Add a check so we can't pick up invisible objects (0.93.8) 2418 * Add a check so we can't pick up invisible objects (0.93.8)
2420 */ 2419 */
2421 2420int
2422int can_pick(const object *who, const object *item) { 2421can_pick (const object *who, const object *item)
2423 return /*QUERY_FLAG(who,FLAG_WIZ)||*/ 2422{
2424 (item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&& 2423 return /*who->flag [FLAG_WIZ]|| */
2425 !QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible && 2424 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2426 (who->type==PLAYER||item->weight<who->weight/3)); 2425 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2427} 2426}
2428
2429 2427
2430/* 2428/*
2431 * create clone from object to another 2429 * create clone from object to another
2432 */ 2430 */
2433object *object_create_clone (object *asrc) { 2431object *
2434 object *dst = NULL,*tmp,*src,*part,*prev, *item; 2432object::deep_clone ()
2433{
2434 assert (("deep_clone called on non-head object", is_head ()));
2435 2435
2436 if(!asrc) return NULL; 2436 object *dst = clone ();
2437 src = asrc;
2438 if(src->head)
2439 src = src->head;
2440 2437
2441 prev = NULL; 2438 object *prev = dst;
2442 for(part = src; part; part = part->more) { 2439 for (object *part = this->more; part; part = part->more)
2443 tmp = get_object(); 2440 {
2444 copy_object(part,tmp); 2441 object *tmp = part->clone ();
2445 tmp->x -= src->x;
2446 tmp->y -= src->y;
2447 if(!part->head) {
2448 dst = tmp;
2449 tmp->head = NULL;
2450 } else {
2451 tmp->head = dst; 2442 tmp->head = dst;
2452 }
2453 tmp->more = NULL;
2454 if(prev)
2455 prev->more = tmp; 2443 prev->more = tmp;
2456 prev = tmp; 2444 prev = tmp;
2457 } 2445 }
2458 /*** copy inventory ***/ 2446
2459 for(item = src->inv; item; item = item->below) { 2447 for (object *item = inv; item; item = item->below)
2460 (void) insert_ob_in_ob(object_create_clone(item),dst); 2448 insert_ob_in_ob (item->deep_clone (), dst);
2461 }
2462 2449
2463 return dst; 2450 return dst;
2464}
2465
2466/* return true if the object was destroyed, 0 otherwise */
2467int was_destroyed (const object *op, tag_t old_tag)
2468{
2469 /* checking for FLAG_FREED isn't necessary, but makes this function more
2470 * robust */
2471 return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2472}
2473
2474/* GROS - Creates an object using a string representing its content. */
2475/* Basically, we save the content of the string to a temp file, then call */
2476/* load_object on it. I admit it is a highly inefficient way to make things, */
2477/* but it was simple to make and allows reusing the load_object function. */
2478/* Remember not to use load_object_str in a time-critical situation. */
2479/* Also remember that multiparts objects are not supported for now. */
2480
2481object* load_object_str(const char *obstr)
2482{
2483 object *op;
2484 char filename[MAX_BUF];
2485 sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);
2486
2487 FILE *tempfile=fopen(filename,"w");
2488 if (tempfile == NULL)
2489 {
2490 LOG(llevError,"Error - Unable to access load object temp file\n");
2491 return NULL;
2492 };
2493 fprintf(tempfile,obstr);
2494 fclose(tempfile);
2495
2496 op=get_object();
2497
2498 object_thawer thawer (filename);
2499 if (thawer)
2500 load_object(thawer,op,LO_NEWFILE,0);
2501 LOG(llevDebug," load str completed, object=%s\n", &op->name);
2502 CLEAR_FLAG(op,FLAG_REMOVED);
2503
2504 return op;
2505} 2451}
2506 2452
2507/* This returns the first object in who's inventory that 2453/* This returns the first object in who's inventory that
2508 * has the same type and subtype match. 2454 * has the same type and subtype match.
2509 * returns NULL if no match. 2455 * returns NULL if no match.
2510 */ 2456 */
2457object *
2511object *find_obj_by_type_subtype(const object *who, int type, int subtype) 2458find_obj_by_type_subtype (const object *who, int type, int subtype)
2512{ 2459{
2513 object *tmp;
2514
2515 for (tmp=who->inv; tmp; tmp=tmp->below) 2460 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2516 if (tmp->type == type && tmp->subtype == subtype) return tmp; 2461 if (tmp->type == type && tmp->subtype == subtype)
2462 return tmp;
2517 2463
2518 return NULL; 2464 return 0;
2519} 2465}
2520 2466
2521/* If ob has a field named key, return the link from the list, 2467shstr_tmp
2522 * otherwise return NULL. 2468object::kv_get (shstr_tmp key) const
2523 * 2469{
2524 * key must be a passed in shared string - otherwise, this won't 2470 for (key_value *kv = key_values; kv; kv = kv->next)
2525 * do the desired thing. 2471 if (kv->key == key)
2526 */ 2472 return kv->value;
2527key_value * get_ob_key_link(const object * ob, const char * key) { 2473
2528 key_value * link; 2474 return shstr ();
2475}
2476
2477void
2478object::kv_set (shstr_tmp key, shstr_tmp value)
2479{
2480 for (key_value *kv = key_values; kv; kv = kv->next)
2481 if (kv->key == key)
2482 {
2483 kv->value = value;
2484 return;
2485 }
2486
2487 key_value *kv = new key_value;
2488
2489 kv->next = key_values;
2490 kv->key = key;
2491 kv->value = value;
2492
2493 key_values = kv;
2494}
2495
2496void
2497object::kv_del (shstr_tmp key)
2498{
2499 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2500 if ((*kvp)->key == key)
2501 {
2502 key_value *kv = *kvp;
2503 *kvp = (*kvp)->next;
2504 delete kv;
2505 return;
2506 }
2507}
2508
2509object::depth_iterator::depth_iterator (object *container)
2510: iterator_base (container)
2511{
2512 while (item->inv)
2513 item = item->inv;
2514}
2515
2516void
2517object::depth_iterator::next ()
2518{
2519 if (item->below)
2529 2520 {
2530 for (link = ob->key_values; link != NULL; link = link->next) { 2521 item = item->below;
2531 if (link->key == key) { 2522
2532 return link; 2523 while (item->inv)
2524 item = item->inv;
2525 }
2526 else
2527 item = item->env;
2528}
2529
2530const char *
2531object::flag_desc (char *desc, int len) const
2532{
2533 char *p = desc;
2534 bool first = true;
2535
2536 *p = 0;
2537
2538 for (int i = 0; i < NUM_FLAGS; i++)
2539 {
2540 if (len <= 10) // magic constant!
2541 {
2542 snprintf (p, len, ",...");
2543 break;
2533 } 2544 }
2534 }
2535
2536 return NULL;
2537}
2538 2545
2539/* 2546 if (flag [i])
2540 * Returns the value of op has an extra_field for key, or NULL.
2541 *
2542 * The argument doesn't need to be a shared string.
2543 *
2544 * The returned string is shared.
2545 */
2546const char * get_ob_key_value(const object * op, const char * const key) {
2547 key_value * link;
2548 const char * canonical_key;
2549
2550 canonical_key = shstr::find (key);
2551
2552 if (canonical_key == NULL) {
2553 /* 1. There being a field named key on any object
2554 * implies there'd be a shared string to find.
2555 * 2. Since there isn't, no object has this field.
2556 * 3. Therefore, *this* object doesn't have this field.
2557 */ 2547 {
2558 return NULL; 2548 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2559 } 2549 len -= cnt;
2560 2550 p += cnt;
2561 /* This is copied from get_ob_key_link() above - 2551 first = false;
2562 * only 4 lines, and saves the function call overhead.
2563 */
2564 for (link = op->key_values; link != NULL; link = link->next) {
2565 if (link->key == canonical_key) {
2566 return link->value;
2567 } 2552 }
2568 } 2553 }
2554
2555 return desc;
2556}
2557
2558// return a suitable string describing an object in enough detail to find it
2559const char *
2560object::debug_desc (char *info) const
2561{
2562 char flagdesc[512];
2563 char info2[256 * 4];
2564 char *p = info;
2565
2566 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2567 count,
2568 uuid.c_str (),
2569 &name,
2570 title ? ",title:\"" : "",
2571 title ? (const char *)title : "",
2572 title ? "\"" : "",
2573 flag_desc (flagdesc, 512), type);
2574
2575 if (!flag[FLAG_REMOVED] && env)
2576 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2577
2578 if (map)
2579 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2580
2581 return info;
2582}
2583
2584const char *
2585object::debug_desc () const
2586{
2587 static char info[3][256 * 4];
2588 static int info_idx;
2589
2590 return debug_desc (info [++info_idx % 3]);
2591}
2592
2593struct region *
2594object::region () const
2595{
2596 return map ? map->region (x, y)
2597 : region::default_region ();
2598}
2599
2600void
2601object::open_container (object *new_container)
2602{
2603 if (container == new_container)
2569 return NULL; 2604 return;
2570}
2571 2605
2606 object *old_container = container;
2572 2607
2573/* 2608 if (old_container)
2574 * Updates the canonical_key in op to value.
2575 *
2576 * canonical_key is a shared string (value doesn't have to be).
2577 *
2578 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2579 * keys.
2580 *
2581 * Returns TRUE on success.
2582 */
2583int set_ob_key_value_s(object * op, const shstr &canonical_key, const char * value, int add_key) {
2584 key_value * field = NULL, *last=NULL;
2585 2609 {
2586 for (field=op->key_values; field != NULL; field=field->next) { 2610 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2587 if (field->key != canonical_key) { 2611 return;
2588 last = field; 2612
2589 continue; 2613#if 0
2614 // remove the "Close old_container" object.
2615 if (object *closer = old_container->inv)
2616 if (closer->type == CLOSE_CON)
2617 closer->destroy ();
2618#endif
2619
2620 // make sure the container is available
2621 esrv_send_item (this, old_container);
2622
2623 old_container->flag [FLAG_APPLIED] = false;
2624 container = 0;
2625
2626 // client needs item update to make it work, client bug requires this to be separate
2627 esrv_update_item (UPD_FLAGS, this, old_container);
2628
2629 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2630 play_sound (sound_find ("chest_close"));
2631 }
2632
2633 if (new_container)
2634 {
2635 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2636 return;
2637
2638 // TODO: this does not seem to serve any purpose anymore?
2639#if 0
2640 // insert the "Close Container" object.
2641 if (archetype *closer = new_container->other_arch)
2642 {
2643 object *closer = new_container->other_arch->instance ();
2644 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2645 new_container->insert (closer);
2590 } 2646 }
2647#endif
2648
2649 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2650
2651 // make sure the container is available, client bug requires this to be separate
2652 esrv_send_item (this, new_container);
2653
2654 new_container->flag [FLAG_APPLIED] = true;
2655 container = new_container;
2656
2657 // client needs flag change
2658 esrv_update_item (UPD_FLAGS, this, new_container);
2659 esrv_send_inventory (this, new_container);
2660 play_sound (sound_find ("chest_open"));
2591 2661 }
2592 if (value) 2662// else if (!old_container->env && contr && contr->ns)
2593 field->value = value; 2663// contr->ns->floorbox_reset ();
2594 else { 2664}
2595 /* Basically, if the archetype has this key set,
2596 * we need to store the null value so when we save
2597 * it, we save the empty value so that when we load,
2598 * we get this value back again.
2599 */
2600 if (get_ob_key_link (&op->arch->clone, canonical_key))
2601 field->value = 0;
2602 else
2603 {
2604 if (last) last->next = field->next;
2605 else op->key_values = field->next;
2606 2665
2607 delete field; 2666object *
2608 } 2667object::force_find (shstr_tmp name)
2609 } 2668{
2610 return TRUE; 2669 /* cycle through his inventory to look for the MARK we want to
2611 } 2670 * place
2612 /* IF we get here, key doesn't exist */ 2671 */
2672 for (object *tmp = inv; tmp; tmp = tmp->below)
2673 if (tmp->type == FORCE && tmp->slaying == name)
2674 return splay (tmp);
2613 2675
2614 /* No field, we'll have to add it. */ 2676 return 0;
2677}
2678
2679//-GPL
2680
2681void
2682object::force_set_timer (int duration)
2683{
2684 this->duration = 1;
2685 this->speed_left = -1.f;
2686
2687 this->set_speed (duration ? 1.f / duration : 0.f);
2688}
2689
2690object *
2691object::force_add (shstr_tmp name, int duration)
2692{
2693 if (object *force = force_find (name))
2694 force->destroy ();
2695
2696 object *force = get_archetype (FORCE_NAME);
2697
2698 force->slaying = name;
2699 force->force_set_timer (duration);
2700 force->flag [FLAG_APPLIED] = true;
2701
2702 return insert (force);
2703}
2704
2705void
2706object::play_sound (faceidx sound) const
2707{
2708 if (!sound)
2709 return;
2710
2711 if (is_on_map ())
2712 map->play_sound (sound, x, y);
2713 else if (object *pl = in_player ())
2714 pl->contr->play_sound (sound);
2715}
2716
2717void
2718object::say_msg (const char *msg) const
2719{
2720 if (is_on_map ())
2721 map->say_msg (msg, x, y);
2722 else if (object *pl = in_player ())
2723 pl->contr->play_sound (sound);
2724}
2725
2726void
2727object::make_noise ()
2728{
2729 // we do not model noise in the map, so instead put
2730 // a temporary light into the noise source
2731 // could use the map instead, but that's less reliable for our
2732 // goal, which is to make invisibility a bit harder to exploit
2733
2734 // currently only works sensibly for players
2735 if (!is_player ())
2736 return;
2737
2738 // find old force, or create new one
2739 object *force = force_find (shstr_noise_force);
2740
2741 if (force)
2742 force->speed_left = -1.f; // patch old speed up
2743 else
2615 2744 {
2616 if (!add_key) { 2745 force = archetype::get (shstr_noise_force);
2617 return FALSE; 2746
2618 } 2747 force->slaying = shstr_noise_force;
2619 /* There isn't any good reason to store a null 2748 force->stats.food = 1;
2620 * value in the key/value list. If the archetype has 2749 force->speed_left = -1.f;
2621 * this key, then we should also have it, so shouldn't 2750
2622 * be here. If user wants to store empty strings, 2751 force->set_speed (1.f / 4.f);
2623 * should pass in "" 2752 force->flag [FLAG_IS_USED_UP] = true;
2624 */ 2753 force->flag [FLAG_APPLIED] = true;
2625 if (value == NULL) return TRUE; 2754
2755 insert (force);
2626 2756 }
2627 field = new key_value; 2757}
2758
2759void object::change_move_type (MoveType mt)
2760{
2761 if (move_type == mt)
2762 return;
2763
2764 if (is_on_map ())
2628 2765 {
2629 field->key = canonical_key; 2766 // we are on the map, so handle move_on/off effects
2630 field->value = value; 2767 remove ();
2631 /* Usual prepend-addition. */ 2768 move_type = mt;
2632 field->next = op->key_values; 2769 map->insert (this, x, y, this);
2633 op->key_values = field;
2634 2770 }
2771 else
2772 move_type = mt;
2773}
2774
2775/* object should be a player.
2776 * we return the object the player has marked with the 'mark' command
2777 * below. If no match is found (or object has changed), we return
2778 * NULL. We leave it up to the calling function to print messages if
2779 * nothing is found.
2780 */
2781object *
2782object::mark () const
2783{
2784 if (contr && contr->mark && contr->mark->env == this)
2785 return contr->mark;
2786 else
2635 return TRUE; 2787 return 0;
2636} 2788}
2637 2789
2638/*
2639 * Updates the key in op to value.
2640 *
2641 * If add_key is FALSE, this will only update existing keys,
2642 * and not add new ones.
2643 * In general, should be little reason FALSE is ever passed in for add_key
2644 *
2645 * Returns TRUE on success.
2646 */
2647int set_ob_key_value(object * op, const char *key, const char * value, int add_key)
2648{
2649 shstr key_ (key);
2650 return set_ob_key_value_s (op, key_, value, add_key);
2651}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines