ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/player.h
(Generate patch)

Comparing deliantra/server/include/player.h (file contents):
Revision 1.94 by root, Wed Nov 4 17:24:00 2009 UTC vs.
Revision 1.97 by root, Mon Nov 9 18:47:56 2009 UTC

… …
21 * 21 *
22 * 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>
23 */ 23 */
24#ifndef PLAYER_H_ 24#ifndef PLAYER_H_
25#define PLAYER_H_ 25#define PLAYER_H_
26
27//+GPL
26 28
27enum bowtype_t 29enum bowtype_t
28{ 30{
29 bow_normal = 0, 31 bow_normal = 0,
30 bow_threewide = 1, 32 bow_threewide = 1,
… …
86 sint64 ACC (RW, total_exp); 88 sint64 ACC (RW, total_exp);
87 uint32 ACC (RW, kills); 89 uint32 ACC (RW, kills);
88}; 90};
89 91
90// used for pet monster logic etc. 92// used for pet monster logic etc.
91static bool 93static inline bool
92same_party (partylist *a, partylist *b) 94same_party (partylist *a, partylist *b)
93{ 95{
94 return a == b && a; 96 return a == b && a;
95} 97}
96 98
… …
172 int ACC (RW, stack_position); /* Current stack position, 0 for no item */ 174 int ACC (RW, stack_position); /* Current stack position, 0 for no item */
173 sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */ 175 sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */
174 /* the player can see. For maps smaller than */ 176 /* the player can see. For maps smaller than */
175 /* MAP_CLIENT_.., the center is used */ 177 /* MAP_CLIENT_.., the center is used */
176 178
179//-GPL
180
177 // return the los value for the given coordinate 181 // return the los value for the given coordinate
178 MTH sint8 blocked_los (int dx, int dy) const 182 MTH sint8 blocked_los (int dx, int dy) const
179 { 183 {
180 dx += LOS_X0; 184 dx += LOS_X0;
181 dy += LOS_Y0; 185 dy += LOS_Y0;
… …
256 260
257 // a prominent box that signifies some error such as a failed 261 // a prominent box that signifies some error such as a failed
258 // improvement potion. should not be long. 262 // improvement potion. should not be long.
259 MTH void failmsg (const char *msg, int color = NDI_RED); 263 MTH void failmsg (const char *msg, int color = NDI_RED);
260 264
265 MTH void update_spells () const
266 {
267 if (ns)
268 ns->update_spells = true;
269 }
270
261 ~player (); 271 ~player ();
262 272
263private: 273private:
264 void set_object (object *op); 274 void set_object (object *op);
265 player (); 275 player ();

Diff Legend

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