diff --git a/SourceS/miniwin.h b/SourceS/miniwin.h index 39d5f2d6e..9ed020788 100644 --- a/SourceS/miniwin.h +++ b/SourceS/miniwin.h @@ -18,13 +18,6 @@ #include #endif -// Constants -#define CONST const -#define TRUE true -#define FALSE false - -#define NO_ERROR 0 - #ifndef _WIN32 #define __int8 char #define __int16 short @@ -39,7 +32,7 @@ #include "miniwin_rand.h" #ifdef DEVILUTION_ENGINE -#include "miniwin_macro.h" +#include "miniwin_misc_macro.h" //#include "miniwin_com_macro.h" #include "miniwin_ddraw_macro.h" #endif diff --git a/SourceS/miniwin_misc.h b/SourceS/miniwin_misc.h index f819af47f..7a7c93e05 100644 --- a/SourceS/miniwin_misc.h +++ b/SourceS/miniwin_misc.h @@ -264,8 +264,8 @@ SHORT WINAPI GetAsyncKeyState(int vKey); WINBOOL WINAPI PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg); -WINBOOL WINAPI TranslateMessage(CONST MSG *lpMsg); -LRESULT WINAPI DispatchMessageA(CONST MSG *lpMsg); +WINBOOL WINAPI TranslateMessage(const MSG *lpMsg); +LRESULT WINAPI DispatchMessageA(const MSG *lpMsg); WINBOOL WINAPI PostMessageA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); WINBOOL WINAPI DestroyWindow(HWND hWnd); @@ -689,91 +689,87 @@ static constexpr auto DVL_PM_REMOVE = 0x0001; static constexpr auto DVL_WM_QUIT = 0x0012; static constexpr auto DVL_INFINITE = 0xFFFFFFFF; -/// Change to constexpr later // // Events // -#define WM_MOUSEFIRST 0x0200 -#define WM_MOUSEMOVE 0x0200 -#define WM_LBUTTONDOWN 0x0201 -#define WM_LBUTTONUP 0x0202 -#define WM_RBUTTONDOWN 0x0204 -#define WM_RBUTTONUP 0x0205 - -#define WM_KEYFIRST 0x0100 -#define WM_KEYDOWN 0x0100 -#define WM_KEYUP 0x0101 -#define WM_SYSKEYDOWN 0x0104 - -#define WM_INITDIALOG 0x0110 -#define WM_COMMAND 0x0111 -#define WM_SYSCOMMAND 0x0112 - -#define WM_CHAR 0x0102 -#define WM_CAPTURECHANGED 0x0215 - -#define WM_CREATE 0x0001 -#define WM_DESTROY DVL_WM_DESTROY -#define WM_PAINT 0x000F -#define WM_CLOSE 0x0010 -#define WM_QUERYENDSESSION 0x0011 -#define WM_ERASEBKGND 0x0014 -#define WM_ACTIVATEAPP DVL_WM_ACTIVATEAPP -#define WM_QUERYNEWPALETTE 0x030F -#define WM_PALETTECHANGED 0x0311 - -#define SC_CLOSE 0xF060 - -#define VK_RETURN 0x0D -#define VK_BACK 0x08 -#define VK_SHIFT 0x10 -#define VK_ESCAPE 0x1B -#define VK_SPACE 0x20 -#define VK_LEFT 0x25 -#define VK_UP 0x26 -#define VK_RIGHT 0x27 -#define VK_DOWN 0x28 - -#define VK_F1 0x70 -#define VK_F2 0x71 -#define VK_F3 0x72 -#define VK_F4 0x73 -#define VK_F5 0x74 -#define VK_F6 0x75 -#define VK_F7 0x76 -#define VK_F8 0x77 -#define VK_F9 0x78 -#define VK_F10 0x79 -#define VK_F11 0x7A -#define VK_F12 0x7B - -#define VK_TAB 0x09 -#define VK_PAUSE 0x13 -#define VK_PRIOR 0x21 -#define VK_NEXT 0x22 -#define VK_SNAPSHOT 0x2C - -#define VK_OEM_1 0xBA -#define VK_OEM_PLUS 0xBB -#define VK_OEM_COMMA 0xBC -#define VK_OEM_MINUS 0xBD -#define VK_OEM_PERIOD 0xBE -#define VK_OEM_2 0xBF -#define VK_OEM_3 0xC0 -#define VK_OEM_4 0xDB -#define VK_OEM_5 0xDC -#define VK_OEM_6 0xDD -#define VK_OEM_7 0xDE -//#define VK_OEM_8 0xDF -//#define VK_OEM_102 0xE2 - -#define MK_SHIFT 0x0004 -#define MK_LBUTTON 0x0001 -#define MK_RBUTTON 0x0002 - -#define MB_TASKMODAL 0x00002000L -#define MB_ICONHAND 0x00000010L -#define MB_ICONEXCLAMATION 0x00000030L - +static constexpr auto DVL_WM_MOUSEFIRST = 0x0200; +static constexpr auto DVL_WM_MOUSEMOVE = 0x0200; +static constexpr auto DVL_WM_LBUTTONDOWN = 0x0201; +static constexpr auto DVL_WM_LBUTTONUP = 0x0202; +static constexpr auto DVL_WM_RBUTTONDOWN = 0x0204; +static constexpr auto DVL_WM_RBUTTONUP = 0x0205; + +static constexpr auto DVL_WM_KEYFIRST = 0x0100; +static constexpr auto DVL_WM_KEYDOWN = 0x0100; +static constexpr auto DVL_WM_KEYUP = 0x0101; +static constexpr auto DVL_WM_SYSKEYDOWN = 0x0104; + +static constexpr auto DVL_WM_INITDIALOG = 0x0110; +static constexpr auto DVL_WM_COMMAND = 0x0111; +static constexpr auto DVL_WM_SYSCOMMAND = 0x0112; + +static constexpr auto DVL_WM_CHAR = 0x0102; +static constexpr auto DVL_WM_CAPTURECHANGED = 0x0215; + +static constexpr auto DVL_WM_CREATE = 0x0001; +static constexpr auto DVL_WM_PAINT = 0x000F; +static constexpr auto DVL_WM_CLOSE = 0x0010; +static constexpr auto DVL_WM_QUERYENDSESSION = 0x0011; +static constexpr auto DVL_WM_ERASEBKGND = 0x0014; +static constexpr auto DVL_WM_QUERYNEWPALETTE = 0x030F; +static constexpr auto DVL_WM_PALETTECHANGED = 0x0311; + +static constexpr auto DVL_SC_CLOSE = 0xF060; + +static constexpr auto DVL_VK_RETURN = 0x0D; +static constexpr auto DVL_VK_BACK = 0x08; +static constexpr auto DVL_VK_SHIFT = 0x10; +static constexpr auto DVL_VK_ESCAPE = 0x1B; +static constexpr auto DVL_VK_SPACE = 0x20; +static constexpr auto DVL_VK_LEFT = 0x25; +static constexpr auto DVL_VK_UP = 0x26; +static constexpr auto DVL_VK_RIGHT = 0x27; +static constexpr auto DVL_VK_DOWN = 0x28; + +static constexpr auto DVL_VK_F1 = 0x70; +static constexpr auto DVL_VK_F2 = 0x71; +static constexpr auto DVL_VK_F3 = 0x72; +static constexpr auto DVL_VK_F4 = 0x73; +static constexpr auto DVL_VK_F5 = 0x74; +static constexpr auto DVL_VK_F6 = 0x75; +static constexpr auto DVL_VK_F7 = 0x76; +static constexpr auto DVL_VK_F8 = 0x77; +static constexpr auto DVL_VK_F9 = 0x78; +static constexpr auto DVL_VK_F10 = 0x79; +static constexpr auto DVL_VK_F11 = 0x7A; +static constexpr auto DVL_VK_F12 = 0x7B; + +static constexpr auto DVL_VK_TAB = 0x09; +static constexpr auto DVL_VK_PAUSE = 0x13; +static constexpr auto DVL_VK_PRIOR = 0x21; +static constexpr auto DVL_VK_NEXT = 0x22; +static constexpr auto DVL_VK_SNAPSHOT = 0x2C; + +static constexpr auto DVL_VK_OEM_1 = 0xBA; +static constexpr auto DVL_VK_OEM_PLUS = 0xBB; +static constexpr auto DVL_VK_OEM_COMMA = 0xBC; +static constexpr auto DVL_VK_OEM_MINUS = 0xBD; +static constexpr auto DVL_VK_OEM_PERIOD = 0xBE; +static constexpr auto DVL_VK_OEM_2 = 0xBF; +static constexpr auto DVL_VK_OEM_3 = 0xC0; +static constexpr auto DVL_VK_OEM_4 = 0xDB; +static constexpr auto DVL_VK_OEM_5 = 0xDC; +static constexpr auto DVL_VK_OEM_6 = 0xDD; +static constexpr auto DVL_VK_OEM_7 = 0xDE; +//static constexpr auto DVL_VK_OEM_8 = 0xDF; +//static constexpr auto DVL_VK_OEM_102 = 0xE2; + +static constexpr auto DVL_MK_SHIFT = 0x0004; +static constexpr auto DVL_MK_LBUTTON = 0x0001; +static constexpr auto DVL_MK_RBUTTON = 0x0002; + +static constexpr auto DVL_MB_TASKMODAL = 0x00002000L; +static constexpr auto DVL_MB_ICONHAND = 0x00000010L; +static constexpr auto DVL_MB_ICONEXCLAMATION = 0x00000030L; } diff --git a/SourceS/miniwin_macro.h b/SourceS/miniwin_misc_macro.h similarity index 77% rename from SourceS/miniwin_macro.h rename to SourceS/miniwin_misc_macro.h index 94a1f0a01..1e499945c 100644 --- a/SourceS/miniwin_macro.h +++ b/SourceS/miniwin_misc_macro.h @@ -1,5 +1,8 @@ #pragma once +#define TRUE true +#define FALSE false + #define INVALID_HANDLE_VALUE ((HANDLE)-1) #define INVALID_HANDLE ((HANDLE)-1) #define HFILE_ERROR DVL_HFILE_ERROR @@ -239,3 +242,88 @@ #define _finddata_t DVL_finddata_t #define _beginthreadex DVL_beginthreadex + +// +// Events +// +#define WM_MOUSEFIRST DVL_WM_MOUSEFIRST +#define WM_MOUSEMOVE DVL_WM_MOUSEMOVE +#define WM_LBUTTONDOWN DVL_WM_LBUTTONDOWN +#define WM_LBUTTONUP DVL_WM_LBUTTONUP +#define WM_RBUTTONDOWN DVL_WM_RBUTTONDOWN +#define WM_RBUTTONUP DVL_WM_RBUTTONUP + +#define WM_KEYFIRST DVL_WM_KEYFIRST +#define WM_KEYDOWN DVL_WM_KEYDOWN +#define WM_KEYUP DVL_WM_KEYUP +#define WM_SYSKEYDOWN DVL_WM_SYSKEYDOWN + +#define WM_INITDIALOG DVL_WM_INITDIALOG +#define WM_COMMAND DVL_WM_COMMAND +#define WM_SYSCOMMAND DVL_WM_SYSCOMMAND + +#define WM_CHAR DVL_WM_CHAR +#define WM_CAPTURECHANGED DVL_WM_CAPTURECHANGED + +#define WM_CREATE DVL_WM_CREATE +#define WM_DESTROY DVL_WM_DESTROY +#define WM_PAINT DVL_WM_PAINT +#define WM_CLOSE DVL_WM_CLOSE +#define WM_QUERYENDSESSION DVL_WM_QUERYENDSESSION +#define WM_ERASEBKGND DVL_WM_ERASEBKGND +#define WM_ACTIVATEAPP DVL_WM_ACTIVATEAPP +#define WM_QUERYNEWPALETTE DVL_WM_QUERYNEWPALETTE +#define WM_PALETTECHANGED DVL_WM_PALETTECHANGED + +#define SC_CLOSE DVL_SC_CLOSE + +#define VK_RETURN DVL_VK_RETURN +#define VK_BACK DVL_VK_BACK +#define VK_SHIFT DVL_VK_SHIFT +#define VK_ESCAPE DVL_VK_ESCAPE +#define VK_SPACE DVL_VK_SPACE +#define VK_LEFT DVL_VK_LEFT +#define VK_UP DVL_VK_UP +#define VK_RIGHT DVL_VK_RIGHT +#define VK_DOWN DVL_VK_DOWN + +#define VK_F1 DVL_VK_F1 +#define VK_F2 DVL_VK_F2 +#define VK_F3 DVL_VK_F3 +#define VK_F4 DVL_VK_F4 +#define VK_F5 DVL_VK_F5 +#define VK_F6 DVL_VK_F6 +#define VK_F7 DVL_VK_F7 +#define VK_F8 DVL_VK_F8 +#define VK_F9 DVL_VK_F9 +#define VK_F10 DVL_VK_F10 +#define VK_F11 DVL_VK_F11 +#define VK_F12 DVL_VK_F12 + +#define VK_TAB DVL_VK_TAB +#define VK_PAUSE DVL_VK_PAUSE +#define VK_PRIOR DVL_VK_PRIOR +#define VK_NEXT DVL_VK_NEXT +#define VK_SNAPSHOT DVL_VK_SNAPSHOT + +#define VK_OEM_1 DVL_VK_OEM_1 +#define VK_OEM_PLUS DVL_VK_OEM_PLUS +#define VK_OEM_COMMA DVL_VK_OEM_COMMA +#define VK_OEM_MINUS DVL_VK_OEM_MINUS +#define VK_OEM_PERIOD DVL_VK_OEM_PERIOD +#define VK_OEM_2 DVL_VK_OEM_2 +#define VK_OEM_3 DVL_VK_OEM_3 +#define VK_OEM_4 DVL_VK_OEM_4 +#define VK_OEM_5 DVL_VK_OEM_5 +#define VK_OEM_6 DVL_VK_OEM_6 +#define VK_OEM_7 DVL_VK_OEM_7 +//#define VK_OEM_8 DVL_VK_OEM_8 +//#define VK_OEM_102 DVL_VK_OEM_102 + +#define MK_SHIFT DVL_MK_SHIFT +#define MK_LBUTTON DVL_MK_LBUTTON +#define MK_RBUTTON DVL_MK_RBUTTON + +#define MB_TASKMODAL DVL_MB_TASKMODAL +#define MB_ICONHAND DVL_MB_ICONHAND +#define MB_ICONEXCLAMATION DVL_MB_ICONEXCLAMATION diff --git a/SourceX/DiabloUI/credits.cpp b/SourceX/DiabloUI/credits.cpp index 1dd681b44..889d54212 100644 --- a/SourceX/DiabloUI/credits.cpp +++ b/SourceX/DiabloUI/credits.cpp @@ -557,7 +557,7 @@ BOOL UiCreditsDialog(int a1) credts_Free(); - return TRUE; + return true; } } diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp index f41c0b810..0ce4fa74a 100644 --- a/SourceX/DiabloUI/diabloui.cpp +++ b/SourceX/DiabloUI/diabloui.cpp @@ -107,19 +107,19 @@ int DialogBoxParam(HINSTANCE hInstance, LPCSTR msgId, HWND hWndParent, DLGPROC l BOOL SetDlgItemText(HWND hDlg, int nIDDlgItem, LPCSTR lpString) { - return FALSE; + return false; } BOOL EndDialog(HWND hDlg, INT_PTR nResult) { - return FALSE; + return false; } BOOL SetWindowPos(HWND hWnd, HWND hWndInsertAfter, int X, int Y, int cx, int cy, UINT uFlags) { SDL_SetWindowPosition(window, X, Y); - return TRUE; + return true; } void UiDestroy() @@ -370,14 +370,14 @@ void InitFont() return; } - TTF_SetFontKerning(font, FALSE); + TTF_SetFontKerning(font, false); TTF_SetFontHinting(font, TTF_HINTING_MONO); } void UiInitialize() { LoadUiGFX(); - ShowCursor(FALSE); + ShowCursor(false); InitFont(); } @@ -425,16 +425,16 @@ void UiAppActivate(BOOL bActive) BOOL UiValidPlayerName(char *name) { if (!strlen(name)) - return FALSE; + return false; if (strpbrk(name, ",<>%&\\\"?*#/:") || strpbrk(name, " ")) - return FALSE; + return false; for (char *letter = name; *letter; letter++) if (*letter < 0x20 || *letter > 0x7E && *letter < 0xC0) - return FALSE; + return false; - return TRUE; + return true; } void UiProfileCallback() @@ -509,7 +509,7 @@ BOOL UiCreatePlayerDescription(_uiheroinfo *info, DWORD mode, char *desc) info->gold, info->spawned); - return TRUE; + return true; } void DrawArt(int screenX, int screenY, Art *art, int nFrame, int drawW) diff --git a/SourceX/DiabloUI/mainmenu.cpp b/SourceX/DiabloUI/mainmenu.cpp index 75f462d19..3e5e78f5d 100644 --- a/SourceX/DiabloUI/mainmenu.cpp +++ b/SourceX/DiabloUI/mainmenu.cpp @@ -56,7 +56,7 @@ BOOL UiMainMenuDialog(char *name, int *pdwResult, void(*fnSound)(char *file), in mainmenu_Free(); *pdwResult = MainMenuResult; - return TRUE; + return true; } } diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp index 99525ba9a..5219893e3 100644 --- a/SourceX/DiabloUI/selhero.cpp +++ b/SourceX/DiabloUI/selhero.cpp @@ -217,7 +217,7 @@ BOOL SelHero_GetHeroInfo(_uiheroinfo *pInfo) heros[selhero_SaveCount] = *pInfo; selhero_SaveCount++; - return TRUE; + return true; } BOOL UiSelHeroDialog( @@ -252,7 +252,7 @@ BOOL UiSelHeroDialog( strcpy(name, heroInfo.name); *dlgresult = selhero_result; - return TRUE; + return true; } BOOL UiSelHeroSingDialog( diff --git a/SourceX/DiabloUI/title.cpp b/SourceX/DiabloUI/title.cpp index 64857e662..1308e66ee 100644 --- a/SourceX/DiabloUI/title.cpp +++ b/SourceX/DiabloUI/title.cpp @@ -55,7 +55,7 @@ BOOL UiTitleDialog(int a1) title_Free(); - return TRUE; + return true; } } diff --git a/SourceX/dx.cpp b/SourceX/dx.cpp index 8ce26cc3d..e48af58a4 100644 --- a/SourceX/dx.cpp +++ b/SourceX/dx.cpp @@ -406,7 +406,7 @@ void dx_init(HWND hWnd) return; } - MainWndProc(NULL, DVL_WM_ACTIVATEAPP, TRUE, NULL); + MainWndProc(NULL, DVL_WM_ACTIVATEAPP, true, NULL); lpDDInterface = &stub_draw; lpDDSPrimary = &stub_surface; @@ -492,7 +492,7 @@ BOOL SDrawUpdatePalette(unsigned int firstentry, unsigned int numentries, PALETT assert(palette); if (SDL_SetPaletteColors(palette, colors, firstentry, numentries) != 0) { SDL_Log("SDL_SetPaletteColors: %s\n", SDL_GetError()); - return FALSE; + return false; } if (pal_surface) { @@ -500,7 +500,7 @@ BOOL SDrawUpdatePalette(unsigned int firstentry, unsigned int numentries, PALETT sdl_present_surface(); } - return TRUE; + return true; } // @@ -523,7 +523,7 @@ WINBOOL SetCursorPos(int X, int Y) Y *= scaleX; SDL_WarpMouseInWindow(window, X, Y); - return TRUE; + return true; } int ShowCursor(WINBOOL bShow) @@ -540,7 +540,7 @@ WINBOOL TextOutA(HDC hdc, int x, int y, LPCSTR lpString, int c) assert(window); SDL_SetWindowTitle(window, lpString); - return TRUE; + return true; } } diff --git a/SourceX/miniwin.cpp b/SourceX/miniwin.cpp index 639693b4f..219a99387 100644 --- a/SourceX/miniwin.cpp +++ b/SourceX/miniwin.cpp @@ -146,7 +146,7 @@ WINBOOL GetComputerNameA(LPSTR lpBuffer, LPDWORD nSize) DUMMY(); strncpy(lpBuffer, "localhost", *nSize); *nSize = strlen(lpBuffer); - return TRUE; + return true; } DWORD GetFileVersionInfoSizeA(LPCSTR lptstrFilename, LPDWORD lpdwHandle) @@ -162,7 +162,7 @@ BOOL GetFileVersionInfoA(LPCSTR lptstrFilename, DWORD dwHandle, DWORD dwLen, LPV DUMMY(); *(int *)lpData = 16711836; // TODO use actual version from .rc - return TRUE; + return true; } BOOL VerQueryValueA(LPCVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen) @@ -179,7 +179,7 @@ BOOL VerQueryValueA(LPCVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, PUINT lpBuffer.dwProductVersionLS |= 2 & 0xFFFF; *lplpBuffer = (LPVOID *)&lpBuffer; - return TRUE; + return true; } DWORD GetCurrentDirectory(DWORD nBufferLength, LPTSTR lpBuffer) @@ -237,13 +237,13 @@ HWND SetCapture(HWND hWnd) WINBOOL ReleaseCapture() { DUMMY_ONCE(); - return TRUE; + return true; } WINBOOL DestroyWindow(HWND hWnd) { DUMMY(); - return TRUE; + return true; } HWND GetLastActivePopup(HWND hWnd) @@ -274,7 +274,7 @@ HWND FindWindowA(LPCSTR lpClassName, LPCSTR lpWindowName) void FakeWMDestroy() { - MainWndProc(NULL, WM_DESTROY, 0, NULL); + MainWndProc(NULL, DVL_WM_DESTROY, 0, NULL); } HWND CreateWindowExA( @@ -310,7 +310,7 @@ HWND CreateWindowExA( BOOL InvalidateRect(HWND hWnd, const RECT *lpRect, BOOL bErase) { DUMMY(); - return TRUE; + return true; } /** @@ -319,7 +319,7 @@ BOOL InvalidateRect(HWND hWnd, const RECT *lpRect, BOOL bErase) BOOL UpdateWindow(HWND hWnd) { DUMMY(); - return TRUE; + return true; } BOOL ShowWindow(HWND hWnd, int nCmdShow) @@ -330,7 +330,7 @@ BOOL ShowWindow(HWND hWnd, int nCmdShow) SDL_ShowWindow(window); } - return TRUE; + return true; } ATOM RegisterClassExA(const WNDCLASSEXA *lpwcx) @@ -389,19 +389,19 @@ HCURSOR LoadCursorA(HINSTANCE hInstance, LPCSTR lpCursorName) BOOL IsBadReadPtr(const void *lp, UINT_PTR ucb) { UNIMPLEMENTED(); - return TRUE; + return true; } BOOL IsBadWritePtr(LPVOID lp, UINT_PTR ucb) { UNIMPLEMENTED(); - return TRUE; + return true; } SIZE_T VirtualQuery(LPCVOID lpAddress, PMEMORY_BASIC_INFORMATION lpBuffer, SIZE_T dwLength) { UNIMPLEMENTED(); - return FALSE; + return false; } LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect) @@ -413,7 +413,7 @@ LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWO BOOL VirtualFree(LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType) { UNIMPLEMENTED(); - return FALSE; + return false; } void GetLocalTime(LPSYSTEMTIME lpSystemTime) @@ -456,7 +456,7 @@ HMODULE GetModuleHandleA(LPCSTR lpModuleName) BOOL GetUserNameA(LPSTR lpBuffer, LPDWORD pcbBuffer) { UNIMPLEMENTED(); - return FALSE; + return false; } /** @@ -496,7 +496,7 @@ HWND GetDesktopWindow() */ BOOL SHGetPathFromIDListA(PCIDLIST_ABSOLUTE pidl, LPSTR pszPath) { - return FALSE; + return false; } /** @@ -504,7 +504,7 @@ BOOL SHGetPathFromIDListA(PCIDLIST_ABSOLUTE pidl, LPSTR pszPath) */ BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData) { - return FALSE; + return false; } void GetSystemInfo(LPSYSTEM_INFO lpSystemInfo) @@ -556,7 +556,7 @@ BOOL GetWindowRect(HWND hDlg, tagRECT *Rect) Rect->left = w + x; Rect->bottom = h + y; - return TRUE; + return true; } UINT GetSystemPaletteEntries(HDC hdc, UINT iStart, UINT cEntries, LPPALETTEENTRY pPalEntries) @@ -570,7 +570,7 @@ BOOL GetVersionExA(LPOSVERSIONINFOA lpVersionInformation) lpVersionInformation->dwMajorVersion = 5; lpVersionInformation->dwMinorVersion = 0; lpVersionInformation->dwPlatformId = DVL_VER_PLATFORM_WIN32_NT; - return TRUE; + return true; } void lstrcpynA(LPSTR lpString1, LPCSTR lpString2, int iMaxLength) @@ -584,7 +584,7 @@ WINBOOL CreateProcessA(LPCSTR lpApplicationName, LPSTR lpCommandLine, LPSECURITY LPPROCESS_INFORMATION lpProcessInformation) { UNIMPLEMENTED(); - return FALSE; + return false; } void ExitProcess(UINT uExitCode) @@ -644,9 +644,9 @@ DWORD GetPrivateProfileStringA(LPCSTR lpAppName, LPCSTR lpKeyName, LPCSTR lpDefa int MessageBoxA(HWND hWnd, const char *Text, const char *Title, UINT Flags) { Uint32 SDLFlags = 0; - if (Flags & MB_ICONHAND) { + if (Flags & DVL_MB_ICONHAND) { SDLFlags |= SDL_MESSAGEBOX_ERROR; - } else if (Flags & MB_ICONEXCLAMATION) { + } else if (Flags & DVL_MB_ICONEXCLAMATION) { SDLFlags |= SDL_MESSAGEBOX_WARNING; } @@ -695,13 +695,13 @@ LSTATUS RegCloseKeyA(HKEY hKey) void PostQuitMessage(int nExitCode) { DUMMY(); - PostMessageA(NULL, WM_QUERYENDSESSION, 0, 0); + PostMessageA(NULL, DVL_WM_QUERYENDSESSION, 0, 0); } LRESULT DefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { DUMMY_ONCE(); - if (Msg == WM_QUERYENDSESSION) + if (Msg == DVL_WM_QUERYENDSESSION) exit(0); return NULL; diff --git a/SourceX/miniwin_io.cpp b/SourceX/miniwin_io.cpp index ca5934412..9f953d27d 100644 --- a/SourceX/miniwin_io.cpp +++ b/SourceX/miniwin_io.cpp @@ -59,7 +59,7 @@ WINBOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDW int len = read((intptr_t)hFile, lpBuffer, nNumberOfBytesToRead); assert(len != -1); *lpNumberOfBytesRead = len; - return TRUE; + return true; } DWORD GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh) @@ -82,10 +82,10 @@ WINBOOL WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, L ssize_t len = write((intptr_t)hFile, lpBuffer, nNumberOfBytesToWrite); if (len == -1) { *lpNumberOfBytesWritten = 0; - return FALSE; + return false; } *lpNumberOfBytesWritten = (DWORD)len; - return TRUE; + return true; } DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod) @@ -113,7 +113,7 @@ WINBOOL SetEndOfFile(HANDLE hFile) assert(cur != -1); int res = ftruncate((intptr_t)hFile, cur); assert(res == 0); - return TRUE; + return true; } DWORD GetFileAttributesA(LPCSTR lpFileName) @@ -137,7 +137,7 @@ DWORD GetFileAttributesA(LPCSTR lpFileName) WINBOOL SetFileAttributesA(LPCSTR lpFileName, DWORD dwFileAttributes) { DUMMY_PRINT("file: %s", lpFileName); - return TRUE; + return true; } WINBOOL CloseHandle(HANDLE hObject) @@ -147,7 +147,7 @@ WINBOOL CloseHandle(HANDLE hObject) assert(ret == 0); files.erase(hObject); } - return TRUE; + return true; } } diff --git a/SourceX/miniwin_msg_sdl.cpp b/SourceX/miniwin_msg_sdl.cpp index 15cd938ee..819f04e73 100644 --- a/SourceX/miniwin_msg_sdl.cpp +++ b/SourceX/miniwin_msg_sdl.cpp @@ -13,61 +13,61 @@ static int translate_sdl_key(SDL_Keysym key) int sym = key.sym; switch (sym) { case SDLK_ESCAPE: - return VK_ESCAPE; + return DVL_VK_ESCAPE; case SDLK_RETURN: case SDLK_KP_ENTER: - return VK_RETURN; + return DVL_VK_RETURN; case SDLK_TAB: - return VK_TAB; + return DVL_VK_TAB; case SDLK_SPACE: - return VK_SPACE; + return DVL_VK_SPACE; case SDLK_BACKSPACE: - return VK_BACK; + return DVL_VK_BACK; case SDLK_DOWN: - return VK_DOWN; + return DVL_VK_DOWN; case SDLK_LEFT: - return VK_LEFT; + return DVL_VK_LEFT; case SDLK_RIGHT: - return VK_RIGHT; + return DVL_VK_RIGHT; case SDLK_UP: - return VK_UP; + return DVL_VK_UP; case SDLK_PAGEUP: - return VK_PRIOR; + return DVL_VK_PRIOR; case SDLK_PAGEDOWN: - return VK_NEXT; + return DVL_VK_NEXT; case SDLK_PAUSE: - return VK_PAUSE; + return DVL_VK_PAUSE; case SDLK_SEMICOLON: - return VK_OEM_1; + return DVL_VK_OEM_1; case SDLK_QUESTION: - return VK_OEM_2; + return DVL_VK_OEM_2; case SDLK_BACKQUOTE: - return VK_OEM_3; + return DVL_VK_OEM_3; case SDLK_LEFTBRACKET: - return VK_OEM_4; + return DVL_VK_OEM_4; case SDLK_BACKSLASH: - return VK_OEM_5; + return DVL_VK_OEM_5; case SDLK_RIGHTBRACKET: - return VK_OEM_6; + return DVL_VK_OEM_6; case SDLK_QUOTE: - return VK_OEM_7; + return DVL_VK_OEM_7; case SDLK_MINUS: - return VK_OEM_MINUS; + return DVL_VK_OEM_MINUS; case SDLK_PLUS: - return VK_OEM_PLUS; + return DVL_VK_OEM_PLUS; case SDLK_PERIOD: - return VK_OEM_PERIOD; + return DVL_VK_OEM_PERIOD; case SDLK_COMMA: - return VK_OEM_COMMA; + return DVL_VK_OEM_COMMA; case SDLK_LSHIFT: case SDLK_RSHIFT: - return VK_SHIFT; + return DVL_VK_SHIFT; case SDLK_PRINTSCREEN: - return VK_SNAPSHOT; + return DVL_VK_SNAPSHOT; default: if (sym >= SDLK_a && sym <= SDLK_z) { @@ -75,7 +75,7 @@ static int translate_sdl_key(SDL_Keysym key) } else if (sym >= SDLK_0 && sym <= SDLK_9) { return '0' + (sym - SDLK_0); } else if (sym >= SDLK_F1 && sym <= SDLK_F12) { - return VK_F1 + (sym - SDLK_F1); + return DVL_VK_F1 + (sym - SDLK_F1); } DUMMY_PRINT("unknown key: name=%s sym=0x%X scan=%d mod=0x%X", SDL_GetKeyName(sym), sym, key.scancode, key.mod); return -1; @@ -85,16 +85,16 @@ static int translate_sdl_key(SDL_Keysym key) static WPARAM keystate_for_mouse(WPARAM ret) { const Uint8 *keystate = SDL_GetKeyboardState(NULL); - ret |= keystate[SDL_SCANCODE_LSHIFT] ? MK_SHIFT : 0; - ret |= keystate[SDL_SCANCODE_RSHIFT] ? MK_SHIFT : 0; - // XXX: other MK_* codes not implemented + ret |= keystate[SDL_SCANCODE_LSHIFT] ? DVL_MK_SHIFT : 0; + ret |= keystate[SDL_SCANCODE_RSHIFT] ? DVL_MK_SHIFT : 0; + // XXX: other DVL_MK_* codes not implemented return ret; } static WINBOOL false_avail() { - DUMMY_PRINT("return FALSE although event avaliable"); - return FALSE; + DUMMY_PRINT("return false although event avaliable"); + return false; } WINBOOL PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg) @@ -118,12 +118,12 @@ WINBOOL PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilter if (!message_queue.empty()) { *lpMsg = message_queue.front(); message_queue.pop_front(); - return TRUE; + return true; } SDL_Event e; if (!SDL_PollEvent(&e)) { - return FALSE; + return false; } lpMsg->hwnd = hWnd; @@ -139,26 +139,26 @@ WINBOOL PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilter int key = translate_sdl_key(e.key.keysym); if (key == -1) return false_avail(); - lpMsg->message = e.type == SDL_KEYDOWN ? WM_KEYDOWN : WM_KEYUP; + lpMsg->message = e.type == SDL_KEYDOWN ? DVL_WM_KEYDOWN : DVL_WM_KEYUP; lpMsg->wParam = (DWORD)key; // HACK: Encode modifier in lParam for TranslateMessage later lpMsg->lParam = e.key.keysym.mod << 16; } break; case SDL_MOUSEMOTION: - lpMsg->message = WM_MOUSEMOVE; + lpMsg->message = DVL_WM_MOUSEMOVE; lpMsg->lParam = (e.motion.y << 16) | (e.motion.x & 0xFFFF); lpMsg->wParam = keystate_for_mouse(0); break; case SDL_MOUSEBUTTONDOWN: { int button = e.button.button; if (button == SDL_BUTTON_LEFT) { - lpMsg->message = WM_LBUTTONDOWN; + lpMsg->message = DVL_WM_LBUTTONDOWN; lpMsg->lParam = (e.button.y << 16) | (e.button.x & 0xFFFF); - lpMsg->wParam = keystate_for_mouse(MK_LBUTTON); + lpMsg->wParam = keystate_for_mouse(DVL_MK_LBUTTON); } else if (button == SDL_BUTTON_RIGHT) { - lpMsg->message = WM_RBUTTONDOWN; + lpMsg->message = DVL_WM_RBUTTONDOWN; lpMsg->lParam = (e.button.y << 16) | (e.button.x & 0xFFFF); - lpMsg->wParam = keystate_for_mouse(MK_RBUTTON); + lpMsg->wParam = keystate_for_mouse(DVL_MK_RBUTTON); } else { return false_avail(); } @@ -166,11 +166,11 @@ WINBOOL PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilter case SDL_MOUSEBUTTONUP: { int button = e.button.button; if (button == SDL_BUTTON_LEFT) { - lpMsg->message = WM_LBUTTONUP; + lpMsg->message = DVL_WM_LBUTTONUP; lpMsg->lParam = (e.button.y << 16) | (e.button.x & 0xFFFF); lpMsg->wParam = keystate_for_mouse(0); } else if (button == SDL_BUTTON_RIGHT) { - lpMsg->message = WM_RBUTTONUP; + lpMsg->message = DVL_WM_RBUTTONUP; lpMsg->lParam = (e.button.y << 16) | (e.button.x & 0xFFFF); lpMsg->wParam = keystate_for_mouse(0); } else { @@ -180,7 +180,7 @@ WINBOOL PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilter case SDL_TEXTINPUT: case SDL_WINDOWEVENT: if (e.window.event == SDL_WINDOWEVENT_CLOSE) { - lpMsg->message = WM_QUERYENDSESSION; + lpMsg->message = DVL_WM_QUERYENDSESSION; } else { return false_avail(); } @@ -189,13 +189,13 @@ WINBOOL PeekMessageA(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilter DUMMY_PRINT("unknown SDL message 0x%X", e.type); return false_avail(); } - return TRUE; + return true; } -WINBOOL TranslateMessage(CONST MSG *lpMsg) +WINBOOL TranslateMessage(const MSG *lpMsg) { assert(lpMsg->hwnd == 0); - if (lpMsg->message == WM_KEYDOWN) { + if (lpMsg->message == DVL_WM_KEYDOWN) { int key = lpMsg->wParam; unsigned mod = (DWORD)lpMsg->lParam >> 16; @@ -204,8 +204,8 @@ WINBOOL TranslateMessage(CONST MSG *lpMsg) bool is_alpha = (key >= 'A' && key <= 'Z'); bool is_numeric = (key >= '0' && key <= '9'); - bool is_control = key == VK_SPACE || key == VK_BACK || key == VK_ESCAPE || key == VK_TAB || key == VK_RETURN; - bool is_oem = (key >= VK_OEM_1 && key <= VK_OEM_7); + bool is_control = key == DVL_VK_SPACE || key == DVL_VK_BACK || key == DVL_VK_ESCAPE || key == DVL_VK_TAB || key == DVL_VK_RETURN; + bool is_oem = (key >= DVL_VK_OEM_1 && key <= DVL_VK_OEM_7); if (is_control || is_alpha || is_numeric || is_oem) { if (!upper && is_alpha) { @@ -215,38 +215,38 @@ WINBOOL TranslateMessage(CONST MSG *lpMsg) } else if (is_oem) { // XXX: This probably only supports US keyboard layout switch (key) { - case VK_OEM_1: + case DVL_VK_OEM_1: key = shift ? ':' : ';'; break; - case VK_OEM_2: + case DVL_VK_OEM_2: key = shift ? '?' : '/'; break; - case VK_OEM_3: + case DVL_VK_OEM_3: key = shift ? '~' : '`'; break; - case VK_OEM_4: + case DVL_VK_OEM_4: key = shift ? '{' : '['; break; - case VK_OEM_5: + case DVL_VK_OEM_5: key = shift ? '|' : '\\'; break; - case VK_OEM_6: + case DVL_VK_OEM_6: key = shift ? '}' : ']'; break; - case VK_OEM_7: + case DVL_VK_OEM_7: key = shift ? '"' : '\''; break; - case VK_OEM_MINUS: + case DVL_VK_OEM_MINUS: key = shift ? '_' : '-'; break; - case VK_OEM_PLUS: + case DVL_VK_OEM_PLUS: key = shift ? '+' : '='; break; - case VK_OEM_PERIOD: + case DVL_VK_OEM_PERIOD: key = shift ? '>' : '.'; break; - case VK_OEM_COMMA: + case DVL_VK_OEM_COMMA: key = shift ? '<' : ','; break; @@ -260,11 +260,11 @@ WINBOOL TranslateMessage(CONST MSG *lpMsg) } // XXX: This does not add extended info to lParam - PostMessageA(lpMsg->hwnd, WM_CHAR, key, 0); + PostMessageA(lpMsg->hwnd, DVL_WM_CHAR, key, 0); } } - return TRUE; + return true; } SHORT GetAsyncKeyState(int vKey) @@ -274,7 +274,7 @@ SHORT GetAsyncKeyState(int vKey) return 0; } -LRESULT DispatchMessageA(CONST MSG *lpMsg) +LRESULT DispatchMessageA(const MSG *lpMsg) { DUMMY_ONCE(); assert(lpMsg->hwnd == 0); @@ -298,7 +298,7 @@ WINBOOL PostMessageA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) message_queue.push_back(msg); - return TRUE; + return true; } } diff --git a/SourceX/miniwin_thread.cpp b/SourceX/miniwin_thread.cpp index db624ffd9..1091c6c9f 100644 --- a/SourceX/miniwin_thread.cpp +++ b/SourceX/miniwin_thread.cpp @@ -57,7 +57,7 @@ WINBOOL SetThreadPriority(HANDLE hThread, int nPriority) { // SDL cannot set the priority of the non-current thread // (and e.g. unprivileged processes on Linux cannot increase it) - return TRUE; + return true; } void InitializeCriticalSection(LPCRITICAL_SECTION lpCriticalSection) @@ -92,9 +92,9 @@ HANDLE CreateEventA(LPSECURITY_ATTRIBUTES lpEventAttributes, WINBOOL bManualRese } if (lpEventAttributes != NULL) UNIMPLEMENTED(); - if (bManualReset != TRUE) + if (bManualReset != true) UNIMPLEMENTED(); - if (bInitialState != FALSE) + if (bInitialState != false) UNIMPLEMENTED(); if (lpName != NULL) UNIMPLEMENTED(); diff --git a/SourceX/sound.cpp b/SourceX/sound.cpp index 6ce8ac71b..93d939b14 100644 --- a/SourceX/sound.cpp +++ b/SourceX/sound.cpp @@ -16,9 +16,9 @@ LPDIRECTSOUNDBUFFER sglpDSB; /* data */ -BYTE gbMusicOn = TRUE; -BYTE gbSoundOn = TRUE; -BYTE gbDupSounds = TRUE; +BYTE gbMusicOn = true; +BYTE gbSoundOn = true; +BYTE gbDupSounds = true; int sgnMusicTrack = 6; char *sgszMusicTracks[NUM_MUSIC] = { "Music\\DTowne.wav", @@ -57,14 +57,14 @@ BOOL snd_playing(TSnd *pSnd) DWORD error_code; // TODO should probably be HRESULT if (!pSnd) - return FALSE; + return false; if (pSnd->DSB == NULL) - return FALSE; + return false; DUMMY_ONCE(); - return FALSE; + return false; } void snd_play_snd(TSnd *pSnd, int lVolume, int lPan) @@ -135,9 +135,9 @@ BOOL sound_file_reload(TSnd *sound_file, LPDIRECTSOUNDBUFFER DSB) DUMMY_ONCE(); - rv = FALSE; + rv = false; - WOpenFile(sound_file->sound_path, &file, FALSE); + WOpenFile(sound_file->sound_path, &file, false); WSetFilePointer(file, sound_file->chunk.dwOffset, NULL, 0); WCloseFile(file); @@ -157,7 +157,7 @@ TSnd *sound_file_load(char *path) if (!gbSndInited) return NULL; - WOpenFile(path, &file, FALSE); + WOpenFile(path, &file, false); pSnd = (TSnd *)DiabloAllocPtr(sizeof(TSnd)); memset(pSnd, 0, sizeof(TSnd)); pSnd->sound_path = path; @@ -321,7 +321,7 @@ HRESULT sound_DirectSoundCreate(LPGUID lpGuid, LPDIRECTSOUND *ppDS, LPUNKNOWN pU void sound_cleanup() { - snd_update(TRUE); + snd_update(true); SVidDestroy(); SFileDdaDestroy(); @@ -331,7 +331,7 @@ void sound_cleanup() } if (gbSndInited) { - gbSndInited = FALSE; + gbSndInited = false; sound_store_volume("Sound Volume", sglSoundVolume); sound_store_volume("Music Volume", sglMusicVolume); } @@ -360,11 +360,11 @@ void music_start(int nTrack) music_stop(); if (gbSndInited && gbMusicOn) { #ifdef _DEBUG - SFileEnableDirectAccess(FALSE); + SFileEnableDirectAccess(false); #endif success = SFileOpenFile(sgszMusicTracks[nTrack], &sgpMusicTrack); #ifdef _DEBUG - SFileEnableDirectAccess(TRUE); + SFileEnableDirectAccess(true); #endif sound_create_primary_buffer(sgpMusicTrack); if (!success) { diff --git a/SourceX/storm.cpp b/SourceX/storm.cpp index a4f1baee2..0e19f586b 100644 --- a/SourceX/storm.cpp +++ b/SourceX/storm.cpp @@ -65,7 +65,7 @@ BOOL SFileDdaEnd(HANDLE directsound) BOOL SFileDdaGetPos(HANDLE directsound, int a2, int a3) { DUMMY_ONCE(); - return TRUE; + return true; } BOOL SFileDdaInitialize(HANDLE directsound) @@ -78,7 +78,7 @@ BOOL SFileDdaSetVolume(HANDLE directsound, signed int bigvolume, signed int volu { Mix_VolumeMusic(MIX_MAX_VOLUME - MIX_MAX_VOLUME * bigvolume / VOLUME_MIN); - return TRUE; + return true; } BOOL SFileGetFileArchive(HANDLE hFile, HANDLE *archive) @@ -264,7 +264,7 @@ BOOL SMemFree(void *location, char *logfilename, int logline, char defaultValue) // fprintf(stderr, "%s: (%s:%d)\n", __FUNCTION__, logfilename, logline); assert(location); free(location); - return TRUE; + return true; } void *SMemReAlloc(void *location, unsigned int amount, char *logfilename, int logline, char defaultValue) @@ -327,24 +327,24 @@ BOOL SRegLoadValue(const char *keyname, const char *valuename, BYTE flags, int * char string[10]; if (getIniValue(keyname, valuename, string, 10)) { *value = strtol(string, NULL, 10); - return TRUE; + return true; } - return FALSE; + return false; } BOOL SRegSaveData(const char *keyname, const char *valuename, int size, BYTE *lpData, DWORD cbData) { setIniValue(keyname, valuename, (char *)lpData, cbData); - return TRUE; + return true; } BOOL SRegSaveString(const char *keyname, const char *valuename, BYTE flags, char *string) { setIniValue(keyname, valuename, string); - return TRUE; + return true; } BOOL SRegSaveValue(const char *keyname, const char *valuename, BYTE flags, DWORD result) @@ -353,19 +353,19 @@ BOOL SRegSaveValue(const char *keyname, const char *valuename, BYTE flags, DWORD sprintf(str, "%d", result); setIniValue(keyname, valuename, str); - return TRUE; + return true; } BOOL SVidInitialize(HANDLE video) { DUMMY(); - return TRUE; + return true; } BOOL SVidDestroy() { DUMMY(); - return TRUE; + return true; } double SVidFrameEnd; @@ -381,7 +381,7 @@ SDL_AudioDeviceID deviceId; BOOL SVidPlayBegin(char *filename, int a2, int a3, int a4, int a5, int flags, HANDLE *video) { if (flags & 0x10000 || flags & 0x20000000) { - return FALSE; + return false; } SVidLoop = flags & 0x40000; @@ -401,7 +401,7 @@ BOOL SVidPlayBegin(char *filename, int a2, int a3, int a4, int a5, int flags, HA SVidSMK = smk_open_memory(SVidBuffer, bytestoread); if (SVidSMK == NULL) { - return FALSE; + return false; } deviceId = 0; @@ -419,7 +419,7 @@ BOOL SVidPlayBegin(char *filename, int a2, int a3, int a4, int a5, int flags, HA deviceId = SDL_OpenAudioDevice(NULL, 0, &audioFormat, NULL, 0); if (deviceId == 0) { SDL_Log("SDL_OpenAudioDevice: %s\n", SDL_GetError()); - return FALSE; + return false; } else { SDL_PauseAudioDevice(deviceId, 0); /* start audio playing. */ } @@ -450,12 +450,12 @@ BOOL SVidPlayBegin(char *filename, int a2, int a3, int a4, int a5, int flags, HA SVidPalette = SDL_AllocPalette(256); if (SDL_SetSurfacePalette(SVidSurface, SVidPalette) != 0) { SDL_Log("SDL_SetSurfacePalette: %s\n", SDL_GetError()); - return FALSE; + return false; } SVidFrameEnd = SDL_GetTicks() * 1000 + SVidFrameLength; - return TRUE; + return true; } BOOL SVidLoadNextFrame() @@ -464,13 +464,13 @@ BOOL SVidLoadNextFrame() if (smk_next(SVidSMK) == SMK_DONE) { if (!SVidLoop) { - return FALSE; + return false; } smk_first(SVidSMK); } - return TRUE; + return true; } BOOL SVidPlayContinue(void) @@ -494,7 +494,7 @@ BOOL SVidPlayContinue(void) if (SDL_SetPaletteColors(SVidPalette, colors, 0, 256) != 0) { SDL_Log("SDL_SetPaletteColors: %s\n", SDL_GetError()); - return FALSE; + return false; } } @@ -504,7 +504,7 @@ BOOL SVidPlayContinue(void) if (deviceId && SDL_QueueAudio(deviceId, smk_get_audio(SVidSMK, 0), smk_get_audio_size(SVidSMK, 0)) == -1) { SDL_Log("SDL_QueueAudio: %s\n", SDL_GetError()); - return FALSE; + return false; } if (SDL_GetTicks() * 1000 >= SVidFrameEnd) { @@ -514,7 +514,7 @@ BOOL SVidPlayContinue(void) SDL_Rect pal_surface_offset = { 64, 160, 0, 0 }; if (SDL_BlitSurface(SVidSurface, NULL, pal_surface, &pal_surface_offset) != 0) { SDL_Log("SDL_BlitSurface: %s\n", SDL_GetError()); - return FALSE; + return false; } SetFadeLevel(256); // present frame @@ -554,7 +554,7 @@ BOOL SVidPlayEnd(HANDLE video) texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, SCREEN_WIDTH, SCREEN_HEIGHT); SDL_RenderSetLogicalSize(renderer, SCREEN_WIDTH, SCREEN_HEIGHT); - return TRUE; + return true; } BOOL SErrDisplayError(DWORD dwErrMsg, const char *logfilename, int logline, const char *message, @@ -566,7 +566,7 @@ BOOL SErrDisplayError(DWORD dwErrMsg, const char *logfilename, int logline, cons BOOL SErrGetErrorStr(DWORD dwErrCode, char *buffer, unsigned int bufferchars) { DUMMY(); - return FALSE; + return false; } DWORD SErrGetLastError() @@ -628,13 +628,13 @@ void SDrawMessageBox(char *Text, char *Title, int Flags) BOOLEAN StormDestroy(void) { DUMMY(); - return TRUE; + return true; } BOOLEAN SFileSetBasePath(char *) { DUMMY(); - return TRUE; + return true; } void SDrawRealizePalette(void) @@ -645,7 +645,7 @@ void SDrawRealizePalette(void) BOOL SFileEnableDirectAccess(BOOL enable) { DUMMY(); - return TRUE; + return true; } } diff --git a/SourceX/storm_net.cpp b/SourceX/storm_net.cpp index 48ce0b258..7e66ecf57 100644 --- a/SourceX/storm_net.cpp +++ b/SourceX/storm_net.cpp @@ -9,9 +9,9 @@ BOOL SNetReceiveMessage(int *senderplayerid, char **data, int *databytes) { if (!dvlnet_inst->SNetReceiveMessage(senderplayerid, data, databytes)) { SErrSetLastError(STORM_ERROR_NO_MESSAGES_WAITING); - return FALSE; + return false; } - return TRUE; + return true; } BOOL SNetSendMessage(int playerID, void *data, unsigned int databytes) @@ -28,9 +28,9 @@ BOOL SNetReceiveTurns(int a1, int arraysize, char **arraydata, unsigned int *arr UNIMPLEMENTED(); if (!dvlnet_inst->SNetReceiveTurns(arraydata, arraydatabytes, arrayplayerstatus)) { SErrSetLastError(STORM_ERROR_NO_MESSAGES_WAITING); - return FALSE; + return false; } - return TRUE; + return true; } BOOL SNetSendTurn(char *data, unsigned int databytes) @@ -56,7 +56,7 @@ void *SNetRegisterEventHandler(int evtype, void(*func)(struct _SNETEVENT *)) BOOL SNetDestroy() { DUMMY(); - return TRUE; + return true; } BOOL SNetDropPlayer(int playerid, DWORD flags) @@ -67,7 +67,7 @@ BOOL SNetDropPlayer(int playerid, DWORD flags) BOOL SNetGetGameInfo(int type, void *dst, unsigned int length, unsigned int *byteswritten) { DUMMY(); - return TRUE; + return true; } BOOL SNetLeaveGame(int type) @@ -78,7 +78,7 @@ BOOL SNetLeaveGame(int type) BOOL SNetSendServerChatCommand(const char *command) { DUMMY(); - return TRUE; + return true; } /** @@ -136,7 +136,7 @@ BOOL SNetGetTurnsInTransit(int *turns) */ BOOLEAN SNetSetBasePlayer(int) { - return TRUE; + return true; } /** @@ -153,7 +153,7 @@ BOOL SNetPerformUpgrade(DWORD *upgradestatus) BOOL SNetSetGameMode(DWORD modeFlags, bool makePublic) { UNIMPLEMENTED(); - return TRUE; + return true; } } diff --git a/types.h b/types.h index b22efff14..615cc0e5a 100644 --- a/types.h +++ b/types.h @@ -155,6 +155,7 @@ DEVILUTION_BEGIN_NAMESPACE //#endif #include "miniwin_popdecl.h" + DEVILUTION_END_NAMESPACE #endif