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.23 by root, Sun Sep 10 14:54:02 2006 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines