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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.50 by elmex, Wed Dec 20 10:31:00 2006 UTC vs.
Revision 1.52 by root, Thu Dec 21 23:37:06 2006 UTC

   op->direction = 5;            /* So player faces south */
   op->stats.wc = 2;
   op->run_away = 25;            /* Then we panick... */
   {
-    int oldmon = p->socket->monitor_spells; // what a hack
+    int oldmon = p->ns->monitor_spells; // what a hack
-    p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
+    p->ns->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
     roll_stats (op);
-    p->socket->monitor_spells = oldmon;
+    p->ns->monitor_spells = oldmon;
   }
-  p->state = ST_ROLL_STAT;
+  p->ns->state = ST_ROLL_STAT;
   clear_los (op);
   p->gen_sp_armour = 10;
   p->last_speed = -1;
   p->shoottype = range_none;
     p->last_resist[i] = -1;
   p->last_stats.exp = -1;
   p->last_weight = (uint32) - 1;
-  p->socket->update_look = 0;
+  p->ns->update_look = 0;
-  p->socket->look_position = 0;
+  p->ns->look_position = 0;
   return p;
 }
 /* This loads the first map an puts the player on it. */
 int
 add_player (client *ns)
 {
   player *p = new player;
-  p->socket = ns;
+  p->ns = ns;
   ns->pl = p;
   p->next = first_player;
   first_player = p;
   CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
   add_friendly_object (p->ob);
   send_rules (p->ob);
   send_news (p->ob);
   display_motd (p->ob);
   get_name (p->ob);
   return 0;
 }
 void
 get_name (object *op)
 {
   op->contr->write_buf[0] = '\0';
-  op->contr->state = ST_GET_NAME;
+  op->contr->ns->state = ST_GET_NAME;
-  send_query (op->contr->socket, 0, "What is your name?\n:");
+  send_query (op->contr->ns, 0, "What is your name?\n:");
 }
 void
 get_password (object *op)
 {
   op->contr->write_buf[0] = '\0';
-  op->contr->state = ST_GET_PASSWORD;
+  op->contr->ns->state = ST_GET_PASSWORD;
-  send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
+  send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is your password?\n:");
 }
 void
 play_again (object *op)
 {
-  op->contr->state = ST_PLAY_AGAIN;
+  op->contr->ns->state = ST_PLAY_AGAIN;
   op->chosen_skill = NULL;
-  send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
+  send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
   /* a bit of a hack, but there are various places early in th
    * player creation process that a user can quit (eg, roll
    * stats) that isn't removing the player.  Taking a quick
    * look, there are many places that call play_again without
    * removing the player - it probably makes more sense
    * to leave it to play_again to remove the object in all
    * cases.
    */
   if (!QUERY_FLAG (op, FLAG_REMOVED))
     op->remove ();
   /* Need to set this to null - otherwise, it could point to garbage,
    * and draw() doesn't check to see if the player is removed, only if
    * the map is null or not swapped out.
    */
   op->map = NULL;
 void
 confirm_password (object *op)
 {
   op->contr->write_buf[0] = '\0';
-  op->contr->state = ST_CONFIRM_PASSWORD;
+  op->contr->ns->state = ST_CONFIRM_PASSWORD;
-  send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
+  send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
 }
 void
 get_party_password (object *op, partylist *party)
 {
     {
       LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
       return;
     }
   op->contr->write_buf[0] = '\0';
-  op->contr->state = ST_GET_PARTY_PASSWORD;
+  op->contr->ns->state = ST_GET_PARTY_PASSWORD;
   op->contr->party_to_join = party;
-  send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");
+  send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
 }
 /* This rolls four 1-6 rolls and sums the best 3 of the 4. */
 int
 void
 Roll_Again (object *op)
 {
   esrv_new_player (op->contr, 0);
-  send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
+  send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
               "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?  ");
 }
 void
 Swap_Stat (object *op, int Swap_Second)
           new_draw_info (NDI_UNIQUE, 0, op, buf);
         }
       else
         Swap_Stat (op, stat_trans[keynum]);
