[Gcblue-commits] gcb_wx/src/sim tcMapData.cpp,1.28,1.29

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21970/src/sim

Modified Files:
	tcMapData.cpp 
Log Message:
Added attributes (hidden and permanent) to AI tasks so that automation tasks can be hidden and not distract player

Index: tcMapData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapData.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tcMapData.cpp	17 Aug 2006 01:28:05 -0000	1.28
--- tcMapData.cpp	27 Aug 2006 21:28:54 -0000	1.29
***************
*** 256,277 ****
  		maPalette1[k] = nRed + (nGreen << 8) + (nBlue << 16) + alpha_val;
  	}
! 	for (int k=100; k<1024; k++) 
  	{
! 		nRed =(k-100);
! 		nGreen =(k-100);
! 		nBlue = (k-100)*8/10;
  
! 		/* For some reason values have to be limited to 128 to avoid distorted colors.
! 		** This started happening after switching the terrain map to use osg::Texture
! 		*/
! 		nRed =  min((unsigned int)128, nRed+80);
! 		nGreen =  min((unsigned int)128,nGreen+80);
! 		nBlue =  min((unsigned int)128,nBlue+60);
  
  		maPalette1[k] = nRed + (nGreen << 8) + (nBlue << 16) + alpha_val;
- 		//unsigned int nGray = (k-100);
- 		//if (nGray > 128) nGray = 128;
- 		//maPalette1[k] = nGray + (nGray << 8) + (nGray << 16) + alpha_val;
  	}
  }
  
--- 256,284 ----
  		maPalette1[k] = nRed + (nGreen << 8) + (nBlue << 16) + alpha_val;
  	}
! 	for (int k=100; k<200; k++) 
  	{
! 		nRed =(k-100) + 80;
! 		nGreen =(k-100) + 80;
! 		nBlue = ((k-100)*8/10) + 60;
  
! 		nRed =  min((unsigned int)255, nRed);
! 		nGreen =  min((unsigned int)255, nGreen);
! 		nBlue =  min((unsigned int)255, nBlue);
! 
! 		maPalette1[k] = nRed + (nGreen << 8) + (nBlue << 16) + alpha_val;
! 	}
! 	for (int k=200; k<1024; k++) 
! 	{
! 		nRed = ((k-200)/2) + 180;
! 		nGreen = ((k-200)/2) + 180;
! 		nBlue = ((k-200)*4/10) + 140;
! 
! 		nRed =  min((unsigned int)255, nRed);
! 		nGreen =  min((unsigned int)255, nGreen);
! 		nBlue =  min((unsigned int)255, nBlue);
  
  		maPalette1[k] = nRed + (nGreen << 8) + (nBlue << 16) + alpha_val;
  	}
+ 
  }
  
***************
*** 1055,1065 ****
  UINT32 tcMapData::YellowBlueMap(long pval) const
  {
! 	int nPaletteIndex = (pval/10) + 100;
  
! 	if (nPaletteIndex > 247) // TODO bug here that needs fixing, higher values distort on texture
! 	{
! 		nPaletteIndex = 247;
! 	}
! 	else if (nPaletteIndex < 0) 
  	{
  		nPaletteIndex = 0;
--- 1062,1077 ----
  UINT32 tcMapData::YellowBlueMap(long pval) const
  {
! 	int nPaletteIndex = (pval/12) + 100;
  
! 	//if (nPaletteIndex > 247) // TODO bug here that needs fixing, higher values distort on texture
! 	//{
! 	//	nPaletteIndex = 247;
! 	//}
! 	//else if (nPaletteIndex < 0) 
! 	//{
! 	//	nPaletteIndex = 0;
! 	//}
! 
! 	if (nPaletteIndex < 0) 
  	{
  		nPaletteIndex = 0;