diff --git a/Core/GameEngine/Include/GameClient/View.h b/Core/GameEngine/Include/GameClient/View.h index 4e7e78b9068..7180b907f25 100644 --- a/Core/GameEngine/Include/GameClient/View.h +++ b/Core/GameEngine/Include/GameClient/View.h @@ -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; } diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp index 251c0ae5925..8a185443bdb 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp @@ -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); @@ -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); diff --git a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp index e13e44dee26..e28c2dd4805 100644 --- a/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp +++ b/Core/GameEngine/Source/GameNetwork/GameSpy/Thread/PingThread.cpp @@ -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 @@ -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; diff --git a/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp b/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp index 2f67822c6a9..11198b19887 100644 --- a/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp +++ b/Core/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp @@ -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; } @@ -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; diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp index e750ed11901..a7dbc8501ae 100644 --- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp +++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp @@ -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 diff --git a/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp b/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp index 6a82b1a6a95..8c00512cb28 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp +++ b/Core/Libraries/Source/WWVegas/WWDownload/FTP.cpp @@ -555,7 +555,7 @@ HRESULT Cftp::LoginToServer( LPCSTR szUserName, LPCSTR szPassword ) /*$_Function**************************************************************** * $_Name : -* STDMETHOD Cftp::LogoffFromServer( void ) +* STDMETHOD Cftp::LogoffFromServer() * * $_Description : * Logs off from a server. LoginToServer() must have succeeded before this @@ -1069,7 +1069,7 @@ unsigned long MyIPAddress( int sockfd ) /*$_Function**************************************************************** * $_Name : -* int Cftp::SendNewPort( void ) +* int Cftp::SendNewPort() * * $_Description : * Sends a PORT command to the server specifying a new ephemeral port to diff --git a/Core/Tools/DebugWindow/DebugWindow.cpp b/Core/Tools/DebugWindow/DebugWindow.cpp index c01d0418c00..e619aeb81be 100644 --- a/Core/Tools/DebugWindow/DebugWindow.cpp +++ b/Core/Tools/DebugWindow/DebugWindow.cpp @@ -76,7 +76,7 @@ CDebugWindowApp::CDebugWindowApp() m_DialogWindow = nullptr; } -DebugWindowDialog* CDebugWindowApp::GetDialogWindow(void) +DebugWindowDialog* CDebugWindowApp::GetDialogWindow() { return m_DialogWindow; } @@ -96,7 +96,7 @@ CDebugWindowApp::~CDebugWindowApp() CDebugWindowApp theApp; -void __declspec(dllexport) CreateDebugDialog(void) +void __declspec(dllexport) CreateDebugDialog() { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -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(); @@ -125,7 +125,7 @@ void __declspec(dllexport) DestroyDebugDialog(void) } -bool __declspec(dllexport) CanAppContinue(void) +bool __declspec(dllexport) CanAppContinue() { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -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( )); @@ -151,7 +151,7 @@ void __declspec(dllexport) ForceAppContinue(void) pDbg->ForceContinue(); } -bool __declspec(dllexport) RunAppFast(void) +bool __declspec(dllexport) RunAppFast() { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); diff --git a/Core/Tools/DebugWindow/DebugWindow.h b/Core/Tools/DebugWindow/DebugWindow.h index 27d437e628a..fb9366810b6 100644 --- a/Core/Tools/DebugWindow/DebugWindow.h +++ b/Core/Tools/DebugWindow/DebugWindow.h @@ -39,7 +39,7 @@ class CDebugWindowApp : public CWinApp public: CDebugWindowApp(); ~CDebugWindowApp(); - DebugWindowDialog* GetDialogWindow(void); + DebugWindowDialog* GetDialogWindow(); void SetDialogWindow(DebugWindowDialog* pWnd); protected: diff --git a/Core/Tools/DebugWindow/DebugWindowDialog.cpp b/Core/Tools/DebugWindow/DebugWindowDialog.cpp index 91667ad4ac8..530286a9aab 100644 --- a/Core/Tools/DebugWindow/DebugWindowDialog.cpp +++ b/Core/Tools/DebugWindow/DebugWindowDialog.cpp @@ -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(); @@ -88,7 +88,7 @@ void DebugWindowDialog::OnClearWindows() _RebuildVarsString(); } -bool DebugWindowDialog::CanProceed(void) +bool DebugWindowDialog::CanProceed() { if (mNumberOfStepsAllowed < 0) { return true; @@ -104,7 +104,7 @@ bool DebugWindowDialog::CanProceed(void) return true; } -bool DebugWindowDialog::RunAppFast(void) +bool DebugWindowDialog::RunAppFast() { return mRunFast; } @@ -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); @@ -168,7 +168,7 @@ void DebugWindowDialog::_RebuildVarsString(void) ((CEdit*)GetDlgItem(IDC_Variables))->GetSel(cursorPosBeg, cursorPosEnd); } -void DebugWindowDialog::_RebuildMesgString(void) +void DebugWindowDialog::_RebuildMesgString() { mMessagesString = ""; @@ -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); diff --git a/Core/Tools/DebugWindow/DebugWindowDialog.h b/Core/Tools/DebugWindow/DebugWindowDialog.h index 6e1751f9a72..7e223927f32 100644 --- a/Core/Tools/DebugWindow/DebugWindowDialog.h +++ b/Core/Tools/DebugWindow/DebugWindowDialog.h @@ -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: @@ -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); diff --git a/Core/Tools/DebugWindow/DebugWindowExport.h b/Core/Tools/DebugWindow/DebugWindowExport.h index 0d9a0a12116..ac6ce875905 100644 --- a/Core/Tools/DebugWindow/DebugWindowExport.h +++ b/Core/Tools/DebugWindow/DebugWindowExport.h @@ -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); diff --git a/Core/Tools/ImagePacker/Include/ImageDirectory.h b/Core/Tools/ImagePacker/Include/ImageDirectory.h index 2cece795979..e817d9642bd 100644 --- a/Core/Tools/ImagePacker/Include/ImageDirectory.h +++ b/Core/Tools/ImagePacker/Include/ImageDirectory.h @@ -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; diff --git a/Core/Tools/ImagePacker/Include/ImagePacker.h b/Core/Tools/ImagePacker/Include/ImagePacker.h index c989a2fd9ff..f1cf30f1e00 100644 --- a/Core/Tools/ImagePacker/Include/ImagePacker.h +++ b/Core/Tools/ImagePacker/Include/ImagePacker.h @@ -73,75 +73,75 @@ class ImagePacker public: - ImagePacker( void ); - virtual ~ImagePacker( void ); + ImagePacker(); + virtual ~ImagePacker(); - Bool init( void ); ///< initialize the system - Bool process( void ); ///< run the process + Bool init(); ///< initialize the system + Bool process(); ///< run the process Bool getSettingsFromDialog( HWND dialog ); ///< get the options for exection void setWindowHandle( HWND hWnd ); ///< set window handle for 'dialog' app - HWND getWindowHandle( void ); ///< get window handle for 'dialog' app + HWND getWindowHandle(); ///< get window handle for 'dialog' app - ICoord2D *getTargetSize( void ); ///< get target size - Int getTargetWidth( void ); ///< get target width - Int getTargetHeight( void ); ///< bet target height + ICoord2D *getTargetSize(); ///< get target size + Int getTargetWidth(); ///< get target width + Int getTargetHeight(); ///< bet target height void statusMessage( const char *message ); ///< set a status message - UnsignedInt getImageCount( void ); ///< get image count + UnsignedInt getImageCount(); ///< get image count ImageInfo *getImage( Int index ); ///< get image - TexturePage *getFirstTexturePage( void ); ///< get first texture page + TexturePage *getFirstTexturePage(); ///< get first texture page - UnsignedInt getPageCount( void ); ///< get the count of texutre pages + UnsignedInt getPageCount(); ///< get the count of texutre pages void setTargetPreviewPage( Int page ); ///< set the target preview page to view - Int getTargetPreviewPage( void ); ///< get the target preview page to view + Int getTargetPreviewPage(); ///< get the target preview page to view void setGutter( UnsignedInt size ); ///< set gutter size in pixels - UnsignedInt getGutter( void ); ///< get gutter size in pixels + UnsignedInt getGutter(); ///< get gutter size in pixels void setGapMethod( UnsignedInt methodBit ); ///< set gap method option void clearGapMethod( UnsignedInt methodBit ); ///< clear gap method option - UnsignedInt getGapMethod( void ); ///< get gap method option + UnsignedInt getGapMethod(); ///< get gap method option void setOutputAlpha( Bool outputAlpha ); ///< set output alpha option - Bool getOutputAlpha( void ); ///< get output alpha option + Bool getOutputAlpha(); ///< get output alpha option void setPreviewWindow( HWND window ); ///< assign preview window handle - HWND getPreviewWindow( void ); ///< get the preview window handle + HWND getPreviewWindow(); ///< get the preview window handle void setUseTexturePreview( Bool use ); ///< use the real image data in preview - Bool getUseTexturePreview( void ); ///< get texture preview option + Bool getUseTexturePreview(); ///< get texture preview option void setINICreate( Bool create ); ///< set create INI file option - Bool createINIFile( void ); ///< get create INI option + Bool createINIFile(); ///< get create INI option - char *getOutputFile( void ); ///< get output filename - char *getOutputDirectory( void ); ///< get output directory + char *getOutputFile(); ///< get output filename + char *getOutputDirectory(); ///< get output directory void setCompressTextures( Bool compress ); ///< set compress textures option - Bool getCompressTextures( void ); ///< get compress textures option + Bool getCompressTextures(); ///< get compress textures option protected: void setTargetSize( Int width, Int height ); ///< set the size of the output target image - Bool checkOutputDirectory( void ); ///< verify output directory is OK + Bool checkOutputDirectory(); ///< verify output directory is OK - void resetImageDirectoryList( void ); ///< clear the image directory list - void resetImageList( void ); ///< clear the image list - void resetPageList( void ); ///< clear the texture page list + void resetImageDirectoryList(); ///< clear the image directory list + void resetImageList(); ///< clear the image list + void resetPageList(); ///< clear the texture page list void addDirectory( char *path, Bool subDirs ); ///< add directory to directory list void addImagesInDirectory( char *dir ); ///< add all images from the specified directory void addImage( char *path ); ///< add image to image list - Bool validateImages( void ); ///< validate that the loaded images can all be processed - Bool packImages( void ); ///< do the packing - void writeFinalTextures( void ); ///< write the packed textures + Bool validateImages(); ///< validate that the loaded images can all be processed + Bool packImages(); ///< do the packing + void writeFinalTextures(); ///< write the packed textures - Bool generateINIFile( void ); ///< generate the INI file for this image set + Bool generateINIFile(); ///< generate the INI file for this image set - TexturePage *createNewTexturePage( void ); ///< create a new texture page + TexturePage *createNewTexturePage(); ///< create a new texture page - void sortImageList( void ); ///< sort the image list + void sortImageList(); ///< sort the image list HWND m_hWnd; ///< window handle for app ICoord2D m_targetSize; ///< the target size @@ -176,34 +176,34 @@ class ImagePacker // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// inline void ImagePacker::setTargetSize( Int width, Int height ) { m_targetSize.x = width; m_targetSize.y = height; } -inline ICoord2D *ImagePacker::getTargetSize( void ) { return &m_targetSize; } -inline Int ImagePacker::getTargetWidth( void ) { return m_targetSize.x; } -inline Int ImagePacker::getTargetHeight( void ) { return m_targetSize.y; } +inline ICoord2D *ImagePacker::getTargetSize() { return &m_targetSize; } +inline Int ImagePacker::getTargetWidth() { return m_targetSize.x; } +inline Int ImagePacker::getTargetHeight() { return m_targetSize.y; } inline void ImagePacker::setWindowHandle( HWND hWnd ) { m_hWnd = hWnd; } -inline HWND ImagePacker::getWindowHandle( void ) { return m_hWnd; } -inline UnsignedInt ImagePacker::getImageCount( void ) { return m_imageCount; } +inline HWND ImagePacker::getWindowHandle() { return m_hWnd; } +inline UnsignedInt ImagePacker::getImageCount() { return m_imageCount; } inline ImageInfo *ImagePacker::getImage( Int index ) { return m_imageList[ index ]; } inline void ImagePacker::setTargetPreviewPage( Int page ) { m_targetPreviewPage = page; } -inline Int ImagePacker::getTargetPreviewPage( void ) { return m_targetPreviewPage; } -inline UnsignedInt ImagePacker::getPageCount( void ) { return m_pageCount; } +inline Int ImagePacker::getTargetPreviewPage() { return m_targetPreviewPage; } +inline UnsignedInt ImagePacker::getPageCount() { return m_pageCount; } inline void ImagePacker::setPreviewWindow( HWND window ) { m_hWndPreview = window; } -inline HWND ImagePacker::getPreviewWindow( void ) { return m_hWndPreview; } +inline HWND ImagePacker::getPreviewWindow() { return m_hWndPreview; } inline void ImagePacker::setGutter( UnsignedInt size ) { m_gutterSize = size; } -inline UnsignedInt ImagePacker::getGutter( void ) { return m_gutterSize; } +inline UnsignedInt ImagePacker::getGutter() { return m_gutterSize; } inline void ImagePacker::setOutputAlpha( Bool outputAlpha ) { m_outputAlpha = outputAlpha; } -inline Bool ImagePacker::getOutputAlpha( void ) { return m_outputAlpha; } -inline TexturePage *ImagePacker::getFirstTexturePage( void ) { return m_pageList; } +inline Bool ImagePacker::getOutputAlpha() { return m_outputAlpha; } +inline TexturePage *ImagePacker::getFirstTexturePage() { return m_pageList; } inline void ImagePacker::setUseTexturePreview( Bool use ) { m_showTextureInPreview = use; } -inline Bool ImagePacker::getUseTexturePreview( void ) { return m_showTextureInPreview; } +inline Bool ImagePacker::getUseTexturePreview() { return m_showTextureInPreview; } inline void ImagePacker::setINICreate( Bool create ) { m_createINI = create; }; -inline Bool ImagePacker::createINIFile( void ) { return m_createINI; } -inline char *ImagePacker::getOutputFile( void ) { return m_outputFile; } -inline char *ImagePacker::getOutputDirectory( void ) { return m_outputDirectory; } +inline Bool ImagePacker::createINIFile() { return m_createINI; } +inline char *ImagePacker::getOutputFile() { return m_outputFile; } +inline char *ImagePacker::getOutputDirectory() { return m_outputDirectory; } inline void ImagePacker::setCompressTextures( Bool compress ) { m_compressTextures = compress; } -inline Bool ImagePacker::getCompressTextures( void ) { return m_compressTextures; } +inline Bool ImagePacker::getCompressTextures() { return m_compressTextures; } inline void ImagePacker::setGapMethod( UnsignedInt methodBit ) { BitSet( m_gapMethod, methodBit ); } inline void ImagePacker::clearGapMethod( UnsignedInt methodBit ) { BitClear( m_gapMethod, methodBit ); } -inline UnsignedInt ImagePacker::getGapMethod( void ) { return m_gapMethod; } +inline UnsignedInt ImagePacker::getGapMethod() { return m_gapMethod; } /////////////////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// diff --git a/Core/Tools/ImagePacker/Include/TexturePage.h b/Core/Tools/ImagePacker/Include/TexturePage.h index cc5e9d781a7..65f044fa584 100644 --- a/Core/Tools/ImagePacker/Include/TexturePage.h +++ b/Core/Tools/ImagePacker/Include/TexturePage.h @@ -81,20 +81,20 @@ class TexturePage }; TexturePage( Int width, Int height ); - ~TexturePage( void ); + ~TexturePage(); Bool addImage( ImageInfo *image ); ///< try to add image to this page void setID( Int id ); ///< set page id - Int getID( void ); ///< get page id + Int getID(); ///< get page id - Bool generateTexture( void ); ///< generate the final packed texture + Bool generateTexture(); ///< generate the final packed texture Bool writeFile( char *baseFilename ); ///< write generated texture to file - ImageInfo *getFirstImage( void ); ///< get the first image in the list + ImageInfo *getFirstImage(); ///< get the first image in the list - Int getWidth( void ); ///< get width of texture page - Int getHeight( void ); ///< get height of texture page + Int getWidth(); ///< get width of texture page + Int getHeight(); ///< get height of texture page // get rgb from final generated texture (putting this in for quick preview) void getPixel( Int x, Int y, Byte *r, Byte *g, Byte *b, Byte *a = nullptr ); @@ -158,9 +158,9 @@ class TexturePage // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// inline void TexturePage::setID( Int id ) { m_id = id; } -inline Int TexturePage::getID( void ) { return m_id; } -inline ImageInfo *TexturePage::getFirstImage( void ) { return m_imageList; } -inline Int TexturePage::getWidth( void ) { return m_size.x; } -inline Int TexturePage::getHeight( void ) { return m_size.y; } +inline Int TexturePage::getID() { return m_id; } +inline ImageInfo *TexturePage::getFirstImage() { return m_imageList; } +inline Int TexturePage::getWidth() { return m_size.x; } +inline Int TexturePage::getHeight() { return m_size.y; } // EXTERNALS ////////////////////////////////////////////////////////////////// diff --git a/Core/Tools/ImagePacker/Include/WindowProc.h b/Core/Tools/ImagePacker/Include/WindowProc.h index 57886fd6c35..659223e55bb 100644 --- a/Core/Tools/ImagePacker/Include/WindowProc.h +++ b/Core/Tools/ImagePacker/Include/WindowProc.h @@ -53,8 +53,8 @@ extern BOOL CALLBACK ImagePackerProc( HWND hWndDialog, UINT message, WPARAM wParam, LPARAM lParam ); -extern HWND MakePreviewDisplay( void ); -extern void UpdatePreviewWindow( void ); +extern HWND MakePreviewDisplay(); +extern void UpdatePreviewWindow(); extern LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ); diff --git a/Core/Tools/ImagePacker/Source/ImageInfo.cpp b/Core/Tools/ImagePacker/Source/ImageInfo.cpp index 4a71bfe10ca..3fc0564e77a 100644 --- a/Core/Tools/ImagePacker/Source/ImageInfo.cpp +++ b/Core/Tools/ImagePacker/Source/ImageInfo.cpp @@ -63,7 +63,7 @@ // ImageInfo::ImageInfo ======================================================= /** */ //============================================================================= -ImageInfo::ImageInfo( void ) +ImageInfo::ImageInfo() { m_area = 0; @@ -91,7 +91,7 @@ ImageInfo::ImageInfo( void ) // ImageInfo::~ImageInfo ====================================================== /** */ //============================================================================= -ImageInfo::~ImageInfo( void ) +ImageInfo::~ImageInfo() { delete [] m_path; diff --git a/Core/Tools/ImagePacker/Source/ImagePacker.cpp b/Core/Tools/ImagePacker/Source/ImagePacker.cpp index 3bf47871c9a..d80ca888b61 100644 --- a/Core/Tools/ImagePacker/Source/ImagePacker.cpp +++ b/Core/Tools/ImagePacker/Source/ImagePacker.cpp @@ -74,7 +74,7 @@ ImagePacker *TheImagePacker = nullptr; // ImagePacker::createNewTexturePage ========================================== /** Create a new texture page and add to the list */ //============================================================================= -TexturePage *ImagePacker::createNewTexturePage( void ) +TexturePage *ImagePacker::createNewTexturePage() { TexturePage *page; @@ -119,7 +119,7 @@ TexturePage *ImagePacker::createNewTexturePage( void ) * Returns FALSE to cancel build */ //============================================================================= -Bool ImagePacker::validateImages( void ) +Bool ImagePacker::validateImages() { UnsignedInt i; ImageInfo *image; @@ -192,7 +192,7 @@ Bool ImagePacker::validateImages( void ) /** Pack all the images in the image list, starting from the top and * working from there */ //============================================================================= -Bool ImagePacker::packImages( void ) +Bool ImagePacker::packImages() { UnsignedInt i; TexturePage *page = nullptr; @@ -270,7 +270,7 @@ Bool ImagePacker::packImages( void ) * of the packed images along with a definition file for which images * are where on the page */ //============================================================================= -void ImagePacker::writeFinalTextures( void ) +void ImagePacker::writeFinalTextures() { TexturePage *page; Bool errors = FALSE; @@ -348,7 +348,7 @@ static Int sortImageCompare( const void *aa, const void *bb ) // ImagePacker::sortImageList ================================================= /** Sort the image list */ //============================================================================= -void ImagePacker::sortImageList( void ) +void ImagePacker::sortImageList() { // sort all images so that largest area ones are first @@ -450,7 +450,7 @@ void ImagePacker::addImagesInDirectory( char *dir ) * to cancel the process */ //============================================================================= -Bool ImagePacker::checkOutputDirectory( void ) +Bool ImagePacker::checkOutputDirectory() { WIN32_FIND_DATA item; // search item HANDLE hFile; // handle for search resources @@ -559,7 +559,7 @@ Bool ImagePacker::checkOutputDirectory( void ) // ImagePacker::resetPageList ================================================= /** Clear the page list */ //============================================================================= -void ImagePacker::resetPageList( void ) +void ImagePacker::resetPageList() { TexturePage *next; @@ -581,7 +581,7 @@ void ImagePacker::resetPageList( void ) // ImagePacker::resetImageDirectoryList ======================================= /** Clear the image directory list */ //============================================================================= -void ImagePacker::resetImageDirectoryList( void ) +void ImagePacker::resetImageDirectoryList() { ImageDirectory *next; @@ -602,7 +602,7 @@ void ImagePacker::resetImageDirectoryList( void ) // ImagePacker::resetImageList ================================================ /** Clear the image list */ //============================================================================= -void ImagePacker::resetImageList( void ) +void ImagePacker::resetImageList() { delete [] m_imageList; @@ -859,7 +859,7 @@ void ImagePacker::addImage( char *path ) // ImagePacker::generateINIFile =============================================== /** Generate the INI image file definition for the final packed images */ //============================================================================= -Bool ImagePacker::generateINIFile( void ) +Bool ImagePacker::generateINIFile() { FILE *fp; char filename[ _MAX_PATH ]; @@ -1092,7 +1092,7 @@ Bool ImagePacker::getSettingsFromDialog( HWND dialog ) // ImagePacker::ImagePacker =================================================== /** */ //============================================================================= -ImagePacker::ImagePacker( void ) +ImagePacker::ImagePacker() { m_hWnd = nullptr; @@ -1127,7 +1127,7 @@ ImagePacker::ImagePacker( void ) // ImagePacker::~ImagePacker ================================================== /** */ //============================================================================= -ImagePacker::~ImagePacker( void ) +ImagePacker::~ImagePacker() { // delete our lists @@ -1143,7 +1143,7 @@ ImagePacker::~ImagePacker( void ) // ImagePacker::init ========================================================== /** Initialize the image packer system */ //============================================================================= -Bool ImagePacker::init( void ) +Bool ImagePacker::init() { // allocate a targa to read the headers for the images @@ -1175,7 +1175,7 @@ void ImagePacker::statusMessage( const char *message ) // ImagePacker::process ======================================================= /** Run the packing process */ //============================================================================= -Bool ImagePacker::process( void ) +Bool ImagePacker::process() { // build the output directory based on the base name of the output images diff --git a/Core/Tools/ImagePacker/Source/TexturePage.cpp b/Core/Tools/ImagePacker/Source/TexturePage.cpp index c3ffadf843f..210150cfe37 100644 --- a/Core/Tools/ImagePacker/Source/TexturePage.cpp +++ b/Core/Tools/ImagePacker/Source/TexturePage.cpp @@ -871,7 +871,7 @@ TexturePage::TexturePage( Int width, Int height ) // TexturePage::~TexturePage ================================================== /** */ //============================================================================= -TexturePage::~TexturePage( void ) +TexturePage::~TexturePage() { // delete the canvas @@ -1170,7 +1170,7 @@ Bool TexturePage::addImage( ImageInfo *image ) /** Generate the final packed texture given all the images that have * already been assigned to this page */ //============================================================================= -Bool TexturePage::generateTexture( void ) +Bool TexturePage::generateTexture() { // sanity diff --git a/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp b/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp index bd53e08d181..0d0fdfc9568 100644 --- a/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp +++ b/Core/Tools/ImagePacker/Source/WindowProcedures/PreviewProc.cpp @@ -169,7 +169,7 @@ LRESULT CALLBACK PreviewProc( HWND hWnd, UINT message, // MakePreviewDisplay ========================================================= /** */ //============================================================================= -HWND MakePreviewDisplay( void ) +HWND MakePreviewDisplay() { WNDCLASSEX wcex; const char *className = "PreviewDisplay"; @@ -218,7 +218,7 @@ HWND MakePreviewDisplay( void ) // UpdatePreviewWindow ======================================================== /** Update the preview window, if present */ //============================================================================= -void UpdatePreviewWindow( void ) +void UpdatePreviewWindow() { HWND preview; diff --git a/Core/Tools/ParticleEditor/CButtonShowColor.h b/Core/Tools/ParticleEditor/CButtonShowColor.h index 8d99dc6c7f8..64238d4585c 100644 --- a/Core/Tools/ParticleEditor/CButtonShowColor.h +++ b/Core/Tools/ParticleEditor/CButtonShowColor.h @@ -26,7 +26,7 @@ class CButtonShowColor : public CButton RGBColor m_color; public: - const RGBColor& getColor(void) const { return m_color; } + const RGBColor& getColor() const { return m_color; } void setColor(Int color) { m_color.setFromInt(color); } void setColor(const RGBColor& color) { m_color = color; } ~CButtonShowColor(); diff --git a/Core/Tools/ParticleEditor/CColorAlphaDialog.cpp b/Core/Tools/ParticleEditor/CColorAlphaDialog.cpp index d1ed59b416e..877d5d77efb 100644 --- a/Core/Tools/ParticleEditor/CColorAlphaDialog.cpp +++ b/Core/Tools/ParticleEditor/CColorAlphaDialog.cpp @@ -61,7 +61,7 @@ CColorAlphaDialog::CColorAlphaDialog(UINT nIDTemplate, CWnd* pParentWnd) : CDialog(nIDTemplate, pParentWnd) {} -void CColorAlphaDialog::InitPanel( void ) +void CColorAlphaDialog::InitPanel() { CString custColor; custColor = AfxGetApp()->GetProfileString("Custom Colors", "Color1", "0"); diff --git a/Core/Tools/ParticleEditor/CColorAlphaDialog.h b/Core/Tools/ParticleEditor/CColorAlphaDialog.h index 4d4ef457970..b9d91788f33 100644 --- a/Core/Tools/ParticleEditor/CColorAlphaDialog.h +++ b/Core/Tools/ParticleEditor/CColorAlphaDialog.h @@ -32,7 +32,7 @@ class CColorAlphaDialog : public CDialog enum {IDD = IDD_PSEd_EditColorAndAlpha}; CColorAlphaDialog(UINT nIDTemplate = CColorAlphaDialog::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI diff --git a/Core/Tools/ParticleEditor/CSwitchesDialog.cpp b/Core/Tools/ParticleEditor/CSwitchesDialog.cpp index 48683cbb839..d92bae6675a 100644 --- a/Core/Tools/ParticleEditor/CSwitchesDialog.cpp +++ b/Core/Tools/ParticleEditor/CSwitchesDialog.cpp @@ -27,7 +27,7 @@ CSwitchesDialog::CSwitchesDialog(UINT nIDTemplate, CWnd* pParentWnd) : CDialog(n } -void CSwitchesDialog::InitPanel( void ) +void CSwitchesDialog::InitPanel() { } diff --git a/Core/Tools/ParticleEditor/CSwitchesDialog.h b/Core/Tools/ParticleEditor/CSwitchesDialog.h index 35adbf77c27..37c4322d7e5 100644 --- a/Core/Tools/ParticleEditor/CSwitchesDialog.h +++ b/Core/Tools/ParticleEditor/CSwitchesDialog.h @@ -28,12 +28,12 @@ class CSwitchesDialog : public CDialog enum {IDD = IDD_PSEd_EditSwitchesDialog}; CSwitchesDialog(UINT nIDTemplate = CSwitchesDialog::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI void performUpdate( IN Bool toUI ); - DebugWindowDialog* GetDWDParent(void) { return (DebugWindowDialog*) GetParent(); } + DebugWindowDialog* GetDWDParent() { return (DebugWindowDialog*) GetParent(); } protected: afx_msg void OnParticleSystemEdit(); diff --git a/Core/Tools/ParticleEditor/EmissionTypePanels.cpp b/Core/Tools/ParticleEditor/EmissionTypePanels.cpp index 8f464e74bbb..458a44f5d9e 100644 --- a/Core/Tools/ParticleEditor/EmissionTypePanels.cpp +++ b/Core/Tools/ParticleEditor/EmissionTypePanels.cpp @@ -45,7 +45,7 @@ EmissionPanelPoint::EmissionPanelPoint(UINT nIDTemplate, CWnd* pParentWnd) : ISw } -void EmissionPanelPoint::InitPanel( void ) +void EmissionPanelPoint::InitPanel() { } @@ -78,7 +78,7 @@ EmissionPanelLine::EmissionPanelLine(UINT nIDTemplate, CWnd* pParentWnd) : ISwap } -void EmissionPanelLine::InitPanel( void ) +void EmissionPanelLine::InitPanel() { } @@ -215,7 +215,7 @@ EmissionPanelBox::EmissionPanelBox(UINT nIDTemplate, CWnd* pParentWnd) : ISwapab } -void EmissionPanelBox::InitPanel( void ) +void EmissionPanelBox::InitPanel() { } @@ -302,7 +302,7 @@ EmissionPanelSphere::EmissionPanelSphere(UINT nIDTemplate, CWnd* pParentWnd) : I } -void EmissionPanelSphere::InitPanel( void ) +void EmissionPanelSphere::InitPanel() { } @@ -359,7 +359,7 @@ EmissionPanelCylinder::EmissionPanelCylinder(UINT nIDTemplate, CWnd* pParentWnd) } -void EmissionPanelCylinder::InitPanel( void ) +void EmissionPanelCylinder::InitPanel() { } diff --git a/Core/Tools/ParticleEditor/EmissionTypePanels.h b/Core/Tools/ParticleEditor/EmissionTypePanels.h index 300973ed21a..4fbd6295797 100644 --- a/Core/Tools/ParticleEditor/EmissionTypePanels.h +++ b/Core/Tools/ParticleEditor/EmissionTypePanels.h @@ -48,10 +48,10 @@ class EmissionPanelPoint : public ISwapablePanel { public: enum {IDD = IDD_PSEd_EmissionPanelPoint}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } EmissionPanelPoint(UINT nIDTemplate = EmissionPanelPoint::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -66,10 +66,10 @@ class EmissionPanelLine : public ISwapablePanel { public: enum {IDD = IDD_PSEd_EmissionPanelLine}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } EmissionPanelLine(UINT nIDTemplate = EmissionPanelLine::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -84,10 +84,10 @@ class EmissionPanelBox : public ISwapablePanel { public: enum {IDD = IDD_PSEd_EmissionPanelBox}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } EmissionPanelBox(UINT nIDTemplate = EmissionPanelBox::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -102,10 +102,10 @@ class EmissionPanelSphere : public ISwapablePanel { public: enum {IDD = IDD_PSEd_EmissionPanelSphere}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } EmissionPanelSphere(UINT nIDTemplate = EmissionPanelSphere::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -120,10 +120,10 @@ class EmissionPanelCylinder : public ISwapablePanel { public: enum {IDD = IDD_PSEd_EmissionPanelCylinder}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } EmissionPanelCylinder(UINT nIDTemplate = EmissionPanelCylinder::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI diff --git a/Core/Tools/ParticleEditor/ISwapablePanel.h b/Core/Tools/ParticleEditor/ISwapablePanel.h index 2461474bcc1..20c7a2d338c 100644 --- a/Core/Tools/ParticleEditor/ISwapablePanel.h +++ b/Core/Tools/ParticleEditor/ISwapablePanel.h @@ -44,7 +44,7 @@ interface ISwapablePanel : public CDialog { ISwapablePanel(UINT nIDTemplate = 0, CWnd* pParentWnd = nullptr) : CDialog(nIDTemplate, pParentWnd) {} - virtual DWORD GetIDD( void ) = 0; + virtual DWORD GetIDD() = 0; virtual void performUpdate( IN Bool toUI ) = 0; - virtual void InitPanel( void ) = 0; + virtual void InitPanel() = 0; }; diff --git a/Core/Tools/ParticleEditor/MoreParmsDialog.cpp b/Core/Tools/ParticleEditor/MoreParmsDialog.cpp index e05e45b1040..ea42de2abce 100644 --- a/Core/Tools/ParticleEditor/MoreParmsDialog.cpp +++ b/Core/Tools/ParticleEditor/MoreParmsDialog.cpp @@ -46,7 +46,7 @@ MoreParmsDialog::~MoreParmsDialog() } -void MoreParmsDialog::InitPanel( void ) +void MoreParmsDialog::InitPanel() { CComboBox* pCombo; diff --git a/Core/Tools/ParticleEditor/MoreParmsDialog.h b/Core/Tools/ParticleEditor/MoreParmsDialog.h index 06555e88b8a..6e57198500d 100644 --- a/Core/Tools/ParticleEditor/MoreParmsDialog.h +++ b/Core/Tools/ParticleEditor/MoreParmsDialog.h @@ -48,7 +48,7 @@ class MoreParmsDialog : public CDialog MoreParmsDialog(UINT nIDTemplate = MoreParmsDialog::IDD, CWnd* pParentWnd = nullptr); virtual ~MoreParmsDialog(); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI diff --git a/Core/Tools/ParticleEditor/ParticleEditor.cpp b/Core/Tools/ParticleEditor/ParticleEditor.cpp index 781b4f66a6d..a197bcd69ea 100644 --- a/Core/Tools/ParticleEditor/ParticleEditor.cpp +++ b/Core/Tools/ParticleEditor/ParticleEditor.cpp @@ -77,7 +77,7 @@ CDebugWindowApp::CDebugWindowApp() } -DebugWindowDialog* CDebugWindowApp::GetDialogWindow(void) +DebugWindowDialog* CDebugWindowApp::GetDialogWindow() { return m_DialogWindow; } @@ -97,7 +97,7 @@ CDebugWindowApp::~CDebugWindowApp() CDebugWindowApp theApp; -void __declspec(dllexport) CreateParticleSystemDialog(void) +void __declspec(dllexport) CreateParticleSystemDialog() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -117,7 +117,7 @@ void __declspec(dllexport) CreateParticleSystemDialog(void) } catch (...) { } } -void __declspec(dllexport) DestroyParticleSystemDialog(void) +void __declspec(dllexport) DestroyParticleSystemDialog() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -131,7 +131,7 @@ void __declspec(dllexport) DestroyParticleSystemDialog(void) } catch (...) { } } -void __declspec(dllexport) RemoveAllParticleSystems(void) +void __declspec(dllexport) RemoveAllParticleSystems() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -155,7 +155,7 @@ void __declspec(dllexport) AppendParticleSystem(const char* particleSystemName) } catch (...) { } } -void __declspec(dllexport) RemoveAllThingTemplates( void ) +void __declspec(dllexport) RemoveAllThingTemplates() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -181,7 +181,7 @@ void __declspec(dllexport) AppendThingTemplate( const char* thingTemplateName ) } -Bool __declspec(dllexport) HasUpdatedSelectedParticleSystem( void ) +Bool __declspec(dllexport) HasUpdatedSelectedParticleSystem() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -231,7 +231,7 @@ void __declspec(dllexport) UpdateCurrentNumParticles( int currentParticleCount ) } catch (...) { } } -int __declspec(dllexport) GetNewParticleCap( void ) +int __declspec(dllexport) GetNewParticleCap() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -299,7 +299,7 @@ void __declspec(dllexport) UpdateSystemUseParameters( ParticleSystemTemplate *pa } catch(...) { } } -Bool __declspec(dllexport) ShouldWriteINI( void ) +Bool __declspec(dllexport) ShouldWriteINI() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -313,7 +313,7 @@ Bool __declspec(dllexport) ShouldWriteINI( void ) return false; } -Bool __declspec(dllexport) HasRequestedReload( void ) +Bool __declspec(dllexport) HasRequestedReload() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -327,7 +327,7 @@ Bool __declspec(dllexport) HasRequestedReload( void ) return false; } -Bool __declspec(dllexport) ShouldBusyWait( void ) +Bool __declspec(dllexport) ShouldBusyWait() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -341,7 +341,7 @@ Bool __declspec(dllexport) ShouldBusyWait( void ) return false; } -Bool __declspec(dllexport) ShouldUpdateParticleCap( void ) +Bool __declspec(dllexport) ShouldUpdateParticleCap() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -355,7 +355,7 @@ Bool __declspec(dllexport) ShouldUpdateParticleCap( void ) return false; } -Bool __declspec(dllexport) ShouldReloadTextures( void ) +Bool __declspec(dllexport) ShouldReloadTextures() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -369,7 +369,7 @@ Bool __declspec(dllexport) ShouldReloadTextures( void ) return false; } -Bool __declspec(dllexport) HasRequestedKillAllSystems( void ) +Bool __declspec(dllexport) HasRequestedKillAllSystems() { try { AFX_MANAGE_STATE(AfxGetStaticModuleState( )); @@ -383,7 +383,7 @@ Bool __declspec(dllexport) HasRequestedKillAllSystems( void ) return false; } -int __declspec(dllexport) NextParticleEditorBehavior( void ) +int __declspec(dllexport) NextParticleEditorBehavior() { try { if (HasUpdatedSelectedParticleSystem()) { diff --git a/Core/Tools/ParticleEditor/ParticleEditor.h b/Core/Tools/ParticleEditor/ParticleEditor.h index cc285778c9c..e498f903e5e 100644 --- a/Core/Tools/ParticleEditor/ParticleEditor.h +++ b/Core/Tools/ParticleEditor/ParticleEditor.h @@ -39,7 +39,7 @@ class CDebugWindowApp : public CWinApp public: CDebugWindowApp(); ~CDebugWindowApp(); - DebugWindowDialog* GetDialogWindow(void); + DebugWindowDialog* GetDialogWindow(); void SetDialogWindow(DebugWindowDialog* pWnd); protected: diff --git a/Core/Tools/ParticleEditor/ParticleEditorDialog.cpp b/Core/Tools/ParticleEditor/ParticleEditorDialog.cpp index ace9b9650fc..256bf78938b 100644 --- a/Core/Tools/ParticleEditor/ParticleEditorDialog.cpp +++ b/Core/Tools/ParticleEditor/ParticleEditorDialog.cpp @@ -92,7 +92,7 @@ int DebugWindowDialog::OnCreate(LPCREATESTRUCT lpCreateStruct) return CDialog::OnCreate(lpCreateStruct); } -void DebugWindowDialog::InitPanel( void ) +void DebugWindowDialog::InitPanel() { CComboBox* pCombo; @@ -194,7 +194,7 @@ void DebugWindowDialog::InitPanel( void ) } } -HWND DebugWindowDialog::GetMainWndHWND(void) +HWND DebugWindowDialog::GetMainWndHWND() { return mMainWndHWND; } @@ -234,7 +234,7 @@ void DebugWindowDialog::OnSize(UINT nType, int cx, int cy) } } -void DebugWindowDialog::clearAllParticleSystems(void) +void DebugWindowDialog::clearAllParticleSystems() { CComboBox* combo = (CComboBox*) GetDlgItem(IDC_PSEd_ParticleSystem); if (!combo) { @@ -245,7 +245,7 @@ void DebugWindowDialog::clearAllParticleSystems(void) combo->ResetContent(); } -void DebugWindowDialog::clearAllThingTemplates( void ) +void DebugWindowDialog::clearAllThingTemplates() { m_listOfThingTemplates.clear(); // this is a kindof(dirty_hack), because there's no way at runtime to verify that @@ -296,7 +296,7 @@ void DebugWindowDialog::OnReloadTextures() m_shouldReloadTextures = true; } -Bool DebugWindowDialog::hasSelectionChanged(void) +Bool DebugWindowDialog::hasSelectionChanged() { if (m_changeHasOcurred) { m_changeHasOcurred = false; @@ -1596,7 +1596,7 @@ void DebugWindowDialog::OnParticleSystemEdit() signalParticleSystemEdit(); } -void DebugWindowDialog::signalParticleSystemEdit( void ) +void DebugWindowDialog::signalParticleSystemEdit() { performUpdate(false); } @@ -1662,7 +1662,7 @@ void DebugWindowDialog::OnEditMoreParms() } } -Bool DebugWindowDialog::shouldWriteINI( void ) +Bool DebugWindowDialog::shouldWriteINI() { if (m_shouldWriteINI) { m_shouldWriteINI = false; @@ -1672,7 +1672,7 @@ Bool DebugWindowDialog::shouldWriteINI( void ) return false; } -Bool DebugWindowDialog::hasRequestedReload( void ) +Bool DebugWindowDialog::hasRequestedReload() { if (m_shouldReload) { m_shouldReload = false; @@ -1682,12 +1682,12 @@ Bool DebugWindowDialog::hasRequestedReload( void ) return false; } -Bool DebugWindowDialog::shouldBusyWait( void ) +Bool DebugWindowDialog::shouldBusyWait() { return m_shouldBusyWait; } -Bool DebugWindowDialog::shouldUpdateParticleCap( void ) +Bool DebugWindowDialog::shouldUpdateParticleCap() { if (m_shouldUpdateParticleCap) { m_shouldUpdateParticleCap = false; @@ -1697,7 +1697,7 @@ Bool DebugWindowDialog::shouldUpdateParticleCap( void ) return false; } -Bool DebugWindowDialog::shouldReloadTextures( void ) +Bool DebugWindowDialog::shouldReloadTextures() { if (m_shouldReloadTextures) { m_shouldReloadTextures = false; @@ -1707,7 +1707,7 @@ Bool DebugWindowDialog::shouldReloadTextures( void ) return false; } -Bool DebugWindowDialog::shouldKillAllParticleSystems( void ) +Bool DebugWindowDialog::shouldKillAllParticleSystems() { if (m_shouldKillAllParticleSystems) { m_shouldKillAllParticleSystems = false; @@ -1722,7 +1722,7 @@ void DebugWindowDialog::OnSysCommand(UINT nID, LPARAM lParam) CDialog::OnSysCommand(nID, lParam); } -void DebugWindowDialog::OnReloadSystem( void ) +void DebugWindowDialog::OnReloadSystem() { m_shouldReload = true; } @@ -1776,7 +1776,7 @@ void DebugWindowDialog::updateCurrentNumParticles( IN int particleCount ) pWnd->SetWindowText(buff); } -int DebugWindowDialog::getNewParticleCap( void ) +int DebugWindowDialog::getNewParticleCap() { static char buff[ARBITRARY_BUFF_SIZE]; CWnd *pWnd = GetDlgItem(IDC_PSEd_CurrentParticleCap); diff --git a/Core/Tools/ParticleEditor/ParticleEditorDialog.h b/Core/Tools/ParticleEditor/ParticleEditorDialog.h index 52a5783c4e0..69203757a5c 100644 --- a/Core/Tools/ParticleEditor/ParticleEditorDialog.h +++ b/Core/Tools/ParticleEditor/ParticleEditorDialog.h @@ -57,23 +57,23 @@ class DebugWindowDialog : public CDialog DebugWindowDialog(UINT nIDTemplate = DebugWindowDialog::IDD, CWnd* pParentWnd = nullptr); virtual ~DebugWindowDialog(); - void InitPanel( void ); - HWND GetMainWndHWND( void ); + void InitPanel(); + HWND GetMainWndHWND(); void addParticleSystem( IN const char *particleSystem ); void addThingTemplate( IN const char *thingTemplate ); - void clearAllParticleSystems( void ); - void clearAllThingTemplates( void ); - Bool hasSelectionChanged( void ); + void clearAllParticleSystems(); + void clearAllThingTemplates(); + Bool hasSelectionChanged(); void getSelectedSystemName( OUT char *bufferToCopyInto ) const; void getSelectedParticleAsciiStringParm( IN int parmNum, OUT char *bufferToCopyInto ) const; void updateParticleAsciiStringParm( IN int parmNum, IN const char *bufferToCopyFrom ); void updateCurrentParticleCap( IN int particleCap ); void updateCurrentNumParticles( IN int particleCount ); - int getNewParticleCap( void ); + int getNewParticleCap(); void updateCurrentParticleSystem( IN ParticleSystemTemplate *particleTemplate ); void updateSystemUseParameters( IN ParticleSystemTemplate *particleTemplate ); - void signalParticleSystemEdit( void ); + void signalParticleSystemEdit(); // The purpose of these is to add as few friends as possible to the particle system classes. @@ -241,19 +241,19 @@ class DebugWindowDialog : public CDialog void getWindAngleChangeFromSystem( IN Int parmNum, OUT Real& angle ) const; void updateWindAngleChangeToSystem( IN Int parmNum, IN const Real& angle ); - Bool shouldWriteINI( void ); - Bool hasRequestedReload( void ); - Bool shouldBusyWait( void ); - Bool shouldUpdateParticleCap( void ); - Bool shouldReloadTextures( void ); - Bool shouldKillAllParticleSystems( void ); + Bool shouldWriteINI(); + Bool hasRequestedReload(); + Bool shouldBusyWait(); + Bool shouldUpdateParticleCap(); + Bool shouldReloadTextures(); + Bool shouldKillAllParticleSystems(); - const std::list &getAllThingTemplates( void ) const { return m_listOfThingTemplates; } - const std::list &getAllParticleSystems( void ) const { return m_listOfParticleSystems; } + const std::list &getAllThingTemplates() const { return m_listOfThingTemplates; } + const std::list &getAllParticleSystems() const { return m_listOfParticleSystems; } - ParticleSystemTemplate *getCurrentParticleSystem( void ) { return m_particleSystem; } + ParticleSystemTemplate *getCurrentParticleSystem() { return m_particleSystem; } protected: HWND mMainWndHWND; diff --git a/Core/Tools/ParticleEditor/ParticleEditorExport.h b/Core/Tools/ParticleEditor/ParticleEditorExport.h index b8b32ba3c02..e5883b00edb 100644 --- a/Core/Tools/ParticleEditor/ParticleEditorExport.h +++ b/Core/Tools/ParticleEditor/ParticleEditorExport.h @@ -25,23 +25,23 @@ class ParticleSystemTemplate; // Declared extern C to prevent name mangling, which makes life very unhappy extern "C" { // Called to create the dialog - void __declspec(dllexport) CreateParticleSystemDialog( void ); + void __declspec(dllexport) CreateParticleSystemDialog(); // Called to (not surprisingly) destroy the dialog (and free the resources) - void __declspec(dllexport) DestroyParticleSystemDialog( void ); + void __declspec(dllexport) DestroyParticleSystemDialog(); - void __declspec(dllexport) RemoveAllParticleSystems( void ); + void __declspec(dllexport) RemoveAllParticleSystems(); void __declspec(dllexport) AppendParticleSystem( const char* particleSystemName ); - void __declspec(dllexport) RemoveAllThingTemplates( void ); + void __declspec(dllexport) RemoveAllThingTemplates(); void __declspec(dllexport) AppendThingTemplate( const char* thingTemplateName ); - Bool __declspec(dllexport) HasUpdatedSelectedParticleSystem( void ); + Bool __declspec(dllexport) HasUpdatedSelectedParticleSystem(); void __declspec(dllexport) GetSelectedParticleSystemName( char *bufferToCopyInto ); void __declspec(dllexport) UpdateCurrentParticleCap( int currentParticleCap ); void __declspec(dllexport) UpdateCurrentNumParticles( int currentParticleCount ); - int __declspec(dllexport) GetNewParticleCap( void ); + int __declspec(dllexport) GetNewParticleCap(); # define PARM_ParticleTypeName 0x00 @@ -57,10 +57,10 @@ extern "C" { void __declspec(dllexport) UpdateCurrentParticleSystem( ParticleSystemTemplate *particleTemplate ); void __declspec(dllexport) UpdateSystemUseParameters( ParticleSystemTemplate *particleTemplate ); - Bool __declspec(dllexport) ShouldWriteINI( void ); - Bool __declspec(dllexport) ShouldBusyWait( void ); - Bool __declspec(dllexport) ShouldUpdateParticleCap( void ); - Bool __declspec(dllexport) ShouldReloadTextures( void ); + Bool __declspec(dllexport) ShouldWriteINI(); + Bool __declspec(dllexport) ShouldBusyWait(); + Bool __declspec(dllexport) ShouldUpdateParticleCap(); + Bool __declspec(dllexport) ShouldReloadTextures(); # define PEB_Continue 0x00 @@ -76,7 +76,7 @@ extern "C" { # define PEB_Error 0xFF - int __declspec(dllexport) NextParticleEditorBehavior( void ); + int __declspec(dllexport) NextParticleEditorBehavior(); } diff --git a/Core/Tools/ParticleEditor/ParticleTypePanels.cpp b/Core/Tools/ParticleEditor/ParticleTypePanels.cpp index 69108771f45..87c2389ab52 100644 --- a/Core/Tools/ParticleEditor/ParticleTypePanels.cpp +++ b/Core/Tools/ParticleEditor/ParticleTypePanels.cpp @@ -48,7 +48,7 @@ ParticlePanelParticle::ParticlePanelParticle(UINT nIDTemplate, CWnd* pParentWnd) } -void ParticlePanelParticle::InitPanel( void ) +void ParticlePanelParticle::InitPanel() { CFileFind finder; @@ -121,7 +121,7 @@ ParticlePanelDrawable::ParticlePanelDrawable(UINT nIDTemplate, CWnd* pParentWnd) } -void ParticlePanelDrawable::InitPanel( void ) +void ParticlePanelDrawable::InitPanel() { } @@ -172,7 +172,7 @@ void ParticlePanelDrawable::OnParticleSystemEdit() pParent->signalParticleSystemEdit(); } -void ParticlePanelDrawable::clearAllThingTemplates( void ) +void ParticlePanelDrawable::clearAllThingTemplates() { CComboBox *pWnd = (CComboBox*) GetDlgItem(IDC_PSEd_ParticleTypeDrawable); if (!pWnd) { @@ -192,7 +192,7 @@ ParticlePanelStreak::ParticlePanelStreak(UINT nIDTemplate, CWnd* pParentWnd) : P } -void ParticlePanelStreak::InitPanel( void ) +void ParticlePanelStreak::InitPanel() { ParticlePanelParticle::InitPanel(); } diff --git a/Core/Tools/ParticleEditor/ParticleTypePanels.h b/Core/Tools/ParticleEditor/ParticleTypePanels.h index a11b9966488..0e1acec90b6 100644 --- a/Core/Tools/ParticleEditor/ParticleTypePanels.h +++ b/Core/Tools/ParticleEditor/ParticleTypePanels.h @@ -47,10 +47,10 @@ class ParticlePanelParticle : public ISwapablePanel { public: enum {IDD = IDD_PSEd_ParticlePanelParticle}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } ParticlePanelParticle(UINT nIDTemplate = ParticlePanelParticle::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -65,11 +65,11 @@ class ParticlePanelDrawable : public ISwapablePanel { public: enum {IDD = IDD_PSEd_ParticlePanelDrawable}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } ParticlePanelDrawable(UINT nIDTemplate = ParticlePanelDrawable::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); - void clearAllThingTemplates( void ); + void InitPanel(); + void clearAllThingTemplates(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -84,10 +84,10 @@ class ParticlePanelStreak : public ParticlePanelParticle { public: enum {IDD = IDD_PSEd_ParticlePanelStreak}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } ParticlePanelStreak(UINT nIDTemplate = ParticlePanelStreak::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI diff --git a/Core/Tools/ParticleEditor/VelocityTypePanels.cpp b/Core/Tools/ParticleEditor/VelocityTypePanels.cpp index 72da56265b8..cf3d270c200 100644 --- a/Core/Tools/ParticleEditor/VelocityTypePanels.cpp +++ b/Core/Tools/ParticleEditor/VelocityTypePanels.cpp @@ -43,7 +43,7 @@ VelocityPanelOrtho::VelocityPanelOrtho(UINT nIDTemplate, CWnd* pParentWnd) : ISw } -void VelocityPanelOrtho::InitPanel( void ) +void VelocityPanelOrtho::InitPanel() { } @@ -177,7 +177,7 @@ VelocityPanelSphere::VelocityPanelSphere(UINT nIDTemplate, CWnd* pParentWnd) : I } -void VelocityPanelSphere::InitPanel( void ) +void VelocityPanelSphere::InitPanel() { } @@ -248,7 +248,7 @@ VelocityPanelHemisphere::VelocityPanelHemisphere(UINT nIDTemplate, CWnd* pParent } -void VelocityPanelHemisphere::InitPanel( void ) +void VelocityPanelHemisphere::InitPanel() { } @@ -318,7 +318,7 @@ VelocityPanelCylinder::VelocityPanelCylinder(UINT nIDTemplate, CWnd* pParentWnd) } -void VelocityPanelCylinder::InitPanel( void ) +void VelocityPanelCylinder::InitPanel() { } @@ -420,7 +420,7 @@ VelocityPanelOutward::VelocityPanelOutward(UINT nIDTemplate, CWnd* pParentWnd) : } -void VelocityPanelOutward::InitPanel( void ) +void VelocityPanelOutward::InitPanel() { } diff --git a/Core/Tools/ParticleEditor/VelocityTypePanels.h b/Core/Tools/ParticleEditor/VelocityTypePanels.h index 9a1c0207aff..0643c3d3d65 100644 --- a/Core/Tools/ParticleEditor/VelocityTypePanels.h +++ b/Core/Tools/ParticleEditor/VelocityTypePanels.h @@ -48,10 +48,10 @@ class VelocityPanelOrtho : public ISwapablePanel { public: enum {IDD = IDD_PSEd_VelocityPanelOrtho}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } VelocityPanelOrtho(UINT nIDTemplate = VelocityPanelOrtho::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -66,10 +66,10 @@ class VelocityPanelSphere : public ISwapablePanel { public: enum {IDD = IDD_PSEd_VelocityPanelSphere}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } VelocityPanelSphere(UINT nIDTemplate = VelocityPanelSphere::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -84,10 +84,10 @@ class VelocityPanelHemisphere : public ISwapablePanel { public: enum {IDD = IDD_PSEd_VelocityPanelHemisphere}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } VelocityPanelHemisphere(UINT nIDTemplate = VelocityPanelHemisphere::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -102,10 +102,10 @@ class VelocityPanelCylinder : public ISwapablePanel { public: enum {IDD = IDD_PSEd_VelocityPanelCylinder}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } VelocityPanelCylinder(UINT nIDTemplate = VelocityPanelCylinder::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI @@ -120,10 +120,10 @@ class VelocityPanelOutward : public ISwapablePanel { public: enum {IDD = IDD_PSEd_VelocityPanelOutward}; - virtual DWORD GetIDD( void ) { return IDD; } + virtual DWORD GetIDD() { return IDD; } VelocityPanelOutward(UINT nIDTemplate = VelocityPanelOutward::IDD, CWnd* pParentWnd = nullptr); - void InitPanel( void ); + void InitPanel(); // if true, updates the UI from the Particle System. // if false, updates the Particle System from the UI diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.cpp b/Core/Tools/W3DView/AdvancedAnimSheet.cpp index 72b1ba5c7c1..c67a57ce727 100644 --- a/Core/Tools/W3DView/AdvancedAnimSheet.cpp +++ b/Core/Tools/W3DView/AdvancedAnimSheet.cpp @@ -95,7 +95,7 @@ END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // CAdvancedAnimSheet message handlers -int CAdvancedAnimSheet::GetAnimCount (void) +int CAdvancedAnimSheet::GetAnimCount () { if (AnimsValid) return AnimCount; @@ -109,7 +109,7 @@ int CAdvancedAnimSheet::GetAnimCount (void) } -HAnimClass ** CAdvancedAnimSheet::GetAnims (void) +HAnimClass ** CAdvancedAnimSheet::GetAnims () { if (AnimsValid) return Anims; @@ -122,7 +122,7 @@ HAnimClass ** CAdvancedAnimSheet::GetAnims (void) } -void CAdvancedAnimSheet::LoadAnims (void) +void CAdvancedAnimSheet::LoadAnims () { // Get the current render object and it's HTree. If it doesn't have // an HTree, then it's not animating and we're not interested. diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.h b/Core/Tools/W3DView/AdvancedAnimSheet.h index fd2bf23f419..42244a55901 100644 --- a/Core/Tools/W3DView/AdvancedAnimSheet.h +++ b/Core/Tools/W3DView/AdvancedAnimSheet.h @@ -52,8 +52,8 @@ class CAdvancedAnimSheet : public CPropertySheet // Operations public: - int GetAnimCount (void); - HAnimClass ** GetAnims (void); + int GetAnimCount (); + HAnimClass ** GetAnims (); // Overrides // ClassWizard generated virtual function overrides @@ -67,7 +67,7 @@ class CAdvancedAnimSheet : public CPropertySheet // Generated message map functions protected: - void LoadAnims (void); + void LoadAnims (); HAnimClass *Anims[MAX_REPORT_ANIMS]; int AnimCount; diff --git a/Core/Tools/W3DView/AggregateNameDialog.cpp b/Core/Tools/W3DView/AggregateNameDialog.cpp index 37b1a88093b..ae1579120cd 100644 --- a/Core/Tools/W3DView/AggregateNameDialog.cpp +++ b/Core/Tools/W3DView/AggregateNameDialog.cpp @@ -101,7 +101,7 @@ END_MESSAGE_MAP() // OnOK // void -AggregateNameDialogClass::OnOK (void) +AggregateNameDialogClass::OnOK () { GetDlgItemText (IDC_AGGREGATE_NAME, m_Name); CDialog::OnOK (); @@ -114,7 +114,7 @@ AggregateNameDialogClass::OnOK (void) // OnInitDialog // BOOL -AggregateNameDialogClass::OnInitDialog (void) +AggregateNameDialogClass::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); diff --git a/Core/Tools/W3DView/AggregateNameDialog.h b/Core/Tools/W3DView/AggregateNameDialog.h index ec9c700bb15..a01707f5281 100644 --- a/Core/Tools/W3DView/AggregateNameDialog.h +++ b/Core/Tools/W3DView/AggregateNameDialog.h @@ -61,7 +61,7 @@ class AggregateNameDialogClass : public CDialog // // Public methods // - const CString & Get_Name (void) const { return m_Name; } + const CString & Get_Name () const { return m_Name; } void Set_Name (const CString &name) { m_Name = name; } private: diff --git a/Core/Tools/W3DView/AmbientLightDialog.cpp b/Core/Tools/W3DView/AmbientLightDialog.cpp index 708d9cbe64a..700a1222dd4 100644 --- a/Core/Tools/W3DView/AmbientLightDialog.cpp +++ b/Core/Tools/W3DView/AmbientLightDialog.cpp @@ -71,7 +71,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CAmbientLightDialog::OnInitDialog (void) +CAmbientLightDialog::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -170,7 +170,7 @@ CAmbientLightDialog::OnHScroll // OnCancel // void -CAmbientLightDialog::OnCancel (void) +CAmbientLightDialog::OnCancel () { Vector3 lightSettings; lightSettings.X = float(m_initialRed) / 100.00F; @@ -220,7 +220,7 @@ CAmbientLightDialog::WindowProc // OnGrayscaleCheck // void -CAmbientLightDialog::OnGrayscaleCheck (void) +CAmbientLightDialog::OnGrayscaleCheck () { if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) { diff --git a/Core/Tools/W3DView/AnimMixingPage.cpp b/Core/Tools/W3DView/AnimMixingPage.cpp index 59e45261146..ddb968c7a70 100644 --- a/Core/Tools/W3DView/AnimMixingPage.cpp +++ b/Core/Tools/W3DView/AnimMixingPage.cpp @@ -84,7 +84,7 @@ BOOL CAnimMixingPage::OnInitDialog() } -void CAnimMixingPage::FillListCtrl (void) +void CAnimMixingPage::FillListCtrl () { // Get the current render object and it's HTree. If it doesn't have // an HTree, then it's not animating and we're not interested. diff --git a/Core/Tools/W3DView/AnimMixingPage.h b/Core/Tools/W3DView/AnimMixingPage.h index 77c1df481d2..3f385e17cff 100644 --- a/Core/Tools/W3DView/AnimMixingPage.h +++ b/Core/Tools/W3DView/AnimMixingPage.h @@ -55,7 +55,7 @@ class CAnimMixingPage : public CPropertyPage // Implementation protected: - void FillListCtrl (void); + void FillListCtrl (); CAdvancedAnimSheet *m_Sheet; diff --git a/Core/Tools/W3DView/AnimReportPage.h b/Core/Tools/W3DView/AnimReportPage.h index d4933140e04..6292fa1f73a 100644 --- a/Core/Tools/W3DView/AnimReportPage.h +++ b/Core/Tools/W3DView/AnimReportPage.h @@ -54,7 +54,7 @@ class CAnimReportPage : public CPropertyPage // Implementation protected: - void FillListControl (void); + void FillListControl (); int FindItem (const char *item_name); void MakeChannelStr(int bone_idx, HAnimClass* hanim, char channels[6]); diff --git a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp index dea88570eca..eaae9ae3e78 100644 --- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp +++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.cpp @@ -77,7 +77,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// void -AnimatedSoundOptionsDialogClass::OnSoundDefinitionLibraryBrowseButton (void) +AnimatedSoundOptionsDialogClass::OnSoundDefinitionLibraryBrowseButton () { CFileDialog dialog ( TRUE, ".ddb", @@ -103,7 +103,7 @@ AnimatedSoundOptionsDialogClass::OnSoundDefinitionLibraryBrowseButton (void) // ///////////////////////////////////////////////////////////////////////////// void -AnimatedSoundOptionsDialogClass::OnSoundIniBrowseButton (void) +AnimatedSoundOptionsDialogClass::OnSoundIniBrowseButton () { CFileDialog dialog ( TRUE, ".ini", @@ -129,7 +129,7 @@ AnimatedSoundOptionsDialogClass::OnSoundIniBrowseButton (void) // ///////////////////////////////////////////////////////////////////////////// void -AnimatedSoundOptionsDialogClass::OnOK (void) +AnimatedSoundOptionsDialogClass::OnOK () { CDialog::OnOK (); @@ -161,7 +161,7 @@ AnimatedSoundOptionsDialogClass::OnOK (void) // ///////////////////////////////////////////////////////////////////////////// BOOL -AnimatedSoundOptionsDialogClass::OnInitDialog (void) +AnimatedSoundOptionsDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -186,7 +186,7 @@ AnimatedSoundOptionsDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -AnimatedSoundOptionsDialogClass::Load_Animated_Sound_Settings (void) +AnimatedSoundOptionsDialogClass::Load_Animated_Sound_Settings () { // // Start fresh @@ -234,7 +234,7 @@ AnimatedSoundOptionsDialogClass::Load_Animated_Sound_Settings (void) // ///////////////////////////////////////////////////////////////////////////// void -AnimatedSoundOptionsDialogClass::OnSoundPathBrowseButton (void) +AnimatedSoundOptionsDialogClass::OnSoundPathBrowseButton () { RestrictedFileDialogClass dialog ( TRUE, ".wav", diff --git a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h index b2afc10a5d1..fad4c447e14 100644 --- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h +++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h @@ -62,7 +62,7 @@ class AnimatedSoundOptionsDialogClass : public CDialog /////////////////////////////////////////////////////////////////// // Public methods /////////////////////////////////////////////////////////////////// - static void Load_Animated_Sound_Settings (void); + static void Load_Animated_Sound_Settings (); private: diff --git a/Core/Tools/W3DView/AnimationPropPage.cpp b/Core/Tools/W3DView/AnimationPropPage.cpp index 23593e48a2d..21f0ab859ee 100644 --- a/Core/Tools/W3DView/AnimationPropPage.cpp +++ b/Core/Tools/W3DView/AnimationPropPage.cpp @@ -45,7 +45,7 @@ IMPLEMENT_DYNCREATE(CAnimationPropPage, CPropertyPage) // // CAnimationPropPage // -CAnimationPropPage::CAnimationPropPage (void) +CAnimationPropPage::CAnimationPropPage () : CPropertyPage(CAnimationPropPage::IDD) { //{{AFX_DATA_INIT(CAnimationPropPage) @@ -58,7 +58,7 @@ CAnimationPropPage::CAnimationPropPage (void) // // CAnimationPropPage // -CAnimationPropPage::~CAnimationPropPage (void) +CAnimationPropPage::~CAnimationPropPage () { return ; } @@ -89,7 +89,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CAnimationPropPage::OnInitDialog (void) +CAnimationPropPage::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); diff --git a/Core/Tools/W3DView/AnimationSpeed.cpp b/Core/Tools/W3DView/AnimationSpeed.cpp index ffc1caa4fe2..2e0135d30f0 100644 --- a/Core/Tools/W3DView/AnimationSpeed.cpp +++ b/Core/Tools/W3DView/AnimationSpeed.cpp @@ -87,7 +87,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CAnimationSpeed::OnInitDialog (void) +CAnimationSpeed::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -174,7 +174,7 @@ CAnimationSpeed::OnHScroll // OnDestroy // void -CAnimationSpeed::OnDestroy (void) +CAnimationSpeed::OnDestroy () { m_iInitialPercent = m_speedSlider.GetPos (); CDialog::OnDestroy(); @@ -186,7 +186,7 @@ CAnimationSpeed::OnDestroy (void) // OnBlend // void -CAnimationSpeed::OnBlend (void) +CAnimationSpeed::OnBlend () { // Get a pointer to the doc so we can get at the current scene // pointer. diff --git a/Core/Tools/W3DView/AssetInfo.cpp b/Core/Tools/W3DView/AssetInfo.cpp index 0abd6dc3688..0f21c877916 100644 --- a/Core/Tools/W3DView/AssetInfo.cpp +++ b/Core/Tools/W3DView/AssetInfo.cpp @@ -46,7 +46,7 @@ // Initialize // void -AssetInfoClass::Initialize (void) +AssetInfoClass::Initialize () { // If this isn't a material, then try to get its hierarchy name (if there is one) if (m_AssetType != TypeMaterial) { diff --git a/Core/Tools/W3DView/AssetInfo.h b/Core/Tools/W3DView/AssetInfo.h index 8655a3363b8..68fea267f27 100644 --- a/Core/Tools/W3DView/AssetInfo.h +++ b/Core/Tools/W3DView/AssetInfo.h @@ -56,7 +56,7 @@ class AssetInfoClass // // Public constructors/destructors // - AssetInfoClass (void) + AssetInfoClass () : m_AssetType (TypeUnknown), m_dwUserData (0L), m_pRenderObj (nullptr) { Initialize (); } @@ -67,7 +67,7 @@ class AssetInfoClass m_dwUserData (user_data), m_pRenderObj (nullptr) { REF_PTR_SET (m_pRenderObj, prender_obj); Initialize (); } - virtual ~AssetInfoClass (void) { REF_PTR_RELEASE (m_pRenderObj); } + virtual ~AssetInfoClass () { REF_PTR_RELEASE (m_pRenderObj); } ////////////////////////////////////////////////////////////// // @@ -77,14 +77,14 @@ class AssetInfoClass // // Inline accessors // - const CString & Get_Name (void) const { return m_Name; } - const CString & Get_Hierarchy_Name (void) const { return m_HierarchyName; } - const CString & Get_Original_Name (void) const { return m_OriginalName; } - ASSET_TYPE Get_Type (void) const { return m_AssetType; } - DWORD Get_User_Number (void) const { return m_dwUserData; } - const CString & Get_User_String (void) const { return m_UserString; } - RenderObjClass * Get_Render_Obj (void) const { if (m_pRenderObj) m_pRenderObj->Add_Ref(); return m_pRenderObj; } - RenderObjClass * Peek_Render_Obj (void) const { return m_pRenderObj; } + const CString & Get_Name () const { return m_Name; } + const CString & Get_Hierarchy_Name () const { return m_HierarchyName; } + const CString & Get_Original_Name () const { return m_OriginalName; } + ASSET_TYPE Get_Type () const { return m_AssetType; } + DWORD Get_User_Number () const { return m_dwUserData; } + const CString & Get_User_String () const { return m_UserString; } + RenderObjClass * Get_Render_Obj () const { if (m_pRenderObj) m_pRenderObj->Add_Ref(); return m_pRenderObj; } + RenderObjClass * Peek_Render_Obj () const { return m_pRenderObj; } void Set_Name (LPCTSTR pname) { m_Name = pname; } void Set_Hierarchy_Name (LPCTSTR pname) { m_HierarchyName = pname; } void Set_Type (ASSET_TYPE type) { m_AssetType = type; } @@ -95,7 +95,7 @@ class AssetInfoClass // // Information methods // - bool Can_Asset_Have_Animations (void) const { return bool(m_HierarchyName.GetLength () > 0); } + bool Can_Asset_Have_Animations () const { return bool(m_HierarchyName.GetLength () > 0); } protected: @@ -103,7 +103,7 @@ class AssetInfoClass // // Protected methods // - void Initialize (void); + void Initialize (); private: diff --git a/Core/Tools/W3DView/BackgroundBMPDialog.cpp b/Core/Tools/W3DView/BackgroundBMPDialog.cpp index 7fd50ca25db..fe1dbbc811e 100644 --- a/Core/Tools/W3DView/BackgroundBMPDialog.cpp +++ b/Core/Tools/W3DView/BackgroundBMPDialog.cpp @@ -79,7 +79,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CBackgroundBMPDialog::OnInitDialog (void) +CBackgroundBMPDialog::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -104,7 +104,7 @@ CBackgroundBMPDialog::OnInitDialog (void) // OnOK // void -CBackgroundBMPDialog::OnOK (void) +CBackgroundBMPDialog::OnOK () { // Gett a pointer to the current document CW3DViewDoc *pCDoc = ::GetCurrentDocument (); @@ -135,7 +135,7 @@ CBackgroundBMPDialog::OnOK (void) // OnBrowse // void -CBackgroundBMPDialog::OnBrowse (void) +CBackgroundBMPDialog::OnBrowse () { // Get a pointer to the current document CW3DViewDoc *pCDoc = ::GetCurrentDocument (); diff --git a/Core/Tools/W3DView/BackgroundColorDialog.cpp b/Core/Tools/W3DView/BackgroundColorDialog.cpp index e8d2a71d3d1..059a4a1429a 100644 --- a/Core/Tools/W3DView/BackgroundColorDialog.cpp +++ b/Core/Tools/W3DView/BackgroundColorDialog.cpp @@ -72,7 +72,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CBackgroundColorDialog::OnInitDialog (void) +CBackgroundColorDialog::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -173,7 +173,7 @@ CBackgroundColorDialog::OnHScroll // OnGrayscaleCheck // void -CBackgroundColorDialog::OnGrayscaleCheck (void) +CBackgroundColorDialog::OnGrayscaleCheck () { if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) { @@ -204,7 +204,7 @@ CBackgroundColorDialog::OnGrayscaleCheck (void) // OnCancel // void -CBackgroundColorDialog::OnCancel (void) +CBackgroundColorDialog::OnCancel () { Vector3 colorSettings; colorSettings.X = float(m_initialRed) / 100.00F; diff --git a/Core/Tools/W3DView/BackgroundObjectDialog.cpp b/Core/Tools/W3DView/BackgroundObjectDialog.cpp index 2117ce60470..fe5844d3ab4 100644 --- a/Core/Tools/W3DView/BackgroundObjectDialog.cpp +++ b/Core/Tools/W3DView/BackgroundObjectDialog.cpp @@ -77,7 +77,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CBackgroundObjectDialog::OnInitDialog (void) +CBackgroundObjectDialog::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -155,7 +155,7 @@ CBackgroundObjectDialog::OnInitDialog (void) // OnInitDialog // void -CBackgroundObjectDialog::OnOK (void) +CBackgroundObjectDialog::OnOK () { // Get a pointer to the doc CW3DViewDoc *pCDoc = ::GetCurrentDocument (); @@ -226,7 +226,7 @@ CBackgroundObjectDialog::OnItemChangedHierarchyList // OnClear // void -CBackgroundObjectDialog::OnClear (void) +CBackgroundObjectDialog::OnClear () { // Get the current selection (if any) int iIndex = m_heirarchyListCtrl.GetNextItem (-1, LVNI_ALL | LVNI_SELECTED); diff --git a/Core/Tools/W3DView/BoneMgrDialog.cpp b/Core/Tools/W3DView/BoneMgrDialog.cpp index d9eacf4f18f..0ca0c06bb04 100644 --- a/Core/Tools/W3DView/BoneMgrDialog.cpp +++ b/Core/Tools/W3DView/BoneMgrDialog.cpp @@ -89,7 +89,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -BoneMgrDialogClass::OnInitDialog (void) +BoneMgrDialogClass::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -291,7 +291,7 @@ BoneMgrDialogClass::OnSelchangedBoneTree // OnSelchangeObjectCombo // void -BoneMgrDialogClass::OnSelchangeObjectCombo (void) +BoneMgrDialogClass::OnSelchangeObjectCombo () { // Get the name of the currently selected render object CString name; @@ -384,7 +384,7 @@ BoneMgrDialogClass::Update_Controls (HTREEITEM selected_item) // OnDestroy // void -BoneMgrDialogClass::OnDestroy (void) +BoneMgrDialogClass::OnDestroy () { // Free the state image list we associated with the control CImageList *pimagelist = m_BoneTree.GetImageList (TVSIL_NORMAL); @@ -402,7 +402,7 @@ BoneMgrDialogClass::OnDestroy (void) // OnOK // void -BoneMgrDialogClass::OnOK (void) +BoneMgrDialogClass::OnOK () { // Simply forget about the backup we made REF_PTR_RELEASE (m_pBackupModel); @@ -422,7 +422,7 @@ BoneMgrDialogClass::OnOK (void) // OnCancel // void -BoneMgrDialogClass::OnCancel (void) +BoneMgrDialogClass::OnCancel () { CWaitCursor wait_cursor; @@ -441,7 +441,7 @@ BoneMgrDialogClass::OnCancel (void) // OnAttachButton // void -BoneMgrDialogClass::OnAttachButton (void) +BoneMgrDialogClass::OnAttachButton () { // Get the name of the currently selected render object CString name; @@ -501,7 +501,7 @@ BoneMgrDialogClass::OnAttachButton (void) // Get_Current_Bone_Item // HTREEITEM -BoneMgrDialogClass::Get_Current_Bone_Item (void) +BoneMgrDialogClass::Get_Current_Bone_Item () { // Get the currently selected item and its parent HTREEITEM htree_item = m_BoneTree.GetSelectedItem (); diff --git a/Core/Tools/W3DView/BoneMgrDialog.h b/Core/Tools/W3DView/BoneMgrDialog.h index b5b6adafaae..973dec337b6 100644 --- a/Core/Tools/W3DView/BoneMgrDialog.h +++ b/Core/Tools/W3DView/BoneMgrDialog.h @@ -86,7 +86,7 @@ class BoneMgrDialogClass : public CDialog bool Is_Object_In_List (const char *passet_name, DynamicVectorClass &node_list); bool Is_Render_Obj_Already_Attached (const CString &name); void Update_Controls (HTREEITEM selected_item); - HTREEITEM Get_Current_Bone_Item (void); + HTREEITEM Get_Current_Bone_Item (); void Remove_Object_From_Bone (HTREEITEM bone_item, const CString &name); private: diff --git a/Core/Tools/W3DView/CameraDistanceDialog.cpp b/Core/Tools/W3DView/CameraDistanceDialog.cpp index 1c8b6b3a510..d7fa8a3f328 100644 --- a/Core/Tools/W3DView/CameraDistanceDialog.cpp +++ b/Core/Tools/W3DView/CameraDistanceDialog.cpp @@ -76,7 +76,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -CameraDistanceDialogClass::OnInitDialog (void) +CameraDistanceDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -94,7 +94,7 @@ CameraDistanceDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -CameraDistanceDialogClass::OnOK (void) +CameraDistanceDialogClass::OnOK () { CDialog::OnOK (); diff --git a/Core/Tools/W3DView/CameraSettingsDialog.cpp b/Core/Tools/W3DView/CameraSettingsDialog.cpp index 401cdd10c5e..5770a72001e 100644 --- a/Core/Tools/W3DView/CameraSettingsDialog.cpp +++ b/Core/Tools/W3DView/CameraSettingsDialog.cpp @@ -86,7 +86,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -CameraSettingsDialogClass::OnInitDialog (void) +CameraSettingsDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -134,7 +134,7 @@ CameraSettingsDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -CameraSettingsDialogClass::OnOK (void) +CameraSettingsDialogClass::OnOK () { CW3DViewDoc *doc = ::GetCurrentDocument (); CGraphicView *graphic_view = doc->GetGraphicView (); @@ -194,7 +194,7 @@ CameraSettingsDialogClass::OnOK (void) // ///////////////////////////////////////////////////////////////////////////// void -CameraSettingsDialogClass::OnFovCheck (void) +CameraSettingsDialogClass::OnFovCheck () { bool manual_fov = (SendDlgItemMessage (IDC_FOV_CHECK, BM_GETCHECK) == 1); ::EnableWindow (m_VFOVSpin, manual_fov); @@ -213,7 +213,7 @@ CameraSettingsDialogClass::OnFovCheck (void) // ///////////////////////////////////////////////////////////////////////////// void -CameraSettingsDialogClass::OnClipPlaneCheck (void) +CameraSettingsDialogClass::OnClipPlaneCheck () { bool manual_planes = (SendDlgItemMessage (IDC_CLIP_PLANE_CHECK, BM_GETCHECK) == 1); ::EnableWindow (m_NearClipSpin, manual_planes); @@ -230,7 +230,7 @@ CameraSettingsDialogClass::OnClipPlaneCheck (void) // ///////////////////////////////////////////////////////////////////////////// void -CameraSettingsDialogClass::OnReset (void) +CameraSettingsDialogClass::OnReset () { CW3DViewDoc *doc = ::GetCurrentDocument (); CGraphicView *graphic_view = doc->GetGraphicView (); @@ -314,7 +314,7 @@ CameraSettingsDialogClass::OnNotify // //////////////////////////////////////////////////////////////////// void -CameraSettingsDialogClass::Update_Camera_Lens (void) +CameraSettingsDialogClass::Update_Camera_Lens () { // // Get the current vertical FOV settings @@ -340,7 +340,7 @@ CameraSettingsDialogClass::Update_Camera_Lens (void) // //////////////////////////////////////////////////////////////////// void -CameraSettingsDialogClass::Update_FOV (void) +CameraSettingsDialogClass::Update_FOV () { // // Get the current camera lens setting diff --git a/Core/Tools/W3DView/CameraSettingsDialog.h b/Core/Tools/W3DView/CameraSettingsDialog.h index 15d96dae8ba..ba447859f3d 100644 --- a/Core/Tools/W3DView/CameraSettingsDialog.h +++ b/Core/Tools/W3DView/CameraSettingsDialog.h @@ -68,8 +68,8 @@ class CameraSettingsDialogClass : public CDialog /////////////////////////////////////////////////////////////////// // Protected methods /////////////////////////////////////////////////////////////////// - void Update_Camera_Lens (void); - void Update_FOV (void); + void Update_Camera_Lens (); + void Update_FOV (); }; //{{AFX_INSERT_LOCATION}} diff --git a/Core/Tools/W3DView/ColorBar.cpp b/Core/Tools/W3DView/ColorBar.cpp index f77b56415b1..54ebe11bcbf 100644 --- a/Core/Tools/W3DView/ColorBar.cpp +++ b/Core/Tools/W3DView/ColorBar.cpp @@ -42,7 +42,7 @@ static char THIS_FILE[] = __FILE__; // // ColorBarClass // -ColorBarClass::ColorBarClass (void) +ColorBarClass::ColorBarClass () : m_hBitmap (nullptr), m_iBMPWidth (0), m_iBMPHeight (0), @@ -122,7 +122,7 @@ ColorBarClass::ColorBarClass (void) // // ~ColorBarClass // -ColorBarClass::~ColorBarClass (void) +ColorBarClass::~ColorBarClass () { if (m_hMemDC != nullptr) { ::DeleteObject (m_hMemDC); @@ -314,7 +314,7 @@ ColorBarClass::Create // Create_Bitmap // void -ColorBarClass::Create_Bitmap (void) +ColorBarClass::Create_Bitmap () { // Start fresh Free_Bitmap (); @@ -407,7 +407,7 @@ ColorBarClass::Create_Bitmap (void) // Free_Bitmap // void -ColorBarClass::Free_Bitmap (void) +ColorBarClass::Free_Bitmap () { if (m_hBitmap != nullptr) { ::DeleteObject (m_hBitmap); @@ -622,7 +622,7 @@ ColorBarClass::Paint_Bar_Horz // Paint_DIB // void -ColorBarClass::Paint_DIB (void) +ColorBarClass::Paint_DIB () { CRect frame_rect = m_ColorArea; frame_rect.InflateRect (1, 1); @@ -721,7 +721,7 @@ ColorBarClass::Paint_DIB (void) // OnPaint // void -ColorBarClass::OnPaint (void) +ColorBarClass::OnPaint () { CPaintDC dc (this); Paint_Screen (dc); @@ -1063,7 +1063,7 @@ ColorBarClass::Set_Range // Update_Point_Info // void -ColorBarClass::Update_Point_Info (void) +ColorBarClass::Update_Point_Info () { int width = m_ColorArea.Width (); int height = m_ColorArea.Height (); @@ -1139,7 +1139,7 @@ ColorBarClass::Update_Point_Info (void) // Free_Marker_Bitmap // void -ColorBarClass::Free_Marker_Bitmap (void) +ColorBarClass::Free_Marker_Bitmap () { if (m_KeyFrameDIB != nullptr) { ::DeleteObject (m_KeyFrameDIB); @@ -1156,7 +1156,7 @@ ColorBarClass::Free_Marker_Bitmap (void) // Load_Key_Frame_BMP // void -ColorBarClass::Load_Key_Frame_BMP (void) +ColorBarClass::Load_Key_Frame_BMP () { Free_Marker_Bitmap (); @@ -1816,7 +1816,7 @@ ColorBarClass::Get_Color // Clear_Points // void -ColorBarClass::Clear_Points (void) +ColorBarClass::Clear_Points () { // Reset the point count m_iColorPoints = 1; @@ -1924,7 +1924,7 @@ ColorBarClass::Set_Redraw (bool redraw) // Repaint // void -ColorBarClass::Repaint (void) +ColorBarClass::Repaint () { InvalidateRect (nullptr, FALSE); if (m_bRedraw) { diff --git a/Core/Tools/W3DView/ColorBar.h b/Core/Tools/W3DView/ColorBar.h index 595eb26bbf9..67eac6915db 100644 --- a/Core/Tools/W3DView/ColorBar.h +++ b/Core/Tools/W3DView/ColorBar.h @@ -142,14 +142,14 @@ class ColorBarClass : public CWnd bool Set_Graph_Percent (int index, float percent); float Get_Graph_Percent (int index); bool Delete_Point (int index); - void Clear_Points (void); + void Clear_Points (); - int Get_Point_Count (void) const { return m_iColorPoints; } + int Get_Point_Count () const { return m_iColorPoints; } bool Get_Point (int index, float *position, float *red, float *green, float *blue); int Marker_From_Point (CPoint point); void Set_Selection_Pos (float pos); - float Get_Selection_Pos (void) const { return m_SelectionPos; } + float Get_Selection_Pos () const { return m_SelectionPos; } void Get_Color (float position, float *red, float *green, float *blue); void Get_Range (float &min, float &max) const { min = m_MinPos; max = m_MaxPos; } @@ -195,20 +195,20 @@ class ColorBarClass : public CWnd // // Protected methods // - void Paint_DIB (void); - void Create_Bitmap (void); - void Free_Bitmap (void); - void Free_Marker_Bitmap (void); + void Paint_DIB (); + void Create_Bitmap (); + void Free_Bitmap (); + void Free_Marker_Bitmap (); void Paint_Bar_Horz (int x_pos, int y_pos, int width, int height, UCHAR *pbits); void Paint_Bar_Vert (int x_pos, int y_pos, int width, int height, UCHAR *pbits); - void Update_Point_Info (void); - void Load_Key_Frame_BMP (void); + void Update_Point_Info (); + void Load_Key_Frame_BMP (); void Paint_Key_Frame (int x_pos, int y_pos); void Paint_Screen (HDC hwnd_dc); void Get_Selection_Rectangle (CRect &rect); void Move_Selection (CPoint point, bool send_notify = true); void Move_Selection (float new_pos, bool send_notify = true); - void Repaint (void); + void Repaint (); private: diff --git a/Core/Tools/W3DView/ColorPicker.cpp b/Core/Tools/W3DView/ColorPicker.cpp index b98a48d6a22..ab53783690d 100644 --- a/Core/Tools/W3DView/ColorPicker.cpp +++ b/Core/Tools/W3DView/ColorPicker.cpp @@ -43,7 +43,7 @@ static char THIS_FILE[] = __FILE__; // // ColorPickerClass // -ColorPickerClass::ColorPickerClass (void) +ColorPickerClass::ColorPickerClass () : m_hBitmap (nullptr), m_iWidth (0), m_iHeight (0), @@ -63,7 +63,7 @@ ColorPickerClass::ColorPickerClass (void) // // ~ColorPickerClass // -ColorPickerClass::~ColorPickerClass (void) +ColorPickerClass::~ColorPickerClass () { if (m_hMemDC != nullptr) { ::DeleteObject (m_hMemDC); @@ -93,7 +93,7 @@ END_MESSAGE_MAP() // OnPaint // void -ColorPickerClass::OnPaint (void) +ColorPickerClass::OnPaint () { CPaintDC dc (this); @@ -297,7 +297,7 @@ ColorPickerClass::Create // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerClass::Create_Bitmap (void) +ColorPickerClass::Create_Bitmap () { // Start fresh Free_Bitmap (); @@ -693,7 +693,7 @@ ColorPickerClass::Paint_DIB // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerClass::Free_Bitmap (void) +ColorPickerClass::Free_Bitmap () { if (m_hBitmap != nullptr) { ::DeleteObject (m_hBitmap); @@ -893,7 +893,7 @@ ColorPickerClass::Calc_Display_Rect (RECT &rect) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerClass::Erase_Marker (void) +ColorPickerClass::Erase_Marker () { HDC hdc = ::GetDC (m_hWnd); if (m_hMemDC != nullptr) { @@ -926,7 +926,7 @@ ColorPickerClass::Erase_Marker (void) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerClass::Paint_Marker (void) +ColorPickerClass::Paint_Marker () { HDC hdc = ::GetDC (m_hWnd); if (m_hMemDC != nullptr) { diff --git a/Core/Tools/W3DView/ColorPicker.h b/Core/Tools/W3DView/ColorPicker.h index 35f96ee6c8f..e8fa7256812 100644 --- a/Core/Tools/W3DView/ColorPicker.h +++ b/Core/Tools/W3DView/ColorPicker.h @@ -119,16 +119,16 @@ class ColorPickerClass : public CWnd // Private member data // void Paint_DIB (int width, int height, UCHAR *pbits); - void Create_Bitmap (void); - void Free_Bitmap (void); + void Create_Bitmap (); + void Free_Bitmap (); void Fill_Rect (UCHAR *pbits, const RECT &rect, COLORREF color, int scanline_size); void Frame_Rect (UCHAR *pbits, const RECT &rect, COLORREF color, int scanline_size); void Draw_Horz_Line (UCHAR *pbits, int x, int y, int len, COLORREF color, int scanline_size); void Draw_Vert_Line (UCHAR *pbits, int x, int y, int len, COLORREF color, int scanline_size); COLORREF Color_From_Point (int x, int y); CPoint Point_From_Color (COLORREF color); - void Paint_Marker (void); - void Erase_Marker (void); + void Paint_Marker (); + void Erase_Marker (); void Calc_Display_Rect (RECT &rect); diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.cpp b/Core/Tools/W3DView/ColorPickerDialogClass.cpp index 874aab91248..f6b564d64f9 100644 --- a/Core/Tools/W3DView/ColorPickerDialogClass.cpp +++ b/Core/Tools/W3DView/ColorPickerDialogClass.cpp @@ -45,13 +45,13 @@ const DWORD UPDATE_HUE_PICKER = 0x00000004; /*class MyManageStateClass { public: - MyManageStateClass (void) + MyManageStateClass () { m_hResHandle = ::AfxGetResourceHandle (); ::AfxSetResourceHandle (_hinstance); } - ~MyManageStateClass (void) { ::AfxSetResourceHandle (m_hResHandle); } + ~MyManageStateClass () { ::AfxSetResourceHandle (m_hResHandle); } private: HINSTANCE m_hResHandle; @@ -245,7 +245,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -ColorPickerDialogClass::OnInitDialog (void) +ColorPickerDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -307,7 +307,7 @@ ColorPickerDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerDialogClass::Update_Red_Bar (void) +ColorPickerDialogClass::Update_Red_Bar () { m_RedColorBar->Set_Selection_Pos (m_CurrentRed); m_RedColorBar->Modify_Point (0, 0, 0, (float)m_CurrentGreen, (float)m_CurrentBlue); @@ -322,7 +322,7 @@ ColorPickerDialogClass::Update_Red_Bar (void) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerDialogClass::Update_Green_Bar (void) +ColorPickerDialogClass::Update_Green_Bar () { m_GreenColorBar->Set_Selection_Pos (m_CurrentGreen); m_GreenColorBar->Modify_Point (0, 0, m_CurrentRed, 0, m_CurrentBlue); @@ -337,7 +337,7 @@ ColorPickerDialogClass::Update_Green_Bar (void) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerDialogClass::Update_Blue_Bar (void) +ColorPickerDialogClass::Update_Blue_Bar () { m_BlueColorBar->Set_Selection_Pos (m_CurrentBlue); m_BlueColorBar->Modify_Point (0, 0, m_CurrentRed, m_CurrentGreen, 0); @@ -352,7 +352,7 @@ ColorPickerDialogClass::Update_Blue_Bar (void) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerDialogClass::Update_Current_Color_Bar (void) +ColorPickerDialogClass::Update_Current_Color_Bar () { m_CurrentColorBar->Modify_Point (0, 0, m_CurrentRed, m_CurrentGreen, m_CurrentBlue); return ; @@ -365,7 +365,7 @@ ColorPickerDialogClass::Update_Current_Color_Bar (void) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerDialogClass::Update_Whiteness_Bar (void) +ColorPickerDialogClass::Update_Whiteness_Bar () { int red = 0; int green = 0; @@ -587,7 +587,7 @@ void ColorPickerDialogClass::Set_Original_Color (int r, int g, int b) // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerDialogClass::OnReset (void) +ColorPickerDialogClass::OnReset () { Update_Color (m_OrigRed, m_OrigGreen, @@ -640,7 +640,7 @@ ColorPickerDialogClass::OnCommand // ///////////////////////////////////////////////////////////////////////////// void -ColorPickerDialogClass::PostNcDestroy (void) +ColorPickerDialogClass::PostNcDestroy () { CDialog::PostNcDestroy(); diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.h b/Core/Tools/W3DView/ColorPickerDialogClass.h index 4bc428d4665..fd5a1156950 100644 --- a/Core/Tools/W3DView/ColorPickerDialogClass.h +++ b/Core/Tools/W3DView/ColorPickerDialogClass.h @@ -76,9 +76,9 @@ class ColorPickerDialogClass : public CDialog ///////////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////////// - int Get_Red (void) const { return (int)m_CurrentRed; } - int Get_Green (void) const { return (int)m_CurrentGreen; } - int Get_Blue (void) const { return (int)m_CurrentBlue; } + int Get_Red () const { return (int)m_CurrentRed; } + int Get_Green () const { return (int)m_CurrentGreen; } + int Get_Blue () const { return (int)m_CurrentBlue; } void Set_Color (int r, int g, int b) { Update_Color((float)r, (float)g, (float)b); } void Set_Original_Color (int r, int g, int b); @@ -91,11 +91,11 @@ class ColorPickerDialogClass : public CDialog ///////////////////////////////////////////////////////////// // Protected methods ///////////////////////////////////////////////////////////// - void Update_Red_Bar (void); - void Update_Green_Bar (void); - void Update_Blue_Bar (void); - void Update_Current_Color_Bar (void); - void Update_Whiteness_Bar (void); + void Update_Red_Bar (); + void Update_Green_Bar (); + void Update_Blue_Bar (); + void Update_Current_Color_Bar (); + void Update_Whiteness_Bar (); void Update_Color (float red, float green, float blue, DWORD flags = 0xFFFFFFFF); private: diff --git a/Core/Tools/W3DView/ColorSelectionDialog.cpp b/Core/Tools/W3DView/ColorSelectionDialog.cpp index 6a70810eb87..e6be2237643 100644 --- a/Core/Tools/W3DView/ColorSelectionDialog.cpp +++ b/Core/Tools/W3DView/ColorSelectionDialog.cpp @@ -90,7 +90,7 @@ END_MESSAGE_MAP() // ColorSelectionDialogClass // BOOL -ColorSelectionDialogClass::OnInitDialog (void) +ColorSelectionDialogClass::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -131,7 +131,7 @@ ColorSelectionDialogClass::OnInitDialog (void) // ColorSelectionDialogClass // void -ColorSelectionDialogClass::OnOK (void) +ColorSelectionDialogClass::OnOK () { // Record the color m_Color = m_PaintColor; @@ -168,7 +168,7 @@ ColorSelectionDialogClass::OnHScroll // OnPaint // void -ColorSelectionDialogClass::OnPaint (void) +ColorSelectionDialogClass::OnPaint () { CPaintDC dc (this); @@ -188,7 +188,7 @@ ColorSelectionDialogClass::OnPaint (void) // Paint_Color_Window // void -ColorSelectionDialogClass::Paint_Color_Window (void) +ColorSelectionDialogClass::Paint_Color_Window () { // Get the client coords of the 'color' window CRect rect; @@ -212,7 +212,7 @@ ColorSelectionDialogClass::Paint_Color_Window (void) // OnGrayscaleCheck // void -ColorSelectionDialogClass::OnGrayscaleCheck (void) +ColorSelectionDialogClass::OnGrayscaleCheck () { // Is the checkbox checked? if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) { @@ -238,7 +238,7 @@ ColorSelectionDialogClass::OnGrayscaleCheck (void) // OnChangeBlueEdit // void -ColorSelectionDialogClass::OnChangeBlueEdit (void) +ColorSelectionDialogClass::OnChangeBlueEdit () { if (::IsWindow (m_BlueSlider)) { int value = GetDlgItemInt (IDC_BLUE_EDIT); @@ -260,7 +260,7 @@ ColorSelectionDialogClass::OnChangeBlueEdit (void) // OnChangeGreenEdit // void -ColorSelectionDialogClass::OnChangeGreenEdit (void) +ColorSelectionDialogClass::OnChangeGreenEdit () { if (::IsWindow (m_GreenSlider)) { int value = GetDlgItemInt (IDC_GREEN_EDIT); @@ -282,7 +282,7 @@ ColorSelectionDialogClass::OnChangeGreenEdit (void) // OnChangeRedEdit // void -ColorSelectionDialogClass::OnChangeRedEdit (void) +ColorSelectionDialogClass::OnChangeRedEdit () { if (::IsWindow (m_RedSlider)) { int value = GetDlgItemInt (IDC_RED_EDIT); diff --git a/Core/Tools/W3DView/ColorSelectionDialog.h b/Core/Tools/W3DView/ColorSelectionDialog.h index 166c0ed70cd..d6d4a2972cf 100644 --- a/Core/Tools/W3DView/ColorSelectionDialog.h +++ b/Core/Tools/W3DView/ColorSelectionDialog.h @@ -77,7 +77,7 @@ class ColorSelectionDialogClass : public CDialog // // Public methods // - const Vector3 & Get_Color (void) const { return m_Color; } + const Vector3 & Get_Color () const { return m_Color; } void Set_Color (const Vector3 &color) { m_Color = color; } protected: @@ -86,7 +86,7 @@ class ColorSelectionDialogClass : public CDialog // // Inline accessors // - void Paint_Color_Window (void); + void Paint_Color_Window (); void Update_Sliders (int slider_id); private: diff --git a/Core/Tools/W3DView/DataTreeView.cpp b/Core/Tools/W3DView/DataTreeView.cpp index 895cdc0bb1a..482bb391713 100644 --- a/Core/Tools/W3DView/DataTreeView.cpp +++ b/Core/Tools/W3DView/DataTreeView.cpp @@ -80,7 +80,7 @@ IMPLEMENT_DYNCREATE(CDataTreeView, CTreeView) // CDataTreeView // //////////////////////////////////////////////////////////////////////////// -CDataTreeView::CDataTreeView (void) +CDataTreeView::CDataTreeView () : m_hMaterialsRoot (nullptr), m_hMeshRoot (nullptr), m_hMeshCollectionRoot (nullptr), @@ -110,7 +110,7 @@ CDataTreeView::CDataTreeView (void) // // ~CDataTreeView // -CDataTreeView::~CDataTreeView (void) +CDataTreeView::~CDataTreeView () { return ; } @@ -175,7 +175,7 @@ CDataTreeView::PreCreateWindow (CREATESTRUCT& cs) // OnInitialUpdate // void -CDataTreeView::OnInitialUpdate (void) +CDataTreeView::OnInitialUpdate () { // Allow the base class to process this message CTreeView::OnInitialUpdate (); @@ -190,7 +190,7 @@ CDataTreeView::OnInitialUpdate (void) // CreateRootNodes // void -CDataTreeView::CreateRootNodes (void) +CDataTreeView::CreateRootNodes () { // Insert all the root nodes m_hMaterialsRoot = GetTreeCtrl ().InsertItem ("Materials", m_iMaterialIcon, m_iMaterialIcon); @@ -248,7 +248,7 @@ CDataTreeView::OnCreate (LPCREATESTRUCT lpCreateStruct) // Load_Materials_Into_Tree // void -CDataTreeView::Load_Materials_Into_Tree (void) +CDataTreeView::Load_Materials_Into_Tree () { // Get an iterator from the asset manager that we can // use to enumerate the currently loaded textures @@ -286,7 +286,7 @@ CDataTreeView::Load_Materials_Into_Tree (void) // LoadAssetsIntoTree // void -CDataTreeView::LoadAssetsIntoTree (void) +CDataTreeView::LoadAssetsIntoTree () { // Turn off repainting GetTreeCtrl ().SetRedraw (FALSE); @@ -442,7 +442,7 @@ CDataTreeView::LoadAssetsIntoTree (void) // LoadAnimationsIntoTree // void -CDataTreeView::LoadAnimationsIntoTree (void) +CDataTreeView::LoadAnimationsIntoTree () { // Get an iterator from the asset manager that we can // use to enumerate the currently loaded assets @@ -1115,7 +1115,7 @@ CDataTreeView::OnDeleteItem // Get_Current_Asset_Info // AssetInfoClass * -CDataTreeView::Get_Current_Asset_Info (void) const +CDataTreeView::Get_Current_Asset_Info () const { AssetInfoClass *asset_info = nullptr; @@ -1137,7 +1137,7 @@ CDataTreeView::Get_Current_Asset_Info (void) const // Get_Current_Render_Obj // RenderObjClass * -CDataTreeView::Get_Current_Render_Obj (void) const +CDataTreeView::Get_Current_Render_Obj () const { RenderObjClass *prender_obj = nullptr; @@ -1164,7 +1164,7 @@ CDataTreeView::Get_Current_Render_Obj (void) const // GetCurrentSelectionName // LPCTSTR -CDataTreeView::GetCurrentSelectionName (void) +CDataTreeView::GetCurrentSelectionName () { LPCTSTR pname = nullptr; @@ -1190,7 +1190,7 @@ CDataTreeView::GetCurrentSelectionName (void) // GetCurrentSelectionType // ASSET_TYPE -CDataTreeView::GetCurrentSelectionType (void) +CDataTreeView::GetCurrentSelectionType () { ASSET_TYPE type = TypeUnknown; @@ -1374,7 +1374,7 @@ CDataTreeView::Refresh_Asset // Select_Next // void -CDataTreeView::Select_Next (void) +CDataTreeView::Select_Next () { // // Get the selected entry in the tree control @@ -1400,7 +1400,7 @@ CDataTreeView::Select_Next (void) // Select_Prev // void -CDataTreeView::Select_Prev (void) +CDataTreeView::Select_Prev () { // // Get the selected entry in the tree control @@ -1427,7 +1427,7 @@ CDataTreeView::Select_Prev (void) // //////////////////////////////////////////////////////////////////////////// void -CDataTreeView::Reload_Lightmap_Models (void) +CDataTreeView::Reload_Lightmap_Models () { Free_Child_Models (m_hMeshCollectionRoot); Free_Child_Models (m_hHierarchyRoot); diff --git a/Core/Tools/W3DView/DataTreeView.h b/Core/Tools/W3DView/DataTreeView.h index a060943a31f..17a315c5af6 100644 --- a/Core/Tools/W3DView/DataTreeView.h +++ b/Core/Tools/W3DView/DataTreeView.h @@ -84,38 +84,38 @@ class CDataTreeView : public CTreeView // Asset insertion methods // bool Add_Asset_To_Tree (LPCTSTR name, ASSET_TYPE type, bool bselect); - void LoadAssetsIntoTree (void); + void LoadAssetsIntoTree (); void Refresh_Asset (LPCTSTR new_name, LPCTSTR old_name, ASSET_TYPE type); // // Animation insertion methods // - void LoadAnimationsIntoTree (void); + void LoadAnimationsIntoTree (); void LoadAnimationsIntoTree (HTREEITEM hItem); - bool Are_Anims_Restricted (void) const { return m_RestrictAnims; } + bool Are_Anims_Restricted () const { return m_RestrictAnims; } void Restrict_Anims (bool onoff); // // Texture insertion methods // - void Load_Materials_Into_Tree (void); + void Load_Materials_Into_Tree (); // // Display methods // void Display_Asset (HTREEITEM htree_item = nullptr); - void Select_Next (void); - void Select_Prev (void); - void Reload_Lightmap_Models (void); + void Select_Next (); + void Select_Prev (); + void Reload_Lightmap_Models (); // // Information methods // - RenderObjClass * Get_Current_Render_Obj (void) const; - AssetInfoClass * Get_Current_Asset_Info (void) const; - LPCTSTR GetCurrentSelectionName (void); - ASSET_TYPE GetCurrentSelectionType (void); + RenderObjClass * Get_Current_Render_Obj () const; + AssetInfoClass * Get_Current_Asset_Info () const; + LPCTSTR GetCurrentSelectionName (); + ASSET_TYPE GetCurrentSelectionType (); HTREEITEM FindChildItem (HTREEITEM hParentItem, LPCTSTR pszChildItemName); HTREEITEM FindChildItem (HTREEITEM hParentItem, RenderObjClass *prender_obj); HTREEITEM FindFirstChildItemBasedOnHierarchyName (HTREEITEM hParentItem, LPCTSTR pszHierarchyName); @@ -125,7 +125,7 @@ class CDataTreeView : public CTreeView // // Initialization methods // - void CreateRootNodes (void); + void CreateRootNodes (); protected: diff --git a/Core/Tools/W3DView/DeviceSelectionDialog.cpp b/Core/Tools/W3DView/DeviceSelectionDialog.cpp index 8c0af94d1d7..f016c6338c0 100644 --- a/Core/Tools/W3DView/DeviceSelectionDialog.cpp +++ b/Core/Tools/W3DView/DeviceSelectionDialog.cpp @@ -89,7 +89,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CDeviceSelectionDialog::OnInitDialog (void) +CDeviceSelectionDialog::OnInitDialog () { CDialog::OnInitDialog(); @@ -131,7 +131,7 @@ CDeviceSelectionDialog::OnInitDialog (void) // OnSelchangeRenderDeviceCombo // void -CDeviceSelectionDialog::OnSelchangeRenderDeviceCombo (void) +CDeviceSelectionDialog::OnSelchangeRenderDeviceCombo () { int index = m_deviceListComboBox.GetCurSel (); if (index != CB_ERR) { @@ -150,7 +150,7 @@ CDeviceSelectionDialog::OnSelchangeRenderDeviceCombo (void) // UpdateDeviceDescription // void -CDeviceSelectionDialog::UpdateDeviceDescription (void) +CDeviceSelectionDialog::UpdateDeviceDescription () { const RenderDeviceDescClass &device_desc = WW3D::Get_Render_Device_Desc (); @@ -176,7 +176,7 @@ CDeviceSelectionDialog::UpdateDeviceDescription (void) // OnOK // void -CDeviceSelectionDialog::OnOK (void) +CDeviceSelectionDialog::OnOK () { // Ask the combobox for its current selection m_iDeviceIndex = m_deviceListComboBox.GetItemData (m_deviceListComboBox.GetCurSel ()); @@ -202,7 +202,7 @@ CDeviceSelectionDialog::OnOK (void) // DoModal // int -CDeviceSelectionDialog::DoModal (void) +CDeviceSelectionDialog::DoModal () { BOOL bFoundDevice = FALSE; int iReturn = IDOK; diff --git a/Core/Tools/W3DView/DeviceSelectionDialog.h b/Core/Tools/W3DView/DeviceSelectionDialog.h index c62f0380b84..0b8dd1c6e95 100644 --- a/Core/Tools/W3DView/DeviceSelectionDialog.h +++ b/Core/Tools/W3DView/DeviceSelectionDialog.h @@ -71,7 +71,7 @@ class CDeviceSelectionDialog : public CDialog { return m_DriverName; } protected: - void UpdateDeviceDescription (void); + void UpdateDeviceDescription (); private: BOOL m_bLookupCachedInfo; diff --git a/Core/Tools/W3DView/DialogToolbar.cpp b/Core/Tools/W3DView/DialogToolbar.cpp index f3e94f28311..8fad4ca0019 100644 --- a/Core/Tools/W3DView/DialogToolbar.cpp +++ b/Core/Tools/W3DView/DialogToolbar.cpp @@ -48,7 +48,7 @@ BEGIN_MESSAGE_MAP(DialogToolbarClass, CToolBar) END_MESSAGE_MAP() -DialogToolbarClass::DialogToolbarClass (void) +DialogToolbarClass::DialogToolbarClass () : CToolBar () { //{{AFX_DATA_INIT(DialogToolbarClass) @@ -118,7 +118,7 @@ DialogToolbarClass::OnIdleUpdateCmdUI (WPARAM, LPARAM) // OnInitialUpdate // void -DialogToolbarClass::OnInitialUpdate (void) +DialogToolbarClass::OnInitialUpdate () { return ; } diff --git a/Core/Tools/W3DView/DialogToolbar.h b/Core/Tools/W3DView/DialogToolbar.h index 09b160b6ab8..fa464eadf14 100644 --- a/Core/Tools/W3DView/DialogToolbar.h +++ b/Core/Tools/W3DView/DialogToolbar.h @@ -45,8 +45,8 @@ class DialogToolbarClass : public CToolBar { public: - DialogToolbarClass (void); - virtual ~DialogToolbarClass (void) {} + DialogToolbarClass (); + virtual ~DialogToolbarClass () {} // Form Data public: diff --git a/Core/Tools/W3DView/EditLODDialog.cpp b/Core/Tools/W3DView/EditLODDialog.cpp index a8e46a3fefc..3e3f3142c0b 100644 --- a/Core/Tools/W3DView/EditLODDialog.cpp +++ b/Core/Tools/W3DView/EditLODDialog.cpp @@ -91,7 +91,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CEditLODDialog::OnInitDialog (void) +CEditLODDialog::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -167,7 +167,7 @@ CEditLODDialog::OnInitDialog (void) // OnOK // void -CEditLODDialog::OnOK (void) +CEditLODDialog::OnOK () { // Get a pointer to the doc @@ -215,7 +215,7 @@ CEditLODDialog::OnOK (void) // OnCancel // void -CEditLODDialog::OnCancel (void) +CEditLODDialog::OnCancel () { // Allow the base class to process this message CDialog::OnCancel (); @@ -399,7 +399,7 @@ CEditLODDialog::EnableControls (BOOL bEnable) // OnUpdateSwitchDnEdit // void -CEditLODDialog::OnUpdateSwitchDnEdit (void) +CEditLODDialog::OnUpdateSwitchDnEdit () { // Get the switching distance from the edit control CString stringTemp; @@ -424,7 +424,7 @@ CEditLODDialog::OnUpdateSwitchDnEdit (void) // // OnUpdateSwitchUpEdit // -void CEditLODDialog::OnUpdateSwitchUpEdit (void) +void CEditLODDialog::OnUpdateSwitchUpEdit () { // Get the switching distance from the edit control CString stringTemp; @@ -449,7 +449,7 @@ void CEditLODDialog::OnUpdateSwitchUpEdit (void) // // OnRecalc // -void CEditLODDialog::OnRecalc (void) +void CEditLODDialog::OnRecalc () { // Get the up switching distance from the edit control CString stringTemp; diff --git a/Core/Tools/W3DView/EmitterColorPropPage.cpp b/Core/Tools/W3DView/EmitterColorPropPage.cpp index 50ab0d9c8d6..4c7b57a4205 100644 --- a/Core/Tools/W3DView/EmitterColorPropPage.cpp +++ b/Core/Tools/W3DView/EmitterColorPropPage.cpp @@ -71,7 +71,7 @@ EmitterColorPropPageClass::EmitterColorPropPageClass (EmitterInstanceListClass * // ~EmitterColorPropPageClass // ///////////////////////////////////////////////////////////// -EmitterColorPropPageClass::~EmitterColorPropPageClass (void) +EmitterColorPropPageClass::~EmitterColorPropPageClass () { // Free the original setting arrays SAFE_DELETE_ARRAY (m_OrigColors.KeyTimes); @@ -122,7 +122,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -EmitterColorPropPageClass::Initialize (void) +EmitterColorPropPageClass::Initialize () { SAFE_DELETE_ARRAY (m_OrigColors.KeyTimes); SAFE_DELETE_ARRAY (m_OrigColors.Values); @@ -156,7 +156,7 @@ EmitterColorPropPageClass::Initialize (void) // ///////////////////////////////////////////////////////////// BOOL -EmitterColorPropPageClass::OnInitDialog (void) +EmitterColorPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -238,7 +238,7 @@ EmitterColorPropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -EmitterColorPropPageClass::OnApply (void) +EmitterColorPropPageClass::OnApply () { /*SAFE_DELETE_ARRAY (m_OrigColors.KeyTimes); SAFE_DELETE_ARRAY (m_OrigColors.Values); @@ -262,7 +262,7 @@ EmitterColorPropPageClass::OnApply (void) // ///////////////////////////////////////////////////////////// void -EmitterColorPropPageClass::OnDestroy (void) +EmitterColorPropPageClass::OnDestroy () { CPropertyPage::OnDestroy(); return ; @@ -416,7 +416,7 @@ EmitterColorPropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -EmitterColorPropPageClass::OnCancel (void) +EmitterColorPropPageClass::OnCancel () { // // Reset the emitter to its original state @@ -435,7 +435,7 @@ EmitterColorPropPageClass::OnCancel (void) // ///////////////////////////////////////////////////////////// void -EmitterColorPropPageClass::Update_Opacities (void) +EmitterColorPropPageClass::Update_Opacities () { float position = 0; float red = 0; @@ -483,7 +483,7 @@ EmitterColorPropPageClass::Update_Opacities (void) // ///////////////////////////////////////////////////////////// void -EmitterColorPropPageClass::Update_Colors (void) +EmitterColorPropPageClass::Update_Colors () { float position = 0; float red = 0; diff --git a/Core/Tools/W3DView/EmitterColorPropPage.h b/Core/Tools/W3DView/EmitterColorPropPage.h index f0a511c2f26..8e6178808f1 100644 --- a/Core/Tools/W3DView/EmitterColorPropPage.h +++ b/Core/Tools/W3DView/EmitterColorPropPage.h @@ -83,17 +83,17 @@ class EmitterColorPropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } void Get_Color_Keyframes (ParticlePropertyStruct &colors) { colors = m_CurrentColors; } void Get_Opacity_Keyframes (ParticlePropertyStruct &opacity) { opacity = m_CurrentOpacities; } - /*const Vector3 & Get_Start_Color (void) const { return m_StartColor; } - const Vector3 & Get_End_Color (void) const { return m_EndColor; } - float Get_Start_Opacity (void) const { return m_StartOpacity; } - float Get_End_Opacity (void) const { return m_EndOpacity; } - float Get_Fade_Time (void) const { return m_FadeTime; }*/ + /*const Vector3 & Get_Start_Color () const { return m_StartColor; } + const Vector3 & Get_End_Color () const { return m_EndColor; } + float Get_Start_Opacity () const { return m_StartOpacity; } + float Get_End_Opacity () const { return m_EndOpacity; } + float Get_Fade_Time () const { return m_FadeTime; }*/ void On_Lifetime_Changed (float lifetime); @@ -103,9 +103,9 @@ class EmitterColorPropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); - void Update_Colors (void); - void Update_Opacities (void); + void Initialize (); + void Update_Colors (); + void Update_Opacities (); private: diff --git a/Core/Tools/W3DView/EmitterFramePropPage.cpp b/Core/Tools/W3DView/EmitterFramePropPage.cpp index d18d01f9d86..8c7be7bf247 100644 --- a/Core/Tools/W3DView/EmitterFramePropPage.cpp +++ b/Core/Tools/W3DView/EmitterFramePropPage.cpp @@ -98,7 +98,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -EmitterFramePropPageClass::Initialize (void) +EmitterFramePropPageClass::Initialize () { SAFE_DELETE_ARRAY (m_Frames.KeyTimes); SAFE_DELETE_ARRAY (m_Frames.Values); @@ -315,7 +315,7 @@ BOOL EmitterFramePropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* // ///////////////////////////////////////////////////////////// void -EmitterFramePropPageClass::Update_Frames (void) +EmitterFramePropPageClass::Update_Frames () { float position = 0; float red = 0; diff --git a/Core/Tools/W3DView/EmitterFramePropPage.h b/Core/Tools/W3DView/EmitterFramePropPage.h index 7e7c7cbf648..6c76c34ee2a 100644 --- a/Core/Tools/W3DView/EmitterFramePropPage.h +++ b/Core/Tools/W3DView/EmitterFramePropPage.h @@ -76,15 +76,15 @@ class EmitterFramePropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } void Get_Frame_Keyframes (ParticlePropertyStruct &frames) { frames = m_Frames; } void On_Lifetime_Changed (float lifetime); - void Initialize (void); - void Update_Frames (void); + void Initialize (); + void Update_Frames (); private: diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.cpp b/Core/Tools/W3DView/EmitterGeneralPropPage.cpp index 852c078d3d9..2417ffdc9aa 100644 --- a/Core/Tools/W3DView/EmitterGeneralPropPage.cpp +++ b/Core/Tools/W3DView/EmitterGeneralPropPage.cpp @@ -63,7 +63,7 @@ EmitterGeneralPropPageClass::EmitterGeneralPropPageClass (EmitterInstanceListCla // // ~EmitterGeneralPropPageClass // -EmitterGeneralPropPageClass::~EmitterGeneralPropPageClass (void) +EmitterGeneralPropPageClass::~EmitterGeneralPropPageClass () { return; } @@ -103,7 +103,7 @@ END_MESSAGE_MAP() // Initialize // void -EmitterGeneralPropPageClass::Initialize (void) +EmitterGeneralPropPageClass::Initialize () { if (m_pEmitterList != nullptr) { @@ -156,7 +156,7 @@ EmitterGeneralPropPageClass::Add_Shader_To_Combo // OnInitDialog // BOOL -EmitterGeneralPropPageClass::OnInitDialog (void) +EmitterGeneralPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -203,7 +203,7 @@ EmitterGeneralPropPageClass::OnInitDialog (void) // OnApply // BOOL -EmitterGeneralPropPageClass::OnApply (void) +EmitterGeneralPropPageClass::OnApply () { // Get the data from the dialog controls GetDlgItemText (IDC_NAME_EDIT, m_EmitterName); @@ -255,7 +255,7 @@ EmitterGeneralPropPageClass::OnApply (void) // OnBrowseButton // void -EmitterGeneralPropPageClass::OnBrowseButton (void) +EmitterGeneralPropPageClass::OnBrowseButton () { CFileDialog openFileDialog (TRUE, ".tga", @@ -279,7 +279,7 @@ EmitterGeneralPropPageClass::OnBrowseButton (void) // OnChangeFilenameEdit // void -EmitterGeneralPropPageClass::OnChangeFilenameEdit (void) +EmitterGeneralPropPageClass::OnChangeFilenameEdit () { SetModified (); return ; @@ -291,7 +291,7 @@ EmitterGeneralPropPageClass::OnChangeFilenameEdit (void) // OnChangeNameEdit // void -EmitterGeneralPropPageClass::OnChangeNameEdit (void) +EmitterGeneralPropPageClass::OnChangeNameEdit () { SetModified (); return ; @@ -329,7 +329,7 @@ EmitterGeneralPropPageClass::OnNotify // OnChangeParticleLifetimeEdit // void -EmitterGeneralPropPageClass::OnChangeParticleLifetimeEdit (void) +EmitterGeneralPropPageClass::OnChangeParticleLifetimeEdit () { SetModified (); return ; @@ -341,7 +341,7 @@ EmitterGeneralPropPageClass::OnChangeParticleLifetimeEdit (void) // OnSelchangeShaderCombo // void -EmitterGeneralPropPageClass::OnSelchangeShaderCombo (void) +EmitterGeneralPropPageClass::OnSelchangeShaderCombo () { SetModified (); return ; @@ -396,7 +396,7 @@ EmitterGeneralPropPageClass::OnCommand // ///////////////////////////////////////////////////////////// void -EmitterGeneralPropPageClass::OnParticleLifetimeCheck (void) +EmitterGeneralPropPageClass::OnParticleLifetimeCheck () { bool enable = (SendDlgItemMessage (IDC_PARTICLE_LIFETIME_CHECK, BM_GETCHECK) == 1); ::EnableWindow (::GetDlgItem (m_hWnd, IDC_PARTICLE_LIFETIME_EDIT), enable); diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.h b/Core/Tools/W3DView/EmitterGeneralPropPage.h index 56894bd680e..d428683a3e8 100644 --- a/Core/Tools/W3DView/EmitterGeneralPropPage.h +++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h @@ -84,18 +84,18 @@ class EmitterGeneralPropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - EmitterPropertySheetClass *Get_Parent (void) const { return m_Parent; } + EmitterPropertySheetClass *Get_Parent () const { return m_Parent; } void Set_Parent (EmitterPropertySheetClass * parent) { m_Parent = parent; } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } - const CString & Get_Name (void) const { return m_EmitterName; } - const CString & Get_Texture_Filename (void) const { return m_TextureFilename; } - float Get_Lifetime (void) const { return m_Lifetime; } - const ShaderClass & Get_Shader (void) const { return m_Shader; } + const CString & Get_Name () const { return m_EmitterName; } + const CString & Get_Texture_Filename () const { return m_TextureFilename; } + float Get_Lifetime () const { return m_Lifetime; } + const ShaderClass & Get_Shader () const { return m_Shader; } //void Get_Shader (ShaderClass &shader); protected: @@ -104,7 +104,7 @@ class EmitterGeneralPropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); + void Initialize (); void Add_Shader_To_Combo (ShaderClass &shader, LPCTSTR name); private: diff --git a/Core/Tools/W3DView/EmitterInstanceList.cpp b/Core/Tools/W3DView/EmitterInstanceList.cpp index a321224cf44..aef0ba5ae5b 100644 --- a/Core/Tools/W3DView/EmitterInstanceList.cpp +++ b/Core/Tools/W3DView/EmitterInstanceList.cpp @@ -40,7 +40,7 @@ // ~EmitterInstanceListClass // ///////////////////////////////////////////////////////////////////// -EmitterInstanceListClass::~EmitterInstanceListClass (void) +EmitterInstanceListClass::~EmitterInstanceListClass () { Free_List (); return ; @@ -53,7 +53,7 @@ EmitterInstanceListClass::~EmitterInstanceListClass (void) // ///////////////////////////////////////////////////////////////////// void -EmitterInstanceListClass::Free_List (void) +EmitterInstanceListClass::Free_List () { // // Release our hold on each of the emitter pointers diff --git a/Core/Tools/W3DView/EmitterInstanceList.h b/Core/Tools/W3DView/EmitterInstanceList.h index 88688ba59e5..bb0ac949839 100644 --- a/Core/Tools/W3DView/EmitterInstanceList.h +++ b/Core/Tools/W3DView/EmitterInstanceList.h @@ -49,17 +49,17 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass /////////////////////////////////////////////////////// // Public constructors/destructors /////////////////////////////////////////////////////// - EmitterInstanceListClass (void) { } + EmitterInstanceListClass () { } EmitterInstanceListClass (const EmitterInstanceListClass &src) : ParticleEmitterDefClass (src) { } - virtual ~EmitterInstanceListClass (void); + virtual ~EmitterInstanceListClass (); /////////////////////////////////////////////////////// // Public methods /////////////////////////////////////////////////////// virtual void Add_Emitter (ParticleEmitterClass *emitter); - virtual void Free_List (void); + virtual void Free_List (); /////////////////////////////////////////////////////// // Derived overrides diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp b/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp index 1ee23a62c48..dd8cc99d31f 100644 --- a/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp +++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.cpp @@ -84,7 +84,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -EmitterLineGroupPropPageClass::Initialize (void) +EmitterLineGroupPropPageClass::Initialize () { SAFE_DELETE_ARRAY (m_BlurTimes.KeyTimes); SAFE_DELETE_ARRAY (m_BlurTimes.Values); @@ -159,7 +159,7 @@ BOOL EmitterLineGroupPropPageClass::OnInitDialog() // ///////////////////////////////////////////////////////////// void -EmitterLineGroupPropPageClass::Update_Blur_Times (void) +EmitterLineGroupPropPageClass::Update_Blur_Times () { float position = 0; float red = 0; diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.h b/Core/Tools/W3DView/EmitterLineGroupPropPage.h index 2a575eff3e3..62a12f62d40 100644 --- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h +++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h @@ -75,15 +75,15 @@ class EmitterLineGroupPropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } void Get_Blur_Time_Keyframes (ParticlePropertyStruct &blurtimes) { blurtimes = m_BlurTimes; } void On_Lifetime_Changed (float lifetime); - void Initialize (void); - void Update_Blur_Times (void); + void Initialize (); + void Update_Blur_Times (); private: diff --git a/Core/Tools/W3DView/EmitterLinePropPage.cpp b/Core/Tools/W3DView/EmitterLinePropPage.cpp index 22f0bf79e58..bc868abefd1 100644 --- a/Core/Tools/W3DView/EmitterLinePropPage.cpp +++ b/Core/Tools/W3DView/EmitterLinePropPage.cpp @@ -90,7 +90,7 @@ END_MESSAGE_MAP() // Initialize // void -EmitterLinePropPageClass::Initialize (void) +EmitterLinePropPageClass::Initialize () { if (m_pEmitterList != nullptr) { diff --git a/Core/Tools/W3DView/EmitterLinePropPage.h b/Core/Tools/W3DView/EmitterLinePropPage.h index 00f2c2feee2..6b3907d0a27 100644 --- a/Core/Tools/W3DView/EmitterLinePropPage.h +++ b/Core/Tools/W3DView/EmitterLinePropPage.h @@ -78,21 +78,21 @@ class EmitterLinePropPageClass : public CPropertyPage // // Public methods // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } - int Get_Mapping_Mode (void) const { return m_MappingMode; } - bool Get_Merge_Intersections (void) const { return m_MergeIntersections; } - bool Get_End_Caps (void) const { return m_EndCaps; } - bool Get_Disable_Sorting (void) const { return m_DisableSorting; } + int Get_Mapping_Mode () const { return m_MappingMode; } + bool Get_Merge_Intersections () const { return m_MergeIntersections; } + bool Get_End_Caps () const { return m_EndCaps; } + bool Get_Disable_Sorting () const { return m_DisableSorting; } - int Get_Subdivision_Level (void) const { return m_SubdivisionLevel; } - float Get_Noise_Amplitude (void) const { return m_NoiseAmplitude; } - float Get_Merge_Abort_Factor (void) const { return m_MergeAbortFactor; } - float Get_Texture_Tile_Factor (void) const { return m_TextureTileFactor; } - float Get_U_Per_Sec(void) const { return m_UPerSec; } - float Get_V_Per_Sed(void) const { return m_VPerSec; } + int Get_Subdivision_Level () const { return m_SubdivisionLevel; } + float Get_Noise_Amplitude () const { return m_NoiseAmplitude; } + float Get_Merge_Abort_Factor () const { return m_MergeAbortFactor; } + float Get_Texture_Tile_Factor () const { return m_TextureTileFactor; } + float Get_U_Per_Sec() const { return m_UPerSec; } + float Get_V_Per_Sed() const { return m_VPerSec; } protected: @@ -100,7 +100,7 @@ class EmitterLinePropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); + void Initialize (); private: diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.cpp b/Core/Tools/W3DView/EmitterParticlePropPage.cpp index f07e646e1ee..0f238cfbe89 100644 --- a/Core/Tools/W3DView/EmitterParticlePropPage.cpp +++ b/Core/Tools/W3DView/EmitterParticlePropPage.cpp @@ -64,7 +64,7 @@ EmitterParticlePropPageClass::EmitterParticlePropPageClass (EmitterInstanceListC // // ~EmitterParticlePropPageClass // -EmitterParticlePropPageClass::~EmitterParticlePropPageClass (void) +EmitterParticlePropPageClass::~EmitterParticlePropPageClass () { SAFE_DELETE (m_Randomizer); return; @@ -102,7 +102,7 @@ END_MESSAGE_MAP() // Initialize // void -EmitterParticlePropPageClass::Initialize (void) +EmitterParticlePropPageClass::Initialize () { SAFE_DELETE (m_Randomizer); if (m_pEmitterList != nullptr) { @@ -125,7 +125,7 @@ EmitterParticlePropPageClass::Initialize (void) // OnInitDialog // BOOL -EmitterParticlePropPageClass::OnInitDialog (void) +EmitterParticlePropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -154,7 +154,7 @@ EmitterParticlePropPageClass::OnInitDialog (void) // OnApply // BOOL -EmitterParticlePropPageClass::OnApply (void) +EmitterParticlePropPageClass::OnApply () { // // Get the data from the controls @@ -237,7 +237,7 @@ EmitterParticlePropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -EmitterParticlePropPageClass::OnSpecifyCreationVolume (void) +EmitterParticlePropPageClass::OnSpecifyCreationVolume () { VolumeRandomDialogClass dialog (m_Randomizer, this); if (dialog.DoModal () == IDOK) { @@ -287,7 +287,7 @@ EmitterParticlePropPageClass::OnCommand // ///////////////////////////////////////////////////////////// void -EmitterParticlePropPageClass::OnMaxParticlesCheck (void) +EmitterParticlePropPageClass::OnMaxParticlesCheck () { BOOL enable = SendDlgItemMessage (IDC_MAX_PARTICLES_CHECK, BM_GETCHECK); ::EnableWindow (::GetDlgItem (m_hWnd, IDC_MAX_PARTICLES_EDIT), enable); diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.h b/Core/Tools/W3DView/EmitterParticlePropPage.h index bdb4135a1df..bd263861c75 100644 --- a/Core/Tools/W3DView/EmitterParticlePropPage.h +++ b/Core/Tools/W3DView/EmitterParticlePropPage.h @@ -82,14 +82,14 @@ class EmitterParticlePropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } - float Get_Rate (void) const { return m_Rate; } - int Get_Burst_Size (void) const { return m_BurstSize; } - int Get_Max_Particles (void) const { return m_MaxParticles; } - Vector3Randomizer * Get_Creation_Volume (void) const { return m_Randomizer->Clone (); } + float Get_Rate () const { return m_Rate; } + int Get_Burst_Size () const { return m_BurstSize; } + int Get_Max_Particles () const { return m_MaxParticles; } + Vector3Randomizer * Get_Creation_Volume () const { return m_Randomizer->Clone (); } protected: @@ -97,7 +97,7 @@ class EmitterParticlePropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); + void Initialize (); private: diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp b/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp index 7449f8e0c3e..ac022c96c05 100644 --- a/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp +++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.cpp @@ -65,7 +65,7 @@ EmitterPhysicsPropPageClass::EmitterPhysicsPropPageClass (EmitterInstanceListCla // ~EmitterPhysicsPropPageClass // ///////////////////////////////////////////////////////////// -EmitterPhysicsPropPageClass::~EmitterPhysicsPropPageClass (void) +EmitterPhysicsPropPageClass::~EmitterPhysicsPropPageClass () { SAFE_DELETE (m_Randomizer); return; @@ -109,7 +109,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -EmitterPhysicsPropPageClass::Initialize (void) +EmitterPhysicsPropPageClass::Initialize () { SAFE_DELETE (m_Randomizer); if (m_pEmitterList != nullptr) { @@ -134,7 +134,7 @@ EmitterPhysicsPropPageClass::Initialize (void) // ///////////////////////////////////////////////////////////// BOOL -EmitterPhysicsPropPageClass::OnInitDialog (void) +EmitterPhysicsPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -164,7 +164,7 @@ EmitterPhysicsPropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -EmitterPhysicsPropPageClass::OnApply (void) +EmitterPhysicsPropPageClass::OnApply () { // // Read the velocity settings @@ -221,7 +221,7 @@ EmitterPhysicsPropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -EmitterPhysicsPropPageClass::OnSpecifyVelocityRandom (void) +EmitterPhysicsPropPageClass::OnSpecifyVelocityRandom () { VolumeRandomDialogClass dialog (m_Randomizer, this); if (dialog.DoModal () == IDOK) { diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.h b/Core/Tools/W3DView/EmitterPhysicsPropPage.h index 9900f7e835b..23db23dcd65 100644 --- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h +++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h @@ -84,15 +84,15 @@ class EmitterPhysicsPropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } - Vector3Randomizer * Get_Velocity_Random (void) const { return m_Randomizer; } - const Vector3 & Get_Velocity (void) const { return m_Velocity; } - const Vector3 & Get_Acceleration (void) const { return m_Acceleration; } - float Get_Out_Factor (void) const { return m_OutFactor; } - float Get_Inheritance_Factor (void) const { return m_InheritanceFactor; } + Vector3Randomizer * Get_Velocity_Random () const { return m_Randomizer; } + const Vector3 & Get_Velocity () const { return m_Velocity; } + const Vector3 & Get_Acceleration () const { return m_Acceleration; } + float Get_Out_Factor () const { return m_OutFactor; } + float Get_Inheritance_Factor () const { return m_InheritanceFactor; } protected: @@ -100,7 +100,7 @@ class EmitterPhysicsPropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); + void Initialize (); void On_Setting_Changed (UINT ctrl_id); private: diff --git a/Core/Tools/W3DView/EmitterPropertySheet.cpp b/Core/Tools/W3DView/EmitterPropertySheet.cpp index 6258ebdf9fb..94e0d0ef300 100644 --- a/Core/Tools/W3DView/EmitterPropertySheet.cpp +++ b/Core/Tools/W3DView/EmitterPropertySheet.cpp @@ -97,7 +97,7 @@ EmitterPropertySheetClass::EmitterPropertySheetClass // // EmitterPropertySheetClass // -EmitterPropertySheetClass::~EmitterPropertySheetClass (void) +EmitterPropertySheetClass::~EmitterPropertySheetClass () { SAFE_DELETE (m_pEmitterList); return ; @@ -189,7 +189,7 @@ EmitterPropertySheetClass::WindowProc // Add_Emitter_To_Viewer // void -EmitterPropertySheetClass::Add_Emitter_To_Viewer (void) +EmitterPropertySheetClass::Add_Emitter_To_Viewer () { CW3DViewDoc *pdoc = ::GetCurrentDocument (); if ((pdoc != nullptr) && (m_pEmitterList != nullptr)) { @@ -241,7 +241,7 @@ EmitterPropertySheetClass::Add_Emitter_To_Viewer (void) // Update_Emitter // void -EmitterPropertySheetClass::Update_Emitter (void) +EmitterPropertySheetClass::Update_Emitter () { // // Update those pages that are dependent on the particle's @@ -284,7 +284,7 @@ EmitterPropertySheetClass::Update_Emitter (void) // Initialize // void -EmitterPropertySheetClass::Initialize (void) +EmitterPropertySheetClass::Initialize () { if (m_pEmitterList == nullptr) { Create_New_Emitter (); @@ -338,7 +338,7 @@ EmitterPropertySheetClass::Initialize (void) // Create_Emitter // /*ParticleEmitterClass * -EmitterPropertySheetClass::Create_Emitter (void) +EmitterPropertySheetClass::Create_Emitter () { // // Read the particle settings @@ -422,7 +422,7 @@ EmitterPropertySheetClass::Create_Emitter (void) // Create_New_Emitter // void -EmitterPropertySheetClass::Create_New_Emitter (void) +EmitterPropertySheetClass::Create_New_Emitter () { ParticlePropertyStruct color; color.Start = Vector3 (1, 1, 1); diff --git a/Core/Tools/W3DView/EmitterPropertySheet.h b/Core/Tools/W3DView/EmitterPropertySheet.h index 1430e719738..80a9bca7937 100644 --- a/Core/Tools/W3DView/EmitterPropertySheet.h +++ b/Core/Tools/W3DView/EmitterPropertySheet.h @@ -89,11 +89,11 @@ class EmitterPropertySheetClass : public CPropertySheet // // Protected methods // - void Initialize (void); - ParticleEmitterClass * Create_Emitter (void); - void Update_Emitter (void); - void Add_Emitter_To_Viewer (void); - void Create_New_Emitter (void); + void Initialize (); + ParticleEmitterClass * Create_Emitter (); + void Update_Emitter (); + void Add_Emitter_To_Viewer (); + void Create_New_Emitter (); private: diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.cpp b/Core/Tools/W3DView/EmitterRotationPropPage.cpp index 4c9dc0329cd..f2a223aa6de 100644 --- a/Core/Tools/W3DView/EmitterRotationPropPage.cpp +++ b/Core/Tools/W3DView/EmitterRotationPropPage.cpp @@ -105,7 +105,7 @@ END_MESSAGE_MAP() // Initialize // ///////////////////////////////////////////////////////////// -void EmitterRotationPropPageClass::Initialize (void) +void EmitterRotationPropPageClass::Initialize () { SAFE_DELETE_ARRAY (m_Rotations.KeyTimes); SAFE_DELETE_ARRAY (m_Rotations.Values); @@ -303,7 +303,7 @@ BOOL EmitterRotationPropPageClass::OnNotify(WPARAM wParam, LPARAM lParam, LRESUL // ///////////////////////////////////////////////////////////// void -EmitterRotationPropPageClass::Update_Rotations (void) +EmitterRotationPropPageClass::Update_Rotations () { float position = 0; float red = 0; diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.h b/Core/Tools/W3DView/EmitterRotationPropPage.h index aba163b3c08..e7b9a3fb5cb 100644 --- a/Core/Tools/W3DView/EmitterRotationPropPage.h +++ b/Core/Tools/W3DView/EmitterRotationPropPage.h @@ -76,9 +76,9 @@ class EmitterRotationPropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } void Get_Rotation_Keyframes (ParticlePropertyStruct &rotations) { rotations = m_Rotations; } void On_Lifetime_Changed (float lifetime); @@ -89,8 +89,8 @@ class EmitterRotationPropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); - void Update_Rotations (void); + void Initialize (); + void Update_Rotations (); private: diff --git a/Core/Tools/W3DView/EmitterSizePropPage.cpp b/Core/Tools/W3DView/EmitterSizePropPage.cpp index f5a5b4efe4e..1e5fb35ccda 100644 --- a/Core/Tools/W3DView/EmitterSizePropPage.cpp +++ b/Core/Tools/W3DView/EmitterSizePropPage.cpp @@ -67,7 +67,7 @@ EmitterSizePropPageClass::EmitterSizePropPageClass (EmitterInstanceListClass *pe // ~EmitterSizePropPageClass // ///////////////////////////////////////////////////////////// -EmitterSizePropPageClass::~EmitterSizePropPageClass (void) +EmitterSizePropPageClass::~EmitterSizePropPageClass () { // Free the original setting arrays SAFE_DELETE_ARRAY (m_OrigSizes.KeyTimes); @@ -107,7 +107,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -EmitterSizePropPageClass::Initialize (void) +EmitterSizePropPageClass::Initialize () { SAFE_DELETE_ARRAY (m_OrigSizes.KeyTimes); SAFE_DELETE_ARRAY (m_OrigSizes.Values); @@ -140,7 +140,7 @@ EmitterSizePropPageClass::Initialize (void) // ///////////////////////////////////////////////////////////// BOOL -EmitterSizePropPageClass::OnInitDialog (void) +EmitterSizePropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -183,7 +183,7 @@ EmitterSizePropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -EmitterSizePropPageClass::OnApply (void) +EmitterSizePropPageClass::OnApply () { /*SAFE_DELETE_ARRAY (m_OrigSizes.KeyTimes); SAFE_DELETE_ARRAY (m_OrigSizes.Values); @@ -309,7 +309,7 @@ EmitterSizePropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -EmitterSizePropPageClass::Update_Sizes (void) +EmitterSizePropPageClass::Update_Sizes () { float position = 0; float red = 0; diff --git a/Core/Tools/W3DView/EmitterSizePropPage.h b/Core/Tools/W3DView/EmitterSizePropPage.h index b525e00392a..75de00909a6 100644 --- a/Core/Tools/W3DView/EmitterSizePropPage.h +++ b/Core/Tools/W3DView/EmitterSizePropPage.h @@ -77,9 +77,9 @@ class EmitterSizePropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } void Get_Size_Keyframes (ParticlePropertyStruct &sizes) { sizes = m_CurrentSizes; } @@ -91,8 +91,8 @@ class EmitterSizePropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); - void Update_Sizes (void); + void Initialize (); + void Update_Sizes (); private: diff --git a/Core/Tools/W3DView/EmitterUserPropPage.cpp b/Core/Tools/W3DView/EmitterUserPropPage.cpp index bc5cf79ccf4..d9dc9daca0b 100644 --- a/Core/Tools/W3DView/EmitterUserPropPage.cpp +++ b/Core/Tools/W3DView/EmitterUserPropPage.cpp @@ -59,7 +59,7 @@ EmitterUserPropPageClass::EmitterUserPropPageClass (EmitterInstanceListClass *pe // // ~EmitterUserPropPageClass // -EmitterUserPropPageClass::~EmitterUserPropPageClass (void) +EmitterUserPropPageClass::~EmitterUserPropPageClass () { return; } @@ -94,7 +94,7 @@ END_MESSAGE_MAP() // Initialize // void -EmitterUserPropPageClass::Initialize (void) +EmitterUserPropPageClass::Initialize () { if (m_pEmitterList != nullptr) { @@ -112,7 +112,7 @@ EmitterUserPropPageClass::Initialize (void) // OnInitDialog // BOOL -EmitterUserPropPageClass::OnInitDialog (void) +EmitterUserPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -136,7 +136,7 @@ EmitterUserPropPageClass::OnInitDialog (void) // OnApply // BOOL -EmitterUserPropPageClass::OnApply (void) +EmitterUserPropPageClass::OnApply () { // Get the settings from the controls m_iType = m_TypeCombo.GetCurSel (); @@ -158,7 +158,7 @@ EmitterUserPropPageClass::OnApply (void) // OnChangeProgrammerSettingsEdit // void -EmitterUserPropPageClass::OnChangeProgrammerSettingsEdit (void) +EmitterUserPropPageClass::OnChangeProgrammerSettingsEdit () { SetModified (); return ; @@ -170,7 +170,7 @@ EmitterUserPropPageClass::OnChangeProgrammerSettingsEdit (void) // OnSelchangeTypeCombo // void -EmitterUserPropPageClass::OnSelchangeTypeCombo (void) +EmitterUserPropPageClass::OnSelchangeTypeCombo () { SetModified (); return ; diff --git a/Core/Tools/W3DView/EmitterUserPropPage.h b/Core/Tools/W3DView/EmitterUserPropPage.h index e9edf67d60e..36438918153 100644 --- a/Core/Tools/W3DView/EmitterUserPropPage.h +++ b/Core/Tools/W3DView/EmitterUserPropPage.h @@ -74,12 +74,12 @@ class EmitterUserPropPageClass : public CPropertyPage // // Inline accessors // - EmitterInstanceListClass * Get_Emitter (void) const { return m_pEmitterList; } + EmitterInstanceListClass * Get_Emitter () const { return m_pEmitterList; } void Set_Emitter (EmitterInstanceListClass *pemitter_list) { m_pEmitterList = pemitter_list; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } - int Get_Type (void) const { return m_iType; } - const CString & Get_String (void) const { return m_UserString; } + int Get_Type () const { return m_iType; } + const CString & Get_String () const { return m_UserString; } void Set_Type (int type) { m_iType = type; } void Set_String (LPCTSTR string) { m_UserString = string; } @@ -90,7 +90,7 @@ class EmitterUserPropPageClass : public CPropertyPage // // Protected methods // - void Initialize (void); + void Initialize (); private: diff --git a/Core/Tools/W3DView/GraphicView.cpp b/Core/Tools/W3DView/GraphicView.cpp index fb9c4a782fd..52c79db2326 100644 --- a/Core/Tools/W3DView/GraphicView.cpp +++ b/Core/Tools/W3DView/GraphicView.cpp @@ -69,7 +69,7 @@ IMPLEMENT_DYNCREATE(CGraphicView, CView) // CGraphicView // //////////////////////////////////////////////////////////////////////////// -CGraphicView::CGraphicView (void) +CGraphicView::CGraphicView () : m_bInitialized (FALSE), m_pCamera (nullptr), m_TimerID (0), @@ -181,7 +181,7 @@ CGraphicView::OnCreate (LPCREATESTRUCT lpCreateStruct) // //////////////////////////////////////////////////////////////////////////// BOOL -CGraphicView::InitializeGraphicView (void) +CGraphicView::InitializeGraphicView () { // Assume failure BOOL bReturn = FALSE; @@ -316,7 +316,7 @@ CGraphicView::OnSize // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::OnDestroy (void) +CGraphicView::OnDestroy () { // Allow the base class to process this message CView::OnDestroy (); @@ -357,7 +357,7 @@ CGraphicView::OnDestroy (void) // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::OnInitialUpdate (void) +CGraphicView::OnInitialUpdate () { // Allow the base class to process this message CView::OnInitialUpdate (); @@ -582,7 +582,7 @@ CGraphicView::RepaintView // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::UpdateDisplay (void) +CGraphicView::UpdateDisplay () { // Get the document to display CW3DViewDoc* doc = (CW3DViewDoc *)GetDocument(); @@ -1314,7 +1314,7 @@ CGraphicView::Reset_Camera_To_Display_Object (RenderObjClass &render_object) // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::Load_Default_Dat (void) +CGraphicView::Load_Default_Dat () { // Get the directory where this executable was run from TCHAR filename[MAX_PATH]; @@ -1590,7 +1590,7 @@ CGraphicView::SetAllowedCameraRotation (CAMERA_ROTATION cameraRotation) // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::ResetObject (void) +CGraphicView::ResetObject () { // Get the current document CW3DViewDoc *doc = ::GetCurrentDocument (); @@ -1630,7 +1630,7 @@ CGraphicView::OnGetMinMaxInfo (MINMAXINFO FAR* lpMMI) // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::Rotate_Object (void) +CGraphicView::Rotate_Object () { // Get the document to display CW3DViewDoc *doc = (CW3DViewDoc *)GetDocument(); @@ -1678,7 +1678,7 @@ CGraphicView::Rotate_Object (void) // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::Rotate_Light (void) +CGraphicView::Rotate_Light () { // Get the document to display CW3DViewDoc *doc = (CW3DViewDoc *)GetDocument(); @@ -1762,7 +1762,7 @@ CGraphicView::Set_FOV (double hfov, double vfov, bool force) // //////////////////////////////////////////////////////////////////////////// void -CGraphicView::Reset_FOV (void) +CGraphicView::Reset_FOV () { int cx = 0; int cy = 0; diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h index 8a6faa8b5da..c89f77dd430 100644 --- a/Core/Tools/W3DView/GraphicView.h +++ b/Core/Tools/W3DView/GraphicView.h @@ -136,7 +136,7 @@ class CGraphicView : public CView // Public Methods // - BOOL InitializeGraphicView (void); + BOOL InitializeGraphicView (); // // Initial display methods @@ -144,9 +144,9 @@ class CGraphicView : public CView void Reset_Camera_To_Display_Sphere (SphereClass &sphere); void Reset_Camera_To_Display_Object (RenderObjClass &physObject); void Reset_Camera_To_Display_Emitter (ParticleEmitterClass &emitter); - void Load_Default_Dat (void); + void Load_Default_Dat (); - void UpdateDisplay (void); + void UpdateDisplay (); void RepaintView (BOOL bUpdateAnimation = TRUE, DWORD ticks_to_use = 0); void SetActiveUpdate (BOOL bActive) { m_bActive = bActive; @@ -159,9 +159,9 @@ class CGraphicView : public CView // // Animation methods // - float GetAnimationSpeed (void) const { return m_animationSpeed; } + float GetAnimationSpeed () const { return m_animationSpeed; } void SetAnimationSpeed (float animationSpeed) { m_animationSpeed = animationSpeed; } - ANIMATION_STATE GetAnimationState (void) const { return m_animationState; } + ANIMATION_STATE GetAnimationState () const { return m_animationState; } void SetAnimationState (ANIMATION_STATE animationState); // @@ -170,44 +170,44 @@ class CGraphicView : public CView void SetAllowedCameraRotation (CAMERA_ROTATION cameraRotation); CAMERA_ROTATION GetAllowedCameraRotation () const { return m_allowedCameraRotation; } void SetCameraPos (CAMERA_POS cameraPos); - class CameraClass *GetCamera (void) const { return m_pCamera; } + class CameraClass *GetCamera () const { return m_pCamera; } - float Get_Camera_Distance (void) const { return m_CameraDistance; } + float Get_Camera_Distance () const { return m_CameraDistance; } void Set_Camera_Distance (float dist); void Set_Camera_Bone_Pos_X (bool onoff) { m_CameraBonePosX = onoff; } - BOOL Is_Camera_Bone_Pos_X (void) const { return m_CameraBonePosX; } + BOOL Is_Camera_Bone_Pos_X () const { return m_CameraBonePosX; } // // Object rotation methods // - void ResetObject (void); + void ResetObject (); void RotateObject (OBJECT_ROTATION rotation); - OBJECT_ROTATION GetObjectRotation (void) const { return m_objectRotation; } + OBJECT_ROTATION GetObjectRotation () const { return m_objectRotation; } // // Light rotation methods // void Rotate_Light (OBJECT_ROTATION rotation) { m_LightRotation = rotation; } - OBJECT_ROTATION Get_Light_Rotation (void) const { return m_LightRotation; } + OBJECT_ROTATION Get_Light_Rotation () const { return m_LightRotation; } // // Fullscreen mode // - BOOL Is_Fullscreen (void) const { return !(BOOL)m_iWindowed; } + BOOL Is_Fullscreen () const { return !(BOOL)m_iWindowed; } void Set_Fullscreen (bool fullscreen) { m_iWindowed = fullscreen ? 0 : 1; InitializeGraphicView (); } // // Misc // - RenderObjClass * Get_Light_Mesh (void) const { return m_pLightMesh; } - Vector3 & Get_Object_Center (void) { return m_ObjectCenter; } + RenderObjClass * Get_Light_Mesh () const { return m_pLightMesh; } + Vector3 & Get_Object_Center () { return m_ObjectCenter; } // // FOV methods // void Set_FOV (double hfov, double vfov, bool force = false); - void Reset_FOV (void); + void Reset_FOV (); protected: @@ -215,8 +215,8 @@ class CGraphicView : public CView // // Protected methods // - void Rotate_Object (void); - void Rotate_Light (void); + void Rotate_Object (); + void Rotate_Light (); private: diff --git a/Core/Tools/W3DView/HierarchyPropPage.cpp b/Core/Tools/W3DView/HierarchyPropPage.cpp index c39fd171552..b64b351554f 100644 --- a/Core/Tools/W3DView/HierarchyPropPage.cpp +++ b/Core/Tools/W3DView/HierarchyPropPage.cpp @@ -58,7 +58,7 @@ CHierarchyPropPage::CHierarchyPropPage (const CString &stringHierarchyName) // // CHierarchyPropPage // -CHierarchyPropPage::~CHierarchyPropPage (void) +CHierarchyPropPage::~CHierarchyPropPage () { return ; } @@ -92,7 +92,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CHierarchyPropPage::OnInitDialog (void) +CHierarchyPropPage::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog(); diff --git a/Core/Tools/W3DView/MainFrm.cpp b/Core/Tools/W3DView/MainFrm.cpp index 38563a531e1..a15dee66381 100644 --- a/Core/Tools/W3DView/MainFrm.cpp +++ b/Core/Tools/W3DView/MainFrm.cpp @@ -327,7 +327,7 @@ typedef enum // CMainFrame // //////////////////////////////////////////////////////////////////////////// -CMainFrame::CMainFrame (void) +CMainFrame::CMainFrame () : m_currentAssetType (TypeUnknown), m_bShowAnimationBar (TRUE), m_bInitialized (FALSE) @@ -341,7 +341,7 @@ CMainFrame::CMainFrame (void) // ~CMainFrame // //////////////////////////////////////////////////////////////////////////// -CMainFrame::~CMainFrame (void) +CMainFrame::~CMainFrame () { return ; } @@ -448,7 +448,7 @@ CMainFrame::OnCreate (LPCREATESTRUCT lpCreateStruct) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::Restore_Window_State (void) +CMainFrame::Restore_Window_State () { // // Read the cached window information from the registry @@ -478,7 +478,7 @@ CMainFrame::Restore_Window_State (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::RestoreOriginalSize (void) +CMainFrame::RestoreOriginalSize () { // Resize the window so its the same size it was when the application loaded SetWindowPos (nullptr, 0, 0, m_OrigRect.right-m_OrigRect.left, m_OrigRect.bottom-m_OrigRect.top, SWP_NOMOVE | SWP_NOZORDER); @@ -715,7 +715,7 @@ CMainFrame::WindowProc // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectProperties (void) +CMainFrame::OnObjectProperties () { // Dislay the properties for the currently selected object. ShowObjectProperties (); @@ -729,7 +729,7 @@ CMainFrame::OnObjectProperties (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::ShowObjectProperties (void) +CMainFrame::ShowObjectProperties () { // Get a pointer to the 'graphic' pane's window CDataTreeView *pCDataTreeView = (CDataTreeView *)m_wndSplitter.GetPane (0, 0); @@ -976,7 +976,7 @@ CMainFrame::OnSelectionChanged (ASSET_TYPE newAssetType) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLodGenerate (void) +CMainFrame::OnLodGenerate () { // Get a pointer to the 'data' pane's window CDataTreeView *ptree_view = (CDataTreeView *)m_wndSplitter.GetPane (0, 0); @@ -1183,7 +1183,7 @@ CMainFrame::UpdateCameraDistance (float cameraDistance) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnFileOpen (void) +CMainFrame::OnFileOpen () { CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument (); if (doc == nullptr) { @@ -1241,7 +1241,7 @@ CMainFrame::OnFileOpen (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnAniSpeed (void) +CMainFrame::OnAniSpeed () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); if (pCGraphicView) @@ -1265,7 +1265,7 @@ CMainFrame::OnAniSpeed (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnAniStop (void) +CMainFrame::OnAniStop () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1289,7 +1289,7 @@ CMainFrame::OnAniStop (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnAniStart (void) +CMainFrame::OnAniStart () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1315,7 +1315,7 @@ CMainFrame::OnAniStart (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnAniPause (void) +CMainFrame::OnAniPause () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1354,7 +1354,7 @@ CMainFrame::OnAniPause (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraBack (void) +CMainFrame::OnCameraBack () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1374,7 +1374,7 @@ CMainFrame::OnCameraBack (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraBottom (void) +CMainFrame::OnCameraBottom () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1394,7 +1394,7 @@ CMainFrame::OnCameraBottom (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraFront (void) +CMainFrame::OnCameraFront () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1414,7 +1414,7 @@ CMainFrame::OnCameraFront (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraLeft (void) +CMainFrame::OnCameraLeft () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1434,7 +1434,7 @@ CMainFrame::OnCameraLeft (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraReset (void) +CMainFrame::OnCameraReset () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1464,7 +1464,7 @@ CMainFrame::OnCameraReset (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraRight (void) +CMainFrame::OnCameraRight () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1484,7 +1484,7 @@ CMainFrame::OnCameraRight (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraTop (void) +CMainFrame::OnCameraTop () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1504,7 +1504,7 @@ CMainFrame::OnCameraTop (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectRotateZ (void) +CMainFrame::OnObjectRotateZ () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1538,7 +1538,7 @@ CMainFrame::OnObjectRotateZ (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectRotateY (void) +CMainFrame::OnObjectRotateY () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1561,7 +1561,7 @@ CMainFrame::OnObjectRotateY (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectRotateX (void) +CMainFrame::OnObjectRotateX () { CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pCGraphicView); @@ -1585,7 +1585,7 @@ CMainFrame::OnObjectRotateX (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLightAmbient (void) +CMainFrame::OnLightAmbient () { // Show the ambient light dialog CAmbientLightDialog ambientLightDialog (this); @@ -1601,7 +1601,7 @@ CMainFrame::OnLightAmbient (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLightScene (void) +CMainFrame::OnLightScene () { // Show the scene light dialog CSceneLightDialog sceneLightDialog (this); @@ -1616,7 +1616,7 @@ CMainFrame::OnLightScene (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnBackgroundColor (void) +CMainFrame::OnBackgroundColor () { // Show the background color CBackgroundColorDialog backgroundColorDialog (this); @@ -1646,7 +1646,7 @@ CMainFrame::OnUpdateBackgroundFog (CCmdUI* pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnBackgroundFog (void) +CMainFrame::OnBackgroundFog () { CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument (); if (pdoc) { @@ -1663,7 +1663,7 @@ CMainFrame::OnBackgroundFog (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnBackgroundBMP (void) +CMainFrame::OnBackgroundBMP () { // Show the background BMP dialog CBackgroundBMPDialog backgroundBMPDialog (this); @@ -1678,7 +1678,7 @@ CMainFrame::OnBackgroundBMP (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnSaveSettings (void) +CMainFrame::OnSaveSettings () { // Show the save settings dialog CSaveSettingsDialog saveSettingsDialog (this); @@ -1693,7 +1693,7 @@ CMainFrame::OnSaveSettings (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLoadSettings (void) +CMainFrame::OnLoadSettings () { // Get the active document CW3DViewDoc *pCDoc = (CW3DViewDoc *)GetActiveDocument (); @@ -1724,7 +1724,7 @@ CMainFrame::OnLoadSettings (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLODSetSwitch (void) +CMainFrame::OnLODSetSwitch () { // Display the edit LOD dialog CEditLODDialog editLODDialog (this); @@ -1739,7 +1739,7 @@ CMainFrame::OnLODSetSwitch (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLODSave (void) +CMainFrame::OnLODSave () { // Get the controlling doc object so we can have it save the // LOD for us. @@ -1758,7 +1758,7 @@ CMainFrame::OnLODSave (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLODSaveAll (void) +CMainFrame::OnLODSaveAll () { MessageBox ("Not implemented yet.", "Test", MB_OK | MB_ICONEXCLAMATION); return ; @@ -1771,7 +1771,7 @@ CMainFrame::OnLODSaveAll (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnBackgroundObject (void) +CMainFrame::OnBackgroundObject () { // Display the background object dialog CBackgroundObjectDialog backgroundObjectDialog (this); @@ -1827,7 +1827,7 @@ CMainFrame::OnUpdateViewObjectBar (CCmdUI* pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnViewAnimationBar (void) +CMainFrame::OnViewAnimationBar () { if (m_animationToolbar.IsWindowVisible () == FALSE) { @@ -1856,7 +1856,7 @@ CMainFrame::OnViewAnimationBar (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnViewObjectBar (void) +CMainFrame::OnViewObjectBar () { if (m_objectToolbar.IsWindowVisible () == FALSE) { @@ -1879,7 +1879,7 @@ CMainFrame::OnViewObjectBar (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnAniStepFwd (void) +CMainFrame::OnAniStepFwd () { // Get the current doc CW3DViewDoc *pCDoc = (CW3DViewDoc *)GetActiveDocument (); @@ -1899,7 +1899,7 @@ CMainFrame::OnAniStepFwd (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnAniStepBkwd (void) +CMainFrame::OnAniStepBkwd () { // Get the current doc CW3DViewDoc *pCDoc = (CW3DViewDoc *)GetActiveDocument (); @@ -1919,7 +1919,7 @@ CMainFrame::OnAniStepBkwd (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectReset (void) +CMainFrame::OnObjectReset () { // Get the graphic view CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); @@ -1939,7 +1939,7 @@ CMainFrame::OnObjectReset (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraAllowRotateX (void) +CMainFrame::OnCameraAllowRotateX () { // Get the graphic view CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); @@ -1977,7 +1977,7 @@ CMainFrame::OnCameraAllowRotateX (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraAllowRotateY (void) +CMainFrame::OnCameraAllowRotateY () { // Get the graphic view CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); @@ -2015,7 +2015,7 @@ CMainFrame::OnCameraAllowRotateY (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraAllowRotateZ (void) +CMainFrame::OnCameraAllowRotateZ () { // Get the graphic view CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); @@ -2238,7 +2238,7 @@ CMainFrame::Select_Device (bool show_dlg) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnDeviceChange (void) +CMainFrame::OnDeviceChange () { #ifdef WW3D_DX8 Select_Device (true); @@ -2255,7 +2255,7 @@ CMainFrame::OnDeviceChange (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnViewFullscreen (void) +CMainFrame::OnViewFullscreen () { #ifdef WW3D_DX8 CGraphicView *pCGraphicView = (CGraphicView *)m_wndSplitter.GetPane (0, 1); @@ -2318,7 +2318,7 @@ CMainFrame::OnGetMinMaxInfo (MINMAXINFO FAR* lpMMI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCreateEmitter (void) +CMainFrame::OnCreateEmitter () { // Clear the current display CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument (); @@ -2341,7 +2341,7 @@ CMainFrame::OnCreateEmitter (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnEditEmitter (void) +CMainFrame::OnEditEmitter () { // Get a pointer to the doc object CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument (); @@ -2384,7 +2384,7 @@ CMainFrame::OnUpdateEditEmitter (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnScaleEmitter (void) +CMainFrame::OnScaleEmitter () { // Get a pointer to the doc object CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument (); @@ -2440,7 +2440,7 @@ CMainFrame::OnUpdateScaleEmitter (CCmdUI* pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnSaveEmitter (void) +CMainFrame::OnSaveEmitter () { ((CW3DViewDoc *)GetActiveDocument ())->Save_Selected_Emitter (); return ; @@ -2466,7 +2466,7 @@ CMainFrame::OnUpdateSaveEmitter (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnBoneAutoAssign (void) +CMainFrame::OnBoneAutoAssign () { ((CW3DViewDoc *)GetActiveDocument ())->Auto_Assign_Bones (); return ; @@ -2479,7 +2479,7 @@ CMainFrame::OnBoneAutoAssign (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnBoneManagement (void) +CMainFrame::OnBoneManagement () { // Get the currently selected hierarchy model RenderObjClass *prender_obj = ((CW3DViewDoc *)GetActiveDocument ())->GetDisplayedObject (); @@ -2498,7 +2498,7 @@ CMainFrame::OnBoneManagement (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnSaveAggregate (void) +CMainFrame::OnSaveAggregate () { ((CW3DViewDoc *)GetActiveDocument ())->Save_Selected_Aggregate (); return ; @@ -2511,7 +2511,7 @@ CMainFrame::OnSaveAggregate (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraAnimate (void) +CMainFrame::OnCameraAnimate () { // Toggel the animated state bool banimated = ((CW3DViewDoc *)GetActiveDocument ())->Is_Camera_Animated (); @@ -2565,7 +2565,7 @@ CMainFrame::OnUpdateSaveAggregate (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraResetOnLoad (void) +CMainFrame::OnCameraResetOnLoad () { // Toggle the auto reset state of the menu option CW3DViewDoc *pdoc = (CW3DViewDoc *)GetActiveDocument (); @@ -2594,7 +2594,7 @@ CMainFrame::OnUpdateCameraResetOnLoad (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectRotateYBack (void) +CMainFrame::OnObjectRotateYBack () { CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pgraphic_view != nullptr); @@ -2616,7 +2616,7 @@ CMainFrame::OnObjectRotateYBack (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectRotateZBack (void) +CMainFrame::OnObjectRotateZBack () { CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pgraphic_view != nullptr); @@ -2638,7 +2638,7 @@ CMainFrame::OnObjectRotateZBack (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLightRotateY (void) +CMainFrame::OnLightRotateY () { CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pgraphic_view != nullptr); @@ -2660,7 +2660,7 @@ CMainFrame::OnLightRotateY (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLightRotateYBack (void) +CMainFrame::OnLightRotateYBack () { CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pgraphic_view != nullptr); @@ -2682,7 +2682,7 @@ CMainFrame::OnLightRotateYBack (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLightRotateZ (void) +CMainFrame::OnLightRotateZ () { CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pgraphic_view != nullptr); @@ -2704,7 +2704,7 @@ CMainFrame::OnLightRotateZ (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLightRotateZBack (void) +CMainFrame::OnLightRotateZBack () { CGraphicView *pgraphic_view = (CGraphicView *)m_wndSplitter.GetPane (0, 1); ASSERT (pgraphic_view != nullptr); @@ -2726,7 +2726,7 @@ CMainFrame::OnLightRotateZBack (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnDestroy (void) +CMainFrame::OnDestroy () { CRect rect; WINDOWPLACEMENT wnd_info = { sizeof (WINDOWPLACEMENT), 0 }; @@ -2763,7 +2763,7 @@ CMainFrame::OnDestroy (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnDecLight (void) +CMainFrame::OnDecLight () { CW3DViewDoc *pdoc = ::GetCurrentDocument (); LightClass *plight = pdoc->GetSceneLight (); @@ -2792,7 +2792,7 @@ CMainFrame::OnDecLight (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnIncLight (void) +CMainFrame::OnIncLight () { CW3DViewDoc *pdoc = ::GetCurrentDocument (); LightClass *plight = pdoc->GetSceneLight (); @@ -2821,7 +2821,7 @@ CMainFrame::OnIncLight (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnDecAmbientLight (void) +CMainFrame::OnDecAmbientLight () { CW3DViewDoc *pdoc = ::GetCurrentDocument (); if (pdoc->GetScene () != nullptr) { @@ -2844,7 +2844,7 @@ CMainFrame::OnDecAmbientLight (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnIncAmbientLight (void) +CMainFrame::OnIncAmbientLight () { CW3DViewDoc *pdoc = ::GetCurrentDocument (); if (pdoc->GetScene () != nullptr) { @@ -2878,7 +2878,7 @@ void CMainFrame::OnUpdateLightingExpose (CCmdUI *pcmdui) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnMakeAggregate (void) +CMainFrame::OnMakeAggregate () { // Show the name dialog to the user AggregateNameDialogClass dialog (this); @@ -2912,7 +2912,7 @@ CMainFrame::OnMakeAggregate (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnRenameAggregate (void) +CMainFrame::OnRenameAggregate () { // Get a pointer to the current aggregate RenderObjClass *prender_obj = (::GetCurrentDocument ())->GetDisplayedObject (); @@ -3013,7 +3013,7 @@ CMainFrame::OnCmdMsg // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCrashApp (void) +CMainFrame::OnCrashApp () { // Usefull HACK to get the program to crash when needed... LPTSTR hack = nullptr; @@ -3028,7 +3028,7 @@ CMainFrame::OnCrashApp (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLODRecordScreenArea (void) +CMainFrame::OnLODRecordScreenArea () { // Make sure the current object is an LOD RenderObjClass *prender_obj = ::GetCurrentDocument ()->GetDisplayedObject (); @@ -3062,7 +3062,7 @@ CMainFrame::OnLODRecordScreenArea (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLODIncludeNull (void) +CMainFrame::OnLODIncludeNull () { // Make sure the current object is an LOD RenderObjClass *prender_obj = ::GetCurrentDocument ()->GetDisplayedObject (); @@ -3109,7 +3109,7 @@ CMainFrame::OnUpdateLODIncludeNull (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLodPrevLevel (void) +CMainFrame::OnLodPrevLevel () { ::GetCurrentDocument ()->Switch_LOD (-1); return ; @@ -3144,7 +3144,7 @@ CMainFrame::OnUpdateLodPrevLevel (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLodNextLevel (void) +CMainFrame::OnLodNextLevel () { ::GetCurrentDocument ()->Switch_LOD (1); return ; @@ -3180,7 +3180,7 @@ CMainFrame::OnUpdateLodNextLevel (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnLodAutoswitch (void) +CMainFrame::OnLodAutoswitch () { // Toggle the autoswitch setting ViewerSceneClass *pscene = ::GetCurrentDocument ()->GetScene (); @@ -3229,7 +3229,7 @@ CMainFrame::OnUpdateMakeMovie (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnMakeMovie (void) +CMainFrame::OnMakeMovie () { // Force a resolution change //WW3D::Set_Resolution (800, 600, g_iBitsPerPixel, 0); @@ -3245,7 +3245,7 @@ CMainFrame::OnMakeMovie (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnSaveScreenshot (void) +CMainFrame::OnSaveScreenshot () { // Get the directory where this executable was run from TCHAR filename[MAX_PATH]; @@ -3284,7 +3284,7 @@ CMainFrame::OnSaveScreenshot (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::Update_Emitters_List (void) +CMainFrame::Update_Emitters_List () { ::EnableMenuItem (::GetSubMenu (::GetMenu (m_hWnd), 3), 3, MF_BYPOSITION | MF_ENABLED); HMENU hsub_menu = Get_Emitters_List_Menu (); @@ -3318,7 +3318,7 @@ CMainFrame::Update_Emitters_List (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnSlideshowDown (void) +CMainFrame::OnSlideshowDown () { CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0); if (data_tree != nullptr) { @@ -3335,7 +3335,7 @@ CMainFrame::OnSlideshowDown (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnSlideshowUp (void) +CMainFrame::OnSlideshowUp () { CDataTreeView *data_tree = (CDataTreeView *)m_wndSplitter.GetPane (0, 0); if (data_tree != nullptr) { @@ -3381,7 +3381,7 @@ CMainFrame::OnUpdateAdvancedAnim(CCmdUI* pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCameraSettings (void) +CMainFrame::OnCameraSettings () { CameraSettingsDialogClass dialog (this); dialog.DoModal (); @@ -3395,7 +3395,7 @@ CMainFrame::OnCameraSettings (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCopyScreenSize (void) +CMainFrame::OnCopyScreenSize () { // // Determine the current screen size of the displayed object @@ -3438,7 +3438,7 @@ CMainFrame::OnCopyScreenSize (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnListMissingTextures (void) +CMainFrame::OnListMissingTextures () { // // Get the list of missing textures and preset it to the user @@ -3467,7 +3467,7 @@ CMainFrame::OnListMissingTextures (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCopyAssets (void) +CMainFrame::OnCopyAssets () { CString path; if (::Browse_For_Folder (m_hWnd, nullptr, path)) { @@ -3512,7 +3512,7 @@ CMainFrame::OnUpdateCopyAssets (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnTexturePath (void) +CMainFrame::OnTexturePath () { TexturePathDialogClass dialog (this); dialog.DoModal (); @@ -3526,7 +3526,7 @@ CMainFrame::OnTexturePath (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnChangeResolution (void) +CMainFrame::OnChangeResolution () { #ifdef WW3D_DX8 ResolutionDialogClass dialog (this); @@ -3544,7 +3544,7 @@ CMainFrame::OnChangeResolution (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCreateSphere (void) +CMainFrame::OnCreateSphere () { // Clear the current display CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument (); @@ -3567,7 +3567,7 @@ CMainFrame::OnCreateSphere (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCreateRing (void) +CMainFrame::OnCreateRing () { // Clear the current display CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument (); @@ -3590,7 +3590,7 @@ CMainFrame::OnCreateRing (void) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnEditPrimitive (void) +CMainFrame::OnEditPrimitive () { // Get a pointer to the doc object CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument (); @@ -3649,7 +3649,7 @@ CMainFrame::OnUpdateEditPrimitive (CCmdUI *pCmdUI) // //////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnExportPrimitive (void) +CMainFrame::OnExportPrimitive () { ((CW3DViewDoc *)GetActiveDocument ())->Save_Selected_Primitive (); return ; @@ -3695,7 +3695,7 @@ void CMainFrame::OnKillSceneLight() // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnPrelitMultipass (void) +CMainFrame::OnPrelitMultipass () { if (WW3D::Get_Prelit_Mode () != WW3D::PRELIT_MODE_LIGHTMAP_MULTI_PASS) { @@ -3736,7 +3736,7 @@ CMainFrame::OnUpdatePrelitMultipass (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnPrelitMultitex (void) +CMainFrame::OnPrelitMultitex () { if (WW3D::Get_Prelit_Mode () != WW3D::PRELIT_MODE_LIGHTMAP_MULTI_TEXTURE) { @@ -3777,7 +3777,7 @@ CMainFrame::OnUpdatePrelitMultitex (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnPrelitVertex (void) +CMainFrame::OnPrelitVertex () { if (WW3D::Get_Prelit_Mode () != WW3D::PRELIT_MODE_VERTEX) { @@ -3820,7 +3820,7 @@ CMainFrame::OnUpdatePrelitVertex (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnAddToLineup (void) +CMainFrame::OnAddToLineup () { // Display a dialog that will let the user choose a render object // to add to the current scene. The reason I call it a lineup is @@ -3889,7 +3889,7 @@ void CMainFrame::OnUpdateAddToLineup(CCmdUI* pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnImportFacialAnims (void) +CMainFrame::OnImportFacialAnims () { // // Look up the currently selected hierarchy @@ -3971,7 +3971,7 @@ CMainFrame::OnUpdateImportFacialAnims (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnRestrictAnims (void) +CMainFrame::OnRestrictAnims () { CDataTreeView *data_tree = ::GetCurrentDocument ()->GetDataTreeView (); if (data_tree != nullptr) { @@ -4009,7 +4009,7 @@ CMainFrame::OnUpdateRestrictAnims (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnBindSubobjectLod (void) +CMainFrame::OnBindSubobjectLod () { CW3DViewDoc *doc = (CW3DViewDoc *)GetActiveDocument (); if (doc != nullptr && doc->GetDisplayedObject () != nullptr) { @@ -4056,7 +4056,7 @@ CMainFrame::OnUpdateBindSubobjectLod (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnSetCameraDistance (void) +CMainFrame::OnSetCameraDistance () { CameraDistanceDialogClass dialog (this); dialog.DoModal (); @@ -4070,7 +4070,7 @@ CMainFrame::OnSetCameraDistance (void) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnObjectAlternateMaterials (void) +CMainFrame::OnObjectAlternateMaterials () { ::GetCurrentDocument ()->Toggle_Alternate_Materials (); return ; @@ -4083,7 +4083,7 @@ CMainFrame::OnObjectAlternateMaterials (void) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnCreateSoundObject (void) +CMainFrame::OnCreateSoundObject () { SoundEditDialogClass dialog (this); dialog.DoModal (); @@ -4097,7 +4097,7 @@ CMainFrame::OnCreateSoundObject (void) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnEditSoundObject (void) +CMainFrame::OnEditSoundObject () { // // Get a pointer to the doc object @@ -4143,7 +4143,7 @@ CMainFrame::OnUpdateEditSoundObject (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnExportSoundObj (void) +CMainFrame::OnExportSoundObj () { ((CW3DViewDoc *)GetActiveDocument ())->Save_Selected_Sound_Object (); return ; @@ -4169,7 +4169,7 @@ CMainFrame::OnUpdateExportSoundObj (CCmdUI *pCmdUI) // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnWireframeMode (void) +CMainFrame::OnWireframeMode () { ViewerSceneClass *scene = ::GetCurrentDocument ()->GetScene (); @@ -4456,7 +4456,7 @@ void CMainFrame::OnSetGamma() // ////////////////////////////////////////////////////////////////////////// void -CMainFrame::OnEditAnimatedSoundsOptions (void) +CMainFrame::OnEditAnimatedSoundsOptions () { AnimatedSoundOptionsDialogClass dialog (this); dialog.DoModal (); diff --git a/Core/Tools/W3DView/MainFrm.h b/Core/Tools/W3DView/MainFrm.h index 67652f0a100..e96dfae1e11 100644 --- a/Core/Tools/W3DView/MainFrm.h +++ b/Core/Tools/W3DView/MainFrm.h @@ -251,7 +251,7 @@ class CMainFrame : public CFrameWnd CView *GetPane (int iRow, int iCol) const { return (CView *)m_wndSplitter.GetPane (iRow, iCol); } - void ShowObjectProperties (void); + void ShowObjectProperties (); void OnSelectionChanged (ASSET_TYPE newAssetType); @@ -260,18 +260,18 @@ class CMainFrame : public CFrameWnd void Update_Particle_Count (int particles); void UpdateCameraDistance (float cameraDistance); void UpdateFrameCount (int iCurrentFrame, int iTotalFrames, float frame_rate); - void RestoreOriginalSize (void); + void RestoreOriginalSize (); void Select_Device (bool show_dlg = true); - HMENU Get_Emitters_List_Menu (void) const { return m_hEmittersSubMenu; } - void Update_Emitters_List (void); + HMENU Get_Emitters_List_Menu () const { return m_hEmittersSubMenu; } + void Update_Emitters_List (); protected: ////////////////////////////////////////////////////////////////////// // Protected methods ////////////////////////////////////////////////////////////////////// - void Restore_Window_State (void); + void Restore_Window_State (); private: diff --git a/Core/Tools/W3DView/MeshPropPage.cpp b/Core/Tools/W3DView/MeshPropPage.cpp index fb766ddd8f7..412aef65a2b 100644 --- a/Core/Tools/W3DView/MeshPropPage.cpp +++ b/Core/Tools/W3DView/MeshPropPage.cpp @@ -59,7 +59,7 @@ CMeshPropPage::CMeshPropPage (const CString &stringMeshName) // // ~CMeshPropPage // -CMeshPropPage::~CMeshPropPage (void) +CMeshPropPage::~CMeshPropPage () { return ; } @@ -93,7 +93,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CMeshPropPage::OnInitDialog (void) +CMeshPropPage::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog(); diff --git a/Core/Tools/W3DView/OpacitySettingsDialog.cpp b/Core/Tools/W3DView/OpacitySettingsDialog.cpp index 1d4faed13af..0753b4c7ac3 100644 --- a/Core/Tools/W3DView/OpacitySettingsDialog.cpp +++ b/Core/Tools/W3DView/OpacitySettingsDialog.cpp @@ -88,7 +88,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -OpacitySettingsDialogClass::OnInitDialog (void) +OpacitySettingsDialogClass::OnInitDialog () { CDialog::OnInitDialog(); @@ -112,7 +112,7 @@ OpacitySettingsDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -OpacitySettingsDialogClass::OnOK (void) +OpacitySettingsDialogClass::OnOK () { m_Opacity = m_OpacityBar->Get_Selection_Pos (); CDialog::OnOK (); diff --git a/Core/Tools/W3DView/OpacitySettingsDialog.h b/Core/Tools/W3DView/OpacitySettingsDialog.h index 216eeafdf90..556a708f96c 100644 --- a/Core/Tools/W3DView/OpacitySettingsDialog.h +++ b/Core/Tools/W3DView/OpacitySettingsDialog.h @@ -62,7 +62,7 @@ class OpacitySettingsDialogClass : public CDialog //////////////////////////////////////////////////////////////// // Public methods //////////////////////////////////////////////////////////////// - float Get_Opacity (void) const { return m_Opacity; } + float Get_Opacity () const { return m_Opacity; } private: diff --git a/Core/Tools/W3DView/OpacityVectorDialog.cpp b/Core/Tools/W3DView/OpacityVectorDialog.cpp index 8485ed1dbf1..ee8e7512453 100644 --- a/Core/Tools/W3DView/OpacityVectorDialog.cpp +++ b/Core/Tools/W3DView/OpacityVectorDialog.cpp @@ -86,7 +86,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -OpacityVectorDialogClass::OnInitDialog (void) +OpacityVectorDialogClass::OnInitDialog () { CDialog::OnInitDialog(); @@ -182,7 +182,7 @@ OpacityVectorDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -OpacityVectorDialogClass::OnOK (void) +OpacityVectorDialogClass::OnOK () { m_Value = Update_Value (); CDialog::OnOK (); @@ -196,7 +196,7 @@ OpacityVectorDialogClass::OnOK (void) // ///////////////////////////////////////////////////////////////////////////// void -OpacityVectorDialogClass::Update_Object (void) +OpacityVectorDialogClass::Update_Object () { Update_Object (Update_Value ()); return ; @@ -209,7 +209,7 @@ OpacityVectorDialogClass::Update_Object (void) // ///////////////////////////////////////////////////////////////////////////// AlphaVectorStruct -OpacityVectorDialogClass::Update_Value (void) +OpacityVectorDialogClass::Update_Value () { AlphaVectorStruct value; @@ -279,7 +279,7 @@ OpacityVectorDialogClass::Update_Object (const AlphaVectorStruct &value) // ///////////////////////////////////////////////////////////////////////////// void -OpacityVectorDialogClass::OnCancel (void) +OpacityVectorDialogClass::OnCancel () { Update_Object (m_Value); CDialog::OnCancel (); diff --git a/Core/Tools/W3DView/OpacityVectorDialog.h b/Core/Tools/W3DView/OpacityVectorDialog.h index cb074b87db6..5829f603aab 100644 --- a/Core/Tools/W3DView/OpacityVectorDialog.h +++ b/Core/Tools/W3DView/OpacityVectorDialog.h @@ -71,7 +71,7 @@ class OpacityVectorDialogClass : public CDialog //////////////////////////////////////////////////////////////// void Set_Render_Obj (RenderObjClass *render_obj) { m_RenderObj = render_obj; } void Set_Vector (const AlphaVectorStruct &def_vector) { m_Value = def_vector; } - const AlphaVectorStruct & Get_Vector (void) const { return m_Value; } + const AlphaVectorStruct & Get_Vector () const { return m_Value; } void Set_Key_Index (int index) { m_KeyIndex = index; } private: @@ -80,8 +80,8 @@ class OpacityVectorDialogClass : public CDialog // Protected methods //////////////////////////////////////////////////////////////// void Update_Object (const AlphaVectorStruct &value); - void Update_Object (void); - AlphaVectorStruct Update_Value (void); + void Update_Object (); + AlphaVectorStruct Update_Value (); private: diff --git a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h index 13b95fb09b4..acdd78cbb61 100644 --- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h +++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h @@ -60,7 +60,7 @@ class ParticleBlurTimeKeyDialogClass : public CDialog ///////////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////////// - float Get_Blur_Time (void) const { return m_BlurTime; } + float Get_Blur_Time () const { return m_BlurTime; } private: diff --git a/Core/Tools/W3DView/ParticleFrameKeyDialog.h b/Core/Tools/W3DView/ParticleFrameKeyDialog.h index 6491a749290..b73bed90b76 100644 --- a/Core/Tools/W3DView/ParticleFrameKeyDialog.h +++ b/Core/Tools/W3DView/ParticleFrameKeyDialog.h @@ -60,7 +60,7 @@ class ParticleFrameKeyDialogClass : public CDialog ///////////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////////// - float Get_Frame (void) const { return m_Frame; } + float Get_Frame () const { return m_Frame; } private: diff --git a/Core/Tools/W3DView/ParticleRotationKeyDialog.h b/Core/Tools/W3DView/ParticleRotationKeyDialog.h index 6df2856bec6..d2fa14e3269 100644 --- a/Core/Tools/W3DView/ParticleRotationKeyDialog.h +++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.h @@ -60,7 +60,7 @@ class ParticleRotationKeyDialogClass : public CDialog ///////////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////////// - float Get_Rotation (void) const { return m_Rotation; } + float Get_Rotation () const { return m_Rotation; } private: diff --git a/Core/Tools/W3DView/ParticleSizeDialog.cpp b/Core/Tools/W3DView/ParticleSizeDialog.cpp index 1506093d51f..0b303933570 100644 --- a/Core/Tools/W3DView/ParticleSizeDialog.cpp +++ b/Core/Tools/W3DView/ParticleSizeDialog.cpp @@ -78,7 +78,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -ParticleSizeDialogClass::OnInitDialog (void) +ParticleSizeDialogClass::OnInitDialog () { CDialog::OnInitDialog(); @@ -93,7 +93,7 @@ ParticleSizeDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -ParticleSizeDialogClass::OnOK (void) +ParticleSizeDialogClass::OnOK () { m_Size = GetDlgItemFloat (m_hWnd, IDC_SIZE_EDIT); CDialog::OnOK (); diff --git a/Core/Tools/W3DView/ParticleSizeDialog.h b/Core/Tools/W3DView/ParticleSizeDialog.h index 86c664797c1..8303479c9c7 100644 --- a/Core/Tools/W3DView/ParticleSizeDialog.h +++ b/Core/Tools/W3DView/ParticleSizeDialog.h @@ -60,7 +60,7 @@ class ParticleSizeDialogClass : public CDialog ///////////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////////// - float Get_Size (void) const { return m_Size; } + float Get_Size () const { return m_Size; } private: diff --git a/Core/Tools/W3DView/PlaySoundDialog.cpp b/Core/Tools/W3DView/PlaySoundDialog.cpp index b97ab602238..e0d88a03138 100644 --- a/Core/Tools/W3DView/PlaySoundDialog.cpp +++ b/Core/Tools/W3DView/PlaySoundDialog.cpp @@ -79,7 +79,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// void -PlaySoundDialogClass::OnPlaySoundEffect (void) +PlaySoundDialogClass::OnPlaySoundEffect () { ASSERT (SoundObj != nullptr); if (SoundObj != nullptr) { @@ -97,7 +97,7 @@ PlaySoundDialogClass::OnPlaySoundEffect (void) // ///////////////////////////////////////////////////////////////////////////// void -PlaySoundDialogClass::OnCancel (void) +PlaySoundDialogClass::OnCancel () { SoundObj->Stop (); REF_PTR_RELEASE (SoundObj); @@ -113,7 +113,7 @@ PlaySoundDialogClass::OnCancel (void) // ///////////////////////////////////////////////////////////////////////////// BOOL -PlaySoundDialogClass::OnInitDialog (void) +PlaySoundDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -145,7 +145,7 @@ PlaySoundDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -PlaySoundDialogClass::OnStopSoundEffect (void) +PlaySoundDialogClass::OnStopSoundEffect () { ASSERT (SoundObj != nullptr); if (SoundObj != nullptr) { diff --git a/Core/Tools/W3DView/ResolutionDialog.cpp b/Core/Tools/W3DView/ResolutionDialog.cpp index 05420b607ce..f8ce425d868 100644 --- a/Core/Tools/W3DView/ResolutionDialog.cpp +++ b/Core/Tools/W3DView/ResolutionDialog.cpp @@ -81,7 +81,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -ResolutionDialogClass::OnInitDialog (void) +ResolutionDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -175,7 +175,7 @@ ResolutionDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -ResolutionDialogClass::OnOK (void) +ResolutionDialogClass::OnOK () { CDialog::OnOK (); diff --git a/Core/Tools/W3DView/ResolutionDialog.h b/Core/Tools/W3DView/ResolutionDialog.h index 9882ff5b949..ddb0be63a8f 100644 --- a/Core/Tools/W3DView/ResolutionDialog.h +++ b/Core/Tools/W3DView/ResolutionDialog.h @@ -62,9 +62,9 @@ class ResolutionDialogClass : public CDialog /////////////////////////////////////////////////////////////////// // Public methods /////////////////////////////////////////////////////////////////// - int Get_Width (void); - int Get_Height (void); - int Get_BPP (void); + int Get_Width (); + int Get_Height (); + int Get_BPP (); private: diff --git a/Core/Tools/W3DView/RestrictedFileDialog.cpp b/Core/Tools/W3DView/RestrictedFileDialog.cpp index 7e66b7de446..b712c2b4244 100644 --- a/Core/Tools/W3DView/RestrictedFileDialog.cpp +++ b/Core/Tools/W3DView/RestrictedFileDialog.cpp @@ -57,7 +57,7 @@ END_MESSAGE_MAP() // OnFileNameChange // void -RestrictedFileDialogClass::OnFileNameChange (void) +RestrictedFileDialogClass::OnFileNameChange () { // Force the original filename into the filename control CommDlg_OpenSave_SetControlText (::GetParent (m_hWnd), 0x480, (LPCTSTR)m_ExpectedFilename); @@ -70,7 +70,7 @@ RestrictedFileDialogClass::OnFileNameChange (void) // OnFileNameOK // BOOL -RestrictedFileDialogClass::OnFileNameOK (void) +RestrictedFileDialogClass::OnFileNameOK () { // Force the original filename into the filename control CommDlg_OpenSave_SetControlText (::GetParent (m_hWnd), 0x480, (LPCTSTR)m_ExpectedFilename); @@ -91,7 +91,7 @@ RestrictedFileDialogClass::OnFileNameOK (void) // OnInitDone // void -RestrictedFileDialogClass::OnInitDone (void) +RestrictedFileDialogClass::OnInitDone () { // Disable the controls we don't want the user to change ::EnableWindow (::GetDlgItem (::GetParent (m_hWnd), 0x480), FALSE); diff --git a/Core/Tools/W3DView/RestrictedFileDialog.h b/Core/Tools/W3DView/RestrictedFileDialog.h index 4aaed15232f..949055d76bc 100644 --- a/Core/Tools/W3DView/RestrictedFileDialog.h +++ b/Core/Tools/W3DView/RestrictedFileDialog.h @@ -42,9 +42,9 @@ class RestrictedFileDialogClass : public CFileDialog //}}AFX_MSG DECLARE_MESSAGE_MAP() - virtual void OnFileNameChange (void); - virtual BOOL OnFileNameOK (void); - virtual void OnInitDone (void); + virtual void OnFileNameChange (); + virtual BOOL OnFileNameOK (); + virtual void OnInitDone (); private: CString m_ExpectedFilename; diff --git a/Core/Tools/W3DView/RingColorPropPage.cpp b/Core/Tools/W3DView/RingColorPropPage.cpp index e60863d5473..cc094097573 100644 --- a/Core/Tools/W3DView/RingColorPropPage.cpp +++ b/Core/Tools/W3DView/RingColorPropPage.cpp @@ -62,7 +62,7 @@ RingColorPropPageClass::RingColorPropPageClass (RingRenderObjClass *ring) // ~RingColorPropPageClass // ///////////////////////////////////////////////////////////// -RingColorPropPageClass::~RingColorPropPageClass (void) +RingColorPropPageClass::~RingColorPropPageClass () { return ; } @@ -97,7 +97,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -RingColorPropPageClass::Initialize (void) +RingColorPropPageClass::Initialize () { m_ColorChannel.Reset (); m_OrigColorChannel.Reset (); @@ -133,7 +133,7 @@ RingColorPropPageClass::Initialize (void) // ///////////////////////////////////////////////////////////// BOOL -RingColorPropPageClass::OnInitDialog (void) +RingColorPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -185,7 +185,7 @@ RingColorPropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -RingColorPropPageClass::OnApply (void) +RingColorPropPageClass::OnApply () { // Allow the base class to process this message return CPropertyPage::OnApply (); @@ -198,7 +198,7 @@ RingColorPropPageClass::OnApply (void) // ///////////////////////////////////////////////////////////// void -RingColorPropPageClass::OnDestroy (void) +RingColorPropPageClass::OnDestroy () { CPropertyPage::OnDestroy(); return ; @@ -305,7 +305,7 @@ RingColorPropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -RingColorPropPageClass::OnCancel (void) +RingColorPropPageClass::OnCancel () { // // Reset the object to its original state @@ -324,7 +324,7 @@ RingColorPropPageClass::OnCancel (void) // ///////////////////////////////////////////////////////////// void -RingColorPropPageClass::Update_Opacities (void) +RingColorPropPageClass::Update_Opacities () { m_AlphaChannel.Reset (); @@ -357,7 +357,7 @@ RingColorPropPageClass::Update_Opacities (void) // ///////////////////////////////////////////////////////////// void -RingColorPropPageClass::Update_Colors (void) +RingColorPropPageClass::Update_Colors () { m_ColorChannel.Reset (); diff --git a/Core/Tools/W3DView/RingColorPropPage.h b/Core/Tools/W3DView/RingColorPropPage.h index b39bd6303c2..888c86d7fd8 100644 --- a/Core/Tools/W3DView/RingColorPropPage.h +++ b/Core/Tools/W3DView/RingColorPropPage.h @@ -78,18 +78,18 @@ class RingColorPropPageClass : public CPropertyPage // Inline accessors // - RingRenderObjClass * Get_Ring (void) const { return m_RenderObj; } + RingRenderObjClass * Get_Ring () const { return m_RenderObj; } void Set_Ring (RingRenderObjClass *ring) { m_RenderObj = ring; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } protected: ///////////////////////////////////////////////////////// // Protected methods ///////////////////////////////////////////////////////// - void Initialize (void); - void Update_Colors (void); - void Update_Opacities (void); + void Initialize (); + void Update_Colors (); + void Update_Opacities (); private: diff --git a/Core/Tools/W3DView/RingGeneralPropPage.cpp b/Core/Tools/W3DView/RingGeneralPropPage.cpp index aec2b8bbf42..38638b2a238 100644 --- a/Core/Tools/W3DView/RingGeneralPropPage.cpp +++ b/Core/Tools/W3DView/RingGeneralPropPage.cpp @@ -95,7 +95,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -RingGeneralPropPageClass::Initialize (void) +RingGeneralPropPageClass::Initialize () { if (m_RenderObj != nullptr) { @@ -157,7 +157,7 @@ RingGeneralPropPageClass::Add_Shader_To_Combo // ///////////////////////////////////////////////////////////// BOOL -RingGeneralPropPageClass::OnInitDialog (void) +RingGeneralPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -199,7 +199,7 @@ RingGeneralPropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -RingGeneralPropPageClass::OnApply (void) +RingGeneralPropPageClass::OnApply () { // Get the data from the dialog controls GetDlgItemText (IDC_NAME_EDIT, m_Name); @@ -260,7 +260,7 @@ RingGeneralPropPageClass::OnApply (void) // ///////////////////////////////////////////////////////////// void -RingGeneralPropPageClass::OnBrowseButton (void) +RingGeneralPropPageClass::OnBrowseButton () { CFileDialog dialog ( TRUE, ".tga", @@ -285,7 +285,7 @@ RingGeneralPropPageClass::OnBrowseButton (void) // ///////////////////////////////////////////////////////////// void -RingGeneralPropPageClass::OnChangeFilenameEdit (void) +RingGeneralPropPageClass::OnChangeFilenameEdit () { SetModified (); return ; @@ -298,7 +298,7 @@ RingGeneralPropPageClass::OnChangeFilenameEdit (void) // ///////////////////////////////////////////////////////////// void -RingGeneralPropPageClass::OnChangeNameEdit (void) +RingGeneralPropPageClass::OnChangeNameEdit () { SetModified (); return ; @@ -338,7 +338,7 @@ RingGeneralPropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -RingGeneralPropPageClass::OnChangeLifetimeEdit (void) +RingGeneralPropPageClass::OnChangeLifetimeEdit () { SetModified (); return ; @@ -351,7 +351,7 @@ RingGeneralPropPageClass::OnChangeLifetimeEdit (void) // ///////////////////////////////////////////////////////////// void -RingGeneralPropPageClass::OnSelchangeShaderCombo (void) +RingGeneralPropPageClass::OnSelchangeShaderCombo () { SetModified (); return ; @@ -397,7 +397,7 @@ RingGeneralPropPageClass::OnCommand // ///////////////////////////////////////////////////////////// void -RingGeneralPropPageClass::OnChangeTextureTileEdit (void) +RingGeneralPropPageClass::OnChangeTextureTileEdit () { SetModified (); return ; diff --git a/Core/Tools/W3DView/RingGeneralPropPage.h b/Core/Tools/W3DView/RingGeneralPropPage.h index 4881ed4eebd..98b06041256 100644 --- a/Core/Tools/W3DView/RingGeneralPropPage.h +++ b/Core/Tools/W3DView/RingGeneralPropPage.h @@ -82,21 +82,21 @@ class RingGeneralPropPageClass : public CPropertyPage // // Inline accessors // - RingRenderObjClass * Get_Ring (void) const { return m_RenderObj; } + RingRenderObjClass * Get_Ring () const { return m_RenderObj; } void Set_Ring (RingRenderObjClass *ring) { m_RenderObj = ring; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } - const CString & Get_Name (void) const { return m_Name; } - const CString & Get_Texture_Filename (void) const { return m_TextureFilename; } - float Get_Lifetime (void) const { return m_Lifetime; } - const ShaderClass & Get_Shader (void) const { return m_Shader; } + const CString & Get_Name () const { return m_Name; } + const CString & Get_Texture_Filename () const { return m_TextureFilename; } + float Get_Lifetime () const { return m_Lifetime; } + const ShaderClass & Get_Shader () const { return m_Shader; } protected: ///////////////////////////////////////////////////////// // Protected methods ///////////////////////////////////////////////////////// - void Initialize (void); + void Initialize (); void Add_Shader_To_Combo (ShaderClass &shader, LPCTSTR name); private: diff --git a/Core/Tools/W3DView/RingPropertySheet.cpp b/Core/Tools/W3DView/RingPropertySheet.cpp index 87d9710bf25..35bfd0fa124 100644 --- a/Core/Tools/W3DView/RingPropertySheet.cpp +++ b/Core/Tools/W3DView/RingPropertySheet.cpp @@ -83,7 +83,7 @@ RingPropertySheetClass::RingPropertySheetClass // ~RingPropertySheetClass // ///////////////////////////////////////////////////////////////////////////// -RingPropertySheetClass::~RingPropertySheetClass (void) +RingPropertySheetClass::~RingPropertySheetClass () { REF_PTR_RELEASE (m_RenderObj); return ; @@ -175,7 +175,7 @@ RingPropertySheetClass::WindowProc // ///////////////////////////////////////////////////////////// void -RingPropertySheetClass::Add_Object_To_Viewer (void) +RingPropertySheetClass::Add_Object_To_Viewer () { CW3DViewDoc *doc = ::GetCurrentDocument (); if ((doc != nullptr) && (m_RenderObj != nullptr)) { @@ -224,7 +224,7 @@ RingPropertySheetClass::Add_Object_To_Viewer (void) // ///////////////////////////////////////////////////////////// void -RingPropertySheetClass::Update_Object (void) +RingPropertySheetClass::Update_Object () { Add_Object_To_Viewer (); return ; @@ -237,7 +237,7 @@ RingPropertySheetClass::Update_Object (void) // ///////////////////////////////////////////////////////////// void -RingPropertySheetClass::Initialize (void) +RingPropertySheetClass::Initialize () { if (m_RenderObj == nullptr) { Create_New_Object (); @@ -275,7 +275,7 @@ RingPropertySheetClass::Initialize (void) // ///////////////////////////////////////////////////////////// void -RingPropertySheetClass::Create_New_Object (void) +RingPropertySheetClass::Create_New_Object () { m_RenderObj = new RingRenderObjClass; m_RenderObj->Set_Name ("Ring"); diff --git a/Core/Tools/W3DView/RingPropertySheet.h b/Core/Tools/W3DView/RingPropertySheet.h index 5bef56bf104..1ed8f9c9570 100644 --- a/Core/Tools/W3DView/RingPropertySheet.h +++ b/Core/Tools/W3DView/RingPropertySheet.h @@ -95,11 +95,11 @@ class RingPropertySheetClass : public CPropertySheet ////////////////////////////////////////////////////////////////////// // Protected methods ////////////////////////////////////////////////////////////////////// - void Initialize (void); - RingRenderObjClass * Create_Object (void); - void Update_Object (void); - void Add_Object_To_Viewer (void); - void Create_New_Object (void); + void Initialize (); + RingRenderObjClass * Create_Object (); + void Update_Object (); + void Add_Object_To_Viewer (); + void Create_New_Object (); private: diff --git a/Core/Tools/W3DView/RingSizePropPage.cpp b/Core/Tools/W3DView/RingSizePropPage.cpp index c5d0c322823..8420f89933e 100644 --- a/Core/Tools/W3DView/RingSizePropPage.cpp +++ b/Core/Tools/W3DView/RingSizePropPage.cpp @@ -72,7 +72,7 @@ RingSizePropPageClass::RingSizePropPageClass (RingRenderObjClass *ring) // ~RingSizePropPageClass // ///////////////////////////////////////////////////////////// -RingSizePropPageClass::~RingSizePropPageClass (void) +RingSizePropPageClass::~RingSizePropPageClass () { return ; } @@ -110,7 +110,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -RingSizePropPageClass::Initialize (void) +RingSizePropPageClass::Initialize () { m_InnerScaleChannel.Reset (); m_OrigInnerScaleChannel.Reset (); @@ -148,7 +148,7 @@ RingSizePropPageClass::Initialize (void) // ///////////////////////////////////////////////////////////// BOOL -RingSizePropPageClass::OnInitDialog (void) +RingSizePropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -324,7 +324,7 @@ RingSizePropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -RingSizePropPageClass::OnApply (void) +RingSizePropPageClass::OnApply () { // Allow the base class to process this message return CPropertyPage::OnApply (); @@ -337,7 +337,7 @@ RingSizePropPageClass::OnApply (void) // ///////////////////////////////////////////////////////////// void -RingSizePropPageClass::OnDestroy (void) +RingSizePropPageClass::OnDestroy () { CPropertyPage::OnDestroy(); return ; @@ -515,7 +515,7 @@ RingSizePropPageClass::OnCommand // ///////////////////////////////////////////////////////////// void -RingSizePropPageClass::OnCancel (void) +RingSizePropPageClass::OnCancel () { // // Reset the object to its original state @@ -534,7 +534,7 @@ RingSizePropPageClass::OnCancel (void) // ///////////////////////////////////////////////////////////// void -RingSizePropPageClass::Update_Inner_Scale_Array (void) +RingSizePropPageClass::Update_Inner_Scale_Array () { m_InnerScaleChannel.Reset (); @@ -633,7 +633,7 @@ RingSizePropPageClass::Update_Inner_Scale_Array (void) // ///////////////////////////////////////////////////////////// void -RingSizePropPageClass::Update_Outer_Scale_Array (void) +RingSizePropPageClass::Update_Outer_Scale_Array () { m_OuterScaleChannel.Reset (); diff --git a/Core/Tools/W3DView/RingSizePropPage.h b/Core/Tools/W3DView/RingSizePropPage.h index 384f310c62d..c955006a4c0 100644 --- a/Core/Tools/W3DView/RingSizePropPage.h +++ b/Core/Tools/W3DView/RingSizePropPage.h @@ -81,18 +81,18 @@ class RingSizePropPageClass : public CPropertyPage // Inline accessors // - RingRenderObjClass * Get_Ring (void) const { return m_RenderObj; } + RingRenderObjClass * Get_Ring () const { return m_RenderObj; } void Set_Ring (RingRenderObjClass *ring) { m_RenderObj = ring; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } protected: ///////////////////////////////////////////////////////// // Protected methods ///////////////////////////////////////////////////////// - void Initialize (void); - void Update_Inner_Scale_Array (void); - void Update_Outer_Scale_Array (void); + void Initialize (); + void Update_Inner_Scale_Array (); + void Update_Outer_Scale_Array (); private: diff --git a/Core/Tools/W3DView/SaveSettingsDialog.cpp b/Core/Tools/W3DView/SaveSettingsDialog.cpp index ac4ad7acdec..d0bd24ff1d0 100644 --- a/Core/Tools/W3DView/SaveSettingsDialog.cpp +++ b/Core/Tools/W3DView/SaveSettingsDialog.cpp @@ -77,7 +77,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CSaveSettingsDialog::OnInitDialog (void) +CSaveSettingsDialog::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -97,7 +97,7 @@ CSaveSettingsDialog::OnInitDialog (void) // OnBrowseButton // void -CSaveSettingsDialog::OnBrowseButton (void) +CSaveSettingsDialog::OnBrowseButton () { TCHAR szFileName[MAX_PATH]; ::GetModuleFileName (nullptr, szFileName, sizeof (szFileName)); @@ -135,7 +135,7 @@ CSaveSettingsDialog::OnBrowseButton (void) // OnUpdateFilenameEdit // void -CSaveSettingsDialog::OnUpdateFilenameEdit (void) +CSaveSettingsDialog::OnUpdateFilenameEdit () { // Set the enabled state of the OK button // based on the values of the control @@ -148,7 +148,7 @@ CSaveSettingsDialog::OnUpdateFilenameEdit (void) // OnUpdateFilenameEdit // void -CSaveSettingsDialog::OnOK (void) +CSaveSettingsDialog::OnOK () { // Assume we want to allow the base class to process this message BOOL bAllowDefaultProcessing = TRUE; @@ -227,7 +227,7 @@ CSaveSettingsDialog::OnCommand // FixOKEnableState // void -CSaveSettingsDialog::FixOKEnableState (void) +CSaveSettingsDialog::FixOKEnableState () { // Determine which (if any) checkboxes are checked int iValidSel = 0; diff --git a/Core/Tools/W3DView/SaveSettingsDialog.h b/Core/Tools/W3DView/SaveSettingsDialog.h index 744144a0577..b3d9b8be186 100644 --- a/Core/Tools/W3DView/SaveSettingsDialog.h +++ b/Core/Tools/W3DView/SaveSettingsDialog.h @@ -58,7 +58,7 @@ class CSaveSettingsDialog : public CDialog DECLARE_MESSAGE_MAP() protected: - void FixOKEnableState (void); + void FixOKEnableState (); }; //{{AFX_INSERT_LOCATION}} diff --git a/Core/Tools/W3DView/ScaleDialog.cpp b/Core/Tools/W3DView/ScaleDialog.cpp index 78525e285ba..ffa1546bb66 100644 --- a/Core/Tools/W3DView/ScaleDialog.cpp +++ b/Core/Tools/W3DView/ScaleDialog.cpp @@ -77,7 +77,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -ScaleDialogClass::OnInitDialog (void) +ScaleDialogClass::OnInitDialog () { CDialog::OnInitDialog(); @@ -98,7 +98,7 @@ ScaleDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -ScaleDialogClass::OnOK (void) +ScaleDialogClass::OnOK () { int pos = m_ScaleSpin.GetPos(); if (pos & 0xffff0000) { diff --git a/Core/Tools/W3DView/ScaleDialog.h b/Core/Tools/W3DView/ScaleDialog.h index ad685ffa7b0..9872f26e191 100644 --- a/Core/Tools/W3DView/ScaleDialog.h +++ b/Core/Tools/W3DView/ScaleDialog.h @@ -61,7 +61,7 @@ class ScaleDialogClass : public CDialog ///////////////////////////////////////////////////////////// // Public methods ///////////////////////////////////////////////////////////// - float Get_Scale (void) const { return m_Scale; } + float Get_Scale () const { return m_Scale; } private: diff --git a/Core/Tools/W3DView/SceneLightDialog.cpp b/Core/Tools/W3DView/SceneLightDialog.cpp index b379c0c3550..c6880edcfb0 100644 --- a/Core/Tools/W3DView/SceneLightDialog.cpp +++ b/Core/Tools/W3DView/SceneLightDialog.cpp @@ -93,7 +93,7 @@ END_MESSAGE_MAP() // OnInitDialog // BOOL -CSceneLightDialog::OnInitDialog (void) +CSceneLightDialog::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); @@ -247,7 +247,7 @@ CSceneLightDialog::OnHScroll // OnCancel // void -CSceneLightDialog::OnCancel (void) +CSceneLightDialog::OnCancel () { // Get a pointer to the document so we can change the scene light's // settings and position @@ -361,7 +361,7 @@ CSceneLightDialog::WindowProc // OnGrayscaleCheck // void -CSceneLightDialog::OnGrayscaleCheck (void) +CSceneLightDialog::OnGrayscaleCheck () { if (SendDlgItemMessage (IDC_GRAYSCALE_CHECK, BM_GETCHECK)) { @@ -385,7 +385,7 @@ CSceneLightDialog::OnGrayscaleCheck (void) // OnChannelBothRadio // void -CSceneLightDialog::OnChannelBothRadio (void) +CSceneLightDialog::OnChannelBothRadio () { m_CurrentChannel = BOTH; return ; @@ -397,7 +397,7 @@ CSceneLightDialog::OnChannelBothRadio (void) // OnChannelDiffuseRadio // void -CSceneLightDialog::OnChannelDiffuseRadio (void) +CSceneLightDialog::OnChannelDiffuseRadio () { // Reset the UI to reflect the current diffuse color Vector3 color; @@ -413,7 +413,7 @@ CSceneLightDialog::OnChannelDiffuseRadio (void) // OnChannelSpecularRadio // void -CSceneLightDialog::OnChannelSpecularRadio (void) +CSceneLightDialog::OnChannelSpecularRadio () { // Reset the UI to reflect the current specular color Vector3 color; @@ -479,7 +479,7 @@ CSceneLightDialog::Set_Color_Control_State (const Vector3 &color) // Update_Attenuation // void -CSceneLightDialog::Update_Attenuation (void) +CSceneLightDialog::Update_Attenuation () { // Get a pointer to the document so we can change the scene light's // settings @@ -533,7 +533,7 @@ CSceneLightDialog::Update_Distance (float distance) // Update_Attenuation_Controls // void -CSceneLightDialog::Update_Attenuation_Controls (void) +CSceneLightDialog::Update_Attenuation_Controls () { // Enable or disable the attenuation controls based on the group's checkstate BOOL enable = (SendDlgItemMessage (IDC_ATTENUATION_CHECK, BM_GETCHECK) == 1); @@ -550,7 +550,7 @@ CSceneLightDialog::Update_Attenuation_Controls (void) // OnAttenuationCheck // void -CSceneLightDialog::OnAttenuationCheck (void) +CSceneLightDialog::OnAttenuationCheck () { // Update the scene light to reflect the new setting bool enable = (SendDlgItemMessage (IDC_ATTENUATION_CHECK, BM_GETCHECK) == 1); diff --git a/Core/Tools/W3DView/SceneLightDialog.h b/Core/Tools/W3DView/SceneLightDialog.h index 5f36ee64d4a..c10dc4d535f 100644 --- a/Core/Tools/W3DView/SceneLightDialog.h +++ b/Core/Tools/W3DView/SceneLightDialog.h @@ -80,8 +80,8 @@ class CSceneLightDialog : public CDialog void Set_Color_Control_State (const Vector3 &color); void Update_Light (const Vector3 &color); void Update_Distance (float distance); - void Update_Attenuation (void); - void Update_Attenuation_Controls (void); + void Update_Attenuation (); + void Update_Attenuation_Controls (); private: diff --git a/Core/Tools/W3DView/ScreenCursor.cpp b/Core/Tools/W3DView/ScreenCursor.cpp index ac8323e67bd..f8c722ead82 100644 --- a/Core/Tools/W3DView/ScreenCursor.cpp +++ b/Core/Tools/W3DView/ScreenCursor.cpp @@ -51,7 +51,7 @@ // ScreenCursorClass // /////////////////////////////////////////////////////////////////// -ScreenCursorClass::ScreenCursorClass (void) +ScreenCursorClass::ScreenCursorClass () : m_ScreenPos (0, 0), m_pTexture (nullptr), m_pVertMaterial (nullptr), @@ -88,7 +88,7 @@ ScreenCursorClass::ScreenCursorClass (const ScreenCursorClass &src) // ~ScreenCursorClass // /////////////////////////////////////////////////////////////////// -ScreenCursorClass::~ScreenCursorClass (void) +ScreenCursorClass::~ScreenCursorClass () { REF_PTR_RELEASE (m_pTexture); REF_PTR_RELEASE (m_pVertMaterial); @@ -102,7 +102,7 @@ ScreenCursorClass::~ScreenCursorClass (void) // /////////////////////////////////////////////////////////////////// void -ScreenCursorClass::Initialize (void) +ScreenCursorClass::Initialize () { REF_PTR_RELEASE(m_pVertMaterial); @@ -171,7 +171,7 @@ ScreenCursorClass::Set_Texture (TextureClass *texture) // /////////////////////////////////////////////////////////////////// void -ScreenCursorClass::On_Frame_Update (void) +ScreenCursorClass::On_Frame_Update () { // // Get the current cursor position in screen coords diff --git a/Core/Tools/W3DView/ScreenCursor.h b/Core/Tools/W3DView/ScreenCursor.h index 3227d2ddd9a..3ffacdda703 100644 --- a/Core/Tools/W3DView/ScreenCursor.h +++ b/Core/Tools/W3DView/ScreenCursor.h @@ -51,9 +51,9 @@ class ScreenCursorClass : public RenderObjClass //////////////////////////////////////////////////////////////////////// // Public constructors/destructors //////////////////////////////////////////////////////////////////////// - ScreenCursorClass (void); + ScreenCursorClass (); ScreenCursorClass (const ScreenCursorClass &src); - virtual ~ScreenCursorClass (void); + virtual ~ScreenCursorClass (); //////////////////////////////////////////////////////////////////////// // Public operators @@ -69,10 +69,10 @@ class ScreenCursorClass : public RenderObjClass //////////////////////////////////////////////////////////////////////// // Base class overrides //////////////////////////////////////////////////////////////////////// - RenderObjClass * Clone (void) const { return new ScreenCursorClass (*this); } - virtual int Class_ID(void) const { return CLASSID_LAST + 103L; } + RenderObjClass * Clone () const { return new ScreenCursorClass (*this); } + virtual int Class_ID() const { return CLASSID_LAST + 103L; } virtual void Render (RenderInfoClass &rinfo); - virtual void On_Frame_Update (void); + virtual void On_Frame_Update (); virtual void Get_Obj_Space_Bounding_Sphere(SphereClass & sphere) const; virtual void Get_Obj_Space_Bounding_Box(AABoxClass & box) const; @@ -84,7 +84,7 @@ class ScreenCursorClass : public RenderObjClass //////////////////////////////////////////////////////////////////////// // Protected methods //////////////////////////////////////////////////////////////////////// - void Initialize (void); + void Initialize (); private: diff --git a/Core/Tools/W3DView/SoundEditDialog.cpp b/Core/Tools/W3DView/SoundEditDialog.cpp index 43af96e09b7..0d4bde1f768 100644 --- a/Core/Tools/W3DView/SoundEditDialog.cpp +++ b/Core/Tools/W3DView/SoundEditDialog.cpp @@ -73,7 +73,7 @@ SoundEditDialogClass::SoundEditDialogClass (CWnd *parent) // ~SoundEditDialogClass // ///////////////////////////////////////////////////////////////////////////// -SoundEditDialogClass::~SoundEditDialogClass (void) +SoundEditDialogClass::~SoundEditDialogClass () { REF_PTR_RELEASE (SoundRObj); return; @@ -132,7 +132,7 @@ void SoundEditDialogClass::Dump(CDumpContext& dc) const // ///////////////////////////////////////////////////////////////////////////// BOOL -SoundEditDialogClass::OnInitDialog (void) +SoundEditDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -223,7 +223,7 @@ SoundEditDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -SoundEditDialogClass::OnOK (void) +SoundEditDialogClass::OnOK () { CString name; GetDlgItemText (IDC_NAME_EDIT, name); @@ -307,7 +307,7 @@ SoundEditDialogClass::OnOK (void) // ///////////////////////////////////////////////////////////////////////////// AudibleSoundClass * -SoundEditDialogClass::Create_Sound_Object (void) +SoundEditDialogClass::Create_Sound_Object () { AudibleSoundClass *sound = nullptr; @@ -380,7 +380,7 @@ SoundEditDialogClass::Create_Sound_Object (void) // ///////////////////////////////////////////////////////////////////////////// void -SoundEditDialogClass::OnBrowse (void) +SoundEditDialogClass::OnBrowse () { // // Determine what filename and path to initially display in the dialog @@ -424,7 +424,7 @@ SoundEditDialogClass::OnBrowse (void) // ///////////////////////////////////////////////////////////////////////////// void -SoundEditDialogClass::On2DRadio (void) +SoundEditDialogClass::On2DRadio () { Update_Enable_State (); return ; @@ -437,7 +437,7 @@ SoundEditDialogClass::On2DRadio (void) // ///////////////////////////////////////////////////////////////////////////// void -SoundEditDialogClass::On3DRadio (void) +SoundEditDialogClass::On3DRadio () { Update_Enable_State (); return ; @@ -450,7 +450,7 @@ SoundEditDialogClass::On3DRadio (void) // ///////////////////////////////////////////////////////////////////////////// void -SoundEditDialogClass::Update_Enable_State (void) +SoundEditDialogClass::Update_Enable_State () { bool enable_3d = (SendDlgItemMessage (IDC_3D_RADIO, BM_GETCHECK) == 1); @@ -467,7 +467,7 @@ SoundEditDialogClass::Update_Enable_State (void) // ///////////////////////////////////////////////////////////////////////////// void -SoundEditDialogClass::OnPlay (void) +SoundEditDialogClass::OnPlay () { // // Get the current filename @@ -490,7 +490,7 @@ SoundEditDialogClass::OnPlay (void) // ///////////////////////////////////////////////////////////////////////////// void -SoundEditDialogClass::OnCancel (void) +SoundEditDialogClass::OnCancel () { CDialog::OnCancel (); return ; diff --git a/Core/Tools/W3DView/SoundEditDialog.h b/Core/Tools/W3DView/SoundEditDialog.h index 4540570a503..c91f66d403d 100644 --- a/Core/Tools/W3DView/SoundEditDialog.h +++ b/Core/Tools/W3DView/SoundEditDialog.h @@ -37,7 +37,7 @@ class SoundEditDialogClass : public CDialog { public: SoundEditDialogClass (CWnd *parent); - virtual ~SoundEditDialogClass (void); + virtual ~SoundEditDialogClass (); // Form Data public: @@ -85,15 +85,15 @@ class SoundEditDialogClass : public CDialog // Public methods /////////////////////////////////////////////////////// void Set_Sound (SoundRenderObjClass *sound) { REF_PTR_SET (SoundRObj, sound); } - SoundRenderObjClass * Get_Sound (void) const { if (SoundRObj != nullptr) SoundRObj->Add_Ref (); return SoundRObj; } + SoundRenderObjClass * Get_Sound () const { if (SoundRObj != nullptr) SoundRObj->Add_Ref (); return SoundRObj; } protected: /////////////////////////////////////////////////////// // Protected methods /////////////////////////////////////////////////////// - void Update_Enable_State (void); - AudibleSoundClass * Create_Sound_Object (void); + void Update_Enable_State (); + AudibleSoundClass * Create_Sound_Object (); private: diff --git a/Core/Tools/W3DView/SphereColorPropPage.cpp b/Core/Tools/W3DView/SphereColorPropPage.cpp index 491648db456..fce8a0b7fe8 100644 --- a/Core/Tools/W3DView/SphereColorPropPage.cpp +++ b/Core/Tools/W3DView/SphereColorPropPage.cpp @@ -64,7 +64,7 @@ SphereColorPropPageClass::SphereColorPropPageClass (SphereRenderObjClass *sphere // ~SphereColorPropPageClass // ///////////////////////////////////////////////////////////// -SphereColorPropPageClass::~SphereColorPropPageClass (void) +SphereColorPropPageClass::~SphereColorPropPageClass () { return ; } @@ -101,7 +101,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::Initialize (void) +SphereColorPropPageClass::Initialize () { m_ColorChannel.Reset (); m_OrigColorChannel.Reset (); @@ -150,7 +150,7 @@ SphereColorPropPageClass::Initialize (void) // ///////////////////////////////////////////////////////////// BOOL -SphereColorPropPageClass::OnInitDialog (void) +SphereColorPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -226,7 +226,7 @@ SphereColorPropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -SphereColorPropPageClass::OnApply (void) +SphereColorPropPageClass::OnApply () { // Allow the base class to process this message return CPropertyPage::OnApply (); @@ -239,7 +239,7 @@ SphereColorPropPageClass::OnApply (void) // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::OnDestroy (void) +SphereColorPropPageClass::OnDestroy () { // // Free the alpha vectors associated with the keys... @@ -436,7 +436,7 @@ SphereColorPropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::OnCancel (void) +SphereColorPropPageClass::OnCancel () { // // Reset the object to its original state @@ -459,7 +459,7 @@ SphereColorPropPageClass::OnCancel (void) // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::Update_Opacities (void) +SphereColorPropPageClass::Update_Opacities () { m_AlphaChannel.Reset (); @@ -492,7 +492,7 @@ SphereColorPropPageClass::Update_Opacities (void) // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::Update_Colors (void) +SphereColorPropPageClass::Update_Colors () { m_ColorChannel.Reset (); @@ -525,7 +525,7 @@ SphereColorPropPageClass::Update_Colors (void) // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::Update_Vectors (void) +SphereColorPropPageClass::Update_Vectors () { m_VectorChannel.Reset (); @@ -562,7 +562,7 @@ SphereColorPropPageClass::Update_Vectors (void) // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::OnOpacityVectorCheck (void) +SphereColorPropPageClass::OnOpacityVectorCheck () { bool is_checked = (IsDlgButtonChecked (IDC_OPACITY_VECTOR_CHECK) == 1); @@ -586,7 +586,7 @@ SphereColorPropPageClass::OnOpacityVectorCheck (void) // ///////////////////////////////////////////////////////////// void -SphereColorPropPageClass::OnInvertVectorCheck (void) +SphereColorPropPageClass::OnInvertVectorCheck () { bool is_checked = (IsDlgButtonChecked (IDC_INVERT_VECTOR_CHECK) == 1); diff --git a/Core/Tools/W3DView/SphereColorPropPage.h b/Core/Tools/W3DView/SphereColorPropPage.h index aaf4b803f20..9e94ba12813 100644 --- a/Core/Tools/W3DView/SphereColorPropPage.h +++ b/Core/Tools/W3DView/SphereColorPropPage.h @@ -80,20 +80,20 @@ class SphereColorPropPageClass : public CPropertyPage // Inline accessors // - SphereRenderObjClass * Get_Sphere (void) const { return m_RenderObj; } + SphereRenderObjClass * Get_Sphere () const { return m_RenderObj; } void Set_Sphere (SphereRenderObjClass *sphere) { m_RenderObj = sphere; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } protected: ///////////////////////////////////////////////////////// // Protected methods ///////////////////////////////////////////////////////// - void Initialize (void); - void Update_Colors (void); - void Update_Opacities (void); - void Update_Vectors (void); - void Update_Vector_Bar_Enabled_Status (void); + void Initialize (); + void Update_Colors (); + void Update_Opacities (); + void Update_Vectors (); + void Update_Vector_Bar_Enabled_Status (); private: diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.cpp b/Core/Tools/W3DView/SphereGeneralPropPage.cpp index 0b0698c3f92..54625b66691 100644 --- a/Core/Tools/W3DView/SphereGeneralPropPage.cpp +++ b/Core/Tools/W3DView/SphereGeneralPropPage.cpp @@ -93,7 +93,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -SphereGeneralPropPageClass::Initialize (void) +SphereGeneralPropPageClass::Initialize () { if (m_RenderObj != nullptr) { @@ -155,7 +155,7 @@ SphereGeneralPropPageClass::Add_Shader_To_Combo // ///////////////////////////////////////////////////////////// BOOL -SphereGeneralPropPageClass::OnInitDialog (void) +SphereGeneralPropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -191,7 +191,7 @@ SphereGeneralPropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -SphereGeneralPropPageClass::OnApply (void) +SphereGeneralPropPageClass::OnApply () { // Get the data from the dialog controls GetDlgItemText (IDC_NAME_EDIT, m_Name); @@ -251,7 +251,7 @@ SphereGeneralPropPageClass::OnApply (void) // ///////////////////////////////////////////////////////////// void -SphereGeneralPropPageClass::OnBrowseButton (void) +SphereGeneralPropPageClass::OnBrowseButton () { CFileDialog dialog ( TRUE, ".tga", @@ -276,7 +276,7 @@ SphereGeneralPropPageClass::OnBrowseButton (void) // ///////////////////////////////////////////////////////////// void -SphereGeneralPropPageClass::OnChangeFilenameEdit (void) +SphereGeneralPropPageClass::OnChangeFilenameEdit () { SetModified (); return ; @@ -289,7 +289,7 @@ SphereGeneralPropPageClass::OnChangeFilenameEdit (void) // ///////////////////////////////////////////////////////////// void -SphereGeneralPropPageClass::OnChangeNameEdit (void) +SphereGeneralPropPageClass::OnChangeNameEdit () { SetModified (); return ; @@ -329,7 +329,7 @@ SphereGeneralPropPageClass::OnNotify // ///////////////////////////////////////////////////////////// void -SphereGeneralPropPageClass::OnChangeLifetimeEdit (void) +SphereGeneralPropPageClass::OnChangeLifetimeEdit () { SetModified (); return ; @@ -342,7 +342,7 @@ SphereGeneralPropPageClass::OnChangeLifetimeEdit (void) // ///////////////////////////////////////////////////////////// void -SphereGeneralPropPageClass::OnSelchangeShaderCombo (void) +SphereGeneralPropPageClass::OnSelchangeShaderCombo () { SetModified (); return ; diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.h b/Core/Tools/W3DView/SphereGeneralPropPage.h index a4210a7d5fe..cf9fcbb8bc5 100644 --- a/Core/Tools/W3DView/SphereGeneralPropPage.h +++ b/Core/Tools/W3DView/SphereGeneralPropPage.h @@ -80,21 +80,21 @@ class SphereGeneralPropPageClass : public CPropertyPage // // Inline accessors // - SphereRenderObjClass * Get_Sphere (void) const { return m_RenderObj; } + SphereRenderObjClass * Get_Sphere () const { return m_RenderObj; } void Set_Sphere (SphereRenderObjClass *sphere) { m_RenderObj = sphere; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } - const CString & Get_Name (void) const { return m_Name; } - const CString & Get_Texture_Filename (void) const { return m_TextureFilename; } - float Get_Lifetime (void) const { return m_Lifetime; } - const ShaderClass & Get_Shader (void) const { return m_Shader; } + const CString & Get_Name () const { return m_Name; } + const CString & Get_Texture_Filename () const { return m_TextureFilename; } + float Get_Lifetime () const { return m_Lifetime; } + const ShaderClass & Get_Shader () const { return m_Shader; } protected: ///////////////////////////////////////////////////////// // Protected methods ///////////////////////////////////////////////////////// - void Initialize (void); + void Initialize (); void Add_Shader_To_Combo (ShaderClass &shader, LPCTSTR name); private: diff --git a/Core/Tools/W3DView/SpherePropertySheet.cpp b/Core/Tools/W3DView/SpherePropertySheet.cpp index 28a4433dd94..acc05296ed2 100644 --- a/Core/Tools/W3DView/SpherePropertySheet.cpp +++ b/Core/Tools/W3DView/SpherePropertySheet.cpp @@ -83,7 +83,7 @@ SpherePropertySheetClass::SpherePropertySheetClass // ~SpherePropertySheetClass // ///////////////////////////////////////////////////////////////////////////// -SpherePropertySheetClass::~SpherePropertySheetClass (void) +SpherePropertySheetClass::~SpherePropertySheetClass () { REF_PTR_RELEASE (m_RenderObj); return ; @@ -175,7 +175,7 @@ SpherePropertySheetClass::WindowProc // ///////////////////////////////////////////////////////////// void -SpherePropertySheetClass::Add_Object_To_Viewer (void) +SpherePropertySheetClass::Add_Object_To_Viewer () { CW3DViewDoc *doc = ::GetCurrentDocument (); if ((doc != nullptr) && (m_RenderObj != nullptr)) { @@ -224,7 +224,7 @@ SpherePropertySheetClass::Add_Object_To_Viewer (void) // ///////////////////////////////////////////////////////////// void -SpherePropertySheetClass::Update_Object (void) +SpherePropertySheetClass::Update_Object () { Add_Object_To_Viewer (); return ; @@ -237,7 +237,7 @@ SpherePropertySheetClass::Update_Object (void) // ///////////////////////////////////////////////////////////// void -SpherePropertySheetClass::Initialize (void) +SpherePropertySheetClass::Initialize () { if (m_RenderObj == nullptr) { Create_New_Object (); @@ -275,7 +275,7 @@ SpherePropertySheetClass::Initialize (void) // ///////////////////////////////////////////////////////////// void -SpherePropertySheetClass::Create_New_Object (void) +SpherePropertySheetClass::Create_New_Object () { m_RenderObj = new SphereRenderObjClass; m_RenderObj->Set_Name ("Sphere"); diff --git a/Core/Tools/W3DView/SpherePropertySheet.h b/Core/Tools/W3DView/SpherePropertySheet.h index ce769f79074..b04e35d87af 100644 --- a/Core/Tools/W3DView/SpherePropertySheet.h +++ b/Core/Tools/W3DView/SpherePropertySheet.h @@ -95,11 +95,11 @@ class SpherePropertySheetClass : public CPropertySheet ////////////////////////////////////////////////////////////////////// // Protected methods ////////////////////////////////////////////////////////////////////// - void Initialize (void); - SphereRenderObjClass * Create_Object (void); - void Update_Object (void); - void Add_Object_To_Viewer (void); - void Create_New_Object (void); + void Initialize (); + SphereRenderObjClass * Create_Object (); + void Update_Object (); + void Add_Object_To_Viewer (); + void Create_New_Object (); private: diff --git a/Core/Tools/W3DView/SphereSizePropPage.cpp b/Core/Tools/W3DView/SphereSizePropPage.cpp index 1372a20b63e..5ff59b86e7c 100644 --- a/Core/Tools/W3DView/SphereSizePropPage.cpp +++ b/Core/Tools/W3DView/SphereSizePropPage.cpp @@ -70,7 +70,7 @@ SphereSizePropPageClass::SphereSizePropPageClass (SphereRenderObjClass *sphere) // ~SphereSizePropPageClass // ///////////////////////////////////////////////////////////// -SphereSizePropPageClass::~SphereSizePropPageClass (void) +SphereSizePropPageClass::~SphereSizePropPageClass () { return ; } @@ -107,7 +107,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////// void -SphereSizePropPageClass::Initialize (void) +SphereSizePropPageClass::Initialize () { m_ScaleChannel.Reset (); m_OrigScaleChannel.Reset (); @@ -133,7 +133,7 @@ SphereSizePropPageClass::Initialize (void) // ///////////////////////////////////////////////////////////// BOOL -SphereSizePropPageClass::OnInitDialog (void) +SphereSizePropPageClass::OnInitDialog () { // Allow the base class to process this message CPropertyPage::OnInitDialog (); @@ -259,7 +259,7 @@ SphereSizePropPageClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////// BOOL -SphereSizePropPageClass::OnApply (void) +SphereSizePropPageClass::OnApply () { // Allow the base class to process this message return CPropertyPage::OnApply (); @@ -272,7 +272,7 @@ SphereSizePropPageClass::OnApply (void) // ///////////////////////////////////////////////////////////// void -SphereSizePropPageClass::OnDestroy (void) +SphereSizePropPageClass::OnDestroy () { CPropertyPage::OnDestroy(); return ; @@ -410,7 +410,7 @@ SphereSizePropPageClass::OnCommand // ///////////////////////////////////////////////////////////// void -SphereSizePropPageClass::OnCancel (void) +SphereSizePropPageClass::OnCancel () { // // Reset the object to its original state @@ -428,7 +428,7 @@ SphereSizePropPageClass::OnCancel (void) // ///////////////////////////////////////////////////////////// void -SphereSizePropPageClass::Update_Scale_Array (void) +SphereSizePropPageClass::Update_Scale_Array () { m_ScaleChannel.Reset (); diff --git a/Core/Tools/W3DView/SphereSizePropPage.h b/Core/Tools/W3DView/SphereSizePropPage.h index 5d7e859b087..23f7a977bac 100644 --- a/Core/Tools/W3DView/SphereSizePropPage.h +++ b/Core/Tools/W3DView/SphereSizePropPage.h @@ -80,17 +80,17 @@ class SphereSizePropPageClass : public CPropertyPage // Inline accessors // - SphereRenderObjClass * Get_Sphere (void) const { return m_RenderObj; } + SphereRenderObjClass * Get_Sphere () const { return m_RenderObj; } void Set_Sphere (SphereRenderObjClass *sphere) { m_RenderObj = sphere; Initialize (); } - bool Is_Data_Valid (void) const { return m_bValid; } + bool Is_Data_Valid () const { return m_bValid; } protected: ///////////////////////////////////////////////////////// // Protected methods ///////////////////////////////////////////////////////// - void Initialize (void); - void Update_Scale_Array (void); + void Initialize (); + void Update_Scale_Array (); private: diff --git a/Core/Tools/W3DView/TexturePathDialog.cpp b/Core/Tools/W3DView/TexturePathDialog.cpp index d0d5a50d75c..20cff61338b 100644 --- a/Core/Tools/W3DView/TexturePathDialog.cpp +++ b/Core/Tools/W3DView/TexturePathDialog.cpp @@ -78,7 +78,7 @@ END_MESSAGE_MAP() // ///////////////////////////////////////////////////////////////////////////// BOOL -TexturePathDialogClass::OnInitDialog (void) +TexturePathDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -96,7 +96,7 @@ TexturePathDialogClass::OnInitDialog (void) // ///////////////////////////////////////////////////////////////////////////// void -TexturePathDialogClass::OnOK (void) +TexturePathDialogClass::OnOK () { CString path1; CString path2; @@ -118,7 +118,7 @@ TexturePathDialogClass::OnOK (void) // ///////////////////////////////////////////////////////////////////////////// void -TexturePathDialogClass::OnBrowse1 (void) +TexturePathDialogClass::OnBrowse1 () { CString initial_path; GetDlgItemText (IDC_PATH1, initial_path); @@ -138,7 +138,7 @@ TexturePathDialogClass::OnBrowse1 (void) // ///////////////////////////////////////////////////////////////////////////// void -TexturePathDialogClass::OnBrowse2 (void) +TexturePathDialogClass::OnBrowse2 () { CString initial_path; GetDlgItemText (IDC_PATH2, initial_path); diff --git a/Core/Tools/W3DView/Toolbar.cpp b/Core/Tools/W3DView/Toolbar.cpp index 7780f0233c6..757c1b93f5b 100644 --- a/Core/Tools/W3DView/Toolbar.cpp +++ b/Core/Tools/W3DView/Toolbar.cpp @@ -48,7 +48,7 @@ const TCHAR * const TOOLBAR_CLASS_NAME = TEXT ("FANCYTOOLBAR"); // // CFancyToolbar // -CFancyToolbar::CFancyToolbar (void) +CFancyToolbar::CFancyToolbar () : m_iButtons (0), m_iCurrentButton (-1) { @@ -63,7 +63,7 @@ CFancyToolbar::CFancyToolbar (void) // // ~CFancyToolbar // -CFancyToolbar::~CFancyToolbar (void) +CFancyToolbar::~CFancyToolbar () { for (int iButton = 0; iButton < m_iButtons; iButton ++) { @@ -90,7 +90,7 @@ CFancyToolbar::~CFancyToolbar (void) // RegisterFancyToolbarClass // void -CFancyToolbar::RegisterFancyToolbarClass (void) +CFancyToolbar::RegisterFancyToolbarClass () { // Is this class already registered? WNDCLASS classInfo = { 0 }; @@ -215,7 +215,7 @@ CFancyToolbar::AddButton // Paint // void -CFancyToolbar::Paint (void) +CFancyToolbar::Paint () { // Get the window's DC HDC hDC = ::GetDC (m_hWnd); diff --git a/Core/Tools/W3DView/Toolbar.h b/Core/Tools/W3DView/Toolbar.h index 527c2a1537b..ad0ce864d21 100644 --- a/Core/Tools/W3DView/Toolbar.h +++ b/Core/Tools/W3DView/Toolbar.h @@ -119,10 +119,10 @@ class CFancyToolbar : public CControlBar // // Protected Methods // - void Paint (void); + void Paint (); void DrawButton (HDC hDC, int iXPos, int iYPos, HBITMAP hBMP); int ButtonFromPoint (const CPoint &point); - void RegisterFancyToolbarClass (void); + void RegisterFancyToolbarClass (); //{{AFX_MSG(CFancyToolbar) afx_msg void OnPaint(); diff --git a/Core/Tools/W3DView/Utils.cpp b/Core/Tools/W3DView/Utils.cpp index b665f1c73db..c1b533b4f5b 100644 --- a/Core/Tools/W3DView/Utils.cpp +++ b/Core/Tools/W3DView/Utils.cpp @@ -43,7 +43,7 @@ // //////////////////////////////////////////////////////////////////////////// CW3DViewDoc * -GetCurrentDocument (void) +GetCurrentDocument () { // Assume failure CW3DViewDoc *pCDoc = nullptr; @@ -701,7 +701,7 @@ Get_File_Time // Are_Glide_Drivers_Acceptable // bool -Are_Glide_Drivers_Acceptable (void) +Are_Glide_Drivers_Acceptable () { // Assume success bool retval = true; @@ -865,7 +865,7 @@ Copy_File // //////////////////////////////////////////////////////////////////////////// CGraphicView * -Get_Graphic_View (void) +Get_Graphic_View () { CGraphicView *view = nullptr; diff --git a/Core/Tools/W3DView/Utils.h b/Core/Tools/W3DView/Utils.h index 9d2b940466c..8029788c431 100644 --- a/Core/Tools/W3DView/Utils.h +++ b/Core/Tools/W3DView/Utils.h @@ -86,8 +86,8 @@ class CGraphicView; // // Prototypes // -class CW3DViewDoc * GetCurrentDocument (void); -CGraphicView * Get_Graphic_View (void); +class CW3DViewDoc * GetCurrentDocument (); +CGraphicView * Get_Graphic_View (); void Paint_Gradient (HWND hWnd, BYTE baseRed, BYTE baseGreen, BYTE baseBlue); void CenterDialogAroundTreeView (HWND hDlg); @@ -115,7 +115,7 @@ CString Filename_From_Asset_Name (LPCTSTR asset_name); // File routines // bool Get_File_Time (LPCTSTR path, LPFILETIME pcreation_time, LPFILETIME paccess_time = nullptr, LPFILETIME pwrite_time = nullptr); -bool Are_Glide_Drivers_Acceptable (void); +bool Are_Glide_Drivers_Acceptable (); bool Copy_File (LPCTSTR existing_filename, LPCTSTR new_filename, bool bforce_copy = false); // diff --git a/Core/Tools/W3DView/ViewerAssetMgr.cpp b/Core/Tools/W3DView/ViewerAssetMgr.cpp index b42bc73017e..2d863ba02a2 100644 --- a/Core/Tools/W3DView/ViewerAssetMgr.cpp +++ b/Core/Tools/W3DView/ViewerAssetMgr.cpp @@ -112,7 +112,7 @@ ViewerAssetMgrClass::Open_Texture_File_Cache (const char * /*prefix*/) // //////////////////////////////////////////////////////////////////////// void -ViewerAssetMgrClass::Close_Texture_File_Cache (void) +ViewerAssetMgrClass::Close_Texture_File_Cache () { return ; } diff --git a/Core/Tools/W3DView/ViewerAssetMgr.h b/Core/Tools/W3DView/ViewerAssetMgr.h index 3025ccbfbe8..e2aae9c9675 100644 --- a/Core/Tools/W3DView/ViewerAssetMgr.h +++ b/Core/Tools/W3DView/ViewerAssetMgr.h @@ -51,8 +51,8 @@ class ViewerAssetMgrClass : public WW3DAssetManager /////////////////////////////////////////////////// // Public constructors/destructors /////////////////////////////////////////////////// - ViewerAssetMgrClass (void) {} - virtual ~ViewerAssetMgrClass (void) {} + ViewerAssetMgrClass () {} + virtual ~ViewerAssetMgrClass () {} /////////////////////////////////////////////////// // Public methods @@ -67,8 +67,8 @@ class ViewerAssetMgrClass : public WW3DAssetManager // // Missing texture methods // - void Start_Tracking_Textures (void) { m_MissingTextureList.Delete_All (); } - DynamicVectorClass & Get_Missing_Texture_List (void) { return m_MissingTextureList; } + void Start_Tracking_Textures () { m_MissingTextureList.Delete_All (); } + DynamicVectorClass & Get_Missing_Texture_List () { return m_MissingTextureList; } // // Texture caching overrides diff --git a/Core/Tools/W3DView/ViewerScene.cpp b/Core/Tools/W3DView/ViewerScene.cpp index 549934c81c0..bbd81350775 100644 --- a/Core/Tools/W3DView/ViewerScene.cpp +++ b/Core/Tools/W3DView/ViewerScene.cpp @@ -53,10 +53,10 @@ class ViewerSceneIterator : public SceneIterator { public: - virtual void First(void); - virtual void Next(void); - virtual bool Is_Done(void); - virtual RenderObjClass * Current_Item(void); + virtual void First(); + virtual void Next(); + virtual bool Is_Done(); + virtual RenderObjClass * Current_Item(); protected: @@ -72,22 +72,22 @@ ViewerSceneIterator::ViewerSceneIterator(RefRenderObjListClass *list) { } -void ViewerSceneIterator::First(void) +void ViewerSceneIterator::First() { RobjIterator.First(); } -void ViewerSceneIterator::Next(void) +void ViewerSceneIterator::Next() { RobjIterator.Next(); } -bool ViewerSceneIterator::Is_Done(void) +bool ViewerSceneIterator::Is_Done() { return RobjIterator.Is_Done(); } -RenderObjClass * ViewerSceneIterator::Current_Item(void) +RenderObjClass * ViewerSceneIterator::Current_Item() { return RobjIterator.Peek_Obj(); } @@ -212,7 +212,7 @@ ViewerSceneClass::Add_To_Lineup (RenderObjClass *obj) } void -ViewerSceneClass::Clear_Lineup (void) +ViewerSceneClass::Clear_Lineup () { // Remove every object in the lineup from the scene, // and remove each object from the line up list. @@ -222,7 +222,7 @@ ViewerSceneClass::Clear_Lineup (void) } SphereClass -ViewerSceneClass::Get_Bounding_Sphere (void) +ViewerSceneClass::Get_Bounding_Sphere () { // Iterate through every object in the scene, adding its // bounding sphere to the current bounding sphere. The sum of @@ -244,7 +244,7 @@ ViewerSceneClass::Get_Bounding_Sphere (void) } AABoxClass -ViewerSceneClass::Get_Line_Up_Bounding_Box (void) +ViewerSceneClass::Get_Line_Up_Bounding_Box () { // Iterate through each object in the lineup, adding its // bounding box to the current bounding box. The sum @@ -279,7 +279,7 @@ ViewerSceneClass::Can_Line_Up (int class_id) } SceneIterator * -ViewerSceneClass::Create_Line_Up_Iterator (void) +ViewerSceneClass::Create_Line_Up_Iterator () { return new ViewerSceneIterator(&LineUpList); } @@ -302,7 +302,7 @@ void ViewerSceneClass::Add_Render_Object(RenderObjClass * obj) Recalculate_Fog_Planes(); } -void ViewerSceneClass::Recalculate_Fog_Planes (void) +void ViewerSceneClass::Recalculate_Fog_Planes () { const float FOG_OPAQUE_MULTIPLE = 8.0f; const float FOG_MINIMUM_DEPTH = 200.0f; diff --git a/Core/Tools/W3DView/ViewerScene.h b/Core/Tools/W3DView/ViewerScene.h index aac90782013..28a3f56cc50 100644 --- a/Core/Tools/W3DView/ViewerScene.h +++ b/Core/Tools/W3DView/ViewerScene.h @@ -55,10 +55,10 @@ class ViewerSceneClass : public SimpleSceneClass // // Public constructors/destructors // - ViewerSceneClass (void) + ViewerSceneClass () : m_AllowLODSwitching (false) { } - virtual ~ViewerSceneClass (void) { } + virtual ~ViewerSceneClass () { } /////////////////////////////////////////////////////////////////// @@ -77,23 +77,23 @@ class ViewerSceneClass : public SimpleSceneClass // Inline accessors // virtual void Allow_LOD_Switching (bool onoff) { m_AllowLODSwitching = onoff; } - virtual bool Are_LODs_Switching (void) { return m_AllowLODSwitching; } + virtual bool Are_LODs_Switching () { return m_AllowLODSwitching; } // // General methods // virtual void Add_To_Lineup (RenderObjClass *obj); - virtual void Clear_Lineup (void); - virtual AABoxClass Get_Line_Up_Bounding_Box (void); + virtual void Clear_Lineup (); + virtual AABoxClass Get_Line_Up_Bounding_Box (); bool Can_Line_Up (RenderObjClass *obj); bool Can_Line_Up (int class_id); - void Recalculate_Fog_Planes (void); - virtual SphereClass Get_Bounding_Sphere (void); + void Recalculate_Fog_Planes (); + virtual SphereClass Get_Bounding_Sphere (); // // Line-Up list iteration // - virtual SceneIterator * Create_Line_Up_Iterator (void); + virtual SceneIterator * Create_Line_Up_Iterator (); virtual void Destroy_Line_Up_Iterator (SceneIterator *iterator); private: diff --git a/Core/Tools/W3DView/VolumeRandomDialog.cpp b/Core/Tools/W3DView/VolumeRandomDialog.cpp index 6c3de349a12..5b0b3c52989 100644 --- a/Core/Tools/W3DView/VolumeRandomDialog.cpp +++ b/Core/Tools/W3DView/VolumeRandomDialog.cpp @@ -96,7 +96,7 @@ END_MESSAGE_MAP() // //////////////////////////////////////////////////////////////////// void -VolumeRandomDialogClass::OnOK (void) +VolumeRandomDialogClass::OnOK () { if (SendDlgItemMessage (IDC_BOX_RADIO, BM_GETCHECK) == 1) { @@ -140,7 +140,7 @@ VolumeRandomDialogClass::OnOK (void) // //////////////////////////////////////////////////////////////////// BOOL -VolumeRandomDialogClass::OnInitDialog (void) +VolumeRandomDialogClass::OnInitDialog () { CDialog::OnInitDialog (); @@ -225,7 +225,7 @@ VolumeRandomDialogClass::OnInitDialog (void) // //////////////////////////////////////////////////////////////////// void -VolumeRandomDialogClass::OnBoxRadio (void) +VolumeRandomDialogClass::OnBoxRadio () { Update_Enable_State (); return ; @@ -238,7 +238,7 @@ VolumeRandomDialogClass::OnBoxRadio (void) // //////////////////////////////////////////////////////////////////// void -VolumeRandomDialogClass::OnCylinderRadio (void) +VolumeRandomDialogClass::OnCylinderRadio () { Update_Enable_State (); return ; @@ -251,7 +251,7 @@ VolumeRandomDialogClass::OnCylinderRadio (void) // //////////////////////////////////////////////////////////////////// void -VolumeRandomDialogClass::OnSphereRadio (void) +VolumeRandomDialogClass::OnSphereRadio () { Update_Enable_State (); return ; @@ -264,7 +264,7 @@ VolumeRandomDialogClass::OnSphereRadio (void) // //////////////////////////////////////////////////////////////////// void -VolumeRandomDialogClass::Update_Enable_State (void) +VolumeRandomDialogClass::Update_Enable_State () { bool enable_box_ctrls = (SendDlgItemMessage (IDC_BOX_RADIO, BM_GETCHECK) == 1); bool enable_sphere_ctrls = (SendDlgItemMessage (IDC_SPHERE_RADIO, BM_GETCHECK) == 1); diff --git a/Core/Tools/W3DView/VolumeRandomDialog.h b/Core/Tools/W3DView/VolumeRandomDialog.h index f1550b21428..7ff8c1e96f1 100644 --- a/Core/Tools/W3DView/VolumeRandomDialog.h +++ b/Core/Tools/W3DView/VolumeRandomDialog.h @@ -73,14 +73,14 @@ class VolumeRandomDialogClass : public CDialog ////////////////////////////////////////////////////////////////////////////// // Public methods ////////////////////////////////////////////////////////////////////////////// - Vector3Randomizer * Get_Randomizer (void) const { return m_Randomizer; } + Vector3Randomizer * Get_Randomizer () const { return m_Randomizer; } protected: ////////////////////////////////////////////////////////////////////////////// // Protected methods ////////////////////////////////////////////////////////////////////////////// - void Update_Enable_State (void); + void Update_Enable_State (); private: diff --git a/Core/Tools/W3DView/W3DView.cpp b/Core/Tools/W3DView/W3DView.cpp index 890673e4d36..6739c9d1ebd 100644 --- a/Core/Tools/W3DView/W3DView.cpp +++ b/Core/Tools/W3DView/W3DView.cpp @@ -84,7 +84,7 @@ END_MESSAGE_MAP() // // CW3DViewApp construction // -CW3DViewApp::CW3DViewApp (void) +CW3DViewApp::CW3DViewApp () : m_bInitialized (false) { // TODO: add construction code here, @@ -146,7 +146,7 @@ WinMain // //////////////////////////////////////////////////////////// void -Do_Version_Check (void) +Do_Version_Check () { char curr_filename[MAX_PATH]; ::GetModuleFileName (nullptr, curr_filename, MAX_PATH); @@ -170,7 +170,7 @@ Do_Version_Check (void) // // InitInstance // -BOOL CW3DViewApp::InitInstance (void) +BOOL CW3DViewApp::InitInstance () { // Standard initialization // If you are not using these features and wish to reduce the size @@ -316,7 +316,7 @@ void CW3DViewApp::OnAppAbout() /* ** */ -void Debug_Refs(void) +void Debug_Refs() { #ifdef RTS_DEBUG TRACE("Detecting Active Refs...\r\n"); @@ -442,7 +442,7 @@ fnTopLevelWindowSearch // OnInitDialog // BOOL -CAboutDlg::OnInitDialog (void) +CAboutDlg::OnInitDialog () { // Allow the base class to process this message CDialog::OnInitDialog (); diff --git a/Core/Tools/W3DView/W3DViewDoc.cpp b/Core/Tools/W3DView/W3DViewDoc.cpp index 7dc9eb19cac..e1845797608 100644 --- a/Core/Tools/W3DView/W3DViewDoc.cpp +++ b/Core/Tools/W3DView/W3DViewDoc.cpp @@ -88,7 +88,7 @@ END_MESSAGE_MAP() // // CW3DViewDoc // -CW3DViewDoc::CW3DViewDoc (void) +CW3DViewDoc::CW3DViewDoc () : m_pCScene (nullptr), m_pC2DScene (nullptr), m_pCursorScene (nullptr), @@ -127,7 +127,7 @@ CW3DViewDoc::CW3DViewDoc (void) // ~CW3DViewDoc // /////////////////////////////////////////////////////////////// -CW3DViewDoc::~CW3DViewDoc (void) +CW3DViewDoc::~CW3DViewDoc () { CleanupResources (); REF_PTR_RELEASE (m_pCursor); @@ -141,7 +141,7 @@ CW3DViewDoc::~CW3DViewDoc (void) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::CleanupResources (void) +CW3DViewDoc::CleanupResources () { if (m_pC2DScene) { @@ -256,7 +256,7 @@ CW3DViewDoc::CleanupResources (void) // /////////////////////////////////////////////////////////////// BOOL -CW3DViewDoc::OnNewDocument (void) +CW3DViewDoc::OnNewDocument () { if (!CDocument::OnNewDocument()) return FALSE; @@ -350,7 +350,7 @@ void CW3DViewDoc::Dump(CDumpContext& dc) const // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::InitScene (void) +CW3DViewDoc::InitScene () { if (m_pCScene == nullptr) { @@ -580,7 +580,7 @@ CW3DViewDoc::LoadAssetsFromFile (LPCTSTR lpszPathName) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Reload_Displayed_Object (void) +CW3DViewDoc::Reload_Displayed_Object () { GetDataTreeView ()->Display_Asset (); //SAFE_ADD_REF (m_pCRenderObj); @@ -768,7 +768,7 @@ CW3DViewDoc::DisplayObject // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::ResetAnimation (void) +CW3DViewDoc::ResetAnimation () { if (m_pCAnimation != nullptr) { @@ -917,7 +917,7 @@ CW3DViewDoc::PlayAnimation // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Play_Animation_Sound (void) +CW3DViewDoc::Play_Animation_Sound () { if (m_pCAnimation != nullptr) { CString animation_name = m_pCAnimation->Get_Name (); @@ -1048,7 +1048,7 @@ Get_Camera_Transform (RenderObjClass *render_obj, Matrix3D &tm) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Update_Camera (void) +CW3DViewDoc::Update_Camera () { // Should we update the camera's position as well? if (m_bAnimateCamera && m_pCRenderObj != nullptr) { @@ -1136,7 +1136,7 @@ CW3DViewDoc::UpdateFrame (float relativeTimeSlice) // /////////////////////////////////////////////////////////////// CDataTreeView * -CW3DViewDoc::GetDataTreeView (void) +CW3DViewDoc::GetDataTreeView () { CDataTreeView *pCDataTreeView = nullptr; @@ -1159,7 +1159,7 @@ CW3DViewDoc::GetDataTreeView (void) // /////////////////////////////////////////////////////////////// CGraphicView * -CW3DViewDoc::GetGraphicView (void) +CW3DViewDoc::GetGraphicView () { CGraphicView *pCGrephicView = nullptr; @@ -1725,7 +1725,7 @@ CW3DViewDoc::SaveSettings // /////////////////////////////////////////////////////////////// bool -CW3DViewDoc::Save_Selected_LOD (void) +CW3DViewDoc::Save_Selected_LOD () { // Assume failure bool retval = false; @@ -1917,7 +1917,7 @@ CW3DViewDoc::Remove_Object_From_Scene (RenderObjClass *prender_obj) // /////////////////////////////////////////////////////////////// bool -CW3DViewDoc::Save_Selected_Primitive (void) +CW3DViewDoc::Save_Selected_Primitive () { // Assume failure bool retval = false; @@ -2053,7 +2053,7 @@ CW3DViewDoc::Save_Current_Ring (const CString &filename) // /////////////////////////////////////////////////////////////// bool -CW3DViewDoc::Save_Selected_Emitter (void) +CW3DViewDoc::Save_Selected_Emitter () { // Assume failure bool retval = false; @@ -2136,7 +2136,7 @@ CW3DViewDoc::Save_Current_Emitter (const CString &filename) // /////////////////////////////////////////////////////////////// bool -CW3DViewDoc::Save_Selected_Sound_Object (void) +CW3DViewDoc::Save_Selected_Sound_Object () { bool retval = false; @@ -2238,7 +2238,7 @@ CW3DViewDoc::Save_Current_Sound_Object (const CString &filename) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Auto_Assign_Bones (void) +CW3DViewDoc::Auto_Assign_Bones () { if (m_pCRenderObj != nullptr) { bool bupdate_prototype = false; @@ -2274,7 +2274,7 @@ CW3DViewDoc::Auto_Assign_Bones (void) // /////////////////////////////////////////////////////////////// bool -CW3DViewDoc::Save_Selected_Aggregate (void) +CW3DViewDoc::Save_Selected_Aggregate () { // Assume failure bool retval = false; @@ -2413,7 +2413,7 @@ CW3DViewDoc::Animate_Camera (bool banimate) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Make_Movie (void) +CW3DViewDoc::Make_Movie () { // Hide the mouse cursor when we're making a movie. bool restore_cursor = Is_Cursor_Shown(); @@ -2576,7 +2576,7 @@ CW3DViewDoc::Show_Cursor (bool onoff) // /////////////////////////////////////////////////////////////// bool -CW3DViewDoc::Is_Cursor_Shown (void) const +CW3DViewDoc::Is_Cursor_Shown () const { return m_pCursor != nullptr && m_pCursor->Is_Not_Hidden_At_All (); } @@ -2601,7 +2601,7 @@ CW3DViewDoc::Set_Cursor (LPCTSTR resource_name) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Create_Cursor (void) +CW3DViewDoc::Create_Cursor () { if (m_pCursor == nullptr) { m_pCursor = new ScreenCursorClass; @@ -2667,7 +2667,7 @@ CW3DViewDoc::Count_Particles (RenderObjClass *render_obj) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Update_Particle_Count (void) +CW3DViewDoc::Update_Particle_Count () { int particles = Count_Particles (); ((CMainFrame *)::AfxGetMainWnd ())->Update_Particle_Count (particles); @@ -2984,7 +2984,7 @@ CW3DViewDoc::Import_Facial_Animation (const CString &heirarchy_name, const CStri // /////////////////////////////////////////////////////////////// const HTreeClass * -CW3DViewDoc::Get_Current_HTree (void) const +CW3DViewDoc::Get_Current_HTree () const { const HTreeClass *htree = nullptr; @@ -3002,7 +3002,7 @@ CW3DViewDoc::Get_Current_HTree (void) const // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Save_Camera_Settings (void) +CW3DViewDoc::Save_Camera_Settings () { theApp.WriteProfileInt ("Config", "UseManualFOV", m_ManualFOV); theApp.WriteProfileInt ("Config", "UseManualClipPlanes", m_ManualClipPlanes); @@ -3043,7 +3043,7 @@ CW3DViewDoc::Save_Camera_Settings (void) // /////////////////////////////////////////////////////////////// void -CW3DViewDoc::Load_Camera_Settings (void) +CW3DViewDoc::Load_Camera_Settings () { m_ManualFOV = (theApp.GetProfileInt ("Config", "UseManualFOV", 0) == TRUE); m_ManualClipPlanes = (theApp.GetProfileInt ("Config", "UseManualClipPlanes", 0) == TRUE); diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h index 4bbdb92d79d..815ddd53d90 100644 --- a/Core/Tools/W3DView/W3DViewDoc.h +++ b/Core/Tools/W3DView/W3DViewDoc.h @@ -109,41 +109,41 @@ class CW3DViewDoc : public CDocument // // Accessors // - CameraClass * Get2DCamera (void) const { return m_pC2DCamera; } - CameraClass * GetBackObjectCamera (void) const { return m_pCBackObjectCamera; } - SceneClass * Get2DScene (void) const { return m_pC2DScene; } - SceneClass * GetCursorScene (void) const { return m_pCursorScene; } - ViewerSceneClass * GetScene (void) const { return m_pCScene; } - SceneClass * GetBackObjectScene (void) const { return m_pCBackObjectScene; } - LightClass * GetSceneLight (void) const { return m_pCSceneLight; } - RenderObjClass * GetDisplayedObject (void) const { return m_pCRenderObj; } - HAnimClass * GetCurrentAnimation (void) const { return m_pCAnimation; } - const HTreeClass * Get_Current_HTree (void) const; + CameraClass * Get2DCamera () const { return m_pC2DCamera; } + CameraClass * GetBackObjectCamera () const { return m_pCBackObjectCamera; } + SceneClass * Get2DScene () const { return m_pC2DScene; } + SceneClass * GetCursorScene () const { return m_pCursorScene; } + ViewerSceneClass * GetScene () const { return m_pCScene; } + SceneClass * GetBackObjectScene () const { return m_pCBackObjectScene; } + LightClass * GetSceneLight () const { return m_pCSceneLight; } + RenderObjClass * GetDisplayedObject () const { return m_pCRenderObj; } + HAnimClass * GetCurrentAnimation () const { return m_pCAnimation; } + const HTreeClass * Get_Current_HTree () const; // // Creation/destruction methods // - void InitScene (void); + void InitScene (); void LoadAssetsFromFile (LPCTSTR lpszPathName); HLodPrototypeClass *GenerateLOD (LPCTSTR pszLODBaseName, LOD_NAMING_TYPE type); - void CleanupResources (void); - bool Is_Initialized (void) { return m_IsInitialized; } + void CleanupResources (); + bool Is_Initialized () { return m_IsInitialized; } - void Reload_Displayed_Object (void); + void Reload_Displayed_Object (); void Display_Emitter (ParticleEmitterClass *pemitter = nullptr, bool use_global_reset_flag = true, bool allow_reset = true); void DisplayObject (RenderObjClass *pCModel = nullptr, bool use_global_reset_flag = true, bool allow_reset = true, bool add_ghost = false); BOOL SaveSettings (LPCTSTR pszFilename, DWORD dwSettingsMask); BOOL LoadSettings (LPCTSTR pszFileName); - CGraphicView * GetGraphicView (void); - CDataTreeView * GetDataTreeView (void); + CGraphicView * GetGraphicView (); + CDataTreeView * GetDataTreeView (); void Build_Emitter_List (EmitterInstanceListClass *emitter_list, LPCTSTR emitter_name, RenderObjClass *render_obj = nullptr); // // Animation methods // - void Make_Movie (void); - void ResetAnimation (void); + void Make_Movie (); + void ResetAnimation (); void StepAnimation (int frame_inc = 1); void PlayAnimation (RenderObjClass *pobj, LPCTSTR panim_name = nullptr, bool use_global_reset_flag = true, bool allow_reset = true); void PlayAnimation (RenderObjClass *pobj, HAnimComboClass *pcombo, bool use_global_reset_flag = true, bool allow_reset = true); @@ -152,40 +152,40 @@ class CW3DViewDoc : public CDocument bool GetChannelQCompression(){ return m_bCompress_channel_Q;} int GetChannelQnBytes(){return m_nChannelQnBytes;} void SetChannelQnBytes(int n_bytes){m_nChannelQnBytes = n_bytes;} - BOOL GetAnimationBlend (void) const { return m_bAnimBlend; } - bool Is_Camera_Animated (void) const { return m_bAnimateCamera; } + BOOL GetAnimationBlend () const { return m_bAnimBlend; } + bool Is_Camera_Animated () const { return m_bAnimateCamera; } void Animate_Camera (bool banimate); void Import_Facial_Animation (const CString &hierarchy_name, const CString &filename); - void Play_Animation_Sound (void); + void Play_Animation_Sound (); // // Camera methods // - bool Is_Camera_Auto_Reset_On (void) const { return m_bAutoCameraReset; } + bool Is_Camera_Auto_Reset_On () const { return m_bAutoCameraReset; } void Turn_Camera_Auto_Reset_On (bool onoff) { m_bAutoCameraReset = onoff; } // // Background color methods // - const Vector3 & GetBackgroundColor (void) const { return m_backgroundColor; } + const Vector3 & GetBackgroundColor () const { return m_backgroundColor; } void SetBackgroundColor (const Vector3 &backgroundColor); // // Background BMP methods // - const CString & GetBackgroundBMP (void) const { return m_stringBackgroundBMP; } + const CString & GetBackgroundBMP () const { return m_stringBackgroundBMP; } void SetBackgroundBMP (LPCTSTR pszBackgroundBMP); // // Background Object methods // - const CString & GetBackgroundObjectName (void) const { return m_stringBackgroundObject; } + const CString & GetBackgroundObjectName () const { return m_stringBackgroundObject; } void SetBackgroundObject (LPCTSTR pszBackgroundObjectName); // // Fogging methods // - bool IsFogEnabled (void) const { return m_bFogEnabled; } + bool IsFogEnabled () const { return m_bFogEnabled; } void EnableFog (bool enable=true); // @@ -196,34 +196,34 @@ class CW3DViewDoc : public CDocument // // Emitter serialization methods // - bool Save_Selected_Emitter (void); + bool Save_Selected_Emitter (); bool Save_Current_Emitter (const CString &filename); // // Primitive serialization methods // - bool Save_Selected_Primitive (void); + bool Save_Selected_Primitive (); bool Save_Current_Sphere (const CString &filename); bool Save_Current_Ring (const CString &filename); // // Aggregate methods // - void Auto_Assign_Bones (void); - bool Save_Selected_Aggregate (void); + void Auto_Assign_Bones (); + bool Save_Selected_Aggregate (); bool Save_Current_Aggregate (const CString &filename); // // Sound object methods // - bool Save_Selected_Sound_Object (void); + bool Save_Selected_Sound_Object (); bool Save_Current_Sound_Object (const CString &filename); // // LOD methods // bool Save_Current_LOD (const CString &filename); - bool Save_Selected_LOD (void); + bool Save_Selected_LOD (); void Switch_LOD (int increment = 1, RenderObjClass *render_obj = nullptr); // @@ -242,39 +242,39 @@ class CW3DViewDoc : public CDocument // void Show_Cursor (bool onoff); void Set_Cursor (LPCTSTR resource_name); - bool Is_Cursor_Shown (void) const; - void Create_Cursor (void); + bool Is_Cursor_Shown () const; + void Create_Cursor (); // // Particle methods // int Count_Particles (RenderObjClass *render_obj = nullptr); - void Update_Particle_Count (void); + void Update_Particle_Count (); // // Manual settings // void Set_Manual_FOV (bool manual) { m_ManualFOV = manual; } void Set_Manul_Clip_Planes (bool manual){ m_ManualClipPlanes = manual; } - bool Is_FOV_Manual (void) const { return m_ManualFOV; } - bool Are_Clip_Planes_Manual (void) const { return m_ManualClipPlanes; } + bool Is_FOV_Manual () const { return m_ManualFOV; } + bool Are_Clip_Planes_Manual () const { return m_ManualClipPlanes; } - void Update_Camera (void); - void Save_Camera_Settings (void); - void Load_Camera_Settings (void); + void Update_Camera (); + void Save_Camera_Settings (); + void Load_Camera_Settings (); // // File methods // void Copy_Assets_To_Dir (LPCTSTR directory); bool Lookup_Path (LPCTSTR asset_name, CString &path); - const char * Get_Last_Path (void) const { return (m_LastPath.IsEmpty () ? nullptr : (const char *)m_LastPath); } + const char * Get_Last_Path () const { return (m_LastPath.IsEmpty () ? nullptr : (const char *)m_LastPath); } // // Texture search paths // - const CString & Get_Texture_Path1 (void) const { return m_TexturePath1; } - const CString & Get_Texture_Path2 (void) const { return m_TexturePath2; } + const CString & Get_Texture_Path1 () const { return m_TexturePath1; } + const CString & Get_Texture_Path2 () const { return m_TexturePath2; } void Set_Texture_Path1 (LPCTSTR path); void Set_Texture_Path2 (LPCTSTR path); diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index 4b31d780d4e..0b7bde5b4fa 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -94,7 +94,7 @@ SpecialAbilityUpdate::~SpecialAbilityUpdate() } /*------------------------------------------------------------------------------------------------ -void SpecialAbilityUpdate::update( void ) +void SpecialAbilityUpdate::update() This is the brains of the entire special ability update. There are several optional steps and variations that can be processed for any particular type of special ability. A special ability diff --git a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h index 8d2a34503ee..337bf072e1e 100644 --- a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h @@ -72,27 +72,27 @@ class EditWindow public: - EditWindow( void ); - ~EditWindow( void ); + EditWindow(); + ~EditWindow(); /// initialize the edit window singleton void init( UnsignedInt clientWidth, UnsignedInt clientHeight ); - void shutdown( void ); ///< free all data - void draw( void ); ///< draw the edit window + void shutdown(); ///< free all data + void draw(); ///< draw the edit window - void updatePulse( void ); ///< pulse message from timer + void updatePulse(); ///< pulse message from timer - HWND getWindowHandle( void ); ///< get window handle + HWND getWindowHandle(); ///< get window handle void setSize( ICoord2D *size ); ///< set width and height for edit window void getSize( ICoord2D *size ); ///< get width and height for edit window - RGBColorReal getBackgroundColor( void ); ///< return the background color + RGBColorReal getBackgroundColor(); ///< return the background color void setBackgroundColor( RGBColorReal color ); ///< set background color void setDragMoveOrigin( ICoord2D *pos ); ///< for drag moving void setDragMoveDest( ICoord2D *pos ); ///< for drag moving - ICoord2D getDragMoveOrigin( void ); ///< for keybord moving - ICoord2D getDragMoveDest( void ); ///< for keyboard moving + ICoord2D getDragMoveOrigin(); ///< for keybord moving + ICoord2D getDragMoveDest(); ///< for keyboard moving void notifyWindowDeleted( GameWindow *window ); ///< window has been deleted @@ -122,21 +122,21 @@ class EditWindow /// image clipping support void setClipRegion( IRegion2D *region ) {m_clipRegion = *region; m_isClippedEnabled = TRUE;} - Bool isClippingEnabled( void ) { return m_isClippedEnabled; } + Bool isClippingEnabled() { return m_isClippedEnabled; } void enableClipping( Bool onoff ) { m_isClippedEnabled = onoff; } protected: - void registerEditWindowClass( void ); ///< register class with OS + void registerEditWindowClass(); ///< register class with OS /// callback from windows, NOTE that it's static and has no this pointer static LRESULT CALLBACK editProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ); - void drawGrid( void ); ///< draw the grid + void drawGrid(); ///< draw the grid void drawSeeThruOutlines( GameWindow *windowList, Color c ); void drawHiddenOutlines( GameWindow *windowList, Color c ); - void drawUIFeedback( void ); ///< draw UI visual feedback + void drawUIFeedback(); ///< draw UI visual feedback /// if mouse is close to selected window allow resize void handleResizeAvailable( Int mouseX, Int mouseY ); @@ -188,13 +188,13 @@ class EditWindow /////////////////////////////////////////////////////////////////////////////// // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -inline HWND EditWindow::getWindowHandle( void ) { return m_editWindowHWnd; } +inline HWND EditWindow::getWindowHandle() { return m_editWindowHWnd; } inline void EditWindow::getSize( ICoord2D *size ) { *size = m_size; } inline void EditWindow::getPopupMenuClickPos( ICoord2D *pos ) { *pos = m_popupMenuClickPos; } inline void EditWindow::setDragMoveDest( ICoord2D *pos ) { if( pos ) m_dragMoveDest = *pos; } inline void EditWindow::setDragMoveOrigin( ICoord2D *pos ) { if( pos ) m_dragMoveOrigin = *pos; } -inline ICoord2D EditWindow::getDragMoveDest( void ) { return m_dragMoveDest; } -inline ICoord2D EditWindow::getDragMoveOrigin( void ) { return m_dragMoveOrigin; } +inline ICoord2D EditWindow::getDragMoveDest() { return m_dragMoveDest; } +inline ICoord2D EditWindow::getDragMoveOrigin() { return m_dragMoveOrigin; } /////////////////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h index 60c381da025..08e595b4cd4 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -119,12 +119,12 @@ class GUIEdit public: - GUIEdit( void ); - ~GUIEdit( void ); + GUIEdit(); + ~GUIEdit(); - void init( void ); ///< initialize data - void shutdown( void ); ///< shutdown all our data - void update( void ); ///< process the universe + void init(); ///< initialize data + void shutdown(); ///< shutdown all our data + void update(); ///< process the universe Bool readConfigFile( const char *filename ); ///< read the configuration file Bool writeConfigFile( const char *filename ); ///< write the configuration file @@ -132,47 +132,47 @@ class GUIEdit void readFontFile( const char *filename ); ///< read file with available font definitions void writeFontFile( const char *filename ); ///< write all loaded fonts to a file - char *getSaveFilename( void ); - char *getSavePathAndFilename( void ); + char *getSaveFilename(); + char *getSavePathAndFilename(); void setSaveFile( const char *fullPathAndFilename ); ///< set filename to use for saving - HWND getWindowHandle( void ); ///< get window handle - HINSTANCE getInstance( void ); ///< get application instance - HWND getStatusBarWindowHandle( void ); ///< get status bar HWND - void createStatusBar( void ); ///< create status bar + HWND getWindowHandle(); ///< get window handle + HINSTANCE getInstance(); ///< get application instance + HWND getStatusBarWindowHandle(); ///< get status bar HWND + void createStatusBar(); ///< create status bar void statusMessage( StatusPart part, const char *message ); ///< set status bar textl - void createToolbar( void ); ///< create the toolbar + void createToolbar(); ///< create the toolbar void setCursor( CursorType type ); ///< set cursor void setPropertyTarget( GameWindow *window ); ///< set window for property editing - GameWindow *getPropertyTarget( void ); ///< get window editing properties + GameWindow *getPropertyTarget(); ///< get window editing properties void loadGUIEditFontLibrary( FontLibrary *library ); ///< fonts available in the editor Bool isNameDuplicate( GameWindow *root, GameWindow *ignore, AsciiString name ); - EditMode getMode( void ); ///< return the current mode + EditMode getMode(); ///< return the current mode void setMode( EditMode mode ); ///< set the new mode void setUnsaved( Bool unsaved ); ///< set unsaved flag to FALSE or TRUE - Bool newLayout( void ); ///< reset editor for new layout + Bool newLayout(); ///< reset editor for new layout // grid settings void setGridResolution( Int res ); - Int getGridResolution( void ); + Int getGridResolution(); void setGridVisible( Bool visible ); - Bool isGridVisible( void ); + Bool isGridVisible(); void setGridSnap( Bool on ); - Bool isGridSnapOn( void ); + Bool isGridSnapOn(); void setGridColor( RGBColorInt *color ); - RGBColorInt *getGridColor( void ); + RGBColorInt *getGridColor(); void gridSnapLocation( ICoord2D *source, ICoord2D *snapped ); // display options for hidden/see thru windows void setShowHiddenOutlines( Bool show ); - Bool getShowHiddenOutlines( void ); + Bool getShowHiddenOutlines(); void setShowSeeThruOutlines( Bool show ); - Bool getShowSeeThruOutlines( void ); + Bool getShowSeeThruOutlines(); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // manipulating windows ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -181,16 +181,16 @@ class GUIEdit Bool windowIsGadget( GameWindow *window ); ///< is the window a gadget // selection help ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - WindowSelectionEntry *getSelectList( void ); ///< get the selected list head - GameWindow *getFirstSelected( void ); ///< get first selected window + WindowSelectionEntry *getSelectList(); ///< get the selected list head + GameWindow *getFirstSelected(); ///< get first selected window void moveWindowTo( GameWindow *window, Int x, Int y ); ///< move window Bool isWindowSelected( GameWindow *window ); ///< is window selected void selectWindow( GameWindow *window ); ///< add to selection list void unSelectWindow( GameWindow *window ); ///< remove from selection list - void clearSelections( void ); ///< clear selection list - Int selectionCount( void ); ///< return # of selected windows - void deleteSelected( void ); ///< delete selected windows - void bringSelectedToTop( void ); ///< bring selected windows to top + void clearSelections(); ///< clear selection list + Int selectionCount(); ///< return # of selected windows + void deleteSelected(); ///< delete selected windows + void bringSelectedToTop(); ///< bring selected windows to top /// select the windows that are FULLY in the region specified void selectWindowsInRegion( IRegion2D *region ); @@ -223,7 +223,7 @@ class GUIEdit GameWindow *getWindowAtPos( Int x, Int y ); ///< get topmost window at pos - void deleteAllWindows( void ); ///< delete all windows in the editor + void deleteAllWindows(); ///< delete all windows in the editor void removeWindowCleanup( GameWindow *window ); ///< to cleanup before delete void deleteWindow( GameWindow *window ); ///< delete a game window @@ -274,16 +274,16 @@ class GUIEdit Int width, Int height ); // menu options ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Bool menuNew( void ); ///< start a new layout process - Bool menuOpen( void ); ///< hit open on menu + Bool menuNew(); ///< start a new layout process + Bool menuOpen(); ///< hit open on menu void stripNameDecorations( GameWindow *root ); ///< after a load void revertDefaultCallbacks( GameWindow *root ); ///< after a load - Bool menuSave( void ); ///< hit save on menu - Bool menuSaveAs( void ); ///< hit save as on menu - Bool menuExit( void ); ///< exit application - Bool menuCopy( void ); ///< copy selected windows into copy buffer - Bool menuPaste( void ); ///< paste contents of copy buffer - Bool menuCut( void ); ///< cut selected windows into copy buffer + Bool menuSave(); ///< hit save on menu + Bool menuSaveAs(); ///< hit save as on menu + Bool menuExit(); ///< exit application + Bool menuCopy(); ///< copy selected windows into copy buffer + Bool menuPaste(); ///< paste contents of copy buffer + Bool menuCut(); ///< cut selected windows into copy buffer void checkMenuItem( Int item ); void unCheckMenuItem( Int item ); @@ -291,14 +291,14 @@ class GUIEdit void setLayoutInit( AsciiString init ); ///< set layout init function name void setLayoutUpdate( AsciiString update ); ///< set layout update function name void setLayoutShutdown( AsciiString shutdown ); ///< set layout shutdown function name - AsciiString getLayoutInit( void ); ///< get layout init function name - AsciiString getLayoutUpdate( void ); ///< get layout update function name - AsciiString getLayoutShutdown( void ); ///< get layout shutdown function name + AsciiString getLayoutInit(); ///< get layout init function name + AsciiString getLayoutUpdate(); ///< get layout update function name + AsciiString getLayoutShutdown(); ///< get layout shutdown function name protected: - char *saveAsDialog( void ); ///< save as standard browser - char *openDialog( void ); ///< open standard browser + char *saveAsDialog(); ///< save as standard browser + char *openDialog(); ///< open standard browser void validateNames( GameWindow *root, char *filename, Bool *valid ); void updateRadioScreenIdentifiers( GameWindow *window, Int screenID ); @@ -343,30 +343,30 @@ class GUIEdit }; // INLINING /////////////////////////////////////////////////////////////////////////////////////// -inline HWND GUIEdit::getWindowHandle( void ) { return m_appHWnd; } -inline HINSTANCE GUIEdit::getInstance( void ) { return m_appInst; } -inline HWND GUIEdit::getStatusBarWindowHandle( void ) { return m_statusBarHWnd; } -inline EditMode GUIEdit::getMode( void ) { return m_mode; } +inline HWND GUIEdit::getWindowHandle() { return m_appHWnd; } +inline HINSTANCE GUIEdit::getInstance() { return m_appInst; } +inline HWND GUIEdit::getStatusBarWindowHandle() { return m_statusBarHWnd; } +inline EditMode GUIEdit::getMode() { return m_mode; } inline void GUIEdit::setPropertyTarget( GameWindow *window ) { m_propertyTarget = window; } -inline GameWindow *GUIEdit::getPropertyTarget( void ) { return m_propertyTarget; } -inline char *GUIEdit::getSaveFilename( void ) { return m_saveFilename; } -inline char *GUIEdit::getSavePathAndFilename( void ) { return m_savePathAndFilename; } +inline GameWindow *GUIEdit::getPropertyTarget() { return m_propertyTarget; } +inline char *GUIEdit::getSaveFilename() { return m_saveFilename; } +inline char *GUIEdit::getSavePathAndFilename() { return m_savePathAndFilename; } inline void GUIEdit::setGridResolution( Int res ) { m_gridResolution = res; } -inline Int GUIEdit::getGridResolution( void ) { return m_gridResolution; } +inline Int GUIEdit::getGridResolution() { return m_gridResolution; } inline void GUIEdit::setGridVisible( Bool visible ) { m_gridVisible = visible; } -inline Bool GUIEdit::isGridVisible( void ) { return m_gridVisible; } +inline Bool GUIEdit::isGridVisible() { return m_gridVisible; } inline void GUIEdit::setGridSnap( Bool on ) { m_snapToGrid = on; } -inline Bool GUIEdit::isGridSnapOn( void ) { return m_snapToGrid; } +inline Bool GUIEdit::isGridSnapOn() { return m_snapToGrid; } inline void GUIEdit::setGridColor( RGBColorInt *color ) { m_gridColor = *color; } -inline RGBColorInt *GUIEdit::getGridColor( void ) { return &m_gridColor; } -inline Bool GUIEdit::getShowHiddenOutlines( void ) { return m_showHiddenOutlines; } -inline Bool GUIEdit::getShowSeeThruOutlines( void ) { return m_showSeeThruOutlines; } +inline RGBColorInt *GUIEdit::getGridColor() { return &m_gridColor; } +inline Bool GUIEdit::getShowHiddenOutlines() { return m_showHiddenOutlines; } +inline Bool GUIEdit::getShowSeeThruOutlines() { return m_showSeeThruOutlines; } inline void GUIEdit::setLayoutInit( AsciiString init ) { m_layoutInitString = init; } inline void GUIEdit::setLayoutUpdate( AsciiString update ) { m_layoutUpdateString = update; } inline void GUIEdit::setLayoutShutdown( AsciiString shutdown ) { m_layoutShutdownString = shutdown; } -inline AsciiString GUIEdit::getLayoutInit( void ) { return m_layoutInitString; } -inline AsciiString GUIEdit::getLayoutUpdate( void ) { return m_layoutUpdateString; } -inline AsciiString GUIEdit::getLayoutShutdown( void ) { return m_layoutShutdownString; } +inline AsciiString GUIEdit::getLayoutInit() { return m_layoutInitString; } +inline AsciiString GUIEdit::getLayoutUpdate() { return m_layoutUpdateString; } +inline AsciiString GUIEdit::getLayoutShutdown() { return m_layoutShutdownString; } // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern GUIEdit *TheEditor; ///< editor application singleton diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 58549efa658..8679d5fabd9 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -63,10 +63,10 @@ class GUIEditDisplay : public Display public: - GUIEditDisplay( void ); - virtual ~GUIEditDisplay( void ) override; + GUIEditDisplay(); + virtual ~GUIEditDisplay() override; - virtual void draw( void ) override { }; + virtual void draw() override { }; /// draw a line on the display in pixel coordinates with the specified color virtual void drawLine( Int startX, Int startY, Int endX, Int endY, @@ -89,20 +89,20 @@ class GUIEditDisplay : public Display Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) override; /// image clipping support virtual void setClipRegion( IRegion2D *region ) override; - virtual Bool isClippingEnabled( void ) override; + virtual Bool isClippingEnabled() override; virtual void enableClipping( Bool onoff ) override; // These are stub functions to allow compilation: /// Create a video buffer that can be used for this display - virtual VideoBuffer* createVideoBuffer( void ) override { return nullptr; } + virtual VideoBuffer* createVideoBuffer() override { return nullptr; } /// draw a video buffer fit within the screen coordinates virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) override { } virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, Int endX, Int endY ) override { } - virtual void takeScreenShot(void) override { } - virtual void toggleMovieCapture(void) override {} + virtual void takeScreenShot() override { } + virtual void toggleMovieCapture() override {} // methods that we need to stub virtual void setTimeOfDay( TimeOfDay tod ) override {} @@ -113,7 +113,7 @@ class GUIEditDisplay : public Display virtual void clearShroud() override {} virtual void preloadModelAssets( AsciiString model ) override {} virtual void preloadTextureAssets( AsciiString texture ) override {} - virtual void toggleLetterBox(void) override {} + virtual void toggleLetterBox() override {} virtual void enableLetterBox(Bool enable) override {} #if defined(RTS_DEBUG) virtual void dumpModelAssets(const char *path) {} @@ -123,9 +123,9 @@ class GUIEditDisplay : public Display virtual void dumpAssetUsage(const char* mapname) {} #endif - virtual Real getAverageFPS(void) override { return 0; } - virtual Real getCurrentFPS(void) override { return 0; } - virtual Int getLastFrameDrawCalls( void ) override { return 0; } + virtual Real getAverageFPS() override { return 0; } + virtual Real getCurrentFPS() override { return 0; } + virtual Int getLastFrameDrawCalls() override { return 0; } protected: diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index f9795dee57e..207df8eccf5 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -45,10 +45,10 @@ class GUIEditWindowManager : public W3DGameWindowManager public: - GUIEditWindowManager( void ); - virtual ~GUIEditWindowManager( void ) override; + GUIEditWindowManager(); + virtual ~GUIEditWindowManager() override; - virtual void init( void ) override; ///< initialize system + virtual void init() override; ///< initialize system virtual Int winDestroy( GameWindow *window ) override; ///< destroy this window /// create a new window by setting up parameters and callbacks @@ -69,15 +69,15 @@ class GUIEditWindowManager : public W3DGameWindowManager void validateClipboardNames( GameWindow *root ); ///< ensure unique names void incrementName( GameWindow *window ); ///< make a new unique name - void resetClipboard( void ); ///< reset the clipboard to empty - Bool isClipboardEmpty( void ); ///< is the clipboard empty + void resetClipboard(); ///< reset the clipboard to empty + Bool isClipboardEmpty(); ///< is the clipboard empty void duplicateSelected( GameWindow *root ); ///< dupe the selected windows into the clipboard - void copySelectedToClipboard( void ); ///< copy selected windows to clipboard - void cutSelectedToClipboard( void ); ///< cut selected windows to clipboard - void pasteClipboard( void ); ///< paste the contents of the clipboard + void copySelectedToClipboard(); ///< copy selected windows to clipboard + void cutSelectedToClipboard(); ///< cut selected windows to clipboard + void pasteClipboard(); ///< paste the contents of the clipboard - GameWindow *getClipboardList( void ); ///< get the clipboard list - GameWindow *getClipboardDupeList( void ); ///< get clipboard dupe list + GameWindow *getClipboardList(); ///< get the clipboard list + GameWindow *getClipboardDupeList(); ///< get clipboard dupe list protected: @@ -88,14 +88,14 @@ class GUIEditWindowManager : public W3DGameWindowManager /** remove selected children from the select list that have a parent also in the select list */ - void removeSupervisedChildSelections( void ); + void removeSupervisedChildSelections(); /** selected windows that are children will cut loose their parents and become adults (their parent will be null, otherwise the screen) */ -// void orphanSelectedChildren( void ); +// void orphanSelectedChildren(); /// dupe a window and its children GameWindow *duplicateWindow( GameWindow *source, GameWindow *parent ); - void createClipboardDuplicate( void ); ///< duplicate the clipboard on the dup list + void createClipboardDuplicate(); ///< duplicate the clipboard on the dup list GameWindow *m_clipboard; ///< list of windows in the clipboard GameWindow *m_clipboardDup; ///< list duplicate of the clipboard used for pasting @@ -106,8 +106,8 @@ class GUIEditWindowManager : public W3DGameWindowManager }; // INLINE ///////////////////////////////////////////////////////////////////////////////////////// -inline GameWindow *GUIEditWindowManager::getClipboardList( void ) { return m_clipboard; } -inline GameWindow *GUIEditWindowManager::getClipboardDupeList( void ) { return m_clipboardDup; } +inline GameWindow *GUIEditWindowManager::getClipboardList() { return m_clipboard; } +inline GameWindow *GUIEditWindowManager::getClipboardDupeList() { return m_clipboardDup; } // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern GUIEditWindowManager *TheGUIEditWindowManager; ///< editor use only diff --git a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h index 984d42d17c2..817f0850f3d 100644 --- a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -78,12 +78,12 @@ class HierarchyView public: - HierarchyView( void ); - ~HierarchyView( void ); + HierarchyView(); + ~HierarchyView(); - void init( void ); - void reset( void ); - void shutdown( void ); + void init(); + void reset(); + void shutdown(); char *getWindowTreeName( GameWindow *window ); void addWindow( GameWindow *window, HierarchyOption option ); ///< add a window to the view @@ -92,8 +92,8 @@ class HierarchyView void updateWindowName( GameWindow *window ); ///< update tree entry based on name void selectWindow( GameWindow *window ); ///< select window - HWND getTreeHandle( void ); ///< get the tree control handle - HWND getHierarchyHandle( void ); ///< get window handle for the whole dialog + HWND getTreeHandle(); ///< get the tree control handle + HWND getHierarchyHandle(); ///< get window handle for the whole dialog void setDialogPos( ICoord2D *pos ); void getDialogPos( ICoord2D *pos ); @@ -102,15 +102,15 @@ class HierarchyView void setDragWindow( GameWindow *window ); void setDragTarget( GameWindow *window ); - GameWindow *getDragWindow( void ); - GameWindow *getDragTarget( void ); + GameWindow *getDragWindow(); + GameWindow *getDragTarget(); void moveWindowAheadOf( GameWindow *window, GameWindow *aheadOf ); ///< move hierarchy representation void moveWindowChildOf( GameWindow *window, GameWindow *parent ); ///< move hierarchy representation Bool validateDragDropOperation( GameWindow *source, GameWindow *target ); void setPopupTarget( GameWindow *window ); ///< set target for popup menu - GameWindow *getPopupTarget( void ); ///< get the popup target window + GameWindow *getPopupTarget(); ///< get the popup target window HTREEITEM treePointToItem( Int x, Int y ); ///< translate mouse pos to item location GameWindow *getWindowFromItem( HTREEITEM treeItem ); ///< get game window from user data in the tree item @@ -138,14 +138,14 @@ class HierarchyView /////////////////////////////////////////////////////////////////////////////// // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -inline HWND HierarchyView::getTreeHandle( void ) { return m_tree; } -inline HWND HierarchyView::getHierarchyHandle( void ) { return m_dialog; } +inline HWND HierarchyView::getTreeHandle() { return m_tree; } +inline HWND HierarchyView::getHierarchyHandle() { return m_dialog; } inline void HierarchyView::setDragWindow( GameWindow *window ) { m_dragWindow = window; } inline void HierarchyView::setDragTarget( GameWindow *window ) { m_dragTarget = window; } -inline GameWindow *HierarchyView::getDragWindow( void ) { return m_dragWindow; } -inline GameWindow *HierarchyView::getDragTarget( void ) { return m_dragTarget; } +inline GameWindow *HierarchyView::getDragWindow() { return m_dragWindow; } +inline GameWindow *HierarchyView::getDragTarget() { return m_dragTarget; } inline void HierarchyView::setPopupTarget( GameWindow *window ) { m_popupTarget = window; } -inline GameWindow *HierarchyView::getPopupTarget( void ) { return m_popupTarget; } +inline GameWindow *HierarchyView::getPopupTarget() { return m_popupTarget; } // EXTERNALS ////////////////////////////////////////////////////////////////// extern HierarchyView *TheHierarchyView; ///< singleton for our view diff --git a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h index c84862d5a31..135595793af 100644 --- a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -70,11 +70,11 @@ class LayoutScheme LayoutScheme(); ~LayoutScheme(); - void init( void ); + void init(); - void openDialog( void ); ///< open the scheme info and editing dialog + void openDialog(); ///< open the scheme info and editing dialog - char *getSchemeFilename( void ); ///< get the scheme filename + char *getSchemeFilename(); ///< get the scheme filename void setSchemeFilename( char *filename ); ///< set the scheme filename Bool saveScheme( char *filename ); ///< save the current scheme to file @@ -85,14 +85,14 @@ class LayoutScheme Color color, Color borderColor ); void setFont( GameFont *font ); - GameFont *getFont( void ); - - Color getEnabledTextColor( void ); - Color getEnabledTextBorderColor( void ); - Color getDisabledTextColor( void ); - Color getDisabledTextBorderColor( void ); - Color getHiliteTextColor( void ); - Color getHiliteTextBorderColor( void ); + GameFont *getFont(); + + Color getEnabledTextColor(); + Color getEnabledTextBorderColor(); + Color getDisabledTextColor(); + Color getDisabledTextBorderColor(); + Color getHiliteTextColor(); + Color getHiliteTextBorderColor(); void setEnabledTextColor( Color c ); void setEnabledTextBorderColor( Color c ); void setDisabledTextColor( Color c ); @@ -123,14 +123,14 @@ class LayoutScheme /////////////////////////////////////////////////////////////////////////////// // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -inline char *LayoutScheme::getSchemeFilename( void ) { return m_schemeFilename; } +inline char *LayoutScheme::getSchemeFilename() { return m_schemeFilename; } inline void LayoutScheme::setSchemeFilename( char *filename ) { strlcpy(m_schemeFilename, filename, ARRAY_SIZE(m_schemeFilename)); } -inline Color LayoutScheme::getEnabledTextColor( void ) { return m_enabledText.color; } -inline Color LayoutScheme::getEnabledTextBorderColor( void ) { return m_enabledText.borderColor; } -inline Color LayoutScheme::getDisabledTextColor( void ) { return m_disabledText.color; } -inline Color LayoutScheme::getDisabledTextBorderColor( void ) { return m_disabledText.borderColor; } -inline Color LayoutScheme::getHiliteTextColor( void ) { return m_hiliteText.color; } -inline Color LayoutScheme::getHiliteTextBorderColor( void ) { return m_hiliteText.borderColor; } +inline Color LayoutScheme::getEnabledTextColor() { return m_enabledText.color; } +inline Color LayoutScheme::getEnabledTextBorderColor() { return m_enabledText.borderColor; } +inline Color LayoutScheme::getDisabledTextColor() { return m_disabledText.color; } +inline Color LayoutScheme::getDisabledTextBorderColor() { return m_disabledText.borderColor; } +inline Color LayoutScheme::getHiliteTextColor() { return m_hiliteText.color; } +inline Color LayoutScheme::getHiliteTextBorderColor() { return m_hiliteText.borderColor; } inline void LayoutScheme::setEnabledTextColor( Color c ) { m_enabledText.color = c; } inline void LayoutScheme::setEnabledTextBorderColor( Color c ) { m_enabledText.borderColor = c; } inline void LayoutScheme::setDisabledTextColor( Color c ) { m_disabledText.color = c; } @@ -138,7 +138,7 @@ inline void LayoutScheme::setDisabledTextBorderColor( Color c ) { m_disabledText inline void LayoutScheme::setHiliteTextColor( Color c ) { m_hiliteText.color = c; } inline void LayoutScheme::setHiliteTextBorderColor( Color c ) { m_hiliteText.borderColor = c; } inline void LayoutScheme::setFont( GameFont *font ) { m_font = font; } -inline GameFont *LayoutScheme::getFont( void ) { return m_font; } +inline GameFont *LayoutScheme::getFont() { return m_font; } /////////////////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/GUIEdit/Include/Properties.h b/Generals/Code/Tools/GUIEdit/Include/Properties.h index dacacce8251..f11424889e4 100644 --- a/Generals/Code/Tools/GUIEdit/Include/Properties.h +++ b/Generals/Code/Tools/GUIEdit/Include/Properties.h @@ -416,9 +416,9 @@ extern void StoreColor( StateIdentifier id, Color color, Color borderColor ); extern void LoadFontCombo( HWND comboBox, GameFont *currFont ); extern GameFont *GetSelectedFontFromCombo( HWND combo ); -extern Color GetPropsEnabledTextColor( void ); -extern Color GetPropsEnabledTextBorderColor( void ); -extern Color GetPropsDisabledTextColor( void ); -extern Color GetPropsDisabledTextBorderColor( void ); -extern Color GetPropsHiliteTextColor( void ); -extern Color GetPropsHiliteTextBorderColor( void ); +extern Color GetPropsEnabledTextColor(); +extern Color GetPropsEnabledTextBorderColor(); +extern Color GetPropsDisabledTextColor(); +extern Color GetPropsDisabledTextBorderColor(); +extern Color GetPropsHiliteTextColor(); +extern Color GetPropsHiliteTextBorderColor(); diff --git a/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp b/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp index 5b711392e8f..edd5fcc1fe1 100644 --- a/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp @@ -310,7 +310,7 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message, // EditWindow::registerEditWindowClass ======================================== /** Register a class with the windows OS for an edit window */ //============================================================================= -void EditWindow::registerEditWindowClass( void ) +void EditWindow::registerEditWindowClass() { WNDCLASSEX wcex; ATOM atom; @@ -345,7 +345,7 @@ void EditWindow::registerEditWindowClass( void ) // EditWindow::EditWindow ===================================================== /** */ //============================================================================= -EditWindow::EditWindow( void ) +EditWindow::EditWindow() { m_pulse = 0; @@ -396,7 +396,7 @@ EditWindow::EditWindow( void ) // EditWindow::~EditWindow ==================================================== /** */ //============================================================================= -EditWindow::~EditWindow( void ) +EditWindow::~EditWindow() { // call the shutdown @@ -490,7 +490,7 @@ void EditWindow::init( UnsignedInt clientWidth, UnsignedInt clientHeight ) // EditWindow::shutdown ======================================================= /** Shutdown edit window */ //============================================================================= -void EditWindow::shutdown( void ) +void EditWindow::shutdown() { // delete 2d renderer @@ -524,7 +524,7 @@ void EditWindow::shutdown( void ) // EditWindow::updatePulse ==================================================== /** Update pulse from timer message */ //============================================================================= -void EditWindow::updatePulse( void ) +void EditWindow::updatePulse() { static Bool dir = 1; static Int stepSize = 4; @@ -1199,7 +1199,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c ) /** Draw any visual feedback to the user about selection boxes or windows * that are selected, draggin windows etc */ //============================================================================= -void EditWindow::drawUIFeedback( void ) +void EditWindow::drawUIFeedback() { WindowSelectionEntry *select; Int color = m_pulse * 2; @@ -1398,7 +1398,7 @@ void EditWindow::drawUIFeedback( void ) // EditWindow::drawGrid ======================================================= /** Draw the grid */ //============================================================================= -void EditWindow::drawGrid( void ) +void EditWindow::drawGrid() { // HDC hdc = GetDC( getWindowHandle() ); Int res = TheEditor->getGridResolution(); @@ -1454,7 +1454,7 @@ void EditWindow::drawGrid( void ) // EditWindow::draw =========================================================== /** Draw the edit window */ //============================================================================= -void EditWindow::draw( void ) +void EditWindow::draw() { // allow W3D to update its internals WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds()); @@ -1712,7 +1712,7 @@ void EditWindow::drawImage( const Image *image, // EditWindow::getBackgroundColor ============================================= /** Get the background color for the edit window */ //============================================================================= -RGBColorReal EditWindow::getBackgroundColor( void ) +RGBColorReal EditWindow::getBackgroundColor() { return m_backgroundColor; diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp index 4256b1f851e..0963b8a53c7 100644 --- a/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/GUIEdit.cpp @@ -117,7 +117,7 @@ GUIEdit *TheEditor = nullptr; /** Bring up the standard windows browser save as dialog and return * filename selected */ //============================================================================= -char *GUIEdit::saveAsDialog( void ) +char *GUIEdit::saveAsDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -159,7 +159,7 @@ char *GUIEdit::saveAsDialog( void ) /** Bring up the standard windows browser open dialog and return * filename selected */ //============================================================================= -char *GUIEdit::openDialog( void ) +char *GUIEdit::openDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -409,7 +409,7 @@ void GUIEdit::selectWindowsInRegion( IRegion2D *region ) // GUIEdit::GUIEdit =========================================================== /** */ //============================================================================= -GUIEdit::GUIEdit( void ) +GUIEdit::GUIEdit() { m_appInst = nullptr; @@ -443,7 +443,7 @@ GUIEdit::GUIEdit( void ) // GUIEdit::~GUIEdit ========================================================== /** */ //============================================================================= -GUIEdit::~GUIEdit( void ) +GUIEdit::~GUIEdit() { delete TheHeaderTemplateManager; TheHeaderTemplateManager = nullptr; @@ -463,7 +463,7 @@ GUIEdit::~GUIEdit( void ) // GUIEdit::init ============================================================== /** Initialize all the GUI edit data */ //============================================================================= -void GUIEdit::init( void ) +void GUIEdit::init() { // @@ -615,7 +615,7 @@ void GUIEdit::init( void ) // GUIEdit::shutdown ========================================================== /** Shutdown our GUI edit application */ //============================================================================= -void GUIEdit::shutdown( void ) +void GUIEdit::shutdown() { // write our configuration file @@ -710,7 +710,7 @@ void GUIEdit::shutdown( void ) // GUIEdit::update ============================================================ /** Update method for our GUI edit application */ //============================================================================= -void GUIEdit::update( void ) +void GUIEdit::update() { // update mouse info @@ -1363,7 +1363,7 @@ void GUIEdit::clipCreationParamsToParent( GameWindow *parent, // GUIEdit::deleteAllWindows ================================================== /** Delete all windows in the editor */ //============================================================================= -void GUIEdit::deleteAllWindows( void ) +void GUIEdit::deleteAllWindows() { GameWindow *window, *next; @@ -3334,7 +3334,7 @@ GameWindow *GUIEdit::newStaticText( GameWindow *parent, // GUIEdit::createStatusBar =================================================== /** Create a status bar at the bottom of the editor */ //============================================================================= -void GUIEdit::createStatusBar( void ) +void GUIEdit::createStatusBar() { RECT rect; Int width; @@ -3393,7 +3393,7 @@ void GUIEdit::statusMessage( StatusPart part, const char *message ) // GUIEdit::createToolbar ===================================================== /** Create the toolbar for the editor */ //============================================================================= -void GUIEdit::createToolbar( void ) +void GUIEdit::createToolbar() { } @@ -3405,7 +3405,7 @@ void GUIEdit::createToolbar( void ) // GUIEdit::newLayout ========================================================= /** Reset the editor for a new layout */ //============================================================================= -Bool GUIEdit::newLayout( void ) +Bool GUIEdit::newLayout() { // delete all windows @@ -3426,7 +3426,7 @@ Bool GUIEdit::newLayout( void ) // GUIEdit::menuExit ========================================================== /** The user clicked on exit in the menu and wishes to exit the editor */ //============================================================================= -Bool GUIEdit::menuExit( void ) +Bool GUIEdit::menuExit() { Int result; @@ -3473,7 +3473,7 @@ Bool GUIEdit::menuExit( void ) // GUIEdit::menuNew =========================================================== /** file->new menu option */ //============================================================================= -Bool GUIEdit::menuNew( void ) +Bool GUIEdit::menuNew() { // @@ -3599,7 +3599,7 @@ void GUIEdit::revertDefaultCallbacks( GameWindow *root ) // GUIEdit::menuOpen ========================================================== /** User has clicked on file->open */ //============================================================================= -Bool GUIEdit::menuOpen( void ) +Bool GUIEdit::menuOpen() { char *filePath; @@ -3699,7 +3699,7 @@ Bool GUIEdit::menuOpen( void ) // GUIEdit::menuSave ========================================================== /** file->save menu option */ //============================================================================= -Bool GUIEdit::menuSave( void ) +Bool GUIEdit::menuSave() { Bool success; @@ -3730,7 +3730,7 @@ Bool GUIEdit::menuSave( void ) // GUIEdit::menuSaveAs ======================================================== /** file->saveAs menu option */ //============================================================================= -Bool GUIEdit::menuSaveAs( void ) +Bool GUIEdit::menuSaveAs() { char *filePath; Bool success; @@ -3768,7 +3768,7 @@ Bool GUIEdit::menuSaveAs( void ) // GUIEdit::menuCopy ========================================================== /** Copy selected windows into clipboard */ //============================================================================= -Bool GUIEdit::menuCopy( void ) +Bool GUIEdit::menuCopy() { WindowSelectionEntry *select; @@ -3796,7 +3796,7 @@ Bool GUIEdit::menuCopy( void ) // GUIEdit::menuPaste ========================================================= /** Paste contents of clipboard into current layout */ //============================================================================= -Bool GUIEdit::menuPaste( void ) +Bool GUIEdit::menuPaste() { TheGUIEditWindowManager->pasteClipboard(); @@ -3807,7 +3807,7 @@ Bool GUIEdit::menuPaste( void ) // GUIEdit::menuCut =========================================================== /** Cut selected windows into the clipboard */ //============================================================================= -Bool GUIEdit::menuCut( void ) +Bool GUIEdit::menuCut() { WindowSelectionEntry *select; @@ -3930,7 +3930,7 @@ void GUIEdit::unSelectWindow( GameWindow *window ) // GUIEdit::clearSelections =================================================== /** Clear the entire selection list */ //============================================================================= -void GUIEdit::clearSelections( void ) +void GUIEdit::clearSelections() { while( m_selectList ) @@ -3941,7 +3941,7 @@ void GUIEdit::clearSelections( void ) // GUIEdit::selectionCount ==================================================== /** How many items are selected */ //============================================================================= -Int GUIEdit::selectionCount( void ) +Int GUIEdit::selectionCount() { WindowSelectionEntry *select; Int count = 0; @@ -3998,7 +3998,7 @@ void GUIEdit::notifyNewWindow( GameWindow *window ) // GUIEdit::deleteSelected ==================================================== /** Delete the windows in the selection list */ //============================================================================= -void GUIEdit::deleteSelected( void ) +void GUIEdit::deleteSelected() { Int count = selectionCount(); Int i; @@ -4040,7 +4040,7 @@ void GUIEdit::deleteSelected( void ) * the top of the window stack for all windows, for child windows it will * bring them to the top of the child list for their parent */ //============================================================================= -void GUIEdit::bringSelectedToTop( void ) +void GUIEdit::bringSelectedToTop() { Int count = selectionCount(); @@ -4138,7 +4138,7 @@ void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin, // GUIEdit::getSelectList ===================================================== /** Return the selection list */ //============================================================================= -WindowSelectionEntry *GUIEdit::getSelectList( void ) +WindowSelectionEntry *GUIEdit::getSelectList() { return m_selectList; @@ -4148,7 +4148,7 @@ WindowSelectionEntry *GUIEdit::getSelectList( void ) // GUIEdit::getFirstSelected ================================================== /** Get the first GameWindow * from the selection list */ //============================================================================= -GameWindow *GUIEdit::getFirstSelected( void ) +GameWindow *GUIEdit::getFirstSelected() { if( m_selectList ) diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp index 0ee39f732b9..ebe6e8562aa 100644 --- a/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp @@ -69,7 +69,7 @@ // GUIEditDisplay::GUIEditDisplay ============================================= /** */ //============================================================================= -GUIEditDisplay::GUIEditDisplay( void ) +GUIEditDisplay::GUIEditDisplay() { } @@ -77,7 +77,7 @@ GUIEditDisplay::GUIEditDisplay( void ) // GUIEditDisplay::~GUIEditDisplay ============================================ /** */ //============================================================================= -GUIEditDisplay::~GUIEditDisplay( void ) +GUIEditDisplay::~GUIEditDisplay() { } @@ -151,7 +151,7 @@ void GUIEditDisplay::setClipRegion( IRegion2D *region ) // GUIEditDisplay::isClippingEnabled ============================================== /** returns current state of 2D image clipping */ //============================================================================= -Bool GUIEditDisplay::isClippingEnabled( void ) +Bool GUIEditDisplay::isClippingEnabled() { return TheEditWindow->isClippingEnabled(); } diff --git a/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp b/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp index 0b9574b23b7..6d5df0a8967 100644 --- a/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp @@ -130,7 +130,7 @@ void GUIEditWindowManager::unlinkFromClipboard( GameWindow *window, /** Remove selection entries for child windows that also have ANY of * their parents in the selection list. */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::removeSupervisedChildSelections( void ) +void GUIEditWindowManager::removeSupervisedChildSelections() { WindowSelectionEntry *select, *next; GameWindow *window, *parent; @@ -176,7 +176,7 @@ void GUIEditWindowManager::removeSupervisedChildSelections( void ) * for the transition from "parent space" to "screen space" */ //------------------------------------------------------------------------------------------------- /* -void GUIEditWindowManager::orphanSelectedChildren( void ) +void GUIEditWindowManager::orphanSelectedChildren() { WindowSelectionEntry *select; GameWindow *window, *parent; @@ -218,7 +218,7 @@ void GUIEditWindowManager::orphanSelectedChildren( void ) //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -GUIEditWindowManager::GUIEditWindowManager( void ) +GUIEditWindowManager::GUIEditWindowManager() { m_clipboard = nullptr; @@ -231,7 +231,7 @@ GUIEditWindowManager::GUIEditWindowManager( void ) //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -GUIEditWindowManager::~GUIEditWindowManager( void ) +GUIEditWindowManager::~GUIEditWindowManager() { // the duplicate list is only used in the actual act of pasting @@ -245,7 +245,7 @@ GUIEditWindowManager::~GUIEditWindowManager( void ) //------------------------------------------------------------------------------------------------- /** initialize the system */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::init( void ) +void GUIEditWindowManager::init() { // extending functionality @@ -318,7 +318,7 @@ GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent, //------------------------------------------------------------------------------------------------- /** Destroy all windows in the clipboard */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::resetClipboard( void ) +void GUIEditWindowManager::resetClipboard() { GameWindow *window, *next; @@ -359,7 +359,7 @@ void GUIEditWindowManager::resetClipboard( void ) //------------------------------------------------------------------------------------------------- /** Is the clipboard empty */ //------------------------------------------------------------------------------------------------- -Bool GUIEditWindowManager::isClipboardEmpty( void ) +Bool GUIEditWindowManager::isClipboardEmpty() { if( m_clipboard ) @@ -375,7 +375,7 @@ Bool GUIEditWindowManager::isClipboardEmpty( void ) * child the child will have no parent and will be adjusted to absolute * screen coordinates with no parent */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::cutSelectedToClipboard( void ) +void GUIEditWindowManager::cutSelectedToClipboard() { // @@ -466,7 +466,7 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root ) //------------------------------------------------------------------------------------------------- /** Copy the selected windows to the clipboard */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::copySelectedToClipboard( void ) +void GUIEditWindowManager::copySelectedToClipboard() { // reset the contents of the clipboard @@ -660,7 +660,7 @@ void GUIEditWindowManager::validateClipboardNames( GameWindow *root ) //------------------------------------------------------------------------------------------------- /** Paste the contents of the clipboard into the window world */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::pasteClipboard( void ) +void GUIEditWindowManager::pasteClipboard() { GameWindow *window, *next; GameWindow *firstWindow = nullptr; @@ -1408,7 +1408,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source, /** Create a duplicate everything on the clipboard list and put it * on the m_clipboardDup list for pasting */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::createClipboardDuplicate( void ) +void GUIEditWindowManager::createClipboardDuplicate() { GameWindow *duplicate; GameWindow *window; diff --git a/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp b/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp index bd418c7e5f6..4a88e26f162 100644 --- a/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/HierarchyView.cpp @@ -733,7 +733,7 @@ void HierarchyView::addWindowToTree( GameWindow *window, // HierarchyView::HierarchyView =============================================== /** */ //============================================================================= -HierarchyView::HierarchyView( void ) +HierarchyView::HierarchyView() { m_dialog = nullptr; @@ -749,7 +749,7 @@ HierarchyView::HierarchyView( void ) // HierarchyView::~HierarchyView ============================================== /** */ //============================================================================= -HierarchyView::~HierarchyView( void ) +HierarchyView::~HierarchyView() { // call the shutdown @@ -760,7 +760,7 @@ HierarchyView::~HierarchyView( void ) // HierarchyView::init ========================================================= /** Create the control palette */ //============================================================================= -void HierarchyView::init( void ) +void HierarchyView::init() { RECT dialogRect; RECT appRect; @@ -803,7 +803,7 @@ void HierarchyView::init( void ) // HierarchyView::reset ======================================================= /** Reset everything about our hierarchy view */ //============================================================================= -void HierarchyView::reset( void ) +void HierarchyView::reset() { // reset the tree control @@ -815,7 +815,7 @@ void HierarchyView::reset( void ) // HierarchyView::shutdown ==================================================== /** Destroy the control palette and all data associated with it */ //============================================================================= -void HierarchyView::shutdown( void ) +void HierarchyView::shutdown() { // destroy the control palette window diff --git a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp index 9b41455b9b4..0c45af74c8f 100644 --- a/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp @@ -197,7 +197,7 @@ static void saveData( HWND hWndDialog ) /** Bring up the standard windows browser save as dialog and return * filename selected */ //============================================================================= -char *saveAsDialog( void ) +char *saveAsDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -239,7 +239,7 @@ char *saveAsDialog( void ) /** Bring up the standard windows browser open dialog and return * filename selected */ //============================================================================= -char *openDialog( void ) +char *openDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -1477,7 +1477,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root ) // LayoutScheme::LayoutScheme ================================================= /** */ //============================================================================= -LayoutScheme::LayoutScheme( void ) +LayoutScheme::LayoutScheme() { strcpy( m_schemeFilename, "Default.ls" ); @@ -1495,7 +1495,7 @@ LayoutScheme::LayoutScheme( void ) // LayoutScheme::~LayoutScheme ================================================ /** */ //============================================================================= -LayoutScheme::~LayoutScheme( void ) +LayoutScheme::~LayoutScheme() { Int i; @@ -1519,7 +1519,7 @@ LayoutScheme::~LayoutScheme( void ) // LayoutScheme::init ========================================================= /** Init */ //============================================================================= -void LayoutScheme::init( void ) +void LayoutScheme::init() { Int i; ImageAndColorInfo *info; @@ -2153,7 +2153,7 @@ void LayoutScheme::init( void ) // LayoutScheme::openDialog =================================================== /** Bring up the layout scheme dialog box */ //============================================================================= -void LayoutScheme::openDialog( void ) +void LayoutScheme::openDialog() { // save the scheme instance we're going to open the dialog on diff --git a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp index e32032e8b35..2e6fdf16c87 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp @@ -1719,42 +1719,42 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message, // GetProprsEnabledTextColor ================================================== //============================================================================= -Color GetPropsEnabledTextColor( void ) +Color GetPropsEnabledTextColor() { return textDrawData[ enabledTextIndex ].color; } // GetPropsEnabledTextBorderColor ============================================= //============================================================================= -Color GetPropsEnabledTextBorderColor( void ) +Color GetPropsEnabledTextBorderColor() { return textDrawData[ enabledTextIndex ].borderColor; } // GetProprsDisabledTextColor ================================================= //============================================================================= -Color GetPropsDisabledTextColor( void ) +Color GetPropsDisabledTextColor() { return textDrawData[ disabledTextIndex ].color; } // GetPropsDisabledTextBorderColor ============================================ //============================================================================= -Color GetPropsDisabledTextBorderColor( void ) +Color GetPropsDisabledTextBorderColor() { return textDrawData[ disabledTextIndex ].borderColor; } // GetProprsHiliteTextColor =================================================== //============================================================================= -Color GetPropsHiliteTextColor( void ) +Color GetPropsHiliteTextColor() { return textDrawData[ hiliteTextIndex ].color; } // GetPropsHiliteTextBorderColor ============================================== //============================================================================= -Color GetPropsHiliteTextBorderColor( void ) +Color GetPropsHiliteTextBorderColor() { return textDrawData[ hiliteTextIndex ].borderColor; } diff --git a/Generals/Code/Tools/GUIEdit/Source/Save.cpp b/Generals/Code/Tools/GUIEdit/Source/Save.cpp index 92fd1616a09..f4127d8f6f3 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Save.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Save.cpp @@ -110,7 +110,7 @@ static void writeBufferToFile( FILE *fp, char *buffer ) // clearBufferToSpaces ======================================================== /** Clear the buffer to all spaces */ //============================================================================= -static void clearBufferToSpaces( void ) +static void clearBufferToSpaces() { Int i; diff --git a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index 17f300ca4af..9ce0a98413f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -32,8 +32,8 @@ class WorldHeightMapEdit; class AutoEdgeOutTool : public Tool { public: - AutoEdgeOutTool(void); - virtual ~AutoEdgeOutTool(void) override; + AutoEdgeOutTool(); + virtual ~AutoEdgeOutTool() override; public: /// Perform tool on mouse down. diff --git a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h index 246fdc34872..5d904bfa423 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -62,10 +62,10 @@ class BaseBuildProps : public CDialog public: void setProps(AsciiString name, AsciiString script, Int health, Bool unsellable); - AsciiString getName(void) {return m_name;} - AsciiString getScript(void) {return m_script;} - Int getHealth(void) {return m_health;} - Bool getUnsellable(void) {return m_unsellable;} + AsciiString getName() {return m_name;} + AsciiString getScript() {return m_script;} + Int getHealth() {return m_health;} + Bool getUnsellable() {return m_unsellable;} }; //{{AFX_INSERT_LOCATION}} diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index 70e9cb87269..354dc25c9ff 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -35,8 +35,8 @@ class BlendEdgeTool : public Tool Coord3D m_downPt; public: - BlendEdgeTool(void); - virtual ~BlendEdgeTool(void) override; + BlendEdgeTool(); + virtual ~BlendEdgeTool() override; public: /// Perform tool on mouse down. diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h index 62e6ac63f3d..da4d6558e02 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -68,12 +68,12 @@ class BlendMaterial : public COptionsPanel CTreeCtrl m_terrainTreeView; protected: - void updateTextures(void); + void updateTextures(); void addTerrain(const char *pPath, Int terrainNdx, HTREEITEM parent); HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel); public: - static Int getBlendTexClass(void) {return m_currentBlendTexture;} + static Int getBlendTexClass() {return m_currentBlendTexture;} static void setBlendTexClass(Int texClass); diff --git a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h index 0e709b485aa..8991e5cdbca 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h @@ -34,13 +34,13 @@ class BorderTool : public Tool BorderTool(); virtual ~BorderTool() override; - Int getToolID(void) {return m_toolID;} - virtual void setCursor(void) override; + Int getToolID() {return m_toolID;} + virtual void setCursor() override; virtual void activate() override; virtual void deactivate() override; - virtual Bool followsTerrain(void) override { return false; } + virtual Bool followsTerrain() override { return false; } virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; diff --git a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h index 6901e6e162e..57cb0161792 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h @@ -41,13 +41,13 @@ class BrushTool : public Tool static Int m_brushHeight; public: - BrushTool(void); - virtual ~BrushTool(void) override; + BrushTool(); + virtual ~BrushTool() override; public: - static Int getWidth(void) {return m_brushWidth;}; ///loadSides();}; + static void update() {if (m_staticThis) m_staticThis->loadSides();}; static void setSelectedBuildList(BuildListInfo *pInfo); virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h index d8dcb517bd6..9f15f6feacf 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -55,23 +55,23 @@ class BuildListTool : public Tool static Bool m_isActive; public: - BuildListTool(void); - virtual ~BuildListTool(void) override; + BuildListTool(); + virtual ~BuildListTool() override; private: - void createWindow(void); - Bool isDoingAdd(void); + void createWindow(); + Bool isDoingAdd(); public: - static void addBuilding(void); - static Bool isActive(void) {return m_isActive;}; + static void addBuilding(); + static Bool isActive() {return m_isActive;}; public: /// Perform tool on mouse down. virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual void setCursor(void) override; + virtual void setCursor() override; virtual void activate() override; ///< Become the current tool. virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h index 9f018c49898..41626175d87 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -24,7 +24,7 @@ class CButtonShowColor : public CButton RGBColor m_color; public: - const RGBColor& getColor(void) const { return m_color; } + const RGBColor& getColor() const { return m_color; } void setColor(Int color) { m_color.setFromInt(color); } void setColor(const RGBColor& color) { m_color = color; } virtual ~CButtonShowColor() override; diff --git a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h index 1e58deaa547..e136336dac1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h @@ -40,17 +40,17 @@ class Undoable : public RefCountClass Undoable *mNext; public: - Undoable(void); + Undoable(); - virtual ~Undoable(void) override; + virtual ~Undoable() override; public: - virtual void Do(void)=0; ///< pure virtual. - virtual void Undo(void)=0;///< pure virtual. - virtual void Redo(void); + virtual void Do()=0; ///< pure virtual. + virtual void Undo()=0;///< pure virtual. + virtual void Redo(); void LinkNext(Undoable *pNext); - Undoable *GetNext(void) {return mNext;}; + Undoable *GetNext() {return mNext;}; }; @@ -77,10 +77,10 @@ class WBDocUndoable : public Undoable WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtMap, Coord3D *pObjOffset = nullptr); // destructor. - virtual ~WBDocUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; - virtual void Redo(void) override; + virtual ~WBDocUndoable() override; + virtual void Do() override; + virtual void Undo() override; + virtual void Redo() override; }; @@ -99,9 +99,9 @@ class AddObjectUndoable : public Undoable AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectToAdd); // destructor. - virtual ~AddObjectUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~AddObjectUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; @@ -146,11 +146,11 @@ class ModifyObjectUndoable : public Undoable public: ModifyObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - virtual ~ModifyObjectUndoable(void) override; + virtual ~ModifyObjectUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; - virtual void Redo(void) override; + virtual void Do() override; + virtual void Undo() override; + virtual void Redo() override; void SetOffset(Real x, Real y); void SetZOffset(Real z); @@ -188,11 +188,11 @@ class ModifyFlagsUndoable : public Undoable public: ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, Int flagValue); // destructor. - virtual ~ModifyFlagsUndoable(void) override; + virtual ~ModifyFlagsUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; - virtual void Redo(void) override; + virtual void Do() override; + virtual void Undo() override; + virtual void Redo() override; }; @@ -205,10 +205,10 @@ class SidesListUndoable : public Undoable public: SidesListUndoable(const SidesList& newSL, CWorldBuilderDoc *pDoc); - virtual ~SidesListUndoable(void) override; + virtual ~SidesListUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual void Do() override; + virtual void Undo() override; }; @@ -231,10 +231,10 @@ class DictItemUndoable : public Undoable // if you want to substitute the entire contents of the new dict, pass NAMEKEY_INVALID. DictItemUndoable(Dict **d, Dict data, NameKeyType key, Int dictsToModify = 1, CWorldBuilderDoc *pDoc = nullptr, Bool inval = false); // destructor. - virtual ~DictItemUndoable(void) override; + virtual ~DictItemUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual void Do() override; + virtual void Undo() override; }; @@ -246,7 +246,7 @@ class DeleteInfo { public: DeleteInfo(MapObject *pObjToDelete); - ~DeleteInfo(void); + ~DeleteInfo(); void DoDelete(WorldHeightMapEdit *pMap); void UndoDelete(WorldHeightMapEdit *pMap); @@ -267,9 +267,9 @@ class DeleteObjectUndoable : public Undoable DeleteObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - virtual ~DeleteObjectUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~DeleteObjectUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// AddPolygonUndoable @@ -282,9 +282,9 @@ class AddPolygonUndoable : public Undoable public: AddPolygonUndoable( PolygonTrigger *pTrig); // destructor. - virtual ~AddPolygonUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~AddPolygonUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// AddPolygonPointUndoable @@ -297,9 +297,9 @@ class AddPolygonPointUndoable : public Undoable public: AddPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt); // destructor. - virtual ~AddPolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~AddPolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// ModifyPolygonPointUndoable @@ -314,9 +314,9 @@ class ModifyPolygonPointUndoable : public Undoable public: ModifyPolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - virtual ~ModifyPolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~ModifyPolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// MovePolygonUndoable @@ -330,12 +330,12 @@ class MovePolygonUndoable : public Undoable public: MovePolygonUndoable(PolygonTrigger *pTrig); // destructor. - virtual ~MovePolygonUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~MovePolygonUndoable() override; + virtual void Do() override; + virtual void Undo() override; void SetOffset(const ICoord3D &offset); - PolygonTrigger *getTrigger(void) {return m_trigger;} + PolygonTrigger *getTrigger() {return m_trigger;} }; /// InsertPolygonPointUndoable @@ -349,9 +349,9 @@ class InsertPolygonPointUndoable : public Undoable public: InsertPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt, Int ndx); // destructor. - virtual ~InsertPolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~InsertPolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// DeletePolygonPointUndoable @@ -365,9 +365,9 @@ class DeletePolygonPointUndoable : public Undoable public: DeletePolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - virtual ~DeletePolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~DeletePolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// DeletePolygonUndoable @@ -380,7 +380,7 @@ class DeletePolygonUndoable : public Undoable public: DeletePolygonUndoable(PolygonTrigger *pTrig); // destructor. - virtual ~DeletePolygonUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~DeletePolygonUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h index 15b559a6cd5..f336a35c636 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -65,7 +65,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner void putReal( Int ctrlID, Real val ); void putAsciiString( Int ctrlID, AsciiString val ); BOOL getReal( Int ctrlID, Real *rVal ); - void stuffValuesIntoFields( void ); + void stuffValuesIntoFields(); void applyCameraPitch( Real pitch ); WBPopupSliderButton m_pitchPopup; @@ -78,7 +78,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner virtual void PopSliderFinished(const long sliderID, long theVal) override; public: - void update( void ); + void update(); }; diff --git a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h index 5fb0ca63b33..7618374ebf4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h @@ -30,7 +30,7 @@ class CellWidth : public CDialog public: CellWidth(int cellWidth, CWnd* pParent = nullptr); // standard constructor - int GetCellWidth(void) {return mCellWidth;}; + int GetCellWidth() {return mCellWidth;}; // Dialog Data //{{AFX_DATA(CellWidth) enum { IDD = IDD_CellWidth }; diff --git a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h index 36a1483e276..87386b4b592 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -73,9 +73,9 @@ class ContourOptions : public CDialog CSliderCtrl m_contourWidthSlider; ///< Brush width slider control. public: - static Int getContourWidth(void) {return m_contourWidth;}; ///m_meshModelName; return "";}; + static Bool isDoingPreview() {return m_doingPreview;}; + static Bool isRaisingOnly() {return m_raiseOnly;}; + static Bool isLoweringOnly() {return m_lowerOnly;}; + static AsciiString getModelName() {if (m_staticThis) return m_staticThis->m_meshModelName; return "";}; public: //PopupSliderOwner methods. virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h index a9f239649bc..e56928da369 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -41,8 +41,8 @@ class MeshMoldTool : public Tool static WorldHeightMapEdit *m_htMapEditCopy; ///< ref counted. public: - MeshMoldTool(void); - virtual ~MeshMoldTool(void) override; + MeshMoldTool(); + virtual ~MeshMoldTool() override; protected: static void applyMesh(CWorldBuilderDoc *pDoc); ///< Apply the mesh to copy of terrain. @@ -53,10 +53,10 @@ class MeshMoldTool : public Tool virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual WorldHeightMapEdit *getHeightMap() override {return m_htMapEditCopy;}; virtual void activate() override; ///< Become the current tool. virtual void deactivate() override; ///< Become the current tool. - virtual Bool followsTerrain(void) override {return false;}; + virtual Bool followsTerrain() override {return false;}; public: // Methods specific to MeshMoldTool. static void updateMeshLocation(Bool changePreview); diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h index 3286bf485d4..718959d6d7d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h @@ -41,14 +41,14 @@ class MoundTool : public Tool static Int m_brushFeather; public: - MoundTool(void); - virtual ~MoundTool(void) override; + MoundTool(); + virtual ~MoundTool() override; public: - static Int getMoundHeight(void) {return m_moundHeight;}; + static Int getMoundHeight() {return m_moundHeight;}; static void setMoundHeight(Int height); - static Int getWidth(void) {return m_brushWidth;}; ///= m_numberOfRoads);} - static Bool isAngled(void) {return m_angleCorners;} - static Bool isTightCurve(void) {return m_tightCurve;} - static Bool isJoin(void) {return m_doJoin;} - static void updateSelection(void); - static Bool selectionIsRoadsOnly(void); - void applyToSelection(void); + static AsciiString getCurRoadName() {return m_currentRoadName;} + static Bool isBridge() {return (m_currentRoadIndex >= m_numberOfRoads);} + static Bool isAngled() {return m_angleCorners;} + static Bool isTightCurve() {return m_tightCurve;} + static Bool isJoin() {return m_doJoin;} + static void updateSelection(); + static Bool selectionIsRoadsOnly(); + void applyToSelection(); }; //{{AFX_INSERT_LOCATION}} diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h index 100c720386d..bf11a057f5b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h @@ -42,8 +42,8 @@ class RoadTool : public Tool MapObject* findSegment(const Coord3D *pLoc, Coord3D *outLoc); public: - RoadTool(void); - virtual ~RoadTool(void) override; + RoadTool(); + virtual ~RoadTool() override; public: static Bool snap(Coord3D *pLoc, Bool skipLast); diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h index 45b8d6a1a5f..6b7c1d5930b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -64,8 +64,8 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner DECLARE_MESSAGE_MAP() private: - static MapObject *getSingleSelectedScorch(void); - void updateTheUI(void); + static MapObject *getSingleSelectedScorch(); + void updateTheUI(); WBPopupSliderButton m_radiusPopup; std::vector m_allSelectedDicts; Bool m_updating; ///>28)&0x0F; m_playerIndex = ((i)>>24)&0x0F; m_groupIndex = ((i)>>12)&0x0FFF; m_scriptIndex = (i)&0x0FFF;} }; @@ -80,12 +80,12 @@ class ScriptDialog : public CDialog // Implementation public: - static void updateWarnings(void); + static void updateWarnings(); static void updateScriptWarning(Script *pScript); /// To allow CSDTreeCtrl access to these member functions of ScriptDialog - Script *friend_getCurScript(void); - ScriptGroup *friend_getCurGroup(void); + Script *friend_getCurScript(); + ScriptGroup *friend_getCurGroup(); protected: ListType m_curSelection; @@ -107,8 +107,8 @@ class ScriptDialog : public CDialog HTREEITEM addPlayer(Int playerIndx); void addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList *pSL); void doDropOn(HTREEITEM hDrop, HTREEITEM hTarget); - Script *getCurScript(void); - ScriptGroup *getCurGroup(void); + Script *getCurScript(); + ScriptGroup *getCurGroup(); void reloadPlayer(Int playerIndex, ScriptList *pSL); HTREEITEM findItem(ListType sel, Bool failSafe = FALSE); void insertScript(Script *pNewScript); diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h index e7770f5d4c4..62148a16f20 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -54,7 +54,7 @@ class ScriptProperties : public CPropertyPage public: void setScript(Script *pScript) {m_script = pScript;} protected: - void enableControls(void); + void enableControls(); protected: Script *m_script; diff --git a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h index ba5cee3b42a..257f977798b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -52,7 +52,7 @@ class ShadowOptions : public CDialog Real m_intensity; protected: - void setShadowColor(void); + void setShadowColor(); // Generated message map functions //{{AFX_MSG(ShadowOptions) diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h index a971e7b2e28..9808eb5d000 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -82,21 +82,21 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner protected: void addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent); HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel); - void updateLabel(void); + void updateLabel(); public: - static Int getFgTexClass(void) {return m_currentFgTexture;} - static Int getBgTexClass(void) {return m_currentBgTexture;} + static Int getFgTexClass() {return m_currentFgTexture;} + static Int getBgTexClass() {return m_currentBgTexture;} static void setFgTexClass(Int texClass); static void setBgTexClass(Int texClass); static void updateTextures(WorldHeightMapEdit *pMap); - static void updateTextureSelection(void); + static void updateTextureSelection(); static void setToolOptions(Bool singleCell); static void setWidth(Int width); - static Bool isPaintingPathingInfo(void) {return m_paintingPathingInfo;} - static Bool isPaintingPassable(void) {return m_paintingPassable;} + static Bool isPaintingPathingInfo() {return m_paintingPathingInfo;} + static Bool isPaintingPassable() {return m_paintingPassable;} public: Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection); diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h index 6e3e527eba9..85b073e8082 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -67,12 +67,12 @@ class TerrainModal : public CDialog protected: void addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent); HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel); - void updateLabel(void); - void updateTextures(void); + void updateLabel(); + void updateTextures(); Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection); public: - Int getNewNdx(void) {return m_currentFgTexture;}; + Int getNewNdx() {return m_currentFgTexture;}; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/TileTool.h b/Generals/Code/Tools/WorldBuilder/include/TileTool.h index 49a7d408154..8fe8a0ee1d0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TileTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/TileTool.h @@ -35,16 +35,16 @@ class TileTool : public Tool CPoint m_prevViewPt; public: - TileTool(void); - virtual ~TileTool(void) override; + TileTool(); + virtual ~TileTool() override; public: virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual WorldHeightMapEdit *getHeightMap() override {return m_htMapEditCopy;}; virtual void activate() override; ///< Become the current tool. - virtual Int getWidth(void) {return 1;}; + virtual Int getWidth() {return 1;}; }; /************************************************************************* @@ -60,9 +60,9 @@ class BigTileTool : public TileTool virtual void activate() override; ///< Become the current tool. public: - BigTileTool(void); + BigTileTool(); static void setWidth(Int width) ; - virtual Int getWidth(void) override {return m_currentWidth;}; + virtual Int getWidth() override {return m_currentWidth;}; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/Tool.h b/Generals/Code/Tools/WorldBuilder/include/Tool.h index 670a74c9214..8aa9b8baa71 100644 --- a/Generals/Code/Tools/WorldBuilder/include/Tool.h +++ b/Generals/Code/Tools/WorldBuilder/include/Tool.h @@ -61,21 +61,21 @@ class Tool Int m_prevYIndex; public: Tool(Int toolID, Int cursorID); - virtual ~Tool(void); + virtual ~Tool(); public: - Int getToolID(void) {return m_toolID;} - virtual void setCursor(void); + Int getToolID() {return m_toolID;} + virtual void setCursor(); virtual void activate(); ///< Become the current tool. virtual void deactivate(){}; ///< Become not the current tool. - virtual Bool followsTerrain(void) {return true;}; ///< True if the tool tracks the terrain, generally false if it modifies the terrain heights. + virtual Bool followsTerrain() {return true;}; ///< True if the tool tracks the terrain, generally false if it modifies the terrain heights. virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) {} virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) {} virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) {} - virtual WorldHeightMapEdit *getHeightMap(void) {return nullptr;} + virtual WorldHeightMapEdit *getHeightMap() {return nullptr;} static Real calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth); static Real calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth); diff --git a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h index e0f87d25261..b680e82bbdf 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -24,7 +24,7 @@ class WBHeightMap : public HeightMapRenderObjClass { public: - WBHeightMap(void); + WBHeightMap(); ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) @@ -36,11 +36,11 @@ class WBHeightMap : public HeightMapRenderObjClass virtual Real getMaxCellHeight(Real x, Real y); ///< returns maximum height of the 4 cell corners. void setDrawEntireMap(Bool entire) {m_drawEntireMap = entire;}; - Bool getDrawEntireMap(void) {return m_drawEntireMap;}; + Bool getDrawEntireMap() {return m_drawEntireMap;}; void setFlattenHeights(Bool flat); protected: - void flattenHeights(void); + void flattenHeights(); protected: Bool m_drawEntireMap; Bool m_flattenHeights; diff --git a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h index 8ffd9bb9672..e923b87c432 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -36,7 +36,7 @@ class CProcessNode CProcessNode *m_next; public: CProcessNode(Int x, Int y):m_x(x),m_y(y),m_next(nullptr),m_len(0) {}; - ~CProcessNode(void) { }; + ~CProcessNode() { }; }; #define MAX_TILES_PER_CLASS 100 @@ -73,7 +73,7 @@ class WorldHeightMapEdit : public WorldHeightMap static void loadBitmap(char *path, const char *uiName); static void loadDirectoryOfImages(const char *path); static void loadImagesFromTerrainType( TerrainType *terrain ); - static void loadBaseImages(void); + static void loadBaseImages(); Int allocateTiles(Int textureClass); Int allocateEdgeTiles(Int textureClass); void blendToThisClass(Int xIndex, Int yIndex, Int textureClass, Int edgeClass); @@ -96,18 +96,18 @@ class WorldHeightMapEdit : public WorldHeightMap WorldHeightMapEdit(Int xExtent, Int yExtent, UnsignedByte initialHeight, Int border); ///< create. WorldHeightMapEdit(WorldHeightMapEdit *pThis); ///< duplicate. WorldHeightMapEdit(ChunkInputStream *pStrm); ///< read from file. - virtual ~WorldHeightMapEdit(void) override; ///< destroy. + virtual ~WorldHeightMapEdit() override; ///< destroy. void saveToFile(DataChunkOutput &chunkWriter); - WorldHeightMapEdit *duplicate(void); + WorldHeightMapEdit *duplicate(); - static void init(void); - static void shutdown(void); + static void init(); + static void shutdown(); public: /// Status methods. - void clearStatus(void) {m_warnTooManyTex = false;m_warnTooManyBlend = false;}; - Bool tooManyTextures(void) {return m_warnTooManyTex;}; - Bool tooManyBlends(void) {return m_warnTooManyBlend;}; + void clearStatus() {m_warnTooManyTex = false;m_warnTooManyBlend = false;}; + Bool tooManyTextures() {return m_warnTooManyTex;}; + Bool tooManyBlends() {return m_warnTooManyBlend;}; Bool canFitTexture(Int textureClass); ///< Returns true if we can fit this texture. public: // Editing methods. @@ -120,44 +120,44 @@ class WorldHeightMapEdit : public WorldHeightMap void setCliff(Int xIndex, Int yIndex, Bool impassable) {setCliffState(xIndex, yIndex, impassable);} Bool setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bool singleTile); Bool floodFill(Int xIndex, Int yIndex, Int textureClass, Bool doReplace); - static Int getNumTexClasses(void) {return m_numGlobalTextureClasses;}; + static Int getNumTexClasses() {return m_numGlobalTextureClasses;}; static AsciiString getTexClassName(int ndx) {return m_globalTextureClasses[ndx].name;} static AsciiString getTexClassUiName(int ndx) ; static Int getTexClassNumTiles(int ndx) {return m_globalTextureClasses[ndx].numTiles;} static Int getTexClassIsBlendEdge(int ndx) {return m_globalTextureClasses[ndx].isBlendEdgeTile;} void addObject(MapObject *pMapObj); ///< Adds a map object to the front of the list. - void removeFirstObject(void); ///< Removes the first map object from the list. + void removeFirstObject(); ///< Removes the first map object from the list. Bool isTexClassUsed(Int textureClass); Int getFirstTile(Int textureClass); - Bool optimizeTiles(void); ///< Optimizes tile allocations. + Bool optimizeTiles(); ///< Optimizes tile allocations. - void showTileStatusInfo(void); ///< pops up a dialog box with tile mem usage. + void showTileStatusInfo(); ///< pops up a dialog box with tile mem usage. - Bool selectDuplicates(void); ///< Selects any dupicate map objects. - Bool selectSimilar(void); ///< Selects any dupicate map objects. - Bool selectInvalidTeam(void); ///< Selects any objects with invalid teams. + Bool selectDuplicates(); ///< Selects any dupicate map objects. + Bool selectSimilar(); ///< Selects any dupicate map objects. + Bool selectInvalidTeam(); ///< Selects any objects with invalid teams. Bool resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom, Bool anchorLeft, Bool anchorRight, Coord3D *pObjOffset); - Bool remapTextures(void); ///< returns true if the operation had an effect. - void reloadTextures(void); ///< Reloads textures from disk. - void resetResources(void); ///< Releases textures in preparation for device reset. + Bool remapTextures(); ///< returns true if the operation had an effect. + void reloadTextures(); ///< Reloads textures from disk. + void resetResources(); ///< Releases textures in preparation for device reset. Bool getRawTileData(Short tileNdx, Int width, UnsignedByte *buffer, Int bufLen); - void dbgVerifyAfterUndo(void); ///< Verifies the structures are still consistent. + void dbgVerifyAfterUndo(); ///< Verifies the structures are still consistent. Bool doCliffAdjustment(Int xIndex, Int yIndex); - Bool removeCliffMapping(void); + Bool removeCliffMapping(); - Int getNumBoundaries(void) const ; + Int getNumBoundaries() const ; void getBoundary(Int ndx, ICoord2D* border) const; void addBoundary(ICoord2D* boundaryToAdd); void changeBoundary(Int ndx, ICoord2D *border); - void removeLastBoundary(void); + void removeLastBoundary(); // outNdx must not be null, but outHandle can be. // outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h index 87724084b08..be33616feef 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -77,18 +77,18 @@ class WaterOptions : public COptionsPanel, public PopupSliderOwner static Int m_waterPointSpacing; static Bool m_creatingWaterAreas; ///< True if we are creating flood fill water polygons, rather than dropping single points. protected: - void updateTheUI(void); - void startUpdateHeight(void); - void updateHeight(void); - void endUpdateHeight(void); + void updateTheUI(); + void startUpdateHeight(); + void updateHeight(); + void endUpdateHeight(); PolygonTrigger *adjustCount(PolygonTrigger *trigger, Int firstPt, Int lastPt, Int desiredPointCount); public: - static void update(void); + static void update(); static void setHeight(Int height); - static Int getHeight(void) { return m_waterHeight;}; - static Int getSpacing(void) { return m_waterPointSpacing;}; - static Bool getCreatingWaterAreas(void) {return m_creatingWaterAreas;} + static Int getHeight() { return m_waterHeight;}; + static Int getSpacing() { return m_waterPointSpacing;}; + static Bool getCreatingWaterAreas() {return m_creatingWaterAreas;} public: diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h index 13d4aafc544..ab9d9b5768f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h @@ -35,8 +35,8 @@ class MovePolygonUndoable; class WaterTool : public PolygonTool { public: - WaterTool(void); - virtual ~WaterTool(void) override; + WaterTool(); + virtual ~WaterTool() override; protected: static Bool m_water_isActive; @@ -44,14 +44,14 @@ class WaterTool : public PolygonTool Real m_currentZ; public: - static Bool isActive(void) {return m_water_isActive;}; + static Bool isActive() {return m_water_isActive;}; public: /// Perform tool on mouse down. virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual void setCursor(void) override; + virtual void setCursor() override; virtual void activate() override; ///< Become the current tool. virtual void deactivate() override; ///< Become not the current tool. diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h index e8f048c250f..82cef5f241a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -75,13 +75,13 @@ class WaypointOptions : public COptionsPanel MovePolygonUndoable *m_moveUndoable; Int m_originalHeight; protected: - void updateTheUI(void); + void updateTheUI(); void changeWaypointLabel(Int editControlID, NameKeyType key); public: - static void update(void); - static MapObject *getSingleSelectedWaypoint(void); - static PolygonTrigger *getSingleSelectedPolygon(void); + static void update(); + static MapObject *getSingleSelectedWaypoint(); + static PolygonTrigger *getSingleSelectedPolygon(); static Bool isUnique(AsciiString name, MapObject* theMapObj = nullptr); static AsciiString GenerateUniqueName(Int id); diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h index ab6ff0cc87b..bed8c54f862 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -33,8 +33,8 @@ class MapObject; class WaypointTool : public Tool { public: - WaypointTool(void); - virtual ~WaypointTool(void) override; + WaypointTool(); + virtual ~WaypointTool() override; protected: Int m_downWaypointID; @@ -45,7 +45,7 @@ class WaypointTool : public Tool MapObject *pickWaypoint(Coord3D loc); public: - static Bool isActive(void) {return m_isActive;}; + static Bool isActive() {return m_isActive;}; public: /// Perform tool on mouse down. diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h index 5c3a5f6d95b..d4d4d90cf57 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -132,7 +132,7 @@ class CWorldBuilderApp : public CWinApp MapObject *m_pasteMapObjList; ///< List of copied/cut map objects. protected: - void deletePasteObjList(void) + void deletePasteObjList() { deleteInstance(m_pasteMapObjList); m_pasteMapObjList = nullptr; @@ -143,13 +143,13 @@ class CWorldBuilderApp : public CWinApp CDocTemplate *Get3dTemplate() { return m_3dtemplate; } /// Set the brush tool as the active tool. - void selectBrushTool(void) { setActiveTool(&m_brushTool); } + void selectBrushTool() { setActiveTool(&m_brushTool); } /// Set the pointer tool as the active tool. - void selectPointerTool(void); + void selectPointerTool(); /// Set the hand tool as the cur tool (but not active tool) - void selectHandToolTemp(void) { m_curTool = &m_handScrollTool; } + void selectHandToolTemp() { m_curTool = &m_handScrollTool; } /// Set the tool that will be active. void setActiveTool(Tool *newTool); @@ -163,17 +163,17 @@ class CWorldBuilderApp : public CWinApp void updateCurTool(Bool forceHand); /// Switch to the poly tool if we aren't already. - void setPolyTool(void){ setActiveTool(&m_polygonTool); }; + void setPolyTool(){ setActiveTool(&m_polygonTool); }; /// Return true if the hand scroll tool is active. - Bool isHandScroll(void) {return m_curTool == &m_handScrollTool; } + Bool isHandScroll() {return m_curTool == &m_handScrollTool; } void lockCurTool() { DEBUG_ASSERTCRASH(!m_lockCurTool,("already locked")); m_lockCurTool = 1; } void unlockCurTool() { m_lockCurTool = 0; } Bool isCurToolLocked() { return m_lockCurTool != 0; } /// Note - read only data - make yourself a copy. - MapObject *getMapObjPasteList(void) { return(m_pasteMapObjList);}; + MapObject *getMapObjPasteList() { return(m_pasteMapObjList);}; /// Note - the app owns this, and will delete it on close. void setMapObjPasteList(MapObject *list) { deletePasteObjList(); m_pasteMapObjList = list; }; diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h index 96007913bc9..84bc70e6292 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -69,25 +69,25 @@ class CWorldBuilderDoc : public CDocument } m_waypointLinks[MAX_WAYPOINTS]; Int m_numWaypointLinks; protected: - void updateWaypointTable(void); - void compressWaypointIds(void); + void updateWaypointTable(); + void compressWaypointIds(); void updateLWL(MapObject *pWay, MapObject *pSrcWay); public: void addWaypointLink(Int waypointID1, Int waypointID2); void removeWaypointLink(Int waypointID1, Int waypointID2); MapObject *getWaypointByID(Int waypointID); - Int getNumWaypointLinks(void) {return m_numWaypointLinks;}; + Int getNumWaypointLinks() {return m_numWaypointLinks;}; void getWaypointLink(Int ndx, Int *waypoint1, Int *waypointID2); Bool waypointLinkExists(Int waypointID1, Int waypointID2); Bool isWaypointLinked(MapObject *pWay); void updateLinkedWaypointLabels(MapObject *pWay); // Boundary stuff - Int getNumBoundaries(void) const ; + Int getNumBoundaries() const ; void getBoundary(Int ndx, ICoord2D* border) const; void addBoundary(ICoord2D* boundaryToAdd); void changeBoundary(Int ndx, ICoord2D *border); - void removeLastBoundary(void); + void removeLastBoundary(); // outNdx must not be null, but outHandle can be. // outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR @@ -141,14 +141,14 @@ class CWorldBuilderDoc : public CDocument void syncViewCenters(Real x, Real y); - Bool needAutoSave(void) {return m_needAutosave;}; + Bool needAutoSave() {return m_needAutosave;}; - Int getNextWaypointID(void) { return ++m_curWaypointID;}; + Int getNextWaypointID() { return ++m_curWaypointID;}; void setNextWaypointID(Int newMax) { if (newMax>m_curWaypointID) m_curWaypointID = newMax;}; - void autoSave(void); - void validate(void); + void autoSave(); + void validate(); // Operations public: diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h index 5493e9319be..7543200ae7c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -100,13 +100,13 @@ class CWorldBuilderView : public WbView public: /// Get the current draw size in pixels in the 2d window of one height map cell. - Int getCellSize(void) {return m_cellSize;} + Int getCellSize() {return m_cellSize;} /// Sets the current draw size. void setCellSize(Int cellSize); /// Set whether contours are drawn. - Bool getShowContours(void) {return m_showContours;} + Bool getShowContours() {return m_showContours;} /// Set whether contours are drawn. void setShowContours(Bool show); /// Update the center to match a center point from the 3d view. diff --git a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h index fe863cfeaed..2f15bcf5fa6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -60,7 +60,7 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner // Implementation protected: - void getAllSelectedDicts(void); + void getAllSelectedDicts(); Dict** getAllSelectedDictsData(); static MapObjectProps *TheMapObjectProps; @@ -70,7 +70,7 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner const char* m_title; MapObject *m_selectedObject; - void updateTheUI(void); + void updateTheUI(); void enableButtons(); int getSel(); WBPopupSliderButton m_heightSlider; @@ -89,63 +89,63 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner afx_msg void OnDblclkProperties(); virtual void OnOK() override; virtual void OnCancel() override; - afx_msg void _TeamToDict(void); - afx_msg void _NameToDict(void); - afx_msg void _HealthToDict(void); - afx_msg void _EnabledToDict(void); - afx_msg void _ScriptToDict(void); - afx_msg void _IndestructibleToDict(void); - afx_msg void _UnsellableToDict(void); + afx_msg void _TeamToDict(); + afx_msg void _NameToDict(); + afx_msg void _HealthToDict(); + afx_msg void _EnabledToDict(); + afx_msg void _ScriptToDict(); + afx_msg void _IndestructibleToDict(); + afx_msg void _UnsellableToDict(); afx_msg void _TargetableToDict(); - afx_msg void _PoweredToDict(void); - afx_msg void _AggressivenessToDict(void); - afx_msg void _VisibilityToDict(void); - afx_msg void _VeterancyToDict(void); - afx_msg void _ShroudClearingDistanceToDict(void); - afx_msg void _RecruitableAIToDict(void); - afx_msg void _SelectableToDict(void); - afx_msg void _WeatherToDict(void); - afx_msg void _TimeToDict(void); - afx_msg void _PrebuiltUpgradesToDict(void); - afx_msg void SetZOffset(void); - afx_msg void SetAngle(void); + afx_msg void _PoweredToDict(); + afx_msg void _AggressivenessToDict(); + afx_msg void _VisibilityToDict(); + afx_msg void _VeterancyToDict(); + afx_msg void _ShroudClearingDistanceToDict(); + afx_msg void _RecruitableAIToDict(); + afx_msg void _SelectableToDict(); + afx_msg void _WeatherToDict(); + afx_msg void _TimeToDict(); + afx_msg void _PrebuiltUpgradesToDict(); + afx_msg void SetZOffset(); + afx_msg void SetAngle(); afx_msg void _HPsToDict(); - afx_msg void _StoppingDistanceToDict(void); + afx_msg void _StoppingDistanceToDict(); //}}AFX_MSG DECLARE_MESSAGE_MAP() - void _DictToTeam(void); - void _DictToName(void); - void _DictToHealth(void); - void _DictToHPs(void); - void _DictToEnabled(void); - void _DictToScript(void); - void _DictToDestructible(void); - void _DictToUnsellable(void); - void _DictToTargetable(void); - - void _DictToPowered(void); - void _DictToAggressiveness(void); - void _DictToVisibilityRange(void); - void _DictToVeterancy(void); - void _DictToShroudClearingDistance(void); + void _DictToTeam(); + void _DictToName(); + void _DictToHealth(); + void _DictToHPs(); + void _DictToEnabled(); + void _DictToScript(); + void _DictToDestructible(); + void _DictToUnsellable(); + void _DictToTargetable(); + + void _DictToPowered(); + void _DictToAggressiveness(); + void _DictToVisibilityRange(); + void _DictToVeterancy(); + void _DictToShroudClearingDistance(); void _DictToRecruitableAI(); - void _DictToSelectable(void); - void _DictToWeather(void); - void _DictToTime(void); + void _DictToSelectable(); + void _DictToWeather(); + void _DictToTime(); void ShowZOffset(MapObject* pMapObj); void ShowAngle(MapObject* pMapObj); - void _DictToStoppingDistance(void); - void _DictToPrebuiltUpgrades(void); + void _DictToStoppingDistance(); + void _DictToPrebuiltUpgrades(); public: virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; virtual void PopSliderChanged(const long sliderID, long theVal) override; virtual void PopSliderFinished(const long sliderID, long theVal) override; - static MapObject *getSingleSelectedMapObject(void); - static void update(void); + static MapObject *getSingleSelectedMapObject(); + static void update(); }; diff --git a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h index 6912bb08fa4..f71fbab636a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -55,8 +55,8 @@ class PlayerListDlg : public CDialog Int m_curPlayerIdx; CButtonShowColor m_colorButton; - void updateTheUI(void); - void PopulateColorComboBox(void); + void updateTheUI(); + void PopulateColorComboBox(); void SelectColor(RGBColor rgb); // Generated message map functions diff --git a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h index b3c87cc141f..7999ee053ce 100644 --- a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -82,12 +82,12 @@ class CTeamsDialog : public CDialog }; void updateUI(Int whatToRebuild); - void validateTeamOwners( void ); + void validateTeamOwners(); Bool isValidTeamOwner( AsciiString ownerName ); void doCorrectTeamOwnerDialog( TeamsInfo *ti ); private: - void UpdateTeamsList(void); + void UpdateTeamsList(); }; diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview.h b/Generals/Code/Tools/WorldBuilder/include/wbview.h index 70cd70ee770..5612fa7264d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview.h @@ -118,8 +118,8 @@ class WbView : public CView virtual void rotateCamera(Real delta) { } virtual void pitchCamera(Real delta) { } - virtual Int getPickPixels(void) {return 4;} - virtual EditorSortingType GetPickConstraint(void) {return m_pickConstraint;} + virtual Int getPickPixels() {return 4;} + virtual EditorSortingType GetPickConstraint() {return m_pickConstraint;} public: CWorldBuilderDoc *WbDoc() { return ((CWorldBuilderDoc*)GetDocument()); } @@ -130,17 +130,17 @@ class WbView : public CView virtual MapObject *picked3dObjectInView(CPoint viewPt) {return nullptr;}; virtual BuildListInfo *pickedBuildObjectInView(CPoint viewPt) {return nullptr;}; - Bool isPolygonTriggerVisible(void) {return m_showPolygonTriggers;}; - Bool isWaypointVisible(void) {return m_showWaypoints;}; - Bool isNamesVisible(void) {return m_showNames;}; + Bool isPolygonTriggerVisible() {return m_showPolygonTriggers;}; + Bool isWaypointVisible() {return m_showWaypoints;}; + Bool isNamesVisible() {return m_showNames;}; void setShowModels(Bool show) {m_showModels = show;} - Bool getShowModels(void) { return m_showModels;} - Bool getShowTerrain(void) { return m_showTerrain;} + Bool getShowModels() { return m_showModels;} + Bool getShowTerrain() { return m_showTerrain;} void setShowGarrisoned(Bool show) {m_showGarrisoned = show;} - Bool getShowGarrisoned(void) { return m_showGarrisoned;} + Bool getShowGarrisoned() { return m_showGarrisoned;} - virtual Bool isDoingPitch( void ) { return false; } + virtual Bool isDoingPitch() { return false; } // Operations public: diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h index 6881cefaa65..4bfb73c3a2c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h @@ -65,8 +65,8 @@ class WbView3d : public WbView, public DX8_CleanupHook public: // DX8_CleanupHook methods - virtual void ReleaseResources(void) override; ///< Release all dx8 resources so the device can be reset. - virtual void ReAcquireResources(void) override; ///< Reacquire all resources after device reset. + virtual void ReleaseResources() override; ///< Release all dx8 resources so the device can be reset. + virtual void ReAcquireResources() override; ///< Reacquire all resources after device reset. // Operations public: @@ -212,12 +212,12 @@ class WbView3d : public WbView, public DX8_CleanupHook void initAssets(); void initWW3D(); void drawLabels(HDC hdc); - void drawLabels(void); + void drawLabels(); void shutdownWW3D(); void killTheTimer(); void render(); void setupCamera(); - void updateHysteresis(void); + void updateHysteresis(); void updateLights(); void updateScorches(); @@ -246,11 +246,11 @@ class WbView3d : public WbView, public DX8_CleanupHook virtual void rotateCamera(Real delta) override; virtual void pitchCamera(Real delta) override; void setCameraPitch(Real absolutePitch); - Real getCameraPitch(void); - Real getHeightAboveGround(void) { return m_actualHeightAboveGround; } - Vector3 getCameraSource(void) { return m_cameraSource; } - Vector3 getCameraTarget(void) { return m_cameraTarget; } - Real getCameraAngle(void) { return m_cameraAngle; } + Real getCameraPitch(); + Real getHeightAboveGround() { return m_actualHeightAboveGround; } + Vector3 getCameraSource() { return m_cameraSource; } + Vector3 getCameraTarget() { return m_cameraTarget; } + Real getCameraAngle() { return m_cameraAngle; } virtual MapObject *picked3dObjectInView(CPoint viewPt) override; virtual BuildListInfo *pickedBuildObjectInView(CPoint viewPt) override; @@ -261,16 +261,16 @@ class WbView3d : public WbView, public DX8_CleanupHook /// Removes all render objects. Call when swithing to a new map. void resetRenderObjects(); - void stepTimeOfDay(void); + void stepTimeOfDay(); void reset3dEngineDisplaySize(Int width, Int height); ///< Closes & reinitializes w3d. void setLighting(const GlobalData::TerrainLighting *tl, Int whichLighting, Int whichLight=0); - DrawObject *getDrawObject(void) {return m_drawObject;}; + DrawObject *getDrawObject() {return m_drawObject;}; AsciiString getModelNameAndScale(MapObject *pMapObj, Real *scale, BodyDamageType curDamageState); - virtual Int getPickPixels(void) override {return m_pickPixels;} + virtual Int getPickPixels() override {return m_pickPixels;} virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z) override; public: @@ -285,11 +285,11 @@ class WbView3d : public WbView, public DX8_CleanupHook void setObjTracking(MapObject *pMapObj, Coord3D pos, Real angle, Bool show); void setViewLayersList(Bool showLayersList) { m_showLayersList = showLayersList; } - Bool getShowMapBoundaryFeedback(void) const { return m_showMapBoundaries; } - Bool getShowAmbientSoundsFeedback(void) const { return m_showAmbientSounds; } + Bool getShowMapBoundaryFeedback() const { return m_showMapBoundaries; } + Bool getShowAmbientSoundsFeedback() const { return m_showAmbientSounds; } - void togglePitchAndRotation( void ) { m_doPitch = !m_doPitch; } - virtual Bool isDoingPitch( void ) override { return m_doPitch; } + void togglePitchAndRotation() { m_doPitch = !m_doPitch; } + virtual Bool isDoingPitch() override { return m_doPitch; } }; inline UINT WbView3d::getLastDrawTime() { return m_time; } diff --git a/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp b/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp index 7e33d0fda6e..b60f45a1d24 100644 --- a/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp @@ -33,13 +33,13 @@ // AutoEdgeOutTool class. // /// Constructor -AutoEdgeOutTool::AutoEdgeOutTool(void) : +AutoEdgeOutTool::AutoEdgeOutTool() : Tool(ID_AUTO_EDGE_OUT_TOOL, IDC_AUTO_EDGE_OUT) { } /// Destructor -AutoEdgeOutTool::~AutoEdgeOutTool(void) +AutoEdgeOutTool::~AutoEdgeOutTool() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp index 4132ba96971..8f29f96b9da 100644 --- a/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp @@ -33,13 +33,13 @@ // BlendEdgeTool class. // /// Constructor -BlendEdgeTool::BlendEdgeTool(void) : +BlendEdgeTool::BlendEdgeTool() : Tool(ID_BLEND_EDGE_TOOL, IDC_BLEND_EDGE) { } /// Destructor -BlendEdgeTool::~BlendEdgeTool(void) +BlendEdgeTool::~BlendEdgeTool() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp b/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp index d0676c592bd..c1a19b1cfa4 100644 --- a/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/BlendMaterial.cpp @@ -224,7 +224,7 @@ void BlendMaterial::addTerrain(const char *pPath, Int terrainNdx, HTREEITEM pare } //* Create the tree view of textures from the textures in pMap. */ -void BlendMaterial::updateTextures(void) +void BlendMaterial::updateTextures() { m_updating = true; m_terrainTreeView.DeleteAllItems(); diff --git a/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp index ad4495ef71c..73aa050139f 100644 --- a/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/BorderTool.cpp @@ -39,7 +39,7 @@ BorderTool::~BorderTool() } -void BorderTool::setCursor(void) +void BorderTool::setCursor() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp index 3543e35f104..b6da31f7bcc 100644 --- a/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/BrushTool.cpp @@ -43,7 +43,7 @@ Int BrushTool::m_brushHeight; /// Constructor -BrushTool::BrushTool(void) : +BrushTool::BrushTool() : Tool(ID_BRUSH_TOOL, IDC_BRUSH_CROSS) { m_htMapEditCopy = nullptr; @@ -56,7 +56,7 @@ BrushTool::BrushTool(void) : } /// Destructor -BrushTool::~BrushTool(void) +BrushTool::~BrushTool() { REF_PTR_RELEASE(m_htMapEditCopy); REF_PTR_RELEASE(m_htMapFeatherCopy); diff --git a/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp b/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp index ad895aa69ce..34dc1374e7f 100644 --- a/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/BuildList.cpp @@ -53,7 +53,7 @@ BuildList::BuildList(CWnd* pParent /*=nullptr*/) } -BuildList::~BuildList(void) +BuildList::~BuildList() { } @@ -113,7 +113,7 @@ BOOL BuildList::OnInitDialog() } /// Load the sides in the sides list. -void BuildList::loadSides(void) +void BuildList::loadSides() { CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO); if (!pCombo) { @@ -137,7 +137,7 @@ void BuildList::loadSides(void) } /// Updates the current side, loading it's build list. -void BuildList::updateCurSide(void) +void BuildList::updateCurSide() { if (TheSidesList->getNumSides() < 1) return; diff --git a/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp b/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp index 3b8d10c59c7..d0d84c1f038 100644 --- a/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/BuildListTool.cpp @@ -43,7 +43,7 @@ Bool BuildListTool::m_isActive = false; PickUnitDialog* BuildListTool::m_static_pickBuildingDlg = nullptr; /// Constructor -BuildListTool::BuildListTool(void) : +BuildListTool::BuildListTool() : Tool(ID_BUILD_LIST_TOOL, IDC_BUILD_LIST_TOOL), m_rotateCursor(nullptr), m_pointerCursor(nullptr), @@ -54,11 +54,11 @@ BuildListTool::BuildListTool(void) : } /// Destructor -BuildListTool::~BuildListTool(void) +BuildListTool::~BuildListTool() { } -void BuildListTool::createWindow(void) +void BuildListTool::createWindow() { CRect frameRect; frameRect.top = ::AfxGetApp()->GetProfileInt(BUILD_PICK_PANEL_SECTION, "Top", 0); @@ -73,7 +73,7 @@ void BuildListTool::createWindow(void) m_created = true; } -Bool BuildListTool::isDoingAdd(void) +Bool BuildListTool::isDoingAdd() { if (!m_created) { return false; @@ -133,7 +133,7 @@ void BuildListTool::deactivate() } /** Set the cursor. */ -void BuildListTool::setCursor(void) +void BuildListTool::setCursor() { if (isDoingAdd()) { Tool::setCursor(); // Default cursor is the adding cursor diff --git a/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp b/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp index 7fe6ab3178b..9e79467c778 100644 --- a/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/CUndoable.cpp @@ -47,7 +47,7 @@ // /// Undoable - destructor. // -Undoable::~Undoable(void) +Undoable::~Undoable() { REF_PTR_RELEASE(mNext); } @@ -56,7 +56,7 @@ Undoable::~Undoable(void) // /// Create a new undoable. // -Undoable::Undoable(void): +Undoable::Undoable(): mNext(nullptr) { } @@ -72,7 +72,7 @@ void Undoable::LinkNext(Undoable *pNext) // /// Redo defaults to Do(). // -void Undoable::Redo(void) +void Undoable::Redo() { Do(); } @@ -86,7 +86,7 @@ void Undoable::Redo(void) // /// destructor. // -WBDocUndoable::~WBDocUndoable(void) +WBDocUndoable::~WBDocUndoable() { REF_PTR_RELEASE(mPNewHeightMapData); REF_PTR_RELEASE(mPOldHeightMapData); @@ -117,7 +117,7 @@ WBDocUndoable::WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtM // /// Set the new height map. // -void WBDocUndoable::Do(void) +void WBDocUndoable::Do() { mPDoc->SetHeightMap(mPNewHeightMapData, false); // SetHeightMap but don't inval. if (m_offsetObjects) { @@ -151,7 +151,7 @@ void WBDocUndoable::Do(void) // /// Set the new height map. // -void WBDocUndoable::Redo(void) +void WBDocUndoable::Redo() { // Cause the terrain texture to be regenerated. mPNewHeightMapData->resetResources(); @@ -176,7 +176,7 @@ void WBDocUndoable::Redo(void) // /// Restore the old height map. // -void WBDocUndoable::Undo(void) +void WBDocUndoable::Undo() { // Cause the terrain texture to be regenerated. mPOldHeightMapData->resetResources(); @@ -204,7 +204,7 @@ void WBDocUndoable::Undo(void) // // AddObjectUndoable - destructor. // -AddObjectUndoable::~AddObjectUndoable(void) +AddObjectUndoable::~AddObjectUndoable() { m_pDoc = nullptr; // not ref counted. if (!m_addedToList) { @@ -230,7 +230,7 @@ AddObjectUndoable::AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectT // /// Set the new mipping values, and force an inval of the windows. // -void AddObjectUndoable::Do(void) +void AddObjectUndoable::Do() { // WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); MapObject *pCur = m_objectToAdd; @@ -291,7 +291,7 @@ void AddObjectUndoable::Do(void) // // Restore the old mipping values, and inval. // -void AddObjectUndoable::Undo(void) +void AddObjectUndoable::Undo() { // WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); DEBUG_ASSERTCRASH(m_addedToList,("oops")); @@ -323,7 +323,7 @@ void AddObjectUndoable::Undo(void) /************************************************************************* ** MoveInfo ***************************************************************************/ -MoveInfo::~MoveInfo(void) +MoveInfo::~MoveInfo() { m_objectToModify=nullptr; // The map info list owns these, don't delete. MoveInfo *pCur = m_next; @@ -432,7 +432,7 @@ void MoveInfo::UndoMove(CWorldBuilderDoc *pDoc) // // ModifyObjectUndoable - destructor. // -ModifyObjectUndoable::~ModifyObjectUndoable(void) +ModifyObjectUndoable::~ModifyObjectUndoable() { m_pDoc = nullptr; // not ref counted. if (m_moveList) { @@ -536,7 +536,7 @@ void ModifyObjectUndoable::SetName(AsciiString name) // /// Set the new values, and force an inval of the windows. // -void ModifyObjectUndoable::Do(void) +void ModifyObjectUndoable::Do() { // Already done. } @@ -544,7 +544,7 @@ void ModifyObjectUndoable::Do(void) // /// Set the new values, and force an inval of the windows. // -void ModifyObjectUndoable::Redo(void) +void ModifyObjectUndoable::Redo() { MoveInfo *pCur = m_moveList; while (pCur) { @@ -562,7 +562,7 @@ void ModifyObjectUndoable::Redo(void) // // Restore the old mipping values, and inval. // -void ModifyObjectUndoable::Undo(void) +void ModifyObjectUndoable::Undo() { MoveInfo *pCur = m_moveList; while (pCur) { @@ -580,7 +580,7 @@ void ModifyObjectUndoable::Undo(void) /************************************************************************* ** FlagsInfo ***************************************************************************/ -FlagsInfo::~FlagsInfo(void) +FlagsInfo::~FlagsInfo() { m_objectToModify=nullptr; // The map info list owns these, don't delete. FlagsInfo *pCur = m_next; @@ -646,7 +646,7 @@ void FlagsInfo::UndoFlags(CWorldBuilderDoc *pDoc) // // ModifyFlagsUndoable - destructor. // -ModifyFlagsUndoable::~ModifyFlagsUndoable(void) +ModifyFlagsUndoable::~ModifyFlagsUndoable() { m_pDoc = nullptr; // not ref counted. @@ -682,7 +682,7 @@ ModifyFlagsUndoable::ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, I // /// Set the new values, and force an inval of the objects. // -void ModifyFlagsUndoable::Do(void) +void ModifyFlagsUndoable::Do() { FlagsInfo *pCur = m_flagsList; while (pCur) { @@ -694,7 +694,7 @@ void ModifyFlagsUndoable::Do(void) // /// Set the new values, and force an inval of the objects. // -void ModifyFlagsUndoable::Redo(void) +void ModifyFlagsUndoable::Redo() { Do(); } @@ -702,7 +702,7 @@ void ModifyFlagsUndoable::Redo(void) // // Restore the old mipping values, and inval. // -void ModifyFlagsUndoable::Undo(void) +void ModifyFlagsUndoable::Undo() { FlagsInfo *pCur = m_flagsList; while (pCur) { @@ -730,7 +730,7 @@ SidesListUndoable::~SidesListUndoable() { } -void SidesListUndoable::Do(void) +void SidesListUndoable::Do() { *TheSidesList = m_new; MapObjectProps::update(); // ugh, hack to update panel @@ -742,7 +742,7 @@ void SidesListUndoable::Do(void) p3View->invalObjectInView(nullptr); } -void SidesListUndoable::Undo(void) +void SidesListUndoable::Undo() { *TheSidesList = m_old; MapObjectProps::update(); // ugh, hack to update panel @@ -785,7 +785,7 @@ DictItemUndoable::~DictItemUndoable() } -void DictItemUndoable::Do(void) +void DictItemUndoable::Do() { for (int i = 0; i < m_numDictsToModify; ++i) { if (m_key == NAMEKEY_INVALID) @@ -802,7 +802,7 @@ void DictItemUndoable::Do(void) } } -void DictItemUndoable::Undo(void) +void DictItemUndoable::Undo() { for (int i = 0; i < m_numDictsToModify; ++i) { if (m_key == NAMEKEY_INVALID) @@ -854,7 +854,7 @@ void DictItemUndoable::Undo(void) /************************************************************************* ** DeleteInfo ***************************************************************************/ -DeleteInfo::~DeleteInfo(void) +DeleteInfo::~DeleteInfo() { if (m_didDelete) { deleteInstance(m_objectToDelete); @@ -933,7 +933,7 @@ void DeleteInfo::UndoDelete(WorldHeightMapEdit *pMap) // // DeleteObjectUndoable - destructor. // -DeleteObjectUndoable::~DeleteObjectUndoable(void) +DeleteObjectUndoable::~DeleteObjectUndoable() { m_pDoc = nullptr; // not ref counted. @@ -988,7 +988,7 @@ DeleteObjectUndoable::DeleteObjectUndoable(CWorldBuilderDoc *pDoc): // /// Delete the objects. // -void DeleteObjectUndoable::Do(void) +void DeleteObjectUndoable::Do() { WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); DeleteInfo *pCur = m_deleteList; @@ -1015,7 +1015,7 @@ void DeleteObjectUndoable::Do(void) // // Restore the old mipping values, and inval. // -void DeleteObjectUndoable::Undo(void) +void DeleteObjectUndoable::Undo() { WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); DeleteInfo *pCur = m_deleteList; @@ -1044,7 +1044,7 @@ void DeleteObjectUndoable::Undo(void) // // AddPolygonUndoable - destructor. // -AddPolygonUndoable::~AddPolygonUndoable(void) +AddPolygonUndoable::~AddPolygonUndoable() { if (m_trigger && !m_isTriggerInList) { DEBUG_ASSERTCRASH(m_trigger->getNext()==nullptr, ("Logic error.")); @@ -1065,7 +1065,7 @@ AddPolygonUndoable::AddPolygonUndoable(PolygonTrigger *pTrig): // /// Add the trigger. // -void AddPolygonUndoable::Do(void) +void AddPolygonUndoable::Do() { PolygonTrigger::addPolygonTrigger(m_trigger); m_isTriggerInList = true; @@ -1074,7 +1074,7 @@ void AddPolygonUndoable::Do(void) // // Remove the trigger. // -void AddPolygonUndoable::Undo(void) +void AddPolygonUndoable::Undo() { PolygonTrigger::removePolygonTrigger(m_trigger); m_isTriggerInList = false; @@ -1087,7 +1087,7 @@ void AddPolygonUndoable::Undo(void) // // AddPolygonUndoable - destructor. // -AddPolygonPointUndoable::~AddPolygonPointUndoable(void) +AddPolygonPointUndoable::~AddPolygonPointUndoable() { m_trigger=nullptr; } @@ -1105,7 +1105,7 @@ AddPolygonPointUndoable::AddPolygonPointUndoable(PolygonTrigger *pTrig, // /// Add the trigger. // -void AddPolygonPointUndoable::Do(void) +void AddPolygonPointUndoable::Do() { m_trigger->addPoint(m_point); } @@ -1113,7 +1113,7 @@ void AddPolygonPointUndoable::Do(void) // // Remove the trigger. // -void AddPolygonPointUndoable::Undo(void) +void AddPolygonPointUndoable::Undo() { m_point = *m_trigger->getPoint(m_trigger->getNumPoints()-1); m_trigger->deletePoint(m_trigger->getNumPoints()-1); @@ -1126,7 +1126,7 @@ void AddPolygonPointUndoable::Undo(void) // // ModifyPolygonPointUndoable - destructor. // -ModifyPolygonPointUndoable::~ModifyPolygonPointUndoable(void) +ModifyPolygonPointUndoable::~ModifyPolygonPointUndoable() { m_trigger=nullptr; } @@ -1144,7 +1144,7 @@ ModifyPolygonPointUndoable::ModifyPolygonPointUndoable(PolygonTrigger *pTrig, In // /// Add the trigger. // -void ModifyPolygonPointUndoable::Do(void) +void ModifyPolygonPointUndoable::Do() { m_savPoint = *m_trigger->getPoint(m_pointIndex); m_trigger->setPoint(m_point, m_pointIndex); @@ -1153,7 +1153,7 @@ void ModifyPolygonPointUndoable::Do(void) // // Remove the trigger. // -void ModifyPolygonPointUndoable::Undo(void) +void ModifyPolygonPointUndoable::Undo() { m_point = *m_trigger->getPoint(m_pointIndex); m_trigger->setPoint(m_savPoint, m_pointIndex); @@ -1165,7 +1165,7 @@ void ModifyPolygonPointUndoable::Undo(void) // // MovePolygonUndoable - destructor. // -MovePolygonUndoable::~MovePolygonUndoable(void) +MovePolygonUndoable::~MovePolygonUndoable() { m_trigger=nullptr; } @@ -1204,7 +1204,7 @@ void MovePolygonUndoable::SetOffset(const ICoord3D &offset) // /// Offset the trigger. // -void MovePolygonUndoable::Do(void) +void MovePolygonUndoable::Do() { Int i; for (i=0; igetNumPoints(); i++) { @@ -1219,7 +1219,7 @@ void MovePolygonUndoable::Do(void) // // Unoffset the trigger. // -void MovePolygonUndoable::Undo(void) +void MovePolygonUndoable::Undo() { Int i; for (i=0; igetNumPoints(); i++) { @@ -1238,7 +1238,7 @@ void MovePolygonUndoable::Undo(void) // // InsertPolygonPointUndoable - destructor. // -InsertPolygonPointUndoable::~InsertPolygonPointUndoable(void) +InsertPolygonPointUndoable::~InsertPolygonPointUndoable() { m_trigger=nullptr; } @@ -1256,7 +1256,7 @@ InsertPolygonPointUndoable::InsertPolygonPointUndoable(PolygonTrigger *pTrig, IC // /// Insert the point. // -void InsertPolygonPointUndoable::Do(void) +void InsertPolygonPointUndoable::Do() { m_trigger->insertPoint(m_point, m_pointIndex); } @@ -1264,7 +1264,7 @@ void InsertPolygonPointUndoable::Do(void) // // Remove the point. // -void InsertPolygonPointUndoable::Undo(void) +void InsertPolygonPointUndoable::Undo() { m_trigger->deletePoint(m_pointIndex); } @@ -1275,7 +1275,7 @@ void InsertPolygonPointUndoable::Undo(void) // // DeletePolygonPointUndoable - destructor. // -DeletePolygonPointUndoable::~DeletePolygonPointUndoable(void) +DeletePolygonPointUndoable::~DeletePolygonPointUndoable() { m_trigger=nullptr; } @@ -1293,7 +1293,7 @@ DeletePolygonPointUndoable::DeletePolygonPointUndoable(PolygonTrigger *pTrig, In // /// Delete the point. // -void DeletePolygonPointUndoable::Do(void) +void DeletePolygonPointUndoable::Do() { m_trigger->deletePoint(m_pointIndex); } @@ -1301,7 +1301,7 @@ void DeletePolygonPointUndoable::Do(void) // // Remove the point. // -void DeletePolygonPointUndoable::Undo(void) +void DeletePolygonPointUndoable::Undo() { m_trigger->insertPoint(m_point, m_pointIndex); } @@ -1312,7 +1312,7 @@ void DeletePolygonPointUndoable::Undo(void) // // DeletePolygonUndoable - destructor. // -DeletePolygonUndoable::~DeletePolygonUndoable(void) +DeletePolygonUndoable::~DeletePolygonUndoable() { if (m_trigger && !m_isTriggerInList) { DEBUG_ASSERTCRASH(m_trigger->getNext()==nullptr, ("Logic error.")); @@ -1333,7 +1333,7 @@ DeletePolygonUndoable::DeletePolygonUndoable(PolygonTrigger *pTrig): // /// Delete the point. // -void DeletePolygonUndoable::Do(void) +void DeletePolygonUndoable::Do() { PolygonTrigger::removePolygonTrigger(m_trigger); m_isTriggerInList = false; @@ -1342,7 +1342,7 @@ void DeletePolygonUndoable::Do(void) // // Remove the point. // -void DeletePolygonUndoable::Undo(void) +void DeletePolygonUndoable::Undo() { PolygonTrigger::addPolygonTrigger(m_trigger); m_isTriggerInList = true; diff --git a/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp index 32f1633aac8..8057093f5e5 100644 --- a/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/CameraOptions.cpp @@ -129,7 +129,7 @@ BOOL CameraOptions::getReal(Int ctrlID, Real *rVal) return false; } -void CameraOptions::stuffValuesIntoFields( void ) +void CameraOptions::stuffValuesIntoFields() { WbView3d * p3View = CWorldBuilderDoc::GetActive3DView(); if (p3View) @@ -155,7 +155,7 @@ void CameraOptions::stuffValuesIntoFields( void ) } } -void CameraOptions::update( void ) +void CameraOptions::update() { stuffValuesIntoFields(); } diff --git a/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp b/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp index 31fd2eede39..9b64db2821d 100644 --- a/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/DrawObject.cpp @@ -128,12 +128,12 @@ void DrawObject::stopWaypointDragFeedback() -DrawObject::~DrawObject(void) +DrawObject::~DrawObject() { freeMapResources(); } -DrawObject::DrawObject(void) : +DrawObject::DrawObject() : m_drawObjects(true), m_drawPolygonAreas(true), m_indexBuffer(nullptr), @@ -191,18 +191,18 @@ void DrawObject::Get_Obj_Space_Bounding_Box(AABoxClass & box) const box.Init(minPt,maxPt); } -Int DrawObject::Class_ID(void) const +Int DrawObject::Class_ID() const { return RenderObjClass::CLASSID_UNKNOWN; } -RenderObjClass * DrawObject::Clone(void) const +RenderObjClass * DrawObject::Clone() const { return new DrawObject(*this); } -Int DrawObject::freeMapResources(void) +Int DrawObject::freeMapResources() { REF_PTR_RELEASE(m_indexBuffer); @@ -230,7 +230,7 @@ Int DrawObject::freeMapResources(void) #define SELECT_PYRAMID_HEIGHT (1.0f) -Int DrawObject::initData(void) +Int DrawObject::initData() { Int i; @@ -274,7 +274,7 @@ Int DrawObject::initData(void) /** updateMeshVB puts mesh mold triangles into m_vertexFeedback. */ -void DrawObject::updateMeshVB(void) +void DrawObject::updateMeshVB() { const Int theAlpha = 64; @@ -428,7 +428,7 @@ void DrawObject::updateMeshVB(void) /** updateRampVB puts the ramps into a vertex buffer. */ -void DrawObject::updateRampVB(void) +void DrawObject::updateRampVB() { const Int theAlpha = 64; @@ -544,7 +544,7 @@ void DrawObject::updateRampVB(void) } /** updateBoundaryVB puts boundaries into m_vertexFeedback. */ -void DrawObject::updateBoundaryVB(void) +void DrawObject::updateBoundaryVB() { // const Int theAlpha = 64; @@ -722,7 +722,7 @@ static const Int poleWidth = 2; static const Int flagHeight = 10; static const Int flagWidth = 10; -void DrawObject::updateAmbientSoundVB(void) +void DrawObject::updateAmbientSoundVB() { m_feedbackVertexCount = 0; m_feedbackIndexCount = 0; @@ -831,7 +831,7 @@ void DrawObject::updateAmbientSoundVB(void) /** updateMeshVB puts waypoint path triangles into m_vertexFeedback. */ -void DrawObject::updateWaypointVB(void) +void DrawObject::updateWaypointVB() { // const Int theAlpha = 64; @@ -1164,7 +1164,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp /** updateFeedbackVB puts brush feedback triangles into m_vertexFeedback. */ -void DrawObject::updateFeedbackVB(void) +void DrawObject::updateFeedbackVB() { const Int theAlpha = 64; m_feedbackVertexCount = 0; @@ -1293,7 +1293,7 @@ static Int xpSign(const ICoord3D &v1, const ICoord3D &v2) { /** updateForWater puts a blue rectangle into the vertex buffer. */ -void DrawObject::updateForWater(void) +void DrawObject::updateForWater() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp b/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp index 8b570fbb0e7..1fe7b77d501 100644 --- a/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/EyedropperTool.cpp @@ -35,13 +35,13 @@ // EyedropperTool class. // /// Constructor -EyedropperTool::EyedropperTool(void) : +EyedropperTool::EyedropperTool() : Tool(ID_EYEDROPPER_TOOL, IDC_EYEDROPPER) { } /// Destructor -EyedropperTool::~EyedropperTool(void) +EyedropperTool::~EyedropperTool() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp b/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp index c41273b9f1c..54e3b5a0105 100644 --- a/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/FeatherTool.cpp @@ -39,7 +39,7 @@ Int FeatherTool::m_radius = 0; // /// Constructor -FeatherTool::FeatherTool(void) : +FeatherTool::FeatherTool() : Tool(ID_FEATHERTOOL, IDC_BRUSH_CROSS) { m_htMapEditCopy = nullptr; @@ -48,7 +48,7 @@ FeatherTool::FeatherTool(void) : } /// Destructor -FeatherTool::~FeatherTool(void) +FeatherTool::~FeatherTool() { REF_PTR_RELEASE(m_htMapEditCopy); REF_PTR_RELEASE(m_htMapFeatherCopy); diff --git a/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp index 9009a11db7b..a77295fb302 100644 --- a/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/FenceOptions.cpp @@ -66,7 +66,7 @@ FenceOptions::FenceOptions(CWnd* pParent /*=nullptr*/) } -FenceOptions::~FenceOptions(void) +FenceOptions::~FenceOptions() { deleteInstance(m_objectsList); m_objectsList = nullptr; @@ -306,7 +306,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha } -Bool FenceOptions::hasSelectedObject(void) +Bool FenceOptions::hasSelectedObject() { // If we have no selected object, return false. if (m_currentObjectIndex==-1) return false; diff --git a/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp b/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp index 60a5793ace4..984f6d4cb05 100644 --- a/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/FenceTool.cpp @@ -37,7 +37,7 @@ // enum {MAX_OBJECTS = 200}; /// Constructor -FenceTool::FenceTool(void) : +FenceTool::FenceTool() : Tool(ID_FENCE_TOOL, IDC_FENCE), m_mapObjectList(nullptr), m_objectCount(1) @@ -47,7 +47,7 @@ FenceTool::FenceTool(void) : } /// Destructor -FenceTool::~FenceTool(void) +FenceTool::~FenceTool() { deleteInstance(m_mapObjectList); m_mapObjectList = nullptr; diff --git a/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp b/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp index 9ab949deba4..e5fcd2cab97 100644 --- a/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/FloodFillTool.cpp @@ -38,14 +38,14 @@ Bool FloodFillTool::m_adjustCliffTextures = false; /// Constructor -FloodFillTool::FloodFillTool(void) : +FloodFillTool::FloodFillTool() : Tool(ID_TILE_FLOOD_FILL, IDC_FLOOD_FILL), m_cliffCursor(nullptr) { } /// Destructor -FloodFillTool::~FloodFillTool(void) +FloodFillTool::~FloodFillTool() { if (m_cliffCursor) { ::DestroyCursor(m_cliffCursor); @@ -63,7 +63,7 @@ void FloodFillTool::activate() } /** Set the cursor. */ -void FloodFillTool::setCursor(void) +void FloodFillTool::setCursor() { if (m_adjustCliffTextures) { if (m_cliffCursor == nullptr) { diff --git a/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp index 107ad345e28..e0d7188db43 100644 --- a/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp @@ -61,7 +61,7 @@ static void calcNewLight(Int lr, Int fb, Vector3 *newLight) newLight->Rotate_Z(zAngle); } -void GlobalLightOptions::updateEditFields(void) +void GlobalLightOptions::updateEditFields() { m_updating = true; CString str; diff --git a/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp index 8687248189c..67c7fb93ddd 100644 --- a/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/GroveOptions.cpp @@ -27,7 +27,7 @@ /*extern*/ GroveOptions *TheGroveOptions = nullptr; -void GroveOptions::makeMain(void) +void GroveOptions::makeMain() { TheGroveOptions = this; } @@ -37,7 +37,7 @@ GroveOptions::GroveOptions(CWnd* pParent) } -int GroveOptions::getNumTrees(void) +int GroveOptions::getNumTrees() { CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees); if (!pWnd) { @@ -117,7 +117,7 @@ AsciiString GroveOptions::getTypeName(int type) return cstr.GetBuffer(0); } -int GroveOptions::getTotalTreePerc(void) +int GroveOptions::getTotalTreePerc() { static char buff[ARBITRARY_BUFF_SIZE]; @@ -133,7 +133,7 @@ int GroveOptions::getTotalTreePerc(void) return -1; } -Bool GroveOptions::getCanPlaceInWater(void) +Bool GroveOptions::getCanPlaceInWater() { CButton* pButt; @@ -144,7 +144,7 @@ Bool GroveOptions::getCanPlaceInWater(void) return false; } -Bool GroveOptions::getCanPlaceOnCliffs(void) +Bool GroveOptions::getCanPlaceOnCliffs() { CButton* pButt; @@ -172,7 +172,7 @@ GroveOptions::~GroveOptions() } -void GroveOptions::_setTreesToLists(void) +void GroveOptions::_setTreesToLists() { CString str; for (VecPairNameDisplayNameIt it = mVecDisplayNames.begin(); it != mVecDisplayNames.end(); it++) { @@ -245,7 +245,7 @@ void GroveOptions::_setTreesToLists(void) } } -void GroveOptions::_buildTreeList(void) +void GroveOptions::_buildTreeList() { const ThingTemplate* pTemplate; for (pTemplate = TheThingFactory->firstTemplate(); pTemplate; pTemplate = pTemplate->friend_getNextTemplate()) { @@ -258,7 +258,7 @@ void GroveOptions::_buildTreeList(void) } } -void GroveOptions::_setDefaultRatios(void) +void GroveOptions::_setDefaultRatios() { static char buff[ARBITRARY_BUFF_SIZE]; int defaultRatio; @@ -299,7 +299,7 @@ void GroveOptions::_setDefaultRatios(void) } } -void GroveOptions::_setDefaultNumTrees(void) +void GroveOptions::_setDefaultNumTrees() { CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees); if (!pWnd) { @@ -313,7 +313,7 @@ void GroveOptions::_setDefaultNumTrees(void) pWnd->SetWindowText(buff); } -void GroveOptions::_setDefaultPlacementAllowed(void) +void GroveOptions::_setDefaultPlacementAllowed() { CButton* pButt; int state; @@ -332,7 +332,7 @@ void GroveOptions::_setDefaultPlacementAllowed(void) } -void GroveOptions::_updateTreeWeights(void) +void GroveOptions::_updateTreeWeights() { static char buff[ARBITRARY_BUFF_SIZE]; int val = 0; @@ -384,7 +384,7 @@ void GroveOptions::_updateTreeWeights(void) } } -void GroveOptions::_updateTreeCount(void) +void GroveOptions::_updateTreeCount() { static char buff[ARBITRARY_BUFF_SIZE]; CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees); @@ -395,7 +395,7 @@ void GroveOptions::_updateTreeCount(void) } } -void GroveOptions::_updateGroveMakeup(void) +void GroveOptions::_updateGroveMakeup() { for (int type = 1; type <= 5; ++type) { CComboBox *pComboBox; @@ -430,7 +430,7 @@ void GroveOptions::_updateGroveMakeup(void) } } -void GroveOptions::_updatePlacementAllowed(void) +void GroveOptions::_updatePlacementAllowed() { // huh huh huh-huh CButton* pButt; diff --git a/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp b/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp index 0905871cf35..b39858b2791 100644 --- a/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/GroveTool.cpp @@ -235,14 +235,14 @@ void GroveTool::plantGrove( Coord3D pos, Coord3D prevDir, Real baseHeight, Int l // GroveTool class. // /// Constructor -GroveTool::GroveTool(void) : +GroveTool::GroveTool() : Tool(ID_GROVE_TOOL, IDC_GROVE) { m_headMapObj = nullptr; } /// Destructor -GroveTool::~GroveTool(void) +GroveTool::~GroveTool() { deleteInstance(m_headMapObj); } diff --git a/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp b/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp index 5da879514f7..c9fb1a4beb2 100644 --- a/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/HandScrollTool.cpp @@ -38,7 +38,7 @@ inline Int IABS(Int x) { if (x>=0) return x; return -x;}; static const Int MAX_SCROLL = 1000; /// Constructor -HandScrollTool::HandScrollTool(void) : +HandScrollTool::HandScrollTool() : Tool(ID_HAND_SCROLL_TOOL, IDC_HAND_SCROLL) { } @@ -50,7 +50,7 @@ void HandScrollTool::activate() } /// Destructor -HandScrollTool::~HandScrollTool(void) +HandScrollTool::~HandScrollTool() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp b/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp index 0e651efd565..c0e3d1599cd 100644 --- a/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/LayersList.cpp @@ -151,7 +151,7 @@ LayersList::~LayersList() delete mTree; } -void LayersList::resetLayers(void) +void LayersList::resetLayers() { // @todo Default needs to be a localizable string Layer defaultLayer; @@ -307,7 +307,7 @@ Bool LayersList::isLayerHidden(IN AsciiString layerToTest) return (!layerIt->show); } -void LayersList::updateUIFromList(void) +void LayersList::updateUIFromList() { if (!m_performUpdates) { return; diff --git a/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp index 6df468ce222..b9d4b25e4a7 100644 --- a/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/LightOptions.cpp @@ -49,7 +49,7 @@ void LightOptions::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } -MapObject *LightOptions::getSingleSelectedLight(void) +MapObject *LightOptions::getSingleSelectedLight() { MapObject *pMapObj; MapObject *theMapObj = nullptr; @@ -70,7 +70,7 @@ MapObject *LightOptions::getSingleSelectedLight(void) } -void LightOptions::updateTheUI(void) +void LightOptions::updateTheUI() { MapObject *theMapObj = getSingleSelectedLight(); if (!theMapObj) return; @@ -114,7 +114,7 @@ void LightOptions::updateTheUI(void) } } -void LightOptions::update(void) +void LightOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); diff --git a/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp b/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp index 369067109fa..26125e89382 100644 --- a/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/MainFrm.cpp @@ -297,7 +297,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) return 0; } -void CMainFrame::adjustWindowSize(void) +void CMainFrame::adjustWindowSize() { HWND hDesk = ::GetDesktopWindow(); CRect top; @@ -338,7 +338,7 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) return TRUE; } -void CMainFrame::ResetWindowPositions(void) +void CMainFrame::ResetWindowPositions() { if (m_curOptions == nullptr) { m_curOptions = &m_brushOptions; @@ -492,7 +492,7 @@ void CMainFrame::OnEditCameraoptions() m_cameraOptions.ShowWindow(SW_SHOWNA); } -void CMainFrame::handleCameraChange(void) +void CMainFrame::handleCameraChange() { m_cameraOptions.update(); } diff --git a/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp b/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp index 1c454135dcb..835fec70a54 100644 --- a/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/MapPreview.cpp @@ -67,7 +67,7 @@ Bool localIsUnderwater( Real x, Real y); // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ -MapPreview::MapPreview(void ) +MapPreview::MapPreview() { memset(m_pixelBuffer, 0xffffffff, sizeof(m_pixelBuffer)); } diff --git a/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp b/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp index 42a0f27ce88..4925068987e 100644 --- a/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp @@ -44,14 +44,14 @@ Coord3D MeshMoldTool::m_toolPos; WorldHeightMapEdit *MeshMoldTool::m_htMapEditCopy = nullptr; /// Constructor -MeshMoldTool::MeshMoldTool(void) : +MeshMoldTool::MeshMoldTool() : Tool(ID_MOLD_TOOL, IDC_MOLD_POINTER) { m_offsettingZ = false; } /// Destructor -MeshMoldTool::~MeshMoldTool(void) +MeshMoldTool::~MeshMoldTool() { REF_PTR_RELEASE(m_htMapEditCopy); } diff --git a/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp b/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp index 3eb9af508de..097dde932e0 100644 --- a/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/MoundTool.cpp @@ -42,7 +42,7 @@ Int MoundTool::m_brushFeather; /// Constructor -MoundTool::MoundTool(void) : +MoundTool::MoundTool() : Tool(ID_BRUSH_ADD_TOOL, IDC_BRUSH_CROSS) { m_htMapEditCopy = nullptr; @@ -51,7 +51,7 @@ MoundTool::MoundTool(void) : } /// Destructor -MoundTool::~MoundTool(void) +MoundTool::~MoundTool() { REF_PTR_RELEASE(m_htMapEditCopy); REF_PTR_RELEASE(m_htMapSaveCopy); @@ -239,7 +239,7 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld ** DigTool ***************************************************************************/ /// Constructor -DigTool::DigTool(void) +DigTool::DigTool() { m_toolID = ID_BRUSH_SUBTRACT_TOOL; m_raising = false; // digging. diff --git a/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp b/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp index a79ca28d428..4e613790002 100644 --- a/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/MyToolbar.cpp @@ -53,12 +53,12 @@ void CellSizeToolBar::CellSizeChanged(Int cellSize) } } -CellSizeToolBar::~CellSizeToolBar(void) +CellSizeToolBar::~CellSizeToolBar() { m_staticThis = nullptr; } -void CellSizeToolBar::SetupSlider(void) +void CellSizeToolBar::SetupSlider() { CWnd *pWnd = GetDlgItem(ID_SLIDER); CRect rect; diff --git a/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp index 8ef7c88f13c..fdae566e3f4 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ObjectOptions.cpp @@ -62,7 +62,7 @@ ObjectOptions::ObjectOptions(CWnd* pParent /*=nullptr*/) } -ObjectOptions::~ObjectOptions(void) +ObjectOptions::~ObjectOptions() { deleteInstance(m_objectsList); m_objectsList = nullptr; @@ -613,7 +613,7 @@ BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) } -MapObject *ObjectOptions::getCurMapObject(void) +MapObject *ObjectOptions::getCurMapObject() { if (m_staticThis && m_currentObjectIndex >= 0) { MapObject *pObj = m_staticThis->m_objectsList; @@ -629,7 +629,7 @@ MapObject *ObjectOptions::getCurMapObject(void) return(nullptr); } -AsciiString ObjectOptions::getCurGdfName(void) +AsciiString ObjectOptions::getCurGdfName() { MapObject *pCur = getCurMapObject(); if (pCur) { @@ -711,7 +711,7 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real return(nullptr); } -Real ObjectOptions::getCurObjectHeight(void) +Real ObjectOptions::getCurObjectHeight() { if (m_staticThis) { CWnd *pWnd = m_staticThis->GetDlgItem(IDC_OBJECT_HEIGHT_EDIT); diff --git a/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp b/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp index 43ddb3b405c..083262ee557 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ObjectTool.cpp @@ -38,13 +38,13 @@ // enum {HYSTERESIS = 3}; /// Constructor -ObjectTool::ObjectTool(void) : +ObjectTool::ObjectTool() : Tool(ID_PLACE_OBJECT_TOOL, IDC_PLACE_OBJECT) { } /// Destructor -ObjectTool::~ObjectTool(void) +ObjectTool::~ObjectTool() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp index 5492fd5b571..0a7e9a7e186 100644 --- a/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp @@ -140,7 +140,7 @@ void PickUnitDialog::SetAllowableType(EditorSortingType sort) m_allowable[sort] = true; } -void PickUnitDialog::SetupAsPanel(void) +void PickUnitDialog::SetupAsPanel() { CWnd *pWnd = GetDlgItem(IDCANCEL); if (pWnd) { @@ -381,7 +381,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind } -AsciiString PickUnitDialog::getPickedUnit(void) +AsciiString PickUnitDialog::getPickedUnit() { if (m_currentObjectIndex >= 0) { AsciiString retval(m_currentObjectName); @@ -390,7 +390,7 @@ AsciiString PickUnitDialog::getPickedUnit(void) return AsciiString::TheEmptyString; } -const ThingTemplate* PickUnitDialog::getPickedThing(void) +const ThingTemplate* PickUnitDialog::getPickedThing() { if (m_currentObjectIndex >= 0) { const ThingTemplate *tTemplate; diff --git a/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp b/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp index 2bb96cd1908..dda7df218fc 100644 --- a/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/PointerTool.cpp @@ -87,7 +87,7 @@ static void helper_pickAllWaypointsInPath( Int sourceID, CWorldBuilderDoc *pDoc, // /// Constructor -PointerTool::PointerTool(void) : +PointerTool::PointerTool() : m_modifyUndoable(nullptr), m_curObject(nullptr), m_rotateCursor(nullptr), @@ -99,7 +99,7 @@ PointerTool::PointerTool(void) : } /// Destructor -PointerTool::~PointerTool(void) +PointerTool::~PointerTool() { REF_PTR_RELEASE(m_modifyUndoable); // belongs to pDoc now. if (m_rotateCursor) { @@ -111,7 +111,7 @@ PointerTool::~PointerTool(void) } /// See if a single obj is selected that has properties. -void PointerTool::checkForPropertiesPanel(void) +void PointerTool::checkForPropertiesPanel() { MapObject *theMapObj = WaypointOptions::getSingleSelectedWaypoint(); PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); @@ -144,7 +144,7 @@ void PointerTool::checkForPropertiesPanel(void) } /// Clear the selection.. -void PointerTool::clearSelection(void) ///< Clears the selected objects selected flags. +void PointerTool::clearSelection() ///< Clears the selected objects selected flags. { // Clear selection. MapObject *pObj = MapObject::getFirstMapObject(); @@ -188,7 +188,7 @@ void PointerTool::deactivate() } /** Set the cursor. */ -void PointerTool::setCursor(void) +void PointerTool::setCursor() { if (m_mouseUpRotate) { if (m_rotateCursor == nullptr) { diff --git a/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp b/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp index 2fec8cd3e41..74429fce8a4 100644 --- a/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/PolygonTool.cpp @@ -47,7 +47,7 @@ Int PolygonTool::m_poly_dragPointNdx = -1; enum {SNAP_DISTANCE = 5}; /// Constructor -PolygonTool::PolygonTool(void) : +PolygonTool::PolygonTool() : Tool(ID_POLYGON_TOOL, IDC_POLYGON), m_poly_plusCursor(nullptr), m_poly_moveCursor(nullptr) @@ -57,7 +57,7 @@ PolygonTool::PolygonTool(void) : /// Destructor -PolygonTool::~PolygonTool(void) +PolygonTool::~PolygonTool() { if (m_poly_plusCursor) { ::DestroyCursor(m_poly_plusCursor); @@ -353,7 +353,7 @@ void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, } /// Delete the selected polygon or point. -Bool PolygonTool::deleteSelectedPolygon(void) +Bool PolygonTool::deleteSelectedPolygon() { if (m_poly_curSelectedPolygon) { Bool found = false; @@ -391,7 +391,7 @@ Bool PolygonTool::deleteSelectedPolygon(void) } /** Set the cursor. */ -void PolygonTool::setCursor(void) +void PolygonTool::setCursor() { if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) { if (m_poly_plusCursor == nullptr) { diff --git a/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp b/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp index d9bef230431..572684b34c6 100644 --- a/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/RampTool.cpp @@ -67,7 +67,7 @@ void RampTool::deactivate() mIsMouseDown = false; } -Bool RampTool::followsTerrain(void) +Bool RampTool::followsTerrain() { return true; } diff --git a/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp index 15c95eb8591..360d32c6be0 100644 --- a/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/RoadOptions.cpp @@ -57,7 +57,7 @@ RoadOptions::RoadOptions(CWnd* pParent /*=nullptr*/) } -RoadOptions::~RoadOptions(void) +RoadOptions::~RoadOptions() { m_currentRoadName.clear(); } @@ -86,7 +86,7 @@ END_MESSAGE_MAP() // RoadOptions data access method. -void RoadOptions::updateLabel(void) +void RoadOptions::updateLabel() { const char *tName = getCurRoadName().str(); @@ -97,7 +97,7 @@ void RoadOptions::updateLabel(void) } /** Returns true if only one or more roads is selected. */ -Bool RoadOptions::selectionIsRoadsOnly(void) +Bool RoadOptions::selectionIsRoadsOnly() { // MapObject *theMapObj = nullptr; Bool foundRoad = false; @@ -116,7 +116,7 @@ Bool RoadOptions::selectionIsRoadsOnly(void) } /** Returns true if only one or more roads is selected. */ -void RoadOptions::updateSelection(void) +void RoadOptions::updateSelection() { // MapObject *theMapObj = nullptr; Int angled = 0; @@ -189,7 +189,7 @@ void RoadOptions::updateSelection(void) } /** Applies road corner flags and road type to selection. */ -void RoadOptions::applyToSelection(void) +void RoadOptions::applyToSelection() { Int flagMask = FLAG_ROAD_CORNER_ANGLED | FLAG_ROAD_CORNER_TIGHT; Int flagVal = 0; @@ -438,7 +438,7 @@ Bool RoadOptions::setRoadTreeViewSelection(HTREEITEM parent, Int selection) return(false); } -void RoadOptions::SelectConnected(void) +void RoadOptions::SelectConnected() { std::list roadSegs; std::list connectedSegs; diff --git a/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp b/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp index 55e07945b9d..e5d9d1dfc69 100644 --- a/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/RoadTool.cpp @@ -40,14 +40,14 @@ // RoadTool class. // /// Constructor -RoadTool::RoadTool(void) : +RoadTool::RoadTool() : Tool(ID_ROAD_TOOL, IDC_ROAD) { m_mapObj = nullptr; } /// Destructor -RoadTool::~RoadTool(void) +RoadTool::~RoadTool() { m_mapObj = nullptr; } diff --git a/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp index 1ef2a1dedf5..528d994c751 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScorchOptions.cpp @@ -61,7 +61,7 @@ BEGIN_MESSAGE_MAP(ScorchOptions, CDialog) //}}AFX_MSG_MAP END_MESSAGE_MAP() -MapObject *ScorchOptions::getSingleSelectedScorch(void) +MapObject *ScorchOptions::getSingleSelectedScorch() { MapObject *theMapObj = nullptr; // Bool found = false; @@ -82,7 +82,7 @@ MapObject *ScorchOptions::getSingleSelectedScorch(void) return(nullptr); } -void ScorchOptions::updateTheUI(void) +void ScorchOptions::updateTheUI() { m_updating = true; MapObject *theMapObj = getSingleSelectedScorch(); @@ -102,7 +102,7 @@ void ScorchOptions::updateTheUI(void) m_updating = false; } -void ScorchOptions::update(void) +void ScorchOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); @@ -216,7 +216,7 @@ void ScorchOptions::PopSliderFinished(const long sliderID, long theVal) } -void ScorchOptions::changeScorch(void) +void ScorchOptions::changeScorch() { getAllSelectedDicts(); @@ -231,7 +231,7 @@ void ScorchOptions::changeScorch(void) pView->Invalidate(); } -void ScorchOptions::changeSize(void) +void ScorchOptions::changeSize() { getAllSelectedDicts(); @@ -246,7 +246,7 @@ void ScorchOptions::changeSize(void) pView->Invalidate(); } -void ScorchOptions::getAllSelectedDicts(void) +void ScorchOptions::getAllSelectedDicts() { m_allSelectedDicts.clear(); diff --git a/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp b/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp index e5c9cd07ff3..11029ffacd3 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScorchTool.cpp @@ -38,13 +38,13 @@ // /// Constructor -ScorchTool::ScorchTool(void) : +ScorchTool::ScorchTool() : Tool(ID_SCORCH_TOOL, IDC_SCORCH) { } /// Destructor -ScorchTool::~ScorchTool(void) +ScorchTool::~ScorchTool() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp index 4808855cdf4..2dd20f41c20 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp @@ -80,7 +80,7 @@ BOOL ScriptActionsFalse::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -void ScriptActionsFalse::loadList(void) +void ScriptActionsFalse::loadList() { m_falseAction = nullptr; ScriptDialog::updateScriptWarning(m_script); diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp index fc043ce8e3d..b2fb20c70af 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp @@ -80,7 +80,7 @@ BOOL ScriptActionsTrue::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -void ScriptActionsTrue::loadList(void) +void ScriptActionsTrue::loadList() { m_action = nullptr; ScriptDialog::updateScriptWarning(m_script); diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp index 35c67f9bba7..44639e9a2f7 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptConditions.cpp @@ -84,7 +84,7 @@ BOOL ScriptConditionsDlg::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -void ScriptConditionsDlg::loadList(void) +void ScriptConditionsDlg::loadList() { Int count = 0; ScriptDialog::updateScriptWarning(m_script); diff --git a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index 80951615404..e47ceab9e01 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -242,17 +242,17 @@ void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult) /* The purpose of these two functions is to allow the inner class CSDTreeCtrl the ability to check what Script and ScriptGroup belong to the cursor location */ -Script *ScriptDialog::friend_getCurScript(void) +Script *ScriptDialog::friend_getCurScript() { return getCurScript(); } -ScriptGroup *ScriptDialog::friend_getCurGroup(void) +ScriptGroup *ScriptDialog::friend_getCurGroup() { return getCurGroup(); } -Script *ScriptDialog::getCurScript(void) +Script *ScriptDialog::getCurScript() { if (m_curSelection.m_objType == ListType::SCRIPT_IN_PLAYER_TYPE || m_curSelection.m_objType == ListType::SCRIPT_IN_GROUP_TYPE) { ScriptList *pSL = m_sides.getSideInfo(m_curSelection.m_playerIndex)->getScriptList(); @@ -281,7 +281,7 @@ Script *ScriptDialog::getCurScript(void) return nullptr; } -ScriptGroup *ScriptDialog::getCurGroup(void) +ScriptGroup *ScriptDialog::getCurGroup() { ScriptList *pSL = m_sides.getSideInfo(m_curSelection.m_playerIndex)->getScriptList(); if (m_curSelection.m_objType == ListType::PLAYER_TYPE) { diff --git a/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp index d3695af3b47..48455afa463 100644 --- a/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/ShadowOptions.cpp @@ -61,7 +61,7 @@ END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // ShadowOptions message handlers -void ShadowOptions::setShadowColor(void) +void ShadowOptions::setShadowColor() { Int r, g, b, shift; diff --git a/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp b/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp index 8b25017731d..6f56c51fd31 100644 --- a/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp @@ -134,7 +134,7 @@ void TerrainMaterial::setToolOptions(Bool singleCell) } } -void TerrainMaterial::updateLabel(void) +void TerrainMaterial::updateLabel() { CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); if (!pDoc) return; @@ -160,7 +160,7 @@ void TerrainMaterial::updateLabel(void) } } -void TerrainMaterial::updateTextureSelection(void) +void TerrainMaterial::updateTextureSelection() { if (m_staticThis) { m_staticThis->setTerrainTreeViewSelection(TVI_ROOT, m_staticThis->m_currentFgTexture); diff --git a/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp b/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp index a17a70211a1..25dee84ad33 100644 --- a/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/TerrainModal.cpp @@ -54,7 +54,7 @@ void TerrainModal::DoDataExchange(CDataExchange* pDX) } -void TerrainModal::updateLabel(void) +void TerrainModal::updateLabel() { CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); if (!pDoc) return; @@ -221,7 +221,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent) } //* Create the tree view of textures from the textures in pMap. */ -void TerrainModal::updateTextures(void) +void TerrainModal::updateTextures() { m_terrainTreeView.DeleteAllItems(); Int i; diff --git a/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp b/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp index 57490fe0aba..f9d9aa9217a 100644 --- a/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/TileTool.cpp @@ -37,14 +37,14 @@ /// Constructor -TileTool::TileTool(void) : +TileTool::TileTool() : Tool(ID_TILE_TOOL, IDC_TILE_CURSOR) { m_htMapEditCopy = nullptr; } /// Destructor -TileTool::~TileTool(void) +TileTool::~TileTool() { REF_PTR_RELEASE(m_htMapEditCopy); } @@ -178,7 +178,7 @@ void TileTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB Int BigTileTool::m_currentWidth = 0; /// Constructor -BigTileTool::BigTileTool(void) +BigTileTool::BigTileTool() { m_toolID = ID_BIG_TILE_TOOL; } diff --git a/Generals/Code/Tools/WorldBuilder/src/Tool.cpp b/Generals/Code/Tools/WorldBuilder/src/Tool.cpp index f55ab2027c9..b186cf483f7 100644 --- a/Generals/Code/Tools/WorldBuilder/src/Tool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/Tool.cpp @@ -41,7 +41,7 @@ Tool::Tool(Int toolID, Int cursorID) /// Destructor -Tool::~Tool(void) +Tool::~Tool() { if (m_cursor) { ::DestroyCursor(m_cursor); @@ -57,7 +57,7 @@ void Tool::activate() } -void Tool::setCursor(void) +void Tool::setCursor() { if (m_cursor == nullptr) { m_cursor = AfxGetApp()->LoadCursor(MAKEINTRESOURCE(m_cursorID)); diff --git a/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp b/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp index 9c6b86eff0a..c59bfe44a50 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp @@ -82,7 +82,7 @@ void WBHeightMap::setFlattenHeights(Bool flat) //============================================================================= /** Flattens the terrain for the top down view.. */ //============================================================================= -void WBHeightMap::flattenHeights(void) { +void WBHeightMap::flattenHeights() { Real theZ = THE_Z; Int i, j; for (j=0; jm_data == nullptr) { @@ -1593,7 +1593,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo resetResources releases textures so things like device reset can be done. */ -void WorldHeightMapEdit::resetResources(void) +void WorldHeightMapEdit::resetResources() { REF_PTR_RELEASE(m_terrainTex); REF_PTR_RELEASE(m_alphaEdgeTex); @@ -1603,7 +1603,7 @@ void WorldHeightMapEdit::resetResources(void) reloadTextures reloads textures from files. */ -void WorldHeightMapEdit::reloadTextures(void) +void WorldHeightMapEdit::reloadTextures() { Int i; for (i=0; igetNext(); @@ -2019,7 +2019,7 @@ void WorldHeightMapEdit::removeFirstObject(void) //============================================================================= /** Selects any duplicate objects. */ //============================================================================= -Bool WorldHeightMapEdit::selectDuplicates(void) +Bool WorldHeightMapEdit::selectDuplicates() { const float DELTA = 0.05f; MapObject *firstObj = MapObject::TheMapObjectListPtr; @@ -2088,7 +2088,7 @@ Bool WorldHeightMapEdit::selectDuplicates(void) //============================================================================= /** Selects any similar objects. */ //============================================================================= -Bool WorldHeightMapEdit::selectSimilar(void) +Bool WorldHeightMapEdit::selectSimilar() { // const float DELTA = 0.05f; MapObject *firstObj = MapObject::TheMapObjectListPtr; @@ -2133,7 +2133,7 @@ Bool WorldHeightMapEdit::selectSimilar(void) //============================================================================= /** Selects any objects with invalid teams. */ //============================================================================= -Bool WorldHeightMapEdit::selectInvalidTeam(void) +Bool WorldHeightMapEdit::selectInvalidTeam() { Int i; AsciiString name; @@ -2568,7 +2568,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex) removeCliffMapping Removes all cliff adjustments. */ -Bool WorldHeightMapEdit::removeCliffMapping(void) +Bool WorldHeightMapEdit::removeCliffMapping() { Int ndx; @@ -3341,7 +3341,7 @@ Int WorldHeightMapEdit::addCliffInfo(TCliffInfo *pCliffInfo) } -Int WorldHeightMapEdit::getNumBoundaries(void) const +Int WorldHeightMapEdit::getNumBoundaries() const { return m_boundaries.size(); } @@ -3376,7 +3376,7 @@ void WorldHeightMapEdit::changeBoundary(Int ndx, ICoord2D *border) m_boundaries[ndx] = (*border); } -void WorldHeightMapEdit::removeLastBoundary(void) +void WorldHeightMapEdit::removeLastBoundary() { if (m_boundaries.empty()) { DEBUG_CRASH(("Invalid border remove request. jkmcd")); diff --git a/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp index 4c5cb435715..7c1c0b4db55 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WaterOptions.cpp @@ -70,7 +70,7 @@ void WaterOptions::setHeight(Int height) } } -void WaterOptions::updateTheUI(void) +void WaterOptions::updateTheUI() { PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); @@ -98,7 +98,7 @@ void WaterOptions::updateTheUI(void) } } -void WaterOptions::update(void) +void WaterOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); @@ -405,7 +405,7 @@ void WaterOptions::PopSliderFinished(const long sliderID, long theVal) } -void WaterOptions::startUpdateHeight(void) +void WaterOptions::startUpdateHeight() { PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); if (!theTrigger) { @@ -432,7 +432,7 @@ void WaterOptions::startUpdateHeight(void) } -void WaterOptions::updateHeight(void) +void WaterOptions::updateHeight() { PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); if (!theTrigger || !m_moveUndoable) { @@ -457,7 +457,7 @@ void WaterOptions::updateHeight(void) pView->Invalidate(); } -void WaterOptions::endUpdateHeight(void) +void WaterOptions::endUpdateHeight() { REF_PTR_RELEASE(m_moveUndoable); // belongs to pDoc now. } diff --git a/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp b/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp index e820d5a10c2..643c253bae1 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WaterTool.cpp @@ -41,7 +41,7 @@ Bool WaterTool::m_water_isActive = false; /// Constructor -WaterTool::WaterTool(void) +WaterTool::WaterTool() { m_toolID = ID_WATER_TOOL; m_cursorID = IDC_WATER; @@ -53,7 +53,7 @@ WaterTool::WaterTool(void) /// Destructor -WaterTool::~WaterTool(void) +WaterTool::~WaterTool() { if (m_poly_plusCursor) { ::DestroyCursor(m_poly_plusCursor); @@ -121,7 +121,7 @@ void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB /** Set the cursor. */ -void WaterTool::setCursor(void) +void WaterTool::setCursor() { if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) { if (m_poly_plusCursor == nullptr) { diff --git a/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp b/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp index 8ffcc8d0f1a..e6608622f50 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WaypointOptions.cpp @@ -56,7 +56,7 @@ void WaypointOptions::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } -MapObject *WaypointOptions::getSingleSelectedWaypoint(void) +MapObject *WaypointOptions::getSingleSelectedWaypoint() { MapObject *theMapObj = nullptr; // Bool found = false; @@ -77,7 +77,7 @@ MapObject *WaypointOptions::getSingleSelectedWaypoint(void) return(nullptr); } -PolygonTrigger *WaypointOptions::getSingleSelectedPolygon(void) +PolygonTrigger *WaypointOptions::getSingleSelectedPolygon() { CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); if (pDoc==nullptr) return nullptr; @@ -96,7 +96,7 @@ PolygonTrigger *WaypointOptions::getSingleSelectedPolygon(void) return(nullptr); } -void WaypointOptions::updateTheUI(void) +void WaypointOptions::updateTheUI() { Tool *curTool = ((CWorldBuilderApp*)AfxGetApp())->getCurTool(); @@ -273,7 +273,7 @@ void WaypointOptions::updateTheUI(void) } } -void WaypointOptions::update(void) +void WaypointOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); diff --git a/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp b/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp index 56d74756523..b425501566d 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WaypointTool.cpp @@ -42,13 +42,13 @@ Bool WaypointTool::m_isActive = false; /// Constructor -WaypointTool::WaypointTool(void) : +WaypointTool::WaypointTool() : Tool(ID_WAYPOINT_TOOL, IDC_WAYPOINT) { } /// Destructor -WaypointTool::~WaypointTool(void) +WaypointTool::~WaypointTool() { } diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 2334a45a2a8..71d6c44b1f3 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -497,7 +497,7 @@ BOOL CWorldBuilderApp::OnCmdMsg(UINT nID, int nCode, void* pExtra, //============================================================================= /** Sets the active tool to the pointer, and clears the selection. */ //============================================================================= -void CWorldBuilderApp::selectPointerTool(void) +void CWorldBuilderApp::selectPointerTool() { setActiveTool(&m_pointerTool); // Clear selection. diff --git a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp index 91b9ddec8ba..14032945d3b 100644 --- a/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp @@ -193,7 +193,7 @@ class CachedMFCFileOutputStream : public OutputStream m_totalBytes += numBytes; return(numBytes); }; - virtual void flush(void) { + virtual void flush() { while (!m_cachedChunks.empty())//!m_cachedChunks.empty()) { CachedChunk c = m_cachedChunks.front(); @@ -227,7 +227,7 @@ class CompressedCachedMFCFileOutputStream : public OutputStream m_totalBytes += numBytes; return(numBytes); }; - virtual void flush(void) { + virtual void flush() { if (!m_totalBytes) return; UnsignedByte *srcBuffer = NEW UnsignedByte[m_totalBytes]; @@ -452,7 +452,7 @@ AsciiString ConvertFaction(AsciiString name) return AsciiString::TheEmptyString; } -void CWorldBuilderDoc::validate(void) +void CWorldBuilderDoc::validate() { DEBUG_LOG(("Validating")); @@ -793,7 +793,7 @@ Bool CWorldBuilderDoc::ParseWaypointData(DataChunkInput &file, DataChunkInfo *in return true; } -void CWorldBuilderDoc::autoSave(void) +void CWorldBuilderDoc::autoSave() { // srj sez: put autosave into our user data folder, not the ap dir AsciiString autosave1 = TheGlobalData->getPath_UserData(); @@ -950,7 +950,7 @@ void CWorldBuilderDoc::OnEditUndo() } } -void CWorldBuilderDoc::OnTogglePitchAndRotation( void ) +void CWorldBuilderDoc::OnTogglePitchAndRotation() { WbView3d * p3View = Get3DView(); if (p3View) @@ -1584,7 +1584,7 @@ void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI) /** Renumbers the waypoints and the links that reference them, removing any unused ids. */ //============================================================================= -void CWorldBuilderDoc::compressWaypointIds(void) +void CWorldBuilderDoc::compressWaypointIds() { updateWaypointTable(); m_curWaypointID = 0; @@ -1638,7 +1638,7 @@ void CWorldBuilderDoc::compressWaypointIds(void) table. The waypoint table is used to locate waypoints by id, without searching the objects list. (See getWaypointByID()) */ //============================================================================= -void CWorldBuilderDoc::updateWaypointTable(void) +void CWorldBuilderDoc::updateWaypointTable() { if (m_waypointTableNeedsUpdate) { m_waypointTableNeedsUpdate=false; @@ -2089,7 +2089,7 @@ static void fprintUnit(FILE *theLogFile, Dict *teamDict, NameKeyType keyMinUnit, } -void CWorldBuilderDoc::OnDumpDocToText(void) +void CWorldBuilderDoc::OnDumpDocToText() { MapObject *pMapObj = nullptr; const char* vetStrings[] = {"Green", "Regular", "Veteran", "Elite"}; @@ -2570,7 +2570,7 @@ void CWorldBuilderDoc::OnRemoveclifftexmapping() } } -Int CWorldBuilderDoc::getNumBoundaries(void) const +Int CWorldBuilderDoc::getNumBoundaries() const { return m_heightMap->getNumBoundaries(); } @@ -2590,7 +2590,7 @@ void CWorldBuilderDoc::changeBoundary(Int ndx, ICoord2D *border) m_heightMap->changeBoundary(ndx, border); } -void CWorldBuilderDoc::removeLastBoundary(void) +void CWorldBuilderDoc::removeLastBoundary() { m_heightMap->removeLastBoundary(); } diff --git a/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp b/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp index 20804726755..0e8ff0f3185 100644 --- a/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/mapobjectprops.cpp @@ -186,7 +186,7 @@ BOOL MapObjectProps::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -/*static*/ void MapObjectProps::update(void) +/*static*/ void MapObjectProps::update() { if (TheMapObjectProps) { @@ -194,7 +194,7 @@ BOOL MapObjectProps::OnInitDialog() } } -void MapObjectProps::updateTheUI(void) +void MapObjectProps::updateTheUI() { if (this != TheMapObjectProps) { return; @@ -235,7 +235,7 @@ void MapObjectProps::updateTheUI(void) } } -/*static*/ MapObject *MapObjectProps::getSingleSelectedMapObject(void) +/*static*/ MapObject *MapObjectProps::getSingleSelectedMapObject() { MapObject *pMapObj; MapObject *theMapObj = nullptr; @@ -347,7 +347,7 @@ void MapObjectProps::OnDblclkProperties() OnEditprop(); } -void MapObjectProps::_DictToTeam(void) +void MapObjectProps::_DictToTeam() { int i; @@ -374,7 +374,7 @@ void MapObjectProps::_DictToTeam(void) owner->SetCurSel(i); } -void MapObjectProps::_DictToName(void) +void MapObjectProps::_DictToName() { AsciiString name; Bool exists; @@ -388,7 +388,7 @@ void MapObjectProps::_DictToName(void) } } -void MapObjectProps::_DictToHealth(void) +void MapObjectProps::_DictToHealth() { Int value = 100; Bool exists; @@ -429,7 +429,7 @@ void MapObjectProps::_DictToHealth(void) } } -void MapObjectProps::_DictToHPs(void) +void MapObjectProps::_DictToHPs() { Int value = -1; Bool exists; @@ -454,7 +454,7 @@ void MapObjectProps::_DictToHPs(void) } } -void MapObjectProps::_DictToEnabled(void) +void MapObjectProps::_DictToEnabled() { Bool enabled = true; Bool exists; @@ -468,7 +468,7 @@ void MapObjectProps::_DictToEnabled(void) } } -void MapObjectProps::_DictToScript(void) +void MapObjectProps::_DictToScript() { if (!m_dictToEdit) { return; @@ -488,7 +488,7 @@ void MapObjectProps::_DictToScript(void) } } -void MapObjectProps::_DictToDestructible(void) +void MapObjectProps::_DictToDestructible() { Bool destructible = true; Bool exists; @@ -502,7 +502,7 @@ void MapObjectProps::_DictToDestructible(void) } } -void MapObjectProps::_DictToUnsellable(void) +void MapObjectProps::_DictToUnsellable() { Bool unsellable = false; Bool exists; @@ -532,7 +532,7 @@ void MapObjectProps::_DictToTargetable() } } -void MapObjectProps::_DictToPowered(void) +void MapObjectProps::_DictToPowered() { Bool powered = true; Bool exists; @@ -547,7 +547,7 @@ void MapObjectProps::_DictToPowered(void) } -void MapObjectProps::_DictToAggressiveness(void) +void MapObjectProps::_DictToAggressiveness() { Int value = 0; Bool exists; @@ -571,7 +571,7 @@ void MapObjectProps::_DictToAggressiveness(void) } } -void MapObjectProps::_DictToVisibilityRange(void) +void MapObjectProps::_DictToVisibilityRange() { Int distance = 0; Bool exists; @@ -591,7 +591,7 @@ void MapObjectProps::_DictToVisibilityRange(void) } } -void MapObjectProps::_DictToVeterancy(void) +void MapObjectProps::_DictToVeterancy() { Int value = 0; Bool exists; @@ -605,7 +605,7 @@ void MapObjectProps::_DictToVeterancy(void) } } -void MapObjectProps::_DictToWeather(void) +void MapObjectProps::_DictToWeather() { Int value = 0; Bool exists; @@ -619,7 +619,7 @@ void MapObjectProps::_DictToWeather(void) pItem->SetCurSel(value); } -void MapObjectProps::_DictToTime(void) +void MapObjectProps::_DictToTime() { Int value = 0; Bool exists; @@ -633,7 +633,7 @@ void MapObjectProps::_DictToTime(void) pItem->SetCurSel(value); } -void MapObjectProps::_DictToShroudClearingDistance(void) +void MapObjectProps::_DictToShroudClearingDistance() { Int distance = 0; Bool exists; @@ -653,7 +653,7 @@ void MapObjectProps::_DictToShroudClearingDistance(void) } } -void MapObjectProps::_DictToRecruitableAI(void) +void MapObjectProps::_DictToRecruitableAI() { Bool recruitableAI = true; Bool exists; @@ -667,7 +667,7 @@ void MapObjectProps::_DictToRecruitableAI(void) } } -void MapObjectProps::_DictToSelectable(void) +void MapObjectProps::_DictToSelectable() { Bool selectable = true; Bool exists; @@ -681,7 +681,7 @@ void MapObjectProps::_DictToSelectable(void) } } -void MapObjectProps::_DictToStoppingDistance(void) +void MapObjectProps::_DictToStoppingDistance() { Real stoppingDistance = 1.0f; Bool exists = false; @@ -697,7 +697,7 @@ void MapObjectProps::_DictToStoppingDistance(void) } } -void MapObjectProps::_DictToPrebuiltUpgrades(void) +void MapObjectProps::_DictToPrebuiltUpgrades() { getAllSelectedDicts(); @@ -797,7 +797,7 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void) } while (!upgradeString.isEmpty()); } -void MapObjectProps::_TeamToDict(void) +void MapObjectProps::_TeamToDict() { getAllSelectedDicts(); @@ -816,7 +816,7 @@ void MapObjectProps::_TeamToDict(void) // Update is called by Do } -void MapObjectProps::_NameToDict(void) +void MapObjectProps::_NameToDict() { getAllSelectedDicts(); @@ -833,7 +833,7 @@ void MapObjectProps::_NameToDict(void) // Update is called by Do } -void MapObjectProps::_HealthToDict(void) +void MapObjectProps::_HealthToDict() { getAllSelectedDicts(); @@ -871,7 +871,7 @@ void MapObjectProps::_HealthToDict(void) // Update is called by Do } -void MapObjectProps::_PrebuiltUpgradesToDict(void) +void MapObjectProps::_PrebuiltUpgradesToDict() { getAllSelectedDicts(); @@ -934,7 +934,7 @@ void MapObjectProps::_PrebuiltUpgradesToDict(void) REF_PTR_RELEASE(pUndo); // belongs to pDoc now. } -void MapObjectProps::_EnabledToDict(void) +void MapObjectProps::_EnabledToDict() { getAllSelectedDicts(); @@ -950,7 +950,7 @@ void MapObjectProps::_EnabledToDict(void) // Update is called by Do } -void MapObjectProps::_ScriptToDict(void) +void MapObjectProps::_ScriptToDict() { getAllSelectedDicts(); @@ -967,7 +967,7 @@ void MapObjectProps::_ScriptToDict(void) // Update is called by Do } -void MapObjectProps::_IndestructibleToDict(void) +void MapObjectProps::_IndestructibleToDict() { getAllSelectedDicts(); @@ -983,7 +983,7 @@ void MapObjectProps::_IndestructibleToDict(void) // Update is called by Do } -void MapObjectProps::_UnsellableToDict(void) +void MapObjectProps::_UnsellableToDict() { getAllSelectedDicts(); @@ -1017,7 +1017,7 @@ void MapObjectProps::_TargetableToDict() } -void MapObjectProps::_PoweredToDict(void) +void MapObjectProps::_PoweredToDict() { getAllSelectedDicts(); @@ -1034,7 +1034,7 @@ void MapObjectProps::_PoweredToDict(void) } -void MapObjectProps::_AggressivenessToDict(void) +void MapObjectProps::_AggressivenessToDict() { getAllSelectedDicts(); @@ -1064,7 +1064,7 @@ void MapObjectProps::_AggressivenessToDict(void) // Update is called by Do } -void MapObjectProps::_VisibilityToDict(void) +void MapObjectProps::_VisibilityToDict() { getAllSelectedDicts(); @@ -1088,7 +1088,7 @@ void MapObjectProps::_VisibilityToDict(void) // Update is called by Do } -void MapObjectProps::_VeterancyToDict(void) +void MapObjectProps::_VeterancyToDict() { getAllSelectedDicts(); @@ -1110,7 +1110,7 @@ void MapObjectProps::_VeterancyToDict(void) } -void MapObjectProps::_WeatherToDict(void) +void MapObjectProps::_WeatherToDict() { getAllSelectedDicts(); @@ -1128,7 +1128,7 @@ void MapObjectProps::_WeatherToDict(void) } -void MapObjectProps::_TimeToDict(void) +void MapObjectProps::_TimeToDict() { getAllSelectedDicts(); @@ -1146,7 +1146,7 @@ void MapObjectProps::_TimeToDict(void) } -void MapObjectProps::_ShroudClearingDistanceToDict(void) +void MapObjectProps::_ShroudClearingDistanceToDict() { getAllSelectedDicts(); @@ -1170,7 +1170,7 @@ void MapObjectProps::_ShroudClearingDistanceToDict(void) // Update is called by Do } -void MapObjectProps::_RecruitableAIToDict(void) +void MapObjectProps::_RecruitableAIToDict() { getAllSelectedDicts(); @@ -1186,7 +1186,7 @@ void MapObjectProps::_RecruitableAIToDict(void) // Update is called by Do } -void MapObjectProps::_SelectableToDict(void) +void MapObjectProps::_SelectableToDict() { getAllSelectedDicts(); @@ -1224,7 +1224,7 @@ void MapObjectProps::_HPsToDict() REF_PTR_RELEASE(pUndo); // belongs to pDoc now. } -void MapObjectProps::_StoppingDistanceToDict(void) +void MapObjectProps::_StoppingDistanceToDict() { getAllSelectedDicts(); @@ -1269,7 +1269,7 @@ void MapObjectProps::ShowZOffset(MapObject *pMapObj) edit->SetWindowText(buff); } -void MapObjectProps::SetZOffset(void) +void MapObjectProps::SetZOffset() { Real value = 0.0f; CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ZOffset); @@ -1296,7 +1296,7 @@ void MapObjectProps::ShowAngle(MapObject *pMapObj) } -void MapObjectProps::SetAngle(void) +void MapObjectProps::SetAngle() { Real angle = 0.0f; CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Angle); @@ -1313,7 +1313,7 @@ void MapObjectProps::SetAngle(void) REF_PTR_RELEASE(pUndo); // belongs to pDoc now. } -void MapObjectProps::getAllSelectedDicts(void) +void MapObjectProps::getAllSelectedDicts() { m_allSelectedDicts.clear(); diff --git a/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp b/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp index 8448aad4692..ce79975e5e8 100644 --- a/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/playerlistdlg.cpp @@ -434,7 +434,7 @@ void PlayerListDlg::OnSelchangePlayers() updateTheUI(); } -void PlayerListDlg::updateTheUI(void) +void PlayerListDlg::updateTheUI() { char buffer[1024]; diff --git a/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp b/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp index 7fcf8ae1d05..63b62e8f2d9 100644 --- a/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/teamsdialog.cpp @@ -572,7 +572,7 @@ void CTeamsDialog::OnMoveDownTeam() updateUI(REBUILD_ALL); } -void CTeamsDialog::validateTeamOwners( void ) +void CTeamsDialog::validateTeamOwners() { Int numTeams = m_sides.getNumTeams(); for (Int i = 0; i < numTeams; ++i) { diff --git a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp index fff2a24a670..4cf30dc0f4c 100644 --- a/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -128,7 +128,7 @@ static Int theFlashCount = 0; static void WWDebug_Message_Callback(DebugType type, const char * message); static void WWAssert_Callback(const char * message); -static void Debug_Refs(void); +static void Debug_Refs(); // ---------------------------------------------------------------------------- static void WWDebug_Message_Callback(DebugType type, const char * message) @@ -160,12 +160,12 @@ class PlaceholderView : public View protected: virtual View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list - virtual View *getNextView( void ) override { return nullptr; } ///< Return next view in the set + virtual View *getNextView() override { return nullptr; } ///< Return next view in the set public: - virtual void init( void ) override {}; + virtual void init() override {}; - virtual UnsignedInt getID( void ) override { return 1; } + virtual UnsignedInt getID() override { return 1; } virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {return nullptr;}; ///< pick drawable given the screen pixel coords @@ -180,17 +180,17 @@ class PlaceholderView : public View Coord3D *bottomRight, Coord3D *bottomLeft, Real z ) override {}; - virtual void drawView( void ) override {}; ///< Render the world visible in this view. - virtual void updateView( void ) override {}; ///< Render the world visible in this view. + virtual void drawView() override {}; ///< Render the world visible in this view. + virtual void updateView() override {}; ///< Render the world visible in this view. virtual void stepView() override {}; ///< Update view for every fixed time step virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height - virtual Bool isZoomLimited( void ) const override { return TRUE; } ///< get status of zoom limit + virtual Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit virtual void setWidth( Int width ) override { m_width = width; } - virtual Int getWidth( void ) override { return m_width; } + virtual Int getWidth() override { return m_width; } virtual void setHeight( Int height ) override { m_height = height; } - virtual Int getHeight( void ) override { return m_height; } + virtual Int getHeight() override { return m_height; } virtual void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display virtual void getOrigin( Int *x, Int *y) override { *x=m_originX; *y=m_originY;} ///< Return location of top-left view corner on display @@ -200,13 +200,13 @@ class PlaceholderView : public View virtual void stopDoingScriptedCamera() override {} virtual void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate - virtual void initHeightForMap( void ) override {}; ///< Init the camera height for the map at the current position. + virtual void initHeightForMap() override {}; ///< Init the camera height for the map at the current position. virtual void scrollBy( Coord2D *delta ){}; ///< Shift the view by the given delta virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, Bool orient) {lookAt(o);}; virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient) {}; - virtual Bool isCameraMovementFinished(void) override {return true;}; + virtual Bool isCameraMovementFinished() override {return true;}; virtual void resetCamera(const Coord3D *location, Int frames) {}; ///< Move camera to location, and reset to default angle & zoom. virtual void rotateCamera(Real rotations, Int frames) {}; ///< Rotate camera about current viewpoint. virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds) {}; ///< Rotate camera to face an object, and hold on it @@ -214,34 +214,34 @@ class PlaceholderView : public View virtual void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. virtual void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< Final time multiplier for current camera movement. virtual void cameraModFinalPitch(Real finalPitch){}; ///< Final pitch for current camera movement. - virtual void cameraModFreezeTime(void) override {} ///< Freezes time during the next camera movement. - virtual void cameraModFreezeAngle(void) override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeTime() override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeAngle() override {} ///< Freezes time during the next camera movement. virtual void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. virtual void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. virtual void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. - virtual Bool isTimeFrozen(void) override { return false;} ///< Freezes time during the next camera movement. - virtual Int getTimeMultiplier(void) override {return 1;}; ///< Get the time multiplier. + virtual Bool isTimeFrozen() override { return false;} ///< Freezes time during the next camera movement. + virtual Int getTimeMultiplier() override {return 1;}; ///< Get the time multiplier. virtual void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) override {}; virtual void zoomCamera( Real finalZoom, Int milliseconds ) {}; virtual void pitchCamera( Real finalPitch, Int milliseconds ) {}; virtual void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle - virtual Real getAngle( void ) override { return 0; } + virtual Real getAngle() override { return 0; } virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle - virtual Real getPitch( void ) override { return 0; } ///< Return current camera pitch - virtual void setAngleToDefault( void ) override {} ///< Set the view angle back to default - virtual void setPitchToDefault( void ) override {} ///< Set the view pitch back to default + virtual Real getPitch() override { return 0; } ///< Return current camera pitch + virtual void setAngleToDefault() override {} ///< Set the view angle back to default + virtual void setPitchToDefault() override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position virtual Real getHeightAboveGround() override { return 1; } virtual void setHeightAboveGround(Real z) override { } virtual Real getZoom() override { return 1; } virtual void setZoom(Real z) override { } - virtual void zoomIn( void ) { } ///< Zoom in, closer to the ground, limit to min - virtual void zoomOut( void ) { } ///< Zoom out, farther away from the ground, limit to max - virtual void setZoomToDefault( void ) override { } ///< Set zoom to default value - virtual Real getMaxZoom( void ) { return 0.0f; } + virtual void zoomIn() { } ///< Zoom in, closer to the ground, limit to min + virtual void zoomOut() { } ///< Zoom out, farther away from the ground, limit to max + virtual void setZoomToDefault() override { } ///< Set zoom to default value + virtual Real getMaxZoom() { return 0.0f; } virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height virtual Real getTerrainHeightAtPivot() override { return 0.0f; } @@ -252,30 +252,30 @@ class PlaceholderView : public View virtual ObjectID getCameraLock() const override { return INVALID_ID; } virtual void setCameraLock(ObjectID id) override { } - virtual void snapToCameraLock( void ) override { } + virtual void snapToCameraLock() override { } virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } virtual Drawable *getCameraLockDrawable() const override { return nullptr; } virtual void setCameraLockDrawable(Drawable *drawable) override { } virtual void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view - virtual Bool isMouseLocked( void ) override { return FALSE; } ///< is the mouse input locked to the tactical view? + virtual Bool isMouseLocked() override { return FALSE; } ///< is the mouse input locked to the tactical view? virtual void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle - virtual Real getFieldOfView( void ) override {return 0;}; ///< Get the horizontal field of view angle + virtual Real getFieldOfView() override {return 0;}; ///< Get the horizontal field of view angle virtual Bool setViewFilterMode(enum FilterModes) override {return FALSE;} ///ReleaseResources(); @@ -512,7 +512,7 @@ void WbView3d::ReleaseResources(void) //============================================================================= /** Reallocates all W3D assets after a reset.. */ //============================================================================= -void WbView3d::ReAcquireResources(void) +void WbView3d::ReAcquireResources() { if (TheTerrainRenderObject) { TheTerrainRenderObject->ReAcquireResources(); @@ -554,7 +554,7 @@ void WbView3d::ReAcquireResources(void) } // ---------------------------------------------------------------------------- -void WbView3d::killTheTimer(void) +void WbView3d::killTheTimer() { if (m_timer != 0) { KillTimer(m_timer); @@ -962,7 +962,7 @@ void WbView3d::updateLights() } // ---------------------------------------------------------------------------- -void WbView3d::updateScorches(void) +void WbView3d::updateScorches() { TheTerrainRenderObject->clearAllScorches(); MapObject *pMapObj; @@ -1806,7 +1806,7 @@ Bool WbView3d::viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real theZ) } // ---------------------------------------------------------------------------- -void WbView3d::updateHysteresis(void) +void WbView3d::updateHysteresis() { CRect client; GetClientRect(&client); @@ -1939,7 +1939,7 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt) } // ---------------------------------------------------------------------------- -void WbView3d::redraw(void) +void WbView3d::redraw() { if (m_updateCount > 0) { return; @@ -2286,7 +2286,7 @@ void WbView3d::OnPaint() } -void WbView3d::drawLabels(void) +void WbView3d::drawLabels() { CDC * pDC = GetDC(); drawLabels(pDC->m_hDC); @@ -2613,7 +2613,7 @@ void WbView3d::setCameraPitch(Real absolutePitch) } // ---------------------------------------------------------------------------- -Real WbView3d::getCameraPitch(void) +Real WbView3d::getCameraPitch() { return m_FXPitch; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp index dbfb48bf300..d785c5d9d9b 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp @@ -95,7 +95,7 @@ SpecialAbilityUpdate::~SpecialAbilityUpdate() } /*------------------------------------------------------------------------------------------------ -void SpecialAbilityUpdate::update( void ) +void SpecialAbilityUpdate::update() This is the brains of the entire special ability update. There are several optional steps and variations that can be processed for any particular type of special ability. A special ability diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h index 4bf23d13661..34eed7a464a 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h @@ -72,27 +72,27 @@ class EditWindow public: - EditWindow( void ); - ~EditWindow( void ); + EditWindow(); + ~EditWindow(); /// initialize the edit window singleton void init( UnsignedInt clientWidth, UnsignedInt clientHeight ); - void shutdown( void ); ///< free all data - void draw( void ); ///< draw the edit window + void shutdown(); ///< free all data + void draw(); ///< draw the edit window - void updatePulse( void ); ///< pulse message from timer + void updatePulse(); ///< pulse message from timer - HWND getWindowHandle( void ); ///< get window handle + HWND getWindowHandle(); ///< get window handle void setSize( ICoord2D *size ); ///< set width and height for edit window void getSize( ICoord2D *size ); ///< get width and height for edit window - RGBColorReal getBackgroundColor( void ); ///< return the background color + RGBColorReal getBackgroundColor(); ///< return the background color void setBackgroundColor( RGBColorReal color ); ///< set background color void setDragMoveOrigin( ICoord2D *pos ); ///< for drag moving void setDragMoveDest( ICoord2D *pos ); ///< for drag moving - ICoord2D getDragMoveOrigin( void ); ///< for keyboard moving - ICoord2D getDragMoveDest( void ); ///< for keyboard moving + ICoord2D getDragMoveOrigin(); ///< for keyboard moving + ICoord2D getDragMoveDest(); ///< for keyboard moving void notifyWindowDeleted( GameWindow *window ); ///< window has been deleted @@ -122,21 +122,21 @@ class EditWindow /// image clipping support void setClipRegion( IRegion2D *region ) {m_clipRegion = *region; m_isClippedEnabled = TRUE;} - Bool isClippingEnabled( void ) { return m_isClippedEnabled; } + Bool isClippingEnabled() { return m_isClippedEnabled; } void enableClipping( Bool onoff ) { m_isClippedEnabled = onoff; } protected: - void registerEditWindowClass( void ); ///< register class with OS + void registerEditWindowClass(); ///< register class with OS /// callback from windows, NOTE that it's static and has no this pointer static LRESULT CALLBACK editProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ); - void drawGrid( void ); ///< draw the grid + void drawGrid(); ///< draw the grid void drawSeeThruOutlines( GameWindow *windowList, Color c ); void drawHiddenOutlines( GameWindow *windowList, Color c ); - void drawUIFeedback( void ); ///< draw UI visual feedback + void drawUIFeedback(); ///< draw UI visual feedback /// if mouse is close to selected window allow resize void handleResizeAvailable( Int mouseX, Int mouseY ); @@ -188,13 +188,13 @@ class EditWindow /////////////////////////////////////////////////////////////////////////////// // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -inline HWND EditWindow::getWindowHandle( void ) { return m_editWindowHWnd; } +inline HWND EditWindow::getWindowHandle() { return m_editWindowHWnd; } inline void EditWindow::getSize( ICoord2D *size ) { *size = m_size; } inline void EditWindow::getPopupMenuClickPos( ICoord2D *pos ) { *pos = m_popupMenuClickPos; } inline void EditWindow::setDragMoveDest( ICoord2D *pos ) { if( pos ) m_dragMoveDest = *pos; } inline void EditWindow::setDragMoveOrigin( ICoord2D *pos ) { if( pos ) m_dragMoveOrigin = *pos; } -inline ICoord2D EditWindow::getDragMoveDest( void ) { return m_dragMoveDest; } -inline ICoord2D EditWindow::getDragMoveOrigin( void ) { return m_dragMoveOrigin; } +inline ICoord2D EditWindow::getDragMoveDest() { return m_dragMoveDest; } +inline ICoord2D EditWindow::getDragMoveOrigin() { return m_dragMoveOrigin; } /////////////////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h index 41cbb62eb19..2e982766960 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -119,12 +119,12 @@ class GUIEdit public: - GUIEdit( void ); - ~GUIEdit( void ); + GUIEdit(); + ~GUIEdit(); - void init( void ); ///< initialize data - void shutdown( void ); ///< shutdown all our data - void update( void ); ///< process the universe + void init(); ///< initialize data + void shutdown(); ///< shutdown all our data + void update(); ///< process the universe Bool readConfigFile( const char *filename ); ///< read the configuration file Bool writeConfigFile( const char *filename ); ///< write the configuration file @@ -132,47 +132,47 @@ class GUIEdit void readFontFile( const char *filename ); ///< read file with available font definitions void writeFontFile( const char *filename ); ///< write all loaded fonts to a file - char *getSaveFilename( void ); - char *getSavePathAndFilename( void ); + char *getSaveFilename(); + char *getSavePathAndFilename(); void setSaveFile( const char *fullPathAndFilename ); ///< set filename to use for saving - HWND getWindowHandle( void ); ///< get window handle - HINSTANCE getInstance( void ); ///< get application instance - HWND getStatusBarWindowHandle( void ); ///< get status bar HWND - void createStatusBar( void ); ///< create status bar + HWND getWindowHandle(); ///< get window handle + HINSTANCE getInstance(); ///< get application instance + HWND getStatusBarWindowHandle(); ///< get status bar HWND + void createStatusBar(); ///< create status bar void statusMessage( StatusPart part, const char *message ); ///< set status bar textl - void createToolbar( void ); ///< create the toolbar + void createToolbar(); ///< create the toolbar void setCursor( CursorType type ); ///< set cursor void setPropertyTarget( GameWindow *window ); ///< set window for property editing - GameWindow *getPropertyTarget( void ); ///< get window editing properties + GameWindow *getPropertyTarget(); ///< get window editing properties void loadGUIEditFontLibrary( FontLibrary *library ); ///< fonts available in the editor Bool isNameDuplicate( GameWindow *root, GameWindow *ignore, AsciiString name ); - EditMode getMode( void ); ///< return the current mode + EditMode getMode(); ///< return the current mode void setMode( EditMode mode ); ///< set the new mode void setUnsaved( Bool unsaved ); ///< set unsaved flag to FALSE or TRUE - Bool newLayout( void ); ///< reset editor for new layout + Bool newLayout(); ///< reset editor for new layout // grid settings void setGridResolution( Int res ); - Int getGridResolution( void ); + Int getGridResolution(); void setGridVisible( Bool visible ); - Bool isGridVisible( void ); + Bool isGridVisible(); void setGridSnap( Bool on ); - Bool isGridSnapOn( void ); + Bool isGridSnapOn(); void setGridColor( RGBColorInt *color ); - RGBColorInt *getGridColor( void ); + RGBColorInt *getGridColor(); void gridSnapLocation( ICoord2D *source, ICoord2D *snapped ); // display options for hidden/see thru windows void setShowHiddenOutlines( Bool show ); - Bool getShowHiddenOutlines( void ); + Bool getShowHiddenOutlines(); void setShowSeeThruOutlines( Bool show ); - Bool getShowSeeThruOutlines( void ); + Bool getShowSeeThruOutlines(); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // manipulating windows ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -181,16 +181,16 @@ class GUIEdit Bool windowIsGadget( GameWindow *window ); ///< is the window a gadget // selection help ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - WindowSelectionEntry *getSelectList( void ); ///< get the selected list head - GameWindow *getFirstSelected( void ); ///< get first selected window + WindowSelectionEntry *getSelectList(); ///< get the selected list head + GameWindow *getFirstSelected(); ///< get first selected window void moveWindowTo( GameWindow *window, Int x, Int y ); ///< move window Bool isWindowSelected( GameWindow *window ); ///< is window selected void selectWindow( GameWindow *window ); ///< add to selection list void unSelectWindow( GameWindow *window ); ///< remove from selection list - void clearSelections( void ); ///< clear selection list - Int selectionCount( void ); ///< return # of selected windows - void deleteSelected( void ); ///< delete selected windows - void bringSelectedToTop( void ); ///< bring selected windows to top + void clearSelections(); ///< clear selection list + Int selectionCount(); ///< return # of selected windows + void deleteSelected(); ///< delete selected windows + void bringSelectedToTop(); ///< bring selected windows to top /// select the windows that are FULLY in the region specified void selectWindowsInRegion( IRegion2D *region ); @@ -223,7 +223,7 @@ class GUIEdit GameWindow *getWindowAtPos( Int x, Int y ); ///< get topmost window at pos - void deleteAllWindows( void ); ///< delete all windows in the editor + void deleteAllWindows(); ///< delete all windows in the editor void removeWindowCleanup( GameWindow *window ); ///< to cleanup before delete void deleteWindow( GameWindow *window ); ///< delete a game window @@ -274,16 +274,16 @@ class GUIEdit Int width, Int height ); // menu options ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Bool menuNew( void ); ///< start a new layout process - Bool menuOpen( void ); ///< hit open on menu + Bool menuNew(); ///< start a new layout process + Bool menuOpen(); ///< hit open on menu void stripNameDecorations( GameWindow *root ); ///< after a load void revertDefaultCallbacks( GameWindow *root ); ///< after a load - Bool menuSave( void ); ///< hit save on menu - Bool menuSaveAs( void ); ///< hit save as on menu - Bool menuExit( void ); ///< exit application - Bool menuCopy( void ); ///< copy selected windows into copy buffer - Bool menuPaste( void ); ///< paste contents of copy buffer - Bool menuCut( void ); ///< cut selected windows into copy buffer + Bool menuSave(); ///< hit save on menu + Bool menuSaveAs(); ///< hit save as on menu + Bool menuExit(); ///< exit application + Bool menuCopy(); ///< copy selected windows into copy buffer + Bool menuPaste(); ///< paste contents of copy buffer + Bool menuCut(); ///< cut selected windows into copy buffer void checkMenuItem( Int item ); void unCheckMenuItem( Int item ); @@ -291,14 +291,14 @@ class GUIEdit void setLayoutInit( AsciiString init ); ///< set layout init function name void setLayoutUpdate( AsciiString update ); ///< set layout update function name void setLayoutShutdown( AsciiString shutdown ); ///< set layout shutdown function name - AsciiString getLayoutInit( void ); ///< get layout init function name - AsciiString getLayoutUpdate( void ); ///< get layout update function name - AsciiString getLayoutShutdown( void ); ///< get layout shutdown function name + AsciiString getLayoutInit(); ///< get layout init function name + AsciiString getLayoutUpdate(); ///< get layout update function name + AsciiString getLayoutShutdown(); ///< get layout shutdown function name protected: - char *saveAsDialog( void ); ///< save as standard browser - char *openDialog( void ); ///< open standard browser + char *saveAsDialog(); ///< save as standard browser + char *openDialog(); ///< open standard browser void validateNames( GameWindow *root, char *filename, Bool *valid ); void updateRadioScreenIdentifiers( GameWindow *window, Int screenID ); @@ -343,30 +343,30 @@ class GUIEdit }; // INLINING /////////////////////////////////////////////////////////////////////////////////////// -inline HWND GUIEdit::getWindowHandle( void ) { return m_appHWnd; } -inline HINSTANCE GUIEdit::getInstance( void ) { return m_appInst; } -inline HWND GUIEdit::getStatusBarWindowHandle( void ) { return m_statusBarHWnd; } -inline EditMode GUIEdit::getMode( void ) { return m_mode; } +inline HWND GUIEdit::getWindowHandle() { return m_appHWnd; } +inline HINSTANCE GUIEdit::getInstance() { return m_appInst; } +inline HWND GUIEdit::getStatusBarWindowHandle() { return m_statusBarHWnd; } +inline EditMode GUIEdit::getMode() { return m_mode; } inline void GUIEdit::setPropertyTarget( GameWindow *window ) { m_propertyTarget = window; } -inline GameWindow *GUIEdit::getPropertyTarget( void ) { return m_propertyTarget; } -inline char *GUIEdit::getSaveFilename( void ) { return m_saveFilename; } -inline char *GUIEdit::getSavePathAndFilename( void ) { return m_savePathAndFilename; } +inline GameWindow *GUIEdit::getPropertyTarget() { return m_propertyTarget; } +inline char *GUIEdit::getSaveFilename() { return m_saveFilename; } +inline char *GUIEdit::getSavePathAndFilename() { return m_savePathAndFilename; } inline void GUIEdit::setGridResolution( Int res ) { m_gridResolution = res; } -inline Int GUIEdit::getGridResolution( void ) { return m_gridResolution; } +inline Int GUIEdit::getGridResolution() { return m_gridResolution; } inline void GUIEdit::setGridVisible( Bool visible ) { m_gridVisible = visible; } -inline Bool GUIEdit::isGridVisible( void ) { return m_gridVisible; } +inline Bool GUIEdit::isGridVisible() { return m_gridVisible; } inline void GUIEdit::setGridSnap( Bool on ) { m_snapToGrid = on; } -inline Bool GUIEdit::isGridSnapOn( void ) { return m_snapToGrid; } +inline Bool GUIEdit::isGridSnapOn() { return m_snapToGrid; } inline void GUIEdit::setGridColor( RGBColorInt *color ) { m_gridColor = *color; } -inline RGBColorInt *GUIEdit::getGridColor( void ) { return &m_gridColor; } -inline Bool GUIEdit::getShowHiddenOutlines( void ) { return m_showHiddenOutlines; } -inline Bool GUIEdit::getShowSeeThruOutlines( void ) { return m_showSeeThruOutlines; } +inline RGBColorInt *GUIEdit::getGridColor() { return &m_gridColor; } +inline Bool GUIEdit::getShowHiddenOutlines() { return m_showHiddenOutlines; } +inline Bool GUIEdit::getShowSeeThruOutlines() { return m_showSeeThruOutlines; } inline void GUIEdit::setLayoutInit( AsciiString init ) { m_layoutInitString = init; } inline void GUIEdit::setLayoutUpdate( AsciiString update ) { m_layoutUpdateString = update; } inline void GUIEdit::setLayoutShutdown( AsciiString shutdown ) { m_layoutShutdownString = shutdown; } -inline AsciiString GUIEdit::getLayoutInit( void ) { return m_layoutInitString; } -inline AsciiString GUIEdit::getLayoutUpdate( void ) { return m_layoutUpdateString; } -inline AsciiString GUIEdit::getLayoutShutdown( void ) { return m_layoutShutdownString; } +inline AsciiString GUIEdit::getLayoutInit() { return m_layoutInitString; } +inline AsciiString GUIEdit::getLayoutUpdate() { return m_layoutUpdateString; } +inline AsciiString GUIEdit::getLayoutShutdown() { return m_layoutShutdownString; } // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern GUIEdit *TheEditor; ///< editor application singleton diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 7b278b8f2d4..f554dd614c8 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -63,10 +63,10 @@ class GUIEditDisplay : public Display public: - GUIEditDisplay( void ); - virtual ~GUIEditDisplay( void ) override; + GUIEditDisplay(); + virtual ~GUIEditDisplay() override; - virtual void draw( void ) override { }; + virtual void draw() override { }; /// draw a line on the display in pixel coordinates with the specified color virtual void drawLine( Int startX, Int startY, Int endX, Int endY, @@ -89,20 +89,20 @@ class GUIEditDisplay : public Display Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) override; /// image clipping support virtual void setClipRegion( IRegion2D *region ) override; - virtual Bool isClippingEnabled( void ) override; + virtual Bool isClippingEnabled() override; virtual void enableClipping( Bool onoff ) override; // These are stub functions to allow compilation: /// Create a video buffer that can be used for this display - virtual VideoBuffer* createVideoBuffer( void ) override { return nullptr; } + virtual VideoBuffer* createVideoBuffer() override { return nullptr; } /// draw a video buffer fit within the screen coordinates virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) override { } virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY, Int endX, Int endY ) override { } - virtual void takeScreenShot(void) override { } - virtual void toggleMovieCapture(void) override {} + virtual void takeScreenShot() override { } + virtual void toggleMovieCapture() override {} // methods that we need to stub virtual void setTimeOfDay( TimeOfDay tod ) override {} @@ -113,7 +113,7 @@ class GUIEditDisplay : public Display virtual void clearShroud() override {} virtual void preloadModelAssets( AsciiString model ) override {} virtual void preloadTextureAssets( AsciiString texture ) override {} - virtual void toggleLetterBox(void) override {} + virtual void toggleLetterBox() override {} virtual void enableLetterBox(Bool enable) override {} #if defined(RTS_DEBUG) virtual void dumpModelAssets(const char *path) {} @@ -123,9 +123,9 @@ class GUIEditDisplay : public Display virtual void dumpAssetUsage(const char* mapname) {} #endif - virtual Real getAverageFPS(void) override { return 0; } - virtual Real getCurrentFPS(void) override { return 0; } - virtual Int getLastFrameDrawCalls( void ) override { return 0; } + virtual Real getAverageFPS() override { return 0; } + virtual Real getCurrentFPS() override { return 0; } + virtual Int getLastFrameDrawCalls() override { return 0; } protected: diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index b83666e6f5a..767e32fe943 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -45,10 +45,10 @@ class GUIEditWindowManager : public W3DGameWindowManager public: - GUIEditWindowManager( void ); - virtual ~GUIEditWindowManager( void ) override; + GUIEditWindowManager(); + virtual ~GUIEditWindowManager() override; - virtual void init( void ) override; ///< initialize system + virtual void init() override; ///< initialize system virtual Int winDestroy( GameWindow *window ) override; ///< destroy this window /// create a new window by setting up parameters and callbacks @@ -69,15 +69,15 @@ class GUIEditWindowManager : public W3DGameWindowManager void validateClipboardNames( GameWindow *root ); ///< ensure unique names void incrementName( GameWindow *window ); ///< make a new unique name - void resetClipboard( void ); ///< reset the clipboard to empty - Bool isClipboardEmpty( void ); ///< is the clipboard empty + void resetClipboard(); ///< reset the clipboard to empty + Bool isClipboardEmpty(); ///< is the clipboard empty void duplicateSelected( GameWindow *root ); ///< dupe the selected windows into the clipboard - void copySelectedToClipboard( void ); ///< copy selected windows to clipboard - void cutSelectedToClipboard( void ); ///< cut selected windows to clipboard - void pasteClipboard( void ); ///< paste the contents of the clipboard + void copySelectedToClipboard(); ///< copy selected windows to clipboard + void cutSelectedToClipboard(); ///< cut selected windows to clipboard + void pasteClipboard(); ///< paste the contents of the clipboard - GameWindow *getClipboardList( void ); ///< get the clipboard list - GameWindow *getClipboardDupeList( void ); ///< get clipboard dupe list + GameWindow *getClipboardList(); ///< get the clipboard list + GameWindow *getClipboardDupeList(); ///< get clipboard dupe list protected: @@ -88,14 +88,14 @@ class GUIEditWindowManager : public W3DGameWindowManager /** remove selected children from the select list that have a parent also in the select list */ - void removeSupervisedChildSelections( void ); + void removeSupervisedChildSelections(); /** selected windows that are children will cut loose their parents and become adults (their parent will be null, otherwise the screen) */ -// void orphanSelectedChildren( void ); +// void orphanSelectedChildren(); /// dupe a window and its children GameWindow *duplicateWindow( GameWindow *source, GameWindow *parent ); - void createClipboardDuplicate( void ); ///< duplicate the clipboard on the dup list + void createClipboardDuplicate(); ///< duplicate the clipboard on the dup list GameWindow *m_clipboard; ///< list of windows in the clipboard GameWindow *m_clipboardDup; ///< list duplicate of the clipboard used for pasting @@ -106,8 +106,8 @@ class GUIEditWindowManager : public W3DGameWindowManager }; // INLINE ///////////////////////////////////////////////////////////////////////////////////////// -inline GameWindow *GUIEditWindowManager::getClipboardList( void ) { return m_clipboard; } -inline GameWindow *GUIEditWindowManager::getClipboardDupeList( void ) { return m_clipboardDup; } +inline GameWindow *GUIEditWindowManager::getClipboardList() { return m_clipboard; } +inline GameWindow *GUIEditWindowManager::getClipboardDupeList() { return m_clipboardDup; } // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern GUIEditWindowManager *TheGUIEditWindowManager; ///< editor use only diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h index bbe9c0b0083..4b607bc6bab 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -82,12 +82,12 @@ class HierarchyView public: - HierarchyView( void ); - ~HierarchyView( void ); + HierarchyView(); + ~HierarchyView(); - void init( void ); - void reset( void ); - void shutdown( void ); + void init(); + void reset(); + void shutdown(); char *getWindowTreeName( GameWindow *window ); void addWindow( GameWindow *window, HierarchyOption option ); ///< add a window to the view @@ -96,8 +96,8 @@ class HierarchyView void updateWindowName( GameWindow *window ); ///< update tree entry based on name void selectWindow( GameWindow *window ); ///< select window - HWND getTreeHandle( void ); ///< get the tree control handle - HWND getHierarchyHandle( void ); ///< get window handle for the whole dialog + HWND getTreeHandle(); ///< get the tree control handle + HWND getHierarchyHandle(); ///< get window handle for the whole dialog void setDialogPos( ICoord2D *pos ); void getDialogPos( ICoord2D *pos ); @@ -106,15 +106,15 @@ class HierarchyView void setDragWindow( GameWindow *window ); void setDragTarget( GameWindow *window ); - GameWindow *getDragWindow( void ); - GameWindow *getDragTarget( void ); + GameWindow *getDragWindow(); + GameWindow *getDragTarget(); void moveWindowAheadOf( GameWindow *window, GameWindow *aheadOf ); ///< move hierarchy representation void moveWindowChildOf( GameWindow *window, GameWindow *parent ); ///< move hierarchy representation Bool validateDragDropOperation( GameWindow *source, GameWindow *target ); void setPopupTarget( GameWindow *window ); ///< set target for popup menu - GameWindow *getPopupTarget( void ); ///< get the popup target window + GameWindow *getPopupTarget(); ///< get the popup target window HTREEITEM treePointToItem( Int x, Int y ); ///< translate mouse pos to item location GameWindow *getWindowFromItem( HTREEITEM treeItem ); ///< get game window from user data in the tree item @@ -160,14 +160,14 @@ class HierarchyView /////////////////////////////////////////////////////////////////////////////// // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -inline HWND HierarchyView::getTreeHandle( void ) { return m_tree; } -inline HWND HierarchyView::getHierarchyHandle( void ) { return m_dialog; } +inline HWND HierarchyView::getTreeHandle() { return m_tree; } +inline HWND HierarchyView::getHierarchyHandle() { return m_dialog; } inline void HierarchyView::setDragWindow( GameWindow *window ) { m_dragWindow = window; } inline void HierarchyView::setDragTarget( GameWindow *window ) { m_dragTarget = window; } -inline GameWindow *HierarchyView::getDragWindow( void ) { return m_dragWindow; } -inline GameWindow *HierarchyView::getDragTarget( void ) { return m_dragTarget; } +inline GameWindow *HierarchyView::getDragWindow() { return m_dragWindow; } +inline GameWindow *HierarchyView::getDragTarget() { return m_dragTarget; } inline void HierarchyView::setPopupTarget( GameWindow *window ) { m_popupTarget = window; } -inline GameWindow *HierarchyView::getPopupTarget( void ) { return m_popupTarget; } +inline GameWindow *HierarchyView::getPopupTarget() { return m_popupTarget; } // EXTERNALS ////////////////////////////////////////////////////////////////// extern HierarchyView *TheHierarchyView; ///< singleton for our view diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h index b2f414c28c3..1d32905efaf 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -70,11 +70,11 @@ class LayoutScheme LayoutScheme(); ~LayoutScheme(); - void init( void ); + void init(); - void openDialog( void ); ///< open the scheme info and editing dialog + void openDialog(); ///< open the scheme info and editing dialog - char *getSchemeFilename( void ); ///< get the scheme filename + char *getSchemeFilename(); ///< get the scheme filename void setSchemeFilename( char *filename ); ///< set the scheme filename Bool saveScheme( char *filename ); ///< save the current scheme to file @@ -85,14 +85,14 @@ class LayoutScheme Color color, Color borderColor ); void setFont( GameFont *font ); - GameFont *getFont( void ); - - Color getEnabledTextColor( void ); - Color getEnabledTextBorderColor( void ); - Color getDisabledTextColor( void ); - Color getDisabledTextBorderColor( void ); - Color getHiliteTextColor( void ); - Color getHiliteTextBorderColor( void ); + GameFont *getFont(); + + Color getEnabledTextColor(); + Color getEnabledTextBorderColor(); + Color getDisabledTextColor(); + Color getDisabledTextBorderColor(); + Color getHiliteTextColor(); + Color getHiliteTextBorderColor(); void setEnabledTextColor( Color c ); void setEnabledTextBorderColor( Color c ); void setDisabledTextColor( Color c ); @@ -123,14 +123,14 @@ class LayoutScheme /////////////////////////////////////////////////////////////////////////////// // INLINING /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -inline char *LayoutScheme::getSchemeFilename( void ) { return m_schemeFilename; } +inline char *LayoutScheme::getSchemeFilename() { return m_schemeFilename; } inline void LayoutScheme::setSchemeFilename( char *filename ) { strlcpy(m_schemeFilename, filename, ARRAY_SIZE(m_schemeFilename)); } -inline Color LayoutScheme::getEnabledTextColor( void ) { return m_enabledText.color; } -inline Color LayoutScheme::getEnabledTextBorderColor( void ) { return m_enabledText.borderColor; } -inline Color LayoutScheme::getDisabledTextColor( void ) { return m_disabledText.color; } -inline Color LayoutScheme::getDisabledTextBorderColor( void ) { return m_disabledText.borderColor; } -inline Color LayoutScheme::getHiliteTextColor( void ) { return m_hiliteText.color; } -inline Color LayoutScheme::getHiliteTextBorderColor( void ) { return m_hiliteText.borderColor; } +inline Color LayoutScheme::getEnabledTextColor() { return m_enabledText.color; } +inline Color LayoutScheme::getEnabledTextBorderColor() { return m_enabledText.borderColor; } +inline Color LayoutScheme::getDisabledTextColor() { return m_disabledText.color; } +inline Color LayoutScheme::getDisabledTextBorderColor() { return m_disabledText.borderColor; } +inline Color LayoutScheme::getHiliteTextColor() { return m_hiliteText.color; } +inline Color LayoutScheme::getHiliteTextBorderColor() { return m_hiliteText.borderColor; } inline void LayoutScheme::setEnabledTextColor( Color c ) { m_enabledText.color = c; } inline void LayoutScheme::setEnabledTextBorderColor( Color c ) { m_enabledText.borderColor = c; } inline void LayoutScheme::setDisabledTextColor( Color c ) { m_disabledText.color = c; } @@ -138,7 +138,7 @@ inline void LayoutScheme::setDisabledTextBorderColor( Color c ) { m_disabledText inline void LayoutScheme::setHiliteTextColor( Color c ) { m_hiliteText.color = c; } inline void LayoutScheme::setHiliteTextBorderColor( Color c ) { m_hiliteText.borderColor = c; } inline void LayoutScheme::setFont( GameFont *font ) { m_font = font; } -inline GameFont *LayoutScheme::getFont( void ) { return m_font; } +inline GameFont *LayoutScheme::getFont() { return m_font; } /////////////////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h index b584d35a442..739452167a3 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h @@ -416,9 +416,9 @@ extern void StoreColor( StateIdentifier id, Color color, Color borderColor ); extern void LoadFontCombo( HWND comboBox, GameFont *currFont ); extern GameFont *GetSelectedFontFromCombo( HWND combo ); -extern Color GetPropsEnabledTextColor( void ); -extern Color GetPropsEnabledTextBorderColor( void ); -extern Color GetPropsDisabledTextColor( void ); -extern Color GetPropsDisabledTextBorderColor( void ); -extern Color GetPropsHiliteTextColor( void ); -extern Color GetPropsHiliteTextBorderColor( void ); +extern Color GetPropsEnabledTextColor(); +extern Color GetPropsEnabledTextBorderColor(); +extern Color GetPropsDisabledTextColor(); +extern Color GetPropsDisabledTextBorderColor(); +extern Color GetPropsHiliteTextColor(); +extern Color GetPropsHiliteTextBorderColor(); diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp index 5616d54a06d..afaa6f4a1a4 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp @@ -310,7 +310,7 @@ LRESULT CALLBACK EditWindow::editProc( HWND hWnd, UINT message, // EditWindow::registerEditWindowClass ======================================== /** Register a class with the windows OS for an edit window */ //============================================================================= -void EditWindow::registerEditWindowClass( void ) +void EditWindow::registerEditWindowClass() { WNDCLASSEX wcex; ATOM atom; @@ -345,7 +345,7 @@ void EditWindow::registerEditWindowClass( void ) // EditWindow::EditWindow ===================================================== /** */ //============================================================================= -EditWindow::EditWindow( void ) +EditWindow::EditWindow() { m_pulse = 0; @@ -396,7 +396,7 @@ EditWindow::EditWindow( void ) // EditWindow::~EditWindow ==================================================== /** */ //============================================================================= -EditWindow::~EditWindow( void ) +EditWindow::~EditWindow() { // call the shutdown @@ -490,7 +490,7 @@ void EditWindow::init( UnsignedInt clientWidth, UnsignedInt clientHeight ) // EditWindow::shutdown ======================================================= /** Shutdown edit window */ //============================================================================= -void EditWindow::shutdown( void ) +void EditWindow::shutdown() { // delete 2d renderer @@ -524,7 +524,7 @@ void EditWindow::shutdown( void ) // EditWindow::updatePulse ==================================================== /** Update pulse from timer message */ //============================================================================= -void EditWindow::updatePulse( void ) +void EditWindow::updatePulse() { static Bool dir = 1; static Int stepSize = 4; @@ -1201,7 +1201,7 @@ void EditWindow::drawHiddenOutlines( GameWindow *windowList, Color c ) /** Draw any visual feedback to the user about selection boxes or windows * that are selected, draggin windows etc */ //============================================================================= -void EditWindow::drawUIFeedback( void ) +void EditWindow::drawUIFeedback() { WindowSelectionEntry *select; Int color = m_pulse * 2; @@ -1412,7 +1412,7 @@ void EditWindow::drawUIFeedback( void ) // EditWindow::drawGrid ======================================================= /** Draw the grid */ //============================================================================= -void EditWindow::drawGrid( void ) +void EditWindow::drawGrid() { // HDC hdc = GetDC( getWindowHandle() ); Int res = TheEditor->getGridResolution(); @@ -1468,7 +1468,7 @@ void EditWindow::drawGrid( void ) // EditWindow::draw =========================================================== /** Draw the edit window */ //============================================================================= -void EditWindow::draw( void ) +void EditWindow::draw() { // allow W3D to update its internals WW3D::Update_Logic_Frame_Time(TheFramePacer->getLogicTimeStepMilliseconds()); @@ -1726,7 +1726,7 @@ void EditWindow::drawImage( const Image *image, // EditWindow::getBackgroundColor ============================================= /** Get the background color for the edit window */ //============================================================================= -RGBColorReal EditWindow::getBackgroundColor( void ) +RGBColorReal EditWindow::getBackgroundColor() { return m_backgroundColor; diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp index 9868b51ddba..23b315cc5f0 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEdit.cpp @@ -117,7 +117,7 @@ GUIEdit *TheEditor = nullptr; /** Bring up the standard windows browser save as dialog and return * filename selected */ //============================================================================= -char *GUIEdit::saveAsDialog( void ) +char *GUIEdit::saveAsDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -159,7 +159,7 @@ char *GUIEdit::saveAsDialog( void ) /** Bring up the standard windows browser open dialog and return * filename selected */ //============================================================================= -char *GUIEdit::openDialog( void ) +char *GUIEdit::openDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -409,7 +409,7 @@ void GUIEdit::selectWindowsInRegion( IRegion2D *region ) // GUIEdit::GUIEdit =========================================================== /** */ //============================================================================= -GUIEdit::GUIEdit( void ) +GUIEdit::GUIEdit() { m_appInst = nullptr; @@ -443,7 +443,7 @@ GUIEdit::GUIEdit( void ) // GUIEdit::~GUIEdit ========================================================== /** */ //============================================================================= -GUIEdit::~GUIEdit( void ) +GUIEdit::~GUIEdit() { delete TheHeaderTemplateManager; TheHeaderTemplateManager = nullptr; @@ -463,7 +463,7 @@ GUIEdit::~GUIEdit( void ) // GUIEdit::init ============================================================== /** Initialize all the GUI edit data */ //============================================================================= -void GUIEdit::init( void ) +void GUIEdit::init() { // @@ -615,7 +615,7 @@ void GUIEdit::init( void ) // GUIEdit::shutdown ========================================================== /** Shutdown our GUI edit application */ //============================================================================= -void GUIEdit::shutdown( void ) +void GUIEdit::shutdown() { // write our configuration file @@ -710,7 +710,7 @@ void GUIEdit::shutdown( void ) // GUIEdit::update ============================================================ /** Update method for our GUI edit application */ //============================================================================= -void GUIEdit::update( void ) +void GUIEdit::update() { // update mouse info @@ -1363,7 +1363,7 @@ void GUIEdit::clipCreationParamsToParent( GameWindow *parent, // GUIEdit::deleteAllWindows ================================================== /** Delete all windows in the editor */ //============================================================================= -void GUIEdit::deleteAllWindows( void ) +void GUIEdit::deleteAllWindows() { GameWindow *window, *next; @@ -3334,7 +3334,7 @@ GameWindow *GUIEdit::newStaticText( GameWindow *parent, // GUIEdit::createStatusBar =================================================== /** Create a status bar at the bottom of the editor */ //============================================================================= -void GUIEdit::createStatusBar( void ) +void GUIEdit::createStatusBar() { RECT rect; Int width; @@ -3393,7 +3393,7 @@ void GUIEdit::statusMessage( StatusPart part, const char *message ) // GUIEdit::createToolbar ===================================================== /** Create the toolbar for the editor */ //============================================================================= -void GUIEdit::createToolbar( void ) +void GUIEdit::createToolbar() { } @@ -3405,7 +3405,7 @@ void GUIEdit::createToolbar( void ) // GUIEdit::newLayout ========================================================= /** Reset the editor for a new layout */ //============================================================================= -Bool GUIEdit::newLayout( void ) +Bool GUIEdit::newLayout() { // delete all windows @@ -3426,7 +3426,7 @@ Bool GUIEdit::newLayout( void ) // GUIEdit::menuExit ========================================================== /** The user clicked on exit in the menu and wishes to exit the editor */ //============================================================================= -Bool GUIEdit::menuExit( void ) +Bool GUIEdit::menuExit() { Int result; @@ -3473,7 +3473,7 @@ Bool GUIEdit::menuExit( void ) // GUIEdit::menuNew =========================================================== /** file->new menu option */ //============================================================================= -Bool GUIEdit::menuNew( void ) +Bool GUIEdit::menuNew() { // @@ -3599,7 +3599,7 @@ void GUIEdit::revertDefaultCallbacks( GameWindow *root ) // GUIEdit::menuOpen ========================================================== /** User has clicked on file->open */ //============================================================================= -Bool GUIEdit::menuOpen( void ) +Bool GUIEdit::menuOpen() { char *filePath; @@ -3699,7 +3699,7 @@ Bool GUIEdit::menuOpen( void ) // GUIEdit::menuSave ========================================================== /** file->save menu option */ //============================================================================= -Bool GUIEdit::menuSave( void ) +Bool GUIEdit::menuSave() { Bool success; @@ -3730,7 +3730,7 @@ Bool GUIEdit::menuSave( void ) // GUIEdit::menuSaveAs ======================================================== /** file->saveAs menu option */ //============================================================================= -Bool GUIEdit::menuSaveAs( void ) +Bool GUIEdit::menuSaveAs() { char *filePath; Bool success; @@ -3768,7 +3768,7 @@ Bool GUIEdit::menuSaveAs( void ) // GUIEdit::menuCopy ========================================================== /** Copy selected windows into clipboard */ //============================================================================= -Bool GUIEdit::menuCopy( void ) +Bool GUIEdit::menuCopy() { WindowSelectionEntry *select; @@ -3796,7 +3796,7 @@ Bool GUIEdit::menuCopy( void ) // GUIEdit::menuPaste ========================================================= /** Paste contents of clipboard into current layout */ //============================================================================= -Bool GUIEdit::menuPaste( void ) +Bool GUIEdit::menuPaste() { TheGUIEditWindowManager->pasteClipboard(); @@ -3807,7 +3807,7 @@ Bool GUIEdit::menuPaste( void ) // GUIEdit::menuCut =========================================================== /** Cut selected windows into the clipboard */ //============================================================================= -Bool GUIEdit::menuCut( void ) +Bool GUIEdit::menuCut() { WindowSelectionEntry *select; @@ -3930,7 +3930,7 @@ void GUIEdit::unSelectWindow( GameWindow *window ) // GUIEdit::clearSelections =================================================== /** Clear the entire selection list */ //============================================================================= -void GUIEdit::clearSelections( void ) +void GUIEdit::clearSelections() { while( m_selectList ) @@ -3941,7 +3941,7 @@ void GUIEdit::clearSelections( void ) // GUIEdit::selectionCount ==================================================== /** How many items are selected */ //============================================================================= -Int GUIEdit::selectionCount( void ) +Int GUIEdit::selectionCount() { WindowSelectionEntry *select; Int count = 0; @@ -3998,7 +3998,7 @@ void GUIEdit::notifyNewWindow( GameWindow *window ) // GUIEdit::deleteSelected ==================================================== /** Delete the windows in the selection list */ //============================================================================= -void GUIEdit::deleteSelected( void ) +void GUIEdit::deleteSelected() { Int count = selectionCount(); Int i; @@ -4040,7 +4040,7 @@ void GUIEdit::deleteSelected( void ) * the top of the window stack for all windows, for child windows it will * bring them to the top of the child list for their parent */ //============================================================================= -void GUIEdit::bringSelectedToTop( void ) +void GUIEdit::bringSelectedToTop() { Int count = selectionCount(); @@ -4138,7 +4138,7 @@ void GUIEdit::dragMoveSelectedWindows( ICoord2D *dragOrigin, // GUIEdit::getSelectList ===================================================== /** Return the selection list */ //============================================================================= -WindowSelectionEntry *GUIEdit::getSelectList( void ) +WindowSelectionEntry *GUIEdit::getSelectList() { return m_selectList; @@ -4148,7 +4148,7 @@ WindowSelectionEntry *GUIEdit::getSelectList( void ) // GUIEdit::getFirstSelected ================================================== /** Get the first GameWindow * from the selection list */ //============================================================================= -GameWindow *GUIEdit::getFirstSelected( void ) +GameWindow *GUIEdit::getFirstSelected() { if( m_selectList ) diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp index e72b810841a..59f3f8d3ed0 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditDisplay.cpp @@ -69,7 +69,7 @@ // GUIEditDisplay::GUIEditDisplay ============================================= /** */ //============================================================================= -GUIEditDisplay::GUIEditDisplay( void ) +GUIEditDisplay::GUIEditDisplay() { } @@ -77,7 +77,7 @@ GUIEditDisplay::GUIEditDisplay( void ) // GUIEditDisplay::~GUIEditDisplay ============================================ /** */ //============================================================================= -GUIEditDisplay::~GUIEditDisplay( void ) +GUIEditDisplay::~GUIEditDisplay() { } @@ -151,7 +151,7 @@ void GUIEditDisplay::setClipRegion( IRegion2D *region ) // GUIEditDisplay::isClippingEnabled ============================================== /** returns current state of 2D image clipping */ //============================================================================= -Bool GUIEditDisplay::isClippingEnabled( void ) +Bool GUIEditDisplay::isClippingEnabled() { return TheEditWindow->isClippingEnabled(); } diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp index 2f0622c1f6b..eeb39d1287e 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp @@ -130,7 +130,7 @@ void GUIEditWindowManager::unlinkFromClipboard( GameWindow *window, /** Remove selection entries for child windows that also have ANY of * their parents in the selection list. */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::removeSupervisedChildSelections( void ) +void GUIEditWindowManager::removeSupervisedChildSelections() { WindowSelectionEntry *select, *next; GameWindow *window, *parent; @@ -176,7 +176,7 @@ void GUIEditWindowManager::removeSupervisedChildSelections( void ) * for the transition from "parent space" to "screen space" */ //------------------------------------------------------------------------------------------------- /* -void GUIEditWindowManager::orphanSelectedChildren( void ) +void GUIEditWindowManager::orphanSelectedChildren() { WindowSelectionEntry *select; GameWindow *window, *parent; @@ -218,7 +218,7 @@ void GUIEditWindowManager::orphanSelectedChildren( void ) //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -GUIEditWindowManager::GUIEditWindowManager( void ) +GUIEditWindowManager::GUIEditWindowManager() { m_clipboard = nullptr; @@ -231,7 +231,7 @@ GUIEditWindowManager::GUIEditWindowManager( void ) //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- -GUIEditWindowManager::~GUIEditWindowManager( void ) +GUIEditWindowManager::~GUIEditWindowManager() { // the duplicate list is only used in the actual act of pasting @@ -245,7 +245,7 @@ GUIEditWindowManager::~GUIEditWindowManager( void ) //------------------------------------------------------------------------------------------------- /** initialize the system */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::init( void ) +void GUIEditWindowManager::init() { // extending functionality @@ -318,7 +318,7 @@ GameWindow *GUIEditWindowManager::winCreate( GameWindow *parent, //------------------------------------------------------------------------------------------------- /** Destroy all windows in the clipboard */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::resetClipboard( void ) +void GUIEditWindowManager::resetClipboard() { GameWindow *window, *next; @@ -359,7 +359,7 @@ void GUIEditWindowManager::resetClipboard( void ) //------------------------------------------------------------------------------------------------- /** Is the clipboard empty */ //------------------------------------------------------------------------------------------------- -Bool GUIEditWindowManager::isClipboardEmpty( void ) +Bool GUIEditWindowManager::isClipboardEmpty() { if( m_clipboard ) @@ -375,7 +375,7 @@ Bool GUIEditWindowManager::isClipboardEmpty( void ) * child the child will have no parent and will be adjusted to absolute * screen coordinates with no parent */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::cutSelectedToClipboard( void ) +void GUIEditWindowManager::cutSelectedToClipboard() { // @@ -466,7 +466,7 @@ void GUIEditWindowManager::duplicateSelected( GameWindow *root ) //------------------------------------------------------------------------------------------------- /** Copy the selected windows to the clipboard */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::copySelectedToClipboard( void ) +void GUIEditWindowManager::copySelectedToClipboard() { // reset the contents of the clipboard @@ -660,7 +660,7 @@ void GUIEditWindowManager::validateClipboardNames( GameWindow *root ) //------------------------------------------------------------------------------------------------- /** Paste the contents of the clipboard into the window world */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::pasteClipboard( void ) +void GUIEditWindowManager::pasteClipboard() { GameWindow *window, *next; GameWindow *firstWindow = nullptr; @@ -1408,7 +1408,7 @@ GameWindow *GUIEditWindowManager::duplicateWindow( GameWindow *source, /** Create a duplicate everything on the clipboard list and put it * on the m_clipboardDup list for pasting */ //------------------------------------------------------------------------------------------------- -void GUIEditWindowManager::createClipboardDuplicate( void ) +void GUIEditWindowManager::createClipboardDuplicate() { GameWindow *duplicate; GameWindow *window; diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp index 4dad1818a42..33805d1ab2b 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp @@ -743,7 +743,7 @@ void HierarchyView::addWindowToTree( GameWindow *window, // HierarchyView::HierarchyView =============================================== /** */ //============================================================================= -HierarchyView::HierarchyView( void ) +HierarchyView::HierarchyView() { m_dialog = nullptr; @@ -759,7 +759,7 @@ HierarchyView::HierarchyView( void ) // HierarchyView::~HierarchyView ============================================== /** */ //============================================================================= -HierarchyView::~HierarchyView( void ) +HierarchyView::~HierarchyView() { // call the shutdown @@ -770,7 +770,7 @@ HierarchyView::~HierarchyView( void ) // HierarchyView::init ========================================================= /** Create the control palette */ //============================================================================= -void HierarchyView::init( void ) +void HierarchyView::init() { RECT dialogRect; RECT appRect; @@ -813,7 +813,7 @@ void HierarchyView::init( void ) // HierarchyView::reset ======================================================= /** Reset everything about our hierarchy view */ //============================================================================= -void HierarchyView::reset( void ) +void HierarchyView::reset() { // reset the tree control @@ -829,7 +829,7 @@ void HierarchyView::reset( void ) // HierarchyView::shutdown ==================================================== /** Destroy the control palette and all data associated with it */ //============================================================================= -void HierarchyView::shutdown( void ) +void HierarchyView::shutdown() { // destroy the control palette window diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp index eb20865d720..8db735c1ae1 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp @@ -197,7 +197,7 @@ static void saveData( HWND hWndDialog ) /** Bring up the standard windows browser save as dialog and return * filename selected */ //============================================================================= -char *saveAsDialog( void ) +char *saveAsDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -239,7 +239,7 @@ char *saveAsDialog( void ) /** Bring up the standard windows browser open dialog and return * filename selected */ //============================================================================= -char *openDialog( void ) +char *openDialog() { static char filename[ _MAX_PATH ]; OPENFILENAME ofn; @@ -1477,7 +1477,7 @@ void LayoutScheme::applyPropertyTablesToWindow( GameWindow *root ) // LayoutScheme::LayoutScheme ================================================= /** */ //============================================================================= -LayoutScheme::LayoutScheme( void ) +LayoutScheme::LayoutScheme() { strcpy( m_schemeFilename, "Default.ls" ); @@ -1495,7 +1495,7 @@ LayoutScheme::LayoutScheme( void ) // LayoutScheme::~LayoutScheme ================================================ /** */ //============================================================================= -LayoutScheme::~LayoutScheme( void ) +LayoutScheme::~LayoutScheme() { Int i; @@ -1519,7 +1519,7 @@ LayoutScheme::~LayoutScheme( void ) // LayoutScheme::init ========================================================= /** Init */ //============================================================================= -void LayoutScheme::init( void ) +void LayoutScheme::init() { Int i; ImageAndColorInfo *info; @@ -2153,7 +2153,7 @@ void LayoutScheme::init( void ) // LayoutScheme::openDialog =================================================== /** Bring up the layout scheme dialog box */ //============================================================================= -void LayoutScheme::openDialog( void ) +void LayoutScheme::openDialog() { // save the scheme instance we're going to open the dialog on diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp index 72feb50dc80..8b1e3b002b1 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp @@ -1719,42 +1719,42 @@ Bool HandleCommonDialogMessages( HWND hWndDialog, UINT message, // GetProprsEnabledTextColor ================================================== //============================================================================= -Color GetPropsEnabledTextColor( void ) +Color GetPropsEnabledTextColor() { return textDrawData[ enabledTextIndex ].color; } // GetPropsEnabledTextBorderColor ============================================= //============================================================================= -Color GetPropsEnabledTextBorderColor( void ) +Color GetPropsEnabledTextBorderColor() { return textDrawData[ enabledTextIndex ].borderColor; } // GetProprsDisabledTextColor ================================================= //============================================================================= -Color GetPropsDisabledTextColor( void ) +Color GetPropsDisabledTextColor() { return textDrawData[ disabledTextIndex ].color; } // GetPropsDisabledTextBorderColor ============================================ //============================================================================= -Color GetPropsDisabledTextBorderColor( void ) +Color GetPropsDisabledTextBorderColor() { return textDrawData[ disabledTextIndex ].borderColor; } // GetProprsHiliteTextColor =================================================== //============================================================================= -Color GetPropsHiliteTextColor( void ) +Color GetPropsHiliteTextColor() { return textDrawData[ hiliteTextIndex ].color; } // GetPropsHiliteTextBorderColor ============================================== //============================================================================= -Color GetPropsHiliteTextBorderColor( void ) +Color GetPropsHiliteTextBorderColor() { return textDrawData[ hiliteTextIndex ].borderColor; } diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp index 9976e7ea723..54e9d525655 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp @@ -110,7 +110,7 @@ static void writeBufferToFile( FILE *fp, char *buffer ) // clearBufferToSpaces ======================================================== /** Clear the buffer to all spaces */ //============================================================================= -static void clearBufferToSpaces( void ) +static void clearBufferToSpaces() { Int i; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index 7368beb8009..c255f07878a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -32,8 +32,8 @@ class WorldHeightMapEdit; class AutoEdgeOutTool : public Tool { public: - AutoEdgeOutTool(void); - virtual ~AutoEdgeOutTool(void) override; + AutoEdgeOutTool(); + virtual ~AutoEdgeOutTool() override; public: /// Perform tool on mouse down. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h index bbb9a65c9ea..0837afac79d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -62,10 +62,10 @@ class BaseBuildProps : public CDialog public: void setProps(AsciiString name, AsciiString script, Int health, Bool unsellable); - AsciiString getName(void) {return m_name;} - AsciiString getScript(void) {return m_script;} - Int getHealth(void) {return m_health;} - Bool getUnsellable(void) {return m_unsellable;} + AsciiString getName() {return m_name;} + AsciiString getScript() {return m_script;} + Int getHealth() {return m_health;} + Bool getUnsellable() {return m_unsellable;} }; //{{AFX_INSERT_LOCATION}} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index 8088cbbc872..b6fc5d087cf 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -35,8 +35,8 @@ class BlendEdgeTool : public Tool Coord3D m_downPt; public: - BlendEdgeTool(void); - virtual ~BlendEdgeTool(void) override; + BlendEdgeTool(); + virtual ~BlendEdgeTool() override; public: /// Perform tool on mouse down. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h index ce0f0a1b919..963cd6d3c45 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -68,12 +68,12 @@ class BlendMaterial : public COptionsPanel CTreeCtrl m_terrainTreeView; protected: - void updateTextures(void); + void updateTextures(); void addTerrain(const char *pPath, Int terrainNdx, HTREEITEM parent); HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel); public: - static Int getBlendTexClass(void) {return m_currentBlendTexture;} + static Int getBlendTexClass() {return m_currentBlendTexture;} static void setBlendTexClass(Int texClass); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h index bdcc88d52ab..9a1e5c43631 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h @@ -34,13 +34,13 @@ class BorderTool : public Tool BorderTool(); virtual ~BorderTool() override; - Int getToolID(void) {return m_toolID;} - virtual void setCursor(void) override; + Int getToolID() {return m_toolID;} + virtual void setCursor() override; virtual void activate() override; virtual void deactivate() override; - virtual Bool followsTerrain(void) override { return false; } + virtual Bool followsTerrain() override { return false; } virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h index d699978f97a..1f028ca1fd3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h @@ -41,13 +41,13 @@ class BrushTool : public Tool static Int m_brushHeight; public: - BrushTool(void); - virtual ~BrushTool(void) override; + BrushTool(); + virtual ~BrushTool() override; public: - static Int getWidth(void) {return m_brushWidth;}; ///loadSides();}; + static void update() {if (m_staticThis) m_staticThis->loadSides();}; static void setSelectedBuildList(BuildListInfo *pInfo); virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h index f36b70f4735..774cd5e7db4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -55,23 +55,23 @@ class BuildListTool : public Tool static Bool m_isActive; public: - BuildListTool(void); - virtual ~BuildListTool(void) override; + BuildListTool(); + virtual ~BuildListTool() override; private: - void createWindow(void); - Bool isDoingAdd(void); + void createWindow(); + Bool isDoingAdd(); public: - static void addBuilding(void); - static Bool isActive(void) {return m_isActive;}; + static void addBuilding(); + static Bool isActive() {return m_isActive;}; public: /// Perform tool on mouse down. virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual void setCursor(void) override; + virtual void setCursor() override; virtual void activate() override; ///< Become the current tool. virtual void deactivate() override; ///< Become not the current tool. }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h index 15afd58a457..689f82f18c1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -24,7 +24,7 @@ class CButtonShowColor : public CButton RGBColor m_color; public: - const RGBColor& getColor(void) const { return m_color; } + const RGBColor& getColor() const { return m_color; } void setColor(Int color) { m_color.setFromInt(color); } void setColor(const RGBColor& color) { m_color = color; } virtual ~CButtonShowColor() override; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h index de06b9b6e4f..9aae72df161 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h @@ -40,17 +40,17 @@ class Undoable : public RefCountClass Undoable *mNext; public: - Undoable(void); + Undoable(); - virtual ~Undoable(void) override; + virtual ~Undoable() override; public: - virtual void Do(void)=0; ///< pure virtual. - virtual void Undo(void)=0;///< pure virtual. - virtual void Redo(void); + virtual void Do()=0; ///< pure virtual. + virtual void Undo()=0;///< pure virtual. + virtual void Redo(); void LinkNext(Undoable *pNext); - Undoable *GetNext(void) {return mNext;}; + Undoable *GetNext() {return mNext;}; }; @@ -77,10 +77,10 @@ class WBDocUndoable : public Undoable WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtMap, Coord3D *pObjOffset = nullptr); // destructor. - virtual ~WBDocUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; - virtual void Redo(void) override; + virtual ~WBDocUndoable() override; + virtual void Do() override; + virtual void Undo() override; + virtual void Redo() override; }; @@ -99,9 +99,9 @@ class AddObjectUndoable : public Undoable AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectToAdd); // destructor. - virtual ~AddObjectUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~AddObjectUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; @@ -146,11 +146,11 @@ class ModifyObjectUndoable : public Undoable public: ModifyObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - virtual ~ModifyObjectUndoable(void) override; + virtual ~ModifyObjectUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; - virtual void Redo(void) override; + virtual void Do() override; + virtual void Undo() override; + virtual void Redo() override; void SetOffset(Real x, Real y); void SetZOffset(Real z); @@ -188,11 +188,11 @@ class ModifyFlagsUndoable : public Undoable public: ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, Int flagValue); // destructor. - virtual ~ModifyFlagsUndoable(void) override; + virtual ~ModifyFlagsUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; - virtual void Redo(void) override; + virtual void Do() override; + virtual void Undo() override; + virtual void Redo() override; }; @@ -205,10 +205,10 @@ class SidesListUndoable : public Undoable public: SidesListUndoable(const SidesList& newSL, CWorldBuilderDoc *pDoc); - virtual ~SidesListUndoable(void) override; + virtual ~SidesListUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual void Do() override; + virtual void Undo() override; }; @@ -231,10 +231,10 @@ class DictItemUndoable : public Undoable // if you want to substitute the entire contents of the new dict, pass NAMEKEY_INVALID. DictItemUndoable(Dict **d, Dict data, NameKeyType key, Int dictsToModify = 1, CWorldBuilderDoc *pDoc = nullptr, Bool inval = false); // destructor. - virtual ~DictItemUndoable(void) override; + virtual ~DictItemUndoable() override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual void Do() override; + virtual void Undo() override; }; @@ -246,7 +246,7 @@ class DeleteInfo { public: DeleteInfo(MapObject *pObjToDelete); - ~DeleteInfo(void); + ~DeleteInfo(); void DoDelete(WorldHeightMapEdit *pMap); void UndoDelete(WorldHeightMapEdit *pMap); @@ -267,9 +267,9 @@ class DeleteObjectUndoable : public Undoable DeleteObjectUndoable(CWorldBuilderDoc *pDoc); // destructor. - virtual ~DeleteObjectUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~DeleteObjectUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// AddPolygonUndoable @@ -282,9 +282,9 @@ class AddPolygonUndoable : public Undoable public: AddPolygonUndoable( PolygonTrigger *pTrig); // destructor. - virtual ~AddPolygonUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~AddPolygonUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// AddPolygonPointUndoable @@ -297,9 +297,9 @@ class AddPolygonPointUndoable : public Undoable public: AddPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt); // destructor. - virtual ~AddPolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~AddPolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// ModifyPolygonPointUndoable @@ -314,9 +314,9 @@ class ModifyPolygonPointUndoable : public Undoable public: ModifyPolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - virtual ~ModifyPolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~ModifyPolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// MovePolygonUndoable @@ -330,12 +330,12 @@ class MovePolygonUndoable : public Undoable public: MovePolygonUndoable(PolygonTrigger *pTrig); // destructor. - virtual ~MovePolygonUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~MovePolygonUndoable() override; + virtual void Do() override; + virtual void Undo() override; void SetOffset(const ICoord3D &offset); - PolygonTrigger *getTrigger(void) {return m_trigger;} + PolygonTrigger *getTrigger() {return m_trigger;} }; /// InsertPolygonPointUndoable @@ -349,9 +349,9 @@ class InsertPolygonPointUndoable : public Undoable public: InsertPolygonPointUndoable(PolygonTrigger *pTrig, ICoord3D pt, Int ndx); // destructor. - virtual ~InsertPolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~InsertPolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// DeletePolygonPointUndoable @@ -365,9 +365,9 @@ class DeletePolygonPointUndoable : public Undoable public: DeletePolygonPointUndoable(PolygonTrigger *pTrig, Int ndx); // destructor. - virtual ~DeletePolygonPointUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~DeletePolygonPointUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// DeletePolygonUndoable @@ -380,9 +380,9 @@ class DeletePolygonUndoable : public Undoable public: DeletePolygonUndoable(PolygonTrigger *pTrig); // destructor. - virtual ~DeletePolygonUndoable(void) override; - virtual void Do(void) override; - virtual void Undo(void) override; + virtual ~DeletePolygonUndoable() override; + virtual void Do() override; + virtual void Undo() override; }; /// MultipleUndoable @@ -397,14 +397,14 @@ class MultipleUndoable : public Undoable public: MultipleUndoable(); // destructor. - virtual ~MultipleUndoable(void) override; + virtual ~MultipleUndoable() override; /** Add other undoables in the order you would want them UNdone; e.g. in the reverse order you want them done * The MultipleUndoable object will then own the pointers. */ void addUndoable( Undoable * undoable ); - virtual void Do(void) override; - virtual void Undo(void) override; - virtual void Redo(void) override; + virtual void Do() override; + virtual void Undo() override; + virtual void Redo() override; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h index 655c197b44c..db805549d6b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -67,7 +67,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner void putReal( Int ctrlID, Real val ); void putAsciiString( Int ctrlID, AsciiString val ); BOOL getReal( Int ctrlID, Real *rVal ); - void stuffValuesIntoFields( void ); + void stuffValuesIntoFields(); void applyCameraPitch( Real pitch ); WBPopupSliderButton m_pitchPopup; @@ -80,7 +80,7 @@ class CameraOptions : public CDialog, public PopupSliderOwner virtual void PopSliderFinished(const long sliderID, long theVal) override; public: - void update( void ); + void update(); }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h index 34ececd084b..ee16757e00b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h @@ -30,7 +30,7 @@ class CellWidth : public CDialog public: CellWidth(int cellWidth, CWnd* pParent = nullptr); // standard constructor - int GetCellWidth(void) {return mCellWidth;}; + int GetCellWidth() {return mCellWidth;}; // Dialog Data //{{AFX_DATA(CellWidth) enum { IDD = IDD_CellWidth }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h index ab501fb64d2..90f74267260 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -73,9 +73,9 @@ class ContourOptions : public CDialog CSliderCtrl m_contourWidthSlider; ///< Brush width slider control. public: - static Int getContourWidth(void) {return m_contourWidth;}; ///m_meshModelName; return "";}; + static Bool isDoingPreview() {return m_doingPreview;}; + static Bool isRaisingOnly() {return m_raiseOnly;}; + static Bool isLoweringOnly() {return m_lowerOnly;}; + static AsciiString getModelName() {if (m_staticThis) return m_staticThis->m_meshModelName; return "";}; public: //PopupSliderOwner methods. virtual void GetPopSliderInfo(const long sliderID, long *pMin, long *pMax, long *pLineSize, long *pInitial) override; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h index 479b8ddd190..c2f96107e5a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -41,8 +41,8 @@ class MeshMoldTool : public Tool static WorldHeightMapEdit *m_htMapEditCopy; ///< ref counted. public: - MeshMoldTool(void); - virtual ~MeshMoldTool(void) override; + MeshMoldTool(); + virtual ~MeshMoldTool() override; protected: static void applyMesh(CWorldBuilderDoc *pDoc); ///< Apply the mesh to copy of terrain. @@ -53,10 +53,10 @@ class MeshMoldTool : public Tool virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual WorldHeightMapEdit *getHeightMap() override {return m_htMapEditCopy;}; virtual void activate() override; ///< Become the current tool. virtual void deactivate() override; ///< Become the current tool. - virtual Bool followsTerrain(void) override {return false;}; + virtual Bool followsTerrain() override {return false;}; public: // Methods specific to MeshMoldTool. static void updateMeshLocation(Bool changePreview); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h index 724af775589..1d873838776 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h @@ -41,14 +41,14 @@ class MoundTool : public Tool static Int m_brushFeather; public: - MoundTool(void); - virtual ~MoundTool(void) override; + MoundTool(); + virtual ~MoundTool() override; public: - static Int getMoundHeight(void) {return m_moundHeight;}; + static Int getMoundHeight() {return m_moundHeight;}; static void setMoundHeight(Int height); - static Int getWidth(void) {return m_brushWidth;}; ///= m_numberOfRoads);} - static Bool isAngled(void) {return m_angleCorners;} - static Bool isTightCurve(void) {return m_tightCurve;} - static Bool isJoin(void) {return m_doJoin;} - static void updateSelection(void); - static Bool selectionIsRoadsOnly(void); - void applyToSelection(void); + static AsciiString getCurRoadName() {return m_currentRoadName;} + static Bool isBridge() {return (m_currentRoadIndex >= m_numberOfRoads);} + static Bool isAngled() {return m_angleCorners;} + static Bool isTightCurve() {return m_tightCurve;} + static Bool isJoin() {return m_doJoin;} + static void updateSelection(); + static Bool selectionIsRoadsOnly(); + void applyToSelection(); }; //{{AFX_INSERT_LOCATION}} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h index 462bc89beac..f0a091a72a7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h @@ -42,8 +42,8 @@ class RoadTool : public Tool MapObject* findSegment(const Coord3D *pLoc, Coord3D *outLoc); public: - RoadTool(void); - virtual ~RoadTool(void) override; + RoadTool(); + virtual ~RoadTool() override; public: static Bool snap(Coord3D *pLoc, Bool skipLast); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h index 0db6664f15f..6f316bd271a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h @@ -34,22 +34,22 @@ class RulerTool : public Tool static RulerTool* m_staticThis; public: - RulerTool(void); - virtual ~RulerTool(void) override; + RulerTool(); + virtual ~RulerTool() override; public: /// Clear the selection on activate or deactivate. virtual void activate() override; virtual void deactivate() override; - virtual void setCursor(void) override; + virtual void setCursor() override; virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual Bool followsTerrain(void) override {return false;}; + virtual Bool followsTerrain() override {return false;}; static void setLength(Real length); static Bool switchType(); static int getType(); - static Real getLength(void); + static Real getLength(); }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h index b0c303e21e7..20cbae58e0d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -64,8 +64,8 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner DECLARE_MESSAGE_MAP() private: - static MapObject *getSingleSelectedScorch(void); - void updateTheUI(void); + static MapObject *getSingleSelectedScorch(); + void updateTheUI(); WBPopupSliderButton m_radiusPopup; std::vector m_allSelectedDicts; Bool m_updating; ///>28)&0x0F; m_playerIndex = ((i)>>24)&0x0F; m_groupIndex = ((i)>>12)&0x0FFF; m_scriptIndex = (i)&0x0FFF;} }; @@ -84,12 +84,12 @@ class ScriptDialog : public CDialog static void updateScriptWarning(Script *pScript); static void patchScriptParametersForGC(Script *pScript); - static void checkParametersForGC(void); + static void checkParametersForGC(); /// To allow CSDTreeCtrl access to these member functions of ScriptDialog - Script *friend_getCurScript(void); - ScriptGroup *friend_getCurGroup(void); + Script *friend_getCurScript(); + ScriptGroup *friend_getCurGroup(); protected: ListType m_curSelection; @@ -113,8 +113,8 @@ class ScriptDialog : public CDialog HTREEITEM addPlayer(Int playerIndx); void addScriptList(HTREEITEM hPlayer, Int playerIndex, ScriptList *pSL); void doDropOn(HTREEITEM hDrop, HTREEITEM hTarget); - Script *getCurScript(void); - ScriptGroup *getCurGroup(void); + Script *getCurScript(); + ScriptGroup *getCurGroup(); void reloadPlayer(Int playerIndex, ScriptList *pSL); HTREEITEM findItem(ListType sel, Bool failSafe = FALSE); void insertScript(Script *pNewScript); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h index 39d06b79482..167efdde693 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -54,7 +54,7 @@ class ScriptProperties : public CPropertyPage public: void setScript(Script *pScript) {m_script = pScript;} protected: - void enableControls(void); + void enableControls(); protected: Script *m_script; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h index 31743aa15d4..9902f78055c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -52,7 +52,7 @@ class ShadowOptions : public CDialog Real m_intensity; protected: - void setShadowColor(void); + void setShadowColor(); // Generated message map functions //{{AFX_MSG(ShadowOptions) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h index c9cf45d6736..4974c8540ab 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -82,21 +82,21 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner protected: void addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent); HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel); - void updateLabel(void); + void updateLabel(); public: - static Int getFgTexClass(void) {return m_currentFgTexture;} - static Int getBgTexClass(void) {return m_currentBgTexture;} + static Int getFgTexClass() {return m_currentFgTexture;} + static Int getBgTexClass() {return m_currentBgTexture;} static void setFgTexClass(Int texClass); static void setBgTexClass(Int texClass); static void updateTextures(WorldHeightMapEdit *pMap); - static void updateTextureSelection(void); + static void updateTextureSelection(); static void setToolOptions(Bool singleCell); static void setWidth(Int width); - static Bool isPaintingPathingInfo(void) {return m_paintingPathingInfo;} - static Bool isPaintingPassable(void) {return m_paintingPassable;} + static Bool isPaintingPathingInfo() {return m_paintingPathingInfo;} + static Bool isPaintingPassable() {return m_paintingPassable;} public: Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h index f40e639d9fd..89c23708e93 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -67,12 +67,12 @@ class TerrainModal : public CDialog protected: void addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent); HTREEITEM findOrAdd(HTREEITEM parent, const char *pLabel); - void updateLabel(void); - void updateTextures(void); + void updateLabel(); + void updateTextures(); Bool setTerrainTreeViewSelection(HTREEITEM parent, Int selection); public: - Int getNewNdx(void) {return m_currentFgTexture;}; + Int getNewNdx() {return m_currentFgTexture;}; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h index 475b5ef99b8..a75350fccb5 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h @@ -35,16 +35,16 @@ class TileTool : public Tool CPoint m_prevViewPt; public: - TileTool(void); - virtual ~TileTool(void) override; + TileTool(); + virtual ~TileTool() override; public: virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual WorldHeightMapEdit *getHeightMap(void) override {return m_htMapEditCopy;}; + virtual WorldHeightMapEdit *getHeightMap() override {return m_htMapEditCopy;}; virtual void activate() override; ///< Become the current tool. - virtual Int getWidth(void) {return 1;}; + virtual Int getWidth() {return 1;}; }; /************************************************************************* @@ -60,9 +60,9 @@ class BigTileTool : public TileTool virtual void activate() override; ///< Become the current tool. public: - BigTileTool(void); + BigTileTool(); static void setWidth(Int width) ; - virtual Int getWidth(void) override {return m_currentWidth;}; + virtual Int getWidth() override {return m_currentWidth;}; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h index e997529e2b5..1198341693d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h @@ -61,21 +61,21 @@ class Tool Int m_prevYIndex; public: Tool(Int toolID, Int cursorID); - virtual ~Tool(void); + virtual ~Tool(); public: - Int getToolID(void) {return m_toolID;} - virtual void setCursor(void); + Int getToolID() {return m_toolID;} + virtual void setCursor(); virtual void activate(); ///< Become the current tool. virtual void deactivate(){}; ///< Become not the current tool. - virtual Bool followsTerrain(void) {return true;}; ///< True if the tool tracks the terrain, generally false if it modifies the terrain heights. + virtual Bool followsTerrain() {return true;}; ///< True if the tool tracks the terrain, generally false if it modifies the terrain heights. virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) {} virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) {} virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) {} - virtual WorldHeightMapEdit *getHeightMap(void) {return nullptr;} + virtual WorldHeightMapEdit *getHeightMap() {return nullptr;} static Real calcRoundBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth); static Real calcSquareBlendFactor(CPoint center, Int x, Int y, Int brushWidth, Int featherWidth); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h index 8808131fb2b..57f0f640c1b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -29,7 +29,7 @@ class WBHeightMap : public HeightMapRenderObjClass { public: - WBHeightMap(void); + WBHeightMap(); ///////////////////////////////////////////////////////////////////////////// // Render Object Interface (W3D methods) @@ -41,11 +41,11 @@ class WBHeightMap : public HeightMapRenderObjClass virtual Real getMaxCellHeight(Real x, Real y); ///< returns maximum height of the 4 cell corners. void setDrawEntireMap(Bool entire) {m_drawEntireMap = entire;}; - Bool getDrawEntireMap(void) {return m_drawEntireMap;}; + Bool getDrawEntireMap() {return m_drawEntireMap;}; void setFlattenHeights(Bool flat); protected: - void flattenHeights(void); + void flattenHeights(); protected: Bool m_drawEntireMap; Bool m_flattenHeights; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h index 1df675a53d5..c51ffb3a4d0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -36,7 +36,7 @@ class CProcessNode CProcessNode *m_next; public: CProcessNode(Int x, Int y):m_x(x),m_y(y),m_next(nullptr),m_len(0) {}; - ~CProcessNode(void) { }; + ~CProcessNode() { }; }; #define MAX_TILES_PER_CLASS 100 @@ -73,7 +73,7 @@ class WorldHeightMapEdit : public WorldHeightMap static void loadBitmap(char *path, const char *uiName); static void loadDirectoryOfImages(const char *path); static void loadImagesFromTerrainType( TerrainType *terrain ); - static void loadBaseImages(void); + static void loadBaseImages(); Int allocateTiles(Int textureClass); Int allocateEdgeTiles(Int textureClass); void blendToThisClass(Int xIndex, Int yIndex, Int textureClass, Int edgeClass); @@ -96,18 +96,18 @@ class WorldHeightMapEdit : public WorldHeightMap WorldHeightMapEdit(Int xExtent, Int yExtent, UnsignedByte initialHeight, Int border); ///< create. WorldHeightMapEdit(WorldHeightMapEdit *pThis); ///< duplicate. WorldHeightMapEdit(ChunkInputStream *pStrm); ///< read from file. - virtual ~WorldHeightMapEdit(void) override; ///< destroy. + virtual ~WorldHeightMapEdit() override; ///< destroy. void saveToFile(DataChunkOutput &chunkWriter); - WorldHeightMapEdit *duplicate(void); + WorldHeightMapEdit *duplicate(); - static void init(void); - static void shutdown(void); + static void init(); + static void shutdown(); public: /// Status methods. - void clearStatus(void) {m_warnTooManyTex = false;m_warnTooManyBlend = false;}; - Bool tooManyTextures(void) {return m_warnTooManyTex;}; - Bool tooManyBlends(void) {return m_warnTooManyBlend;}; + void clearStatus() {m_warnTooManyTex = false;m_warnTooManyBlend = false;}; + Bool tooManyTextures() {return m_warnTooManyTex;}; + Bool tooManyBlends() {return m_warnTooManyBlend;}; Bool canFitTexture(Int textureClass); ///< Returns true if we can fit this texture. public: // Editing methods. @@ -120,42 +120,42 @@ class WorldHeightMapEdit : public WorldHeightMap void setCliff(Int xIndex, Int yIndex, Bool impassable) {setCliffState(xIndex, yIndex, impassable);} Bool setTileNdx(Int xIndex, Int yIndex, Int textureClass, Bool singleTile); Bool floodFill(Int xIndex, Int yIndex, Int textureClass, Bool doReplace); - static Int getNumTexClasses(void) {return m_numGlobalTextureClasses;}; + static Int getNumTexClasses() {return m_numGlobalTextureClasses;}; static AsciiString getTexClassName(int ndx) {return m_globalTextureClasses[ndx].name;} static AsciiString getTexClassUiName(int ndx) ; static Int getTexClassNumTiles(int ndx) {return m_globalTextureClasses[ndx].numTiles;} static Int getTexClassIsBlendEdge(int ndx) {return m_globalTextureClasses[ndx].isBlendEdgeTile;} void addObject(MapObject *pMapObj); ///< Adds a map object to the front of the list. - void removeFirstObject(void); ///< Removes the first map object from the list. + void removeFirstObject(); ///< Removes the first map object from the list. Bool isTexClassUsed(Int textureClass); Int getFirstTile(Int textureClass); - Bool optimizeTiles(void); ///< Optimizes tile allocations. + Bool optimizeTiles(); ///< Optimizes tile allocations. - void showTileStatusInfo(void); ///< pops up a dialog box with tile mem usage. + void showTileStatusInfo(); ///< pops up a dialog box with tile mem usage. - Bool selectDuplicates(void); ///< Selects any duplicate map objects. - Bool selectSimilar(void); ///< Selects any duplicate map objects. - Bool selectInvalidTeam(void); ///< Selects any objects with invalid teams. + Bool selectDuplicates(); ///< Selects any duplicate map objects. + Bool selectSimilar(); ///< Selects any duplicate map objects. + Bool selectInvalidTeam(); ///< Selects any objects with invalid teams. Bool resize(Int newXSize, Int newYSize, Int newHeight, Int newBorder, Bool anchorTop, Bool anchorBottom, Bool anchorLeft, Bool anchorRight, Coord3D *pObjOffset); - Bool remapTextures(void); ///< returns true if the operation had an effect. - void reloadTextures(void); ///< Reloads textures from disk. - void resetResources(void); ///< Releases textures in preparation for device reset. + Bool remapTextures(); ///< returns true if the operation had an effect. + void reloadTextures(); ///< Reloads textures from disk. + void resetResources(); ///< Releases textures in preparation for device reset. - void dbgVerifyAfterUndo(void); ///< Verifies the structures are still consistent. + void dbgVerifyAfterUndo(); ///< Verifies the structures are still consistent. Bool doCliffAdjustment(Int xIndex, Int yIndex); - Bool removeCliffMapping(void); + Bool removeCliffMapping(); - Int getNumBoundaries(void) const ; + Int getNumBoundaries() const ; void getBoundary(Int ndx, ICoord2D* border) const; void addBoundary(ICoord2D* boundaryToAdd); void changeBoundary(Int ndx, ICoord2D *border); - void removeLastBoundary(void); + void removeLastBoundary(); // outNdx must not be null, but outHandle can be. // outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h index f634b6ed8d2..d8b27bdf4e2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -77,18 +77,18 @@ class WaterOptions : public COptionsPanel, public PopupSliderOwner static Int m_waterPointSpacing; static Bool m_creatingWaterAreas; ///< True if we are creating flood fill water polygons, rather than dropping single points. protected: - void updateTheUI(void); - void startUpdateHeight(void); - void updateHeight(void); - void endUpdateHeight(void); + void updateTheUI(); + void startUpdateHeight(); + void updateHeight(); + void endUpdateHeight(); PolygonTrigger *adjustCount(PolygonTrigger *trigger, Int firstPt, Int lastPt, Int desiredPointCount); public: - static void update(void); + static void update(); static void setHeight(Int height); - static Int getHeight(void) { return m_waterHeight;}; - static Int getSpacing(void) { return m_waterPointSpacing;}; - static Bool getCreatingWaterAreas(void) {return m_creatingWaterAreas;} + static Int getHeight() { return m_waterHeight;}; + static Int getSpacing() { return m_waterPointSpacing;}; + static Bool getCreatingWaterAreas() {return m_creatingWaterAreas;} public: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h index 6e2e9c20e2d..506fc8caf0e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h @@ -35,8 +35,8 @@ class MovePolygonUndoable; class WaterTool : public PolygonTool { public: - WaterTool(void); - virtual ~WaterTool(void) override; + WaterTool(); + virtual ~WaterTool() override; protected: static Bool m_water_isActive; @@ -44,14 +44,14 @@ class WaterTool : public PolygonTool Real m_currentZ; public: - static Bool isActive(void) {return m_water_isActive;}; + static Bool isActive() {return m_water_isActive;}; public: /// Perform tool on mouse down. virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc) override; - virtual void setCursor(void) override; + virtual void setCursor() override; virtual void activate() override; ///< Become the current tool. virtual void deactivate() override; ///< Become not the current tool. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h index 167e7812e58..193d2791dd7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -75,13 +75,13 @@ class WaypointOptions : public COptionsPanel MovePolygonUndoable *m_moveUndoable; Int m_originalHeight; protected: - void updateTheUI(void); + void updateTheUI(); void changeWaypointLabel(Int editControlID, NameKeyType key); public: - static void update(void); - static MapObject *getSingleSelectedWaypoint(void); - static PolygonTrigger *getSingleSelectedPolygon(void); + static void update(); + static MapObject *getSingleSelectedWaypoint(); + static PolygonTrigger *getSingleSelectedPolygon(); static Bool isUnique(AsciiString name, MapObject* theMapObj = nullptr); static AsciiString GenerateUniqueName(Int id); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h index 647a0202c42..85c649b4986 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -33,8 +33,8 @@ class MapObject; class WaypointTool : public Tool { public: - WaypointTool(void); - virtual ~WaypointTool(void) override; + WaypointTool(); + virtual ~WaypointTool() override; protected: Int m_downWaypointID; @@ -45,7 +45,7 @@ class WaypointTool : public Tool MapObject *pickWaypoint(Coord3D loc); public: - static Bool isActive(void) {return m_isActive;}; + static Bool isActive() {return m_isActive;}; public: /// Perform tool on mouse down. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h index 03f1291d0e3..5d4f8295497 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -134,7 +134,7 @@ class CWorldBuilderApp : public CWinApp MapObject *m_pasteMapObjList; ///< List of copied/cut map objects. protected: - void deletePasteObjList(void) + void deletePasteObjList() { deleteInstance(m_pasteMapObjList); m_pasteMapObjList = nullptr; @@ -145,13 +145,13 @@ class CWorldBuilderApp : public CWinApp CDocTemplate *Get3dTemplate() { return m_3dtemplate; } /// Set the brush tool as the active tool. - void selectBrushTool(void) { setActiveTool(&m_brushTool); } + void selectBrushTool() { setActiveTool(&m_brushTool); } /// Set the pointer tool as the active tool. - void selectPointerTool(void); + void selectPointerTool(); /// Set the hand tool as the cur tool (but not active tool) - void selectHandToolTemp(void) { m_curTool = &m_handScrollTool; } + void selectHandToolTemp() { m_curTool = &m_handScrollTool; } /// Set the tool that will be active. void setActiveTool(Tool *newTool); @@ -165,17 +165,17 @@ class CWorldBuilderApp : public CWinApp void updateCurTool(Bool forceHand); /// Switch to the poly tool if we aren't already. - void setPolyTool(void){ setActiveTool(&m_polygonTool); }; + void setPolyTool(){ setActiveTool(&m_polygonTool); }; /// Return true if the hand scroll tool is active. - Bool isHandScroll(void) {return m_curTool == &m_handScrollTool; } + Bool isHandScroll() {return m_curTool == &m_handScrollTool; } void lockCurTool() { DEBUG_ASSERTCRASH(!m_lockCurTool,("already locked")); m_lockCurTool = 1; } void unlockCurTool() { m_lockCurTool = 0; } Bool isCurToolLocked() { return m_lockCurTool != 0; } /// Note - read only data - make yourself a copy. - MapObject *getMapObjPasteList(void) { return(m_pasteMapObjList);}; + MapObject *getMapObjPasteList() { return(m_pasteMapObjList);}; /// Note - the app owns this, and will delete it on close. void setMapObjPasteList(MapObject *list) { deletePasteObjList(); m_pasteMapObjList = list; }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h index 81abb74b461..cd8e0e40fe8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -69,25 +69,25 @@ class CWorldBuilderDoc : public CDocument } m_waypointLinks[MAX_WAYPOINTS]; Int m_numWaypointLinks; protected: - void updateWaypointTable(void); - void compressWaypointIds(void); + void updateWaypointTable(); + void compressWaypointIds(); void updateLWL(MapObject *pWay, MapObject *pSrcWay); public: void addWaypointLink(Int waypointID1, Int waypointID2); void removeWaypointLink(Int waypointID1, Int waypointID2); MapObject *getWaypointByID(Int waypointID); - Int getNumWaypointLinks(void) {return m_numWaypointLinks;}; + Int getNumWaypointLinks() {return m_numWaypointLinks;}; void getWaypointLink(Int ndx, Int *waypoint1, Int *waypointID2); Bool waypointLinkExists(Int waypointID1, Int waypointID2); Bool isWaypointLinked(MapObject *pWay); void updateLinkedWaypointLabels(MapObject *pWay); // Boundary stuff - Int getNumBoundaries(void) const ; + Int getNumBoundaries() const ; void getBoundary(Int ndx, ICoord2D* border) const; void addBoundary(ICoord2D* boundaryToAdd); void changeBoundary(Int ndx, ICoord2D *border); - void removeLastBoundary(void); + void removeLastBoundary(); // outNdx must not be null, but outHandle can be. // outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR @@ -141,14 +141,14 @@ class CWorldBuilderDoc : public CDocument void syncViewCenters(Real x, Real y); - Bool needAutoSave(void) {return m_needAutosave;}; + Bool needAutoSave() {return m_needAutosave;}; - Int getNextWaypointID(void) { return ++m_curWaypointID;}; + Int getNextWaypointID() { return ++m_curWaypointID;}; void setNextWaypointID(Int newMax) { if (newMax>m_curWaypointID) m_curWaypointID = newMax;}; - void autoSave(void); - void validate(void); + void autoSave(); + void validate(); // Operations public: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h index a136a9891d7..422ec18ae58 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -100,13 +100,13 @@ class CWorldBuilderView : public WbView public: /// Get the current draw size in pixels in the 2d window of one height map cell. - Int getCellSize(void) {return m_cellSize;} + Int getCellSize() {return m_cellSize;} /// Sets the current draw size. void setCellSize(Int cellSize); /// Set whether contours are drawn. - Bool getShowContours(void) {return m_showContours;} + Bool getShowContours() {return m_showContours;} /// Set whether contours are drawn. void setShowContours(Bool show); /// Update the center to match a center point from the 3d view. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h index 2860923843b..a448ec7582a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -63,7 +63,7 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner // Implementation protected: - void getAllSelectedDicts(void); + void getAllSelectedDicts(); Dict** getAllSelectedDictsData(); static MapObjectProps *TheMapObjectProps; @@ -93,7 +93,7 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner Coord3D m_position; void deletePages(); - void updateTheUI(void); + void updateTheUI(); void enableButtons(); int getSel(); @@ -109,82 +109,82 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner afx_msg void OnRemoveprop(); afx_msg void OnDblclkProperties(); - afx_msg void _TeamToDict(void); - afx_msg void _NameToDict(void); - afx_msg void _ScriptToDict(void); - afx_msg void _WeatherToDict(void); - afx_msg void _TimeToDict(void); - afx_msg void _ScaleToDict(void); - afx_msg void SetZOffset(void); - afx_msg void SetAngle(void); - afx_msg void SetPosition(void); + afx_msg void _TeamToDict(); + afx_msg void _NameToDict(); + afx_msg void _ScriptToDict(); + afx_msg void _WeatherToDict(); + afx_msg void _TimeToDict(); + afx_msg void _ScaleToDict(); + afx_msg void SetZOffset(); + afx_msg void SetAngle(); + afx_msg void SetPosition(); afx_msg void OnScaleOn(); afx_msg void OnScaleOff(); afx_msg void OnKillfocusMAPOBJECTXYPosition(); - afx_msg void _PrebuiltUpgradesToDict(void); - afx_msg void _HealthToDict(void); - afx_msg void _EnabledToDict(void); - afx_msg void _IndestructibleToDict(void); - afx_msg void _UnsellableToDict(void); + afx_msg void _PrebuiltUpgradesToDict(); + afx_msg void _HealthToDict(); + afx_msg void _EnabledToDict(); + afx_msg void _IndestructibleToDict(); + afx_msg void _UnsellableToDict(); afx_msg void _TargetableToDict(); - afx_msg void _PoweredToDict(void); - afx_msg void _AggressivenessToDict(void); - afx_msg void _VisibilityToDict(void); - afx_msg void _VeterancyToDict(void); - afx_msg void _ShroudClearingDistanceToDict(void); - afx_msg void _RecruitableAIToDict(void); - afx_msg void _SelectableToDict(void); + afx_msg void _PoweredToDict(); + afx_msg void _AggressivenessToDict(); + afx_msg void _VisibilityToDict(); + afx_msg void _VeterancyToDict(); + afx_msg void _ShroudClearingDistanceToDict(); + afx_msg void _RecruitableAIToDict(); + afx_msg void _SelectableToDict(); afx_msg void _HPsToDict(); - afx_msg void _StoppingDistanceToDict(void); - afx_msg void attachedSoundToDict(void); - afx_msg void customizeToDict(void); - afx_msg void enabledToDict(void); - afx_msg void loopingToDict(void); - afx_msg void loopCountToDict(void); - afx_msg void minVolumeToDict(void); - afx_msg void volumeToDict(void); - afx_msg void minRangeToDict(void); - afx_msg void maxRangeToDict(void); - afx_msg void priorityToDict(void); + afx_msg void _StoppingDistanceToDict(); + afx_msg void attachedSoundToDict(); + afx_msg void customizeToDict(); + afx_msg void enabledToDict(); + afx_msg void loopingToDict(); + afx_msg void loopCountToDict(); + afx_msg void minVolumeToDict(); + afx_msg void volumeToDict(); + afx_msg void minRangeToDict(); + afx_msg void maxRangeToDict(); + afx_msg void priorityToDict(); //}}AFX_MSG DECLARE_MESSAGE_MAP() - void _DictToName(void); - void _DictToTeam(void); - void _DictToScript(void); - void _DictToScale(void); - void _DictToWeather(void); - void _DictToTime(void); - void _DictToPrebuiltUpgrades(void); - void _DictToHealth(void); - void _DictToHPs(void); - void _DictToEnabled(void); - void _DictToDestructible(void); - void _DictToUnsellable(void); - void _DictToTargetable(void); - - void _DictToPowered(void); - void _DictToAggressiveness(void); - void _DictToVisibilityRange(void); - void _DictToVeterancy(void); - void _DictToShroudClearingDistance(void); + void _DictToName(); + void _DictToTeam(); + void _DictToScript(); + void _DictToScale(); + void _DictToWeather(); + void _DictToTime(); + void _DictToPrebuiltUpgrades(); + void _DictToHealth(); + void _DictToHPs(); + void _DictToEnabled(); + void _DictToDestructible(); + void _DictToUnsellable(); + void _DictToTargetable(); + + void _DictToPowered(); + void _DictToAggressiveness(); + void _DictToVisibilityRange(); + void _DictToVeterancy(); + void _DictToShroudClearingDistance(); void _DictToRecruitableAI(); - void _DictToSelectable(void); - void _DictToStoppingDistance(void); + void _DictToSelectable(); + void _DictToStoppingDistance(); void ShowZOffset(MapObject* pMapObj); void ShowAngle(MapObject* pMapObj); void ShowPosition(MapObject* pMapObj); - void dictToAttachedSound(void); - void dictToCustomize(void); - void dictToEnabled(void); - void dictToLooping(void); - void dictToLoopCount(void); - void dictToMinVolume(void); - void dictToVolume(void); - void dictToMinRange(void); - void dictToMaxRange(void); - void dictToPriority(void); + void dictToAttachedSound(); + void dictToCustomize(); + void dictToEnabled(); + void dictToLooping(); + void dictToLoopCount(); + void dictToMinVolume(); + void dictToVolume(); + void dictToMinRange(); + void dictToMaxRange(); + void dictToPriority(); void clearCustomizeFlag( CWorldBuilderDoc* pDoc, MultipleUndoable * ownerUndoable ); @@ -194,15 +194,15 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner virtual void PopSliderFinished(const long sliderID, long theVal) override; public: - static MapObject *getSingleSelectedMapObject(void); - static void update(void); + static MapObject *getSingleSelectedMapObject(); + static void update(); private: /// Disallow copying: Object is not set up to be copied MapObjectProps( const MapObjectProps & other ); // Deliberately undefined MapObjectProps & operator=( const MapObjectProps & other ); // Deliberately undefined void updateTheUI(MapObject *pMapObj); - void InitSound(void); + void InitSound(); }; //{{AFX_INSERT_LOCATION}} diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h index 30c7caf88be..26f8c78503d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -55,8 +55,8 @@ class PlayerListDlg : public CDialog Int m_curPlayerIdx; CButtonShowColor m_colorButton; - void updateTheUI(void); - void PopulateColorComboBox(void); + void updateTheUI(); + void PopulateColorComboBox(); void SelectColor(RGBColor rgb); // Generated message map functions diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h index 5b03d138cd4..84d22cf5c35 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -82,12 +82,12 @@ class CTeamsDialog : public CDialog }; void updateUI(Int whatToRebuild); - void validateTeamOwners( void ); + void validateTeamOwners(); Bool isValidTeamOwner( AsciiString ownerName ); void doCorrectTeamOwnerDialog( TeamsInfo *ti ); private: - void UpdateTeamsList(void); + void UpdateTeamsList(); }; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h index 067880f2711..54b0481328f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h @@ -129,8 +129,8 @@ class WbView : public CView virtual void rotateCamera(Real delta) { } virtual void pitchCamera(Real delta) { } - virtual Int getPickPixels(void) {return 4;} - virtual EditorSortingType GetPickConstraint(void) {return m_pickConstraint;} + virtual Int getPickPixels() {return 4;} + virtual EditorSortingType GetPickConstraint() {return m_pickConstraint;} public: CWorldBuilderDoc *WbDoc() { return ((CWorldBuilderDoc*)GetDocument()); } @@ -141,17 +141,17 @@ class WbView : public CView virtual MapObject *picked3dObjectInView(CPoint viewPt) {return nullptr;}; virtual BuildListInfo *pickedBuildObjectInView(CPoint viewPt) {return nullptr;}; - Bool isPolygonTriggerVisible(void) {return m_showPolygonTriggers;}; - Bool isWaypointVisible(void) {return m_showWaypoints;}; - Bool isNamesVisible(void) {return m_showNames;}; + Bool isPolygonTriggerVisible() {return m_showPolygonTriggers;}; + Bool isWaypointVisible() {return m_showWaypoints;}; + Bool isNamesVisible() {return m_showNames;}; void setShowModels(Bool show) {m_showModels = show;} - Bool getShowModels(void) { return m_showModels;} - Bool getShowTerrain(void) { return m_showTerrain;} + Bool getShowModels() { return m_showModels;} + Bool getShowTerrain() { return m_showTerrain;} void setShowGarrisoned(Bool show) {m_showGarrisoned = show;} - Bool getShowGarrisoned(void) { return m_showGarrisoned;} + Bool getShowGarrisoned() { return m_showGarrisoned;} - virtual Bool isDoingPitch( void ) { return false; } + virtual Bool isDoingPitch() { return false; } // Operations public: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h index 026a35e735f..1b9104f2cc1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h @@ -66,8 +66,8 @@ class WbView3d : public WbView, public DX8_CleanupHook public: // DX8_CleanupHook methods - virtual void ReleaseResources(void) override; ///< Release all dx8 resources so the device can be reset. - virtual void ReAcquireResources(void) override; ///< Reacquire all resources after device reset. + virtual void ReleaseResources() override; ///< Release all dx8 resources so the device can be reset. + virtual void ReAcquireResources() override; ///< Reacquire all resources after device reset. // Operations public: @@ -224,12 +224,12 @@ class WbView3d : public WbView, public DX8_CleanupHook void initWW3D(); void drawCircle( HDC hdc, const Coord3D & centerPoint, Real radius, COLORREF color ); void drawLabels(HDC hdc); - void drawLabels(void); + void drawLabels(); void shutdownWW3D(); void killTheTimer(); void render(); void setupCamera(); - void updateHysteresis(void); + void updateHysteresis(); void updateLights(); void updateScorches(); void updateTrees(); @@ -259,13 +259,13 @@ class WbView3d : public WbView, public DX8_CleanupHook virtual void rotateCamera(Real delta) override; virtual void pitchCamera(Real delta) override; void setCameraPitch(Real absolutePitch); - Real getCameraPitch(void); - Real getCurrentZoom(void); //WST 10/17/2002 - Real getHeightAboveGround(void) { return m_actualHeightAboveGround; } - Vector3 getCameraSource(void) { return m_cameraSource; } - Vector3 getCameraTarget(void) { return m_cameraTarget; } - Real getCameraAngle(void) { return m_cameraAngle; } - CPoint getActualWinSize(void) {return m_actualWinSize;} + Real getCameraPitch(); + Real getCurrentZoom(); //WST 10/17/2002 + Real getHeightAboveGround() { return m_actualHeightAboveGround; } + Vector3 getCameraSource() { return m_cameraSource; } + Vector3 getCameraTarget() { return m_cameraTarget; } + Real getCameraAngle() { return m_cameraAngle; } + CPoint getActualWinSize() {return m_actualWinSize;} virtual MapObject *picked3dObjectInView(CPoint viewPt) override; virtual BuildListInfo *pickedBuildObjectInView(CPoint viewPt) override; @@ -276,16 +276,16 @@ class WbView3d : public WbView, public DX8_CleanupHook /// Removes all render objects. Call when swithing to a new map. void resetRenderObjects(); - void stepTimeOfDay(void); + void stepTimeOfDay(); void reset3dEngineDisplaySize(Int width, Int height); ///< Closes & reinitializes w3d. void setLighting(const GlobalData::TerrainLighting *tl, Int whichLighting, Int whichLight=0); - DrawObject *getDrawObject(void) {return m_drawObject;}; + DrawObject *getDrawObject() {return m_drawObject;}; AsciiString getModelNameAndScale(MapObject *pMapObj, Real *scale, BodyDamageType curDamageState); - virtual Int getPickPixels(void) override {return m_pickPixels;} + virtual Int getPickPixels() override {return m_pickPixels;} virtual Bool viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real Z) override; public: @@ -300,21 +300,21 @@ class WbView3d : public WbView, public DX8_CleanupHook void setObjTracking(MapObject *pMapObj, Coord3D pos, Real angle, Bool show); void setViewLayersList(Bool showLayersList) { m_showLayersList = showLayersList; } - Bool getShowMapBoundaryFeedback(void) const { return m_showMapBoundaries; } - Bool getShowAmbientSoundsFeedback(void) const { return m_showAmbientSounds; } + Bool getShowMapBoundaryFeedback() const { return m_showMapBoundaries; } + Bool getShowAmbientSoundsFeedback() const { return m_showAmbientSounds; } - void togglePitchAndRotation( void ) { m_doPitch = !m_doPitch; } - virtual Bool isDoingPitch( void ) override { return m_doPitch; } + void togglePitchAndRotation() { m_doPitch = !m_doPitch; } + virtual Bool isDoingPitch() override { return m_doPitch; } void setShowBoundingBoxes(Bool toggle) {m_showBoundingBoxes = toggle;} - Bool getShowBoundingBoxes(void) { return m_showBoundingBoxes;} + Bool getShowBoundingBoxes() { return m_showBoundingBoxes;} void setShowSightRanges(Bool toggle) {m_showSightRanges = toggle;} - Bool getShowSightRanges(void) { return m_showSightRanges;} + Bool getShowSightRanges() { return m_showSightRanges;} void setShowWeaponRanges(Bool toggle) {m_showWeaponRanges = toggle;} - Bool getShowWeaponRanges(void) { return m_showWeaponRanges;} + Bool getShowWeaponRanges() { return m_showWeaponRanges;} void setHighlightTestArt(Bool toggle) {m_highlightTestArt = toggle;} - Bool getHighlightTestArt(void) { return m_highlightTestArt;} + Bool getHighlightTestArt() { return m_highlightTestArt;} void setShowLetterbox(Bool toggle) {m_showLetterbox = toggle;} - Bool getShowLetterbox(void) { return m_showLetterbox;} + Bool getShowLetterbox() { return m_showLetterbox;} }; inline UINT WbView3d::getLastDrawTime() { return m_time; } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp index 3c016d6bdf0..4fa4184e28a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/AutoEdgeOutTool.cpp @@ -33,13 +33,13 @@ // AutoEdgeOutTool class. // /// Constructor -AutoEdgeOutTool::AutoEdgeOutTool(void) : +AutoEdgeOutTool::AutoEdgeOutTool() : Tool(ID_AUTO_EDGE_OUT_TOOL, IDC_AUTO_EDGE_OUT) { } /// Destructor -AutoEdgeOutTool::~AutoEdgeOutTool(void) +AutoEdgeOutTool::~AutoEdgeOutTool() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp index ac9c75df19d..c1129b7f4b0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendEdgeTool.cpp @@ -33,13 +33,13 @@ // BlendEdgeTool class. // /// Constructor -BlendEdgeTool::BlendEdgeTool(void) : +BlendEdgeTool::BlendEdgeTool() : Tool(ID_BLEND_EDGE_TOOL, IDC_BLEND_EDGE) { } /// Destructor -BlendEdgeTool::~BlendEdgeTool(void) +BlendEdgeTool::~BlendEdgeTool() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp index a6b5e6f9a35..3981689ac4f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BlendMaterial.cpp @@ -224,7 +224,7 @@ void BlendMaterial::addTerrain(const char *pPath, Int terrainNdx, HTREEITEM pare } //* Create the tree view of textures from the textures in pMap. */ -void BlendMaterial::updateTextures(void) +void BlendMaterial::updateTextures() { m_updating = true; m_terrainTreeView.DeleteAllItems(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp index c9c2f148032..1db6efb14da 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BorderTool.cpp @@ -39,7 +39,7 @@ BorderTool::~BorderTool() } -void BorderTool::setCursor(void) +void BorderTool::setCursor() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp index b9f5f2b14ae..27b8e758660 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BrushTool.cpp @@ -44,7 +44,7 @@ Int BrushTool::m_brushHeight; /// Constructor -BrushTool::BrushTool(void) : +BrushTool::BrushTool() : Tool(ID_BRUSH_TOOL, IDC_BRUSH_CROSS) { m_htMapEditCopy = nullptr; @@ -57,7 +57,7 @@ BrushTool::BrushTool(void) : } /// Destructor -BrushTool::~BrushTool(void) +BrushTool::~BrushTool() { REF_PTR_RELEASE(m_htMapEditCopy); REF_PTR_RELEASE(m_htMapFeatherCopy); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp index 8ba092b4637..12b1d28219c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp @@ -53,7 +53,7 @@ BuildList::BuildList(CWnd* pParent /*=nullptr*/) } -BuildList::~BuildList(void) +BuildList::~BuildList() { } @@ -113,7 +113,7 @@ BOOL BuildList::OnInitDialog() } /// Load the sides in the sides list. -void BuildList::loadSides(void) +void BuildList::loadSides() { CComboBox *pCombo = (CComboBox*)GetDlgItem(IDC_SIDES_COMBO); if (!pCombo) { @@ -137,7 +137,7 @@ void BuildList::loadSides(void) } /// Updates the current side, loading it's build list. -void BuildList::updateCurSide(void) +void BuildList::updateCurSide() { if (TheSidesList->getNumSides() < 1) return; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp index 5965a0217d5..e935114202d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildListTool.cpp @@ -43,7 +43,7 @@ Bool BuildListTool::m_isActive = false; PickUnitDialog* BuildListTool::m_static_pickBuildingDlg = nullptr; /// Constructor -BuildListTool::BuildListTool(void) : +BuildListTool::BuildListTool() : Tool(ID_BUILD_LIST_TOOL, IDC_BUILD_LIST_TOOL), m_rotateCursor(nullptr), m_pointerCursor(nullptr), @@ -54,11 +54,11 @@ BuildListTool::BuildListTool(void) : } /// Destructor -BuildListTool::~BuildListTool(void) +BuildListTool::~BuildListTool() { } -void BuildListTool::createWindow(void) +void BuildListTool::createWindow() { CRect frameRect; frameRect.top = ::AfxGetApp()->GetProfileInt(BUILD_PICK_PANEL_SECTION, "Top", 0); @@ -73,7 +73,7 @@ void BuildListTool::createWindow(void) m_created = true; } -Bool BuildListTool::isDoingAdd(void) +Bool BuildListTool::isDoingAdd() { if (!m_created) { return false; @@ -133,7 +133,7 @@ void BuildListTool::deactivate() } /** Set the cursor. */ -void BuildListTool::setCursor(void) +void BuildListTool::setCursor() { if (isDoingAdd()) { Tool::setCursor(); // Default cursor is the adding cursor diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp index 34419e2272f..93d9ee1ce0e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CUndoable.cpp @@ -47,7 +47,7 @@ // /// Undoable - destructor. // -Undoable::~Undoable(void) +Undoable::~Undoable() { REF_PTR_RELEASE(mNext); } @@ -56,7 +56,7 @@ Undoable::~Undoable(void) // /// Create a new undoable. // -Undoable::Undoable(void): +Undoable::Undoable(): mNext(nullptr) { } @@ -72,7 +72,7 @@ void Undoable::LinkNext(Undoable *pNext) // /// Redo defaults to Do(). // -void Undoable::Redo(void) +void Undoable::Redo() { Do(); } @@ -86,7 +86,7 @@ void Undoable::Redo(void) // /// destructor. // -WBDocUndoable::~WBDocUndoable(void) +WBDocUndoable::~WBDocUndoable() { REF_PTR_RELEASE(mPNewHeightMapData); REF_PTR_RELEASE(mPOldHeightMapData); @@ -117,7 +117,7 @@ WBDocUndoable::WBDocUndoable(CWorldBuilderDoc *pDoc, WorldHeightMapEdit *pNewHtM // /// Set the new height map. // -void WBDocUndoable::Do(void) +void WBDocUndoable::Do() { mPDoc->SetHeightMap(mPNewHeightMapData, false); // SetHeightMap but don't inval. if (m_offsetObjects) { @@ -151,7 +151,7 @@ void WBDocUndoable::Do(void) // /// Set the new height map. // -void WBDocUndoable::Redo(void) +void WBDocUndoable::Redo() { // Cause the terrain texture to be regenerated. mPNewHeightMapData->resetResources(); @@ -176,7 +176,7 @@ void WBDocUndoable::Redo(void) // /// Restore the old height map. // -void WBDocUndoable::Undo(void) +void WBDocUndoable::Undo() { // Cause the terrain texture to be regenerated. mPOldHeightMapData->resetResources(); @@ -204,7 +204,7 @@ void WBDocUndoable::Undo(void) // // AddObjectUndoable - destructor. // -AddObjectUndoable::~AddObjectUndoable(void) +AddObjectUndoable::~AddObjectUndoable() { m_pDoc = nullptr; // not ref counted. if (!m_addedToList) { @@ -230,7 +230,7 @@ AddObjectUndoable::AddObjectUndoable(CWorldBuilderDoc *pDoc, MapObject *pObjectT // /// Set the new mipping values, and force an inval of the windows. // -void AddObjectUndoable::Do(void) +void AddObjectUndoable::Do() { // WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); MapObject *pCur = m_objectToAdd; @@ -291,7 +291,7 @@ void AddObjectUndoable::Do(void) // // Restore the old mipping values, and inval. // -void AddObjectUndoable::Undo(void) +void AddObjectUndoable::Undo() { // WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); DEBUG_ASSERTCRASH(m_addedToList,("oops")); @@ -323,7 +323,7 @@ void AddObjectUndoable::Undo(void) /************************************************************************* ** MoveInfo ***************************************************************************/ -MoveInfo::~MoveInfo(void) +MoveInfo::~MoveInfo() { m_objectToModify=nullptr; // The map info list owns these, don't delete. MoveInfo *pCur = m_next; @@ -432,7 +432,7 @@ void MoveInfo::UndoMove(CWorldBuilderDoc *pDoc) // // ModifyObjectUndoable - destructor. // -ModifyObjectUndoable::~ModifyObjectUndoable(void) +ModifyObjectUndoable::~ModifyObjectUndoable() { m_pDoc = nullptr; // not ref counted. if (m_moveList) { @@ -536,7 +536,7 @@ void ModifyObjectUndoable::SetName(AsciiString name) // /// Set the new values, and force an inval of the windows. // -void ModifyObjectUndoable::Do(void) +void ModifyObjectUndoable::Do() { // Already done. } @@ -544,7 +544,7 @@ void ModifyObjectUndoable::Do(void) // /// Set the new values, and force an inval of the windows. // -void ModifyObjectUndoable::Redo(void) +void ModifyObjectUndoable::Redo() { MoveInfo *pCur = m_moveList; while (pCur) { @@ -562,7 +562,7 @@ void ModifyObjectUndoable::Redo(void) // // Restore the old mipping values, and inval. // -void ModifyObjectUndoable::Undo(void) +void ModifyObjectUndoable::Undo() { MoveInfo *pCur = m_moveList; while (pCur) { @@ -580,7 +580,7 @@ void ModifyObjectUndoable::Undo(void) /************************************************************************* ** FlagsInfo ***************************************************************************/ -FlagsInfo::~FlagsInfo(void) +FlagsInfo::~FlagsInfo() { m_objectToModify=nullptr; // The map info list owns these, don't delete. FlagsInfo *pCur = m_next; @@ -646,7 +646,7 @@ void FlagsInfo::UndoFlags(CWorldBuilderDoc *pDoc) // // ModifyFlagsUndoable - destructor. // -ModifyFlagsUndoable::~ModifyFlagsUndoable(void) +ModifyFlagsUndoable::~ModifyFlagsUndoable() { m_pDoc = nullptr; // not ref counted. @@ -682,7 +682,7 @@ ModifyFlagsUndoable::ModifyFlagsUndoable(CWorldBuilderDoc *pDoc, Int flagMask, I // /// Set the new values, and force an inval of the objects. // -void ModifyFlagsUndoable::Do(void) +void ModifyFlagsUndoable::Do() { FlagsInfo *pCur = m_flagsList; while (pCur) { @@ -694,7 +694,7 @@ void ModifyFlagsUndoable::Do(void) // /// Set the new values, and force an inval of the objects. // -void ModifyFlagsUndoable::Redo(void) +void ModifyFlagsUndoable::Redo() { Do(); } @@ -702,7 +702,7 @@ void ModifyFlagsUndoable::Redo(void) // // Restore the old mipping values, and inval. // -void ModifyFlagsUndoable::Undo(void) +void ModifyFlagsUndoable::Undo() { FlagsInfo *pCur = m_flagsList; while (pCur) { @@ -730,7 +730,7 @@ SidesListUndoable::~SidesListUndoable() { } -void SidesListUndoable::Do(void) +void SidesListUndoable::Do() { *TheSidesList = m_new; MapObjectProps::update(); // ugh, hack to update panel @@ -742,7 +742,7 @@ void SidesListUndoable::Do(void) p3View->invalObjectInView(nullptr); } -void SidesListUndoable::Undo(void) +void SidesListUndoable::Undo() { *TheSidesList = m_old; MapObjectProps::update(); // ugh, hack to update panel @@ -785,7 +785,7 @@ DictItemUndoable::~DictItemUndoable() } -void DictItemUndoable::Do(void) +void DictItemUndoable::Do() { for (int i = 0; i < m_numDictsToModify; ++i) { if (m_key == NAMEKEY_INVALID) @@ -802,7 +802,7 @@ void DictItemUndoable::Do(void) } } -void DictItemUndoable::Undo(void) +void DictItemUndoable::Undo() { for (int i = 0; i < m_numDictsToModify; ++i) { if (m_key == NAMEKEY_INVALID) @@ -854,7 +854,7 @@ void DictItemUndoable::Undo(void) /************************************************************************* ** DeleteInfo ***************************************************************************/ -DeleteInfo::~DeleteInfo(void) +DeleteInfo::~DeleteInfo() { if (m_didDelete) { deleteInstance(m_objectToDelete); @@ -933,7 +933,7 @@ void DeleteInfo::UndoDelete(WorldHeightMapEdit *pMap) // // DeleteObjectUndoable - destructor. // -DeleteObjectUndoable::~DeleteObjectUndoable(void) +DeleteObjectUndoable::~DeleteObjectUndoable() { m_pDoc = nullptr; // not ref counted. @@ -988,7 +988,7 @@ DeleteObjectUndoable::DeleteObjectUndoable(CWorldBuilderDoc *pDoc): // /// Delete the objects. // -void DeleteObjectUndoable::Do(void) +void DeleteObjectUndoable::Do() { WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); DeleteInfo *pCur = m_deleteList; @@ -1015,7 +1015,7 @@ void DeleteObjectUndoable::Do(void) // // Restore the old mipping values, and inval. // -void DeleteObjectUndoable::Undo(void) +void DeleteObjectUndoable::Undo() { WorldHeightMapEdit *pMap = m_pDoc->GetHeightMap(); DeleteInfo *pCur = m_deleteList; @@ -1044,7 +1044,7 @@ void DeleteObjectUndoable::Undo(void) // // AddPolygonUndoable - destructor. // -AddPolygonUndoable::~AddPolygonUndoable(void) +AddPolygonUndoable::~AddPolygonUndoable() { if (m_trigger && !m_isTriggerInList) { DEBUG_ASSERTCRASH(m_trigger->getNext()==nullptr, ("Logic error.")); @@ -1065,7 +1065,7 @@ AddPolygonUndoable::AddPolygonUndoable(PolygonTrigger *pTrig): // /// Add the trigger. // -void AddPolygonUndoable::Do(void) +void AddPolygonUndoable::Do() { // The call to LayersList must be done here because only the WorldBuilder knows about Layers. TheLayersList->addPolygonTriggerToLayersList(m_trigger, m_trigger->getLayerName()); @@ -1076,7 +1076,7 @@ void AddPolygonUndoable::Do(void) // // Remove the trigger. // -void AddPolygonUndoable::Undo(void) +void AddPolygonUndoable::Undo() { // The call to LayersList must be done here because only the WorldBuilder knows about Layers. TheLayersList->removePolygonTriggerFromLayersList(m_trigger); @@ -1091,7 +1091,7 @@ void AddPolygonUndoable::Undo(void) // // AddPolygonUndoable - destructor. // -AddPolygonPointUndoable::~AddPolygonPointUndoable(void) +AddPolygonPointUndoable::~AddPolygonPointUndoable() { m_trigger=nullptr; } @@ -1109,7 +1109,7 @@ AddPolygonPointUndoable::AddPolygonPointUndoable(PolygonTrigger *pTrig, // /// Add the trigger. // -void AddPolygonPointUndoable::Do(void) +void AddPolygonPointUndoable::Do() { m_trigger->addPoint(m_point); } @@ -1117,7 +1117,7 @@ void AddPolygonPointUndoable::Do(void) // // Remove the trigger. // -void AddPolygonPointUndoable::Undo(void) +void AddPolygonPointUndoable::Undo() { m_point = *m_trigger->getPoint(m_trigger->getNumPoints()-1); m_trigger->deletePoint(m_trigger->getNumPoints()-1); @@ -1130,7 +1130,7 @@ void AddPolygonPointUndoable::Undo(void) // // ModifyPolygonPointUndoable - destructor. // -ModifyPolygonPointUndoable::~ModifyPolygonPointUndoable(void) +ModifyPolygonPointUndoable::~ModifyPolygonPointUndoable() { m_trigger=nullptr; } @@ -1148,7 +1148,7 @@ ModifyPolygonPointUndoable::ModifyPolygonPointUndoable(PolygonTrigger *pTrig, In // /// Add the trigger. // -void ModifyPolygonPointUndoable::Do(void) +void ModifyPolygonPointUndoable::Do() { m_savPoint = *m_trigger->getPoint(m_pointIndex); m_trigger->setPoint(m_point, m_pointIndex); @@ -1157,7 +1157,7 @@ void ModifyPolygonPointUndoable::Do(void) // // Remove the trigger. // -void ModifyPolygonPointUndoable::Undo(void) +void ModifyPolygonPointUndoable::Undo() { m_point = *m_trigger->getPoint(m_pointIndex); m_trigger->setPoint(m_savPoint, m_pointIndex); @@ -1169,7 +1169,7 @@ void ModifyPolygonPointUndoable::Undo(void) // // MovePolygonUndoable - destructor. // -MovePolygonUndoable::~MovePolygonUndoable(void) +MovePolygonUndoable::~MovePolygonUndoable() { m_trigger=nullptr; } @@ -1208,7 +1208,7 @@ void MovePolygonUndoable::SetOffset(const ICoord3D &offset) // /// Offset the trigger. // -void MovePolygonUndoable::Do(void) +void MovePolygonUndoable::Do() { Int i; for (i=0; igetNumPoints(); i++) { @@ -1223,7 +1223,7 @@ void MovePolygonUndoable::Do(void) // // Unoffset the trigger. // -void MovePolygonUndoable::Undo(void) +void MovePolygonUndoable::Undo() { Int i; for (i=0; igetNumPoints(); i++) { @@ -1242,7 +1242,7 @@ void MovePolygonUndoable::Undo(void) // // InsertPolygonPointUndoable - destructor. // -InsertPolygonPointUndoable::~InsertPolygonPointUndoable(void) +InsertPolygonPointUndoable::~InsertPolygonPointUndoable() { m_trigger=nullptr; } @@ -1260,7 +1260,7 @@ InsertPolygonPointUndoable::InsertPolygonPointUndoable(PolygonTrigger *pTrig, IC // /// Insert the point. // -void InsertPolygonPointUndoable::Do(void) +void InsertPolygonPointUndoable::Do() { m_trigger->insertPoint(m_point, m_pointIndex); } @@ -1268,7 +1268,7 @@ void InsertPolygonPointUndoable::Do(void) // // Remove the point. // -void InsertPolygonPointUndoable::Undo(void) +void InsertPolygonPointUndoable::Undo() { m_trigger->deletePoint(m_pointIndex); } @@ -1279,7 +1279,7 @@ void InsertPolygonPointUndoable::Undo(void) // // DeletePolygonPointUndoable - destructor. // -DeletePolygonPointUndoable::~DeletePolygonPointUndoable(void) +DeletePolygonPointUndoable::~DeletePolygonPointUndoable() { m_trigger=nullptr; } @@ -1297,7 +1297,7 @@ DeletePolygonPointUndoable::DeletePolygonPointUndoable(PolygonTrigger *pTrig, In // /// Delete the point. // -void DeletePolygonPointUndoable::Do(void) +void DeletePolygonPointUndoable::Do() { m_trigger->deletePoint(m_pointIndex); } @@ -1305,7 +1305,7 @@ void DeletePolygonPointUndoable::Do(void) // // Remove the point. // -void DeletePolygonPointUndoable::Undo(void) +void DeletePolygonPointUndoable::Undo() { m_trigger->insertPoint(m_point, m_pointIndex); } @@ -1316,7 +1316,7 @@ void DeletePolygonPointUndoable::Undo(void) // // DeletePolygonUndoable - destructor. // -DeletePolygonUndoable::~DeletePolygonUndoable(void) +DeletePolygonUndoable::~DeletePolygonUndoable() { if (m_trigger && !m_isTriggerInList) { DEBUG_ASSERTCRASH(m_trigger->getNext()==nullptr, ("Logic error.")); @@ -1337,7 +1337,7 @@ DeletePolygonUndoable::DeletePolygonUndoable(PolygonTrigger *pTrig): // /// Delete the point. // -void DeletePolygonUndoable::Do(void) +void DeletePolygonUndoable::Do() { TheLayersList->removePolygonTriggerFromLayersList(m_trigger); PolygonTrigger::removePolygonTrigger(m_trigger); @@ -1347,7 +1347,7 @@ void DeletePolygonUndoable::Do(void) // // Remove the point. // -void DeletePolygonUndoable::Undo(void) +void DeletePolygonUndoable::Undo() { PolygonTrigger::addPolygonTrigger(m_trigger); TheLayersList->addPolygonTriggerToLayersList(m_trigger, m_trigger->getLayerName()); @@ -1362,7 +1362,7 @@ void DeletePolygonUndoable::Undo(void) // // MultipleUndoable - constructor. // -MultipleUndoable::MultipleUndoable(void) +MultipleUndoable::MultipleUndoable() : m_undoableList( nullptr ) { } @@ -1370,7 +1370,7 @@ MultipleUndoable::MultipleUndoable(void) // // MultipleUndoable - destructor // -MultipleUndoable::~MultipleUndoable(void) +MultipleUndoable::~MultipleUndoable() { if ( m_undoableList ) { @@ -1392,7 +1392,7 @@ void MultipleUndoable::addUndoable( Undoable * undoable ) // /// Do all the list's actions. // -void MultipleUndoable::Do(void) +void MultipleUndoable::Do() { Undoable * undoable = m_undoableList; @@ -1422,7 +1422,7 @@ static void undoHelper(Undoable * undoable) // Undo all the list's actions. This is harder, because we need to do it in reverse order, for a // singly linked list // -void MultipleUndoable::Undo(void) +void MultipleUndoable::Undo() { undoHelper(m_undoableList); } @@ -1431,7 +1431,7 @@ void MultipleUndoable::Undo(void) // /// Redo all the list's actions. // -void MultipleUndoable::Redo(void) +void MultipleUndoable::Redo() { Undoable * undoable = m_undoableList; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp index 039ee5c71a9..220e3d5f22d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/CameraOptions.cpp @@ -196,7 +196,7 @@ BOOL CameraOptions::getReal(Int ctrlID, Real *rVal) return false; } -void CameraOptions::stuffValuesIntoFields( void ) +void CameraOptions::stuffValuesIntoFields() { WbView3d * p3View = CWorldBuilderDoc::GetActive3DView(); if (p3View) @@ -224,7 +224,7 @@ void CameraOptions::stuffValuesIntoFields( void ) } } -void CameraOptions::update( void ) +void CameraOptions::update() { stuffValuesIntoFields(); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp index 6d96e26c0bc..0ff319de3ad 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/DrawObject.cpp @@ -131,14 +131,14 @@ void DrawObject::stopWaypointDragFeedback() -DrawObject::~DrawObject(void) +DrawObject::~DrawObject() { freeMapResources(); REF_PTR_RELEASE(m_waterDrawObject); TheWaterRenderObj = nullptr; } -DrawObject::DrawObject(void) : +DrawObject::DrawObject() : m_drawObjects(true), m_drawPolygonAreas(true), m_indexBuffer(nullptr), @@ -205,18 +205,18 @@ void DrawObject::Get_Obj_Space_Bounding_Box(AABoxClass & box) const box.Init(minPt,maxPt); } -Int DrawObject::Class_ID(void) const +Int DrawObject::Class_ID() const { return RenderObjClass::CLASSID_UNKNOWN; } -RenderObjClass * DrawObject::Clone(void) const +RenderObjClass * DrawObject::Clone() const { return new DrawObject(*this); } -Int DrawObject::freeMapResources(void) +Int DrawObject::freeMapResources() { REF_PTR_RELEASE(m_indexBuffer); @@ -245,7 +245,7 @@ Int DrawObject::freeMapResources(void) #define SELECT_PYRAMID_HEIGHT (1.0f) -Int DrawObject::initData(void) +Int DrawObject::initData() { Int i; @@ -289,7 +289,7 @@ Int DrawObject::initData(void) /** updateMeshVB puts mesh mold triangles into m_vertexFeedback. */ -void DrawObject::updateMeshVB(void) +void DrawObject::updateMeshVB() { const Int theAlpha = 64; @@ -443,7 +443,7 @@ void DrawObject::updateMeshVB(void) /** updateRampVB puts the ramps into a vertex buffer. */ -void DrawObject::updateRampVB(void) +void DrawObject::updateRampVB() { const Int theAlpha = 64; @@ -559,7 +559,7 @@ void DrawObject::updateRampVB(void) } /** updateBoundaryVB puts boundaries into m_vertexFeedback. */ -void DrawObject::updateBoundaryVB(void) +void DrawObject::updateBoundaryVB() { // const Int theAlpha = 64; @@ -737,7 +737,7 @@ static const Int poleWidth = 2; static const Int flagHeight = 10; static const Int flagWidth = 10; -void DrawObject::updateAmbientSoundVB(void) +void DrawObject::updateAmbientSoundVB() { m_feedbackVertexCount = 0; m_feedbackIndexCount = 0; @@ -845,7 +845,7 @@ void DrawObject::updateAmbientSoundVB(void) /** updateMeshVB puts waypoint path triangles into m_vertexFeedback. */ -void DrawObject::updateWaypointVB(void) +void DrawObject::updateWaypointVB() { // const Int theAlpha = 64; @@ -1178,7 +1178,7 @@ void DrawObject::updatePolygonVB(PolygonTrigger *pTrig, Bool selected, Bool isOp /** updateFeedbackVB puts brush feedback triangles into m_vertexFeedback. */ -void DrawObject::updateFeedbackVB(void) +void DrawObject::updateFeedbackVB() { const Int theAlpha = 64; m_feedbackVertexCount = 0; @@ -1307,7 +1307,7 @@ static Int xpSign(const ICoord3D &v1, const ICoord3D &v2) { /** updateForWater puts a blue rectangle into the vertex buffer. */ -void DrawObject::updateForWater(void) +void DrawObject::updateForWater() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp index 9b6ef999adb..1fbbe91a7b6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/EyedropperTool.cpp @@ -35,13 +35,13 @@ // EyedropperTool class. // /// Constructor -EyedropperTool::EyedropperTool(void) : +EyedropperTool::EyedropperTool() : Tool(ID_EYEDROPPER_TOOL, IDC_EYEDROPPER) { } /// Destructor -EyedropperTool::~EyedropperTool(void) +EyedropperTool::~EyedropperTool() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp index e881ca38ba8..b4cfeb0b5ce 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FeatherTool.cpp @@ -40,7 +40,7 @@ Int FeatherTool::m_radius = 0; // /// Constructor -FeatherTool::FeatherTool(void) : +FeatherTool::FeatherTool() : Tool(ID_FEATHERTOOL, IDC_BRUSH_CROSS) { m_htMapEditCopy = nullptr; @@ -49,7 +49,7 @@ FeatherTool::FeatherTool(void) : } /// Destructor -FeatherTool::~FeatherTool(void) +FeatherTool::~FeatherTool() { REF_PTR_RELEASE(m_htMapEditCopy); REF_PTR_RELEASE(m_htMapFeatherCopy); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp index 10fb78bb354..d28033102f8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceOptions.cpp @@ -66,7 +66,7 @@ FenceOptions::FenceOptions(CWnd* pParent /*=nullptr*/) } -FenceOptions::~FenceOptions(void) +FenceOptions::~FenceOptions() { deleteInstance(m_objectsList); m_objectsList = nullptr; @@ -306,7 +306,7 @@ void FenceOptions::addObject( MapObject *mapObject, const char *pPath, const cha } -Bool FenceOptions::hasSelectedObject(void) +Bool FenceOptions::hasSelectedObject() { // If we have no selected object, return false. if (m_currentObjectIndex==-1) return false; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp index 28e7920b3fb..0a9a354aa2a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FenceTool.cpp @@ -37,7 +37,7 @@ // enum {MAX_OBJECTS = 200}; /// Constructor -FenceTool::FenceTool(void) : +FenceTool::FenceTool() : Tool(ID_FENCE_TOOL, IDC_FENCE), m_mapObjectList(nullptr), m_objectCount(1) @@ -47,7 +47,7 @@ FenceTool::FenceTool(void) : } /// Destructor -FenceTool::~FenceTool(void) +FenceTool::~FenceTool() { deleteInstance(m_mapObjectList); m_mapObjectList = nullptr; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp index 6f8cff603ad..97b4084cdd3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/FloodFillTool.cpp @@ -39,14 +39,14 @@ Bool FloodFillTool::m_adjustCliffTextures = false; /// Constructor -FloodFillTool::FloodFillTool(void) : +FloodFillTool::FloodFillTool() : Tool(ID_TILE_FLOOD_FILL, IDC_FLOOD_FILL), m_cliffCursor(nullptr) { } /// Destructor -FloodFillTool::~FloodFillTool(void) +FloodFillTool::~FloodFillTool() { if (m_cliffCursor) { ::DestroyCursor(m_cliffCursor); @@ -64,7 +64,7 @@ void FloodFillTool::activate() } /** Set the cursor. */ -void FloodFillTool::setCursor(void) +void FloodFillTool::setCursor() { if (m_adjustCliffTextures) { if (m_cliffCursor == nullptr) { diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp index 0ca2889702c..a3fb95ca52f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/GlobalLightOptions.cpp @@ -61,7 +61,7 @@ static void calcNewLight(Int lr, Int fb, Vector3 *newLight) newLight->Rotate_Z(zAngle); } -void GlobalLightOptions::updateEditFields(void) +void GlobalLightOptions::updateEditFields() { m_updating = true; CString str; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp index 00c99ccb7f9..6171aef302e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveOptions.cpp @@ -27,7 +27,7 @@ /*extern*/ GroveOptions *TheGroveOptions = nullptr; -void GroveOptions::makeMain(void) +void GroveOptions::makeMain() { TheGroveOptions = this; } @@ -37,7 +37,7 @@ GroveOptions::GroveOptions(CWnd* pParent) } -int GroveOptions::getNumTrees(void) +int GroveOptions::getNumTrees() { CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees); if (!pWnd) { @@ -117,7 +117,7 @@ AsciiString GroveOptions::getTypeName(int type) return cstr.GetBuffer(0); } -int GroveOptions::getTotalTreePerc(void) +int GroveOptions::getTotalTreePerc() { static char buff[ARBITRARY_BUFF_SIZE]; @@ -133,7 +133,7 @@ int GroveOptions::getTotalTreePerc(void) return -1; } -Bool GroveOptions::getCanPlaceInWater(void) +Bool GroveOptions::getCanPlaceInWater() { CButton* pButt; @@ -144,7 +144,7 @@ Bool GroveOptions::getCanPlaceInWater(void) return false; } -Bool GroveOptions::getCanPlaceOnCliffs(void) +Bool GroveOptions::getCanPlaceOnCliffs() { CButton* pButt; @@ -172,7 +172,7 @@ GroveOptions::~GroveOptions() } -void GroveOptions::_setTreesToLists(void) +void GroveOptions::_setTreesToLists() { CString str; for (VecPairNameDisplayNameIt it = mVecDisplayNames.begin(); it != mVecDisplayNames.end(); it++) { @@ -245,7 +245,7 @@ void GroveOptions::_setTreesToLists(void) } } -void GroveOptions::_buildTreeList(void) +void GroveOptions::_buildTreeList() { const ThingTemplate* pTemplate; for (pTemplate = TheThingFactory->firstTemplate(); pTemplate; pTemplate = pTemplate->friend_getNextTemplate()) { @@ -258,7 +258,7 @@ void GroveOptions::_buildTreeList(void) } } -void GroveOptions::_setDefaultRatios(void) +void GroveOptions::_setDefaultRatios() { static char buff[ARBITRARY_BUFF_SIZE]; int defaultRatio; @@ -299,7 +299,7 @@ void GroveOptions::_setDefaultRatios(void) } } -void GroveOptions::_setDefaultNumTrees(void) +void GroveOptions::_setDefaultNumTrees() { CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees); if (!pWnd) { @@ -313,7 +313,7 @@ void GroveOptions::_setDefaultNumTrees(void) pWnd->SetWindowText(buff); } -void GroveOptions::_setDefaultPlacementAllowed(void) +void GroveOptions::_setDefaultPlacementAllowed() { CButton* pButt; int state; @@ -332,7 +332,7 @@ void GroveOptions::_setDefaultPlacementAllowed(void) } -void GroveOptions::_updateTreeWeights(void) +void GroveOptions::_updateTreeWeights() { static char buff[ARBITRARY_BUFF_SIZE]; int val = 0; @@ -384,7 +384,7 @@ void GroveOptions::_updateTreeWeights(void) } } -void GroveOptions::_updateTreeCount(void) +void GroveOptions::_updateTreeCount() { static char buff[ARBITRARY_BUFF_SIZE]; CWnd* pWnd = GetDlgItem(IDC_Grove_NumberTrees); @@ -395,7 +395,7 @@ void GroveOptions::_updateTreeCount(void) } } -void GroveOptions::_updateGroveMakeup(void) +void GroveOptions::_updateGroveMakeup() { for (int type = 1; type <= 5; ++type) { CComboBox *pComboBox; @@ -430,7 +430,7 @@ void GroveOptions::_updateGroveMakeup(void) } } -void GroveOptions::_updatePlacementAllowed(void) +void GroveOptions::_updatePlacementAllowed() { // huh huh huh-huh CButton* pButt; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp index 75e1afabe3f..b60c9d662a6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/GroveTool.cpp @@ -235,14 +235,14 @@ void GroveTool::plantGrove( Coord3D pos, Coord3D prevDir, Real baseHeight, Int l // GroveTool class. // /// Constructor -GroveTool::GroveTool(void) : +GroveTool::GroveTool() : Tool(ID_GROVE_TOOL, IDC_GROVE) { m_headMapObj = nullptr; } /// Destructor -GroveTool::~GroveTool(void) +GroveTool::~GroveTool() { deleteInstance(m_headMapObj); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp index 3ef8150a05e..f3287f6e646 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/HandScrollTool.cpp @@ -38,7 +38,7 @@ inline Int IABS(Int x) { if (x>=0) return x; return -x;}; static const Int MAX_SCROLL = 1000; /// Constructor -HandScrollTool::HandScrollTool(void) : +HandScrollTool::HandScrollTool() : Tool(ID_HAND_SCROLL_TOOL, IDC_HAND_SCROLL) { } @@ -50,7 +50,7 @@ void HandScrollTool::activate() } /// Destructor -HandScrollTool::~HandScrollTool(void) +HandScrollTool::~HandScrollTool() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp index 298790684fe..744f8038f05 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/LayersList.cpp @@ -182,7 +182,7 @@ LayersList::~LayersList() delete mTree; } -void LayersList::resetLayers(void) +void LayersList::resetLayers() { // @todo Default needs to be a localizable string Layer defaultLayer; @@ -416,7 +416,7 @@ Bool LayersList::isLayerHidden(IN AsciiString layerToTest) return (!layerIt->show); } -void LayersList::updateUIFromList(void) +void LayersList::updateUIFromList() { if (!m_performUpdates) { return; @@ -1185,7 +1185,7 @@ void LayersList::OnMergeViewSelection(UINT commandID) //WST 11/23/2002 -void LayersList::unselectAllMapObjects(void) +void LayersList::unselectAllMapObjects() { MapObject *mapObject = MapObject::getFirstMapObject(); while (mapObject) { @@ -1194,7 +1194,7 @@ void LayersList::unselectAllMapObjects(void) } } -void LayersList::unselectAllPolygonTriggers(void) +void LayersList::unselectAllPolygonTriggers() { PolygonTrigger *trigger = PolygonTrigger::getFirstPolygonTrigger(); while (trigger) { diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp index 2b7d1712552..3505989b30f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/LightOptions.cpp @@ -49,7 +49,7 @@ void LightOptions::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } -MapObject *LightOptions::getSingleSelectedLight(void) +MapObject *LightOptions::getSingleSelectedLight() { MapObject *pMapObj; MapObject *theMapObj = nullptr; @@ -70,7 +70,7 @@ MapObject *LightOptions::getSingleSelectedLight(void) } -void LightOptions::updateTheUI(void) +void LightOptions::updateTheUI() { MapObject *theMapObj = getSingleSelectedLight(); if (!theMapObj) return; @@ -114,7 +114,7 @@ void LightOptions::updateTheUI(void) } } -void LightOptions::update(void) +void LightOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp index f86005ddfa8..183d9e45233 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MainFrm.cpp @@ -309,7 +309,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) return 0; } -void CMainFrame::adjustWindowSize(void) +void CMainFrame::adjustWindowSize() { HWND hDesk = ::GetDesktopWindow(); CRect top; @@ -350,7 +350,7 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) return TRUE; } -void CMainFrame::ResetWindowPositions(void) +void CMainFrame::ResetWindowPositions() { if (m_curOptions == nullptr) { m_curOptions = &m_brushOptions; @@ -521,7 +521,7 @@ void CMainFrame::OnEditCameraoptions() m_cameraOptions.ShowWindow(SW_SHOWNA); } -void CMainFrame::handleCameraChange(void) +void CMainFrame::handleCameraChange() { m_cameraOptions.update(); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp index c4ef56b462b..d232f729992 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MapPreview.cpp @@ -67,7 +67,7 @@ Bool localIsUnderwater( Real x, Real y); // ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------ -MapPreview::MapPreview(void ) +MapPreview::MapPreview() { memset(m_pixelBuffer, 0xffffffff, sizeof(m_pixelBuffer)); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp index 36773b6c53e..dcf0e7a02f3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldTool.cpp @@ -45,14 +45,14 @@ Coord3D MeshMoldTool::m_toolPos; WorldHeightMapEdit *MeshMoldTool::m_htMapEditCopy = nullptr; /// Constructor -MeshMoldTool::MeshMoldTool(void) : +MeshMoldTool::MeshMoldTool() : Tool(ID_MOLD_TOOL, IDC_MOLD_POINTER) { m_offsettingZ = false; } /// Destructor -MeshMoldTool::~MeshMoldTool(void) +MeshMoldTool::~MeshMoldTool() { REF_PTR_RELEASE(m_htMapEditCopy); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp index 9c24413efac..24a7f1291a7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MoundTool.cpp @@ -43,7 +43,7 @@ Int MoundTool::m_brushFeather; /// Constructor -MoundTool::MoundTool(void) : +MoundTool::MoundTool() : Tool(ID_BRUSH_ADD_TOOL, IDC_BRUSH_CROSS) { m_htMapEditCopy = nullptr; @@ -52,7 +52,7 @@ MoundTool::MoundTool(void) : } /// Destructor -MoundTool::~MoundTool(void) +MoundTool::~MoundTool() { REF_PTR_RELEASE(m_htMapEditCopy); REF_PTR_RELEASE(m_htMapSaveCopy); @@ -240,7 +240,7 @@ void MoundTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorld ** DigTool ***************************************************************************/ /// Constructor -DigTool::DigTool(void) +DigTool::DigTool() { m_toolID = ID_BRUSH_SUBTRACT_TOOL; m_raising = false; // digging. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp index 8633cf1e09b..7847a4e6e10 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/MyToolbar.cpp @@ -53,12 +53,12 @@ void CellSizeToolBar::CellSizeChanged(Int cellSize) } } -CellSizeToolBar::~CellSizeToolBar(void) +CellSizeToolBar::~CellSizeToolBar() { m_staticThis = nullptr; } -void CellSizeToolBar::SetupSlider(void) +void CellSizeToolBar::SetupSlider() { CWnd *pWnd = GetDlgItem(ID_SLIDER); CRect rect; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp index dcc8db44aa0..40240af3a56 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp @@ -62,7 +62,7 @@ ObjectOptions::ObjectOptions(CWnd* pParent /*=nullptr*/) } -ObjectOptions::~ObjectOptions(void) +ObjectOptions::~ObjectOptions() { deleteInstance(m_objectsList); m_objectsList = nullptr; @@ -613,7 +613,7 @@ BOOL ObjectOptions::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) } -MapObject *ObjectOptions::getCurMapObject(void) +MapObject *ObjectOptions::getCurMapObject() { if (m_staticThis && m_currentObjectIndex >= 0) { MapObject *pObj = m_staticThis->m_objectsList; @@ -629,7 +629,7 @@ MapObject *ObjectOptions::getCurMapObject(void) return(nullptr); } -AsciiString ObjectOptions::getCurGdfName(void) +AsciiString ObjectOptions::getCurGdfName() { MapObject *pCur = getCurMapObject(); if (pCur) { @@ -711,7 +711,7 @@ MapObject *ObjectOptions::duplicateCurMapObjectForPlace(const Coord3D* loc, Real return(nullptr); } -Real ObjectOptions::getCurObjectHeight(void) +Real ObjectOptions::getCurObjectHeight() { if (m_staticThis) { CWnd *pWnd = m_staticThis->GetDlgItem(IDC_OBJECT_HEIGHT_EDIT); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp index c8ba5bbfab3..a95f4af1388 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectTool.cpp @@ -38,13 +38,13 @@ // enum {HYSTERESIS = 3}; /// Constructor -ObjectTool::ObjectTool(void) : +ObjectTool::ObjectTool() : Tool(ID_PLACE_OBJECT_TOOL, IDC_PLACE_OBJECT) { } /// Destructor -ObjectTool::~ObjectTool(void) +ObjectTool::~ObjectTool() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp index 99268d1550f..10413a61100 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/PickUnitDialog.cpp @@ -140,7 +140,7 @@ void PickUnitDialog::SetAllowableType(EditorSortingType sort) m_allowable[sort] = true; } -void PickUnitDialog::SetupAsPanel(void) +void PickUnitDialog::SetupAsPanel() { CWnd *pWnd = GetDlgItem(IDCANCEL); if (pWnd) { @@ -381,7 +381,7 @@ void PickUnitDialog::addObject( MapObject *mapObject, const char *pPath, Int ind } -AsciiString PickUnitDialog::getPickedUnit(void) +AsciiString PickUnitDialog::getPickedUnit() { if (m_currentObjectIndex >= 0) { AsciiString retval(m_currentObjectName); @@ -390,7 +390,7 @@ AsciiString PickUnitDialog::getPickedUnit(void) return AsciiString::TheEmptyString; } -const ThingTemplate* PickUnitDialog::getPickedThing(void) +const ThingTemplate* PickUnitDialog::getPickedThing() { if (m_currentObjectIndex >= 0) { const ThingTemplate *tTemplate; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp index 42df76f43eb..9e80a811c99 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/PointerTool.cpp @@ -87,7 +87,7 @@ static void helper_pickAllWaypointsInPath( Int sourceID, CWorldBuilderDoc *pDoc, // /// Constructor -PointerTool::PointerTool(void) : +PointerTool::PointerTool() : m_modifyUndoable(nullptr), m_curObject(nullptr), m_rotateCursor(nullptr), @@ -99,7 +99,7 @@ PointerTool::PointerTool(void) : } /// Destructor -PointerTool::~PointerTool(void) +PointerTool::~PointerTool() { REF_PTR_RELEASE(m_modifyUndoable); // belongs to pDoc now. if (m_rotateCursor) { @@ -111,7 +111,7 @@ PointerTool::~PointerTool(void) } /// See if a single obj is selected that has properties. -void PointerTool::checkForPropertiesPanel(void) +void PointerTool::checkForPropertiesPanel() { MapObject *theMapObj = WaypointOptions::getSingleSelectedWaypoint(); PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); @@ -144,7 +144,7 @@ void PointerTool::checkForPropertiesPanel(void) } /// Clear the selection.. -void PointerTool::clearSelection(void) ///< Clears the selected objects selected flags. +void PointerTool::clearSelection() ///< Clears the selected objects selected flags. { // Clear selection. MapObject *pObj = MapObject::getFirstMapObject(); @@ -188,7 +188,7 @@ void PointerTool::deactivate() } /** Set the cursor. */ -void PointerTool::setCursor(void) +void PointerTool::setCursor() { if (m_mouseUpRotate) { if (m_rotateCursor == nullptr) { diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp index b579c587f23..f4882ce322b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/PolygonTool.cpp @@ -47,7 +47,7 @@ Int PolygonTool::m_poly_dragPointNdx = -1; enum {SNAP_DISTANCE = 5}; /// Constructor -PolygonTool::PolygonTool(void) : +PolygonTool::PolygonTool() : Tool(ID_POLYGON_TOOL, IDC_POLYGON), m_poly_plusCursor(nullptr), m_poly_moveCursor(nullptr) @@ -57,7 +57,7 @@ PolygonTool::PolygonTool(void) : /// Destructor -PolygonTool::~PolygonTool(void) +PolygonTool::~PolygonTool() { if (m_poly_plusCursor) { ::DestroyCursor(m_poly_plusCursor); @@ -353,7 +353,7 @@ void PolygonTool::startMouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, } /// Delete the selected polygon or point. -Bool PolygonTool::deleteSelectedPolygon(void) +Bool PolygonTool::deleteSelectedPolygon() { if (m_poly_curSelectedPolygon) { Bool found = false; @@ -391,7 +391,7 @@ Bool PolygonTool::deleteSelectedPolygon(void) } /** Set the cursor. */ -void PolygonTool::setCursor(void) +void PolygonTool::setCursor() { if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) { if (m_poly_plusCursor == nullptr) { diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp index e1f741ec245..4e2cf875af8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RampTool.cpp @@ -69,7 +69,7 @@ void RampTool::deactivate() mIsMouseDown = false; } -Bool RampTool::followsTerrain(void) +Bool RampTool::followsTerrain() { return true; } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp index f3c0d23d12f..3e52ecb5864 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp @@ -57,7 +57,7 @@ RoadOptions::RoadOptions(CWnd* pParent /*=nullptr*/) } -RoadOptions::~RoadOptions(void) +RoadOptions::~RoadOptions() { m_currentRoadName.clear(); } @@ -86,7 +86,7 @@ END_MESSAGE_MAP() // RoadOptions data access method. -void RoadOptions::updateLabel(void) +void RoadOptions::updateLabel() { const char *tName = getCurRoadName().str(); @@ -97,7 +97,7 @@ void RoadOptions::updateLabel(void) } /** Returns true if only one or more roads is selected. */ -Bool RoadOptions::selectionIsRoadsOnly(void) +Bool RoadOptions::selectionIsRoadsOnly() { // MapObject *theMapObj = nullptr; Bool foundRoad = false; @@ -116,7 +116,7 @@ Bool RoadOptions::selectionIsRoadsOnly(void) } /** Returns true if only one or more roads is selected. */ -void RoadOptions::updateSelection(void) +void RoadOptions::updateSelection() { // MapObject *theMapObj = nullptr; Int angled = 0; @@ -189,7 +189,7 @@ void RoadOptions::updateSelection(void) } /** Applies road corner flags and road type to selection. */ -void RoadOptions::applyToSelection(void) +void RoadOptions::applyToSelection() { Int flagMask = FLAG_ROAD_CORNER_ANGLED | FLAG_ROAD_CORNER_TIGHT; Int flagVal = 0; @@ -438,7 +438,7 @@ Bool RoadOptions::setRoadTreeViewSelection(HTREEITEM parent, Int selection) return(false); } -void RoadOptions::SelectConnected(void) +void RoadOptions::SelectConnected() { std::list roadSegs; std::list connectedSegs; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp index b9b083b54a4..39ea5558efd 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadTool.cpp @@ -40,14 +40,14 @@ // RoadTool class. // /// Constructor -RoadTool::RoadTool(void) : +RoadTool::RoadTool() : Tool(ID_ROAD_TOOL, IDC_ROAD) { m_mapObj = nullptr; } /// Destructor -RoadTool::~RoadTool(void) +RoadTool::~RoadTool() { m_mapObj = nullptr; } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp index 8b1fddc82ad..34c7255c1b8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/RulerTool.cpp @@ -35,7 +35,7 @@ RulerTool* RulerTool::m_staticThis = nullptr; /// Constructor -RulerTool::RulerTool(void) : +RulerTool::RulerTool() : Tool(ID_RULER_TOOL, IDC_POINTER) { m_downPt3d.set(0.0f, 0.0f, 0.0f); @@ -45,7 +45,7 @@ Tool(ID_RULER_TOOL, IDC_POINTER) } /// Destructor -RulerTool::~RulerTool(void) +RulerTool::~RulerTool() { } @@ -72,7 +72,7 @@ void RulerTool::deactivate() } /** Set the cursor. */ -void RulerTool::setCursor(void) +void RulerTool::setCursor() { Tool::setCursor(); } @@ -177,7 +177,7 @@ int RulerTool::getType() return (m_staticThis->m_rulerType); } -Real RulerTool::getLength(void) +Real RulerTool::getLength() { if (m_staticThis) { return m_staticThis->m_savedLength; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp index a1eb231b753..32b7ddd5f97 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchOptions.cpp @@ -61,7 +61,7 @@ BEGIN_MESSAGE_MAP(ScorchOptions, CDialog) //}}AFX_MSG_MAP END_MESSAGE_MAP() -MapObject *ScorchOptions::getSingleSelectedScorch(void) +MapObject *ScorchOptions::getSingleSelectedScorch() { MapObject *theMapObj = nullptr; // Bool found = false; @@ -82,7 +82,7 @@ MapObject *ScorchOptions::getSingleSelectedScorch(void) return(nullptr); } -void ScorchOptions::updateTheUI(void) +void ScorchOptions::updateTheUI() { m_updating = true; MapObject *theMapObj = getSingleSelectedScorch(); @@ -102,7 +102,7 @@ void ScorchOptions::updateTheUI(void) m_updating = false; } -void ScorchOptions::update(void) +void ScorchOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); @@ -216,7 +216,7 @@ void ScorchOptions::PopSliderFinished(const long sliderID, long theVal) } -void ScorchOptions::changeScorch(void) +void ScorchOptions::changeScorch() { getAllSelectedDicts(); @@ -231,7 +231,7 @@ void ScorchOptions::changeScorch(void) pView->Invalidate(); } -void ScorchOptions::changeSize(void) +void ScorchOptions::changeSize() { getAllSelectedDicts(); @@ -246,7 +246,7 @@ void ScorchOptions::changeSize(void) pView->Invalidate(); } -void ScorchOptions::getAllSelectedDicts(void) +void ScorchOptions::getAllSelectedDicts() { m_allSelectedDicts.clear(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp index 4b258bf395e..f2868efdb7a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScorchTool.cpp @@ -38,13 +38,13 @@ // /// Constructor -ScorchTool::ScorchTool(void) : +ScorchTool::ScorchTool() : Tool(ID_SCORCH_TOOL, IDC_SCORCH) { } /// Destructor -ScorchTool::~ScorchTool(void) +ScorchTool::~ScorchTool() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp index 08eb9e4f2ec..d91367f6180 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp @@ -80,7 +80,7 @@ BOOL ScriptActionsFalse::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -void ScriptActionsFalse::loadList(void) +void ScriptActionsFalse::loadList() { m_falseAction = nullptr; ScriptDialog::updateScriptWarning(m_script); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp index 8ec67c302a9..b71cdebebeb 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp @@ -80,7 +80,7 @@ BOOL ScriptActionsTrue::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -void ScriptActionsTrue::loadList(void) +void ScriptActionsTrue::loadList() { m_action = nullptr; ScriptDialog::updateScriptWarning(m_script); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp index 267913356b8..e7bb1d89337 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp @@ -84,7 +84,7 @@ BOOL ScriptConditionsDlg::OnInitDialog() // EXCEPTION: OCX Property Pages should return FALSE } -void ScriptConditionsDlg::loadList(void) +void ScriptConditionsDlg::loadList() { Int count = 0; ScriptDialog::updateScriptWarning(m_script); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp index 808baaeccdd..5cff3c30888 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp @@ -247,17 +247,17 @@ void ScriptDialog::OnSelchangedScriptTree(NMHDR* pNMHDR, LRESULT* pResult) /* The purpose of these two functions is to allow the inner class CSDTreeCtrl the ability to check what Script and ScriptGroup belong to the cursor location */ -Script *ScriptDialog::friend_getCurScript(void) +Script *ScriptDialog::friend_getCurScript() { return getCurScript(); } -ScriptGroup *ScriptDialog::friend_getCurGroup(void) +ScriptGroup *ScriptDialog::friend_getCurGroup() { return getCurGroup(); } -Script *ScriptDialog::getCurScript(void) +Script *ScriptDialog::getCurScript() { if (m_curSelection.m_objType == ListType::SCRIPT_IN_PLAYER_TYPE || m_curSelection.m_objType == ListType::SCRIPT_IN_GROUP_TYPE) { ScriptList *pSL = m_sides.getSideInfo(m_curSelection.m_playerIndex)->getScriptList(); @@ -286,7 +286,7 @@ Script *ScriptDialog::getCurScript(void) return nullptr; } -ScriptGroup *ScriptDialog::getCurGroup(void) +ScriptGroup *ScriptDialog::getCurGroup() { ScriptList *pSL = m_sides.getSideInfo(m_curSelection.m_playerIndex)->getScriptList(); if (m_curSelection.m_objType == ListType::PLAYER_TYPE) { @@ -474,7 +474,7 @@ void ScriptDialog::patchScriptParametersForGC(Script *pScript) } /*Checks all script parameters for obsolete values (example: mission disk using GC_ templates)*/ -void ScriptDialog::checkParametersForGC(void) +void ScriptDialog::checkParametersForGC() { SidesList *sidesListP = TheSidesList; Int i; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp index bcd9904259e..e7bee45388a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/ShadowOptions.cpp @@ -61,7 +61,7 @@ END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // ShadowOptions message handlers -void ShadowOptions::setShadowColor(void) +void ShadowOptions::setShadowColor() { Int r, g, b, shift; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp index 0a0a98420dd..fb03c2a5e98 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamObjectProperties.cpp @@ -93,7 +93,7 @@ void TeamObjectProperties::OnOK() _PropertiesToDict(); } -void TeamObjectProperties::updateTheUI(void) +void TeamObjectProperties::updateTheUI() { _DictToHealth(); _DictToHPs(); @@ -112,7 +112,7 @@ void TeamObjectProperties::updateTheUI(void) _DictToStoppingDistance(); } -void TeamObjectProperties::_DictToHealth(void) +void TeamObjectProperties::_DictToHealth() { Int value = 100; Bool exists; @@ -153,7 +153,7 @@ void TeamObjectProperties::_DictToHealth(void) } } -void TeamObjectProperties::_DictToHPs(void) +void TeamObjectProperties::_DictToHPs() { Int value = -1; Bool exists; @@ -178,7 +178,7 @@ void TeamObjectProperties::_DictToHPs(void) } } -void TeamObjectProperties::_DictToEnabled(void) +void TeamObjectProperties::_DictToEnabled() { Bool enabled = true; Bool exists; @@ -192,7 +192,7 @@ void TeamObjectProperties::_DictToEnabled(void) } } -void TeamObjectProperties::_DictToDestructible(void) +void TeamObjectProperties::_DictToDestructible() { Bool destructible = true; Bool exists; @@ -206,7 +206,7 @@ void TeamObjectProperties::_DictToDestructible(void) } } -void TeamObjectProperties::_DictToUnsellable(void) +void TeamObjectProperties::_DictToUnsellable() { Bool unsellable = false; Bool exists; @@ -220,7 +220,7 @@ void TeamObjectProperties::_DictToUnsellable(void) } } -void TeamObjectProperties::_DictToPowered(void) +void TeamObjectProperties::_DictToPowered() { Bool powered = true; Bool exists; @@ -235,7 +235,7 @@ void TeamObjectProperties::_DictToPowered(void) } -void TeamObjectProperties::_DictToAggressiveness(void) +void TeamObjectProperties::_DictToAggressiveness() { Int value = 0; Bool exists; @@ -259,7 +259,7 @@ void TeamObjectProperties::_DictToAggressiveness(void) } } -void TeamObjectProperties::_DictToVisibilityRange(void) +void TeamObjectProperties::_DictToVisibilityRange() { Int distance = 0; Bool exists; @@ -279,7 +279,7 @@ void TeamObjectProperties::_DictToVisibilityRange(void) } } -void TeamObjectProperties::_DictToVeterancy(void) +void TeamObjectProperties::_DictToVeterancy() { Int value = 0; Bool exists; @@ -293,7 +293,7 @@ void TeamObjectProperties::_DictToVeterancy(void) } } -void TeamObjectProperties::_DictToWeather(void) +void TeamObjectProperties::_DictToWeather() { Int value = 0; Bool exists; @@ -307,7 +307,7 @@ void TeamObjectProperties::_DictToWeather(void) pItem->SetCurSel(value); } -void TeamObjectProperties::_DictToTime(void) +void TeamObjectProperties::_DictToTime() { Int value = 0; Bool exists; @@ -321,7 +321,7 @@ void TeamObjectProperties::_DictToTime(void) pItem->SetCurSel(value); } -void TeamObjectProperties::_DictToShroudClearingDistance(void) +void TeamObjectProperties::_DictToShroudClearingDistance() { Int distance = 0; Bool exists; @@ -341,7 +341,7 @@ void TeamObjectProperties::_DictToShroudClearingDistance(void) } } -void TeamObjectProperties::_DictToRecruitableAI(void) +void TeamObjectProperties::_DictToRecruitableAI() { Bool recruitableAI = true; Bool exists; @@ -355,7 +355,7 @@ void TeamObjectProperties::_DictToRecruitableAI(void) } } -void TeamObjectProperties::_DictToSelectable(void) +void TeamObjectProperties::_DictToSelectable() { Bool selectable = true; Bool exists; @@ -369,7 +369,7 @@ void TeamObjectProperties::_DictToSelectable(void) } } -void TeamObjectProperties::_DictToStoppingDistance(void) +void TeamObjectProperties::_DictToStoppingDistance() { Real stoppingDistance = 1.0f; Bool exists = false; @@ -389,7 +389,7 @@ void TeamObjectProperties::_DictToStoppingDistance(void) } } -void TeamObjectProperties::_HealthToDict(void) +void TeamObjectProperties::_HealthToDict() { Int value; static char buf[1024]; @@ -420,7 +420,7 @@ void TeamObjectProperties::_HealthToDict(void) m_dictToEdit->setInt(TheKey_teamObjectInitialHealth, value); } -void TeamObjectProperties::_EnabledToDict(void) +void TeamObjectProperties::_EnabledToDict() { CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_Enabled); Bool isChecked = (owner->GetCheck() != 0); @@ -429,7 +429,7 @@ void TeamObjectProperties::_EnabledToDict(void) } -void TeamObjectProperties::_IndestructibleToDict(void) +void TeamObjectProperties::_IndestructibleToDict() { CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_Indestructible); Bool isChecked = (owner->GetCheck() != 0); @@ -437,7 +437,7 @@ void TeamObjectProperties::_IndestructibleToDict(void) m_dictToEdit->setBool(TheKey_teamObjectIndestructible, isChecked); } -void TeamObjectProperties::_UnsellableToDict(void) +void TeamObjectProperties::_UnsellableToDict() { CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_Unsellable); Bool isChecked = (owner->GetCheck() != 0); @@ -445,7 +445,7 @@ void TeamObjectProperties::_UnsellableToDict(void) m_dictToEdit->setBool(TheKey_teamObjectUnsellable, isChecked); } -void TeamObjectProperties::_PoweredToDict(void) +void TeamObjectProperties::_PoweredToDict() { CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_Powered); Bool isChecked = (owner->GetCheck() != 0); @@ -453,7 +453,7 @@ void TeamObjectProperties::_PoweredToDict(void) m_dictToEdit->setBool(TheKey_teamObjectPowered, isChecked); } -void TeamObjectProperties::_AggressivenessToDict(void) +void TeamObjectProperties::_AggressivenessToDict() { CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Aggressiveness); static char buf[1024]; @@ -475,7 +475,7 @@ void TeamObjectProperties::_AggressivenessToDict(void) m_dictToEdit->setInt(TheKey_teamObjectAggressiveness, value); } -void TeamObjectProperties::_VisibilityToDict(void) +void TeamObjectProperties::_VisibilityToDict() { int value = -1; CWnd* edit = GetDlgItem(IDC_MAPOBJECT_VisionDistance); @@ -491,7 +491,7 @@ void TeamObjectProperties::_VisibilityToDict(void) } } -void TeamObjectProperties::_VeterancyToDict(void) +void TeamObjectProperties::_VeterancyToDict() { CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Veterancy); static char buf[1024]; @@ -504,7 +504,7 @@ void TeamObjectProperties::_VeterancyToDict(void) m_dictToEdit->setInt(TheKey_teamObjectVeterancy, value); } -void TeamObjectProperties::_WeatherToDict(void) +void TeamObjectProperties::_WeatherToDict() { CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Weather); static char buf[1024]; @@ -513,7 +513,7 @@ void TeamObjectProperties::_WeatherToDict(void) m_dictToEdit->setInt(TheKey_teamObjectWeather, curSel); } -void TeamObjectProperties::_TimeToDict(void) +void TeamObjectProperties::_TimeToDict() { CComboBox *owner = (CComboBox*)GetDlgItem(IDC_MAPOBJECT_Time); static char buf[1024]; @@ -522,7 +522,7 @@ void TeamObjectProperties::_TimeToDict(void) m_dictToEdit->setInt(TheKey_teamObjectTime, curSel); } -void TeamObjectProperties::_ShroudClearingDistanceToDict(void) +void TeamObjectProperties::_ShroudClearingDistanceToDict() { int value = -1; CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ShroudClearingDistance); @@ -538,7 +538,7 @@ void TeamObjectProperties::_ShroudClearingDistanceToDict(void) } } -void TeamObjectProperties::_RecruitableAIToDict(void) +void TeamObjectProperties::_RecruitableAIToDict() { CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_RecruitableAI); Bool isChecked = (owner->GetCheck() != 0); @@ -546,7 +546,7 @@ void TeamObjectProperties::_RecruitableAIToDict(void) m_dictToEdit->setBool(TheKey_teamObjectRecruitableAI, isChecked); } -void TeamObjectProperties::_SelectableToDict(void) +void TeamObjectProperties::_SelectableToDict() { CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_Selectable); Bool isChecked = (owner->GetCheck() != 0); @@ -568,7 +568,7 @@ void TeamObjectProperties::_HPsToDict() m_dictToEdit->setInt(TheKey_teamObjectMaxHPs, value); } -void TeamObjectProperties::_StoppingDistanceToDict(void) +void TeamObjectProperties::_StoppingDistanceToDict() { Real value; static char buf[1024]; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp index 3ba4c7d028e..92e828d7138 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainMaterial.cpp @@ -134,7 +134,7 @@ void TerrainMaterial::setToolOptions(Bool singleCell) } } -void TerrainMaterial::updateLabel(void) +void TerrainMaterial::updateLabel() { CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); if (!pDoc) return; @@ -160,7 +160,7 @@ void TerrainMaterial::updateLabel(void) } } -void TerrainMaterial::updateTextureSelection(void) +void TerrainMaterial::updateTextureSelection() { if (m_staticThis) { m_staticThis->setTerrainTreeViewSelection(TVI_ROOT, m_staticThis->m_currentFgTexture); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp index e27851b0b95..031155d7a4a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TerrainModal.cpp @@ -54,7 +54,7 @@ void TerrainModal::DoDataExchange(CDataExchange* pDX) } -void TerrainModal::updateLabel(void) +void TerrainModal::updateLabel() { CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); if (!pDoc) return; @@ -221,7 +221,7 @@ void TerrainModal::addTerrain(char *pPath, Int terrainNdx, HTREEITEM parent) } //* Create the tree view of textures from the textures in pMap. */ -void TerrainModal::updateTextures(void) +void TerrainModal::updateTextures() { m_terrainTreeView.DeleteAllItems(); Int i; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp index 8ccf0173287..aa2688ecb2a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TileTool.cpp @@ -37,14 +37,14 @@ /// Constructor -TileTool::TileTool(void) : +TileTool::TileTool() : Tool(ID_TILE_TOOL, IDC_TILE_CURSOR) { m_htMapEditCopy = nullptr; } /// Destructor -TileTool::~TileTool(void) +TileTool::~TileTool() { REF_PTR_RELEASE(m_htMapEditCopy); } @@ -182,7 +182,7 @@ void TileTool::mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB Int BigTileTool::m_currentWidth = 0; /// Constructor -BigTileTool::BigTileTool(void) +BigTileTool::BigTileTool() { m_toolID = ID_BIG_TILE_TOOL; } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp index d0d75ccfd2f..c179749f17f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/Tool.cpp @@ -41,7 +41,7 @@ Tool::Tool(Int toolID, Int cursorID) /// Destructor -Tool::~Tool(void) +Tool::~Tool() { if (m_cursor) { ::DestroyCursor(m_cursor); @@ -57,7 +57,7 @@ void Tool::activate() } -void Tool::setCursor(void) +void Tool::setCursor() { if (m_cursor == nullptr) { m_cursor = AfxGetApp()->LoadCursor(MAKEINTRESOURCE(m_cursorID)); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp index ce5ddac5561..ca8b83c307c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WBHeightMap.cpp @@ -84,7 +84,7 @@ void WBHeightMap::setFlattenHeights(Bool flat) //============================================================================= /** Flattens the terrain for the top down view.. */ //============================================================================= -void WBHeightMap::flattenHeights(void) { +void WBHeightMap::flattenHeights() { #ifndef USE_FLAT_HEIGHT_MAP Real theZ = THE_Z; Int i, j; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp index 63bbb234491..697d3ed2036 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp @@ -48,11 +48,11 @@ int WorldHeightMapEdit::m_numGlobalTextureClasses=0; TGlobalTextureClass WorldHeightMapEdit::m_globalTextureClasses[NUM_TEXTURE_CLASSES]; /** Destructor -. */ -WorldHeightMapEdit::~WorldHeightMapEdit(void) +WorldHeightMapEdit::~WorldHeightMapEdit() { } -void WorldHeightMapEdit::shutdown(void) +void WorldHeightMapEdit::shutdown() { Int i, j; for (i=0; im_data == nullptr) { @@ -1565,7 +1565,7 @@ Bool WorldHeightMapEdit::floodFill(Int xIndex, Int yIndex, Int textureClass, Boo resetResources releases textures so things like device reset can be done. */ -void WorldHeightMapEdit::resetResources(void) +void WorldHeightMapEdit::resetResources() { REF_PTR_RELEASE(m_terrainTex); REF_PTR_RELEASE(m_alphaEdgeTex); @@ -1575,7 +1575,7 @@ void WorldHeightMapEdit::resetResources(void) reloadTextures reloads textures from files. */ -void WorldHeightMapEdit::reloadTextures(void) +void WorldHeightMapEdit::reloadTextures() { Int i; for (i=0; igetNext(); @@ -1991,7 +1991,7 @@ void WorldHeightMapEdit::removeFirstObject(void) //============================================================================= /** Selects any duplicate objects. */ //============================================================================= -Bool WorldHeightMapEdit::selectDuplicates(void) +Bool WorldHeightMapEdit::selectDuplicates() { const float DELTA = 0.05f; MapObject *firstObj = MapObject::TheMapObjectListPtr; @@ -2060,7 +2060,7 @@ Bool WorldHeightMapEdit::selectDuplicates(void) //============================================================================= /** Selects any similar objects. */ //============================================================================= -Bool WorldHeightMapEdit::selectSimilar(void) +Bool WorldHeightMapEdit::selectSimilar() { // const float DELTA = 0.05f; MapObject *firstObj = MapObject::TheMapObjectListPtr; @@ -2105,7 +2105,7 @@ Bool WorldHeightMapEdit::selectSimilar(void) //============================================================================= /** Selects any objects with invalid teams. */ //============================================================================= -Bool WorldHeightMapEdit::selectInvalidTeam(void) +Bool WorldHeightMapEdit::selectInvalidTeam() { Int i; AsciiString name; @@ -2540,7 +2540,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex) removeCliffMapping Removes all cliff adjustments. */ -Bool WorldHeightMapEdit::removeCliffMapping(void) +Bool WorldHeightMapEdit::removeCliffMapping() { Int ndx; @@ -3313,7 +3313,7 @@ Int WorldHeightMapEdit::addCliffInfo(TCliffInfo *pCliffInfo) } -Int WorldHeightMapEdit::getNumBoundaries(void) const +Int WorldHeightMapEdit::getNumBoundaries() const { return m_boundaries.size(); } @@ -3348,7 +3348,7 @@ void WorldHeightMapEdit::changeBoundary(Int ndx, ICoord2D *border) m_boundaries[ndx] = (*border); } -void WorldHeightMapEdit::removeLastBoundary(void) +void WorldHeightMapEdit::removeLastBoundary() { if (m_boundaries.empty()) { DEBUG_CRASH(("Invalid border remove request. jkmcd")); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp index f197ac0d9e2..a4c0b4f99fc 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterOptions.cpp @@ -70,7 +70,7 @@ void WaterOptions::setHeight(Int height) } } -void WaterOptions::updateTheUI(void) +void WaterOptions::updateTheUI() { PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); @@ -98,7 +98,7 @@ void WaterOptions::updateTheUI(void) } } -void WaterOptions::update(void) +void WaterOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); @@ -405,7 +405,7 @@ void WaterOptions::PopSliderFinished(const long sliderID, long theVal) } -void WaterOptions::startUpdateHeight(void) +void WaterOptions::startUpdateHeight() { PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); if (!theTrigger) { @@ -432,7 +432,7 @@ void WaterOptions::startUpdateHeight(void) } -void WaterOptions::updateHeight(void) +void WaterOptions::updateHeight() { PolygonTrigger *theTrigger = WaypointOptions::getSingleSelectedPolygon(); if (!theTrigger || !m_moveUndoable) { @@ -457,7 +457,7 @@ void WaterOptions::updateHeight(void) pView->Invalidate(); } -void WaterOptions::endUpdateHeight(void) +void WaterOptions::endUpdateHeight() { REF_PTR_RELEASE(m_moveUndoable); // belongs to pDoc now. } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp index f1c22892fee..aa52fa42821 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaterTool.cpp @@ -41,7 +41,7 @@ Bool WaterTool::m_water_isActive = false; /// Constructor -WaterTool::WaterTool(void) +WaterTool::WaterTool() { m_toolID = ID_WATER_TOOL; m_cursorID = IDC_WATER; @@ -53,7 +53,7 @@ WaterTool::WaterTool(void) /// Destructor -WaterTool::~WaterTool(void) +WaterTool::~WaterTool() { if (m_poly_plusCursor) { ::DestroyCursor(m_poly_plusCursor); @@ -121,7 +121,7 @@ void WaterTool::mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldB /** Set the cursor. */ -void WaterTool::setCursor(void) +void WaterTool::setCursor() { if (m_poly_mouseUpPlus || (m_poly_isAdding && m_poly_curSelectedPolygon)) { if (m_poly_plusCursor == nullptr) { diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp index dd9b0224378..9d6e68800b1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointOptions.cpp @@ -56,7 +56,7 @@ void WaypointOptions::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } -MapObject *WaypointOptions::getSingleSelectedWaypoint(void) +MapObject *WaypointOptions::getSingleSelectedWaypoint() { MapObject *theMapObj = nullptr; // Bool found = false; @@ -77,7 +77,7 @@ MapObject *WaypointOptions::getSingleSelectedWaypoint(void) return(nullptr); } -PolygonTrigger *WaypointOptions::getSingleSelectedPolygon(void) +PolygonTrigger *WaypointOptions::getSingleSelectedPolygon() { CWorldBuilderDoc *pDoc = CWorldBuilderDoc::GetActiveDoc(); if (pDoc==nullptr) return nullptr; @@ -96,7 +96,7 @@ PolygonTrigger *WaypointOptions::getSingleSelectedPolygon(void) return(nullptr); } -void WaypointOptions::updateTheUI(void) +void WaypointOptions::updateTheUI() { Tool *curTool = ((CWorldBuilderApp*)AfxGetApp())->getCurTool(); @@ -273,7 +273,7 @@ void WaypointOptions::updateTheUI(void) } } -void WaypointOptions::update(void) +void WaypointOptions::update() { if (m_staticThis) { m_staticThis->updateTheUI(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp index fa6b63185ea..7a469ef50c4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WaypointTool.cpp @@ -42,13 +42,13 @@ Bool WaypointTool::m_isActive = false; /// Constructor -WaypointTool::WaypointTool(void) : +WaypointTool::WaypointTool() : Tool(ID_WAYPOINT_TOOL, IDC_WAYPOINT) { } /// Destructor -WaypointTool::~WaypointTool(void) +WaypointTool::~WaypointTool() { } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp index 56581c15dc2..7efd924e2b1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp @@ -514,7 +514,7 @@ BOOL CWorldBuilderApp::OnCmdMsg(UINT nID, int nCode, void* pExtra, //============================================================================= /** Sets the active tool to the pointer, and clears the selection. */ //============================================================================= -void CWorldBuilderApp::selectPointerTool(void) +void CWorldBuilderApp::selectPointerTool() { setActiveTool(&m_pointerTool); // Clear selection. diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp index 478d075c511..185b81dd1b2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp @@ -195,7 +195,7 @@ class CachedMFCFileOutputStream : public OutputStream m_totalBytes += numBytes; return(numBytes); }; - virtual void flush(void) { + virtual void flush() { while (!m_cachedChunks.empty())//!m_cachedChunks.empty()) { CachedChunk c = m_cachedChunks.front(); @@ -229,7 +229,7 @@ class CompressedCachedMFCFileOutputStream : public OutputStream m_totalBytes += numBytes; return(numBytes); }; - virtual void flush(void) { + virtual void flush() { if (!m_totalBytes) return; UnsignedByte *srcBuffer = NEW UnsignedByte[m_totalBytes]; @@ -483,7 +483,7 @@ AsciiString ConvertFaction(AsciiString name) return AsciiString::TheEmptyString; } -void CWorldBuilderDoc::validate(void) +void CWorldBuilderDoc::validate() { DEBUG_LOG(("Validating")); @@ -849,7 +849,7 @@ Bool CWorldBuilderDoc::ParseWaypointData(DataChunkInput &file, DataChunkInfo *in return true; } -void CWorldBuilderDoc::autoSave(void) +void CWorldBuilderDoc::autoSave() { // srj sez: put autosave into our user data folder, not the ap dir AsciiString autosave1 = TheGlobalData->getPath_UserData(); @@ -1006,7 +1006,7 @@ void CWorldBuilderDoc::OnEditUndo() } } -void CWorldBuilderDoc::OnTogglePitchAndRotation( void ) +void CWorldBuilderDoc::OnTogglePitchAndRotation() { WbView3d * p3View = Get3DView(); if (p3View) @@ -1641,7 +1641,7 @@ void CWorldBuilderDoc::OnUpdateWindow2dwindow(CCmdUI* pCmdUI) /** Renumbers the waypoints and the links that reference them, removing any unused ids. */ //============================================================================= -void CWorldBuilderDoc::compressWaypointIds(void) +void CWorldBuilderDoc::compressWaypointIds() { updateWaypointTable(); m_curWaypointID = 0; @@ -1695,7 +1695,7 @@ void CWorldBuilderDoc::compressWaypointIds(void) table. The waypoint table is used to locate waypoints by id, without searching the objects list. (See getWaypointByID()) */ //============================================================================= -void CWorldBuilderDoc::updateWaypointTable(void) +void CWorldBuilderDoc::updateWaypointTable() { if (m_waypointTableNeedsUpdate) { m_waypointTableNeedsUpdate=false; @@ -2146,7 +2146,7 @@ static void fprintUnit(FILE *theLogFile, Dict *teamDict, NameKeyType keyMinUnit, } -void CWorldBuilderDoc::OnDumpDocToText(void) +void CWorldBuilderDoc::OnDumpDocToText() { MapObject *pMapObj = nullptr; const char* vetStrings[] = {"Green", "Regular", "Veteran", "Elite"}; @@ -2627,7 +2627,7 @@ void CWorldBuilderDoc::OnRemoveclifftexmapping() } } -Int CWorldBuilderDoc::getNumBoundaries(void) const +Int CWorldBuilderDoc::getNumBoundaries() const { return m_heightMap->getNumBoundaries(); } @@ -2647,7 +2647,7 @@ void CWorldBuilderDoc::changeBoundary(Int ndx, ICoord2D *border) m_heightMap->changeBoundary(ndx, border); } -void CWorldBuilderDoc::removeLastBoundary(void) +void CWorldBuilderDoc::removeLastBoundary() { m_heightMap->removeLastBoundary(); } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp index a9cc0dfd1ba..8b2eb251fe1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp @@ -190,7 +190,7 @@ int MapObjectProps::getSel() } /// Move data from object to dialog controls -void MapObjectProps::_DictToTeam(void) +void MapObjectProps::_DictToTeam() { int i; @@ -219,7 +219,7 @@ void MapObjectProps::_DictToTeam(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToName(void) +void MapObjectProps::_DictToName() { AsciiString name; Bool exists; @@ -236,7 +236,7 @@ void MapObjectProps::_DictToName(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToScript(void) +void MapObjectProps::_DictToScript() { if (!m_dictToEdit) { @@ -258,7 +258,7 @@ void MapObjectProps::_DictToScript(void) } /// Move data from dialog controls to object -void MapObjectProps::_TeamToDict(void) +void MapObjectProps::_TeamToDict() { getAllSelectedDicts(); @@ -281,7 +281,7 @@ void MapObjectProps::_TeamToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_NameToDict(void) +void MapObjectProps::_NameToDict() { getAllSelectedDicts(); @@ -304,7 +304,7 @@ void MapObjectProps::_NameToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_ScriptToDict(void) +void MapObjectProps::_ScriptToDict() { getAllSelectedDicts(); @@ -326,7 +326,7 @@ void MapObjectProps::_ScriptToDict(void) /// Move data from object to dialog controls -void MapObjectProps::_DictToScale(void) +void MapObjectProps::_DictToScale() { // Currently not in the Mission Disk. #if 0 @@ -362,7 +362,7 @@ void MapObjectProps::_DictToScale(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToWeather(void) +void MapObjectProps::_DictToWeather() { Int value = 0; Bool exists; @@ -377,7 +377,7 @@ void MapObjectProps::_DictToWeather(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToTime(void) +void MapObjectProps::_DictToTime() { Int value = 0; Bool exists; @@ -392,7 +392,7 @@ void MapObjectProps::_DictToTime(void) } /// Move data from dialog controls to object -void MapObjectProps::_WeatherToDict(void) +void MapObjectProps::_WeatherToDict() { getAllSelectedDicts(); @@ -413,7 +413,7 @@ void MapObjectProps::_WeatherToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_TimeToDict(void) +void MapObjectProps::_TimeToDict() { getAllSelectedDicts(); @@ -434,7 +434,7 @@ void MapObjectProps::_TimeToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_ScaleToDict(void) +void MapObjectProps::_ScaleToDict() { // Currently not in mission disk. #if 0 @@ -480,7 +480,7 @@ void MapObjectProps::ShowZOffset(MapObject *pMapObj) } /// Move data from dialog controls to object -void MapObjectProps::SetZOffset(void) +void MapObjectProps::SetZOffset() { Real value = 0.0f; CWnd* edit = GetDlgItem(IDC_MAPOBJECT_ZOffset); @@ -523,7 +523,7 @@ void MapObjectProps::ShowPosition(MapObject *pMapObj) } /// Move data from dialog controls to object -void MapObjectProps::SetAngle(void) +void MapObjectProps::SetAngle() { Real angle = m_angle; CWnd* edit = GetDlgItem(IDC_MAPOBJECT_Angle); @@ -548,7 +548,7 @@ void MapObjectProps::SetAngle(void) } /// Move data from dialog controls to object -void MapObjectProps::SetPosition(void) +void MapObjectProps::SetPosition() { CWnd* edit = GetDlgItem(IDC_MAPOBJECT_XYPosition); CString cstr; @@ -683,7 +683,7 @@ void MapObjectProps::PopSliderFinished(const long sliderID, long theVal) } /// Move data from dialog controls to object -void MapObjectProps::_PrebuiltUpgradesToDict(void) +void MapObjectProps::_PrebuiltUpgradesToDict() { getAllSelectedDicts(); @@ -750,7 +750,7 @@ void MapObjectProps::_PrebuiltUpgradesToDict(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToPrebuiltUpgrades(void) +void MapObjectProps::_DictToPrebuiltUpgrades() { getAllSelectedDicts(); @@ -851,7 +851,7 @@ void MapObjectProps::_DictToPrebuiltUpgrades(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToHealth(void) +void MapObjectProps::_DictToHealth() { Int value = 100; Bool exists; @@ -894,7 +894,7 @@ void MapObjectProps::_DictToHealth(void) /// Move data from object to dialog controls -void MapObjectProps::_DictToHPs(void) +void MapObjectProps::_DictToHPs() { Int value = -1; Bool exists; @@ -920,7 +920,7 @@ void MapObjectProps::_DictToHPs(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToEnabled(void) +void MapObjectProps::_DictToEnabled() { Bool enabled = true; Bool exists; @@ -936,7 +936,7 @@ void MapObjectProps::_DictToEnabled(void) /// Move data from object to dialog controls -void MapObjectProps::_DictToDestructible(void) +void MapObjectProps::_DictToDestructible() { Bool destructible = true; Bool exists; @@ -951,7 +951,7 @@ void MapObjectProps::_DictToDestructible(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToUnsellable(void) +void MapObjectProps::_DictToUnsellable() { Bool unsellable = false; Bool exists; @@ -983,7 +983,7 @@ void MapObjectProps::_DictToTargetable() } /// Move data from object to dialog controls -void MapObjectProps::_DictToPowered(void) +void MapObjectProps::_DictToPowered() { Bool powered = true; Bool exists; @@ -999,7 +999,7 @@ void MapObjectProps::_DictToPowered(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToAggressiveness(void) +void MapObjectProps::_DictToAggressiveness() { Int value = 0; Bool exists; @@ -1024,7 +1024,7 @@ void MapObjectProps::_DictToAggressiveness(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToVisibilityRange(void) +void MapObjectProps::_DictToVisibilityRange() { Int distance = 0; Bool exists; @@ -1045,7 +1045,7 @@ void MapObjectProps::_DictToVisibilityRange(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToVeterancy(void) +void MapObjectProps::_DictToVeterancy() { Int value = 0; Bool exists; @@ -1060,7 +1060,7 @@ void MapObjectProps::_DictToVeterancy(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToShroudClearingDistance(void) +void MapObjectProps::_DictToShroudClearingDistance() { Int distance = 0; Bool exists; @@ -1081,7 +1081,7 @@ void MapObjectProps::_DictToShroudClearingDistance(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToRecruitableAI(void) +void MapObjectProps::_DictToRecruitableAI() { Bool recruitableAI = true; Bool exists; @@ -1096,7 +1096,7 @@ void MapObjectProps::_DictToRecruitableAI(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToSelectable(void) +void MapObjectProps::_DictToSelectable() { Int selectable = true; Bool exists=false; @@ -1114,7 +1114,7 @@ void MapObjectProps::_DictToSelectable(void) } /// Move data from object to dialog controls -void MapObjectProps::_DictToStoppingDistance(void) +void MapObjectProps::_DictToStoppingDistance() { Real stoppingDistance = 1.0f; Bool exists = false; @@ -1132,7 +1132,7 @@ void MapObjectProps::_DictToStoppingDistance(void) /// Move data from dialog controls to object -void MapObjectProps::_HealthToDict(void) +void MapObjectProps::_HealthToDict() { getAllSelectedDicts(); @@ -1175,7 +1175,7 @@ void MapObjectProps::_HealthToDict(void) /// Move data from dialog controls to object -void MapObjectProps::_EnabledToDict(void) +void MapObjectProps::_EnabledToDict() { getAllSelectedDicts(); @@ -1195,7 +1195,7 @@ void MapObjectProps::_EnabledToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_IndestructibleToDict(void) +void MapObjectProps::_IndestructibleToDict() { getAllSelectedDicts(); @@ -1215,7 +1215,7 @@ void MapObjectProps::_IndestructibleToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_UnsellableToDict(void) +void MapObjectProps::_UnsellableToDict() { getAllSelectedDicts(); @@ -1256,7 +1256,7 @@ void MapObjectProps::_TargetableToDict() /// Move data from dialog controls to object -void MapObjectProps::_PoweredToDict(void) +void MapObjectProps::_PoweredToDict() { getAllSelectedDicts(); @@ -1276,7 +1276,7 @@ void MapObjectProps::_PoweredToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_AggressivenessToDict(void) +void MapObjectProps::_AggressivenessToDict() { getAllSelectedDicts(); @@ -1310,7 +1310,7 @@ void MapObjectProps::_AggressivenessToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_VisibilityToDict(void) +void MapObjectProps::_VisibilityToDict() { getAllSelectedDicts(); @@ -1338,7 +1338,7 @@ void MapObjectProps::_VisibilityToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_VeterancyToDict(void) +void MapObjectProps::_VeterancyToDict() { getAllSelectedDicts(); @@ -1363,7 +1363,7 @@ void MapObjectProps::_VeterancyToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_ShroudClearingDistanceToDict(void) +void MapObjectProps::_ShroudClearingDistanceToDict() { getAllSelectedDicts(); @@ -1391,7 +1391,7 @@ void MapObjectProps::_ShroudClearingDistanceToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_RecruitableAIToDict(void) +void MapObjectProps::_RecruitableAIToDict() { getAllSelectedDicts(); @@ -1411,7 +1411,7 @@ void MapObjectProps::_RecruitableAIToDict(void) } /// Move data from dialog controls to object -void MapObjectProps::_SelectableToDict(void) +void MapObjectProps::_SelectableToDict() { getAllSelectedDicts(); @@ -1462,7 +1462,7 @@ void MapObjectProps::_HPsToDict() } /// Move data from dialog controls to object -void MapObjectProps::_StoppingDistanceToDict(void) +void MapObjectProps::_StoppingDistanceToDict() { getAllSelectedDicts(); @@ -1613,7 +1613,7 @@ BOOL MapObjectProps::OnInitDialog() } //--------------------------------------------------------------------------------------------------- -/*static*/ void MapObjectProps::update(void) +/*static*/ void MapObjectProps::update() { if (TheMapObjectProps) { @@ -1621,7 +1621,7 @@ BOOL MapObjectProps::OnInitDialog() } } -void MapObjectProps::updateTheUI(void) +void MapObjectProps::updateTheUI() { if (this != TheMapObjectProps) { return; @@ -1688,7 +1688,7 @@ void MapObjectProps::updateTheUI(MapObject *pMapObj) //--------------------------------------------------------------------------------------------------- -void MapObjectProps::InitSound(void) +void MapObjectProps::InitSound() { CComboBox * priorityComboBox = (CComboBox *)GetDlgItem(IDC_PRIORITY_COMBO); DEBUG_ASSERTCRASH( priorityComboBox != nullptr, ("Cannot find sound priority combobox" ) ); @@ -1780,7 +1780,7 @@ void MapObjectProps::clearCustomizeFlag( CWorldBuilderDoc* pDoc, MultipleUndoabl } /// Move data from dialog controls to object(s) -void MapObjectProps::attachedSoundToDict(void) +void MapObjectProps::attachedSoundToDict() { CComboBox * soundComboBox = (CComboBox *)GetDlgItem(IDC_SOUND_COMBO); if ( soundComboBox == nullptr ) @@ -1827,7 +1827,7 @@ void MapObjectProps::attachedSoundToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::customizeToDict(void) +void MapObjectProps::customizeToDict() { CButton * customizeCheckbox = (CButton *)GetDlgItem(IDC_CUSTOMIZE_CHECKBOX); if ( customizeCheckbox == nullptr ) @@ -1861,7 +1861,7 @@ void MapObjectProps::customizeToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::enabledToDict(void) +void MapObjectProps::enabledToDict() { CButton * enabledCheckbox = (CButton *)GetDlgItem(IDC_ENABLED_CHECKBOX); if ( enabledCheckbox == nullptr ) @@ -1884,7 +1884,7 @@ void MapObjectProps::enabledToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::loopingToDict(void) +void MapObjectProps::loopingToDict() { CButton * loopingCheckbox = (CButton *)GetDlgItem(IDC_LOOPING_CHECKBOX); if ( loopingCheckbox == nullptr ) @@ -1907,7 +1907,7 @@ void MapObjectProps::loopingToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::loopCountToDict(void) +void MapObjectProps::loopCountToDict() { CEdit * loopCountEdit = (CEdit *)GetDlgItem(IDC_LOOPCOUNT_EDIT); if ( loopCountEdit == nullptr ) @@ -1933,7 +1933,7 @@ void MapObjectProps::loopCountToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::minVolumeToDict(void) +void MapObjectProps::minVolumeToDict() { CEdit * minVolumeEdit = (CEdit *)GetDlgItem(IDC_MIN_VOLUME_EDIT); if ( minVolumeEdit == nullptr ) @@ -1960,7 +1960,7 @@ void MapObjectProps::minVolumeToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::volumeToDict(void) +void MapObjectProps::volumeToDict() { CEdit * volumeEdit = (CEdit *)GetDlgItem(IDC_VOLUME_EDIT); if ( volumeEdit == nullptr ) @@ -1988,7 +1988,7 @@ void MapObjectProps::volumeToDict(void) /// Move data from dialog controls to object(s) -void MapObjectProps::minRangeToDict(void) +void MapObjectProps::minRangeToDict() { CEdit * minRangeEdit = (CEdit *)GetDlgItem(IDC_MIN_RANGE_EDIT); if ( minRangeEdit == nullptr ) @@ -2014,7 +2014,7 @@ void MapObjectProps::minRangeToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::maxRangeToDict(void) +void MapObjectProps::maxRangeToDict() { CEdit * maxRangeEdit = (CEdit *)GetDlgItem(IDC_MAX_RANGE_EDIT); if ( maxRangeEdit == nullptr ) @@ -2040,7 +2040,7 @@ void MapObjectProps::maxRangeToDict(void) } /// Move data from dialog controls to object(s) -void MapObjectProps::priorityToDict(void) +void MapObjectProps::priorityToDict() { CComboBox * priorityComboBox = (CComboBox *)GetDlgItem(IDC_PRIORITY_COMBO); if ( priorityComboBox == nullptr ) @@ -2798,7 +2798,7 @@ void MapObjectProps::enableButtons() } -/*static*/ MapObject *MapObjectProps::getSingleSelectedMapObject(void) +/*static*/ MapObject *MapObjectProps::getSingleSelectedMapObject() { MapObject *pMapObj; MapObject *theMapObj = nullptr; @@ -2835,7 +2835,7 @@ void MapObjectProps::OnCancel() -void MapObjectProps::getAllSelectedDicts(void) +void MapObjectProps::getAllSelectedDicts() { m_allSelectedDicts.clear(); diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp index d53ac17c207..ec228afedaa 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/playerlistdlg.cpp @@ -435,7 +435,7 @@ void PlayerListDlg::OnSelchangePlayers() updateTheUI(); } -void PlayerListDlg::updateTheUI(void) +void PlayerListDlg::updateTheUI() { char buffer[1024]; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp index 98ec4a7f1b4..f8e2189b643 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/teamsdialog.cpp @@ -576,7 +576,7 @@ void CTeamsDialog::OnMoveDownTeam() updateUI(REBUILD_ALL); } -void CTeamsDialog::validateTeamOwners( void ) +void CTeamsDialog::validateTeamOwners() { Int numTeams = m_sides.getNumTeams(); for (Int i = 0; i < numTeams; ++i) { diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp index 408f1b1ae50..0062c2c661d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp @@ -129,7 +129,7 @@ static Int theFlashCount = 0; static void WWDebug_Message_Callback(DebugType type, const char * message); static void WWAssert_Callback(const char * message); -static void Debug_Refs(void); +static void Debug_Refs(); // ---------------------------------------------------------------------------- static void WWDebug_Message_Callback(DebugType type, const char * message) @@ -161,12 +161,12 @@ class PlaceholderView : public View protected: virtual View *prependViewToList( View *list ) override {return nullptr;}; ///< Prepend this view to the given list, return the new list - virtual View *getNextView( void ) override { return nullptr; } ///< Return next view in the set + virtual View *getNextView() override { return nullptr; } ///< Return next view in the set public: - virtual void init( void ) override {}; + virtual void init() override {}; - virtual UnsignedInt getID( void ) override { return 1; } + virtual UnsignedInt getID() override { return 1; } virtual Drawable *pickDrawable( const ICoord2D *screen, Bool forceAttack, PickType pickType ) override {return nullptr;}; ///< pick drawable given the screen pixel coords @@ -181,17 +181,17 @@ class PlaceholderView : public View Coord3D *bottomRight, Coord3D *bottomLeft, Real z ) override {}; - virtual void drawView( void ) override {}; ///< Render the world visible in this view. - virtual void updateView( void ) override {}; ///< Render the world visible in this view. + virtual void drawView() override {}; ///< Render the world visible in this view. + virtual void updateView() override {}; ///< Render the world visible in this view. virtual void stepView() override {}; ///< Update view for every fixed time step virtual void setZoomLimited( Bool limit ) override {} ///< limit the zoom height - virtual Bool isZoomLimited( void ) const override { return TRUE; } ///< get status of zoom limit + virtual Bool isZoomLimited() const override { return TRUE; } ///< get status of zoom limit virtual void setWidth( Int width ) override { m_width = width; } - virtual Int getWidth( void ) override { return m_width; } + virtual Int getWidth() override { return m_width; } virtual void setHeight( Int height ) override { m_height = height; } - virtual Int getHeight( void ) override { return m_height; } + virtual Int getHeight() override { return m_height; } virtual void setOrigin( Int x, Int y) override { m_originX=x; m_originY=y;} ///< Sets location of top-left view corner on display virtual void getOrigin( Int *x, Int *y) override { *x=m_originX; *y=m_originY;} ///< Return location of top-left view corner on display @@ -201,13 +201,13 @@ class PlaceholderView : public View virtual void stopDoingScriptedCamera() override {} virtual void lookAt( const Coord3D *o ) override {}; ///< Center the view on the given coordinate - virtual void initHeightForMap( void ) override {}; ///< Init the camera height for the map at the current position. + virtual void initHeightForMap() override {}; ///< Init the camera height for the map at the current position. virtual void scrollBy( Coord2D *delta ){}; ///< Shift the view by the given delta virtual void moveCameraTo(const Coord3D *o, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) override {lookAt(o);}; virtual void moveCameraAlongWaypointPath(Waypoint *way, Int frames, Int shutter, Bool orient, Real easeIn, Real easeOut) override {}; - virtual Bool isCameraMovementFinished(void) override {return true;}; + virtual Bool isCameraMovementFinished() override {return true;}; virtual void resetCamera(const Coord3D *location, Int frames, Real easeIn, Real easeOut) override {}; ///< Move camera to location, and reset to default angle & zoom. virtual void rotateCamera(Real rotations, Int frames, Real easeIn, Real easeOut) override {}; ///< Rotate camera about current viewpoint. virtual void rotateCameraTowardObject(ObjectID id, Int milliseconds, Int holdMilliseconds, Real easeIn, Real easeOut) override {}; ///< Rotate camera to face an object, and hold on it @@ -215,34 +215,34 @@ class PlaceholderView : public View virtual void cameraModRollingAverage(Int framesToAverage) override {}; ///< Number of frames to average movement for current camera movement. virtual void cameraModFinalTimeMultiplier(Int finalMultiplier) override {}; ///< Final time multiplier for current camera movement. virtual void cameraModFinalPitch(Real finalPitch, Real easeIn, Real easeOut) override {}; ///< Final pitch for current camera movement. - virtual void cameraModFreezeTime(void) override {} ///< Freezes time during the next camera movement. - virtual void cameraModFreezeAngle(void) override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeTime() override {} ///< Freezes time during the next camera movement. + virtual void cameraModFreezeAngle() override {} ///< Freezes time during the next camera movement. virtual void cameraModLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. virtual void cameraModFinalLookToward(Coord3D *pLoc) override {} ///< Sets a look at point during camera movement. virtual void cameraModFinalMoveTo(Coord3D *pLoc) override { }; ///< Sets a final move to. - virtual Bool isTimeFrozen(void) override { return false;} ///< Freezes time during the next camera movement. - virtual Int getTimeMultiplier(void) override {return 1;}; ///< Get the time multiplier. + virtual Bool isTimeFrozen() override { return false;} ///< Freezes time during the next camera movement. + virtual Int getTimeMultiplier() override {return 1;}; ///< Get the time multiplier. virtual void setTimeMultiplier(Int multiple) override {}; ///< Set the time multiplier. virtual void setDefaultView(Real pitch, Real angle, Real maxHeight) override {}; virtual void zoomCamera( Real finalZoom, Int milliseconds, Real easeIn, Real easeOut ) override {}; virtual void pitchCamera( Real finalPitch, Int milliseconds, Real easeIn, Real easeOut ) override {}; virtual void setAngle( Real angle ) override {}; ///< Rotate the view around the up axis to the given angle - virtual Real getAngle( void ) override { return 0; } + virtual Real getAngle() override { return 0; } virtual void setPitch( Real angle ) override {}; ///< Rotate the view around the horizontal axis to the given angle - virtual Real getPitch( void ) override { return 0; } ///< Return current camera pitch - virtual void setAngleToDefault( void ) override {} ///< Set the view angle back to default - virtual void setPitchToDefault( void ) override {} ///< Set the view pitch back to default + virtual Real getPitch() override { return 0; } ///< Return current camera pitch + virtual void setAngleToDefault() override {} ///< Set the view angle back to default + virtual void setPitchToDefault() override {} ///< Set the view pitch back to default virtual void getPosition(Coord3D *pos) {} ///< Return camera position virtual Real getHeightAboveGround() override { return 1; } virtual void setHeightAboveGround(Real z) override { } virtual Real getZoom() override { return 1; } virtual void setZoom(Real z) override { } - virtual void zoomIn( void ) { } ///< Zoom in, closer to the ground, limit to min - virtual void zoomOut( void ) { } ///< Zoom out, farther away from the ground, limit to max - virtual void setZoomToDefault( void ) override { } ///< Set zoom to default value - virtual Real getMaxZoom( void ) { return 0.0f; } + virtual void zoomIn() { } ///< Zoom in, closer to the ground, limit to min + virtual void zoomOut() { } ///< Zoom out, farther away from the ground, limit to max + virtual void setZoomToDefault() override { } ///< Set zoom to default value + virtual Real getMaxZoom() { return 0.0f; } virtual void setOkToAdjustHeight( Bool val ) override { } ///< Set this to adjust camera height virtual Real getTerrainHeightAtPivot() override { return 0.0f; } @@ -253,30 +253,30 @@ class PlaceholderView : public View virtual ObjectID getCameraLock() const override { return INVALID_ID; } virtual void setCameraLock(ObjectID id) override { } - virtual void snapToCameraLock( void ) override { } + virtual void snapToCameraLock() override { } virtual void setSnapMode( CameraLockType lockType, Real lockDist ) override { } virtual Drawable *getCameraLockDrawable() const override { return nullptr; } virtual void setCameraLockDrawable(Drawable *drawable) override { } virtual void setMouseLock( Bool mouseLocked ) override {} ///< lock/unlock the mouse input to the tactical view - virtual Bool isMouseLocked( void ) override { return FALSE; } ///< is the mouse input locked to the tactical view? + virtual Bool isMouseLocked() override { return FALSE; } ///< is the mouse input locked to the tactical view? virtual void setFieldOfView( Real angle ) override {}; ///< Set the horizontal field of view angle - virtual Real getFieldOfView( void ) override {return 0;}; ///< Get the horizontal field of view angle + virtual Real getFieldOfView() override {return 0;}; ///< Get the horizontal field of view angle virtual Bool setViewFilterMode(enum FilterModes) override {return FALSE;} ///ReleaseResources(); @@ -529,7 +529,7 @@ void WbView3d::ReleaseResources(void) //============================================================================= /** Reallocates all W3D assets after a reset.. */ //============================================================================= -void WbView3d::ReAcquireResources(void) +void WbView3d::ReAcquireResources() { if (TheTerrainRenderObject) { TheTerrainRenderObject->ReAcquireResources(); @@ -572,7 +572,7 @@ void WbView3d::ReAcquireResources(void) } // ---------------------------------------------------------------------------- -void WbView3d::killTheTimer(void) +void WbView3d::killTheTimer() { if (m_timer != 0) { KillTimer(m_timer); @@ -987,7 +987,7 @@ void WbView3d::updateLights() } // ---------------------------------------------------------------------------- -void WbView3d::updateScorches(void) +void WbView3d::updateScorches() { TheTerrainRenderObject->clearAllScorches(); MapObject *pMapObj; @@ -1006,7 +1006,7 @@ void WbView3d::updateScorches(void) } // ---------------------------------------------------------------------------- -void WbView3d::updateTrees(void) +void WbView3d::updateTrees() { TheTerrainRenderObject->removeAllTrees(); TheTerrainRenderObject->removeAllProps(); @@ -1887,7 +1887,7 @@ Bool WbView3d::viewToDocCoordZ(CPoint curPt, Coord3D *newPt, Real theZ) } // ---------------------------------------------------------------------------- -void WbView3d::updateHysteresis(void) +void WbView3d::updateHysteresis() { CRect client; GetClientRect(&client); @@ -2025,7 +2025,7 @@ Bool WbView3d::docToViewCoords(Coord3D curPt, CPoint* newPt) } // ---------------------------------------------------------------------------- -void WbView3d::redraw(void) +void WbView3d::redraw() { if (m_updateCount > 0) { return; @@ -2421,7 +2421,7 @@ void WbView3d::drawCircle( HDC hdc, const Coord3D & centerPoint, Real radius, CO } -void WbView3d::drawLabels(void) +void WbView3d::drawLabels() { CDC * pDC = GetDC(); drawLabels(pDC->m_hDC); @@ -2784,14 +2784,14 @@ void WbView3d::setCameraPitch(Real absolutePitch) } // ---------------------------------------------------------------------------- -Real WbView3d::getCameraPitch(void) +Real WbView3d::getCameraPitch() { return m_FXPitch; } //WST 10.17.2002 ---------------------------------------------------------------------------- -Real WbView3d::getCurrentZoom(void) +Real WbView3d::getCurrentZoom() { float zOffset = - m_mouseWheelOffset / 1200; //WST 11/21/02 new triple speed camera zoom. Real zoom = 1.0f; diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.cpp b/GeneralsMD/Code/Tools/wdump/rawfilem.cpp index 619703eb66b..b06628aaf7d 100644 --- a/GeneralsMD/Code/Tools/wdump/rawfilem.cpp +++ b/GeneralsMD/Code/Tools/wdump/rawfilem.cpp @@ -359,7 +359,7 @@ bool RawFileMClass::Is_Available(int forced) * HISTORY: * * 10/18/1994 JLB : Created. * *=============================================================================================*/ -void RawFileMClass::Close(void) +void RawFileMClass::Close() { /* ** If the file is open, then close it. If the file is already closed, then just return. This @@ -611,7 +611,7 @@ int RawFileMClass::Seek(int pos, int dir) * HISTORY: * * 10/18/1994 JLB : Created. * *=============================================================================================*/ -int RawFileMClass::Size(void) +int RawFileMClass::Size() { int size = 0; @@ -674,7 +674,7 @@ int RawFileMClass::Size(void) * HISTORY: * * 10/18/1994 JLB : Created. * *=============================================================================================*/ -int RawFileMClass::Create(void) +int RawFileMClass::Create() { Close(); if (Open(WRITE)) { @@ -712,7 +712,7 @@ int RawFileMClass::Create(void) * HISTORY: * * 10/18/1994 JLB : Created. * *=============================================================================================*/ -int RawFileMClass::Delete(void) +int RawFileMClass::Delete() { /* ** If the file was open, then it must be closed first. @@ -773,7 +773,7 @@ int RawFileMClass::Delete(void) * 11/14/1995 DRD : Created. * * 07/13/1996 JLB : Handles win32 method. * *=============================================================================================*/ -unsigned long RawFileMClass::Get_Date_Time(void) +unsigned long RawFileMClass::Get_Date_Time() { BY_HANDLE_FILE_INFORMATION info;