[Gemrb-commits] gemrb/gemrb/plugins/Core Variables.cpp,1.24,1.25 Interface.cpp,1.209,1.210 Inventory.cpp,1.27,1.28

[Laszlo T. <ave...@us...>]

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

Modified Files:
	Variables.cpp Interface.cpp Inventory.cpp 
Log Message:
MSVC6.0 compatibility fixes


Index: Inventory.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Inventory.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Inventory.cpp	25 Aug 2004 11:55:51 -0000	1.27
--- Inventory.cpp	28 Aug 2004 19:33:01 -0000	1.28
***************
*** 262,266 ****
  }
  
! int Inventory::AddSlotItem(STOItem* item, unsigned int /*slot*/, CREItem **/*res_item*/, int count)
  {
  	CREItem *temp;
--- 262,266 ----
  }
  
! int Inventory::AddSlotItem(STOItem* item, unsigned int /*slot*/, CREItem** /*res_item*/, int count)
  {
  	CREItem *temp;

Index: Interface.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Interface.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -d -r1.209 -r1.210
*** Interface.cpp	28 Aug 2004 16:23:03 -0000	1.209
--- Interface.cpp	28 Aug 2004 19:33:01 -0000	1.210
***************
*** 20,29 ****
   */
  
- #include <config.h>
- 
  #ifndef INTERFACE
  #define INTERFACE
  #endif
  
  #include <stdlib.h>
  #include <time.h>
--- 20,29 ----
   */
  
  #ifndef INTERFACE
  #define INTERFACE
  #endif
  
+ #include <config.h>
+ 
  #include <stdlib.h>
  #include <time.h>

Index: Variables.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Variables.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Variables.cpp	19 Aug 2004 21:14:26 -0000	1.24
--- Variables.cpp	28 Aug 2004 19:33:01 -0000	1.25
***************
*** 118,121 ****
--- 118,122 ----
  	m_pBlocks = NULL;
  	m_nBlockSize = nBlockSize;
+ 	m_type = GEM_VARIABLES_INT;
  }