BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok

Browse Source 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
ViktorLjung
2014-05-13 03:36:09 +02:00
parent ce5b62cf6d d259811795
commit ab58cbc08d
16 changed files with 552 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/TankSteeringSystem.cpp
+3 -3
View File
@@ -90,12 +90,12 @@ bool Systems::TankSteeringSystem::TankSteeringInputController::OnCommand(const E
}
else if (event.Command == "vertical")
{
m_Vertical = val;
m_Vertical = -val;
}
else if (event.Command == "handbrake")
{
Handbrake = val;
Handbrake = val > 0;
}
return true;
@@ -106,7 +106,7 @@ bool Systems::TankSteeringSystem::TowerSteeringInputController::OnCommand( const
float val = event.Value;
if(event.Command == "tower_rotation")
{
m_TowerDirection = val;
m_TowerDirection = -val;
}
else if(event.Command == "barrel_rotation")
{