--- deliantra/server/include/client.h	2006/12/21 23:37:05	1.15
+++ deliantra/server/include/client.h	2006/12/23 06:21:02	1.18
@@ -79,7 +79,6 @@
 /* The following is the setup for a ring buffer for storing output
  * data that the OS can't handle right away.
  */
-
 struct Buffer
 {
   char data[SOCKETBUFSIZE];
@@ -94,14 +93,8 @@
  ST_PLAYING,  // logged in an playing
  ST_CUSTOM,   // waiting for custom reply
 
- ST_PLAY_AGAIN,
- ST_ROLL_STAT,
- ST_CHANGE_CLASS,
  ST_CONFIRM_QUIT,
- ST_CONFIGURE,
- ST_GET_NAME,
- ST_GET_PASSWORD,
- ST_CONFIRM_PASSWORD,
+ ST_CHANGE_CLASS,
  ST_GET_PARTY_PASSWORD,
 };
 
@@ -219,7 +212,7 @@
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   char ACC (RW, version)[64];             // CF+ client name/version
 
-  player *ACC (RO, pl);//TODO should not be here, preferably
+  player_ptr ACC (RO, pl);
 
   int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */