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

Diff Legend

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