1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

bugfix:

Browse Source 
- Placement cursor was shown valid (should not be valid), when it was inside the shade area near to the valid area.
- Removed the "flicker" that sometimes appeared on the Tactical Placement screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-06-30 21:25:37 +00:00
parent 7bfdcedf5d
commit 5ad73ef703
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JA2.suo
BIN
View File
Binary file not shown.
Strategic/Queen Command.cpp
+4 -2
View File
@@ -172,8 +172,10 @@ UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY )
SECTORINFO *pSector; SECTORINFO *pSector;
GROUP *pGroup; GROUP *pGroup;
UINT8 ubNumTroops; UINT8 ubNumTroops;
Assert( sSectorX >= 1 && sSectorX <= 16 );
Assert( sSectorY >= 1 && sSectorY <= 16 ); //Assert( sSectorX >= 1 && sSectorX <= 16 );
//Assert( sSectorY >= 1 && sSectorY <= 16 );
pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ]; pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ];
ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites); ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites);
TileEngine/Tactical Placement GUI.cpp
+5 -5
View File
@@ -566,7 +566,7 @@ void RenderTacticalPlacementGUI()
gTPClipRect.iTop = iOffsetVertical; gTPClipRect.iTop = iOffsetVertical;
// WANNE 2 // WANNE 2
//gTPClipRect.iRight = iOffsetHorizontal + 640; //gTPClipRect.iRight = iOffsetHorizontal + 640;
gTPClipRect.iRight = iOffsetHorizontal + 635; gTPClipRect.iRight = iOffsetHorizontal + 634; // 635
gTPClipRect.iBottom = iOffsetVertical + 320; gTPClipRect.iBottom = iOffsetVertical + 320;
switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode ) switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode )
{ {
@@ -719,19 +719,19 @@ void TacticalPlacementHandle()
switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode ) switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode )
{ {
case INSERTION_CODE_NORTH: case INSERTION_CODE_NORTH:
if( gusMouseYPos <= (iOffsetVertical + 40) ) if( gusMouseYPos <= (iOffsetVertical + 30) ) // 40
gfValidCursor = TRUE; gfValidCursor = TRUE;
break; break;
case INSERTION_CODE_EAST: case INSERTION_CODE_EAST:
if( gusMouseXPos >= (iOffsetHorizontal + 600) ) if( gusMouseXPos >= (iOffsetHorizontal + 610) ) // 600
gfValidCursor = TRUE; gfValidCursor = TRUE;
break; break;
case INSERTION_CODE_SOUTH: case INSERTION_CODE_SOUTH:
if( gusMouseYPos >= (iOffsetVertical + 280) ) if( gusMouseYPos >= (iOffsetVertical + 290) ) // 280
gfValidCursor = TRUE; gfValidCursor = TRUE;
break; break;
case INSERTION_CODE_WEST: case INSERTION_CODE_WEST:
if( gusMouseXPos <= (iOffsetHorizontal + 40) ) if( gusMouseXPos <= (iOffsetHorizontal + 30) ) // 40
gfValidCursor = TRUE; gfValidCursor = TRUE;
break; break;
} }