* Updates to map cache generator tool.
- Removed unmaintained grfio library copy and made the tool use the one in /common instead (related r12726). - Updated makefile to use compile options/libraries determined by configure (bugreport:1109). - Fixed error messages from the tool and grfio library overlapping each other (bugreport:2403). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14646 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei
parent
bf53c4e2a8
commit
0a86d090c1
@ -1,5 +1,10 @@
|
||||
Date Added
|
||||
|
||||
2011/01/01
|
||||
* Updates to map cache generator tool. [Ai4rei]
|
||||
- Removed unmaintained grfio library copy and made the tool use the one in /common instead (related r12726).
|
||||
- Updated makefile to use compile options/libraries determined by configure (bugreport:1109).
|
||||
- Fixed error messages from the tool and grfio library overlapping each other (bugreport:2403).
|
||||
2010/12/31
|
||||
* Pending trade requests no longer prevent a character from trading someone else instead (official). [Ai4rei]
|
||||
- This fixes trade window displaying wrong name when attempting to deal multiple characters (bugreport:344).
|
||||
|
||||
@ -1,4 +1,13 @@
|
||||
|
||||
COMMON_OBJ = ../common/obj_all/minicore.o ../common/obj_all/malloc.o \
|
||||
../common/obj_all/showmsg.o ../common/obj_all/strlib.o \
|
||||
../common/obj_all/utils.o ../common/obj_all/grfio.o
|
||||
COMMON_H = ../common/core.h ../common/mmo.h ../common/version.h \
|
||||
../common/malloc.h ../common/showmsg.h ../common/strlib.h \
|
||||
../common/utils.h ../common/cbasetypes.h ../common/grfio.h
|
||||
|
||||
MAPCACHE_OBJ = obj_all/mapcache.o
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
#####################################################################
|
||||
@ -6,11 +15,11 @@
|
||||
|
||||
all: mapcache
|
||||
|
||||
mapcache:
|
||||
@CC@ -o ../../mapcache@EXEEXT@ mapcache.c grfio.c -lz
|
||||
mapcache: obj_all $(MAPCACHE_OBJ) $(COMMON_OBJ)
|
||||
@CC@ @LDFLAGS@ -o ../../mapcache@EXEEXT@ $(MAPCACHE_OBJ) $(COMMON_OBJ) @LIBS@
|
||||
|
||||
clean:
|
||||
rm -rf *.o ../../mapcache@EXEEXT@
|
||||
rm -rf obj_all/*.o ../../mapcache@EXEEXT@
|
||||
|
||||
help:
|
||||
@echo "possible targets are 'mapcache' 'all' 'clean' 'help'"
|
||||
@ -20,3 +29,16 @@ help:
|
||||
@echo "'help' - outputs this message"
|
||||
|
||||
#####################################################################
|
||||
|
||||
obj_all:
|
||||
-mkdir obj_all
|
||||
|
||||
obj_all/%.o: %.c $(COMMON_H)
|
||||
@CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
|
||||
|
||||
# missing common object files
|
||||
../common/obj_all/%.o:
|
||||
@$(MAKE) -C ../common txt
|
||||
|
||||
../common/obj_all/mini%.o:
|
||||
@$(MAKE) -C ../common txt
|
||||
|
||||
844
src/tool/grfio.c
844
src/tool/grfio.c
@ -1,844 +0,0 @@
|
||||
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
|
||||
// For more information, see LICENCE in the main folder
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <ctype.h> // tolower()
|
||||
|
||||
#include "grfio.h"
|
||||
#include <zlib.h>
|
||||
|
||||
|
||||
#ifndef __WIN32
|
||||
#define strcmpi strcasecmp
|
||||
#endif
|
||||
|
||||
|
||||
//----------------------------
|
||||
// file entry table struct
|
||||
//----------------------------
|
||||
typedef struct _FILELIST {
|
||||
int srclen; // compressed size
|
||||
int srclen_aligned;
|
||||
int declen; // original size
|
||||
int srcpos; // position of entry in grf
|
||||
int next; // index of next filelist entry with same hash (-1: end of entry chain)
|
||||
int cycle;
|
||||
char type;
|
||||
char fn[128-4*5]; // file name
|
||||
char* fnd; // if the file was cloned, contains name of original file
|
||||
char gentry; // read grf file select
|
||||
} FILELIST;
|
||||
|
||||
//gentry ... > 0 : data read from a grf file (gentry_table[gentry-1])
|
||||
//gentry ... 0 : data read from a local file (data directory)
|
||||
//gentry ... < 0 : entry "-(gentry)" is marked for a local file check
|
||||
// - if local file exists, gentry will be set to 0 (thus using the local file)
|
||||
// - if local file doesn't exist, sign is inverted (thus using the original file inside a grf)
|
||||
// (NOTE: this case is only used once (during startup) and only if GRFIO_LOCAL is enabled)
|
||||
// (NOTE: probably meant to be used to override grf contents by files in the data directory)
|
||||
//#define GRFIO_LOCAL
|
||||
|
||||
// stores info about every loaded file
|
||||
FILELIST* filelist = NULL;
|
||||
int filelist_entrys = 0;
|
||||
int filelist_maxentry = 0;
|
||||
|
||||
// stores grf file names
|
||||
char** gentry_table = NULL;
|
||||
int gentry_entrys = 0;
|
||||
int gentry_maxentry = 0;
|
||||
|
||||
// the path to the data directory
|
||||
char data_dir[1024] = "";
|
||||
|
||||
//----------------------------
|
||||
// file list hash table
|
||||
//----------------------------
|
||||
int filelist_hash[256];
|
||||
|
||||
//----------------------------
|
||||
// grf decode data table
|
||||
//----------------------------
|
||||
static unsigned char BitMaskTable[8] = {
|
||||
0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01
|
||||
};
|
||||
|
||||
static char BitSwapTable1[64] = {
|
||||
58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4,
|
||||
62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8,
|
||||
57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3,
|
||||
61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7
|
||||
};
|
||||
static char BitSwapTable2[64] = {
|
||||
40, 8, 48, 16, 56, 24, 64, 32, 39, 7, 47, 15, 55, 23, 63, 31,
|
||||
38, 6, 46, 14, 54, 22, 62, 30, 37, 5, 45, 13, 53, 21, 61, 29,
|
||||
36, 4, 44, 12, 52, 20, 60, 28, 35, 3, 43, 11, 51, 19, 59, 27,
|
||||
34, 2, 42, 10, 50, 18, 58, 26, 33, 1, 41, 9, 49, 17, 57, 25
|
||||
};
|
||||
static char BitSwapTable3[32] = {
|
||||
16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10,
|
||||
2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25
|
||||
};
|
||||
|
||||
static unsigned char NibbleData[4][64]={
|
||||
{
|
||||
0xef, 0x03, 0x41, 0xfd, 0xd8, 0x74, 0x1e, 0x47, 0x26, 0xef, 0xfb, 0x22, 0xb3, 0xd8, 0x84, 0x1e,
|
||||
0x39, 0xac, 0xa7, 0x60, 0x62, 0xc1, 0xcd, 0xba, 0x5c, 0x96, 0x90, 0x59, 0x05, 0x3b, 0x7a, 0x85,
|
||||
0x40, 0xfd, 0x1e, 0xc8, 0xe7, 0x8a, 0x8b, 0x21, 0xda, 0x43, 0x64, 0x9f, 0x2d, 0x14, 0xb1, 0x72,
|
||||
0xf5, 0x5b, 0xc8, 0xb6, 0x9c, 0x37, 0x76, 0xec, 0x39, 0xa0, 0xa3, 0x05, 0x52, 0x6e, 0x0f, 0xd9,
|
||||
}, {
|
||||
0xa7, 0xdd, 0x0d, 0x78, 0x9e, 0x0b, 0xe3, 0x95, 0x60, 0x36, 0x36, 0x4f, 0xf9, 0x60, 0x5a, 0xa3,
|
||||
0x11, 0x24, 0xd2, 0x87, 0xc8, 0x52, 0x75, 0xec, 0xbb, 0xc1, 0x4c, 0xba, 0x24, 0xfe, 0x8f, 0x19,
|
||||
0xda, 0x13, 0x66, 0xaf, 0x49, 0xd0, 0x90, 0x06, 0x8c, 0x6a, 0xfb, 0x91, 0x37, 0x8d, 0x0d, 0x78,
|
||||
0xbf, 0x49, 0x11, 0xf4, 0x23, 0xe5, 0xce, 0x3b, 0x55, 0xbc, 0xa2, 0x57, 0xe8, 0x22, 0x74, 0xce,
|
||||
}, {
|
||||
0x2c, 0xea, 0xc1, 0xbf, 0x4a, 0x24, 0x1f, 0xc2, 0x79, 0x47, 0xa2, 0x7c, 0xb6, 0xd9, 0x68, 0x15,
|
||||
0x80, 0x56, 0x5d, 0x01, 0x33, 0xfd, 0xf4, 0xae, 0xde, 0x30, 0x07, 0x9b, 0xe5, 0x83, 0x9b, 0x68,
|
||||
0x49, 0xb4, 0x2e, 0x83, 0x1f, 0xc2, 0xb5, 0x7c, 0xa2, 0x19, 0xd8, 0xe5, 0x7c, 0x2f, 0x83, 0xda,
|
||||
0xf7, 0x6b, 0x90, 0xfe, 0xc4, 0x01, 0x5a, 0x97, 0x61, 0xa6, 0x3d, 0x40, 0x0b, 0x58, 0xe6, 0x3d,
|
||||
}, {
|
||||
0x4d, 0xd1, 0xb2, 0x0f, 0x28, 0xbd, 0xe4, 0x78, 0xf6, 0x4a, 0x0f, 0x93, 0x8b, 0x17, 0xd1, 0xa4,
|
||||
0x3a, 0xec, 0xc9, 0x35, 0x93, 0x56, 0x7e, 0xcb, 0x55, 0x20, 0xa0, 0xfe, 0x6c, 0x89, 0x17, 0x62,
|
||||
0x17, 0x62, 0x4b, 0xb1, 0xb4, 0xde, 0xd1, 0x87, 0xc9, 0x14, 0x3c, 0x4a, 0x7e, 0xa8, 0xe2, 0x7d,
|
||||
0xa0, 0x9f, 0xf6, 0x5c, 0x6a, 0x09, 0x8d, 0xf0, 0x0f, 0xe3, 0x53, 0x25, 0x95, 0x36, 0x28, 0xcb,
|
||||
}
|
||||
};
|
||||
|
||||
// little endian char array to uint conversion
|
||||
static unsigned int getlong(unsigned char* p)
|
||||
{
|
||||
return (p[0] | p[1] << 0x08 | p[2] << 0x10 | p[3] << 0x18);
|
||||
}
|
||||
|
||||
/*==========================================
|
||||
* Grf data decode : Subs
|
||||
*------------------------------------------*/
|
||||
static void NibbleSwap(unsigned char* Src, int len)
|
||||
{
|
||||
for(;0<len;len--,Src++) {
|
||||
*Src = (*Src>>4) | (*Src<<4);
|
||||
}
|
||||
}
|
||||
|
||||
static void BitConvert(unsigned char* Src, char* BitSwapTable)
|
||||
{
|
||||
int lop,prm;
|
||||
unsigned char tmp[8];
|
||||
memset(tmp,0,8);
|
||||
for(lop=0;lop!=64;lop++) {
|
||||
prm = BitSwapTable[lop]-1;
|
||||
if (Src[(prm >> 3) & 7] & BitMaskTable[prm & 7]) {
|
||||
tmp[(lop >> 3) & 7] |= BitMaskTable[lop & 7];
|
||||
}
|
||||
}
|
||||
memcpy(Src,tmp,8);
|
||||
}
|
||||
|
||||
static void BitConvert4(unsigned char* Src)
|
||||
{
|
||||
int lop,prm;
|
||||
unsigned char tmp[8];
|
||||
tmp[0] = ((Src[7]<<5) | (Src[4]>>3)) & 0x3f; // ..0 vutsr
|
||||
tmp[1] = ((Src[4]<<1) | (Src[5]>>7)) & 0x3f; // ..srqpo n
|
||||
tmp[2] = ((Src[4]<<5) | (Src[5]>>3)) & 0x3f; // ..o nmlkj
|
||||
tmp[3] = ((Src[5]<<1) | (Src[6]>>7)) & 0x3f; // ..kjihg f
|
||||
tmp[4] = ((Src[5]<<5) | (Src[6]>>3)) & 0x3f; // ..g fedcb
|
||||
tmp[5] = ((Src[6]<<1) | (Src[7]>>7)) & 0x3f; // ..cba98 7
|
||||
tmp[6] = ((Src[6]<<5) | (Src[7]>>3)) & 0x3f; // ..8 76543
|
||||
tmp[7] = ((Src[7]<<1) | (Src[4]>>7)) & 0x3f; // ..43210 v
|
||||
|
||||
for(lop=0;lop!=4;lop++) {
|
||||
tmp[lop] = (NibbleData[lop][tmp[lop*2]] & 0xf0)
|
||||
| (NibbleData[lop][tmp[lop*2+1]] & 0x0f);
|
||||
}
|
||||
|
||||
memset(tmp+4,0,4);
|
||||
for(lop=0;lop!=32;lop++) {
|
||||
prm = BitSwapTable3[lop]-1;
|
||||
if (tmp[prm >> 3] & BitMaskTable[prm & 7]) {
|
||||
tmp[(lop >> 3) + 4] |= BitMaskTable[lop & 7];
|
||||
}
|
||||
}
|
||||
Src[0] ^= tmp[4];
|
||||
Src[1] ^= tmp[5];
|
||||
Src[2] ^= tmp[6];
|
||||
Src[3] ^= tmp[7];
|
||||
}
|
||||
|
||||
static void decode_des_etc(unsigned char* buf, size_t len, int type, int cycle)
|
||||
{
|
||||
size_t lop,cnt=0;
|
||||
if(cycle<3) cycle=3;
|
||||
else if(cycle<5) cycle++;
|
||||
else if(cycle<7) cycle+=9;
|
||||
else cycle+=15;
|
||||
|
||||
for(lop=0; lop*8<len; lop++, buf+=8)
|
||||
{
|
||||
if(lop<20 || (type==0 && lop%cycle==0)) { // des
|
||||
BitConvert(buf,BitSwapTable1);
|
||||
BitConvert4(buf);
|
||||
BitConvert(buf,BitSwapTable2);
|
||||
} else {
|
||||
if(cnt==7 && type==0) {
|
||||
unsigned char a;
|
||||
unsigned char tmp[8];
|
||||
memcpy(tmp,buf,8);
|
||||
cnt=0;
|
||||
buf[0]=tmp[3];
|
||||
buf[1]=tmp[4];
|
||||
buf[2]=tmp[6];
|
||||
buf[3]=tmp[0];
|
||||
buf[4]=tmp[1];
|
||||
buf[5]=tmp[2];
|
||||
buf[6]=tmp[5];
|
||||
a=tmp[7];
|
||||
if(a==0x00) a=0x2b;
|
||||
else if(a==0x2b) a=0x00;
|
||||
else if(a==0x01) a=0x68;
|
||||
else if(a==0x68) a=0x01;
|
||||
else if(a==0x48) a=0x77;
|
||||
else if(a==0x77) a=0x48;
|
||||
else if(a==0x60) a=0xff;
|
||||
else if(a==0xff) a=0x60;
|
||||
else if(a==0x6c) a=0x80;
|
||||
else if(a==0x80) a=0x6c;
|
||||
else if(a==0xb9) a=0xc0;
|
||||
else if(a==0xc0) a=0xb9;
|
||||
else if(a==0xeb) a=0xfe;
|
||||
else if(a==0xfe) a=0xeb;
|
||||
buf[7]=a;
|
||||
}
|
||||
cnt++;
|
||||
}
|
||||
}
|
||||
}
|
||||
/*==========================================
|
||||
* Grf data decode sub : zip
|
||||
*------------------------------------------*/
|
||||
int decode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen)
|
||||
{
|
||||
z_stream stream;
|
||||
int err;
|
||||
|
||||
stream.next_in = (Bytef*)source;
|
||||
stream.avail_in = (uInt)sourceLen;
|
||||
/* Check for source > 64K on 16-bit machine: */
|
||||
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
|
||||
|
||||
stream.next_out = (Bytef*) dest;
|
||||
stream.avail_out = (uInt)*destLen;
|
||||
if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
|
||||
|
||||
stream.zalloc = (alloc_func)0;
|
||||
stream.zfree = (free_func)0;
|
||||
|
||||
err = inflateInit(&stream);
|
||||
if (err != Z_OK) return err;
|
||||
|
||||
err = inflate(&stream, Z_FINISH);
|
||||
if (err != Z_STREAM_END) {
|
||||
inflateEnd(&stream);
|
||||
return err == Z_OK ? Z_BUF_ERROR : err;
|
||||
}
|
||||
*destLen = stream.total_out;
|
||||
|
||||
err = inflateEnd(&stream);
|
||||
return err;
|
||||
}
|
||||
|
||||
int encode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen)
|
||||
{
|
||||
z_stream stream;
|
||||
int err;
|
||||
memset(&stream, 0, sizeof(stream));
|
||||
stream.next_in = (Bytef*)source;
|
||||
stream.avail_in = (uInt)sourceLen;
|
||||
/* Check for source > 64K on 16-bit machine: */
|
||||
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
|
||||
|
||||
stream.next_out = (Bytef*) dest;
|
||||
stream.avail_out = (uInt)*destLen;
|
||||
if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
|
||||
|
||||
stream.zalloc = (alloc_func)0;
|
||||
stream.zfree = (free_func)0;
|
||||
|
||||
err = deflateInit(&stream,Z_DEFAULT_COMPRESSION);
|
||||
if (err != Z_OK) return err;
|
||||
|
||||
err = deflate(&stream, Z_FINISH);
|
||||
if (err != Z_STREAM_END) {
|
||||
inflateEnd(&stream);
|
||||
return err == Z_OK ? Z_BUF_ERROR : err;
|
||||
}
|
||||
*destLen = stream.total_out;
|
||||
|
||||
err = deflateEnd(&stream);
|
||||
return err;
|
||||
}
|
||||
|
||||
unsigned long grfio_crc32 (const unsigned char* buf, unsigned int len)
|
||||
{
|
||||
return crc32(crc32(0L, Z_NULL, 0), buf, len);
|
||||
}
|
||||
|
||||
/***********************************************************
|
||||
*** File List Subroutines ***
|
||||
***********************************************************/
|
||||
|
||||
// initializes the table that holds the first elements of all hash chains
|
||||
static void hashinit(void)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < 256; i++)
|
||||
filelist_hash[i] = -1;
|
||||
}
|
||||
|
||||
// hashes a filename string into a number from {0..255}
|
||||
static int filehash(char* fname)
|
||||
{
|
||||
unsigned int hash = 0;
|
||||
while(*fname) {
|
||||
hash = ((hash<<1) + (hash>>7)*9 + (unsigned int)tolower((unsigned char)(*fname)));
|
||||
fname++;
|
||||
}
|
||||
return hash & 255;
|
||||
}
|
||||
|
||||
// finds a FILELIST entry with the specified file name
|
||||
static FILELIST* filelist_find(char* fname)
|
||||
{
|
||||
int hash, index;
|
||||
|
||||
if (!filelist)
|
||||
return NULL;
|
||||
|
||||
hash = filelist_hash[filehash(fname)];
|
||||
for (index = hash; index != -1; index = filelist[index].next)
|
||||
if(!strcmpi(filelist[index].fn, fname))
|
||||
break;
|
||||
|
||||
return (index >= 0) ? &filelist[index] : NULL;
|
||||
}
|
||||
|
||||
// returns the original file name
|
||||
/*
|
||||
char* grfio_find_file(char* fname)
|
||||
{
|
||||
FILELIST *filelist = filelist_find(fname);
|
||||
if (!filelist) return NULL;
|
||||
return (!filelist->fnd ? filelist->fn : filelist->fnd);
|
||||
}
|
||||
*/
|
||||
|
||||
// adds a FILELIST entry into the list of loaded files
|
||||
static FILELIST* filelist_add(FILELIST* entry)
|
||||
{
|
||||
int hash;
|
||||
|
||||
#define FILELIST_ADDS 1024 // number increment of file lists `
|
||||
|
||||
if (filelist_entrys >= filelist_maxentry) {
|
||||
filelist = (FILELIST *)realloc(filelist, (filelist_maxentry + FILELIST_ADDS) * sizeof(FILELIST));
|
||||
memset(filelist + filelist_maxentry, '\0', FILELIST_ADDS * sizeof(FILELIST));
|
||||
filelist_maxentry += FILELIST_ADDS;
|
||||
}
|
||||
|
||||
memcpy (&filelist[filelist_entrys], entry, sizeof(FILELIST));
|
||||
|
||||
hash = filehash(entry->fn);
|
||||
filelist[filelist_entrys].next = filelist_hash[hash];
|
||||
filelist_hash[hash] = filelist_entrys;
|
||||
|
||||
filelist_entrys++;
|
||||
|
||||
return &filelist[filelist_entrys - 1];
|
||||
}
|
||||
|
||||
// adds a new FILELIST entry or overwrites an existing one
|
||||
static FILELIST* filelist_modify(FILELIST* entry)
|
||||
{
|
||||
FILELIST* fentry = filelist_find(entry->fn);
|
||||
if (fentry != NULL) {
|
||||
int tmp = fentry->next;
|
||||
memcpy(fentry, entry, sizeof(FILELIST));
|
||||
fentry->next = tmp;
|
||||
} else {
|
||||
fentry = filelist_add(entry);
|
||||
}
|
||||
return fentry;
|
||||
}
|
||||
|
||||
// shrinks the file list array if too long
|
||||
static void filelist_adjust(void)
|
||||
{
|
||||
if (filelist == NULL)
|
||||
return;
|
||||
|
||||
if (filelist_entrys < filelist_maxentry) {
|
||||
filelist = (FILELIST *)realloc(filelist, filelist_entrys * sizeof(FILELIST));
|
||||
filelist_maxentry = filelist_entrys;
|
||||
}
|
||||
}
|
||||
|
||||
/***********************************************************
|
||||
*** Grfio Sobroutines ***
|
||||
***********************************************************/
|
||||
|
||||
// returns a file's size
|
||||
/*
|
||||
int grfio_size(char* fname)
|
||||
{
|
||||
FILELIST* entry;
|
||||
|
||||
entry = filelist_find(fname);
|
||||
|
||||
if (entry == NULL || entry->gentry < 0) { // LocalFileCheck
|
||||
char lfname[256], *p;
|
||||
FILELIST lentry;
|
||||
struct stat st;
|
||||
|
||||
sprintf(lfname, "%s%s", data_dir, fname);
|
||||
|
||||
for (p = &lfname[0]; *p != 0; p++)
|
||||
if (*p=='\\') *p = '/';
|
||||
|
||||
if (stat(lfname, &st) == 0) {
|
||||
strncpy(lentry.fn, fname, sizeof(lentry.fn) - 1);
|
||||
lentry.fnd = NULL;
|
||||
lentry.declen = st.st_size;
|
||||
lentry.gentry = 0; // 0:LocalFile
|
||||
entry = filelist_modify(&lentry);
|
||||
} else if (entry == NULL) {
|
||||
printf("%s not found (grfio_size)\n", fname);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return entry->declen;
|
||||
}
|
||||
*/
|
||||
|
||||
// reads a file into a newly allocated buffer (from grf or data directory)
|
||||
void* grfio_reads(char* fname, int* size)
|
||||
{
|
||||
FILE* in;
|
||||
FILELIST* entry;
|
||||
unsigned char* buf2 = NULL;
|
||||
|
||||
entry = filelist_find(fname);
|
||||
|
||||
if (entry == NULL || entry->gentry <= 0) { // LocalFileCheck
|
||||
char lfname[256], *p;
|
||||
FILELIST lentry;
|
||||
|
||||
sprintf(lfname, "%s%s", data_dir, fname);
|
||||
|
||||
for (p = &lfname[0]; *p != 0; p++)
|
||||
if (*p == '\\') *p = '/';
|
||||
|
||||
in = fopen(lfname, "rb");
|
||||
if (in != NULL) {
|
||||
if (entry != NULL && entry->gentry == 0) {
|
||||
lentry.declen = entry->declen;
|
||||
} else {
|
||||
fseek(in,0,SEEK_END);
|
||||
lentry.declen = ftell(in);
|
||||
}
|
||||
fseek(in,0,SEEK_SET);
|
||||
buf2 = (unsigned char *)malloc(lentry.declen + 1024);
|
||||
fread(buf2, 1, lentry.declen, in);
|
||||
fclose(in);
|
||||
strncpy(lentry.fn, fname, sizeof(lentry.fn) - 1);
|
||||
lentry.fnd = NULL;
|
||||
lentry.gentry = 0; // 0:LocalFile
|
||||
entry = filelist_modify(&lentry);
|
||||
} else {
|
||||
if (entry != NULL && entry->gentry < 0) {
|
||||
entry->gentry = -entry->gentry; // local file checked
|
||||
} else {
|
||||
printf("%s not found (grfio_reads - local file %s)\n", fname, lfname);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (entry != NULL && entry->gentry > 0) { // Archive[GRF] File Read
|
||||
char* grfname = gentry_table[entry->gentry - 1];
|
||||
in = fopen(grfname, "rb");
|
||||
if(in != NULL) {
|
||||
unsigned char *buf = (unsigned char *)malloc(entry->srclen_aligned + 1024);
|
||||
fseek(in, entry->srcpos, 0);
|
||||
fread(buf, 1, entry->srclen_aligned, in);
|
||||
fclose(in);
|
||||
buf2 = (unsigned char *)malloc(entry->declen + 1024);
|
||||
if (entry->type == 1 || entry->type == 3 || entry->type == 5) {
|
||||
uLongf len;
|
||||
if (entry->cycle >= 0)
|
||||
decode_des_etc(buf, entry->srclen_aligned, entry->cycle == 0, entry->cycle);
|
||||
len = entry->declen;
|
||||
decode_zip(buf2, &len, buf, entry->srclen);
|
||||
if (len != (uLong)entry->declen) {
|
||||
printf("decode_zip size mismatch err: %d != %d\n", (int)len, entry->declen);
|
||||
free(buf);
|
||||
free(buf2);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
memcpy(buf2, buf, entry->declen);
|
||||
}
|
||||
free(buf);
|
||||
} else {
|
||||
printf("%s not found (grfio_reads - GRF file %s)\n", fname, grfname);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
if (size != NULL && entry != NULL)
|
||||
*size = entry->declen;
|
||||
|
||||
return buf2;
|
||||
}
|
||||
|
||||
/*==========================================
|
||||
* Resource filename decode
|
||||
*------------------------------------------*/
|
||||
static char* decode_filename(unsigned char* buf, int len)
|
||||
{
|
||||
int lop;
|
||||
for(lop=0;lop<len;lop+=8) {
|
||||
NibbleSwap(&buf[lop],8);
|
||||
BitConvert(&buf[lop],BitSwapTable1);
|
||||
BitConvert4(&buf[lop]);
|
||||
BitConvert(&buf[lop],BitSwapTable2);
|
||||
}
|
||||
return (char*)buf;
|
||||
}
|
||||
|
||||
// loads all entries in the specified grf file into the filelist
|
||||
// gentry - index of the grf file name in the gentry_table
|
||||
static int grfio_entryread(char* grfname, int gentry)
|
||||
{
|
||||
FILE* fp;
|
||||
long grf_size,list_size;
|
||||
unsigned char grf_header[0x2e];
|
||||
int lop,entry,entrys,ofs,grf_version;
|
||||
char *fname;
|
||||
unsigned char *grf_filelist;
|
||||
|
||||
fp = fopen(grfname, "rb");
|
||||
if (fp == NULL) {
|
||||
printf("GRF data file not found: '%s'\n",grfname);
|
||||
return 1; // 1:not found error
|
||||
} else
|
||||
printf("GRF data file found: '%s'\n",grfname);
|
||||
|
||||
fseek(fp,0,SEEK_END);
|
||||
grf_size = ftell(fp);
|
||||
fseek(fp,0,SEEK_SET);
|
||||
fread(grf_header,1,0x2e,fp);
|
||||
if (strcmp((const char *) grf_header,"Master of Magic") ||
|
||||
fseek(fp,getlong(grf_header+0x1e),SEEK_CUR))
|
||||
{
|
||||
fclose(fp);
|
||||
printf("GRF %s read error\n", grfname);
|
||||
return 2; // 2:file format error
|
||||
}
|
||||
|
||||
grf_version = getlong(grf_header+0x2a) >> 8;
|
||||
|
||||
if (grf_version == 0x01) { //****** Grf version 01xx ******
|
||||
list_size = grf_size - ftell(fp);
|
||||
grf_filelist = (unsigned char *) malloc(list_size);
|
||||
fread(grf_filelist,1,list_size,fp);
|
||||
fclose(fp);
|
||||
|
||||
entrys = getlong(grf_header+0x26) - getlong(grf_header+0x22) - 7;
|
||||
|
||||
// Get an entry
|
||||
for (entry = 0,ofs = 0; entry < entrys; entry++) {
|
||||
int ofs2, srclen, srccount;
|
||||
unsigned char type;
|
||||
char* period_ptr;
|
||||
FILELIST aentry;
|
||||
|
||||
ofs2 = ofs+getlong(grf_filelist+ofs)+4;
|
||||
type = grf_filelist[ofs2+12];
|
||||
if (type != 0) { // Directory Index ... skip
|
||||
fname = decode_filename(grf_filelist+ofs+6, grf_filelist[ofs]-6);
|
||||
if (strlen(fname) > sizeof(aentry.fn) - 1) {
|
||||
printf("GRF file name %s is too long\n", fname);
|
||||
free(grf_filelist);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
srclen = 0;
|
||||
if ((period_ptr = strrchr(fname, '.')) != NULL) {
|
||||
for(lop = 0; lop < 4; lop++) {
|
||||
if (strcmpi(period_ptr, ".gnd\0.gat\0.act\0.str"+lop*5) == 0)
|
||||
break;
|
||||
}
|
||||
srclen = getlong(grf_filelist+ofs2) - getlong(grf_filelist+ofs2+8) - 715;
|
||||
if(lop == 4) {
|
||||
for(lop = 10, srccount = 1; srclen >= lop; lop = lop * 10, srccount++);
|
||||
} else {
|
||||
srccount = 0;
|
||||
}
|
||||
} else {
|
||||
srccount = 0;
|
||||
}
|
||||
|
||||
aentry.srclen = srclen;
|
||||
aentry.srclen_aligned = getlong(grf_filelist+ofs2+4)-37579;
|
||||
aentry.declen = getlong(grf_filelist+ofs2+8);
|
||||
aentry.srcpos = getlong(grf_filelist+ofs2+13)+0x2e;
|
||||
aentry.cycle = srccount;
|
||||
aentry.type = type;
|
||||
strncpy(aentry.fn, fname,sizeof(aentry.fn)-1);
|
||||
aentry.fnd = NULL;
|
||||
#ifdef GRFIO_LOCAL
|
||||
aentry.gentry = -(gentry+1); // As Flag for making it a negative number carrying out the first time LocalFileCheck
|
||||
#else
|
||||
aentry.gentry = gentry+1; // With no first time LocalFileCheck
|
||||
#endif
|
||||
filelist_modify(&aentry);
|
||||
}
|
||||
ofs = ofs2 + 17;
|
||||
}
|
||||
free(grf_filelist);
|
||||
|
||||
} else if (grf_version == 0x02) { //****** Grf version 02xx ******
|
||||
unsigned char eheader[8];
|
||||
unsigned char *rBuf;
|
||||
uLongf rSize, eSize;
|
||||
|
||||
fread(eheader,1,8,fp);
|
||||
rSize = getlong(eheader); // Read Size
|
||||
eSize = getlong(eheader+4); // Extend Size
|
||||
|
||||
if ((long)rSize > grf_size-ftell(fp)) {
|
||||
fclose(fp);
|
||||
printf("Illegal data format: GRF compress entry size\n");
|
||||
return 4;
|
||||
}
|
||||
|
||||
rBuf = (unsigned char *)malloc(rSize); // Get a Read Size
|
||||
grf_filelist = (unsigned char *)malloc(eSize); // Get a Extend Size
|
||||
fread(rBuf,1,rSize,fp);
|
||||
fclose(fp);
|
||||
decode_zip(grf_filelist, &eSize, rBuf, rSize); // Decode function
|
||||
list_size = eSize;
|
||||
free(rBuf);
|
||||
|
||||
entrys = getlong(grf_header+0x26) - 7;
|
||||
|
||||
// Get an entry
|
||||
for(entry = 0, ofs = 0; entry < entrys; entry++) {
|
||||
int ofs2, srclen, srccount, type;
|
||||
FILELIST aentry;
|
||||
|
||||
fname = (char*)(grf_filelist+ofs);
|
||||
if (strlen(fname) > sizeof(aentry.fn)-1) {
|
||||
printf("GRF file name %s is too long\n", fname);
|
||||
free(grf_filelist);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
ofs2 = ofs + (int)strlen(fname)+1;
|
||||
type = grf_filelist[ofs2+12];
|
||||
if (type == 1 || type == 3 || type == 5) {
|
||||
srclen = getlong(grf_filelist+ofs2);
|
||||
if (grf_filelist[ofs2+12] == 3) {
|
||||
for (lop = 10, srccount = 1; srclen >= lop; lop = lop * 10, srccount++);
|
||||
} else if (grf_filelist[ofs2+12] == 5) {
|
||||
srccount = 0;
|
||||
} else { // if (grf_filelist[ofs2+12]==1) {
|
||||
srccount = -1;
|
||||
}
|
||||
|
||||
aentry.srclen = srclen;
|
||||
aentry.srclen_aligned = getlong(grf_filelist+ofs2+4);
|
||||
aentry.declen = getlong(grf_filelist+ofs2+8);
|
||||
aentry.srcpos = getlong(grf_filelist+ofs2+13)+0x2e;
|
||||
aentry.cycle = srccount;
|
||||
aentry.type = type;
|
||||
strncpy(aentry.fn,fname,sizeof(aentry.fn)-1);
|
||||
aentry.fnd = NULL;
|
||||
#ifdef GRFIO_LOCAL
|
||||
aentry.gentry = -(gentry+1); // As Flag for making it a negative number carrying out the first time LocalFileCheck
|
||||
#else
|
||||
aentry.gentry = gentry+1; // With no first time LocalFileCheck
|
||||
#endif
|
||||
filelist_modify(&aentry);
|
||||
}
|
||||
ofs = ofs2 + 17;
|
||||
}
|
||||
free(grf_filelist);
|
||||
|
||||
} else { //****** Grf Other version ******
|
||||
fclose(fp);
|
||||
printf("GRF version %04x not supported\n",getlong(grf_header+0x2a));
|
||||
return 4;
|
||||
}
|
||||
|
||||
filelist_adjust(); // Unnecessary area release of filelist
|
||||
|
||||
return 0; // 0:no error
|
||||
}
|
||||
|
||||
/*==========================================
|
||||
* Grfio : Resource file check
|
||||
*------------------------------------------*/
|
||||
static void grfio_resourcecheck(void)
|
||||
{
|
||||
char w1[256], w2[256], src[256], dst[256], restable[256], line[256];
|
||||
char *ptr, *buf;
|
||||
FILELIST* entry;
|
||||
int size;
|
||||
FILE* fp;
|
||||
|
||||
// read resnametable from data directory and return if successful
|
||||
sprintf(restable, "%sdata\\resnametable.txt", data_dir);
|
||||
for (ptr = &restable[0]; *ptr != 0; ptr++)
|
||||
if (*ptr == '\\') *ptr = '/';
|
||||
|
||||
fp = fopen(restable, "rb");
|
||||
if (fp) {
|
||||
while(fgets(line, sizeof(line), fp))
|
||||
{
|
||||
if (sscanf(line, "%[^#]#%[^#]#", w1, w2) == 2 &&
|
||||
// we only need the maps' GAT and RSW files
|
||||
(strstr(w2, ".gat") || strstr(w2, ".rsw")))
|
||||
{
|
||||
sprintf(src, "data\\%s", w1);
|
||||
sprintf(dst, "data\\%s", w2);
|
||||
entry = filelist_find(dst);
|
||||
// create new entries reusing the original's info
|
||||
if (entry != NULL) {
|
||||
FILELIST fentry;
|
||||
memcpy(&fentry, entry, sizeof(FILELIST));
|
||||
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
|
||||
fentry.fnd = strdup(dst);
|
||||
filelist_modify(&fentry);
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
return; // we're done here!
|
||||
}
|
||||
|
||||
// read resnametable from loaded GRF's, only if it cannot be loaded from the data directory
|
||||
buf = (char *)grfio_reads("data\\resnametable.txt", &size);
|
||||
if (buf) {
|
||||
buf[size] = 0;
|
||||
|
||||
ptr = buf;
|
||||
while (ptr - buf < size) {
|
||||
if (sscanf(ptr, "%[^#]#%[^#]#", w1, w2) == 2 &&
|
||||
(strstr(w2, ".gat") || strstr(w2, ".rsw")))
|
||||
{
|
||||
sprintf(src, "data\\%s", w1);
|
||||
sprintf(dst, "data\\%s", w2);
|
||||
entry = filelist_find(dst);
|
||||
if (entry != NULL) {
|
||||
FILELIST fentry;
|
||||
memcpy(&fentry, entry, sizeof(FILELIST));
|
||||
strncpy(fentry.fn, src, sizeof(fentry.fn) - 1);
|
||||
fentry.fnd = strdup(dst);
|
||||
filelist_modify(&fentry);
|
||||
}
|
||||
}
|
||||
ptr = strchr(ptr, '\n'); // Next line
|
||||
if (!ptr) break;
|
||||
ptr++;
|
||||
}
|
||||
free(buf);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// reads a grf file and adds it to the list
|
||||
static int grfio_add(char* fname)
|
||||
{
|
||||
#define GENTRY_ADDS 4 // The number increment of gentry_table entries
|
||||
|
||||
if (gentry_entrys >= gentry_maxentry) {
|
||||
gentry_maxentry += GENTRY_ADDS;
|
||||
gentry_table = (char**)realloc(gentry_table, gentry_maxentry * sizeof(char*));
|
||||
memset(gentry_table + (gentry_maxentry - GENTRY_ADDS), 0, sizeof(char*) * GENTRY_ADDS);
|
||||
}
|
||||
|
||||
gentry_table[gentry_entrys++] = strdup(fname);
|
||||
|
||||
return grfio_entryread(fname, gentry_entrys - 1);
|
||||
}
|
||||
|
||||
// removes all entries
|
||||
void grfio_final(void)
|
||||
{
|
||||
if (filelist != NULL) {
|
||||
int i;
|
||||
for (i = 0; i < filelist_entrys; i++)
|
||||
if (filelist[i].fnd != NULL)
|
||||
free(filelist[i].fnd);
|
||||
|
||||
free(filelist);
|
||||
filelist = NULL;
|
||||
}
|
||||
filelist_entrys = filelist_maxentry = 0;
|
||||
|
||||
if (gentry_table != NULL) {
|
||||
int i;
|
||||
for (i = 0; i < gentry_entrys; i++)
|
||||
if (gentry_table[i] != NULL)
|
||||
free(gentry_table[i]);
|
||||
|
||||
free(gentry_table);
|
||||
gentry_table = NULL;
|
||||
}
|
||||
gentry_entrys = gentry_maxentry = 0;
|
||||
}
|
||||
|
||||
/*==========================================
|
||||
* Grfio : Initialize
|
||||
*------------------------------------------*/
|
||||
void grfio_init(char* fname)
|
||||
{
|
||||
FILE* data_conf;
|
||||
char line[1024], w1[1024], w2[1024];
|
||||
int grf_num = 0;
|
||||
|
||||
hashinit(); // hash table initialization
|
||||
|
||||
data_conf = fopen(fname, "r");
|
||||
// It will read, if there is grf-files.txt.
|
||||
if (data_conf) {
|
||||
while(fgets(line, sizeof(line), data_conf))
|
||||
{
|
||||
if (line[0] == '/' && line[1] == '/')
|
||||
continue;
|
||||
if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
|
||||
continue;
|
||||
// Entry table reading
|
||||
if(strcmp(w1, "grf") == 0) // GRF file
|
||||
grf_num += (grfio_add(w2) == 0);
|
||||
else if(strcmp(w1,"data_dir") == 0) { // Data directory
|
||||
strcpy(data_dir, w2);
|
||||
printf("Use data directory %s\n", w2);
|
||||
}
|
||||
}
|
||||
fclose(data_conf);
|
||||
} // end of reading grf-files.txt
|
||||
|
||||
if (grf_num == 0) {
|
||||
printf("No GRF loaded, using default data directory\n");
|
||||
}
|
||||
|
||||
// Unneccessary area release of filelist
|
||||
filelist_adjust();
|
||||
|
||||
// Resource check
|
||||
grfio_resourcecheck();
|
||||
|
||||
return;
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
|
||||
// For more information, see LICENCE in the main folder
|
||||
|
||||
#ifndef _GRFIO_H_
|
||||
#define _GRFIO_H_
|
||||
|
||||
void grfio_init(char*); // GRFIO Initialize
|
||||
void grfio_final(void); // GRFIO Finalize
|
||||
void* grfio_reads(char*,int*); // GRFIO data file read & size get
|
||||
char *grfio_find_file(char *fname);
|
||||
|
||||
#define grfio_read(fn) grfio_reads(fn, NULL)
|
||||
|
||||
int grfio_size(char*); // GRFIO data file size get
|
||||
unsigned long grfio_crc32(const unsigned char *buf, unsigned int len);
|
||||
|
||||
int decode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
||||
int encode_zip(unsigned char *dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen);
|
||||
|
||||
#endif /* _GRFIO_H_ */
|
||||
@ -1,6 +1,12 @@
|
||||
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
|
||||
// For more information, see LICENCE in the main folder
|
||||
|
||||
#include "../common/cbasetypes.h"
|
||||
#include "../common/grfio.h"
|
||||
#include "../common/malloc.h"
|
||||
#include "../common/mmo.h"
|
||||
#include "../common/showmsg.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -9,11 +15,6 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "../common/cbasetypes.h"
|
||||
#include "grfio.h"
|
||||
|
||||
#define MAP_NAME_LENGTH 12
|
||||
#define MAP_NAME_LENGTH_EXT 16
|
||||
#define NO_WATER 1000000
|
||||
|
||||
char grf_list_file[256] = "conf/grf-files.txt";
|
||||
@ -124,7 +125,7 @@ int read_map(char *name, struct map_data *m)
|
||||
// Read water height
|
||||
if (rsw) {
|
||||
water_height = (int)GetFloat(rsw+166);
|
||||
free(rsw);
|
||||
aFree(rsw);
|
||||
} else
|
||||
water_height = NO_WATER;
|
||||
|
||||
@ -132,11 +133,11 @@ int read_map(char *name, struct map_data *m)
|
||||
m->xs = (int16)GetULong(gat+6);
|
||||
m->ys = (int16)GetULong(gat+10);
|
||||
if (m->xs <= 0 || m->ys <= 0) {
|
||||
free(gat);
|
||||
aFree(gat);
|
||||
return 0;
|
||||
}
|
||||
num_cells = (size_t)m->xs*(size_t)m->ys;
|
||||
m->cells = (unsigned char *)malloc(num_cells);
|
||||
m->cells = (unsigned char *)aMalloc(num_cells);
|
||||
|
||||
// Set cell properties
|
||||
off = 14;
|
||||
@ -154,7 +155,7 @@ int read_map(char *name, struct map_data *m)
|
||||
m->cells[xy] = (unsigned char)type;
|
||||
}
|
||||
|
||||
free(gat);
|
||||
aFree(gat);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -168,7 +169,7 @@ void cache_map(char *name, struct map_data *m)
|
||||
|
||||
// Create an output buffer twice as big as the uncompressed map... this way we're sure it fits
|
||||
len = (unsigned long)m->xs*(unsigned long)m->ys*2;
|
||||
write_buf = (unsigned char *)malloc(len);
|
||||
write_buf = (unsigned char *)aMalloc(len);
|
||||
// Compress the cells and get the compressed length
|
||||
encode_zip(write_buf, &len, m->cells, m->xs*m->ys);
|
||||
|
||||
@ -185,8 +186,8 @@ void cache_map(char *name, struct map_data *m)
|
||||
header.file_size += sizeof(struct map_info) + len;
|
||||
header.map_count++;
|
||||
|
||||
free(write_buf);
|
||||
free(m->cells);
|
||||
aFree(write_buf);
|
||||
aFree(m->cells);
|
||||
|
||||
return;
|
||||
}
|
||||
@ -245,7 +246,7 @@ void process_args(int argc, char *argv[])
|
||||
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
int do_init(int argc, char *argv[])
|
||||
{
|
||||
FILE *list;
|
||||
char line[1024];
|
||||
@ -255,15 +256,15 @@ int main(int argc, char *argv[])
|
||||
// Process the command-line arguments
|
||||
process_args(argc, argv);
|
||||
|
||||
printf("Initializing grfio with %s\n", grf_list_file);
|
||||
ShowStatus("Initializing grfio with %s\n", grf_list_file);
|
||||
grfio_init(grf_list_file);
|
||||
|
||||
// Attempt to open the map cache file and force rebuild if not found
|
||||
printf("Opening map cache: %s\n", map_cache_file);
|
||||
ShowStatus("Opening map cache: %s\n", map_cache_file);
|
||||
if(!rebuild) {
|
||||
map_cache_fp = fopen(map_cache_file, "rb");
|
||||
if(map_cache_fp == NULL) {
|
||||
printf("Existing map cache not found, forcing rebuild mode\n");
|
||||
ShowNotice("Existing map cache not found, forcing rebuild mode\n");
|
||||
rebuild = 1;
|
||||
} else
|
||||
fclose(map_cache_fp);
|
||||
@ -273,15 +274,15 @@ int main(int argc, char *argv[])
|
||||
else
|
||||
map_cache_fp = fopen(map_cache_file, "r+b");
|
||||
if(map_cache_fp == NULL) {
|
||||
printf("Failure when opening map cache file %s\n", map_cache_file);
|
||||
ShowError("Failure when opening map cache file %s\n", map_cache_file);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
// Open the map list
|
||||
printf("Opening map list: %s\n", map_list_file);
|
||||
ShowStatus("Opening map list: %s\n", map_list_file);
|
||||
list = fopen(map_list_file, "r");
|
||||
if(list == NULL) {
|
||||
printf("Failure when opening maps list file %s\n", map_list_file);
|
||||
ShowError("Failure when opening maps list file %s\n", map_list_file);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
@ -309,30 +310,33 @@ int main(int argc, char *argv[])
|
||||
|
||||
name[MAP_NAME_LENGTH_EXT-1] = '\0';
|
||||
remove_extension(name);
|
||||
printf("%s", name);
|
||||
if(find_map(name))
|
||||
printf(" already in cache!\n");
|
||||
ShowInfo("Map '"CL_WHITE"%s"CL_RESET"' already in cache.\n", name);
|
||||
else if(read_map(name, &map)) {
|
||||
cache_map(name, &map);
|
||||
printf(" successfully cached\n");
|
||||
ShowInfo("Map '"CL_WHITE"%s"CL_RESET"' successfully cached.\n", name);
|
||||
} else
|
||||
printf(" not found in GRF!\n");
|
||||
ShowError("Map '"CL_WHITE"%s"CL_RESET"' not found!\n", name);
|
||||
|
||||
}
|
||||
|
||||
printf("Closing map list: %s\n", map_list_file);
|
||||
ShowStatus("Closing map list: %s\n", map_list_file);
|
||||
fclose(list);
|
||||
|
||||
// Write the main header and close the map cache
|
||||
printf("Closing map cache: %s\n", map_cache_file);
|
||||
ShowStatus("Closing map cache: %s\n", map_cache_file);
|
||||
fseek(map_cache_fp, 0, SEEK_SET);
|
||||
fwrite(&header, sizeof(struct main_header), 1, map_cache_fp);
|
||||
fclose(map_cache_fp);
|
||||
|
||||
printf("Finalizing grfio\n");
|
||||
ShowStatus("Finalizing grfio\n");
|
||||
grfio_final();
|
||||
|
||||
printf("%d maps now in cache\n", header.map_count);
|
||||
ShowInfo("%d maps now in cache\n", header.map_count);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void do_final(void)
|
||||
{
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessToFile>false</PreprocessToFile>
|
||||
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
@ -90,7 +90,7 @@
|
||||
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<AdditionalIncludeDirectories>..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<FunctionLevelLinking>false</FunctionLevelLinking>
|
||||
@ -120,11 +120,24 @@
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\tool\grfio.c" />
|
||||
<ClCompile Include="..\src\common\core.c" />
|
||||
<ClCompile Include="..\src\common\grfio.c" />
|
||||
<ClCompile Include="..\src\common\malloc.c" />
|
||||
<ClCompile Include="..\src\common\showmsg.c" />
|
||||
<ClCompile Include="..\src\common\strlib.c" />
|
||||
<ClCompile Include="..\src\common\utils.c" />
|
||||
<ClCompile Include="..\src\tool\mapcache.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\tool\grfio.h" />
|
||||
<ClInclude Include="..\src\common\cbasetypes.h" />
|
||||
<ClInclude Include="..\src\common\core.h" />
|
||||
<ClInclude Include="..\src\common\grfio.h" />
|
||||
<ClInclude Include="..\src\common\malloc.h" />
|
||||
<ClInclude Include="..\src\common\mmo.h" />
|
||||
<ClInclude Include="..\src\common\showmsg.h" />
|
||||
<ClInclude Include="..\src\common\strlib.h" />
|
||||
<ClInclude Include="..\src\common\utils.h" />
|
||||
<ClInclude Include="..\src\common\version.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;MINICORE"
|
||||
MinimalRebuild="TRUE"
|
||||
ExceptionHandling="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -87,7 +87,7 @@
|
||||
OptimizeForProcessor="2"
|
||||
OptimizeForWindowsApplication="TRUE"
|
||||
AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;MINICORE"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="3"
|
||||
DefaultCharIsUnsigned="FALSE"
|
||||
@ -138,14 +138,57 @@
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="mapcache"
|
||||
Name="common"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\src\tool\grfio.c">
|
||||
RelativePath="..\src\common\cbasetypes.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\tool\grfio.h">
|
||||
RelativePath="..\src\common\core.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\core.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\grfio.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\grfio.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\malloc.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\malloc.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\mmo.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\showmsg.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\showmsg.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\strlib.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\strlib.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\utils.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\utils.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\version.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="mapcache"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\src\tool\mapcache.c">
|
||||
</File>
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE"
|
||||
GeneratePreprocessedFile="0"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="0"
|
||||
@ -131,7 +131,7 @@
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="false"
|
||||
@ -192,16 +192,72 @@
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="mapcache"
|
||||
Name="common"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\src\tool\grfio.c"
|
||||
RelativePath="..\src\common\cbasetypes.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\tool\grfio.h"
|
||||
RelativePath="..\src\common\core.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\core.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\grfio.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\grfio.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\malloc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\malloc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\mmo.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\showmsg.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\showmsg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\strlib.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\strlib.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\utils.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\utils.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\version.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="mapcache"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\src\tool\mapcache.c"
|
||||
>
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE"
|
||||
GeneratePreprocessedFile="0"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="0"
|
||||
@ -134,7 +134,7 @@
|
||||
EnableFiberSafeOptimizations="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
|
||||
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="false"
|
||||
@ -197,16 +197,72 @@
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="mapcache"
|
||||
Name="common"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\src\tool\grfio.c"
|
||||
RelativePath="..\src\common\cbasetypes.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\tool\grfio.h"
|
||||
RelativePath="..\src\common\core.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\core.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\grfio.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\grfio.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\malloc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\malloc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\mmo.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\showmsg.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\showmsg.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\strlib.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\strlib.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\utils.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\utils.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\common\version.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="mapcache"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\src\tool\mapcache.c"
|
||||
>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user