From e8000dba9849be82a767f35ea3f8a47fd665d41a Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Thu, 14 May 2026 20:12:35 -0700 Subject: [PATCH] Added MFC styles. --- neo/engine/tools/radiant/MainFrm.cpp | 1161 ++++++++++++++------------ 1 file changed, 613 insertions(+), 548 deletions(-) diff --git a/neo/engine/tools/radiant/MainFrm.cpp b/neo/engine/tools/radiant/MainFrm.cpp index fb6696e4..0d3c67d9 100644 --- a/neo/engine/tools/radiant/MainFrm.cpp +++ b/neo/engine/tools/radiant/MainFrm.cpp @@ -2,9 +2,9 @@ =========================================================================== IceTech GPL Source Code -Copyright (C) 2026 Justin Marshall +Copyright (C) 2026 Justin Marshall -This file is part of the IceTech GPL Source Code (?IceTech Source Code?). +This file is part of the IceTech GPL Source Code (?IceTech Source Code?). IceTech Source Code is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -57,22 +57,58 @@ If you have questions concerning this license or the applicable additional terms #include "EntKeyFindReplace.h" #include "InspectorDialog.h" #include "autocaulk.h" +#include #include "../../sys/win32/rc/common_resource.h" #include "../comafx/DialogName.h" #include "../comafx/DialogColorPicker.h" #ifdef _DEBUG - #define new DEBUG_NEW - #undef THIS_FILE +#define new DEBUG_NEW +#undef THIS_FILE static char THIS_FILE[] = __FILE__; #endif +// Enable Windows common-controls v6 visual styles for MFC/common-control UI. +// This embeds the dependency when built with a manifest-aware Visual C++ linker. +#pragma comment(lib, "comctl32.lib") +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#if defined(_M_IX86) +#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") +#elif defined(_M_X64) +#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"") +#elif defined(_M_IA64) +#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"") +#else +#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") +#endif +#endif + +static void InitRadiantCommonControls() { + INITCOMMONCONTROLSEX commonControls; + memset(&commonControls, 0, sizeof(commonControls)); + commonControls.dwSize = sizeof(commonControls); + commonControls.dwICC = ICC_WIN95_CLASSES; +#ifdef ICC_BAR_CLASSES + commonControls.dwICC |= ICC_BAR_CLASSES; +#endif +#ifdef ICC_COOL_CLASSES + commonControls.dwICC |= ICC_COOL_CLASSES; +#endif +#ifdef ICC_TAB_CLASSES + commonControls.dwICC |= ICC_TAB_CLASSES; +#endif + + if (!::InitCommonControlsEx(&commonControls)) { + ::InitCommonControls(); + } +} + // globals CString g_strAppPath; // holds the full path of the executable -CMainFrame *g_pParentWnd = NULL; // used to precast to CMainFrame +CMainFrame* g_pParentWnd = NULL; // used to precast to CMainFrame CPrefsDlg g_Preferences; // global prefs instance -CPrefsDlg &g_PrefsDlg = g_Preferences; // reference used throughout +CPrefsDlg& g_PrefsDlg = g_Preferences; // reference used throughout int g_nUpdateBits = 0; // window update flags bool g_bScreenUpdates = true; // whether window painting is active, used in a few places @@ -117,7 +153,7 @@ SCommandInfo g_Commands[] = { { "Texture_ShiftDown", VK_DOWN, RAD_SHIFT, ID_SELECTION_TEXTURE_SHIFTDOWN }, { "Texture_ScaleLeft", VK_LEFT, RAD_CONTROL, ID_SELECTION_TEXTURE_SCALELEFT }, { "Texture_ScaleRight", VK_RIGHT, RAD_CONTROL, ID_SELECTION_TEXTURE_SCALERIGHT }, - { "Texture_InvertX", 'I', RAD_CONTROL|RAD_SHIFT, ID_CURVE_NEGATIVETEXTUREY }, + { "Texture_InvertX", 'I', RAD_CONTROL | RAD_SHIFT, ID_CURVE_NEGATIVETEXTUREY }, { "Texture_InvertY", 'I', RAD_SHIFT, ID_CURVE_NEGATIVETEXTUREX }, { "Texture_ToggleLock", 'T', RAD_SHIFT, ID_TOGGLE_LOCK }, @@ -143,7 +179,7 @@ SCommandInfo g_Commands[] = { { "Camera_CenterView", VK_END, 0, ID_VIEW_CENTER }, { "Grid_ZoomOut", VK_INSERT, 0, ID_VIEW_ZOOMOUT }, - { "FileSaveCopy", 'C', RAD_CONTROL|RAD_ALT|RAD_SHIFT, D3XP_ID_FILE_SAVE_COPY }, + { "FileSaveCopy", 'C', RAD_CONTROL | RAD_ALT | RAD_SHIFT, D3XP_ID_FILE_SAVE_COPY }, { "ShowHideModels", 'M', RAD_CONTROL, D3XP_ID_SHOW_MODELS }, { "NextView", VK_HOME, 0, ID_VIEW_NEXTVIEW }, { "Grid_ZoomIn", VK_DELETE, 0, ID_VIEW_ZOOMIN }, @@ -181,8 +217,8 @@ SCommandInfo g_Commands[] = { { "Brush_Make8Sided", '8', RAD_CONTROL, ID_BRUSH_8SIDED }, { "Brush_Make9Sided", '9', RAD_CONTROL, ID_BRUSH_9SIDED }, - { "Leak_NextSpot", 'K', RAD_CONTROL|RAD_SHIFT, ID_MISC_NEXTLEAKSPOT }, - { "Leak_PrevSpot", 'L', RAD_CONTROL|RAD_SHIFT, ID_MISC_PREVIOUSLEAKSPOT }, + { "Leak_NextSpot", 'K', RAD_CONTROL | RAD_SHIFT, ID_MISC_NEXTLEAKSPOT }, + { "Leak_PrevSpot", 'L', RAD_CONTROL | RAD_SHIFT, ID_MISC_PREVIOUSLEAKSPOT }, { "File_Open", 'O', RAD_CONTROL, ID_FILE_OPEN }, { "File_Save", 'S', RAD_CONTROL, ID_FILE_SAVE }, @@ -193,19 +229,19 @@ SCommandInfo g_Commands[] = { { "Patch_BendMode", 'B', 0, ID_PATCH_BEND }, { "Patch_FreezeVertices", 'F', 0, ID_CURVE_FREEZE }, { "Patch_UnFreezeVertices", 'F', RAD_CONTROL, ID_CURVE_UNFREEZE }, - { "Patch_UnFreezeAllVertices",'F', RAD_CONTROL|RAD_SHIFT, ID_CURVE_UNFREEZEALL }, + { "Patch_UnFreezeAllVertices",'F', RAD_CONTROL | RAD_SHIFT, ID_CURVE_UNFREEZEALL }, { "Patch_Thicken", 'T', RAD_CONTROL, ID_CURVE_THICKEN }, { "Patch_ClearOverlays", 'Y', RAD_SHIFT, ID_CURVE_OVERLAY_CLEAR }, { "Patch_MakeOverlay", 'Y', 0, ID_CURVE_OVERLAY_SET }, - { "Patch_CycleCapTexturing", 'P', RAD_CONTROL|RAD_SHIFT, ID_CURVE_CYCLECAP }, + { "Patch_CycleCapTexturing", 'P', RAD_CONTROL | RAD_SHIFT, ID_CURVE_CYCLECAP }, { "Patch_CycleCapTexturingAlt",'P', RAD_SHIFT, ID_CURVE_CYCLECAPALT }, { "Patch_InvertCurve", 'I', RAD_CONTROL, ID_CURVE_NEGATIVE }, - { "Patch_IncPatchColumn", VK_ADD, RAD_CONTROL|RAD_SHIFT, ID_CURVE_INSERTCOLUMN }, + { "Patch_IncPatchColumn", VK_ADD, RAD_CONTROL | RAD_SHIFT, ID_CURVE_INSERTCOLUMN }, { "Patch_IncPatchRow", VK_ADD, RAD_CONTROL, ID_CURVE_INSERTROW }, - { "Patch_DecPatchColumn", VK_SUBTRACT, RAD_CONTROL|RAD_SHIFT, ID_CURVE_DELETECOLUMN }, + { "Patch_DecPatchColumn", VK_SUBTRACT, RAD_CONTROL | RAD_SHIFT, ID_CURVE_DELETECOLUMN }, { "Patch_DecPatchRow", VK_SUBTRACT, RAD_CONTROL, ID_CURVE_DELETEROW }, { "Patch_RedisperseRows", 'E', RAD_CONTROL, ID_CURVE_REDISPERSE_ROWS }, - { "Patch_RedisperseCols", 'E', RAD_CONTROL|RAD_SHIFT, ID_CURVE_REDISPERSE_COLS }, + { "Patch_RedisperseCols", 'E', RAD_CONTROL | RAD_SHIFT, ID_CURVE_REDISPERSE_COLS }, { "Patch_Naturalize", 'N', RAD_CONTROL, ID_PATCH_NATURALIZE }, { "Patch_SnapToGrid", 'G', RAD_CONTROL, ID_SELECT_SNAPTOGRID }, { "Patch_CapCurrentCurve", 'C', RAD_SHIFT, ID_CURVE_CAP }, @@ -228,9 +264,9 @@ SCommandInfo g_Commands[] = { { "Window_PatchInspector", 'S', RAD_SHIFT, ID_PATCH_INSPECTOR }, { "Window_EntityList", 'I', 0, ID_EDIT_ENTITYINFO }, { "Window_Preferences", 'P', 0, ID_PREFS }, - { "Window_ToggleCamera", 'C', RAD_CONTROL|RAD_SHIFT, ID_TOGGLECAMERA }, - { "Window_ToggleView", 'V', RAD_CONTROL|RAD_SHIFT, ID_TOGGLEVIEW }, - { "Window_ToggleZ", 'Z', RAD_CONTROL|RAD_SHIFT, ID_TOGGLEZ }, + { "Window_ToggleCamera", 'C', RAD_CONTROL | RAD_SHIFT, ID_TOGGLECAMERA }, + { "Window_ToggleView", 'V', RAD_CONTROL | RAD_SHIFT, ID_TOGGLEVIEW }, + { "Window_ToggleZ", 'Z', RAD_CONTROL | RAD_SHIFT, ID_TOGGLEZ }, { "Window_LightEditor", 'J', 0, ID_PROJECTED_LIGHT }, { "Window_EntityColor", 'K', 0, ID_MISC_SELECTENTITYCOLOR }, @@ -253,9 +289,9 @@ SCommandInfo g_Commands[] = { { "Selection_Connect", 'K', RAD_CONTROL, ID_SELECTION_CONNECT }, { "Selection_Ungroup", 'G', RAD_SHIFT, ID_SELECTION_UNGROUPENTITY }, { "Selection_CSGMerge", 'M', RAD_SHIFT, ID_SELECTION_CSGMERGE }, - + { "Selection_CenterOrigin", 'O', RAD_SHIFT, ID_SELECTION_CENTER_ORIGIN }, - { "Selection_SelectCompleteEntity", 'E' , RAD_CONTROL|RAD_ALT|RAD_SHIFT , ID_SELECT_COMPLETE_ENTITY }, + { "Selection_SelectCompleteEntity", 'E' , RAD_CONTROL | RAD_ALT | RAD_SHIFT , ID_SELECT_COMPLETE_ENTITY }, { "Selection_SelectAllOfType", 'A', RAD_SHIFT, ID_SELECT_ALL }, { "Show_ToggleLights", '0' , RAD_ALT , ID_VIEW_SHOWLIGHTS }, @@ -264,7 +300,7 @@ SCommandInfo g_Commands[] = { { "Show_HideSelected", 'H', 0, ID_VIEW_HIDESHOW_HIDESELECTED }, { "Show_ShowHidden", 'H', RAD_SHIFT, ID_VIEW_HIDESHOW_SHOWHIDDEN }, - { "Show_HideNotSelected", 'H', RAD_CONTROL|RAD_SHIFT, ID_VIEW_HIDESHOW_HIDENOTSELECTED }, + { "Show_HideNotSelected", 'H', RAD_CONTROL | RAD_SHIFT, ID_VIEW_HIDESHOW_HIDENOTSELECTED }, { "Render_ToggleSound", VK_F9, 0, ID_VIEW_RENDERSOUND }, { "Render_ToggleSelections", VK_F8, 0, ID_VIEW_RENDERSELECTION }, @@ -275,7 +311,7 @@ SCommandInfo g_Commands[] = { { "Render_Toggle", VK_F3, 0, ID_VIEW_RENDERMODE }, { "Find_Textures", 'F', RAD_SHIFT, ID_TEXTURE_REPLACEALL }, - { "Find_Entity", VK_F3, RAD_CONTROL, ID_MISC_FINDORREPLACEENTITY}, + { "Find_Entity", VK_F3, RAD_CONTROL, ID_MISC_FINDORREPLACEENTITY}, { "Find_NextEntity", VK_F3,RAD_SHIFT, ID_MISC_FINDNEXTENT}, @@ -283,7 +319,7 @@ SCommandInfo g_Commands[] = { { "Rotate_ToggleFlatRotation", 'R', RAD_CONTROL, ID_VIEW_CAMERAUPDATE }, { "Rotate_CycleRotationAxis", 'R', RAD_SHIFT, ID_TOGGLE_ROTATELOCK }, - { "_AutoCaulk", 'A', RAD_CONTROL|RAD_SHIFT, ID_AUTOCAULK }, // ctrl-shift-a, since SHIFT-A is already taken + { "_AutoCaulk", 'A', RAD_CONTROL | RAD_SHIFT, ID_AUTOCAULK }, // ctrl-shift-a, since SHIFT-A is already taken }; int g_nCommandCount = sizeof(g_Commands) / sizeof(SCommandInfo); @@ -346,7 +382,7 @@ const int g_msgBSPStatus = RegisterWindowMessage(DMAP_MSGID); IMPLEMENT_DYNAMIC(CMainFrame, CFrameWnd) BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) -//{{AFX_MSG_MAP(CMainFrame) + //{{AFX_MSG_MAP(CMainFrame) ON_WM_PARENTNOTIFY() ON_WM_CREATE() ON_WM_TIMER() @@ -366,7 +402,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) ON_COMMAND(ID_FILE_SAVE, OnFileSave) ON_COMMAND(ID_FILE_SAVEAS, OnFileSaveas) ON_COMMAND(D3XP_ID_FILE_SAVE_COPY, OnFileSaveCopy) - ON_COMMAND(D3XP_ID_SHOW_MODELS, OnViewShowModels ) + ON_COMMAND(D3XP_ID_SHOW_MODELS, OnViewShowModels) ON_COMMAND(ID_VIEW_100, OnView100) ON_COMMAND(ID_VIEW_CENTER, OnViewCenter) ON_COMMAND(ID_VIEW_CONSOLE, OnViewConsole) @@ -491,7 +527,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) ON_COMMAND(ID_COLOR_SETORIGINAL, OnColorSetoriginal) ON_COMMAND(ID_COLOR_SETQER, OnColorSetqer) ON_COMMAND(ID_COLOR_SUPERMAL, OnColorSetSuperMal) - ON_COMMAND(ID_THEMES_MAX , OnColorSetMax ) + ON_COMMAND(ID_THEMES_MAX, OnColorSetMax) ON_COMMAND(ID_COLOR_SETBLACK, OnColorSetblack) ON_COMMAND(ID_SNAPTOGRID, OnSnaptogrid) ON_COMMAND(ID_SELECT_SCALE, OnSelectScale) @@ -679,9 +715,9 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) ON_COMMAND(ID_SOUND_SHOWSOUNDVOLUMES, OnSoundShowsoundvolumes) ON_COMMAND(ID_SOUND_SHOWSELECTEDSOUNDVOLUMES, OnSoundShowselectedsoundvolumes) ON_COMMAND(ID_PATCH_NURBEDITOR, OnNurbEditor) - ON_COMMAND(ID_SELECT_COMPLETE_ENTITY, OnSelectCompleteEntity) - ON_COMMAND(ID_PRECISION_CURSOR_CYCLE , OnPrecisionCursorCycle) - ON_COMMAND(ID_MATERIALS_GENERATEMATERIALSLIST,OnGenerateMaterialsList) + ON_COMMAND(ID_SELECT_COMPLETE_ENTITY, OnSelectCompleteEntity) + ON_COMMAND(ID_PRECISION_CURSOR_CYCLE, OnPrecisionCursorCycle) + ON_COMMAND(ID_MATERIALS_GENERATEMATERIALSLIST, OnGenerateMaterialsList) ON_COMMAND(ID_SELECTION_VIEW_WIREFRAMEON, OnSelectionWireFrameOn) ON_COMMAND(ID_SELECTION_VIEW_WIREFRAMEOFF, OnSelectionWireFrameOff) ON_COMMAND(ID_SELECTION_VIEW_VISIBLEON, OnSelectionVisibleOn) @@ -693,14 +729,14 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd) ON_COMMAND_RANGE(ID_VIEW_NEAREST, ID_TEXTURES_FLATSHADE, OnViewNearest) ON_COMMAND_RANGE(ID_GRID_POINT0625, ID_GRID_64, OnGrid1) #if _MSC_VER < 1300 - ON_REGISTERED_MESSAGE(g_msgBSPDone, OnBSPDone) + ON_REGISTERED_MESSAGE(g_msgBSPDone, OnBSPDone) ON_REGISTERED_MESSAGE(g_msgBSPStatus, OnBSPStatus) ON_MESSAGE(WM_DISPLAYCHANGE, OnDisplayChange) #endif ON_COMMAND(ID_AUTOCAULK, OnAutocaulk) ON_UPDATE_COMMAND_UI(ID_AUTOCAULK, OnUpdateAutocaulk) ON_COMMAND(ID_SELECT_ALLTARGETS, OnSelectAlltargets) - END_MESSAGE_MAP() +END_MESSAGE_MAP() static UINT indicators[] = { ID_SEPARATOR, // status line indicator ID_SEPARATOR, // status line indicator @@ -741,7 +777,7 @@ CMainFrameLeftPaneWnd::CMainFrameLeftPaneWnd() { CMainFrameLeftPaneWnd::~CMainFrameLeftPaneWnd() { } -BOOL CMainFrameLeftPaneWnd::Create(CWnd *pParent, UINT nID) { +BOOL CMainFrameLeftPaneWnd::Create(CWnd* pParent, UINT nID) { CString className = AfxRegisterWndClass( CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS, ::LoadCursor(NULL, IDC_ARROW), @@ -759,7 +795,7 @@ BOOL CMainFrameLeftPaneWnd::Create(CWnd *pParent, UINT nID) { ); } -void CMainFrameLeftPaneWnd::AttachChild(CWnd *pWnd) { +void CMainFrameLeftPaneWnd::AttachChild(CWnd* pWnd) { if (!pWnd || !pWnd->GetSafeHwnd() || !GetSafeHwnd()) { return; } @@ -789,11 +825,11 @@ void CMainFrameLeftPaneWnd::AttachChild(CWnd *pWnd) { ); } -bool CMainFrameLeftPaneWnd::IsWindowUsable(CWnd *pWnd) const { +bool CMainFrameLeftPaneWnd::IsWindowUsable(CWnd* pWnd) const { return pWnd && pWnd->GetSafeHwnd(); } -void CMainFrameLeftPaneWnd::SetEmbeddedWindows(CWnd *pCameraWnd, CWnd *pInspectorWnd) { +void CMainFrameLeftPaneWnd::SetEmbeddedWindows(CWnd* pCameraWnd, CWnd* pInspectorWnd) { m_pCameraWnd = pCameraWnd; m_pInspectorWnd = pInspectorWnd; AttachChild(m_pCameraWnd); @@ -801,7 +837,7 @@ void CMainFrameLeftPaneWnd::SetEmbeddedWindows(CWnd *pCameraWnd, CWnd *pInspecto LayoutChildren(); } -int CMainFrameLeftPaneWnd::ClampCameraHeight(int cameraHeight, const CRect &client) const { +int CMainFrameLeftPaneWnd::ClampCameraHeight(int cameraHeight, const CRect& client) const { const int height = client.Height(); const int available = height - m_nSplitterHeight; if (available <= 2) { @@ -830,11 +866,11 @@ int CMainFrameLeftPaneWnd::ClampCameraHeight(int cameraHeight, const CRect &clie return cameraHeight; } -bool CMainFrameLeftPaneWnd::HitTestSplitter(const CPoint &point) const { +bool CMainFrameLeftPaneWnd::HitTestSplitter(const CPoint& point) const { return !m_rcSplitter.IsRectEmpty() && m_rcSplitter.PtInRect(point); } -void CMainFrameLeftPaneWnd::DrawSplitter(CDC *pDC) { +void CMainFrameLeftPaneWnd::DrawSplitter(CDC* pDC) { if (!pDC || m_rcSplitter.IsRectEmpty()) { return; } @@ -846,7 +882,7 @@ void CMainFrameLeftPaneWnd::DrawSplitter(CDC *pDC) { int y = rc.top + rc.Height() / 2; CPen pen(PS_SOLID, 1, ::GetSysColor(COLOR_3DSHADOW)); - CPen *oldPen = pDC->SelectObject(&pen); + CPen* oldPen = pDC->SelectObject(&pen); pDC->MoveTo(rc.left + 6, y); pDC->LineTo(rc.right - 6, y); pDC->SelectObject(oldPen); @@ -963,7 +999,7 @@ void CMainFrameLeftPaneWnd::OnMouseMove(UINT nFlags, CPoint point) { CWnd::OnMouseMove(nFlags, point); } -BOOL CMainFrameLeftPaneWnd::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) { +BOOL CMainFrameLeftPaneWnd::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) { CPoint point; GetCursorPos(&point); ScreenToClient(&point); @@ -974,7 +1010,7 @@ BOOL CMainFrameLeftPaneWnd::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) return CWnd::OnSetCursor(pWnd, nHitTest, message); } -BOOL CMainFrameLeftPaneWnd::OnEraseBkgnd(CDC *pDC) { +BOOL CMainFrameLeftPaneWnd::OnEraseBkgnd(CDC* pDC) { CRect client; GetClientRect(client); CBrush brush(::GetSysColor(COLOR_BTNFACE)); @@ -1013,7 +1049,7 @@ CMainFrameLayoutWnd::CMainFrameLayoutWnd() { CMainFrameLayoutWnd::~CMainFrameLayoutWnd() { } -BOOL CMainFrameLayoutWnd::Create(CWnd *pParent, UINT nID) { +BOOL CMainFrameLayoutWnd::Create(CWnd* pParent, UINT nID) { CString className = AfxRegisterWndClass( CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS, ::LoadCursor(NULL, IDC_ARROW), @@ -1036,11 +1072,11 @@ BOOL CMainFrameLayoutWnd::Create(CWnd *pParent, UINT nID) { return m_wndLeftPane.Create(this, 0x7B20); } -CWnd *CMainFrameLayoutWnd::GetLeftPaneWnd() { +CWnd* CMainFrameLayoutWnd::GetLeftPaneWnd() { return &m_wndLeftPane; } -void CMainFrameLayoutWnd::AttachChild(CWnd *pWnd) { +void CMainFrameLayoutWnd::AttachChild(CWnd* pWnd) { if (!pWnd || !pWnd->GetSafeHwnd() || !GetSafeHwnd()) { return; } @@ -1065,18 +1101,18 @@ void CMainFrameLayoutWnd::AttachChild(CWnd *pWnd) { ); } -bool CMainFrameLayoutWnd::IsWindowUsable(CWnd *pWnd) const { +bool CMainFrameLayoutWnd::IsWindowUsable(CWnd* pWnd) const { return pWnd && pWnd->GetSafeHwnd(); } -void CMainFrameLayoutWnd::SetEmbeddedWindows(CWnd *pCameraWnd, CWnd *pInspectorWnd, CWnd *pXYDockWnd) { +void CMainFrameLayoutWnd::SetEmbeddedWindows(CWnd* pCameraWnd, CWnd* pInspectorWnd, CWnd* pXYDockWnd) { m_pXYDockWnd = pXYDockWnd; AttachChild(m_pXYDockWnd); m_wndLeftPane.SetEmbeddedWindows(pCameraWnd, pInspectorWnd); LayoutChildren(); } -int CMainFrameLayoutWnd::ClampLeftWidth(int leftWidth, const CRect &client) const { +int CMainFrameLayoutWnd::ClampLeftWidth(int leftWidth, const CRect& client) const { const int width = client.Width(); const int available = width - m_nSplitterWidth; if (available <= 2) { @@ -1105,11 +1141,11 @@ int CMainFrameLayoutWnd::ClampLeftWidth(int leftWidth, const CRect &client) cons return leftWidth; } -bool CMainFrameLayoutWnd::HitTestSplitter(const CPoint &point) const { +bool CMainFrameLayoutWnd::HitTestSplitter(const CPoint& point) const { return !m_rcSplitter.IsRectEmpty() && m_rcSplitter.PtInRect(point); } -void CMainFrameLayoutWnd::DrawSplitter(CDC *pDC) { +void CMainFrameLayoutWnd::DrawSplitter(CDC* pDC) { if (!pDC || m_rcSplitter.IsRectEmpty()) { return; } @@ -1121,7 +1157,7 @@ void CMainFrameLayoutWnd::DrawSplitter(CDC *pDC) { int x = rc.left + rc.Width() / 2; CPen pen(PS_SOLID, 1, ::GetSysColor(COLOR_3DSHADOW)); - CPen *oldPen = pDC->SelectObject(&pen); + CPen* oldPen = pDC->SelectObject(&pen); pDC->MoveTo(x, rc.top + 6); pDC->LineTo(x, rc.bottom - 6); pDC->SelectObject(oldPen); @@ -1240,7 +1276,7 @@ void CMainFrameLayoutWnd::OnMouseMove(UINT nFlags, CPoint point) { CWnd::OnMouseMove(nFlags, point); } -BOOL CMainFrameLayoutWnd::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) { +BOOL CMainFrameLayoutWnd::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) { CPoint point; GetCursorPos(&point); ScreenToClient(&point); @@ -1251,7 +1287,7 @@ BOOL CMainFrameLayoutWnd::OnSetCursor(CWnd *pWnd, UINT nHitTest, UINT message) { return CWnd::OnSetCursor(pWnd, nHitTest, message); } -BOOL CMainFrameLayoutWnd::OnEraseBkgnd(CDC *pDC) { +BOOL CMainFrameLayoutWnd::OnEraseBkgnd(CDC* pDC) { CRect client; GetClientRect(client); CBrush brush(::GetSysColor(COLOR_BTNFACE)); @@ -1286,9 +1322,9 @@ void CMainFrame::OnBSPStatus(UINT wParam, long lParam) { ======================================================================================================================= */ void CMainFrame::OnBSPDone(UINT wParam, long lParam) { - idStr str = cvarSystem->GetCVarString( "radiant_bspdone" ); + idStr str = cvarSystem->GetCVarString("radiant_bspdone"); if (str.Length()) { - sndPlaySound(str.c_str(), SND_FILENAME | SND_ASYNC); + sndPlaySound(str.c_str(), SND_FILENAME | SND_ASYNC); } } @@ -1323,14 +1359,14 @@ CMainFrame::~CMainFrame() { ======================================================================================================================= ======================================================================================================================= */ -CMenu *CMainFrame::GetMenu() const { +CMenu* CMainFrame::GetMenu() const { if (m_pXYDockWnd && m_pXYDockWnd->GetSafeHwnd() && m_pXYDockWnd->GetMenuHandle()) { return CMenu::FromHandle(m_pXYDockWnd->GetMenuHandle()); } if (m_hMovedMenu) { return CMenu::FromHandle(m_hMovedMenu); } - return const_cast(this)->CFrameWnd::GetMenu(); + return const_cast(this)->CFrameWnd::GetMenu(); } /* @@ -1339,7 +1375,7 @@ CMenu *CMainFrame::GetMenu() const { */ static HMENU RadiantMainMenuHandle() { if (g_pParentWnd) { - CMenu *pMenu = g_pParentWnd->GetMenu(); + CMenu* pMenu = g_pParentWnd->GetMenu(); if (pMenu && pMenu->GetSafeHmenu()) { return pMenu->GetSafeHmenu(); } @@ -1352,7 +1388,7 @@ static HMENU RadiantMainMenuHandle() { ======================================================================================================================= */ BOOL CMainFrame::CreateEmbeddedMainToolBar(UINT nID) { - CWnd *pToolBarParent = m_pXYDockWnd ? static_cast(m_pXYDockWnd) : static_cast(this); + CWnd* pToolBarParent = m_pXYDockWnd ? static_cast(m_pXYDockWnd) : static_cast(this); if (!m_wndToolBar.CreateEx(pToolBarParent, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(nID)) { TRACE0("Failed to create toolbar\n"); return FALSE; @@ -1414,7 +1450,7 @@ void CMainFrame::RemoveDoomToolbarButton() { return; } - CToolBarCtrl &toolBarCtrl = m_wndToolBar.GetToolBarCtrl(); + CToolBarCtrl& toolBarCtrl = m_wndToolBar.GetToolBarCtrl(); for (int i = toolBarCtrl.GetButtonCount() - 1; i >= 0; --i) { TBBUTTON button; memset(&button, 0, sizeof(button)); @@ -1479,7 +1515,8 @@ void CMainFrame::AttachDoomWindowToGameTab() { if (m_pXYDockWnd->GetDockedGameWindow() != win32.hWnd) { m_pXYDockWnd->AttachGameWindow(win32.hWnd); RecalcXYDockLayout(); - } else { + } + else { m_pXYDockWnd->AttachGameWindow(win32.hWnd); } } @@ -1516,7 +1553,8 @@ void CMainFrame::ApplyActiveTabInputMode() { if (IsDockedGameInputActive()) { common->ActivateTool(false); m_pXYDockWnd->FocusGameWindow(); - } else { + } + else { common->ActivateTool(true); if (soundSystem) { soundSystem->SetPlayingSoundWorld(g_qeglobals.sw); @@ -1528,7 +1566,7 @@ void CMainFrame::ApplyActiveTabInputMode() { ======================================================================================================================= ======================================================================================================================= */ -void HandlePopup(CWnd *pWindow, unsigned int uId) { +void HandlePopup(CWnd* pWindow, unsigned int uId) { // Get the current position of the mouse CPoint ptMouse; GetCursorPos(&ptMouse); @@ -1537,12 +1575,12 @@ void HandlePopup(CWnd *pWindow, unsigned int uId) { CMenu mnuPopup; VERIFY(mnuPopup.LoadMenu(uId)); mnuPopup.GetSubMenu(0)->TrackPopupMenu - ( - TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, - ptMouse.x, - ptMouse.y, - pWindow - ); + ( + TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, + ptMouse.x, + ptMouse.y, + pWindow + ); mnuPopup.DestroyMenu(); // Set focus back to window @@ -1561,7 +1599,7 @@ void CMainFrame::OnParentNotify(UINT message, LPARAM lParam) { ======================================================================================================================= */ void CMainFrame::SetButtonMenuStates() { - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); if (pMenu) { // pMenu->CheckMenuItem(ID_VIEW_SHOWNAMES, MF_BYCOMMAND | MF_CHECKED); @@ -1642,48 +1680,48 @@ void CMainFrame::SetButtonMenuStates() { pMenu->CheckMenuItem(ID_TOGGLE_LOCK, MF_BYCOMMAND | (g_PrefsDlg.m_bTextureLock) ? MF_CHECKED : MF_UNCHECKED); pMenu->CheckMenuItem - ( - ID_TOGGLE_ROTATELOCK, - MF_BYCOMMAND | (g_PrefsDlg.m_bRotateLock) ? MF_CHECKED : MF_UNCHECKED - ); + ( + ID_TOGGLE_ROTATELOCK, + MF_BYCOMMAND | (g_PrefsDlg.m_bRotateLock) ? MF_CHECKED : MF_UNCHECKED + ); pMenu->CheckMenuItem - ( - ID_VIEW_CUBICCLIPPING, - MF_BYCOMMAND | (g_PrefsDlg.m_bCubicClipping) ? MF_CHECKED : MF_UNCHECKED - ); + ( + ID_VIEW_CUBICCLIPPING, + MF_BYCOMMAND | (g_PrefsDlg.m_bCubicClipping) ? MF_CHECKED : MF_UNCHECKED + ); pMenu->CheckMenuItem - ( - ID_VIEW_OPENGLLIGHTING, - MF_BYCOMMAND | (g_PrefsDlg.m_bGLLighting) ? MF_CHECKED : MF_UNCHECKED - ); + ( + ID_VIEW_OPENGLLIGHTING, + MF_BYCOMMAND | (g_PrefsDlg.m_bGLLighting) ? MF_CHECKED : MF_UNCHECKED + ); pMenu->CheckMenuItem(ID_SNAPTOGRID, MF_BYCOMMAND | (!g_PrefsDlg.m_bNoClamp) ? MF_CHECKED : MF_UNCHECKED); if (m_wndToolBar.GetSafeHwnd()) { m_wndToolBar.GetToolBarCtrl().CheckButton - ( - ID_VIEW_CUBICCLIPPING, - (g_PrefsDlg.m_bCubicClipping) ? TRUE : FALSE - ); + ( + ID_VIEW_CUBICCLIPPING, + (g_PrefsDlg.m_bCubicClipping) ? TRUE : FALSE + ); } int n = g_PrefsDlg.m_nTextureScale; int id; switch (n) { - case 10: - id = ID_TEXTURES_TEXTUREWINDOWSCALE_10; - break; - case 25: - id = ID_TEXTURES_TEXTUREWINDOWSCALE_25; - break; - case 50: - id = ID_TEXTURES_TEXTUREWINDOWSCALE_50; - break; - case 200: - id = ID_TEXTURES_TEXTUREWINDOWSCALE_200; - break; - default: - id = ID_TEXTURES_TEXTUREWINDOWSCALE_100; - break; + case 10: + id = ID_TEXTURES_TEXTUREWINDOWSCALE_10; + break; + case 25: + id = ID_TEXTURES_TEXTUREWINDOWSCALE_25; + break; + case 50: + id = ID_TEXTURES_TEXTUREWINDOWSCALE_50; + break; + case 200: + id = ID_TEXTURES_TEXTUREWINDOWSCALE_200; + break; + default: + id = ID_TEXTURES_TEXTUREWINDOWSCALE_100; + break; } CheckTextureScale(id); @@ -1692,7 +1730,7 @@ void CMainFrame::SetButtonMenuStates() { if (g_qeglobals.d_project_entity) { // FillTextureMenu(); // redundant but i'll clean it up later.. yeah right.. FillBSPMenu(); - LoadMruInReg(g_qeglobals.d_lpMruMenu, "Software\\" EDITOR_REGISTRY_KEY "\\MRU" ); + LoadMruInReg(g_qeglobals.d_lpMruMenu, "Software\\" EDITOR_REGISTRY_KEY "\\MRU"); HMENU hMenu = RadiantMainMenuHandle(); if (hMenu) { PlaceMenuMRUItem(g_qeglobals.d_lpMruMenu, ::GetSubMenu(hMenu, 0), ID_FILE_EXIT); @@ -1704,12 +1742,12 @@ void CMainFrame::SetButtonMenuStates() { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::ShowMenuItemKeyBindings(CMenu *pMenu) { +void CMainFrame::ShowMenuItemKeyBindings(CMenu* pMenu) { if (!pMenu) { return; } int i, j; - char key[1024], *ptr; + char key[1024], * ptr; MENUITEMINFO MenuItemInfo; // return; @@ -1773,7 +1811,7 @@ void CMainFrame::ShowMenuItemKeyBindings(CMenu *pMenu) { MFCCreate ============== */ -void MFCCreate( HINSTANCE hInstance ) +void MFCCreate(HINSTANCE hInstance) { HMENU hMenu = NULL; int i = sizeof(g_qeglobals.d_savedinfo); @@ -1789,12 +1827,12 @@ void MFCCreate( HINSTANCE hInstance ) g_qeglobals.d_savedinfo.fGamma = 1.0; g_qeglobals.d_savedinfo.iTexMenu = ID_VIEW_BILINEARMIPMAP; g_qeglobals.d_savedinfo.m_nTextureTweak = 1.0; - + //g_qeglobals.d_savedinfo.exclude = INCLUDE_EASY | INCLUDE_NORMAL | INCLUDE_HARD | INCLUDE_DEATHMATCH; g_qeglobals.d_savedinfo.show_coordinates = true; - g_qeglobals.d_savedinfo.show_names = false; + g_qeglobals.d_savedinfo.show_names = false; - for (i=0 ; i<3 ; i++) { + for (i = 0; i < 3; i++) { g_qeglobals.d_savedinfo.colors[COLOR_TEXTUREBACK][i] = 0; g_qeglobals.d_savedinfo.colors[COLOR_GRIDBACK][i] = 1.0; g_qeglobals.d_savedinfo.colors[COLOR_GRIDMINOR][i] = 0.75; @@ -1840,7 +1878,7 @@ void MFCCreate( HINSTANCE hInstance ) ======================================================================================================================= */ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) { - char *pBuffer = g_strAppPath.GetBufferSetLength(_MAX_PATH + 1); + char* pBuffer = g_strAppPath.GetBufferSetLength(_MAX_PATH + 1); int nResult = ::GetModuleFileName(NULL, pBuffer, _MAX_PATH); ASSERT(nResult != 0); pBuffer[g_strAppPath.ReverseFind('\\') + 1] = '\0'; @@ -1848,7 +1886,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) { com_editors |= EDITOR_RADIANT; - InitCommonControls(); + InitRadiantCommonControls(); g_qeglobals.d_hInstance = AfxGetInstanceHandle(); MFCCreate(AfxGetInstanceHandle()); @@ -1883,8 +1921,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) { m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SHOW_LIGHTVOLUMES, FALSE); m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SHOW_LIGHTTEXTURES, FALSE); m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SELECTION_MOVEONLY, FALSE); - m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSOUNDVOLUMES,g_qeglobals.d_savedinfo.showSoundAlways); - m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSELECTEDSOUNDVOLUMES,g_qeglobals.d_savedinfo.showSoundWhenSelected); + m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSOUNDVOLUMES, g_qeglobals.d_savedinfo.showSoundAlways); + m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSELECTEDSOUNDVOLUMES, g_qeglobals.d_savedinfo.showSoundWhenSelected); EnableDocking(CBRS_ALIGN_ANY); RecalcXYDockLayout(); @@ -1901,10 +1939,10 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) { LoadCommandMap(); - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); ShowMenuItemKeyBindings(pMenu); - CFont *pFont = new CFont(); + CFont* pFont = new CFont(); pFont->CreatePointFont(g_PrefsDlg.m_nStatusSize * 10, "Arial"); m_wndStatusBar.SetFont(pFont); @@ -1938,11 +1976,11 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) { PostMessage(WM_KEYDOWN, 'O', NULL); - if ( radiant_entityMode.GetBool() ) { + if (radiant_entityMode.GetBool()) { g_qeglobals.d_savedinfo.exclude |= (EXCLUDE_PATHS | EXCLUDE_CLIP | EXCLUDE_CAULK | EXCLUDE_VISPORTALS | EXCLUDE_NODRAW | EXCLUDE_TRIGGERS); } - Sys_UpdateWindows ( W_ALL ); + Sys_UpdateWindows(W_ALL); return 0; } @@ -2018,7 +2056,7 @@ void CMainFrame::LoadCommandMap() { ======================================================================================================================= ======================================================================================================================= */ -BOOL CMainFrame::PreCreateWindow(CREATESTRUCT &cs) { +BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) { // TODO: Modify the Window class or styles here by modifying the CREATESTRUCT cs return CFrameWnd::PreCreateWindow(cs); } @@ -2038,7 +2076,7 @@ void CMainFrame::AssertValid() const { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::Dump(CDumpContext &dc) const { +void CMainFrame::Dump(CDumpContext& dc) const { CFrameWnd::Dump(dc); } #endif // _DEBUG @@ -2058,11 +2096,11 @@ void CMainFrame::CreateQEChildren() { bProjectLoaded = QE_LoadProject(g_PrefsDlg.m_strLastProject.GetBuffer(0)); } if (!bProjectLoaded) { - bProjectLoaded = QE_LoadProject( EDITOR_DEFAULT_PROJECT ); + bProjectLoaded = QE_LoadProject(EDITOR_DEFAULT_PROJECT); } if (!bProjectLoaded) { - CFileDialog dlgFile( true, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, EDITOR_WINDOWTEXT " Project files (*.qe4, *.prj)|*.qe4|*.prj||", this ); + CFileDialog dlgFile(true, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, EDITOR_WINDOWTEXT " Project files (*.qe4, *.prj)|*.qe4|*.prj||", this); if (dlgFile.DoModal() == IDOK) { bProjectLoaded = QE_LoadProject(dlgFile.GetPathName().GetBuffer(0)); } @@ -2175,15 +2213,15 @@ void CMainFrame::OnTimer(UINT_PTR nIDEvent) { ApplyActiveTabInputMode(); } - if ( nIDEvent == QE_TIMER0 && !MouseDown() ) { + if (nIDEvent == QE_TIMER0 && !MouseDown()) { QE_CountBrushesAndUpdateStatusBar(); } - if ( nIDEvent == QE_TIMER1 || autoSavePending ) { - if ( MouseDown() ) { + if (nIDEvent == QE_TIMER1 || autoSavePending) { + if (MouseDown()) { autoSavePending = true; return; } - if ( Sys_Waiting() ) { + if (Sys_Waiting()) { autoSavePending = true; return; } @@ -2201,7 +2239,7 @@ struct SplitInfo { ======================================================================================================================= ======================================================================================================================= */ -bool LoadWindowPlacement(HWND hwnd, const char *pName) { +bool LoadWindowPlacement(HWND hwnd, const char* pName) { WINDOWPLACEMENT wp; wp.length = sizeof(WINDOWPLACEMENT); @@ -2218,7 +2256,7 @@ bool LoadWindowPlacement(HWND hwnd, const char *pName) { ======================================================================================================================= ======================================================================================================================= */ -void SaveWindowPlacement(HWND hwnd, const char *pName) { +void SaveWindowPlacement(HWND hwnd, const char* pName) { WINDOWPLACEMENT wp; wp.length = sizeof(WINDOWPLACEMENT); if (::GetWindowPlacement(hwnd, &wp)) { @@ -2250,7 +2288,8 @@ void CMainFrame::OnDestroy() { if (m_pXYDockWnd && m_pXYDockWnd->GetSafeHwnd()) { SaveWindowPlacement(m_pXYDockWnd->GetSafeHwnd(), "radiant_xywindow"); - } else if (m_pXYWnd && m_pXYWnd->GetSafeHwnd()) { + } + else if (m_pXYWnd && m_pXYWnd->GetSafeHwnd()) { SaveWindowPlacement(m_pXYWnd->GetSafeHwnd(), "radiant_xywindow"); } SaveWindowPlacement(m_pXZWnd->GetSafeHwnd(), "radiant_xzwindow"); @@ -2301,7 +2340,7 @@ void CMainFrame::OnDestroy() { delete m_pCamWnd; m_pCamWnd = NULL; - if ( idStr::Icmp(currentmap, "unnamed.map") != 0 ) { + if (idStr::Icmp(currentmap, "unnamed.map") != 0) { g_PrefsDlg.m_strLastMap = currentmap; g_PrefsDlg.SavePrefs(); } @@ -2327,9 +2366,9 @@ void CMainFrame::OnDestroy() { g_qeglobals.d_project_entity->epairs.Clear(); - entity_t *pEntity = g_qeglobals.d_project_entity->next; + entity_t* pEntity = g_qeglobals.d_project_entity->next; while (pEntity != NULL && pEntity != g_qeglobals.d_project_entity) { - entity_t *pNextEntity = pEntity->next; + entity_t* pNextEntity = pEntity->next; Entity_Free(pEntity); pEntity = pNextEntity; } @@ -2361,7 +2400,7 @@ void CMainFrame::OnDestroy() { */ void CMainFrame::OnClose() { if (ConfirmModified()) { - g_Inspectors->SaveWindowPlacement (); + g_Inspectors->SaveWindowPlacement(); CFrameWnd::OnClose(); } } @@ -2382,7 +2421,7 @@ void CMainFrame::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) { if (g_Commands[i].m_nKey == nChar) { // find a match? bool bGo = true; if (g_Commands[i].m_nModifiers & RAD_PRESS) { - int nModifiers = g_Commands[i].m_nModifiers &~RAD_PRESS; + int nModifiers = g_Commands[i].m_nModifiers & ~RAD_PRESS; if (nModifiers) { // are there modifiers present? if (nModifiers & RAD_ALT) { if (!(GetAsyncKeyState(VK_MENU) & 0x8000)) { @@ -2501,13 +2540,13 @@ void CMainFrame::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) { ======================================================================================================================= ======================================================================================================================= */ -BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext *pContext) { +BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) { if (!m_wndMainLayout.Create(this, AFX_IDW_PANE_FIRST)) { return FALSE; } - g_Inspectors = new CInspectorDialog( this ); + g_Inspectors = new CInspectorDialog(this); g_Inspectors->Create(IDD_DIALOG_INSPECTORS, m_wndMainLayout.GetLeftPaneWnd()); g_Inspectors->ShowWindow(SW_SHOW); @@ -2596,18 +2635,18 @@ void CMainFrame::OnSize(UINT nType, int cx, int cy) { UINT nStyle; int nWidth; if (m_wndStatusBar.GetSafeHwnd()) { - m_wndStatusBar.GetPaneInfo( 0, nID, nStyle, nWidth); - m_wndStatusBar.SetPaneInfo( 0, nID, nStyle, rctParent.Width() * 0.15f ); - m_wndStatusBar.GetPaneInfo( 1, nID, nStyle, nWidth); - m_wndStatusBar.SetPaneInfo( 1, nID, nStyle, rctParent.Width() * 0.15f); - m_wndStatusBar.GetPaneInfo( 2, nID, nStyle, nWidth); - m_wndStatusBar.SetPaneInfo( 2, nID, nStyle, rctParent.Width() * 0.15f ); - m_wndStatusBar.GetPaneInfo( 3, nID, nStyle, nWidth); - m_wndStatusBar.SetPaneInfo( 3, nID, nStyle, rctParent.Width() * 0.39f ); - m_wndStatusBar.GetPaneInfo( 4, nID, nStyle, nWidth); - m_wndStatusBar.SetPaneInfo( 4, nID, nStyle, rctParent.Width() * 0.15f ); - m_wndStatusBar.GetPaneInfo( 5, nID, nStyle, nWidth); - m_wndStatusBar.SetPaneInfo( 5, nID, nStyle, rctParent.Width() * 0.01f ); + m_wndStatusBar.GetPaneInfo(0, nID, nStyle, nWidth); + m_wndStatusBar.SetPaneInfo(0, nID, nStyle, rctParent.Width() * 0.15f); + m_wndStatusBar.GetPaneInfo(1, nID, nStyle, nWidth); + m_wndStatusBar.SetPaneInfo(1, nID, nStyle, rctParent.Width() * 0.15f); + m_wndStatusBar.GetPaneInfo(2, nID, nStyle, nWidth); + m_wndStatusBar.SetPaneInfo(2, nID, nStyle, rctParent.Width() * 0.15f); + m_wndStatusBar.GetPaneInfo(3, nID, nStyle, nWidth); + m_wndStatusBar.SetPaneInfo(3, nID, nStyle, rctParent.Width() * 0.39f); + m_wndStatusBar.GetPaneInfo(4, nID, nStyle, nWidth); + m_wndStatusBar.SetPaneInfo(4, nID, nStyle, rctParent.Width() * 0.15f); + m_wndStatusBar.GetPaneInfo(5, nID, nStyle, nWidth); + m_wndStatusBar.SetPaneInfo(5, nID, nStyle, rctParent.Width() * 0.01f); } RecalcMainLayout(); @@ -2737,7 +2776,7 @@ void CMainFrame::OnFileSaveCopy() { char aTitle[260] = "Save a Copy\0"; OPENFILENAME afn; - memset( &afn, 0, sizeof(OPENFILENAME) ); + memset(&afn, 0, sizeof(OPENFILENAME)); CString strPath = ValueForKey(g_qeglobals.d_project_entity, "basepath"); AddSlash(strPath); @@ -2858,7 +2897,7 @@ void CMainFrame::OnViewFront() { ======================================================================================================================= */ -BOOL DoMru(HWND hWnd,WORD wId) +BOOL DoMru(HWND hWnd, WORD wId) { char szFileName[128]; OFSTRUCT of; @@ -2868,19 +2907,19 @@ BOOL DoMru(HWND hWnd,WORD wId) // Test if the file exists. - fExist = OpenFile(szFileName ,&of,OF_EXIST) != HFILE_ERROR; + fExist = OpenFile(szFileName, &of, OF_EXIST) != HFILE_ERROR; if (fExist) { // Place the file on the top of MRU. - AddNewItem(g_qeglobals.d_lpMruMenu,(LPSTR)szFileName); + AddNewItem(g_qeglobals.d_lpMruMenu, (LPSTR)szFileName); // Now perform opening this file !!! - Map_LoadFile (szFileName); + Map_LoadFile(szFileName); } else // Remove the file on MRU. - DelMenuItem(g_qeglobals.d_lpMruMenu,wId,TRUE); + DelMenuItem(g_qeglobals.d_lpMruMenu, wId, TRUE); // Refresh the File menu. HMENU hMenu = RadiantMainMenuHandle(); @@ -2894,8 +2933,8 @@ BOOL DoMru(HWND hWnd,WORD wId) void CMainFrame::OnMru(unsigned int nID) { // DHM - _D3XP if (ConfirmModified()) { - DoMru(GetSafeHwnd(), nID); -} + DoMru(GetSafeHwnd(), nID); + } } /* @@ -2922,40 +2961,40 @@ void CMainFrame::OnTextureWad(unsigned int nID) { ======================================================================================================================= */ -/* -============ -RunBsp + /* + ============ + RunBsp -This is the new all-internal bsp -============ -*/ -void RunBsp (const char *command) { + This is the new all-internal bsp + ============ + */ +void RunBsp(const char* command) { char sys[2048]; char name[2048]; - char *in; + char* in; // bring the console window forward for feedback g_Inspectors->SetMode(W_CONSOLE); // decide if we are doing a .map or a .reg - strcpy (name, currentmap); - if ( region_active ) { - Map_SaveFile (name, false); - StripExtension (name); - strcat (name, ".reg"); + strcpy(name, currentmap); + if (region_active) { + Map_SaveFile(name, false); + StripExtension(name); + strcat(name, ".reg"); } - if ( !Map_SaveFile ( name, region_active ) ) { + if (!Map_SaveFile(name, region_active)) { return; } // name should be a full pathname, but we only // want to pass the maps/ part to dmap in = strstr(name, "maps/"); - if ( !in ) { + if (!in) { in = strstr(name, "maps\\"); } - if ( !in ) { + if (!in) { in = name; } @@ -2964,8 +3003,8 @@ void RunBsp (const char *command) { STARTUPINFO startupinfo; char buff[2048]; - idStr base = cvarSystem->GetCVarString( "fs_basepath" ); - idStr cd = cvarSystem->GetCVarString( "fs_cdpath" ); + idStr base = cvarSystem->GetCVarString("fs_basepath"); + idStr cd = cvarSystem->GetCVarString("fs_cdpath"); idStr paths; if (base.Length()) { paths += "+set fs_basepath "; @@ -2978,28 +3017,31 @@ void RunBsp (const char *command) { ::GetModuleFileName(AfxGetApp()->m_hInstance, buff, sizeof(buff)); if (strlen(command) > strlen("bspext")) { - idStr::snPrintf( sys, sizeof(sys), "%s %s +set r_fullscreen 0 +dmap editorOutput %s %s +quit", buff, paths.c_str(), command + strlen("bspext"), in ); - } else { - idStr::snPrintf( sys, sizeof(sys), "%s %s +set r_fullscreen 0 +dmap editorOutput %s +quit", buff, paths.c_str(), in ); + idStr::snPrintf(sys, sizeof(sys), "%s %s +set r_fullscreen 0 +dmap editorOutput %s %s +quit", buff, paths.c_str(), command + strlen("bspext"), in); } - - ::GetStartupInfo (&startupinfo); + else { + idStr::snPrintf(sys, sizeof(sys), "%s %s +set r_fullscreen 0 +dmap editorOutput %s +quit", buff, paths.c_str(), in); + } + + ::GetStartupInfo(&startupinfo); if (!CreateProcess(NULL, sys, NULL, NULL, FALSE, 0, NULL, NULL, &startupinfo, &ProcessInformation)) { - common->Printf("Could not start bsp process %s %s/n", buff, sys); + common->Printf("Could not start bsp process %s %s/n", buff, sys); } g_pParentWnd->SetFocus(); - } else { // assumes bsp is the command + } + else { // assumes bsp is the command if (strlen(command) > strlen("bsp")) { - idStr::snPrintf( sys, sizeof(sys), "dmap %s %s", command + strlen("bsp"), in ); - } else { - idStr::snPrintf( sys, sizeof(sys), "dmap %s", in ); + idStr::snPrintf(sys, sizeof(sys), "dmap %s %s", command + strlen("bsp"), in); + } + else { + idStr::snPrintf(sys, sizeof(sys), "dmap %s", in); } - cmdSystem->BufferCommandText( CMD_EXEC_NOW, "disconnect\n" ); + cmdSystem->BufferCommandText(CMD_EXEC_NOW, "disconnect\n"); // issue the bsp command - Dmap_f( idCmdArgs( sys, false ) ); + Dmap_f(idCmdArgs(sys, false)); } } @@ -3220,28 +3262,28 @@ void CMainFrame::OnViewZ100() { ======================================================================================================================= */ void CMainFrame::OnViewZoomin() { - if ( m_pXYWnd && m_pXYWnd->Active() ) { - m_pXYWnd->SetScale( m_pXYWnd->Scale() * 5.0f / 4.0f ); - if ( m_pXYWnd->Scale() > 256.0f ) { - m_pXYWnd->SetScale( 256.0f ); + if (m_pXYWnd && m_pXYWnd->Active()) { + m_pXYWnd->SetScale(m_pXYWnd->Scale() * 5.0f / 4.0f); + if (m_pXYWnd->Scale() > 256.0f) { + m_pXYWnd->SetScale(256.0f); } } - if ( m_pXZWnd && m_pXZWnd->Active() ) { - m_pXZWnd->SetScale( m_pXZWnd->Scale() * 5.0f / 4.0f ); - if ( m_pXZWnd->Scale() > 256.0f ) { - m_pXZWnd->SetScale( 256.0f ); + if (m_pXZWnd && m_pXZWnd->Active()) { + m_pXZWnd->SetScale(m_pXZWnd->Scale() * 5.0f / 4.0f); + if (m_pXZWnd->Scale() > 256.0f) { + m_pXZWnd->SetScale(256.0f); } } - if ( m_pYZWnd && m_pYZWnd->Active() ) { - m_pYZWnd->SetScale( m_pYZWnd->Scale() * 5.0f / 4.0f ); - if ( m_pYZWnd->Scale() > 256.0f ) { - m_pYZWnd->SetScale( 256.0f ); + if (m_pYZWnd && m_pYZWnd->Active()) { + m_pYZWnd->SetScale(m_pYZWnd->Scale() * 5.0f / 4.0f); + if (m_pYZWnd->Scale() > 256.0f) { + m_pYZWnd->SetScale(256.0f); } } - Sys_UpdateWindows( W_XY | W_XY_OVERLAY ); + Sys_UpdateWindows(W_XY | W_XY_OVERLAY); } /* @@ -3249,24 +3291,24 @@ void CMainFrame::OnViewZoomin() { ======================================================================================================================= */ void CMainFrame::OnViewZoomout() { - if ( m_pXYWnd && m_pXYWnd->Active() ) { - m_pXYWnd->SetScale( m_pXYWnd->Scale() * 4.0f / 5.0f ); - if ( m_pXYWnd->Scale() < 0.1f / 32.0f ) { - m_pXYWnd->SetScale( 0.1f / 32.0f ); + if (m_pXYWnd && m_pXYWnd->Active()) { + m_pXYWnd->SetScale(m_pXYWnd->Scale() * 4.0f / 5.0f); + if (m_pXYWnd->Scale() < 0.1f / 32.0f) { + m_pXYWnd->SetScale(0.1f / 32.0f); } } - if ( m_pXZWnd && m_pXZWnd->Active() ) { - m_pXZWnd->SetScale( m_pXZWnd->Scale() * 4.0f / 5.0f ); - if ( m_pXZWnd->Scale() < 0.1f / 32.0f ) { - m_pXZWnd->SetScale( 0.1f / 32.0f ); + if (m_pXZWnd && m_pXZWnd->Active()) { + m_pXZWnd->SetScale(m_pXZWnd->Scale() * 4.0f / 5.0f); + if (m_pXZWnd->Scale() < 0.1f / 32.0f) { + m_pXZWnd->SetScale(0.1f / 32.0f); } } - if ( m_pYZWnd && m_pYZWnd->Active() ) { - m_pYZWnd->SetScale( m_pYZWnd->Scale() * 4.0f / 5.0f ); - if ( m_pYZWnd->Scale() < 0.1f / 32.0f ) { - m_pYZWnd->SetScale( 0.1f / 32.0f ); + if (m_pYZWnd && m_pYZWnd->Active()) { + m_pYZWnd->SetScale(m_pYZWnd->Scale() * 4.0f / 5.0f); + if (m_pYZWnd->Scale() < 0.1f / 32.0f) { + m_pYZWnd->SetScale(0.1f / 32.0f); } } @@ -3279,7 +3321,7 @@ void CMainFrame::OnViewZoomout() { */ void CMainFrame::OnViewZzoomin() { z.scale *= 5.0f / 4.0f; - if ( z.scale > 4.0f ) { + if (z.scale > 4.0f) { z.scale = 4.0f; } @@ -3292,7 +3334,7 @@ void CMainFrame::OnViewZzoomin() { */ void CMainFrame::OnViewZzoomout() { z.scale *= 4.0f / 5.0f; - if ( z.scale < 0.125f ) { + if (z.scale < 0.125f) { z.scale = 0.125f; } @@ -3324,36 +3366,36 @@ static void UpdateGrid(void) void CMainFrame::OnGrid1(unsigned int nID) { switch (nID) { - case ID_GRID_1: - g_qeglobals.d_gridsize = 1; - break; - case ID_GRID_2: - g_qeglobals.d_gridsize = 2; - break; - case ID_GRID_4: - g_qeglobals.d_gridsize = 4; - break; - case ID_GRID_8: - g_qeglobals.d_gridsize = 8; - break; - case ID_GRID_16: - g_qeglobals.d_gridsize = 16; - break; - case ID_GRID_32: - g_qeglobals.d_gridsize = 32; - break; - case ID_GRID_64: - g_qeglobals.d_gridsize = 64; - break; - case ID_GRID_POINT5: - g_qeglobals.d_gridsize = 0.5f; - break; - case ID_GRID_POINT25: - g_qeglobals.d_gridsize = 0.25f; - break; - case ID_GRID_POINT125: - g_qeglobals.d_gridsize = 0.125f; - break; + case ID_GRID_1: + g_qeglobals.d_gridsize = 1; + break; + case ID_GRID_2: + g_qeglobals.d_gridsize = 2; + break; + case ID_GRID_4: + g_qeglobals.d_gridsize = 4; + break; + case ID_GRID_8: + g_qeglobals.d_gridsize = 8; + break; + case ID_GRID_16: + g_qeglobals.d_gridsize = 16; + break; + case ID_GRID_32: + g_qeglobals.d_gridsize = 32; + break; + case ID_GRID_64: + g_qeglobals.d_gridsize = 64; + break; + case ID_GRID_POINT5: + g_qeglobals.d_gridsize = 0.5f; + break; + case ID_GRID_POINT25: + g_qeglobals.d_gridsize = 0.25f; + break; + case ID_GRID_POINT125: + g_qeglobals.d_gridsize = 0.125f; + break; //case ID_GRID_POINT0625: // g_qeglobals.d_gridsize = 0.0625f; // break; @@ -3383,7 +3425,7 @@ extern bool texture_showinuse; ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::OnUpdateTexturesShowinuse(CCmdUI *pCmdUI) { +void CMainFrame::OnUpdateTexturesShowinuse(CCmdUI* pCmdUI) { pCmdUI->SetCheck(texture_showinuse); } @@ -3444,29 +3486,30 @@ void CMainFrame::OnMiscPrintxy() { ======================================================================================================================= */ -void UpdateRadiantColor( float r, float g, float b, float a ) { - if ( g_pParentWnd ) { +void UpdateRadiantColor(float r, float g, float b, float a) { + if (g_pParentWnd) { g_pParentWnd->RoutineProcessing(); } } -bool DoColor( int iIndex ) { - COLORREF cr = (int)(g_qeglobals.d_savedinfo.colors[iIndex][0]*255) + - (((int)(g_qeglobals.d_savedinfo.colors[iIndex][1]*255))<<8) + - (((int)(g_qeglobals.d_savedinfo.colors[iIndex][2]*255))<<16); +bool DoColor(int iIndex) { + COLORREF cr = (int)(g_qeglobals.d_savedinfo.colors[iIndex][0] * 255) + + (((int)(g_qeglobals.d_savedinfo.colors[iIndex][1] * 255)) << 8) + + (((int)(g_qeglobals.d_savedinfo.colors[iIndex][2] * 255)) << 16); CDialogColorPicker dlg(cr); dlg.UpdateParent = UpdateRadiantColor; - if ( dlg.DoModal() == IDOK ) { - g_qeglobals.d_savedinfo.colors[iIndex][0] = (dlg.GetColor() & 255)/255.0; - g_qeglobals.d_savedinfo.colors[iIndex][1] = ((dlg.GetColor() >> 8)&255)/255.0; - g_qeglobals.d_savedinfo.colors[iIndex][2] = ((dlg.GetColor() >> 16)&255)/255.0; + if (dlg.DoModal() == IDOK) { + g_qeglobals.d_savedinfo.colors[iIndex][0] = (dlg.GetColor() & 255) / 255.0; + g_qeglobals.d_savedinfo.colors[iIndex][1] = ((dlg.GetColor() >> 8) & 255) / 255.0; + g_qeglobals.d_savedinfo.colors[iIndex][2] = ((dlg.GetColor() >> 16) & 255) / 255.0; - Sys_UpdateWindows (W_ALL); + Sys_UpdateWindows(W_ALL); return true; - } else { + } + else { return false; } } @@ -3475,10 +3518,10 @@ bool DoColor( int iIndex ) { ======================================================================================================================= ======================================================================================================================= */ -extern void Select_SetKeyVal(const char *key, const char *val); +extern void Select_SetKeyVal(const char* key, const char* val); void CMainFrame::OnMiscSelectentitycolor() { - entity_t *ent = NULL; + entity_t* ent = NULL; if (QE_SingleBrush(true, true)) { ent = selected_brushes.next->owner; CString strColor = ValueForKey(ent, "_color"); @@ -3495,7 +3538,7 @@ void CMainFrame::OnMiscSelectentitycolor() { if (DoColor(COLOR_ENTITY)) { char buffer[100]; - sprintf(buffer, "%f %f %f", g_qeglobals.d_savedinfo.colors[COLOR_ENTITY][0], g_qeglobals.d_savedinfo.colors[COLOR_ENTITY][1],g_qeglobals.d_savedinfo.colors[COLOR_ENTITY][2]); + sprintf(buffer, "%f %f %f", g_qeglobals.d_savedinfo.colors[COLOR_ENTITY][0], g_qeglobals.d_savedinfo.colors[COLOR_ENTITY][1], g_qeglobals.d_savedinfo.colors[COLOR_ENTITY][2]); Select_SetKeyVal("_color", buffer); if (ent) { g_Inspectors->UpdateEntitySel(ent->eclass); @@ -3509,7 +3552,7 @@ CString strFindValue; CString strReplaceKey; CString strReplaceValue; bool gbWholeStringMatchOnly = true; -bool gbSelectAllMatchingEnts= false; +bool gbSelectAllMatchingEnts = false; brush_t* gpPrevEntBrushFound = NULL; // all this because there's no ansi stristr(), sigh... @@ -3518,18 +3561,18 @@ LPCSTR String_ToLower(LPCSTR psString) { const int iBufferSize = 4096; static char sString[8][iBufferSize]; - static int iIndex=0; + static int iIndex = 0; - if (strlen(psString)>=iBufferSize) + if (strlen(psString) >= iBufferSize) { assert(0); - common->Printf("String_ToLower(): Warning, input string was %d bytes too large, performing strlwr() inline!\n",strlen(psString)-(iBufferSize-1)); + common->Printf("String_ToLower(): Warning, input string was %d bytes too large, performing strlwr() inline!\n", strlen(psString) - (iBufferSize - 1)); return strlwr(const_cast(psString)); } - iIndex = ++ iIndex & 7; + iIndex = ++iIndex & 7; - strcpy(sString[iIndex],psString); + strcpy(sString[iIndex], psString); strlwr(sString[iIndex]); return sString[iIndex]; @@ -3537,10 +3580,10 @@ LPCSTR String_ToLower(LPCSTR psString) bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search -{ +{ bool bFoundSomething = false; - entity_t *pLastFoundEnt; - brush_t *pLastFoundBrush; + entity_t* pLastFoundEnt; + brush_t* pLastFoundBrush; CWaitCursor waitcursor; @@ -3548,12 +3591,12 @@ bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search // see whether to start search from prev_brush->next by checking if prev_brush is still in the active list... // - brush_t *pStartBrush = active_brushes.next; + brush_t* pStartBrush = active_brushes.next; if (pPrevFoundBrush && !gbSelectAllMatchingEnts) { - brush_t *pPrev = NULL; - for (brush_t* b = active_brushes.next ; b != &active_brushes ; b = b->next) + brush_t* pPrev = NULL; + for (brush_t* b = active_brushes.next; b != &active_brushes; b = b->next) { if (pPrev == pPrevFoundBrush && pPrevFoundBrush) { @@ -3567,19 +3610,19 @@ bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search // now do the search proper... // int iBrushesScanned = 0; - int iBrushesSelected=0; + int iBrushesSelected = 0; int iEntsScanned = 0; - brush_t* pNextBrush; - for (brush_t* b = pStartBrush; b != &active_brushes ; b = pNextBrush) - { + brush_t* pNextBrush; + for (brush_t* b = pStartBrush; b != &active_brushes; b = pNextBrush) + { // setup the ptr before going any further (because selecting a brush down below moves it to a // different link list), but we need to ensure that the next brush has a different ent-owner than the current // one, or multi-brush ents will confuse the list process if they get selected (infinite loop badness)... // // pNextBrush = &active_brushes; // default to loop-stop condition pNextBrush = b->next; - while (pNextBrush->owner == b->owner && pNextBrush!=&active_brushes) + while (pNextBrush->owner == b->owner && pNextBrush != &active_brushes) { pNextBrush = pNextBrush->next; } @@ -3588,36 +3631,36 @@ bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search // a simple progress bar so they don't think it's locked up on long searches... // - static int iDotBodge=0; - if (!(++iDotBodge&15)) + static int iDotBodge = 0; + if (!(++iDotBodge & 15)) common->Printf("."); // cut down on printing bool bMatch = false; entity_t* ent = b->owner; - if (ent && ent!= world_entity) // needed! + if (ent && ent != world_entity) // needed! { iEntsScanned++; - if (FilterBrush (b)) - continue; + if (FilterBrush(b)) + continue; // only check the find-key if there was one specified... // if (!strFindKey.IsEmpty()) { - const char *psEntFoundValue = ValueForKey(ent, strFindKey); + const char* psEntFoundValue = ValueForKey(ent, strFindKey); if (strlen(psEntFoundValue) - && + && + ( + // (stricmp(strFindValue, psEntFoundValue)==0) // found this exact key/value ( -// (stricmp(strFindValue, psEntFoundValue)==0) // found this exact key/value - ( - (gbWholeStringMatchOnly && stricmp(psEntFoundValue, strFindValue)==0) + (gbWholeStringMatchOnly && stricmp(psEntFoundValue, strFindValue) == 0) || (!gbWholeStringMatchOnly && strstr(String_ToLower(psEntFoundValue), String_ToLower(strFindValue))) ) - || // or - (strFindValue.IsEmpty()) // any value for this key if blank value search specified + || // or + (strFindValue.IsEmpty()) // any value for this key if blank value search specified ) ) { @@ -3629,27 +3672,27 @@ bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search // no FIND key specified, so just scan all of them... // int iNumEntKeys = GetNumKeys(ent); - for (int i=0; i search specified then any found-value is ok - || - (gbWholeStringMatchOnly && stricmp(psEntFoundValue, strFindValue)==0) - || - (!gbWholeStringMatchOnly && strstr(String_ToLower(psEntFoundValue), String_ToLower(strFindValue))) + if ((strlen(psEntFoundValue) && strFindValue.IsEmpty()) // if blank search specified then any found-value is ok + || + (gbWholeStringMatchOnly && stricmp(psEntFoundValue, strFindValue) == 0) + || + (!gbWholeStringMatchOnly && strstr(String_ToLower(psEntFoundValue), String_ToLower(strFindValue))) ) { if (!gbWholeStringMatchOnly && strstr(String_ToLower(psEntFoundValue), String_ToLower(strFindValue))) { -// OutputDebugString(va("Matching because: psEntFoundValue '%s' & strFindValue '%s'\n",psEntFoundValue, strFindValue)); -// Sys_Printf("Matching because: psEntFoundValue '%s' & strFindValue '%s'\n",psEntFoundValue, strFindValue); + // OutputDebugString(va("Matching because: psEntFoundValue '%s' & strFindValue '%s'\n",psEntFoundValue, strFindValue)); + // Sys_Printf("Matching because: psEntFoundValue '%s' & strFindValue '%s'\n",psEntFoundValue, strFindValue); -// if (strstr(psEntFoundValue,"killsplat")) -// { -// DebugBreak(); -// } + // if (strstr(psEntFoundValue,"killsplat")) + // { + // DebugBreak(); + // } } bMatch = true; break; @@ -3661,13 +3704,13 @@ bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search if (bMatch) { bFoundSomething = true; - pLastFoundEnt = ent; - pLastFoundBrush = b; + pLastFoundEnt = ent; + pLastFoundBrush = b; iBrushesSelected++; g_bScreenUpdates = false; // !!!!!!!!!!!!!!!!!!!!!!!!!!!! - - Select_Brush(b); + + Select_Brush(b); g_bScreenUpdates = true; // !!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -3687,21 +3730,21 @@ bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search if (pLastFoundEnt->origin[0] != 0.0f || pLastFoundEnt->origin[1] != 0.0f || pLastFoundEnt->origin[2] != 0.0f) { - VectorCopy(pLastFoundEnt->origin,v3Origin); + VectorCopy(pLastFoundEnt->origin, v3Origin); } else { // pLastFoundEnt's origin is zero, so use average point of brush mins maxs instead... // - v3Origin[0] = (pLastFoundBrush->mins[0] + pLastFoundBrush->maxs[0])/2; - v3Origin[1] = (pLastFoundBrush->mins[1] + pLastFoundBrush->maxs[1])/2; - v3Origin[2] = (pLastFoundBrush->mins[2] + pLastFoundBrush->maxs[2])/2; + v3Origin[0] = (pLastFoundBrush->mins[0] + pLastFoundBrush->maxs[0]) / 2; + v3Origin[1] = (pLastFoundBrush->mins[1] + pLastFoundBrush->maxs[1]) / 2; + v3Origin[2] = (pLastFoundBrush->mins[2] + pLastFoundBrush->maxs[2]) / 2; } // got one, jump the camera to it... // VectorCopy(v3Origin, g_pParentWnd->GetCamera()->Camera().origin); - g_pParentWnd->GetCamera()->Camera().origin[1] -= 32; // back off a touch to look at it + g_pParentWnd->GetCamera()->Camera().origin[1] -= 32; // back off a touch to look at it g_pParentWnd->GetCamera()->Camera().angles[0] = 0; g_pParentWnd->GetCamera()->Camera().angles[1] = 90; g_pParentWnd->GetCamera()->Camera().angles[2] = 0; @@ -3711,7 +3754,7 @@ bool FindNextBrush(brush_t* pPrevFoundBrush) // can be NULL for fresh search g_pParentWnd->SetActiveXY(g_pParentWnd->GetXYWnd()); g_pParentWnd->GetXYWnd()->PositionView(); - Sys_UpdateWindows (W_ALL); + Sys_UpdateWindows(W_ALL); // // and record for next find request (F3)... // @@ -3727,56 +3770,56 @@ void CMainFrame::OnMiscFindOrReplaceEntity() CEntKeyFindReplace FindReplace(&strFindKey, &strFindValue, &strReplaceKey, &strReplaceValue, &gbWholeStringMatchOnly, &gbSelectAllMatchingEnts); switch (FindReplace.DoModal()) { - case ID_RET_REPLACE: - { - brush_t* next = NULL; - int iOccurences = 0; - for (brush_t* b = active_brushes.next ; b != &active_brushes ; b = next) + case ID_RET_REPLACE: + { + brush_t* next = NULL; + int iOccurences = 0; + for (brush_t* b = active_brushes.next; b != &active_brushes; b = next) + { + next = b->next; // important to do this here, in case brush gets linked to a different list + entity_t* ent = b->owner; + + if (ent) // needed! { - next = b->next; // important to do this here, in case brush gets linked to a different list - entity_t* ent = b->owner; + if (FilterBrush(b)) + continue; - if (ent) // needed! + const char* psEntFoundValue = ValueForKey(ent, strFindKey); + + if (stricmp(strFindValue, psEntFoundValue) == 0 || // found this exact key/value + (strlen(psEntFoundValue) && strFindValue.IsEmpty()) // or any value for this key if blank value search specified + ) { - if (FilterBrush (b)) - continue; - - const char *psEntFoundValue = ValueForKey(ent, strFindKey); - - if (stricmp(strFindValue, psEntFoundValue)==0 || // found this exact key/value - (strlen(psEntFoundValue) && strFindValue.IsEmpty()) // or any value for this key if blank value search specified - ) + // found this search key/value, so delete it... + // + DeleteKey(ent, strFindKey); + // + // and replace with the new key/value (if specified)... + // + if (!strReplaceKey.IsEmpty() && !strReplaceValue.IsEmpty()) { - // found this search key/value, so delete it... - // - DeleteKey(ent,strFindKey); - // - // and replace with the new key/value (if specified)... - // - if (!strReplaceKey.IsEmpty() && !strReplaceValue.IsEmpty()) - { - SetKeyValue (ent, strReplaceKey, strReplaceValue); - } - iOccurences++; + SetKeyValue(ent, strReplaceKey, strReplaceValue); } + iOccurences++; } } - if (iOccurences) - { - common->Printf("%d occurence(s) replaced\n",iOccurences); - } - else - { - common->Printf("Nothing found to replace\n"); - } } - break; - case ID_RET_FIND: + if (iOccurences) { - gpPrevEntBrushFound = NULL; - FindNextBrush(NULL); + common->Printf("%d occurence(s) replaced\n", iOccurences); } - break; + else + { + common->Printf("Nothing found to replace\n"); + } + } + break; + case ID_RET_FIND: + { + gpPrevEntBrushFound = NULL; + FindNextBrush(NULL); + } + break; } } void CMainFrame::OnMiscFindNextEntity() @@ -3799,25 +3842,25 @@ void CMainFrame::OnMiscSetViewPos() float fYaw = 0; psNewCoords.Remove(','); - int iArgsFound = sscanf(psNewCoords,"%f %f %f",&v3Viewpos[0], &v3Viewpos[1], &v3Viewpos[2]); + int iArgsFound = sscanf(psNewCoords, "%f %f %f", &v3Viewpos[0], &v3Viewpos[1], &v3Viewpos[2]); if (iArgsFound == 3) { // try for an optional 4th (note how this wasn't part of the sscanf() above, so I can check 1st-3, not just any 3) // - int iArgsFound = sscanf(psNewCoords,"%f %f %f %f", &v3Viewpos[0], &v3Viewpos[1], &v3Viewpos[2], &fYaw); + int iArgsFound = sscanf(psNewCoords, "%f %f %f %f", &v3Viewpos[0], &v3Viewpos[1], &v3Viewpos[2], &fYaw); if (iArgsFound != 4) { fYaw = 0; // jic } g_pParentWnd->GetCamera()->Camera().angles[YAW] = fYaw; - VectorCopy (v3Viewpos, g_pParentWnd->GetCamera()->Camera().origin); - VectorCopy (v3Viewpos, g_pParentWnd->GetXYWnd()->GetOrigin()); - Sys_UpdateWindows (W_ALL); + VectorCopy(v3Viewpos, g_pParentWnd->GetCamera()->Camera().origin); + VectorCopy(v3Viewpos, g_pParentWnd->GetXYWnd()->GetOrigin()); + Sys_UpdateWindows(W_ALL); } else { - ErrorBox(va("\"%s\" wasn't 3 valid floats with spaces",psNewCoords)); + ErrorBox(va("\"%s\" wasn't 3 valid floats with spaces", psNewCoords)); } } } @@ -3963,7 +4006,7 @@ void CMainFrame::OnBrushFlipx() { Undo_AddBrushList(&selected_brushes); Select_FlipAxis(0); - for (brush_t * b = selected_brushes.next; b != &selected_brushes; b = b->next) { + for (brush_t* b = selected_brushes.next; b != &selected_brushes; b = b->next) { if (b->owner->eclass->fixedsize) { char buf[16]; float a = FloatForKey(b->owner, "angle"); @@ -3972,7 +4015,7 @@ void CMainFrame::OnBrushFlipx() { Brush_Build(b); } } - Patch_ToggleInverted(); + Patch_ToggleInverted(); Undo_EndBrushList(&selected_brushes); Undo_End(); } @@ -3986,7 +4029,7 @@ void CMainFrame::OnBrushFlipy() { Undo_AddBrushList(&selected_brushes); Select_FlipAxis(1); - for (brush_t * b = selected_brushes.next; b != &selected_brushes; b = b->next) { + for (brush_t* b = selected_brushes.next; b != &selected_brushes; b = b->next) { if (b->owner->eclass->fixedsize) { float a = FloatForKey(b->owner, "angle"); if (a == 0 || a == 180 || a == 360) { @@ -4016,7 +4059,7 @@ void CMainFrame::OnBrushFlipy() { Brush_Build(b); } } - Patch_ToggleInverted(); + Patch_ToggleInverted(); Undo_EndBrushList(&selected_brushes); Undo_End(); } @@ -4186,7 +4229,7 @@ void CMainFrame::OnSelectionCsgmerge() { ======================================================================================================================= */ void CMainFrame::OnSelectionDelete() { - brush_t *brush; + brush_t* brush; // if (ActiveXY()) ActiveXY()->UndoCopy(); Undo_Start("delete"); @@ -4211,22 +4254,28 @@ void CMainFrame::OnSelectionDeselect() { if (!ByeByeSurfaceDialog()) { if (g_bClipMode) { OnViewClipper(); - } else if (g_bRotateMode) { + } + else if (g_bRotateMode) { OnSelectMouserotate(); - } else if (g_bScaleMode) { + } + else if (g_bScaleMode) { OnSelectMousescale(); - } else if (g_bPathMode) { + } + else if (g_bPathMode) { if (ActiveXY()) { ActiveXY()->KillPathMode(); } - } else if (g_bAxialMode) { + } + else if (g_bAxialMode) { g_bAxialMode = false; Sys_UpdateWindows(W_CAMERA); - } else { + } + else { if (g_qeglobals.d_select_mode == sel_curvepoint && g_qeglobals.d_num_move_points > 0) { g_qeglobals.d_num_move_points = 0; Sys_UpdateWindows(W_ALL); - } else { + } + else { Select_Deselect(); SetStatusText(2, " "); } @@ -4336,11 +4385,11 @@ void CMainFrame::OnSelectionUngroupentity() { void CMainFrame::OnAutocaulk() { - Select_AutoCaulk(); + Select_AutoCaulk(); } void CMainFrame::OnUpdateAutocaulk(CCmdUI* pCmdUI) { - pCmdUI->Enable( selected_brushes.next != &selected_brushes); + pCmdUI->Enable(selected_brushes.next != &selected_brushes); } @@ -4382,7 +4431,7 @@ void CMainFrame::OnViewChange() { */ void CMainFrame::OnViewCameraupdate() { g_qeglobals.flatRotation++; - + if (g_qeglobals.flatRotation > 2) { g_qeglobals.flatRotation = 0; } @@ -4391,7 +4440,8 @@ void CMainFrame::OnViewCameraupdate() { g_qeglobals.rotateAxis = 0; if (ActiveXY()->GetViewType() == XY) { g_qeglobals.rotateAxis = 2; - } else if (ActiveXY()->GetViewType() == XZ) { + } + else if (ActiveXY()->GetViewType() == XZ) { g_qeglobals.rotateAxis = 1; } } @@ -4571,7 +4621,7 @@ void CMainFrame::OnPrefs() { g_Inspectors->texWnd.UpdatePrefs(); - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); if (pMenu) { pMenu->CheckMenuItem(ID_SNAPTOGRID, MF_BYCOMMAND | (!g_PrefsDlg.m_bNoClamp) ? MF_CHECKED : MF_UNCHECKED); } @@ -4593,7 +4643,8 @@ void CMainFrame::SetWindowStyle(int nStyle) { void CMainFrame::OnTogglecamera() { if (m_pCamWnd->IsWindowVisible()) { m_pCamWnd->ShowWindow(SW_HIDE); - } else { + } + else { m_pCamWnd->ShowWindow(SW_SHOW); } RecalcMainLayout(); @@ -4605,11 +4656,12 @@ void CMainFrame::OnTogglecamera() { ======================================================================================================================= */ void CMainFrame::OnToggleview() { - CWnd *pViewWnd = (m_pXYDockWnd && m_pXYDockWnd->GetSafeHwnd()) ? static_cast(m_pXYDockWnd) : static_cast(m_pXYWnd); + CWnd* pViewWnd = (m_pXYDockWnd && m_pXYDockWnd->GetSafeHwnd()) ? static_cast(m_pXYDockWnd) : static_cast(m_pXYWnd); if (pViewWnd && pViewWnd->GetSafeHwnd()) { if (pViewWnd->IsWindowVisible()) { pViewWnd->ShowWindow(SW_HIDE); - } else { + } + else { pViewWnd->ShowWindow(SW_SHOW); } RecalcMainLayout(); @@ -4624,7 +4676,8 @@ void CMainFrame::OnTogglez() { if (m_pZWnd && m_pZWnd->GetSafeHwnd()) { if (m_pZWnd->IsWindowVisible()) { m_pZWnd->ShowWindow(SW_HIDE); - } else { + } + else { m_pZWnd->ShowWindow(SW_SHOW); } RecalcXYDockLayout(); @@ -4639,7 +4692,7 @@ void CMainFrame::OnTogglez() { void CMainFrame::OnToggleLock() { g_PrefsDlg.m_bTextureLock = !g_PrefsDlg.m_bTextureLock; - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); if (pMenu) { pMenu->CheckMenuItem(ID_TOGGLE_LOCK, MF_BYCOMMAND | (g_PrefsDlg.m_bTextureLock) ? MF_CHECKED : MF_UNCHECKED); } @@ -4685,7 +4738,8 @@ void CMainFrame::OnViewNextview() { g_qeglobals.rotateAxis = 0; if (ActiveXY()->GetViewType() == XY) { g_qeglobals.rotateAxis = 2; - } else if (ActiveXY()->GetViewType() == XZ) { + } + else if (ActiveXY()->GetViewType() == XZ) { g_qeglobals.rotateAxis = 1; } } @@ -4701,7 +4755,7 @@ void CMainFrame::OnHelpCommandlist() { dlg.DoModal(); #if 0 if (g_b3Dfx) { - C3DFXCamWnd *pWnd = new C3DFXCamWnd(); + C3DFXCamWnd* pWnd = new C3DFXCamWnd(); CRect rect(50, 50, 400, 400); pWnd->Create(_3DFXCAMERA_WINDOW_CLASS, "", QE3_CHILDSTYLE, rect, this, 1234); pWnd->ShowWindow(SW_SHOW); @@ -4733,7 +4787,7 @@ void CMainFrame::UpdateStatusText() { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::SetStatusText(int nPane, const char *pText) { +void CMainFrame::SetStatusText(int nPane, const char* pText) { if (pText && nPane <= 5 && nPane >= 0) { m_strStatus[nPane] = pText; UpdateStatusText(); @@ -4789,7 +4843,7 @@ void WINAPI Sys_UpdateWindows(int nBits) { if (g_PrefsDlg.m_bQE4Painting) { g_nUpdateBits |= nBits; } - else if ( g_pParentWnd ) { + else if (g_pParentWnd) { g_pParentWnd->UpdateWindows(nBits); } } @@ -4815,10 +4869,12 @@ void CMainFrame::OnClipSelected() { m_pActiveXY->Clip(); Undo_EndBrushList(&selected_brushes); Undo_End(); - } else { + } + else { if (g_bPatchBendMode) { Patch_BendHandleENTER(); - } else if (g_bAxialMode) { + } + else if (g_bAxialMode) { } //else if (g_bPatchBendMode) { @@ -4845,7 +4901,7 @@ void CMainFrame::OnSplitSelected() { ======================================================================================================================= ======================================================================================================================= */ -CXYWnd *CMainFrame::ActiveXY() { +CXYWnd* CMainFrame::ActiveXY() { return m_pActiveXY; } @@ -4859,7 +4915,8 @@ void CMainFrame::OnToggleviewXz() { g_PrefsDlg.m_bXZVis = m_pXZWnd->IsWindowVisible(); if (g_PrefsDlg.m_bXZVis) { m_pXZWnd->ShowWindow(SW_HIDE); - } else { + } + else { m_pXZWnd->ShowWindow(SW_SHOW); } @@ -4877,7 +4934,8 @@ void CMainFrame::OnToggleviewYz() { g_PrefsDlg.m_bYZVis = m_pYZWnd->IsWindowVisible(); if (g_PrefsDlg.m_bYZVis) { m_pYZWnd->ShowWindow(SW_HIDE); - } else { + } + else { m_pYZWnd->ShowWindow(SW_SHOW); } @@ -4896,7 +4954,8 @@ void CMainFrame::OnToggleToolbar() BOOL bShow = !m_wndToolBar.IsWindowVisible(); if (m_pXYDockWnd && m_pXYDockWnd->GetSafeHwnd()) { m_pXYDockWnd->ShowEmbeddedToolBar(bShow); - } else { + } + else { m_wndToolBar.ShowWindow(bShow ? SW_SHOW : SW_HIDE); } } @@ -5129,14 +5188,14 @@ void CMainFrame::OnColorSetblack() { } void CMainFrame::OnColorSetMax() { - for (int i=0 ; i<3 ; i++) { + for (int i = 0; i < 3; i++) { g_qeglobals.d_savedinfo.colors[COLOR_TEXTUREBACK][i] = 0.25f; g_qeglobals.d_savedinfo.colors[COLOR_GRIDBACK][i] = 0.77f; g_qeglobals.d_savedinfo.colors[COLOR_GRIDMINOR][i] = 0.83f; g_qeglobals.d_savedinfo.colors[COLOR_GRIDMAJOR][i] = 0.89f; g_qeglobals.d_savedinfo.colors[COLOR_CAMERABACK][i] = 0.25f; } - + g_qeglobals.d_savedinfo.colors[COLOR_GRIDBLOCK][0] = 1.0f; g_qeglobals.d_savedinfo.colors[COLOR_GRIDBLOCK][1] = 1.0f; g_qeglobals.d_savedinfo.colors[COLOR_GRIDBLOCK][2] = 1.0f; @@ -5163,9 +5222,9 @@ void CMainFrame::OnColorSetMax() { g_qeglobals.d_savedinfo.colors[COLOR_PRECISION_CROSSHAIR][0] = 1.0f; g_qeglobals.d_savedinfo.colors[COLOR_PRECISION_CROSSHAIR][1] = 0.0f; g_qeglobals.d_savedinfo.colors[COLOR_PRECISION_CROSSHAIR][2] = 1.0f; - - Sys_UpdateWindows (W_ALL); - + + Sys_UpdateWindows(W_ALL); + } /* @@ -5176,7 +5235,7 @@ void CMainFrame::OnSnaptogrid() { g_PrefsDlg.m_bNoClamp ^= 1; g_PrefsDlg.SavePrefs(); - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); if (pMenu) { pMenu->CheckMenuItem(ID_SNAPTOGRID, MF_BYCOMMAND | (!g_PrefsDlg.m_bNoClamp) ? MF_CHECKED : MF_UNCHECKED); } @@ -5227,7 +5286,8 @@ void CMainFrame::OnSelectMouserotate() { g_qeglobals.rotateAxis = 0; if (ActiveXY()->GetViewType() == XY) { g_qeglobals.rotateAxis = 2; - } else if (ActiveXY()->GetViewType() == XZ) { + } + else if (ActiveXY()->GetViewType() == XZ) { g_qeglobals.rotateAxis = 1; } m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SELECT_MOUSEROTATE, TRUE); @@ -5281,7 +5341,7 @@ void CMainFrame::OnEditRedo() { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::OnUpdateEditUndo(CCmdUI *pCmdUI) { +void CMainFrame::OnUpdateEditUndo(CCmdUI* pCmdUI) { /* * BOOL bEnable = false; if (ActiveXY()) bEnable = ActiveXY()->UndoAvailable(); * pCmdUI->Enable(bEnable); @@ -5293,7 +5353,7 @@ void CMainFrame::OnUpdateEditUndo(CCmdUI *pCmdUI) { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::OnUpdateEditRedo(CCmdUI *pCmdUI) { +void CMainFrame::OnUpdateEditRedo(CCmdUI* pCmdUI) { pCmdUI->Enable(Undo_RedoAvailable()); } @@ -5303,7 +5363,7 @@ void CMainFrame::OnUpdateEditRedo(CCmdUI *pCmdUI) { */ void CMainFrame::OnSelectionTextureDec() { g_qeglobals.d_savedinfo.m_nTextureTweak -= 1.0f; - if ( g_qeglobals.d_savedinfo.m_nTextureTweak == 0.0f ) { + if (g_qeglobals.d_savedinfo.m_nTextureTweak == 0.0f) { g_qeglobals.d_savedinfo.m_nTextureTweak -= 1.0f; } @@ -5315,7 +5375,7 @@ void CMainFrame::OnSelectionTextureDec() { ======================================================================================================================= */ void CMainFrame::OnSelectionTextureFit() { - Select_FitTexture( 1.0f, 1.0f ); + Select_FitTexture(1.0f, 1.0f); } /* @@ -5324,7 +5384,7 @@ void CMainFrame::OnSelectionTextureFit() { */ void CMainFrame::OnSelectionTextureInc() { g_qeglobals.d_savedinfo.m_nTextureTweak += 1.0f; - if ( g_qeglobals.d_savedinfo.m_nTextureTweak == 0.0f ) { + if (g_qeglobals.d_savedinfo.m_nTextureTweak == 0.0f) { g_qeglobals.d_savedinfo.m_nTextureTweak += 1.0f; } @@ -5494,15 +5554,15 @@ void CMainFrame::SetGridStatus() { c1 = (g_PrefsDlg.m_bTextureLock) ? 'M' : ' '; c2 = (g_PrefsDlg.m_bRotateLock) ? 'R' : ' '; strStatus.Format - ( - "G:%1.2f T:%1.2f R:%i C:%i L:%c%c", - g_qeglobals.d_gridsize, - g_qeglobals.d_savedinfo.m_nTextureTweak, - g_PrefsDlg.m_nRotation, - g_PrefsDlg.m_nCubicScale, - c1, - c2 - ); + ( + "G:%1.2f T:%1.2f R:%i C:%i L:%c%c", + g_qeglobals.d_gridsize, + g_qeglobals.d_savedinfo.m_nTextureTweak, + g_PrefsDlg.m_nRotation, + g_PrefsDlg.m_nCubicScale, + c1, + c2 + ); SetStatusText(4, strStatus); } @@ -5617,7 +5677,7 @@ void CMainFrame::OnFileProjectsettings() { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::OnUpdateFileImport(CCmdUI *pCmdUI) { +void CMainFrame::OnUpdateFileImport(CCmdUI* pCmdUI) { pCmdUI->Enable(FALSE); } @@ -5658,13 +5718,13 @@ void CMainFrame::OnViewCubeout() { void CMainFrame::OnViewCubicclipping() { g_PrefsDlg.m_bCubicClipping ^= 1; - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); if (pMenu) { pMenu->CheckMenuItem - ( - ID_VIEW_CUBICCLIPPING, - MF_BYCOMMAND | (g_PrefsDlg.m_bCubicClipping) ? MF_CHECKED : MF_UNCHECKED - ); + ( + ID_VIEW_CUBICCLIPPING, + MF_BYCOMMAND | (g_PrefsDlg.m_bCubicClipping) ? MF_CHECKED : MF_UNCHECKED + ); } m_wndToolBar.GetToolBarCtrl().CheckButton(ID_VIEW_CUBICCLIPPING, (g_PrefsDlg.m_bCubicClipping) ? TRUE : FALSE); @@ -5685,8 +5745,8 @@ void CMainFrame::OnFileSaveregion() { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::OnUpdateFileSaveregion(CCmdUI *pCmdUI) { - pCmdUI->Enable (static_cast(region_active)); +void CMainFrame::OnUpdateFileSaveregion(CCmdUI* pCmdUI) { + pCmdUI->Enable(static_cast(region_active)); } /* @@ -5738,7 +5798,7 @@ void CMainFrame::OnToolbarTexture() { ======================================================================================================================= */ void CMainFrame::OnSelectionPrint() { - for (brush_t * b = selected_brushes.next; b != &selected_brushes; b = b->next) { + for (brush_t* b = selected_brushes.next; b != &selected_brushes; b = b->next) { Brush_Print(b); } } @@ -5762,7 +5822,7 @@ void CMainFrame::OnSelectionTogglesizepaint() { if (::GetAsyncKeyState('Q')) { if (!g_bTABDown) { g_bTABDown = true; - g_bOriginalFlag = ( g_PrefsDlg.m_bSizePaint != FALSE ); + g_bOriginalFlag = (g_PrefsDlg.m_bSizePaint != FALSE); g_PrefsDlg.m_bSizePaint = !g_bOriginalFlag; Sys_UpdateWindows(W_XY); return; @@ -5795,7 +5855,7 @@ void CMainFrame::OnBrushMakecone() { void CMainFrame::OnTexturesLoad() { BROWSEINFO bi; CString strPath; - char *p = strPath.GetBuffer(MAX_PATH + 1); + char* p = strPath.GetBuffer(MAX_PATH + 1); bi.hwndOwner = GetSafeHwnd(); bi.pidlRoot = NULL; bi.pszDisplayName = p; @@ -5972,7 +6032,8 @@ void CMainFrame::NudgeSelection(int nDirection, float fAmount) { int nAxis = 0; if (ActiveXY()->GetViewType() == XY) { nAxis = 2; - } else if (g_pParentWnd->ActiveXY()->GetViewType() == XZ) { + } + else if (g_pParentWnd->ActiveXY()->GetViewType() == XZ) { nAxis = 1; fAmount = -fAmount; } @@ -5987,12 +6048,12 @@ void CMainFrame::NudgeSelection(int nDirection, float fAmount) { CString strStatus; strStatus.Format - ( - "Rotation x:: %.1f y:: %.1f z:: %.1f", - g_pParentWnd->ActiveXY()->Rotation()[0], - g_pParentWnd->ActiveXY()->Rotation()[1], - g_pParentWnd->ActiveXY()->Rotation()[2] - ); + ( + "Rotation x:: %.1f y:: %.1f z:: %.1f", + g_pParentWnd->ActiveXY()->Rotation()[0], + g_pParentWnd->ActiveXY()->Rotation()[1], + g_pParentWnd->ActiveXY()->Rotation()[2] + ); g_pParentWnd->SetStatusText(2, strStatus); Select_RotateAxis(nAxis, fDeg, false, true); Sys_UpdateWindows(W_ALL); @@ -6049,7 +6110,7 @@ void CMainFrame::NudgeSelection(int nDirection, float fAmount) { ======================================================================================================================= ======================================================================================================================= */ -BOOL CMainFrame::PreTranslateMessage(MSG *pMsg) { +BOOL CMainFrame::PreTranslateMessage(MSG* pMsg) { if (pMsg && IsDockedGameInputActive()) { const UINT message = pMsg->message; const BOOL keyMessage = (message >= WM_KEYFIRST && message <= WM_KEYLAST); @@ -6073,7 +6134,8 @@ BOOL CMainFrame::PreTranslateMessage(MSG *pMsg) { if (pMsg->message == WM_SYSKEYDOWN) { menuKey = TRUE; - } else if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_F10) { + } + else if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_F10) { menuKey = TRUE; } @@ -6118,10 +6180,10 @@ void CMainFrame::OnTexturesLoadlist() { void CMainFrame::OnSelectByBoundingBrush() { g_PrefsDlg.m_selectByBoundingBrush ^= 1; m_wndToolBar.GetToolBarCtrl().CheckButton - ( - ID_SELECT_BYBOUNDINGBRUSH, - (g_PrefsDlg.m_selectByBoundingBrush) ? TRUE : FALSE - ); + ( + ID_SELECT_BYBOUNDINGBRUSH, + (g_PrefsDlg.m_selectByBoundingBrush) ? TRUE : FALSE + ); } /* @@ -6141,7 +6203,7 @@ void CMainFrame::OnSelectBrushesOnly() { ======================================================================================================================= */ void CMainFrame::OnDynamicLighting() { - CCamWnd *pCam = new CCamWnd(); + CCamWnd* pCam = new CCamWnd(); CRect rect(100, 100, 300, 300); pCam->Create(CAMERA_WINDOW_CLASS, "", WS_OVERLAPPEDWINDOW, rect, GetDesktopWindow(), 12345); pCam->ShowWindow(SW_SHOW); @@ -6501,26 +6563,27 @@ void CMainFrame::OnPatchTab() { else if (g_bAxialMode) { int faceCount = g_ptrSelectedFaces.GetSize(); if (faceCount > 0) { - face_t *selFace = reinterpret_cast < face_t * > (g_ptrSelectedFaces.GetAt(0)); - int *ip = (Sys_KeyDown(VK_SHIFT)) ? &g_axialAnchor : &g_axialDest; + face_t* selFace = reinterpret_cast (g_ptrSelectedFaces.GetAt(0)); + int* ip = (Sys_KeyDown(VK_SHIFT)) ? &g_axialAnchor : &g_axialDest; (*ip)++; - if ( *ip >= selFace->face_winding->GetNumPoints() ) { + if (*ip >= selFace->face_winding->GetNumPoints()) { *ip = 0; } } Sys_UpdateWindows(W_CAMERA); - } else { + } + else { // // check to see if the selected brush is part of a func group if it is, deselect // everything and reselect the next brush in the group // - brush_t *b = selected_brushes.next; - entity_t *e; + brush_t* b = selected_brushes.next; + entity_t* e; if (b != &selected_brushes) { - if ( idStr::Icmp(b->owner->eclass->name, "worldspawn") != 0 ) { + if (idStr::Icmp(b->owner->eclass->name, "worldspawn") != 0) { e = b->owner; Select_Deselect(); - brush_t *b2; + brush_t* b2; for (b2 = e->brushes.onext; b2 != &e->brushes; b2 = b2->onext) { if (b == b2) { b2 = b2->onext; @@ -6535,7 +6598,7 @@ void CMainFrame::OnPatchTab() { Select_Brush(b2, false); Sys_UpdateWindows(W_ALL); } - } + } } } @@ -6676,7 +6739,7 @@ void CMainFrame::OnCurvePatchsquare() { ======================================================================================================================= */ void CMainFrame::CheckTextureScale(int id) { - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); if (pMenu) { pMenu->CheckMenuItem(ID_TEXTURES_TEXTUREWINDOWSCALE_10, MF_BYCOMMAND | MF_UNCHECKED); pMenu->CheckMenuItem(ID_TEXTURES_TEXTUREWINDOWSCALE_25, MF_BYCOMMAND | MF_UNCHECKED); @@ -6774,8 +6837,8 @@ void CMainFrame::OnCurveThicken() { Undo_AddBrushList(&selected_brushes); CDialogThick dlg; - if ( dlg.DoModal() == IDOK ) { - Patch_Thicken( dlg.m_nAmount, ( dlg.m_bSeams != FALSE ) ); + if (dlg.DoModal() == IDOK) { + Patch_Thicken(dlg.m_nAmount, (dlg.m_bSeams != FALSE)); Sys_UpdateWindows(W_ALL); } @@ -6812,7 +6875,7 @@ void CMainFrame::OnCurveMatrixTranspose() { */ void CMainFrame::OnTexturesReloadshaders() { CWaitCursor wait; - declManager->Reload( false ); + declManager->Reload(false); Sys_UpdateWindows(W_ALL); } @@ -6821,7 +6884,7 @@ void CMainFrame::OnTexturesReloadshaders() { ======================================================================================================================= */ void CMainFrame::SetEntityCheck() { - CMenu *pMenu = GetMenu(); + CMenu* pMenu = GetMenu(); if (pMenu) { pMenu->CheckMenuItem(ID_VIEW_ENTITIESAS_WIREFRAME, MF_BYCOMMAND | (g_PrefsDlg.m_nEntityShowState == ENTITY_WIRE) ? MF_CHECKED : MF_UNCHECKED); pMenu->CheckMenuItem(ID_VIEW_ENTITIESAS_SKINNED, MF_BYCOMMAND | (g_PrefsDlg.m_nEntityShowState == ENTITY_SKINNED) ? MF_CHECKED : MF_UNCHECKED); @@ -6985,14 +7048,14 @@ void CMainFrame::OnViewShowangles() { */ void CMainFrame::OnEditSaveprefab() { CFileDialog dlgFile - ( - FALSE, - "pfb", - NULL, - OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "Prefab files (*.pfb)|*.pfb||", - this - ); + ( + FALSE, + "pfb", + NULL, + OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + "Prefab files (*.pfb)|*.pfb||", + this + ); char CurPath[1024]; ::GetCurrentDirectory(1024, CurPath); @@ -7008,14 +7071,14 @@ void CMainFrame::OnEditSaveprefab() { */ void CMainFrame::OnEditLoadprefab() { CFileDialog dlgFile - ( - TRUE, - "pfb", - NULL, - OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "Prefab files (*.pfb)|*.pfb||", - this - ); + ( + TRUE, + "pfb", + NULL, + OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, + "Prefab files (*.pfb)|*.pfb||", + this + ); char CurPath[1024]; ::GetCurrentDirectory(1024, CurPath); dlgFile.m_ofn.lpstrInitialDir = CurPath; @@ -7138,7 +7201,7 @@ void CMainFrame::OnSelectionInvert() { ======================================================================================================================= */ void CMainFrame::OnProjectedLight() { - LightEditorInit( NULL ); + LightEditorInit(NULL); } /* @@ -7165,10 +7228,10 @@ void CMainFrame::OnShowLightvolumes() { ======================================================================================================================= ======================================================================================================================= */ -void CMainFrame::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) { +void CMainFrame::OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized) { CFrameWnd::OnActivate(nState, pWndOther, bMinimized); - if ( nState != WA_INACTIVE ) { + if (nState != WA_INACTIVE) { AttachDoomWindowToGameTab(); ApplyActiveTabInputMode(); @@ -7179,7 +7242,7 @@ void CMainFrame::OnActivate(UINT nState, CWnd *pWndOther, BOOL bMinimized) { } } else { - //com_editorActive = false; + //com_editorActive = false; } } @@ -7300,7 +7363,7 @@ extern void Patch_AdjustSubdivisions(float hadj, float vadj); ======================================================================================================================= */ void CMainFrame::OnCurveIncreaseVert() { - Patch_AdjustSubdivisions( 0.0f, -0.5f ); + Patch_AdjustSubdivisions(0.0f, -0.5f); } /* @@ -7308,7 +7371,7 @@ void CMainFrame::OnCurveIncreaseVert() { ======================================================================================================================= */ void CMainFrame::OnCurveDecreaseVert() { - Patch_AdjustSubdivisions( 0.0f, 0.5f ); + Patch_AdjustSubdivisions(0.0f, 0.5f); } /* @@ -7316,7 +7379,7 @@ void CMainFrame::OnCurveDecreaseVert() { ======================================================================================================================= */ void CMainFrame::OnCurveIncreaseHorz() { - Patch_AdjustSubdivisions( -0.5f, 0.0f ); + Patch_AdjustSubdivisions(-0.5f, 0.0f); } /* @@ -7324,7 +7387,7 @@ void CMainFrame::OnCurveIncreaseHorz() { ======================================================================================================================= */ void CMainFrame::OnCurveDecreaseHorz() { - Patch_AdjustSubdivisions( 0.5f, 0.0f ); + Patch_AdjustSubdivisions(0.5f, 0.0f); } /* @@ -7336,13 +7399,13 @@ void CMainFrame::OnSelectionMoveonly() { m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SELECTION_MOVEONLY, (g_moveOnly) ? TRUE : FALSE); } -void CMainFrame::OnSelectBrushlight() +void CMainFrame::OnSelectBrushlight() { // TODO: Add your command handler code here - + } -void CMainFrame::OnSelectionCombine() +void CMainFrame::OnSelectionCombine() { if (g_qeglobals.d_select_count < 2) { Sys_Status("Must have at least two things selected.", 0); @@ -7350,7 +7413,7 @@ void CMainFrame::OnSelectionCombine() return; } - entity_t *e1 = g_qeglobals.d_select_order[0]->owner; + entity_t* e1 = g_qeglobals.d_select_order[0]->owner; if (e1 == world_entity) { Sys_Status("First selection must not be world.", 0); @@ -7379,7 +7442,7 @@ void CMainFrame::OnSelectionCombine() } bool setModel = true; - for (brush_t *b = selected_brushes.next; b != &selected_brushes; b = b->next) { + for (brush_t* b = selected_brushes.next; b != &selected_brushes; b = b->next) { if (b->owner != e1) { if (e1->eclass->nShowFlags & ECLASS_LIGHT) { if (GetVectorForKey(b->owner, "origin", v)) { @@ -7395,7 +7458,8 @@ void CMainFrame::OnSelectionCombine() if (b->modelHandle) { SetKeyValue(e1, "model", ValueForKey(b->owner, "model")); setModel = false; - } else { + } + else { b->entityModel = true; } } @@ -7413,15 +7477,16 @@ void CMainFrame::OnSelectionCombine() Sys_UpdateWindows(W_XY | W_CAMERA); } -extern void Patch_Weld(patchMesh_t *p, patchMesh_t *p2); +extern void Patch_Weld(patchMesh_t* p, patchMesh_t* p2); void CMainFrame::OnPatchCombine() { - patchMesh_t *p, *p2; + patchMesh_t* p, * p2; p = p2 = NULL; - for (brush_t *b = selected_brushes.next; b != &selected_brushes; b = b->next) { + for (brush_t* b = selected_brushes.next; b != &selected_brushes; b = b->next) { if (b->pPatch) { if (p == NULL) { p = b->pPatch; - } else if (p2 == NULL) { + } + else if (p2 == NULL) { p2 = b->pPatch; Patch_Weld(p, p2); return; @@ -7430,7 +7495,7 @@ void CMainFrame::OnPatchCombine() { } } -void CMainFrame::OnShowDoom() +void CMainFrame::OnShowDoom() { // Legacy command path. The menu/toolbar entry is removed, but if an old // accelerator or external command still reaches this handler, switch to the @@ -7444,14 +7509,14 @@ void CMainFrame::OnShowDoom() } } -void CMainFrame::OnViewRendermode() +void CMainFrame::OnViewRendermode() { m_pCamWnd->ToggleRenderMode(); CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_RENDERMODE, MF_BYCOMMAND | (m_pCamWnd->GetRenderMode()) ? MF_CHECKED : MF_UNCHECKED); Sys_UpdateWindows(W_ALL); } -void CMainFrame::OnViewRebuildrenderdata() +void CMainFrame::OnViewRebuildrenderdata() { m_pCamWnd->BuildRendererState(); if (!m_pCamWnd->GetRenderMode()) { @@ -7460,35 +7525,35 @@ void CMainFrame::OnViewRebuildrenderdata() Sys_UpdateWindows(W_ALL); } -void CMainFrame::OnViewRealtimerebuild() +void CMainFrame::OnViewRealtimerebuild() { m_pCamWnd->ToggleRebuildMode(); CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_REALTIMEREBUILD, MF_BYCOMMAND | (m_pCamWnd->GetRebuildMode()) ? MF_CHECKED : MF_UNCHECKED); Sys_UpdateWindows(W_ALL); } -void CMainFrame::OnViewRenderentityoutlines() +void CMainFrame::OnViewRenderentityoutlines() { m_pCamWnd->ToggleEntityMode(); CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_RENDERENTITYOUTLINES, MF_BYCOMMAND | (m_pCamWnd->GetEntityMode()) ? MF_CHECKED : MF_UNCHECKED); Sys_UpdateWindows(W_ALL); } -void CMainFrame::OnViewMaterialanimation() +void CMainFrame::OnViewMaterialanimation() { m_pCamWnd->ToggleAnimationMode(); CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_MATERIALANIMATION, MF_BYCOMMAND | (m_pCamWnd->GetAnimationMode()) ? MF_CHECKED : MF_UNCHECKED); Sys_UpdateWindows(W_ALL); } -extern void Face_SetAxialScale_BrushPrimit(face_t *face, bool y); +extern void Face_SetAxialScale_BrushPrimit(face_t* face, bool y); void CMainFrame::OnAxialTextureByWidth() { // temp test code int faceCount = g_ptrSelectedFaces.GetSize(); - + if (faceCount > 0) { for (int i = 0; i < faceCount; i++) { - face_t *selFace = reinterpret_cast < face_t * > (g_ptrSelectedFaces.GetAt(i)); + face_t* selFace = reinterpret_cast (g_ptrSelectedFaces.GetAt(i)); Face_SetAxialScale_BrushPrimit(selFace, false); } Sys_UpdateWindows(W_CAMERA); @@ -7499,10 +7564,10 @@ void CMainFrame::OnAxialTextureByWidth() { void CMainFrame::OnAxialTextureByHeight() { // temp test code int faceCount = g_ptrSelectedFaces.GetSize(); - + if (faceCount > 0) { for (int i = 0; i < faceCount; i++) { - face_t *selFace = reinterpret_cast < face_t * > (g_ptrSelectedFaces.GetAt(i)); + face_t* selFace = reinterpret_cast (g_ptrSelectedFaces.GetAt(i)); Face_SetAxialScale_BrushPrimit(selFace, true); } Sys_UpdateWindows(W_CAMERA); @@ -7523,7 +7588,7 @@ void CMainFrame::OnAxialTextureArbitrary() { } extern void Select_ToOBJ(); -void CMainFrame::OnSelectionExportToobj() +void CMainFrame::OnSelectionExportToobj() { Select_ToOBJ(); } @@ -7535,36 +7600,36 @@ void CMainFrame::OnSelectionExportToCM() } void CMainFrame::OnSelectionWireFrameOff() { - Select_WireFrame( false ); + Select_WireFrame(false); } void CMainFrame::OnSelectionWireFrameOn() { - Select_WireFrame( true ); + Select_WireFrame(true); } void CMainFrame::OnSelectionVisibleOn() { - Select_ForceVisible( true ); + Select_ForceVisible(true); } void CMainFrame::OnSelectionVisibleOff() { - Select_ForceVisible( false ); + Select_ForceVisible(false); } -void CMainFrame::OnViewRenderselection() +void CMainFrame::OnViewRenderselection() { m_pCamWnd->ToggleSelectMode(); CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_RENDERSELECTION, MF_BYCOMMAND | (m_pCamWnd->GetSelectMode()) ? MF_CHECKED : MF_UNCHECKED); Sys_UpdateWindows(W_CAMERA); } -void CMainFrame::OnSelectNomodels() +void CMainFrame::OnSelectNomodels() { g_PrefsDlg.m_selectNoModels ^= 1; m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SELECT_NOMODELS, (g_PrefsDlg.m_selectNoModels) ? TRUE : FALSE); } -void CMainFrame::OnViewShowShowvisportals() +void CMainFrame::OnViewShowShowvisportals() { if ((g_qeglobals.d_savedinfo.exclude ^= EXCLUDE_VISPORTALS) & EXCLUDE_VISPORTALS) { CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_SHOW_SHOWVISPORTALS, MF_BYCOMMAND | MF_UNCHECKED); @@ -7576,7 +7641,7 @@ void CMainFrame::OnViewShowShowvisportals() Sys_UpdateWindows(W_XY | W_CAMERA); } -void CMainFrame::OnViewShowNoDraw() +void CMainFrame::OnViewShowNoDraw() { if ((g_qeglobals.d_savedinfo.exclude ^= EXCLUDE_NODRAW) & EXCLUDE_NODRAW) { CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_SHOW_NODRAW, MF_BYCOMMAND | MF_UNCHECKED); @@ -7590,7 +7655,7 @@ void CMainFrame::OnViewShowNoDraw() -void CMainFrame::OnViewRendersound() +void CMainFrame::OnViewRendersound() { m_pCamWnd->ToggleSoundMode(); CheckMenuItem(RadiantMainMenuHandle(), ID_VIEW_RENDERSOUND, MF_BYCOMMAND | (m_pCamWnd->GetSoundMode()) ? MF_CHECKED : MF_UNCHECKED); @@ -7598,14 +7663,14 @@ void CMainFrame::OnViewRendersound() } -void CMainFrame::OnSoundShowsoundvolumes() +void CMainFrame::OnSoundShowsoundvolumes() { g_qeglobals.d_savedinfo.showSoundAlways ^= 1; if (g_qeglobals.d_savedinfo.showSoundAlways) { g_qeglobals.d_savedinfo.showSoundWhenSelected = false; } - m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSOUNDVOLUMES,g_qeglobals.d_savedinfo.showSoundAlways); - m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSELECTEDSOUNDVOLUMES,g_qeglobals.d_savedinfo.showSoundWhenSelected); + m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSOUNDVOLUMES, g_qeglobals.d_savedinfo.showSoundAlways); + m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSELECTEDSOUNDVOLUMES, g_qeglobals.d_savedinfo.showSoundWhenSelected); Sys_UpdateWindows(W_XY | W_CAMERA); } @@ -7620,9 +7685,9 @@ void CMainFrame::OnNurbEditor() { temp += "\r\n"; if (OpenClipboard()) { ::EmptyClipboard(); - HGLOBAL clip; + HGLOBAL clip; char* buff; - clip = ::GlobalAlloc(GMEM_DDESHARE, temp.Length()+1); + clip = ::GlobalAlloc(GMEM_DDESHARE, temp.Length() + 1); buff = (char*)::GlobalLock(clip); strcpy(buff, temp); ::GlobalUnlock(clip); @@ -7634,14 +7699,14 @@ void CMainFrame::OnNurbEditor() { } -void CMainFrame::OnSoundShowselectedsoundvolumes() +void CMainFrame::OnSoundShowselectedsoundvolumes() { g_qeglobals.d_savedinfo.showSoundWhenSelected ^= 1; if (g_qeglobals.d_savedinfo.showSoundWhenSelected) { g_qeglobals.d_savedinfo.showSoundAlways = false; } - m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSOUNDVOLUMES,g_qeglobals.d_savedinfo.showSoundAlways); - m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSELECTEDSOUNDVOLUMES,g_qeglobals.d_savedinfo.showSoundWhenSelected); + m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSOUNDVOLUMES, g_qeglobals.d_savedinfo.showSoundAlways); + m_wndToolBar.GetToolBarCtrl().CheckButton(ID_SOUND_SHOWSELECTEDSOUNDVOLUMES, g_qeglobals.d_savedinfo.showSoundWhenSelected); Sys_UpdateWindows(W_XY | W_CAMERA); } @@ -7653,26 +7718,26 @@ void CMainFrame::OnSelectAlltargets() void CMainFrame::OnSelectCompleteEntity() { - brush_t* b = NULL; - entity_t* e = NULL; + brush_t* b = NULL; + entity_t* e = NULL; - b = selected_brushes.next; - if ( b == &selected_brushes ) - { - return; //no brushes selected - } - - e = b->owner; - if ( b->owner == world_entity ) - { - return; //don't select the world entity - } + b = selected_brushes.next; + if (b == &selected_brushes) + { + return; //no brushes selected + } - for (b = e->brushes.onext; b != &e->brushes; b = b->onext) - { - Select_Brush ( b , false ); - } - Sys_UpdateWindows ( W_ALL ); + e = b->owner; + if (b->owner == world_entity) + { + return; //don't select the world entity + } + + for (b = e->brushes.onext; b != &e->brushes; b = b->onext) + { + Select_Brush(b, false); + } + Sys_UpdateWindows(W_ALL); } @@ -7695,48 +7760,48 @@ void CMainFrame::OnPrecisionCursorCycle() void CMainFrame::OnGenerateMaterialsList() { idStrList mtrList; - idStr mtrName,mtrFileName; + idStr mtrName, mtrFileName; - - g_Inspectors->consoleWnd.ExecuteCommand ( "clear" ); - Sys_BeginWait (); - common->Printf ( "Generating list of active materials...\n" ); - for ( brush_t* b = active_brushes.next ; b != &active_brushes ; b=b->next ) { - if ( b->pPatch ){ + g_Inspectors->consoleWnd.ExecuteCommand("clear"); + Sys_BeginWait(); + common->Printf("Generating list of active materials...\n"); + + for (brush_t* b = active_brushes.next; b != &active_brushes; b = b->next) { + if (b->pPatch) { mtrName = b->pPatch->d_texture->GetName(); - if ( !mtrList.Find( mtrName) ) { - mtrList.Insert ( mtrName ); + if (!mtrList.Find(mtrName)) { + mtrList.Insert(mtrName); } } else { - for ( face_t* f = b->brush_faces ; f != NULL ; f=f->next) + for (face_t* f = b->brush_faces; f != NULL; f = f->next) { mtrName = f->d_texture->GetName(); - if ( !mtrList.Find( mtrName) ) { - mtrList.Insert ( mtrName ); + if (!mtrList.Find(mtrName)) { + mtrList.Insert(mtrName); } } - } + } } mtrList.Sort(); - for ( int i = 0 ; i < mtrList.Num() ; i++ ) { - common->Printf ( "%s\n" , mtrList[i].c_str()); + for (int i = 0; i < mtrList.Num(); i++) { + common->Printf("%s\n", mtrList[i].c_str()); } - + mtrFileName = currentmap; -// mtrFileName.ExtractFileName( mtrFileName ); + // mtrFileName.ExtractFileName( mtrFileName ); mtrFileName = mtrFileName.StripPath(); - common->Printf ( "Done...found %i unique materials\n" , mtrList.Num()); - mtrFileName = mtrFileName + idStr ( "_Materials.txt" ); - g_Inspectors->SetMode ( W_CONSOLE , true ); - g_Inspectors->consoleWnd.SetConsoleText ( va ( "condump %s" , mtrFileName.c_str()) ); + common->Printf("Done...found %i unique materials\n", mtrList.Num()); + mtrFileName = mtrFileName + idStr("_Materials.txt"); + g_Inspectors->SetMode(W_CONSOLE, true); + g_Inspectors->consoleWnd.SetConsoleText(va("condump %s", mtrFileName.c_str())); - Sys_EndWait (); + Sys_EndWait(); } /*