diff --git a/code/ahandle.cpp b/code/ahandle.cpp
index 39ec42b0..14fb5db2 100644
--- a/code/ahandle.cpp
+++ b/code/ahandle.cpp
@@ -38,14 +38,14 @@ AHANDLE_CALLBACK_2 _AHandleCallbackFunc2;
 
 /// private, call handler instead
 
-long __cdecl Open_Audio_Handler(VQAHandleP *vqap, AhandleInitParams *params, long);
-long __cdecl Close_Audio_Handler(VQAHandleP *vqap);
-long __cdecl Start_Audio_Handler(VQAHandleP *vqap);
-long __cdecl Stop_Audio_Handler(VQAHandleP *vqap);
-long __cdecl Play_Audio_Handler(VQAHandleP *vqap);
-long __cdecl Pause_Audio_Handler(VQAHandleP *vqap);
+VQAErrorType __cdecl Open_Audio_Handler(VQAHandleP *vqap, AhandleInitParams *params, long);
+VQAErrorType __cdecl Close_Audio_Handler(VQAHandleP *vqap);
+VQAErrorType __cdecl Start_Audio_Handler(VQAHandleP *vqap);
+VQAErrorType __cdecl Stop_Audio_Handler(VQAHandleP *vqap);
+VQAErrorType __cdecl Play_Audio_Handler(VQAHandleP *vqap);
+VQAErrorType __cdecl Pause_Audio_Handler(VQAHandleP *vqap);
 long __cdecl Resume_Audio_Handler(VQAHandleP *vqap);
-long __cdecl Load_Audio_Handler(VQAHandleP *vqap, void *buffer, long nbytes);
+VQAErrorType __cdecl Load_Audio_Handler(VQAHandleP *vqap, void *buffer, long nbytes);
 void CALLBACK AudioCallback(UINT uTimerID, UINT, DWORD dwUser, DWORD, DWORD);
 _STATIC unsigned long Get_Playback_Position(VQAHandle *vqa, Ahandle *handle, VQAConfig *config);
 
@@ -188,7 +188,7 @@ long __cdecl Stream_Audio_Handler(VQAHandle *vqa, long action, void *buffer, lon
 }
 
 
