ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.13 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.325 by root, Wed Apr 14 21:36:31 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines