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.54 by root, Fri Nov 17 19:40:53 2006 UTC vs.
Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines