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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines