[Opentnl-cvs] tnl/zap UIGame.cpp,1.16,1.17 ZAP.vcproj,1.11,1.12 main.cpp,1.19,1.20

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/zap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4782/zap

Modified Files:
	UIGame.cpp ZAP.vcproj main.cpp 
Log Message:
Added new CTF level

Index: main.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/main.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** main.cpp	4 May 2004 18:24:52 -0000	1.19
--- main.cpp	4 May 2004 19:46:34 -0000	1.20
***************
*** 54,58 ****
  const char *gMasterAddressString = "IP:master.opentnl.org:29005";
  Address gMasterAddress;
! const char *gLevelList = "level1.txt level2.txt level3.txt level2.txt";
  
  void reshape(int nw, int nh)
--- 54,58 ----
  const char *gMasterAddressString = "IP:master.opentnl.org:29005";
  Address gMasterAddress;
! const char *gLevelList = "level4.txt level2.txt level1.txt level2.txt level3.txt level2.txt";
  
  void reshape(int nw, int nh)

Index: UIGame.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/UIGame.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** UIGame.cpp	3 May 2004 22:55:51 -0000	1.16
--- UIGame.cpp	4 May 2004 19:46:34 -0000	1.17
***************
*** 229,239 ****
  
  #if 0
!    // some code for outputting the RTT for the connection
!    // useful for testing lag code
     GameConnection *con = gClientGame->getConnectionToServer();
  
     if(con)
     {
!       drawStringf(10, 550, 30, "%0.2g", con->getRoundTripTime());
     }
  #endif
--- 229,243 ----
  
  #if 0
!    // some code for outputting the position of the ship for finding good spawns
     GameConnection *con = gClientGame->getConnectionToServer();
  
     if(con)
     {
!       GameObject *co = con->getControlObject();
!       if(co)
!       {
!          Point pos = co->getActualPos() * F32(1 / 300.0f);
!          drawStringf(10, 550, 30, "%0.2g, %0.2g", pos.x, pos.y);
!       }
     }
  #endif

Index: ZAP.vcproj
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/ZAP.vcproj,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ZAP.vcproj	2 May 2004 06:27:41 -0000	1.11
--- ZAP.vcproj	4 May 2004 19:46:34 -0000	1.12
***************
*** 190,193 ****
--- 190,196 ----
  		</File>
  		<File
+ 			RelativePath="..\exe\level4.txt">
+ 		</File>
+ 		<File
  			RelativePath=".\main.cpp">
  		</File>