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.76 by root, Thu Dec 21 01:33:49 2006 UTC vs.
Revision 1.343 by root, Sat Apr 23 04:56:46 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->key_values; 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->flags ^ ob2->flags).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->key_values || ob2->key_values)
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->key_values) != (!ob2->key_values))
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} 602}
454 603
455/* Zero the key_values on op, decrementing the shared-string 604/* Zero the key_values on op, decrementing the shared-string
456 * refcounts and freeing the links. 605 * refcounts and freeing the links.
457 */ 606 */
458static void 607static void
459free_key_values (object *op) 608free_key_values (object *op)
460{ 609{
461 for (key_value *i = op->key_values; i != 0;) 610 for (key_value *i = op->key_values; i; )
462 { 611 {
463 key_value *next = i->next; 612 key_value *next = i->next;
464 delete i; 613 delete i;
465 614
466 i = next; 615 i = next;
467 } 616 }
468 617
469 op->key_values = 0; 618 op->key_values = 0;
470}
471
472void object::clear ()
473{
474 attachable_base::clear ();
475
476 free_key_values (this);
477
478 owner = 0;
479 name = 0;
480 name_pl = 0;
481 title = 0;
482 race = 0;
483 slaying = 0;
484 skill = 0;
485 msg = 0;
486 lore = 0;
487 custom_name = 0;
488 materialname = 0;
489 contr = 0;
490 below = 0;
491 above = 0;
492 inv = 0;
493 container = 0;
494 env = 0;
495 more = 0;
496 head = 0;
497 map = 0;
498 active_next = 0;
499 active_prev = 0;
500
501 memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503 SET_FLAG (this, FLAG_REMOVED);
504
505 /* What is not cleared is next, prev, and count */
506
507 expmul = 1.0;
508 face = blank_face;
509
510 if (settings.casting_time)
511 casting_time = -1;
512} 619}
513 620
514/* 621/*
515 * copy_to first frees everything allocated by the dst object, 622 * copy_to first frees everything allocated by the dst object,
516 * and then copies the contents of itself into the second 623 * and then copies the contents of itself into the second
520 * will point at garbage. 627 * will point at garbage.
521 */ 628 */
522void 629void
523object::copy_to (object *dst) 630object::copy_to (object *dst)
524{ 631{
525 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 632 dst->remove ();
526 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527
528 *(object_copy *)dst = *this; 633 *(object_copy *)dst = *this;
529 *(object_pod *)dst = *this; 634 dst->flag [FLAG_REMOVED] = true;
530
531 if (self || cb)
532 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533
534 if (is_freed)
535 SET_FLAG (dst, FLAG_FREED);
536
537 if (is_removed)
538 SET_FLAG (dst, FLAG_REMOVED);
539
540 if (speed < 0)
541 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
542 635
543 /* Copy over key_values, if any. */ 636 /* Copy over key_values, if any. */
544 if (key_values) 637 if (key_values)
545 { 638 {
546 key_value *tail = 0; 639 key_value *tail = 0;
547 key_value *i;
548
549 dst->key_values = 0; 640 dst->key_values = 0;
550 641
551 for (i = key_values; i; i = i->next) 642 for (key_value *i = key_values; i; i = i->next)
552 { 643 {
553 key_value *new_link = new key_value; 644 key_value *new_link = new key_value;
554 645
555 new_link->next = 0; 646 new_link->next = 0;
556 new_link->key = i->key; 647 new_link->key = i->key;
557 new_link->value = i->value; 648 new_link->value = i->value;
558 649
559 /* Try and be clever here, too. */ 650 /* Try and be clever here, too. */
560 if (!dst->key_values) 651 if (!dst->key_values)
561 { 652 {
568 tail = new_link; 659 tail = new_link;
569 } 660 }
570 } 661 }
571 } 662 }
572 663
573 update_ob_speed (dst); 664 dst->activate ();
665}
666
667void
668object::instantiate ()
669{
670 if (!uuid.seq) // HACK
671 uuid = UUID::gen ();
672
673 // TODO: unclean state changes, should not be done in copy_to AND instantiate
674 if (flag [FLAG_RANDOM_SPEED] && speed)
675 speed_left = - speed - rndm (); // TODO animation
676 else
677 speed_left = -1.;
678
679 /* copy the body_info to the body_used - this is only really
680 * need for monsters, but doesn't hurt to do it for everything.
681 * by doing so, when a monster is created, it has good starting
682 * values for the body_used info, so when items are created
683 * for it, they can be properly equipped.
684 */
685 for (int i = NUM_BODY_LOCATIONS; i--; )
686 slot[i].used = slot[i].info;
687
688 attachable::instantiate ();
574} 689}
575 690
576object * 691object *
577object::clone () 692object::clone ()
578{ 693{
579 object *neu = create (); 694 object *neu = create ();
580 copy_to (neu); 695 copy_to (neu);
696
697 // TODO: unclean state changes, should not be done in clone AND instantiate
698 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
699 neu->speed_left = - neu->speed - rndm (); // TODO animation
700
701 neu->map = map; // not copied by copy_to
581 return neu; 702 return neu;
582} 703}
583 704
584/* 705/*
585 * If an object with the IS_TURNABLE() flag needs to be turned due 706 * If an object with the IS_TURNABLE() flag needs to be turned due
586 * to the closest player being on the other side, this function can 707 * to the closest player being on the other side, this function can
587 * be called to update the face variable, _and_ how it looks on the map. 708 * be called to update the face variable, _and_ how it looks on the map.
588 */ 709 */
589
590void 710void
591update_turn_face (object *op) 711update_turn_face (object *op)
592{ 712{
593 if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL) 713 if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
594 return; 714 return;
715
595 SET_ANIMATION (op, op->direction); 716 SET_ANIMATION (op, op->direction);
596 update_object (op, UP_OBJ_FACE); 717 update_object (op, UP_OBJ_FACE);
597} 718}
598 719
599/* 720/*
600 * Updates the speed of an object. If the speed changes from 0 to another 721 * Updates the speed of an object. If the speed changes from 0 to another
601 * value, or vice versa, then add/remove the object from the active list. 722 * value, or vice versa, then add/remove the object from the active list.
602 * This function needs to be called whenever the speed of an object changes. 723 * This function needs to be called whenever the speed of an object changes.
603 */ 724 */
604void 725void
605update_ob_speed (object *op) 726object::set_speed (float speed)
606{ 727{
607 extern int arch_init; 728 this->speed = speed;
608 729
609 /* No reason putting the archetypes objects on the speed list, 730 if (has_active_speed ())
610 * since they never really need to be updated. 731 activate ();
611 */
612
613 if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614 {
615 LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
616#ifdef MANY_CORES
617 abort ();
618#else
619 op->speed = 0;
620#endif
621 }
622
623 if (arch_init)
624 return;
625
626 if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627 {
628 /* If already on active list, don't do anything */
629 if (op->active_next || op->active_prev || op == active_objects)
630 return;
631
632 /* process_events() expects us to insert the object at the beginning
633 * of the list. */
634 op->active_next = active_objects;
635
636 if (op->active_next != NULL)
637 op->active_next->active_prev = op;
638
639 active_objects = op;
640 }
641 else 732 else
642 { 733 deactivate ();
643 /* If not on the active list, nothing needs to be done */
644 if (!op->active_next && !op->active_prev && op != active_objects)
645 return;
646
647 if (op->active_prev == NULL)
648 {
649 active_objects = op->active_next;
650
651 if (op->active_next != NULL)
652 op->active_next->active_prev = NULL;
653 }
654 else
655 {
656 op->active_prev->active_next = op->active_next;
657
658 if (op->active_next)
659 op->active_next->active_prev = op->active_prev;
660 }
661
662 op->active_next = NULL;
663 op->active_prev = NULL;
664 }
665}
666
667/* This function removes object 'op' from the list of active
668 * objects.
669 * This should only be used for style maps or other such
670 * reference maps where you don't want an object that isn't
671 * in play chewing up cpu time getting processed.
672 * The reverse of this is to call update_ob_speed, which
673 * will do the right thing based on the speed of the object.
674 */
675void
676remove_from_active_list (object *op)
677{
678 /* If not on the active list, nothing needs to be done */
679 if (!op->active_next && !op->active_prev && op != active_objects)
680 return;
681
682 if (op->active_prev == NULL)
683 {
684 active_objects = op->active_next;
685 if (op->active_next != NULL)
686 op->active_next->active_prev = NULL;
687 }
688 else
689 {
690 op->active_prev->active_next = op->active_next;
691 if (op->active_next)
692 op->active_next->active_prev = op->active_prev;
693 }
694 op->active_next = NULL;
695 op->active_prev = NULL;
696} 734}
697 735
698/* 736/*
699 * update_object() updates the the map. 737 * update_object() updates the the map.
700 * It takes into account invisible objects (and represent squares covered 738 * It takes into account invisible objects (and represent squares covered
713 * UP_OBJ_FACE: only the objects face has changed. 751 * UP_OBJ_FACE: only the objects face has changed.
714 */ 752 */
715void 753void
716update_object (object *op, int action) 754update_object (object *op, int action)
717{ 755{
718 MoveType move_on, move_off, move_block, move_slow; 756 if (!op)
719
720 if (op == NULL)
721 { 757 {
722 /* this should never happen */ 758 /* this should never happen */
723 LOG (llevDebug, "update_object() called for NULL object.\n"); 759 LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
724 return; 760 return;
725 } 761 }
726 762
727 if (op->env) 763 if (!op->is_on_map ())
728 { 764 {
729 /* Animation is currently handled by client, so nothing 765 /* Animation is currently handled by client, so nothing
730 * to do in this case. 766 * to do in this case.
731 */ 767 */
732 return; 768 return;
733 } 769 }
734 770
735 /* If the map is saving, don't do anything as everything is
736 * going to get freed anyways.
737 */
738 if (!op->map || op->map->in_memory == MAP_SAVING)
739 return;
740
741 /* make sure the object is within map boundaries */ 771 /* make sure the object is within map boundaries */
742 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 772 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
743 { 773 {
744 LOG (llevError, "update_object() called for object out of map!\n"); 774 LOG (llevError, "update_object() called for object out of map!\n");
745#ifdef MANY_CORES 775#ifdef MANY_CORES
746 abort (); 776 abort ();
747#endif 777#endif
748 return; 778 return;
749 } 779 }
750 780
751 mapspace &m = op->ms (); 781 mapspace &m = op->ms ();
752 782
753 if (m.flags_ & P_NEED_UPDATE) 783 if (!(m.flags_ & P_UPTODATE))
754 /* nop */; 784 /* nop */;
755 else if (action == UP_OBJ_INSERT) 785 else if (action == UP_OBJ_INSERT)
756 { 786 {
787#if 0
757 // this is likely overkill, TODO: revisit (schmorp) 788 // this is likely overkill, TODO: revisit (schmorp)
758 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 789 if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
759 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 790 || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
760 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 791 || (op->is_player () && !(m.flags_ & P_PLAYER))
761 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 792 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
762 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 793 || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
763 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 794 || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
764 || (m.move_on | op->move_on ) != m.move_on 795 || (m.move_on | op->move_on ) != m.move_on
765 || (m.move_off | op->move_off ) != m.move_off 796 || (m.move_off | op->move_off ) != m.move_off
766 || (m.move_slow | op->move_slow) != m.move_slow 797 || (m.move_slow | op->move_slow) != m.move_slow
767 /* This isn't perfect, but I don't expect a lot of objects to 798 /* This isn't perfect, but I don't expect a lot of objects to
768 * to have move_allow right now. 799 * have move_allow right now.
769 */ 800 */
770 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 801 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
802 m.invalidate ();
803#else
771 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 804 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
772 m.flags_ = P_NEED_UPDATE; 805 m.invalidate ();
806#endif
773 } 807 }
774 /* if the object is being removed, we can't make intelligent 808 /* if the object is being removed, we can't make intelligent
775 * decisions, because remove_ob can't really pass the object 809 * decisions, because remove_ob can't really pass the object
776 * that is being removed. 810 * that is being removed.
777 */ 811 */
778 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 812 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779 m.flags_ = P_NEED_UPDATE; 813 m.invalidate ();
780 else if (action == UP_OBJ_FACE) 814 else if (action == UP_OBJ_FACE)
781 /* Nothing to do for that case */ ; 815 /* Nothing to do for that case */ ;
782 else 816 else
783 LOG (llevError, "update_object called with invalid action: %d\n", action); 817 LOG (llevError, "update_object called with invalid action: %d\n", action);
784 818
785 if (op->more) 819 if (op->more)
786 update_object (op->more, action); 820 update_object (op->more, action);
787} 821}
788 822
789object::vector object::mortals;
790object::vector object::objects; // not yet used
791object *object::first;
792
793void object::free_mortals ()
794{
795 for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796 if ((*i)->refcnt)
797 ++i; // further delay freeing
798 else
799 {
800 delete *i;
801 mortals.erase (i);
802 }
803}
804
805object::object () 823object::object ()
806{ 824{
807 SET_FLAG (this, FLAG_REMOVED); 825 this->set_flag (FLAG_REMOVED);
808 826
809 expmul = 1.0; 827 //expmul = 1.0; declared const for the time being
810 face = blank_face; 828 face = blank_face;
829 material = MATERIAL_NULL;
811} 830}
812 831
813object::~object () 832object::~object ()
814{ 833{
834 unlink ();
835
815 free_key_values (this); 836 free_key_values (this);
816} 837}
817 838
818void object::link () 839void object::link ()
819{ 840{
820 count = ++ob_count; 841 assert (!index);//D
821 uuid = gen_uuid (); 842 uuid = UUID::gen ();
822 843
823 prev = 0; 844 refcnt_inc ();
824 next = object::first; 845 objects.insert (this);
825 846
826 if (object::first) 847 ++create_count;
827 object::first->prev = this;
828 848
829 object::first = this;
830} 849}
831 850
832void object::unlink () 851void object::unlink ()
833{ 852{
834 if (this == object::first) 853 if (!index)
835 object::first = next;
836
837 /* Remove this object from the list of used objects */
838 if (prev) prev->next = next;
839 if (next) next->prev = prev;
840
841 prev = 0;
842 next = 0;
843}
844
845object *object::create ()
846{
847 object *op = new object;
848 op->link ();
849 return op;
850}
851
852/*
853 * free_object() frees everything allocated by an object, removes
854 * it from the list of used objects, and puts it on the list of
855 * free objects. The IS_FREED() flag is set in the object.
856 * The object must have been removed by remove_ob() first for
857 * this function to succeed.
858 *
859 * If destroy_inventory is set, free inventory as well. Else drop items in
860 * inventory to the ground.
861 */
862void object::destroy (bool destroy_inventory)
863{
864 if (QUERY_FLAG (this, FLAG_FREED))
865 return; 854 return;
866 855
867 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 856 ++destroy_count;
868 remove_friendly_object (this);
869 857
870 if (!QUERY_FLAG (this, FLAG_REMOVED)) 858 objects.erase (this);
871 remove (); 859 refcnt_dec ();
860}
872 861
873 SET_FLAG (this, FLAG_FREED); 862void
863object::activate ()
864{
865 /* If already on active list, don't do anything */
866 if (active)
867 return;
874 868
875 if (more) 869 if (has_active_speed ())
876 {
877 more->destroy (destroy_inventory);
878 more = 0;
879 } 870 {
871 if (flag [FLAG_FREED])
872 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
880 873
874 actives.insert (this);
875 }
876}
877
878void
879object::activate_recursive ()
880{
881 activate ();
882
883 for (object *op = inv; op; op = op->below)
884 op->activate_recursive ();
885}
886
887/* This function removes object 'op' from the list of active
888 * objects.
889 * This should only be used for style maps or other such
890 * reference maps where you don't want an object that isn't
891 * in play chewing up cpu time getting processed.
892 * The reverse of this is to call update_ob_speed, which
893 * will do the right thing based on the speed of the object.
894 */
895void
896object::deactivate ()
897{
898 /* If not on the active list, nothing needs to be done */
899 if (!active)
900 return;
901
902 actives.erase (this);
903}
904
905void
906object::deactivate_recursive ()
907{
908 for (object *op = inv; op; op = op->below)
909 op->deactivate_recursive ();
910
911 deactivate ();
912}
913
914void
915object::set_flag_inv (int flag, int value)
916{
917 for (object *op = inv; op; op = op->below)
918 {
919 op->flag [flag] = value;
920 op->set_flag_inv (flag, value);
921 }
922}
923
924/*
925 * Remove and free all objects in the inventory of the given object.
926 * object.c ?
927 */
928void
929object::destroy_inv (bool drop_to_ground)
930{
931 // need to check first, because the checks below might segfault
932 // as we might be on an invalid mapspace and crossfire code
933 // is too buggy to ensure that the inventory is empty.
934 // corollary: if you create arrows etc. with stuff in its inventory,
935 // cf will crash below with off-map x and y
881 if (inv) 936 if (!inv)
882 { 937 return;
938
883 /* Only if the space blocks everything do we not process - 939 /* Only if the space blocks everything do we not process -
884 * if some form of movement is allowed, let objects 940 * if some form of movement is allowed, let objects
885 * drop on that space. 941 * drop on that space.
886 */ 942 */
887 if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL) 943 if (!drop_to_ground
944 || !map
945 || map->in_memory != MAP_ACTIVE
946 || map->no_drop
947 || ms ().move_block == MOVE_ALL)
948 {
949 while (inv)
950 inv->destroy ();
951 }
952 else
953 { /* Put objects in inventory onto this space */
954 while (inv)
888 { 955 {
889 object *op = inv; 956 object *op = inv;
890 957
891 while (op) 958 if (op->flag [FLAG_STARTEQUIP]
892 { 959 || op->flag [FLAG_NO_DROP]
893 object *tmp = op->below; 960 || op->type == RUNE
894 op->destroy (destroy_inventory); 961 || op->type == TRAP
895 op = tmp; 962 || op->flag [FLAG_IS_A_TEMPLATE]
896 } 963 || op->flag [FLAG_DESTROY_ON_DEATH])
964 op->destroy ();
965 else
966 map->insert (op, x, y);
897 } 967 }
898 else 968 }
899 { /* Put objects in inventory onto this space */ 969}
900 object *op = inv;
901 970
902 while (op) 971/*
903 { 972 * Remove and free all objects in the inventory of the given object.
904 object *tmp = op->below; 973 * Unlike destroy_inv, this assumes the *this is destroyed as well
974 * well, so we can (and have to!) take shortcuts.
975 */
976void
977object::destroy_inv_fast ()
978{
979 while (object *op = inv)
980 {
981 // remove from object the fast way
982 op->flag [FLAG_REMOVED] = true;
983 op->env = 0;
984 if ((inv = inv->below))
985 inv->above = 0;
905 986
906 op->remove (); 987 // then destroy
907
908 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910 op->destroy (); 988 op->destroy ();
911 else 989 }
912 { 990}
913 op->x = x;
914 op->y = y;
915 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916 }
917 991
918 op = tmp; 992void
919 } 993object::freelist_free (int count)
920 } 994{
995 while (count-- && freelist)
921 } 996 {
997 freelist_item *next = freelist->next;
998 // count is being "destroyed"
999
1000 sfree ((char *)freelist, sizeof (object));
1001
1002 freelist = next;
1003 --free_count;
1004 }
1005}
1006
1007object *
1008object::create ()
1009{
1010 object *op;
1011
1012 if (freelist)
1013 {
1014 freelist_item li = *freelist;
1015 memset (freelist, 0, sizeof (object));
1016
1017 op = new (freelist) object;
1018 op->count = li.count;
1019
1020 freelist = li.next;
1021 --free_count;
1022 }
1023 else
1024 {
1025 void *ni = salloc0<char> (sizeof (object));
1026
1027 op = new(ni) object;
1028
1029 op->count = ++object_count;
1030 }
1031
1032 op->link ();
1033
1034 return op;
1035}
1036
1037void
1038object::do_delete ()
1039{
1040 uint32_t count = this->count;
1041
1042 this->~object ();
1043
1044 freelist_item *li = (freelist_item *)this;
1045 li->next = freelist;
1046 li->count = count;
1047
1048 freelist = li;
1049 ++free_count;
1050}
1051
1052static struct freed_map : maptile
1053{
1054 freed_map ()
1055 : maptile (3, 3)
1056 {
1057 path = "<freed objects map>";
1058 name = "/internal/freed_objects_map";
1059 no_drop = 1;
1060 no_reset = 1;
1061
1062 in_memory = MAP_ACTIVE;
1063 }
1064
1065 ~freed_map ()
1066 {
1067 destroy ();
1068 }
1069} freed_map; // freed objects are moved here to avoid crashes
1070
1071void
1072object::do_destroy ()
1073{
1074 if (flag [FLAG_IS_LINKED])
1075 remove_link ();
1076
1077 if (flag [FLAG_FRIENDLY])
1078 remove_friendly_object (this);
1079
1080 remove ();
1081
1082 attachable::do_destroy ();
1083
1084 deactivate ();
1085 unlink ();
1086
1087 flag [FLAG_FREED] = 1;
922 1088
923 // hack to ensure that freed objects still have a valid map 1089 // hack to ensure that freed objects still have a valid map
924 {
925 static maptile *freed_map; // freed objects are moved here to avoid crashes
926
927 if (!freed_map)
928 {
929 freed_map = new maptile;
930
931 freed_map->name = "/internal/freed_objects_map";
932 freed_map->width = 3;
933 freed_map->height = 3;
934
935 freed_map->allocate ();
936 }
937
938 map = freed_map; 1090 map = &freed_map;
939 x = 1; 1091 x = 1;
940 y = 1; 1092 y = 1;
1093
1094 if (more)
1095 {
1096 more->destroy ();
1097 more = 0;
941 } 1098 }
942 1099
1100 head = 0;
1101
943 // clear those pointers that likely might have circular references to us 1102 // clear those pointers that likely might cause circular references
944 owner = 0; 1103 owner = 0;
945 enemy = 0; 1104 enemy = 0;
946 attacked_by = 0; 1105 attacked_by = 0;
947 1106 current_weapon = 0;
948 // only relevant for players(?), but make sure of it anyways
949 contr = 0;
950
951 /* Remove object from the active list */
952 speed = 0;
953 update_ob_speed (this);
954
955 unlink ();
956
957 mortals.push_back (this);
958} 1107}
959 1108
960/*
961 * sub_weight() recursively (outwards) subtracts a number from the
962 * weight of an object (and what is carried by it's environment(s)).
963 */
964void 1109void
965sub_weight (object *op, signed long weight) 1110object::destroy ()
966{ 1111{
967 while (op != NULL) 1112 if (destroyed ())
968 { 1113 return;
969 if (op->type == CONTAINER)
970 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
971 1114
972 op->carrying -= weight; 1115 if (!is_head () && !head->destroyed ())
973 op = op->env;
974 } 1116 {
1117 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1118 head->destroy ();
1119 return;
1120 }
1121
1122 destroy_inv_fast ();
1123
1124 if (is_head ())
1125 if (sound_destroy)
1126 play_sound (sound_destroy);
1127 else if (flag [FLAG_MONSTER])
1128 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
1129
1130 attachable::destroy ();
975} 1131}
976 1132
977/* op->remove (): 1133/* op->remove ():
978 * This function removes the object op from the linked list of objects 1134 * This function removes the object op from the linked list of objects
979 * which it is currently tied to. When this function is done, the 1135 * which it is currently tied to. When this function is done, the
980 * object will have no environment. If the object previously had an 1136 * object will have no environment. If the object previously had an
981 * environment, the x and y coordinates will be updated to 1137 * environment, the x and y coordinates will be updated to
982 * the previous environment. 1138 * the previous environment.
983 * Beware: This function is called from the editor as well!
984 */ 1139 */
985void 1140void
986object::remove () 1141object::do_remove ()
987{ 1142{
988 object *tmp, *last = 0; 1143 if (flag [FLAG_REMOVED])
989 object *otmp;
990
991 int check_walk_off;
992
993 if (QUERY_FLAG (this, FLAG_REMOVED))
994 return; 1144 return;
995 1145
996 SET_FLAG (this, FLAG_REMOVED); 1146 INVOKE_OBJECT (REMOVE, this);
1147
1148 flag [FLAG_REMOVED] = true;
997 1149
998 if (more) 1150 if (more)
999 more->remove (); 1151 more->remove ();
1000 1152
1001 /* 1153 /*
1002 * In this case, the object to be removed is in someones 1154 * In this case, the object to be removed is in someones
1003 * inventory. 1155 * inventory.
1004 */ 1156 */
1005 if (env) 1157 if (env)
1006 { 1158 {
1007 if (nrof) 1159 flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1008 sub_weight (env, weight * nrof); 1160 if (object *pl = visible_to ())
1009 else 1161 esrv_del_item (pl->contr, count);
1010 sub_weight (env, weight + carrying); 1162 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1011 1163
1012 /* NO_FIX_PLAYER is set when a great many changes are being 1164 adjust_weight (env, total_weight (), 0);
1013 * made to players inventory. If set, avoiding the call
1014 * to save cpu time.
1015 */
1016 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1017 fix_player (otmp);
1018 1165
1019 if (above != NULL) 1166 object *pl = in_player ();
1020 above->below = below;
1021 else
1022 env->inv = below;
1023
1024 if (below != NULL)
1025 below->above = above;
1026 1167
1027 /* we set up values so that it could be inserted into 1168 /* we set up values so that it could be inserted into
1028 * the map, but we don't actually do that - it is up 1169 * the map, but we don't actually do that - it is up
1029 * to the caller to decide what we want to do. 1170 * to the caller to decide what we want to do.
1030 */ 1171 */
1031 x = env->x, y = env->y;
1032 map = env->map; 1172 map = env->map;
1033 above = 0, below = 0; 1173 x = env->x;
1034 env = 0; 1174 y = env->y;
1035 }
1036 else if (map)
1037 {
1038 /* Re did the following section of code - it looks like it had
1039 * lots of logic for things we no longer care about
1040 */
1041 1175
1042 /* link the object above us */ 1176 // make sure cmov optimisation is applicable
1043 if (above) 1177 *(above ? &above->below : &env->inv) = below;
1044 above->below = below; 1178 *(below ? &below->above : &above ) = above; // &above is just a dummy
1045 else
1046 map->at (x, y).top = below; /* we were top, set new top */
1047
1048 /* Relink the object below us, if there is one */
1049 if (below)
1050 below->above = above;
1051 else
1052 {
1053 /* Nothing below, which means we need to relink map object for this space
1054 * use translated coordinates in case some oddness with map tiling is
1055 * evident
1056 */
1057 if (GET_MAP_OB (map, x, y) != this)
1058 {
1059 char *dump = dump_object (this);
1060 LOG (llevError,
1061 "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);
1062 free (dump);
1063 dump = dump_object (GET_MAP_OB (map, x, y));
1064 LOG (llevError, "%s\n", dump);
1065 free (dump);
1066 }
1067
1068 map->at (x, y).bottom = above; /* goes on above it. */
1069 }
1070 1179
1071 above = 0; 1180 above = 0;
1072 below = 0; 1181 below = 0;
1182 env = 0;
1183
1184 if (pl && pl->is_player ())
1185 {
1186 if (expect_false (pl->contr->combat_ob == this))
1187 {
1188 pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1189 pl->contr->combat_ob = 0;
1190 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1191 }
1192
1193 if (expect_false (pl->contr->ranged_ob == this))
1194 {
1195 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1196 pl->contr->ranged_ob = 0;
1197 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1198 }
1199
1200 pl->contr->queue_stats_update ();
1201
1202 if (expect_false (glow_radius) && pl->is_on_map ())
1203 update_all_los (pl->map, pl->x, pl->y);
1204 }
1205 }
1206 else if (map)
1207 {
1208 map->dirty = true;
1209 mapspace &ms = this->ms ();
1210
1211 if (object *pl = ms.player ())
1212 {
1213 if (is_player ())
1214 {
1215 if (!flag [FLAG_WIZPASS])
1216 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1217
1218 // leaving a spot always closes any open container on the ground
1219 if (container && !container->env)
1220 // this causes spurious floorbox updates, but it ensures
1221 // that the CLOSE event is being sent.
1222 close_container ();
1223
1224 --map->players;
1225 map->touch ();
1226 }
1227 else if (pl->container_ () == this)
1228 {
1229 // removing a container should close it
1230 close_container ();
1231 }
1232 else
1233 esrv_del_item (pl->contr, count);
1234 }
1235
1236 /* link the object above us */
1237 // re-link, make sure compiler can easily use cmove
1238 *(above ? &above->below : &ms.top) = below;
1239 *(below ? &below->above : &ms.bot) = above;
1240
1241 above = 0;
1242 below = 0;
1243
1244 ms.invalidate ();
1073 1245
1074 if (map->in_memory == MAP_SAVING) 1246 if (map->in_memory == MAP_SAVING)
1075 return; 1247 return;
1076 1248
1077 check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY); 1249 int check_walk_off = !flag [FLAG_NO_APPLY];
1078 1250
1079 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 1251 if (object *pl = ms.player ())
1080 { 1252 {
1081 /* No point updating the players look faces if he is the object 1253 if (pl->container_ () == this)
1082 * being removed.
1083 */
1084
1085 if (tmp->type == PLAYER && tmp != this)
1086 {
1087 /* If a container that the player is currently using somehow gets 1254 /* If a container that the player is currently using somehow gets
1088 * removed (most likely destroyed), update the player view 1255 * removed (most likely destroyed), update the player view
1089 * appropriately. 1256 * appropriately.
1090 */ 1257 */
1091 if (tmp->container == this) 1258 pl->close_container ();
1092 {
1093 CLEAR_FLAG (this, FLAG_APPLIED);
1094 tmp->container = 0;
1095 }
1096 1259
1260 //TODO: the floorbox prev/next might need updating
1261 //esrv_del_item (pl->contr, count);
1262 //TODO: update floorbox to preserve ordering
1263 if (pl->contr->ns)
1097 tmp->contr->socket->floorbox_update (); 1264 pl->contr->ns->floorbox_update ();
1265 }
1266
1267 if (check_walk_off)
1268 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1269 {
1270 above = tmp->above;
1271
1272 /* No point updating the players look faces if he is the object
1273 * being removed.
1098 } 1274 */
1099 1275
1100 /* See if player moving off should effect something */ 1276 /* See if object moving off should effect something */
1101 if (check_walk_off
1102 && ((move_type & tmp->move_off) 1277 if ((move_type & tmp->move_off)
1103 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1278 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1104 {
1105 move_apply (tmp, this, 0); 1279 move_apply (tmp, this, 0);
1106
1107 if (destroyed ())
1108 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1109 } 1280 }
1110 1281
1111 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1282 if (affects_los ())
1112
1113 if (tmp->above == tmp)
1114 tmp->above = 0;
1115
1116 last = tmp;
1117 }
1118
1119 /* last == NULL of there are no objects on this space */
1120 if (!last)
1121 map->at (x, y).flags_ = P_NEED_UPDATE;
1122 else
1123 update_object (last, UP_OBJ_REMOVE);
1124
1125 if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1126 update_all_los (map, x, y); 1283 update_all_los (map, x, y);
1127 } 1284 }
1128} 1285}
1129 1286
1130/* 1287/*
1139merge_ob (object *op, object *top) 1296merge_ob (object *op, object *top)
1140{ 1297{
1141 if (!op->nrof) 1298 if (!op->nrof)
1142 return 0; 1299 return 0;
1143 1300
1144 if (top == NULL) 1301 if (!top)
1145 for (top = op; top != NULL && top->above != NULL; top = top->above); 1302 for (top = op; top && top->above; top = top->above)
1303 ;
1146 1304
1147 for (; top != NULL; top = top->below) 1305 for (; top; top = top->below)
1148 {
1149 if (top == op)
1150 continue;
1151
1152 if (object::can_merge (op, top)) 1306 if (object::can_merge (op, top))
1153 { 1307 {
1154 top->nrof += op->nrof; 1308 top->nrof += op->nrof;
1155 1309
1156/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1310 if (object *pl = top->visible_to ())
1157 op->weight = 0; /* Don't want any adjustements now */ 1311 esrv_update_item (UPD_NROF, pl, top);
1312
1313 op->weight = 0; // cancel the addition above
1314 op->carrying = 0; // must be 0 already
1315
1158 op->destroy (); 1316 op->destroy ();
1317
1159 return top; 1318 return top;
1160 } 1319 }
1161 }
1162 1320
1163 return 0; 1321 return 0;
1164} 1322}
1165 1323
1324void
1325object::expand_tail ()
1326{
1327 if (more)
1328 return;
1329
1330 object *prev = this;
1331
1332 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1333 {
1334 object *op = at->instance ();
1335
1336 op->name = name;
1337 op->name_pl = name_pl;
1338 op->title = title;
1339
1340 op->head = this;
1341 prev->more = op;
1342
1343 prev = op;
1344 }
1345}
1346
1166/* 1347/*
1167 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1348 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1168 * job preparing multi-part monsters 1349 * job preparing multi-part monsters.
1169 */ 1350 */
1170object * 1351object *
1171insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1352insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1172{ 1353{
1173 object *tmp; 1354 op->remove ();
1174 1355
1175 if (op->head)
1176 op = op->head;
1177
1178 for (tmp = op; tmp; tmp = tmp->more) 1356 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179 { 1357 {
1180 tmp->x = x + tmp->arch->clone.x; 1358 tmp->x = x + tmp->arch->x;
1181 tmp->y = y + tmp->arch->clone.y; 1359 tmp->y = y + tmp->arch->y;
1182 } 1360 }
1183 1361
1184 return insert_ob_in_map (op, m, originator, flag); 1362 return insert_ob_in_map (op, m, originator, flag);
1185} 1363}
1186 1364
1199 * Passing 0 for flag gives proper default values, so flag really only needs 1377 * Passing 0 for flag gives proper default values, so flag really only needs
1200 * to be set if special handling is needed. 1378 * to be set if special handling is needed.
1201 * 1379 *
1202 * Return value: 1380 * Return value:
1203 * new object if 'op' was merged with other object 1381 * new object if 'op' was merged with other object
1204 * NULL if 'op' was destroyed 1382 * NULL if there was an error (destroyed, blocked etc.)
1205 * just 'op' otherwise 1383 * just 'op' otherwise
1206 */ 1384 */
1207
1208object * 1385object *
1209insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1386insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1210{ 1387{
1211 object *tmp, *top, *floor = NULL; 1388 op->remove ();
1212 sint16 x, y;
1213 1389
1214 if (QUERY_FLAG (op, FLAG_FREED)) 1390 if (m == &freed_map)//D TODO: remove soon
1215 { 1391 {//D
1216 LOG (llevError, "Trying to insert freed object!\n"); 1392 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1217 return NULL;
1218 } 1393 }//D
1219
1220 if (m == NULL)
1221 {
1222 char *dump = dump_object (op);
1223 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1224 free (dump);
1225 return op;
1226 }
1227
1228 if (out_of_map (m, op->x, op->y))
1229 {
1230 char *dump = dump_object (op);
1231 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1232#ifdef MANY_CORES
1233 /* Better to catch this here, as otherwise the next use of this object
1234 * is likely to cause a crash. Better to find out where it is getting
1235 * improperly inserted.
1236 */
1237 abort ();
1238#endif
1239 free (dump);
1240 return op;
1241 }
1242
1243 if (!QUERY_FLAG (op, FLAG_REMOVED))
1244 {
1245 char *dump = dump_object (op);
1246 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247 free (dump);
1248 return op;
1249 }
1250
1251 if (op->more != NULL)
1252 {
1253 /* The part may be on a different map. */
1254
1255 object *more = op->more;
1256
1257 /* We really need the caller to normalize coordinates - if
1258 * we set the map, that doesn't work if the location is within
1259 * a map and this is straddling an edge. So only if coordinate
1260 * is clear wrong do we normalize it.
1261 */
1262 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263 more->map = get_map_from_coord (m, &more->x, &more->y);
1264 else if (!more->map)
1265 {
1266 /* For backwards compatibility - when not dealing with tiled maps,
1267 * more->map should always point to the parent.
1268 */
1269 more->map = m;
1270 }
1271
1272 if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273 {
1274 if (!op->head)
1275 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276
1277 return NULL;
1278 }
1279 }
1280
1281 CLEAR_FLAG (op, FLAG_REMOVED);
1282 1394
1283 /* Ideally, the caller figures this out. However, it complicates a lot 1395 /* Ideally, the caller figures this out. However, it complicates a lot
1284 * of areas of callers (eg, anything that uses find_free_spot would now 1396 * of areas of callers (eg, anything that uses find_free_spot would now
1285 * need extra work 1397 * need extra work
1286 */ 1398 */
1287 op->map = get_map_from_coord (m, &op->x, &op->y); 1399 maptile *newmap = m;
1288 x = op->x; 1400 if (!xy_normalise (newmap, op->x, op->y))
1289 y = op->y; 1401 {
1402 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1403 return 0;
1404 }
1405
1406 if (object *more = op->more)
1407 if (!insert_ob_in_map (more, m, originator, flag))
1408 return 0;
1409
1410 op->flag [FLAG_REMOVED] = false;
1411 op->env = 0;
1412 op->map = newmap;
1413
1414 mapspace &ms = op->ms ();
1290 1415
1291 /* this has to be done after we translate the coordinates. 1416 /* this has to be done after we translate the coordinates.
1292 */ 1417 */
1293 if (op->nrof && !(flag & INS_NO_MERGE)) 1418 if (op->nrof && !(flag & INS_NO_MERGE))
1294 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1419 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1295 if (object::can_merge (op, tmp)) 1420 if (object::can_merge (op, tmp))
1296 { 1421 {
1422 // TODO: we actually want to update tmp, not op,
1423 // but some caller surely breaks when we return tmp
1424 // from here :/
1297 op->nrof += tmp->nrof; 1425 op->nrof += tmp->nrof;
1298 tmp->destroy (); 1426 tmp->destroy ();
1299 } 1427 }
1300 1428
1301 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1429 op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1302 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1430 op->clr_flag (FLAG_INV_LOCKED);
1303 1431
1304 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1432 if (!op->flag [FLAG_ALIVE])
1305 CLEAR_FLAG (op, FLAG_NO_STEAL); 1433 op->clr_flag (FLAG_NO_STEAL);
1306 1434
1307 if (flag & INS_BELOW_ORIGINATOR) 1435 if (flag & INS_BELOW_ORIGINATOR)
1308 { 1436 {
1309 if (originator->map != op->map || originator->x != op->x || originator->y != op->y) 1437 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1310 { 1438 {
1311 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1439 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1312 abort (); 1440 abort ();
1313 } 1441 }
1314 1442
1443 if (!originator->is_on_map ())
1444 {
1445 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1446 op->debug_desc (), originator->debug_desc ());
1447 abort ();
1448 }
1449
1315 op->above = originator; 1450 op->above = originator;
1316 op->below = originator->below; 1451 op->below = originator->below;
1317
1318 if (op->below)
1319 op->below->above = op;
1320 else
1321 op->ms ().bottom = op;
1322
1323 /* since *below* originator, no need to update top */
1324 originator->below = op; 1452 originator->below = op;
1453
1454 *(op->below ? &op->below->above : &ms.bot) = op;
1325 } 1455 }
1326 else 1456 else
1327 { 1457 {
1458 object *floor = 0;
1459 object *top = ms.top;
1460
1328 /* If there are other objects, then */ 1461 /* If there are other objects, then */
1329 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1462 if (top)
1330 { 1463 {
1331 object *last = NULL;
1332
1333 /* 1464 /*
1334 * If there are multiple objects on this space, we do some trickier handling. 1465 * If there are multiple objects on this space, we do some trickier handling.
1335 * We've already dealt with merging if appropriate. 1466 * We've already dealt with merging if appropriate.
1336 * Generally, we want to put the new object on top. But if 1467 * Generally, we want to put the new object on top. But if
1337 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1468 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1340 * once we get to them. This reduces the need to traverse over all of 1471 * once we get to them. This reduces the need to traverse over all of
1341 * them when adding another one - this saves quite a bit of cpu time 1472 * them when adding another one - this saves quite a bit of cpu time
1342 * when lots of spells are cast in one area. Currently, it is presumed 1473 * when lots of spells are cast in one area. Currently, it is presumed
1343 * that flying non pickable objects are spell objects. 1474 * that flying non pickable objects are spell objects.
1344 */ 1475 */
1345 1476 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1346 while (top != NULL)
1347 { 1477 {
1348 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1478 if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1349 floor = top; 1479 floor = tmp;
1350 1480
1351 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1481 if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1352 { 1482 {
1353 /* We insert above top, so we want this object below this */ 1483 /* We insert above top, so we want this object below this */
1354 top = top->below; 1484 top = tmp->below;
1355 break; 1485 break;
1356 } 1486 }
1357 1487
1358 last = top;
1359 top = top->above; 1488 top = tmp;
1360 } 1489 }
1361
1362 /* Don't want top to be NULL, so set it to the last valid object */
1363 top = last;
1364 1490
1365 /* We let update_position deal with figuring out what the space 1491 /* We let update_position deal with figuring out what the space
1366 * looks like instead of lots of conditions here. 1492 * looks like instead of lots of conditions here.
1367 * makes things faster, and effectively the same result. 1493 * makes things faster, and effectively the same result.
1368 */ 1494 */
1369 1495
1370 /* Have object 'fall below' other objects that block view. 1496 /* Have object 'fall below' other objects that block view.
1371 * Unless those objects are exits, type 66 1497 * Unless those objects are exits.
1372 * If INS_ON_TOP is used, don't do this processing 1498 * If INS_ON_TOP is used, don't do this processing
1373 * Need to find the object that in fact blocks view, otherwise 1499 * Need to find the object that in fact blocks view, otherwise
1374 * stacking is a bit odd. 1500 * stacking is a bit odd.
1375 */ 1501 */
1376 if (!(flag & INS_ON_TOP) && 1502 if (!(flag & INS_ON_TOP)
1377 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1503 && ms.flags () & P_BLOCKSVIEW
1504 && (op->face && !faces [op->face].visibility))
1378 { 1505 {
1506 object *last;
1507
1379 for (last = top; last != floor; last = last->below) 1508 for (last = top; last != floor; last = last->below)
1380 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1509 if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1381 break; 1510 break;
1511
1382 /* Check to see if we found the object that blocks view, 1512 /* Check to see if we found the object that blocks view,
1383 * and make sure we have a below pointer for it so that 1513 * and make sure we have a below pointer for it so that
1384 * we can get inserted below this one, which requires we 1514 * we can get inserted below this one, which requires we
1385 * set top to the object below us. 1515 * set top to the object below us.
1386 */ 1516 */
1387 if (last && last->below && last != floor) 1517 if (last && last->below && last != floor)
1388 top = last->below; 1518 top = last->below;
1389 } 1519 }
1390 } /* If objects on this space */ 1520 } /* If objects on this space */
1391 1521
1392 if (flag & INS_MAP_LOAD)
1393 top = GET_MAP_TOP (op->map, op->x, op->y);
1394
1395 if (flag & INS_ABOVE_FLOOR_ONLY) 1522 if (flag & INS_ABOVE_FLOOR_ONLY)
1396 top = floor; 1523 top = floor;
1397 1524
1398 /* Top is the object that our object (op) is going to get inserted above. 1525 // insert object above top, or bottom-most if top = 0
1399 */
1400
1401 /* First object on this space */
1402 if (!top) 1526 if (!top)
1403 { 1527 {
1404 op->above = GET_MAP_OB (op->map, op->x, op->y);
1405
1406 if (op->above)
1407 op->above->below = op;
1408
1409 op->below = NULL; 1528 op->below = 0;
1529 op->above = ms.bot;
1410 op->ms ().bottom = op; 1530 ms.bot = op;
1531
1532 *(op->above ? &op->above->below : &ms.top) = op;
1411 } 1533 }
1412 else 1534 else
1413 { /* get inserted into the stack above top */ 1535 {
1414 op->above = top->above; 1536 op->above = top->above;
1415
1416 if (op->above)
1417 op->above->below = op; 1537 top->above = op;
1418 1538
1419 op->below = top; 1539 op->below = top;
1420 top->above = op; 1540 *(op->above ? &op->above->below : &ms.top) = op;
1421 } 1541 }
1542 }
1422 1543
1423 if (op->above == NULL) 1544 if (op->is_player ())
1424 op->ms ().top = op; 1545 {
1425 } /* else not INS_BELOW_ORIGINATOR */
1426
1427 if (op->type == PLAYER)
1428 op->contr->do_los = 1; 1546 op->contr->do_los = 1;
1547 ++op->map->players;
1548 op->map->touch ();
1549 }
1429 1550
1430 /* If we have a floor, we know the player, if any, will be above 1551 op->map->dirty = true;
1431 * it, so save a few ticks and start from there. 1552
1432 */
1433 if (!(flag & INS_MAP_LOAD))
1434 if (object *pl = op->ms ().player ()) 1553 if (object *pl = ms.player ())
1554 //TODO: the floorbox prev/next might need updating
1555 //esrv_send_item (pl, op);
1556 //TODO: update floorbox to preserve ordering
1557 if (pl->contr->ns)
1435 pl->contr->socket->floorbox_update (); 1558 pl->contr->ns->floorbox_update ();
1436 1559
1437 /* If this object glows, it may affect lighting conditions that are 1560 /* If this object glows, it may affect lighting conditions that are
1438 * visible to others on this map. But update_all_los is really 1561 * visible to others on this map. But update_all_los is really
1439 * an inefficient way to do this, as it means los for all players 1562 * an inefficient way to do this, as it means los for all players
1440 * on the map will get recalculated. The players could very well 1563 * on the map will get recalculated. The players could very well
1441 * be far away from this change and not affected in any way - 1564 * be far away from this change and not affected in any way -
1442 * this should get redone to only look for players within range, 1565 * this should get redone to only look for players within range,
1443 * or just updating the P_NEED_UPDATE for spaces within this area 1566 * or just updating the P_UPTODATE for spaces within this area
1444 * of effect may be sufficient. 1567 * of effect may be sufficient.
1445 */ 1568 */
1446 if (MAP_DARKNESS (op->map) && (op->glow_radius != 0)) 1569 if (op->affects_los ())
1570 {
1571 op->ms ().invalidate ();
1447 update_all_los (op->map, op->x, op->y); 1572 update_all_los (op->map, op->x, op->y);
1573 }
1448 1574
1449 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1575 /* updates flags (blocked, alive, no magic, etc) for this map space */
1450 update_object (op, UP_OBJ_INSERT); 1576 update_object (op, UP_OBJ_INSERT);
1577
1578 INVOKE_OBJECT (INSERT, op);
1451 1579
1452 /* Don't know if moving this to the end will break anything. However, 1580 /* Don't know if moving this to the end will break anything. However,
1453 * we want to have floorbox_update called before calling this. 1581 * we want to have floorbox_update called before calling this.
1454 * 1582 *
1455 * check_move_on() must be after this because code called from 1583 * check_move_on() must be after this because code called from
1457 * blocked() and wall() work properly), and these flags are updated by 1585 * blocked() and wall() work properly), and these flags are updated by
1458 * update_object(). 1586 * update_object().
1459 */ 1587 */
1460 1588
1461 /* if this is not the head or flag has been passed, don't check walk on status */ 1589 /* if this is not the head or flag has been passed, don't check walk on status */
1462 if (!(flag & INS_NO_WALK_ON) && !op->head) 1590 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1463 { 1591 {
1464 if (check_move_on (op, originator)) 1592 if (check_move_on (op, originator, flag))
1465 return NULL; 1593 return 0;
1466 1594
1467 /* If we are a multi part object, lets work our way through the check 1595 /* If we are a multi part object, let's work our way through the check
1468 * walk on's. 1596 * walk on's.
1469 */ 1597 */
1470 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1598 for (object *tmp = op->more; tmp; tmp = tmp->more)
1471 if (check_move_on (tmp, originator)) 1599 if (check_move_on (tmp, originator, flag))
1472 return NULL; 1600 return 0;
1473 } 1601 }
1474 1602
1475 return op; 1603 return op;
1476} 1604}
1477 1605
1478/* this function inserts an object in the map, but if it 1606/* this function inserts an object in the map, but if it
1479 * finds an object of its own type, it'll remove that one first. 1607 * finds an object of its own type, it'll remove that one first.
1480 * op is the object to insert it under: supplies x and the map. 1608 * op is the object to insert it under: supplies x and the map.
1481 */ 1609 */
1482void 1610void
1483replace_insert_ob_in_map (const char *arch_string, object *op) 1611replace_insert_ob_in_map (shstr_tmp archname, object *op)
1484{ 1612{
1485 object *tmp, *tmp1;
1486
1487 /* first search for itself and remove any old instances */ 1613 /* first search for itself and remove any old instances */
1488 1614
1489 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1615 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1490 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1616 if (tmp->arch->archname == archname) /* same archetype */
1491 tmp->destroy (); 1617 tmp->destroy ();
1492 1618
1493 tmp1 = arch_to_object (archetype::find (arch_string)); 1619 object *tmp = archetype::find (archname)->instance ();
1494 1620
1495 tmp1->x = op->x; 1621 tmp->x = op->x;
1496 tmp1->y = op->y; 1622 tmp->y = op->y;
1623
1497 insert_ob_in_map (tmp1, op->map, op, 0); 1624 insert_ob_in_map (tmp, op->map, op, 0);
1498} 1625}
1499
1500/*
1501 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1502 * is returned contains nr objects, and the remaining parts contains
1503 * the rest (or is removed and freed if that number is 0).
1504 * On failure, NULL is returned, and the reason put into the
1505 * global static errmsg array.
1506 */
1507 1626
1508object * 1627object *
1509get_split_ob (object *orig_ob, uint32 nr) 1628object::insert_at (object *where, object *originator, int flags)
1510{ 1629{
1511 object *newob; 1630 if (where->env)
1512 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1631 return where->env->insert (this);
1513 1632 else
1514 if (orig_ob->nrof < nr) 1633 return where->map->insert (this, where->x, where->y, originator, flags);
1515 {
1516 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1517 return NULL;
1518 }
1519
1520 newob = object_create_clone (orig_ob);
1521
1522 if ((orig_ob->nrof -= nr) < 1)
1523 orig_ob->destroy (1);
1524 else if (!is_removed)
1525 {
1526 if (orig_ob->env != NULL)
1527 sub_weight (orig_ob->env, orig_ob->weight * nr);
1528 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1529 {
1530 strcpy (errmsg, "Tried to split object whose map is not in memory.");
1531 LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1532 return NULL;
1533 }
1534 }
1535
1536 newob->nrof = nr;
1537
1538 return newob;
1539} 1634}
1540 1635
1636// check whether we can put this into the map, respect max_volume, max_items
1637bool
1638object::can_drop_at (maptile *m, int x, int y, object *originator)
1639{
1640 mapspace &ms = m->at (x, y);
1641
1642 int items = ms.items ();
1643
1644 if (!items // testing !items ensures we can drop at least one item
1645 || (items < m->max_items
1646 && ms.volume () < m->max_volume))
1647 return true;
1648
1649 if (originator && originator->is_player ())
1650 originator->contr->failmsgf (
1651 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1652 query_name ()
1653 );
1654
1655 return false;
1656}
1657
1541/* 1658/*
1542 * decrease_ob_nr(object, number) decreases a specified number from 1659 * decrease(object, number) decreases a specified number from
1543 * the amount of an object. If the amount reaches 0, the object 1660 * the amount of an object. If the amount reaches 0, the object
1544 * is subsequently removed and freed. 1661 * is subsequently removed and freed.
1545 * 1662 *
1546 * Return value: 'op' if something is left, NULL if the amount reached 0 1663 * Return value: 'op' if something is left, NULL if the amount reached 0
1547 */ 1664 */
1665bool
1666object::decrease (sint32 nr)
1667{
1668 if (!nr)
1669 return true;
1548 1670
1671 nr = min (nr, nrof);
1672
1673 if (nrof > nr)
1674 {
1675 sint64 oweight = total_weight ();
1676
1677 nrof -= nr;
1678
1679 if (object *pl = visible_to ())
1680 esrv_update_item (UPD_NROF, pl, this);
1681
1682 adjust_weight (env, oweight, total_weight ());
1683
1684 return true;
1685 }
1686 else
1687 {
1688 destroy ();
1689 return false;
1690 }
1691}
1692
1693/*
1694 * split(ob,nr) splits up ob into two parts. The part which
1695 * is returned contains nr objects, and the remaining parts contains
1696 * the rest (or is removed and returned if that number is 0).
1697 * On failure, NULL is returned.
1698 */
1549object * 1699object *
1550decrease_ob_nr (object *op, uint32 i) 1700object::split (sint32 nr)
1551{ 1701{
1552 object *tmp; 1702 int have = number_of ();
1553 player *pl;
1554 1703
1555 if (i == 0) /* objects with op->nrof require this check */ 1704 if (have < nr)
1556 return op; 1705 return 0;
1557 1706 else if (have == nr)
1558 if (i > op->nrof)
1559 i = op->nrof;
1560
1561 if (QUERY_FLAG (op, FLAG_REMOVED))
1562 op->nrof -= i;
1563 else if (op->env)
1564 { 1707 {
1565 /* is this object in the players inventory, or sub container
1566 * therein?
1567 */
1568 tmp = op->in_player ();
1569 /* nope. Is this a container the player has opened?
1570 * If so, set tmp to that player.
1571 * IMO, searching through all the players will mostly
1572 * likely be quicker than following op->env to the map,
1573 * and then searching the map for a player.
1574 */
1575 if (!tmp)
1576 {
1577 for (pl = first_player; pl; pl = pl->next)
1578 if (pl->ob->container == op->env)
1579 {
1580 tmp = pl->ob;
1581 break;
1582 }
1583 }
1584
1585 if (i < op->nrof)
1586 {
1587 sub_weight (op->env, op->weight * i);
1588 op->nrof -= i;
1589 if (tmp)
1590 esrv_send_item (tmp, op);
1591 }
1592 else
1593 {
1594 op->remove (); 1708 remove ();
1595 op->nrof = 0; 1709 return this;
1596 if (tmp)
1597 esrv_del_item (tmp->contr, op->count);
1598 }
1599 } 1710 }
1600 else 1711 else
1601 { 1712 {
1602 object *above = op->above; 1713 decrease (nr);
1603 1714
1604 if (i < op->nrof) 1715 object *op = deep_clone ();
1605 op->nrof -= i; 1716 op->nrof = nr;
1606 else
1607 {
1608 op->remove ();
1609 op->nrof = 0;
1610 }
1611
1612 /* Since we just removed op, op->above is null */
1613 for (tmp = above; tmp; tmp = tmp->above)
1614 if (tmp->type == PLAYER)
1615 {
1616 if (op->nrof)
1617 esrv_send_item (tmp, op);
1618 else
1619 esrv_del_item (tmp->contr, op->count);
1620 }
1621 }
1622
1623 if (op->nrof)
1624 return op; 1717 return op;
1625 else
1626 {
1627 op->destroy ();
1628 return 0;
1629 }
1630}
1631
1632/*
1633 * add_weight(object, weight) adds the specified weight to an object,
1634 * and also updates how much the environment(s) is/are carrying.
1635 */
1636
1637void
1638add_weight (object *op, signed long weight)
1639{
1640 while (op != NULL)
1641 {
1642 if (op->type == CONTAINER)
1643 weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1644
1645 op->carrying += weight;
1646 op = op->env;
1647 } 1718 }
1648} 1719}
1649 1720
1650object * 1721object *
1651insert_ob_in_ob (object *op, object *where) 1722insert_ob_in_ob (object *op, object *where)
1656 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1727 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1657 free (dump); 1728 free (dump);
1658 return op; 1729 return op;
1659 } 1730 }
1660 1731
1661 if (where->head) 1732 if (where->head_ () != where)
1662 { 1733 {
1663 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1734 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1664 where = where->head; 1735 where = where->head;
1665 } 1736 }
1666 1737
1667 return where->insert (op); 1738 return where->insert (op);
1668} 1739}
1673 * inside the object environment. 1744 * inside the object environment.
1674 * 1745 *
1675 * The function returns now pointer to inserted item, and return value can 1746 * The function returns now pointer to inserted item, and return value can
1676 * be != op, if items are merged. -Tero 1747 * be != op, if items are merged. -Tero
1677 */ 1748 */
1678
1679object * 1749object *
1680object::insert (object *op) 1750object::insert (object *op)
1681{ 1751{
1682 object *tmp, *otmp;
1683
1684 if (!QUERY_FLAG (op, FLAG_REMOVED))
1685 op->remove ();
1686
1687 if (op->more) 1752 if (op->more)
1688 { 1753 {
1689 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count); 1754 LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1690 return op; 1755 return op;
1691 } 1756 }
1692 1757
1693 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1758 op->remove ();
1694 CLEAR_FLAG (op, FLAG_REMOVED); 1759
1760 op->flag [FLAG_OBJ_ORIGINAL] = 0;
1761
1695 if (op->nrof) 1762 if (op->nrof)
1696 {
1697 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1763 for (object *tmp = inv; tmp; tmp = tmp->below)
1698 if (object::can_merge (tmp, op)) 1764 if (object::can_merge (tmp, op))
1699 { 1765 {
1700 /* return the original object and remove inserted object 1766 /* return the original object and remove inserted object
1701 (client needs the original object) */ 1767 (client prefers the original object) */
1768
1769 // carring must be 0 for mergable objects
1770 sint64 oweight = tmp->weight * tmp->nrof;
1771
1702 tmp->nrof += op->nrof; 1772 tmp->nrof += op->nrof;
1703 /* Weight handling gets pretty funky. Since we are adding to 1773
1704 * tmp->nrof, we need to increase the weight. 1774 if (object *pl = tmp->visible_to ())
1705 */ 1775 esrv_update_item (UPD_NROF, pl, tmp);
1776
1706 add_weight (this, op->weight * op->nrof); 1777 adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1707 SET_FLAG (op, FLAG_REMOVED); 1778
1708 op->destroy (); /* free the inserted object */ 1779 op->destroy ();
1709 op = tmp; 1780 op = tmp;
1710 op->remove (); /* and fix old object's links */ 1781 goto inserted;
1711 CLEAR_FLAG (op, FLAG_REMOVED);
1712 break;
1713 } 1782 }
1714 1783
1715 /* I assume combined objects have no inventory 1784 op->owner = 0; // it's his/hers now. period.
1716 * We add the weight - this object could have just been removed
1717 * (if it was possible to merge). calling remove_ob will subtract
1718 * the weight, so we need to add it in again, since we actually do
1719 * the linking below
1720 */
1721 add_weight (this, op->weight * op->nrof);
1722 }
1723 else
1724 add_weight (this, (op->weight + op->carrying));
1725
1726 otmp = this->in_player ();
1727 if (otmp && otmp->contr)
1728 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729 fix_player (otmp);
1730
1731 op->map = 0; 1785 op->map = 0;
1732 op->env = this; 1786 op->x = 0;
1787 op->y = 0;
1788
1733 op->above = 0; 1789 op->above = 0;
1734 op->below = 0; 1790 op->below = inv;
1735 op->x = 0, op->y = 0; 1791 op->env = this;
1736 1792
1793 if (inv)
1794 inv->above = op;
1795
1796 inv = op;
1797
1798 op->flag [FLAG_REMOVED] = 0;
1799
1800 if (object *pl = op->visible_to ())
1801 esrv_send_item (pl, op);
1802
1803 adjust_weight (this, 0, op->total_weight ());
1804
1805inserted:
1737 /* reset the light list and los of the players on the map */ 1806 /* reset the light list and los of the players on the map */
1738 if ((op->glow_radius != 0) && map) 1807 if (op->glow_radius && is_on_map ())
1739 { 1808 {
1740#ifdef DEBUG_LIGHTS 1809 update_stats ();
1741 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742#endif /* DEBUG_LIGHTS */
1743 if (MAP_DARKNESS (map))
1744 update_all_los (map, x, y); 1810 update_all_los (map, x, y);
1745 }
1746
1747 /* Client has no idea of ordering so lets not bother ordering it here.
1748 * It sure simplifies this function...
1749 */
1750 if (!inv)
1751 inv = op;
1752 else
1753 { 1811 }
1754 op->below = inv; 1812 else if (is_player ())
1755 op->below->above = op; 1813 // if this is a player's inventory, update stats
1756 inv = op; 1814 contr->queue_stats_update ();
1757 } 1815
1816 INVOKE_OBJECT (INSERT, this);
1758 1817
1759 return op; 1818 return op;
1760} 1819}
1761 1820
1762/* 1821/*
1777 * 1836 *
1778 * MSW 2001-07-08: Check all objects on space, not just those below 1837 * MSW 2001-07-08: Check all objects on space, not just those below
1779 * object being inserted. insert_ob_in_map may not put new objects 1838 * object being inserted. insert_ob_in_map may not put new objects
1780 * on top. 1839 * on top.
1781 */ 1840 */
1782
1783int 1841int
1784check_move_on (object *op, object *originator) 1842check_move_on (object *op, object *originator, int flags)
1785{ 1843{
1844 if (op->flag [FLAG_NO_APPLY])
1845 return 0;
1846
1786 object *tmp; 1847 object *tmp;
1787 maptile *m = op->map; 1848 maptile *m = op->map;
1788 int x = op->x, y = op->y; 1849 int x = op->x, y = op->y;
1789 1850
1790 MoveType move_on, move_slow, move_block; 1851 mapspace &ms = m->at (x, y);
1791 1852
1792 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1853 ms.update ();
1793 return 0;
1794 1854
1795 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1855 MoveType move_on = ms.move_on;
1796 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1856 MoveType move_slow = ms.move_slow;
1797 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1857 MoveType move_block = ms.move_block;
1798 1858
1799 /* if nothing on this space will slow op down or be applied, 1859 /* if nothing on this space will slow op down or be applied,
1800 * no need to do checking below. have to make sure move_type 1860 * no need to do checking below. have to make sure move_type
1801 * is set, as lots of objects don't have it set - we treat that 1861 * is set, as lots of objects don't have it set - we treat that
1802 * as walking. 1862 * as walking.
1813 return 0; 1873 return 0;
1814 1874
1815 /* The objects have to be checked from top to bottom. 1875 /* The objects have to be checked from top to bottom.
1816 * Hence, we first go to the top: 1876 * Hence, we first go to the top:
1817 */ 1877 */
1818 1878 for (object *next, *tmp = ms.top; tmp; tmp = next)
1819 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)
1820 {
1821 /* Trim the search when we find the first other spell effect
1822 * this helps performance so that if a space has 50 spell objects,
1823 * we don't need to check all of them.
1824 */
1825 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1826 break;
1827 } 1879 {
1880 next = tmp->below;
1828 1881
1829 for (; tmp; tmp = tmp->below)
1830 {
1831 if (tmp == op) 1882 if (tmp == op)
1832 continue; /* Can't apply yourself */ 1883 continue; /* Can't apply yourself */
1833 1884
1834 /* Check to see if one of the movement types should be slowed down. 1885 /* Check to see if one of the movement types should be slowed down.
1835 * Second check makes sure that the movement types not being slowed 1886 * Second check makes sure that the movement types not being slowed
1836 * (~slow_move) is not blocked on this space - just because the 1887 * (~slow_move) is not blocked on this space - just because the
1837 * space doesn't slow down swimming (for example), if you can't actually 1888 * space doesn't slow down swimming (for example), if you can't actually
1838 * swim on that space, can't use it to avoid the penalty. 1889 * swim on that space, can't use it to avoid the penalty.
1839 */ 1890 */
1840 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1891 if (!op->flag [FLAG_WIZPASS])
1841 { 1892 {
1842 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1893 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1843 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1894 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1844 { 1895 {
1845
1846 float
1847 diff = tmp->move_slow_penalty * FABS (op->speed); 1896 float diff = tmp->move_slow_penalty * fabs (op->speed);
1848 1897
1849 if (op->type == PLAYER) 1898 if (op->is_player ())
1850 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1899 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1851 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1900 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1852 diff /= 4.0; 1901 diff /= 4.0;
1853 1902
1854 op->speed_left -= diff; 1903 op->speed_left -= diff;
1855 } 1904 }
1856 } 1905 }
1857 1906
1858 /* Basically same logic as above, except now for actual apply. */ 1907 /* Basically same logic as above, except now for actual apply. */
1859 if ((!op->move_type && tmp->move_on & MOVE_WALK) || 1908 if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1860 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0)) 1909 ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1861 { 1910 {
1911 if ((flags & INS_NO_AUTO_EXIT)
1912 && (tmp->type == EXIT || tmp->type == TELEPORTER
1913 || tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
1914 continue;
1915
1862 move_apply (tmp, op, originator); 1916 move_apply (tmp, op, originator);
1863 1917
1864 if (op->destroyed ()) 1918 if (op->destroyed ())
1865 return 1; 1919 return 1;
1866 1920
1879/* 1933/*
1880 * present_arch(arch, map, x, y) searches for any objects with 1934 * present_arch(arch, map, x, y) searches for any objects with
1881 * a matching archetype at the given map and coordinates. 1935 * a matching archetype at the given map and coordinates.
1882 * The first matching object is returned, or NULL if none. 1936 * The first matching object is returned, or NULL if none.
1883 */ 1937 */
1884
1885object * 1938object *
1886present_arch (const archetype *at, maptile *m, int x, int y) 1939present_arch (const archetype *at, maptile *m, int x, int y)
1887{ 1940{
1888 object *
1889 tmp;
1890
1891 if (m == NULL || out_of_map (m, x, y)) 1941 if (!m || out_of_map (m, x, y))
1892 { 1942 {
1893 LOG (llevError, "Present_arch called outside map.\n"); 1943 LOG (llevError, "Present_arch called outside map.\n");
1894 return NULL; 1944 return NULL;
1895 } 1945 }
1896 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1946
1897 if (tmp->arch == at) 1947 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1948 if (tmp->arch->archname == at->archname)
1898 return tmp; 1949 return tmp;
1950
1899 return NULL; 1951 return NULL;
1900} 1952}
1901 1953
1902/* 1954/*
1903 * present(type, map, x, y) searches for any objects with 1955 * present(type, map, x, y) searches for any objects with
1904 * a matching type variable at the given map and coordinates. 1956 * a matching type variable at the given map and coordinates.
1905 * The first matching object is returned, or NULL if none. 1957 * The first matching object is returned, or NULL if none.
1906 */ 1958 */
1907
1908object * 1959object *
1909present (unsigned char type, maptile *m, int x, int y) 1960present (unsigned char type, maptile *m, int x, int y)
1910{ 1961{
1911 object *
1912 tmp;
1913
1914 if (out_of_map (m, x, y)) 1962 if (out_of_map (m, x, y))
1915 { 1963 {
1916 LOG (llevError, "Present called outside map.\n"); 1964 LOG (llevError, "Present called outside map.\n");
1917 return NULL; 1965 return NULL;
1918 } 1966 }
1919 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1967
1968 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1920 if (tmp->type == type) 1969 if (tmp->type == type)
1921 return tmp; 1970 return tmp;
1971
1922 return NULL; 1972 return NULL;
1923} 1973}
1924 1974
1925/* 1975/*
1926 * present_in_ob(type, object) searches for any objects with 1976 * present_in_ob(type, object) searches for any objects with
1927 * a matching type variable in the inventory of the given object. 1977 * a matching type variable in the inventory of the given object.
1928 * The first matching object is returned, or NULL if none. 1978 * The first matching object is returned, or NULL if none.
1929 */ 1979 */
1930
1931object * 1980object *
1932present_in_ob (unsigned char type, const object *op) 1981present_in_ob (unsigned char type, const object *op)
1933{ 1982{
1934 object *
1935 tmp;
1936
1937 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1983 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938 if (tmp->type == type) 1984 if (tmp->type == type)
1939 return tmp; 1985 return tmp;
1986
1940 return NULL; 1987 return NULL;
1941} 1988}
1942 1989
1943/* 1990/*
1944 * present_in_ob (type, str, object) searches for any objects with 1991 * present_in_ob (type, str, object) searches for any objects with
1952 * str is the string to match against. Note that we match against 1999 * str is the string to match against. Note that we match against
1953 * the object name, not the archetype name. this is so that the 2000 * the object name, not the archetype name. this is so that the
1954 * spell code can use one object type (force), but change it's name 2001 * spell code can use one object type (force), but change it's name
1955 * to be unique. 2002 * to be unique.
1956 */ 2003 */
1957
1958object * 2004object *
1959present_in_ob_by_name (int type, const char *str, const object *op) 2005present_in_ob_by_name (int type, const char *str, const object *op)
1960{ 2006{
1961 object *
1962 tmp;
1963
1964 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2007 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 {
1966 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name))) 2008 if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967 return tmp; 2009 return tmp;
1968 } 2010
1969 return NULL; 2011 return 0;
1970} 2012}
1971 2013
1972/* 2014/*
1973 * present_arch_in_ob(archetype, object) searches for any objects with 2015 * present_arch_in_ob(archetype, object) searches for any objects with
1974 * a matching archetype in the inventory of the given object. 2016 * a matching archetype in the inventory of the given object.
1975 * The first matching object is returned, or NULL if none. 2017 * The first matching object is returned, or NULL if none.
1976 */ 2018 */
1977
1978object * 2019object *
1979present_arch_in_ob (const archetype *at, const object *op) 2020present_arch_in_ob (const archetype *at, const object *op)
1980{ 2021{
1981 object *
1982 tmp;
1983
1984 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2022 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1985 if (tmp->arch == at) 2023 if (tmp->arch->archname == at->archname)
1986 return tmp; 2024 return tmp;
2025
1987 return NULL; 2026 return NULL;
1988} 2027}
1989 2028
1990/* 2029/*
1991 * activate recursively a flag on an object inventory 2030 * activate recursively a flag on an object inventory
1992 */ 2031 */
1993void 2032void
1994flag_inv (object *op, int flag) 2033flag_inv (object *op, int flag)
1995{ 2034{
1996 object *
1997 tmp;
1998
1999 if (op->inv)
2000 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2035 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2001 { 2036 {
2002 SET_FLAG (tmp, flag); 2037 tmp->set_flag (flag);
2003 flag_inv (tmp, flag); 2038 flag_inv (tmp, flag);
2004 } 2039 }
2005} /* 2040}
2041
2042/*
2006 * desactivate recursively a flag on an object inventory 2043 * deactivate recursively a flag on an object inventory
2007 */ 2044 */
2008void 2045void
2009unflag_inv (object *op, int flag) 2046unflag_inv (object *op, int flag)
2010{ 2047{
2011 object *
2012 tmp;
2013
2014 if (op->inv)
2015 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2048 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2016 { 2049 {
2017 CLEAR_FLAG (tmp, flag); 2050 tmp->clr_flag (flag);
2018 unflag_inv (tmp, flag); 2051 unflag_inv (tmp, flag);
2019 } 2052 }
2020}
2021
2022/*
2023 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024 * all it's inventory (recursively).
2025 * If checksums are used, a player will get set_cheat called for
2026 * him/her-self and all object carried by a call to this function.
2027 */
2028
2029void
2030set_cheat (object *op)
2031{
2032 SET_FLAG (op, FLAG_WAS_WIZ);
2033 flag_inv (op, FLAG_WAS_WIZ);
2034} 2053}
2035 2054
2036/* 2055/*
2037 * find_free_spot(object, map, x, y, start, stop) will search for 2056 * find_free_spot(object, map, x, y, start, stop) will search for
2038 * a spot at the given map and coordinates which will be able to contain 2057 * a spot at the given map and coordinates which will be able to contain
2040 * to search (see the freearr_x/y[] definition). 2059 * to search (see the freearr_x/y[] definition).
2041 * It returns a random choice among the alternatives found. 2060 * It returns a random choice among the alternatives found.
2042 * start and stop are where to start relative to the free_arr array (1,9 2061 * start and stop are where to start relative to the free_arr array (1,9
2043 * does all 4 immediate directions). This returns the index into the 2062 * does all 4 immediate directions). This returns the index into the
2044 * array of the free spot, -1 if no spot available (dir 0 = x,y) 2063 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2045 * Note - this only checks to see if there is space for the head of the
2046 * object - if it is a multispace object, this should be called for all
2047 * pieces.
2048 * Note2: This function does correctly handle tiled maps, but does not 2064 * Note: This function does correctly handle tiled maps, but does not
2049 * inform the caller. However, insert_ob_in_map will update as 2065 * inform the caller. However, insert_ob_in_map will update as
2050 * necessary, so the caller shouldn't need to do any special work. 2066 * necessary, so the caller shouldn't need to do any special work.
2051 * Note - updated to take an object instead of archetype - this is necessary 2067 * Note - updated to take an object instead of archetype - this is necessary
2052 * because arch_blocked (now ob_blocked) needs to know the movement type 2068 * because arch_blocked (now ob_blocked) needs to know the movement type
2053 * to know if the space in question will block the object. We can't use 2069 * to know if the space in question will block the object. We can't use
2054 * the archetype because that isn't correct if the monster has been 2070 * the archetype because that isn't correct if the monster has been
2055 * customized, changed states, etc. 2071 * customized, changed states, etc.
2056 */ 2072 */
2057
2058int 2073int
2059find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2074find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060{ 2075{
2061 int
2062 i,
2063 index = 0, flag;
2064 static int
2065 altern[SIZEOFFREE]; 2076 int altern[SIZEOFFREE];
2077 int index = 0, flag;
2066 2078
2067 for (i = start; i < stop; i++) 2079 for (int i = start; i < stop; i++)
2068 { 2080 {
2069 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2081 mapxy pos (m, x, y); pos.move (i);
2070 if (!flag) 2082
2083 if (!pos.normalise ())
2084 continue;
2085
2086 mapspace &ms = *pos;
2087
2088 if (ms.flags () & P_IS_ALIVE)
2089 continue;
2090
2091 /* However, often
2092 * ob doesn't have any move type (when used to place exits)
2093 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2094 */
2095 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2096 {
2071 altern[index++] = i; 2097 altern [index++] = i;
2098 continue;
2099 }
2072 2100
2073 /* Basically, if we find a wall on a space, we cut down the search size. 2101 /* Basically, if we find a wall on a space, we cut down the search size.
2074 * In this way, we won't return spaces that are on another side of a wall. 2102 * In this way, we won't return spaces that are on another side of a wall.
2075 * This mostly work, but it cuts down the search size in all directions - 2103 * This mostly work, but it cuts down the search size in all directions -
2076 * if the space being examined only has a wall to the north and empty 2104 * if the space being examined only has a wall to the north and empty
2077 * spaces in all the other directions, this will reduce the search space 2105 * spaces in all the other directions, this will reduce the search space
2078 * to only the spaces immediately surrounding the target area, and 2106 * to only the spaces immediately surrounding the target area, and
2079 * won't look 2 spaces south of the target space. 2107 * won't look 2 spaces south of the target space.
2080 */ 2108 */
2081 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2109 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2110 {
2082 stop = maxfree[i]; 2111 stop = maxfree[i];
2112 continue;
2113 }
2114
2115 /* Note it is intentional that we check ob - the movement type of the
2116 * head of the object should correspond for the entire object.
2117 */
2118 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2119 continue;
2120
2121 if (ob->blocked (pos.m, pos.x, pos.y))
2122 continue;
2123
2124 altern [index++] = i;
2083 } 2125 }
2084 2126
2085 if (!index) 2127 if (!index)
2086 return -1; 2128 return -1;
2087 2129
2088 return altern[RANDOM () % index]; 2130 return altern [rndm (index)];
2089} 2131}
2090 2132
2091/* 2133/*
2092 * find_first_free_spot(archetype, maptile, x, y) works like 2134 * find_first_free_spot(archetype, maptile, x, y) works like
2093 * find_free_spot(), but it will search max number of squares. 2135 * find_free_spot(), but it will search max number of squares.
2094 * But it will return the first available spot, not a random choice. 2136 * But it will return the first available spot, not a random choice.
2095 * Changed 0.93.2: Have it return -1 if there is no free spot available. 2137 * Changed 0.93.2: Have it return -1 if there is no free spot available.
2096 */ 2138 */
2097
2098int 2139int
2099find_first_free_spot (const object *ob, maptile *m, int x, int y) 2140find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100{ 2141{
2101 int
2102 i;
2103
2104 for (i = 0; i < SIZEOFFREE; i++) 2142 for (int i = 0; i < SIZEOFFREE; i++)
2105 {
2106 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2143 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2107 return i; 2144 return i;
2108 } 2145
2109 return -1; 2146 return -1;
2110} 2147}
2111 2148
2112/* 2149/*
2113 * The function permute(arr, begin, end) randomly reorders the array 2150 * The function permute(arr, begin, end) randomly reorders the array
2114 * arr[begin..end-1]. 2151 * arr[begin..end-1].
2152 * now uses a fisher-yates shuffle, old permute was broken
2115 */ 2153 */
2116static void 2154static void
2117permute (int *arr, int begin, int end) 2155permute (int *arr, int begin, int end)
2118{ 2156{
2119 int 2157 arr += begin;
2120 i,
2121 j,
2122 tmp,
2123 len;
2124
2125 len = end - begin; 2158 end -= begin;
2126 for (i = begin; i < end; i++)
2127 {
2128 j = begin + RANDOM () % len;
2129 2159
2130 tmp = arr[i]; 2160 while (--end)
2131 arr[i] = arr[j]; 2161 swap (arr [end], arr [rndm (end + 1)]);
2132 arr[j] = tmp;
2133 }
2134} 2162}
2135 2163
2136/* new function to make monster searching more efficient, and effective! 2164/* new function to make monster searching more efficient, and effective!
2137 * This basically returns a randomized array (in the passed pointer) of 2165 * This basically returns a randomized array (in the passed pointer) of
2138 * the spaces to find monsters. In this way, it won't always look for 2166 * the spaces to find monsters. In this way, it won't always look for
2141 * the 3x3 area will be searched, just not in a predictable order. 2169 * the 3x3 area will be searched, just not in a predictable order.
2142 */ 2170 */
2143void 2171void
2144get_search_arr (int *search_arr) 2172get_search_arr (int *search_arr)
2145{ 2173{
2146 int 2174 int i;
2147 i;
2148 2175
2149 for (i = 0; i < SIZEOFFREE; i++) 2176 for (i = 0; i < SIZEOFFREE; i++)
2150 {
2151 search_arr[i] = i; 2177 search_arr[i] = i;
2152 }
2153 2178
2154 permute (search_arr, 1, SIZEOFFREE1 + 1); 2179 permute (search_arr, 1, SIZEOFFREE1 + 1);
2155 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1); 2180 permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE); 2181 permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157} 2182}
2166 * Perhaps incorrectly, but I'm making the assumption that exclude 2191 * Perhaps incorrectly, but I'm making the assumption that exclude
2167 * is actually want is going to try and move there. We need this info 2192 * is actually want is going to try and move there. We need this info
2168 * because we have to know what movement the thing looking to move 2193 * because we have to know what movement the thing looking to move
2169 * there is capable of. 2194 * there is capable of.
2170 */ 2195 */
2171
2172int 2196int
2173find_dir (maptile *m, int x, int y, object *exclude) 2197find_dir (maptile *m, int x, int y, object *exclude)
2174{ 2198{
2175 int
2176 i,
2177 max = SIZEOFFREE, mflags; 2199 int max = SIZEOFFREE, mflags;
2178
2179 sint16 nx, ny;
2180 object *
2181 tmp;
2182 maptile *
2183 mp;
2184
2185 MoveType blocked, move_type; 2200 MoveType move_type;
2186 2201
2187 if (exclude && exclude->head) 2202 if (exclude && exclude->head_ () != exclude)
2188 { 2203 {
2189 exclude = exclude->head; 2204 exclude = exclude->head;
2190 move_type = exclude->move_type; 2205 move_type = exclude->move_type;
2191 } 2206 }
2192 else 2207 else
2193 { 2208 {
2194 /* If we don't have anything, presume it can use all movement types. */ 2209 /* If we don't have anything, presume it can use all movement types. */
2195 move_type = MOVE_ALL; 2210 move_type = MOVE_ALL;
2196 } 2211 }
2197 2212
2198 for (i = 1; i < max; i++) 2213 for (int i = 1; i < max; i++)
2199 { 2214 {
2200 mp = m; 2215 mapxy pos (m, x, y);
2201 nx = x + freearr_x[i]; 2216 pos.move (i);
2202 ny = y + freearr_y[i];
2203 2217
2204 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2218 if (!pos.normalise ())
2205
2206 if (mflags & P_OUT_OF_MAP)
2207 max = maxfree[i]; 2219 max = maxfree[i];
2208 else 2220 else
2209 { 2221 {
2210 blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny); 2222 mapspace &ms = *pos;
2211 2223
2212 if ((move_type & blocked) == move_type) 2224 if ((move_type & ms.move_block) == move_type)
2213 max = maxfree[i]; 2225 max = maxfree [i];
2214 else if (mflags & P_IS_ALIVE) 2226 else if (ms.flags () & P_IS_ALIVE)
2215 { 2227 {
2216 for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above) 2228 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2217 if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2229 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2218 break; 2230 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2219
2220 if (tmp)
2221 return freedir[i]; 2231 return freedir [i];
2222 } 2232 }
2223 } 2233 }
2224 } 2234 }
2225 2235
2226 return 0; 2236 return 0;
2228 2238
2229/* 2239/*
2230 * distance(object 1, object 2) will return the square of the 2240 * distance(object 1, object 2) will return the square of the
2231 * distance between the two given objects. 2241 * distance between the two given objects.
2232 */ 2242 */
2233
2234int 2243int
2235distance (const object *ob1, const object *ob2) 2244distance (const object *ob1, const object *ob2)
2236{ 2245{
2237 int i;
2238
2239 i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); 2246 return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240 return i;
2241} 2247}
2242 2248
2243/* 2249/*
2244 * find_dir_2(delta-x,delta-y) will return a direction in which 2250 * find_dir_2(delta-x,delta-y) will return a direction value
2245 * an object which has subtracted the x and y coordinates of another 2251 * for running into direct [dx, dy].
2246 * object, needs to travel toward it. 2252 * (the opposite of crossfire's find_dir_2!)
2247 */ 2253 */
2248
2249int 2254int
2250find_dir_2 (int x, int y) 2255find_dir_2 (int x, int y)
2251{ 2256{
2257#if 1 // new algorithm
2258 // this works by putting x, y into 16 sectors, which
2259 // are not equal sized, but are a better approximation
2260 // then the old algorithm, and then using a mapping
2261 // table to map it into a direction value.
2262 // basically, it maps these comparisons to each bit
2263 // bit #3: x < 0
2264 // bit #2: y < 0
2265 // bit #1: x > y
2266 // bit #0: x > 2y
2267
2268 static const uint8 dir[16] = {
2269 4, 5, 4, 3,
2270 2, 1, 2, 3,
2271 6, 5, 6, 7,
2272 8, 1, 8, 7,
2273 };
2274 int sector = 0;
2275
2276 // this is a bit ugly, but more likely to result in branchless code
2277 sector |= x < 0 ? 8 : 0;
2278 x = x < 0 ? -x : x; // abs
2279
2280 sector |= y < 0 ? 4 : 0;
2281 y = y < 0 ? -y : y; // abs
2282
2283 if (x > y)
2284 {
2285 sector |= 2;
2286
2287 if (x > y * 2)
2288 sector |= 1;
2289 }
2290 else
2291 {
2292 if (y > x * 2)
2293 sector |= 1;
2294 else if (!y)
2295 return 0; // x == 0 here
2296 }
2297
2298 return dir [sector];
2299#else // old algorithm
2252 int q; 2300 int q;
2253 2301
2254 if (y) 2302 if (y)
2255 q = x * 100 / y; 2303 q = 128 * x / y;
2256 else if (x) 2304 else if (x)
2257 q = -300 * x; 2305 q = -512 * x; // to make it > 309
2258 else 2306 else
2259 return 0; 2307 return 0;
2260 2308
2261 if (y > 0) 2309 if (y > 0)
2262 { 2310 {
2263 if (q < -242) 2311 if (q < -309) return 7;
2312 if (q < -52) return 6;
2313 if (q < 52) return 5;
2314 if (q < 309) return 4;
2315
2264 return 3; 2316 return 3;
2265 if (q < -41) 2317 }
2266 return 2; 2318 else
2267 if (q < 41) 2319 {
2268 return 1; 2320 if (q < -309) return 3;
2269 if (q < 242) 2321 if (q < -52) return 2;
2270 return 8; 2322 if (q < 52) return 1;
2323 if (q < 309) return 8;
2324
2271 return 7; 2325 return 7;
2272 } 2326 }
2273 2327#endif
2274 if (q < -242)
2275 return 7;
2276 if (q < -41)
2277 return 6;
2278 if (q < 41)
2279 return 5;
2280 if (q < 242)
2281 return 4;
2282
2283 return 3;
2284}
2285
2286/*
2287 * absdir(int): Returns a number between 1 and 8, which represent
2288 * the "absolute" direction of a number (it actually takes care of
2289 * "overflow" in previous calculations of a direction).
2290 */
2291
2292int
2293absdir (int d)
2294{
2295 while (d < 1)
2296 d += 8;
2297 while (d > 8)
2298 d -= 8;
2299 return d;
2300} 2328}
2301 2329
2302/* 2330/*
2303 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2331 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2304 * between two directions (which are expected to be absolute (see absdir()) 2332 * between two directions (which are expected to be absolute (see absdir())
2305 */ 2333 */
2306
2307int 2334int
2308dirdiff (int dir1, int dir2) 2335dirdiff (int dir1, int dir2)
2309{ 2336{
2310 int
2311 d;
2312
2313 d = abs (dir1 - dir2); 2337 int d = abs (dir1 - dir2);
2314 if (d > 4) 2338
2315 d = 8 - d; 2339 return d > 4 ? 8 - d : d;
2316 return d;
2317} 2340}
2318 2341
2319/* peterm: 2342/* peterm:
2320 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. 2343 * do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2321 * Basically, this is a table of directions, and what directions 2344 * Basically, this is a table of directions, and what directions
2323 * This basically means that if direction is 15, then it could either go 2346 * This basically means that if direction is 15, then it could either go
2324 * direction 4, 14, or 16 to get back to where we are. 2347 * direction 4, 14, or 16 to get back to where we are.
2325 * Moved from spell_util.c to object.c with the other related direction 2348 * Moved from spell_util.c to object.c with the other related direction
2326 * functions. 2349 * functions.
2327 */ 2350 */
2328
2329int
2330 reduction_dir[SIZEOFFREE][3] = { 2351static const int reduction_dir[SIZEOFFREE][3] = {
2331 {0, 0, 0}, /* 0 */ 2352 {0, 0, 0}, /* 0 */
2332 {0, 0, 0}, /* 1 */ 2353 {0, 0, 0}, /* 1 */
2333 {0, 0, 0}, /* 2 */ 2354 {0, 0, 0}, /* 2 */
2334 {0, 0, 0}, /* 3 */ 2355 {0, 0, 0}, /* 3 */
2335 {0, 0, 0}, /* 4 */ 2356 {0, 0, 0}, /* 4 */
2426 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2447 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2427 * core dumps if they do. 2448 * core dumps if they do.
2428 * 2449 *
2429 * Add a check so we can't pick up invisible objects (0.93.8) 2450 * Add a check so we can't pick up invisible objects (0.93.8)
2430 */ 2451 */
2431
2432int 2452int
2433can_pick (const object *who, const object *item) 2453can_pick (const object *who, const object *item)
2434{ 2454{
2435 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2455 return /*who->flag [FLAG_WIZ]|| */
2436 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2456 (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2437 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2457 !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2438} 2458}
2439 2459
2440/* 2460/*
2441 * create clone from object to another 2461 * create clone from object to another
2442 */ 2462 */
2443object * 2463object *
2444object_create_clone (object *asrc) 2464object::deep_clone ()
2445{ 2465{
2446 object *dst = 0, *tmp, *src, *part, *prev, *item; 2466 assert (("deep_clone called on non-head object", is_head ()));
2447 2467
2448 if (!asrc) 2468 object *dst = clone ();
2449 return 0;
2450 2469
2451 src = asrc; 2470 object *prev = dst;
2452 if (src->head)
2453 src = src->head;
2454
2455 prev = 0;
2456 for (part = src; part; part = part->more) 2471 for (object *part = this->more; part; part = part->more)
2457 { 2472 {
2458 tmp = part->clone (); 2473 object *tmp = part->clone ();
2459 tmp->x -= src->x;
2460 tmp->y -= src->y;
2461
2462 if (!part->head)
2463 {
2464 dst = tmp;
2465 tmp->head = 0;
2466 }
2467 else
2468 tmp->head = dst; 2474 tmp->head = dst;
2469
2470 tmp->more = 0;
2471
2472 if (prev)
2473 prev->more = tmp; 2475 prev->more = tmp;
2474
2475 prev = tmp; 2476 prev = tmp;
2476 } 2477 }
2477 2478
2478 for (item = src->inv; item; item = item->below) 2479 for (object *item = inv; item; item = item->below)
2479 insert_ob_in_ob (object_create_clone (item), dst); 2480 insert_ob_in_ob (item->deep_clone (), dst);
2480 2481
2481 return dst; 2482 return dst;
2482}
2483
2484/* GROS - Creates an object using a string representing its content. */
2485/* Basically, we save the content of the string to a temp file, then call */
2486/* load_object on it. I admit it is a highly inefficient way to make things, */
2487/* but it was simple to make and allows reusing the load_object function. */
2488/* Remember not to use load_object_str in a time-critical situation. */
2489/* Also remember that multiparts objects are not supported for now. */
2490
2491object *
2492load_object_str (const char *obstr)
2493{
2494 object *op;
2495 char filename[MAX_BUF];
2496
2497 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2498
2499 FILE *tempfile = fopen (filename, "w");
2500
2501 if (tempfile == NULL)
2502 {
2503 LOG (llevError, "Error - Unable to access load object temp file\n");
2504 return NULL;
2505 }
2506
2507 fprintf (tempfile, obstr);
2508 fclose (tempfile);
2509
2510 op = object::create ();
2511
2512 object_thawer thawer (filename);
2513
2514 if (thawer)
2515 load_object (thawer, op, 0);
2516
2517 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2518 CLEAR_FLAG (op, FLAG_REMOVED);
2519
2520 return op;
2521} 2483}
2522 2484
2523/* This returns the first object in who's inventory that 2485/* This returns the first object in who's inventory that
2524 * has the same type and subtype match. 2486 * has the same type and subtype match.
2525 * returns NULL if no match. 2487 * returns NULL if no match.
2526 */ 2488 */
2527object * 2489object *
2528find_obj_by_type_subtype (const object *who, int type, int subtype) 2490find_obj_by_type_subtype (const object *who, int type, int subtype)
2529{ 2491{
2530 object *tmp;
2531
2532 for (tmp = who->inv; tmp; tmp = tmp->below) 2492 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533 if (tmp->type == type && tmp->subtype == subtype) 2493 if (tmp->type == type && tmp->subtype == subtype)
2534 return tmp; 2494 return tmp;
2535 2495
2536 return NULL;
2537}
2538
2539/* If ob has a field named key, return the link from the list,
2540 * otherwise return NULL.
2541 *
2542 * key must be a passed in shared string - otherwise, this won't
2543 * do the desired thing.
2544 */
2545key_value *
2546get_ob_key_link (const object *ob, const char *key)
2547{
2548 key_value *link;
2549
2550 for (link = ob->key_values; link != NULL; link = link->next)
2551 if (link->key == key)
2552 return link;
2553
2554 return NULL;
2555}
2556
2557/*
2558 * Returns the value of op has an extra_field for key, or NULL.
2559 *
2560 * The argument doesn't need to be a shared string.
2561 *
2562 * The returned string is shared.
2563 */
2564const char *
2565get_ob_key_value (const object *op, const char *const key)
2566{
2567 key_value *link;
2568 shstr_cmp canonical_key (key);
2569
2570 if (!canonical_key)
2571 {
2572 /* 1. There being a field named key on any object
2573 * implies there'd be a shared string to find.
2574 * 2. Since there isn't, no object has this field.
2575 * 3. Therefore, *this* object doesn't have this field.
2576 */
2577 return 0;
2578 }
2579
2580 /* This is copied from get_ob_key_link() above -
2581 * only 4 lines, and saves the function call overhead.
2582 */
2583 for (link = op->key_values; link; link = link->next)
2584 if (link->key == canonical_key)
2585 return link->value;
2586
2587 return 0; 2496 return 0;
2588} 2497}
2589 2498
2590 2499shstr_tmp
2591/* 2500object::kv_get (shstr_tmp key) const
2592 * Updates the canonical_key in op to value.
2593 *
2594 * canonical_key is a shared string (value doesn't have to be).
2595 *
2596 * Unless add_key is TRUE, it won't add fields, only change the value of existing
2597 * keys.
2598 *
2599 * Returns TRUE on success.
2600 */
2601int
2602set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603{ 2501{
2604 key_value * 2502 for (key_value *kv = key_values; kv; kv = kv->next)
2605 field = NULL, *last = NULL; 2503 if (kv->key == key)
2504 return kv->value;
2606 2505
2607 for (field = op->key_values; field != NULL; field = field->next) 2506 return shstr ();
2608 { 2507}
2609 if (field->key != canonical_key) 2508
2509void
2510object::kv_set (shstr_tmp key, shstr_tmp value)
2511{
2512 for (key_value *kv = key_values; kv; kv = kv->next)
2513 if (kv->key == key)
2610 { 2514 {
2611 last = field; 2515 kv->value = value;
2612 continue; 2516 return;
2613 } 2517 }
2614 2518
2615 if (value) 2519 key_value *kv = new key_value;
2616 field->value = value; 2520
2617 else 2521 kv->next = key_values;
2522 kv->key = key;
2523 kv->value = value;
2524
2525 key_values = kv;
2526}
2527
2528void
2529object::kv_del (shstr_tmp key)
2530{
2531 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2532 if ((*kvp)->key == key)
2618 { 2533 {
2619 /* Basically, if the archetype has this key set, 2534 key_value *kv = *kvp;
2620 * we need to store the null value so when we save 2535 *kvp = (*kvp)->next;
2621 * it, we save the empty value so that when we load, 2536 delete kv;
2622 * we get this value back again. 2537 return;
2623 */
2624 if (get_ob_key_link (&op->arch->clone, canonical_key))
2625 field->value = 0;
2626 else
2627 {
2628 if (last)
2629 last->next = field->next;
2630 else
2631 op->key_values = field->next;
2632
2633 delete field;
2634 }
2635 } 2538 }
2636 return TRUE;
2637 }
2638 /* IF we get here, key doesn't exist */
2639
2640 /* No field, we'll have to add it. */
2641
2642 if (!add_key)
2643 {
2644 return FALSE;
2645 }
2646 /* There isn't any good reason to store a null
2647 * value in the key/value list. If the archetype has
2648 * this key, then we should also have it, so shouldn't
2649 * be here. If user wants to store empty strings,
2650 * should pass in ""
2651 */
2652 if (value == NULL)
2653 return TRUE;
2654
2655 field = new key_value;
2656
2657 field->key = canonical_key;
2658 field->value = value;
2659 /* Usual prepend-addition. */
2660 field->next = op->key_values;
2661 op->key_values = field;
2662
2663 return TRUE;
2664}
2665
2666/*
2667 * Updates the key in op to value.
2668 *
2669 * If add_key is FALSE, this will only update existing keys,
2670 * and not add new ones.
2671 * In general, should be little reason FALSE is ever passed in for add_key
2672 *
2673 * Returns TRUE on success.
2674 */
2675int
2676set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2677{
2678 shstr key_ (key);
2679
2680 return set_ob_key_value_s (op, key_, value, add_key);
2681} 2539}
2682 2540
2683object::depth_iterator::depth_iterator (object *container) 2541object::depth_iterator::depth_iterator (object *container)
2684: iterator_base (container) 2542: iterator_base (container)
2685{ 2543{
2699 } 2557 }
2700 else 2558 else
2701 item = item->env; 2559 item = item->env;
2702} 2560}
2703 2561
2562const char *
2563object::flag_desc (char *desc, int len) const
2564{
2565 char *p = desc;
2566 bool first = true;
2567
2568 *p = 0;
2569
2570 for (int i = 0; i < NUM_FLAGS; i++)
2571 {
2572 if (len <= 10) // magic constant!
2573 {
2574 snprintf (p, len, ",...");
2575 break;
2576 }
2577
2578 if (flag [i])
2579 {
2580 int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2581 len -= cnt;
2582 p += cnt;
2583 first = false;
2584 }
2585 }
2586
2587 return desc;
2588}
2589
2704// return a suitable string describing an objetc in enough detail to find it 2590// return a suitable string describing an object in enough detail to find it
2705const char * 2591const char *
2706object::debug_desc (char *info) const 2592object::debug_desc (char *info) const
2707{ 2593{
2594 char flagdesc[512];
2708 char info2[256 * 3]; 2595 char info2[256 * 4];
2709 char *p = info; 2596 char *p = info;
2710 2597
2711 p += snprintf (p, 256, "%d=\"%s%s%s\"", 2598 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2712 count, 2599 count,
2600 uuid.c_str (),
2713 &name, 2601 &name,
2714 title ? " " : "", 2602 title ? ",title:\"" : "",
2715 title ? (const char *)title : ""); 2603 title ? (const char *)title : "",
2604 title ? "\"" : "",
2605 flag_desc (flagdesc, 512), type);
2716 2606
2717 if (env) 2607 if (!flag[FLAG_REMOVED] && env)
2718 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2608 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719 2609
2720 if (map) 2610 if (map)
2721 p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y); 2611 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2722 2612
2723 return info; 2613 return info;
2724} 2614}
2725 2615
2726const char * 2616const char *
2727object::debug_desc () const 2617object::debug_desc () const
2728{ 2618{
2729 static char info[256 * 3]; 2619 static char info[3][256 * 4];
2620 static int info_idx;
2621
2730 return debug_desc (info); 2622 return debug_desc (info [++info_idx % 3]);
2731} 2623}
2732 2624
2625struct region *
2626object::region () const
2627{
2628 return map ? map->region (x, y)
2629 : region::default_region ();
2630}
2631
2632void
2633object::open_container (object *new_container)
2634{
2635 if (container == new_container)
2636 return;
2637
2638 object *old_container = container;
2639
2640 if (old_container)
2641 {
2642 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2643 return;
2644
2645#if 0
2646 // remove the "Close old_container" object.
2647 if (object *closer = old_container->inv)
2648 if (closer->type == CLOSE_CON)
2649 closer->destroy ();
2650#endif
2651
2652 // make sure the container is available
2653 esrv_send_item (this, old_container);
2654
2655 old_container->flag [FLAG_APPLIED] = false;
2656 container = 0;
2657
2658 // client needs item update to make it work, client bug requires this to be separate
2659 esrv_update_item (UPD_FLAGS, this, old_container);
2660
2661 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2662 play_sound (sound_find ("chest_close"));
2663 }
2664
2665 if (new_container)
2666 {
2667 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2668 return;
2669
2670 // TODO: this does not seem to serve any purpose anymore?
2671#if 0
2672 // insert the "Close Container" object.
2673 if (archetype *closer = new_container->other_arch)
2674 {
2675 object *closer = new_container->other_arch->instance ();
2676 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2677 new_container->insert (closer);
2678 }
2679#endif
2680
2681 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2682
2683 // make sure the container is available, client bug requires this to be separate
2684 esrv_send_item (this, new_container);
2685
2686 new_container->flag [FLAG_APPLIED] = true;
2687 container = new_container;
2688
2689 // client needs flag change
2690 esrv_update_item (UPD_FLAGS, this, new_container);
2691 esrv_send_inventory (this, new_container);
2692 play_sound (sound_find ("chest_open"));
2693 }
2694// else if (!old_container->env && contr && contr->ns)
2695// contr->ns->floorbox_reset ();
2696}
2697
2698object *
2699object::force_find (shstr_tmp name)
2700{
2701 /* cycle through his inventory to look for the MARK we want to
2702 * place
2703 */
2704 for (object *tmp = inv; tmp; tmp = tmp->below)
2705 if (tmp->type == FORCE && tmp->slaying == name)
2706 return splay (tmp);
2707
2708 return 0;
2709}
2710
2711//-GPL
2712
2713void
2714object::force_set_timer (int duration)
2715{
2716 this->duration = 1;
2717 this->speed_left = -1.f;
2718
2719 this->set_speed (duration ? 1.f / duration : 0.f);
2720}
2721
2722object *
2723object::force_add (shstr_tmp name, int duration)
2724{
2725 if (object *force = force_find (name))
2726 force->destroy ();
2727
2728 object *force = get_archetype (FORCE_NAME);
2729
2730 force->slaying = name;
2731 force->force_set_timer (duration);
2732 force->flag [FLAG_APPLIED] = true;
2733
2734 return insert (force);
2735}
2736
2737void
2738object::play_sound (faceidx sound) const
2739{
2740 if (!sound)
2741 return;
2742
2743 if (is_on_map ())
2744 map->play_sound (sound, x, y);
2745 else if (object *pl = in_player ())
2746 pl->contr->play_sound (sound);
2747}
2748
2749void
2750object::say_msg (const char *msg) const
2751{
2752 if (is_on_map ())
2753 map->say_msg (msg, x, y);
2754 else if (object *pl = in_player ())
2755 pl->contr->play_sound (sound);
2756}
2757
2758void
2759object::make_noise ()
2760{
2761 // we do not model noise in the map, so instead put
2762 // a temporary light into the noise source
2763 // could use the map instead, but that's less reliable for our
2764 // goal, which is to make invisibility a bit harder to exploit
2765
2766 // currently only works sensibly for players
2767 if (!is_player ())
2768 return;
2769
2770 // find old force, or create new one
2771 object *force = force_find (shstr_noise_force);
2772
2773 if (force)
2774 force->speed_left = -1.f; // patch old speed up
2775 else
2776 {
2777 force = archetype::get (shstr_noise_force);
2778
2779 force->slaying = shstr_noise_force;
2780 force->stats.food = 1;
2781 force->speed_left = -1.f;
2782
2783 force->set_speed (1.f / 4.f);
2784 force->flag [FLAG_IS_USED_UP] = true;
2785 force->flag [FLAG_APPLIED] = true;
2786
2787 insert (force);
2788 }
2789}
2790
2791void object::change_move_type (MoveType mt)
2792{
2793 if (move_type == mt)
2794 return;
2795
2796 if (is_on_map ())
2797 {
2798 // we are on the map, so handle move_on/off effects
2799 remove ();
2800 move_type = mt;
2801 map->insert (this, x, y, this);
2802 }
2803 else
2804 move_type = mt;
2805}
2806
2807/* object should be a player.
2808 * we return the object the player has marked with the 'mark' command
2809 * below. If no match is found (or object has changed), we return
2810 * NULL. We leave it up to the calling function to print messages if
2811 * nothing is found.
2812 */
2813object *
2814object::mark () const
2815{
2816 if (contr && contr->mark && contr->mark->env == this)
2817 return contr->mark;
2818 else
2819 return 0;
2820}
2821
2822// put marked object first in the inventory
2823// this is used by identify-like spells so players can influence
2824// the order a bit.
2825void
2826object::splay_marked ()
2827{
2828 if (object *marked = mark ())
2829 splay (marked);
2830}
2831

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines