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.12 by elmex, Sun Sep 3 14:33:47 2006 UTC vs.
Revision 1.28 by root, Mon Sep 11 12:10:21 2006 UTC

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

Diff Legend

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