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.63 by root, Tue Dec 12 20:53:02 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines