--- deliantra/server/include/player.h	2009/10/12 14:00:58	1.92
+++ deliantra/server/include/player.h	2009/11/06 13:21:20	1.96
@@ -21,6 +21,10 @@
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
+#ifndef PLAYER_H_
+#define PLAYER_H_
+
+//+GPL
 
 enum bowtype_t
 {
@@ -86,7 +90,7 @@
 };
 
 // used for pet monster logic etc.
-static bool
+static inline bool
 same_party (partylist *a, partylist *b)
 {
   return a == b && a;
@@ -134,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 */
@@ -171,6 +176,8 @@
                                                 /* 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
   {
@@ -234,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)
   {
@@ -284,3 +292,5 @@
 {
   if (expect_true (contr)) contr->failmsg (msg, color);
 }
+
+#endif