X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=7106e5200aa8db2daad0a1cc711658fbe8afe873;hb=76d7ff31e2bb0ace116d9c995c007d857c41cdff;hp=4c686d94bc2e4c4c277962ff29cc97eb2d3bf555;hpb=b45406d25eee76ccd4cb95541edd98f2e498c69a;p=tpg%2Fopendispense2.git

diff --git a/src/server/server.c b/src/server/server.c
index 4c686d9..7106e52 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -486,6 +486,32 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 	sendf(Client->Socket, "200 User set\n");
 }
 
+/**
+ * \brief Send an item status to the client
+ * \param Client	Who to?
+ * \param Item	Item to send
+ */
+void Server_int_SendItem(tClient *Client, tItem *Item)
+{
+	char	*status = "avail";
+	
+	if( Item->Handler->CanDispense )
+	{
+		switch(Item->Handler->CanDispense(Client->UID, Item->ID))
+		{
+		case  0:	status = "avail";	break;
+		case  1:	status = "sold";	break;
+		default:
+		case -1:	status = "error";	break;
+		}
+	}
+	
+	sendf(Client->Socket,
+		"202 Item %s:%i %s %i %s\n",
+		Item->Handler->Name, Item->ID, status, Item->Price, Item->Name
+		);
+}
+
 /**
  * \brief Enumerate the items that the server knows about
  */
@@ -509,10 +535,7 @@ void Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
 
 	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
-			 );
+		Server_int_SendItem( Client, &gaItems[i] );
 	}
 
 	sendf(Client->Socket, "200 List end\n");
@@ -574,10 +597,7 @@ void Server_Cmd_ITEMINFO(tClient *Client, char *Args)
 		return ;
 	}
 	
-	sendf(Client->Socket,
-		"202 Item %s:%i %i %s\n",
-		 item->Handler->Name, item->ID, item->Price, item->Name
-		 );
+	Server_int_SendItem( Client, item );
 }
 
 void Server_Cmd_DISPENSE(tClient *Client, char *Args)