--- deliantra/server/include/sockproto.h	2006/02/03 07:12:50	1.1
+++ deliantra/server/include/sockproto.h	2006/09/16 22:24:12	1.7
@@ -8,15 +8,14 @@
 void send_image_info(NewSocket *ns, char *params);
 void send_image_sums(NewSocket *ns, char *params);
 /* info.c */
-void flush_output_element(object *pl, Output_Buf *outputs);
-void check_output_buffers(object *pl, const char *buf);
-void new_draw_info(int flags, int pri, object *pl, const char *buf);
-void new_draw_info_format(int flags, int pri, object *pl, const char *format, ...);
-void draw_ext_info(int flags, int pri, object *pl, uint8 type, uint8 subtype, const char* message,const char* oldmessage);
-void draw_ext_info_format(int flags, int pri, object *pl, uint8 type, uint8 subtype, const char* old_format, char* new_format, ...);
-void new_info_map_except(int color, mapstruct *map, object *op, const char *str);
-void new_info_map_except2(int color, mapstruct *map, object *op1, object *op2, const char *str);
-void new_info_map(int color, mapstruct *map, const char *str);
+void flush_output_element(const object *pl, Output_Buf *outputs);
+void new_draw_info(int flags, int pri, const object *pl, const char *buf);
+void new_draw_info_format(int flags, int pri, const object *pl, const char *format, ...);
+void draw_ext_info(int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char* message,const char* oldmessage);
+void draw_ext_info_format(int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char* old_format, char* new_format, ...);
+void new_info_map_except(int color, maptile *map, object *op, const char *str);
+void new_info_map_except2(int color, maptile *map, object *op1, object *op2, const char *str);
+void new_info_map(int color, maptile *map, const char *str);
 void clear_win_info(object *op);
 void rangetostring(object *pl, char *obuf);
 void set_title(object *pl, char *buf);
@@ -49,8 +48,10 @@
 void Handle_Oldsocket(NewSocket *ns);
 void HandleClient(NewSocket *ns, player *pl);
 void watchdog(void);
+void flush_sockets(void);
 void doeric_server(void);
 /* lowlevel.c */
+void Socket_Flush (NewSocket *ns);
 void SockList_Init(SockList *sl);
 void SockList_AddChar(SockList *sl, char c);
 void SockList_AddShort(SockList *sl, uint16 data);
@@ -60,7 +61,7 @@
 short GetShort_String(unsigned char *data);
 int SockList_ReadPacket(int fd, SockList *sl, int len);
 void write_socket_buffer(NewSocket *ns);
-void Write_To_Socket(NewSocket *ns, unsigned char *buf, int len);
+void Write_To_Socket(NewSocket *ns, char *buf, int len);
 void cs_write_string(NewSocket *ns, const char *buf, int len);
 void Send_With_Handling(NewSocket *ns, SockList *msg);
 void Write_String_To_Socket(NewSocket *ns, char *buf, int len);
@@ -80,7 +81,8 @@
 void VersionCmd(char *buf, int len, NewSocket *ns);
 void SetSound(char *buf, int len, NewSocket *ns);
 void MapRedrawCmd(char *buff, int len, player *pl);
-void MapNewmapCmd(player *pl);
+void ExtCmd(char *buff, int len, player *pl);
+void MapInfoCmd(char *buff, int len, player *pl);
 void MoveCmd(char *buf, int len, player *pl);
 void send_query(NewSocket *ns, uint8 flags, char *text);
 void esrv_update_stats(player *pl);
@@ -89,7 +91,6 @@
 int getExtendedMapInfoSize(NewSocket *ns);
 void draw_client_map1(object *pl);
 void draw_client_map(object *pl);
-void esrv_map_scroll(NewSocket *ns, int dx, int dy);
 void send_plugin_custom_message(object *pl, char *buf);
 void send_skill_info(NewSocket *ns, char *params);
 void send_spell_paths (NewSocket *ns, char *params);
@@ -98,4 +99,4 @@
 void esrv_add_spells(player *pl, object *spell);
 /* sounds.c */
 void play_sound_player_only(player *pl, short soundnum, sint8 x, sint8 y);
-void play_sound_map(mapstruct *map, int x, int y, short sound_num);
+void play_sound_map(maptile *map, int x, int y, short sound_num);