--- deliantra/server/include/player.h 2009/10/12 14:00:58 1.92 +++ deliantra/server/include/player.h 2010/04/02 03:41:24 1.104 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -22,6 +22,11 @@ * The authors can be reached via e-mail to */ +#ifndef PLAYER_H_ +#define PLAYER_H_ + +//+GPL + enum bowtype_t { bow_normal = 0, @@ -70,10 +75,10 @@ INTERFACE_CLASS (partylist) struct partylist { - char *ACC (RW, partyleader); + utf8_string ACC (RW, partyleader); char ACC (RW, passwd)[9]; partylist *ACC (RW, next); - char *ACC (RW, partyname); + utf8_string ACC (RW, partyname); struct party_kill { @@ -86,7 +91,7 @@ }; // used for pet monster logic etc. -static bool +static inline bool same_party (partylist *a, partylist *b) { return a == b && a; @@ -134,7 +139,8 @@ object_ptr ACC (RW, combat_ob); // which weapon/bow/skill to use for direct attacks object_ptr ACC (RW, ranged_ob); // which skill/item/spell to use for ranged attacks object_ptr ACC (RW, golem); // the currently controlled golem - object_ptr ACC (RW, observe); // the object that is being observed (or 0) + object_ptr ACC (RW, observe); // the object that is being observed (never 0) + object_ptr ACC (RW, viewpoint); // the object that is being viewed in the map (never 0) sint16 ACC (RW, bed_x), ACC (RW, bed_y); /* x,y - coordinates of respawn (savebed) */ shstr ACC (RW, savebed_map); /* map where player will respawn after death */ @@ -151,7 +157,8 @@ object_ptr ACC (RW, killer); /* Who last tried to kill this player (this object is usually destroyed) */ - char write_buf[MAX_BUF]; /* Holds arbitrary input from client */ /* should go */ + float speed_left_save; // spee doptimisation, see process_players[12] + char write_buf[MAX_BUF]; /* Holds arbitrary input from client */ /* should go */ char ACC (RW, password)[16]; /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */ partylist *ACC (RW, party); /* Party this player is part of */ @@ -159,7 +166,7 @@ /* but we will have to get password first */ /* so we have to remember which party to */ /* join */ - char ACC (RW, search_str)[MAX_BUF]; /* Item we are looking for */ + char ACC (RW, search_str)[256]; /* Item we are looking for */ sint16 ACC (RW, encumbrance); /* How much our player is encumbered */ uint16 ACC (RW, outputs_sync); /* How often to print, no matter what */ uint16 ACC (RW, outputs_count); /* Print if this count is exceeded */ @@ -171,6 +178,34 @@ /* the player can see. For maps smaller than */ /* MAP_CLIENT_.., the center is used */ +//-GPL + + // stats updates are very costly, so delay them if at all possible + bool ACC (RW, delayed_update); + void queue_stats_update () + { + delayed_update = true; + } + void need_updated_stats () + { + if (delayed_update) + ob->update_stats (); + } + +#if 0 + enum { + SA_SPELLS = 1<<0, + SA_EXP = 1<<1, + }; + + uint8 ACxC (RW, stat_update_flags); + + void need_stat_update (int flags) + { + stat_update_flags |= flags; + } +#endif + // return the los value for the given coordinate MTH sint8 blocked_los (int dx, int dy) const { @@ -193,7 +228,7 @@ shstr ACC (RW, invis_race); /* What race invisible to? */ - MTH const char *killer_name () const; // makes a string out of ->killer + MTH const_utf8_string killer_name () const; // makes a string out of ->killer MTH static player *create (); static player *find (const_utf8_string name); @@ -205,12 +240,12 @@ MTH object *find_skill (shstr_cmp name) const; bool save_pl (object_freezer &freezer); - MTH bool save_pl (const char *path); + MTH bool save_pl (const_octet_string path); void do_destroy (); void gather_callbacks (AV *&callbacks, event_type event) const; - MTH dynbuf_text *expand_cfpod (const char *cfpod) const; + MTH dynbuf_text *expand_cfpod (const_utf8_string cfpod) const; MTH void touch () { dirty = true; } // need to touch when logged out and changed @@ -234,8 +269,9 @@ MTH void chargen_race_next (); MTH void set_observe (object_ornull *ob); + MTH void set_viewpoint (object_ornull *ob); - void send_msg (int color, const char *type, const char *msg) + void send_msg (int color, const_utf8_string type, const_utf8_string msg) { ns->send_msg (color, type, msg); } @@ -243,16 +279,22 @@ // a prominent box that can easily be escaped away or so // should be used for informative output such as who, maps etc. // will stay on-screen - MTH void infobox (const char *title, const char *msg, int color = NDI_BLACK); + MTH void infobox (const_utf8_string title, const_utf8_string msg, int color = NDI_BLACK); // a prominent msg that signifies some important event, // an improvement potion effect potion. should not be long. // might time out after a while - MTH void statusmsg (const char *msg, int color = NDI_BLACK); + MTH void statusmsg (const_utf8_string msg, int color = NDI_BLACK); // a prominent box that signifies some error such as a failed // improvement potion. should not be long. - MTH void failmsg (const char *msg, int color = NDI_RED); + MTH void failmsg (const_utf8_string msg, int color = NDI_RED); + + MTH void update_spells () const + { + if (ns) + ns->update_spells = true; + } ~player (); @@ -274,13 +316,16 @@ if ((var)->ob->map == (mapp)) inline void -object::statusmsg (const char *msg, int color) +object::statusmsg (const_utf8_string msg, int color) { if (expect_true (contr)) contr->statusmsg (msg, color); } inline void -object::failmsg (const char *msg, int color) +object::failmsg (const_utf8_string msg, int color) { if (expect_true (contr)) contr->failmsg (msg, color); } + +#endif +