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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines