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.153 by root, Thu May 17 21:11:01 2007 UTC vs.
Revision 1.307 by root, Sun Nov 29 10:55:18 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines