[ViewVC] Diff of: cvs/deliantra/server/include/object.h

Comparing deliantra/server/include/object.h (file contents):
Revision 1.56 by root, Mon Dec 18 02:35:01 2006 UTC vs.
Revision 1.70 by root, Tue Dec 26 08:54:59 2006 UTC

…		…
88	/* However, if you're keeping a pointer of some sort, you probably	88	/* However, if you're keeping a pointer of some sort, you probably
89	* don't just want it copied, so you'll need to add to common/object.C,	89	* don't just want it copied, so you'll need to add to common/object.C,
90	* e.g. ->copy_to ()	90	* e.g. ->copy_to ()
91	*/	91	*/
92		92
93	typedef refptr<object> object_ptr;
94	typedef refptr<archetype> arch_ptr;
95
96	// these are not being copied
97	ACC_CLASS (object)	93	INTERFACE_CLASS (object)
98	struct object_keep : refcounted
99	{
100	/* These variables are not changed by ->copy_to */
101
102	tag_t ACC (RW, count); /* Generation count for this object */
103	UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
104
105	player ACC (RW, contr); / Pointer to the player which control this object */
106	object ACC (RW, next); / Pointer to the next object in the free/used list */
107	object ACC (RW, prev); / Pointer to the previous object in the free/used list */
108	object ACC (RW, active_next);/ Next & previous object in the 'active' */
109	object ACC (RW, active_prev);/ List. This is used in process_events */
110	/* so that the entire object list does not */
111	/* need to be gone through. */
112	object ACC (RW, below); / Pointer to the object stacked below this one */
113	object ACC (RW, above); / Pointer to the object stacked above this one */
114	/* Note: stacked in the same environment */
115	object inv; / Pointer to the first object in the inventory */
116	object ACC (RW, container); / Current container being used. I think this
117	* is only used by the player right now.
118	*/
119	object ACC (RW, env); / Pointer to the object which is the environment.
120	* This is typically the container that the object is in.
121	*/
122	object ACC (RW, more); / Pointer to the rest of a large body of objects */
123	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different
124	maptile ACC (RW, map); / Pointer to the map in which this object is present */
125	};
126
127	// these are being copied	94	// these are being copied
128	struct object_copy : attachable<object>	95	struct object_copy : attachable
129	{	96	{
		97	typedef bitset<NUM_FLAGS> flags_t;
		98
		99	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
		100	sint8 ACC (RW, direction); /* Means the object is moving that way. */
		101	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
130	shstr ACC (RW, name); /* The name of the object, obviously... */	102	shstr ACC (RW, name); /* The name of the object, obviously... */
131	shstr ACC (RW, name_pl); /* The plural name of the object */	103	shstr ACC (RW, name_pl); /* The plural name of the object */
132	shstr ACC (RW, title); /* Of foo, etc */	104	shstr ACC (RW, title); /* Of foo, etc */
133	shstr ACC (RW, race); /* human, goblin, dragon, etc */	105	shstr ACC (RW, race); /* human, goblin, dragon, etc */
134	shstr ACC (RW, slaying); /* Which race to do double damage to */	106	shstr ACC (RW, slaying); /* Which race to do double damage to */
135	/* If this is an exit, this is the filename */	107	/* If this is an exit, this is the filename */
136	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */	108	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
137	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */	109	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
138	shstr ACC (RW, lore); /* Obscure information about this object, */	110	shstr ACC (RW, lore); /* Obscure information about this object, */
139	/* To get put into books and the like. */	111	/* To get put into books and the like. */
140	shstr ACC (RW, materialname); /* specific material name */	112	shstr ACC (RW, materialname); /* specific material name */
141	shstr ACC (RW, custom_name); /* Custom name assigned by player */	113	shstr ACC (RW, custom_name); /* Custom name assigned by player */
142	object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */	114	object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
143	object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */	115	object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
144	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */	116	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
145	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */	117	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
146	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */	118	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
147	object_ptr ACC (RW, spell); /* Spell that was being cast */	119	object_ptr ACC (RW, spell); /* Spell that was being cast */
148	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */	120	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
149	};	121	arch_ptr ACC (RW, arch); /* Pointer to archetype */
		122	arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
150		123
151	// these are being copied and also cleared
152	struct object_pod
153	{
154	New_Face ACC (RW, face); / Face with colors */	124	New_Face ACC (RW, face); / Face with colors */
155	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
156	float ACC (RW, speed); /* The overall speed of this object */	125	float ACC (RW, speed); /* The overall speed of this object */
157	float ACC (RW, speed_left); /* How much speed is left to spend this round */	126	float ACC (RW, speed_left); /* How much speed is left to spend this round */
158	uint32 ACC (RW, nrof); /* How many of the objects */	127	uint32 ACC (RW, nrof); /* How many of the objects */
159	sint8 ACC (RW, direction); /* Means the object is moving that way. */
160	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
161		128
162	/* This next big block are basically used for monsters and equipment */	129	/* This next big block are basically used for monsters and equipment */
163	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */	130	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
164	uint8 ACC (RW, subtype); /* subtype of object */	131	uint8 ACC (RW, subtype); /* subtype of object */
165	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */	132	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
166	sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */	133	sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */
167	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */	134	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
168	uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */	135	uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
169	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */	136	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
170	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */	137	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
171	uint16 ACC (RW, material); /* What materials this object consist of */	138	uint16 ACC (RW, material); /* What materials this object consist of */
…		…
189	sint32 ACC (RW, weight_limit);/* Weight-limit of object */	156	sint32 ACC (RW, weight_limit);/* Weight-limit of object */
190	sint32 ACC (RW, carrying); /* How much weight this object contains */	157	sint32 ACC (RW, carrying); /* How much weight this object contains */
191	sint64 ACC (RW, perm_exp); /* Permanent exp */	158	sint64 ACC (RW, perm_exp); /* Permanent exp */
192	uint32 ACC (RW, weapontype); /* type of weapon */	159	uint32 ACC (RW, weapontype); /* type of weapon */
193	uint32 ACC (RW, tooltype); /* type of tool or build facility */	160	uint32 ACC (RW, tooltype); /* type of tool or build facility */
194	sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */	161	sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]); /* body info as loaded from the file */
195	sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */	162	sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]); /* Calculated value based on items equipped */
196	living ACC (RO, stats); /* Str, Con, Dex, etc */	163	living ACC (RO, stats); /* Str, Con, Dex, etc */
197	/* See the doc/Developers/objects for more info about body locations */	164	/* See the pod/objects.pod for more info about body locations */
198		165
199	/* Following mostly refers to fields only used for monsters */	166	/* Following mostly refers to fields only used for monsters */
200	uint32 ACC (RW, hide); /* The object is hidden, not invisible */	167	uint32 ACC (RW, hide); /* The object is hidden, not invisible */
201	/* changes made by kholland@sunlab.cit.cornell.edu */	168
202	/* allows different movement patterns for attackers */	169	/* allows different movement patterns for attackers */
203	sint32 ACC (RW, move_status); /* What stage in attack mode */	170	sint32 ACC (RW, move_status); /* What stage in attack mode */
204	uint16 ACC (RW, attack_movement); /* What kind of attack movement */	171	uint16 ACC (RW, attack_movement); /* What kind of attack movement */
205	uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */	172	uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
206	float ACC (RW, expmul); /* needed experience = (calc_expexpmul) - means some /	173	float ACC (RW, expmul); /* needed experience = (calc_expexpmul) - means some /
207	/* races/classes can need less/more exp to gain levels */	174	/* races/classes can need less/more exp to gain levels */
208		175
209	/* Spell related information, may be useful elsewhere	176	/* Spell related information, may be useful elsewhere
210	* Note that other fields are used - these files are basically	177	* Note that other fields are used - these files are basically
211	* only used in spells.	178	* only used in spells.
212	*/	179	*/
…		…
215	uint16 ACC (RW, start_holding);	182	uint16 ACC (RW, start_holding);
216	uint8 ACC (RW, duration_modifier); /* how level modifies duration */	183	uint8 ACC (RW, duration_modifier); /* how level modifies duration */
217	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */	184	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
218	sint8 ACC (RW, range); /* Range of the spell */	185	sint8 ACC (RW, range); /* Range of the spell */
219	uint8 ACC (RW, range_modifier); /* How going up in level effects range */	186	uint8 ACC (RW, range_modifier); /* How going up in level effects range */
220	char *ACC (RW, spellarg);
221
222	/* Following are values used by any object */
223	/* this objects turns into or what this object creates */
224	treasurelist ACC (RW, randomitems); / Items to be generated */
225	arch_ptr ACC (RW, arch); /* Pointer to archetype */
226	arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
227	key_value key_values; / Fields not explictly known by the loader. */
228	std::bitset<NUM_FLAGS> flags; /* various flags */
229	uint16 ACC (RW, animation_id);/* An index into the animation array */
230	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
231	uint8 ACC (RW, last_anim); /* last sequence used to draw face */
232	sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
233	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
234	uint8 ACC (RW, will_apply); /* See crossfire.doc */
235		187
236	MoveType ACC (RW, move_type); /* Type of movement this object uses */	188	MoveType ACC (RW, move_type); /* Type of movement this object uses */
237	MoveType ACC (RW, move_block);/* What movement types this blocks */	189	MoveType ACC (RW, move_block);/* What movement types this blocks */
238	MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */	190	MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
239	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */	191	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
240	MoveType ACC (RW, move_off); /* Move types affected moving off this space */	192	MoveType ACC (RW, move_off); /* Move types affected moving off this space */
241	MoveType ACC (RW, move_slow); /* Movement types this slows down */	193	MoveType ACC (RW, move_slow); /* Movement types this slows down */
242	float ACC (RW, move_slow_penalty); /* How much this slows down the object */	194	float ACC (RW, move_slow_penalty); /* How much this slows down the object */
		195
		196	char *ACC (RW, spellarg);
		197
		198	/* Following are values used by any object */
		199	/* this objects turns into or what this object creates */
		200	treasurelist ACC (RW, randomitems); / Items to be generated */
		201	key_value key_values; / Fields not explictly known by the loader. */
		202	flags_t flag; /* various flags */
		203	#if FOR_PERL
		204	bool ACC (RW, flag[NUM_FLAGS]);
		205	#endif
		206	uint16 ACC (RW, animation_id);/* An index into the animation array */
		207	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
		208	uint8 ACC (RW, last_anim); /* last sequence used to draw face */
		209	sint16 ACC (RW, elevation); /* elevation of this terrain - not currently used */
		210	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
		211	uint8 ACC (RW, will_apply); /* See crossfire.doc */
243	};	212	};
244		213
245	struct object : zero_initialised, object_keep, object_copy, object_pod	214	struct object : zero_initialised, object_copy
246	{	215	{
247	typedef unordered_vector<object *> vector;	216	typedef unordered_vector<object *> vector;
248		217
249	static vector mortals;	218	// These variables are not changed by ->copy_to
		219	maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */
		220
		221	tag_t ACC (RW, count); /* Generation count for this object */
		222	UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
		223
		224	player_ptr ACC (RW, contr); /* Pointer to the player which control this object */
		225	object ACC (RW, next); / Pointer to the next object in the free/used list */
		226	object ACC (RW, prev); / Pointer to the previous object in the free/used list */
		227	object ACC (RW, active_next);/ Next & previous object in the 'active' */
		228	object ACC (RW, active_prev);/ List. This is used in process_events */
		229	/* so that the entire object list does not */
		230	/* need to be gone through. */
		231	object ACC (RW, below); / Pointer to the object stacked below this one */
		232	object ACC (RW, above); / Pointer to the object stacked above this one */
		233	/* Note: stacked in the same environment */
		234	object inv; / Pointer to the first object in the inventory */
		235	object ACC (RW, container); / Current container being used. I think this
		236	* is only used by the player right now.
		237	*/
		238	object ACC (RW, env); / Pointer to the object which is the environment.
		239	* This is typically the container that the object is in.
		240	*/
		241	object ACC (RW, more); / Pointer to the rest of a large body of objects */
		242	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different
		243	client_container *seen_by; // seen by which player/container currently?
		244
250	static vector active; // active objects, not yet used	245	static vector active; // active objects, not yet used
251	static vector objects; // not used yet, use first->next->...	246	static vector objects; // not used yet, use first->next->...
252	static object *first; // will be replaced by "objects"	247	static object *first; // will be replaced by "objects"
253		248
254	static object *create ();	249	MTH static object *create ();
255	void copy_to (object *dst);	250	MTH void copy_to (object *dst);
256	object *clone (); // create + copy_to	251	MTH object *clone (); // create + copy_to
		252	void do_destroy ();
		253	void gather_callbacks (AV *&callbacks, event_type event) const;
257	void destroy (bool destroy_inventory = false);	254	MTH void destroy (bool destroy_inventory = false);
		255
		256	// recursively destroy all objects in inventory, optionally dropping them to the ground instead
		257	MTH void destroy_inv (bool drop_to_ground = false);
258	void remove ();	258	MTH void remove ();
259	object insert (object item); // insert into inventory	259	MTH object insert (object item); // insert into inventory
260		260
261	static void free_mortals ();
262	static bool can_merge_slow (object op1, object op2);	261	static bool can_merge_slow (object op1, object op2);
263		262
264	// this is often used in time-critical code, so optimise	263	// this is often used in time-critical code, so optimise
265	static bool can_merge (object op1, object op2)	264	MTH static bool can_merge (object op1, object op2)
266	{	265	{
267	return op1->value == op2->value	266	return op1->value == op2->value
268	&& op1->name == op2->name	267	&& op1->name == op2->name
269	&& can_merge_slow (op1, op2);	268	&& can_merge_slow (op1, op2);
270	}	269	}
271		270
272	void clear ();
273
274	bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
275
276	void set_owner (object *owner);	271	MTH void set_owner (object *owner);
		272	MTH void set_speed (float speed);
277		273
278	void instantiate ()	274	MTH void instantiate ()
279	{	275	{
280	if (!uuid.seq) // HACK	276	if (!uuid.seq) // HACK
281	uuid = gen_uuid ();	277	uuid = gen_uuid ();
282		278
283	attachable<object>::instantiate ();	279	attachable::instantiate ();
284	}	280	}
285		281
		282	// recalculate all stats
		283	MTH void update_stats ();
		284	MTH void roll_stats ();
		285	MTH void swap_stats (int a, int b);
		286	MTH void add_statbonus ();
		287	MTH void remove_statbonus ();
		288	MTH void drain_stat ();
		289	MTH void drain_specific_stat (int deplete_stats);
		290	MTH void change_luck (int value);
		291
286	// info must hold 256 * 3 bytes currently	292	// info must hold 256 * 3 bytes currently
287	const char debug_desc (char info) const;	293	MTH const char debug_desc (char info) const;
288	const char *debug_desc () const;	294	MTH const char *debug_desc () const;
		295
		296	MTH bool is_weapon () const { return type == ARROW \|\| type == BOW \|\| type == WEAPON; }
		297	MTH bool is_armor () const { return type == ARMOUR \|\| type == SHIELD \|\| type == HELMET
		298	\|\| type == CLOAK \|\| type == BOOTS \|\| type == GLOVES
		299	\|\| type == BRACERS \|\| type == GIRDLE; }
		300	MTH bool is_alive () const { return (type == PLAYER
		301	\|\| flag [FLAG_MONSTER]
		302	\|\| (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR))
		303	&& !flag [FLAG_IS_A_TEMPLATE]; }
		304	MTH bool is_arrow () const { return type == ARROW
		305	\|\| (type == SPELL_EFFECT
		306	&& (subtype == SP_BULLET \|\| subtype == SP_MAGIC_MISSILE)); }
		307
		308	/* This return true if object has still randomitems which
		309	* could be expanded.
		310	*/
		311	MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
		312
		313	// returns the player that has this object in his inventory, or 0
		314	MTH object *in_player () const
		315	{
		316	for (object *op = env; op; op = op->env)
		317	if (op->type == PLAYER)
		318	return op;
		319
		320	return 0;
		321	}
		322
		323	// returns the mapspace this object is in
		324	mapspace &ms () const;
289		325
290	// fully recursive iterator	326	// fully recursive iterator
291	struct iterator_base	327	struct iterator_base
292	{	328	{
293	object *item;	329	object *item;
…		…
352	* be much left in the archetype - all it really is is a holder for the	388	* be much left in the archetype - all it really is is a holder for the
353	* object and pointers. This structure should get removed, and just replaced	389	* object and pointers. This structure should get removed, and just replaced
354	* by the object structure	390	* by the object structure
355	*/	391	*/
356		392
357	ACC_CLASS (archetype)	393	INTERFACE_CLASS (archetype)
358	struct archetype : zero_initialised, refcounted	394	struct archetype : zero_initialised, attachable
359	{	395	{
360	archetype ();	396	archetype ();
361	~archetype ();	397	~archetype ();
		398	void gather_callbacks (AV *&callbacks, event_type event) const;
362		399
363	static archetype find (const char arch);	400	static archetype find (const char arch);
364		401
365	void hash_add (); // add to hastable	402	void hash_add (); // add to hashtable
366	void hash_del (); // remove from hashtable	403	void hash_del (); // remove from hashtable
367		404
368	shstr ACC (RW, name); /* More definite name, like "generate_kobold" */	405	shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
369	struct archetype ACC (RW, next); / Next archetype in a linked list */	406	struct archetype ACC (RW, next); / Next archetype in a linked list */
370	struct archetype ACC (RW, head); / The main part of a linked object */	407	struct archetype ACC (RW, head); / The main part of a linked object */
…		…
382	extern int nrofallocobjects;	419	extern int nrofallocobjects;
383		420
384	/* This returns TRUE if the object is something that	421	/* This returns TRUE if the object is something that
385	* should be displayed in the look window	422	* should be displayed in the look window
386	*/	423	*/
387	#define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER && ob->type!=EVENT_CONNECTOR)	424	#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
388		425
389	/* Used by update_object to know if the object being passed is	426	/* Used by update_object to know if the object being passed is
390	* being added or removed.	427	* being added or removed.
391	*/	428	*/
392	#define UP_OBJ_INSERT 1	429	#define UP_OBJ_INSERT 1

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.56 by root, Mon Dec 18 02:35:01 2006 UTC vs. Revision 1.70 by root, Tue Dec 26 08:54:59 2006 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.56 by root, Mon Dec 18 02:35:01 2006 UTC vs.
Revision 1.70 by root, Tue Dec 26 08:54:59 2006 UTC