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

Diff Legend

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