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

Diff Legend

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