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.99 by root, Sun Dec 31 18:10:40 2006 UTC vs.
Revision 1.314 by root, Fri Mar 26 00:59:20 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 (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
220 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 272 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221 273
222 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 274 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 275 SET_FLAG (ob2, 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 }
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;
577}
578
579int
580object::slottype () const
581{
582 if (type == SKILL)
583 {
584 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
585 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
586 }
587 else
588 {
589 if (slot [body_combat].info) return slot_combat;
590 if (slot [body_range ].info) return slot_ranged;
591 }
592
593 return slot_none;
594}
595
596bool
597object::change_weapon (object *ob)
598{
599 if (current_weapon == ob)
600 return true;
601
602 if (chosen_skill)
603 chosen_skill->flag [FLAG_APPLIED] = false;
604
605 current_weapon = ob;
606 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
607
608 if (chosen_skill)
609 chosen_skill->flag [FLAG_APPLIED] = true;
610
611 update_stats ();
612
613 if (ob)
614 {
615 // now check wether any body locations became invalid, in which case
616 // we cannot apply the weapon at the moment.
617 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
618 if (slot[i].used < 0)
619 {
620 current_weapon = chosen_skill = 0;
621 update_stats ();
622
623 new_draw_info_format (NDI_UNIQUE, 0, this,
624 "You try to balance all your items at once, "
625 "but the %s is just too much for your body. "
626 "[You need to unapply some items first - use the 'body' command to see "
627 "how many items you cna wera on a specific body part.]", &ob->name);
628 return false;
629 }
630
631 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
632 }
633 else
634 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
635
636 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
637 {
638 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
639 &name, ob->debug_desc ());
640 return false;
641 }
642
643 return true;
452} 644}
453 645
454/* Zero the key_values on op, decrementing the shared-string 646/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 647 * refcounts and freeing the links.
456 */ 648 */
457static void 649static void
458free_key_values (object *op) 650free_key_values (object *op)
459{ 651{
460 for (key_value *i = op->key_values; i != 0;) 652 for (key_value *i = op->key_values; i; )
461 { 653 {
462 key_value *next = i->next; 654 key_value *next = i->next;
463 delete i; 655 delete i;
464 656
465 i = next; 657 i = next;
477 * will point at garbage. 669 * will point at garbage.
478 */ 670 */
479void 671void
480object::copy_to (object *dst) 672object::copy_to (object *dst)
481{ 673{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 674 dst->remove ();
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
484
485 *(object_copy *)dst = *this; 675 *(object_copy *)dst = *this;
486 676 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 677
496 /* Copy over key_values, if any. */ 678 /* Copy over key_values, if any. */
497 if (key_values) 679 if (key_values)
498 { 680 {
499 key_value *tail = 0; 681 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 682 dst->key_values = 0;
503 683
504 for (i = key_values; i; i = i->next) 684 for (key_value *i = key_values; i; i = i->next)
505 { 685 {
506 key_value *new_link = new key_value; 686 key_value *new_link = new key_value;
507 687
508 new_link->next = 0; 688 new_link->next = 0;
509 new_link->key = i->key; 689 new_link->key = i->key;
510 new_link->value = i->value; 690 new_link->value = i->value;
511 691
512 /* Try and be clever here, too. */ 692 /* Try and be clever here, too. */
513 if (!dst->key_values) 693 if (!dst->key_values)
514 { 694 {
521 tail = new_link; 701 tail = new_link;
522 } 702 }
523 } 703 }
524 } 704 }
525 705
526 dst->set_speed (dst->speed); 706 dst->activate ();
707}
708
709void
710object::instantiate ()
711{
712 if (!uuid.seq) // HACK
713 uuid = UUID::gen ();
714
715 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
716 if (flag [FLAG_RANDOM_SPEED] && speed)
717 speed_left = - speed - rndm (); // TODO animation
718 else
719 speed_left = -1.;
720
721 /* copy the body_info to the body_used - this is only really
722 * need for monsters, but doesn't hurt to do it for everything.
723 * by doing so, when a monster is created, it has good starting
724 * values for the body_used info, so when items are created
725 * for it, they can be properly equipped.
726 */
727 for (int i = NUM_BODY_LOCATIONS; i--; )
728 slot[i].used = slot[i].info;
729
730 attachable::instantiate ();
527} 731}
528 732
529object * 733object *
530object::clone () 734object::clone ()
531{ 735{
532 object *neu = create (); 736 object *neu = create ();
533 copy_to (neu); 737 copy_to (neu);
738
739 // TODO: unclean state changes, should not be done in clone AND instantiate
740 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
741 neu->speed_left = - neu->speed - rndm (); // TODO animation
742
743 neu->map = map; // not copied by copy_to
534 return neu; 744 return neu;
535} 745}
536 746
537/* 747/*
538 * If an object with the IS_TURNABLE() flag needs to be turned due 748 * If an object with the IS_TURNABLE() flag needs to be turned due
555 * This function needs to be called whenever the speed of an object changes. 765 * This function needs to be called whenever the speed of an object changes.
556 */ 766 */
557void 767void
558object::set_speed (float speed) 768object::set_speed (float speed)
559{ 769{
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; 770 this->speed = speed;
567 771
568 if (has_active_speed ()) 772 if (has_active_speed ())
569 activate (); 773 activate ();
570 else 774 else
589 * UP_OBJ_FACE: only the objects face has changed. 793 * UP_OBJ_FACE: only the objects face has changed.
590 */ 794 */
591void 795void
592update_object (object *op, int action) 796update_object (object *op, int action)
593{ 797{
594 MoveType move_on, move_off, move_block, move_slow; 798 if (!op)
595
596 if (op == NULL)
597 { 799 {
598 /* this should never happen */ 800 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 801 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
600 return; 802 return;
601 } 803 }
602 804
603 if (op->env) 805 if (!op->is_on_map ())
604 { 806 {
605 /* Animation is currently handled by client, so nothing 807 /* Animation is currently handled by client, so nothing
606 * to do in this case. 808 * to do in this case.
607 */ 809 */
608 return; 810 return;
609 } 811 }
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 812
617 /* make sure the object is within map boundaries */ 813 /* 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) 814 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
619 { 815 {
620 LOG (llevError, "update_object() called for object out of map!\n"); 816 LOG (llevError, "update_object() called for object out of map!\n");
628 824
629 if (!(m.flags_ & P_UPTODATE)) 825 if (!(m.flags_ & P_UPTODATE))
630 /* nop */; 826 /* nop */;
631 else if (action == UP_OBJ_INSERT) 827 else if (action == UP_OBJ_INSERT)
632 { 828 {
829#if 0
633 // this is likely overkill, TODO: revisit (schmorp) 830 // this is likely overkill, TODO: revisit (schmorp)
634 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 831 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
635 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 832 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
636 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 833 || (op->is_player () && !(m.flags_ & P_PLAYER))
637 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 834 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
638 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 835 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
639 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 836 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
640 || (m.move_on | op->move_on ) != m.move_on 837 || (m.move_on | op->move_on ) != m.move_on
641 || (m.move_off | op->move_off ) != m.move_off 838 || (m.move_off | op->move_off ) != m.move_off
642 || (m.move_slow | op->move_slow) != m.move_slow 839 || (m.move_slow | op->move_slow) != m.move_slow
643 /* This isn't perfect, but I don't expect a lot of objects to 840 /* This isn't perfect, but I don't expect a lot of objects to
644 * to have move_allow right now. 841 * have move_allow right now.
645 */ 842 */
646 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 843 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
844 m.invalidate ();
845#else
647 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 846 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
648 m.flags_ = 0; 847 m.invalidate ();
848#endif
649 } 849 }
650 /* if the object is being removed, we can't make intelligent 850 /* if the object is being removed, we can't make intelligent
651 * decisions, because remove_ob can't really pass the object 851 * decisions, because remove_ob can't really pass the object
652 * that is being removed. 852 * that is being removed.
653 */ 853 */
654 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 854 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
655 m.flags_ = 0; 855 m.invalidate ();
656 else if (action == UP_OBJ_FACE) 856 else if (action == UP_OBJ_FACE)
657 /* Nothing to do for that case */ ; 857 /* Nothing to do for that case */ ;
658 else 858 else
659 LOG (llevError, "update_object called with invalid action: %d\n", action); 859 LOG (llevError, "update_object called with invalid action: %d\n", action);
660 860
661 if (op->more) 861 if (op->more)
662 update_object (op->more, action); 862 update_object (op->more, action);
663} 863}
664 864
665object *object::first;
666
667object::object () 865object::object ()
668{ 866{
669 SET_FLAG (this, FLAG_REMOVED); 867 SET_FLAG (this, FLAG_REMOVED);
670 868
671 expmul = 1.0; 869 //expmul = 1.0; declared const for the time being
672 face = blank_face; 870 face = blank_face;
871 material = MATERIAL_NULL;
673} 872}
674 873
675object::~object () 874object::~object ()
676{ 875{
876 unlink ();
877
677 free_key_values (this); 878 free_key_values (this);
678} 879}
679 880
881static int object_count;
882
680void object::link () 883void object::link ()
681{ 884{
885 assert (!index);//D
886 uuid = UUID::gen ();
682 count = ++ob_count; 887 count = ++object_count;
683 uuid = gen_uuid ();
684 888
685 prev = 0; 889 refcnt_inc ();
686 next = object::first; 890 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 891}
693 892
694void object::unlink () 893void object::unlink ()
695{ 894{
696 if (this == object::first) 895 if (!index)
697 object::first = next; 896 return;
698 897
699 /* Remove this object from the list of used objects */ 898 objects.erase (this);
700 if (prev) prev->next = next; 899 refcnt_dec ();
701 if (next) next->prev = prev;
702
703 prev = 0;
704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711} 900}
712 901
713void 902void
714object::activate () 903object::activate ()
715{ 904{
716 /* If already on active list, don't do anything */ 905 /* If already on active list, don't do anything */
717 if (active ()) 906 if (active)
718 return; 907 return;
719 908
720 if (has_active_speed ()) 909 if (has_active_speed ())
721 { 910 {
722 /* process_events() expects us to insert the object at the beginning 911 if (flag [FLAG_FREED])
723 * of the list. */ 912 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
724 active_next = active_objects;
725 913
726 if (active_next) 914 actives.insert (this);
727 active_next->active_prev = this;
728
729 active_objects = this;
730 } 915 }
731} 916}
732 917
733void 918void
734object::activate_recursive () 919object::activate_recursive ()
735{ 920{
736 activate (); 921 activate ();
737 922
738 for (object *op = inv; op; op = op->above) 923 for (object *op = inv; op; op = op->below)
739 op->activate_recursive (); 924 op->activate_recursive ();
740} 925}
741 926
742/* This function removes object 'op' from the list of active 927/* This function removes object 'op' from the list of active
743 * objects. 928 * objects.
749 */ 934 */
750void 935void
751object::deactivate () 936object::deactivate ()
752{ 937{
753 /* If not on the active list, nothing needs to be done */ 938 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 939 if (!active)
755 return; 940 return;
756 941
757 if (active_prev == 0) 942 actives.erase (this);
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772} 943}
773 944
774void 945void
775object::deactivate_recursive () 946object::deactivate_recursive ()
776{ 947{
777 for (object *op = inv; op; op = op->above) 948 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 949 op->deactivate_recursive ();
779 950
780 deactivate (); 951 deactivate ();
952}
953
954void
955object::set_flag_inv (int flag, int value)
956{
957 for (object *op = inv; op; op = op->below)
958 {
959 op->flag [flag] = value;
960 op->set_flag_inv (flag, value);
961 }
781} 962}
782 963
783/* 964/*
784 * Remove and free all objects in the inventory of the given object. 965 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 966 * object.c ?
788object::destroy_inv (bool drop_to_ground) 969object::destroy_inv (bool drop_to_ground)
789{ 970{
790 // need to check first, because the checks below might segfault 971 // need to check first, because the checks below might segfault
791 // as we might be on an invalid mapspace and crossfire code 972 // as we might be on an invalid mapspace and crossfire code
792 // is too buggy to ensure that the inventory is empty. 973 // is too buggy to ensure that the inventory is empty.
793 // corollary: if you create arrows etc. with stuff in tis inventory, 974 // corollary: if you create arrows etc. with stuff in its inventory,
794 // cf will crash below with off-map x and y 975 // cf will crash below with off-map x and y
795 if (!inv) 976 if (!inv)
796 return; 977 return;
797 978
798 /* Only if the space blocks everything do we not process - 979 /* Only if the space blocks everything do we not process -
799 * if some form of movement is allowed, let objects 980 * if some form of movement is allowed, let objects
800 * drop on that space. 981 * drop on that space.
801 */ 982 */
802 if (!drop_to_ground 983 if (!drop_to_ground
803 || !map 984 || !map
804 || map->in_memory != MAP_IN_MEMORY 985 || map->in_memory != MAP_ACTIVE
986 || map->no_drop
805 || ms ().move_block == MOVE_ALL) 987 || ms ().move_block == MOVE_ALL)
806 { 988 {
807 while (inv) 989 while (inv)
808 {
809 inv->destroy_inv (drop_to_ground);
810 inv->destroy (); 990 inv->destroy ();
811 }
812 } 991 }
813 else 992 else
814 { /* Put objects in inventory onto this space */ 993 { /* Put objects in inventory onto this space */
815 while (inv) 994 while (inv)
816 { 995 {
818 997
819 if (op->flag [FLAG_STARTEQUIP] 998 if (op->flag [FLAG_STARTEQUIP]
820 || op->flag [FLAG_NO_DROP] 999 || op->flag [FLAG_NO_DROP]
821 || op->type == RUNE 1000 || op->type == RUNE
822 || op->type == TRAP 1001 || op->type == TRAP
823 || op->flag [FLAG_IS_A_TEMPLATE]) 1002 || op->flag [FLAG_IS_A_TEMPLATE]
1003 || op->flag [FLAG_DESTROY_ON_DEATH])
824 op->destroy (); 1004 op->destroy ();
825 else 1005 else
826 map->insert (op, x, y); 1006 map->insert (op, x, y);
827 } 1007 }
828 } 1008 }
833 object *op = new object; 1013 object *op = new object;
834 op->link (); 1014 op->link ();
835 return op; 1015 return op;
836} 1016}
837 1017
1018static struct freed_map : maptile
1019{
1020 freed_map ()
1021 {
1022 path = "<freed objects map>";
1023 name = "/internal/freed_objects_map";
1024 width = 3;
1025 height = 3;
1026 no_drop = 1;
1027 no_reset = 1;
1028
1029 alloc ();
1030 in_memory = MAP_ACTIVE;
1031 }
1032
1033 ~freed_map ()
1034 {
1035 destroy ();
1036 }
1037} freed_map; // freed objects are moved here to avoid crashes
1038
838void 1039void
839object::do_destroy () 1040object::do_destroy ()
840{ 1041{
841 if (flag [FLAG_IS_LINKED]) 1042 if (flag [FLAG_IS_LINKED])
842 remove_button_link (this); 1043 remove_link ();
843 1044
844 if (flag [FLAG_FRIENDLY]) 1045 if (flag [FLAG_FRIENDLY])
845 remove_friendly_object (this); 1046 remove_friendly_object (this);
846 1047
847 if (!flag [FLAG_REMOVED])
848 remove (); 1048 remove ();
849 1049
850 if (flag [FLAG_FREED]) 1050 attachable::do_destroy ();
851 return;
852 1051
853 set_speed (0); 1052 deactivate ();
1053 unlink ();
854 1054
855 flag [FLAG_FREED] = 1; 1055 flag [FLAG_FREED] = 1;
856 1056
857 attachable::do_destroy ();
858
859 destroy_inv (true);
860 unlink ();
861
862 // hack to ensure that freed objects still have a valid map 1057 // hack to ensure that freed objects still have a valid map
863 {
864 static maptile *freed_map; // freed objects are moved here to avoid crashes
865
866 if (!freed_map)
867 {
868 freed_map = new maptile;
869
870 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3;
872 freed_map->height = 3;
873
874 freed_map->alloc ();
875 }
876
877 map = freed_map; 1058 map = &freed_map;
878 x = 1; 1059 x = 1;
879 y = 1; 1060 y = 1;
880 }
881
882 head = 0;
883 1061
884 if (more) 1062 if (more)
885 { 1063 {
886 more->destroy (); 1064 more->destroy ();
887 more = 0; 1065 more = 0;
888 } 1066 }
889 1067
1068 head = 0;
1069
890 // clear those pointers that likely might have circular references to us 1070 // clear those pointers that likely might cause circular references
891 owner = 0; 1071 owner = 0;
892 enemy = 0; 1072 enemy = 0;
893 attacked_by = 0; 1073 attacked_by = 0;
894 1074 current_weapon = 0;
895 // only relevant for players(?), but make sure of it anyways
896 contr = 0;
897} 1075}
898 1076
899void 1077void
900object::destroy (bool destroy_inventory) 1078object::destroy ()
901{ 1079{
902 if (destroyed ()) 1080 if (destroyed ())
903 return; 1081 return;
904 1082
905 if (destroy_inventory) 1083 if (!is_head () && !head->destroyed ())
1084 {
1085 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1086 head->destroy ();
1087 return;
1088 }
1089
906 destroy_inv (false); 1090 destroy_inv (false);
1091
1092 if (is_head ())
1093 if (sound_destroy)
1094 play_sound (sound_destroy);
1095 else if (flag [FLAG_MONSTER])
1096 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
907 1097
908 attachable::destroy (); 1098 attachable::destroy ();
909}
910
911/*
912 * sub_weight() recursively (outwards) subtracts a number from the
913 * weight of an object (and what is carried by it's environment(s)).
914 */
915void
916sub_weight (object *op, signed long weight)
917{
918 while (op != NULL)
919 {
920 if (op->type == CONTAINER)
921 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
922
923 op->carrying -= weight;
924 op = op->env;
925 }
926} 1099}
927 1100
928/* op->remove (): 1101/* op->remove ():
929 * This function removes the object op from the linked list of objects 1102 * This function removes the object op from the linked list of objects
930 * which it is currently tied to. When this function is done, the 1103 * which it is currently tied to. When this function is done, the
931 * object will have no environment. If the object previously had an 1104 * object will have no environment. If the object previously had an
932 * environment, the x and y coordinates will be updated to 1105 * environment, the x and y coordinates will be updated to
933 * the previous environment. 1106 * the previous environment.
934 * Beware: This function is called from the editor as well!
935 */ 1107 */
936void 1108void
937object::remove () 1109object::do_remove ()
938{ 1110{
939 object *tmp, *last = 0; 1111 if (flag [FLAG_REMOVED])
940 object *otmp;
941
942 if (QUERY_FLAG (this, FLAG_REMOVED))
943 return; 1112 return;
944 1113
945 SET_FLAG (this, FLAG_REMOVED);
946 INVOKE_OBJECT (REMOVE, this); 1114 INVOKE_OBJECT (REMOVE, this);
1115
1116 flag [FLAG_REMOVED] = true;
947 1117
948 if (more) 1118 if (more)
949 more->remove (); 1119 more->remove ();
950 1120
951 /* 1121 /*
952 * In this case, the object to be removed is in someones 1122 * In this case, the object to be removed is in someones
953 * inventory. 1123 * inventory.
954 */ 1124 */
955 if (env) 1125 if (env)
956 { 1126 {
957 if (nrof) 1127 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
958 sub_weight (env, weight * nrof); 1128 if (object *pl = visible_to ())
959 else 1129 esrv_del_item (pl->contr, count);
960 sub_weight (env, weight + carrying); 1130 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
961 1131
962 /* NO_FIX_PLAYER is set when a great many changes are being 1132 adjust_weight (env, -total_weight ());
963 * made to players inventory. If set, avoiding the call
964 * to save cpu time.
965 */
966 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967 otmp->update_stats ();
968 1133
969 if (above) 1134 object *pl = in_player ();
970 above->below = below;
971 else
972 env->inv = below;
973
974 if (below)
975 below->above = above;
976 1135
977 /* we set up values so that it could be inserted into 1136 /* we set up values so that it could be inserted into
978 * the map, but we don't actually do that - it is up 1137 * the map, but we don't actually do that - it is up
979 * to the caller to decide what we want to do. 1138 * to the caller to decide what we want to do.
980 */ 1139 */
981 x = env->x, y = env->y;
982 map = env->map; 1140 map = env->map;
983 above = 0, below = 0; 1141 x = env->x;
984 env = 0; 1142 y = env->y;
985 }
986 else if (map)
987 {
988 if (type == PLAYER)
989 {
990 --map->players;
991 map->last_access = runtime;
992 }
993 1143
994 map->dirty = true; 1144 // make sure cmov optimisation is applicable
995 1145 *(above ? &above->below : &env->inv) = below;
996 /* link the object above us */ 1146 *(below ? &below->above : &above ) = above; // &above is just a dummy
997 if (above)
998 above->below = below;
999 else
1000 map->at (x, y).top = below; /* we were top, set new top */
1001
1002 /* Relink the object below us, if there is one */
1003 if (below)
1004 below->above = above;
1005 else
1006 {
1007 /* Nothing below, which means we need to relink map object for this space
1008 * use translated coordinates in case some oddness with map tiling is
1009 * evident
1010 */
1011 if (GET_MAP_OB (map, x, y) != this)
1012 {
1013 char *dump = dump_object (this);
1014 LOG (llevError,
1015 "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);
1016 free (dump);
1017 dump = dump_object (GET_MAP_OB (map, x, y));
1018 LOG (llevError, "%s\n", dump);
1019 free (dump);
1020 }
1021
1022 map->at (x, y).bot = above; /* goes on above it. */
1023 }
1024 1147
1025 above = 0; 1148 above = 0;
1026 below = 0; 1149 below = 0;
1150 env = 0;
1151
1152 if (pl && pl->is_player ())
1153 {
1154 pl->contr->queue_stats_update ();
1155
1156 if (glow_radius && pl->is_on_map ())
1157 update_all_los (pl->map, pl->x, pl->y);
1158 }
1159 }
1160 else if (map)
1161 {
1162 map->dirty = true;
1163 mapspace &ms = this->ms ();
1164
1165 if (object *pl = ms.player ())
1166 {
1167 if (is_player ())
1168 {
1169 if (!flag [FLAG_WIZPASS])
1170 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1171
1172 // leaving a spot always closes any open container on the ground
1173 if (container && !container->env)
1174 // this causes spurious floorbox updates, but it ensures
1175 // that the CLOSE event is being sent.
1176 close_container ();
1177
1178 --map->players;
1179 map->touch ();
1180 }
1181 else if (pl->container_ () == this)
1182 {
1183 // removing a container should close it
1184 close_container ();
1185 }
1186
1187 esrv_del_item (pl->contr, count);
1188 }
1189
1190 /* link the object above us */
1191 // re-link, make sure compiler can easily use cmove
1192 *(above ? &above->below : &ms.top) = below;
1193 *(below ? &below->above : &ms.bot) = above;
1194
1195 above = 0;
1196 below = 0;
1197
1198 ms.invalidate ();
1027 1199
1028 if (map->in_memory == MAP_SAVING) 1200 if (map->in_memory == MAP_SAVING)
1029 return; 1201 return;
1030 1202
1031 int check_walk_off = !flag [FLAG_NO_APPLY]; 1203 int check_walk_off = !flag [FLAG_NO_APPLY];
1032 1204
1033 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1205 if (object *pl = ms.player ())
1034 { 1206 {
1035 /* No point updating the players look faces if he is the object 1207 if (pl->container_ () == this)
1036 * being removed.
1037 */
1038
1039 if (tmp->type == PLAYER && tmp != this)
1040 {
1041 /* If a container that the player is currently using somehow gets 1208 /* If a container that the player is currently using somehow gets
1042 * removed (most likely destroyed), update the player view 1209 * removed (most likely destroyed), update the player view
1043 * appropriately. 1210 * appropriately.
1044 */ 1211 */
1045 if (tmp->container == this) 1212 pl->close_container ();
1046 {
1047 flag [FLAG_APPLIED] = 0;
1048 tmp->container = 0;
1049 }
1050 1213
1214 //TODO: the floorbox prev/next might need updating
1215 //esrv_del_item (pl->contr, count);
1216 //TODO: update floorbox to preserve ordering
1051 if (tmp->contr->ns) 1217 if (pl->contr->ns)
1052 tmp->contr->ns->floorbox_update (); 1218 pl->contr->ns->floorbox_update ();
1219 }
1220
1221 if (check_walk_off)
1222 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1223 {
1224 above = tmp->above;
1225
1226 /* No point updating the players look faces if he is the object
1227 * being removed.
1053 } 1228 */
1054 1229
1055 /* See if object moving off should effect something */ 1230 /* See if object moving off should effect something */
1056 if (check_walk_off
1057 && ((move_type & tmp->move_off) 1231 if ((move_type & tmp->move_off)
1058 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1232 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1059 {
1060 move_apply (tmp, this, 0); 1233 move_apply (tmp, this, 0);
1061
1062 if (destroyed ())
1063 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1064 } 1234 }
1065 1235
1066 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1236 if (affects_los ())
1067 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1068 if (tmp->above == tmp)
1069 tmp->above = 0;
1070
1071 last = tmp;
1072 }
1073
1074 /* last == NULL if there are no objects on this space */
1075 //TODO: this makes little sense, why only update the topmost object?
1076 if (!last)
1077 map->at (x, y).flags_ = 0;
1078 else
1079 update_object (last, UP_OBJ_REMOVE);
1080
1081 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1082 update_all_los (map, x, y); 1237 update_all_los (map, x, y);
1083 } 1238 }
1084} 1239}
1085 1240
1086/* 1241/*
1095merge_ob (object *op, object *top) 1250merge_ob (object *op, object *top)
1096{ 1251{
1097 if (!op->nrof) 1252 if (!op->nrof)
1098 return 0; 1253 return 0;
1099 1254
1100 if (top) 1255 if (!top)
1101 for (top = op; top && top->above; top = top->above) 1256 for (top = op; top && top->above; top = top->above)
1102 ; 1257 ;
1103 1258
1104 for (; top; top = top->below) 1259 for (; top; top = top->below)
1105 {
1106 if (top == op)
1107 continue;
1108
1109 if (object::can_merge (op, top)) 1260 if (object::can_merge (op, top))
1110 { 1261 {
1111 top->nrof += op->nrof; 1262 top->nrof += op->nrof;
1112 1263
1113/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1264 if (object *pl = top->visible_to ())
1114 op->weight = 0; /* Don't want any adjustements now */ 1265 esrv_update_item (UPD_NROF, pl, top);
1266
1267 op->weight = 0; // cancel the addition above
1268 op->carrying = 0; // must be 0 already
1269
1115 op->destroy (); 1270 op->destroy ();
1271
1116 return top; 1272 return top;
1117 } 1273 }
1118 }
1119 1274
1120 return 0; 1275 return 0;
1121} 1276}
1122 1277
1278void
1279object::expand_tail ()
1280{
1281 if (more)
1282 return;
1283
1284 object *prev = this;
1285
1286 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1287 {
1288 object *op = at->instance ();
1289
1290 op->name = name;
1291 op->name_pl = name_pl;
1292 op->title = title;
1293
1294 op->head = this;
1295 prev->more = op;
1296
1297 prev = op;
1298 }
1299}
1300
1123/* 1301/*
1124 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1302 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1125 * job preparing multi-part monsters 1303 * job preparing multi-part monsters.
1126 */ 1304 */
1127object * 1305object *
1128insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1306insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129{ 1307{
1308 op->remove ();
1309
1130 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1310 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1131 { 1311 {
1132 tmp->x = x + tmp->arch->clone.x; 1312 tmp->x = x + tmp->arch->x;
1133 tmp->y = y + tmp->arch->clone.y; 1313 tmp->y = y + tmp->arch->y;
1134 } 1314 }
1135 1315
1136 return insert_ob_in_map (op, m, originator, flag); 1316 return insert_ob_in_map (op, m, originator, flag);
1137} 1317}
1138 1318
1151 * Passing 0 for flag gives proper default values, so flag really only needs 1331 * Passing 0 for flag gives proper default values, so flag really only needs
1152 * to be set if special handling is needed. 1332 * to be set if special handling is needed.
1153 * 1333 *
1154 * Return value: 1334 * Return value:
1155 * new object if 'op' was merged with other object 1335 * new object if 'op' was merged with other object
1156 * NULL if 'op' was destroyed 1336 * NULL if there was an error (destroyed, blocked etc.)
1157 * just 'op' otherwise 1337 * just 'op' otherwise
1158 */ 1338 */
1159object * 1339object *
1160insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1340insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161{ 1341{
1162 object *tmp, *top, *floor = NULL; 1342 op->remove ();
1163 sint16 x, y;
1164 1343
1165 if (QUERY_FLAG (op, FLAG_FREED)) 1344 if (m == &freed_map)//D TODO: remove soon
1166 { 1345 {//D
1167 LOG (llevError, "Trying to insert freed object!\n"); 1346 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1168 return NULL;
1169 } 1347 }//D
1170
1171 if (!m)
1172 {
1173 char *dump = dump_object (op);
1174 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1175 free (dump);
1176 return op;
1177 }
1178
1179 if (out_of_map (m, op->x, op->y))
1180 {
1181 char *dump = dump_object (op);
1182 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1183#ifdef MANY_CORES
1184 /* Better to catch this here, as otherwise the next use of this object
1185 * is likely to cause a crash. Better to find out where it is getting
1186 * improperly inserted.
1187 */
1188 abort ();
1189#endif
1190 free (dump);
1191 return op;
1192 }
1193
1194 if (!QUERY_FLAG (op, FLAG_REMOVED))
1195 {
1196 char *dump = dump_object (op);
1197 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198 free (dump);
1199 return op;
1200 }
1201
1202 if (op->more)
1203 {
1204 /* The part may be on a different map. */
1205
1206 object *more = op->more;
1207
1208 /* We really need the caller to normalize coordinates - if
1209 * we set the map, that doesn't work if the location is within
1210 * a map and this is straddling an edge. So only if coordinate
1211 * is clear wrong do we normalize it.
1212 */
1213 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214 more->map = get_map_from_coord (m, &more->x, &more->y);
1215 else if (!more->map)
1216 {
1217 /* For backwards compatibility - when not dealing with tiled maps,
1218 * more->map should always point to the parent.
1219 */
1220 more->map = m;
1221 }
1222
1223 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1224 {
1225 if (!op->head)
1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228 return 0;
1229 }
1230 }
1231
1232 CLEAR_FLAG (op, FLAG_REMOVED);
1233 1348
1234 /* Ideally, the caller figures this out. However, it complicates a lot 1349 /* Ideally, the caller figures this out. However, it complicates a lot
1235 * of areas of callers (eg, anything that uses find_free_spot would now 1350 * of areas of callers (eg, anything that uses find_free_spot would now
1236 * need extra work 1351 * need extra work
1237 */ 1352 */
1238 op->map = get_map_from_coord (m, &op->x, &op->y); 1353 maptile *newmap = m;
1239 x = op->x; 1354 if (!xy_normalise (newmap, op->x, op->y))
1240 y = op->y; 1355 {
1356 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1357 return 0;
1358 }
1359
1360 if (object *more = op->more)
1361 if (!insert_ob_in_map (more, m, originator, flag))
1362 return 0;
1363
1364 op->flag [FLAG_REMOVED] = false;
1365 op->env = 0;
1366 op->map = newmap;
1367
1368 mapspace &ms = op->ms ();
1241 1369
1242 /* this has to be done after we translate the coordinates. 1370 /* this has to be done after we translate the coordinates.
1243 */ 1371 */
1244 if (op->nrof && !(flag & INS_NO_MERGE)) 1372 if (op->nrof && !(flag & INS_NO_MERGE))
1245 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1373 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1246 if (object::can_merge (op, tmp)) 1374 if (object::can_merge (op, tmp))
1247 { 1375 {
1376 // TODO: we actually want to update tmp, not op,
1377 // but some caller surely breaks when we return tmp
1378 // from here :/
1248 op->nrof += tmp->nrof; 1379 op->nrof += tmp->nrof;
1249 tmp->destroy (); 1380 tmp->destroy ();
1250 } 1381 }
1251 1382
1252 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1383 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1261 { 1392 {
1262 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1393 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1263 abort (); 1394 abort ();
1264 } 1395 }
1265 1396
1397 if (!originator->is_on_map ())
1398 {
1399 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1400 op->debug_desc (), originator->debug_desc ());
1401 abort ();
1402 }
1403
1266 op->above = originator; 1404 op->above = originator;
1267 op->below = originator->below; 1405 op->below = originator->below;
1268
1269 if (op->below)
1270 op->below->above = op;
1271 else
1272 op->ms ().bot = op;
1273
1274 /* since *below* originator, no need to update top */
1275 originator->below = op; 1406 originator->below = op;
1407
1408 *(op->below ? &op->below->above : &ms.bot) = op;
1276 } 1409 }
1277 else 1410 else
1278 { 1411 {
1412 object *floor = 0;
1413 object *top = ms.top;
1414
1279 /* If there are other objects, then */ 1415 /* If there are other objects, then */
1280 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1416 if (top)
1281 { 1417 {
1282 object *last = 0;
1283
1284 /* 1418 /*
1285 * If there are multiple objects on this space, we do some trickier handling. 1419 * If there are multiple objects on this space, we do some trickier handling.
1286 * We've already dealt with merging if appropriate. 1420 * We've already dealt with merging if appropriate.
1287 * Generally, we want to put the new object on top. But if 1421 * Generally, we want to put the new object on top. But if
1288 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1422 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1291 * once we get to them. This reduces the need to traverse over all of 1425 * once we get to them. This reduces the need to traverse over all of
1292 * them when adding another one - this saves quite a bit of cpu time 1426 * them when adding another one - this saves quite a bit of cpu time
1293 * when lots of spells are cast in one area. Currently, it is presumed 1427 * when lots of spells are cast in one area. Currently, it is presumed
1294 * that flying non pickable objects are spell objects. 1428 * that flying non pickable objects are spell objects.
1295 */ 1429 */
1296 while (top) 1430 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1297 { 1431 {
1298 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1432 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1299 floor = top; 1433 floor = tmp;
1300 1434
1301 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1435 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1302 { 1436 {
1303 /* We insert above top, so we want this object below this */ 1437 /* We insert above top, so we want this object below this */
1304 top = top->below; 1438 top = tmp->below;
1305 break; 1439 break;
1306 } 1440 }
1307 1441
1308 last = top;
1309 top = top->above; 1442 top = tmp;
1310 } 1443 }
1311
1312 /* Don't want top to be NULL, so set it to the last valid object */
1313 top = last;
1314 1444
1315 /* We let update_position deal with figuring out what the space 1445 /* We let update_position deal with figuring out what the space
1316 * looks like instead of lots of conditions here. 1446 * looks like instead of lots of conditions here.
1317 * makes things faster, and effectively the same result. 1447 * makes things faster, and effectively the same result.
1318 */ 1448 */
1319 1449
1320 /* Have object 'fall below' other objects that block view. 1450 /* Have object 'fall below' other objects that block view.
1321 * Unless those objects are exits, type 66 1451 * Unless those objects are exits.
1322 * If INS_ON_TOP is used, don't do this processing 1452 * If INS_ON_TOP is used, don't do this processing
1323 * Need to find the object that in fact blocks view, otherwise 1453 * Need to find the object that in fact blocks view, otherwise
1324 * stacking is a bit odd. 1454 * stacking is a bit odd.
1325 */ 1455 */
1326 if (!(flag & INS_ON_TOP) && 1456 if (!(flag & INS_ON_TOP)
1327 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1457 && ms.flags () & P_BLOCKSVIEW
1458 && (op->face && !faces [op->face].visibility))
1328 { 1459 {
1460 object *last;
1461
1329 for (last = top; last != floor; last = last->below) 1462 for (last = top; last != floor; last = last->below)
1330 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1463 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1331 break; 1464 break;
1465
1332 /* Check to see if we found the object that blocks view, 1466 /* Check to see if we found the object that blocks view,
1333 * and make sure we have a below pointer for it so that 1467 * and make sure we have a below pointer for it so that
1334 * we can get inserted below this one, which requires we 1468 * we can get inserted below this one, which requires we
1335 * set top to the object below us. 1469 * set top to the object below us.
1336 */ 1470 */
1337 if (last && last->below && last != floor) 1471 if (last && last->below && last != floor)
1338 top = last->below; 1472 top = last->below;
1339 } 1473 }
1340 } /* If objects on this space */ 1474 } /* If objects on this space */
1341 1475
1342 if (flag & INS_MAP_LOAD)
1343 top = GET_MAP_TOP (op->map, op->x, op->y);
1344
1345 if (flag & INS_ABOVE_FLOOR_ONLY) 1476 if (flag & INS_ABOVE_FLOOR_ONLY)
1346 top = floor; 1477 top = floor;
1347 1478
1348 /* Top is the object that our object (op) is going to get inserted above. 1479 // insert object above top, or bottom-most if top = 0
1349 */
1350
1351 /* First object on this space */
1352 if (!top) 1480 if (!top)
1353 { 1481 {
1354 op->above = GET_MAP_OB (op->map, op->x, op->y);
1355
1356 if (op->above)
1357 op->above->below = op;
1358
1359 op->below = 0; 1482 op->below = 0;
1483 op->above = ms.bot;
1360 op->ms ().bot = op; 1484 ms.bot = op;
1485
1486 *(op->above ? &op->above->below : &ms.top) = op;
1361 } 1487 }
1362 else 1488 else
1363 { /* get inserted into the stack above top */ 1489 {
1364 op->above = top->above; 1490 op->above = top->above;
1365
1366 if (op->above)
1367 op->above->below = op; 1491 top->above = op;
1368 1492
1369 op->below = top; 1493 op->below = top;
1370 top->above = op; 1494 *(op->above ? &op->above->below : &ms.top) = op;
1371 } 1495 }
1496 }
1372 1497
1373 if (!op->above) 1498 if (op->is_player ())
1374 op->ms ().top = op;
1375 } /* else not INS_BELOW_ORIGINATOR */
1376
1377 if (op->type == PLAYER)
1378 { 1499 {
1379 op->contr->do_los = 1; 1500 op->contr->do_los = 1;
1380 ++op->map->players; 1501 ++op->map->players;
1381 op->map->last_access = runtime; 1502 op->map->touch ();
1382 } 1503 }
1383 1504
1384 op->map->dirty = true; 1505 op->map->dirty = true;
1385 1506
1386 /* If we have a floor, we know the player, if any, will be above
1387 * it, so save a few ticks and start from there.
1388 */
1389 if (!(flag & INS_MAP_LOAD))
1390 if (object *pl = op->ms ().player ()) 1507 if (object *pl = ms.player ())
1508 //TODO: the floorbox prev/next might need updating
1509 //esrv_send_item (pl, op);
1510 //TODO: update floorbox to preserve ordering
1391 if (pl->contr->ns) 1511 if (pl->contr->ns)
1392 pl->contr->ns->floorbox_update (); 1512 pl->contr->ns->floorbox_update ();
1393 1513
1394 /* If this object glows, it may affect lighting conditions that are 1514 /* If this object glows, it may affect lighting conditions that are
1395 * visible to others on this map. But update_all_los is really 1515 * visible to others on this map. But update_all_los is really
1396 * an inefficient way to do this, as it means los for all players 1516 * an inefficient way to do this, as it means los for all players
1397 * on the map will get recalculated. The players could very well 1517 * on the map will get recalculated. The players could very well
1398 * be far away from this change and not affected in any way - 1518 * be far away from this change and not affected in any way -
1399 * this should get redone to only look for players within range, 1519 * this should get redone to only look for players within range,
1400 * or just updating the P_UPTODATE for spaces within this area 1520 * or just updating the P_UPTODATE for spaces within this area
1401 * of effect may be sufficient. 1521 * of effect may be sufficient.
1402 */ 1522 */
1403 if (op->map->darkness && (op->glow_radius != 0)) 1523 if (op->affects_los ())
1524 {
1525 op->ms ().invalidate ();
1404 update_all_los (op->map, op->x, op->y); 1526 update_all_los (op->map, op->x, op->y);
1527 }
1405 1528
1406 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1529 /* updates flags (blocked, alive, no magic, etc) for this map space */
1407 update_object (op, UP_OBJ_INSERT); 1530 update_object (op, UP_OBJ_INSERT);
1408 1531
1409 INVOKE_OBJECT (INSERT, op); 1532 INVOKE_OBJECT (INSERT, op);
1416 * blocked() and wall() work properly), and these flags are updated by 1539 * blocked() and wall() work properly), and these flags are updated by
1417 * update_object(). 1540 * update_object().
1418 */ 1541 */
1419 1542
1420 /* if this is not the head or flag has been passed, don't check walk on status */ 1543 /* if this is not the head or flag has been passed, don't check walk on status */
1421 if (!(flag & INS_NO_WALK_ON) && !op->head) 1544 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1422 { 1545 {
1423 if (check_move_on (op, originator)) 1546 if (check_move_on (op, originator))
1424 return 0; 1547 return 0;
1425 1548
1426 /* If we are a multi part object, lets work our way through the check 1549 /* If we are a multi part object, lets work our way through the check
1427 * walk on's. 1550 * walk on's.
1428 */ 1551 */
1429 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1552 for (object *tmp = op->more; tmp; tmp = tmp->more)
1430 if (check_move_on (tmp, originator)) 1553 if (check_move_on (tmp, originator))
1431 return 0; 1554 return 0;
1432 } 1555 }
1433 1556
1434 return op; 1557 return op;
1437/* this function inserts an object in the map, but if it 1560/* this function inserts an object in the map, but if it
1438 * finds an object of its own type, it'll remove that one first. 1561 * finds an object of its own type, it'll remove that one first.
1439 * op is the object to insert it under: supplies x and the map. 1562 * op is the object to insert it under: supplies x and the map.
1440 */ 1563 */
1441void 1564void
1442replace_insert_ob_in_map (const char *arch_string, object *op) 1565replace_insert_ob_in_map (shstr_tmp archname, object *op)
1443{ 1566{
1444 object *tmp, *tmp1;
1445
1446 /* first search for itself and remove any old instances */ 1567 /* first search for itself and remove any old instances */
1447 1568
1448 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1569 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1570 if (tmp->arch->archname == archname) /* same archetype */
1450 tmp->destroy (); 1571 tmp->destroy ();
1451 1572
1452 tmp1 = arch_to_object (archetype::find (arch_string)); 1573 object *tmp = archetype::find (archname)->instance ();
1453 1574
1454 tmp1->x = op->x; 1575 tmp->x = op->x;
1455 tmp1->y = op->y; 1576 tmp->y = op->y;
1577
1456 insert_ob_in_map (tmp1, op->map, op, 0); 1578 insert_ob_in_map (tmp, op->map, op, 0);
1457} 1579}
1458 1580
1459object * 1581object *
1460object::insert_at (object *where, object *originator, int flags) 1582object::insert_at (object *where, object *originator, int flags)
1461{ 1583{
1584 if (where->env)
1585 return where->env->insert (this);
1586 else
1462 where->map->insert (this, where->x, where->y, originator, flags); 1587 return where->map->insert (this, where->x, where->y, originator, flags);
1463} 1588}
1464 1589
1465/* 1590// check whether we can put this into the map, respect max_volume, max_items
1466 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1591bool
1467 * is returned contains nr objects, and the remaining parts contains 1592object::can_drop_at (maptile *m, int x, int y, object *originator)
1468 * the rest (or is removed and freed if that number is 0).
1469 * On failure, NULL is returned, and the reason put into the
1470 * global static errmsg array.
1471 */
1472object *
1473get_split_ob (object *orig_ob, uint32 nr)
1474{ 1593{
1475 object *newob; 1594 mapspace &ms = m->at (x, y);
1476 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1477 1595
1478 if (orig_ob->nrof < nr) 1596 int items = ms.items ();
1479 {
1480 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1481 return NULL;
1482 }
1483 1597
1484 newob = object_create_clone (orig_ob); 1598 if (!items // testing !items ensures we can drop at least one item
1599 || (items < m->max_items
1600 && ms.volume () < m->max_volume))
1601 return true;
1485 1602
1486 if ((orig_ob->nrof -= nr) < 1) 1603 if (originator && originator->is_player ())
1487 orig_ob->destroy (1); 1604 originator->contr->failmsg (format (
1488 else if (!is_removed) 1605 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1489 { 1606 query_name ()
1490 if (orig_ob->env != NULL) 1607 ));
1491 sub_weight (orig_ob->env, orig_ob->weight * nr);
1492 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1493 {
1494 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1495 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1496 return NULL;
1497 }
1498 }
1499 1608
1500 newob->nrof = nr; 1609 return false;
1501
1502 return newob;
1503} 1610}
1504 1611
1505/* 1612/*
1506 * decrease_ob_nr(object, number) decreases a specified number from 1613 * decrease(object, number) decreases a specified number from
1507 * the amount of an object. If the amount reaches 0, the object 1614 * the amount of an object. If the amount reaches 0, the object
1508 * is subsequently removed and freed. 1615 * is subsequently removed and freed.
1509 * 1616 *
1510 * Return value: 'op' if something is left, NULL if the amount reached 0 1617 * Return value: 'op' if something is left, NULL if the amount reached 0
1511 */ 1618 */
1619bool
1620object::decrease (sint32 nr)
1621{
1622 if (!nr)
1623 return true;
1512 1624
1625 nr = min (nr, nrof);
1626
1627 if (nrof > nr)
1628 {
1629 nrof -= nr;
1630 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1631
1632 if (object *pl = visible_to ())
1633 esrv_update_item (UPD_NROF, pl, this);
1634
1635 return true;
1636 }
1637 else
1638 {
1639 destroy ();
1640 return false;
1641 }
1642}
1643
1644/*
1645 * split(ob,nr) splits up ob into two parts. The part which
1646 * is returned contains nr objects, and the remaining parts contains
1647 * the rest (or is removed and returned if that number is 0).
1648 * On failure, NULL is returned.
1649 */
1513object * 1650object *
1514decrease_ob_nr (object *op, uint32 i) 1651object::split (sint32 nr)
1515{ 1652{
1516 object *tmp; 1653 int have = number_of ();
1517 1654
1518 if (i == 0) /* objects with op->nrof require this check */ 1655 if (have < nr)
1519 return op; 1656 return 0;
1520 1657 else if (have == nr)
1521 if (i > op->nrof)
1522 i = op->nrof;
1523
1524 if (QUERY_FLAG (op, FLAG_REMOVED))
1525 op->nrof -= i;
1526 else if (op->env)
1527 { 1658 {
1528 /* is this object in the players inventory, or sub container
1529 * therein?
1530 */
1531 tmp = op->in_player ();
1532 /* nope. Is this a container the player has opened?
1533 * If so, set tmp to that player.
1534 * IMO, searching through all the players will mostly
1535 * likely be quicker than following op->env to the map,
1536 * and then searching the map for a player.
1537 */
1538 if (!tmp)
1539 for_all_players (pl)
1540 if (pl->ob->container == op->env)
1541 {
1542 tmp = pl->ob;
1543 break;
1544 }
1545
1546 if (i < op->nrof)
1547 {
1548 sub_weight (op->env, op->weight * i);
1549 op->nrof -= i;
1550 if (tmp)
1551 esrv_send_item (tmp, op);
1552 }
1553 else
1554 {
1555 op->remove (); 1659 remove ();
1556 op->nrof = 0; 1660 return this;
1557 if (tmp)
1558 esrv_del_item (tmp->contr, op->count);
1559 }
1560 } 1661 }
1561 else 1662 else
1562 { 1663 {
1563 object *above = op->above; 1664 decrease (nr);
1564 1665
1565 if (i < op->nrof) 1666 object *op = deep_clone ();
1566 op->nrof -= i; 1667 op->nrof = nr;
1567 else
1568 {
1569 op->remove ();
1570 op->nrof = 0;
1571 }
1572
1573 /* Since we just removed op, op->above is null */
1574 for (tmp = above; tmp; tmp = tmp->above)
1575 if (tmp->type == PLAYER)
1576 {
1577 if (op->nrof)
1578 esrv_send_item (tmp, op);
1579 else
1580 esrv_del_item (tmp->contr, op->count);
1581 }
1582 }
1583
1584 if (op->nrof)
1585 return op; 1668 return op;
1586 else
1587 {
1588 op->destroy ();
1589 return 0;
1590 }
1591}
1592
1593/*
1594 * add_weight(object, weight) adds the specified weight to an object,
1595 * and also updates how much the environment(s) is/are carrying.
1596 */
1597
1598void
1599add_weight (object *op, signed long weight)
1600{
1601 while (op != NULL)
1602 {
1603 if (op->type == CONTAINER)
1604 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1605
1606 op->carrying += weight;
1607 op = op->env;
1608 } 1669 }
1609} 1670}
1610 1671
1611object * 1672object *
1612insert_ob_in_ob (object *op, object *where) 1673insert_ob_in_ob (object *op, object *where)
1617 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1678 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1618 free (dump); 1679 free (dump);
1619 return op; 1680 return op;
1620 } 1681 }
1621 1682
1622 if (where->head) 1683 if (where->head_ () != where)
1623 { 1684 {
1624 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1685 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1625 where = where->head; 1686 where = where->head;
1626 } 1687 }
1627 1688
1628 return where->insert (op); 1689 return where->insert (op);
1629} 1690}
1634 * inside the object environment. 1695 * inside the object environment.
1635 * 1696 *
1636 * The function returns now pointer to inserted item, and return value can 1697 * The function returns now pointer to inserted item, and return value can
1637 * be != op, if items are merged. -Tero 1698 * be != op, if items are merged. -Tero
1638 */ 1699 */
1639
1640object * 1700object *
1641object::insert (object *op) 1701object::insert (object *op)
1642{ 1702{
1643 object *tmp, *otmp;
1644
1645 if (!QUERY_FLAG (op, FLAG_REMOVED))
1646 op->remove ();
1647
1648 if (op->more) 1703 if (op->more)
1649 { 1704 {
1650 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1705 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1651 return op; 1706 return op;
1652 } 1707 }
1653 1708
1654 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1709 op->remove ();
1655 CLEAR_FLAG (op, FLAG_REMOVED); 1710
1711 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1712
1656 if (op->nrof) 1713 if (op->nrof)
1657 {
1658 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1714 for (object *tmp = inv; tmp; tmp = tmp->below)
1659 if (object::can_merge (tmp, op)) 1715 if (object::can_merge (tmp, op))
1660 { 1716 {
1661 /* return the original object and remove inserted object 1717 /* return the original object and remove inserted object
1662 (client needs the original object) */ 1718 (client needs the original object) */
1663 tmp->nrof += op->nrof; 1719 tmp->nrof += op->nrof;
1664 /* Weight handling gets pretty funky. Since we are adding to 1720
1665 * tmp->nrof, we need to increase the weight. 1721 if (object *pl = tmp->visible_to ())
1666 */ 1722 esrv_update_item (UPD_NROF, pl, tmp);
1723
1667 add_weight (this, op->weight * op->nrof); 1724 adjust_weight (this, op->total_weight ());
1668 SET_FLAG (op, FLAG_REMOVED); 1725
1669 op->destroy (); /* free the inserted object */ 1726 op->destroy ();
1670 op = tmp; 1727 op = tmp;
1671 op->remove (); /* and fix old object's links */ 1728 goto inserted;
1672 CLEAR_FLAG (op, FLAG_REMOVED);
1673 break;
1674 } 1729 }
1675 1730
1676 /* I assume combined objects have no inventory 1731 op->owner = 0; // it's his/hers now. period.
1677 * We add the weight - this object could have just been removed
1678 * (if it was possible to merge). calling remove_ob will subtract
1679 * the weight, so we need to add it in again, since we actually do
1680 * the linking below
1681 */
1682 add_weight (this, op->weight * op->nrof);
1683 }
1684 else
1685 add_weight (this, (op->weight + op->carrying));
1686
1687 otmp = this->in_player ();
1688 if (otmp && otmp->contr)
1689 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1690 otmp->update_stats ();
1691
1692 op->map = 0; 1732 op->map = 0;
1693 op->env = this; 1733 op->x = 0;
1734 op->y = 0;
1735
1694 op->above = 0; 1736 op->above = 0;
1695 op->below = 0; 1737 op->below = inv;
1696 op->x = 0, op->y = 0; 1738 op->env = this;
1697 1739
1740 if (inv)
1741 inv->above = op;
1742
1743 inv = op;
1744
1745 op->flag [FLAG_REMOVED] = 0;
1746
1747 if (object *pl = op->visible_to ())
1748 esrv_send_item (pl, op);
1749
1750 adjust_weight (this, op->total_weight ());
1751
1752inserted:
1698 /* reset the light list and los of the players on the map */ 1753 /* reset the light list and los of the players on the map */
1699 if ((op->glow_radius != 0) && map) 1754 if (op->glow_radius && is_on_map ())
1700 { 1755 {
1701#ifdef DEBUG_LIGHTS 1756 update_stats ();
1702 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1703#endif /* DEBUG_LIGHTS */
1704 if (map->darkness)
1705 update_all_los (map, x, y); 1757 update_all_los (map, x, y);
1706 }
1707
1708 /* Client has no idea of ordering so lets not bother ordering it here.
1709 * It sure simplifies this function...
1710 */
1711 if (!inv)
1712 inv = op;
1713 else
1714 { 1758 }
1715 op->below = inv; 1759 else if (is_player ())
1716 op->below->above = op; 1760 // if this is a player's inventory, update stats
1717 inv = op; 1761 contr->queue_stats_update ();
1718 }
1719 1762
1720 INVOKE_OBJECT (INSERT, this); 1763 INVOKE_OBJECT (INSERT, this);
1721 1764
1722 return op; 1765 return op;
1723} 1766}
1743 * on top. 1786 * on top.
1744 */ 1787 */
1745int 1788int
1746check_move_on (object *op, object *originator) 1789check_move_on (object *op, object *originator)
1747{ 1790{
1791 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1792 return 0;
1793
1748 object *tmp; 1794 object *tmp;
1749 maptile *m = op->map; 1795 maptile *m = op->map;
1750 int x = op->x, y = op->y; 1796 int x = op->x, y = op->y;
1751 1797
1752 MoveType move_on, move_slow, move_block; 1798 mapspace &ms = m->at (x, y);
1753 1799
1754 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1800 ms.update ();
1755 return 0;
1756 1801
1757 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1802 MoveType move_on = ms.move_on;
1758 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1803 MoveType move_slow = ms.move_slow;
1759 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1804 MoveType move_block = ms.move_block;
1760 1805
1761 /* if nothing on this space will slow op down or be applied, 1806 /* if nothing on this space will slow op down or be applied,
1762 * no need to do checking below. have to make sure move_type 1807 * no need to do checking below. have to make sure move_type
1763 * is set, as lots of objects don't have it set - we treat that 1808 * is set, as lots of objects don't have it set - we treat that
1764 * as walking. 1809 * as walking.
1775 return 0; 1820 return 0;
1776 1821
1777 /* The objects have to be checked from top to bottom. 1822 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1823 * Hence, we first go to the top:
1779 */ 1824 */
1780 1825 for (object *next, *tmp = ms.top; tmp; tmp = next)
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1782 {
1783 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them.
1786 */
1787 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1788 break;
1789 } 1826 {
1827 next = tmp->below;
1790 1828
1791 for (; tmp; tmp = tmp->below)
1792 {
1793 if (tmp == op) 1829 if (tmp == op)
1794 continue; /* Can't apply yourself */ 1830 continue; /* Can't apply yourself */
1795 1831
1796 /* Check to see if one of the movement types should be slowed down. 1832 /* Check to see if one of the movement types should be slowed down.
1797 * Second check makes sure that the movement types not being slowed 1833 * Second check makes sure that the movement types not being slowed
1802 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1838 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1803 { 1839 {
1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1840 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1841 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806 { 1842 {
1807
1808 float
1809 diff = tmp->move_slow_penalty * FABS (op->speed); 1843 float diff = tmp->move_slow_penalty * fabs (op->speed);
1810 1844
1811 if (op->type == PLAYER) 1845 if (op->is_player ())
1812 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1846 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1813 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1847 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1814 diff /= 4.0; 1848 diff /= 4.0;
1815 1849
1816 op->speed_left -= diff; 1850 op->speed_left -= diff;
1817 } 1851 }
1818 } 1852 }
1844 * The first matching object is returned, or NULL if none. 1878 * The first matching object is returned, or NULL if none.
1845 */ 1879 */
1846object * 1880object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1881present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1882{
1849 if (m == NULL || out_of_map (m, x, y)) 1883 if (!m || out_of_map (m, x, y))
1850 { 1884 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1885 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1886 return NULL;
1853 } 1887 }
1854 1888
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1889 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1890 if (tmp->arch->archname == at->archname)
1857 return tmp; 1891 return tmp;
1858 1892
1859 return NULL; 1893 return NULL;
1860} 1894}
1861 1895
1871 { 1905 {
1872 LOG (llevError, "Present called outside map.\n"); 1906 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1907 return NULL;
1874 } 1908 }
1875 1909
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1910 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1911 if (tmp->type == type)
1878 return tmp; 1912 return tmp;
1879 1913
1880 return NULL; 1914 return NULL;
1881} 1915}
1925 * The first matching object is returned, or NULL if none. 1959 * The first matching object is returned, or NULL if none.
1926 */ 1960 */
1927object * 1961object *
1928present_arch_in_ob (const archetype *at, const object *op) 1962present_arch_in_ob (const archetype *at, const object *op)
1929{ 1963{
1930 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1931 if (tmp->arch == at) 1965 if (tmp->arch->archname == at->archname)
1932 return tmp; 1966 return tmp;
1933 1967
1934 return NULL; 1968 return NULL;
1935} 1969}
1936 1970
1938 * activate recursively a flag on an object inventory 1972 * activate recursively a flag on an object inventory
1939 */ 1973 */
1940void 1974void
1941flag_inv (object *op, int flag) 1975flag_inv (object *op, int flag)
1942{ 1976{
1943 if (op->inv)
1944 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1945 { 1978 {
1946 SET_FLAG (tmp, flag); 1979 SET_FLAG (tmp, flag);
1947 flag_inv (tmp, flag); 1980 flag_inv (tmp, flag);
1948 } 1981 }
1949} 1982}
1950 1983
1951/* 1984/*
1952 * deactivate recursively a flag on an object inventory 1985 * deactivate recursively a flag on an object inventory
1953 */ 1986 */
1954void 1987void
1955unflag_inv (object *op, int flag) 1988unflag_inv (object *op, int flag)
1956{ 1989{
1957 if (op->inv)
1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1990 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 1991 {
1960 CLEAR_FLAG (tmp, flag); 1992 CLEAR_FLAG (tmp, flag);
1961 unflag_inv (tmp, flag); 1993 unflag_inv (tmp, flag);
1962 } 1994 }
1963}
1964
1965/*
1966 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1967 * all it's inventory (recursively).
1968 * If checksums are used, a player will get set_cheat called for
1969 * him/her-self and all object carried by a call to this function.
1970 */
1971void
1972set_cheat (object *op)
1973{
1974 SET_FLAG (op, FLAG_WAS_WIZ);
1975 flag_inv (op, FLAG_WAS_WIZ);
1976} 1995}
1977 1996
1978/* 1997/*
1979 * find_free_spot(object, map, x, y, start, stop) will search for 1998 * find_free_spot(object, map, x, y, start, stop) will search for
1980 * a spot at the given map and coordinates which will be able to contain 1999 * a spot at the given map and coordinates which will be able to contain
1982 * to search (see the freearr_x/y[] definition). 2001 * to search (see the freearr_x/y[] definition).
1983 * It returns a random choice among the alternatives found. 2002 * It returns a random choice among the alternatives found.
1984 * start and stop are where to start relative to the free_arr array (1,9 2003 * start and stop are where to start relative to the free_arr array (1,9
1985 * does all 4 immediate directions). This returns the index into the 2004 * does all 4 immediate directions). This returns the index into the
1986 * array of the free spot, -1 if no spot available (dir 0 = x,y) 2005 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1987 * Note - this only checks to see if there is space for the head of the
1988 * object - if it is a multispace object, this should be called for all
1989 * pieces.
1990 * Note2: This function does correctly handle tiled maps, but does not 2006 * Note: This function does correctly handle tiled maps, but does not
1991 * inform the caller. However, insert_ob_in_map will update as 2007 * inform the caller. However, insert_ob_in_map will update as
1992 * necessary, so the caller shouldn't need to do any special work. 2008 * necessary, so the caller shouldn't need to do any special work.
1993 * Note - updated to take an object instead of archetype - this is necessary 2009 * Note - updated to take an object instead of archetype - this is necessary
1994 * because arch_blocked (now ob_blocked) needs to know the movement type 2010 * because arch_blocked (now ob_blocked) needs to know the movement type
1995 * to know if the space in question will block the object. We can't use 2011 * to know if the space in question will block the object. We can't use
1997 * customized, changed states, etc. 2013 * customized, changed states, etc.
1998 */ 2014 */
1999int 2015int
2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2016find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2001{ 2017{
2018 int altern[SIZEOFFREE];
2002 int index = 0, flag; 2019 int index = 0, flag;
2003 int altern[SIZEOFFREE];
2004 2020
2005 for (int i = start; i < stop; i++) 2021 for (int i = start; i < stop; i++)
2006 { 2022 {
2007 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2023 mapxy pos (m, x, y); pos.move (i);
2008 if (!flag) 2024
2025 if (!pos.normalise ())
2026 continue;
2027
2028 mapspace &ms = *pos;
2029
2030 if (ms.flags () & P_IS_ALIVE)
2031 continue;
2032
2033 /* However, often
2034 * ob doesn't have any move type (when used to place exits)
2035 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2036 */
2037 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2038 {
2009 altern [index++] = i; 2039 altern [index++] = i;
2040 continue;
2041 }
2010 2042
2011 /* Basically, if we find a wall on a space, we cut down the search size. 2043 /* Basically, if we find a wall on a space, we cut down the search size.
2012 * In this way, we won't return spaces that are on another side of a wall. 2044 * In this way, we won't return spaces that are on another side of a wall.
2013 * This mostly work, but it cuts down the search size in all directions - 2045 * This mostly work, but it cuts down the search size in all directions -
2014 * if the space being examined only has a wall to the north and empty 2046 * if the space being examined only has a wall to the north and empty
2015 * spaces in all the other directions, this will reduce the search space 2047 * spaces in all the other directions, this will reduce the search space
2016 * to only the spaces immediately surrounding the target area, and 2048 * to only the spaces immediately surrounding the target area, and
2017 * won't look 2 spaces south of the target space. 2049 * won't look 2 spaces south of the target space.
2018 */ 2050 */
2019 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2051 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2052 {
2020 stop = maxfree[i]; 2053 stop = maxfree[i];
2054 continue;
2055 }
2056
2057 /* Note it is intentional that we check ob - the movement type of the
2058 * head of the object should correspond for the entire object.
2059 */
2060 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2061 continue;
2062
2063 if (ob->blocked (pos.m, pos.x, pos.y))
2064 continue;
2065
2066 altern [index++] = i;
2021 } 2067 }
2022 2068
2023 if (!index) 2069 if (!index)
2024 return -1; 2070 return -1;
2025 2071
2026 return altern[RANDOM () % index]; 2072 return altern [rndm (index)];
2027} 2073}
2028 2074
2029/* 2075/*
2030 * find_first_free_spot(archetype, maptile, x, y) works like 2076 * find_first_free_spot(archetype, maptile, x, y) works like
2031 * find_free_spot(), but it will search max number of squares. 2077 * find_free_spot(), but it will search max number of squares.
2034 */ 2080 */
2035int 2081int
2036find_first_free_spot (const object *ob, maptile *m, int x, int y) 2082find_first_free_spot (const object *ob, maptile *m, int x, int y)
2037{ 2083{
2038 for (int i = 0; i < SIZEOFFREE; i++) 2084 for (int i = 0; i < SIZEOFFREE; i++)
2039 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2085 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2040 return i; 2086 return i;
2041 2087
2042 return -1; 2088 return -1;
2043} 2089}
2044 2090
2052{ 2098{
2053 arr += begin; 2099 arr += begin;
2054 end -= begin; 2100 end -= begin;
2055 2101
2056 while (--end) 2102 while (--end)
2057 swap (arr [end], arr [RANDOM () % (end + 1)]); 2103 swap (arr [end], arr [rndm (end + 1)]);
2058} 2104}
2059 2105
2060/* new function to make monster searching more efficient, and effective! 2106/* new function to make monster searching more efficient, and effective!
2061 * This basically returns a randomized array (in the passed pointer) of 2107 * This basically returns a randomized array (in the passed pointer) of
2062 * the spaces to find monsters. In this way, it won't always look for 2108 * the spaces to find monsters. In this way, it won't always look for
2090 * there is capable of. 2136 * there is capable of.
2091 */ 2137 */
2092int 2138int
2093find_dir (maptile *m, int x, int y, object *exclude) 2139find_dir (maptile *m, int x, int y, object *exclude)
2094{ 2140{
2095 int i, max = SIZEOFFREE, mflags; 2141 int max = SIZEOFFREE, mflags;
2096
2097 sint16 nx, ny;
2098 object *tmp;
2099 maptile *mp;
2100
2101 MoveType blocked, move_type; 2142 MoveType move_type;
2102 2143
2103 if (exclude && exclude->head) 2144 if (exclude && exclude->head_ () != exclude)
2104 { 2145 {
2105 exclude = exclude->head; 2146 exclude = exclude->head;
2106 move_type = exclude->move_type; 2147 move_type = exclude->move_type;
2107 } 2148 }
2108 else 2149 else
2109 { 2150 {
2110 /* If we don't have anything, presume it can use all movement types. */ 2151 /* If we don't have anything, presume it can use all movement types. */
2111 move_type = MOVE_ALL; 2152 move_type = MOVE_ALL;
2112 } 2153 }
2113 2154
2114 for (i = 1; i < max; i++) 2155 for (int i = 1; i < max; i++)
2115 { 2156 {
2116 mp = m; 2157 mapxy pos (m, x, y);
2117 nx = x + freearr_x[i]; 2158 pos.move (i);
2118 ny = y + freearr_y[i];
2119 2159
2120 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2160 if (!pos.normalise ())
2121
2122 if (mflags & P_OUT_OF_MAP)
2123 max = maxfree[i]; 2161 max = maxfree[i];
2124 else 2162 else
2125 { 2163 {
2126 mapspace &ms = mp->at (nx, ny); 2164 mapspace &ms = *pos;
2127 2165
2128 blocked = ms.move_block;
2129
2130 if ((move_type & blocked) == move_type) 2166 if ((move_type & ms.move_block) == move_type)
2131 max = maxfree[i]; 2167 max = maxfree [i];
2132 else if (mflags & P_IS_ALIVE) 2168 else if (ms.flags () & P_IS_ALIVE)
2133 { 2169 {
2134 for (tmp = ms.bot; tmp; tmp = tmp->above) 2170 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2135 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2171 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2136 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2172 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2137 break;
2138
2139 if (tmp)
2140 return freedir[i]; 2173 return freedir [i];
2141 } 2174 }
2142 } 2175 }
2143 } 2176 }
2144 2177
2145 return 0; 2178 return 0;
2196 2229
2197 return 3; 2230 return 3;
2198} 2231}
2199 2232
2200/* 2233/*
2201 * absdir(int): Returns a number between 1 and 8, which represent
2202 * the "absolute" direction of a number (it actually takes care of
2203 * "overflow" in previous calculations of a direction).
2204 */
2205
2206int
2207absdir (int d)
2208{
2209 while (d < 1)
2210 d += 8;
2211
2212 while (d > 8)
2213 d -= 8;
2214
2215 return d;
2216}
2217
2218/*
2219 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2234 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220 * between two directions (which are expected to be absolute (see absdir()) 2235 * between two directions (which are expected to be absolute (see absdir())
2221 */ 2236 */
2222
2223int 2237int
2224dirdiff (int dir1, int dir2) 2238dirdiff (int dir1, int dir2)
2225{ 2239{
2226 int d; 2240 int d;
2227 2241
2239 * This basically means that if direction is 15, then it could either go 2253 * This basically means that if direction is 15, then it could either go
2240 * direction 4, 14, or 16 to get back to where we are. 2254 * direction 4, 14, or 16 to get back to where we are.
2241 * Moved from spell_util.c to object.c with the other related direction 2255 * Moved from spell_util.c to object.c with the other related direction
2242 * functions. 2256 * functions.
2243 */ 2257 */
2244int reduction_dir[SIZEOFFREE][3] = { 2258static const int reduction_dir[SIZEOFFREE][3] = {
2245 {0, 0, 0}, /* 0 */ 2259 {0, 0, 0}, /* 0 */
2246 {0, 0, 0}, /* 1 */ 2260 {0, 0, 0}, /* 1 */
2247 {0, 0, 0}, /* 2 */ 2261 {0, 0, 0}, /* 2 */
2248 {0, 0, 0}, /* 3 */ 2262 {0, 0, 0}, /* 3 */
2249 {0, 0, 0}, /* 4 */ 2263 {0, 0, 0}, /* 4 */
2340 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2354 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2341 * core dumps if they do. 2355 * core dumps if they do.
2342 * 2356 *
2343 * Add a check so we can't pick up invisible objects (0.93.8) 2357 * Add a check so we can't pick up invisible objects (0.93.8)
2344 */ 2358 */
2345
2346int 2359int
2347can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2348{ 2361{
2349 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2350 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2351 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2364 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2352} 2365}
2353 2366
2354/* 2367/*
2355 * create clone from object to another 2368 * create clone from object to another
2356 */ 2369 */
2357object * 2370object *
2358object_create_clone (object *asrc) 2371object::deep_clone ()
2359{ 2372{
2360 object *dst = 0, *tmp, *src, *part, *prev, *item; 2373 assert (("deep_clone called on non-head object", is_head ()));
2361 2374
2362 if (!asrc) 2375 object *dst = clone ();
2363 return 0;
2364 2376
2365 src = asrc; 2377 object *prev = dst;
2366 if (src->head)
2367 src = src->head;
2368
2369 prev = 0;
2370 for (part = src; part; part = part->more) 2378 for (object *part = this->more; part; part = part->more)
2371 { 2379 {
2372 tmp = part->clone (); 2380 object *tmp = part->clone ();
2373 tmp->x -= src->x;
2374 tmp->y -= src->y;
2375
2376 if (!part->head)
2377 {
2378 dst = tmp;
2379 tmp->head = 0;
2380 }
2381 else
2382 tmp->head = dst; 2381 tmp->head = dst;
2383
2384 tmp->more = 0;
2385
2386 if (prev)
2387 prev->more = tmp; 2382 prev->more = tmp;
2388
2389 prev = tmp; 2383 prev = tmp;
2390 } 2384 }
2391 2385
2392 for (item = src->inv; item; item = item->below) 2386 for (object *item = inv; item; item = item->below)
2393 insert_ob_in_ob (object_create_clone (item), dst); 2387 insert_ob_in_ob (item->deep_clone (), dst);
2394 2388
2395 return dst; 2389 return dst;
2396}
2397
2398/* GROS - Creates an object using a string representing its content. */
2399/* Basically, we save the content of the string to a temp file, then call */
2400/* load_object on it. I admit it is a highly inefficient way to make things, */
2401/* but it was simple to make and allows reusing the load_object function. */
2402/* Remember not to use load_object_str in a time-critical situation. */
2403/* Also remember that multiparts objects are not supported for now. */
2404object *
2405load_object_str (const char *obstr)
2406{
2407 object *op;
2408 char filename[MAX_BUF];
2409
2410 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412 FILE *tempfile = fopen (filename, "w");
2413
2414 if (tempfile == NULL)
2415 {
2416 LOG (llevError, "Error - Unable to access load object temp file\n");
2417 return NULL;
2418 }
2419
2420 fprintf (tempfile, obstr);
2421 fclose (tempfile);
2422
2423 op = object::create ();
2424
2425 object_thawer thawer (filename);
2426
2427 if (thawer)
2428 load_object (thawer, op, 0);
2429
2430 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431 CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433 return op;
2434} 2390}
2435 2391
2436/* This returns the first object in who's inventory that 2392/* This returns the first object in who's inventory that
2437 * has the same type and subtype match. 2393 * has the same type and subtype match.
2438 * returns NULL if no match. 2394 * returns NULL if no match.
2445 return tmp; 2401 return tmp;
2446 2402
2447 return 0; 2403 return 0;
2448} 2404}
2449 2405
2450/* If ob has a field named key, return the link from the list, 2406shstr_tmp
2451 * otherwise return NULL. 2407object::kv_get (shstr_tmp key) const
2452 *
2453 * key must be a passed in shared string - otherwise, this won't
2454 * do the desired thing.
2455 */
2456key_value *
2457get_ob_key_link (const object *ob, const char *key)
2458{ 2408{
2459 for (key_value *link = ob->key_values; link; link = link->next) 2409 for (key_value *kv = key_values; kv; kv = kv->next)
2460 if (link->key == key) 2410 if (kv->key == key)
2461 return link;
2462
2463 return 0;
2464}
2465
2466/*
2467 * Returns the value of op has an extra_field for key, or NULL.
2468 *
2469 * The argument doesn't need to be a shared string.
2470 *
2471 * The returned string is shared.
2472 */
2473const char *
2474get_ob_key_value (const object *op, const char *const key)
2475{
2476 key_value *link;
2477 shstr_cmp canonical_key (key);
2478
2479 if (!canonical_key)
2480 {
2481 /* 1. There being a field named key on any object
2482 * implies there'd be a shared string to find.
2483 * 2. Since there isn't, no object has this field.
2484 * 3. Therefore, *this* object doesn't have this field.
2485 */
2486 return 0;
2487 }
2488
2489 /* This is copied from get_ob_key_link() above -
2490 * only 4 lines, and saves the function call overhead.
2491 */
2492 for (link = op->key_values; link; link = link->next)
2493 if (link->key == canonical_key)
2494 return link->value; 2411 return kv->value;
2495 2412
2496 return 0; 2413 return shstr ();
2497} 2414}
2498 2415
2499 2416void
2500/* 2417object::kv_set (shstr_tmp key, shstr_tmp value)
2501 * Updates the canonical_key in op to value.
2502 *
2503 * canonical_key is a shared string (value doesn't have to be).
2504 *
2505 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2506 * keys.
2507 *
2508 * Returns TRUE on success.
2509 */
2510int
2511set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2512{ 2418{
2513 key_value *field = NULL, *last = NULL; 2419 for (key_value *kv = key_values; kv; kv = kv->next)
2514 2420 if (kv->key == key)
2515 for (field = op->key_values; field != NULL; field = field->next)
2516 {
2517 if (field->key != canonical_key)
2518 { 2421 {
2519 last = field; 2422 kv->value = value;
2520 continue; 2423 return;
2521 } 2424 }
2522 2425
2523 if (value) 2426 key_value *kv = new key_value;
2524 field->value = value; 2427
2525 else 2428 kv->next = key_values;
2429 kv->key = key;
2430 kv->value = value;
2431
2432 key_values = kv;
2433}
2434
2435void
2436object::kv_del (shstr_tmp key)
2437{
2438 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2439 if ((*kvp)->key == key)
2526 { 2440 {
2527 /* Basically, if the archetype has this key set, 2441 key_value *kv = *kvp;
2528 * we need to store the null value so when we save 2442 *kvp = (*kvp)->next;
2529 * it, we save the empty value so that when we load, 2443 delete kv;
2530 * we get this value back again. 2444 return;
2531 */
2532 if (get_ob_key_link (&op->arch->clone, canonical_key))
2533 field->value = 0;
2534 else
2535 {
2536 if (last)
2537 last->next = field->next;
2538 else
2539 op->key_values = field->next;
2540
2541 delete field;
2542 }
2543 } 2445 }
2544 return TRUE;
2545 }
2546 /* IF we get here, key doesn't exist */
2547
2548 /* No field, we'll have to add it. */
2549
2550 if (!add_key)
2551 return FALSE;
2552
2553 /* There isn't any good reason to store a null
2554 * value in the key/value list. If the archetype has
2555 * this key, then we should also have it, so shouldn't
2556 * be here. If user wants to store empty strings,
2557 * should pass in ""
2558 */
2559 if (value == NULL)
2560 return TRUE;
2561
2562 field = new key_value;
2563
2564 field->key = canonical_key;
2565 field->value = value;
2566 /* Usual prepend-addition. */
2567 field->next = op->key_values;
2568 op->key_values = field;
2569
2570 return TRUE;
2571}
2572
2573/*
2574 * Updates the key in op to value.
2575 *
2576 * If add_key is FALSE, this will only update existing keys,
2577 * and not add new ones.
2578 * In general, should be little reason FALSE is ever passed in for add_key
2579 *
2580 * Returns TRUE on success.
2581 */
2582int
2583set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2584{
2585 shstr key_ (key);
2586
2587 return set_ob_key_value_s (op, key_, value, add_key);
2588} 2446}
2589 2447
2590object::depth_iterator::depth_iterator (object *container) 2448object::depth_iterator::depth_iterator (object *container)
2591: iterator_base (container) 2449: iterator_base (container)
2592{ 2450{
2606 } 2464 }
2607 else 2465 else
2608 item = item->env; 2466 item = item->env;
2609} 2467}
2610 2468
2611
2612const char * 2469const char *
2613object::flag_desc (char *desc, int len) const 2470object::flag_desc (char *desc, int len) const
2614{ 2471{
2615 char *p = desc; 2472 char *p = desc;
2616 bool first = true; 2473 bool first = true;
2474
2475 *p = 0;
2617 2476
2618 for (int i = 0; i < NUM_FLAGS; i++) 2477 for (int i = 0; i < NUM_FLAGS; i++)
2619 { 2478 {
2620 if (len <= 10) // magic constant! 2479 if (len <= 10) // magic constant!
2621 { 2480 {
2622 snprintf (p, len, ",..."); 2481 snprintf (p, len, ",...");
2623 break; 2482 break;
2624 } 2483 }
2625 2484
2626 if (flag[i]) 2485 if (flag [i])
2627 { 2486 {
2628 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i); 2487 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2629 len -= cnt; 2488 len -= cnt;
2630 p += cnt; 2489 p += cnt;
2631 first = false; 2490 first = false;
2633 } 2492 }
2634 2493
2635 return desc; 2494 return desc;
2636} 2495}
2637 2496
2638// return a suitable string describing an objetc in enough detail to find it 2497// return a suitable string describing an object in enough detail to find it
2639const char * 2498const char *
2640object::debug_desc (char *info) const 2499object::debug_desc (char *info) const
2641{ 2500{
2642 char flagdesc[512]; 2501 char flagdesc[512];
2643 char info2[256 * 4]; 2502 char info2[256 * 4];
2644 char *p = info; 2503 char *p = info;
2645 2504
2646 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2505 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2647 count, uuid.seq, 2506 count,
2507 uuid.c_str (),
2648 &name, 2508 &name,
2649 title ? "\",title:" : "", 2509 title ? ",title:\"" : "",
2650 title ? (const char *)title : "", 2510 title ? (const char *)title : "",
2511 title ? "\"" : "",
2651 flag_desc (flagdesc, 512), type); 2512 flag_desc (flagdesc, 512), type);
2652 2513
2653 if (env) 2514 if (!flag[FLAG_REMOVED] && env)
2654 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2515 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2655 2516
2656 if (map) 2517 if (map)
2657 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2518 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2658 2519
2660} 2521}
2661 2522
2662const char * 2523const char *
2663object::debug_desc () const 2524object::debug_desc () const
2664{ 2525{
2665 static char info[256 * 3]; 2526 static char info[3][256 * 4];
2527 static int info_idx;
2528
2666 return debug_desc (info); 2529 return debug_desc (info [++info_idx % 3]);
2667} 2530}
2668 2531
2532struct region *
2533object::region () const
2534{
2535 return map ? map->region (x, y)
2536 : region::default_region ();
2537}
2538
2539void
2540object::open_container (object *new_container)
2541{
2542 if (container == new_container)
2543 return;
2544
2545 object *old_container = container;
2546
2547 if (old_container)
2548 {
2549 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2550 return;
2551
2552#if 0
2553 // remove the "Close old_container" object.
2554 if (object *closer = old_container->inv)
2555 if (closer->type == CLOSE_CON)
2556 closer->destroy ();
2557#endif
2558
2559 // make sure the container is available
2560 esrv_send_item (this, old_container);
2561
2562 old_container->flag [FLAG_APPLIED] = false;
2563 container = 0;
2564
2565 // client needs item update to make it work, client bug requires this to be separate
2566 esrv_update_item (UPD_FLAGS, this, old_container);
2567
2568 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2569 play_sound (sound_find ("chest_close"));
2570 }
2571
2572 if (new_container)
2573 {
2574 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2575 return;
2576
2577 // TODO: this does not seem to serve any purpose anymore?
2578#if 0
2579 // insert the "Close Container" object.
2580 if (archetype *closer = new_container->other_arch)
2581 {
2582 object *closer = new_container->other_arch->instance ();
2583 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2584 new_container->insert (closer);
2585 }
2586#endif
2587
2588 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2589
2590 // make sure the container is available, client bug requires this to be separate
2591 esrv_send_item (this, new_container);
2592
2593 new_container->flag [FLAG_APPLIED] = true;
2594 container = new_container;
2595
2596 // client needs flag change
2597 esrv_update_item (UPD_FLAGS, this, new_container);
2598 esrv_send_inventory (this, new_container);
2599 play_sound (sound_find ("chest_open"));
2600 }
2601// else if (!old_container->env && contr && contr->ns)
2602// contr->ns->floorbox_reset ();
2603}
2604
2605object *
2606object::force_find (shstr_tmp name)
2607{
2608 /* cycle through his inventory to look for the MARK we want to
2609 * place
2610 */
2611 for (object *tmp = inv; tmp; tmp = tmp->below)
2612 if (tmp->type == FORCE && tmp->slaying == name)
2613 return splay (tmp);
2614
2615 return 0;
2616}
2617
2618//-GPL
2619
2620void
2621object::force_set_timer (int duration)
2622{
2623 this->duration = 1;
2624 this->speed_left = -1.f;
2625
2626 this->set_speed (duration ? 1.f / duration : 0.f);
2627}
2628
2629object *
2630object::force_add (shstr_tmp name, int duration)
2631{
2632 if (object *force = force_find (name))
2633 force->destroy ();
2634
2635 object *force = get_archetype (FORCE_NAME);
2636
2637 force->slaying = name;
2638 force->force_set_timer (duration);
2639 force->flag [FLAG_APPLIED] = true;
2640
2641 return insert (force);
2642}
2643
2644void
2645object::play_sound (faceidx sound) const
2646{
2647 if (!sound)
2648 return;
2649
2650 if (is_on_map ())
2651 map->play_sound (sound, x, y);
2652 else if (object *pl = in_player ())
2653 pl->contr->play_sound (sound);
2654}
2655
2656void
2657object::say_msg (const char *msg) const
2658{
2659 if (is_on_map ())
2660 map->say_msg (msg, x, y);
2661 else if (object *pl = in_player ())
2662 pl->contr->play_sound (sound);
2663}
2664
2665void
2666object::make_noise ()
2667{
2668 // we do not model noise in the map, so instead put
2669 // a temporary light into the noise source
2670 // could use the map instead, but that's less reliable for our
2671 // goal, which is to make invisibility a bit harder to exploit
2672
2673 // currently only works sensibly for players
2674 if (!is_player ())
2675 return;
2676
2677 // find old force, or create new one
2678 object *force = force_find (shstr_noise_force);
2679
2680 if (force)
2681 force->speed_left = -1.f; // patch old speed up
2682 else
2683 {
2684 force = archetype::get (shstr_noise_force);
2685
2686 force->slaying = shstr_noise_force;
2687 force->stats.food = 1;
2688 force->speed_left = -1.f;
2689
2690 force->set_speed (1.f / 4.f);
2691 force->flag [FLAG_IS_USED_UP] = true;
2692 force->flag [FLAG_APPLIED] = true;
2693
2694 insert (force);
2695 }
2696}
2697
2698void object::change_move_type (MoveType mt)
2699{
2700 if (move_type == mt)
2701 return;
2702
2703 if (is_on_map ())
2704 {
2705 // we are on the map, so handle move_on/off effects
2706 remove ();
2707 move_type = mt;
2708 map->insert (this, x, y, this);
2709 }
2710 else
2711 move_type = mt;
2712}
2713

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines