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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines