[Gemrb-commits] gemrb/gemrb/plugins/KEYImporter KeyImp.cpp,1.40,1.41 KeyImp.h,1.6,1.7

[Guido de J. <gu...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/KEYImporter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12307/gemrb/plugins/KEYImporter

Modified Files:
	KeyImp.cpp KeyImp.h 
Log Message:
more type conversion


Index: KeyImp.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/KEYImporter/KeyImp.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** KeyImp.cpp	1 Jul 2004 23:17:51 -0000	1.40
--- KeyImp.cpp	2 Aug 2004 21:53:45 -0000	1.41
***************
*** 58,63 ****
  
  bool KeyImp::LoadResFile(const char* resfile)
! {
!   unsigned int i;
  	char fn[_MAX_PATH] = {
  		0
--- 58,63 ----
  
  bool KeyImp::LoadResFile(const char* resfile)
! {
! 	unsigned int i;
  	char fn[_MAX_PATH] = {
  		0
***************
*** 101,105 ****
  	printStatus( "OK", LIGHT_GREEN );
  	printMessage( "KEYImporter", "Reading Resources...\n", WHITE );
! 	unsigned long BifCount, ResCount, BifOffset, ResOffset;
  	f->Read( &BifCount, 4 );
  	f->Read( &ResCount, 4 );
--- 101,105 ----
  	printStatus( "OK", LIGHT_GREEN );
  	printMessage( "KEYImporter", "Reading Resources...\n", WHITE );
! 	ieDword BifCount, ResCount, BifOffset, ResOffset;
  	f->Read( &BifCount, 4 );
  	f->Read( &ResCount, 4 );
***************
*** 107,117 ****
  	f->Read( &ResOffset, 4 );
  	printMessage( "KEYImporter", "", WHITE );
! 	printf( "BIF Files Count: %ld (Starting at %ld Bytes)\n", BifCount,
  		BifOffset );
  	printMessage( "KEYImporter", "", WHITE );
! 	printf( "RES Count: %ld (Starting at %ld Bytes)\n", ResCount, ResOffset );
  	f->Seek( BifOffset, GEM_STREAM_START );
! 	unsigned long BifLen, ASCIIZOffset;
! 	unsigned short ASCIIZLen;
  	for (i = 0; i < BifCount; i++) {
  		BIFEntry be;
--- 107,117 ----
  	f->Read( &ResOffset, 4 );
  	printMessage( "KEYImporter", "", WHITE );
! 	printf( "BIF Files Count: %d (Starting at %d Bytes)\n", BifCount,
  		BifOffset );
  	printMessage( "KEYImporter", "", WHITE );
! 	printf( "RES Count: %d (Starting at %d Bytes)\n", ResCount, ResOffset );
  	f->Seek( BifOffset, GEM_STREAM_START );
! 	ieDword BifLen, ASCIIZOffset;
! 	ieWord ASCIIZLen;
  	for (i = 0; i < BifCount; i++) {
  		BIFEntry be;

Index: KeyImp.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/KEYImporter/KeyImp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KeyImp.h	24 Feb 2004 22:20:40 -0000	1.6
--- KeyImp.h	2 Aug 2004 21:53:45 -0000	1.7
***************
*** 28,39 ****
  
  typedef struct RESEntry {
! 	char ResRef[8];
! 	unsigned short Type;
! 	unsigned long ResLocator;
  } RESEntry;
  
  typedef struct BIFEntry {
  	char* name;
! 	unsigned short BIFLocator;
  } BIFEntry;
  
--- 28,39 ----
  
  typedef struct RESEntry {
! 	ieResRef ResRef;
! 	ieWord   Type;
! 	ieDword  ResLocator;
  } RESEntry;
  
  typedef struct BIFEntry {
  	char* name;
! 	ieWord BIFLocator;
  } BIFEntry;