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