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.154 by root, Wed Apr 9 14:36:47 2008 UTC vs.
Revision 1.238 by root, Sat Apr 10 04:54:09 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 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 */
74 * Each object (this also means archetypes!) could have a few of these 70 * Each object (this also means archetypes!) could have a few of these
75 * "dangling" from it; this could also end up containing 'parse errors'. 71 * "dangling" from it; this could also end up containing 'parse errors'.
76 * 72 *
77 * key and value are shared-strings. 73 * key and value are shared-strings.
78 * 74 *
79 * Please use get_ob_key_value(), set_ob_key_value() from object.c rather than 75 * Please use kv_get/kv_set/kv_del from object rather than
80 * accessing the list directly. 76 * accessing the list directly.
81 * Exception is if you want to walk this list for some reason. 77 * Exception is if you want to walk this list for some reason.
82 */ 78 */
83struct key_value 79struct key_value : slice_allocated
84{ 80{
85 key_value *next; 81 key_value *next;
86 shstr key, value; 82 shstr key, value;
87}; 83};
88 84
85//-GPL
86
89struct UUID 87struct UUID
90{ 88{
91 uint64 seq; 89 uint64 seq;
90
91 enum { MAX_LEN = 3 + 16 + 1 + 1 }; // <1. + hex + > + \0
92
93 static UUID cur; // last uuid generated
94 static void init ();
95 static UUID gen ();
92 96
93 UUID () { } 97 UUID () { }
94 UUID (uint64 seq) : seq(seq) { } 98 UUID (uint64 seq) : seq(seq) { }
95 operator uint64() { return seq; } 99 operator uint64() { return seq; }
96 void operator =(uint64 seq) { this->seq = seq; } 100 void operator =(uint64 seq) { this->seq = seq; }
101
102 bool parse (const char *s);
103 char *append (char *buf) const;
104 char *c_str () const;
97}; 105};
98 106
99extern void init_uuid (); 107//+GPL
100extern UUID gen_uuid ();
101extern const uint64 UUID_SKIP;
102 108
103/* Definition for WILL_APPLY values. Replaces having harcoded values 109/* Definition for WILL_APPLY values. Replaces having harcoded values
104 * sprinkled in the code. Note that some of these also replace fields 110 * sprinkled in the code. Note that some of these also replace fields
105 * that were in the can_apply area. What is the point of having both 111 * that were in the can_apply area. What is the point of having both
106 * can_apply and will_apply? 112 * can_apply and will_apply?
111#define WILL_APPLY_DOOR 0x08 117#define WILL_APPLY_DOOR 0x08
112#define WILL_APPLY_FOOD 0x10 118#define WILL_APPLY_FOOD 0x10
113 119
114struct body_slot 120struct body_slot
115{ 121{
122 signed char used:4; /* Calculated value based on items equipped */
116 signed char info:4; /* body info as loaded from the file */ 123 signed char info:4; /* body info as loaded from the file */
117 signed char used:4; /* Calculated value based on items equipped */
118}; 124};
125
126typedef struct oblnk
127{ /* Used to link together several objects */
128 object_ptr ob;
129 struct oblnk *next;
130} objectlink;
131
132typedef struct oblinkpt
133{ /* Used to link together several object links */
134 struct oblnk *link;
135 struct oblinkpt *next;
136 shstr id; /* Used as connected value in buttons/gates */
137} oblinkpt;
119 138
120INTERFACE_CLASS (object) 139INTERFACE_CLASS (object)
121// these are being copied 140// these are being copied
122struct object_copy : attachable 141struct object_copy : attachable
123{ 142{
124 typedef bitset<NUM_FLAGS> flags_t;
125
126 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ 143 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
127 144
128 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */ 145 uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
129 uint8 ACC (RW, subtype); /* subtype of object */ 146 uint8 ACC (RW, subtype); /* subtype of object */
130 sint8 ACC (RW, direction); /* Means the object is moving that way. */ 147 sint8 ACC (RW, direction); /* Means the object is moving that way. */
134 shstr ACC (RW, name_pl); /* The plural name of the object */ 151 shstr ACC (RW, name_pl); /* The plural name of the object */
135 shstr ACC (RW, title); /* Of foo, etc */ 152 shstr ACC (RW, title); /* Of foo, etc */
136 shstr ACC (RW, race); /* human, goblin, dragon, etc */ 153 shstr ACC (RW, race); /* human, goblin, dragon, etc */
137 shstr ACC (RW, slaying); /* Which race to do double damage to */ 154 shstr ACC (RW, slaying); /* Which race to do double damage to */
138 /* If this is an exit, this is the filename */ 155 /* If this is an exit, this is the filename */
139 shstr ACC (RW, tag); // a tag used to tracking this object 156
157 typedef bitset<NUM_FLAGS> flags_t;
158 flags_t flag; /* various flags */
159#if FOR_PERL
160 bool ACC (RW, flag[NUM_FLAGS]);
161#endif
162
163 materialtype_t *material; // What material this object consists of //TODO, make perl-accessible
140 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ 164 shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
141 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
142 shstr ACC (RW, lore); /* Obscure information about this object, */
143 /* To get put into books and the like. */
144 shstr ACC (RW, materialname); /* specific material name */
145 shstr ACC (RW, custom_name); /* Custom name assigned by player */
146// materialtype_t *ACC (RW, material); /* What material this object consists of */
147 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */ 165 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
148 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */ 166 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
149 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ 167 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
150 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */ 168 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
151 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */ 169 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
154 arch_ptr ACC (RW, arch); /* Pointer to archetype */ 172 arch_ptr ACC (RW, arch); /* Pointer to archetype */
155 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ 173 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
156 174
157 float ACC (RW, speed); /* The overall speed of this object */ 175 float ACC (RW, speed); /* The overall speed of this object */
158 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 176 float ACC (RW, speed_left); /* How much speed is left to spend this round */
177
159 uint32 ACC (RW, nrof); /* How many of the objects */ 178 sint32 ACC (RW, nrof); /* How many of the objects */
160
161 /* This next big block are basically used for monsters and equipment */ 179 /* This next big block is basically used for monsters and equipment */
162 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */ 180 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
163
164 sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */ 181 sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */
182
165 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */ 183 uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
166 uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */ 184 uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
167 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */ 185 uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
168 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */ 186 uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
187
169 uint16 ACC (RW, materials); /* What materials this object consists of */ 188 uint16 ACC (RW, materials); /* What materials this object consists of */
170 sint8 ACC (RW, magic); /* Any magical bonuses to this item */ 189 sint8 ACC (RW, magic); /* Any magical bonuses to this item */
171 uint8 ACC (RW, state); /* How the object was last drawn (animation) */ 190 uint8 ACC (RW, state); /* How the object was last drawn (animation) */
172 sint32 ACC (RW, value); /* How much money it is worth (or contains) */ 191 sint32 ACC (RW, value); /* How much money it is worth (or contains) */
192
173 /* Note that the last_.. values are sometimes used for non obvious 193 /* Note that the last_.. values are sometimes used for non obvious
174 * meanings by some objects, eg, sp penalty, permanent exp. 194 * meanings by some objects, eg, sp penalty, permanent exp.
175 */ 195 */
176 sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */ 196 sint16 ACC (RW, last_heal); /* Last healed. Depends on constitution */
177 sint32 ACC (RW, last_sp); /* As last_heal, but for spell points */ 197 sint16 ACC (RW, last_sp); /* As last_heal, but for spell points */
178 sint16 ACC (RW, last_grace); /* as last_sp, except for grace */ 198 sint16 ACC (RW, last_grace); /* as last_sp, except for grace */
179 sint16 ACC (RW, last_eat); /* How long since we last ate */ 199 sint16 ACC (RW, last_eat); /* How long since we last ate */
200
180 sint16 ACC (RW, invisible); /* How much longer the object will be invis */ 201 sint16 ACC (RW, invisible); /* How much longer the object will be invis */
181 sint16 ACC (RW, level); /* Level of creature or object */ 202 sint16 ACC (RW, level); /* Level of creature or object */
203
182 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 204 uint8 ACC (RW, pick_up); /* See crossfire.doc */
183 sint8 ACC (RW, item_power); /* power rating of the object */
184 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */ 205 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
185 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 206 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
207 uint8 ACC (RW, weapontype); /* type of weapon */
208
209 body_slot slot [NUM_BODY_LOCATIONS];
210
211 faceidx ACC (RW, face); /* the graphical face */
212
213 faceidx ACC (RW, sound); /* the sound face */
214 faceidx ACC (RW, sound_destroy); /* played on destroy */
215
186 sint32 ACC (RW, weight); /* Attributes of the object */ 216 sint32 ACC (RW, weight); /* Attributes of the object */
187 sint32 ACC (RW, weight_limit);/* Weight-limit of object */ 217 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
218
188 sint32 ACC (RW, carrying); /* How much weight this object contains */ 219 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */
220
189 sint64 ACC (RW, perm_exp); /* Permanent exp */ 221 sint64 ACC (RW, perm_exp); /* Permanent exp */
190 uint32 ACC (RW, weapontype); /* type of weapon */
191 uint32 ACC (RW, tooltype); /* type of tool or build facility */
192 body_slot slot [NUM_BODY_LOCATIONS];
193 faceidx ACC (RW, face); /* the graphical face */
194 faceidx ACC (RW, sound); /* the sound face */
195 faceidx ACC (RW, sound_destroy); /* played on destroy */
196 living ACC (RO, stats); /* Str, Con, Dex, etc */ 222 living ACC (RO, stats); /* Str, Con, Dex, etc */
197 /* See the pod/objects.pod for more info about body locations */ 223 /* See the pod/objects.pod for more info about body locations */
198 224
199 /* Following mostly refers to fields only used for monsters */ 225 /* Following mostly refers to fields only used for monsters */
200 uint32 ACC (RW, hide); /* The object is hidden, not invisible */
201
202 /* allows different movement patterns for attackers */
203 sint32 ACC (RW, move_status); /* What stage in attack mode */
204 uint16 ACC (RW, attack_movement); /* What kind of attack movement */
205 uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
206 float ACC (RW, expmul); /* needed experience = (calc_exp*expmul) - means some */
207 /* races/classes can need less/more exp to gain levels */
208 226
209 /* Spell related information, may be useful elsewhere 227 /* Spell related information, may be useful elsewhere
210 * Note that other fields are used - these files are basically 228 * Note that other fields are used - these files are basically
211 * only used in spells. 229 * only used in spells.
212 */ 230 */
213 sint16 ACC (RW, duration); /* How long the spell lasts */ 231 sint16 ACC (RW, duration); /* How long the spell lasts */
214 sint16 ACC (RW, casting_time);/* time left before spell goes off */ 232 uint8 ACC (RW, casting_time); /* time left before spell goes off */
215
216 uint16 ACC (RW, start_holding);
217 uint8 ACC (RW, duration_modifier); /* how level modifies duration */ 233 uint8 ACC (RW, duration_modifier); /* how level modifies duration */
234
218 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */ 235 uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
219
220 sint8 ACC (RW, range); /* Range of the spell */ 236 sint8 ACC (RW, range); /* Range of the spell */
221 uint8 ACC (RW, range_modifier); /* How going up in level effects range */ 237 uint8 ACC (RW, range_modifier); /* How going up in level effects range */
238 sint8 ACC (RW, item_power); /* power rating of the object */
239
240 uint8 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
222 MoveType ACC (RW, move_type); /* Type of movement this object uses */ 241 MoveType ACC (RW, move_type); /* Type of movement this object uses */
223 MoveType ACC (RW, move_block);/* What movement types this blocks */ 242 MoveType ACC (RW, move_block);/* What movement types this blocks */
224
225 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */ 243 MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
244
226 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */ 245 MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
227 MoveType ACC (RW, move_off); /* Move types affected moving off this space */ 246 MoveType ACC (RW, move_off); /* Move types affected moving off this space */
228 MoveType ACC (RW, move_slow); /* Movement types this slows down */ 247 MoveType ACC (RW, move_slow); /* Movement types this slows down */
229 248
249 // 8 free bits
250
251 //float ACC (RW, expmul) = 1.0; /* needed experience = (calc_exp*expmul) - means some */
252 // /* races/classes can need less/more exp to gain levels */
253 static const float expmul = 1.0;//D
230 float ACC (RW, move_slow_penalty); /* How much this slows down the object */ 254 float ACC (RW, move_slow_penalty); /* How much this slows down the object */
231
232 char *ACC (RW, spellarg);
233 255
234 /* Following are values used by any object */ 256 /* Following are values used by any object */
235 /* this objects turns into or what this object creates */ 257 /* this objects turns into or what this object creates */
236 treasurelist *ACC (RW, randomitems); /* Items to be generated */ 258 treasurelist *ACC (RW, randomitems); /* Items to be generated */
237 flags_t flag; /* various flags */ 259
238#if FOR_PERL
239 bool ACC (RW, flag[NUM_FLAGS]);
240#endif
241 uint16 ACC (RW, animation_id);/* An index into the animation array */
242 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
243 uint8 ACC (RW, last_anim); /* last sequence used to draw face */ 260 uint8 ACC (RW, last_anim); /* last sequence used to draw face */
244 sint16 ACC (RW, elevation); /* elevation of this terrain - not currently used */
245 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ 261 uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
246 uint8 ACC (RW, will_apply); /* See crossfire.doc */ 262 uint8 ACC (RW, will_apply); /* See crossfire.doc */
263 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
264 uint16 ACC (RW, animation_id);/* An index into the animation array */
265 uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */
266
267 uint16 ACC (RW, cached_eat); /* cached food, used by esrv_update_spells */
268 uint16 ACC (RW, cached_sp); /* cached spell points used for a spell, used by esrv_update_spells */
269 /* allows different movement patterns for attackers */
270 uint8 ACC (RW, move_status); /* What stage in attack mode */
271 uint8 ACC (RW, attack_movement);/* What kind of attack movement */
272
273 //16+ free bits
274
275 // rarely-accessed members should be at the end
276 shstr ACC (RW, tag); // a tag used to tracking this object
277 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
278 shstr ACC (RW, lore); /* Obscure information about this object, */
279 /* To get put into books and the like. */
280 shstr ACC (RW, custom_name); /* Custom name assigned by player */
247}; 281};
248 282
283const_utf8_string query_weight (const object *op);
284const_utf8_string query_short_name (const object *op);
285const_utf8_string query_name (const object *op);
286const_utf8_string query_base_name (const object *op, int plural);
287sint64 query_cost (const object *tmp, object *who, int flag);
288const char *query_cost_string (const object *tmp, object *who, int flag);
289
290int change_ability_duration (object *spell, object *caster);
291int min_casting_level (object *caster, object *spell);
292int casting_level (object *caster, object *spell);
293sint16 SP_level_spellpoint_cost (object *caster, object *spell, int flags);
294int SP_level_dam_adjust (object *caster, object *spob);
295int SP_level_duration_adjust (object *caster, object *spob);
296int SP_level_range_adjust (object *caster, object *spob);
297
249struct object : zero_initialised, object_copy 298struct object : zero_initialised, object_copy
250{ 299{
251 // These variables are not changed by ->copy_to 300 // These variables are not changed by ->copy_to
252 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */ 301 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
253 302
254 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. 303 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
255 int ACC (RO, count); 304 int ACC (RO, count);
256 object_vector_index ACC (RO, index); // index into objects 305 object_vector_index ACC (RO, index); // index into objects
257 object_vector_index ACC (RO, active); // index into actives 306 object_vector_index ACC (RO, active); // index into actives
262 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 311 object *ACC (RW, above); /* Pointer to the object stacked above this one */
263 /* Note: stacked in the *same* environment */ 312 /* Note: stacked in the *same* environment */
264 object *inv; /* Pointer to the first object in the inventory */ 313 object *inv; /* Pointer to the first object in the inventory */
265 314
266 //TODO: container must move into client 315 //TODO: container must move into client
267 object_ptr ACC (RW, container); /* Current container being used. I think this 316 object_ptr ACC (RW, container);/* Currently opened container. I think this
268 * is only used by the player right now. 317 * is only used by the player right now.
269 */ 318 */
270 object *ACC (RW, env); /* Pointer to the object which is the environment. 319 object *ACC (RW, env); /* Pointer to the object which is the environment.
271 * This is typically the container that the object is in. 320 * This is typically the container that the object is in.
272 */ 321 */
273 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 322 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
274 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 323 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
275 client_container *seen_by; // seen by which player/container currently?
276 key_value *key_values; /* Fields not explictly known by the loader. */ 324 key_value *key_values; /* Fields not explictly known by the loader. */
325
326 // privates / perl
327 shstr_tmp kv_get (shstr_tmp key) const;
328 void kv_del (shstr_tmp key);
329 void kv_set (shstr_tmp key, shstr_tmp value);
330
331//-GPL
332
333 // custom extra fields management
334 struct key_value_access_proxy
335 {
336 object &ob;
337 shstr_tmp key;
338
339 key_value_access_proxy (object &ob, shstr_tmp key)
340 : ob (ob), key (key)
341 {
342 }
343
344 const key_value_access_proxy &operator =(shstr_tmp value) const
345 {
346 ob.kv_set (key, value);
347 return *this;
348 }
349
350 operator const shstr_tmp () const { return ob.kv_get (key); }
351 operator const char *() const { return ob.kv_get (key); }
352
353 private:
354 void operator =(int);
355 };
356
357 // operator [] is too annoying to use
358 const key_value_access_proxy kv (shstr_tmp key)
359 {
360 return key_value_access_proxy (*this, key);
361 }
277 362
278 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all 363 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
279 MTH void post_load_check (); // do some adjustments after parsing 364 MTH void post_load_check (); // do some adjustments after parsing
280 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go. 365 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
281 bool write (object_freezer &f); 366 bool write (object_freezer &f);
282 367
283 MTH int slottype () const;
284 MTH static object *create (); 368 MTH static object *create ();
285 const mapxy &operator =(const mapxy &pos); 369 const mapxy &operator =(const mapxy &pos);
286 object &operator =(const object &src);
287 MTH void copy_to (object *dst); 370 MTH void copy_to (object *dst);
288 MTH object *clone (); // create + copy_to 371 MTH object *clone (); // create + copy_to a single object
372 MTH object *deep_clone (); // copy whole more chain and inventory
289 void do_destroy (); 373 void do_destroy ();
290 void gather_callbacks (AV *&callbacks, event_type event) const; 374 void gather_callbacks (AV *&callbacks, event_type event) const;
291 MTH void destroy (bool destroy_inventory = false); 375 MTH void destroy ();
376 MTH void drop_and_destroy ()
377 {
378 destroy_inv (true);
379 destroy ();
380 }
292 381
293 // recursively destroy all objects in inventory, optionally dropping them to the ground instead 382 // recursively destroy all objects in inventory, optionally dropping them to the ground instead
294 MTH void destroy_inv (bool drop_to_ground = false); 383 MTH void destroy_inv (bool drop_to_ground = false);
384 MTH void destroy_inv_fast (); // like destroy_inv (false), but only works when *this is destroyed, too
295 MTH object *insert (object *item); // insert into inventory 385 MTH object *insert (object *item); // insert into inventory
296 MTH void play_sound (faceidx sound) const; 386 MTH void play_sound (faceidx sound) const;
387 MTH void say_msg (const_utf8_string msg) const;
297 388
298 void do_remove (); 389 void do_remove ();
299 MTH void remove () 390 MTH void remove ()
300 { 391 {
301 if (!flag [FLAG_REMOVED]) 392 if (!flag [FLAG_REMOVED])
309 remove (); 400 remove ();
310 *this = pos; 401 *this = pos;
311 insert_at (this, this); 402 insert_at (this, this);
312 } 403 }
313 404
405 // high-level move method.
406 // object op is trying to move in direction dir.
407 // originator is typically the same as op, but
408 // can be different if originator is causing op to
409 // move (originator is pushing op)
410 // returns 0 if the object is not able to move to the
411 // desired space, 1 otherwise (in which case we also
412 // move the object accordingly. This function is
413 // very similiar to move_object.
414 int move (int dir, object *originator);
415
416 int move (int dir)
417 {
418 return move (dir, this);
419 }
420
421 // changes move_type to a new value - handles move_on/move_off effects
422 MTH void change_move_type (MoveType mt);
423
314 static bool can_merge_slow (object *op1, object *op2); 424 static bool can_merge_slow (object *op1, object *op2);
315 425
316 // this is often used in time-critical code, so optimise 426 // this is often used in time-critical code, so optimise
317 MTH static bool can_merge (object *op1, object *op2) 427 MTH static bool can_merge (object *op1, object *op2)
318 { 428 {
321 && can_merge_slow (op1, op2); 431 && can_merge_slow (op1, op2);
322 } 432 }
323 433
324 MTH void set_owner (object *owner); 434 MTH void set_owner (object *owner);
325 MTH void set_speed (float speed); 435 MTH void set_speed (float speed);
326 MTH bool change_weapon (object *ob); 436 MTH void set_glow_radius (sint8 rad);
327 MTH bool change_skill (object *ob); 437 MTH bool change_skill (object *ob); // deprecated?
328 438
329 MTH void open_container (object *new_container); 439 MTH void open_container (object *new_container);
330 MTH void close_container () 440 MTH void close_container ()
331 { 441 {
332 open_container (0); 442 open_container (0);
333 } 443 }
334 444
445 // potential future accessor for "container"
446 MTH object *container_ () const
447 {
448 return container;
449 }
450
451 MTH bool is_open_container () const
452 {
453 // strangely enough, using ?: here causes code to inflate
454 return type == CONTAINER
455 && ((env && env->container_ () == this)
456 || (!env && flag [FLAG_APPLIED]));
457 }
458
335 MTH object *force_find (const shstr name); 459 MTH object *force_find (shstr_tmp name);
460 MTH void force_set_timer (int duration);
336 MTH void force_add (const shstr name, int duration = 0); 461 MTH object *force_add (shstr_tmp name, int duration = 0);
462
463 oblinkpt *find_link () const;
464 MTH void add_link (maptile *map, shstr_tmp id);
465 MTH void remove_link ();
337 466
338 // overwrite the attachable should_invoke function with a version that also checks ev_want_type 467 // overwrite the attachable should_invoke function with a version that also checks ev_want_type
339 bool should_invoke (event_type event) 468 bool should_invoke (event_type event)
340 { 469 {
341 return ev_want_event [event] || ev_want_type [type] || cb; 470 return ev_want_event [event] || ev_want_type [type] || cb;
352 MTH void drain_stat (); 481 MTH void drain_stat ();
353 MTH void drain_specific_stat (int deplete_stats); 482 MTH void drain_specific_stat (int deplete_stats);
354 MTH void change_luck (int value); 483 MTH void change_luck (int value);
355 484
356 // info must hold 256 * 3 bytes currently 485 // info must hold 256 * 3 bytes currently
357 const char *debug_desc (char *info) const; 486 const_utf8_string debug_desc (char *info) const;
358 MTH const char *debug_desc () const; // uses at least 3 round-robin buffers 487 MTH const_utf8_string debug_desc () const; // uses at least 3 round-robin buffers
359 const char *flag_desc (char *desc, int len) const; 488 const_utf8_string flag_desc (char *desc, int len) const;
360 489
490 MTH bool decrease (sint32 nr = 1); // returns true if anything is left
491 MTH object *split (sint32 nr = 1); // return 0 on failure
492
361 int number_of () const 493 MTH int number_of () const
362 { 494 {
363 return nrof ? nrof : 1; 495 return nrof ? nrof : 1;
364 } 496 }
365 497
366 uint64 total_weight () const 498 MTH sint32 total_weight () const
367 { 499 {
368 return weight * number_of (); 500 return (weight + carrying) * number_of ();
369 } 501 }
502
503 MTH void update_weight ();
370 504
371 // return the dominant material of this item, always return something 505 // return the dominant material of this item, always return something
372 const materialtype_t *dominant_material () const; 506 const materialtype_t *dominant_material () const
507 {
508 return material;
509 }
373 510
374 // return the volume of this object in cm³ 511 // return the volume of this object in cm³
375 uint64 volume () const 512 MTH uint64 volume () const
376 { 513 {
377 return total_weight () 514 return (uint64)total_weight ()
378 * 1000 515 * 1024 // 1000 actually
379 * (type == CONTAINER ? 1000 : 1) 516 * (type == CONTAINER ? 128 : 1)
380 / dominant_material ()->density; 517 / dominant_material ()->density; // ugh, division
381 } 518 }
382 519
520 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
521
522 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
383 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; } 523 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
384 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET 524 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET
385 || type == CLOAK || type == BOOTS || type == GLOVES 525 || type == CLOAK || type == BOOTS || type == GLOVES
386 || type == BRACERS || type == GIRDLE; } 526 || type == BRACERS || type == GIRDLE; }
387 MTH bool is_alive () const { return (type == PLAYER 527 MTH bool is_alive () const { return (type == PLAYER
391 MTH bool is_arrow () const { return type == ARROW 531 MTH bool is_arrow () const { return type == ARROW
392 || (type == SPELL_EFFECT 532 || (type == SPELL_EFFECT
393 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } 533 && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
394 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; } 534 MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
395 535
536 MTH bool is_dragon () const;
537
538 MTH bool is_immunity () const { return invisible && type == SIGN; }
539
396 MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; } 540 MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
397 541
398 // temporary: wether the object can be saved in a map file 542 // temporary: wether the object can be saved in a map file
399 // contr => is a player 543 // contr => is a player
400 // head => only save head of a multitile object 544 // head => only save head of a multitile object
401 // owner => can not reference owner yet 545 // owner => can not reference owner yet
404 /* This return true if object has still randomitems which 548 /* This return true if object has still randomitems which
405 * could be expanded. 549 * could be expanded.
406 */ 550 */
407 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } 551 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
408 552
553 static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
554
555 MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
556
557 // returns the outermost owner, never returns 0
558 MTH object *outer_owner ()
559 {
560 object *op;
561
562 for (op = this; op->owner; op = op->owner)
563 ;
564
565 return op;
566 }
567
568 // returns the outermost environment, never returns 0
569 MTH object *outer_env_or_self () const
570 {
571 const object *op;
572
573 for (op = this; op->env; op = op->env)
574 ;
575
576 return const_cast<object *>(op);
577 }
578
579 // returns the outermost environment, may return 0
580 MTH object *outer_env () const
581 {
582 return env ? outer_env_or_self () : 0;
583 }
584
409 // returns the player that has this object in his inventory, or 0 585 // returns the player that has this object in his inventory, or 0
586 // we assume the player is always the outer env
410 MTH object *in_player () const 587 MTH object *in_player () const
411 { 588 {
412 for (object *op = env; op; op = op->env) 589 object *op = outer_env_or_self ();
413 if (op->type == PLAYER)
414 return op;
415 590
416 return 0; 591 return op->type == PLAYER ? op : 0;
417 } 592 }
418 593
419 // "temporary" helper function 594 // "temporary" helper function
420 MTH object *head_ () 595 MTH object *head_ () const
421 { 596 {
422 return head ? head : this; 597 return head ? head : const_cast<object *>(this);
423 } 598 }
424 599
425 MTH bool is_head () 600 MTH bool is_head () const
426 { 601 {
427 return head_ () == this; 602 return head_ () == this;
428 } 603 }
429 604
605 MTH bool is_on_map () const
606 {
607 return !env && !flag [FLAG_REMOVED];
608 }
609
610 MTH bool is_inserted () const
611 {
612 return !flag [FLAG_REMOVED];
613 }
614
615 MTH bool is_player () const
616 {
617 return !!contr;
618 }
619
620 /* elmex: this method checks whether the object is in a shop */
621 MTH bool is_in_shop () const;
622
623 MTH bool affects_los () const
624 {
625 return glow_radius || flag [FLAG_BLOCKSVIEW];
626 }
627
628 MTH bool has_carried_lights () const
629 {
630 return glow_radius;
631 }
632
633 // returns the player that cna see this object, if any
634 MTH object *visible_to () const;
635
430 MTH std::string long_desc (object *who = 0); 636 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
431 MTH std::string describe_monster (object *who = 0); 637 MTH std::string describe_monster (object *who = 0);
432 MTH std::string describe_item (object *who = 0); 638 MTH std::string describe_item (object *who = 0);
433 MTH std::string describe (object *who = 0); 639 MTH std::string describe (object *who = 0); // long description, without name
640
641 MTH const_utf8_string query_weight () { return ::query_weight (this); }
642 MTH const_utf8_string query_name () { return ::query_name (this); }
643 MTH const_utf8_string query_short_name () { return ::query_short_name (this); }
644 MTH const_utf8_string query_base_name (bool plural) { return ::query_base_name (this, plural); }
434 645
435 // If this object has no extra parts but should have them, 646 // If this object has no extra parts but should have them,
436 // add them, effectively expanding heads into multipart 647 // add them, effectively expanding heads into multipart
437 // objects. This method only works on objects not inserted 648 // objects. This method only works on objects not inserted
438 // anywhere. 649 // anywhere.
441 MTH void create_treasure (treasurelist *tl, int flags = 0); 652 MTH void create_treasure (treasurelist *tl, int flags = 0);
442 653
443 // insert object at same map position as 'where' 654 // insert object at same map position as 'where'
444 // handles both inventory and map "positions" 655 // handles both inventory and map "positions"
445 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 656 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
657 // check whether we can put this into the map, respect max_nrof, max_volume, max_items
658 MTH bool can_drop_at (maptile *m, int x, int y, object *originator = 0);
446 MTH void drop_unpaid_items (); 659 MTH void drop_unpaid_items ();
447 660
448 MTH void activate (); 661 MTH void activate ();
449 MTH void deactivate (); 662 MTH void deactivate ();
450 MTH void activate_recursive (); 663 MTH void activate_recursive ();
451 MTH void deactivate_recursive (); 664 MTH void deactivate_recursive ();
452 665
453 // set the givne flag on all objects in the inventory recursively 666 // set the given flag on all objects in the inventory recursively
454 MTH void set_flag_inv (int flag, int value = 1); 667 MTH void set_flag_inv (int flag, int value = 1);
455 668
456 void enter_exit (object *exit);//Perl 669 void enter_exit (object *exit);//Perl
457 MTH void enter_map (maptile *newmap, int x, int y); 670 MTH void enter_map (maptile *newmap, int x, int y);
671 void player_goto (const_utf8_string path, int x, int y); // only for players
672 MTH bool apply (object *ob, int aflags = AP_APPLY); // ob may be 0
458 673
459 // returns the mapspace this object is in 674 // returns the mapspace this object is in
460 mapspace &ms () const; 675 mapspace &ms () const;
461 676
462 // fully recursive iterator 677 // fully recursive iterator
498 { 713 {
499 return this; 714 return this;
500 } 715 }
501 716
502 /* This returns TRUE if the object is something that 717 /* This returns TRUE if the object is something that
503 * should be displayed in the floorbox/inventory window 718 * a client might want to know about.
504 */ 719 */
505 MTH bool client_visible () const 720 MTH bool client_visible () const
506 { 721 {
507 return !invisible && type != PLAYER; 722 return !invisible && type != PLAYER;
508 } 723 }
509 724
725 // the client does nrof * this weight
726 MTH sint32 client_weight () const
727 {
728 return weight + carrying;
729 }
730
510 MTH struct region *region () const; 731 MTH struct region *region () const;
511 732
512 void statusmsg (const char *msg, int color = NDI_BLACK); 733 void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
513 void failmsg (const char *msg, int color = NDI_RED); 734 void failmsg (const_utf8_string msg, int color = NDI_RED);
735 void failmsgf (const_utf8_string format, ...); // always NDI_RED...
514 736
515 const char *query_inventory (object *who = 0, const char *indent = ""); 737 const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
516 738
517 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference 739 MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
518 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible 740 static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
741
742 // make some noise with given item into direction dir,
743 // currently only used for players to make them temporarily visible
744 // when they are invisible.
745 MTH void make_noise ();
746
747 /* animation */
748 MTH bool has_anim () const { return animation_id; }
749 const animation &anim () const { return animations [animation_id]; }
750 MTH faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
751 MTH void set_anim_frame (int frame) { face = get_anim_frame (frame); }
752 /* anim_frames () returns the number of animations allocated. The last
753 * usuable animation will be anim_frames () - 1 (for example, if an object
754 * has 8 animations, anim_frames () will return 8, but the values will
755 * range from 0 through 7.
756 */
757 MTH int anim_frames () const { return anim ().num_animations; }
758 MTH int anim_facings () const { return anim ().facings; }
759
760 MTH utf8_string as_string ();
519 761
520protected: 762protected:
521 void link (); 763 void link ();
522 void unlink (); 764 void unlink ();
523 765
524 object (); 766 object ();
525 ~object (); 767 ~object ();
768
769private:
770 object &operator =(const object &);
771 object (const object &);
526}; 772};
527 773
528// move this object to the top of its env's inventory to speed up 774// move this object to the top of its env's inventory to speed up
529// searches for it. 775// searches for it.
530static object * 776static inline object *
531splay (object *ob) 777splay (object *ob)
532{ 778{
533 if (ob->env && ob->env->inv != ob) 779 if (ob->above && ob->env)
534 { 780 {
535 if (ob->above) ob->above->below = ob->below; 781 if (ob->above) ob->above->below = ob->below;
536 if (ob->below) ob->below->above = ob->above; 782 if (ob->below) ob->below->above = ob->above;
537 783
538 ob->above = 0; 784 ob->above = 0;
542 } 788 }
543 789
544 return ob; 790 return ob;
545} 791}
546 792
547typedef struct oblnk 793//+GPL
548{ /* Used to link together several objects */
549 object_ptr ob;
550 struct oblnk *next;
551} objectlink;
552 794
553typedef struct oblinkpt
554{ /* Used to link together several object links */
555 struct oblnk *link;
556 long value; /* Used as connected value in buttons/gates */
557 struct oblinkpt *next;
558} oblinkpt;
559
560object *find_skill_by_name (object *who, const char *name); 795object *find_skill_by_name_fuzzy (object *who, const_utf8_string name);
561object *find_skill_by_name (object *who, const shstr &sh); 796object *find_skill_by_name (object *who, shstr_cmp sh);
562object *find_skill_by_number (object *who, int skillno); 797object *find_skill_by_number (object *who, int skillno);
563 798
564/* 799/*
565 * The archetype structure is a set of rules on how to generate and manipulate 800 * The archetype structure is a set of rules on how to generate and manipulate
566 * objects which point to archetypes. 801 * objects which point to archetypes.
568 * be much left in the archetype - all it really is is a holder for the 803 * be much left in the archetype - all it really is is a holder for the
569 * object and pointers. This structure should get removed, and just replaced 804 * object and pointers. This structure should get removed, and just replaced
570 * by the object structure 805 * by the object structure
571 */ 806 */
572 807
808//-GPL
809
573INTERFACE_CLASS (archetype) 810INTERFACE_CLASS (archetype)
574struct archetype : object 811struct archetype : object
575{ 812{
576 archetype (const char *name); 813 static arch_ptr empty; // the empty_archetype
814 MTH static void gc ();
815
816 archetype (const_utf8_string name);
577 ~archetype (); 817 ~archetype ();
578 void gather_callbacks (AV *&callbacks, event_type event) const; 818 void gather_callbacks (AV *&callbacks, event_type event) const;
579 819
580 static archetype *read (object_thawer &f);
581
582 MTH static archetype *get (const_utf8_string name); // find or create
583 MTH static archetype *find (const_utf8_string name); 820 MTH static archetype *find (const_utf8_string name);
584 821
585 MTH void link (); 822 MTH void link ();
586 MTH void unlink (); 823 MTH void unlink ();
587 824
825 MTH static object *get (const_utf8_string name); // (find() || singularity)->instance()
588 MTH object *instance (); 826 MTH object *instance ();
827
828 MTH void post_load_check (); // do some adjustments after parsing
589 829
590 object_vector_index ACC (RW, archid); // index in archvector 830 object_vector_index ACC (RW, archid); // index in archvector
591 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 831 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
592 bool ACC (RW, stub); // if true, this is an invalid archetype
593 832
594 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 833 sint8 ACC (RW, max_x); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
595 sint8 ACC (RW, max_x), ACC (RW, max_y); 834
835 // support for archetype loading
836 static archetype *read (object_thawer &f);
837 MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
838 static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
596}; 839};
597 840
841// returns whether the object is a dragon player, which are often specialcased
842inline bool
843object::is_dragon () const
844{
845 return arch->race == shstr_dragon && is_player ();
846}
847
598inline void 848inline void
599object_freezer::put (keyword k, archetype *v) 849object_freezer::put (const keyword_string k, archetype *v)
600{ 850{
601 put (k, v ? &v->archname : (const char *)0); 851 if (expect_true (v))
852 put (k, v->archname);
853 else
854 put (k);
602} 855}
603 856
604typedef object_vector<object, &object::index > objectvec; 857typedef object_vector<object, &object::index > objectvec;
605typedef object_vector<object, &object::active> activevec; 858typedef object_vector<object, &object::active> activevec;
606typedef object_vector<archetype, &archetype::archid> archvec; 859typedef object_vector<archetype, &archetype::archid> archvec;
607 860
608extern objectvec objects; 861extern objectvec objects;
609extern activevec actives; 862extern activevec actives;
610extern archvec archetypes; 863extern archvec archetypes;
611 864
865// "safely" iterate over inv in a way such that the current item is removable
866// quite horrible, that's why its hidden in some macro
867#define for_inv_removable(op,var) \
868 for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
869
612#define for_all_objects(var) \ 870#define for_all_objects(var) \
613 for (unsigned _i = 0; _i < objects.size (); ++_i) \ 871 for (unsigned _i = 0; _i < objects.size (); ++_i) \
614 statementvar (object *, var, objects [_i]) 872 statementvar (object *, var, objects [_i])
615 873
616#define for_all_actives(var) \ 874#define for_all_actives(var) \
617 for (unsigned _i = 0; _i < actives.size (); ++_i) \ 875 for (unsigned _i = 0; _i < actives.size (); ++_i) \
618 statementvar (object *, var, actives [_i]) 876 statementvar (object *, var, actives [_i])
619 877
620#define for_all_archetypes(var) \ 878#define for_all_archetypes(var) \
621 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \ 879 for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
622 statementvar (archetype *, var, archetypes [_i]) 880 statementvar (archetype *, var, archetypes [_i])
881
882//+GPL
623 883
624/* Used by update_object to know if the object being passed is 884/* Used by update_object to know if the object being passed is
625 * being added or removed. 885 * being added or removed.
626 */ 886 */
627#define UP_OBJ_INSERT 1 887#define UP_OBJ_INSERT 1
657#define INS_ABOVE_FLOOR_ONLY 0x0002 917#define INS_ABOVE_FLOOR_ONLY 0x0002
658#define INS_NO_WALK_ON 0x0004 918#define INS_NO_WALK_ON 0x0004
659#define INS_ON_TOP 0x0008 919#define INS_ON_TOP 0x0008
660#define INS_BELOW_ORIGINATOR 0x0010 920#define INS_BELOW_ORIGINATOR 0x0010
661 921
662#define ARCH_DEPLETION "depletion" 922//-GPL
663 923
664#endif 924#endif
665 925

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines