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.14 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines