diff --git a/JA2.suo b/JA2.suo index 553cd833..f4d2eed3 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index 9769c07f..9058726b 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -172,8 +172,10 @@ UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY ) SECTORINFO *pSector; GROUP *pGroup; 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 ) ]; ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites); diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index b9b433a9..a96b5162 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -566,7 +566,7 @@ void RenderTacticalPlacementGUI() gTPClipRect.iTop = iOffsetVertical; // WANNE 2 //gTPClipRect.iRight = iOffsetHorizontal + 640; - gTPClipRect.iRight = iOffsetHorizontal + 635; + gTPClipRect.iRight = iOffsetHorizontal + 634; // 635 gTPClipRect.iBottom = iOffsetVertical + 320; switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode ) { @@ -719,19 +719,19 @@ void TacticalPlacementHandle() switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode ) { case INSERTION_CODE_NORTH: - if( gusMouseYPos <= (iOffsetVertical + 40) ) + if( gusMouseYPos <= (iOffsetVertical + 30) ) // 40 gfValidCursor = TRUE; break; case INSERTION_CODE_EAST: - if( gusMouseXPos >= (iOffsetHorizontal + 600) ) + if( gusMouseXPos >= (iOffsetHorizontal + 610) ) // 600 gfValidCursor = TRUE; break; case INSERTION_CODE_SOUTH: - if( gusMouseYPos >= (iOffsetVertical + 280) ) + if( gusMouseYPos >= (iOffsetVertical + 290) ) // 280 gfValidCursor = TRUE; break; case INSERTION_CODE_WEST: - if( gusMouseXPos <= (iOffsetHorizontal + 40) ) + if( gusMouseXPos <= (iOffsetHorizontal + 30) ) // 40 gfValidCursor = TRUE; break; }