GameExecutable: Fix spaces for headers.

This commit is contained in:
zcaliptium 2016-03-31 22:43:28 +03:00
parent 7972586d1d
commit 6434adfc1b
53 changed files with 547 additions and 560 deletions

View File

@ -20,11 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
enum ArrowDir { enum ArrowDir {
AD_NONE, AD_NONE,
AD_UP, AD_UP,
AD_DOWN, AD_DOWN,
AD_LEFT, AD_LEFT,
AD_RIGHT, AD_RIGHT,
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -1,15 +0,0 @@
/* Copyright (c) 2002-2012 Croteam Ltd.
This program is free software; you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License as published by
the Free Software Foundation
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#define CD_CHECK 1

View File

@ -21,9 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CFileInfo { class CFileInfo {
public: public:
CListNode fi_lnNode; CListNode fi_lnNode;
CTFileName fi_fnFile; CTFileName fi_fnFile;
CTString fi_strName; CTString fi_strName;
}; };

View File

@ -24,9 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGArrow : public CMGButton { class CMGArrow : public CMGButton {
public: public:
enum ArrowDir mg_adDirection; enum ArrowDir mg_adDirection;
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
void OnActivate(void); void OnActivate(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,24 +23,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGButton : public CMenuGadget { class CMGButton : public CMenuGadget {
public: public:
CTString mg_strLabel; // for those that have labels separately from main text CTString mg_strLabel; // for those that have labels separately from main text
CTString mg_strText; CTString mg_strText;
INDEX mg_iCenterI; INDEX mg_iCenterI;
enum ButtonFontSize mg_bfsFontSize; enum ButtonFontSize mg_bfsFontSize;
BOOL mg_bEditing; BOOL mg_bEditing;
BOOL mg_bHighlighted; BOOL mg_bHighlighted;
BOOL mg_bRectangle; BOOL mg_bRectangle;
BOOL mg_bMental; BOOL mg_bMental;
INDEX mg_iTextMode; INDEX mg_iTextMode;
INDEX mg_iCursorPos; INDEX mg_iCursorPos;
INDEX mg_iIndex;
INDEX mg_iIndex; void(*mg_pActivatedFunction)(void);
void(*mg_pActivatedFunction)(void);
CMGButton(void); CMGButton(void);
void SetText(CTString strNew); void SetText(CTString strNew);
void OnActivate(void); void OnActivate(void);
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
PIX GetCharOffset(CDrawPort *pdp, INDEX iCharNo); PIX GetCharOffset(CDrawPort *pdp, INDEX iCharNo);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,10 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGChangePlayer : public CMGButton { class CMGChangePlayer : public CMGButton {
public: public:
INDEX mg_iLocalPlayer; INDEX mg_iLocalPlayer;
void SetPlayerText(void); void SetPlayerText(void);
void OnActivate(void); void OnActivate(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,18 +23,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGEdit : public CMGButton { class CMGEdit : public CMGButton {
public: public:
INDEX mg_ctMaxStringLen; INDEX mg_ctMaxStringLen;
CTString *mg_pstrToChange; CTString *mg_pstrToChange;
CMGEdit(void);
// return TRUE if handled CMGEdit(void);
BOOL OnKeyDown(int iVKey);
BOOL OnChar(MSG msg); // return TRUE if handled
void Clear(void); BOOL OnKeyDown(int iVKey);
void OnActivate(void); BOOL OnChar(MSG msg);
void OnKillFocus(void); void Clear(void);
void Render(CDrawPort *pdp); void OnActivate(void);
virtual void OnStringChanged(void); void OnKillFocus(void);
virtual void OnStringCanceled(void); void Render(CDrawPort *pdp);
virtual void OnStringChanged(void);
virtual void OnStringCanceled(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -26,30 +26,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define FBS_RENAME 2 // renaming existing file #define FBS_RENAME 2 // renaming existing file
class CMGFileButton : public CMGEdit { class CMGFileButton : public CMGEdit {
public: public:
CMGFileButton(void); CMGFileButton(void);
CTFileName mg_fnm; CTFileName mg_fnm;
CTString mg_strDes; // entire description goes here CTString mg_strDes; // entire description goes here
CTString mg_strInfo; // info part of text to print above the gadget tip CTString mg_strInfo; // info part of text to print above the gadget tip
INDEX mg_iState; INDEX mg_iState;
// refresh current text from description
void RefreshText(void);
// save description to disk
void SaveDescription(void);
void SaveYes(void);
void DoSave(void);
void DoLoad(void);
void StartEdit(void);
// return TRUE if handled // refresh current text from description
BOOL OnKeyDown(int iVKey); void RefreshText(void);
void OnActivate(void); // save description to disk
void OnSetFocus(void); void SaveDescription(void);
void OnKillFocus(void); void SaveYes(void);
void DoSave(void);
void DoLoad(void);
void StartEdit(void);
// overrides from edit gadget // return TRUE if handled
void OnStringChanged(void); BOOL OnKeyDown(int iVKey);
void OnStringCanceled(void); void OnActivate(void);
void Render(CDrawPort *pdp); void OnSetFocus(void);
void OnKillFocus(void);
// overrides from edit gadget
void OnStringChanged(void);
void OnStringCanceled(void);
void Render(CDrawPort *pdp);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGHighScore : public CMenuGadget { class CMGHighScore : public CMenuGadget {
public: public:
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,23 +23,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGKeyDefinition : public CMenuGadget { class CMGKeyDefinition : public CMenuGadget {
public: public:
INDEX mg_iState; INDEX mg_iState;
INDEX mg_iControlNumber; INDEX mg_iControlNumber;
CTString mg_strLabel; CTString mg_strLabel;
CTString mg_strBinding; CTString mg_strBinding;
CMGKeyDefinition(void); CMGKeyDefinition(void);
void Appear(void); void Appear(void);
void Disappear(void); void Disappear(void);
void OnActivate(void); void OnActivate(void);
// return TRUE if handled // return TRUE if handled
BOOL OnKeyDown(int iVKey); BOOL OnKeyDown(int iVKey);
void Think(void); void Think(void);
// set names for both key bindings // set names for both key bindings
void SetBindingNames(BOOL bDefining); void SetBindingNames(BOOL bDefining);
void DefineKey(INDEX iDik); void DefineKey(INDEX iDik);
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,10 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGLevelButton : public CMGButton { class CMGLevelButton : public CMGButton {
public: public:
CTFileName mg_fnmLevel; CTFileName mg_fnmLevel;
void OnActivate(void); void OnActivate(void);
void OnSetFocus(void); void OnSetFocus(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,13 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGModel : public CMGButton { class CMGModel : public CMGButton {
public: public:
CModelObject mg_moModel; CModelObject mg_moModel;
CModelObject mg_moFloor; CModelObject mg_moFloor;
CPlacement3D mg_plModel; CPlacement3D mg_plModel;
BOOL mg_fFloorY; BOOL mg_fFloorY;
CMGModel(void); CMGModel(void);
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,44 +23,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGServerList : public CMGButton { class CMGServerList : public CMGButton {
public: public:
INDEX mg_iSelected; INDEX mg_iSelected;
INDEX mg_iFirstOnScreen; INDEX mg_iFirstOnScreen;
INDEX mg_ctOnScreen; INDEX mg_ctOnScreen;
// server list dimensions // server list dimensions
PIX mg_pixMinI; PIX mg_pixMinI;
PIX mg_pixMaxI; PIX mg_pixMaxI;
PIX mg_pixListMinJ; PIX mg_pixListMinJ;
PIX mg_pixListStepJ; PIX mg_pixListStepJ;
// header dimensions // header dimensions
PIX mg_pixHeaderMinJ; PIX mg_pixHeaderMinJ;
PIX mg_pixHeaderMidJ; PIX mg_pixHeaderMidJ;
PIX mg_pixHeaderMaxJ; PIX mg_pixHeaderMaxJ;
PIX mg_pixHeaderI[8]; PIX mg_pixHeaderI[8];
// scrollbar dimensions // scrollbar dimensions
PIX mg_pixSBMinI; PIX mg_pixSBMinI;
PIX mg_pixSBMaxI; PIX mg_pixSBMaxI;
PIX mg_pixSBMinJ; PIX mg_pixSBMinJ;
PIX mg_pixSBMaxJ; PIX mg_pixSBMaxJ;
// scrollbar dragging params // scrollbar dragging params
PIX mg_pixDragJ; PIX mg_pixDragJ;
PIX mg_iDragLine; PIX mg_iDragLine;
PIX mg_pixMouseDrag; PIX mg_pixMouseDrag;
// current mouse pos // current mouse pos
PIX mg_pixMouseI; PIX mg_pixMouseI;
PIX mg_pixMouseJ; PIX mg_pixMouseJ;
INDEX mg_iSort; // column to sort by INDEX mg_iSort; // column to sort by
BOOL mg_bSortDown; // sort in reverse order BOOL mg_bSortDown; // sort in reverse order
CMGServerList(); CMGServerList();
BOOL OnKeyDown(int iVKey); BOOL OnKeyDown(int iVKey);
PIXaabbox2D GetScrollBarFullBox(void); PIXaabbox2D GetScrollBarFullBox(void);
PIXaabbox2D GetScrollBarHandleBox(void); PIXaabbox2D GetScrollBarHandleBox(void);
void OnSetFocus(void); void OnSetFocus(void);
void OnKillFocus(void); void OnKillFocus(void);
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
void AdjustFirstOnScreen(void); void AdjustFirstOnScreen(void);
void OnMouseOver(PIX pixI, PIX pixJ); void OnMouseOver(PIX pixI, PIX pixJ);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,19 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGSlider : public CMGButton { class CMGSlider : public CMGButton {
public: public:
FLOAT mg_fFactor; FLOAT mg_fFactor;
INDEX mg_iMinPos; INDEX mg_iMinPos;
INDEX mg_iMaxPos; INDEX mg_iMaxPos;
INDEX mg_iCurPos; INDEX mg_iCurPos;
CMGSlider(); CMGSlider();
void ApplyCurrentPosition(void); void ApplyCurrentPosition(void);
void ApplyGivenPosition(INDEX iMin, INDEX iMax, INDEX iCur); void ApplyGivenPosition(INDEX iMin, INDEX iMax, INDEX iCur);
// return TRUE if handled // return TRUE if handled
virtual BOOL OnKeyDown(int iVKey); virtual BOOL OnKeyDown(int iVKey);
void(*mg_pOnSliderChange)(INDEX iCurPos); void(*mg_pOnSliderChange)(INDEX iCurPos);
PIXaabbox2D GetSliderBox(void); PIXaabbox2D GetSliderBox(void);
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGTitle : public CMenuGadget { class CMGTitle : public CMenuGadget {
public: public:
CTString mg_strText; CTString mg_strText;
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,24 +23,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGTrigger : public CMenuGadget { class CMGTrigger : public CMenuGadget {
public: public:
CTString mg_strLabel; CTString mg_strLabel;
CTString mg_strValue; CTString mg_strValue;
CTString *mg_astrTexts; CTString *mg_astrTexts;
INDEX mg_ctTexts; INDEX mg_ctTexts;
INDEX mg_iSelected; INDEX mg_iSelected;
INDEX mg_iCenterI; INDEX mg_iCenterI;
BOOL mg_bVisual; BOOL mg_bVisual;
CMGTrigger(void); CMGTrigger(void);
void ApplyCurrentSelection(void); void ApplyCurrentSelection(void);
void OnSetNextInList(int iVKey); void OnSetNextInList(int iVKey);
void(*mg_pPreTriggerChange)(INDEX iCurrentlySelected); void(*mg_pPreTriggerChange)(INDEX iCurrentlySelected);
void(*mg_pOnTriggerChange)(INDEX iCurrentlySelected); void(*mg_pOnTriggerChange)(INDEX iCurrentlySelected);
// return TRUE if handled // return TRUE if handled
BOOL OnKeyDown(int iVKey); BOOL OnKeyDown(int iVKey);
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,12 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMGVarButton : public CMGButton { class CMGVarButton : public CMGButton {
public: public:
class CVarSetting *mg_pvsVar; class CVarSetting *mg_pvsVar;
PIXaabbox2D GetSliderBox(void); PIXaabbox2D GetSliderBox(void);
BOOL OnKeyDown(int iVKey); BOOL OnKeyDown(int iVKey);
void Render(CDrawPort *pdp); void Render(CDrawPort *pdp);
BOOL IsSeparator(void); BOOL IsSeparator(void);
BOOL IsEnabled(void); BOOL IsEnabled(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -29,41 +29,41 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMenuGadget { class CMenuGadget {
public: public:
CListNode mg_lnNode; CListNode mg_lnNode;
FLOATaabbox2D mg_boxOnScreen; FLOATaabbox2D mg_boxOnScreen;
BOOL mg_bVisible; BOOL mg_bVisible;
BOOL mg_bEnabled; BOOL mg_bEnabled;
BOOL mg_bLabel; BOOL mg_bLabel;
BOOL mg_bFocused; BOOL mg_bFocused;
INDEX mg_iInList; // for scrollable gadget lists INDEX mg_iInList; // for scrollable gadget lists
CTString mg_strTip; CTString mg_strTip;
CMenuGadget *mg_pmgLeft; CMenuGadget *mg_pmgLeft;
CMenuGadget *mg_pmgRight; CMenuGadget *mg_pmgRight;
CMenuGadget *mg_pmgUp; CMenuGadget *mg_pmgUp;
CMenuGadget *mg_pmgDown; CMenuGadget *mg_pmgDown;
CMenuGadget(void); CMenuGadget(void);
// return TRUE if handled // return TRUE if handled
virtual BOOL OnKeyDown(int iVKey); virtual BOOL OnKeyDown(int iVKey);
virtual BOOL OnChar(MSG msg); virtual BOOL OnChar(MSG msg);
virtual void OnActivate(void); virtual void OnActivate(void);
virtual void OnSetFocus(void); virtual void OnSetFocus(void);
virtual void OnKillFocus(void); virtual void OnKillFocus(void);
virtual void Appear(void); virtual void Appear(void);
virtual void Disappear(void); virtual void Disappear(void);
virtual void Think(void); virtual void Think(void);
virtual void OnMouseOver(PIX pixI, PIX pixJ); virtual void OnMouseOver(PIX pixI, PIX pixJ);
virtual COLOR GetCurrentColor(void); virtual COLOR GetCurrentColor(void);
virtual void Render(CDrawPort *pdp); virtual void Render(CDrawPort *pdp);
virtual BOOL IsSeparator(void) { return FALSE; }; virtual BOOL IsSeparator(void) { return FALSE; };
}; };
enum ButtonFontSize { enum ButtonFontSize {
BFS_SMALL = 0, BFS_SMALL = 0,
BFS_MEDIUM = 1, BFS_MEDIUM = 1,
BFS_LARGE = 2, BFS_LARGE = 2,
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -21,31 +21,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CGameMenu { class CGameMenu {
public: public:
CListHead gm_lhGadgets; CListHead gm_lhGadgets;
CGameMenu *gm_pgmParentMenu; CGameMenu *gm_pgmParentMenu;
BOOL gm_bPopup; BOOL gm_bPopup;
const char *gm_strName; // menu name (for mod interface only) const char *gm_strName; // menu name (for mod interface only)
class CMenuGadget *gm_pmgSelectedByDefault; class CMenuGadget *gm_pmgSelectedByDefault;
class CMenuGadget *gm_pmgArrowUp; class CMenuGadget *gm_pmgArrowUp;
class CMenuGadget *gm_pmgArrowDn; class CMenuGadget *gm_pmgArrowDn;
class CMenuGadget *gm_pmgListTop; class CMenuGadget *gm_pmgListTop;
class CMenuGadget *gm_pmgListBottom; class CMenuGadget *gm_pmgListBottom;
INDEX gm_iListOffset; INDEX gm_iListOffset;
INDEX gm_iListWantedItem; // item you want to focus initially INDEX gm_iListWantedItem; // item you want to focus initially
INDEX gm_ctListVisible; INDEX gm_ctListVisible;
INDEX gm_ctListTotal; INDEX gm_ctListTotal;
CGameMenu(void); CGameMenu(void);
void ScrollList(INDEX iDir); void ScrollList(INDEX iDir);
void KillAllFocuses(void); void KillAllFocuses(void);
virtual void Initialize_t(void); virtual void Initialize_t(void);
virtual void Destroy(void); virtual void Destroy(void);
virtual void StartMenu(void); virtual void StartMenu(void);
virtual void FillListItems(void); virtual void FillListItems(void);
virtual void EndMenu(void); virtual void EndMenu(void);
// return TRUE if handled // return TRUE if handled
virtual BOOL OnKeyDown(int iVKey); virtual BOOL OnKeyDown(int iVKey);
virtual BOOL OnChar(MSG msg); virtual BOOL OnChar(MSG msg);
virtual void Think(void); virtual void Think(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -27,16 +27,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CAudioOptionsMenu : public CGameMenu { class CAudioOptionsMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGTrigger gm_mgAudioAutoTrigger; CMGTrigger gm_mgAudioAutoTrigger;
CMGTrigger gm_mgAudioAPITrigger; CMGTrigger gm_mgAudioAPITrigger;
CMGTrigger gm_mgFrequencyTrigger; CMGTrigger gm_mgFrequencyTrigger;
CMGSlider gm_mgWaveVolume; CMGSlider gm_mgWaveVolume;
CMGSlider gm_mgMPEGVolume; CMGSlider gm_mgMPEGVolume;
CMGButton gm_mgApply; CMGButton gm_mgApply;
void StartMenu(void); void StartMenu(void);
void Initialize_t(void); void Initialize_t(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -24,19 +24,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CConfirmMenu : public CGameMenu { class CConfirmMenu : public CGameMenu {
public: public:
CMGButton gm_mgConfirmLabel; CMGButton gm_mgConfirmLabel;
CMGButton gm_mgConfirmYes; CMGButton gm_mgConfirmYes;
CMGButton gm_mgConfirmNo; CMGButton gm_mgConfirmNo;
void(*_pConfimedYes)(void) = NULL; void(*_pConfimedYes)(void) = NULL;
void(*_pConfimedNo)(void) = NULL; void(*_pConfimedNo)(void) = NULL;
void Initialize_t(void); void Initialize_t(void);
// return TRUE if handled // return TRUE if handled
BOOL OnKeyDown(int iVKey); BOOL OnKeyDown(int iVKey);
void BeLarge(void); void BeLarge(void);
void BeSmall(void); void BeSmall(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -27,22 +27,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CControlsMenu : public CGameMenu { class CControlsMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgNameLabel; CMGButton gm_mgNameLabel;
CMGButton gm_mgButtons; CMGButton gm_mgButtons;
CMGSlider gm_mgSensitivity; CMGSlider gm_mgSensitivity;
CMGTrigger gm_mgInvertTrigger; CMGTrigger gm_mgInvertTrigger;
CMGTrigger gm_mgSmoothTrigger; CMGTrigger gm_mgSmoothTrigger;
CMGTrigger gm_mgAccelTrigger; CMGTrigger gm_mgAccelTrigger;
CMGTrigger gm_mgIFeelTrigger; CMGTrigger gm_mgIFeelTrigger;
CMGButton gm_mgPredefined; CMGButton gm_mgPredefined;
CMGButton gm_mgAdvanced; CMGButton gm_mgAdvanced;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
void ObtainActionSettings(void); void ObtainActionSettings(void);
void ApplyActionSettings(void); void ApplyActionSettings(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CCreditsMenu : public CGameMenu { class CCreditsMenu : public CGameMenu {
public: public:
void Initialize_t(void); void Initialize_t(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -26,21 +26,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CCustomizeAxisMenu : public CGameMenu { class CCustomizeAxisMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGTrigger gm_mgActionTrigger; CMGTrigger gm_mgActionTrigger;
CMGTrigger gm_mgMountedTrigger; CMGTrigger gm_mgMountedTrigger;
CMGSlider gm_mgSensitivity; CMGSlider gm_mgSensitivity;
CMGSlider gm_mgDeadzone; CMGSlider gm_mgDeadzone;
CMGTrigger gm_mgInvertTrigger; CMGTrigger gm_mgInvertTrigger;
CMGTrigger gm_mgRelativeTrigger; CMGTrigger gm_mgRelativeTrigger;
CMGTrigger gm_mgSmoothTrigger; CMGTrigger gm_mgSmoothTrigger;
~CCustomizeAxisMenu(void); ~CCustomizeAxisMenu(void);
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
void ObtainActionSettings(void); void ObtainActionSettings(void);
void ApplyActionSettings(void); void ApplyActionSettings(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -26,15 +26,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CCustomizeKeyboardMenu : public CGameMenu { class CCustomizeKeyboardMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGKeyDefinition gm_mgKey[KEYS_ON_SCREEN]; CMGKeyDefinition gm_mgKey[KEYS_ON_SCREEN];
CMGArrow gm_mgArrowUp; CMGArrow gm_mgArrowUp;
CMGArrow gm_mgArrowDn; CMGArrow gm_mgArrowDn;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
void FillListItems(void); void FillListItems(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,10 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CDisabledMenu : public CGameMenu { class CDisabledMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgButton; CMGButton gm_mgButton;
void Initialize_t(void); void Initialize_t(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,11 +25,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CHighScoreMenu : public CGameMenu { class CHighScoreMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGHighScore gm_mgHScore; CMGHighScore gm_mgHScore;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,21 +25,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CInGameMenu : public CGameMenu { class CInGameMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgLabel1; CMGButton gm_mgLabel1;
CMGButton gm_mgLabel2; CMGButton gm_mgLabel2;
CMGButton gm_mgQuickLoad; CMGButton gm_mgQuickLoad;
CMGButton gm_mgQuickSave; CMGButton gm_mgQuickSave;
CMGButton gm_mgLoad; CMGButton gm_mgLoad;
CMGButton gm_mgSave; CMGButton gm_mgSave;
CMGButton gm_mgDemoRec; CMGButton gm_mgDemoRec;
CMGButton gm_mgHighScore; CMGButton gm_mgHighScore;
CMGButton gm_mgOptions; CMGButton gm_mgOptions;
CMGButton gm_mgStop; CMGButton gm_mgStop;
CMGButton gm_mgQuit; CMGButton gm_mgQuit;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -26,14 +26,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CLevelsMenu : public CGameMenu { class CLevelsMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGLevelButton gm_mgManualLevel[LEVELS_ON_SCREEN]; CMGLevelButton gm_mgManualLevel[LEVELS_ON_SCREEN];
CMGArrow gm_mgArrowUp; CMGArrow gm_mgArrowUp;
CMGArrow gm_mgArrowDn; CMGArrow gm_mgArrowDn;
void Initialize_t(void); void Initialize_t(void);
void FillListItems(void); void FillListItems(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -26,49 +26,54 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define SAVELOAD_BUTTONS_CT 14 #define SAVELOAD_BUTTONS_CT 14
enum ELSSortType
{
LSSORT_NONE,
LSSORT_NAMEUP,
LSSORT_NAMEDN,
LSSORT_FILEUP,
LSSORT_FILEDN,
};
class CLoadSaveMenu : public CGameMenu { class CLoadSaveMenu : public CGameMenu {
public: public:
// settings adjusted before starting the menu // settings adjusted before starting the menu
CGameMenu *gm_pgmNextMenu; // menu to go to after selecting a file (if null, use parent menu) CGameMenu *gm_pgmNextMenu; // menu to go to after selecting a file (if null, use parent menu)
CTFileName gm_fnmSelected; // file that is selected initially CTFileName gm_fnmSelected; // file that is selected initially
CTFileName gm_fnmDirectory; // directory that should be read CTFileName gm_fnmDirectory; // directory that should be read
CTFileName gm_fnmBaseName; // base file name for saving (numbers are auto-added) CTFileName gm_fnmBaseName; // base file name for saving (numbers are auto-added)
CTFileName gm_fnmExt; // accepted file extension CTFileName gm_fnmExt; // accepted file extension
BOOL gm_bSave; // set when chosing file for saving BOOL gm_bSave; // set when chosing file for saving
BOOL gm_bManage; // set if managing (rename/delet is enabled) BOOL gm_bManage; // set if managing (rename/delet is enabled)
CTString gm_strSaveDes; // default description (if saving) CTString gm_strSaveDes; // default description (if saving)
BOOL gm_bAllowThumbnails; // set when chosing file for saving BOOL gm_bAllowThumbnails; // set when chosing file for saving
BOOL gm_bNoEscape; // forbid exiting with escape/rmb BOOL gm_bNoEscape; // forbid exiting with escape/rmb
#define LSSORT_NONE 0
#define LSSORT_NAMEUP 1
#define LSSORT_NAMEDN 2
#define LSSORT_FILEUP 3
#define LSSORT_FILEDN 4
INDEX gm_iSortType; // sort type
// function to activate when file is chosen INDEX gm_iSortType; // sort type
// return true if saving succeeded - description is saved automatically
// always return true for loading
BOOL(*gm_pAfterFileChosen)(const CTFileName &fnm);
// internal properties // function to activate when file is chosen
CListHead gm_lhFileInfos; // all file infos to list // return true if saving succeeded - description is saved automatically
INDEX gm_iLastFile; // index of last saved file in numbered format // always return true for loading
BOOL(*gm_pAfterFileChosen)(const CTFileName &fnm);
CMGTitle gm_mgTitle; // internal properties
CMGButton gm_mgNotes; CListHead gm_lhFileInfos; // all file infos to list
CMGFileButton gm_amgButton[SAVELOAD_BUTTONS_CT]; INDEX gm_iLastFile; // index of last saved file in numbered format
CMGArrow gm_mgArrowUp;
CMGArrow gm_mgArrowDn;
// called to get info of a file from directory, or to skip it CMGTitle gm_mgTitle;
BOOL ParseFile(const CTFileName &fnm, CTString &strName); CMGButton gm_mgNotes;
CMGFileButton gm_amgButton[SAVELOAD_BUTTONS_CT];
CMGArrow gm_mgArrowUp;
CMGArrow gm_mgArrowDn;
void Initialize_t(void); // called to get info of a file from directory, or to skip it
void StartMenu(void); BOOL ParseFile(const CTFileName &fnm, CTString &strName);
void EndMenu(void);
void FillListItems(void); void Initialize_t(void);
void StartMenu(void);
void EndMenu(void);
void FillListItems(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -24,19 +24,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMainMenu : public CGameMenu { class CMainMenu : public CGameMenu {
public: public:
CMGButton gm_mgVersionLabel; CMGButton gm_mgVersionLabel;
CMGButton gm_mgModLabel; CMGButton gm_mgModLabel;
CMGButton gm_mgSingle; CMGButton gm_mgSingle;
CMGButton gm_mgNetwork; CMGButton gm_mgNetwork;
CMGButton gm_mgSplitScreen; CMGButton gm_mgSplitScreen;
CMGButton gm_mgDemo; CMGButton gm_mgDemo;
CMGButton gm_mgMods; CMGButton gm_mgMods;
CMGButton gm_mgHighScore; CMGButton gm_mgHighScore;
CMGButton gm_mgOptions; CMGButton gm_mgOptions;
CMGButton gm_mgQuit; CMGButton gm_mgQuit;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,14 +25,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CNetworkMenu : public CGameMenu { class CNetworkMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgJoin; CMGButton gm_mgJoin;
CMGButton gm_mgStart; CMGButton gm_mgStart;
CMGButton gm_mgQuickLoad; CMGButton gm_mgQuickLoad;
CMGButton gm_mgLoad; CMGButton gm_mgLoad;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,12 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CNetworkJoinMenu : public CGameMenu { class CNetworkJoinMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgLAN; CMGButton gm_mgLAN;
CMGButton gm_mgNET; CMGButton gm_mgNET;
CMGButton gm_mgOpen; CMGButton gm_mgOpen;
void Initialize_t(void); void Initialize_t(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -26,18 +26,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CNetworkOpenMenu : public CGameMenu { class CNetworkOpenMenu : public CGameMenu {
public: public:
CTString gm_strPort; CTString gm_strPort;
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgAddressLabel; CMGButton gm_mgAddressLabel;
CMGEdit gm_mgAddress; CMGEdit gm_mgAddress;
CMGButton gm_mgPortLabel; CMGButton gm_mgPortLabel;
CMGEdit gm_mgPort; CMGEdit gm_mgPort;
CMGButton gm_mgJoin; CMGButton gm_mgJoin;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -27,20 +27,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CNetworkStartMenu : public CGameMenu { class CNetworkStartMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGEdit gm_mgSessionName; CMGEdit gm_mgSessionName;
CMGTrigger gm_mgGameType; CMGTrigger gm_mgGameType;
CMGTrigger gm_mgDifficulty; CMGTrigger gm_mgDifficulty;
CMGButton gm_mgLevel; CMGButton gm_mgLevel;
CMGTrigger gm_mgMaxPlayers; CMGTrigger gm_mgMaxPlayers;
CMGTrigger gm_mgWaitAllPlayers; CMGTrigger gm_mgWaitAllPlayers;
CMGTrigger gm_mgVisible; CMGTrigger gm_mgVisible;
CMGButton gm_mgGameOptions; CMGButton gm_mgGameOptions;
CMGButton gm_mgStart; CMGButton gm_mgStart;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,13 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class COptionsMenu : public CGameMenu { class COptionsMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgVideoOptions; CMGButton gm_mgVideoOptions;
CMGButton gm_mgAudioOptions; CMGButton gm_mgAudioOptions;
CMGButton gm_mgPlayerProfileOptions; CMGButton gm_mgPlayerProfileOptions;
CMGButton gm_mgNetworkOptions; CMGButton gm_mgNetworkOptions;
CMGButton gm_mgCustomOptions; CMGButton gm_mgCustomOptions;
CMGButton gm_mgAddonOptions; CMGButton gm_mgAddonOptions;
void Initialize_t(void); void Initialize_t(void);
}; };

View File

@ -28,34 +28,34 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CPlayerProfileMenu : public CGameMenu { class CPlayerProfileMenu : public CGameMenu {
public: public:
INDEX *gm_piCurrentPlayer; INDEX *gm_piCurrentPlayer;
CMGTitle gm_mgProfileTitle; CMGTitle gm_mgProfileTitle;
CMGButton gm_mgNoLabel; CMGButton gm_mgNoLabel;
CMGButton gm_mgNumber[8]; CMGButton gm_mgNumber[8];
CMGButton gm_mgNameLabel; CMGButton gm_mgNameLabel;
CMGEdit gm_mgNameField; CMGEdit gm_mgNameField;
CMGButton gm_mgTeamLabel; CMGButton gm_mgTeamLabel;
CMGEdit gm_mgTeam; CMGEdit gm_mgTeam;
CMGButton gm_mgCustomizeControls; CMGButton gm_mgCustomizeControls;
CMGTrigger gm_mgCrosshair; CMGTrigger gm_mgCrosshair;
CMGTrigger gm_mgWeaponSelect; CMGTrigger gm_mgWeaponSelect;
CMGTrigger gm_mgWeaponHide; CMGTrigger gm_mgWeaponHide;
CMGTrigger gm_mg3rdPerson; CMGTrigger gm_mg3rdPerson;
CMGTrigger gm_mgQuotes; CMGTrigger gm_mgQuotes;
CMGTrigger gm_mgAutoSave; CMGTrigger gm_mgAutoSave;
CMGTrigger gm_mgCompDoubleClick; CMGTrigger gm_mgCompDoubleClick;
CMGTrigger gm_mgViewBobbing; CMGTrigger gm_mgViewBobbing;
CMGTrigger gm_mgSharpTurning; CMGTrigger gm_mgSharpTurning;
CMGModel gm_mgModel; CMGModel gm_mgModel;
void Initialize_t(void); void Initialize_t(void);
INDEX ComboFromPlayer(INDEX iPlayer); INDEX ComboFromPlayer(INDEX iPlayer);
INDEX PlayerFromCombo(INDEX iCombo); INDEX PlayerFromCombo(INDEX iCombo);
void SelectPlayer(INDEX iPlayer); void SelectPlayer(INDEX iPlayer);
void ApplyComboPlayer(INDEX iPlayer); void ApplyComboPlayer(INDEX iPlayer);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CRenderingOptionsMenu : public CGameMenu { class CRenderingOptionsMenu : public CGameMenu {
public: public:
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
void Initialize_t(void); void Initialize_t(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -27,27 +27,27 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CSelectPlayersMenu : public CGameMenu { class CSelectPlayersMenu : public CGameMenu {
public: public:
BOOL gm_bAllowDedicated; BOOL gm_bAllowDedicated;
BOOL gm_bAllowObserving; BOOL gm_bAllowObserving;
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGTrigger gm_mgDedicated; CMGTrigger gm_mgDedicated;
CMGTrigger gm_mgObserver; CMGTrigger gm_mgObserver;
CMGTrigger gm_mgSplitScreenCfg; CMGTrigger gm_mgSplitScreenCfg;
CMGChangePlayer gm_mgPlayer0Change; CMGChangePlayer gm_mgPlayer0Change;
CMGChangePlayer gm_mgPlayer1Change; CMGChangePlayer gm_mgPlayer1Change;
CMGChangePlayer gm_mgPlayer2Change; CMGChangePlayer gm_mgPlayer2Change;
CMGChangePlayer gm_mgPlayer3Change; CMGChangePlayer gm_mgPlayer3Change;
CMGButton gm_mgNotes; CMGButton gm_mgNotes;
CMGButton gm_mgStart; CMGButton gm_mgStart;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -27,15 +27,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CServersMenu : public CGameMenu { class CServersMenu : public CGameMenu {
public: public:
BOOL m_bInternet; BOOL m_bInternet;
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGServerList gm_mgList; CMGServerList gm_mgList;
CMGButton gm_mgRefresh; CMGButton gm_mgRefresh;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void Think(void); void Think(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,19 +25,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CSinglePlayerMenu : public CGameMenu { class CSinglePlayerMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgPlayerLabel; CMGButton gm_mgPlayerLabel;
CMGButton gm_mgNewGame; CMGButton gm_mgNewGame;
CMGButton gm_mgCustom; CMGButton gm_mgCustom;
CMGButton gm_mgQuickLoad; CMGButton gm_mgQuickLoad;
CMGButton gm_mgLoad; CMGButton gm_mgLoad;
CMGButton gm_mgTraining; CMGButton gm_mgTraining;
CMGButton gm_mgTechTest; CMGButton gm_mgTechTest;
CMGButton gm_mgPlayersAndControls; CMGButton gm_mgPlayersAndControls;
CMGButton gm_mgOptions; CMGButton gm_mgOptions;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,16 +25,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CSinglePlayerNewMenu : public CGameMenu { class CSinglePlayerNewMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgTourist; CMGButton gm_mgTourist;
CMGButton gm_mgEasy; CMGButton gm_mgEasy;
CMGButton gm_mgMedium; CMGButton gm_mgMedium;
CMGButton gm_mgHard; CMGButton gm_mgHard;
CMGButton gm_mgSerious; CMGButton gm_mgSerious;
CMGButton gm_mgMental; CMGButton gm_mgMental;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -25,13 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CSplitScreenMenu : public CGameMenu { class CSplitScreenMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGButton gm_mgStart; CMGButton gm_mgStart;
CMGButton gm_mgQuickLoad; CMGButton gm_mgQuickLoad;
CMGButton gm_mgLoad; CMGButton gm_mgLoad;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -26,16 +26,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CSplitStartMenu : public CGameMenu { class CSplitStartMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGTrigger gm_mgGameType; CMGTrigger gm_mgGameType;
CMGTrigger gm_mgDifficulty; CMGTrigger gm_mgDifficulty;
CMGButton gm_mgLevel; CMGButton gm_mgLevel;
CMGButton gm_mgOptions; CMGButton gm_mgOptions;
CMGButton gm_mgStart; CMGButton gm_mgStart;
void Initialize_t(void); void Initialize_t(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -27,19 +27,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CVarMenu : public CGameMenu { class CVarMenu : public CGameMenu {
public: public:
CTFileName gm_fnmMenuCFG; CTFileName gm_fnmMenuCFG;
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGVarButton gm_mgVar[LEVELS_ON_SCREEN]; CMGVarButton gm_mgVar[LEVELS_ON_SCREEN];
CMGButton gm_mgApply; CMGButton gm_mgApply;
CMGArrow gm_mgArrowUp; CMGArrow gm_mgArrowUp;
CMGArrow gm_mgArrowDn; CMGArrow gm_mgArrowDn;
void Initialize_t(void); void Initialize_t(void);
void FillListItems(void); void FillListItems(void);
void StartMenu(void); void StartMenu(void);
void EndMenu(void); void EndMenu(void);
void Think(void); void Think(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -23,18 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CVideoOptionsMenu : public CGameMenu { class CVideoOptionsMenu : public CGameMenu {
public: public:
CMGTitle gm_mgTitle; CMGTitle gm_mgTitle;
CMGTrigger gm_mgDisplayAPITrigger; CMGTrigger gm_mgDisplayAPITrigger;
CMGTrigger gm_mgDisplayAdaptersTrigger; CMGTrigger gm_mgDisplayAdaptersTrigger;
CMGTrigger gm_mgFullScreenTrigger; CMGTrigger gm_mgFullScreenTrigger;
CMGTrigger gm_mgResolutionsTrigger; CMGTrigger gm_mgResolutionsTrigger;
CMGTrigger gm_mgDisplayPrefsTrigger; CMGTrigger gm_mgDisplayPrefsTrigger;
CMGButton gm_mgVideoRendering; CMGButton gm_mgVideoRendering;
CMGTrigger gm_mgBitsPerPixelTrigger; CMGTrigger gm_mgBitsPerPixelTrigger;
CMGButton gm_mgApply; CMGButton gm_mgApply;
void StartMenu(void); void StartMenu(void);
void Initialize_t(void); void Initialize_t(void);
}; };
#endif /* include-once check. */ #endif /* include-once check. */

View File

@ -96,6 +96,9 @@ static void SizeToResolution(PIX pixSizeI, PIX pixSizeJ, INDEX &iRes)
} }
// ------------------------ CConfirmMenu implementation // ------------------------ CConfirmMenu implementation
extern CTFileName _fnmModToLoad;
extern CTString _strModServerJoin;
CTFileName _fnmModSelected; CTFileName _fnmModSelected;
CTString _strModURLSelected; CTString _strModURLSelected;
CTString _strModServerSelected; CTString _strModServerSelected;
@ -140,14 +143,11 @@ static void StopConfirm(void)
static void ModLoadYes(void) static void ModLoadYes(void)
{ {
extern CTFileName _fnmModToLoad;
_fnmModToLoad = _fnmModSelected; _fnmModToLoad = _fnmModSelected;
} }
static void ModConnect(void) static void ModConnect(void)
{ {
extern CTFileName _fnmModToLoad;
extern CTString _strModServerJoin;
_fnmModToLoad = _fnmModSelected; _fnmModToLoad = _fnmModSelected;
_strModServerJoin = _strModServerSelected; _strModServerJoin = _strModServerSelected;
} }
@ -213,7 +213,6 @@ void ModNotInstalled(void)
ChangeToMenu(&gmCurrent); ChangeToMenu(&gmCurrent);
} }
extern void ModConfirm(void) extern void ModConfirm(void)
{ {
CConfirmMenu &gmCurrent = _pGUIM->gmConfirmMenu; CConfirmMenu &gmCurrent = _pGUIM->gmConfirmMenu;
@ -334,7 +333,6 @@ extern void SetDemoStartStopRecText(void)
} }
} }
// ------------------------ CSinglePlayerMenu implementation // ------------------------ CSinglePlayerMenu implementation
extern CTString sam_strTechTestLevel; extern CTString sam_strTechTestLevel;
extern CTString sam_strTrainingLevel; extern CTString sam_strTrainingLevel;

