ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.21 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines