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.85 by root, Thu Jan 11 01:10:01 2007 UTC vs.
Revision 1.216 by root, Sun Nov 8 20:55:39 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines