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.112 by root, Mon Jan 8 14:11:04 2007 UTC vs.
Revision 1.358 by root, Sun Nov 25 15:50:20 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines