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.14 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.120 by root, Sun Jan 21 21:28:27 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines