diff --git a/code/REDALERT/CONQUER.CPP b/code/REDALERT/CONQUER.CPP index b79337e..5c81f6d 100644 --- a/code/REDALERT/CONQUER.CPP +++ b/code/REDALERT/CONQUER.CPP @@ -232,7 +232,6 @@ void Main_Game(int argc, char * argv[]) ** 2) Invoke either the main-loop routine, or the editor-loop routine, ** until they indicate that the user wants to exit the scenario. */ - g_inMainMenu = true; while (Select_Game(fade)) { // ST 5/14/2019 diff --git a/code/REDALERT/DIALOG.CPP b/code/REDALERT/DIALOG.CPP index aa29da6..5dd28e1 100644 --- a/code/REDALERT/DIALOG.CPP +++ b/code/REDALERT/DIALOG.CPP @@ -109,15 +109,28 @@ void Dialog_Box(int x, int y, int w, int h) // CC_Draw_Shape(shapedata, 0, cx-156, cy-96, WINDOW_PARTIAL, SHAPE_WIN_REL); //#endif GL_SetClipRect(x, y, w, h); - - Image_t* ddbkgrnd = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0000.png"); - Image_t* ddbkgrnd_1 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0001.png"); - Image_t* ddbkgrnd_2 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0002.png"); - Image_t* ddbkgrnd_3 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0003.png"); - GL_RenderImage(ddbkgrnd, x, y, ddbkgrnd->width, ddbkgrnd->height); - GL_RenderImage(ddbkgrnd_1, x + 312, y, ddbkgrnd->width, ddbkgrnd->height); - GL_RenderImage(ddbkgrnd_2, x, y + 192, ddbkgrnd->width, ddbkgrnd->height); - GL_RenderImage(ddbkgrnd_3, x + 312, y + 192, ddbkgrnd->width, ddbkgrnd->height); + if (g_inMainMenu) + { + Image_t* ddbkgrnd = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-red-0000.png"); + Image_t* ddbkgrnd_1 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-red-0001.png"); + Image_t* ddbkgrnd_2 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-red-0002.png"); + Image_t* ddbkgrnd_3 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-red-0003.png"); + GL_RenderImage(ddbkgrnd, x, y, ddbkgrnd->width, ddbkgrnd->height); + GL_RenderImage(ddbkgrnd_1, x + 312, y, ddbkgrnd->width, ddbkgrnd->height); + GL_RenderImage(ddbkgrnd_2, x, y + 192, ddbkgrnd->width, ddbkgrnd->height); + GL_RenderImage(ddbkgrnd_3, x + 312, y + 192, ddbkgrnd->width, ddbkgrnd->height); + } + else + { + Image_t* ddbkgrnd = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0000.png"); + Image_t* ddbkgrnd_1 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0001.png"); + Image_t* ddbkgrnd_2 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0002.png"); + Image_t* ddbkgrnd_3 = Image_LoadImage("ui/dd-bkgrnd/dd-bkgnd-0003.png"); + GL_RenderImage(ddbkgrnd, x, y, ddbkgrnd->width, ddbkgrnd->height); + GL_RenderImage(ddbkgrnd_1, x + 312, y, ddbkgrnd->width, ddbkgrnd->height); + GL_RenderImage(ddbkgrnd_2, x, y + 192, ddbkgrnd->width, ddbkgrnd->height); + GL_RenderImage(ddbkgrnd_3, x + 312, y + 192, ddbkgrnd->width, ddbkgrnd->height); + } // jmarshall end /* ** Draw the side strips. diff --git a/code/REDALERT/INIT.CPP b/code/REDALERT/INIT.CPP index 49ca69d..cd21a77 100644 --- a/code/REDALERT/INIT.CPP +++ b/code/REDALERT/INIT.CPP @@ -733,6 +733,7 @@ bool Select_Game(bool fade) #ifdef FIXIT_ANTS AntsEnabled = false; #endif + g_inMainMenu = true; selection = Main_Menu(ATTRACT_MODE_TIMEOUT); } Call_Back(); diff --git a/ui/dd-bkgrnd/dd-bkgnd-red-0000.png b/ui/dd-bkgrnd/dd-bkgnd-red-0000.png new file mode 100644 index 0000000..e6ef8e5 Binary files /dev/null and b/ui/dd-bkgrnd/dd-bkgnd-red-0000.png differ diff --git a/ui/dd-bkgrnd/dd-bkgnd-red-0001.png b/ui/dd-bkgrnd/dd-bkgnd-red-0001.png new file mode 100644 index 0000000..a9e3ea4 Binary files /dev/null and b/ui/dd-bkgrnd/dd-bkgnd-red-0001.png differ diff --git a/ui/dd-bkgrnd/dd-bkgnd-red-0002.png b/ui/dd-bkgrnd/dd-bkgnd-red-0002.png new file mode 100644 index 0000000..1629948 Binary files /dev/null and b/ui/dd-bkgrnd/dd-bkgnd-red-0002.png differ diff --git a/ui/dd-bkgrnd/dd-bkgnd-red-0003.png b/ui/dd-bkgrnd/dd-bkgnd-red-0003.png new file mode 100644 index 0000000..58d7b83 Binary files /dev/null and b/ui/dd-bkgrnd/dd-bkgnd-red-0003.png differ