[Gemrb-commits] gemrb/gemrb/plugins/Core Actor.h,1.40,1.41 Interface.cpp,1.181,1.182 Interface.h,1.99,1.100 MemoryStream.cpp,1.17,1.18

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

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

Modified Files:
	Actor.h Interface.cpp Interface.h MemoryStream.cpp 
Log Message:
type definition clean up 


Index: Interface.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** Interface.h	31 Jul 2004 09:24:10 -0000	1.99
--- Interface.h	2 Aug 2004 21:26:54 -0000	1.100
***************
*** 148,152 ****
  	Video * GetVideoDriver();
  	ResourceMgr * GetResourceMgr();
! 	char * GetString(unsigned long strref, unsigned long options=0);
  	void FreeInterface(void * ptr);
  	Factory * GetFactory(void);
--- 148,152 ----
  	Video * GetVideoDriver();
  	ResourceMgr * GetResourceMgr();
! 	char * GetString(ieStrRef strref, unsigned long options=0);
  	void FreeInterface(void * ptr);
  	Factory * GetFactory(void);

Index: Actor.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Actor.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Actor.h	2 Aug 2004 18:00:18 -0000	1.40
--- Actor.h	2 Aug 2004 21:26:54 -0000	1.41
***************
*** 93,97 ****
  	unsigned char InParty;
  	char* LongName, * ShortName;
! 	unsigned long StrRefs[100];
  
  	ieWord AppearanceFlags1;
--- 93,97 ----
  	unsigned char InParty;
  	char* LongName, * ShortName;
! 	ieStrRef StrRefs[100];
  
  	ieWord AppearanceFlags1;

Index: MemoryStream.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/MemoryStream.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MemoryStream.cpp	20 Apr 2004 21:12:04 -0000	1.17
--- MemoryStream.cpp	2 Aug 2004 21:26:54 -0000	1.18
***************
*** 44,48 ****
  		return GEM_ERROR;
  	}
! 	Byte* p = ( Byte* ) ptr + Pos;
  	memcpy( dest, p, length );
  	if (Encrypted) {
--- 44,48 ----
  		return GEM_ERROR;
  	}
! 	BYTE* p = ( BYTE* ) ptr + Pos;
  	memcpy( dest, p, length );
  	if (Encrypted) {
***************
*** 95,99 ****
  	unsigned int i = 0;
  	while (i < ( maxlen - 1 )) {
! 		Byte ch = *( ( Byte* ) ptr + Pos );
  		if (Pos == length)
  			break;
--- 95,99 ----
  	unsigned int i = 0;
  	while (i < ( maxlen - 1 )) {
! 		BYTE ch = *( ( BYTE* ) ptr + Pos );
  		if (Pos == length)
  			break;

Index: Interface.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** Interface.cpp	2 Aug 2004 18:00:20 -0000	1.181
--- Interface.cpp	2 Aug 2004 21:26:54 -0000	1.182
***************
*** 748,752 ****
  }
  
! char* Interface::GetString(unsigned long strref, unsigned long options)
  {
  	unsigned long flags = 0;
--- 748,752 ----
  }
  
! char* Interface::GetString(ieStrRef strref, unsigned long options)
  {
  	unsigned long flags = 0;