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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.54 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.56 by root, Sat Dec 23 05:25:18 2006 UTC

   op->x = -1;
   op->y = -1;
   enter_exit (op, 0);
 }
+// connect the player with a specific client
+// also changed, rationalises, and fixes some incorrect settings
 void
 player::connect (client *ns)
 {
   this->ns = ns;
   ns->pl = this;
   clear_los (ob);
   ob->type = PLAYER; // we are paranoid
   ob->race = ob->arch->clone.race;
+  if (!legal_range (ob, shoottype))
+    shoottype = range_none;
+  ob->carrying = sum_weight (ob);
+  link_player_skills (ob);
   CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
   ob->update_stats ();
   update_ob_speed (ob);
-  ob->carrying = sum_weight (ob);
-  link_player_skills (ob);
-  if (!legal_range (ob, shoottype))
-    shoottype = range_none;
   assign (title, ob->arch->clone.name);
   /* can_use_shield is a new flag.  However, the can_use.. seems to largely come
    * from the class, and not race.  I don't see any way to get the class information
       op = next;
     }
 }
 /*
  * Returns pointer a static string containing gravestone text
  * Moved from apply.c to player.c - player.c is what
  * actually uses this function.  player.c may not be quite the
  * best, a misc file for object actions is probably better,
   strncat (buf2, "                    ", 20 - strlen (buf) / 2);
   strcat (buf2, buf);
   return buf2;
 }
 void
 do_some_living (object *op)
 {
   int last_food = op->stats.food;
   const int max_grace = 1;
   if (op->contr->outputs_sync)
     {
       for (i = 0; i < NUM_OUTPUT_BUFS; i++)
-        if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
+        if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
           flush_output_element (op, &op->contr->outputs[i]);
     }
   if (op->contr->ns->state == ST_PLAYING)
     {
       /* these next three if clauses make it possible to SLOW DOWN
          hp/grace/spellpoint regeneration. */
       if (op->contr->gen_hp >= 0)
         gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
       else
         {
           gen_hp = op->stats.maxhp;
           rate_hp -= rate_hp / 2 * op->contr->gen_hp;
         }
       if (op->contr->gen_sp >= 0)
         gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
       else
         {
           gen_sp = op->stats.maxsp;
           rate_sp -= rate_sp / 2 * op->contr->gen_sp;
         }
       if (op->contr->gen_grace >= 0)
         gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
       else
         {
           gen_grace = op->stats.maxgrace;
                     op->stats.food += op->contr->digestion;
                   else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
                     op->stats.food = last_food;
                 }
             }
           if (max_sp > 1)
             {
               over_sp = (gen_sp + 10) / rate_sp;
               if (over_sp > 0)
                 {
                   if (op->stats.sp < op->stats.maxsp)
                     {
                       op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
                       if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
                         op->stats.sp--;
                       if (op->stats.sp > op->stats.maxsp)
                         op->stats.sp = op->stats.maxsp;
                     }
                   op->last_sp = 0;
                 }
               else
-                {
-                  op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
+                op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
-                }
             }
           else
-            {
-              op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
+            op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
-            }
         }
       /* Regenerate Grace */
       /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
       if (--op->last_grace < 0)
         {
           if (op->stats.grace < op->stats.maxgrace / 2)
             op->stats.grace++;  /* no penalty in food for regaining grace */
           if (max_grace > 1)
             {
               over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
               if (over_grace > 0)
                 {
                     op->stats.food += op->contr->digestion;
                   else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
                     op->stats.food = last_food;
                 }
             }
           if (max_hp > 1)
             {
               over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
               if (over_hp > 0)
                 {
           if (op->contr->gen_hp > 0)
             op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
           else
             op->last_eat = 25 * (1 + bonus) / (penalty + 1);
           /* dms do not consume food */
           if (!QUERY_FLAG (op, FLAG_WIZ))
             op->stats.food--;
         }
-    }
-  if (op->contr->ns->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)
+      if (op->stats.food < 0 && op->stats.hp >= 0)
-    {
+        {
-      object *tmp, *flesh = NULL;
+          object *tmp, *flesh = 0;
-      for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
+          for (tmp = op->inv; tmp; tmp = tmp->below)
-        {
+            {
-          if (!QUERY_FLAG (tmp, FLAG_UNPAID))
+              if (!QUERY_FLAG (tmp, FLAG_UNPAID))
-            {
-              if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
                 {
+                  if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
+                    {
-                  new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
+                      new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
-                  manual_apply (op, tmp, 0);
+                      manual_apply (op, tmp, 0);
-                  if (op->stats.food >= 0 || op->stats.hp < 0)
+                      if (op->stats.food >= 0 || op->stats.hp < 0)
-                    break;
+                        break;
-                }
+                    }
-              else if (tmp->type == FLESH)
+                  else if (tmp->type == FLESH)
-                flesh = tmp;
+                    flesh = tmp;
-            }                   /* End if paid for object */
+                }                   /* End if paid for object */
-        }                       /* end of for loop */
+            }                       /* end of for loop */
-      /* If player is still starving, it means they don't have any food, so
+          /* If player is still starving, it means they don't have any food, so
-       * eat flesh instead.
+           * eat flesh instead.
-       */
+           */
-      if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
+          if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
-        {
+            {
-          new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
+              new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
-          manual_apply (op, flesh, 0);
+              manual_apply (op, flesh, 0);
-        }
+            }
-    }                           /* end if player is starving */
+        }
-  while (op->stats.food < 0 && op->stats.hp > 0)
+      while (op->stats.food < 0 && op->stats.hp >= 0)
-    op->stats.food++, op->stats.hp--;
+        op->stats.food++, op->stats.hp--;
-  if (!op->contr->ns->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))
+      if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
-    kill_player (op);
+        kill_player (op);
+    }
 }
 /* If the player should die (lack of hp, food, etc), we call this.
  * op is the player in jeopardy.  If the player can not be saved (not
  * permadeath, no lifesave), this will take care of removing the player
  * file.

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.54 by root, Fri Dec 22 16:34:00 2006 UTC vs. Revision 1.56 by root, Sat Dec 23 05:25:18 2006 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.54 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.56 by root, Sat Dec 23 05:25:18 2006 UTC