diff --git a/REDALERT/DESCDLG.CPP b/REDALERT/DESCDLG.CPP deleted file mode 100644 index 863ca69..0000000 --- a/REDALERT/DESCDLG.CPP +++ /dev/null @@ -1,160 +0,0 @@ -// -// Copyright 2020 Electronic Arts Inc. -// -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. - -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions -// with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection - -/* $Header: /CounterStrike/DESCDLG.CPP 1 3/03/97 10:24a Joe_bostic $ */ -/*********************************************************************************************** - *** C O N F I D E N T I A L --- W E S T W O O D S T U D I O S *** - *********************************************************************************************** - * * - * Project Name : Command & Conquer * - * * - * File Name : DESCDLG.CPP * - * * - * Programmer : Maria del Mar McCready Legg * - * Joe L. Bostic * - * * - * Start Date : Jan 26, 1995 * - * * - * Last Update : Jan 26, 1995 [MML] * - * * - *---------------------------------------------------------------------------------------------* - * Functions: * - * DescriptionClass::Process -- Handles all the options graphic interface. * - * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#include "function.h" -#include "descdlg.h" - - -/*********************************************************************************************** - * DescriptionClass::Process -- Handles all the options graphic interface. * - * * - * This dialog uses an edit box to "fill-out" a description. * - * * - * INPUT: char *string - return answer here. * - * OUTPUT: none * - * WARNINGS: none * - * HISTORY: 12/31/1994 MML : Created. * - *=============================================================================================*/ -void DescriptionClass::Process(char * string) -{ - /* - ** Set up the window. Window x-coords are in bytes not pixels. - */ - Set_Window(WINDOW_EDITOR, OPTION_X, OPTION_Y, OPTION_WIDTH, OPTION_HEIGHT); - Set_Logic_Page(SeenBuff); - - /* - ** Create Buttons. Button coords are in pixels, but are window-relative. - */ - TextButtonClass optionsbtn(BUTTON_OPTIONS, TXT_OK, TPF_BUTTON, 0, BUTTON_Y); - TextButtonClass cancelbtn(BUTTON_CANCEL, TXT_CANCEL, TPF_BUTTON, 0, BUTTON_Y); - - cancelbtn.X = OPTION_X + ((OPTION_WIDTH - optionsbtn.Width)/3)*2; - optionsbtn.X = OPTION_X + ((OPTION_WIDTH - optionsbtn.Width)/3); - optionsbtn.Add_Tail(cancelbtn); - - EditClass edit( - BUTTON_EDIT, - string, - 31, - TPF_6PT_GRAD, - 0, - EDIT_Y, - EDIT_W); - - edit.Set_Focus(); - edit.X = OPTION_X + (OPTION_WIDTH - edit.Width)/2, - optionsbtn.Add_Tail(edit); - - /* - ** This causes left mouse button clicking within the confines of the dialog to - ** be ignored if it wasn't recognized by any other button or slider. - */ - GadgetClass dialog(OPTION_X, OPTION_Y, OPTION_WIDTH, OPTION_HEIGHT, GadgetClass::LEFTPRESS); - optionsbtn.Add_Tail(dialog); - - /* - ** This causes a right click anywhere or a left click outside the dialog region - ** to be equivalent to clicking on the return to options dialog. - */ - ControlClass background(BUTTON_OPTIONS, 0, 0, 320, 200, GadgetClass::LEFTPRESS|GadgetClass::RIGHTPRESS); - optionsbtn.Add_Tail(background); - - /* - ** Main Processing Loop - */ - bool display = true; - bool process = true; - while (process) { - - /* - ** Invoke game callback - */ - Call_Back(); - - /* - ** Refresh display if needed - */ - if (display) { - - Window_Hide_Mouse(WINDOW_EDITOR); - - /* - ** Draw the background - */ - Window_Box (WINDOW_EDITOR, BOXSTYLE_BORDER); // has border, raised up - Draw_Caption(TXT_MISSION_DESCRIPTION, OPTION_X, OPTION_Y, OPTION_WIDTH); - - /* - ** Draw the titles - */ - optionsbtn.Draw_All(); - Window_Show_Mouse(); - display = false; - } - - /* - ** Get user input - */ - KeyNumType input = optionsbtn.Input(); - - /* - ** Process Input - */ - switch (input) { - - case KN_RETURN: - case KeyNumType(BUTTON_OPTIONS|KN_BUTTON): - strtrim(string); - process = false; - break; - - case KN_ESC: - case KeyNumType(BUTTON_CANCEL|KN_BUTTON): - string[0]= NULL; - strtrim(string); - process = false; - break; - - case KeyNumType(BUTTON_EDIT|KN_BUTTON): - break; - - default: - break; - } - } -} - diff --git a/REDALERT/DESCDLG.H b/REDALERT/DESCDLG.H deleted file mode 100644 index b3b83fd..0000000 --- a/REDALERT/DESCDLG.H +++ /dev/null @@ -1,66 +0,0 @@ -// -// Copyright 2020 Electronic Arts Inc. -// -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. - -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions -// with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection - -/* $Header: /CounterStrike/DESCDLG.H 1 3/03/97 10:24a Joe_bostic $ */ -/*********************************************************************************************** - *** C O N F I D E N T I A L --- W E S T W O O D S T U D I O S *** - *********************************************************************************************** - * * - * Project Name : Command & Conquer * - * * - * File Name : DESCDLG.H * - * * - * Programmer : Maria del Mar McCready Legg * - * Joe L. Bostic * - * * - * Start Date : Jan 26, 1995 * - * * - * Last Update : Jan 26, 1995 [MML] * - * * - *---------------------------------------------------------------------------------------------*/ - -#ifndef DESCDLG_H -#define DESCDLG_H - -#include "gadget.h" - -class DescriptionClass -{ - private: - - enum DescriptionClassEnum { - OPTION_WIDTH=216, // Width of dialog box. - OPTION_HEIGHT=122, // Height of dialog box. - OPTION_X=(((320 - OPTION_WIDTH) / 2) & ~7), - OPTION_Y=((200 - OPTION_HEIGHT) / 2), - TEXT_X=OPTION_X+32, // Title's x pos - TEXT_Y=OPTION_Y+32, // Add 11 for each following line - BUTTON_OPTIONS=1, // Button number for "Ok" - BUTTON_CANCEL, - BUTTON_EDIT, - BUTTON_X=OPTION_X+63, // Options button x pos - BUTTON_Y=OPTION_Y+102, // Options button y pos - EDIT_Y =OPTION_Y+50, - EDIT_W =180 //204, - }; - - public: - DescriptionClass(void) {}; - void Process(char *string); -}; - -#endif - - diff --git a/REDALERT/GOPTIONS.CPP b/REDALERT/GOPTIONS.CPP index 018593a..113eda9 100644 --- a/REDALERT/GOPTIONS.CPP +++ b/REDALERT/GOPTIONS.CPP @@ -41,7 +41,6 @@ #include "visudlg.h" #include "gamedlg.h" #include "textbtn.h" -#include "descdlg.h" #ifdef FIXIT_VERSION_3 // Stalemate games. #include "WolStrng.h" diff --git a/REDALERT/RedAlert.vcxproj b/REDALERT/RedAlert.vcxproj index 4cee2b6..26c731c 100644 --- a/REDALERT/RedAlert.vcxproj +++ b/REDALERT/RedAlert.vcxproj @@ -220,7 +220,6 @@ - @@ -508,7 +507,6 @@ - diff --git a/REDALERT/RedAlert.vcxproj.filters b/REDALERT/RedAlert.vcxproj.filters index c1e617a..4eb2c92 100644 --- a/REDALERT/RedAlert.vcxproj.filters +++ b/REDALERT/RedAlert.vcxproj.filters @@ -192,9 +192,6 @@ Source Files - - Source Files - Source Files @@ -1052,9 +1049,6 @@ Source Files - - Source Files - Source Files @@ -1842,4 +1836,4 @@ Source Files\Resource - \ No newline at end of file + diff --git a/TIBERIANDAWN/DESCDLG.CPP b/TIBERIANDAWN/DESCDLG.CPP deleted file mode 100644 index 7b791f8..0000000 --- a/TIBERIANDAWN/DESCDLG.CPP +++ /dev/null @@ -1,181 +0,0 @@ -// -// Copyright 2020 Electronic Arts Inc. -// -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. - -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions -// with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection - -/* $Header: F:\projects\c&c\vcs\code\descdlg.cpv 2.17 16 Oct 1995 16:49:44 JOE_BOSTIC $ */ -/*********************************************************************************************** - *** C O N F I D E N T I A L --- W E S T W O O D S T U D I O S *** - *********************************************************************************************** - * * - * Project Name : Command & Conquer * - * * - * File Name : DESCDLG.CPP * - * * - * Programmer : Maria del Mar McCready Legg * - * Joe L. Bostic * - * * - * Start Date : Jan 26, 1995 * - * * - * Last Update : Jan 26, 1995 [MML] * - * * - *---------------------------------------------------------------------------------------------* - * Functions: * - * DescriptionClass::Process -- Handles all the options graphic interface. * - * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#include "function.h" -#include "descdlg.h" - - -/*********************************************************************************************** - * DescriptionClass::Process -- Handles all the options graphic interface. * - * * - * This dialog uses an edit box to "fill-out" a description. * - * * - * INPUT: char *string - return answer here. * - * OUTPUT: none * - * WARNINGS: none * - * HISTORY: 12/31/1994 MML : Created. * - *=============================================================================================*/ -void DescriptionClass::Process(char *string) -{ - /* - ----------------------------------------------------------------- - Set up the window. Window x-coords are in bytes not pixels. - ----------------------------------------------------------------- - */ - Set_Window(WINDOW_EDITOR, OPTION_X, OPTION_Y, OPTION_WIDTH, OPTION_HEIGHT); - Set_Logic_Page(SeenBuff); - - /* - ----------------------------------------------------------------------- - Create Buttons. Button coords are in pixels, but are window-relative. - ----------------------------------------------------------------------- - */ - TextButtonClass optionsbtn( - BUTTON_OPTIONS, - TXT_OK, - TPF_6PT_GRAD, - 0, - BUTTON_Y); - - TextButtonClass cancelbtn( - BUTTON_CANCEL, - TXT_CANCEL, - TPF_6PT_GRAD, - 0, - BUTTON_Y); - - cancelbtn.X = OPTION_X + ((OPTION_WIDTH - optionsbtn.Width)/3)*2; - optionsbtn.X = OPTION_X + ((OPTION_WIDTH - optionsbtn.Width)/3); - optionsbtn.Add_Tail(cancelbtn); - - EditClass edit( - BUTTON_EDIT, - string, - 31, - TPF_6PT_GRAD, - 0, - EDIT_Y - ,EDIT_W); - - edit.Set_Focus(); - edit.X = OPTION_X + (OPTION_WIDTH - edit.Width)/2, - optionsbtn.Add_Tail(edit); - - /* - ** This causes left mouse button clicking within the confines of the dialog to - ** be ignored if it wasn't recognized by any other button or slider. - */ - GadgetClass dialog(OPTION_X, OPTION_Y, OPTION_WIDTH, OPTION_HEIGHT, GadgetClass::LEFTPRESS); - optionsbtn.Add_Tail(dialog); - - /* - ** This causes a right click anywhere or a left click outside the dialog region - ** to be equivalent to clicking on the return to options dialog. - */ - ControlClass background(BUTTON_OPTIONS, 0, 0, SeenBuff.Get_Width(), SeenBuff.Get_Height(), GadgetClass::LEFTPRESS|GadgetClass::RIGHTPRESS); - optionsbtn.Add_Tail(background); - - /* - ------------------- Main Processing Loop -------------------- - */ - bool display = true; - bool process = true; - while (process) { - - /* - ** If we have just received input focus again after running in the background then - ** we need to redraw. - */ - if (AllSurfaces.SurfacesRestored){ - AllSurfaces.SurfacesRestored=FALSE; - display=TRUE; - } - - /* - -------------- Invoke game callback ------------- - */ - Call_Back(); - - /* - -------------- Refresh display if needed -------------- - */ - if (display) { - - Window_Hide_Mouse(WINDOW_EDITOR); - - /* - --------- Draw the background ----------- - */ - Window_Box (WINDOW_EDITOR, BOXSTYLE_GREEN_BORDER); // has border, raised up - Draw_Caption(TXT_MISSION_DESCRIPTION, OPTION_X, OPTION_Y, OPTION_WIDTH); - - /* - --------- Draw the titles ----------- - */ - optionsbtn.Draw_All(); - Window_Show_Mouse(); - display = false; - } - - /* - -------------- Get user input --------------- - */ - KeyNumType input = optionsbtn.Input(); - - /* - -------------- Process Input ---------------- - */ - switch (input) { - - case KN_RETURN: - case BUTTON_OPTIONS|KN_BUTTON: - strtrim(string); - process = false; - break; - - case KN_ESC: - case BUTTON_CANCEL|KN_BUTTON: - string[0]= NULL; - strtrim(string); - process = false; - break; - - case BUTTON_EDIT|KN_BUTTON: - break; - } - } -} - diff --git a/TIBERIANDAWN/DESCDLG.H b/TIBERIANDAWN/DESCDLG.H deleted file mode 100644 index 940c7bd..0000000 --- a/TIBERIANDAWN/DESCDLG.H +++ /dev/null @@ -1,66 +0,0 @@ -// -// Copyright 2020 Electronic Arts Inc. -// -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is free -// software: you can redistribute it and/or modify it under the terms of -// the GNU General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. - -// TiberianDawn.DLL and RedAlert.dll and corresponding source code is distributed -// in the hope that it will be useful, but with permitted additional restrictions -// under Section 7 of the GPL. See the GNU General Public License in LICENSE.TXT -// distributed with this program. You should have received a copy of the -// GNU General Public License along with permitted additional restrictions -// with this program. If not, see https://github.com/electronicarts/CnC_Remastered_Collection - -/* $Header: F:\projects\c&c\vcs\code\descdlg.h_v 2.18 16 Oct 1995 16:47:26 JOE_BOSTIC $ */ -/*********************************************************************************************** - *** C O N F I D E N T I A L --- W E S T W O O D S T U D I O S *** - *********************************************************************************************** - * * - * Project Name : Command & Conquer * - * * - * File Name : DESCDLG.H * - * * - * Programmer : Maria del Mar McCready Legg * - * Joe L. Bostic * - * * - * Start Date : Jan 26, 1995 * - * * - * Last Update : Jan 26, 1995 [MML] * - * * - *---------------------------------------------------------------------------------------------*/ - -#ifndef DESCDLG_H -#define DESCDLG_H - -#include "gadget.h" - -class DescriptionClass -{ - private: - - enum DescriptionClassEnum { - OPTION_WIDTH=216, // Width of dialog box. - OPTION_HEIGHT=122, // Height of dialog box. - OPTION_X=(((320 - OPTION_WIDTH) / 2) & ~7), - OPTION_Y=((200 - OPTION_HEIGHT) / 2), - TEXT_X=OPTION_X+32, // Title's x pos - TEXT_Y=OPTION_Y+32, // Add 11 for each following line - BUTTON_OPTIONS=1, // Button number for "Ok" - BUTTON_CANCEL, - BUTTON_EDIT, - BUTTON_X=OPTION_X+63, // Options button x pos - BUTTON_Y=OPTION_Y+102, // Options button y pos - EDIT_Y =OPTION_Y+50, - EDIT_W =180 //204, - }; - - public: - DescriptionClass(void) {}; - void Process(char *string); -}; - -#endif - - diff --git a/TIBERIANDAWN/GOPTIONS.CPP b/TIBERIANDAWN/GOPTIONS.CPP index 9d7f4bb..13be244 100644 --- a/TIBERIANDAWN/GOPTIONS.CPP +++ b/TIBERIANDAWN/GOPTIONS.CPP @@ -43,7 +43,6 @@ #include "gamedlg.h" #include "textbtn.h" #include "confdlg.h" -#include "descdlg.h" void GameOptionsClass::Adjust_Variables_For_Resolution(void) { diff --git a/TIBERIANDAWN/TiberianDawn.vcxproj b/TIBERIANDAWN/TiberianDawn.vcxproj index 51643fd..24f89a6 100644 --- a/TIBERIANDAWN/TiberianDawn.vcxproj +++ b/TIBERIANDAWN/TiberianDawn.vcxproj @@ -202,7 +202,6 @@ - @@ -397,7 +396,6 @@ - diff --git a/TIBERIANDAWN/TiberianDawn.vcxproj.filters b/TIBERIANDAWN/TiberianDawn.vcxproj.filters index b21671c..27bec35 100644 --- a/TIBERIANDAWN/TiberianDawn.vcxproj.filters +++ b/TIBERIANDAWN/TiberianDawn.vcxproj.filters @@ -162,9 +162,6 @@ Source Files - - Source Files - Source Files @@ -734,9 +731,6 @@ Source Files - - Source Files - Source Files @@ -1235,4 +1229,4 @@ Source Files\Resources - \ No newline at end of file +