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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines