Merge branch 'master' into lsid

common/servertalk.h

@@ -160,6 +160,7 @@
 #define ServerOP_SetWorldTime		0x200B
 #define ServerOP_GetWorldTime		0x200C
 #define ServerOP_SyncWorldTime		0x200E
+#define ServerOP_RefreshCensorship	0x200F
 
 #define ServerOP_LSZoneInfo			0x3001
 #define ServerOP_LSZoneStart		0x3002
@@ -193,6 +194,8 @@
 #define ServerOP_ReloadLogs 0x4010
 #define ServerOP_ReloadPerlExportSettings	0x4011
 #define ServerOP_CZSetEntityVariableByClientName 0x4012
+#define ServerOP_UCSServerStatusRequest		0x4013
+#define ServerOP_UCSServerStatusReply		0x4014
 /* Query Server OP Codes */
 #define ServerOP_QSPlayerLogTrades					0x5010
 #define ServerOP_QSPlayerLogHandins					0x5011
@@ -204,6 +207,7 @@
 #define ServerOP_CZSignalNPC						0x5017
 #define ServerOP_CZSetEntityVariableByNPCTypeID		0x5018
 #define ServerOP_WWMarquee							0x5019
+#define ServerOP_QSPlayerDropItem					0x5020
 
 /* Query Serv Generic Packet Flag/Type Enumeration */
 enum { QSG_LFGuild = 0 }; 
@@ -1176,6 +1180,27 @@ struct QSPlayerLogTrade_Struct {
 	QSTradeItems_Struct items[0];
 };
 
+struct QSDropItems_Struct {
+	uint32 item_id;
+	uint16 charges;
+	uint32 aug_1;
+	uint32 aug_2;
+	uint32 aug_3;
+	uint32 aug_4;
+	uint32 aug_5;
+};
+
+struct QSPlayerDropItem_Struct {
+	uint32 char_id;
+	bool pickup; // 0 drop, 1 pickup
+	uint32 zone_id;
+	int x;
+	int y;
+	int z;
+	uint16	_detail_count;
+	QSDropItems_Struct items[0];
+};
+
 struct QSHandinItems_Struct {
 	char action_type[7]; // handin, return or reward
 	uint16 char_slot;
@@ -1316,6 +1341,17 @@ struct ServerRequestTellQueue_Struct {
 	char	name[64];
 };
 
+struct UCSServerStatus_Struct {
+	uint8 available; // non-zero=true, 0=false
+	union {
+		struct {
+			uint16 port;
+			uint16 unused;
+		};
+		uint32 timestamp;
+	};
+};
+
 #pragma pack()
 
 #endif