View File

@ -15,7 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef SE_INCL_MENUMANAGER_H #ifndef SE_INCL_MENUMANAGER_H
#define SE_INCL_MENUMANAGER_H #define SE_INCL_MENUMANAGER_H
#ifdef PRAGMA_ONCE #ifdef PRAGMA_ONCE
#pragma once #pragma once
#endif #endif
#include "MAudioOptions.h" #include "MAudioOptions.h"
@ -46,31 +46,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class CMenuManager { class CMenuManager {
public: public:
CConfirmMenu gmConfirmMenu; CConfirmMenu gmConfirmMenu;
CMainMenu gmMainMenu; CMainMenu gmMainMenu;
CInGameMenu gmInGameMenu; CInGameMenu gmInGameMenu;
CSinglePlayerMenu gmSinglePlayerMenu; CSinglePlayerMenu gmSinglePlayerMenu;
CSinglePlayerNewMenu gmSinglePlayerNewMenu; CSinglePlayerNewMenu gmSinglePlayerNewMenu;
CDisabledMenu gmDisabledFunction; CDisabledMenu gmDisabledFunction;
CLevelsMenu gmLevelsMenu; CLevelsMenu gmLevelsMenu;
CVarMenu gmVarMenu; CVarMenu gmVarMenu;
CPlayerProfileMenu gmPlayerProfile; CPlayerProfileMenu gmPlayerProfile;
CControlsMenu gmControls; CControlsMenu gmControls;
CLoadSaveMenu gmLoadSaveMenu; CLoadSaveMenu gmLoadSaveMenu;
CHighScoreMenu gmHighScoreMenu; CHighScoreMenu gmHighScoreMenu;
CCustomizeKeyboardMenu gmCustomizeKeyboardMenu; CCustomizeKeyboardMenu gmCustomizeKeyboardMenu;
CServersMenu gmServersMenu; CServersMenu gmServersMenu;
CCustomizeAxisMenu gmCustomizeAxisMenu; CCustomizeAxisMenu gmCustomizeAxisMenu;
COptionsMenu gmOptionsMenu; COptionsMenu gmOptionsMenu;
CVideoOptionsMenu gmVideoOptionsMenu; CVideoOptionsMenu gmVideoOptionsMenu;
CAudioOptionsMenu gmAudioOptionsMenu; CAudioOptionsMenu gmAudioOptionsMenu;
CNetworkMenu gmNetworkMenu; CNetworkMenu gmNetworkMenu;
CNetworkJoinMenu gmNetworkJoinMenu; CNetworkJoinMenu gmNetworkJoinMenu;
CNetworkStartMenu gmNetworkStartMenu; CNetworkStartMenu gmNetworkStartMenu;
CNetworkOpenMenu gmNetworkOpenMenu; CNetworkOpenMenu gmNetworkOpenMenu;
CSplitScreenMenu gmSplitScreenMenu; CSplitScreenMenu gmSplitScreenMenu;
CSplitStartMenu gmSplitStartMenu; CSplitStartMenu gmSplitStartMenu;
CSelectPlayersMenu gmSelectPlayersMenu; CSelectPlayersMenu gmSelectPlayersMenu;
}; };
extern CMenuManager *_pGUIM; // TODO: Make singleton! extern CMenuManager *_pGUIM; // TODO: Make singleton!

View File

@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "MenuStarters.h" #include "MenuStarters.h"
#include "MenuStuff.h" #include "MenuStuff.h"
CTFileName _fnDemoToPlay; static CTFileName _fnDemoToPlay;
CTFileName _fnGameToLoad; static CTFileName _fnGameToLoad;
extern CTString sam_strNetworkSettings; extern CTString sam_strNetworkSettings;

View File

@ -21,15 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "FileInfo.h" #include "FileInfo.h"
#define TRIGGER_MG(mg, y, up, down, text, astr) \ #define TRIGGER_MG(mg, y, up, down, text, astr) \
mg.mg_pmgUp = &up; \ mg.mg_pmgUp = &up; \
mg.mg_pmgDown = &down; \ mg.mg_pmgDown = &down; \
mg.mg_boxOnScreen = BoxMediumRow(y); \ mg.mg_boxOnScreen = BoxMediumRow(y); \
gm_lhGadgets.AddTail(mg.mg_lnNode); \ gm_lhGadgets.AddTail(mg.mg_lnNode); \
mg.mg_astrTexts = astr; \ mg.mg_astrTexts = astr; \
mg.mg_ctTexts = sizeof(astr) / sizeof(astr[0]); \ mg.mg_ctTexts = sizeof(astr) / sizeof(astr[0]); \
mg.mg_iSelected = 0; \ mg.mg_iSelected = 0; \
mg.mg_strLabel = text; \ mg.mg_strLabel = text; \
mg.mg_strValue = astr[0]; mg.mg_strValue = astr[0];
extern INDEX ctGameTypeRadioTexts; extern INDEX ctGameTypeRadioTexts;

View File

@ -13,7 +13,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
#define APPLICATION_NAME "SeriousSam" #define APPLICATION_NAME "SeriousSam"
#include "CDCheck.h"
extern HINSTANCE _hInstance; extern HINSTANCE _hInstance;
extern BOOL _bRunning, _bQuitScreen; extern BOOL _bRunning, _bQuitScreen;

View File

@ -297,7 +297,6 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ &gt;nul </Command>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="ArrowDir.h" /> <ClInclude Include="ArrowDir.h" />
<ClInclude Include="CDCheck.h" />
<ClInclude Include="CmdLine.h" /> <ClInclude Include="CmdLine.h" />
<ClInclude Include="Credits.h" /> <ClInclude Include="Credits.h" />
<ClInclude Include="FileInfo.h" /> <ClInclude Include="FileInfo.h" />

View File

@ -215,9 +215,6 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="CDCheck.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CmdLine.h"> <ClInclude Include="CmdLine.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>