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.45 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.277 by root, Thu Jan 1 11:41:17 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines