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.18 by root, Fri Sep 8 16:51:42 2006 UTC vs.
Revision 1.67 by root, Thu Dec 14 04:30:32 2006 UTC

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

Diff Legend

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