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.192 by root, Fri Oct 12 19:13:25 2007 UTC vs.
Revision 1.317 by root, Fri Apr 2 03:41:24 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines