From 31483d7ded92410fd25da564a4c462dd48908c62 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 5 Feb 2017 17:50:18 +0100 Subject: [PATCH] Remove all directx stuff --- blupi.cpp | 3 - button.cpp | 1 - decor.cpp | 1 - event.cpp | 1 - jauge.cpp | 1 - menu.cpp | 1 - misc.cpp | 166 -------------------------------------------- misc.h | 4 -- planetblupi.vcxproj | 8 +-- text.cpp | 1 - 10 files changed, 4 insertions(+), 183 deletions(-) diff --git a/blupi.cpp b/blupi.cpp index 613ff8e..1aac841 100644 --- a/blupi.cpp +++ b/blupi.cpp @@ -7,11 +7,8 @@ #define SDL_MAIN_HANDLED #include -#include #include #include -#include -#include // link WINMM.LIB as well #include "def.h" #include "resource.h" #include "pixmap.h" diff --git a/button.cpp b/button.cpp index cfda18f..8594a79 100644 --- a/button.cpp +++ b/button.cpp @@ -3,7 +3,6 @@ #include #include -#include #include "def.h" #include "pixmap.h" #include "sound.h" diff --git a/decor.cpp b/decor.cpp index 9d97771..b005798 100644 --- a/decor.cpp +++ b/decor.cpp @@ -3,7 +3,6 @@ #include #include -#include #include "def.h" #include "resource.h" #include "pixmap.h" diff --git a/event.cpp b/event.cpp index 7de7c61..1b4e85e 100644 --- a/event.cpp +++ b/event.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include "blupi.h" #include "def.h" #include "resource.h" diff --git a/jauge.cpp b/jauge.cpp index a919cf2..c28e462 100644 --- a/jauge.cpp +++ b/jauge.cpp @@ -3,7 +3,6 @@ #include #include -#include #include "def.h" #include "pixmap.h" #include "sound.h" diff --git a/menu.cpp b/menu.cpp index dd107df..a68a232 100644 --- a/menu.cpp +++ b/menu.cpp @@ -3,7 +3,6 @@ #include #include -#include #include "blupi.h" #include "def.h" #include "resource.h" diff --git a/misc.cpp b/misc.cpp index e78c0e3..5834ee0 100644 --- a/misc.cpp +++ b/misc.cpp @@ -2,8 +2,6 @@ // #include -#include -#include #include #include #include "def.h" @@ -148,167 +146,3 @@ void AddUserPath(char *pFilename) strcpy(pFilename, temp); } - - - -//---------------------------------------------------------------------- -// -// Function : TraceErrorDD() -// -// Purpose : Traces an error (DirectDraw) -// -//---------------------------------------------------------------------- - -void TraceErrorDD(HRESULT hErr, char *sFile, int nLine) -{ - char dderr[256]; - char err[1024]; - - switch (hErr) - { - case DD_OK : sprintf(dderr, "DD_OK"); break; - case DDERR_ALREADYINITIALIZED : sprintf(dderr, "DDERR_ALREADYINITIALIZED"); break; - case DDERR_CANNOTATTACHSURFACE : sprintf(dderr, "DDERR_CANNOTATTACHSURFACE"); break; - case DDERR_CANNOTDETACHSURFACE : sprintf(dderr, "DDERR_CANNOTDETACHSURFACE"); break; - case DDERR_CURRENTLYNOTAVAIL : sprintf(dderr, "DDERR_CURRENTLYNOTAVAIL"); break; - case DDERR_EXCEPTION : sprintf(dderr, "DDERR_EXCEPTION"); break; - case DDERR_GENERIC : sprintf(dderr, "DDERR_GENERIC"); break; - case DDERR_HEIGHTALIGN : sprintf(dderr, "DDERR_HEIGHTALIGN"); break; - case DDERR_INCOMPATIBLEPRIMARY : sprintf(dderr, "DDERR_INCOMPATIBLEPRIMARY"); break; - case DDERR_INVALIDCAPS : sprintf(dderr, "DDERR_INVALIDCAPS"); break; - case DDERR_INVALIDCLIPLIST : sprintf(dderr, "DDERR_INVALIDCLIPLIST"); break; - case DDERR_INVALIDMODE : sprintf(dderr, "DDERR_INVALIDMODE"); break; - case DDERR_INVALIDOBJECT : sprintf(dderr, "DDERR_INVALIDOBJECT"); break; - case DDERR_INVALIDPARAMS : sprintf(dderr, "DDERR_INVALIDPARAMS"); break; - case DDERR_INVALIDPIXELFORMAT : sprintf(dderr, "DDERR_INVALIDPIXELFORMAT"); break; - case DDERR_INVALIDRECT : sprintf(dderr, "DDERR_INVALIDRECT"); break; - case DDERR_LOCKEDSURFACES : sprintf(dderr, "DDERR_LOCKEDSURFACES"); break; - case DDERR_NO3D : sprintf(dderr, "DDERR_NO3D"); break; - case DDERR_NOALPHAHW : sprintf(dderr, "DDERR_NOALPHAHW"); break; - case DDERR_NOCLIPLIST : sprintf(dderr, "DDERR_NOCLIPLIST"); break; - case DDERR_NOCOLORCONVHW : sprintf(dderr, "DDERR_NOCOLORCONVHW"); break; - case DDERR_NOCOOPERATIVELEVELSET : sprintf(dderr, "DDERR_NOCOOPERATIVELEVELSET"); break; - case DDERR_NOCOLORKEY : sprintf(dderr, "DDERR_NOCOLORKEY"); break; - case DDERR_NOCOLORKEYHW : sprintf(dderr, "DDERR_NOCOLORKEYHW"); break; - case DDERR_NODIRECTDRAWSUPPORT : sprintf(dderr, "DDERR_NODIRECTDRAWSUPPORT"); break; - case DDERR_NOEXCLUSIVEMODE : sprintf(dderr, "DDERR_NOEXCLUSIVEMODE"); break; - case DDERR_NOFLIPHW : sprintf(dderr, "DDERR_NOFLIPHW"); break; - case DDERR_NOGDI : sprintf(dderr, "DDERR_NOGDI"); break; - case DDERR_NOMIRRORHW : sprintf(dderr, "DDERR_NOMIRRORHW"); break; - case DDERR_NOTFOUND : sprintf(dderr, "DDERR_NOTFOUND"); break; - case DDERR_NOOVERLAYHW : sprintf(dderr, "DDERR_NOOVERLAYHW"); break; - case DDERR_NORASTEROPHW : sprintf(dderr, "DDERR_NORASTEROPHW"); break; - case DDERR_NOROTATIONHW : sprintf(dderr, "DDERR_NOROTATIONHW"); break; - case DDERR_NOSTRETCHHW : sprintf(dderr, "DDERR_NOSTRETCHHW"); break; - case DDERR_NOT4BITCOLOR : sprintf(dderr, "DDERR_NOT4BITCOLOR"); break; - case DDERR_NOT4BITCOLORINDEX : sprintf(dderr, "DDERR_NOT4BITCOLORINDEX"); break; - case DDERR_NOT8BITCOLOR : sprintf(dderr, "DDERR_NOT8BITCOLOR"); break; - case DDERR_NOTEXTUREHW : sprintf(dderr, "DDERR_NOTEXTUREHW"); break; - case DDERR_NOVSYNCHW : sprintf(dderr, "DDERR_NOVSYNCHW"); break; - case DDERR_NOZBUFFERHW : sprintf(dderr, "DDERR_NOZBUFFERHW"); break; - case DDERR_NOZOVERLAYHW : sprintf(dderr, "DDERR_NOZOVERLAYHW"); break; - case DDERR_OUTOFCAPS : sprintf(dderr, "DDERR_OUTOFCAPS"); break; - case DDERR_OUTOFMEMORY : sprintf(dderr, "DDERR_OUTOFMEMORY"); break; - case DDERR_OUTOFVIDEOMEMORY : sprintf(dderr, "DDERR_OUTOFVIDEOMEMORY"); break; - case DDERR_OVERLAYCANTCLIP : sprintf(dderr, "DDERR_OVERLAYCANTCLIP"); break; - case DDERR_OVERLAYCOLORKEYONLYONEACTIVE : sprintf(dderr, "DDERR_OVERLAYCOLORKEYONLYONEACTIVE"); break; - case DDERR_PALETTEBUSY : sprintf(dderr, "DDERR_PALETTEBUSY"); break; - case DDERR_COLORKEYNOTSET : sprintf(dderr, "DDERR_COLORKEYNOTSET"); break; - case DDERR_SURFACEALREADYATTACHED : sprintf(dderr, "DDERR_SURFACEALREADYATTACHED"); break; - case DDERR_SURFACEALREADYDEPENDENT : sprintf(dderr, "DDERR_SURFACEALREADYDEPENDENT"); break; - case DDERR_SURFACEBUSY : sprintf(dderr, "DDERR_SURFACEBUSY"); break; - case DDERR_CANTLOCKSURFACE : sprintf(dderr, "DDERR_CANTLOCKSURFACE"); break; - case DDERR_SURFACEISOBSCURED : sprintf(dderr, "DDERR_SURFACEISOBSCURED"); break; - case DDERR_SURFACELOST : sprintf(dderr, "DDERR_SURFACELOST"); break; - case DDERR_SURFACENOTATTACHED : sprintf(dderr, "DDERR_SURFACENOTATTACHED"); break; - case DDERR_TOOBIGHEIGHT : sprintf(dderr, "DDERR_TOOBIGHEIGHT"); break; - case DDERR_TOOBIGSIZE : sprintf(dderr, "DDERR_TOOBIGSIZE"); break; - case DDERR_TOOBIGWIDTH : sprintf(dderr, "DDERR_TOOBIGWIDTH"); break; - case DDERR_UNSUPPORTED : sprintf(dderr, "DDERR_UNSUPPORTED"); break; - case DDERR_UNSUPPORTEDFORMAT : sprintf(dderr, "DDERR_UNSUPPORTEDFORMAT"); break; - case DDERR_UNSUPPORTEDMASK : sprintf(dderr, "DDERR_UNSUPPORTEDMASK"); break; - case DDERR_VERTICALBLANKINPROGRESS : sprintf(dderr, "DDERR_VERTICALBLANKINPROGRESS"); break; - case DDERR_WASSTILLDRAWING : sprintf(dderr, "DDERR_WASSTILLDRAWING"); break; - case DDERR_XALIGN : sprintf(dderr, "DDERR_XALIGN"); break; - case DDERR_INVALIDDIRECTDRAWGUID : sprintf(dderr, "DDERR_INVALIDDIRECTDRAWGUID"); break; - case DDERR_DIRECTDRAWALREADYCREATED : sprintf(dderr, "DDERR_DIRECTDRAWALREADYCREATED"); break; - case DDERR_NODIRECTDRAWHW : sprintf(dderr, "DDERR_NODIRECTDRAWHW"); break; - case DDERR_PRIMARYSURFACEALREADYEXISTS : sprintf(dderr, "DDERR_PRIMARYSURFACEALREADYEXISTS"); break; - case DDERR_NOEMULATION : sprintf(dderr, "DDERR_NOEMULATION"); break; - case DDERR_REGIONTOOSMALL : sprintf(dderr, "DDERR_REGIONTOOSMALL"); break; - case DDERR_CLIPPERISUSINGHWND : sprintf(dderr, "DDERR_CLIPPERISUSINGHWND"); break; - case DDERR_NOCLIPPERATTACHED : sprintf(dderr, "DDERR_NOCLIPPERATTACHED"); break; - case DDERR_NOHWND : sprintf(dderr, "DDERR_NOHWND"); break; - case DDERR_HWNDSUBCLASSED : sprintf(dderr, "DDERR_HWNDSUBCLASSED"); break; - case DDERR_HWNDALREADYSET : sprintf(dderr, "DDERR_HWNDALREADYSET"); break; - case DDERR_NOPALETTEATTACHED : sprintf(dderr, "DDERR_NOPALETTEATTACHED"); break; - case DDERR_NOPALETTEHW : sprintf(dderr, "DDERR_NOPALETTEHW"); break; - case DDERR_BLTFASTCANTCLIP : sprintf(dderr, "DDERR_BLTFASTCANTCLIP"); break; - case DDERR_NOBLTHW : sprintf(dderr, "DDERR_NOBLTHW"); break; - case DDERR_NODDROPSHW : sprintf(dderr, "DDERR_NODDROPSHW"); break; - case DDERR_OVERLAYNOTVISIBLE : sprintf(dderr, "DDERR_OVERLAYNOTVISIBLE"); break; - case DDERR_NOOVERLAYDEST : sprintf(dderr, "DDERR_NOOVERLAYDEST"); break; - case DDERR_INVALIDPOSITION : sprintf(dderr, "DDERR_INVALIDPOSITION"); break; - case DDERR_NOTAOVERLAYSURFACE : sprintf(dderr, "DDERR_NOTAOVERLAYSURFACE"); break; - case DDERR_EXCLUSIVEMODEALREADYSET : sprintf(dderr, "DDERR_EXCLUSIVEMODEALREADYSET"); break; - case DDERR_NOTFLIPPABLE : sprintf(dderr, "DDERR_NOTFLIPPABLE"); break; - case DDERR_CANTDUPLICATE : sprintf(dderr, "DDERR_CANTDUPLICATE"); break; - case DDERR_NOTLOCKED : sprintf(dderr, "DDERR_NOTLOCKED"); break; - case DDERR_CANTCREATEDC : sprintf(dderr, "DDERR_CANTCREATEDC"); break; - case DDERR_NODC : sprintf(dderr, "DDERR_NODC"); break; - case DDERR_WRONGMODE : sprintf(dderr, "DDERR_WRONGMODE"); break; - case DDERR_IMPLICITLYCREATED : sprintf(dderr, "DDERR_IMPLICITLYCREATED"); break; - case DDERR_NOTPALETTIZED : sprintf(dderr, "DDERR_NOTPALETTIZED"); break; - case DDERR_UNSUPPORTEDMODE : sprintf(dderr, "DDERR_UNSUPPORTEDMODE"); break; - case DDERR_NOMIPMAPHW : sprintf(dderr, "DDERR_NOMIPMAPHW"); break; - case DDERR_INVALIDSURFACETYPE : sprintf(dderr, "DDERR_INVALIDSURFACETYPE"); break; - case DDERR_DCALREADYCREATED : sprintf(dderr, "DDERR_DCALREADYCREATED"); break; - case DDERR_CANTPAGELOCK : sprintf(dderr, "DDERR_CANTPAGELOCK"); break; - case DDERR_CANTPAGEUNLOCK : sprintf(dderr, "DDERR_CANTPAGEUNLOCK"); break; - case DDERR_NOTPAGELOCKED : sprintf(dderr, "DDERR_NOTPAGELOCKED"); break; - case DDERR_NOTINITIALIZED : sprintf(dderr, "DDERR_NOTINITIALIZED"); break; - - default : sprintf(dderr, "Unknown Error"); break; - } - sprintf(err, "DirectDraw Error %s in file %s at line %d\n", dderr, sFile, nLine); - OutputDebug(err); -} - -//---------------------------------------------------------------------- -// -// Function : TraceErrorDS() -// -// Purpose : Traces an error (DirectSound) -// -//---------------------------------------------------------------------- - -void TraceErrorDS(HRESULT hErr, char *sFile, int nLine) -{ - char dserr[256]; - char err[1024]; - - switch (hErr) - { - case DS_OK : sprintf(dserr, "DD_OK"); break; - case DSERR_ALLOCATED : sprintf(dserr, "DSERR_ALLOCATED"); break; - case DSERR_CONTROLUNAVAIL : sprintf(dserr, "DSERR_CONTROLUNAVAIL"); break; - case DSERR_INVALIDPARAM : sprintf(dserr, "DSERR_INVALIDPARAM"); break; - case DSERR_INVALIDCALL : sprintf(dserr, "DSERR_INVALIDCALL"); break; - case DSERR_GENERIC : sprintf(dserr, "DSERR_GENERIC"); break; - case DSERR_PRIOLEVELNEEDED : sprintf(dserr, "DSERR_PRIOLEVELNEEDED"); break; - case DSERR_OUTOFMEMORY : sprintf(dserr, "DSERR_OUTOFMEMORY"); break; - case DSERR_BADFORMAT : sprintf(dserr, "DSERR_BADFORMAT"); break; - case DSERR_UNSUPPORTED : sprintf(dserr, "DSERR_UNSUPPORTED"); break; - case DSERR_NODRIVER : sprintf(dserr, "DSERR_NODRIVER"); break; - case DSERR_ALREADYINITIALIZED : sprintf(dserr, "DSERR_ALREADYINITIALIZED"); break; - case DSERR_NOAGGREGATION : sprintf(dserr, "DSERR_NOAGGREGATION"); break; - case DSERR_BUFFERLOST : sprintf(dserr, "DSERR_BUFFERLOST"); break; - case DSERR_OTHERAPPHASPRIO : sprintf(dserr, "DSERR_OTHERAPPHASPRIO"); break; - case DSERR_UNINITIALIZED : sprintf(dserr, "DSERR_UNINITIALIZED"); break; - - default : sprintf(dserr, "Unknown Error"); break; - } - sprintf(err, "DirectSound Error %s in file %s at line %d\n", dserr, sFile, nLine); - OutputDebug(err); -} - diff --git a/misc.h b/misc.h index 4706167..fe0ec83 100644 --- a/misc.h +++ b/misc.h @@ -16,7 +16,3 @@ extern int Random(int min, int max); extern void GetCurrentDir(char *pName, size_t lg); extern void AddUserPath(char *pFilename); - -extern void TraceErrorDD(HRESULT hErr, char *sFile, int nLine); -extern void TraceErrorDS(HRESULT hErr, char *sFile, int nLine); - diff --git a/planetblupi.vcxproj b/planetblupi.vcxproj index d1cab19..b3ac5e8 100644 --- a/planetblupi.vcxproj +++ b/planetblupi.vcxproj @@ -104,7 +104,7 @@ Windows true - winmm.lib;ddraw.lib;dsound.lib;SDL2_mixer.lib;%(AdditionalDependencies) + SDL2_mixer.lib;%(AdditionalDependencies) false @@ -127,7 +127,7 @@ xcopy /Y ffmpeg-3.2.2-win32-shared\bin\*.dll $(SolutionDir)\$(Configuration)\ Windows true - winmm.lib;ddraw.lib;dsound.lib;SDL2_mixer.lib;%(AdditionalDependencies) + SDL2_mixer.lib;%(AdditionalDependencies) false @@ -152,7 +152,7 @@ xcopy /Y ffmpeg-3.2.2-win32-shared\bin\*.dll $(SolutionDir)\$(Configuration)\true true true - winmm.lib;ddraw.lib;dsound.lib;SDL2_mixer.lib;%(AdditionalDependencies) + SDL2_mixer.lib;%(AdditionalDependencies) false @@ -178,7 +178,7 @@ xcopy /Y ffmpeg-3.2.2-win32-shared\bin\*.dll $(SolutionDir)\$(Configuration)\true true true - winmm.lib;ddraw.lib;dsound.lib;SDL2_mixer.lib;%(AdditionalDependencies) + SDL2_mixer.lib;%(AdditionalDependencies) false diff --git a/text.cpp b/text.cpp index fe936a8..0ce7aa6 100644 --- a/text.cpp +++ b/text.cpp @@ -2,7 +2,6 @@ #include #include -#include #include "def.h" #include "pixmap.h" #include "text.h"