-      send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
+      send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
       return 1;
     }
   switch (key)
     {
       case 'n':
           enter_exit (op, NULL);
 #endif
           SET_ANIMATION (op, 2);        /* So player faces south */
           /* Enter exit adds a player otherwise */
           add_statbonus (op);
-          send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
+          send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
                       "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
-          op->contr->state = ST_CHANGE_CLASS;
+          op->contr->ns->state = ST_CHANGE_CLASS;
           if (op->msg)
             new_draw_info (NDI_BLUE, 0, op, op->msg);
           return 0;
         }
       case 'y':
       case 'Y':
         roll_stats (op);
-        send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
+        send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
         return 1;
       case 'q':
       case 'Q':
         play_again (op);
         return 1;
       default:
-        send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6.  Roll again?");
+        send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6.  Roll again?");
         return 0;
     }
   return 0;
 }
         create_treasure (tl, op, 0, 0, 0);
       INVOKE_PLAYER (BIRTH, op->contr);
       INVOKE_PLAYER (LOGIN, op->contr);
-      op->contr->state = ST_PLAYING;
+      op->contr->ns->state = ST_PLAYING;
       if (op->msg)
         op->msg = NULL;
       /* We create this now because some of the unique maps will need it
   op->stats.grace = 0;
   if (op->msg)
     new_draw_info (NDI_BLUE, 0, op, op->msg);
-  send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
+  send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
   return 0;
 }
 int
 key_confirm_quit (object *op, char key)
 {
   char buf[MAX_BUF];
   if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
     {
-      op->contr->state = ST_PLAYING;
+      op->contr->ns->state = ST_PLAYING;
       new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
       return 1;
     }
   INVOKE_PLAYER (LOGOUT, op->contr);
   /* call this here - we also will call this in do_ericserver, but
    * the players time has been increased when doericserver has been
    * called, so we recheck it here.
    */
   //TODO: better than handling 8 commands, use some more intelligent rate-limiting
-  for (int rep = 8; --rep && op->contr->socket->handle_command (); )
+  for (int rep = 8; --rep && op->contr->ns->handle_command (); )
     ;
   if (op->speed_left < 0)
     return 0;
       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)
           flush_output_element (op, &op->contr->outputs[i]);
     }
-  if (op->contr->state == ST_PLAYING)
+  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)
           if (!QUERY_FLAG (op, FLAG_WIZ))
             op->stats.food--;
         }
     }
-  if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)
+  if (op->contr->ns->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)
     {
       object *tmp, *flesh = NULL;
       for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
         {
     }                           /* end if player is starving */
   while (op->stats.food < 0 && op->stats.hp > 0)
     op->stats.food++, op->stats.hp--;
-  if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))
+  if (!op->contr->ns->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))
     kill_player (op);
 }
 fix_luck (void)
 {
   player *pl;
   for (pl = first_player; pl != NULL; pl = pl->next)
-    if (!pl->ob->contr->state)
+    if (!pl->ob->contr->ns->state)
       change_luck (pl->ob, 0);
 }
 /* cast_dust() - handles op throwing objects of type 'DUST'.
       /* only the viewable area the player sees is updated by LOS
        * code, so we need to restrict ourselves to that range of values
        * for any meaningful values.
        */
-      if (FABS (dx) <= (pl->contr->socket->mapx / 2) &&
+      if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
-          FABS (dy) <= (pl->contr->socket->mapy / 2) &&
+          FABS (dy) <= (pl->contr->ns->mapy / 2) &&
-          !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)])
+          !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
         return 1;
       op = op->more;
     }
   return 0;
 }
     {
       /* forces in the treasurelist can alter the player's stats */
       object *skin;
       /* first get the dragon skin force */
+      shstr_cmp dragon_skin_force ("dragon_skin_force");
-      for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below);
+      for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
+        ;
-      if (skin == NULL)
+      if (!skin)
         return;
       /* adding new spellpath attunements */
       if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
         {

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.50 by elmex, Wed Dec 20 10:31:00 2006 UTC vs. Revision 1.52 by root, Thu Dec 21 23:37:06 2006 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.50 by elmex, Wed Dec 20 10:31:00 2006 UTC vs.
Revision 1.52 by root, Thu Dec 21 23:37:06 2006 UTC