Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Core/Libraries/Source/debug/debug_stack.inl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ DBGHELP(SymInitialize,

DBGHELP(SymGetOptions,
DWORD,
(void))
Comment thread
xezon marked this conversation as resolved.
())

DBGHELP(SymSetOptions,
DWORD,
Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/Autorun/ARGS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ Command_Line_Arguments::Command_Line_Arguments ( HINSTANCE current_instance_hand
// 09/01/1997 ML/MG : Created.
//=============================================================================

Command_Line_Arguments::~Command_Line_Arguments ( void )
Command_Line_Arguments::~Command_Line_Arguments ()
{
//--------------------------------------------------------------------------
// reset all data...
Expand All @@ -285,7 +285,7 @@ Command_Line_Arguments::~Command_Line_Arguments ( void )
// 09/01/1997 ML/MG : Created.
//=============================================================================

int Command_Line_Arguments::Get_argc ( void )
int Command_Line_Arguments::Get_argc ()
{
//--------------------------------------------------------------------------
// debug checks - make sure we at least have the application name
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/Autorun/ARGS.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Command_Line_Arguments
Command_Line_Arguments ( HINSTANCE, LPTSTR );
Command_Line_Arguments ( LPTSTR ) {};
Command_Line_Arguments ( HINSTANCE );
~Command_Line_Arguments( void );
~Command_Line_Arguments();

const char * Get_argv( int argument_index );
int Get_argc();
Expand Down
6 changes: 3 additions & 3 deletions Core/Tools/Autorun/CDCNTRL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void Last_Error_Text ( LPCTSTR szPrefix, HRESULT hr );
* HISTORY: *
* 2/17/99 2:03AM ST : Created *
*=============================================================================================*/
CDControlClass::CDControlClass(void)
CDControlClass::CDControlClass()
{
}

Expand All @@ -105,7 +105,7 @@ CDControlClass::CDControlClass(void)
* HISTORY: *
* 2/17/99 2:03AM ST : Created *
*=============================================================================================*/
CDControlClass::~CDControlClass(void)
CDControlClass::~CDControlClass()
{
}

Expand Down Expand Up @@ -908,7 +908,7 @@ bool CDControlClass::Auto_Eject_Volume_95 (HANDLE vwin32, char drive)
* HISTORY: *
* 2/17/99 0:26AM ST : Created *
*=============================================================================================*/
HANDLE WINAPI CDControlClass::Open_VWin32 (void)
HANDLE WINAPI CDControlClass::Open_VWin32 ()
{
assert (WinVersion.Is_Win9x());
HANDLE result = CreateFile ( TEXT("\\\\.\\vwin32"), 0, 0, nullptr, 0, FILE_FLAG_DELETE_ON_CLOSE, nullptr);
Expand Down
6 changes: 3 additions & 3 deletions Core/Tools/Autorun/CDCNTRL.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
class CDControlClass {

public:
CDControlClass(void);
~CDControlClass(void);
CDControlClass();
~CDControlClass();

/*
** Force the CD tray to open on the specified drive.
Expand Down Expand Up @@ -85,7 +85,7 @@ class CDControlClass {
/*
** Win9x functions.
*/
HANDLE WINAPI Open_VWin32 (void);
HANDLE WINAPI Open_VWin32 ();
bool WINAPI Close_VWin32 (HANDLE vwin32);
bool WINAPI Unlock_Logical_Volume (HANDLE vwin32, char drive);
bool WINAPI Lock_Logical_Volume (HANDLE vwin32, char drive, char lock_level, short permissions);
Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/Autorun/CallbackHook.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class CallbackHook
virtual ~CallbackHook()
{}

virtual bool DoCallback(void) const
virtual bool DoCallback() const
{return false;}

protected:
Expand All @@ -66,7 +66,7 @@ template<class T> class Callback : public CallbackHook
{
}

virtual bool DoCallback(void) const
virtual bool DoCallback() const
{
if (mCallback != nullptr)
{
Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/Autorun/DrawButton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ bool DrawButton::Is_Mouse_In_Region ( int mouse_x, int mouse_y )
// 07/15/1996 MML : Created.
//=============================================================================

char *DrawButton::Return_Bitmap ( void )
char *DrawButton::Return_Bitmap ()
{
if ( ButtonState == PRESSED_STATE ) {
return ( PressedBitmap );
Expand Down
30 changes: 15 additions & 15 deletions Core/Tools/Autorun/DrawButton.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,29 @@ class DrawButton
DrawButton ( int id, RECT button_rect, const char *normal, const char *focus, const char *pressed, const char *string, TTFontClass *fontptr );
DrawButton ( int id, RECT button_rect, const char *normal, const char *focus, const char *pressed, const wchar_t *string, TTFontClass *fontptr );

char *Return_Normal_Bitmap ( void ) { return NormalBitmap; };
char *Return_Pressed_Bitmap ( void ) { return PressedBitmap; };
char *Return_Focus_Bitmap ( void ) { return FocusBitmap; };
char *Return_Bitmap ( void );
char *Return_Normal_Bitmap () { return NormalBitmap; };
char *Return_Pressed_Bitmap () { return PressedBitmap; };
char *Return_Focus_Bitmap () { return FocusBitmap; };
char *Return_Bitmap ();

bool Draw_Bitmaps ( void ) { return( UseBitmaps ); };
bool Draw_Bitmaps () { return( UseBitmaps ); };

void Draw_Text ( HDC hDC );

BUTTON_STATE Get_State ( void ) { return ButtonState; };
BUTTON_STATE Get_State () { return ButtonState; };
bool Is_Mouse_In_Region ( int mouse_x, int mouse_y );
int Return_Id ( void ) { return Id; };
int Return_X_Pos ( void ) { return rect.left; };
int Return_Y_Pos ( void ) { return rect.top; };
int Return_Width ( void ) { return( rect.right - rect.left ); };
int Return_Height ( void ) { return( rect.bottom - rect.top ); };
int Return_Stretched_Width ( void ) { return( StretchedWidth ); };
int Return_Stretched_Height ( void ) { return( StretchedHeight ); };
int Return_Id () { return Id; };
int Return_X_Pos () { return rect.left; };
int Return_Y_Pos () { return rect.top; };
int Return_Width () { return( rect.right - rect.left ); };
int Return_Height () { return( rect.bottom - rect.top ); };
int Return_Stretched_Width () { return( StretchedWidth ); };
int Return_Stretched_Height () { return( StretchedHeight ); };
void Return_Area ( RECT *area );
void Return_Area ( Rect *area );
void Return_Text_Area ( Rect *area );
TTFontClass *Return_Font_Ptr ( void ) { return( MyFontPtr ); };
wchar_t *Return_Text ( void ) { return( String ); };
TTFontClass *Return_Font_Ptr () { return( MyFontPtr ); };
wchar_t *Return_Text () { return( String ); };
void Set_State ( BUTTON_STATE state ) { ButtonState = state; };
int Set_Stretched_Width ( int );
int Set_Stretched_Height ( int );
Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/Autorun/GETCD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ GetCDClass CDList;
* 05/26/1994 SW : Created. *
* 12/04/1995 ST : fixed for Win95 *
*==========================================================================*/
GetCDClass::GetCDClass( void )
GetCDClass::GetCDClass()
{
char path[]={ "a:\\" };

Expand Down Expand Up @@ -142,7 +142,7 @@ GetCDClass::GetCDClass( void )
* 05/26/1994 SW: Created. *
* 12/4/95 ST: fixed for Win95 *
*==============================================================================*/
GetCDClass::~GetCDClass(void)
GetCDClass::~GetCDClass()
{
// if(cdDrive_addrp.seg)
// DPMI_real_free(cdDrive_addrp); // free up those conventional buffers
Expand Down
16 changes: 8 additions & 8 deletions Core/Tools/Autorun/GameText.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@
GameTextManager();
virtual ~GameTextManager();

virtual void init( void ); ///< Initlaizes the text system
virtual void deinit( void ); ///< De-initlaizes the text system
virtual void update( void ) {}; ///< update text manager
virtual void reset( void ); ///< Resets the text system
virtual void init(); ///< Initlaizes the text system
virtual void deinit(); ///< De-initlaizes the text system
virtual void update() {}; ///< update text manager
virtual void reset(); ///< Resets the text system

virtual const wchar_t * fetch( const Char *label ); ///< Returns the associated labeled unicode text
protected:
Expand Down Expand Up @@ -207,7 +207,7 @@
// CreateGameTextInterface
//============================================================================

GameTextInterface* CreateGameTextInterface( void )
GameTextInterface* CreateGameTextInterface()
{
return new GameTextManager;
}
Expand Down Expand Up @@ -246,7 +246,7 @@

extern char szArgvPath[];

void GameTextManager::init( void )
void GameTextManager::init()
{
const Char *strFile = "autorun.str";
const Char *csfFile = "autorun.csf";
Expand Down Expand Up @@ -338,7 +338,7 @@
// GameTextManager::deinit
//============================================================================

void GameTextManager::deinit( void )
void GameTextManager::deinit()
{
delete [] m_stringInfo;
m_stringInfo = nullptr;
Expand Down Expand Up @@ -371,7 +371,7 @@
// GameTextManager::reset
//============================================================================

void GameTextManager::reset( void )
void GameTextManager::reset()
{
}

Expand Down Expand Up @@ -814,7 +814,7 @@
file.close();
}

return ok;

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 817 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)
}

//============================================================================
Expand Down Expand Up @@ -1038,7 +1038,7 @@

file.close();

return ok;

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1041 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)
}

//============================================================================
Expand Down Expand Up @@ -1114,7 +1114,7 @@

*buffer = 0;

return ok;

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / vc6+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-profile+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-debug+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)

Check warning on line 1117 in Core/Tools/Autorun/GameText.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / vc6-releaselog+t+e

'int' : forcing value to bool 'true' or 'false' (performance warning)
}

//============================================================================
Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/Autorun/GameText.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ class GameTextInterface

virtual ~GameTextInterface() {};

virtual void init( void ) = 0; ///< Initlaizes the text system
virtual void init() = 0; ///< Initlaizes the text system
virtual const wchar_t * fetch( const char *label ) = 0; ///< Returns the associated labeled unicode text

};


extern GameTextInterface *TheGameText;
extern GameTextInterface* CreateGameTextInterface( void );
extern GameTextInterface* CreateGameTextInterface();

//----------------------------------------------------------------------------
// Inlining
Expand Down
26 changes: 13 additions & 13 deletions Core/Tools/Autorun/GetCD.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,14 @@ struct StopType {
class GetCDClass
{
public:
GetCDClass ( void ); // This is the default constructor
~GetCDClass ( void ); // This is the destructor
GetCDClass (); // This is the default constructor
~GetCDClass (); // This is the destructor

inline int Get_First_CD_Drive ( void );
inline int Get_Next_CD_Drive ( void );
inline int Get_Number_Of_Drives ( void ) { return( CDCount ); };
inline int Get_Index ( void ) { return( CDIndex ); };
inline void Reset_Index ( void ) { CDIndex = 0; };
inline int Get_First_CD_Drive ();
inline int Get_Next_CD_Drive ();
inline int Get_Number_Of_Drives () { return( CDCount ); };
inline int Get_Index () { return( CDIndex ); };
inline void Reset_Index () { CDIndex = 0; };

int Get_CD_Drive_For_This_Volume ( const char *volume_name );
const char * Get_Volume_For_This_CD_Drive ( const char *path, char *volume_name );
Expand All @@ -230,7 +230,7 @@ class GetCDClass
* 12/4/95 ST : fixed for Win95 *
*==========================================================================*/

inline int GetCDClass::Get_First_CD_Drive(void)
inline int GetCDClass::Get_First_CD_Drive()
{
CDIndex = 0;
return (Get_Next_CD_Drive());
Expand All @@ -249,7 +249,7 @@ inline int GetCDClass::Get_First_CD_Drive(void)
* 5/21/96 3:50PM ST : Created *
*==================================================================================*/

inline int GetCDClass::Get_Next_CD_Drive(void)
inline int GetCDClass::Get_Next_CD_Drive()
{
if (CDCount){
if (CDIndex >= CDCount) {
Expand Down Expand Up @@ -277,17 +277,17 @@ class RedBookClass : public GetCDClass
{
public:

RedBookClass(void); // This is the default constructor
~RedBookClass(void); // This is the destructor
RedBookClass(); // This is the default constructor
~RedBookClass(); // This is the destructor
ULONG RedToHS(ULONG i);
ULONG MSFtoRed(UBYTE m, UBYTE s, UBYTE f);
void FullCDVolume(UBYTE chan);
void PlayTrack(UWORD track);
void Play_CD_MSL(UWORD min_sec, UWORD len);
void PlayMSF(UBYTE startM, UBYTE startS, UBYTE startF,
UBYTE endM, UBYTE endS, UBYTE endF, UBYTE chan);
UWORD CheckCDMusic(void);
void StopCDMusic(void);
UWORD CheckCDMusic();
void StopCDMusic();

private:

Expand Down
8 changes: 4 additions & 4 deletions Core/Tools/Autorun/IGR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ IGROptionsClass *OnlineOptions = nullptr;
* HISTORY: *
* 07/05/00 JeffB: Initial coding *
*===========================================================================================*/
bool IGROptionsClass::Init( void )
bool IGROptionsClass::Init()
{
int size;
int returnValue;
Expand Down Expand Up @@ -96,7 +96,7 @@ bool IGROptionsClass::Init( void )
* HISTORY: *
* 07/05/00 JeffB: Initial coding *
*=============================================================================================*/
bool IGROptionsClass::Is_Auto_Login_Allowed( void )
bool IGROptionsClass::Is_Auto_Login_Allowed()
{
return(( options & IGR_NO_AUTO_LOGIN ) == 0 );
}
Expand All @@ -113,7 +113,7 @@ bool IGROptionsClass::Is_Auto_Login_Allowed( void )
* HISTORY: *
* 07/05/00 JeffB: Initial coding *
*=============================================================================================*/
bool IGROptionsClass::Is_Storing_Nicks_Allowed( void )
bool IGROptionsClass::Is_Storing_Nicks_Allowed()
{
return(( options & IGR_NEVER_STORE_NICKS ) == 0 );
}
Expand All @@ -130,7 +130,7 @@ bool IGROptionsClass::Is_Storing_Nicks_Allowed( void )
* HISTORY: *
* 07/05/00 JeffB: Initial coding *
*=============================================================================================*/
bool IGROptionsClass::Is_Running_Reg_App_Allowed( void )
bool IGROptionsClass::Is_Running_Reg_App_Allowed()
{
return(( options & IGR_NEVER_RUN_REG_APP ) == 0 );
}
Expand Down
12 changes: 6 additions & 6 deletions Core/Tools/Autorun/IGR.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ class IGROptionsClass
{
public:
// Constructor
IGROptionsClass( void ) : valid( false ), options( 0 ) {};
IGROptionsClass() : valid( false ), options( 0 ) {};

// Destructor
~IGROptionsClass( void ) {};
~IGROptionsClass() {};

// Initialize. Read value(s) from registry
bool Init( void );
bool Init();

// Check various options
bool Is_Auto_Login_Allowed( void );
bool Is_Storing_Nicks_Allowed( void );
bool Is_Running_Reg_App_Allowed( void );
bool Is_Auto_Login_Allowed();
bool Is_Storing_Nicks_Allowed();
bool Is_Running_Reg_App_Allowed();

// Set various options
bool Set_Options( IGROptionsType options );
Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/Autorun/Locale_API.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ wchar_t * Remove_Quotes_Around_String ( wchar_t *old_string );
// make using the single vs. multi language files more transparent to the program.
//=============================================================================

bool Locale_Use_Multi_Language_Files ( void )
bool Locale_Use_Multi_Language_Files ()
{
#if( USE_MULTI_FILE_FORMAT )
return true;
Expand Down Expand Up @@ -288,7 +288,7 @@ int Locale_Init ( int language, char *file )
/* restore */
/************************************************************************/

void Locale_Restore ( void )
void Locale_Restore ()
{
delete TheGameText;
TheGameText = nullptr;
Expand Down
6 changes: 3 additions & 3 deletions Core/Tools/Autorun/Locale_API.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ extern int SubLanguage;
/* LOCALE API */
/****************************************************************************/
int Locale_Init ( int language, char *file );
void Locale_Restore ( void );
void Locale_Restore ();
const wchar_t* Locale_GetString( const char *id, wchar_t *buffer = nullptr, int size = _MAX_PATH );
/*
const char* Locale_GetString ( int StringID, char *String );
const wchar_t* Locale_GetString ( int StringID, wchar_t *String=nullptr );
*/
bool Locale_Use_Multi_Language_Files ( void );
//int Locale_Get_Language_ID ( void ) { return LanguageID; };
bool Locale_Use_Multi_Language_Files ();
//int Locale_Get_Language_ID () { return LanguageID; };
Loading
Loading