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.21 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.112 by root, Mon Jan 8 14:11:04 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines