Door config settings (and some fixes to doorgroup reporting)

[tpg/opendispense2.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index b103e83..cd69224 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -490,16 +490,24 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
  */
 void Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
 {
-        int    i;
+        int    i, count;
 
        if( Args != NULL && strlen(Args) ) {
                sendf(Client->Socket, "407 ENUM_ITEMS takes no arguments\n");
                return ;
        }
+       
+       // Count shown items
+       count = 0;
+       for( i = 0; i < giNumItems; i ++ ) {
+               if( gaItems[i].bHidden )        continue;
+               count ++;
+       }
 
-       sendf(Client->Socket, "201 Items %i\n", giNumItems);
+       sendf(Client->Socket, "201 Items %i\n", count);
 
        for( i = 0; i < giNumItems; i ++ ) {
+               if( gaItems[i].bHidden )        continue;
                sendf(Client->Socket,
                        "202 Item %s:%i %i %s\n",
                         gaItems[i].Handler->Name, gaItems[i].ID, gaItems[i].Price, gaItems[i].Name
@@ -1087,9 +1095,9 @@ void _SendUserInfo(tClient *Client, int UserID)
        
        // TODO: User flags/type
        sendf(
-               Client->Socket, "202 User %s %i %s%s\n",
+               Client->Socket, "202 User %s %i %s%s%s\n",
                Bank_GetAcctName(UserID), Bank_GetBalance(UserID),
-               type, disabled
+               type, disabled, door
                );
 }
 
@@ -1164,6 +1172,10 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
        if( Server_int_ParseFlags(Client, flags, &mask, &value) )
                return ;
        
+       if( giDebugLevel )
+               Debug(Client, "Set %i(%s) flags to %x (masked %x)\n",
+                       uid, username, mask, value);
+       
        // Apply flags
        Bank_SetFlags(uid, mask, value);