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.162 by root, Sat Jun 16 00:12:20 2007 UTC vs.
Revision 1.320 by root, Wed Apr 7 19:54:44 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines