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.84 by root, Thu Sep 25 22:58:13 2008 UTC vs.
Revision 1.91 by root, Sat Jun 27 08:25:36 2009 UTC

… …
103 usekeytype ACC (RW, usekeys); /* Method for finding keys for doors */ 103 usekeytype ACC (RW, usekeys); /* Method for finding keys for doors */
104 unapplymode ACC (RW, unapply); /* Method for auto unapply */ 104 unapplymode ACC (RW, unapply); /* Method for auto unapply */
105 uint32 ACC (RW, count); /* Any numbers typed before a command */ 105 uint32 ACC (RW, count); /* Any numbers typed before a command */
106 uint32 ACC (RW, mode); /* Mode of player for pickup. */ 106 uint32 ACC (RW, mode); /* Mode of player for pickup. */
107 107
108 int ACC (RW, digestion); /* Any bonuses/penalties to digestion */ 108 int ACC (RW, digestion); /* Any bonuses/penalties to digestion */
109 int ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */ 109 int ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */
110 int ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */ 110 int ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */
111 int ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */ 111 int ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */
112 int ACC (RW, gen_grace); /* Bonuses to regeneration speed of grace */ 112 int ACC (RW, gen_grace); /* Bonuses to regeneration speed of grace */
113 int ACC (RW, item_power); /* Total item power of objects equipped */ 113 int ACC (RW, item_power); /* Total item power of objects equipped */
114 uint8 ACC (RW, gender); /* 0 male, 1 female, others not yet defined */ 114 uint8 ACC (RW, gender); /* 0 male, 1 female, others not yet defined */
115 uint8 ACC (RW, hintmode); /* 0 full, 1 hint, 2 disable */ 115 uint8 ACC (RW, hintmode); /* 0 full, 1 hint, 2 disable */
116 116
117 /* Try to put all the bitfields together - saves some small amount of memory */ 117 /* Try to put all the bitfields together - saves some small amount of memory */
118 bool ACC (RW, braced); /* Will not move if braced, only attack */ 118 bool ACC (RW, braced); /* Will not move if braced, only attack */
… …
164 uint16 ACC (RW, outputs_count); /* Print if this count is exceeded */ 164 uint16 ACC (RW, outputs_count); /* Print if this count is exceeded */
165 object_ptr ACC (RW, mark); /* marked object */ 165 object_ptr ACC (RW, mark); /* marked object */
166 /* Special DM fields */ 166 /* Special DM fields */
167 tag_t *stack_items; /* Item stack for patch/dump/... commands */ 167 tag_t *stack_items; /* Item stack for patch/dump/... commands */
168 int ACC (RW, stack_position); /* Current stack position, 0 for no item */ 168 int ACC (RW, stack_position); /* Current stack position, 0 for no item */
169 sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */ 169 sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */
170 /* the player can see. For maps smaller than */ 170 /* the player can see. For maps smaller than */
171 /* MAP_CLIENT_.., the upper left is used */ 171 /* MAP_CLIENT_.., the center is used */
172
173 // return the los value for the given coordinate
174 MTH sint8 blocked_los (int dx, int dy) const
175 {
176 dx += LOS_X0;
177 dy += LOS_Y0;
178
179 return 0 <= dx && dx < MAP_CLIENT_X
180 && 0 <= dy && dy < MAP_CLIENT_Y
181 ? los[dx][dy] : LOS_BLOCKED;
182 }
183
184 // unchecked variant
185 sint8 blocked_los_uc (int dx, int dy) const
186 {
187 return los[dx + LOS_X0][dy + LOS_Y0];
188 }
189
190 MTH void clear_los (sint8 value = LOS_BLOCKED);
191 MTH void update_los ();
172 192
173 shstr ACC (RW, invis_race); /* What race invisible to? */ 193 shstr ACC (RW, invis_race); /* What race invisible to? */
174 194
175 MTH const char *killer_name () const; // makes a string out of ->killer 195 MTH const char *killer_name () const; // makes a string out of ->killer
176 196
… …
179 199
180 static player *load_pl (object_thawer &thawer); 200 static player *load_pl (object_thawer &thawer);
181 MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); } 201 MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); }
182 202
183 MTH void link_skills (); 203 MTH void link_skills ();
184 MTH object *find_skill (const char *name) const; 204 MTH object *find_skill (shstr_cmp name) const;
185 object *find_skill (const shstr &name) const;
186 205
187 bool save_pl (object_freezer &freezer); 206 bool save_pl (object_freezer &freezer);
188 MTH bool save_pl (const char *path); 207 MTH bool save_pl (const char *path);
189 208
190 void do_destroy (); 209 void do_destroy ();
… …
199 if (ns) 218 if (ns)
200 ns->play_sound (sound, dx, dy); 219 ns->play_sound (sound, dx, dy);
201 } 220 }
202 221
203 // wether the player can "see" this mapspace or not, decided by los 222 // wether the player can "see" this mapspace or not, decided by los
204 // 0 - nothing see, 100 - fully visible 223 // 0 - bright, 3 dark, 4 too dark, 100 blocked or out of range
205 MTH sint8 visibility_at (maptile *map, int x, int y) const; 224 MTH sint8 darkness_at (maptile *map, int x, int y) const;
206 225
207 MTH void connect (client *ns); 226 MTH void connect (client *ns);
208 MTH void disconnect (); 227 MTH void disconnect ();
209 228
210 MTH void activate (); 229 MTH void activate ();
… …
247 266
248#define for_all_players(var) \ 267#define for_all_players(var) \
249 for (unsigned _i = 0; _i < ::players.size (); ++_i) \ 268 for (unsigned _i = 0; _i < ::players.size (); ++_i) \
250 statementvar (player *, var, ::players [_i]) 269 statementvar (player *, var, ::players [_i])
251 270
271#define for_all_players_on_map(var,mapp) \
272 for_all_players(var) \
273 if ((var)->ob->map == (mapp))
274
252inline void 275inline void
253object::statusmsg (const char *msg, int color) 276object::statusmsg (const char *msg, int color)
254{ 277{
255 if (expect_true (contr)) contr->statusmsg (msg, color); 278 if (expect_true (contr)) contr->statusmsg (msg, color);
256} 279}

Diff Legend

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