[Gcblue-commits] gcb_wx/src/graphics tcTerrainTextureFactory.cpp,1.6,1.7

[Xavi <xr...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8946

Modified Files:
	tcTerrainTextureFactory.cpp 
Log Message:
+ added ifdef MSV where needed
+ changed scope of declaration of int nTex local variable.


Index: tcTerrainTextureFactory.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcTerrainTextureFactory.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcTerrainTextureFactory.cpp	5 Apr 2004 02:24:29 -0000	1.6
--- tcTerrainTextureFactory.cpp	11 Apr 2004 22:18:19 -0000	1.7
***************
*** 29,34 ****
  #ifndef WX_PRECOMP
  #include "wx/wx.h" 
  #include "wx/msw/private.h" // for MS Windows specific definitions
! #endif
  
  #include "tcTerrainTextureFactory.h"
--- 29,36 ----
  #ifndef WX_PRECOMP
  #include "wx/wx.h" 
+ #ifdef WIN32
  #include "wx/msw/private.h" // for MS Windows specific definitions
! #endif // WIN32
! #endif // WX_PRECOM
  
  #include "tcTerrainTextureFactory.h"
***************
*** 166,170 ****
              // calculate alpha for each texture
              bool searching = true;
!             for (int nTex=0;(nTex<NUM_TEXTURES)&& searching;nTex++)
              {
                  float zmin = textureInfo[nTex].zmin;
--- 168,173 ----
              // calculate alpha for each texture
              bool searching = true;
! 	    int nTex = 0;
!             for (nTex=0;(nTex<NUM_TEXTURES)&& searching;nTex++)
              {
                  float zmin = textureInfo[nTex].zmin;
***************
*** 193,197 ****
              Uint8 blue = 0;
              // calculate red, green, blue
!             for (int nTex=0;nTex<NUM_TEXTURES;nTex++)
              {
                  int srcIndex = imageIndex % textureInfo[nTex].sizeBytes;
--- 196,200 ----
              Uint8 blue = 0;
              // calculate red, green, blue
!             for (nTex=0;nTex<NUM_TEXTURES;nTex++)
              {
                  int srcIndex = imageIndex % textureInfo[nTex].sizeBytes;