From 2007adbda391fa4775416583de6f2a0d58683433 Mon Sep 17 00:00:00 2001 From: Ben Lankamp Date: Mon, 15 Jun 2020 21:31:03 +0200 Subject: [PATCH] * Change font to Arial * Load/save dialog in proper place --- code/REDALERT/GADGET.CPP | 31 ------------------------------- code/REDALERT/LOADDLG.CPP | 5 +++-- code/REDALERT/WINSTUB.CPP | 2 +- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/code/REDALERT/GADGET.CPP b/code/REDALERT/GADGET.CPP index ca5a3f6..fa22be4 100644 --- a/code/REDALERT/GADGET.CPP +++ b/code/REDALERT/GADGET.CPP @@ -495,37 +495,6 @@ KeyNumType GadgetClass::Input(void) key = Keyboard->Get(); } -#ifdef WIN32 -#ifdef CHEAT_KEYS - //if (key == KN_K && !Debug_Map && (Debug_Flag || Debug_Playtest)) { - // /* - // ** time to create a screen shot using the PCX code (if it works) - // */ - // if (!Debug_MotionCapture) { - // GraphicBufferClass temp_page( SeenBuff.Get_Width(), - // SeenBuff.Get_Height(), - // NULL, - // SeenBuff.Get_Width() * SeenBuff.Get_Height()); - // CDFileClass file; - // char filename[30]; - // -// // Hide_Mouse(); - // SeenBuff.Blit(temp_page); -// // Show_Mouse(); - // for (int lp = 0; lp < 99; lp ++) { - // sprintf(filename, "scrsht%02d.pcx", lp); - // file.Set_Name(filename); - // if (!file.Is_Available()) break; - // } - // - // file.Cache(200000); - // Write_PCX_File(file, temp_page, & GamePalette); - // Sound_Effect(VOC_BEEP); - // } - //} -#endif -#endif - /* ** For mouse button clicks, the mouse position is actually held in the MouseQ... ** globals rather than their normal Mouse... globals. This is because we need to diff --git a/code/REDALERT/LOADDLG.CPP b/code/REDALERT/LOADDLG.CPP index 76db461..4fced4e 100644 --- a/code/REDALERT/LOADDLG.CPP +++ b/code/REDALERT/LOADDLG.CPP @@ -111,8 +111,9 @@ int LoadOptionsClass::Process(void) */ int d_dialog_w = 250 * RESFACTOR; // dialog width int d_dialog_h = 156 * RESFACTOR; // dialog height - int d_dialog_x = (((320 * RESFACTOR) - d_dialog_w) / 2); // centered x-coord - int d_dialog_y = (((200 * RESFACTOR) - d_dialog_h) / 2); // centered y-coord + + int d_dialog_x = ((SeenBuff.Get_Width() - d_dialog_w) / 2); + int d_dialog_y = ((SeenBuff.Get_Height() - d_dialog_h) / 2); int d_dialog_cx = d_dialog_x + (d_dialog_w / 2); // coord of x-center int d_txt8_h = 11 * RESFACTOR; // ht of 8-pt text diff --git a/code/REDALERT/WINSTUB.CPP b/code/REDALERT/WINSTUB.CPP index 419ea13..50851d5 100644 --- a/code/REDALERT/WINSTUB.CPP +++ b/code/REDALERT/WINSTUB.CPP @@ -450,7 +450,7 @@ void Create_Main_Window ( HANDLE instance , int command_show , int width , int h ImGui_ImplSDL2_InitForD3D(game_window); ImGui_ImplOpenGL3_Init(); - io.Fonts->AddFontFromFileTTF("fonts/Roboto-Medium.ttf", 16.0f); + io.Fonts->AddFontFromFileTTF("fonts/Arial.ttf", 16.0f); ImGui_NewFrame(); }