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.92 by root, Mon Oct 12 14:00:58 2009 UTC vs.
Revision 1.94 by root, Wed Nov 4 17:24:00 2009 UTC

19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
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_
25#define PLAYER_H_
24 26
25enum bowtype_t 27enum bowtype_t
26{ 28{
27 bow_normal = 0, 29 bow_normal = 0,
28 bow_threewide = 1, 30 bow_threewide = 1,
132 object_ptr ACC (RW, last_used); /* Pointer to object last picked or applied */ 134 object_ptr ACC (RW, last_used); /* Pointer to object last picked or applied */
133 135
134 object_ptr ACC (RW, combat_ob); // which weapon/bow/skill to use for direct attacks 136 object_ptr ACC (RW, combat_ob); // which weapon/bow/skill to use for direct attacks
135 object_ptr ACC (RW, ranged_ob); // which skill/item/spell to use for ranged attacks 137 object_ptr ACC (RW, ranged_ob); // which skill/item/spell to use for ranged attacks
136 object_ptr ACC (RW, golem); // the currently controlled golem 138 object_ptr ACC (RW, golem); // the currently controlled golem
137 object_ptr ACC (RW, observe); // the object that is being observed (or 0) 139 object_ptr ACC (RW, observe); // the object that is being observed (never 0)
140 object_ptr ACC (RW, viewpoint); // the object that is being viewed in the map (never 0)
138 141
139 sint16 ACC (RW, bed_x), ACC (RW, bed_y); /* x,y - coordinates of respawn (savebed) */ 142 sint16 ACC (RW, bed_x), ACC (RW, bed_y); /* x,y - coordinates of respawn (savebed) */
140 shstr ACC (RW, savebed_map); /* map where player will respawn after death */ 143 shstr ACC (RW, savebed_map); /* map where player will respawn after death */
141 shstr ACC (RW, maplevel); /* On which level is the player? */ 144 shstr ACC (RW, maplevel); /* On which level is the player? */
142 char ACC (RW, spellparam)[MAX_BUF]; /* What param to add to spells */ 145 char ACC (RW, spellparam)[MAX_BUF]; /* What param to add to spells */
232 235
233 MTH void chargen_race_done (); 236 MTH void chargen_race_done ();
234 MTH void chargen_race_next (); 237 MTH void chargen_race_next ();
235 238
236 MTH void set_observe (object_ornull *ob); 239 MTH void set_observe (object_ornull *ob);
240 MTH void set_viewpoint (object_ornull *ob);
237 241
238 void send_msg (int color, const char *type, const char *msg) 242 void send_msg (int color, const char *type, const char *msg)
239 { 243 {
240 ns->send_msg (color, type, msg); 244 ns->send_msg (color, type, msg);
241 } 245 }
282inline void 286inline void
283object::failmsg (const char *msg, int color) 287object::failmsg (const char *msg, int color)
284{ 288{
285 if (expect_true (contr)) contr->failmsg (msg, color); 289 if (expect_true (contr)) contr->failmsg (msg, color);
286} 290}
291
292#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines