--- deliantra/server/socket/request.C	2006/12/21 23:37:06	1.50
+++ deliantra/server/socket/request.C	2006/12/22 16:34:00	1.51
@@ -571,13 +571,7 @@
 void
 AddMeCmd (char *buf, int len, client * ns)
 {
-  if (INVOKE_CLIENT (ADDME, ns))
-    return;
-
-  if (ns->pl || add_player (ns))
-    ns->send_packet ("addme_failed");
-  else
-    ns->send_packet ("addme_success");
+  INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
 }
 
 /** Reply to ExtendedInfos command */
@@ -852,17 +846,6 @@
         LOG (llevError, "Got reply message with ST_PLAYING input state\n");
         break;
 
-      case ST_PLAY_AGAIN:
-        /* We can check this for return value (2==quit).  Maybe we
-         * should, and do something appropriate?
-         */
-        receive_play_again (pl->ob, buf[0]);
-        break;
-
-      case ST_ROLL_STAT:
-        key_roll_stat (pl->ob, buf[0]);
-        break;
-
       case ST_CHANGE_CLASS:
         key_change_class (pl->ob, buf[0]);
         break;
@@ -871,20 +854,6 @@
         key_confirm_quit (pl->ob, buf[0]);
         break;
 
-      case ST_CONFIGURE:
-        LOG (llevError, "In client input handling, but into configure state\n");
-        ns->state = ST_PLAYING;
-        break;
-
-      case ST_GET_NAME:
-        receive_player_name (pl->ob, 13);
-        break;
-
-      case ST_GET_PASSWORD:
-      case ST_CONFIRM_PASSWORD:
-        receive_player_password (pl->ob, 13);
-        break;
-
       case ST_GET_PARTY_PASSWORD:    /* Get password for party */
         receive_party_password (pl->ob, 13);
         break;
@@ -1058,11 +1027,11 @@
       AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
       AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
       AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
-      AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
-      AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
-      AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
       AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
       AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
+      AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
+      AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
+      AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
       AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
     }