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

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

@ -33,9 +33,10 @@ public:
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);

View File

@ -25,7 +25,9 @@ class CMGEdit : public CMGButton {
public: public:
INDEX mg_ctMaxStringLen; INDEX mg_ctMaxStringLen;
CTString *mg_pstrToChange; CTString *mg_pstrToChange;
CMGEdit(void); CMGEdit(void);
// return TRUE if handled // return TRUE if handled
BOOL OnKeyDown(int iVKey); BOOL OnKeyDown(int iVKey);
BOOL OnChar(MSG msg); BOOL OnChar(MSG msg);

View File

@ -31,6 +31,7 @@ public:
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 // refresh current text from description
void RefreshText(void); void RefreshText(void);
// save description to disk // save description to disk

View File

@ -26,6 +26,15 @@ 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:
@ -40,11 +49,7 @@ public:
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 INDEX gm_iSortType; // sort type
// function to activate when file is chosen // function to activate when file is chosen

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"

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

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