File tree Expand file tree Collapse file tree 10 files changed +0
-26
lines changed
Core/Libraries/Source/WWVegas/WW3D2
GeneralsMD/Code/GameEngine Expand file tree Collapse file tree 10 files changed +0
-26
lines changed Original file line number Diff line number Diff line change @@ -785,7 +785,6 @@ void Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
785785 if ( ParseHotKey && (*word == L' &' ) && (*word+1 != 0 ) && (*word+1 > L' ' ) && (*word+1 != L' \n ' ))
786786 {
787787 int offset = 0 ;
788- // Added By Saad
789788 if (word_width != 0 )
790789 {
791790 const WCHAR *word_back = word;
@@ -796,7 +795,6 @@ void Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
796795 offset =-1 ;
797796 }
798797 }
799- //
800798 *word++;
801799 calcHotKeyX = true ;
802800 }
@@ -853,7 +851,6 @@ void Render2DSentenceClass::Build_Sentence_Centered (const WCHAR *text, int *hkX
853851 //
854852 word_width = Font->Get_Char_Spacing (*word++);
855853 wordCount = 0 ;
856- // Added By Saad
857854 line_width += word_width;
858855 }
859856 //
Original file line number Diff line number Diff line change @@ -219,10 +219,8 @@ extern Display *TheDisplay;
219219
220220extern void StatDebugDisplay ( DebugDisplayInterface *dd, void *, FILE *fp = NULL );
221221
222- // Added By Saad
223222// Necessary for display resolution confirmation dialog box
224223// Holds the previous and current display settings
225-
226224typedef struct _DisplaySettings
227225{
228226 Int xRes; // Resolution width
Original file line number Diff line number Diff line change @@ -700,7 +700,6 @@ void InitLanGameGadgets( void )
700700 buttonAcceptID[i] = TheNameKeyGenerator->nameToKey ( tmpString );
701701 buttonAccept[i] = TheWindowManager->winGetWindowFromId ( parentLanGameOptions, buttonAcceptID[i] );
702702 DEBUG_ASSERTCRASH (buttonAccept[i], (" Could not find the buttonAccept[%d]" ,i ));
703- // Added by Saad for the tooltips on the MultiPlayer icons
704703 buttonAccept[i]->winSetTooltipFunc (gameAcceptTooltip);
705704//
706705// tmpString.format("LanGameOptionsMenu.wnd:ButtonStartPosition%d", i);
Original file line number Diff line number Diff line change 7171#include " GameNetwork/GameSpy/MainMenuUtils.h"
7272
7373#include " GameClient/CDCheck.h"
74- // Added By Saad
75- // for accessing the InGameUI
7674#include " GameClient/InGameUI.h"
7775
7876
@@ -200,7 +198,6 @@ static Bool justEntered = FALSE;
200198
201199static Bool dontAllowTransitions = FALSE ;
202200
203- // Added by Saad
204201const Int /* TIME_OUT = 15,*/ CORNER = 10 ;
205202void AcceptResolution ();
206203void DeclineResolution ();
Original file line number Diff line number Diff line change 7272#include " GameLogic/GameLogic.h"
7373#include " GameLogic/ScriptEngine.h"
7474#include " WWDownload/Registry.h"
75- // added by saad
76- // used to access a messagebox that does "ok" and "cancel"
7775#include " GameClient/MessageBox.h"
7876
7977#include " ww3d.h"
@@ -201,13 +199,10 @@ static GameWindow * radioLow = NULL;
201199
202200*/
203201
204- // Added By Saad for the resolution confirmation dialog box
205202DisplaySettings oldDispSettings, newDispSettings;
206203Bool dispChanged = FALSE ;
207204extern Int timer;
208205extern void DoResolutionDialog ();
209- //
210-
211206static Bool ignoreSelected = FALSE ;
212207WindowLayout *OptionsLayout = NULL ;
213208
Original file line number Diff line number Diff line change 9595#include " GameNetwork/GameSpyOverlay.h"
9696#include " GameNetwork/GameSpy/BuddyThread.h"
9797#include " GameNetwork/GameSpy/PersistentStorageThread.h"
98- // Added By Saad
9998#include " GameClient/InGameUI.h"
10099
101100
Original file line number Diff line number Diff line change @@ -220,10 +220,8 @@ extern Display *TheDisplay;
220220
221221extern void StatDebugDisplay ( DebugDisplayInterface *dd, void *, FILE *fp = NULL );
222222
223- // Added By Saad
224223// Necessary for display resolution confirmation dialog box
225224// Holds the previous and current display settings
226-
227225typedef struct _DisplaySettings
228226{
229227 Int xRes; // Resolution width
Original file line number Diff line number Diff line change @@ -775,7 +775,6 @@ void InitLanGameGadgets( void )
775775 buttonAcceptID[i] = TheNameKeyGenerator->nameToKey ( tmpString );
776776 buttonAccept[i] = TheWindowManager->winGetWindowFromId ( parentLanGameOptions, buttonAcceptID[i] );
777777 DEBUG_ASSERTCRASH (buttonAccept[i], (" Could not find the buttonAccept[%d]" ,i ));
778- // Added by Saad for the tooltips on the MultiPlayer icons
779778 buttonAccept[i]->winSetTooltipFunc (gameAcceptTooltip);
780779//
781780// tmpString.format("LanGameOptionsMenu.wnd:ButtonStartPosition%d", i);
Original file line number Diff line number Diff line change 7474#include " GameNetwork/GameSpy/MainMenuUtils.h"
7575
7676#include " GameClient/CDCheck.h"
77- // Added By Saad
78- // for accessing the InGameUI
7977#include " GameClient/InGameUI.h"
8078
8179
@@ -208,7 +206,6 @@ static Bool launchChallengeMenu = FALSE;
208206
209207static Bool dontAllowTransitions = FALSE ;
210208
211- // Added by Saad
212209const Int /* TIME_OUT = 15,*/ CORNER = 10 ;
213210void AcceptResolution ();
214211void DeclineResolution ();
Original file line number Diff line number Diff line change 7272#include " GameLogic/GameLogic.h"
7373#include " GameLogic/ScriptEngine.h"
7474#include " WWDownload/Registry.h"
75- // added by saad
76- // used to access a messagebox that does "ok" and "cancel"
7775#include " GameClient/MessageBox.h"
7876
7977#include " ww3d.h"
@@ -210,13 +208,10 @@ static GameWindow * radioLow = NULL;
210208
211209*/
212210
213- // Added By Saad for the resolution confirmation dialog box
214211DisplaySettings oldDispSettings, newDispSettings;
215212Bool dispChanged = FALSE ;
216213extern Int timer;
217214extern void DoResolutionDialog ();
218- //
219-
220215static Bool ignoreSelected = FALSE ;
221216WindowLayout *OptionsLayout = NULL ;
222217
You can’t perform that action at this time.
0 commit comments