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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines