--- deliantra/server/include/player.h 2008/09/25 04:09:57 1.83
+++ deliantra/server/include/player.h 2009/11/09 18:47:56 1.97
@@ -5,21 +5,26 @@
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
+#ifndef PLAYER_H_
+#define PLAYER_H_
+
+//+GPL
enum bowtype_t
{
@@ -85,7 +90,7 @@
};
// used for pet monster logic etc.
-static bool
+static inline bool
same_party (partylist *a, partylist *b)
{
return a == b && a;
@@ -105,12 +110,12 @@
uint32 ACC (RW, count); /* Any numbers typed before a command */
uint32 ACC (RW, mode); /* Mode of player for pickup. */
- int ACC (RW, digestion); /* Any bonuses/penalties to digestion */
- int ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */
- int ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */
- int ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */
- int ACC (RW, gen_grace); /* Bonuses to regeneration speed of grace */
- int ACC (RW, item_power); /* Total item power of objects equipped */
+ int ACC (RW, digestion); /* Any bonuses/penalties to digestion */
+ int ACC (RW, gen_hp); /* Bonuses to regeneration speed of hp */
+ int ACC (RW, gen_sp); /* Bonuses to regeneration speed of sp */
+ int ACC (RW, gen_sp_armour); /* Penalty to sp regen from armour */
+ int ACC (RW, gen_grace); /* Bonuses to regeneration speed of grace */
+ int ACC (RW, item_power); /* Total item power of objects equipped */
uint8 ACC (RW, gender); /* 0 male, 1 female, others not yet defined */
uint8 ACC (RW, hintmode); /* 0 full, 1 hint, 2 disable */
@@ -133,7 +138,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 */
@@ -166,9 +172,31 @@
/* Special DM fields */
tag_t *stack_items; /* Item stack for patch/dump/... commands */
int ACC (RW, stack_position); /* Current stack position, 0 for no item */
- sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */
- /* the player can see. For maps smaller than */
- /* MAP_CLIENT_.., the upper left is used */
+ sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y]; /* array showing what spaces */
+ /* the player can see. For maps smaller than */
+ /* MAP_CLIENT_.., the center is used */
+
+//-GPL
+
+ // return the los value for the given coordinate
+ MTH sint8 blocked_los (int dx, int dy) const
+ {
+ dx += LOS_X0;
+ dy += LOS_Y0;
+
+ return 0 <= dx && dx < MAP_CLIENT_X
+ && 0 <= dy && dy < MAP_CLIENT_Y
+ ? los[dx][dy] : LOS_BLOCKED;
+ }
+
+ // unchecked variant
+ sint8 blocked_los_uc (int dx, int dy) const
+ {
+ return los[dx + LOS_X0][dy + LOS_Y0];
+ }
+
+ MTH void clear_los (sint8 value = LOS_BLOCKED);
+ MTH void update_los ();
shstr ACC (RW, invis_race); /* What race invisible to? */
@@ -181,6 +209,7 @@
MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); }
MTH void link_skills ();
+ MTH object *find_skill (shstr_cmp name) const;
bool save_pl (object_freezer &freezer);
MTH bool save_pl (const char *path);
@@ -199,8 +228,8 @@
}
// wether the player can "see" this mapspace or not, decided by los
- // 0 - nothing see, 100 - fully visible
- MTH sint8 visibility_at (maptile *map, int x, int y) const;
+ // 0 - bright, 3 dark, 4 too dark, 100 blocked or out of range
+ MTH sint8 darkness_at (maptile *map, int x, int y) const;
MTH void connect (client *ns);
MTH void disconnect ();
@@ -212,6 +241,7 @@
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)
{
@@ -232,6 +262,12 @@
// improvement potion. should not be long.
MTH void failmsg (const char *msg, int color = NDI_RED);
+ MTH void update_spells () const
+ {
+ if (ns)
+ ns->update_spells = true;
+ }
+
~player ();
private:
@@ -247,6 +283,10 @@
for (unsigned _i = 0; _i < ::players.size (); ++_i) \
statementvar (player *, var, ::players [_i])
+#define for_all_players_on_map(var,mapp) \
+ for_all_players(var) \
+ if ((var)->ob->map == (mapp))
+
inline void
object::statusmsg (const char *msg, int color)
{
@@ -258,3 +298,5 @@
{
if (expect_true (contr)) contr->failmsg (msg, color);
}
+
+#endif