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.31 by root, Mon Sep 11 23:33:27 2006 UTC vs.
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines