gcblue-commits

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

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

Modified Files:
	Game.cpp tcDirector.cpp tcDirectorEvent.cpp tcESMSensor.cpp 
	tcObjectControl.cpp tcOpticalSensor.cpp tcRadar.cpp 
	tcSimState.cpp tcSonar.cpp 
Log Message:
Multiple smoke trail fixes
Animation tweaks

Index: tcSimState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSimState.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** tcSimState.cpp	10 Jan 2005 00:30:55 -0000	1.63
--- tcSimState.cpp	27 Jan 2005 01:02:06 -0000	1.64
***************
*** 240,244 ****
          if (mpUserInfo->IsOwnAlliance(pPlatformObj->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect(SEFFECT_NOISYBEEP);
          }
          return true;
--- 240,244 ----
          if (mpUserInfo->IsOwnAlliance(pPlatformObj->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect("NoisyBeepLow");
          }
          return true;
***************
*** 272,276 ****
      pPlatformObj->DesignateLauncherTarget(anTargetKey, anLauncher);
      if (mpUserInfo->IsOwnAlliance(pPlatformObj->mnAlliance)) {
!     tcSound::Get()->PlayEffect(SEFFECT_NOISYBEEP);
      }
      return true;
--- 272,276 ----
      pPlatformObj->DesignateLauncherTarget(anTargetKey, anLauncher);
      if (mpUserInfo->IsOwnAlliance(pPlatformObj->mnAlliance)) {
!     tcSound::Get()->PlayEffect("NoisyBeepLow");
      }
      return true;
***************
*** 278,282 ****
      else {
      //pPlatformObj->DesignateLauncherTarget(anTargetKey, anLauncher);
!     //tcSound::Get()->PlayEffect(SEFFECT_LOWBEEP);
      return false;
      }
--- 278,282 ----
      else {
      //pPlatformObj->DesignateLauncherTarget(anTargetKey, anLauncher);
!     //tcSound::Get()->PlayEffect("LowBeep");
      return false;
      }
***************
*** 384,388 ****
  			else 
  			{
! 				tcSound::Get()->PlayEffect(SEFFECT_EXPLOSION2);
  			}
  		}
--- 384,388 ----
  			else 
  			{
! 				tcSound::Get()->PlayEffect("Explosion2");
  			}
  		}
***************
*** 433,437 ****
  			else 
  			{
! 				tcSound::Get()->PlayEffect(SEFFECT_EXPLOSION2);
  			}
  		}
--- 433,437 ----
  			else 
  			{
! 				tcSound::Get()->PlayEffect("Explosion2");
  			}
  		}
***************
*** 518,522 ****
  					else 
  					{
! 						tcSound::Get()->PlayEffect(SEFFECT_EXPLOSION2);
  					}
  				}
--- 518,522 ----
  					else 
  					{
! 						tcSound::Get()->PlayEffect("Explosion2");
  					}
  				}
***************
*** 885,889 ****
  void tcSimState::ReportDamage(tcGameObject* obj)
  {
!     tcSound::Get()->PlayEffect(SEFFECT_IMPLOSION);
  
      std::string damageString = "reports light damage";
--- 885,889 ----
  void tcSimState::ReportDamage(tcGameObject* obj)
  {
!     tcSound::Get()->PlayEffect("Implosion");
  
      std::string damageString = "reports light damage";
***************
*** 958,962 ****
              if (mpUserInfo->IsOwnAlliance(apRadarPlat->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect(SEFFECT_PING);
              }
              char zBuff[128];
--- 958,962 ----
              if (mpUserInfo->IsOwnAlliance(apRadarPlat->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect("Ping");
              }
              char zBuff[128];
***************
*** 1083,1087 ****
              if (mpUserInfo->IsOwnAlliance(apESMPlat->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect(SEFFECT_PING);
              }
              char zBuff[128];
--- 1083,1087 ----
              if (mpUserInfo->IsOwnAlliance(apESMPlat->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect("Ping");
              }
              char zBuff[128];
***************
*** 1287,1295 ****
                  if (dynamic_cast<tcHeloObject*>(child))
                  {
!                     tcSound::Get()->PlayEffect(SEFFECT_HELOLAUNCH);
                  }
                  else if (dynamic_cast<tcAirObject*>(child))
                  {
!                     tcSound::Get()->PlayEffect(SEFFECT_JETLAUNCH);
                  }
  
--- 1287,1295 ----
                  if (dynamic_cast<tcHeloObject*>(child))
                  {
!                     tcSound::Get()->PlayEffect("helolaunch");
                  }
                  else if (dynamic_cast<tcAirObject*>(child))
                  {
!                     tcSound::Get()->PlayEffect("jetlaunch");
                  }
  
***************
*** 1356,1360 ****
                     if(mpUserInfo->IsOwnAlliance(applat->mnAlliance)) 
                     {
!                        tcSound::Get()->PlayEffect(SEFFECT_TWOBEEPS);
                     }
                 }
--- 1356,1360 ----
                     if(mpUserInfo->IsOwnAlliance(applat->mnAlliance)) 
                     {
!                        tcSound::Get()->PlayEffect("TwoBeeps");
                     }
                 }
***************
*** 1443,1447 ****
  		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
  		{
! 			tcSound::Get()->PlayEffect(SEFFECT_MISSILELAUNCH);
  		}
  	}
--- 1443,1447 ----
  		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
  		{
! 			tcSound::Get()->PlayEffect("MissileLaunch");
  		}
  	}
***************
*** 1452,1456 ****
  		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
  		{
! 			tcSound::Get()->PlayEffect(SEFFECT_TORPEDOLAUNCH);
  		}
  	}
--- 1452,1456 ----
  		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
  		{
! 			tcSound::Get()->PlayEffect("torpedo_launch");
  		}
  	}
***************
*** 1461,1465 ****
  		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
  		{
! 			tcSound::Get()->PlayEffect(SEFFECT_NAVALGUN);
  		}
  	}
--- 1461,1465 ----
  		if (mpUserInfo->IsOwnAlliance(launchingPlatform->mnAlliance)) 
  		{
! 			tcSound::Get()->PlayEffect("NavalGun1");
  		}
  	}

Index: tcOpticalSensor.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcOpticalSensor.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcOpticalSensor.cpp	11 Dec 2004 01:09:08 -0000	1.4
--- tcOpticalSensor.cpp	27 Jan 2005 01:02:06 -0000	1.5
***************
*** 366,370 ****
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect(SEFFECT_LOWBEEP);
          }
          fprintf(stdout, "target %d detected (optical) at %3.1f km at time %.1f [a:%d]\n",
--- 366,370 ----
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect("LowBeep");
          }
          fprintf(stdout, "target %d detected (optical) at %3.1f km at time %.1f [a:%d]\n",
***************
*** 416,420 ****
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect(SEFFECT_TWOBEEPS);
          }
      }
--- 416,420 ----
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect("TwoBeeps");
          }
      }

Index: tcSonar.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSonar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcSonar.cpp	10 Jan 2005 00:30:55 -0000	1.5
--- tcSonar.cpp	27 Jan 2005 01:02:06 -0000	1.6
***************
*** 420,424 ****
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect(SEFFECT_SONARDETECT);
          }
          fprintf(stdout, "%s (%s): target %d (%s) detected by active sonar at %3.1f km at time %.1f "
--- 420,424 ----
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect("shishding");
          }
          fprintf(stdout, "%s (%s): target %d (%s) detected by active sonar at %3.1f km at time %.1f "
***************
*** 480,484 ****
              if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect(SEFFECT_SONARDETECT);
              }
              fprintf(stdout, "%s (%s): target %d (%s) detected by passive sonar at %3.1f km"
--- 480,484 ----
              if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect("shishding");
              }
              fprintf(stdout, "%s (%s): target %d (%s) detected by passive sonar at %3.1f km"
***************
*** 566,570 ****
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect(SEFFECT_TWOBEEPS);
          }
  #endif
--- 566,570 ----
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect("TwoBeeps");
          }
  #endif

Index: tcDirectorEvent.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcDirectorEvent.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcDirectorEvent.cpp	14 Nov 2004 22:52:22 -0000	1.13
--- tcDirectorEvent.cpp	27 Jan 2005 01:01:55 -0000	1.14
***************
*** 195,199 ****
  }
  
! tcSoundEffectEvent::tcSoundEffectEvent(double t, int effect)
  : tcSoundEvent(t,t), effectCode(effect) 
  {
--- 195,199 ----
  }
  
! tcSoundEffectEvent::tcSoundEffectEvent(double t, const std::string& effect)
  : tcSoundEvent(t,t), effectCode(effect) 
  {

Index: tcESMSensor.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcESMSensor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcESMSensor.cpp	23 Nov 2004 23:31:13 -0000	1.10
--- tcESMSensor.cpp	27 Jan 2005 01:01:55 -0000	1.11
***************
*** 301,305 ****
              if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect(SEFFECT_PING);
              }
              char zBuff[128];
--- 301,305 ----
              if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
              {
!                 tcSound::Get()->PlayEffect("Ping");
              }
              char zBuff[128];

Index: tcObjectControl.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcObjectControl.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** tcObjectControl.cpp	10 Jan 2005 00:30:55 -0000	1.29
--- tcObjectControl.cpp	27 Jan 2005 01:01:55 -0000	1.30
***************
*** 1288,1292 ****
          if (bAccepted)
          {
!             tcSound::Get()->PlayEffect(SEFFECT_LOWBEEP);
          }
      }
--- 1288,1292 ----
          if (bAccepted)
          {
!             tcSound::Get()->PlayEffect("LowBeep");
          }
      }
***************
*** 1396,1400 ****
          else 
          {
!             //tcSound::Get()->PlayEffect(SEFFECT_REJECTBEEP);
          }
          return true;
--- 1396,1400 ----
          else 
          {
!             //tcSound::Get()->PlayEffect("RejectBeep");
          }
          return true;
***************
*** 1455,1463 ****
              if (pSensorState->GetActive())
              {
!                 tcSound::Get()->PlayEffect(SEFFECT_RADARON);
              }
              else
              {
!                 tcSound::Get()->PlayEffect(SEFFECT_RADAROFF);
              }
          
--- 1455,1463 ----
              if (pSensorState->GetActive())
              {
!                 tcSound::Get()->PlayEffect("radar_on");
              }
              else
              {
!                 tcSound::Get()->PlayEffect("radar_off");
              }
          

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** Game.cpp	16 Jan 2005 18:36:29 -0000	1.116
--- Game.cpp	27 Jan 2005 01:01:52 -0000	1.117
***************
*** 707,711 ****
  	}
  
! 	briefingConsoleLeft->SetEffect(SEFFECT_MUTEDBEEP); 
  	//briefingConsoleLeft->InitGdi(10.0f,0xFF64FF64);
  	briefingConsoleLeft->SetLineSpacing(10);
--- 707,711 ----
  	}
  
! 	briefingConsoleLeft->SetEffect("MutedBeep"); 
  	//briefingConsoleLeft->InitGdi(10.0f,0xFF64FF64);
  	briefingConsoleLeft->SetLineSpacing(10);
***************
*** 728,732 ****
  	}
  
! 	briefingConsoleBottom->SetEffect(-1); 
  	//briefingConsoleBottom->InitGdi(10.0f,0xFF64FF64);
  	briefingConsoleBottom->SetLineSpacing(10);
--- 728,732 ----
  	}
  
! 	briefingConsoleBottom->SetEffect(""); 
  	//briefingConsoleBottom->InitGdi(10.0f,0xFF64FF64);
  	briefingConsoleBottom->SetLineSpacing(10);
***************
*** 885,889 ****
  	}
  
! 	infoConsole->SetEffect(-1); //SEFFECT_MUTEDBEEP); // no sound
  //	infoConsole->InitGdi(10.0f,0xFF64FF64);
  	infoConsole->SetLineSpacing(10);
--- 885,889 ----
  	}
  
! 	infoConsole->SetEffect(""); //"MutedBeep"); // no sound
  //	infoConsole->InitGdi(10.0f,0xFF64FF64);
  	infoConsole->SetLineSpacing(10);
***************
*** 1055,1059 ****
  
  	tcSensorMapTrack::AttachDatabase(database);
! 	//tcSound::Get()->PlayEffect(SEFFECT_WELCOME);
  
  	return true;
--- 1055,1059 ----
  
  	tcSensorMapTrack::AttachDatabase(database);
! 	//tcSound::Get()->PlayEffect("Welcome");
  
  	return true;
***************
*** 2044,2048 ****
  	hookedUnits = groupUnits;
  
! 	tcSound::Get()->PlayEffect(SEFFECT_SHORTBEEP);
  }
  
--- 2044,2048 ----
  	hookedUnits = groupUnits;
  
! 	tcSound::Get()->PlayEffect("ShortBeep");
  }
  
***************
*** 2074,2078 ****
  	if (hookID != NULL_INDEX)
  	{
! 		tcSound::Get()->PlayEffect(SEFFECT_SHORTBEEP);
  		pythonInterface->SetMenuPlatform(hookID);
  	}
--- 2074,2078 ----
  	if (hookID != NULL_INDEX)
  	{
! 		tcSound::Get()->PlayEffect("ShortBeep");
  		pythonInterface->SetMenuPlatform(hookID);
  	}

Index: tcDirector.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcDirector.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcDirector.cpp	2 Nov 2004 04:23:56 -0000	1.10
--- tcDirector.cpp	27 Jan 2005 01:01:55 -0000	1.11
***************
*** 82,86 ****
      AddEvent(new tcGameCommandEvent(ID_SET3D, 0, 0)); // deactivate 3D window
  
!     //AddEvent(new tcSoundEffectEvent(1.0f,SEFFECT_WELCOME));
      //AddEvent(new tcMusicEvent("","pause",0,0,0));
      AddEvent(new tcMusicEvent("tension1","play",0,2.0,30.0));
--- 82,86 ----
      AddEvent(new tcGameCommandEvent(ID_SET3D, 0, 0)); // deactivate 3D window
  
!     //AddEvent(new tcSoundEffectEvent(1.0f,"Welcome"));
      //AddEvent(new tcMusicEvent("","pause",0,0,0));
      AddEvent(new tcMusicEvent("tension1","play",0,2.0,30.0));
***************
*** 92,96 ****
  
      AddEvent(new tcMapViewEvent(7, -5.9, 49.5, 4.0));
!     AddEvent(new tcSoundEffectEvent(7,SEFFECT_THUCK));
      AddEvent(new tcMapTextEvent("OPFOR", 7.0, 18.0f, -6.0, 49.9, 1));
  
--- 92,96 ----
  
      AddEvent(new tcMapViewEvent(7, -5.9, 49.5, 4.0));
!     AddEvent(new tcSoundEffectEvent(7,"Thuck"));
      AddEvent(new tcMapTextEvent("OPFOR", 7.0, 18.0f, -6.0, 49.9, 1));
  

Index: tcRadar.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcRadar.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** tcRadar.cpp	11 Dec 2004 01:09:08 -0000	1.21
--- tcRadar.cpp	27 Jan 2005 01:02:06 -0000	1.22
***************
*** 486,490 ****
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect(SEFFECT_PING);
          }
          fprintf(stdout, "target %d detected at %3.1f km at time %.1f [a:%d]\n",
--- 486,490 ----
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect("Ping");
          }
          fprintf(stdout, "target %d detected at %3.1f km at time %.1f [a:%d]\n",
***************
*** 546,550 ****
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect(SEFFECT_TWOBEEPS);
          }
  #endif
--- 546,550 ----
          if (simState->mpUserInfo->IsOwnAlliance(parent->mnAlliance)) 
          {
!             tcSound::Get()->PlayEffect("TwoBeeps");
          }
  #endif