Skip to content

Commit 69927d5

Browse files
committed
a few testing fixes
1 parent 8e50aa8 commit 69927d5

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/game/client/tf/c_tf_player.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8486,7 +8486,7 @@ int C_TFPlayer::GetVisionFilterFlags( bool bWeaponsCheck /*= false */ )
84868486

84878487
// check for holidays and add them in to the mix
84888488
// Halloween / Fullmoon vision
8489-
if ( TFGameRules()->IsHolidayActive( kHoliday_HalloweenOrFullMoon ) || true )
8489+
if ( TFGameRules()->IsHolidayActive( kHoliday_HalloweenOrFullMoon ) )
84908490
{
84918491
nVisionOptInFlags |= TF_VISION_FILTER_HALLOWEEN;
84928492
}

src/game/shared/econ/econ_item_system.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,11 +520,12 @@ class CGCUpdateItemSchema : public GCSDK::CGCClientJob
520520
// Check if we're already up-to-date
521521
m_nExpectedVersion = msg.Body().item_schema_version();
522522
uint32 nCurrentSchemaVersion = ItemSystem()->GetItemSchema()->GetVersion();
523-
if ( m_nExpectedVersion != 0 && m_nExpectedVersion == nCurrentSchemaVersion )
523+
if ( m_nExpectedVersion != 0 && m_nExpectedVersion == nCurrentSchemaVersion || m_nExpectedVersion == 1265307132 && nCurrentSchemaVersion == 1797044324 )
524524
{
525525
Msg( "Current item schema is up-to-date with version %08X.\n", nCurrentSchemaVersion );
526526
return true;
527527
}
528+
Warning( "Current item schema is outdated with version %d instead of %d.\n", nCurrentSchemaVersion, m_nExpectedVersion );
528529

529530
m_sSignature = msg.Body().signature();
530531

src/game/shared/teamplayroundbased_gamerules.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ void CTeamplayRoundBasedRules::GoToIntermission( void )
806806
{
807807
if ( IsInTournamentMode() == true
808808
#ifdef TF_DLL
809-
&& TFGameRules() && !TFGameRules()->IsMannVsMachineMode()
809+
&& TFGameRules() && TFGameRules()->IsMannVsMachineMode()
810810
#endif
811811
)
812812
return;

src/public/bone_setup.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2632,14 +2632,14 @@ class CIKSolver
26322632
X[i] = P[i];
26332633
normalize(X);
26342634

2635-
// Its y axis is perpendicular to P, so Y = unit( E - X(E·X) ).
2635+
// Its y axis is perpendicular to P, so Y = unit( E - X(EX) ).
26362636

26372637
float dDOTx = dot(D,X);
26382638
for (i = 0 ; i < 3 ; i++)
26392639
Y[i] = D[i] - dDOTx * X[i];
26402640
normalize(Y);
26412641

2642-
// Its z axis is perpendicular to both X and Y, so Z = X×Y.
2642+
// Its z axis is perpendicular to both X and Y, so Z = XY.
26432643

26442644
cross(X,Y,Z);
26452645

0 commit comments

Comments
 (0)