-long __cdecl Open_Audio_Handler(VQAHandleP *vqap, AhandleInitParams *params, long b)
+VQAErrorType __cdecl Open_Audio_Handler(VQAHandleP *vqap, AhandleInitParams *params, long b)
 {
 	DSCAPS dscaps;
 
@@ -297,7 +297,7 @@ long __cdecl Open_Audio_Handler(VQAHandleP *vqap, AhandleInitParams *params, lon
 }
 
 
-long __cdecl Close_Audio_Handler(VQAHandleP *vqap)
+VQAErrorType __cdecl Close_Audio_Handler(VQAHandleP *vqap)
 {
 	DebugString("Closing VQ audio handler\n");
 
@@ -346,7 +346,7 @@ long __cdecl Close_Audio_Handler(VQAHandleP *vqap)
 }
 
 
-long __cdecl Start_Audio_Handler(VQAHandleP *vqap)
+VQAErrorType __cdecl Start_Audio_Handler(VQAHandleP *vqap)
 {
 	/* Dereference commonly used data members for quicker access. */
 	VQAConfig *config = &vqap->Config;
@@ -421,7 +421,7 @@ long __cdecl Start_Audio_Handler(VQAHandleP *vqap)
 }
 
 
-long __cdecl Load_Audio_Handler(VQAHandleP *vqap, void *buffer, long nbytes)
+VQAErrorType __cdecl Load_Audio_Handler(VQAHandleP *vqap, void *buffer, long nbytes)
 {
 	Ahandle *handle = &_handles[vqap->AudioHandleIndex];
 
@@ -448,7 +448,7 @@ long __cdecl Load_Audio_Handler(VQAHandleP *vqap, void *buffer, long nbytes)
 }
 
 
-long __cdecl Pause_Audio_Handler(VQAHandleP *vqap)
+VQAErrorType __cdecl Pause_Audio_Handler(VQAHandleP *vqap)
 {
 	Ahandle *handle = &_handles[vqap->AudioHandleIndex];
 
@@ -465,19 +465,19 @@ long __cdecl Pause_Audio_Handler(VQAHandleP *vqap)
 }
 
 
-long __cdecl Play_Audio_Handler(VQAHandleP *vqap)
+VQAErrorType __cdecl Play_Audio_Handler(VQAHandleP *vqap)
 {
 	Ahandle *handle = &_handles[vqap->AudioHandleIndex];
 
-	long rc;
+	VQAErrorType rc;
 	if (!handle->Used || handle->SecondaryBufferPtr == NULL) {
 		return(VQAERR_AUDIO);
 	}
 
 	EnterCriticalSection(&handle->CriticalSection);
 
-	rc = handle->SecondaryBufferPtr->Play(0, 0, DSBPLAY_LOOPING);
-	if (rc == S_OK) {
+	HRESULT const return_code = handle->SecondaryBufferPtr->Play(0, 0, DSBPLAY_LOOPING);
+	if (return_code == S_OK) {
 		handle->PauseAdjust = Simple_Timer_Callback_Audio_Handler(NULL) - handle->LastTimerTick;
 		DebugString("Ahandle: PauseAdjust %ld\n", handle->PauseAdjust);
 		handle->Flags &= ~AHANDLEF_IS_PAUSED;
@@ -491,7 +491,7 @@ long __cdecl Play_Audio_Handler(VQAHandleP *vqap)
 }
 
 
-long __cdecl Stop_Audio_Handler(VQAHandleP *vqap)
+VQAErrorType __cdecl Stop_Audio_Handler(VQAHandleP *vqap)
 {
 	Ahandle *handle = &_handles[vqap->AudioHandleIndex];
 
diff --git a/code/vqalib/audio.cpp b/code/vqalib/audio.cpp
index aad2aa99..4b50bddf 100644
--- a/code/vqalib/audio.cpp
+++ b/code/vqalib/audio.cpp
@@ -110,10 +110,9 @@ static void StartAddr(void)
 *
 ****************************************************************************/
 
-long VQA_OpenAudio(VQAHandleP *vqap)
+VQAErrorType VQA_OpenAudio(VQAHandleP *vqap)
 {
 	VQAAudio *audio;
-	long          rc;
 
 	/* Dereference data memebers for quicker access. */
 	audio = &vqap->Audio;
@@ -134,8 +133,9 @@ long VQA_OpenAudio(VQAHandleP *vqap)
 	params.Callback1 = VQA_AudioFillCallback;
 	params.Callback2 = VQA_AudioDoneCallback;
 
-	rc = vqap->Config.AudioHandler((VQAHandle *)vqap, VQAAUDIO_OPEN, &params, sizeof(params));
-	if (rc >= VQAERR_OK || rc == VQAERR_NONE) {
+	auto const opened = vqap->Config.AudioHandler((VQAHandle *)vqap, VQAAUDIO_OPEN, &params, sizeof(params));
+
+	if (opened >= VQAERR_OK || opened == VQAERR_NONE) {
 
 		/* Lock the memory occupied by this module. */
 		if ((audio->Flags & VQAAUDF_MODLOCKED) == 0) {
@@ -143,7 +143,7 @@ long VQA_OpenAudio(VQAHandleP *vqap)
 		}
 		return(VQAERR_NONE);
 	}
-	return(rc);
+	return((VQAErrorType)opened);
 }
 
 
diff --git a/code/vqalib/buffer_.cpp b/code/vqalib/buffer_.cpp
index d46aae9c..8519f6f2 100644
--- a/code/vqalib/buffer_.cpp
+++ b/code/vqalib/buffer_.cpp
@@ -17,7 +17,7 @@
 #include	<string.h>
 #include	"vqamem.h"
 
-extern long VQA_Set_DrawBuffer(VQAHandle *vqa, unsigned char *buffer, unsigned long width, unsigned long height, long xpos, long ypos);
+extern VQAErrorType VQA_Set_DrawBuffer(VQAHandle *vqa, unsigned char *buffer, unsigned long width, unsigned long height, long xpos, long ypos);
 
 
 _STATIC void VQA_BufferPerpareLoop(VQAHandleP *vqap, long * needs_start_cb, long * needs_end_cb);
@@ -58,7 +58,7 @@ _STATIC void VQA_BufferPerpareLoop(VQAHandleP *vqap, long * needs_start_cb, long
 *
 ****************************************************************************/
 
-STATIC long AllocBuffers(VQAHandleP *vqap)
+STATIC VQAErrorType AllocBuffers(VQAHandleP *vqap)
 {
 	long needs_start_cb;
 	long needs_end_cb;
@@ -706,7 +706,7 @@ STATIC void FreeBuffers(VQAHandleP *vqap)
 }
 
 
-long VQA_Configure_Buffer(VQAHandleP *vqap)
+VQAErrorType VQA_Configure_Buffer(VQAHandleP *vqap)
 {
 	unsigned char *buf;
 	int w;
diff --git a/code/vqalib/drawer.cpp b/code/vqalib/drawer.cpp
index 61006f8e..676ef3a7 100644
--- a/code/vqalib/drawer.cpp
+++ b/code/vqalib/drawer.cpp
@@ -73,21 +73,21 @@
 #include	"video.h"
 
 //forward declarations
-_STATIC long Select_Frame(VQAHandleP *vqap);
+_STATIC VQAErrorType Select_Frame(VQAHandleP *vqap);
 _STATIC void Prepare_Frame(VQAHandleP *vqap);
 
-long DrawFrame_MCGABuf(VQAHandle *vqa);
-long PageFlip_MCGABuf(VQAHandle *vqa);
-long DrawFrame_MCGA(VQAHandle *vqa);
-long PageFlip_MCGA(VQAHandle *vqa);
+VQAErrorType DrawFrame_MCGABuf(VQAHandle *vqa);
+VQAErrorType PageFlip_MCGABuf(VQAHandle *vqa);
+VQAErrorType DrawFrame_MCGA(VQAHandle *vqa);
+VQAErrorType PageFlip_MCGA(VQAHandle *vqa);
 
 void __cdecl UnVQ_Nop(unsigned char *codebook, unsigned char *pointers, unsigned char *buffer, unsigned long blocksperrow, unsigned long numrows, unsigned long bufwidth);
-long PageFlip_Nop(VQAHandle *vqa);
+VQAErrorType PageFlip_Nop(VQAHandle *vqa);
 
 void VQA_SetTimer(VQAHandleP *vqap, long time);
 void VQA_StepTimer(VQAHandleP *vqap, long step);
 unsigned long VQA_GetTime(VQAHandleP *vqap);
-_STATIC long VQA_SetCurrentFrameAsLast(VQAHandleP *vqap);
+_STATIC VQAErrorType VQA_SetCurrentFrameAsLast(VQAHandleP *vqap);
 _STATIC void VQA_SetPreviousFrameNode(VQAHandleP *vqap);
 _STATIC long VQA_CalcFramesSinceDrawn(VQAHandleP *vqap);
 
@@ -102,7 +102,7 @@ void VQA_DispatchFrameChunks(VQAHandleP *vqap, long frame);
 /// no frame has been drawn yet.
 /// </summary>
 /// <returns>Returns with VQAERR_NONE.</returns>
-long VQA_ResetLastFrameNum(VQAHandle *vqa)
+VQAErrorType VQA_ResetLastFrameNum(VQAHandle *vqa)
 {
 	VQAHandleP *vqap;
 	VQADrawer *drawer;
@@ -138,7 +138,7 @@ long VQA_ResetLastFrameNum(VQAHandle *vqa)
 *
 ****************************************************************************/
 
-long VQA_Configure_Drawer(VQAHandleP *vqap)
+VQAErrorType VQA_Configure_Drawer(VQAHandleP *vqap)
 {
 	VQAConfig *config;
 	VQAHeader *header;
@@ -265,7 +265,7 @@ long VQA_Configure_Drawer(VQAHandleP *vqap)
 *
 ****************************************************************************/
 
-STATIC long Select_Frame(VQAHandleP *vqap)
+STATIC VQAErrorType Select_Frame(VQAHandleP *vqap)
 {
 	VQADrawer    *drawer;
 	VQAConfig    *config;
@@ -668,7 +668,7 @@ long VQA_CalcFramesSinceDrawn(VQAHandleP *vqap)
 /// notion of playback progress once a frame has been committed.
 /// </summary>
 /// <returns>Returns with VQAERR_NONE.</returns>
-long VQA_SetCurrentFrameAsLast(VQAHandleP *vqap)
+VQAErrorType VQA_SetCurrentFrameAsLast(VQAHandleP *vqap)
 {
 	VQADrawer * drawer;
 
@@ -893,12 +893,12 @@ void VQA_UnVQFrame(VQAHandleP *vqap, VQAFrameNode *frame)
 *
 ****************************************************************************/
 
-long DrawFrame_MCGA(VQAHandle *vqa)
+VQAErrorType DrawFrame_MCGA(VQAHandle *vqa)
 {
 	VQAHandleP *vqap;
 	VQADrawer    *drawer;
 	VQAFrameNode *curframe;
-	long         rc;
+	VQAErrorType         rc;
 
 	/* Dereference commonly used data members for quicker access */
 	vqap = (VQAHandleP *)vqa;
@@ -952,7 +952,7 @@ long DrawFrame_MCGA(VQAHandle *vqa)
 *
 ****************************************************************************/
 
-STATIC long PageFlip_MCGA(VQAHandle *vqa)
+STATIC VQAErrorType PageFlip_MCGA(VQAHandle *vqa)
 {
 	VQAHandleP *vqap;
 	VQADrawer     *drawer;
@@ -1053,9 +1053,9 @@ STATIC long PageFlip_MCGA(VQAHandle *vqa)
 *
 ****************************************************************************/
 
-STATIC long DrawFrame_MCGABuf(VQAHandle *vqa)
+STATIC VQAErrorType DrawFrame_MCGABuf(VQAHandle *vqa)
 {
-	long rc;
+	VQAErrorType rc;
 	VQAHandleP *vqap;
 	VQADrawer *drawer;
 	VQAFrameNode *curframe;
@@ -1111,7 +1111,7 @@ STATIC long DrawFrame_MCGABuf(VQAHandle *vqa)
 *
 ****************************************************************************/
 
-STATIC long PageFlip_MCGABuf(VQAHandle *vqa)
+STATIC VQAErrorType PageFlip_MCGABuf(VQAHandle *vqa)
 {
 	VQAHandleP *vqap;
 	VQADrawer *drawer;
@@ -1237,7 +1237,7 @@ STATIC void __cdecl UnVQ_Nop(unsigned char *codebook, unsigned char *pointers,
 *
 ****************************************************************************/
 
-STATIC long PageFlip_Nop(VQAHandle *vqa)
+STATIC VQAErrorType PageFlip_Nop(VQAHandle *vqa)
 {
 	//shut up compiler warnings
 	vqa = vqa;
diff --git a/code/vqalib/loader.cpp b/code/vqalib/loader.cpp
index 87fa18fb..9dd4ef9c 100644
--- a/code/vqalib/loader.cpp
+++ b/code/vqalib/loader.cpp
@@ -71,69 +71,69 @@
  * PRIVATE DECLARATIONS
  *-------------------------------------------------------------------------*/
 
-long Load_FINF(VQAHandleP *vqap, unsigned long iffsize);
-long Load_CINF(VQAHandleP *vqap);
-long Load_PINF(VQAHandleP *vqap);
-long Load_LINF(VQAHandleP *vqap);
-long Load_CLIP(VQAHandleP *vqap, unsigned long iffsize);
-long Load_MFCI(VQAHandleP *vqap);
-
-long Load_MSCI(VQAHandleP *vqap);
-
-_STATIC long Load_VQF(VQAHandleP *vqap, unsigned long frame_iffsize, char flags);
-_STATIC long Load_CBF0(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_CBFZ(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_CBP0(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_CBPZ(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_CPL0(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_CPLZ(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_VPT0(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_VPTZ(VQAHandleP *vqap, unsigned long iffsize);
+VQAErrorType Load_FINF(VQAHandleP *vqap, unsigned long iffsize);
+VQAErrorType Load_CINF(VQAHandleP *vqap);
+VQAErrorType Load_PINF(VQAHandleP *vqap);
+VQAErrorType Load_LINF(VQAHandleP *vqap);
+VQAErrorType Load_CLIP(VQAHandleP *vqap, unsigned long iffsize);
+VQAErrorType Load_MFCI(VQAHandleP *vqap);
+
+VQAErrorType Load_MSCI(VQAHandleP *vqap);
+
+_STATIC VQAErrorType Load_VQF(VQAHandleP *vqap, unsigned long frame_iffsize, char flags);
+_STATIC VQAErrorType Load_CBF0(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_CBFZ(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_CBP0(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_CBPZ(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_CPL0(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_CPLZ(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_VPT0(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_VPTZ(VQAHandleP *vqap, unsigned long iffsize);
 
 #if(VQAAUDIO_ON)
-_STATIC long Load_SND0(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_SND1(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_SND2(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_SN2J(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_SND0(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_SND1(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_SND2(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_SN2J(VQAHandleP *vqap, unsigned long iffsize);
 #endif
 
-_STATIC long Load_LINH(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_LIND(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_CINH(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_CIND(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_PINH(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_PIND(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_LINH(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_LIND(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_CINH(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_CIND(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_PINH(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_PIND(VQAHandleP *vqap, unsigned long iffsize);
 
-_STATIC long Load_MSCH(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_MSCT(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_MSCH(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_MSCT(VQAHandleP *vqap, unsigned long iffsize);
 
-_STATIC long Load_MFCH(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_MFCD(VQAHandleP *vqap, unsigned long iffsize);
-_STATIC long Load_MFCT(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_MFCH(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_MFCD(VQAHandleP *vqap, unsigned long iffsize);
+_STATIC VQAErrorType Load_MFCT(VQAHandleP *vqap, unsigned long iffsize);
 
 _STATIC long VQA_GetCodebookSize(VQAHandleP *vqap, long framenum);
-_STATIC long VQA_MFCIPrepare(VQAHandleP *vqap, unsigned long index);
+_STATIC VQAErrorType VQA_MFCIPrepare(VQAHandleP *vqap, unsigned long index);
 _STATIC long VQA_MFCICalcCount(VQAHandleP *vqap, unsigned long chunkid, long count, unsigned long value);
 _STATIC VQABool VQA_MFCISpansLoop(VQAHandleP *vqap, unsigned long chunkid, unsigned long value);
 
-_STATIC long VQA_MSCIPrepare(VQAHandleP *vqap, unsigned long index);
-_STATIC long VQA_MSCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index);
+_STATIC VQAErrorType VQA_MSCIPrepare(VQAHandleP *vqap, unsigned long index);
+_STATIC VQAErrorType VQA_MSCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index);
 
 _STATIC long VQA_MFCIIndexFromChunkID(VQAHandleP *vqap, unsigned long chunkid);
-_STATIC long VQA_MFCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index);
+_STATIC VQAErrorType VQA_MFCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index);
 _STATIC long VQA_MSCIIndexFromChunkID(VQAHandleP *vqap, unsigned long chunkid);
 
 _STATIC long VQA_GetPaletteFrameRange(VQAHandleP *vqap, long framenum, long * first_frame, long * last_frame);
-_STATIC long VQA_SeekLoop(VQAHandleP *vqap, long framenum, long flags);
+_STATIC VQAErrorType VQA_SeekLoop(VQAHandleP *vqap, long framenum, long flags);
 _STATIC long VQA_GetCodebookFrameRange(VQAHandleP *vqap, long framenum, long *first_frame, long *last_frame);
 VQABool VQA_IsFrameStartOfLoop(VQAHandleP *vqap, long framenum);
-long VQA_ReloadPalette(VQAHandleP *vqap, long framenum, int force);
-_STATIC long VQA_LoadLoop(VQAHandleP *vqap, long framenum);
+VQAErrorType VQA_ReloadPalette(VQAHandleP *vqap, long framenum, int force);
+_STATIC VQAErrorType VQA_LoadLoop(VQAHandleP *vqap, long framenum);
 
 long __cdecl Memory_VQA_Stream_Handler(VQAHandle *vqa, long action, void *buffer, long nbytes);
-_STATIC long VQA_LoadFrame_Internal(VQAHandleP *vqap, long flags);
+_STATIC VQAErrorType VQA_LoadFrame_Internal(VQAHandleP *vqap, long flags);
 
-long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool preloadaudio, VQABool reset_state, VQABool &skipcodebook);
+VQAErrorType VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool preloadaudio, VQABool reset_state, VQABool &skipcodebook);
 
 
 /****************************************************************************
@@ -173,7 +173,7 @@ long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool prel
 *     Error - 0 if successful or VQAERR_??? error code.
 *
 ****************************************************************************/
-long VQA_LoadFrame(VQAHandleP *vqap, long flags)
+VQAErrorType VQA_LoadFrame(VQAHandleP *vqap, long flags)
 {
 	VQAConfig *config;
 	VQALoader *loader;
@@ -184,7 +184,7 @@ long VQA_LoadFrame(VQAHandleP *vqap, long flags)
 	int scan_frame;
 	int tocache;
 	VQA_H_FUNC handler;
-	unsigned int rc;
+	VQAErrorType rc;
 	int val4;
 	int fsize;
 	VQA_H_FUNC oldhandler;
@@ -261,7 +261,7 @@ long VQA_LoadFrame(VQAHandleP *vqap, long flags)
 						config->StreamHandler((VQAHandle *)vqap, VQACMD_SEEK, NULL, foffset);
 					}
 					if (config->StreamHandler((VQAHandle *)vqap, VQACMD_READ, &cache->Ptr[cache->Offset], tocache)) {
-						return -4;
+						return(VQAERR_READ);
 					}
 					cache->Bytes += tocache;
 				}
@@ -307,7 +307,7 @@ struct VQASN2J {
 #pragma pack(pop)
 
 
-long VQA_LoadFrame_Internal(VQAHandleP *vqap, long flags)
+VQAErrorType VQA_LoadFrame_Internal(VQAHandleP *vqap, long flags)
 {
 	VQAConfig     *config;
 	VQALoader     *loader;
@@ -320,7 +320,7 @@ long VQA_LoadFrame_Internal(VQAHandleP *vqap, long flags)
 	VQABool      loop_loaded = 0;
 
 
-	long          rc;
+	VQAErrorType          rc;
 
 	/* Dereference commonly used data members for quicker access. */
 	config = &vqap->Config;
@@ -869,11 +869,11 @@ long VQA_LoadFrame_Internal(VQAHandleP *vqap, long flags)
 }
 
 
-long PrimeBuffers(VQAHandle *vqa)
+VQAErrorType PrimeBuffers(VQAHandle *vqa)
 {
 	VQAHandleP *vqap;
 	VQAConfig *config;
-	long rc;
+	VQAErrorType rc;
 	long i;
 
 	vqap = ((VQAHandleP *)vqa);
@@ -918,7 +918,7 @@ long VQA_MFCIIndexFromChunkID(VQAHandleP *vqap, unsigned long chunkid)
 /// <param name="iffsize">Size of IFF chunk.</param>
 /// <param name="index">Index of the multi-frame chunk table entry to read into.</param>
 /// <returns>Returns with VQAERR_NONE if successful, or a VQAERR_??? error code.</returns>
-long VQA_MFCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index)
+VQAErrorType VQA_MFCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index)
 {
 	void *buf;
 	VQALoader *loader;
@@ -985,7 +985,7 @@ long VQA_MSCIIndexFromChunkID(VQAHandleP *vqap, unsigned long chunkid)
 /// <param name="iffsize">Size of IFF chunk.</param>
 /// <param name="index">Index of the multi-stream chunk table entry to read into.</param>
 /// <returns>Returns with VQAERR_NONE if successful, or a VQAERR_??? error code.</returns>
-long VQA_MSCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index)
+VQAErrorType VQA_MSCIReadData(VQAHandleP *vqap, unsigned long iffsize, long index)
 {
 	VQAConfig *config;
 	VQALoader *loader;
@@ -1056,9 +1056,9 @@ VQABool VQA_IsFrameStartOfLoop(VQAHandleP *vqap, long framenum)
 }
 
 
-long VQA_SeekLoop(VQAHandleP *vqap, long framenum, long flags)
+VQAErrorType VQA_SeekLoop(VQAHandleP *vqap, long framenum, long flags)
 {
-	long rc = VQAERR_NONE;
+	VQAErrorType rc = VQAERR_NONE;
 	VQAConfig *config;
 	VQALoopCache *cache;
 	bool needs_seek = false;
@@ -1152,13 +1152,13 @@ long VQA_GetPaletteFrameRange(VQAHandleP *vqap, long framenum, long * first_fram
 /// </summary>
 /// <param name="framenum">The frame whose palette is required.</param>
 /// <param name="force">Non-zero to force a full reload rather than reloading only when the palette has changed.</param>
-long VQA_ReloadPalette(VQAHandleP *vqap, long framenum, int force)
+VQAErrorType VQA_ReloadPalette(VQAHandleP *vqap, long framenum, int force)
 {
 	VQALoader *loader;
 	VQAFrameNode *curframe;
 	VQAConfig *config;
 
-	long rc = -1;
+	VQAErrorType rc = VQAERR_NONE;
 
 	loader = &vqap->Loader;
 	curframe = loader->CurFrame;
@@ -1245,7 +1245,7 @@ long VQA_ReloadPalette(VQAHandleP *vqap, long framenum, int force)
 /// <param name="reset_state">Should the loader and audio state be reset before seeking?</param>
 /// <param name="skipcodebook">Set true if the full codebook is already valid, so that the caller may skip codebook assembly.</param>
 /// <returns>Returns with VQAERR_NONE if successful, or a VQAERR_??? error code.</returns>
-long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool preloadaudio, VQABool reset_state, VQABool &skipcodebook)
+VQAErrorType VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool preloadaudio, VQABool reset_state, VQABool &skipcodebook)
 {
 	//VQAHandleP   *vqap;
 	VQALoader    *loader;
@@ -1265,7 +1265,7 @@ long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool prel
 	int bytes_per_frame;
 	int preload_frames;
 	int covered_bytes;
-	unsigned int rc;
+	VQAErrorType rc;
 	bool bool2;
 	int loadflags;
 	long group_end;
@@ -1450,7 +1450,7 @@ long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool prel
 			if ( reset_state )
 			{
 				if (rc == VQAERR_NOBUFFER || rc == VQAERR_SLEEPING) {
-					rc = -1;
+					rc = VQAERR_NONE;
 				}
 			}
 
@@ -1462,7 +1462,7 @@ long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool prel
 		 */
 		if (!config->StreamHandler((VQAHandle *)vqap, VQACMD_SEEK, (void *)SEEK_SET, VQAFRAME_OFFSET(vqap->Foff[group]))) {
 			loader->CurFrameNum = group;
-			rc = -1;
+			rc = VQAERR_NONE;
 
 			loadflags = (VQALOADF_NOPAL|VQALOADF_NOPTR);
 			if (group_index) {
@@ -1534,14 +1534,14 @@ long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool prel
 /// </summary>
 /// <param name="framenum">The loop start frame to rewind to.</param>
 /// <returns>Returns with VQAERR_NONE if successful, or a VQAERR_??? error code.</returns>
-_STATIC long VQA_LoadLoop(VQAHandleP *vqap, long framenum)
+_STATIC VQAErrorType VQA_LoadLoop(VQAHandleP *vqap, long framenum)
 {
 	VQALoader *loader;
 	VQAHeader *header;
 	VQAConfig *config;
 
 
-	long rc = VQAERR_NONE;
+	VQAErrorType rc = VQAERR_NONE;
 	VQABool skipcodebook = false;
 
 	loader = &vqap->Loader;
@@ -1607,7 +1607,7 @@ _STATIC long VQA_LoadLoop(VQAHandleP *vqap, long framenum)
 *
 ****************************************************************************/
 
-long Load_VQF(VQAHandleP *vqap, unsigned long frame_iffsize, char flags)
+VQAErrorType Load_VQF(VQAHandleP *vqap, unsigned long frame_iffsize, char flags)
 {
 	VQAFrameNode  *curframe;
 	ChunkHeader   *chunk;
@@ -1845,7 +1845,7 @@ long Load_VQF(VQAHandleP *vqap, unsigned long frame_iffsize, char flags)
 }
 
 
-long Load_CLIP(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CLIP(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, &vqap->Clipper, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -1854,7 +1854,7 @@ long Load_CLIP(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_LINF(VQAHandleP *vqap)
+VQAErrorType Load_LINF(VQAHandleP *vqap)
 {
 	unsigned long iffsize;
 	ChunkHeader chunk;
@@ -1904,7 +1904,7 @@ long Load_LINF(VQAHandleP *vqap)
 }
 
 
-long Load_LINH(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_LINH(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, &vqap->LoopInfo.Header, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -1913,7 +1913,7 @@ long Load_LINH(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_LIND(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_LIND(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, vqap->LoopInfo.Data, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -1922,7 +1922,7 @@ long Load_LIND(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_MFCI(VQAHandleP *vqap)
+VQAErrorType Load_MFCI(VQAHandleP *vqap)
 {
 	ChunkHeader chunk;
 	VQAConfig *config;
@@ -2009,7 +2009,7 @@ long Load_MFCI(VQAHandleP *vqap)
 		vqap->MemUsed += size;
 
 		for (unsigned long i = 0; i < count; i++) {
-			long rc = VQA_MFCIPrepare(vqap, i);
+			VQAErrorType rc = VQA_MFCIPrepare(vqap, i);
 			if (rc != VQAERR_NONE) {
 				return(rc);
 			}
@@ -2020,7 +2020,7 @@ long Load_MFCI(VQAHandleP *vqap)
 }
 
 
-long Load_MFCH(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_MFCH(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, &vqap->MFCInfo.Header, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2029,7 +2029,7 @@ long Load_MFCH(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_MFCD(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_MFCD(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, vqap->MFCInfo.StaticData, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2038,7 +2038,7 @@ long Load_MFCD(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_MFCT(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_MFCT(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, vqap->MFCInfo.Table, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2047,7 +2047,7 @@ long Load_MFCT(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_MSCI(VQAHandleP *vqap)
+VQAErrorType Load_MSCI(VQAHandleP *vqap)
 {
 	ChunkHeader chunk;
 	VQAConfig *config;
@@ -2110,7 +2110,7 @@ long Load_MSCI(VQAHandleP *vqap)
 		vqap->MemUsed += size;
 
 		for (unsigned long i = 0; i < count; i++) {
-			long rc = VQA_MSCIPrepare(vqap, i);
+			VQAErrorType rc = VQA_MSCIPrepare(vqap, i);
 			if (rc != VQAERR_NONE) {
 				return(rc);
 			}
@@ -2121,7 +2121,7 @@ long Load_MSCI(VQAHandleP *vqap)
 }
 
 
-long Load_MSCH(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_MSCH(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, &vqap->MSCInfo.Header, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2130,7 +2130,7 @@ long Load_MSCH(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_MSCT(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_MSCT(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, vqap->MSCInfo.Table, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2227,7 +2227,7 @@ long VQA_MFCICalcCount(VQAHandleP *vqap, unsigned long chunkid, long count, unsi
 /// </summary>
 /// <param name="index">Index of the multi-frame chunk table entry to prepare.</param>
 /// <returns>Returns with VQAERR_NONE if successful, or VQAERR_NOMEM if a buffer could not be allocated.</returns>
-long VQA_MFCIPrepare(VQAHandleP *vqap, unsigned long index)
+VQAErrorType VQA_MFCIPrepare(VQAHandleP *vqap, unsigned long index)
 {
 	VQAConfig *config;
 	unsigned long size;
@@ -2287,7 +2287,7 @@ long VQA_MFCIPrepare(VQAHandleP *vqap, unsigned long index)
 /// </summary>
 /// <param name="index">Index of the multi-stream chunk table entry to prepare.</param>
 /// <returns>Returns with VQAERR_NONE if successful, or VQAERR_NOMEM if a buffer could not be allocated.</returns>
-long VQA_MSCIPrepare(VQAHandleP *vqap, unsigned long index)
+VQAErrorType VQA_MSCIPrepare(VQAHandleP *vqap, unsigned long index)
 {
 	VQAConfig *config;
 	unsigned long size;
@@ -2422,7 +2422,7 @@ long VQA_GetCodebookFrameRange(VQAHandleP *vqap, long framenum, long *first_fram
 }
 
 
-long Load_CINF(VQAHandleP *vqap)
+VQAErrorType Load_CINF(VQAHandleP *vqap)
 {
 	int groupsize;
 	long size;
@@ -2476,7 +2476,7 @@ long Load_CINF(VQAHandleP *vqap)
 }
 
 
-long Load_CINH(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CINH(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, &vqap->CodebookInfo.Header, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2485,7 +2485,7 @@ long Load_CINH(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_CIND(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CIND(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, vqap->CodebookInfo.Data, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2494,7 +2494,7 @@ long Load_CIND(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_PINF(VQAHandleP *vqap)
+VQAErrorType Load_PINF(VQAHandleP *vqap)
 {
 	unsigned long iffsize;
 	ChunkHeader chunk;
@@ -2544,7 +2544,7 @@ long Load_PINF(VQAHandleP *vqap)
 }
 
 
-long Load_PINH(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_PINH(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, &vqap->PaletteInfo.Header, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2553,7 +2553,7 @@ long Load_PINH(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_PIND(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_PIND(VQAHandleP *vqap, unsigned long iffsize)
 {
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, vqap->PaletteInfo.Data, PADSIZE(iffsize))) {
 		return(VQAERR_READ);
@@ -2584,7 +2584,7 @@ long Load_PIND(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_FINF(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_FINF(VQAHandleP *vqap, unsigned long iffsize)
 {
 	/* Dereference commonly used data members for quicker access. */
 	/* Load the frame information table if we need to, otherwise we will
@@ -2629,7 +2629,7 @@ long Load_FINF(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-static long Load_VQHD(VQAHandleP *vqap, unsigned long iffsize)
+static VQAErrorType Load_VQHD(VQAHandleP *vqap, unsigned long iffsize)
 {
 	/* Read the header */
 	if (vqap->Config.StreamHandler((VQAHandle *)vqap, VQACMD_READ, &vqap->Header,
@@ -2667,7 +2667,7 @@ static long Load_VQHD(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_CBF0(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CBF0(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQALoader *loader;
 	VQACBNode *curcb;
@@ -2723,7 +2723,7 @@ long Load_CBF0(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_CBFZ(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CBFZ(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQALoader     *loader;
 	VQACBNode     *curcb;
@@ -2786,7 +2786,7 @@ long Load_CBFZ(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_CBP0(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CBP0(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQALoader *loader;
 	VQACBNode *curcb;
@@ -2880,7 +2880,7 @@ long Load_CBP0(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_CBPZ(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CBPZ(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQAConfig     *config;
 	VQALoader     *loader;
@@ -2994,7 +2994,7 @@ long Load_CBPZ(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_CPL0(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CPL0(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQADrawer *drawer;
 	VQAFrameNode *curframe;
@@ -3046,7 +3046,7 @@ long Load_CPL0(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_CPLZ(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_CPLZ(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQADrawer *drawer;
 	VQAFrameNode  *curframe;
@@ -3109,7 +3109,7 @@ long Load_CPLZ(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_VPT0(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_VPT0(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQAFrameNode *curframe;
 
@@ -3152,7 +3152,7 @@ long Load_VPT0(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_VPTZ(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_VPTZ(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQAFrameNode  *curframe;
 	void          *buffer;
@@ -3209,7 +3209,7 @@ long Load_VPTZ(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_SND0(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_SND0(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQAAudio      *audio;
 	VQAConfig     *config;
@@ -3298,7 +3298,7 @@ long Load_SND0(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_SND1(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_SND1(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQAAudio      *audio;
 	VQAConfig     *config;
@@ -3429,7 +3429,7 @@ long Load_SND1(VQAHandleP *vqap, unsigned long iffsize)
 *
 ****************************************************************************/
 
-long Load_SND2(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_SND2(VQAHandleP *vqap, unsigned long iffsize)
 {
 	VQAAudio      *audio;
 	VQAConfig     *config;
@@ -3510,7 +3510,7 @@ long Load_SND2(VQAHandleP *vqap, unsigned long iffsize)
 }
 
 
-long Load_SN2J(VQAHandleP *vqap, unsigned long iffsize)
+VQAErrorType Load_SN2J(VQAHandleP *vqap, unsigned long iffsize)
 {
 	unsigned long padsize;
 	VQAConfig     *config;
diff --git a/code/vqalib/task.cpp b/code/vqalib/task.cpp
index 41bbf53b..487eb6ac 100644
--- a/code/vqalib/task.cpp
+++ b/code/vqalib/task.cpp
@@ -61,41 +61,41 @@
 #include "vqadebug.h"
 
 
-long VQA_ResetLastFrameNum(VQAHandle *vqa);
+VQAErrorType VQA_ResetLastFrameNum(VQAHandle *vqa);
 void VQA_DispatchFrameChunks(VQAHandleP *vqap, long frame);
 void VQA_ResetCache(VQAHandleP *vqap);
-long VQA_Configure_Buffer(VQAHandleP *vqap);
+VQAErrorType VQA_Configure_Buffer(VQAHandleP *vqap);
 void VQA_SetTimer(VQAHandleP *vqap, long time);
 unsigned long VQA_GetTime(VQAHandleP *vqap);
 void VQA_StartAudio(VQAHandleP *vqap);
 void VQA_StopAudio(VQAHandleP *vqap);
-long VQA_LoadFrame(VQAHandleP *vqap, long flags);
+VQAErrorType VQA_LoadFrame(VQAHandleP *vqap, long flags);
 long User_Update(VQAHandle *vqa);
-long VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode);
-long VQA_SetLoop_Internal(VQAHandle *vqa, int start, int end, int iterations, int mode);
+VQAErrorType VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode);
+VQAErrorType VQA_SetLoop_Internal(VQAHandle *vqa, int start, int end, int iterations, int mode);
 void VQA_Reset(VQAHandle *vqap);
-long VQA_Configure_Drawer(VQAHandleP *vqap);
+VQAErrorType VQA_Configure_Drawer(VQAHandleP *vqap);
 long VQA_NumFramesWithPalettes(VQAHandleP *vqap);
 
-long VQA_ReloadPalette(VQAHandleP *vqap, long framenum, int force);
+VQAErrorType VQA_ReloadPalette(VQAHandleP *vqap, long framenum, int force);
 VQABool VQA_IsFrameStartOfLoop(VQAHandleP *vqap, long framenum);
-long VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool preloadaudio, VQABool reset_state, VQABool &skipcodebook);
+VQAErrorType VQA_SeekGroup(VQAHandleP *vqap, long framenum, long groupsize, VQABool preloadaudio, VQABool reset_state, VQABool &skipcodebook);
 
 
 /*---------------------------------------------------------------------------
  * PRIVATE DECLARATIONS
  *-------------------------------------------------------------------------*/
 
-long PrimeBuffers(VQAHandle *vqa);
+VQAErrorType PrimeBuffers(VQAHandle *vqa);
 
-long Load_FINF(VQAHandleP *vqap, unsigned long iffsize);
+VQAErrorType Load_FINF(VQAHandleP *vqap, unsigned long iffsize);
 
-long Load_CINF(VQAHandleP *vqap);
-long Load_PINF(VQAHandleP *vqap);
-long Load_LINF(VQAHandleP *vqap);
-long Load_CLIP(VQAHandleP *vqap, unsigned long iffsize);
-long Load_MFCI(VQAHandleP *vqap);
-long Load_MSCI(VQAHandleP *vqap);
+VQAErrorType Load_CINF(VQAHandleP *vqap);
+VQAErrorType Load_PINF(VQAHandleP *vqap);
+VQAErrorType Load_LINF(VQAHandleP *vqap);
+VQAErrorType Load_CLIP(VQAHandleP *vqap, unsigned long iffsize);
+VQAErrorType Load_MFCI(VQAHandleP *vqap);
+VQAErrorType Load_MSCI(VQAHandleP *vqap);
 
 long __cdecl VQA_Memory_Handler(VQAHandle *vqa, long action, void *buffer, long nbytes);
 long __cdecl Disk_VQA_Stream_Handler(VQAHandle *vqa, long action, void *buffer, long nbytes);
@@ -141,7 +141,7 @@ extern void __cdecl UnVQ_Nop(unsigned char *codebook, unsigned char *pointers,
 #define OPEN_CAPTIONS (1<<2)
 #define OPEN_EVA      (1<<3)
 
-long VQA_Open(char const *filename, VQAConfig *_config, VQAHandle **handle)
+VQAErrorType VQA_Open(char const *filename, VQAConfig *_config, VQAHandle **handle)
 {
 	VQAHandle   *vqa;
 	VQAHandleP  *vqap;
@@ -1192,7 +1192,7 @@ long VQA_SeekFrame(VQAHandle *vqa, long framenum, long fromwhere)
 }
 
 
-long VQA_SetUnVQ(VQAHandle *vqa, UNVQ_FUNC unvq1, UNVQ_FUNC unvq2)
+VQAErrorType VQA_SetUnVQ(VQAHandle *vqa, UNVQ_FUNC unvq1, UNVQ_FUNC unvq2)
 {
 	VQAHandleP *vqap = (VQAHandleP *)vqa;
 
@@ -1239,7 +1239,7 @@ long VQA_SetUnVQ(VQAHandle *vqa, UNVQ_FUNC unvq1, UNVQ_FUNC unvq2)
 *
 ****************************************************************************/
 
-long VQA_Set_DrawBuffer(VQAHandle *vqa, unsigned char *buffer, unsigned long width, unsigned long height, long xpos, long ypos)
+VQAErrorType VQA_Set_DrawBuffer(VQAHandle *vqa, unsigned char *buffer, unsigned long width, unsigned long height, long xpos, long ypos)
 {
 	long origin;
 	VQAHeader *header;
@@ -1333,7 +1333,7 @@ long VQA_Set_DrawBuffer(VQAHandle *vqa, unsigned char *buffer, unsigned long wid
 }
 
 
-long VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode)
+VQAErrorType VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode)
 {
 	VQAHandleP *vqap = (VQAHandleP *)vqa;
 	VQAConfig *config = &vqap->Config;
@@ -1351,7 +1351,7 @@ long VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode)
 	int start = data->StartFrame;
 	int end = data->EndFrame;
 	vqap->LoopID = id;
-	long rc = VQA_SetLoop_Internal(vqa, start, end, iterations, mode);
+	VQAErrorType rc = VQA_SetLoop_Internal(vqa, start, end, iterations, mode);
 	if (rc == VQAERR_NONE) {
 		vqap->LoopID = id;
 	}
@@ -1372,11 +1372,11 @@ long VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode)
 /// <param name="iterations">Number of times to repeat the loop. A negative value loops forever.</param>
 /// <param name="mode">One of the VQALOOP_ modes.</param>
 /// <returns>Returns with VQAERR_NONE, or VQAERR_SETLOOP if the loop could not be set.</returns>
-long VQA_SetLoop_Internal(VQAHandle *vqa, int start, int end, int iterations, int mode)
+VQAErrorType VQA_SetLoop_Internal(VQAHandle *vqa, int start, int end, int iterations, int mode)
 {
 	VQAHandleP *vqap = (VQAHandleP *)vqa;
 
-	long rc = VQAERR_NONE;
+	VQAErrorType rc = VQAERR_NONE;
 
 	if (start < vqap->NumFrames && end < vqap->NumFrames && start < end && mode >= VQALOOP_NORMAL && mode < VQALOOP_3) {
 
@@ -1583,7 +1583,7 @@ char const *VQA_Version(void)
 }
 
 
-long VQA_GetClipping(VQAHandleP *vqap, int & clipw, long & cliph)
+VQAErrorType VQA_GetClipping(VQAHandleP *vqap, int & clipw, long & cliph)
 {
 	if (vqap->Clipper.Width > 0) {
 		clipw = vqap->Clipper.Width;
@@ -1596,7 +1596,7 @@ long VQA_GetClipping(VQAHandleP *vqap, int & clipw, long & cliph)
 }
 
 
-long VQA_GetBlockInfo(VQAHandle *vqa, long & blockw, long & blockh, long & clrmode)
+VQAErrorType VQA_GetBlockInfo(VQAHandle *vqa, long & blockw, long & blockh, long & clrmode)
 {
 	VQAHandleP *vqap = (VQAHandleP *)vqa;
 	VQAHeader *header;
@@ -1668,7 +1668,7 @@ long User_Update(VQAHandle *vqa)
 	VQAFrameNode *curframe;
 	VQADrawer *drawer;
 	VQAConfig *config;
-	long    rc = 0;
+	VQAErrorType    rc = VQAERR_OK;
 
 	/* Dereference data members for quicker access. */
 	vqap = (VQAHandleP *)vqa;
@@ -1725,7 +1725,7 @@ long VQA_NumFramesWithPalettes(VQAHandleP *vqap)
 }
 
 
-long VQA_GetXYPos(VQAHandleP *vqap, int & x, long & y)
+VQAErrorType VQA_GetXYPos(VQAHandleP *vqap, int & x, long & y)
 {
 	VQAHeader *header;
 
diff --git a/code/vqalib/vqaplay.h b/code/vqalib/vqaplay.h
index 7fe06ad7..b4bdbc44 100644
--- a/code/vqalib/vqaplay.h
+++ b/code/vqalib/vqaplay.h
@@ -13,6 +13,8 @@
 
 #ifndef VQAPLAY_H
 #define VQAPLAY_H
+
+#include <cstdint>
 /****************************************************************************
 *
 *         C O N F I D E N T I A L -- W E S T W O O D  S T U D I O S
@@ -113,32 +115,34 @@ class VQAClass;
 #define INFINITE_LOOP	-1
 
 /* Error/Status conditions */
-#define VQAERR_OK        0
-#define VQAERR_NONE     -1  /* No error */
-#define	VQAERR_EOF      -2  /* Valid end of file */
-#define VQAERR_OPEN     -3  /* Unable to open */
-#define	VQAERR_READ     -4  /* Read error */
-#define VQAERR_WRITE    -5  /* Write error */
-#define VQAERR_SEEK     -6  /* Seek error */
-#define VQAERR_NOTVQA   -7  /* Not a valid VQA file. */
-#define VQAERR_NOMEM    -8  /* Unable to allocate memory */
-#define	VQAERR_NOBUFFER -9  /* No buffer avail for load/draw */
-#define	VQAERR_NOT_TIME -10 /* Not time for frame yet */
-#define	VQAERR_SLEEPING -11 /* Function is in a sleep state */
-#define VQAERR_VIDEO    -12 /* Video related error. */
-#define VQAERR_AUDIO    -13 /* Audio related error. */
-#define VQAERR_PAUSED   -14 /* In paused state. */
-#define VQAERR_NOTIMER  -15
-#define VQAERR_NORATE   -16
-#define VQAERR_NOCONFIG -17
-#define VQAERR_NOAUDSIZ -18
-#define VQAERR_AUDSYNC  -19
-#define VQAERR_BADBLOCK -20
-#define VQAERR_NOAHANDL -21
-#define VQAERR_SKIPDRAW -22
-#define VQAERR_SETLOOP  -23
-#define VQAERR_SETBUFFR -24
-#define VQAERR_FORCEDRW -25
+enum VQAErrorType : int32_t {
+	VQAERR_OK       = 0,
+	VQAERR_NONE     = -1,	/* No error */
+	VQAERR_EOF      = -2,	/* Valid end of file */
+	VQAERR_OPEN     = -3,	/* Unable to open */
+	VQAERR_READ     = -4,	/* Read error */
+	VQAERR_WRITE    = -5,	/* Write error */
+	VQAERR_SEEK     = -6,	/* Seek error */
+	VQAERR_NOTVQA   = -7,	/* Not a valid VQA file. */
+	VQAERR_NOMEM    = -8,	/* Unable to allocate memory */
+	VQAERR_NOBUFFER = -9,	/* No buffer avail for load/draw */
+	VQAERR_NOT_TIME = -10,	/* Not time for frame yet */
+	VQAERR_SLEEPING = -11,	/* Function is in a sleep state */
+	VQAERR_VIDEO    = -12,	/* Video related error. */
+	VQAERR_AUDIO    = -13,	/* Audio related error. */
+	VQAERR_PAUSED   = -14,	/* In paused state. */
+	VQAERR_NOTIMER  = -15,
+	VQAERR_NORATE   = -16,
+	VQAERR_NOCONFIG = -17,
+	VQAERR_NOAUDSIZ = -18,
+	VQAERR_AUDSYNC  = -19,
+	VQAERR_BADBLOCK = -20,
+	VQAERR_NOAHANDL = -21,
+	VQAERR_SKIPDRAW = -22,
+	VQAERR_SETLOOP  = -23,
+	VQAERR_SETBUFFR = -24,
+	VQAERR_FORCEDRW = -25
+};
 
 /* Event flags. */
 #define VQAEVENT_0			0
@@ -395,22 +399,22 @@ void VQA_Reset(VQAHandle *vqa);
 //VQAHandle *VQA_Alloc(void);
 //void VQA_Init(VQAHandle *, long (*)());
 /* File routines. */
-long VQA_Open(char const *, _VQAConfig *, VQAHandle **vqa);
+VQAErrorType VQA_Open(char const *, _VQAConfig *, VQAHandle **vqa);
 void VQA_Free(VQAHandle *vqa);
 void VQA_Close(VQAHandle *vqa);
 long VQA_Play(VQAHandle *vqa, long, int flags);
 long VQA_SeekFrame(VQAHandle *vqa, long framenum, long fromwhere);
 long VQA_SetStop(VQAHandle *vqa, long stop);
-long VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode);
-long VQA_SetLoop_Internal(VQAHandle *vqa, int start, int end, int iterations, int mode);
+VQAErrorType VQA_SetLoop(VQAHandle *vqa, int id, int iterations, int mode);
+VQAErrorType VQA_SetLoop_Internal(VQAHandle *vqa, int start, int end, int iterations, int mode);
 
-long VQA_SetUnVQ(VQAHandle *vqa, UNVQ_FUNC unvq1, UNVQ_FUNC unvq2);
+VQAErrorType VQA_SetUnVQ(VQAHandle *vqa, UNVQ_FUNC unvq1, UNVQ_FUNC unvq2);
 
-long VQA_Set_DrawBuffer(VQAHandle *vqa, unsigned char *buffer, unsigned long width, unsigned long height, long xpos, long ypos);
-long VQA_ResetLastFrameNum(VQAHandle *vqa);
+VQAErrorType VQA_Set_DrawBuffer(VQAHandle *vqa, unsigned char *buffer, unsigned long width, unsigned long height, long xpos, long ypos);
+VQAErrorType VQA_ResetLastFrameNum(VQAHandle *vqa);
 
 /* Information/statistics access routines. */
-long VQA_GetBlockInfo(VQAHandle *vqa, long & blockw, long & blockh, long & clrmode);
+VQAErrorType VQA_GetBlockInfo(VQAHandle *vqa, long & blockw, long & blockh, long & clrmode);
 
 #endif /* VQAPLAY_H */
 
diff --git a/code/vqalib/vqaplayp.h b/code/vqalib/vqaplayp.h
index cc66e5a9..5daafe96 100644
--- a/code/vqalib/vqaplayp.h
+++ b/code/vqalib/vqaplayp.h
@@ -446,8 +446,8 @@ typedef struct _VQAAudio {
 #define VQAABUFF_ALTLOOP	(1<<2)	// use alternative loop buffer
 
 // Draw_Frame and Page_Flip functions must be this type
-typedef long (*VQAD_FUNC)(VQAHandle *vqa);
-typedef long (*VQAP_FUNC)(VQAHandle *vqa);
+typedef VQAErrorType (*VQAD_FUNC)(VQAHandle *vqa);
+typedef VQAErrorType (*VQAP_FUNC)(VQAHandle *vqa);
 
 struct VQA_Array_Data {
 	void			**Ptr;
@@ -759,8 +759,8 @@ typedef struct _VQAHandleP {
  *-------------------------------------------------------------------------*/
 
 /* Loader/Drawer system. */
-long VQA_LoadFrame(VQAHandle *vqa);
-long VQA_Configure_Drawer(VQAHandleP *vqap);
+VQAErrorType VQA_LoadFrame(VQAHandle *vqa);
+VQAErrorType VQA_Configure_Drawer(VQAHandleP *vqap);
 long User_Update(VQAHandle *vqa);
 
 /* Timer system. */
@@ -771,7 +771,7 @@ unsigned long VQA_GetMovieTime(VQAHandle *vqa);
 
 /* Audio system. */
 #if(VQAAUDIO_ON)
-long VQA_OpenAudio(VQAHandleP *vqap);
+VQAErrorType VQA_OpenAudio(VQAHandleP *vqap);
 void VQA_CloseAudio(VQAHandleP *vqap);
 void VQA_StartAudio(VQAHandleP *vqap);
 void VQA_PauseAudio(VQAHandleP *vqap);
@@ -785,7 +785,7 @@ long __cdecl VQA_AudioDoneCallback(VQAHandleP *vqap, unsigned long);
 void VQA_InitMono(VQAHandleP *vqap);
 void VQA_UpdateMono(VQAHandleP *vqap);
 
-long AllocBuffers(VQAHandleP *vqap);
+VQAErrorType AllocBuffers(VQAHandleP *vqap);
 void FreeBuffers(VQAHandleP *vqap);
 
 #endif /* VQAPLAYP_H */