remove UTIL and JA2 preprocessor definitions (#66)

UTIL is never used, and JA2 is always used. assumption being we'll never make 1.13 for Wizardry 8.

video2.h doesn't exist, which prevented me from deleting it.
This commit is contained in:
majcosta
2023-01-05 20:40:36 +02:00
committed by GitHub
parent 24425a82b1
commit aaa8b094c9
30 changed files with 1 additions and 702 deletions
@@ -1,10 +1,6 @@
#include "Cursor Control.h"
#if defined( JA2 ) || defined( UTIL )
#include "video.h"
#else
#include "video2.h"
#endif
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -311,7 +307,6 @@ void CursorDatabaseClear(void)
BOOLEAN SetCurrentCursorFromDatabase( UINT32 uiCursorIndex )
{
#ifdef JA2
BOOLEAN ReturnValue = TRUE;
UINT16 usSubIndex;
@@ -398,11 +393,7 @@ BOOLEAN SetCurrentCursorFromDatabase( UINT32 uiCursorIndex )
}
#ifdef JA2
SetMouseCursorProperties( (INT16)(usEffWidth/2), (INT16)(usEffHeight/2), (UINT16)(usEffHeight), (UINT16)(usEffWidth ) );
#else
SetMouseCursorProperties( sCenterValY, (INT16)( sCenterValY + gsGlobalCursorYOffset ), MAX_CURSOR_HEIGHT, MAX_CURSOR_WIDTH );
#endif
DirtyCursor( );
}
@@ -545,11 +536,7 @@ BOOLEAN SetCurrentCursorFromDatabase( UINT32 uiCursorIndex )
sCenterValX = pCurData->sOffsetX;
sCenterValY = pCurData->sOffsetY;
#ifdef JA2
SetMouseCursorProperties( sCenterValX, (INT16)( sCenterValY + gsGlobalCursorYOffset ), pCurData->usHeight, pCurData->usWidth );
#else
SetMouseCursorProperties( sCenterValY, (INT16)( sCenterValY + gsGlobalCursorYOffset ), MAX_CURSOR_HEIGHT, MAX_CURSOR_WIDTH );
#endif
DirtyCursor( );
}
}
@@ -575,9 +562,6 @@ BOOLEAN SetCurrentCursorFromDatabase( UINT32 uiCursorIndex )
}
return ( ReturnValue );
#else
return(0);
#endif
}