mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
************************************************************
* Merged Source Code from Development Trunk: Revision 4063 * ************************************************************ - Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP - This will be the Source for the Beta 2011 Test git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
+139
-65
@@ -12,10 +12,16 @@
|
||||
#include "sys globals.h"
|
||||
#include "tile surface.h"
|
||||
#include "fileMan.h"
|
||||
#include "Debug.h"
|
||||
#endif
|
||||
|
||||
#include "VFS/vfs.h"
|
||||
#include <vfs/Core/vfs.h>
|
||||
#include <vfs/Core/vfs_file_raii.h>
|
||||
#include "XML_TileSet.hpp"
|
||||
#include "XMLWriter.h"
|
||||
|
||||
void ExportTilesets(vfs::Path const& filename);
|
||||
|
||||
// THIS FILE CONTAINS DEFINITIONS FOR TILESET FILES
|
||||
|
||||
void SetTilesetThreeTerrainValues();
|
||||
@@ -28,76 +34,156 @@ UINT8 gubNumSets = MAX_TILESETS;
|
||||
|
||||
TILESET gTilesets[ MAX_TILESETS ];
|
||||
|
||||
|
||||
extern bool g_bUseXML_Tilesets;
|
||||
void InitEngineTilesets( )
|
||||
{
|
||||
UINT32 cnt, cnt2, uiNumFiles;
|
||||
// FILE *hfile;
|
||||
HWFILE hfile;
|
||||
CHAR8 zName[32];
|
||||
UINT32 uiNumBytesRead;
|
||||
XMLWriter xmlw;
|
||||
|
||||
//OPEN FILE
|
||||
// hfile = fopen( "BINARYDATA\\JA2SET.DAT", "rb" );
|
||||
hfile = FileOpen( "BINARYDATA\\JA2SET.DAT", FILE_ACCESS_READ, FALSE );
|
||||
if ( !hfile )
|
||||
if(g_bUseXML_Tilesets)
|
||||
{
|
||||
SET_ERROR( "Cannot open tileset data file" );
|
||||
return;
|
||||
const vfs::Path tileset_filename(L"Ja2Set.dat.xml");
|
||||
if(!getVFS()->fileExists(tileset_filename))
|
||||
{
|
||||
SGP_TRYCATCH_RETHROW( ExportTilesets(tileset_filename), L"Could not export tileset XML file");
|
||||
}
|
||||
vfs::tReadableFile* file = getVFS()->getReadFile(tileset_filename);
|
||||
SGP_THROW_IFFALSE(file,
|
||||
_BS(L"File '") << tileset_filename << L"' does not exist and could not be created" << _BS::wget);
|
||||
|
||||
CTilesetReader tileset_reader(gTilesets);
|
||||
xml_auto::TGenericXMLParser<CTilesetReader> pars(&tileset_reader,NULL);
|
||||
|
||||
SGP_TRYCATCH_RETHROW( pars.parseFile(file),
|
||||
_BS(L"Parser Error in file : ") << file->getPath() << _BS::wget );
|
||||
}
|
||||
else
|
||||
{
|
||||
UINT32 cnt, cnt2, uiNumFiles;
|
||||
//FILE *hfile;
|
||||
HWFILE hfile;
|
||||
CHAR8 zName[32];
|
||||
UINT32 uiNumBytesRead;
|
||||
|
||||
//OPEN FILE
|
||||
hfile = FileOpen( "BINARYDATA\\JA2SET.DAT", FILE_ACCESS_READ, FALSE );
|
||||
if ( !hfile )
|
||||
{
|
||||
SET_ERROR( "Cannot open tileset data file" );
|
||||
return;
|
||||
}
|
||||
|
||||
// READ # TILESETS and compare
|
||||
FileRead( hfile, &gubNumSets, sizeof( gubNumSets ), &uiNumBytesRead );
|
||||
// CHECK
|
||||
if ( gubNumSets > MAX_TILESETS )
|
||||
{
|
||||
// Report error
|
||||
SET_ERROR( "Too many tilesets in the data file" );
|
||||
return;
|
||||
}
|
||||
|
||||
// READ #files
|
||||
FileRead( hfile, &uiNumFiles, sizeof( uiNumFiles ), &uiNumBytesRead );
|
||||
|
||||
// COMPARE
|
||||
if ( uiNumFiles != NUMBEROFTILETYPES )
|
||||
{
|
||||
// Report error
|
||||
SET_ERROR( "Number of tilesets slots in code does not match data file" );
|
||||
return;
|
||||
}
|
||||
|
||||
// Loop through each tileset, load name then files
|
||||
for ( cnt = 0; cnt < gubNumSets; cnt++ )
|
||||
{
|
||||
//Read name
|
||||
FileRead( hfile, &zName, sizeof( zName ), &uiNumBytesRead );
|
||||
|
||||
// Read ambience value
|
||||
FileRead( hfile, &(gTilesets[ cnt ].ubAmbientID), sizeof( UINT8 ), &uiNumBytesRead );
|
||||
|
||||
// Set into tileset
|
||||
swprintf( gTilesets[ cnt ].zName, L"%S", zName );
|
||||
|
||||
// Loop for files
|
||||
for ( cnt2 = 0; cnt2 < uiNumFiles; cnt2++ )
|
||||
{
|
||||
// Read file name
|
||||
FileRead( hfile, &zName, sizeof( zName ), &uiNumBytesRead );
|
||||
|
||||
// Set into database
|
||||
strcpy( gTilesets[ cnt ].TileSurfaceFilenames[ cnt2 ], zName );
|
||||
}
|
||||
}
|
||||
|
||||
FileClose( hfile );
|
||||
}
|
||||
|
||||
// SET CALLBACK FUNTIONS!!!!!!!!!!!!!
|
||||
gTilesets[ TLS_CAVES_1 ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetTwoTerrainValues;
|
||||
gTilesets[ TLS_AIRSTRIP ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_DEAD_AIRSTRIP ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_PALACE ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_BALIME ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_BALIME_MUSEUM ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_QUEENS_TROPICAL ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_MEDUNA_INNER_TOWN ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_QUEENS_SAM ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_QUEENS_AIRPORT ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
|
||||
gTilesets[ TLS_TROPICAL_1 ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetFourTerrainValues;
|
||||
gTilesets[ TLS_DESERT_SAM ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetFourTerrainValues;
|
||||
}
|
||||
|
||||
#ifdef USE_VFS
|
||||
void ExportTilesets(vfs::Path const& filename)
|
||||
{
|
||||
UINT32 uiNumBytesRead = 0;
|
||||
CHAR8 zName[32];
|
||||
|
||||
//OPEN FILE
|
||||
HWFILE hfile = FileOpen( "BINARYDATA\\JA2SET.DAT", FILE_ACCESS_READ, FALSE );
|
||||
SGP_THROW_IFFALSE(hfile, L"Cannot open tileset data file" );
|
||||
|
||||
XMLWriter xmlw;
|
||||
xmlw.openNode("JA2SET");
|
||||
|
||||
// READ # TILESETS and compare
|
||||
// fread( &gubNumSets, sizeof( gubNumSets ), 1, hfile );
|
||||
FileRead( hfile, &gubNumSets, sizeof( gubNumSets ), &uiNumBytesRead );
|
||||
UINT8 numSets = 0;
|
||||
FileRead( hfile, &numSets, sizeof( numSets ), &uiNumBytesRead );
|
||||
|
||||
// CHECK
|
||||
if ( gubNumSets > MAX_TILESETS )
|
||||
{
|
||||
// Report error
|
||||
SET_ERROR( "Too many tilesets in the data file" );
|
||||
return;
|
||||
}
|
||||
xmlw.addAttributeToNextValue("numTilesets",(int)gubNumSets);
|
||||
SGP_THROW_IFFALSE( numSets <= MAX_TILESETS, L"Too many tilesets in the data file" );
|
||||
xmlw.addAttributeToNextValue("numTilesets",(int)numSets);
|
||||
|
||||
// READ #files
|
||||
// fread( &uiNumFiles, sizeof( uiNumFiles ), 1, hfile );
|
||||
FileRead( hfile, &uiNumFiles, sizeof( uiNumFiles ), &uiNumBytesRead );
|
||||
UINT32 numFiles;
|
||||
FileRead( hfile, &numFiles, sizeof( numFiles ), &uiNumBytesRead );
|
||||
|
||||
// COMPARE
|
||||
if ( uiNumFiles != NUMBEROFTILETYPES )
|
||||
{
|
||||
// Report error
|
||||
SET_ERROR( "Number of tilesets slots in code does not match data file" );
|
||||
return;
|
||||
}
|
||||
xmlw.addAttributeToNextValue("numFiles",(int)uiNumFiles);
|
||||
SGP_THROW_IFFALSE( numFiles == NUMBEROFTILETYPES,
|
||||
L"Number of tilesets slots in code does not match data file" );
|
||||
|
||||
xmlw.addAttributeToNextValue("numFiles",(int)numFiles);
|
||||
xmlw.openNode("tilesets");
|
||||
// Loop through each tileset, load name then files
|
||||
for ( cnt = 0; cnt < gubNumSets; cnt++ )
|
||||
for ( UINT8 cnt = 0; cnt < numSets; cnt++ )
|
||||
{
|
||||
xmlw.addAttributeToNextValue("index",(int)cnt);
|
||||
xmlw.openNode("Tileset");
|
||||
|
||||
//Read name
|
||||
// fread( &zName, sizeof( zName ), 1, hfile );
|
||||
FileRead( hfile, &zName, sizeof( zName ), &uiNumBytesRead );
|
||||
xmlw.addValue("Name",std::string(zName));
|
||||
|
||||
// Read ambience value
|
||||
// fread( &(gTilesets[ cnt ].ubAmbientID), sizeof( UINT8), 1, hfile );
|
||||
FileRead( hfile, &(gTilesets[ cnt ].ubAmbientID), sizeof( UINT8 ), &uiNumBytesRead );
|
||||
xmlw.addValue("AmbientID",(int)gTilesets[ cnt ].ubAmbientID);
|
||||
|
||||
// Set into tileset
|
||||
swprintf( gTilesets[ cnt ].zName, L"%S", zName );
|
||||
UINT8 ambientID = 0;
|
||||
FileRead( hfile, &ambientID, sizeof( UINT8 ), &uiNumBytesRead );
|
||||
xmlw.addValue("AmbientID",(int)ambientID);
|
||||
|
||||
xmlw.openNode("Files");
|
||||
// Loop for files
|
||||
for ( cnt2 = 0; cnt2 < uiNumFiles; cnt2++ )
|
||||
for ( UINT32 cnt2 = 0; cnt2 < numFiles; cnt2++ )
|
||||
{
|
||||
// Read file name
|
||||
// fread( &zName, sizeof( zName ), 1, hfile );
|
||||
FileRead( hfile, &zName, sizeof( zName ), &uiNumBytesRead );
|
||||
if(!std::string(zName).empty())
|
||||
{
|
||||
@@ -107,38 +193,26 @@ void InitEngineTilesets( )
|
||||
|
||||
// Set into database
|
||||
strcpy( gTilesets[ cnt ].TileSurfaceFilenames[ cnt2 ], zName );
|
||||
|
||||
//ddd{ äîáàâëÿåì â èíäåêñ 250 ôàéë îêîï.
|
||||
// if((cnt==0)&&(cnt2+1 == uiNumFiles))
|
||||
// { strcpy( gTilesets[ cnt ].TileSurfaceFilenames[ 151 ], "okop.sti" );
|
||||
// xmlw.AddAttributeToNextValue("index",(int)151); //for exp in xml
|
||||
// xmlw.AddValue("file",std::string("okop.sti"));
|
||||
// }
|
||||
//ddd}
|
||||
|
||||
}
|
||||
xmlw.closeNode(); // Files
|
||||
xmlw.closeNode(); // tileset
|
||||
}
|
||||
xmlw.closeNode();
|
||||
|
||||
// fclose( hfile );
|
||||
FileClose( hfile );
|
||||
|
||||
xmlw.closeNode();
|
||||
#ifdef USE_VFS
|
||||
xmlw.writeToFile("Ja2Set.dat.xml");
|
||||
#endif
|
||||
// SET CALLBACK FUNTIONS!!!!!!!!!!!!!
|
||||
gTilesets[ TLS_CAVES_1 ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetTwoTerrainValues;
|
||||
gTilesets[ TLS_AIRSTRIP ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_DEAD_AIRSTRIP ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_PALACE ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_BALIME ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_BALIME_MUSEUM ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_QUEENS_TROPICAL ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_MEDUNA_INNER_TOWN ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_QUEENS_SAM ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
gTilesets[ TLS_QUEENS_AIRPORT ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetThreeTerrainValues;
|
||||
|
||||
gTilesets[ TLS_TROPICAL_1 ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetFourTerrainValues;
|
||||
gTilesets[ TLS_DESERT_SAM ].MovementCostFnc = (TILESET_CALLBACK)SetTilesetFourTerrainValues;
|
||||
xmlw.writeToFile(filename);
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
void SetTilesetOneTerrainValues( )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user