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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines