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.15 by root, Mon Sep 4 13:55:54 2006 UTC vs.
Revision 1.90 by root, Tue Dec 26 10:14:24 2006 UTC

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