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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines