hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'Isometric-Dev' into master"

Browse Source 
This reverts commit ae0648fccc, reversing
changes made to d7243e8265.
This commit is contained in:
Justin Marshall
2020-08-06 15:50:30 -07:00
parent ae0648fccc
commit 6685b5d51a
433 changed files with 8487 additions and 172344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/sidebareditor.cpp
+3 -25
View File
@@ -4,8 +4,6 @@
#include "function.h"
#include "image.h"
bool Debug_LockScroll = false;
void SidebarEditor::init() {
metalplt = LoadEditorImage("metalplt.shp");
@@ -18,8 +16,8 @@ Image_t* SidebarEditor::LoadEditorImage(const char* name) {
return NULL;
}
int width = Get_Build_Frame_Width(shapefile, 0);
int height = Get_Build_Frame_Height(shapefile, 0);
int width = Get_Build_Frame_Width(shapefile);
int height = Get_Build_Frame_Height(shapefile);
unsigned char *shape_pointer = (unsigned char*)Build_Frame(shapefile, 0, _ShapeBuffer);
short frameCount = Get_Build_Frame_Count(shapefile);
@@ -38,18 +36,10 @@ void SidebarEditor::draw_it(void) {
ImGuiStyle& style = ImGui::GetStyle();
style.FramePadding = ImVec2(0, 0);
if (Debug_RenderEditorSplash)
{
static Image_t* edwinBackground = Image_LoadImage("ui/edwin/eng_edhi.png");
GL_RenderImage(edwinBackground, 0, 0, ScreenWidth, ScreenHeight);
}
Debug_LockScroll = false;
if (ImGui::BeginMainMenuBar())
{
if (ImGui::BeginMenu("File"))
{
Debug_LockScroll = true;
if (ImGui::MenuItem("New Scenario")) { mainmenu_selection = 0; }
if (ImGui::MenuItem("Load Scenario")) { mainmenu_selection = 1; }
if (ImGui::MenuItem("Save Scenario")) { mainmenu_selection = 2; }
@@ -58,31 +48,19 @@ void SidebarEditor::draw_it(void) {
}
if (ImGui::BeginMenu("Map"))
{
Debug_LockScroll = true;
if (ImGui::MenuItem("Size Map")) { mainmenu_selection = 3; }
if (ImGui::MenuItem("Scenario Options")) { mainmenu_selection = 5; }
if (ImGui::MenuItem("AI Options")) { mainmenu_selection = 6; }
ImGui::EndMenu();
}
}
if (ImGui::BeginMenu("Objects"))
{
Debug_LockScroll = true;
if (ImGui::MenuItem("Add Game Object")) { mainmenu_selection = 4; }
if (ImGui::MenuItem("Add Big Overlay Object")) { mainmenu_selection = 9; }
ImGui::EndMenu();
}
if (ImGui::BeginMenu("Lights"))
{
Debug_LockScroll = true;
if (ImGui::MenuItem("Add Light")) { mainmenu_selection = 8; }
ImGui::EndMenu();
}
if (ImGui::BeginMenu("Run"))
{
Debug_LockScroll = true;
if (ImGui::MenuItem("Play Scenario")) { mainmenu_selection = 7; }
ImGui::EndMenu();
}