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

Diff Legend

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