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.80 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.295 by root, Fri Nov 6 13:03:34 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines