--- deliantra/server/include/newserver.h 2006/08/13 17:16:02 1.5 +++ deliantra/server/include/newserver.h 2006/12/13 18:08:01 1.16 @@ -1,10 +1,6 @@ -/* - * static char *rcsid_newserver_h = - * "$Id$"; - */ /* - CrossFire, A Multiplayer game for X-windows + CrossFire, A Multiplayer game for the X Window System Copyright (C) 2002 Mark Wedel & Crossfire Development Team Copyright (C) 1992 Frank Tore Johansen @@ -33,7 +29,6 @@ newclient.h */ - #ifndef NEWSERVER_H #define NEWSERVER_H @@ -43,10 +38,14 @@ #define NUM_LOOK_OBJECTS 50 -struct MapCell { - short faces[MAP_LAYERS]; +struct MapCell +{ + UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient + int count; /* This is really darkness in the map1 command */ + uint16 faces[MAP_LAYERS]; uint16 smooth[MAP_LAYERS]; - int count; /* This is really darkness in the map1 command */ + unsigned char stat_hp; // health of something in this space, or 0 + unsigned char flags; }; /* This basically defines the largest size an @@ -59,101 +58,103 @@ #define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) #define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) -struct Map { +struct Map +{ struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; }; /* True max is 16383 given current map compaction method */ -#define MAXANIMNUM 2000 +# define MAXANIMNUM 2000 -struct statsinfo { - char *range, *title; +struct statsinfo +{ + char *range, *title; }; - /* This contains basic information on the socket structure. status is its * current state. we set up our on buffers for sending/receiving, so we can * handle some higher level functions. fd is the actual file descriptor we * are using. */ -enum Sock_Status {Ns_Avail, Ns_Add, Ns_Dead, Ns_Old}; +enum Sock_Status { Ns_Avail, Ns_Add, Ns_Dead, Ns_Old }; /* Reserver 0 for neither of these being set */ -enum Old_Mode {Old_Listen=1, Old_Player=2}; +enum Old_Mode { Old_Listen = 1, Old_Player = 2 }; /* Only one map mode can actually be used, so lets make it a switch * instead of having a bunch of different fields that needed to * get toggled. */ -enum MapMode {Map0Cmd = 0, Map1Cmd = 1, Map1aCmd=2 }; +enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; /* The following is the setup for a ring buffer for storing outbut * data that the OS can't handle right away. */ -typedef struct Buffer { - char data[SOCKETBUFSIZE]; - int start; - int len; -} Buffer; +struct Buffer +{ + char data[SOCKETBUFSIZE]; + int start; + int len; +}; /* how many times we are allowed to give the wrong password before being kicked. */ -#define MAX_PASSWORD_FAILURES 5 - -typedef struct NewSocket { - enum Sock_Status status; - int fd; - struct Map lastmap; - size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */ - uint8 *faces_sent; /* This is a bitmap on sent face status */ - uint8 anims_sent[MAXANIMNUM]; - struct statsinfo stats; - /* If we get an incomplete packet, this is used to hold the data. */ - SockList inbuf; - char *host; /* Which host it is connected from (ip address)*/ - uint8 password_fails; /* how many times the player has failed to give the right password */ - Buffer outputbuffer; /* For undeliverable data */ - uint32 facecache:1; /* If true, client is caching images */ - uint32 sent_scroll:1; - uint32 sound:1; /* does the client want sound */ - uint32 exp64:1; /* Client wants 64 bit exp data, as well as skill data */ - uint32 newmapcmd:1; /* Send newmap command when entering new map SMACFIGGEN*/ - uint32 plugincmd:1; /* CF+ extend the protocol through a plug-in */ - uint32 mapinfocmd:1; /* CF+ return map info and send map change info */ - uint32 extcmd:1; /* CF+ call into extensions/plugins */ - uint32 darkness:1; /* True if client wants darkness information */ - uint32 image2:1; /* Client wants image2/face2 commands */ - uint32 update_look:1; /* If true, we need to send the look window */ - uint32 can_write:1; /* Can we write to this socket? */ - uint32 has_readable_type:1; /* If true client accept additional text information - used to arrange text in books, scrolls, or scripted dialogs */ - uint32 monitor_spells:1; /* Client wishes to be informed when their spell list changes */ - uint32 supported_readables; /* each bit is a readable supported by client */ - uint32 cs_version, sc_version; /* versions of the client */ - enum MapMode mapmode; /* Type of map commands the client wants. */ - uint16 look_position; /* start of drawing of look window */ - uint8 mapx, mapy; /* How large a map the client wants */ - uint8 itemcmd; /* What version of the 'item' protocol command to use */ - uint8 faceset; /* Set the client is using, default 0 */ - uint32 ext_mapinfos:1; /* If true client accept additionnal info on maps*/ - /* Below are flags for extedend infos to pass to client - * with S->C mapextended command */ - uint32 EMI_smooth:1; /* Send smooth in extendmapinfos*/ - - struct mapstruct *current_map; /* CF+ current player map */ - - /* Below here is information only relevant for old sockets */ - char *comment; /* name or listen comment */ - enum Old_Mode old_mode; -} NewSocket; +# define MAX_PASSWORD_FAILURES 5 +ACC_CLASS (player_TODO) // should become player when newsocket is a baseclass of player +struct NewSocket +{ + enum Sock_Status status; + int ACC (RW, fd); + struct Map lastmap; + size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */ + uint8 *faces_sent; /* This is a bitmap on sent face status */ + uint8 anims_sent[MAXANIMNUM]; + struct statsinfo stats; + /* If we get an incomplete packet, this is used to hold the data. */ + SockList inbuf; + char *ACC (RW, host); /* Which host it is connected from (ip address) */ + uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ + Buffer outputbuffer; /* For undeliverable data */ + uint32 ACC (RO, facecache):1; /* If true, client is caching images */ + uint32 ACC (RO, sent_scroll):1; + uint32 ACC (RO, sound):1; /* does the client want sound */ + uint32 ACC (RO, exp64):1; /* Client wants 64 bit exp data, as well as skill data */ + uint32 ACC (RO, newmapcmd):1; /* Send newmap command when entering new map SMACFIGGEN */ + uint32 ACC (RO, plugincmd):1; /* CF+ extend the protocol through a plug-in */ + uint32 ACC (RO, mapinfocmd):1; /* CF+ return map info and send map change info */ + uint32 ACC (RO, extcmd):1; /* CF+ call into extensions/plugins */ + uint32 ACC (RO, extmap):1; /* CF+ extend map comamnd with extra data */ + uint32 ACC (RO, buggy_mapscroll):1; /* CF+ client crashes on large mapscrolls */ + uint32 ACC (RO, darkness):1; /* True if client wants darkness information */ + uint32 ACC (RO, image2):1; /* Client wants image2/face2 commands */ + uint32 ACC (RO, update_look):1; /* If true, we need to send the look window */ + uint32 ACC (RO, can_write):1; /* Can we write to this socket? */ + uint32 ACC (RO, has_readable_type):1; /* If true client accept additional text information + used to arrange text in books, scrolls, or scripted dialogs */ + uint32 ACC (RO, monitor_spells):1; /* Client wishes to be informed when their spell list changes */ + uint32 ACC (RO, ext_mapinfos):1; /* If true client accept additionnal info on maps */ + /* Below are flags for extedend infos to pass to client + * with S->C mapextended command */ + uint32 ACC (RO, EMI_smooth):1; /* Send smooth in extendmapinfos */ + uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ + uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ + enum MapMode mapmode; /* Type of map commands the client wants. */ + uint16 ACC (RW, look_position); /* start of drawing of look window */ + uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ + uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ + uint8 ACC (RW, faceset); /* Set the client is using, default 0 */ + + maptile *ACC (RW, current_map); // CF+ last/current player map + int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position + char ACC (RW, client)[64]; // CF+ client name/version +}; #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ - ( ((__type)>0) &&\ - ((__sockPtr)->has_readable_type) && \ - ((__sockPtr)->supported_readables & (1<<(__type))) ) - + ( ((__type)>0) &&\ + ((__sockPtr)->has_readable_type) && \ + ((__sockPtr)->supported_readables & (1<<(__type))) ) /* Bitmask for the faces_sent[] array - what * portion of the face have we sent? @@ -171,12 +172,13 @@ * is a bit field. A bit is activated for each extended info * present in the data */ + /* Meanings: * EMI_NOREDRAW Take extended infos into account but don't redraw, * some additionnal datas will follow in a new packet * EMI_SMOOTH Datas about smoothing - */ -#define EMI_NOREDRAW 0x01 + */ +#define EMI_NOREDRAW 0x01 #define EMI_SMOOTH 0x02 /* this last one says the bitfield continue un next byte @@ -189,19 +191,19 @@ #define FACE_TYPES 1 #define PNG_FACE_INDEX 0 -typedef struct Socket_Info { - struct timeval timeout; /* Timeout for select */ - int max_filedescriptor; /* max filedescriptor on the system */ - int nconns; /* Number of connections */ - int allocated_sockets; /* number of allocated in init_sockets */ -} Socket_Info; +struct Socket_Info +{ + struct timeval timeout; /* Timeout for select */ + int max_filedescriptor; /* max filedescriptor on the system */ + int nconns; /* Number of connections */ + int allocated_sockets; /* number of allocated in init_sockets */ +}; extern Socket_Info socket_info; -#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ +#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ #define VERSION_SC 1027 #define VERSION_INFO "Crossfire+ Server" - - #endif +