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.128 by root, Mon May 28 21:15:56 2007 UTC vs.
Revision 1.225 by root, Sat Jan 30 23:30:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines