diff --git a/Sources/SeriousSam/ArrowDir.h b/Sources/SeriousSam/ArrowDir.h index aa9740d..8b02b09 100644 --- a/Sources/SeriousSam/ArrowDir.h +++ b/Sources/SeriousSam/ArrowDir.h @@ -20,11 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc., enum ArrowDir { - AD_NONE, - AD_UP, - AD_DOWN, - AD_LEFT, - AD_RIGHT, + AD_NONE, + AD_UP, + AD_DOWN, + AD_LEFT, + AD_RIGHT, }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/CDCheck.h b/Sources/SeriousSam/CDCheck.h deleted file mode 100644 index 283b894..0000000 --- a/Sources/SeriousSam/CDCheck.h +++ /dev/null @@ -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 diff --git a/Sources/SeriousSam/FileInfo.h b/Sources/SeriousSam/FileInfo.h index cad9465..c775720 100644 --- a/Sources/SeriousSam/FileInfo.h +++ b/Sources/SeriousSam/FileInfo.h @@ -21,9 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc., class CFileInfo { public: - CListNode fi_lnNode; - CTFileName fi_fnFile; - CTString fi_strName; + CListNode fi_lnNode; + CTFileName fi_fnFile; + CTString fi_strName; }; diff --git a/Sources/SeriousSam/GUI/Components/MGArrow.h b/Sources/SeriousSam/GUI/Components/MGArrow.h index e0d424f..532c94a 100644 --- a/Sources/SeriousSam/GUI/Components/MGArrow.h +++ b/Sources/SeriousSam/GUI/Components/MGArrow.h @@ -24,9 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGArrow : public CMGButton { public: - enum ArrowDir mg_adDirection; - void Render(CDrawPort *pdp); - void OnActivate(void); + enum ArrowDir mg_adDirection; + void Render(CDrawPort *pdp); + void OnActivate(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGButton.h b/Sources/SeriousSam/GUI/Components/MGButton.h index 676b6ef..4b3ea4a 100644 --- a/Sources/SeriousSam/GUI/Components/MGButton.h +++ b/Sources/SeriousSam/GUI/Components/MGButton.h @@ -23,24 +23,25 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGButton : public CMenuGadget { public: - CTString mg_strLabel; // for those that have labels separately from main text - CTString mg_strText; - INDEX mg_iCenterI; - enum ButtonFontSize mg_bfsFontSize; - BOOL mg_bEditing; - BOOL mg_bHighlighted; - BOOL mg_bRectangle; - BOOL mg_bMental; - INDEX mg_iTextMode; - INDEX mg_iCursorPos; + CTString mg_strLabel; // for those that have labels separately from main text + CTString mg_strText; + INDEX mg_iCenterI; + enum ButtonFontSize mg_bfsFontSize; + BOOL mg_bEditing; + BOOL mg_bHighlighted; + BOOL mg_bRectangle; + BOOL mg_bMental; + INDEX mg_iTextMode; + INDEX mg_iCursorPos; + INDEX mg_iIndex; - INDEX mg_iIndex; - void(*mg_pActivatedFunction)(void); - CMGButton(void); - void SetText(CTString strNew); - void OnActivate(void); - void Render(CDrawPort *pdp); - PIX GetCharOffset(CDrawPort *pdp, INDEX iCharNo); + void(*mg_pActivatedFunction)(void); + + CMGButton(void); + void SetText(CTString strNew); + void OnActivate(void); + void Render(CDrawPort *pdp); + PIX GetCharOffset(CDrawPort *pdp, INDEX iCharNo); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGChangePlayer.h b/Sources/SeriousSam/GUI/Components/MGChangePlayer.h index e7f343a..8dd0f08 100644 --- a/Sources/SeriousSam/GUI/Components/MGChangePlayer.h +++ b/Sources/SeriousSam/GUI/Components/MGChangePlayer.h @@ -23,10 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGChangePlayer : public CMGButton { public: - INDEX mg_iLocalPlayer; + INDEX mg_iLocalPlayer; - void SetPlayerText(void); - void OnActivate(void); + void SetPlayerText(void); + void OnActivate(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGEdit.h b/Sources/SeriousSam/GUI/Components/MGEdit.h index 12ff4b1..86eb385 100644 --- a/Sources/SeriousSam/GUI/Components/MGEdit.h +++ b/Sources/SeriousSam/GUI/Components/MGEdit.h @@ -23,18 +23,20 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGEdit : public CMGButton { public: - INDEX mg_ctMaxStringLen; - CTString *mg_pstrToChange; - CMGEdit(void); - // return TRUE if handled - BOOL OnKeyDown(int iVKey); - BOOL OnChar(MSG msg); - void Clear(void); - void OnActivate(void); - void OnKillFocus(void); - void Render(CDrawPort *pdp); - virtual void OnStringChanged(void); - virtual void OnStringCanceled(void); + INDEX mg_ctMaxStringLen; + CTString *mg_pstrToChange; + + CMGEdit(void); + + // return TRUE if handled + BOOL OnKeyDown(int iVKey); + BOOL OnChar(MSG msg); + void Clear(void); + void OnActivate(void); + void OnKillFocus(void); + void Render(CDrawPort *pdp); + virtual void OnStringChanged(void); + virtual void OnStringCanceled(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGFileButton.h b/Sources/SeriousSam/GUI/Components/MGFileButton.h index 8dee6a4..ca37a05 100644 --- a/Sources/SeriousSam/GUI/Components/MGFileButton.h +++ b/Sources/SeriousSam/GUI/Components/MGFileButton.h @@ -26,30 +26,31 @@ with this program; if not, write to the Free Software Foundation, Inc., #define FBS_RENAME 2 // renaming existing file class CMGFileButton : public CMGEdit { public: - CMGFileButton(void); - CTFileName mg_fnm; - CTString mg_strDes; // entire description goes here - CTString mg_strInfo; // info part of text to print above the gadget tip - 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); + CMGFileButton(void); + CTFileName mg_fnm; + CTString mg_strDes; // entire description goes here + CTString mg_strInfo; // info part of text to print above the gadget tip + INDEX mg_iState; - // return TRUE if handled - BOOL OnKeyDown(int iVKey); - void OnActivate(void); - void OnSetFocus(void); - void OnKillFocus(void); + // 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); - // overrides from edit gadget - void OnStringChanged(void); - void OnStringCanceled(void); - void Render(CDrawPort *pdp); + // return TRUE if handled + BOOL OnKeyDown(int iVKey); + void OnActivate(void); + void OnSetFocus(void); + void OnKillFocus(void); + + // overrides from edit gadget + void OnStringChanged(void); + void OnStringCanceled(void); + void Render(CDrawPort *pdp); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGHighScore.h b/Sources/SeriousSam/GUI/Components/MGHighScore.h index 614460f..0299122 100644 --- a/Sources/SeriousSam/GUI/Components/MGHighScore.h +++ b/Sources/SeriousSam/GUI/Components/MGHighScore.h @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGHighScore : public CMenuGadget { public: - void Render(CDrawPort *pdp); + void Render(CDrawPort *pdp); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGKeyDefinition.h b/Sources/SeriousSam/GUI/Components/MGKeyDefinition.h index 157361b..ef4370f 100644 --- a/Sources/SeriousSam/GUI/Components/MGKeyDefinition.h +++ b/Sources/SeriousSam/GUI/Components/MGKeyDefinition.h @@ -23,23 +23,23 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGKeyDefinition : public CMenuGadget { public: - INDEX mg_iState; - INDEX mg_iControlNumber; + INDEX mg_iState; + INDEX mg_iControlNumber; - CTString mg_strLabel; - CTString mg_strBinding; + CTString mg_strLabel; + CTString mg_strBinding; - CMGKeyDefinition(void); - void Appear(void); - void Disappear(void); - void OnActivate(void); - // return TRUE if handled - BOOL OnKeyDown(int iVKey); - void Think(void); - // set names for both key bindings - void SetBindingNames(BOOL bDefining); - void DefineKey(INDEX iDik); - void Render(CDrawPort *pdp); + CMGKeyDefinition(void); + void Appear(void); + void Disappear(void); + void OnActivate(void); + // return TRUE if handled + BOOL OnKeyDown(int iVKey); + void Think(void); + // set names for both key bindings + void SetBindingNames(BOOL bDefining); + void DefineKey(INDEX iDik); + void Render(CDrawPort *pdp); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGLevelButton.h b/Sources/SeriousSam/GUI/Components/MGLevelButton.h index 24c4578..b3392a3 100644 --- a/Sources/SeriousSam/GUI/Components/MGLevelButton.h +++ b/Sources/SeriousSam/GUI/Components/MGLevelButton.h @@ -23,10 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGLevelButton : public CMGButton { public: - CTFileName mg_fnmLevel; + CTFileName mg_fnmLevel; - void OnActivate(void); - void OnSetFocus(void); + void OnActivate(void); + void OnSetFocus(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGModel.h b/Sources/SeriousSam/GUI/Components/MGModel.h index 72d4f30..30f002e 100644 --- a/Sources/SeriousSam/GUI/Components/MGModel.h +++ b/Sources/SeriousSam/GUI/Components/MGModel.h @@ -23,13 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGModel : public CMGButton { public: - CModelObject mg_moModel; - CModelObject mg_moFloor; - CPlacement3D mg_plModel; - BOOL mg_fFloorY; + CModelObject mg_moModel; + CModelObject mg_moFloor; + CPlacement3D mg_plModel; + BOOL mg_fFloorY; - CMGModel(void); - void Render(CDrawPort *pdp); + CMGModel(void); + void Render(CDrawPort *pdp); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGServerList.h b/Sources/SeriousSam/GUI/Components/MGServerList.h index 4796013..dc3195a 100644 --- a/Sources/SeriousSam/GUI/Components/MGServerList.h +++ b/Sources/SeriousSam/GUI/Components/MGServerList.h @@ -23,44 +23,44 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGServerList : public CMGButton { public: - INDEX mg_iSelected; - INDEX mg_iFirstOnScreen; - INDEX mg_ctOnScreen; - // server list dimensions - PIX mg_pixMinI; - PIX mg_pixMaxI; - PIX mg_pixListMinJ; - PIX mg_pixListStepJ; - // header dimensions - PIX mg_pixHeaderMinJ; - PIX mg_pixHeaderMidJ; - PIX mg_pixHeaderMaxJ; - PIX mg_pixHeaderI[8]; - // scrollbar dimensions - PIX mg_pixSBMinI; - PIX mg_pixSBMaxI; - PIX mg_pixSBMinJ; - PIX mg_pixSBMaxJ; - // scrollbar dragging params - PIX mg_pixDragJ; - PIX mg_iDragLine; - PIX mg_pixMouseDrag; - // current mouse pos - PIX mg_pixMouseI; - PIX mg_pixMouseJ; + INDEX mg_iSelected; + INDEX mg_iFirstOnScreen; + INDEX mg_ctOnScreen; + // server list dimensions + PIX mg_pixMinI; + PIX mg_pixMaxI; + PIX mg_pixListMinJ; + PIX mg_pixListStepJ; + // header dimensions + PIX mg_pixHeaderMinJ; + PIX mg_pixHeaderMidJ; + PIX mg_pixHeaderMaxJ; + PIX mg_pixHeaderI[8]; + // scrollbar dimensions + PIX mg_pixSBMinI; + PIX mg_pixSBMaxI; + PIX mg_pixSBMinJ; + PIX mg_pixSBMaxJ; + // scrollbar dragging params + PIX mg_pixDragJ; + PIX mg_iDragLine; + PIX mg_pixMouseDrag; + // current mouse pos + PIX mg_pixMouseI; + PIX mg_pixMouseJ; - INDEX mg_iSort; // column to sort by - BOOL mg_bSortDown; // sort in reverse order + INDEX mg_iSort; // column to sort by + BOOL mg_bSortDown; // sort in reverse order - CMGServerList(); - BOOL OnKeyDown(int iVKey); - PIXaabbox2D GetScrollBarFullBox(void); - PIXaabbox2D GetScrollBarHandleBox(void); - void OnSetFocus(void); - void OnKillFocus(void); - void Render(CDrawPort *pdp); - void AdjustFirstOnScreen(void); - void OnMouseOver(PIX pixI, PIX pixJ); + CMGServerList(); + BOOL OnKeyDown(int iVKey); + PIXaabbox2D GetScrollBarFullBox(void); + PIXaabbox2D GetScrollBarHandleBox(void); + void OnSetFocus(void); + void OnKillFocus(void); + void Render(CDrawPort *pdp); + void AdjustFirstOnScreen(void); + void OnMouseOver(PIX pixI, PIX pixJ); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGSlider.h b/Sources/SeriousSam/GUI/Components/MGSlider.h index 12f1f7a..5d25b06 100644 --- a/Sources/SeriousSam/GUI/Components/MGSlider.h +++ b/Sources/SeriousSam/GUI/Components/MGSlider.h @@ -23,19 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGSlider : public CMGButton { public: - FLOAT mg_fFactor; - INDEX mg_iMinPos; - INDEX mg_iMaxPos; - INDEX mg_iCurPos; + FLOAT mg_fFactor; + INDEX mg_iMinPos; + INDEX mg_iMaxPos; + INDEX mg_iCurPos; - CMGSlider(); - void ApplyCurrentPosition(void); - void ApplyGivenPosition(INDEX iMin, INDEX iMax, INDEX iCur); - // return TRUE if handled - virtual BOOL OnKeyDown(int iVKey); - void(*mg_pOnSliderChange)(INDEX iCurPos); - PIXaabbox2D GetSliderBox(void); - void Render(CDrawPort *pdp); + CMGSlider(); + void ApplyCurrentPosition(void); + void ApplyGivenPosition(INDEX iMin, INDEX iMax, INDEX iCur); + // return TRUE if handled + virtual BOOL OnKeyDown(int iVKey); + void(*mg_pOnSliderChange)(INDEX iCurPos); + PIXaabbox2D GetSliderBox(void); + void Render(CDrawPort *pdp); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGTitle.h b/Sources/SeriousSam/GUI/Components/MGTitle.h index eab0473..534c388 100644 --- a/Sources/SeriousSam/GUI/Components/MGTitle.h +++ b/Sources/SeriousSam/GUI/Components/MGTitle.h @@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGTitle : public CMenuGadget { public: - CTString mg_strText; - void Render(CDrawPort *pdp); + CTString mg_strText; + void Render(CDrawPort *pdp); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGTrigger.h b/Sources/SeriousSam/GUI/Components/MGTrigger.h index 6392eff..e15c4d7 100644 --- a/Sources/SeriousSam/GUI/Components/MGTrigger.h +++ b/Sources/SeriousSam/GUI/Components/MGTrigger.h @@ -23,24 +23,24 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGTrigger : public CMenuGadget { public: - CTString mg_strLabel; - CTString mg_strValue; - CTString *mg_astrTexts; - INDEX mg_ctTexts; - INDEX mg_iSelected; - INDEX mg_iCenterI; - BOOL mg_bVisual; + CTString mg_strLabel; + CTString mg_strValue; + CTString *mg_astrTexts; + INDEX mg_ctTexts; + INDEX mg_iSelected; + INDEX mg_iCenterI; + BOOL mg_bVisual; - CMGTrigger(void); + CMGTrigger(void); - void ApplyCurrentSelection(void); - void OnSetNextInList(int iVKey); - void(*mg_pPreTriggerChange)(INDEX iCurrentlySelected); - void(*mg_pOnTriggerChange)(INDEX iCurrentlySelected); + void ApplyCurrentSelection(void); + void OnSetNextInList(int iVKey); + void(*mg_pPreTriggerChange)(INDEX iCurrentlySelected); + void(*mg_pOnTriggerChange)(INDEX iCurrentlySelected); - // return TRUE if handled - BOOL OnKeyDown(int iVKey); - void Render(CDrawPort *pdp); + // return TRUE if handled + BOOL OnKeyDown(int iVKey); + void Render(CDrawPort *pdp); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MGVarButton.h b/Sources/SeriousSam/GUI/Components/MGVarButton.h index 820165a..0bda9b2 100644 --- a/Sources/SeriousSam/GUI/Components/MGVarButton.h +++ b/Sources/SeriousSam/GUI/Components/MGVarButton.h @@ -23,12 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMGVarButton : public CMGButton { public: - class CVarSetting *mg_pvsVar; - PIXaabbox2D GetSliderBox(void); - BOOL OnKeyDown(int iVKey); - void Render(CDrawPort *pdp); - BOOL IsSeparator(void); - BOOL IsEnabled(void); + class CVarSetting *mg_pvsVar; + PIXaabbox2D GetSliderBox(void); + BOOL OnKeyDown(int iVKey); + void Render(CDrawPort *pdp); + BOOL IsSeparator(void); + BOOL IsEnabled(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Components/MenuGadget.h b/Sources/SeriousSam/GUI/Components/MenuGadget.h index 3d03589..b4a4fbb 100644 --- a/Sources/SeriousSam/GUI/Components/MenuGadget.h +++ b/Sources/SeriousSam/GUI/Components/MenuGadget.h @@ -29,41 +29,41 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMenuGadget { public: - CListNode mg_lnNode; - FLOATaabbox2D mg_boxOnScreen; - BOOL mg_bVisible; - BOOL mg_bEnabled; - BOOL mg_bLabel; - BOOL mg_bFocused; - INDEX mg_iInList; // for scrollable gadget lists + CListNode mg_lnNode; + FLOATaabbox2D mg_boxOnScreen; + BOOL mg_bVisible; + BOOL mg_bEnabled; + BOOL mg_bLabel; + BOOL mg_bFocused; + INDEX mg_iInList; // for scrollable gadget lists - CTString mg_strTip; - CMenuGadget *mg_pmgLeft; - CMenuGadget *mg_pmgRight; - CMenuGadget *mg_pmgUp; - CMenuGadget *mg_pmgDown; + CTString mg_strTip; + CMenuGadget *mg_pmgLeft; + CMenuGadget *mg_pmgRight; + CMenuGadget *mg_pmgUp; + CMenuGadget *mg_pmgDown; - CMenuGadget(void); - // return TRUE if handled - virtual BOOL OnKeyDown(int iVKey); - virtual BOOL OnChar(MSG msg); - virtual void OnActivate(void); - virtual void OnSetFocus(void); - virtual void OnKillFocus(void); - virtual void Appear(void); - virtual void Disappear(void); - virtual void Think(void); - virtual void OnMouseOver(PIX pixI, PIX pixJ); + CMenuGadget(void); + // return TRUE if handled + virtual BOOL OnKeyDown(int iVKey); + virtual BOOL OnChar(MSG msg); + virtual void OnActivate(void); + virtual void OnSetFocus(void); + virtual void OnKillFocus(void); + virtual void Appear(void); + virtual void Disappear(void); + virtual void Think(void); + virtual void OnMouseOver(PIX pixI, PIX pixJ); - virtual COLOR GetCurrentColor(void); - virtual void Render(CDrawPort *pdp); - virtual BOOL IsSeparator(void) { return FALSE; }; + virtual COLOR GetCurrentColor(void); + virtual void Render(CDrawPort *pdp); + virtual BOOL IsSeparator(void) { return FALSE; }; }; enum ButtonFontSize { - BFS_SMALL = 0, - BFS_MEDIUM = 1, - BFS_LARGE = 2, + BFS_SMALL = 0, + BFS_MEDIUM = 1, + BFS_LARGE = 2, }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/GameMenu.h b/Sources/SeriousSam/GUI/Menus/GameMenu.h index 72b57a6..b386400 100644 --- a/Sources/SeriousSam/GUI/Menus/GameMenu.h +++ b/Sources/SeriousSam/GUI/Menus/GameMenu.h @@ -21,31 +21,31 @@ with this program; if not, write to the Free Software Foundation, Inc., class CGameMenu { public: - CListHead gm_lhGadgets; - CGameMenu *gm_pgmParentMenu; - BOOL gm_bPopup; - const char *gm_strName; // menu name (for mod interface only) - class CMenuGadget *gm_pmgSelectedByDefault; - class CMenuGadget *gm_pmgArrowUp; - class CMenuGadget *gm_pmgArrowDn; - class CMenuGadget *gm_pmgListTop; - class CMenuGadget *gm_pmgListBottom; - INDEX gm_iListOffset; - INDEX gm_iListWantedItem; // item you want to focus initially - INDEX gm_ctListVisible; - INDEX gm_ctListTotal; - CGameMenu(void); - void ScrollList(INDEX iDir); - void KillAllFocuses(void); - virtual void Initialize_t(void); - virtual void Destroy(void); - virtual void StartMenu(void); - virtual void FillListItems(void); - virtual void EndMenu(void); - // return TRUE if handled - virtual BOOL OnKeyDown(int iVKey); - virtual BOOL OnChar(MSG msg); - virtual void Think(void); + CListHead gm_lhGadgets; + CGameMenu *gm_pgmParentMenu; + BOOL gm_bPopup; + const char *gm_strName; // menu name (for mod interface only) + class CMenuGadget *gm_pmgSelectedByDefault; + class CMenuGadget *gm_pmgArrowUp; + class CMenuGadget *gm_pmgArrowDn; + class CMenuGadget *gm_pmgListTop; + class CMenuGadget *gm_pmgListBottom; + INDEX gm_iListOffset; + INDEX gm_iListWantedItem; // item you want to focus initially + INDEX gm_ctListVisible; + INDEX gm_ctListTotal; + CGameMenu(void); + void ScrollList(INDEX iDir); + void KillAllFocuses(void); + virtual void Initialize_t(void); + virtual void Destroy(void); + virtual void StartMenu(void); + virtual void FillListItems(void); + virtual void EndMenu(void); + // return TRUE if handled + virtual BOOL OnKeyDown(int iVKey); + virtual BOOL OnChar(MSG msg); + virtual void Think(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MAudioOptions.h b/Sources/SeriousSam/GUI/Menus/MAudioOptions.h index e0d1b5a..4d6a592 100644 --- a/Sources/SeriousSam/GUI/Menus/MAudioOptions.h +++ b/Sources/SeriousSam/GUI/Menus/MAudioOptions.h @@ -27,16 +27,16 @@ with this program; if not, write to the Free Software Foundation, Inc., class CAudioOptionsMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGTrigger gm_mgAudioAutoTrigger; - CMGTrigger gm_mgAudioAPITrigger; - CMGTrigger gm_mgFrequencyTrigger; - CMGSlider gm_mgWaveVolume; - CMGSlider gm_mgMPEGVolume; - CMGButton gm_mgApply; + CMGTitle gm_mgTitle; + CMGTrigger gm_mgAudioAutoTrigger; + CMGTrigger gm_mgAudioAPITrigger; + CMGTrigger gm_mgFrequencyTrigger; + CMGSlider gm_mgWaveVolume; + CMGSlider gm_mgMPEGVolume; + CMGButton gm_mgApply; - void StartMenu(void); - void Initialize_t(void); + void StartMenu(void); + void Initialize_t(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MConfirm.h b/Sources/SeriousSam/GUI/Menus/MConfirm.h index 5fb75a9..b67e97f 100644 --- a/Sources/SeriousSam/GUI/Menus/MConfirm.h +++ b/Sources/SeriousSam/GUI/Menus/MConfirm.h @@ -24,19 +24,19 @@ with this program; if not, write to the Free Software Foundation, Inc., class CConfirmMenu : public CGameMenu { public: - CMGButton gm_mgConfirmLabel; - CMGButton gm_mgConfirmYes; - CMGButton gm_mgConfirmNo; + CMGButton gm_mgConfirmLabel; + CMGButton gm_mgConfirmYes; + CMGButton gm_mgConfirmNo; - void(*_pConfimedYes)(void) = NULL; - void(*_pConfimedNo)(void) = NULL; + void(*_pConfimedYes)(void) = NULL; + void(*_pConfimedNo)(void) = NULL; - void Initialize_t(void); - // return TRUE if handled - BOOL OnKeyDown(int iVKey); + void Initialize_t(void); + // return TRUE if handled + BOOL OnKeyDown(int iVKey); - void BeLarge(void); - void BeSmall(void); + void BeLarge(void); + void BeSmall(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MControls.h b/Sources/SeriousSam/GUI/Menus/MControls.h index f34503f..93f9d2a 100644 --- a/Sources/SeriousSam/GUI/Menus/MControls.h +++ b/Sources/SeriousSam/GUI/Menus/MControls.h @@ -27,22 +27,22 @@ with this program; if not, write to the Free Software Foundation, Inc., class CControlsMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgNameLabel; - CMGButton gm_mgButtons; - CMGSlider gm_mgSensitivity; - CMGTrigger gm_mgInvertTrigger; - CMGTrigger gm_mgSmoothTrigger; - CMGTrigger gm_mgAccelTrigger; - CMGTrigger gm_mgIFeelTrigger; - CMGButton gm_mgPredefined; - CMGButton gm_mgAdvanced; + CMGTitle gm_mgTitle; + CMGButton gm_mgNameLabel; + CMGButton gm_mgButtons; + CMGSlider gm_mgSensitivity; + CMGTrigger gm_mgInvertTrigger; + CMGTrigger gm_mgSmoothTrigger; + CMGTrigger gm_mgAccelTrigger; + CMGTrigger gm_mgIFeelTrigger; + CMGButton gm_mgPredefined; + CMGButton gm_mgAdvanced; - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); - void ObtainActionSettings(void); - void ApplyActionSettings(void); + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); + void ObtainActionSettings(void); + void ApplyActionSettings(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MCredits.h b/Sources/SeriousSam/GUI/Menus/MCredits.h index 06be76d..a36d139 100644 --- a/Sources/SeriousSam/GUI/Menus/MCredits.h +++ b/Sources/SeriousSam/GUI/Menus/MCredits.h @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class CCreditsMenu : public CGameMenu { public: - void Initialize_t(void); + void Initialize_t(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h b/Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h index 6038733..5a92719 100644 --- a/Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h +++ b/Sources/SeriousSam/GUI/Menus/MCustomizeAxis.h @@ -26,21 +26,21 @@ with this program; if not, write to the Free Software Foundation, Inc., class CCustomizeAxisMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGTrigger gm_mgActionTrigger; - CMGTrigger gm_mgMountedTrigger; - CMGSlider gm_mgSensitivity; - CMGSlider gm_mgDeadzone; - CMGTrigger gm_mgInvertTrigger; - CMGTrigger gm_mgRelativeTrigger; - CMGTrigger gm_mgSmoothTrigger; + CMGTitle gm_mgTitle; + CMGTrigger gm_mgActionTrigger; + CMGTrigger gm_mgMountedTrigger; + CMGSlider gm_mgSensitivity; + CMGSlider gm_mgDeadzone; + CMGTrigger gm_mgInvertTrigger; + CMGTrigger gm_mgRelativeTrigger; + CMGTrigger gm_mgSmoothTrigger; - ~CCustomizeAxisMenu(void); - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); - void ObtainActionSettings(void); - void ApplyActionSettings(void); + ~CCustomizeAxisMenu(void); + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); + void ObtainActionSettings(void); + void ApplyActionSettings(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h b/Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h index 0b4c96e..b67861e 100644 --- a/Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h +++ b/Sources/SeriousSam/GUI/Menus/MCustomizeKeyboard.h @@ -26,15 +26,15 @@ with this program; if not, write to the Free Software Foundation, Inc., class CCustomizeKeyboardMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGKeyDefinition gm_mgKey[KEYS_ON_SCREEN]; - CMGArrow gm_mgArrowUp; - CMGArrow gm_mgArrowDn; + CMGTitle gm_mgTitle; + CMGKeyDefinition gm_mgKey[KEYS_ON_SCREEN]; + CMGArrow gm_mgArrowUp; + CMGArrow gm_mgArrowDn; - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); - void FillListItems(void); + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); + void FillListItems(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MDisabled.h b/Sources/SeriousSam/GUI/Menus/MDisabled.h index 0a13a46..32cb7f2 100644 --- a/Sources/SeriousSam/GUI/Menus/MDisabled.h +++ b/Sources/SeriousSam/GUI/Menus/MDisabled.h @@ -25,10 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc., class CDisabledMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgButton; + CMGTitle gm_mgTitle; + CMGButton gm_mgButton; - void Initialize_t(void); + void Initialize_t(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MHighScore.h b/Sources/SeriousSam/GUI/Menus/MHighScore.h index d563953..7402486 100644 --- a/Sources/SeriousSam/GUI/Menus/MHighScore.h +++ b/Sources/SeriousSam/GUI/Menus/MHighScore.h @@ -25,11 +25,11 @@ with this program; if not, write to the Free Software Foundation, Inc., class CHighScoreMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGHighScore gm_mgHScore; + CMGTitle gm_mgTitle; + CMGHighScore gm_mgHScore; - void Initialize_t(void); - void StartMenu(void); + void Initialize_t(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MInGame.h b/Sources/SeriousSam/GUI/Menus/MInGame.h index c337fc3..1b9112e 100644 --- a/Sources/SeriousSam/GUI/Menus/MInGame.h +++ b/Sources/SeriousSam/GUI/Menus/MInGame.h @@ -25,21 +25,21 @@ with this program; if not, write to the Free Software Foundation, Inc., class CInGameMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgLabel1; - CMGButton gm_mgLabel2; - CMGButton gm_mgQuickLoad; - CMGButton gm_mgQuickSave; - CMGButton gm_mgLoad; - CMGButton gm_mgSave; - CMGButton gm_mgDemoRec; - CMGButton gm_mgHighScore; - CMGButton gm_mgOptions; - CMGButton gm_mgStop; - CMGButton gm_mgQuit; + CMGTitle gm_mgTitle; + CMGButton gm_mgLabel1; + CMGButton gm_mgLabel2; + CMGButton gm_mgQuickLoad; + CMGButton gm_mgQuickSave; + CMGButton gm_mgLoad; + CMGButton gm_mgSave; + CMGButton gm_mgDemoRec; + CMGButton gm_mgHighScore; + CMGButton gm_mgOptions; + CMGButton gm_mgStop; + CMGButton gm_mgQuit; - void Initialize_t(void); - void StartMenu(void); + void Initialize_t(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MLevels.h b/Sources/SeriousSam/GUI/Menus/MLevels.h index d39fe06..a746b50 100644 --- a/Sources/SeriousSam/GUI/Menus/MLevels.h +++ b/Sources/SeriousSam/GUI/Menus/MLevels.h @@ -26,14 +26,14 @@ with this program; if not, write to the Free Software Foundation, Inc., class CLevelsMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGLevelButton gm_mgManualLevel[LEVELS_ON_SCREEN]; - CMGArrow gm_mgArrowUp; - CMGArrow gm_mgArrowDn; + CMGTitle gm_mgTitle; + CMGLevelButton gm_mgManualLevel[LEVELS_ON_SCREEN]; + CMGArrow gm_mgArrowUp; + CMGArrow gm_mgArrowDn; - void Initialize_t(void); - void FillListItems(void); - void StartMenu(void); + void Initialize_t(void); + void FillListItems(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MLoadSave.h b/Sources/SeriousSam/GUI/Menus/MLoadSave.h index 44e794e..1836f69 100644 --- a/Sources/SeriousSam/GUI/Menus/MLoadSave.h +++ b/Sources/SeriousSam/GUI/Menus/MLoadSave.h @@ -26,49 +26,54 @@ with this program; if not, write to the Free Software Foundation, Inc., #define SAVELOAD_BUTTONS_CT 14 +enum ELSSortType +{ + LSSORT_NONE, + LSSORT_NAMEUP, + LSSORT_NAMEDN, + LSSORT_FILEUP, + LSSORT_FILEDN, +}; + class CLoadSaveMenu : public CGameMenu { public: - // settings adjusted before starting the 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_fnmDirectory; // directory that should be read - CTFileName gm_fnmBaseName; // base file name for saving (numbers are auto-added) - CTFileName gm_fnmExt; // accepted file extension - BOOL gm_bSave; // set when chosing file for saving - BOOL gm_bManage; // set if managing (rename/delet is enabled) - CTString gm_strSaveDes; // default description (if saving) - BOOL gm_bAllowThumbnails; // set when chosing file for saving - 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 + // settings adjusted before starting the 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_fnmDirectory; // directory that should be read + CTFileName gm_fnmBaseName; // base file name for saving (numbers are auto-added) + CTFileName gm_fnmExt; // accepted file extension + BOOL gm_bSave; // set when chosing file for saving + BOOL gm_bManage; // set if managing (rename/delet is enabled) + CTString gm_strSaveDes; // default description (if saving) + BOOL gm_bAllowThumbnails; // set when chosing file for saving + BOOL gm_bNoEscape; // forbid exiting with escape/rmb - // function to activate when file is chosen - // return true if saving succeeded - description is saved automatically - // always return true for loading - BOOL(*gm_pAfterFileChosen)(const CTFileName &fnm); + INDEX gm_iSortType; // sort type - // internal properties - CListHead gm_lhFileInfos; // all file infos to list - INDEX gm_iLastFile; // index of last saved file in numbered format + // function to activate when file is chosen + // return true if saving succeeded - description is saved automatically + // always return true for loading + BOOL(*gm_pAfterFileChosen)(const CTFileName &fnm); - CMGTitle gm_mgTitle; - CMGButton gm_mgNotes; - CMGFileButton gm_amgButton[SAVELOAD_BUTTONS_CT]; - CMGArrow gm_mgArrowUp; - CMGArrow gm_mgArrowDn; + // internal properties + CListHead gm_lhFileInfos; // all file infos to list + INDEX gm_iLastFile; // index of last saved file in numbered format - // called to get info of a file from directory, or to skip it - BOOL ParseFile(const CTFileName &fnm, CTString &strName); + CMGTitle gm_mgTitle; + CMGButton gm_mgNotes; + CMGFileButton gm_amgButton[SAVELOAD_BUTTONS_CT]; + CMGArrow gm_mgArrowUp; + CMGArrow gm_mgArrowDn; - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); - void FillListItems(void); + // called to get info of a file from directory, or to skip it + BOOL ParseFile(const CTFileName &fnm, CTString &strName); + + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); + void FillListItems(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MMain.h b/Sources/SeriousSam/GUI/Menus/MMain.h index e1e920d..327a828 100644 --- a/Sources/SeriousSam/GUI/Menus/MMain.h +++ b/Sources/SeriousSam/GUI/Menus/MMain.h @@ -24,19 +24,19 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMainMenu : public CGameMenu { public: - CMGButton gm_mgVersionLabel; - CMGButton gm_mgModLabel; - CMGButton gm_mgSingle; - CMGButton gm_mgNetwork; - CMGButton gm_mgSplitScreen; - CMGButton gm_mgDemo; - CMGButton gm_mgMods; - CMGButton gm_mgHighScore; - CMGButton gm_mgOptions; - CMGButton gm_mgQuit; + CMGButton gm_mgVersionLabel; + CMGButton gm_mgModLabel; + CMGButton gm_mgSingle; + CMGButton gm_mgNetwork; + CMGButton gm_mgSplitScreen; + CMGButton gm_mgDemo; + CMGButton gm_mgMods; + CMGButton gm_mgHighScore; + CMGButton gm_mgOptions; + CMGButton gm_mgQuit; - void Initialize_t(void); - void StartMenu(void); + void Initialize_t(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MNetwork.h b/Sources/SeriousSam/GUI/Menus/MNetwork.h index 44a523f..100e13e 100644 --- a/Sources/SeriousSam/GUI/Menus/MNetwork.h +++ b/Sources/SeriousSam/GUI/Menus/MNetwork.h @@ -25,14 +25,14 @@ with this program; if not, write to the Free Software Foundation, Inc., class CNetworkMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgJoin; - CMGButton gm_mgStart; - CMGButton gm_mgQuickLoad; - CMGButton gm_mgLoad; + CMGTitle gm_mgTitle; + CMGButton gm_mgJoin; + CMGButton gm_mgStart; + CMGButton gm_mgQuickLoad; + CMGButton gm_mgLoad; - void Initialize_t(void); - void StartMenu(void); + void Initialize_t(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MNetworkJoin.h b/Sources/SeriousSam/GUI/Menus/MNetworkJoin.h index 7875785..0b4322f 100644 --- a/Sources/SeriousSam/GUI/Menus/MNetworkJoin.h +++ b/Sources/SeriousSam/GUI/Menus/MNetworkJoin.h @@ -25,12 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc., class CNetworkJoinMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgLAN; - CMGButton gm_mgNET; - CMGButton gm_mgOpen; + CMGTitle gm_mgTitle; + CMGButton gm_mgLAN; + CMGButton gm_mgNET; + CMGButton gm_mgOpen; - void Initialize_t(void); + void Initialize_t(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MNetworkOpen.h b/Sources/SeriousSam/GUI/Menus/MNetworkOpen.h index ef1094e..ba29554 100644 --- a/Sources/SeriousSam/GUI/Menus/MNetworkOpen.h +++ b/Sources/SeriousSam/GUI/Menus/MNetworkOpen.h @@ -26,18 +26,18 @@ with this program; if not, write to the Free Software Foundation, Inc., class CNetworkOpenMenu : public CGameMenu { public: - CTString gm_strPort; + CTString gm_strPort; - CMGTitle gm_mgTitle; - CMGButton gm_mgAddressLabel; - CMGEdit gm_mgAddress; - CMGButton gm_mgPortLabel; - CMGEdit gm_mgPort; - CMGButton gm_mgJoin; + CMGTitle gm_mgTitle; + CMGButton gm_mgAddressLabel; + CMGEdit gm_mgAddress; + CMGButton gm_mgPortLabel; + CMGEdit gm_mgPort; + CMGButton gm_mgJoin; - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MNetworkStart.h b/Sources/SeriousSam/GUI/Menus/MNetworkStart.h index 9645fab..401af4d 100644 --- a/Sources/SeriousSam/GUI/Menus/MNetworkStart.h +++ b/Sources/SeriousSam/GUI/Menus/MNetworkStart.h @@ -27,20 +27,20 @@ with this program; if not, write to the Free Software Foundation, Inc., class CNetworkStartMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGEdit gm_mgSessionName; - CMGTrigger gm_mgGameType; - CMGTrigger gm_mgDifficulty; - CMGButton gm_mgLevel; - CMGTrigger gm_mgMaxPlayers; - CMGTrigger gm_mgWaitAllPlayers; - CMGTrigger gm_mgVisible; - CMGButton gm_mgGameOptions; - CMGButton gm_mgStart; + CMGTitle gm_mgTitle; + CMGEdit gm_mgSessionName; + CMGTrigger gm_mgGameType; + CMGTrigger gm_mgDifficulty; + CMGButton gm_mgLevel; + CMGTrigger gm_mgMaxPlayers; + CMGTrigger gm_mgWaitAllPlayers; + CMGTrigger gm_mgVisible; + CMGButton gm_mgGameOptions; + CMGButton gm_mgStart; - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MOptions.h b/Sources/SeriousSam/GUI/Menus/MOptions.h index 905aab9..283a4f8 100644 --- a/Sources/SeriousSam/GUI/Menus/MOptions.h +++ b/Sources/SeriousSam/GUI/Menus/MOptions.h @@ -25,13 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc., class COptionsMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgVideoOptions; - CMGButton gm_mgAudioOptions; - CMGButton gm_mgPlayerProfileOptions; - CMGButton gm_mgNetworkOptions; - CMGButton gm_mgCustomOptions; - CMGButton gm_mgAddonOptions; + CMGTitle gm_mgTitle; + CMGButton gm_mgVideoOptions; + CMGButton gm_mgAudioOptions; + CMGButton gm_mgPlayerProfileOptions; + CMGButton gm_mgNetworkOptions; + CMGButton gm_mgCustomOptions; + CMGButton gm_mgAddonOptions; void Initialize_t(void); }; diff --git a/Sources/SeriousSam/GUI/Menus/MPlayerProfile.h b/Sources/SeriousSam/GUI/Menus/MPlayerProfile.h index 948e51a..def0eb9 100644 --- a/Sources/SeriousSam/GUI/Menus/MPlayerProfile.h +++ b/Sources/SeriousSam/GUI/Menus/MPlayerProfile.h @@ -28,34 +28,34 @@ with this program; if not, write to the Free Software Foundation, Inc., class CPlayerProfileMenu : public CGameMenu { public: - INDEX *gm_piCurrentPlayer; + INDEX *gm_piCurrentPlayer; - CMGTitle gm_mgProfileTitle; - CMGButton gm_mgNoLabel; - CMGButton gm_mgNumber[8]; - CMGButton gm_mgNameLabel; - CMGEdit gm_mgNameField; - CMGButton gm_mgTeamLabel; - CMGEdit gm_mgTeam; - CMGButton gm_mgCustomizeControls; - CMGTrigger gm_mgCrosshair; - CMGTrigger gm_mgWeaponSelect; - CMGTrigger gm_mgWeaponHide; - CMGTrigger gm_mg3rdPerson; - CMGTrigger gm_mgQuotes; - CMGTrigger gm_mgAutoSave; - CMGTrigger gm_mgCompDoubleClick; - CMGTrigger gm_mgViewBobbing; - CMGTrigger gm_mgSharpTurning; - CMGModel gm_mgModel; + CMGTitle gm_mgProfileTitle; + CMGButton gm_mgNoLabel; + CMGButton gm_mgNumber[8]; + CMGButton gm_mgNameLabel; + CMGEdit gm_mgNameField; + CMGButton gm_mgTeamLabel; + CMGEdit gm_mgTeam; + CMGButton gm_mgCustomizeControls; + CMGTrigger gm_mgCrosshair; + CMGTrigger gm_mgWeaponSelect; + CMGTrigger gm_mgWeaponHide; + CMGTrigger gm_mg3rdPerson; + CMGTrigger gm_mgQuotes; + CMGTrigger gm_mgAutoSave; + CMGTrigger gm_mgCompDoubleClick; + CMGTrigger gm_mgViewBobbing; + CMGTrigger gm_mgSharpTurning; + CMGModel gm_mgModel; - void Initialize_t(void); - INDEX ComboFromPlayer(INDEX iPlayer); - INDEX PlayerFromCombo(INDEX iCombo); - void SelectPlayer(INDEX iPlayer); - void ApplyComboPlayer(INDEX iPlayer); - void StartMenu(void); - void EndMenu(void); + void Initialize_t(void); + INDEX ComboFromPlayer(INDEX iPlayer); + INDEX PlayerFromCombo(INDEX iCombo); + void SelectPlayer(INDEX iPlayer); + void ApplyComboPlayer(INDEX iPlayer); + void StartMenu(void); + void EndMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MRenderingOptions.h b/Sources/SeriousSam/GUI/Menus/MRenderingOptions.h index 5ccaff1..d12c614 100644 --- a/Sources/SeriousSam/GUI/Menus/MRenderingOptions.h +++ b/Sources/SeriousSam/GUI/Menus/MRenderingOptions.h @@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., class CRenderingOptionsMenu : public CGameMenu { public: - void StartMenu(void); - void EndMenu(void); - void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); + void Initialize_t(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MSelectPlayers.h b/Sources/SeriousSam/GUI/Menus/MSelectPlayers.h index a743ec5..4befeed 100644 --- a/Sources/SeriousSam/GUI/Menus/MSelectPlayers.h +++ b/Sources/SeriousSam/GUI/Menus/MSelectPlayers.h @@ -27,27 +27,27 @@ with this program; if not, write to the Free Software Foundation, Inc., class CSelectPlayersMenu : public CGameMenu { public: - BOOL gm_bAllowDedicated; - BOOL gm_bAllowObserving; + BOOL gm_bAllowDedicated; + BOOL gm_bAllowObserving; - CMGTitle gm_mgTitle; + CMGTitle gm_mgTitle; - CMGTrigger gm_mgDedicated; - CMGTrigger gm_mgObserver; - CMGTrigger gm_mgSplitScreenCfg; + CMGTrigger gm_mgDedicated; + CMGTrigger gm_mgObserver; + CMGTrigger gm_mgSplitScreenCfg; - CMGChangePlayer gm_mgPlayer0Change; - CMGChangePlayer gm_mgPlayer1Change; - CMGChangePlayer gm_mgPlayer2Change; - CMGChangePlayer gm_mgPlayer3Change; + CMGChangePlayer gm_mgPlayer0Change; + CMGChangePlayer gm_mgPlayer1Change; + CMGChangePlayer gm_mgPlayer2Change; + CMGChangePlayer gm_mgPlayer3Change; - CMGButton gm_mgNotes; + CMGButton gm_mgNotes; - CMGButton gm_mgStart; + CMGButton gm_mgStart; - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MServers.h b/Sources/SeriousSam/GUI/Menus/MServers.h index cb2d7d3..0b24f8f 100644 --- a/Sources/SeriousSam/GUI/Menus/MServers.h +++ b/Sources/SeriousSam/GUI/Menus/MServers.h @@ -27,15 +27,15 @@ with this program; if not, write to the Free Software Foundation, Inc., class CServersMenu : public CGameMenu { public: - BOOL m_bInternet; + BOOL m_bInternet; - CMGTitle gm_mgTitle; - CMGServerList gm_mgList; - CMGButton gm_mgRefresh; + CMGTitle gm_mgTitle; + CMGServerList gm_mgList; + CMGButton gm_mgRefresh; - void Initialize_t(void); - void StartMenu(void); - void Think(void); + void Initialize_t(void); + void StartMenu(void); + void Think(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MSinglePlayer.h b/Sources/SeriousSam/GUI/Menus/MSinglePlayer.h index 5dc0efb..2249338 100644 --- a/Sources/SeriousSam/GUI/Menus/MSinglePlayer.h +++ b/Sources/SeriousSam/GUI/Menus/MSinglePlayer.h @@ -25,19 +25,19 @@ with this program; if not, write to the Free Software Foundation, Inc., class CSinglePlayerMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgPlayerLabel; - CMGButton gm_mgNewGame; - CMGButton gm_mgCustom; - CMGButton gm_mgQuickLoad; - CMGButton gm_mgLoad; - CMGButton gm_mgTraining; - CMGButton gm_mgTechTest; - CMGButton gm_mgPlayersAndControls; - CMGButton gm_mgOptions; + CMGTitle gm_mgTitle; + CMGButton gm_mgPlayerLabel; + CMGButton gm_mgNewGame; + CMGButton gm_mgCustom; + CMGButton gm_mgQuickLoad; + CMGButton gm_mgLoad; + CMGButton gm_mgTraining; + CMGButton gm_mgTechTest; + CMGButton gm_mgPlayersAndControls; + CMGButton gm_mgOptions; - void Initialize_t(void); - void StartMenu(void); + void Initialize_t(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.h b/Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.h index 1d91f95..502f190 100644 --- a/Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.h +++ b/Sources/SeriousSam/GUI/Menus/MSinglePlayerNew.h @@ -25,16 +25,16 @@ with this program; if not, write to the Free Software Foundation, Inc., class CSinglePlayerNewMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgTourist; - CMGButton gm_mgEasy; - CMGButton gm_mgMedium; - CMGButton gm_mgHard; - CMGButton gm_mgSerious; - CMGButton gm_mgMental; + CMGTitle gm_mgTitle; + CMGButton gm_mgTourist; + CMGButton gm_mgEasy; + CMGButton gm_mgMedium; + CMGButton gm_mgHard; + CMGButton gm_mgSerious; + CMGButton gm_mgMental; - void Initialize_t(void); - void StartMenu(void); + void Initialize_t(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MSplitScreen.h b/Sources/SeriousSam/GUI/Menus/MSplitScreen.h index ed73579..2e6ea97 100644 --- a/Sources/SeriousSam/GUI/Menus/MSplitScreen.h +++ b/Sources/SeriousSam/GUI/Menus/MSplitScreen.h @@ -25,13 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc., class CSplitScreenMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGButton gm_mgStart; - CMGButton gm_mgQuickLoad; - CMGButton gm_mgLoad; + CMGTitle gm_mgTitle; + CMGButton gm_mgStart; + CMGButton gm_mgQuickLoad; + CMGButton gm_mgLoad; - void Initialize_t(void); - void StartMenu(void); + void Initialize_t(void); + void StartMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MSplitStart.h b/Sources/SeriousSam/GUI/Menus/MSplitStart.h index 1c28069..8cb8597 100644 --- a/Sources/SeriousSam/GUI/Menus/MSplitStart.h +++ b/Sources/SeriousSam/GUI/Menus/MSplitStart.h @@ -26,16 +26,16 @@ with this program; if not, write to the Free Software Foundation, Inc., class CSplitStartMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGTrigger gm_mgGameType; - CMGTrigger gm_mgDifficulty; - CMGButton gm_mgLevel; - CMGButton gm_mgOptions; - CMGButton gm_mgStart; + CMGTitle gm_mgTitle; + CMGTrigger gm_mgGameType; + CMGTrigger gm_mgDifficulty; + CMGButton gm_mgLevel; + CMGButton gm_mgOptions; + CMGButton gm_mgStart; - void Initialize_t(void); - void StartMenu(void); - void EndMenu(void); + void Initialize_t(void); + void StartMenu(void); + void EndMenu(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MVar.h b/Sources/SeriousSam/GUI/Menus/MVar.h index 4601e30..cc32d43 100644 --- a/Sources/SeriousSam/GUI/Menus/MVar.h +++ b/Sources/SeriousSam/GUI/Menus/MVar.h @@ -27,19 +27,19 @@ with this program; if not, write to the Free Software Foundation, Inc., class CVarMenu : public CGameMenu { public: - CTFileName gm_fnmMenuCFG; + CTFileName gm_fnmMenuCFG; - CMGTitle gm_mgTitle; - CMGVarButton gm_mgVar[LEVELS_ON_SCREEN]; - CMGButton gm_mgApply; - CMGArrow gm_mgArrowUp; - CMGArrow gm_mgArrowDn; + CMGTitle gm_mgTitle; + CMGVarButton gm_mgVar[LEVELS_ON_SCREEN]; + CMGButton gm_mgApply; + CMGArrow gm_mgArrowUp; + CMGArrow gm_mgArrowDn; - void Initialize_t(void); - void FillListItems(void); - void StartMenu(void); - void EndMenu(void); - void Think(void); + void Initialize_t(void); + void FillListItems(void); + void StartMenu(void); + void EndMenu(void); + void Think(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MVideoOptions.h b/Sources/SeriousSam/GUI/Menus/MVideoOptions.h index 2cc0c69..4befd27 100644 --- a/Sources/SeriousSam/GUI/Menus/MVideoOptions.h +++ b/Sources/SeriousSam/GUI/Menus/MVideoOptions.h @@ -23,18 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc., class CVideoOptionsMenu : public CGameMenu { public: - CMGTitle gm_mgTitle; - CMGTrigger gm_mgDisplayAPITrigger; - CMGTrigger gm_mgDisplayAdaptersTrigger; - CMGTrigger gm_mgFullScreenTrigger; - CMGTrigger gm_mgResolutionsTrigger; - CMGTrigger gm_mgDisplayPrefsTrigger; - CMGButton gm_mgVideoRendering; - CMGTrigger gm_mgBitsPerPixelTrigger; - CMGButton gm_mgApply; + CMGTitle gm_mgTitle; + CMGTrigger gm_mgDisplayAPITrigger; + CMGTrigger gm_mgDisplayAdaptersTrigger; + CMGTrigger gm_mgFullScreenTrigger; + CMGTrigger gm_mgResolutionsTrigger; + CMGTrigger gm_mgDisplayPrefsTrigger; + CMGButton gm_mgVideoRendering; + CMGTrigger gm_mgBitsPerPixelTrigger; + CMGButton gm_mgApply; - void StartMenu(void); - void Initialize_t(void); + void StartMenu(void); + void Initialize_t(void); }; #endif /* include-once check. */ \ No newline at end of file diff --git a/Sources/SeriousSam/GUI/Menus/MenuActions.cpp b/Sources/SeriousSam/GUI/Menus/MenuActions.cpp index 0a27758..54d09a1 100644 --- a/Sources/SeriousSam/GUI/Menus/MenuActions.cpp +++ b/Sources/SeriousSam/GUI/Menus/MenuActions.cpp @@ -96,6 +96,9 @@ static void SizeToResolution(PIX pixSizeI, PIX pixSizeJ, INDEX &iRes) } // ------------------------ CConfirmMenu implementation +extern CTFileName _fnmModToLoad; +extern CTString _strModServerJoin; + CTFileName _fnmModSelected; CTString _strModURLSelected; CTString _strModServerSelected; @@ -140,14 +143,11 @@ static void StopConfirm(void) static void ModLoadYes(void) { - extern CTFileName _fnmModToLoad; _fnmModToLoad = _fnmModSelected; } static void ModConnect(void) { - extern CTFileName _fnmModToLoad; - extern CTString _strModServerJoin; _fnmModToLoad = _fnmModSelected; _strModServerJoin = _strModServerSelected; } @@ -213,7 +213,6 @@ void ModNotInstalled(void) ChangeToMenu(&gmCurrent); } - extern void ModConfirm(void) { CConfirmMenu &gmCurrent = _pGUIM->gmConfirmMenu; @@ -334,7 +333,6 @@ extern void SetDemoStartStopRecText(void) } } - // ------------------------ CSinglePlayerMenu implementation extern CTString sam_strTechTestLevel; extern CTString sam_strTrainingLevel; diff --git a/Sources/SeriousSam/GUI/Menus/MenuManager.h b/Sources/SeriousSam/GUI/Menus/MenuManager.h index 400ac49..6ee755e 100644 --- a/Sources/SeriousSam/GUI/Menus/MenuManager.h +++ b/Sources/SeriousSam/GUI/Menus/MenuManager.h @@ -15,7 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef SE_INCL_MENUMANAGER_H #define SE_INCL_MENUMANAGER_H #ifdef PRAGMA_ONCE -#pragma once + #pragma once #endif #include "MAudioOptions.h" @@ -46,31 +46,31 @@ with this program; if not, write to the Free Software Foundation, Inc., class CMenuManager { public: - CConfirmMenu gmConfirmMenu; - CMainMenu gmMainMenu; - CInGameMenu gmInGameMenu; - CSinglePlayerMenu gmSinglePlayerMenu; - CSinglePlayerNewMenu gmSinglePlayerNewMenu; - CDisabledMenu gmDisabledFunction; - CLevelsMenu gmLevelsMenu; - CVarMenu gmVarMenu; - CPlayerProfileMenu gmPlayerProfile; - CControlsMenu gmControls; - CLoadSaveMenu gmLoadSaveMenu; - CHighScoreMenu gmHighScoreMenu; - CCustomizeKeyboardMenu gmCustomizeKeyboardMenu; - CServersMenu gmServersMenu; - CCustomizeAxisMenu gmCustomizeAxisMenu; - COptionsMenu gmOptionsMenu; - CVideoOptionsMenu gmVideoOptionsMenu; - CAudioOptionsMenu gmAudioOptionsMenu; - CNetworkMenu gmNetworkMenu; - CNetworkJoinMenu gmNetworkJoinMenu; - CNetworkStartMenu gmNetworkStartMenu; - CNetworkOpenMenu gmNetworkOpenMenu; - CSplitScreenMenu gmSplitScreenMenu; - CSplitStartMenu gmSplitStartMenu; - CSelectPlayersMenu gmSelectPlayersMenu; + CConfirmMenu gmConfirmMenu; + CMainMenu gmMainMenu; + CInGameMenu gmInGameMenu; + CSinglePlayerMenu gmSinglePlayerMenu; + CSinglePlayerNewMenu gmSinglePlayerNewMenu; + CDisabledMenu gmDisabledFunction; + CLevelsMenu gmLevelsMenu; + CVarMenu gmVarMenu; + CPlayerProfileMenu gmPlayerProfile; + CControlsMenu gmControls; + CLoadSaveMenu gmLoadSaveMenu; + CHighScoreMenu gmHighScoreMenu; + CCustomizeKeyboardMenu gmCustomizeKeyboardMenu; + CServersMenu gmServersMenu; + CCustomizeAxisMenu gmCustomizeAxisMenu; + COptionsMenu gmOptionsMenu; + CVideoOptionsMenu gmVideoOptionsMenu; + CAudioOptionsMenu gmAudioOptionsMenu; + CNetworkMenu gmNetworkMenu; + CNetworkJoinMenu gmNetworkJoinMenu; + CNetworkStartMenu gmNetworkStartMenu; + CNetworkOpenMenu gmNetworkOpenMenu; + CSplitScreenMenu gmSplitScreenMenu; + CSplitStartMenu gmSplitStartMenu; + CSelectPlayersMenu gmSelectPlayersMenu; }; extern CMenuManager *_pGUIM; // TODO: Make singleton! diff --git a/Sources/SeriousSam/GUI/Menus/MenuStartersAF.cpp b/Sources/SeriousSam/GUI/Menus/MenuStartersAF.cpp index e2cb17d..f0c6937 100644 --- a/Sources/SeriousSam/GUI/Menus/MenuStartersAF.cpp +++ b/Sources/SeriousSam/GUI/Menus/MenuStartersAF.cpp @@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "MenuStarters.h" #include "MenuStuff.h" -CTFileName _fnDemoToPlay; -CTFileName _fnGameToLoad; +static CTFileName _fnDemoToPlay; +static CTFileName _fnGameToLoad; extern CTString sam_strNetworkSettings; diff --git a/Sources/SeriousSam/GUI/Menus/MenuStuff.h b/Sources/SeriousSam/GUI/Menus/MenuStuff.h index 08a4a25..a51d69c 100644 --- a/Sources/SeriousSam/GUI/Menus/MenuStuff.h +++ b/Sources/SeriousSam/GUI/Menus/MenuStuff.h @@ -21,15 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "FileInfo.h" #define TRIGGER_MG(mg, y, up, down, text, astr) \ - mg.mg_pmgUp = &up; \ - mg.mg_pmgDown = &down; \ - mg.mg_boxOnScreen = BoxMediumRow(y); \ - gm_lhGadgets.AddTail(mg.mg_lnNode); \ - mg.mg_astrTexts = astr; \ - mg.mg_ctTexts = sizeof(astr) / sizeof(astr[0]); \ - mg.mg_iSelected = 0; \ - mg.mg_strLabel = text; \ - mg.mg_strValue = astr[0]; + mg.mg_pmgUp = &up; \ + mg.mg_pmgDown = &down; \ + mg.mg_boxOnScreen = BoxMediumRow(y); \ + gm_lhGadgets.AddTail(mg.mg_lnNode); \ + mg.mg_astrTexts = astr; \ + mg.mg_ctTexts = sizeof(astr) / sizeof(astr[0]); \ + mg.mg_iSelected = 0; \ + mg.mg_strLabel = text; \ + mg.mg_strValue = astr[0]; extern INDEX ctGameTypeRadioTexts; diff --git a/Sources/SeriousSam/SeriousSam.h b/Sources/SeriousSam/SeriousSam.h index d98b629..0e1adc3 100644 --- a/Sources/SeriousSam/SeriousSam.h +++ b/Sources/SeriousSam/SeriousSam.h @@ -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. */ #define APPLICATION_NAME "SeriousSam" -#include "CDCheck.h" extern HINSTANCE _hInstance; extern BOOL _bRunning, _bQuitScreen; diff --git a/Sources/SeriousSam/SeriousSam.vcxproj b/Sources/SeriousSam/SeriousSam.vcxproj index 93fed95..d5f2ca6 100644 --- a/Sources/SeriousSam/SeriousSam.vcxproj +++ b/Sources/SeriousSam/SeriousSam.vcxproj @@ -297,7 +297,6 @@ copy Release\$(TargetName).map $(SolutionDir)..\Bin\ >nul - diff --git a/Sources/SeriousSam/SeriousSam.vcxproj.filters b/Sources/SeriousSam/SeriousSam.vcxproj.filters index 6bacaec..433430c 100644 --- a/Sources/SeriousSam/SeriousSam.vcxproj.filters +++ b/Sources/SeriousSam/SeriousSam.vcxproj.filters @@ -215,9 +215,6 @@ - - Header Files - Header Files