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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.271 by root, Sat Dec 27 04:07:44 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines