tiberium/CnC_Remastered_Collection
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused DESCDLG

Browse source
This commit is contained in:
Andreas Bergmeier 2020-06-29 10:57:56 +02:00
parent 03416d24e1
commit 1ccaad327f
10 changed files with 2 additions and 493 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
REDALERT/DESCDLG.CPP
View file

@ -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;
}
}
}

66
REDALERT/DESCDLG.H
View file

@ -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

1
REDALERT/GOPTIONS.CPP
View file

@ -41,7 +41,6 @@
#include "visudlg.h" #include "visudlg.h"
#include "gamedlg.h" #include "gamedlg.h"
#include "textbtn.h" #include "textbtn.h"
#include "descdlg.h"
#ifdef FIXIT_VERSION_3 // Stalemate games. #ifdef FIXIT_VERSION_3 // Stalemate games.
#include "WolStrng.h" #include "WolStrng.h"

2
REDALERT/RedAlert.vcxproj
View file

@ -220,7 +220,6 @@
<ClCompile Include="CSTRAW.CPP" /> <ClCompile Include="CSTRAW.CPP" />
<ClCompile Include="DDE.CPP" /> <ClCompile Include="DDE.CPP" />
<ClCompile Include="DEBUG.CPP" /> <ClCompile Include="DEBUG.CPP" />
<ClCompile Include="DESCDLG.CPP" />
<ClCompile Include="DIAL8.CPP" /> <ClCompile Include="DIAL8.CPP" />
<ClCompile Include="DIALOG.CPP" /> <ClCompile Include="DIALOG.CPP" />
<ClCompile Include="DIBFILE.CPP" /> <ClCompile Include="DIBFILE.CPP" />
@ -508,7 +507,6 @@
<ClInclude Include="DDE.H" /> <ClInclude Include="DDE.H" />
<ClInclude Include="DEBUG.H" /> <ClInclude Include="DEBUG.H" />
<ClInclude Include="DEFINES.H" /> <ClInclude Include="DEFINES.H" />
<ClInclude Include="DESCDLG.H" />
<ClInclude Include="DIAL8.H" /> <ClInclude Include="DIAL8.H" />
<ClInclude Include="DIBAPI.H" /> <ClInclude Include="DIBAPI.H" />
<ClInclude Include="DIBUTIL.H" /> <ClInclude Include="DIBUTIL.H" />

8
REDALERT/RedAlert.vcxproj.filters
View file

@ -192,9 +192,6 @@
<ClCompile Include="DEBUG.CPP"> <ClCompile Include="DEBUG.CPP">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="DESCDLG.CPP">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="DIAL8.CPP"> <ClCompile Include="DIAL8.CPP">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -1052,9 +1049,6 @@
<ClInclude Include="DEFINES.H"> <ClInclude Include="DEFINES.H">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="DESCDLG.H">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="DIAL8.H"> <ClInclude Include="DIAL8.H">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
@ -1839,4 +1833,4 @@
<Filter>Source Files\Resource</Filter> <Filter>Source Files\Resource</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

181
TIBERIANDAWN/DESCDLG.CPP
View file

@ -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;
}
}
}

66
TIBERIANDAWN/DESCDLG.H
View file

@ -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

1
TIBERIANDAWN/GOPTIONS.CPP
View file

@ -43,7 +43,6 @@
#include "gamedlg.h" #include "gamedlg.h"
#include "textbtn.h" #include "textbtn.h"
#include "confdlg.h" #include "confdlg.h"
#include "descdlg.h"
void GameOptionsClass::Adjust_Variables_For_Resolution(void) void GameOptionsClass::Adjust_Variables_For_Resolution(void)
{ {

2
TIBERIANDAWN/TiberianDawn.vcxproj
View file

@ -202,7 +202,6 @@
<ClInclude Include="DDE.H" /> <ClInclude Include="DDE.H" />
<ClInclude Include="DEBUG.H" /> <ClInclude Include="DEBUG.H" />
<ClInclude Include="DEFINES.H" /> <ClInclude Include="DEFINES.H" />
<ClInclude Include="DESCDLG.H" />
<ClInclude Include="DIAL8.H" /> <ClInclude Include="DIAL8.H" />
<ClInclude Include="DISPLAY.H" /> <ClInclude Include="DISPLAY.H" />
<ClInclude Include="DLLInterface.h" /> <ClInclude Include="DLLInterface.h" />
@ -396,7 +395,6 @@
<ClCompile Include="CREW.CPP" /> <ClCompile Include="CREW.CPP" />
<ClCompile Include="DDE.CPP" /> <ClCompile Include="DDE.CPP" />
<ClCompile Include="DEBUG.CPP" /> <ClCompile Include="DEBUG.CPP" />
<ClCompile Include="DESCDLG.CPP" />
<ClCompile Include="DIAL8.CPP" /> <ClCompile Include="DIAL8.CPP" />
<ClCompile Include="DIALOG.CPP" /> <ClCompile Include="DIALOG.CPP" />
<ClCompile Include="DISPLAY.CPP" /> <ClCompile Include="DISPLAY.CPP" />

8
TIBERIANDAWN/TiberianDawn.vcxproj.filters
View file

@ -162,9 +162,6 @@
<ClInclude Include="DEFINES.H"> <ClInclude Include="DEFINES.H">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="DESCDLG.H">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="DIAL8.H"> <ClInclude Include="DIAL8.H">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
@ -731,9 +728,6 @@
<ClCompile Include="DEBUG.CPP"> <ClCompile Include="DEBUG.CPP">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="DESCDLG.CPP">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="DIAL8.CPP"> <ClCompile Include="DIAL8.CPP">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -1232,4 +1226,4 @@
<Filter>Source Files\Resources</Filter> <Filter>Source Files\Resources</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>