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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines