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.17 by root, Mon Sep 4 17:27:13 2006 UTC vs.
Revision 1.93 by root, Tue Dec 26 20:04:09 2006 UTC

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

Diff Legend

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