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.40 by root, Thu Sep 14 00:07:15 2006 UTC vs.
Revision 1.367 by root, Sun Nov 18 15:19:48 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines