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.19 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.72 by elmex, Tue Dec 19 15:30:01 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines