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.53 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.211 by root, Mon Apr 21 21:32:32 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines