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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines