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
-17
View File
@@ -15,11 +15,7 @@
#include "input.h"
#include "memman.h"
#include "english.h"
#if defined( JA2 ) || defined( UTIL )
#include "video.h"
#else
#include "video2.h"
#endif
#include "local.h"
@@ -30,12 +26,6 @@ extern UINT16 gsKeyTranslationTable[1024];
extern BOOLEAN gfApplicationActive;
#ifndef JA2
#undef GetCursorPos
#define GetCursorPos SGPMouseGetPos
#endif
// The gfKeyState table is used to track which of the keys is up or down at any one time. This is used while polling
// the interface.
@@ -1095,11 +1085,9 @@ void KeyUp(UINT32 usParam, UINT32 uiParam)
{
// DB this used to be keyed to SCRL_LOCK
// which I believe Luis gave the wrong value
//#ifndef JA2
if (_KeyDown(CTRL))
VideoCaptureToggle();
else
//#endif
PrintScreen();
}
else
@@ -1388,12 +1376,7 @@ void RedirectToString(UINT16 usInputCharacter)
gpCurrentStringDescriptor->usStringOffset = 0 ;
gpCurrentStringDescriptor->usLastCharacter = usInputCharacter;
break;
#ifndef JA2
// Stupid definition causes problems with headers that use the keyword END -- DB
case KEY_END
#else
case END
#endif
: // Go to the end of the input string
gpCurrentStringDescriptor->usStringOffset = gpCurrentStringDescriptor->usCurrentStringLength;
gpCurrentStringDescriptor->usLastCharacter = usInputCharacter;