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.64 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.333 by root, Thu Apr 22 03:53:40 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines