opentnl-cvs

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

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

Modified Files:
	UICredits.h gameConnection.cpp main.cpp masterConnection.cpp 
	sfx.cpp zap.dsp 
Log Message:
Fixed simulated lag parameters in zap
Updated VC6 project files

Index: gameConnection.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/gameConnection.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gameConnection.cpp	12 May 2004 19:35:12 -0000	1.12
--- gameConnection.cpp	13 May 2004 01:45:52 -0000	1.13
***************
*** 360,364 ****
  void GameConnection::onConnectTimedOut()
  {
!    if(this == gClientGame->getConnectionToServer())
        gMainMenuUserInterface.activate();
  }
--- 360,364 ----
  void GameConnection::onConnectTimedOut()
  {
!    if(gClientGame && this == gClientGame->getConnectionToServer())
        gMainMenuUserInterface.activate();
  }

Index: main.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/main.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** main.cpp	12 May 2004 19:35:12 -0000	1.29
--- main.cpp	13 May 2004 01:45:52 -0000	1.30
***************
*** 54,57 ****
--- 54,59 ----
  U32 gMaxPlayers = 128;
  U32 gJoystickType = 0;
+ U32 gSimulatedPing = 0;
+ F32 gSimulatedPacketLoss = 0;
  
  const char *gMasterAddressString = "IP:master.opentnl.org:29005";
***************
*** 327,330 ****
--- 329,333 ----
  
        theConnection->setPlayerName(name);
+       theConnection->setSimulatedNetParams(gSimulatedPacketLoss, gSimulatedPing);
  
        if(local)
***************
*** 423,426 ****
--- 426,439 ----
              gJoystickType = atoi(argv[i+1]);
        }
+       else if(!stricmp(argv[i], "-loss"))
+       {
+          if(hasAdditionalArg)
+             gSimulatedPacketLoss = atof(argv[i+1]);
+       }
+       else if(!stricmp(argv[i], "-lag"))
+       {
+          if(hasAdditionalArg)
+             gSimulatedPing = atoi(argv[i+1]);
+       }
        else if(!stricmp(argv[i], "-jsave"))
        {

Index: sfx.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/sfx.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** sfx.cpp	10 May 2004 22:34:24 -0000	1.19
--- sfx.cpp	13 May 2004 01:45:52 -0000	1.20
***************
*** 40,43 ****
--- 40,44 ----
  static LPDIRECTSOUNDCAPTUREBUFFER captureBuffer = NULL;
  static bool recording = false;
+ static bool captureInit = false;
  
  enum {
***************
*** 52,61 ****
        return true;
  
!    if(!capture)
     {
!       DirectSoundCaptureCreate8(NULL, &capture, NULL);   
!       if(!capture)
!          return false;
     }
  
     if(!captureBuffer)
--- 53,63 ----
        return true;
  
!    if(!captureInit)
     {
!       captureInit = true;
! 	   DirectSoundCaptureCreate8(NULL, &capture, NULL);   
     }
+    if(!capture)
+       return false;
  
     if(!captureBuffer)
***************
*** 77,81 ****
--- 79,86 ----
         
        if (FAILED(hr = capture->CreateCaptureBuffer(&dscbd, &captureBuffer, NULL)))
+       {
+          captureBuffer = NULL;
           return false;
+       }
     }
     recording = true;
***************
*** 139,142 ****
--- 144,149 ----
     {
        recording = false;
+       if(!captureBuffer)
+          return;
        captureBuffer->Stop();
        if(captureBuffer)

Index: masterConnection.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/masterConnection.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** masterConnection.cpp	24 Apr 2004 23:52:33 -0000	1.6
--- masterConnection.cpp	13 May 2004 01:45:52 -0000	1.7
***************
*** 37,40 ****
--- 37,42 ----
  {
  
+ extern U32 gSimulatedPing;
+ extern F32 gSimulatedPacketLoss;
  extern bool gQuit;
  
***************
*** 160,163 ****
--- 162,166 ----
           name = "Playa";
  
+       conn->setSimulatedNetParams(gSimulatedPacketLoss, gSimulatedPing);
        conn->setPlayerName(name);
        gClientGame->setConnectionToServer(conn);

Index: UICredits.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/UICredits.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UICredits.h	30 Apr 2004 21:36:05 -0000	1.3
--- UICredits.h	13 May 2004 01:45:51 -0000	1.4
***************
*** 50,58 ****
  {
     //typedef CreditsFX Parent;
     enum Credits {
        MaxCreditLen = 32,
        CreditSpace  = 200,
     };
! 
     struct ProjectInfo {
        char titleBuf[MaxCreditLen+1];
--- 50,59 ----
  {
     //typedef CreditsFX Parent;
+ public:
     enum Credits {
        MaxCreditLen = 32,
        CreditSpace  = 200,
     };
! private:
     struct ProjectInfo {
        char titleBuf[MaxCreditLen+1];

Index: zap.dsp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/zap.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zap.dsp	30 Apr 2004 07:05:23 -0000	1.4
--- zap.dsp	13 May 2004 01:45:52 -0000	1.5
***************
*** 43,47 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /W3 /GR /GX /O2 /I "../tnl" /I "../glut" /I "../openal" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
--- 43,47 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /W3 /GR /GX /O2 /I "../tnl" /I "../glut" /I "../openal" /I "c:/dxsdk/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 51,55 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 dinput.lib dinput8.lib dxguid.lib ../openal/alut.lib ../openal/openal32.lib wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../exe/zap.exe"
  
  !ELSEIF  "$(CFG)" == "zap - Win32 Debug"
--- 51,55 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 dsound.lib dinput.lib dinput8.lib dxguid.lib ../openal/alut.lib ../openal/openal32.lib wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../exe/zap.exe" /libpath:"c:/dxsdk/lib"
  
  !ELSEIF  "$(CFG)" == "zap - Win32 Debug"
***************
*** 67,71 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../tnl" /I "../glut" /I "../openal" /D "TNL_DEBUG" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
--- 67,71 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../tnl" /I "../glut" /I "../openal" /I "c:/dxsdk/include" /D "TNL_DEBUG" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 75,79 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 dinput.lib dinput8.lib dxguid.lib ../openal/alut.lib ../openal/openal32.lib wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../exe/zapd.exe" /pdbtype:sept
  
  !ENDIF 
--- 75,79 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 dsound.lib dinput.lib dinput8.lib dxguid.lib ../openal/alut.lib ../openal/openal32.lib wsock32.lib opengl32.lib glu32.lib ../glut/glut32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../exe/zapd.exe" /pdbtype:sept /libpath:"c:/dxsdk/lib"
  
  !ENDIF 
***************
*** 161,164 ****
--- 161,180 ----
  # Begin Source File
  
+ SOURCE=.\gsm.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\gsm_decode.c
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\gsm_encode.c
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\gsm_state.c
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\item.cpp
  # End Source File
***************
*** 169,172 ****
--- 185,200 ----
  # Begin Source File
  
+ SOURCE=.\lpc10.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\lpc10dec.c
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\lpc10enc.c
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\main.cpp
  # End Source File
***************
*** 261,264 ****
--- 289,300 ----
  # Begin Source File
  
+ SOURCE=.\UICredits.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\UiCredits.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\UIGame.cpp
  # End Source File
***************
*** 293,303 ****
  # Begin Source File
  
! SOURCE=.\UICredits.cpp
! #End Source File
! #Begin Source File
  
! SOURCE=.\UiCredits.h
! #End Source File
! #Begin Source File
  
  SOURCE=.\winJoystick.cpp
--- 329,339 ----
  # Begin Source File
  
! SOURCE=.\voiceCodec.cpp
! # End Source File
! # Begin Source File
  
! SOURCE=.\voiceCodec.h
! # End Source File
! # Begin Source File
  
  SOURCE=.\winJoystick.cpp