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.66 by root, Wed Dec 13 03:28:42 2006 UTC vs.
Revision 1.344 by root, Sun May 1 13:18:23 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines