ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines