[Gemrb-commits] gemrb/gemrb/plugins/Core Game.cpp,1.50,1.51 Game.h,1.35,1.36

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

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

Modified Files:
	Game.cpp Game.h 
Log Message:
more type conversions again


Index: Game.h
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Game.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Game.h	5 Aug 2004 17:40:57 -0000	1.35
--- Game.h	5 Aug 2004 20:41:07 -0000	1.36
***************
*** 44,66 ****
  
  typedef struct PCStruct {
! 	unsigned short Selected;
! 	unsigned short PartyOrder;
! 	unsigned long OffsetToCRE;
! 	unsigned long CRESize;
  	ieResRef CREResRef;
! 	unsigned long Orientation;
  	ieResRef Area;
! 	unsigned short XPos;
! 	unsigned short YPos;
! 	unsigned short ViewXPos;
! 	unsigned short ViewYPos;
  	unsigned char Unknown28[100];
! 	unsigned short QuickWeaponSlot[4];
  	unsigned char Unknown94[8];
  	ieResRef QuickSpellResRef[3];
! 	unsigned short QuickItemSlot[3];
  	unsigned char UnknownBA[6];
  	char Name[32];
! 	unsigned long TalkCount;
  } PCStruct;
  
--- 44,66 ----
  
  typedef struct PCStruct {
! 	ieWord   Selected;
! 	ieWord   PartyOrder;
! 	ieDword  OffsetToCRE;
! 	ieDword  CRESize;
  	ieResRef CREResRef;
! 	ieDword  Orientation;
  	ieResRef Area;
! 	ieWord   XPos;
! 	ieWord   YPos;
! 	ieWord   ViewXPos;
! 	ieWord   ViewYPos;
  	unsigned char Unknown28[100];
! 	ieWord   QuickWeaponSlot[4];
  	unsigned char Unknown94[8];
  	ieResRef QuickSpellResRef[3];
! 	ieWord   QuickItemSlot[3];
  	unsigned char UnknownBA[6];
  	char Name[32];
! 	ieDword  TalkCount;
  } PCStruct;
  
***************
*** 72,80 ****
  typedef struct GAMJournalEntry {
  	ieStrRef Text;
! 	ieDword GameTime; // in game time seconds
! 	ieByte Chapter;
! 	ieByte unknown09;
! 	ieByte Section;
! 	ieByte Group;   // this is a GemRB extension
  } GAMJournalEntry;
  
--- 72,80 ----
  typedef struct GAMJournalEntry {
  	ieStrRef Text;
! 	ieDword  GameTime; // in game time seconds
! 	ieByte   Chapter;
! 	ieByte   unknown09;
! 	ieByte   Section;
! 	ieByte   Group;   // this is a GemRB extension
  } GAMJournalEntry;
  
***************
*** 93,97 ****
  	ieByte* familiars;
  	int MapIndex;
! 	unsigned long CombatCounter;
  
  	/** index of PC selected in non-walking environment (shops, inventory...) */
--- 93,97 ----
  	ieByte* familiars;
  	int MapIndex;
! 	ieDword CombatCounter;
  
  	/** index of PC selected in non-walking environment (shops, inventory...) */
***************
*** 99,125 ****
  
  public:
! 	unsigned int GameTime;
! 	unsigned short WhichFormation;
! 	unsigned short Formations[5];
! 	unsigned long PartyGold;
! 	unsigned long Unknown1c;
! 	unsigned long PCOffset;
! 	unsigned long PCCount;
! 	unsigned long UnknownOffset;
! 	unsigned long UnknownCount;
! 	unsigned long NPCOffset;
! 	unsigned long NPCCount;
! 	unsigned long GLOBALOffset;
! 	unsigned long GLOBALCount;
  	char AREResRef[9];
! 	unsigned long Unknown48;
! 	unsigned long JournalCount;
! 	unsigned long JournalOffset;
! 	unsigned long Reputation;
! 	unsigned long UnknownOffset54;
! 	unsigned long UnknownCount58;
! 	unsigned long KillVarsOffset;
! 	unsigned long KillVarsCount;
! 	unsigned long FamiliarsOffset;  // offset to known creatures on PST
  	char AnotherArea[9];
  	char CurrentArea[9];
--- 99,125 ----
  
  public:
! 	ieDword GameTime;
! 	ieWord  WhichFormation;
! 	ieWord  Formations[5];
! 	ieDword PartyGold;
! 	ieDword Unknown1c;
! 	ieDword PCOffset;
! 	ieDword PCCount;
! 	ieDword UnknownOffset;
! 	ieDword UnknownCount;
! 	ieDword NPCOffset;
! 	ieDword NPCCount;
! 	ieDword GLOBALOffset;
! 	ieDword GLOBALCount;
  	char AREResRef[9];
! 	ieDword Unknown48;
! 	ieDword JournalCount;
! 	ieDword JournalOffset;
! 	ieDword Reputation;
! 	ieDword UnknownOffset54;
! 	ieDword UnknownCount58;
! 	ieDword KillVarsOffset;
! 	ieDword KillVarsCount;
! 	ieDword FamiliarsOffset;  // offset to known creatures on PST
  	char AnotherArea[9];
  	char CurrentArea[9];

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Game.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Game.cpp	5 Aug 2004 17:40:57 -0000	1.50
--- Game.cpp	5 Aug 2004 20:41:06 -0000	1.51
***************
*** 362,366 ****
  int Game::LoadMap(const char* ResRef)
  {
!   unsigned int i;
  	int index = FindMap(ResRef);
  	if(index>=0) {
--- 362,366 ----
  int Game::LoadMap(const char* ResRef)
  {
! 	unsigned int i;
  	int index = FindMap(ResRef);
  	if(index>=0) {