mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

Remove unused globals in windows.c

Browse Source
This commit is contained in:
Ted John
2016-09-10 18:34:30 +01:00
parent 4350e53392
commit 653c77c9da
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/addresses.h
View File

@@ -158,7 +158,6 @@
#define RCT2_ADDRESS_MOUSE_WRITE_INDEX 0x009E2DE4
#define RCT2_ADDRESS_MOUSE_READ_INDEX 0x009E2DE8
#define RCT2_ADDRESS_HFONT 0x009E2DEC
#define RCT2_ADDRESS_PROGRESSBAR_HWND 0x009E2DF8
#define RCT2_ADDRESS_G1_ELEMENTS 0x009EBD28
@@ -282,8 +281,6 @@
#define RCT2_ADDRESS_HCURSOR_HAND_CLOSED 0x01423600
#define RCT2_ADDRESS_HCURSOR_END 0x01423600
#define RCT2_ADDRESS_HINSTANCE 0x01423A08
#define RCT2_ADDRESS_WINDOW_MAP_SELECTED_TAB 0x014209E4
#define RCT2_ADDRESS_GAME_VERSION_NUMBER 0x0013587BC
@@ -418,6 +415,7 @@
#define RCT2_ADDRESS_TEXTINPUT_WINDOWCLASS 0x009DEB8C
#define RCT2_ADDRESS_CMDLINE 0x009E2D98
#define RCT2_ADDRESS_HFONT 0x009E2DEC
#define RCT2_ADDRESS_LAND_RAISE_COST 0x009E2E1C
#define RCT2_ADDRESS_LAND_LOWER_COST 0x009E2E20
#define RCT2_ADDRESS_SELECTED_TERRAIN_EDGE 0x009E2E24
@@ -627,6 +625,8 @@
// This is also the end of RCT2_ADDRESS_VIEWPORT_LIST.
#define RCT2_ADDRESS_ACTIVE_VIEWPORT_PTR_ARRAY 0x01423570
#define RCT2_ADDRESS_HINSTANCE 0x01423A08
#define RCT2_ADDRESS_PALETTE 0x01424680
#endif

11
src/platform/windows.c
View File

@@ -118,8 +118,6 @@ __declspec(dllexport) int StartOpenRCT(HINSTANCE hInstance, HINSTANCE hPrevInsta
_dllModule = GetModuleHandleA(OPENRCT2_DLL_MODULE_NAME);
}
RCT2_GLOBAL(RCT2_ADDRESS_HINSTANCE, HINSTANCE) = hInstance;
// argv = CommandLineToArgvA(lpCmdLine, &argc);
argv = (char**)windows_get_command_line_args(&argc);
runGame = cmdline_run((const char **)argv, argc);
@@ -775,7 +773,6 @@ utf8 *platform_open_directory_browser(utf8 *title)
int windows_get_registry_install_info(rct2_install_info *installInfo, char *source, char *font, uint8 charset)
{
char subkeyInfogrames[MAX_PATH], subkeyFishTechGroup[MAX_PATH], keyName[100];
LOGFONTA lf;
HKEY hKey;
DWORD type, size;
@@ -784,14 +781,6 @@ int windows_get_registry_install_info(rct2_install_info *installInfo, char *sour
strcpy(subkeyFishTechGroup, "Software\\Fish Technology Group\\");
strcat(subkeyFishTechGroup, source);
memset(&lf, 0, sizeof(lf));
lf.lfCharSet = charset;
lf.lfHeight = 12;
lf.lfWeight = 400;
strcpy(lf.lfFaceName, font);
RCT2_GLOBAL(RCT2_ADDRESS_HFONT, HFONT) = CreateFontIndirectA(&lf);
if (RegOpenKeyA(HKEY_LOCAL_MACHINE, subkeyInfogrames, &hKey) != ERROR_SUCCESS)
return 0;