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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines