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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines