1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 6792

Browse Source 
Fixes (by Buggler)
- draw NCTH cursor indicator after health bar indicator due to potential overlap (thanks to Sevenfm)
- removed IMPROVED_BOMB_PLANTING option, enabled by default
- removed AIMED_BURST_ALTERNATE_KEY option, enabled by default. Alternate Aiming Hotkey reassigned to ',' (comma) for increasing aim
- streamlined burst & auto mode right click aim mechanism

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6793 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-01-20 08:49:56 +00:00
parent 056e5e31c5
commit d643847f42
7 changed files with 165 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Control.cpp
+8 -8
View File
@@ -714,14 +714,6 @@ void RenderTopmostTacticalInterface( )
RenderAccumulatedBurstLocations( );
// HEADROCK HAM 4: The NCTH indicator is now drawn to the FRAMEBUFFER instead of the MOUSEBUFFER. This is
// due to size constraints related to drawing directly on the cursor. This indicator follows the mouse, and
// is a mouse-cursor in everything but name. See the function itself for more details.
if (UsingNewCTHSystem() == true && gfUICtHBar)
{
DrawCTHIndicator();
}
// Loop through all mercs and make go
for ( cnt = 0; cnt < guiNumMercSlots; cnt++ )
{
@@ -752,6 +744,14 @@ void RenderTopmostTacticalInterface( )
DrawSelectedUIAboveGuy((UINT16)gsSelectedGuy );
}
// HEADROCK HAM 4: The NCTH indicator is now drawn to the FRAMEBUFFER instead of the MOUSEBUFFER. This is
// due to size constraints related to drawing directly on the cursor. This indicator follows the mouse, and
// is a mouse-cursor in everything but name. See the function itself for more details.
if (UsingNewCTHSystem() == true && gfUICtHBar)
{
DrawCTHIndicator();
}
// FOR THE MOST PART, DISABLE INTERFACE STUFF WHEN IT'S ENEMY'S TURN
if ( gTacticalStatus.ubCurrentTeam == gbPlayerNum )
{