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

Diff Legend

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