From 427674f713202425a8ab24eeac75ef21091ec7cf Mon Sep 17 00:00:00 2001 From: vts Date: Sat, 10 Dec 2011 11:53:39 +0000 Subject: [PATCH] Fix for compilation failure of [10703] on 64-bit systems This was SVN commit r10705. --- .../atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp | 6 +++--- source/tools/atlas/GameInterface/ActorViewer.cpp | 4 ++-- source/tools/atlas/GameInterface/ActorViewer.h | 2 +- .../atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp | 2 +- source/tools/atlas/GameInterface/Messages.h | 4 ++-- source/tools/atlas/GameInterface/View.cpp | 4 ++-- source/tools/atlas/GameInterface/View.h | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp index 2b4c905caf..aacdaaa513 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp @@ -85,7 +85,7 @@ private: bool m_ViewerPolyCount; bool m_ViewerBoundingBox; bool m_ViewerAxesMarker; - unsigned m_ViewerPropPointsMode; // 0 disabled, 1 for point markers, 2 for point markers + axes + int m_ViewerPropPointsMode; // 0 disabled, 1 for point markers, 2 for point markers + axes wxPanel* m_ViewerPanel; @@ -480,7 +480,7 @@ void ObjectBottomBar::OnFirstDisplay() POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"shadows", m_ViewerShadows)); POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"stats", m_ViewerPolyCount)); POST_MESSAGE(SetViewParamB, (AtlasMessage::eRenderView::ACTOR, L"bounding_box", m_ViewerBoundingBox)); - POST_MESSAGE(SetViewParamU, (AtlasMessage::eRenderView::ACTOR, L"prop_points", m_ViewerPropPointsMode)); + POST_MESSAGE(SetViewParamI, (AtlasMessage::eRenderView::ACTOR, L"prop_points", m_ViewerPropPointsMode)); } void ObjectBottomBar::ShowActorViewer(bool show) @@ -523,7 +523,7 @@ void ObjectBottomBar::OnViewerSetting(wxCommandEvent& evt) break; case ID_ViewerPropPoints: m_ViewerPropPointsMode = (++m_ViewerPropPointsMode % 3); - POST_MESSAGE(SetViewParamU, (AtlasMessage::eRenderView::ACTOR, L"prop_points", m_ViewerPropPointsMode)); + POST_MESSAGE(SetViewParamI, (AtlasMessage::eRenderView::ACTOR, L"prop_points", m_ViewerPropPointsMode)); break; } } diff --git a/source/tools/atlas/GameInterface/ActorViewer.cpp b/source/tools/atlas/GameInterface/ActorViewer.cpp index 2107f08d17..2d4f2739fc 100644 --- a/source/tools/atlas/GameInterface/ActorViewer.cpp +++ b/source/tools/atlas/GameInterface/ActorViewer.cpp @@ -82,7 +82,7 @@ public: bool ShadowsEnabled; bool SelectionBoxEnabled; bool AxesMarkerEnabled; - unsigned PropPointsMode; // 0 disabled, 1 for point markers, 2 for point markers + axes + int PropPointsMode; // 0 disabled, 1 for point markers, 2 for point markers + axes SColor4ub Background; @@ -442,7 +442,7 @@ void ActorViewer::SetGroundEnabled(bool enabled) { m.GroundEnabled = enabled; } void ActorViewer::SetShadowsEnabled(bool enabled) { m.ShadowsEnabled = enabled; } void ActorViewer::SetBoundingBoxesEnabled(bool enabled) { m.SelectionBoxEnabled = enabled; } void ActorViewer::SetAxesMarkerEnabled(bool enabled) { m.AxesMarkerEnabled = enabled; } -void ActorViewer::SetPropPointsMode(unsigned mode) { m.PropPointsMode = mode; } +void ActorViewer::SetPropPointsMode(int mode) { m.PropPointsMode = mode; } void ActorViewer::SetStatsEnabled(bool enabled) { diff --git a/source/tools/atlas/GameInterface/ActorViewer.h b/source/tools/atlas/GameInterface/ActorViewer.h index 2e9e82024f..d230062dcb 100644 --- a/source/tools/atlas/GameInterface/ActorViewer.h +++ b/source/tools/atlas/GameInterface/ActorViewer.h @@ -43,7 +43,7 @@ public: void SetStatsEnabled(bool enabled); void SetBoundingBoxesEnabled(bool enabled); void SetAxesMarkerEnabled(bool enabled); - void SetPropPointsMode(unsigned mode); + void SetPropPointsMode(int mode); void Render(); void Update(float dt); diff --git a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp index 1b2d88d416..924fc06e1e 100644 --- a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp +++ b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp @@ -120,7 +120,7 @@ MESSAGEHANDLER(SetViewParamB) view->SetParam(*msg->name, msg->value); } -MESSAGEHANDLER(SetViewParamU) +MESSAGEHANDLER(SetViewParamI) { View* view = View::GetView(msg->view); view->SetParam(*msg->name, msg->value); diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h index 9902a8ce79..307529a039 100644 --- a/source/tools/atlas/GameInterface/Messages.h +++ b/source/tools/atlas/GameInterface/Messages.h @@ -52,10 +52,10 @@ MESSAGE(SetViewParamB, ((std::wstring, name)) ((bool, value)) ); -MESSAGE(SetViewParamU, +MESSAGE(SetViewParamI, ((int, view)) // eRenderView ((std::wstring, name)) - ((unsigned, value)) + ((int, value)) ); MESSAGE(SetViewParamC, ((int, view)) // eRenderView diff --git a/source/tools/atlas/GameInterface/View.cpp b/source/tools/atlas/GameInterface/View.cpp index ef49515413..1e4b1d5604 100644 --- a/source/tools/atlas/GameInterface/View.cpp +++ b/source/tools/atlas/GameInterface/View.cpp @@ -58,7 +58,7 @@ void View::SetParam(const std::wstring& UNUSED(name), const std::wstring& UNUSED { } -void View::SetParam(const std::wstring& UNUSED(name), unsigned UNUSED(value)) +void View::SetParam(const std::wstring& UNUSED(name), int UNUSED(value)) { } @@ -142,7 +142,7 @@ void ViewActor::SetParam(const std::wstring& name, bool value) m_ActorViewer->SetAxesMarkerEnabled(value); } -void ViewActor::SetParam(const std::wstring& name, unsigned value) +void ViewActor::SetParam(const std::wstring& name, int value) { if (name == L"prop_points") m_ActorViewer->SetPropPointsMode(value); diff --git a/source/tools/atlas/GameInterface/View.h b/source/tools/atlas/GameInterface/View.h index e052a49c5a..fec883fad3 100644 --- a/source/tools/atlas/GameInterface/View.h +++ b/source/tools/atlas/GameInterface/View.h @@ -43,7 +43,7 @@ public: virtual bool WantsHighFramerate() { return false; } virtual void SetParam(const std::wstring& name, bool value); - virtual void SetParam(const std::wstring& name, unsigned value); + virtual void SetParam(const std::wstring& name, int value); virtual void SetParam(const std::wstring& name, const AtlasMessage::Colour& value); virtual void SetParam(const std::wstring& name, const std::wstring& value); @@ -110,7 +110,7 @@ public: virtual bool WantsHighFramerate(); virtual void SetParam(const std::wstring& name, bool value); - virtual void SetParam(const std::wstring& name, unsigned value); + virtual void SetParam(const std::wstring& name, int value); virtual void SetParam(const std::wstring& name, const AtlasMessage::Colour& value); void SetSpeedMultiplier(float speed);