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.183 by root, Mon Aug 20 19:13:10 2007 UTC vs.
Revision 1.314 by root, Fri Mar 26 00:59:20 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)
368 {
369 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
370 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
371
372 if (k1 != k2)
373 return 0;
374
375 if (k1 == 0)
376 return 1;
377
310 if (!cfperl_can_merge (ob1, ob2)) 378 if (!cfperl_can_merge (ob1, ob2))
311 return 0; 379 return 0;
380 }
312 } 381 }
313 382
314 /* Everything passes, must be OK. */ 383 /* Everything passes, must be OK. */
315 return 1; 384 return 1;
316} 385}
317 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
318/* 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/*
319 * sum_weight() is a recursive function which calculates the weight 461 * this is a recursive function which calculates the weight
320 * 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
321 * containers are carrying, and sums it up. 463 * containers are carrying, and sums it up.
322 */ 464 */
323long 465void
324sum_weight (object *op) 466object::update_weight ()
325{ 467{
326 long sum; 468 sint32 sum = 0;
327 object *inv;
328 469
329 for (sum = 0, inv = op->inv; inv; inv = inv->below) 470 for (object *op = inv; op; op = op->below)
330 { 471 {
331 if (inv->inv) 472 if (op->inv)
332 sum_weight (inv); 473 op->update_weight ();
333 474
334 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)
335 } 481 {
336
337 if (op->type == CONTAINER && op->stats.Str)
338 sum = (sum * (100 - op->stats.Str)) / 100;
339
340 if (op->carrying != sum)
341 op->carrying = sum; 482 carrying = sum;
342 483
343 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 }
344} 488}
345 489
346/** 490/*
347 * Return the outermost environment object for a given object. 491 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
348 */
349
350object *
351object_get_env_recursive (object *op)
352{
353 while (op->env != NULL)
354 op = op->env;
355 return op;
356}
357
358/*
359 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360 * Some error messages.
361 * The result of the dump is stored in the static global errmsg array.
362 */ 492 */
363char * 493char *
364dump_object (object *op) 494dump_object (object *op)
365{ 495{
366 if (!op) 496 if (!op)
369 object_freezer freezer; 499 object_freezer freezer;
370 op->write (freezer); 500 op->write (freezer);
371 return freezer.as_string (); 501 return freezer.as_string ();
372} 502}
373 503
374/* 504char *
375 * get_nearest_part(multi-object, object 2) returns the part of the 505object::as_string ()
376 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned.
378 */
379
380object *
381get_nearest_part (object *op, const object *pl)
382{ 506{
383 object *tmp, *closest; 507 return dump_object (this);
384 int last_dist, i;
385
386 if (op->more == NULL)
387 return op;
388 for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
389 if ((i = distance (tmp, pl)) < last_dist)
390 closest = tmp, last_dist = i;
391 return closest;
392} 508}
393 509
394/* 510/*
395 * 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.
396 */ 513 */
397object * 514object *
398find_object (tag_t i) 515find_object (tag_t i)
399{ 516{
400 for_all_objects (op) 517 for_all_objects (op)
403 520
404 return 0; 521 return 0;
405} 522}
406 523
407/* 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/*
408 * 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.
409 * Used only by the patch command, but not all that useful. 541 * Used only by the patch command, but not all that useful.
410 * Enables features like "patch <name-of-other-player> food 999" 542 * Enables features like "patch <name-of-other-player> food 999"
411 */ 543 */
412object * 544object *
413find_object_name (const char *str) 545find_object_name (const char *str)
414{ 546{
415 shstr_cmp str_ (str); 547 shstr_cmp str_ (str);
416 object *op;
417 548
549 if (str_)
418 for_all_objects (op) 550 for_all_objects (op)
419 if (op->name == str_) 551 if (op->name == str_)
420 break; 552 return op;
421 553
422 return op; 554 return 0;
423}
424
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429} 555}
430 556
431/* 557/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 558 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 559 * skill and experience objects.
438{ 564{
439 // allow objects which own objects 565 // allow objects which own objects
440 if (owner) 566 if (owner)
441 while (owner->owner) 567 while (owner->owner)
442 owner = owner->owner; 568 owner = owner->owner;
569
570 if (flag [FLAG_FREED])
571 {
572 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
573 return;
574 }
443 575
444 this->owner = owner; 576 this->owner = owner;
445} 577}
446 578
447int 579int
489 update_stats (); 621 update_stats ();
490 622
491 new_draw_info_format (NDI_UNIQUE, 0, this, 623 new_draw_info_format (NDI_UNIQUE, 0, this,
492 "You try to balance all your items at once, " 624 "You try to balance all your items at once, "
493 "but the %s is just too much for your body. " 625 "but the %s is just too much for your body. "
494 "[You need to unapply some items first.]", &ob->name); 626 "[You need to unapply some items first - use the 'body' command to see "
627 "how many items you cna wera on a specific body part.]", &ob->name);
495 return false; 628 return false;
496 } 629 }
497 630
498 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 631 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
499 } 632 }
525 } 658 }
526 659
527 op->key_values = 0; 660 op->key_values = 0;
528} 661}
529 662
530object & 663/*
531object::operator =(const object &src) 664 * copy_to first frees everything allocated by the dst object,
665 * and then copies the contents of itself into the second
666 * object, allocating what needs to be allocated. Basically, any
667 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
668 * if the first object is freed, the pointers in the new object
669 * will point at garbage.
670 */
671void
672object::copy_to (object *dst)
532{ 673{
533 bool is_freed = flag [FLAG_FREED]; 674 dst->remove ();
534 bool is_removed = flag [FLAG_REMOVED];
535
536 *(object_copy *)this = src; 675 *(object_copy *)dst = *this;
537
538 flag [FLAG_FREED] = is_freed;
539 flag [FLAG_REMOVED] = is_removed; 676 dst->flag [FLAG_REMOVED] = true;
540 677
541 /* Copy over key_values, if any. */ 678 /* Copy over key_values, if any. */
542 if (src.key_values) 679 if (key_values)
543 { 680 {
544 key_value *tail = 0; 681 key_value *tail = 0;
545 key_values = 0; 682 dst->key_values = 0;
546 683
547 for (key_value *i = src.key_values; i; i = i->next) 684 for (key_value *i = key_values; i; i = i->next)
548 { 685 {
549 key_value *new_link = new key_value; 686 key_value *new_link = new key_value;
550 687
551 new_link->next = 0; 688 new_link->next = 0;
552 new_link->key = i->key; 689 new_link->key = i->key;
553 new_link->value = i->value; 690 new_link->value = i->value;
554 691
555 /* Try and be clever here, too. */ 692 /* Try and be clever here, too. */
556 if (!key_values) 693 if (!dst->key_values)
557 { 694 {
558 key_values = new_link; 695 dst->key_values = new_link;
559 tail = new_link; 696 tail = new_link;
560 } 697 }
561 else 698 else
562 { 699 {
563 tail->next = new_link; 700 tail->next = new_link;
564 tail = new_link; 701 tail = new_link;
565 } 702 }
566 } 703 }
567 } 704 }
568}
569 705
570/* 706 dst->activate ();
571 * copy_to first frees everything allocated by the dst object,
572 * and then copies the contents of itself into the second
573 * object, allocating what needs to be allocated. Basically, any
574 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
575 * if the first object is freed, the pointers in the new object
576 * will point at garbage.
577 */
578void
579object::copy_to (object *dst)
580{
581 *dst = *this;
582
583 if (speed < 0)
584 dst->speed_left = speed_left - rndm ();
585
586 dst->set_speed (dst->speed);
587} 707}
588 708
589void 709void
590object::instantiate () 710object::instantiate ()
591{ 711{
592 if (!uuid.seq) // HACK 712 if (!uuid.seq) // HACK
593 uuid = gen_uuid (); 713 uuid = UUID::gen ();
594 714
715 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
716 if (flag [FLAG_RANDOM_SPEED] && speed)
717 speed_left = - speed - rndm (); // TODO animation
718 else
595 speed_left = -0.1f; 719 speed_left = -1.;
720
596 /* copy the body_info to the body_used - this is only really 721 /* copy the body_info to the body_used - this is only really
597 * need for monsters, but doesn't hurt to do it for everything. 722 * need for monsters, but doesn't hurt to do it for everything.
598 * by doing so, when a monster is created, it has good starting 723 * by doing so, when a monster is created, it has good starting
599 * values for the body_used info, so when items are created 724 * values for the body_used info, so when items are created
600 * for it, they can be properly equipped. 725 * for it, they can be properly equipped.
608object * 733object *
609object::clone () 734object::clone ()
610{ 735{
611 object *neu = create (); 736 object *neu = create ();
612 copy_to (neu); 737 copy_to (neu);
738
739 // TODO: unclean state changes, should not be done in clone AND instantiate
740 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
741 neu->speed_left = - neu->speed - rndm (); // TODO animation
742
743 neu->map = map; // not copied by copy_to
613 return neu; 744 return neu;
614} 745}
615 746
616/* 747/*
617 * If an object with the IS_TURNABLE() flag needs to be turned due 748 * If an object with the IS_TURNABLE() flag needs to be turned due
634 * This function needs to be called whenever the speed of an object changes. 765 * This function needs to be called whenever the speed of an object changes.
635 */ 766 */
636void 767void
637object::set_speed (float speed) 768object::set_speed (float speed)
638{ 769{
639 if (flag [FLAG_FREED] && speed)
640 {
641 LOG (llevError, "Object %s is freed but has speed.\n", &name);
642 speed = 0;
643 }
644
645 this->speed = speed; 770 this->speed = speed;
646 771
647 if (has_active_speed ()) 772 if (has_active_speed ())
648 activate (); 773 activate ();
649 else 774 else
668 * UP_OBJ_FACE: only the objects face has changed. 793 * UP_OBJ_FACE: only the objects face has changed.
669 */ 794 */
670void 795void
671update_object (object *op, int action) 796update_object (object *op, int action)
672{ 797{
673 if (op == NULL) 798 if (!op)
674 { 799 {
675 /* this should never happen */ 800 /* this should never happen */
676 LOG (llevDebug, "update_object() called for NULL object.\n"); 801 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
677 return; 802 return;
678 } 803 }
679 804
680 if (op->env) 805 if (!op->is_on_map ())
681 { 806 {
682 /* Animation is currently handled by client, so nothing 807 /* Animation is currently handled by client, so nothing
683 * to do in this case. 808 * to do in this case.
684 */ 809 */
685 return; 810 return;
686 } 811 }
687
688 /* If the map is saving, don't do anything as everything is
689 * going to get freed anyways.
690 */
691 if (!op->map || op->map->in_memory == MAP_SAVING)
692 return;
693 812
694 /* make sure the object is within map boundaries */ 813 /* make sure the object is within map boundaries */
695 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height) 814 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
696 { 815 {
697 LOG (llevError, "update_object() called for object out of map!\n"); 816 LOG (llevError, "update_object() called for object out of map!\n");
705 824
706 if (!(m.flags_ & P_UPTODATE)) 825 if (!(m.flags_ & P_UPTODATE))
707 /* nop */; 826 /* nop */;
708 else if (action == UP_OBJ_INSERT) 827 else if (action == UP_OBJ_INSERT)
709 { 828 {
829#if 0
710 // this is likely overkill, TODO: revisit (schmorp) 830 // this is likely overkill, TODO: revisit (schmorp)
711 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 831 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
712 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 832 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
713 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 833 || (op->is_player () && !(m.flags_ & P_PLAYER))
714 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 834 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
715 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 835 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
716 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 836 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
717 || (m.move_on | op->move_on ) != m.move_on 837 || (m.move_on | op->move_on ) != m.move_on
718 || (m.move_off | op->move_off ) != m.move_off 838 || (m.move_off | op->move_off ) != m.move_off
719 || (m.move_slow | op->move_slow) != m.move_slow 839 || (m.move_slow | op->move_slow) != m.move_slow
720 /* This isn't perfect, but I don't expect a lot of objects to 840 /* This isn't perfect, but I don't expect a lot of objects to
721 * to have move_allow right now. 841 * have move_allow right now.
722 */ 842 */
723 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 843 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
844 m.invalidate ();
845#else
724 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 846 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
725 m.flags_ = 0; 847 m.invalidate ();
848#endif
726 } 849 }
727 /* if the object is being removed, we can't make intelligent 850 /* if the object is being removed, we can't make intelligent
728 * decisions, because remove_ob can't really pass the object 851 * decisions, because remove_ob can't really pass the object
729 * that is being removed. 852 * that is being removed.
730 */ 853 */
731 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 854 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
732 m.flags_ = 0; 855 m.invalidate ();
733 else if (action == UP_OBJ_FACE) 856 else if (action == UP_OBJ_FACE)
734 /* Nothing to do for that case */ ; 857 /* Nothing to do for that case */ ;
735 else 858 else
736 LOG (llevError, "update_object called with invalid action: %d\n", action); 859 LOG (llevError, "update_object called with invalid action: %d\n", action);
737 860
741 864
742object::object () 865object::object ()
743{ 866{
744 SET_FLAG (this, FLAG_REMOVED); 867 SET_FLAG (this, FLAG_REMOVED);
745 868
746 expmul = 1.0; 869 //expmul = 1.0; declared const for the time being
747 face = blank_face; 870 face = blank_face;
871 material = MATERIAL_NULL;
748} 872}
749 873
750object::~object () 874object::~object ()
751{ 875{
752 unlink (); 876 unlink ();
757static int object_count; 881static int object_count;
758 882
759void object::link () 883void object::link ()
760{ 884{
761 assert (!index);//D 885 assert (!index);//D
762 uuid = gen_uuid (); 886 uuid = UUID::gen ();
763 count = ++object_count; 887 count = ++object_count;
764 888
765 refcnt_inc (); 889 refcnt_inc ();
766 objects.insert (this); 890 objects.insert (this);
767} 891}
781 /* If already on active list, don't do anything */ 905 /* If already on active list, don't do anything */
782 if (active) 906 if (active)
783 return; 907 return;
784 908
785 if (has_active_speed ()) 909 if (has_active_speed ())
910 {
911 if (flag [FLAG_FREED])
912 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
913
786 actives.insert (this); 914 actives.insert (this);
915 }
787} 916}
788 917
789void 918void
790object::activate_recursive () 919object::activate_recursive ()
791{ 920{
840object::destroy_inv (bool drop_to_ground) 969object::destroy_inv (bool drop_to_ground)
841{ 970{
842 // need to check first, because the checks below might segfault 971 // need to check first, because the checks below might segfault
843 // as we might be on an invalid mapspace and crossfire code 972 // as we might be on an invalid mapspace and crossfire code
844 // is too buggy to ensure that the inventory is empty. 973 // is too buggy to ensure that the inventory is empty.
845 // corollary: if you create arrows etc. with stuff in tis inventory, 974 // corollary: if you create arrows etc. with stuff in its inventory,
846 // cf will crash below with off-map x and y 975 // cf will crash below with off-map x and y
847 if (!inv) 976 if (!inv)
848 return; 977 return;
849 978
850 /* Only if the space blocks everything do we not process - 979 /* Only if the space blocks everything do we not process -
851 * if some form of movement is allowed, let objects 980 * if some form of movement is allowed, let objects
852 * drop on that space. 981 * drop on that space.
853 */ 982 */
854 if (!drop_to_ground 983 if (!drop_to_ground
855 || !map 984 || !map
856 || map->in_memory != MAP_IN_MEMORY 985 || map->in_memory != MAP_ACTIVE
857 || map->nodrop 986 || map->no_drop
858 || ms ().move_block == MOVE_ALL) 987 || ms ().move_block == MOVE_ALL)
859 { 988 {
860 while (inv) 989 while (inv)
861 {
862 inv->destroy_inv (drop_to_ground);
863 inv->destroy (); 990 inv->destroy ();
864 }
865 } 991 }
866 else 992 else
867 { /* Put objects in inventory onto this space */ 993 { /* Put objects in inventory onto this space */
868 while (inv) 994 while (inv)
869 { 995 {
887 object *op = new object; 1013 object *op = new object;
888 op->link (); 1014 op->link ();
889 return op; 1015 return op;
890} 1016}
891 1017
1018static struct freed_map : maptile
1019{
1020 freed_map ()
1021 {
1022 path = "<freed objects map>";
1023 name = "/internal/freed_objects_map";
1024 width = 3;
1025 height = 3;
1026 no_drop = 1;
1027 no_reset = 1;
1028
1029 alloc ();
1030 in_memory = MAP_ACTIVE;
1031 }
1032
1033 ~freed_map ()
1034 {
1035 destroy ();
1036 }
1037} freed_map; // freed objects are moved here to avoid crashes
1038
892void 1039void
893object::do_destroy () 1040object::do_destroy ()
894{ 1041{
895 attachable::do_destroy ();
896
897 if (flag [FLAG_IS_LINKED]) 1042 if (flag [FLAG_IS_LINKED])
898 remove_button_link (this); 1043 remove_link ();
899 1044
900 if (flag [FLAG_FRIENDLY]) 1045 if (flag [FLAG_FRIENDLY])
901 remove_friendly_object (this); 1046 remove_friendly_object (this);
902 1047
903 if (!flag [FLAG_REMOVED])
904 remove (); 1048 remove ();
905 1049
906 destroy_inv (true); 1050 attachable::do_destroy ();
907 1051
908 deactivate (); 1052 deactivate ();
909 unlink (); 1053 unlink ();
910 1054
911 flag [FLAG_FREED] = 1; 1055 flag [FLAG_FREED] = 1;
912 1056
913 // hack to ensure that freed objects still have a valid map 1057 // hack to ensure that freed objects still have a valid map
914 {
915 static maptile *freed_map; // freed objects are moved here to avoid crashes
916
917 if (!freed_map)
918 {
919 freed_map = new maptile;
920
921 freed_map->name = "/internal/freed_objects_map";
922 freed_map->width = 3;
923 freed_map->height = 3;
924
925 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY;
927 }
928
929 map = freed_map; 1058 map = &freed_map;
930 x = 1; 1059 x = 1;
931 y = 1; 1060 y = 1;
932 }
933 1061
934 if (more) 1062 if (more)
935 { 1063 {
936 more->destroy (); 1064 more->destroy ();
937 more = 0; 1065 more = 0;
945 attacked_by = 0; 1073 attacked_by = 0;
946 current_weapon = 0; 1074 current_weapon = 0;
947} 1075}
948 1076
949void 1077void
950object::destroy (bool destroy_inventory) 1078object::destroy ()
951{ 1079{
952 if (destroyed ()) 1080 if (destroyed ())
953 return; 1081 return;
954 1082
955 if (destroy_inventory) 1083 if (!is_head () && !head->destroyed ())
1084 {
1085 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1086 head->destroy ();
1087 return;
1088 }
1089
956 destroy_inv (false); 1090 destroy_inv (false);
957 1091
958 if (is_head ()) 1092 if (is_head ())
959 if (sound_destroy) 1093 if (sound_destroy)
960 play_sound (sound_destroy); 1094 play_sound (sound_destroy);
961 else if (flag [FLAG_MONSTER]) 1095 else if (flag [FLAG_MONSTER])
962 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism 1096 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963 1097
964 attachable::destroy (); 1098 attachable::destroy ();
965}
966
967/*
968 * sub_weight() recursively (outwards) subtracts a number from the
969 * weight of an object (and what is carried by it's environment(s)).
970 */
971void
972sub_weight (object *op, signed long weight)
973{
974 while (op != NULL)
975 {
976 if (op->type == CONTAINER)
977 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
978
979 op->carrying -= weight;
980 op = op->env;
981 }
982} 1099}
983 1100
984/* op->remove (): 1101/* op->remove ():
985 * This function removes the object op from the linked list of objects 1102 * This function removes the object op from the linked list of objects
986 * which it is currently tied to. When this function is done, the 1103 * which it is currently tied to. When this function is done, the
989 * the previous environment. 1106 * the previous environment.
990 */ 1107 */
991void 1108void
992object::do_remove () 1109object::do_remove ()
993{ 1110{
994 object *tmp, *last = 0; 1111 if (flag [FLAG_REMOVED])
995 object *otmp;
996
997 if (QUERY_FLAG (this, FLAG_REMOVED))
998 return; 1112 return;
999 1113
1000 SET_FLAG (this, FLAG_REMOVED);
1001 INVOKE_OBJECT (REMOVE, this); 1114 INVOKE_OBJECT (REMOVE, this);
1115
1116 flag [FLAG_REMOVED] = true;
1002 1117
1003 if (more) 1118 if (more)
1004 more->remove (); 1119 more->remove ();
1005 1120
1006 /* 1121 /*
1007 * In this case, the object to be removed is in someones 1122 * In this case, the object to be removed is in someones
1008 * inventory. 1123 * inventory.
1009 */ 1124 */
1010 if (env) 1125 if (env)
1011 { 1126 {
1012 if (nrof) 1127 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1013 sub_weight (env, weight * nrof); 1128 if (object *pl = visible_to ())
1014 else 1129 esrv_del_item (pl->contr, count);
1015 sub_weight (env, weight + carrying); 1130 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1016 1131
1017 /* NO_FIX_PLAYER is set when a great many changes are being 1132 adjust_weight (env, -total_weight ());
1018 * made to players inventory. If set, avoiding the call
1019 * to save cpu time.
1020 */
1021 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1022 otmp->update_stats ();
1023 1133
1024 if (above) 1134 object *pl = in_player ();
1025 above->below = below;
1026 else
1027 env->inv = below;
1028
1029 if (below)
1030 below->above = above;
1031 1135
1032 /* we set up values so that it could be inserted into 1136 /* we set up values so that it could be inserted into
1033 * the map, but we don't actually do that - it is up 1137 * the map, but we don't actually do that - it is up
1034 * to the caller to decide what we want to do. 1138 * to the caller to decide what we want to do.
1035 */ 1139 */
1036 x = env->x, y = env->y;
1037 map = env->map; 1140 map = env->map;
1038 above = 0, below = 0; 1141 x = env->x;
1142 y = env->y;
1143
1144 // make sure cmov optimisation is applicable
1145 *(above ? &above->below : &env->inv) = below;
1146 *(below ? &below->above : &above ) = above; // &above is just a dummy
1147
1148 above = 0;
1149 below = 0;
1039 env = 0; 1150 env = 0;
1151
1152 if (pl && pl->is_player ())
1153 {
1154 pl->contr->queue_stats_update ();
1155
1156 if (glow_radius && pl->is_on_map ())
1157 update_all_los (pl->map, pl->x, pl->y);
1158 }
1040 } 1159 }
1041 else if (map) 1160 else if (map)
1042 { 1161 {
1043 if (type == PLAYER)
1044 {
1045 // leaving a spot always closes any open container on the ground
1046 if (container && !container->env)
1047 // this causes spurious floorbox updates, but it ensures
1048 // that the CLOSE event is being sent.
1049 close_container ();
1050
1051 --map->players;
1052 map->touch ();
1053 }
1054
1055 map->dirty = true; 1162 map->dirty = true;
1056 mapspace &ms = this->ms (); 1163 mapspace &ms = this->ms ();
1057 1164
1165 if (object *pl = ms.player ())
1166 {
1167 if (is_player ())
1168 {
1169 if (!flag [FLAG_WIZPASS])
1170 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1171
1172 // leaving a spot always closes any open container on the ground
1173 if (container && !container->env)
1174 // this causes spurious floorbox updates, but it ensures
1175 // that the CLOSE event is being sent.
1176 close_container ();
1177
1178 --map->players;
1179 map->touch ();
1180 }
1181 else if (pl->container_ () == this)
1182 {
1183 // removing a container should close it
1184 close_container ();
1185 }
1186
1187 esrv_del_item (pl->contr, count);
1188 }
1189
1058 /* link the object above us */ 1190 /* link the object above us */
1059 if (above) 1191 // re-link, make sure compiler can easily use cmove
1060 above->below = below; 1192 *(above ? &above->below : &ms.top) = below;
1061 else 1193 *(below ? &below->above : &ms.bot) = above;
1062 ms.top = below; /* we were top, set new top */
1063
1064 /* Relink the object below us, if there is one */
1065 if (below)
1066 below->above = above;
1067 else
1068 {
1069 /* Nothing below, which means we need to relink map object for this space
1070 * use translated coordinates in case some oddness with map tiling is
1071 * evident
1072 */
1073 if (GET_MAP_OB (map, x, y) != this)
1074 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 ());
1075
1076 ms.bot = above; /* goes on above it. */
1077 }
1078 1194
1079 above = 0; 1195 above = 0;
1080 below = 0; 1196 below = 0;
1081 1197
1198 ms.invalidate ();
1199
1082 if (map->in_memory == MAP_SAVING) 1200 if (map->in_memory == MAP_SAVING)
1083 return; 1201 return;
1084 1202
1085 int check_walk_off = !flag [FLAG_NO_APPLY]; 1203 int check_walk_off = !flag [FLAG_NO_APPLY];
1086 1204
1087 if (object *pl = ms.player ()) 1205 if (object *pl = ms.player ())
1088 { 1206 {
1089 if (pl->container == this) 1207 if (pl->container_ () == this)
1090 /* If a container that the player is currently using somehow gets 1208 /* If a container that the player is currently using somehow gets
1091 * removed (most likely destroyed), update the player view 1209 * removed (most likely destroyed), update the player view
1092 * appropriately. 1210 * appropriately.
1093 */ 1211 */
1094 pl->close_container (); 1212 pl->close_container ();
1095 1213
1214 //TODO: the floorbox prev/next might need updating
1215 //esrv_del_item (pl->contr, count);
1216 //TODO: update floorbox to preserve ordering
1217 if (pl->contr->ns)
1096 pl->contr->ns->floorbox_update (); 1218 pl->contr->ns->floorbox_update ();
1097 } 1219 }
1098 1220
1221 if (check_walk_off)
1099 for (tmp = ms.bot; tmp; tmp = tmp->above) 1222 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1100 { 1223 {
1224 above = tmp->above;
1225
1101 /* No point updating the players look faces if he is the object 1226 /* No point updating the players look faces if he is the object
1102 * being removed. 1227 * being removed.
1103 */ 1228 */
1104 1229
1105 /* See if object moving off should effect something */ 1230 /* See if object moving off should effect something */
1106 if (check_walk_off
1107 && ((move_type & tmp->move_off) 1231 if ((move_type & tmp->move_off)
1108 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1232 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1109 {
1110 move_apply (tmp, this, 0); 1233 move_apply (tmp, this, 0);
1111
1112 if (destroyed ())
1113 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1114 } 1234 }
1115 1235
1116 last = tmp; 1236 if (affects_los ())
1117 }
1118
1119 /* last == NULL if there are no objects on this space */
1120 //TODO: this makes little sense, why only update the topmost object?
1121 if (!last)
1122 map->at (x, y).flags_ = 0;
1123 else
1124 update_object (last, UP_OBJ_REMOVE);
1125
1126 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1127 update_all_los (map, x, y); 1237 update_all_los (map, x, y);
1128 } 1238 }
1129} 1239}
1130 1240
1131/* 1241/*
1140merge_ob (object *op, object *top) 1250merge_ob (object *op, object *top)
1141{ 1251{
1142 if (!op->nrof) 1252 if (!op->nrof)
1143 return 0; 1253 return 0;
1144 1254
1145 if (top) 1255 if (!top)
1146 for (top = op; top && top->above; top = top->above) 1256 for (top = op; top && top->above; top = top->above)
1147 ; 1257 ;
1148 1258
1149 for (; top; top = top->below) 1259 for (; top; top = top->below)
1150 {
1151 if (top == op)
1152 continue;
1153
1154 if (object::can_merge (op, top)) 1260 if (object::can_merge (op, top))
1155 { 1261 {
1156 top->nrof += op->nrof; 1262 top->nrof += op->nrof;
1157 1263
1158/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1264 if (object *pl = top->visible_to ())
1159 op->weight = 0; /* Don't want any adjustements now */ 1265 esrv_update_item (UPD_NROF, pl, top);
1266
1267 op->weight = 0; // cancel the addition above
1268 op->carrying = 0; // must be 0 already
1269
1160 op->destroy (); 1270 op->destroy ();
1271
1161 return top; 1272 return top;
1162 } 1273 }
1163 }
1164 1274
1165 return 0; 1275 return 0;
1166} 1276}
1167 1277
1168void 1278void
1173 1283
1174 object *prev = this; 1284 object *prev = this;
1175 1285
1176 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1286 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1177 { 1287 {
1178 object *op = arch_to_object (at); 1288 object *op = at->instance ();
1179 1289
1180 op->name = name; 1290 op->name = name;
1181 op->name_pl = name_pl; 1291 op->name_pl = name_pl;
1182 op->title = title; 1292 op->title = title;
1183 1293
1193 * job preparing multi-part monsters. 1303 * job preparing multi-part monsters.
1194 */ 1304 */
1195object * 1305object *
1196insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1306insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1197{ 1307{
1308 op->remove ();
1309
1198 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1310 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1199 { 1311 {
1200 tmp->x = x + tmp->arch->x; 1312 tmp->x = x + tmp->arch->x;
1201 tmp->y = y + tmp->arch->y; 1313 tmp->y = y + tmp->arch->y;
1202 } 1314 }
1219 * Passing 0 for flag gives proper default values, so flag really only needs 1331 * Passing 0 for flag gives proper default values, so flag really only needs
1220 * to be set if special handling is needed. 1332 * to be set if special handling is needed.
1221 * 1333 *
1222 * Return value: 1334 * Return value:
1223 * new object if 'op' was merged with other object 1335 * new object if 'op' was merged with other object
1224 * NULL if 'op' was destroyed 1336 * NULL if there was an error (destroyed, blocked etc.)
1225 * just 'op' otherwise 1337 * just 'op' otherwise
1226 */ 1338 */
1227object * 1339object *
1228insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1340insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1229{ 1341{
1230 assert (!op->flag [FLAG_FREED]);
1231
1232 object *top, *floor = NULL;
1233
1234 op->remove (); 1342 op->remove ();
1235 1343
1236 if (out_of_map (m, op->x, op->y)) 1344 if (m == &freed_map)//D TODO: remove soon
1237 { 1345 {//D
1238 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); 1346 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1239#ifdef MANY_CORES
1240 /* Better to catch this here, as otherwise the next use of this object
1241 * is likely to cause a crash. Better to find out where it is getting
1242 * improperly inserted.
1243 */
1244 abort ();
1245#endif
1246 return op;
1247 } 1347 }//D
1248
1249 if (object *more = op->more)
1250 if (!insert_ob_in_map (more, m, originator, flag))
1251 return 0;
1252
1253 CLEAR_FLAG (op, FLAG_REMOVED);
1254 1348
1255 /* Ideally, the caller figures this out. However, it complicates a lot 1349 /* Ideally, the caller figures this out. However, it complicates a lot
1256 * of areas of callers (eg, anything that uses find_free_spot would now 1350 * of areas of callers (eg, anything that uses find_free_spot would now
1257 * need extra work 1351 * need extra work
1258 */ 1352 */
1353 maptile *newmap = m;
1259 if (!xy_normalise (m, op->x, op->y)) 1354 if (!xy_normalise (newmap, op->x, op->y))
1355 {
1356 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1260 return 0; 1357 return 0;
1358 }
1261 1359
1360 if (object *more = op->more)
1361 if (!insert_ob_in_map (more, m, originator, flag))
1362 return 0;
1363
1364 op->flag [FLAG_REMOVED] = false;
1365 op->env = 0;
1262 op->map = m; 1366 op->map = newmap;
1367
1263 mapspace &ms = op->ms (); 1368 mapspace &ms = op->ms ();
1264 1369
1265 /* this has to be done after we translate the coordinates. 1370 /* this has to be done after we translate the coordinates.
1266 */ 1371 */
1267 if (op->nrof && !(flag & INS_NO_MERGE)) 1372 if (op->nrof && !(flag & INS_NO_MERGE))
1268 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1373 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269 if (object::can_merge (op, tmp)) 1374 if (object::can_merge (op, tmp))
1270 { 1375 {
1376 // TODO: we actually want to update tmp, not op,
1377 // but some caller surely breaks when we return tmp
1378 // from here :/
1271 op->nrof += tmp->nrof; 1379 op->nrof += tmp->nrof;
1272 tmp->destroy (); 1380 tmp->destroy ();
1273 } 1381 }
1274 1382
1275 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1383 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1284 { 1392 {
1285 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1393 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1286 abort (); 1394 abort ();
1287 } 1395 }
1288 1396
1397 if (!originator->is_on_map ())
1398 {
1399 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1400 op->debug_desc (), originator->debug_desc ());
1401 abort ();
1402 }
1403
1289 op->above = originator; 1404 op->above = originator;
1290 op->below = originator->below; 1405 op->below = originator->below;
1291
1292 if (op->below)
1293 op->below->above = op;
1294 else
1295 ms.bot = op;
1296
1297 /* since *below* originator, no need to update top */
1298 originator->below = op; 1406 originator->below = op;
1407
1408 *(op->below ? &op->below->above : &ms.bot) = op;
1299 } 1409 }
1300 else 1410 else
1301 { 1411 {
1302 top = ms.bot; 1412 object *floor = 0;
1413 object *top = ms.top;
1303 1414
1304 /* If there are other objects, then */ 1415 /* If there are other objects, then */
1305 if ((!(flag & INS_MAP_LOAD)) && top) 1416 if (top)
1306 { 1417 {
1307 object *last = 0;
1308
1309 /* 1418 /*
1310 * If there are multiple objects on this space, we do some trickier handling. 1419 * If there are multiple objects on this space, we do some trickier handling.
1311 * We've already dealt with merging if appropriate. 1420 * We've already dealt with merging if appropriate.
1312 * Generally, we want to put the new object on top. But if 1421 * Generally, we want to put the new object on top. But if
1313 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1422 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1316 * once we get to them. This reduces the need to traverse over all of 1425 * once we get to them. This reduces the need to traverse over all of
1317 * them when adding another one - this saves quite a bit of cpu time 1426 * them when adding another one - this saves quite a bit of cpu time
1318 * when lots of spells are cast in one area. Currently, it is presumed 1427 * when lots of spells are cast in one area. Currently, it is presumed
1319 * that flying non pickable objects are spell objects. 1428 * that flying non pickable objects are spell objects.
1320 */ 1429 */
1321 for (top = ms.bot; top; top = top->above) 1430 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1322 { 1431 {
1323 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1432 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1324 floor = top; 1433 floor = tmp;
1325 1434
1326 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1435 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1327 { 1436 {
1328 /* We insert above top, so we want this object below this */ 1437 /* We insert above top, so we want this object below this */
1329 top = top->below; 1438 top = tmp->below;
1330 break; 1439 break;
1331 } 1440 }
1332 1441
1333 last = top; 1442 top = tmp;
1334 } 1443 }
1335
1336 /* Don't want top to be NULL, so set it to the last valid object */
1337 top = last;
1338 1444
1339 /* We let update_position deal with figuring out what the space 1445 /* We let update_position deal with figuring out what the space
1340 * looks like instead of lots of conditions here. 1446 * looks like instead of lots of conditions here.
1341 * makes things faster, and effectively the same result. 1447 * makes things faster, and effectively the same result.
1342 */ 1448 */
1349 */ 1455 */
1350 if (!(flag & INS_ON_TOP) 1456 if (!(flag & INS_ON_TOP)
1351 && ms.flags () & P_BLOCKSVIEW 1457 && ms.flags () & P_BLOCKSVIEW
1352 && (op->face && !faces [op->face].visibility)) 1458 && (op->face && !faces [op->face].visibility))
1353 { 1459 {
1460 object *last;
1461
1354 for (last = top; last != floor; last = last->below) 1462 for (last = top; last != floor; last = last->below)
1355 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1463 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1356 break; 1464 break;
1357 1465
1358 /* Check to see if we found the object that blocks view, 1466 /* Check to see if we found the object that blocks view,
1362 */ 1470 */
1363 if (last && last->below && last != floor) 1471 if (last && last->below && last != floor)
1364 top = last->below; 1472 top = last->below;
1365 } 1473 }
1366 } /* If objects on this space */ 1474 } /* If objects on this space */
1367 if (flag & INS_MAP_LOAD)
1368 top = ms.top;
1369 1475
1370 if (flag & INS_ABOVE_FLOOR_ONLY) 1476 if (flag & INS_ABOVE_FLOOR_ONLY)
1371 top = floor; 1477 top = floor;
1372 1478
1373 /* Top is the object that our object (op) is going to get inserted above. 1479 // insert object above top, or bottom-most if top = 0
1374 */
1375
1376 /* First object on this space */
1377 if (!top) 1480 if (!top)
1378 { 1481 {
1482 op->below = 0;
1379 op->above = ms.bot; 1483 op->above = ms.bot;
1380
1381 if (op->above)
1382 op->above->below = op;
1383
1384 op->below = 0;
1385 ms.bot = op; 1484 ms.bot = op;
1485
1486 *(op->above ? &op->above->below : &ms.top) = op;
1386 } 1487 }
1387 else 1488 else
1388 { /* get inserted into the stack above top */ 1489 {
1389 op->above = top->above; 1490 op->above = top->above;
1390
1391 if (op->above)
1392 op->above->below = op; 1491 top->above = op;
1393 1492
1394 op->below = top; 1493 op->below = top;
1395 top->above = op; 1494 *(op->above ? &op->above->below : &ms.top) = op;
1396 } 1495 }
1496 }
1397 1497
1398 if (!op->above) 1498 if (op->is_player ())
1399 ms.top = op;
1400 } /* else not INS_BELOW_ORIGINATOR */
1401
1402 if (op->type == PLAYER)
1403 { 1499 {
1404 op->contr->do_los = 1; 1500 op->contr->do_los = 1;
1405 ++op->map->players; 1501 ++op->map->players;
1406 op->map->touch (); 1502 op->map->touch ();
1407 } 1503 }
1408 1504
1409 op->map->dirty = true; 1505 op->map->dirty = true;
1410 1506
1411 if (!(flag & INS_MAP_LOAD))
1412 if (object *pl = ms.player ()) 1507 if (object *pl = ms.player ())
1508 //TODO: the floorbox prev/next might need updating
1509 //esrv_send_item (pl, op);
1510 //TODO: update floorbox to preserve ordering
1511 if (pl->contr->ns)
1413 pl->contr->ns->floorbox_update (); 1512 pl->contr->ns->floorbox_update ();
1414 1513
1415 /* If this object glows, it may affect lighting conditions that are 1514 /* If this object glows, it may affect lighting conditions that are
1416 * visible to others on this map. But update_all_los is really 1515 * visible to others on this map. But update_all_los is really
1417 * an inefficient way to do this, as it means los for all players 1516 * an inefficient way to do this, as it means los for all players
1419 * be far away from this change and not affected in any way - 1518 * be far away from this change and not affected in any way -
1420 * this should get redone to only look for players within range, 1519 * this should get redone to only look for players within range,
1421 * or just updating the P_UPTODATE for spaces within this area 1520 * or just updating the P_UPTODATE for spaces within this area
1422 * of effect may be sufficient. 1521 * of effect may be sufficient.
1423 */ 1522 */
1424 if (op->map->darkness && (op->glow_radius != 0)) 1523 if (op->affects_los ())
1524 {
1525 op->ms ().invalidate ();
1425 update_all_los (op->map, op->x, op->y); 1526 update_all_los (op->map, op->x, op->y);
1527 }
1426 1528
1427 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1529 /* updates flags (blocked, alive, no magic, etc) for this map space */
1428 update_object (op, UP_OBJ_INSERT); 1530 update_object (op, UP_OBJ_INSERT);
1429 1531
1430 INVOKE_OBJECT (INSERT, op); 1532 INVOKE_OBJECT (INSERT, op);
1437 * blocked() and wall() work properly), and these flags are updated by 1539 * blocked() and wall() work properly), and these flags are updated by
1438 * update_object(). 1540 * update_object().
1439 */ 1541 */
1440 1542
1441 /* if this is not the head or flag has been passed, don't check walk on status */ 1543 /* if this is not the head or flag has been passed, don't check walk on status */
1442 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1544 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1443 { 1545 {
1444 if (check_move_on (op, originator)) 1546 if (check_move_on (op, originator))
1445 return 0; 1547 return 0;
1446 1548
1447 /* If we are a multi part object, lets work our way through the check 1549 /* If we are a multi part object, lets work our way through the check
1458/* this function inserts an object in the map, but if it 1560/* this function inserts an object in the map, but if it
1459 * finds an object of its own type, it'll remove that one first. 1561 * finds an object of its own type, it'll remove that one first.
1460 * op is the object to insert it under: supplies x and the map. 1562 * op is the object to insert it under: supplies x and the map.
1461 */ 1563 */
1462void 1564void
1463replace_insert_ob_in_map (const char *arch_string, object *op) 1565replace_insert_ob_in_map (shstr_tmp archname, object *op)
1464{ 1566{
1465 object *tmp, *tmp1;
1466
1467 /* first search for itself and remove any old instances */ 1567 /* first search for itself and remove any old instances */
1468 1568
1469 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1569 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1470 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1570 if (tmp->arch->archname == archname) /* same archetype */
1471 tmp->destroy (); 1571 tmp->destroy ();
1472 1572
1473 tmp1 = arch_to_object (archetype::find (arch_string)); 1573 object *tmp = archetype::find (archname)->instance ();
1474 1574
1475 tmp1->x = op->x; 1575 tmp->x = op->x;
1476 tmp1->y = op->y; 1576 tmp->y = op->y;
1577
1477 insert_ob_in_map (tmp1, op->map, op, 0); 1578 insert_ob_in_map (tmp, op->map, op, 0);
1478} 1579}
1479 1580
1480object * 1581object *
1481object::insert_at (object *where, object *originator, int flags) 1582object::insert_at (object *where, object *originator, int flags)
1482{ 1583{
1584 if (where->env)
1585 return where->env->insert (this);
1586 else
1483 return where->map->insert (this, where->x, where->y, originator, flags); 1587 return where->map->insert (this, where->x, where->y, originator, flags);
1484} 1588}
1485 1589
1486/* 1590// check whether we can put this into the map, respect max_volume, max_items
1487 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1591bool
1488 * is returned contains nr objects, and the remaining parts contains 1592object::can_drop_at (maptile *m, int x, int y, object *originator)
1489 * the rest (or is removed and freed if that number is 0).
1490 * On failure, NULL is returned, and the reason put into the
1491 * global static errmsg array.
1492 */
1493object *
1494get_split_ob (object *orig_ob, uint32 nr)
1495{ 1593{
1496 object *newob; 1594 mapspace &ms = m->at (x, y);
1497 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1498 1595
1499 if (orig_ob->nrof < nr) 1596 int items = ms.items ();
1500 {
1501 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1502 return NULL;
1503 }
1504 1597
1505 newob = object_create_clone (orig_ob); 1598 if (!items // testing !items ensures we can drop at least one item
1599 || (items < m->max_items
1600 && ms.volume () < m->max_volume))
1601 return true;
1506 1602
1507 if ((orig_ob->nrof -= nr) < 1) 1603 if (originator && originator->is_player ())
1508 orig_ob->destroy (1); 1604 originator->contr->failmsg (format (
1509 else if (!is_removed) 1605 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1510 { 1606 query_name ()
1511 if (orig_ob->env != NULL) 1607 ));
1512 sub_weight (orig_ob->env, orig_ob->weight * nr);
1513 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1514 {
1515 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1516 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1517 return NULL;
1518 }
1519 }
1520 1608
1521 newob->nrof = nr; 1609 return false;
1522
1523 return newob;
1524} 1610}
1525 1611
1526/* 1612/*
1527 * decrease_ob_nr(object, number) decreases a specified number from 1613 * decrease(object, number) decreases a specified number from
1528 * the amount of an object. If the amount reaches 0, the object 1614 * the amount of an object. If the amount reaches 0, the object
1529 * is subsequently removed and freed. 1615 * is subsequently removed and freed.
1530 * 1616 *
1531 * Return value: 'op' if something is left, NULL if the amount reached 0 1617 * Return value: 'op' if something is left, NULL if the amount reached 0
1532 */ 1618 */
1619bool
1620object::decrease (sint32 nr)
1621{
1622 if (!nr)
1623 return true;
1624
1625 nr = min (nr, nrof);
1626
1627 if (nrof > nr)
1628 {
1629 nrof -= nr;
1630 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1631
1632 if (object *pl = visible_to ())
1633 esrv_update_item (UPD_NROF, pl, this);
1634
1635 return true;
1636 }
1637 else
1638 {
1639 destroy ();
1640 return false;
1641 }
1642}
1643
1644/*
1645 * split(ob,nr) splits up ob into two parts. The part which
1646 * is returned contains nr objects, and the remaining parts contains
1647 * the rest (or is removed and returned if that number is 0).
1648 * On failure, NULL is returned.
1649 */
1533object * 1650object *
1534decrease_ob_nr (object *op, uint32 i) 1651object::split (sint32 nr)
1535{ 1652{
1536 object *tmp; 1653 int have = number_of ();
1537 1654
1538 if (i == 0) /* objects with op->nrof require this check */ 1655 if (have < nr)
1539 return op; 1656 return 0;
1540 1657 else if (have == nr)
1541 if (i > op->nrof)
1542 i = op->nrof;
1543
1544 if (QUERY_FLAG (op, FLAG_REMOVED))
1545 op->nrof -= i;
1546 else if (op->env)
1547 { 1658 {
1548 /* is this object in the players inventory, or sub container
1549 * therein?
1550 */
1551 tmp = op->in_player ();
1552 /* nope. Is this a container the player has opened?
1553 * If so, set tmp to that player.
1554 * IMO, searching through all the players will mostly
1555 * likely be quicker than following op->env to the map,
1556 * and then searching the map for a player.
1557 */
1558 if (!tmp)
1559 for_all_players (pl)
1560 if (pl->ob->container == op->env)
1561 {
1562 tmp = pl->ob;
1563 break;
1564 }
1565
1566 if (i < op->nrof)
1567 {
1568 sub_weight (op->env, op->weight * i);
1569 op->nrof -= i;
1570 if (tmp)
1571 esrv_send_item (tmp, op);
1572 }
1573 else
1574 {
1575 op->remove (); 1659 remove ();
1576 op->nrof = 0; 1660 return this;
1577 if (tmp)
1578 esrv_del_item (tmp->contr, op->count);
1579 }
1580 } 1661 }
1581 else 1662 else
1582 { 1663 {
1583 object *above = op->above; 1664 decrease (nr);
1584 1665
1585 if (i < op->nrof) 1666 object *op = deep_clone ();
1586 op->nrof -= i; 1667 op->nrof = nr;
1587 else
1588 {
1589 op->remove ();
1590 op->nrof = 0;
1591 }
1592
1593 /* Since we just removed op, op->above is null */
1594 for (tmp = above; tmp; tmp = tmp->above)
1595 if (tmp->type == PLAYER)
1596 {
1597 if (op->nrof)
1598 esrv_send_item (tmp, op);
1599 else
1600 esrv_del_item (tmp->contr, op->count);
1601 }
1602 }
1603
1604 if (op->nrof)
1605 return op; 1668 return op;
1606 else
1607 {
1608 op->destroy ();
1609 return 0;
1610 }
1611}
1612
1613/*
1614 * add_weight(object, weight) adds the specified weight to an object,
1615 * and also updates how much the environment(s) is/are carrying.
1616 */
1617void
1618add_weight (object *op, signed long weight)
1619{
1620 while (op != NULL)
1621 {
1622 if (op->type == CONTAINER)
1623 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1624
1625 op->carrying += weight;
1626 op = op->env;
1627 } 1669 }
1628} 1670}
1629 1671
1630object * 1672object *
1631insert_ob_in_ob (object *op, object *where) 1673insert_ob_in_ob (object *op, object *where)
1656 * be != op, if items are merged. -Tero 1698 * be != op, if items are merged. -Tero
1657 */ 1699 */
1658object * 1700object *
1659object::insert (object *op) 1701object::insert (object *op)
1660{ 1702{
1661 if (!QUERY_FLAG (op, FLAG_REMOVED))
1662 op->remove ();
1663
1664 if (op->more) 1703 if (op->more)
1665 { 1704 {
1666 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1705 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1667 return op; 1706 return op;
1668 } 1707 }
1669 1708
1670 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1709 op->remove ();
1671 CLEAR_FLAG (op, FLAG_REMOVED); 1710
1711 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1672 1712
1673 if (op->nrof) 1713 if (op->nrof)
1674 {
1675 for (object *tmp = inv; tmp; tmp = tmp->below) 1714 for (object *tmp = inv; tmp; tmp = tmp->below)
1676 if (object::can_merge (tmp, op)) 1715 if (object::can_merge (tmp, op))
1677 { 1716 {
1678 /* return the original object and remove inserted object 1717 /* return the original object and remove inserted object
1679 (client needs the original object) */ 1718 (client needs the original object) */
1680 tmp->nrof += op->nrof; 1719 tmp->nrof += op->nrof;
1681 /* Weight handling gets pretty funky. Since we are adding to 1720
1682 * tmp->nrof, we need to increase the weight. 1721 if (object *pl = tmp->visible_to ())
1683 */ 1722 esrv_update_item (UPD_NROF, pl, tmp);
1723
1684 add_weight (this, op->weight * op->nrof); 1724 adjust_weight (this, op->total_weight ());
1685 SET_FLAG (op, FLAG_REMOVED); 1725
1686 op->destroy (); /* free the inserted object */ 1726 op->destroy ();
1687 op = tmp; 1727 op = tmp;
1688 op->remove (); /* and fix old object's links */ 1728 goto inserted;
1689 CLEAR_FLAG (op, FLAG_REMOVED);
1690 break;
1691 } 1729 }
1692 1730
1693 /* I assume combined objects have no inventory
1694 * We add the weight - this object could have just been removed
1695 * (if it was possible to merge). calling remove_ob will subtract
1696 * the weight, so we need to add it in again, since we actually do
1697 * the linking below
1698 */
1699 add_weight (this, op->weight * op->nrof);
1700 }
1701 else
1702 add_weight (this, (op->weight + op->carrying));
1703
1704 if (object *otmp = this->in_player ())
1705 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1706 otmp->update_stats ();
1707
1708 op->owner = 0; // its his/hers now. period. 1731 op->owner = 0; // it's his/hers now. period.
1709 op->map = 0; 1732 op->map = 0;
1733 op->x = 0;
1734 op->y = 0;
1735
1736 op->above = 0;
1737 op->below = inv;
1710 op->env = this; 1738 op->env = this;
1711 op->above = 0;
1712 op->below = 0;
1713 op->x = op->y = 0;
1714 1739
1740 if (inv)
1741 inv->above = op;
1742
1743 inv = op;
1744
1745 op->flag [FLAG_REMOVED] = 0;
1746
1747 if (object *pl = op->visible_to ())
1748 esrv_send_item (pl, op);
1749
1750 adjust_weight (this, op->total_weight ());
1751
1752inserted:
1715 /* reset the light list and los of the players on the map */ 1753 /* reset the light list and los of the players on the map */
1716 if (op->glow_radius && map) 1754 if (op->glow_radius && is_on_map ())
1717 { 1755 {
1718#ifdef DEBUG_LIGHTS 1756 update_stats ();
1719 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1720#endif /* DEBUG_LIGHTS */
1721 if (map->darkness)
1722 update_all_los (map, x, y); 1757 update_all_los (map, x, y);
1723 }
1724
1725 /* Client has no idea of ordering so lets not bother ordering it here.
1726 * It sure simplifies this function...
1727 */
1728 if (!inv)
1729 inv = op;
1730 else
1731 { 1758 }
1732 op->below = inv; 1759 else if (is_player ())
1733 op->below->above = op; 1760 // if this is a player's inventory, update stats
1734 inv = op; 1761 contr->queue_stats_update ();
1735 }
1736 1762
1737 INVOKE_OBJECT (INSERT, this); 1763 INVOKE_OBJECT (INSERT, this);
1738 1764
1739 return op; 1765 return op;
1740} 1766}
1760 * on top. 1786 * on top.
1761 */ 1787 */
1762int 1788int
1763check_move_on (object *op, object *originator) 1789check_move_on (object *op, object *originator)
1764{ 1790{
1791 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1792 return 0;
1793
1765 object *tmp; 1794 object *tmp;
1766 maptile *m = op->map; 1795 maptile *m = op->map;
1767 int x = op->x, y = op->y; 1796 int x = op->x, y = op->y;
1768 1797
1769 MoveType move_on, move_slow, move_block; 1798 mapspace &ms = m->at (x, y);
1770 1799
1771 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1800 ms.update ();
1772 return 0;
1773 1801
1774 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1802 MoveType move_on = ms.move_on;
1775 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1803 MoveType move_slow = ms.move_slow;
1776 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1804 MoveType move_block = ms.move_block;
1777 1805
1778 /* if nothing on this space will slow op down or be applied, 1806 /* if nothing on this space will slow op down or be applied,
1779 * no need to do checking below. have to make sure move_type 1807 * no need to do checking below. have to make sure move_type
1780 * is set, as lots of objects don't have it set - we treat that 1808 * is set, as lots of objects don't have it set - we treat that
1781 * as walking. 1809 * as walking.
1792 return 0; 1820 return 0;
1793 1821
1794 /* The objects have to be checked from top to bottom. 1822 /* The objects have to be checked from top to bottom.
1795 * Hence, we first go to the top: 1823 * Hence, we first go to the top:
1796 */ 1824 */
1797 1825 for (object *next, *tmp = ms.top; tmp; tmp = next)
1798 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1799 {
1800 /* Trim the search when we find the first other spell effect
1801 * this helps performance so that if a space has 50 spell objects,
1802 * we don't need to check all of them.
1803 */
1804 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1805 break;
1806 } 1826 {
1827 next = tmp->below;
1807 1828
1808 for (; tmp; tmp = tmp->below)
1809 {
1810 if (tmp == op) 1829 if (tmp == op)
1811 continue; /* Can't apply yourself */ 1830 continue; /* Can't apply yourself */
1812 1831
1813 /* Check to see if one of the movement types should be slowed down. 1832 /* Check to see if one of the movement types should be slowed down.
1814 * Second check makes sure that the movement types not being slowed 1833 * Second check makes sure that the movement types not being slowed
1819 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1838 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1820 { 1839 {
1821 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1840 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1822 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1841 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1823 { 1842 {
1824
1825 float
1826 diff = tmp->move_slow_penalty * fabs (op->speed); 1843 float diff = tmp->move_slow_penalty * fabs (op->speed);
1827 1844
1828 if (op->type == PLAYER) 1845 if (op->is_player ())
1829 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1846 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1830 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1847 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1831 diff /= 4.0; 1848 diff /= 4.0;
1832 1849
1833 op->speed_left -= diff; 1850 op->speed_left -= diff;
1834 } 1851 }
1835 } 1852 }
1868 LOG (llevError, "Present_arch called outside map.\n"); 1885 LOG (llevError, "Present_arch called outside map.\n");
1869 return NULL; 1886 return NULL;
1870 } 1887 }
1871 1888
1872 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above) 1889 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1873 if (tmp->arch == at) 1890 if (tmp->arch->archname == at->archname)
1874 return tmp; 1891 return tmp;
1875 1892
1876 return NULL; 1893 return NULL;
1877} 1894}
1878 1895
1942 * The first matching object is returned, or NULL if none. 1959 * The first matching object is returned, or NULL if none.
1943 */ 1960 */
1944object * 1961object *
1945present_arch_in_ob (const archetype *at, const object *op) 1962present_arch_in_ob (const archetype *at, const object *op)
1946{ 1963{
1947 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1948 if (tmp->arch == at) 1965 if (tmp->arch->archname == at->archname)
1949 return tmp; 1966 return tmp;
1950 1967
1951 return NULL; 1968 return NULL;
1952} 1969}
1953 1970
1955 * activate recursively a flag on an object inventory 1972 * activate recursively a flag on an object inventory
1956 */ 1973 */
1957void 1974void
1958flag_inv (object *op, int flag) 1975flag_inv (object *op, int flag)
1959{ 1976{
1960 if (op->inv)
1961 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1962 { 1978 {
1963 SET_FLAG (tmp, flag); 1979 SET_FLAG (tmp, flag);
1964 flag_inv (tmp, flag); 1980 flag_inv (tmp, flag);
1965 } 1981 }
1966} 1982}
1967 1983
1968/* 1984/*
1969 * deactivate recursively a flag on an object inventory 1985 * deactivate recursively a flag on an object inventory
1970 */ 1986 */
1971void 1987void
1972unflag_inv (object *op, int flag) 1988unflag_inv (object *op, int flag)
1973{ 1989{
1974 if (op->inv)
1975 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1990 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1976 { 1991 {
1977 CLEAR_FLAG (tmp, flag); 1992 CLEAR_FLAG (tmp, flag);
1978 unflag_inv (tmp, flag); 1993 unflag_inv (tmp, flag);
1979 } 1994 }
1980} 1995}
1981 1996
1982/* 1997/*
1983 * find_free_spot(object, map, x, y, start, stop) will search for 1998 * find_free_spot(object, map, x, y, start, stop) will search for
1984 * a spot at the given map and coordinates which will be able to contain 1999 * a spot at the given map and coordinates which will be able to contain
1986 * to search (see the freearr_x/y[] definition). 2001 * to search (see the freearr_x/y[] definition).
1987 * It returns a random choice among the alternatives found. 2002 * It returns a random choice among the alternatives found.
1988 * start and stop are where to start relative to the free_arr array (1,9 2003 * start and stop are where to start relative to the free_arr array (1,9
1989 * does all 4 immediate directions). This returns the index into the 2004 * does all 4 immediate directions). This returns the index into the
1990 * array of the free spot, -1 if no spot available (dir 0 = x,y) 2005 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1991 * Note - this only checks to see if there is space for the head of the
1992 * object - if it is a multispace object, this should be called for all
1993 * pieces.
1994 * Note2: This function does correctly handle tiled maps, but does not 2006 * Note: This function does correctly handle tiled maps, but does not
1995 * inform the caller. However, insert_ob_in_map will update as 2007 * inform the caller. However, insert_ob_in_map will update as
1996 * necessary, so the caller shouldn't need to do any special work. 2008 * necessary, so the caller shouldn't need to do any special work.
1997 * Note - updated to take an object instead of archetype - this is necessary 2009 * Note - updated to take an object instead of archetype - this is necessary
1998 * because arch_blocked (now ob_blocked) needs to know the movement type 2010 * because arch_blocked (now ob_blocked) needs to know the movement type
1999 * to know if the space in question will block the object. We can't use 2011 * to know if the space in question will block the object. We can't use
2001 * customized, changed states, etc. 2013 * customized, changed states, etc.
2002 */ 2014 */
2003int 2015int
2004find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2016find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2005{ 2017{
2018 int altern[SIZEOFFREE];
2006 int index = 0, flag; 2019 int index = 0, flag;
2007 int altern[SIZEOFFREE];
2008 2020
2009 for (int i = start; i < stop; i++) 2021 for (int i = start; i < stop; i++)
2010 { 2022 {
2011 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2023 mapxy pos (m, x, y); pos.move (i);
2012 if (!flag) 2024
2025 if (!pos.normalise ())
2026 continue;
2027
2028 mapspace &ms = *pos;
2029
2030 if (ms.flags () & P_IS_ALIVE)
2031 continue;
2032
2033 /* However, often
2034 * ob doesn't have any move type (when used to place exits)
2035 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2036 */
2037 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2038 {
2013 altern [index++] = i; 2039 altern [index++] = i;
2040 continue;
2041 }
2014 2042
2015 /* Basically, if we find a wall on a space, we cut down the search size. 2043 /* Basically, if we find a wall on a space, we cut down the search size.
2016 * In this way, we won't return spaces that are on another side of a wall. 2044 * In this way, we won't return spaces that are on another side of a wall.
2017 * This mostly work, but it cuts down the search size in all directions - 2045 * This mostly work, but it cuts down the search size in all directions -
2018 * if the space being examined only has a wall to the north and empty 2046 * if the space being examined only has a wall to the north and empty
2019 * spaces in all the other directions, this will reduce the search space 2047 * spaces in all the other directions, this will reduce the search space
2020 * to only the spaces immediately surrounding the target area, and 2048 * to only the spaces immediately surrounding the target area, and
2021 * won't look 2 spaces south of the target space. 2049 * won't look 2 spaces south of the target space.
2022 */ 2050 */
2023 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2051 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2052 {
2024 stop = maxfree[i]; 2053 stop = maxfree[i];
2054 continue;
2055 }
2056
2057 /* Note it is intentional that we check ob - the movement type of the
2058 * head of the object should correspond for the entire object.
2059 */
2060 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2061 continue;
2062
2063 if (ob->blocked (pos.m, pos.x, pos.y))
2064 continue;
2065
2066 altern [index++] = i;
2025 } 2067 }
2026 2068
2027 if (!index) 2069 if (!index)
2028 return -1; 2070 return -1;
2029 2071
2038 */ 2080 */
2039int 2081int
2040find_first_free_spot (const object *ob, maptile *m, int x, int y) 2082find_first_free_spot (const object *ob, maptile *m, int x, int y)
2041{ 2083{
2042 for (int i = 0; i < SIZEOFFREE; i++) 2084 for (int i = 0; i < SIZEOFFREE; i++)
2043 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2085 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2044 return i; 2086 return i;
2045 2087
2046 return -1; 2088 return -1;
2047} 2089}
2048 2090
2094 * there is capable of. 2136 * there is capable of.
2095 */ 2137 */
2096int 2138int
2097find_dir (maptile *m, int x, int y, object *exclude) 2139find_dir (maptile *m, int x, int y, object *exclude)
2098{ 2140{
2099 int i, max = SIZEOFFREE, mflags; 2141 int max = SIZEOFFREE, mflags;
2100
2101 sint16 nx, ny;
2102 object *tmp;
2103 maptile *mp;
2104
2105 MoveType blocked, move_type; 2142 MoveType move_type;
2106 2143
2107 if (exclude && exclude->head_ () != exclude) 2144 if (exclude && exclude->head_ () != exclude)
2108 { 2145 {
2109 exclude = exclude->head; 2146 exclude = exclude->head;
2110 move_type = exclude->move_type; 2147 move_type = exclude->move_type;
2113 { 2150 {
2114 /* If we don't have anything, presume it can use all movement types. */ 2151 /* If we don't have anything, presume it can use all movement types. */
2115 move_type = MOVE_ALL; 2152 move_type = MOVE_ALL;
2116 } 2153 }
2117 2154
2118 for (i = 1; i < max; i++) 2155 for (int i = 1; i < max; i++)
2119 { 2156 {
2120 mp = m; 2157 mapxy pos (m, x, y);
2121 nx = x + freearr_x[i]; 2158 pos.move (i);
2122 ny = y + freearr_y[i];
2123 2159
2124 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2160 if (!pos.normalise ())
2125
2126 if (mflags & P_OUT_OF_MAP)
2127 max = maxfree[i]; 2161 max = maxfree[i];
2128 else 2162 else
2129 { 2163 {
2130 mapspace &ms = mp->at (nx, ny); 2164 mapspace &ms = *pos;
2131 2165
2132 blocked = ms.move_block;
2133
2134 if ((move_type & blocked) == move_type) 2166 if ((move_type & ms.move_block) == move_type)
2135 max = maxfree[i]; 2167 max = maxfree [i];
2136 else if (mflags & P_IS_ALIVE) 2168 else if (ms.flags () & P_IS_ALIVE)
2137 { 2169 {
2138 for (tmp = ms.bot; tmp; tmp = tmp->above) 2170 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2139 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2171 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2140 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2172 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2141 break;
2142
2143 if (tmp)
2144 return freedir[i]; 2173 return freedir [i];
2145 } 2174 }
2146 } 2175 }
2147 } 2176 }
2148 2177
2149 return 0; 2178 return 0;
2224 * This basically means that if direction is 15, then it could either go 2253 * This basically means that if direction is 15, then it could either go
2225 * direction 4, 14, or 16 to get back to where we are. 2254 * direction 4, 14, or 16 to get back to where we are.
2226 * Moved from spell_util.c to object.c with the other related direction 2255 * Moved from spell_util.c to object.c with the other related direction
2227 * functions. 2256 * functions.
2228 */ 2257 */
2229int reduction_dir[SIZEOFFREE][3] = { 2258static const int reduction_dir[SIZEOFFREE][3] = {
2230 {0, 0, 0}, /* 0 */ 2259 {0, 0, 0}, /* 0 */
2231 {0, 0, 0}, /* 1 */ 2260 {0, 0, 0}, /* 1 */
2232 {0, 0, 0}, /* 2 */ 2261 {0, 0, 0}, /* 2 */
2233 {0, 0, 0}, /* 3 */ 2262 {0, 0, 0}, /* 3 */
2234 {0, 0, 0}, /* 4 */ 2263 {0, 0, 0}, /* 4 */
2330int 2359int
2331can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2332{ 2361{
2333 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2334 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2335 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2364 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2336} 2365}
2337 2366
2338/* 2367/*
2339 * create clone from object to another 2368 * create clone from object to another
2340 */ 2369 */
2341object * 2370object *
2342object_create_clone (object *asrc) 2371object::deep_clone ()
2343{ 2372{
2344 object *dst = 0, *tmp, *src, *prev, *item; 2373 assert (("deep_clone called on non-head object", is_head ()));
2345 2374
2346 if (!asrc) 2375 object *dst = clone ();
2347 return 0;
2348 2376
2349 src = asrc->head_ (); 2377 object *prev = dst;
2350
2351 prev = 0;
2352 for (object *part = src; part; part = part->more) 2378 for (object *part = this->more; part; part = part->more)
2353 { 2379 {
2354 tmp = part->clone (); 2380 object *tmp = part->clone ();
2355 tmp->x -= src->x;
2356 tmp->y -= src->y;
2357
2358 if (!part->head)
2359 {
2360 dst = tmp;
2361 tmp->head = 0;
2362 }
2363 else
2364 tmp->head = dst; 2381 tmp->head = dst;
2365
2366 tmp->more = 0;
2367
2368 if (prev)
2369 prev->more = tmp; 2382 prev->more = tmp;
2370
2371 prev = tmp; 2383 prev = tmp;
2372 } 2384 }
2373 2385
2374 for (item = src->inv; item; item = item->below) 2386 for (object *item = inv; item; item = item->below)
2375 insert_ob_in_ob (object_create_clone (item), dst); 2387 insert_ob_in_ob (item->deep_clone (), dst);
2376 2388
2377 return dst; 2389 return dst;
2378} 2390}
2379 2391
2380/* This returns the first object in who's inventory that 2392/* This returns the first object in who's inventory that
2389 return tmp; 2401 return tmp;
2390 2402
2391 return 0; 2403 return 0;
2392} 2404}
2393 2405
2394/* If ob has a field named key, return the link from the list, 2406shstr_tmp
2395 * otherwise return NULL. 2407object::kv_get (shstr_tmp key) const
2396 *
2397 * key must be a passed in shared string - otherwise, this won't
2398 * do the desired thing.
2399 */
2400key_value *
2401get_ob_key_link (const object *ob, const char *key)
2402{ 2408{
2403 for (key_value *link = ob->key_values; link; link = link->next) 2409 for (key_value *kv = key_values; kv; kv = kv->next)
2404 if (link->key == key) 2410 if (kv->key == key)
2405 return link;
2406
2407 return 0;
2408}
2409
2410/*
2411 * Returns the value of op has an extra_field for key, or NULL.
2412 *
2413 * The argument doesn't need to be a shared string.
2414 *
2415 * The returned string is shared.
2416 */
2417const char *
2418get_ob_key_value (const object *op, const char *const key)
2419{
2420 key_value *link;
2421 shstr_cmp canonical_key (key);
2422
2423 if (!canonical_key)
2424 {
2425 /* 1. There being a field named key on any object
2426 * implies there'd be a shared string to find.
2427 * 2. Since there isn't, no object has this field.
2428 * 3. Therefore, *this* object doesn't have this field.
2429 */
2430 return 0;
2431 }
2432
2433 /* This is copied from get_ob_key_link() above -
2434 * only 4 lines, and saves the function call overhead.
2435 */
2436 for (link = op->key_values; link; link = link->next)
2437 if (link->key == canonical_key)
2438 return link->value; 2411 return kv->value;
2439 2412
2440 return 0; 2413 return shstr ();
2441} 2414}
2442 2415
2443/* 2416void
2444 * Updates the canonical_key in op to value. 2417object::kv_set (shstr_tmp key, shstr_tmp value)
2445 *
2446 * canonical_key is a shared string (value doesn't have to be).
2447 *
2448 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2449 * keys.
2450 *
2451 * Returns TRUE on success.
2452 */
2453int
2454set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2455{ 2418{
2456 key_value *field = NULL, *last = NULL; 2419 for (key_value *kv = key_values; kv; kv = kv->next)
2457 2420 if (kv->key == key)
2458 for (field = op->key_values; field != NULL; field = field->next)
2459 {
2460 if (field->key != canonical_key)
2461 { 2421 {
2462 last = field; 2422 kv->value = value;
2463 continue; 2423 return;
2464 } 2424 }
2465 2425
2466 if (value) 2426 key_value *kv = new key_value;
2467 field->value = value; 2427
2468 else 2428 kv->next = key_values;
2429 kv->key = key;
2430 kv->value = value;
2431
2432 key_values = kv;
2433}
2434
2435void
2436object::kv_del (shstr_tmp key)
2437{
2438 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2439 if ((*kvp)->key == key)
2469 { 2440 {
2470 /* Basically, if the archetype has this key set, 2441 key_value *kv = *kvp;
2471 * we need to store the null value so when we save 2442 *kvp = (*kvp)->next;
2472 * it, we save the empty value so that when we load, 2443 delete kv;
2473 * we get this value back again. 2444 return;
2474 */
2475 if (get_ob_key_link (op->arch, canonical_key))
2476 field->value = 0;
2477 else
2478 {
2479 if (last)
2480 last->next = field->next;
2481 else
2482 op->key_values = field->next;
2483
2484 delete field;
2485 }
2486 } 2445 }
2487 return TRUE;
2488 }
2489 /* IF we get here, key doesn't exist */
2490
2491 /* No field, we'll have to add it. */
2492
2493 if (!add_key)
2494 return FALSE;
2495
2496 /* There isn't any good reason to store a null
2497 * value in the key/value list. If the archetype has
2498 * this key, then we should also have it, so shouldn't
2499 * be here. If user wants to store empty strings,
2500 * should pass in ""
2501 */
2502 if (value == NULL)
2503 return TRUE;
2504
2505 field = new key_value;
2506
2507 field->key = canonical_key;
2508 field->value = value;
2509 /* Usual prepend-addition. */
2510 field->next = op->key_values;
2511 op->key_values = field;
2512
2513 return TRUE;
2514}
2515
2516/*
2517 * Updates the key in op to value.
2518 *
2519 * If add_key is FALSE, this will only update existing keys,
2520 * and not add new ones.
2521 * In general, should be little reason FALSE is ever passed in for add_key
2522 *
2523 * Returns TRUE on success.
2524 */
2525int
2526set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2527{
2528 shstr key_ (key);
2529
2530 return set_ob_key_value_s (op, key_, value, add_key);
2531} 2446}
2532 2447
2533object::depth_iterator::depth_iterator (object *container) 2448object::depth_iterator::depth_iterator (object *container)
2534: iterator_base (container) 2449: iterator_base (container)
2535{ 2450{
2585{ 2500{
2586 char flagdesc[512]; 2501 char flagdesc[512];
2587 char info2[256 * 4]; 2502 char info2[256 * 4];
2588 char *p = info; 2503 char *p = info;
2589 2504
2590 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2505 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2591 count, uuid.seq, 2506 count,
2507 uuid.c_str (),
2592 &name, 2508 &name,
2593 title ? "\",title:\"" : "", 2509 title ? ",title:\"" : "",
2594 title ? (const char *)title : "", 2510 title ? (const char *)title : "",
2511 title ? "\"" : "",
2595 flag_desc (flagdesc, 512), type); 2512 flag_desc (flagdesc, 512), type);
2596 2513
2597 if (!this->flag[FLAG_REMOVED] && env) 2514 if (!flag[FLAG_REMOVED] && env)
2598 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2515 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2599 2516
2600 if (map) 2517 if (map)
2601 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2518 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2602 2519
2617{ 2534{
2618 return map ? map->region (x, y) 2535 return map ? map->region (x, y)
2619 : region::default_region (); 2536 : region::default_region ();
2620} 2537}
2621 2538
2622const materialtype_t *
2623object::dominant_material () const
2624{
2625 if (materialtype_t *mt = name_to_material (materialname))
2626 return mt;
2627
2628 return name_to_material (shstr_unknown);
2629}
2630
2631void 2539void
2632object::open_container (object *new_container) 2540object::open_container (object *new_container)
2633{ 2541{
2634 if (container == new_container) 2542 if (container == new_container)
2635 return; 2543 return;
2636 2544
2637 if (object *old_container = container) 2545 object *old_container = container;
2546
2547 if (old_container)
2638 { 2548 {
2639 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) 2549 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2640 return; 2550 return;
2641 2551
2642#if 0 2552#if 0
2644 if (object *closer = old_container->inv) 2554 if (object *closer = old_container->inv)
2645 if (closer->type == CLOSE_CON) 2555 if (closer->type == CLOSE_CON)
2646 closer->destroy (); 2556 closer->destroy ();
2647#endif 2557#endif
2648 2558
2559 // make sure the container is available
2560 esrv_send_item (this, old_container);
2561
2649 old_container->flag [FLAG_APPLIED] = 0; 2562 old_container->flag [FLAG_APPLIED] = false;
2650 container = 0; 2563 container = 0;
2651 2564
2565 // client needs item update to make it work, client bug requires this to be separate
2652 esrv_update_item (UPD_FLAGS, this, old_container); 2566 esrv_update_item (UPD_FLAGS, this, old_container);
2567
2653 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2568 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2654 play_sound (sound_find ("chest_close")); 2569 play_sound (sound_find ("chest_close"));
2655 } 2570 }
2656 2571
2657 if (new_container) 2572 if (new_container)
2658 { 2573 {
2662 // TODO: this does not seem to serve any purpose anymore? 2577 // TODO: this does not seem to serve any purpose anymore?
2663#if 0 2578#if 0
2664 // insert the "Close Container" object. 2579 // insert the "Close Container" object.
2665 if (archetype *closer = new_container->other_arch) 2580 if (archetype *closer = new_container->other_arch)
2666 { 2581 {
2667 object *closer = arch_to_object (new_container->other_arch); 2582 object *closer = new_container->other_arch->instance ();
2668 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2583 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2669 new_container->insert (closer); 2584 new_container->insert (closer);
2670 } 2585 }
2671#endif 2586#endif
2672 2587
2673 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2588 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2674 2589
2590 // make sure the container is available, client bug requires this to be separate
2591 esrv_send_item (this, new_container);
2592
2675 new_container->flag [FLAG_APPLIED] = 1; 2593 new_container->flag [FLAG_APPLIED] = true;
2676 container = new_container; 2594 container = new_container;
2677 2595
2596 // client needs flag change
2678 esrv_update_item (UPD_FLAGS, this, new_container); 2597 esrv_update_item (UPD_FLAGS, this, new_container);
2679 esrv_send_inventory (this, new_container); 2598 esrv_send_inventory (this, new_container);
2680 play_sound (sound_find ("chest_open")); 2599 play_sound (sound_find ("chest_open"));
2681 } 2600 }
2601// else if (!old_container->env && contr && contr->ns)
2602// contr->ns->floorbox_reset ();
2682} 2603}
2683 2604
2684object * 2605object *
2685object::force_find (const shstr name) 2606object::force_find (shstr_tmp name)
2686{ 2607{
2687 /* cycle through his inventory to look for the MARK we want to 2608 /* cycle through his inventory to look for the MARK we want to
2688 * place 2609 * place
2689 */ 2610 */
2690 for (object *tmp = inv; tmp; tmp = tmp->below) 2611 for (object *tmp = inv; tmp; tmp = tmp->below)
2692 return splay (tmp); 2613 return splay (tmp);
2693 2614
2694 return 0; 2615 return 0;
2695} 2616}
2696 2617
2618//-GPL
2619
2697void 2620void
2621object::force_set_timer (int duration)
2622{
2623 this->duration = 1;
2624 this->speed_left = -1.f;
2625
2626 this->set_speed (duration ? 1.f / duration : 0.f);
2627}
2628
2629object *
2698object::force_add (const shstr name, int duration) 2630object::force_add (shstr_tmp name, int duration)
2699{ 2631{
2700 if (object *force = force_find (name)) 2632 if (object *force = force_find (name))
2701 force->destroy (); 2633 force->destroy ();
2702 2634
2703 object *force = get_archetype (FORCE_NAME); 2635 object *force = get_archetype (FORCE_NAME);
2704 2636
2705 force->slaying = name; 2637 force->slaying = name;
2706 force->stats.food = 1; 2638 force->force_set_timer (duration);
2707 force->speed_left = -1.f;
2708
2709 force->set_speed (duration ? 1.f / duration : 0.f);
2710 force->flag [FLAG_IS_USED_UP] = true;
2711 force->flag [FLAG_APPLIED] = true; 2639 force->flag [FLAG_APPLIED] = true;
2712 2640
2713 insert (force); 2641 return insert (force);
2714} 2642}
2715 2643
2716void 2644void
2717object::play_sound (faceidx sound) const 2645object::play_sound (faceidx sound) const
2718{ 2646{
2719 if (!sound) 2647 if (!sound)
2720 return; 2648 return;
2721 2649
2722 if (flag [FLAG_REMOVED]) 2650 if (is_on_map ())
2651 map->play_sound (sound, x, y);
2652 else if (object *pl = in_player ())
2653 pl->contr->play_sound (sound);
2654}
2655
2656void
2657object::say_msg (const char *msg) const
2658{
2659 if (is_on_map ())
2660 map->say_msg (msg, x, y);
2661 else if (object *pl = in_player ())
2662 pl->contr->play_sound (sound);
2663}
2664
2665void
2666object::make_noise ()
2667{
2668 // we do not model noise in the map, so instead put
2669 // a temporary light into the noise source
2670 // could use the map instead, but that's less reliable for our
2671 // goal, which is to make invisibility a bit harder to exploit
2672
2673 // currently only works sensibly for players
2674 if (!is_player ())
2723 return; 2675 return;
2724 2676
2725 if (env) 2677 // find old force, or create new one
2726 { 2678 object *force = force_find (shstr_noise_force);
2727 if (object *pl = in_player ()) 2679
2728 pl->contr->play_sound (sound); 2680 if (force)
2729 } 2681 force->speed_left = -1.f; // patch old speed up
2730 else 2682 else
2731 map->play_sound (sound, x, y); 2683 {
2732} 2684 force = archetype::get (shstr_noise_force);
2733 2685
2686 force->slaying = shstr_noise_force;
2687 force->stats.food = 1;
2688 force->speed_left = -1.f;
2689
2690 force->set_speed (1.f / 4.f);
2691 force->flag [FLAG_IS_USED_UP] = true;
2692 force->flag [FLAG_APPLIED] = true;
2693
2694 insert (force);
2695 }
2696}
2697
2698void object::change_move_type (MoveType mt)
2699{
2700 if (move_type == mt)
2701 return;
2702
2703 if (is_on_map ())
2704 {
2705 // we are on the map, so handle move_on/off effects
2706 remove ();
2707 move_type = mt;
2708 map->insert (this, x, y, this);
2709 }
2710 else
2711 move_type = mt;
2712}
2713

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines