FWGS/Xash3DArchive
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

17 Aug 2008

Browse Source
This commit is contained in:
g-cont 2008-08-17 00:00:00 +04:00 committed by Alibek Omarov
parent 40713ea5e4
commit 687d70d72c
4 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
common/bsplib/bspfile.c
View File

@ -1,73 +1,54 @@
#include "bsplib.h"
#include "byteorder.h"
void GetLeafNums (void);
#include "const.h"
//=============================================================================
wfile_t *handle;
int s_table;
int nummodels;
dmodel_t dmodels[MAX_MAP_MODELS];
int visdatasize;
byte dvisdata[MAX_MAP_VISIBILITY];
dvis_t *dvis = (dvis_t *)dvisdata;
int lightdatasize;
byte dlightdata[MAX_MAP_LIGHTING];
int entdatasize;
char dentdata[MAX_MAP_ENTSTRING];
int numleafs;
dleaf_t dleafs[MAX_MAP_LEAFS];
int numplanes;
dplane_t dplanes[MAX_MAP_PLANES];
int numvertexes;
dvertex_t dvertexes[MAX_MAP_VERTS];
int numnodes;
dnode_t dnodes[MAX_MAP_NODES];
int numtexinfo;
dtexinfo_t texinfo[MAX_MAP_TEXINFO];
int numfaces;
dface_t dfaces[MAX_MAP_FACES];
int numedges;
dedge_t dedges[MAX_MAP_EDGES];
int numleaffaces;
dword dleaffaces[MAX_MAP_LEAFFACES];
int numleafbrushes;
dword dleafbrushes[MAX_MAP_LEAFBRUSHES];
int numsurfedges;
int dsurfedges[MAX_MAP_SURFEDGES];
int numbrushes;
dbrush_t dbrushes[MAX_MAP_BRUSHES];
int numbrushsides;
dbrushside_t dbrushsides[MAX_MAP_BRUSHSIDES];
int nummiptex;
dmiptex_t dmiptex[MAX_MAP_TEXTURES];
int numareas;
darea_t dareas[MAX_MAP_AREAS];
int numareaportals;
dareaportal_t dareaportals[MAX_MAP_AREAPORTALS];
byte dcollision[MAX_MAP_COLLISION];
int dcollisiondatasize = 256; // variable sized
// string table system
// get rid of this
char dstringdata[MAX_MAP_STRINGDATA];
int stringdatasize;
int dstringtable[MAX_MAP_NUMSTRINGS];
@ -260,6 +241,26 @@ void SwapBSPFile (bool todisk)
}
}
size_t BSP_LoadLump( const char *lumpname, void *dest, size_t block_size )
{
size_t length;
byte *in;
if( !handle ) return 0;
in = WAD_Read( handle, lumpname, &length, TYPE_BINDATA );
if( length % block_size ) Sys_Break( "BSP_CopyLump: %s funny lump size\n", lumpname );
Mem_Copy( dest, in, length );
Mem_Free( in ); // no need more
return length / block_size;
}
void BSP_SaveLump( const char *lumpname, const void *data, size_t length, bool compress )
{
if( !handle ) return;
WAD_Write( handle, lumpname, data, length, TYPE_BINDATA, ( compress ? CMP_ZLIB : CMP_NONE ));
}
dheader_t *header;
int CopyLump( int lump, void *dest, int size )

36
engine/server/sv_progs.c
View File

@ -252,14 +252,14 @@ bool SV_EntitiesIn( bool mode, vec3_t v1, vec3_t v2 )
============
Save\Load gamestate
savefile operations
savegame operations
============
*/
static int s_table;
void SV_AddSaveLump( wfile_t *f, const char *lumpname, void *data, size_t len, bool compress )
{
WAD_Write( f, lumpname, data, len, TYPE_BINDATA, ( compress ? CMP_ZLIB : CMP_NONE ));
if( f ) WAD_Write( f, lumpname, data, len, TYPE_BINDATA, ( compress ? CMP_ZLIB : CMP_NONE ));
}
static void SV_SetPair( const char *name, const char *value, dkeyvalue_t *cvars, int *numpairs )
@ -276,7 +276,7 @@ void SV_AddCvarLump( wfile_t *f )
int numpairs = 0;
Cvar_LookupVars( CVAR_LATCH, cvbuffer, &numpairs, SV_SetPair );
SV_AddSaveLump( f, "latched_cvars", cvbuffer, numpairs * sizeof(dkeyvalue_t), true );
SV_AddSaveLump( f, LUMP_GAMECVARS, cvbuffer, numpairs * sizeof(dkeyvalue_t), true );
}
void SV_AddCStrLump( wfile_t *f )
@ -287,7 +287,7 @@ void SV_AddCStrLump( wfile_t *f )
// pack the cfg string data
for(i = 0; i < MAX_CONFIGSTRINGS; i++)
csbuffer[i] = StringTable_SetString( s_table, sv.configstrings[i] );
SV_AddSaveLump( f, "config_strings", &csbuffer, sizeof(csbuffer), true );
SV_AddSaveLump( f, LUMP_CFGSTRING, &csbuffer, sizeof(csbuffer), true );
}
void SV_WriteGlobal( wfile_t *f )
@ -299,7 +299,7 @@ void SV_WriteGlobal( wfile_t *f )
PRVM_ED_WriteGlobals( &globals, &numpairs, SV_SetPair );
SV_VM_End();
SV_AddSaveLump( f, "globals", &globals, numpairs * sizeof(dkeyvalue_t), true );
SV_AddSaveLump( f, LUMP_GAMESTATE, &globals, numpairs * sizeof(dkeyvalue_t), true );
}
void SV_WriteLocals( wfile_t *f )
@ -319,7 +319,7 @@ void SV_WriteLocals( wfile_t *f )
SV_VM_End();
// all allocated memory will be freed at end of SV_WriteSaveFile
SV_AddSaveLump( f, "entities", VFS_GetBuffer( h ), VFS_Tell( h ), true );
SV_AddSaveLump( f, LUMP_GAMEENTS, VFS_GetBuffer( h ), VFS_Tell( h ), true );
VFS_Close( h ); // release virtual file
}
@ -361,18 +361,18 @@ void SV_WriteSaveFile( const char *name )
return;
}
MsgDev (D_INFO, "Saving game..." );
MsgDev( D_INFO, "Saving game..." );
com.sprintf (comment, "%s - %s", sv.configstrings[CS_NAME], timestamp( TIME_FULL ));
s_table = StringTable_Create( name, MAX_MAP_NUMSTRINGS );
// write lumps
pe->GetAreaPortals( &portalopen, &portalsize );
SV_AddSaveLump( savfile, "map_comment", comment, sizeof(comment), false );
SV_AddSaveLump( savfile, LUMP_AREASTATE, portalopen, portalsize, true );
SV_AddSaveLump( savfile, LUMP_COMMENTS, comment, sizeof(comment), false );
SV_AddSaveLump( savfile, LUMP_MAPCMDS, svs.mapcmd, sizeof(svs.mapcmd), false );
SV_AddCStrLump( savfile );
SV_AddSaveLump( savfile, "areaportals", portalopen, portalsize, true );
SV_WriteGlobal( savfile );
SV_AddSaveLump( savfile, "map_name", svs.mapcmd, sizeof(svs.mapcmd), false );
SV_AddCvarLump( savfile );
SV_WriteGlobal( savfile );
SV_WriteLocals( savfile );
StringTable_Save( s_table, savfile ); // now system released
Mem_Free( portalopen ); // release portalinfo
@ -386,7 +386,7 @@ void Sav_LoadComment( wfile_t *l )
byte *in;
int size;
in = WAD_Read( l, "map_comment", &size, TYPE_BINDATA );
in = WAD_Read( l, LUMP_COMMENTS, &size, TYPE_BINDATA );
com.strncpy( svs.comment, in, size );
}
@ -396,7 +396,7 @@ void Sav_LoadCvars( wfile_t *l )
int i, numpairs;
const char *name, *value;
in = (dkeyvalue_t *)WAD_Read( l, "latched_cvars", &numpairs, TYPE_BINDATA );
in = (dkeyvalue_t *)WAD_Read( l, LUMP_GAMECVARS, &numpairs, TYPE_BINDATA );
if( numpairs % sizeof(*in)) Host_Error( "Sav_LoadCvars: funny lump size\n" );
numpairs /= sizeof( dkeyvalue_t );
@ -413,7 +413,7 @@ void Sav_LoadMapCmds( wfile_t *l )
byte *in;
int size;
in = WAD_Read( l, "map_name", &size, TYPE_BINDATA );
in = WAD_Read( l, LUMP_MAPCMDS, &size, TYPE_BINDATA );
com.strncpy( svs.mapcmd, in, size );
}
@ -422,7 +422,7 @@ void Sav_LoadCfgString( wfile_t *l )
string_t *in;
int i, numstrings;
in = (string_t *)WAD_Read( l, "config_strings", &numstrings, TYPE_BINDATA );
in = (string_t *)WAD_Read( l, LUMP_CFGSTRING, &numstrings, TYPE_BINDATA );
if( numstrings % sizeof(*in)) Host_Error( "Sav_LoadCfgString: funny lump size\n" );
numstrings /= sizeof( string_t ); // because old saves can contain last values of MAX_CONFIGSTRINGS
@ -436,7 +436,7 @@ void Sav_LoadAreaPortals( wfile_t *l )
byte *in;
int size;
in = WAD_Read( l, "areaportals", &size, TYPE_BINDATA );
in = WAD_Read( l, LUMP_AREASTATE, &size, TYPE_BINDATA );
pe->SetAreaPortals( in, size ); // CM_ReadPortalState
}
@ -445,7 +445,7 @@ void Sav_LoadGlobal( wfile_t *l )
dkeyvalue_t *globals;
int numpairs;
globals = (dkeyvalue_t *)WAD_Read( l, "globals", &numpairs, TYPE_BINDATA );
globals = (dkeyvalue_t *)WAD_Read( l, LUMP_GAMESTATE, &numpairs, TYPE_BINDATA );
if( numpairs % sizeof(*globals)) Host_Error( "Sav_LoadGlobal: funny lump size\n" );
numpairs /= sizeof( dkeyvalue_t );
PRVM_ED_ReadGlobals( s_table, globals, numpairs );
@ -459,7 +459,7 @@ void Sav_LoadLocals( wfile_t *l )
size_t size;
vfile_t *h;
buff = WAD_Read( l, "entities", &size, TYPE_BINDATA );
buff = WAD_Read( l, LUMP_GAMEENTS, &size, TYPE_BINDATA );
h = VFS_Create( buff, size );
while(!VFS_Eof( h ))

16
public/ref_dfiles.h
View File

@ -781,4 +781,20 @@ typedef struct
int normindex; // normal vec3_t
} mstudiomesh_t;
/*
==============================================================================
SAVE FILE
included global, and both (client & server) pent list
==============================================================================
*/
#define LUMP_COMMENTS "map_comment"
#define LUMP_CFGSTRING "configstrings"
#define LUMP_AREASTATE "areaportals"
#define LUMP_GAMESTATE "globals"
#define LUMP_MAPCMDS "map_cmds"
#define LUMP_GAMECVARS "latched_cvars"
#define LUMP_GAMEENTS "entities"
#define LUMP_SNAPSHOT "levelshot" // currently not implemented
#endif//REF_DFILES_H

1
todo.log
View File

@ -28,6 +28,7 @@ TODO LIST
Анимация (разобраться с pev->animtime)
Смена формата карты!!!!!!!!!
1. èìïëåìåíòàöèÿ PVS èç Quake3
выбросить лишние ресурсы
забэкапить результат