ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/object.h
(Generate patch)

Comparing deliantra/server/include/object.h (file contents):
Revision 1.200 by root, Tue May 5 04:51:56 2009 UTC vs.
Revision 1.256 by root, Wed Oct 6 01:23:11 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#ifndef OBJECT_H 25#ifndef OBJECT_H
25#define OBJECT_H 26#define OBJECT_H
26 27
27#include <bitset>
28
29#include "cfperl.h" 28#include "cfperl.h"
30#include "shstr.h" 29#include "shstr.h"
31 30
31//+GPL
32
32typedef int tag_t; 33typedef int tag_t;
33 34
35// also see common/item.C
34enum { 36enum
37{
35 body_skill, 38 body_skill,
36 body_combat, 39 body_combat,
37 body_range, 40 body_range,
38 body_shield, 41 body_shield,
39 body_arm, 42 body_arm,
… …
47 body_wrist, 50 body_wrist,
48 body_waist, 51 body_waist,
49 NUM_BODY_LOCATIONS 52 NUM_BODY_LOCATIONS
50}; 53};
51 54
52enum slottype_t
53{
54 slot_none,
55 slot_combat,
56 slot_ranged,
57};
58
59/* See common/item.c */ 55/* See common/item.c */
60 56
61typedef struct Body_Locations 57typedef struct Body_Locations
62{ 58{
63 keyword save_name; /* Name used to load/save it to disk */ 59 keyword save_name; /* Name used to load/save it to disk */
… …
65 const char *nonuse_name; /* Name to describe objects we can't use */ 61 const char *nonuse_name; /* Name to describe objects we can't use */
66} Body_Locations; 62} Body_Locations;
67 63
68extern Body_Locations body_locations[NUM_BODY_LOCATIONS]; 64extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
69 65
66// for each set of directions (1 == up, 2 == right, 4 == down, 8 == left)
67// contains the wall suffix (0, 1_3, 1_4 and so on).
68extern const char *wall_suffix[16];
69
70#define NUM_COINS 4 /* number of coin types */ 70#define NUM_COINS 4 /* number of coin types */
71extern const char *const coins[NUM_COINS + 1]; 71extern const char *const coins[NUM_COINS + 1];
72
73// restart server when object_count reaches this value
74#define RESTART_COUNT 0xe0000000
72 75
73/* 76/*
74 * Each object (this also means archetypes!) could have a few of these 77 * Each object (this also means archetypes!) could have a few of these
75 * "dangling" from it; this could also end up containing 'parse errors'. 78 * "dangling" from it; this could also end up containing 'parse errors'.
76 * 79 *
… …
84{ 87{
85 key_value *next; 88 key_value *next;
86 shstr key, value; 89 shstr key, value;
87}; 90};
88 91
92//-GPL
93
89struct UUID 94struct UUID
90{ 95{
91 uint64 seq; 96 uint64 seq;
97
98 enum { MAX_LEN = 3 + 16 + 1 + 1 }; // <1. + hex + > + \0
92 99
93 static UUID cur; // last uuid generated 100 static UUID cur; // last uuid generated
94 static void init (); 101 static void init ();
95 static UUID gen (); 102 static UUID gen ();
96 103
97 UUID () { } 104 UUID () { }
98 UUID (uint64 seq) : seq(seq) { } 105 UUID (uint64 seq) : seq(seq) { }
99 operator uint64() { return seq; } 106 operator uint64() { return seq; }
100 void operator =(uint64 seq) { this->seq = seq; } 107 void operator =(uint64 seq) { this->seq = seq; }
101 108
102 typedef char BUF [32];
103
104 bool parse (const char *s) 109 bool parse (const char *s);
105 { 110 char *append (char *buf) const;
106 return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
107 }
108
109 const char *c_str (char *buf, int len) const
110 {
111 snprintf (buf, len, "<1.%" PRIx64 ">", seq);
112
113 return buf;
114 }
115
116 const char *c_str () const 111 char *c_str () const;
117 {
118 static BUF buf;
119
120 return c_str (buf, sizeof (buf));
121 }
122}; 112};
113
114//+GPL
123 115
124/* Definition for WILL_APPLY values. Replaces having harcoded values 116/* Definition for WILL_APPLY values. Replaces having harcoded values
125 * sprinkled in the code. Note that some of these also replace fields 117 * sprinkled in the code. Note that some of these also replace fields
126 * that were in the can_apply area. What is the point of having both 118 * that were in the can_apply area. What is the point of having both
127 * can_apply and will_apply? 119 * can_apply and will_apply?
… …
132#define WILL_APPLY_DOOR 0x08 124#define WILL_APPLY_DOOR 0x08
133#define WILL_APPLY_FOOD 0x10 125#define WILL_APPLY_FOOD 0x10
134 126
135struct body_slot 127struct body_slot
136{ 128{
129 signed char used:4; /* Calculated value based on items equipped */
137 signed char info:4; /* body info as loaded from the file */ 130 signed char info:4; /* body info as loaded from the file */
138 signed char used:4; /* Calculated value based on items equipped */
139}; 131};
140 132
141typedef struct oblnk 133typedef struct oblnk
142{ /* Used to link together several objects */ 134{ /* Used to link together several objects */
143 object_ptr ob; 135 object_ptr ob;
… …
173 flags_t flag; /* various flags */ 165 flags_t flag; /* various flags */
174#if FOR_PERL 166#if FOR_PERL
175 bool ACC (RW, flag[NUM_FLAGS]); 167 bool ACC (RW, flag[NUM_FLAGS]);
176#endif 168#endif
177 169
178 shstr ACC (RW, materialname); /* specific material name */ 170 materialtype_t *material; // What material this object consists of //TODO, make perl-accessible
179 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ 171 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
180// materialtype_t *ACC (RW, material); /* What material this object consists of */
181 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */ 172 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
182 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */ 173 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
183 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ 174 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
184 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */ 175 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
185 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */ 176 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
… …
188 arch_ptr ACC (RW, arch); /* Pointer to archetype */ 179 arch_ptr ACC (RW, arch); /* Pointer to archetype */
189 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ 180 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
190 181
191 float ACC (RW, speed); /* The overall speed of this object */ 182 float ACC (RW, speed); /* The overall speed of this object */
192 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 183 float ACC (RW, speed_left); /* How much speed is left to spend this round */
184
193 sint32 ACC (RW, nrof); /* How many of the objects */ 185 sint32 ACC (RW, nrof); /* How many of the objects */
194
195 /* This next big block is basically used for monsters and equipment */ 186 /* This next big block is basically used for monsters and equipment */
196 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */ 187 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
197 sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */ 188 sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */
198 189
199 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */ 190 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
… …
202 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */ 193 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
203 194
204 uint16 ACC (RW, materials); /* What materials this object consists of */ 195 uint16 ACC (RW, materials); /* What materials this object consists of */
205 sint8 ACC (RW, magic); /* Any magical bonuses to this item */ 196 sint8 ACC (RW, magic); /* Any magical bonuses to this item */
206 uint8 ACC (RW, state); /* How the object was last drawn (animation) */ 197 uint8 ACC (RW, state); /* How the object was last drawn (animation) */
207
208 sint32 ACC (RW, value); /* How much money it is worth (or contains) */ 198 sint32 ACC (RW, value); /* How much money it is worth (or contains) */
199
209 /* Note that the last_.. values are sometimes used for non obvious 200 /* Note that the last_.. values are sometimes used for non obvious
210 * meanings by some objects, eg, sp penalty, permanent exp. 201 * meanings by some objects, eg, sp penalty, permanent exp.
211 */ 202 */
212 sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */ 203 sint16 ACC (RW, last_heal); /* Last healed. Depends on constitution */
213 sint32 ACC (RW, last_sp); /* As last_heal, but for spell points */ 204 sint16 ACC (RW, last_sp); /* As last_heal, but for spell points */
214 sint16 ACC (RW, last_grace); /* as last_sp, except for grace */ 205 sint16 ACC (RW, last_grace); /* as last_sp, except for grace */
215 sint16 ACC (RW, last_eat); /* How long since we last ate */ 206 sint16 ACC (RW, last_eat); /* How long since we last ate */
207
216 sint16 ACC (RW, invisible); /* How much longer the object will be invis */ 208 sint16 ACC (RW, invisible); /* How much longer the object will be invis */
217 sint16 ACC (RW, level); /* Level of creature or object */ 209 sint16 ACC (RW, level); /* Level of creature or object */
218 210
219 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 211 uint8 ACC (RW, pick_up); /* See crossfire.doc */
220 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */ 212 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
221 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 213 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
222 uint8 ACC (RW, weapontype); /* type of weapon */ 214 uint8 ACC (RW, weapontype); /* type of weapon */
223 215
216 body_slot slot [NUM_BODY_LOCATIONS];
217
224 faceidx ACC (RW, face); /* the graphical face */ 218 faceidx ACC (RW, face); /* the graphical face */
225 219
226 faceidx ACC (RW, sound); /* the sound face */ 220 faceidx ACC (RW, sound); /* the sound face */
227 faceidx ACC (RW, sound_destroy); /* played on destroy */ 221 faceidx ACC (RW, sound_destroy); /* played on destroy */
228 222
229 body_slot slot [NUM_BODY_LOCATIONS];
230
231 sint32 ACC (RW, weight); /* Attributes of the object */ 223 sint32 ACC (RW, weight); /* Attributes of the object */
232 sint32 ACC (RW, weight_limit);/* Weight-limit of object */ 224 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
225
233 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */ 226 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */
227
234 sint64 ACC (RW, perm_exp); /* Permanent exp */ 228 sint64 ACC (RW, perm_exp); /* Permanent exp */
235 living ACC (RO, stats); /* Str, Con, Dex, etc */ 229 living ACC (RO, stats); /* Str, Con, Dex, etc */
236 /* See the pod/objects.pod for more info about body locations */ 230 /* See the pod/objects.pod for more info about body locations */
237 231
238 /* Following mostly refers to fields only used for monsters */ 232 /* Following mostly refers to fields only used for monsters */
239
240 /* allows different movement patterns for attackers */
241 sint32 ACC (RW, move_status); /* What stage in attack mode */
242 uint16 ACC (RW, attack_movement); /* What kind of attack movement */
243 uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
244 float ACC (RW, expmul); /* needed experience = (calc_exp*expmul) - means some */
245 /* races/classes can need less/more exp to gain levels */
246 233
247 /* Spell related information, may be useful elsewhere 234 /* Spell related information, may be useful elsewhere
248 * Note that other fields are used - these files are basically 235 * Note that other fields are used - these files are basically
249 * only used in spells. 236 * only used in spells.
250 */ 237 */
251 sint16 ACC (RW, duration); /* How long the spell lasts */ 238 sint16 ACC (RW, duration); /* How long the spell lasts */
252 sint16 ACC (RW, casting_time);/* time left before spell goes off */ 239 uint8 ACC (RW, casting_time); /* time left before spell goes off */
253
254 uint8 ACC (RW, duration_modifier); /* how level modifies duration */ 240 uint8 ACC (RW, duration_modifier); /* how level modifies duration */
241
255 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */ 242 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
256 sint8 ACC (RW, range); /* Range of the spell */ 243 sint8 ACC (RW, range); /* Range of the spell */
257 uint8 ACC (RW, range_modifier); /* How going up in level effects range */ 244 uint8 ACC (RW, range_modifier); /* How going up in level effects range */
245 sint8 ACC (RW, item_power); /* power rating of the object */
258 246
247 uint8 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
259 MoveType ACC (RW, move_type); /* Type of movement this object uses */ 248 MoveType ACC (RW, move_type); /* Type of movement this object uses */
260 MoveType ACC (RW, move_block);/* What movement types this blocks */ 249 MoveType ACC (RW, move_block);/* What movement types this blocks */
261 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */ 250 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
251
262 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */ 252 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
263
264 MoveType ACC (RW, move_off); /* Move types affected moving off this space */ 253 MoveType ACC (RW, move_off); /* Move types affected moving off this space */
265 MoveType ACC (RW, move_slow); /* Movement types this slows down */ 254 MoveType ACC (RW, move_slow); /* Movement types this slows down */
266 255
267 sint8 ACC (RW, item_power); /* power rating of the object */
268 // 8 free bits 256 // 8 free bits
269 257
258 //float ACC (RW, expmul) = 1.0; /* needed experience = (calc_exp*expmul) - means some */
259 // /* races/classes can need less/more exp to gain levels */
260 static const float expmul = 1.0;//D
270 float ACC (RW, move_slow_penalty); /* How much this slows down the object */ 261 float ACC (RW, move_slow_penalty); /* How much this slows down the object */
271 char *ACC (RW, spellarg);
272 262
273 /* Following are values used by any object */ 263 /* Following are values used by any object */
274 /* this objects turns into or what this object creates */ 264 /* this objects turns into or what this object creates */
275 treasurelist *ACC (RW, randomitems); /* Items to be generated */ 265 treasurelist *ACC (RW, randomitems); /* Items to be generated */
276 266
277 uint16 ACC (RW, animation_id);/* An index into the animation array */
278 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
279 uint8 ACC (RW, last_anim); /* last sequence used to draw face */ 267 uint8 ACC (RW, last_anim); /* last sequence used to draw face */
280
281 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ 268 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
282 uint8 ACC (RW, will_apply); /* See crossfire.doc */ 269 uint8 ACC (RW, will_apply); /* See crossfire.doc */
270 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
271 uint16 ACC (RW, animation_id);/* An index into the animation array */
272 uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */
273
274 uint16 ACC (RW, cached_eat); /* cached food, used by esrv_update_spells */
283 uint16 ACC (RW, cached_sp); /* cached spell points used for a spell, used by esrv_update_spells */ 275 uint16 ACC (RW, cached_sp); /* cached spell points used for a spell, used by esrv_update_spells */
276 /* allows different movement patterns for attackers */
277 uint8 ACC (RW, move_status); /* What stage in attack mode */
278 uint8 ACC (RW, attack_movement);/* What kind of attack movement */
284 279
285 uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */ 280 //16+ free bits
286 uint16 ACC (RW, cached_eat); /* cached food, used by esrv_update_spells */
287 281
288 // rarely-accessed members should be at the end 282 // rarely-accessed members should be at the end
289 shstr ACC (RW, tag); // a tag used to tracking this object 283 shstr ACC (RW, tag); // a tag used to tracking this object
290 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ 284 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
291 shstr ACC (RW, lore); /* Obscure information about this object, */ 285 shstr ACC (RW, lore); /* Obscure information about this object, */
292 /* To get put into books and the like. */ 286 /* To get put into books and the like. */
293 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 287 shstr ACC (RW, custom_name); /* Custom name assigned by player */
294}; 288};
295 289
296const char *query_weight (const object *op); 290const_utf8_string query_weight (const object *op);
297const char *query_short_name (const object *op); 291const_utf8_string query_short_name (const object *op);
298const char *query_name (const object *op); 292const_utf8_string query_name (const object *op);
299const char *query_base_name (const object *op, int plural); 293const_utf8_string query_base_name (const object *op, int plural);
294sint64 query_cost (const object *tmp, object *who, int flag);
295const char *query_cost_string (const object *tmp, object *who, int flag);
300 296
297int change_ability_duration (object *spell, object *caster);
298int min_casting_level (object *caster, object *spell);
299int casting_level (object *caster, object *spell);
300sint16 SP_level_spellpoint_cost (object *caster, object *spell, int flags);
301int SP_level_dam_adjust (object *caster, object *spob);
302int SP_level_duration_adjust (object *caster, object *spob);
303int SP_level_range_adjust (object *caster, object *spob);
304
305struct freelist_item
306{
307 freelist_item *next;
308 uint32_t count;
309};
310
301struct object : zero_initialised, object_copy 311struct object : object_copy
302{ 312{
303 // These variables are not changed by ->copy_to 313 // These variables are not changed by ->copy_to
304 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */ 314 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
305 315
306 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. 316 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
307 int ACC (RO, count); 317 uint32_t ACC (RO, count);
308 object_vector_index ACC (RO, index); // index into objects 318 object_vector_index ACC (RO, index); // index into objects
309 object_vector_index ACC (RO, active); // index into actives 319 object_vector_index ACC (RO, active); // index into actives
310 320
311 player_ptr ACC (RW, contr); /* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */ 321 player_ptr ACC (RW, contr); /* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */
312 322
… …
314 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 324 object *ACC (RW, above); /* Pointer to the object stacked above this one */
315 /* Note: stacked in the *same* environment */ 325 /* Note: stacked in the *same* environment */
316 object *inv; /* Pointer to the first object in the inventory */ 326 object *inv; /* Pointer to the first object in the inventory */
317 327
318 //TODO: container must move into client 328 //TODO: container must move into client
319 object_ptr ACC (RW, container); /* Current container being used. I think this 329 object_ptr ACC (RW, container);/* Currently opened container. I think this
320 * is only used by the player right now. 330 * is only used by the player right now.
321 */ 331 */
322 object *ACC (RW, env); /* Pointer to the object which is the environment. 332 object *ACC (RW, env); /* Pointer to the object which is the environment.
323 * This is typically the container that the object is in. 333 * This is typically the container that the object is in.
324 */ 334 */
325 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 335 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
326 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 336 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
327 client_container *seen_by; // seen by which player/container currently?
328 key_value *key_values; /* Fields not explictly known by the loader. */ 337 key_value *key_values; /* Fields not explictly known by the loader. */
338
339 MTH void set_flag (int flagnum)
340 {
341 flag [flagnum] = true;
342 }
343
344 MTH void clr_flag (int flagnum)
345 {
346 flag [flagnum] = false;
347 }
329 348
330 // privates / perl 349 // privates / perl
331 shstr_tmp kv_get (shstr_tmp key) const; 350 shstr_tmp kv_get (shstr_tmp key) const;
332 void kv_del (shstr_tmp key); 351 void kv_del (shstr_tmp key);
333 void kv_set (shstr_tmp key, shstr_tmp value); 352 void kv_set (shstr_tmp key, shstr_tmp value);
353
354//-GPL
334 355
335 // custom extra fields management 356 // custom extra fields management
336 struct key_value_access_proxy 357 struct key_value_access_proxy
337 { 358 {
338 object &ob; 359 object &ob;
… …
365 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all 386 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
366 MTH void post_load_check (); // do some adjustments after parsing 387 MTH void post_load_check (); // do some adjustments after parsing
367 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go. 388 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
368 bool write (object_freezer &f); 389 bool write (object_freezer &f);
369 390
370 MTH int slottype () const;
371 MTH static object *create (); 391 MTH static object *create ();
372 const mapxy &operator =(const mapxy &pos); 392 const mapxy &operator =(const mapxy &pos);
373 MTH void copy_to (object *dst); 393 MTH void copy_to (object *dst);
374 MTH object *clone (); // create + copy_to a single object 394 MTH object *clone (); // create + copy_to a single object
375 MTH object *deep_clone (); // copy whole more chain and inventory 395 MTH object *deep_clone (); // copy whole more chain and inventory
… …
382 destroy (); 402 destroy ();
383 } 403 }
384 404
385 // recursively destroy all objects in inventory, optionally dropping them to the ground instead 405 // recursively destroy all objects in inventory, optionally dropping them to the ground instead
386 MTH void destroy_inv (bool drop_to_ground = false); 406 MTH void destroy_inv (bool drop_to_ground = false);
407 MTH void destroy_inv_fast (); // like destroy_inv (false), but only works when *this is destroyed, too
387 MTH object *insert (object *item); // insert into inventory 408 MTH object *insert (object *item); // insert into inventory
388 MTH void play_sound (faceidx sound) const; 409 MTH void play_sound (faceidx sound) const;
389 MTH void say_msg (const char *msg) const; 410 MTH void say_msg (const_utf8_string msg) const;
390 411
391 void do_remove (); 412 void do_remove ();
392 MTH void remove () 413 MTH void remove ()
393 { 414 {
394 if (!flag [FLAG_REMOVED]) 415 if (!flag [FLAG_REMOVED])
… …
402 remove (); 423 remove ();
403 *this = pos; 424 *this = pos;
404 insert_at (this, this); 425 insert_at (this, this);
405 } 426 }
406 427
407 // high-level move functions, return true if successful 428 // high-level move method.
429 // object op is trying to move in direction dir.
430 // originator is typically the same as op, but
431 // can be different if originator is causing op to
432 // move (originator is pushing op)
433 // returns 0 if the object is not able to move to the
434 // desired space, 1 otherwise (in which case we also
435 // move the object accordingly. This function is
436 // very similiar to move_object.
408 int move (int dir, object *originator); 437 int move (int dir, object *originator);
409 438
410 int move (int dir) 439 int move (int dir)
411 { 440 {
412 return move (dir, this); 441 return move (dir, this);
413 } 442 }
443
444 // changes move_type to a new value - handles move_on/move_off effects
445 MTH void change_move_type (MoveType mt);
414 446
415 static bool can_merge_slow (object *op1, object *op2); 447 static bool can_merge_slow (object *op1, object *op2);
416 448
417 // this is often used in time-critical code, so optimise 449 // this is often used in time-critical code, so optimise
418 MTH static bool can_merge (object *op1, object *op2) 450 MTH static bool can_merge (object *op1, object *op2)
… …
423 } 455 }
424 456
425 MTH void set_owner (object *owner); 457 MTH void set_owner (object *owner);
426 MTH void set_speed (float speed); 458 MTH void set_speed (float speed);
427 MTH void set_glow_radius (sint8 rad); 459 MTH void set_glow_radius (sint8 rad);
428 MTH bool change_weapon (object *ob);
429 MTH bool change_skill (object *ob);
430 460
431 MTH void open_container (object *new_container); 461 MTH void open_container (object *new_container);
432 MTH void close_container () 462 MTH void close_container ()
433 { 463 {
434 open_container (0); 464 open_container (0);
435 } 465 }
436 466
467 // potential future accessor for "container"
468 MTH object *container_ () const
469 {
470 return container;
471 }
472
473 MTH bool is_open_container () const
474 {
475 // strangely enough, using ?: here causes code to inflate
476 return type == CONTAINER
477 && ((env && env->container_ () == this)
478 || (!env && flag [FLAG_APPLIED]));
479 }
480
437 MTH object *force_find (shstr_tmp name); 481 MTH object *force_find (shstr_tmp name);
482 MTH void force_set_timer (int duration);
438 MTH object *force_add (shstr_tmp name, int duration = 0); 483 MTH object *force_add (shstr_tmp name, int duration = 0);
439 484
440 oblinkpt *find_link () const; 485 oblinkpt *find_link () const;
441 MTH void add_link (maptile *map, shstr_tmp id); 486 MTH void add_link (maptile *map, shstr_tmp id);
442 MTH void remove_link (); 487 MTH void remove_link ();
… …
458 MTH void drain_stat (); 503 MTH void drain_stat ();
459 MTH void drain_specific_stat (int deplete_stats); 504 MTH void drain_specific_stat (int deplete_stats);
460 MTH void change_luck (int value); 505 MTH void change_luck (int value);
461 506
462 // info must hold 256 * 3 bytes currently 507 // info must hold 256 * 3 bytes currently
463 const char *debug_desc (char *info) const; 508 const_utf8_string debug_desc (char *info) const;
464 MTH const char *debug_desc () const; // uses at least 3 round-robin buffers 509 MTH const_utf8_string debug_desc () const; // uses at least 3 round-robin buffers
465 const char *flag_desc (char *desc, int len) const; 510 const_utf8_string flag_desc (char *desc, int len) const;
466 511
467 MTH bool decrease (sint32 nr = 1); // returns true if anything is left 512 MTH bool decrease (sint32 nr = 1); // returns true if anything is left
468 MTH object *split (sint32 nr = 1); // return 0 on failure 513 MTH object *split (sint32 nr = 1); // return 0 on failure
469 514
470 MTH int number_of () const 515 MTH int number_of () const
… …
478 } 523 }
479 524
480 MTH void update_weight (); 525 MTH void update_weight ();
481 526
482 // return the dominant material of this item, always return something 527 // return the dominant material of this item, always return something
483 const materialtype_t *dominant_material () const; 528 const materialtype_t *dominant_material () const
529 {
530 return material;
531 }
484 532
485 // return the volume of this object in cm³ 533 // return the volume of this object in cm³
486 MTH uint64 volume () const 534 MTH uint64 volume () const
487 { 535 {
488 return (uint64)total_weight () 536 return (uint64)total_weight ()
489 * 1000 537 * 1024 // 1000 actually
490 * (type == CONTAINER ? 1000 : 1) 538 * (type == CONTAINER ? 128 : 1)
491 / dominant_material ()->density; 539 / dominant_material ()->density; // ugh, division
492 } 540 }
541
542 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
493 543
494 MTH bool is_wiz () const { return flag [FLAG_WIZ]; } 544 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
495 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; } 545 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
496 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET 546 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET
497 || type == CLOAK || type == BOOTS || type == GLOVES 547 || type == CLOAK || type == BOOTS || type == GLOVES
… …
503 MTH bool is_arrow () const { return type == ARROW 553 MTH bool is_arrow () const { return type == ARROW
504 || (type == SPELL_EFFECT 554 || (type == SPELL_EFFECT
505 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } 555 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
506 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; } 556 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
507 557
558 MTH bool is_dragon () const;
559
560 MTH bool is_immunity () const { return invisible && type == SIGN; }
561
508 MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; } 562 MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
509 563
510 // temporary: wether the object can be saved in a map file 564 // temporary: wether the object can be saved in a map file
511 // contr => is a player 565 // contr => is a player
512 // head => only save head of a multitile object 566 // head => only save head of a multitile object
513 // owner => can not reference owner yet 567 // owner => can not reference owner yet
… …
516 /* This return true if object has still randomitems which 570 /* This return true if object has still randomitems which
517 * could be expanded. 571 * could be expanded.
518 */ 572 */
519 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } 573 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
520 574
521 MTH bool has_dialogue () const { return *&msg == '@'; } 575 static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
576
577 MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
578
579 /* need_identify returns true if the item should be identified. This
580 * function really should not exist - by default, any item not identified
581 * should need it.
582 */
583 MTH bool need_identify () const;
522 584
523 // returns the outermost owner, never returns 0 585 // returns the outermost owner, never returns 0
524 MTH object *outer_owner () 586 MTH object *outer_owner ()
525 { 587 {
526 object *op; 588 object *op;
… …
530 592
531 return op; 593 return op;
532 } 594 }
533 595
534 // returns the outermost environment, never returns 0 596 // returns the outermost environment, never returns 0
535 MTH object *outer_env () const 597 MTH object *outer_env_or_self () const
536 { 598 {
537 const object *op; 599 const object *op;
538 600
539 for (op = this; op->env; op = op->env) 601 for (op = this; op->env; op = op->env)
540 ; 602 ;
541 603
542 return const_cast<object *>(op); 604 return const_cast<object *>(op);
605 }
606
607 // returns the outermost environment, may return 0
608 MTH object *outer_env () const
609 {
610 return env ? outer_env_or_self () : 0;
543 } 611 }
544 612
545 // returns the player that has this object in his inventory, or 0 613 // returns the player that has this object in his inventory, or 0
546 // we assume the player is always the outer env 614 // we assume the player is always the outer env
547 MTH object *in_player () const 615 MTH object *in_player () const
548 { 616 {
549 object *op = outer_env (); 617 object *op = outer_env_or_self ();
550 618
551 return op->type == PLAYER ? op : 0; 619 return op->type == PLAYER ? op : 0;
552 } 620 }
553 621
554 // "temporary" helper function 622 // "temporary" helper function
… …
575 MTH bool is_player () const 643 MTH bool is_player () const
576 { 644 {
577 return !!contr; 645 return !!contr;
578 } 646 }
579 647
648 /* elmex: this method checks whether the object is in a shop */
649 MTH bool is_in_shop () const;
650
580 MTH bool affects_los () const 651 MTH bool affects_los () const
581 { 652 {
582 return glow_radius || flag [FLAG_BLOCKSVIEW]; 653 return glow_radius || flag [FLAG_BLOCKSVIEW];
583 } 654 }
584 655
585 MTH bool has_carried_lights () const 656 MTH bool has_carried_lights () const
586 { 657 {
587 return glow_radius; 658 return glow_radius;
588 } 659 }
589 660
590 // returns the player that cna see this object, if any 661 // returns the player that can see this object, if any
591 MTH object *visible_to () const; 662 MTH object *visible_to () const;
592 663
593 MTH std::string long_desc (object *who = 0); 664 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
594 MTH std::string describe_monster (object *who = 0); 665 MTH std::string describe_monster (object *who = 0);
595 MTH std::string describe_item (object *who = 0); 666 MTH std::string describe_item (object *who = 0);
596 MTH std::string describe (object *who = 0); 667 MTH std::string describe (object *who = 0); // long description, without name
597 668
598 MTH const char *query_weight () { return ::query_weight (this); } 669 MTH const_utf8_string query_weight () { return ::query_weight (this); }
599 MTH const char *query_name () { return ::query_name (this); } 670 MTH const_utf8_string query_name () { return ::query_name (this); }
600 MTH const char *query_short_name () { return ::query_short_name (this); } 671 MTH const_utf8_string query_short_name () { return ::query_short_name (this); }
601 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); } 672 MTH const_utf8_string query_base_name (bool plural) { return ::query_base_name (this, plural); }
602 673
603 // If this object has no extra parts but should have them, 674 // If this object has no extra parts but should have them,
604 // add them, effectively expanding heads into multipart 675 // add them, effectively expanding heads into multipart
605 // objects. This method only works on objects not inserted 676 // objects. This method only works on objects not inserted
606 // anywhere. 677 // anywhere.
607 MTH void expand_tail (); 678 MTH void expand_tail ();
608 679
609 MTH void create_treasure (treasurelist *tl, int flags = 0); 680 MTH void create_treasure (treasurelist *tl, int flags = 0);
610 681
682 // makes sure the player has the named skill,
683 // and also makes it innate if can_use is true.
684 // returns the new skill or 0 if no such skill exists.
685 MTH object *give_skill (shstr_cmp name, bool can_use = false);
686 MTH void become_follower (object *new_god);
687
611 // insert object at same map position as 'where' 688 // insert object at same map position as 'where'
612 // handles both inventory and map "positions" 689 // handles both inventory and map "positions"
613 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 690 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
691 // check whether we can put this into the map, respect max_nrof, max_volume, max_items
692 MTH bool can_drop_at (maptile *m, int x, int y, object *originator = 0);
614 MTH void drop_unpaid_items (); 693 MTH void drop_unpaid_items ();
615 694
616 MTH void activate (); 695 MTH void activate ();
617 MTH void deactivate (); 696 MTH void deactivate ();
618 MTH void activate_recursive (); 697 MTH void activate_recursive ();
619 MTH void deactivate_recursive (); 698 MTH void deactivate_recursive ();
620 699
621 // set the given flag on all objects in the inventory recursively 700 // set the given flag on all objects in the inventory recursively
622 MTH void set_flag_inv (int flag, int value = 1); 701 MTH void set_flag_inv (int flag, int value = 1);
623 702
624 void enter_exit (object *exit);//Perl 703 void enter_exit (object *exit); // perl
625 MTH void enter_map (maptile *newmap, int x, int y); 704 MTH bool enter_map (maptile *newmap, int x, int y);
626 void player_goto (const char *path, int x, int y); // only for players 705 void player_goto (const_utf8_string path, int x, int y); // only for players
706 MTH bool apply (object *ob, int aflags = AP_APPLY); // ob may be 0
707
708 MTH object *mark () const;
709 MTH void splay_marked ();
627 710
628 // returns the mapspace this object is in 711 // returns the mapspace this object is in
629 mapspace &ms () const; 712 mapspace &ms () const;
630 713
631 // fully recursive iterator 714 // fully recursive iterator
… …
682 return weight + carrying; 765 return weight + carrying;
683 } 766 }
684 767
685 MTH struct region *region () const; 768 MTH struct region *region () const;
686 769
687 void statusmsg (const char *msg, int color = NDI_BLACK); 770 MTH void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
688 void failmsg (const char *msg, int color = NDI_RED); 771 MTH void failmsg (const_utf8_string msg, int color = NDI_RED);
772 void failmsgf (const_utf8_string format, ...); // always NDI_RED...
689 773
690 const char *query_inventory (object *who = 0, const char *indent = ""); 774 MTH const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
691 775
692 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference 776 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
693 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible 777 static object *deref (const_octet_string ref); // returns the object from the generated reference, if possible
694 778
695 // make some noise with given item into direction dir, 779 // make some noise with given item into direction dir,
696 // currently only used for players to make them temporarily visible 780 // currently only used for players to make them temporarily visible
697 // when they are invisible. 781 // when they are invisible.
698 MTH void make_noise (); 782 MTH void make_noise ();
699 783
700 /* animation */ 784 /* animation */
701 bool has_anim () { return animation_id; } 785 MTH bool has_anim () const { return animation_id; }
702 const animation &anim () const { return animations [animation_id]; } 786 const animation &anim () const { return animations [animation_id]; }
703 faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; } 787 MTH faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
704 void set_anim_frame (int frame) { face = get_anim_frame (frame); } 788 MTH void set_anim_frame (int frame) { face = get_anim_frame (frame); }
705 /* anim_frames () returns the number of animations allocated. The last 789 /* anim_frames () returns the number of animations allocated. The last
706 * usuable animation will be anim_frames () - 1 (for example, if an object 790 * usuable animation will be anim_frames () - 1 (for example, if an object
707 * has 8 animations, anim_frames () will return 8, but the values will 791 * has 8 animations, anim_frames () will return 8, but the values will
708 * range from 0 through 7. 792 * range from 0 through 7.
709 */ 793 */
710 int anim_frames () const { return anim ().num_animations; } 794 MTH int anim_frames () const { return anim ().num_animations; }
711 int anim_facings () const { return anim ().facings; } 795 MTH int anim_facings () const { return anim ().facings; }
796
797 MTH utf8_string as_string ();
798
799 // low-level management, statistics, ...
800 static uint32_t ACC (RW, object_count);
801 static uint32_t ACC (RW, free_count);
802 static uint32_t ACC (RW, create_count);
803 static uint32_t ACC (RW, destroy_count);
804 static freelist_item *freelist;
805 MTH static void freelist_free (int count);
712 806
713protected: 807protected:
714 void link (); 808 void link ();
715 void unlink (); 809 void unlink ();
810
811 void do_delete ();
716 812
717 object (); 813 object ();
718 ~object (); 814 ~object ();
719 815
720private: 816private:
… …
722 object (const object &); 818 object (const object &);
723}; 819};
724 820
725// move this object to the top of its env's inventory to speed up 821// move this object to the top of its env's inventory to speed up
726// searches for it. 822// searches for it.
727static object * 823static inline object *
728splay (object *ob) 824splay (object *ob)
729{ 825{
730 if (ob->env && ob->env->inv != ob) 826 if (ob->above && ob->env)
731 { 827 {
732 if (ob->above) ob->above->below = ob->below; 828 if (ob->above) ob->above->below = ob->below;
733 if (ob->below) ob->below->above = ob->above; 829 if (ob->below) ob->below->above = ob->above;
734 830
735 ob->above = 0; 831 ob->above = 0;
… …
739 } 835 }
740 836
741 return ob; 837 return ob;
742} 838}
743 839
840//+GPL
841
744object *find_skill_by_name_fuzzy (object *who, const char *name); 842object *find_skill_by_name_fuzzy (object *who, const_utf8_string name);
745object *find_skill_by_name (object *who, shstr_cmp sh); 843object *find_skill_by_name (object *who, shstr_cmp sh);
746object *find_skill_by_number (object *who, int skillno); 844object *find_skill_by_number (object *who, int skillno);
747 845
748/* 846/*
749 * The archetype structure is a set of rules on how to generate and manipulate 847 * The archetype structure is a set of rules on how to generate and manipulate
… …
752 * be much left in the archetype - all it really is is a holder for the 850 * be much left in the archetype - all it really is is a holder for the
753 * object and pointers. This structure should get removed, and just replaced 851 * object and pointers. This structure should get removed, and just replaced
754 * by the object structure 852 * by the object structure
755 */ 853 */
756 854
855//-GPL
856
757INTERFACE_CLASS (archetype) 857INTERFACE_CLASS (archetype)
758struct archetype : object 858struct archetype : object, zero_initialised
759{ 859{
760 static arch_ptr empty; // the empty_archetype 860 static arch_ptr empty; // the empty_archetype
761 MTH static void gc (); 861 MTH static void gc ();
762 862
763 archetype (const char *name); 863 archetype (const_utf8_string name);
764 ~archetype (); 864 ~archetype ();
765 void gather_callbacks (AV *&callbacks, event_type event) const; 865 void gather_callbacks (AV *&callbacks, event_type event) const;
766 866
767 MTH static archetype *find (const_utf8_string name); 867 MTH static archetype *find (const_utf8_string name);
768 868
769 MTH void link (); 869 MTH void link ();
770 MTH void unlink (); 870 MTH void unlink ();
771 871
772 MTH static object *get (const char *name); // (find() || singularity)->instance() 872 MTH static object *get (const_utf8_string name); // (find() || singularity)->instance()
773 MTH object *instance (); 873 MTH object *instance ();
874
875 MTH void post_load_check (); // do some adjustments after parsing
774 876
775 object_vector_index ACC (RW, archid); // index in archvector 877 object_vector_index ACC (RW, archid); // index in archvector
776 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 878 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
777 879
778 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 880 sint8 ACC (RW, max_x); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
779 sint8 ACC (RW, max_x), ACC (RW, max_y);
780 881
781 // support for archetype loading 882 // support for archetype loading
782 static archetype *read (object_thawer &f); 883 static archetype *read (object_thawer &f);
783 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more 884 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
784 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */ 885 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
886
887protected:
888 void do_delete ();
785}; 889};
786 890
787// compatbiility, remove once replaced by ->instance 891// returns whether the object is a dragon player, which are often specialcased
788inline object * 892inline bool
789arch_to_object (archetype *at) 893object::is_dragon () const
790{ 894{
791 return at->instance (); 895 return arch->race == shstr_dragon && is_player ();
792} 896}
793 897
794inline void 898inline void
795object_freezer::put (keyword k, archetype *v) 899object_freezer::put (const keyword_string k, archetype *v)
796{ 900{
797 put (k, v ? &v->archname : (const char *)0); 901 if (expect_true (v))
902 put (k, v->archname);
903 else
904 put (k);
798} 905}
799 906
800typedef object_vector<object, &object::index > objectvec; 907typedef object_vector<object, &object::index > objectvec;
801typedef object_vector<object, &object::active> activevec; 908typedef object_vector<object, &object::active> activevec;
802typedef object_vector<archetype, &archetype::archid> archvec; 909typedef object_vector<archetype, &archetype::archid> archvec;
… …
819 statementvar (object *, var, actives [_i]) 926 statementvar (object *, var, actives [_i])
820 927
821#define for_all_archetypes(var) \ 928#define for_all_archetypes(var) \
822 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \ 929 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
823 statementvar (archetype *, var, archetypes [_i]) 930 statementvar (archetype *, var, archetypes [_i])
931
932//+GPL
824 933
825/* Used by update_object to know if the object being passed is 934/* Used by update_object to know if the object being passed is
826 * being added or removed. 935 * being added or removed.
827 */ 936 */
828#define UP_OBJ_INSERT 1 937#define UP_OBJ_INSERT 1
… …
857#define INS_NO_MERGE 0x0001 966#define INS_NO_MERGE 0x0001
858#define INS_ABOVE_FLOOR_ONLY 0x0002 967#define INS_ABOVE_FLOOR_ONLY 0x0002
859#define INS_NO_WALK_ON 0x0004 968#define INS_NO_WALK_ON 0x0004
860#define INS_ON_TOP 0x0008 969#define INS_ON_TOP 0x0008
861#define INS_BELOW_ORIGINATOR 0x0010 970#define INS_BELOW_ORIGINATOR 0x0010
971#define INS_NO_AUTO_EXIT 0x0020 // temporary, fix exits instead
862 972
863#define ARCH_DEPLETION "depletion" 973//-GPL
864 974
865#endif 975#endif
866 976

Diff Legend

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