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

Diff Legend

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