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.191 by pippijn, Tue Dec 23 18:52:57 2008 UTC vs.
Revision 1.244 by root, Wed Apr 14 21:36:32 2010 UTC

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

Diff Legend

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