[Gcblue-commits] gcb_wx/src/sim tcMapData.cpp,1.17,1.18 tcObjectControl.cpp,1.32,1.33

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

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

Modified Files:
	tcMapData.cpp tcObjectControl.cpp 
Log Message:


Index: tcMapData.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapData.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tcMapData.cpp	24 Feb 2005 22:19:16 -0000	1.17
--- tcMapData.cpp	11 Mar 2005 02:34:58 -0000	1.18
***************
*** 1178,1185 ****
  			for(n=0;n<N;n++) 
  			{
! 				pval = (anMapID==0) ? maGlobal[m][n] : maTheater[m][n];
  				nPaletteIndex = (pval/10) + 100;
! 				if (nPaletteIndex > 1023) {nPaletteIndex = 1023;}
! 				if (nPaletteIndex < 0) {nPaletteIndex = 0;}
  
  				if (pval == MISSING_DATA_VAL)
--- 1178,1191 ----
  			for(n=0;n<N;n++) 
  			{
! 				pval = (anMapID==0) ? maGlobal[m][n] : maTheater[m][n]; // TODO: move out of loop somehow
  				nPaletteIndex = (pval/10) + 100;
! 				if (nPaletteIndex > 147) // TODO bug here that needs fixing, higher values distort on texture
!                 {
!                     nPaletteIndex = 147;
!                 }
! 				else if (nPaletteIndex < 0) 
!                 {
!                     nPaletteIndex = 0;
!                 }
  
  				if (pval == MISSING_DATA_VAL)
***************
*** 1190,1195 ****
  				{
  					pval = maPalette1[nPaletteIndex];
! 					apData[(M-1-m)*N + n] = pval + nAlphaOffset;
  				}
  				//apWindow->SetPixel(n,M-1-m,pval + nAlphaOffset);
  			}
--- 1196,1202 ----
  				{
  					pval = maPalette1[nPaletteIndex];
! 					apData[(M-1-m)*N + n] = (0x00FFFFFF & pval) + nAlphaOffset;
  				}
+ 
  				//apWindow->SetPixel(n,M-1-m,pval + nAlphaOffset);
  			}

Index: tcObjectControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcObjectControl.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tcObjectControl.cpp	2 Mar 2005 22:28:45 -0000	1.32
--- tcObjectControl.cpp	11 Mar 2005 02:34:58 -0000	1.33
***************
*** 165,169 ****
              mastrCaption[i][4] = "L-AUT";
          }
!         mstrTitle = "WEAPON STATUS";
          break;
      case 1: // sensor
--- 165,169 ----
              mastrCaption[i][4] = "L-AUT";
          }
!         mstrTitle = "MOUNT STATUS";
          break;
      case 1: // sensor