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.19 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.331 by root, Sun Apr 18 14:04:50 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines