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.19 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines