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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.235 by root, Tue May 6 20:00:12 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines