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.16 by root, Mon Sep 4 16:46:32 2006 UTC vs.
Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines