[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC vs.
Revision 1.240 by root, Fri Nov 6 12:49:19 2009 UTC

  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
+//+GPL
 #include <global.h>
 #include <sproto.h>
 #include <sounds.h>
 #include <living.h>
 #include <object.h>
   observe = viewpoint = ob;
   deactivate ();
 }
+//-GPL
 // the need for this function can be explained
 // by load_object not returning the object
 void
 player::set_object (object *op)
 {
 {
   viewpoint = op ? op : (object *)observe;
   do_los = 1;
 }
+//+GPL
 player::player ()
 {
   /* There are some elements we want initialised to non zero value -
    * we deal with that below this point.
    */
 {
   /* Clear item stack */
   free (stack_items);
 }
+/*
+ * get_player_archetype() return next player archetype from archetype
+ * list. Not very efficient routine, but used only creating new players.
+ * Note: there MUST be at least one player archetype!
+ */
+static archetype *
+get_player_archetype (archetype *at)
+{
+  // archetypes could have been reloaded
+  archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
+  if (!nat)
+    return at;
+  archvec::iterator i = archetypes.find (nat);
+  for (;;)
+    {
+      if (++i == archetypes.end ())
+        i = archetypes.begin ();
+      else if (*i == at)
+        cleanup ("not a single player archetype found");
+      if ((*i)->type == PLAYER)
+        return *i;
+    }
+}
 /* Tries to add player on the connection passed in ns.
  * All we can really get in this is some settings like host and display
  * mode.
  */
 player *
   pl->ob->run_away = 25;            /* Then we panick... */
   set_first_map (pl->ob);
   return pl;
-}
-/*
- * get_player_archetype() return next player archetype from archetype
- * list. Not very efficient routine, but used only creating new players.
- * Note: there MUST be at least one player archetype!
- */
-archetype *
-get_player_archetype (archetype *at)
-{
-  // archetypes could have been reloaded
-  archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
-  if (!nat)
-    return at;
-  archvec::iterator i = archetypes.find (nat);
-  for (;;)
-    {
-      if (++i == archetypes.end ())
-        i = archetypes.begin ();
-      else if (*i == at)
-        cleanup ("not a single player archetype found");
-      if ((*i)->type == PLAYER)
-        return *i;
-    }
 }
 object *
 get_nearest_player (object *mon)
 {
     }
   return !stop;
 }
+/* routine for both players and monsters. We call this when
+ * there is a possibility for our action distrubing our hiding
+ * place or invisiblity spell. Artefact invisiblity causes
+ * "noise" instead. If we arent invisible to begin with, we
+ * return 0.
+ */
+static int
+action_makes_visible (object *op)
+{
+  if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
+    {
+      if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
+        {
+          // artefact invisibility is permanent, but we still make noise
+          // this is important for game-balance.
+          if (op->contr)
+            op->make_noise ();
+          return 0;
+        }
+      if (op->contr && op->contr->tmp_invis == 0)
+        return 0;
+      /* If monsters, they should become visible */
+      if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
+        {
+          new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
+          return 1;
+        }
+    }
+  return 0;
+}
 /*
  *  Find an arrow in the inventory and after that
  *  in the right type container (quiver). Pointer to the
  *  found object is returned.
  */
-object *
+static object *
 find_arrow (object *op, const char *type)
 {
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if (tmp->type == ARROW && !strcmp (&tmp->race, type))
       return splay (tmp);
  * Similar to find_arrow, but looks for (roughly) the best arrow to use
  * against the target.  A full test is not performed, simply a basic test
  * of resistances.  The archer is making a quick guess at what he sees down
  * the hall.  Failing that it does it's best to pick the highest plus arrow.
  */
-object *
+static object *
 find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
 {
   object *tmp = NULL, *arrow, *ntmp;
   int attacknum, attacktype, betterby = 0, i;
     }
   return 0;
 }
-/* routine for both players and monsters. We call this when
- * there is a possibility for our action distrubing our hiding
- * place or invisiblity spell. Artefact invisiblity causes
- * "noise" instead. If we arent invisible to begin with, we
- * return 0.
- */
-int
-action_makes_visible (object *op)
-{
-  if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
-    {
-      if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
-        {
-          // artefact invisibility is permanent, but we still make noise
-          // this is important for game-balance.
-          if (op->contr)
-            op->make_noise ();
-          return 0;
-        }
-      if (op->contr && op->contr->tmp_invis == 0)
-        return 0;
-      /* If monsters, they should become visible */
-      if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
-        {
-          new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
-          return 1;
-        }
-    }
-  return 0;
-}
 /* op_on_battleground - checks if the given object op (usually
  * a player) is standing on a valid battleground-tile,
  * function returns TRUE/FALSE. If true x, y returns the battleground
  * -exit-coord. (and if x, y not NULL)
  * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
   if (pl->ranged_ob == ob)
     pl->ranged_ob = 0;
 }
+//-GPL
 sint8
 player::darkness_at (maptile *map, int x, int y) const
 {
   if (!ns)
     return LOS_BLOCKED;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC vs. Revision 1.240 by root, Fri Nov 6 12:49:19 2009 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC vs.
Revision 1.240 by root, Fri Nov 6 12:49:19 2009 UTC