Merge branch 'master' into master

This commit is contained in:
jmarshall23
2020-06-15 11:07:10 -07:00
committed by GitHub
51 changed files with 1164 additions and 169 deletions
+5 -1
View File
@@ -1604,6 +1604,8 @@ int BGMessageBox(char const * msg, int btn1, int btn2)
*/
Hide_Mouse();
Show_OldFrameBuffer(false);
PaletteClass temp;
#ifdef WIN32
char *filename = "SOVPAPER.PCX";
@@ -1704,7 +1706,7 @@ int BGMessageBox(char const * msg, int btn1, int btn2)
}
#endif
if (display) {
{
display = false;
Hide_Mouse();
@@ -1862,6 +1864,8 @@ int BGMessageBox(char const * msg, int btn1, int btn2)
GadgetClass::Set_Color_Scheme(&ColorRemaps[PCOLOR_DIALOG_BLUE]);
Show_OldFrameBuffer(true);
return(retval);
}