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.52 by root, Wed Sep 27 00:36:08 2006 UTC vs.
Revision 1.367 by root, Sun Nov 18 15:19:48 2018 UTC

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