diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2008-08-16 10:19:42 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2008-08-16 10:19:42 +0000 |
| commit | 1526e22e4ff29153e9c127081e8ea8d9e2f33b8c (patch) | |
| tree | b361766433d4a7b4a111865afd52803e2bbf7754 /source/cl_local.h | |
| parent | e826e5f176f21cd18b3bbc22887a266835ada57c (diff) | |
Split some monolithic include files into smaller ones.
Use single BSP models cache for refresh and collision subsystems.
Refresh libraries may not longer be dynamically loaded.
Made gi.TagMalloc use separate tag namespace to avoid
conflicts with engine reserverd tags.
Fixed listing order of MVD channels in chooser menu.
A lot of misc changes... MSVC build is definitely broken now.
Diffstat (limited to 'source/cl_local.h')
| -rw-r--r-- | source/cl_local.h | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/source/cl_local.h b/source/cl_local.h index e5a15d2..8f9605c 100644 --- a/source/cl_local.h +++ b/source/cl_local.h @@ -21,12 +21,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "com_local.h" #include "q_list.h" +#include "files.h" +#include "sys_public.h" +#include "pmove.h" +#include "bsp.h" +#include "cmodel.h" +#include "protocol.h" +#include "q_msg.h" +#include "net_sock.h" +#include "net_chan.h" #include "q_field.h" #include "ref_public.h" #include "key_public.h" #include "snd_public.h" #include "cl_public.h" #include "ui_public.h" +#include "sv_public.h" #if USE_ZLIB #include <zlib.h> #endif @@ -198,10 +208,10 @@ typedef struct client_state_s { // // locally derived information from server state // - cm_t cm; + bsp_t *bsp; qhandle_t model_draw[MAX_MODELS]; - cmodel_t *model_clip[MAX_MODELS]; + mmodel_t *model_clip[MAX_MODELS]; qhandle_t sound_precache[MAX_SOUNDS]; qhandle_t image_precache[MAX_IMAGES]; @@ -228,6 +238,17 @@ of server connections #define CONNECT_DELAY 3000 +typedef enum { + ca_uninitialized, + ca_disconnected, // not talking to a server + ca_challenging, // sending getchallenge packets to the server + ca_connecting, // sending connect packets to the server + ca_connected, // netchan_t established, waiting for svc_serverdata + ca_loading, // loading level data + ca_precached, // loaded level data, waiting for svc_frame + ca_active // game views should be displayed +} connstate_t; + typedef struct client_static_s { connstate_t state; keydest_t key_dest; @@ -643,6 +664,7 @@ void Char_Message( int key ); // void CL_InitRefresh( void ); void CL_ShutdownRefresh( void ); +void CL_RunRefresh( void ); // // cl_ui.c |