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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines