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.15 by root, Mon Sep 4 13:55:54 2006 UTC vs.
Revision 1.51 by root, Sun Sep 17 16:21:53 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines