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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines