--- deliantra/server/include/client.h 2007/06/24 04:09:29 1.55 +++ deliantra/server/include/client.h 2007/07/01 04:08:14 1.58 @@ -163,7 +163,7 @@ bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls bool ACC (RW, darkness); /* True if client wants darkness information */ bool ACC (RW, image2); /* Client wants image2/face2 commands */ - bool ACC (RW, fxix); // client implements fx and ix (face|image extended) commands + uint8_t ACC (RW, fxix); // client implements fx and ix (face|image extended) commands bool ACC (RW, update_look); /* If true, we need to send the look window */ bool ACC (RW, has_readable_type); /* If true client accept additional text information */ /* used to arrange text in books, scrolls, or scripted dialogs */ @@ -199,11 +199,14 @@ faceidx ACC (RW, scrub_idx); // which face to send next int ACC (RW, bg_scrub); // how many ticks till the next background face send - faceidx partial_face; - uint32 partial_face_ofs; // if != 0, need to send remaining bytes of partial_face - std::vector > askface; // which faces have been requested by the client + struct ixsend { + int16_t pri; // unused + faceidx idx; + uint32_t ofs; // if != 0, need to send remaining bytes of partial_face + }; + std::vector > ixface; // which faces to send to the client using ix - std::vector > fxface; // which faces to send using fx + std::vector > fxface; // which faces to send using fx MTH void flush_fx (); // send fx if required void do_destroy (); @@ -316,7 +319,7 @@ #define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ #define VERSION_SC 1026 //#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible -#define VERSION_INFO "Crossfire+ Server" +#define VERSION_INFO "Crossfire TRT Server" typedef object_vector sockvec;