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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Core/GameEngine/Include/GameClient/View.h
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@ class ViewDummy : public View
}
virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) override {}
virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) override {}
virtual void drawView( void ) override {}
virtual void updateView(void) override {}
virtual void drawView() override {}
virtual void updateView() override {}
virtual void stepView() override {}
virtual void setGuardBandBias( const Coord2D *gb ) override {}
virtual Bool isDoingScriptedCamera() override { return false; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ void GameSpyPeerMessageQueue::addRequest( const PeerRequest& req )
m_requests.push(req);
}

//PeerRequest GameSpyPeerMessageQueue::getRequest( void )
//PeerRequest GameSpyPeerMessageQueue::getRequest()
Bool GameSpyPeerMessageQueue::getRequest( PeerRequest& req )
{
MutexClass::LockClass m(m_requestMutex, 0);
Expand All @@ -612,7 +612,7 @@ void GameSpyPeerMessageQueue::addResponse( const PeerResponse& resp )
m_responses.push(resp);
}

//PeerResponse GameSpyPeerMessageQueue::getResponse( void )
//PeerResponse GameSpyPeerMessageQueue::getResponse()
Bool GameSpyPeerMessageQueue::getResponse( PeerResponse& resp )
{
MutexClass::LockClass m(m_responseMutex, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ void PingThreadClass::Thread_Function()
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------

HANDLE WINAPI IcmpCreateFile(VOID); /* INVALID_HANDLE_VALUE on error */
HANDLE WINAPI IcmpCreateFile(); /* INVALID_HANDLE_VALUE on error */
BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle); /* FALSE on error */

/* Note 2: For the most part, you can refer to RFC 791 for detials
Expand Down Expand Up @@ -442,7 +442,7 @@ Int PingThreadClass::doPing(UnsignedInt IP, Int timeout)
char achRepData[sizeof(ICMPECHO) + BUFSIZE];


HANDLE ( WINAPI *lpfnIcmpCreateFile )( VOID ) = nullptr;
HANDLE ( WINAPI *lpfnIcmpCreateFile )() = nullptr;
BOOL ( WINAPI *lpfnIcmpCloseHandle )( HANDLE ) = nullptr;
DWORD (WINAPI *lpfnIcmpSendEcho)(HANDLE, DWORD, LPVOID, WORD, LPVOID,
LPVOID, DWORD, DWORD) = nullptr;
Expand Down
4 changes: 2 additions & 2 deletions Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) IUNKNOWN_NOEXCEP
*
******************************************************************************/

ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT
ULONG STDMETHODCALLTYPE WebBrowser::AddRef() IUNKNOWN_NOEXCEPT
{
return ++mRefCount;
}
Expand All @@ -285,7 +285,7 @@ ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) IUNKNOWN_NOEXCEPT
*
******************************************************************************/

ULONG STDMETHODCALLTYPE WebBrowser::Release(void) IUNKNOWN_NOEXCEPT
ULONG STDMETHODCALLTYPE WebBrowser::Release() IUNKNOWN_NOEXCEPT
{
DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
--mRefCount;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2530,7 +2530,7 @@ void W3DView::initHeightForMap()

//-------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------
void W3DView::resetPivotToGround( void )
void W3DView::resetPivotToGround()
{
m_groundLevel = getHeightAroundPos(m_pos.x, m_pos.y);
m_cameraAreaConstraintsValid = false; // possible ground level change invalidates camera constraints
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@

/*$_Function****************************************************************
* $_Name :
* STDMETHOD Cftp::LogoffFromServer( void )
* STDMETHOD Cftp::LogoffFromServer()
*
* $_Description :
* Logs off from a server. LoginToServer() must have succeeded before this
Expand Down Expand Up @@ -665,7 +665,7 @@
char ext[ 10 ];

if (m_findStart==0)
m_findStart=time(nullptr);

Check warning on line 668 in Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp

View workflow job for this annotation

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

'=': conversion from 'time_t' to 'int', possible loss of data

Check warning on line 668 in Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / win32+t+e

'=': conversion from 'time_t' to 'int', possible loss of data

Check warning on line 668 in Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp

View workflow job for this annotation

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

'=': conversion from 'time_t' to 'int', possible loss of data

Check warning on line 668 in Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp

View workflow job for this annotation

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

'=': conversion from 'time_t' to 'int', possible loss of data

Check warning on line 668 in Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+t+e

'=': conversion from 'time_t' to 'int', possible loss of data

Check warning on line 668 in Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp

View workflow job for this annotation

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

'=': conversion from 'time_t' to 'int', possible loss of data

if((time(nullptr)-m_findStart) > 30) // try for 30 seconds
{
Expand Down Expand Up @@ -1069,7 +1069,7 @@

/*$_Function****************************************************************
* $_Name :
* int Cftp::SendNewPort( void )
* int Cftp::SendNewPort()
*
* $_Description :
* Sends a PORT command to the server specifying a new ephemeral port to
Expand Down
12 changes: 6 additions & 6 deletions Core/Tools/DebugWindow/DebugWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ CDebugWindowApp::CDebugWindowApp()
m_DialogWindow = nullptr;
}

DebugWindowDialog* CDebugWindowApp::GetDialogWindow(void)
DebugWindowDialog* CDebugWindowApp::GetDialogWindow()
{
return m_DialogWindow;
}
Expand All @@ -96,7 +96,7 @@ CDebugWindowApp::~CDebugWindowApp()

CDebugWindowApp theApp;

void __declspec(dllexport) CreateDebugDialog(void)
void __declspec(dllexport) CreateDebugDialog()
{
AFX_MANAGE_STATE(AfxGetStaticModuleState( ));

Expand All @@ -112,7 +112,7 @@ void __declspec(dllexport) CreateDebugDialog(void)
theApp.SetDialogWindow(tmpWnd);
}

void __declspec(dllexport) DestroyDebugDialog(void)
void __declspec(dllexport) DestroyDebugDialog()
{
AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
DebugWindowDialog* tmpWnd = theApp.GetDialogWindow();
Expand All @@ -125,7 +125,7 @@ void __declspec(dllexport) DestroyDebugDialog(void)

}

bool __declspec(dllexport) CanAppContinue(void)
bool __declspec(dllexport) CanAppContinue()
{
AFX_MANAGE_STATE(AfxGetStaticModuleState( ));

Expand All @@ -138,7 +138,7 @@ bool __declspec(dllexport) CanAppContinue(void)
return pDbg->CanProceed();
}

void __declspec(dllexport) ForceAppContinue(void)
void __declspec(dllexport) ForceAppContinue()
{
AFX_MANAGE_STATE(AfxGetStaticModuleState( ));

Expand All @@ -151,7 +151,7 @@ void __declspec(dllexport) ForceAppContinue(void)
pDbg->ForceContinue();
}

bool __declspec(dllexport) RunAppFast(void)
bool __declspec(dllexport) RunAppFast()
{
AFX_MANAGE_STATE(AfxGetStaticModuleState( ));

Expand Down
2 changes: 1 addition & 1 deletion Core/Tools/DebugWindow/DebugWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class CDebugWindowApp : public CWinApp
public:
CDebugWindowApp();
~CDebugWindowApp();
DebugWindowDialog* GetDialogWindow(void);
DebugWindowDialog* GetDialogWindow();
void SetDialogWindow(DebugWindowDialog* pWnd);

protected:
Expand Down
16 changes: 8 additions & 8 deletions Core/Tools/DebugWindow/DebugWindowDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ int DebugWindowDialog::OnCreate(LPCREATESTRUCT lpCreateStruct)
return CDialog::OnCreate(lpCreateStruct);
}

HWND DebugWindowDialog::GetMainWndHWND(void)
HWND DebugWindowDialog::GetMainWndHWND()
{
return mMainWndHWND;
}

void DebugWindowDialog::ForcePause(void)
void DebugWindowDialog::ForcePause()
{
mNumberOfStepsAllowed = 0;
_UpdatePauseButton();
}

void DebugWindowDialog::ForceContinue(void)
void DebugWindowDialog::ForceContinue()
{
mNumberOfStepsAllowed = -1;
_UpdatePauseButton();
Expand Down Expand Up @@ -88,7 +88,7 @@ void DebugWindowDialog::OnClearWindows()
_RebuildVarsString();
}

bool DebugWindowDialog::CanProceed(void)
bool DebugWindowDialog::CanProceed()
{
if (mNumberOfStepsAllowed < 0) {
return true;
Expand All @@ -104,7 +104,7 @@ bool DebugWindowDialog::CanProceed(void)
return true;
}

bool DebugWindowDialog::RunAppFast(void)
bool DebugWindowDialog::RunAppFast()
{
return mRunFast;
}
Expand Down Expand Up @@ -147,7 +147,7 @@ void DebugWindowDialog::SetFrameNumber(int frameNumber)
}
}

void DebugWindowDialog::_RebuildVarsString(void)
void DebugWindowDialog::_RebuildVarsString()
{
int cursorPosBeg, cursorPosEnd;
((CEdit*)GetDlgItem(IDC_Variables))->GetSel(cursorPosBeg, cursorPosEnd);
Expand All @@ -168,7 +168,7 @@ void DebugWindowDialog::_RebuildVarsString(void)
((CEdit*)GetDlgItem(IDC_Variables))->GetSel(cursorPosBeg, cursorPosEnd);
}

void DebugWindowDialog::_RebuildMesgString(void)
void DebugWindowDialog::_RebuildMesgString()
{
mMessagesString = "";

Expand All @@ -183,7 +183,7 @@ void DebugWindowDialog::_RebuildMesgString(void)
((CEdit*)GetDlgItem(IDC_Messages))->SetSel(mMessagesString.length(), mMessagesString.length(), false);
}

void DebugWindowDialog::_UpdatePauseButton(void)
void DebugWindowDialog::_UpdatePauseButton()
{
// huh huh huhuh he said pButt
CButton* pButt = (CButton*) GetDlgItem(IDC_Pause);
Expand Down
16 changes: 8 additions & 8 deletions Core/Tools/DebugWindow/DebugWindowDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ class DebugWindowDialog : public CDialog
enum {IDD = IDD_DebugWindow};
DebugWindowDialog(UINT nIDTemplate = DebugWindowDialog::IDD, CWnd* pParentWnd = nullptr);

bool CanProceed(void);
bool RunAppFast(void);
bool CanProceed();
bool RunAppFast();
void AppendMessage(const std::string& messageToAppend);
void AdjustVariable(const std::string& varName, const std::string& varValue);
void SetFrameNumber(int frameNumber);
HWND GetMainWndHWND(void);
void ForcePause(void);
void ForceContinue(void);
HWND GetMainWndHWND();
void ForcePause();
void ForceContinue();

// This var shouldn't be here, but honsestly...
protected:
Expand All @@ -62,9 +62,9 @@ class DebugWindowDialog : public CDialog
VecPairString mVariables;
VecString mMessages;

void _RebuildVarsString(void);
void _RebuildMesgString(void);
void _UpdatePauseButton(void);
void _RebuildVarsString();
void _RebuildMesgString();
void _UpdatePauseButton();

protected:
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
Expand Down
10 changes: 5 additions & 5 deletions Core/Tools/DebugWindow/DebugWindowExport.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
// Declared extern C to prevent name mangling, which makes life very unhappy
extern "C" {
// Called to create the dialog
void __declspec(dllexport) CreateDebugDialog(void);
void __declspec(dllexport) CreateDebugDialog();

// Called to (not surprisingly) destroy the dialog (and free the resources)
void __declspec(dllexport) DestroyDebugDialog(void);
void __declspec(dllexport) DestroyDebugDialog();

// Call this each frame to determine whether to continue or not
bool __declspec(dllexport) CanAppContinue(void);
bool __declspec(dllexport) CanAppContinue();

// Call this to force the app to continue. (Unpause if necessary.)
void __declspec(dllexport) ForceAppContinue(void);
void __declspec(dllexport) ForceAppContinue();

// Call this to tell the app to run really fast
bool __declspec(dllexport) RunAppFast(void);
bool __declspec(dllexport) RunAppFast();

// Call this to add a message to the script window
void __declspec(dllexport) AppendMessage(const char* messageToPass);
Expand Down
4 changes: 2 additions & 2 deletions Core/Tools/ImagePacker/Include/ImageDirectory.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ class ImageDirectory
///////////////////////////////////////////////////////////////////////////////
// INLINING ///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
inline ImageDirectory::~ImageDirectory( void ) { delete m_path; }
inline ImageDirectory::ImageDirectory( void )
inline ImageDirectory::~ImageDirectory() { delete m_path; }
inline ImageDirectory::ImageDirectory()
{
m_path = nullptr;
m_next = nullptr;
Expand Down
Loading
Loading