Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix for compilation failure of [10703] on 64-bit systems

Browse Source 
This was SVN commit r10705.
This commit is contained in:
vts 2011-12-10 11:53:39 +00:00
parent db864f10c3
commit 427674f713
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
View File

@ -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;
}
}

4
source/tools/atlas/GameInterface/ActorViewer.cpp
View File

@ -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)
{

2
source/tools/atlas/GameInterface/ActorViewer.h
View File

@ -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);

2
source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
View File

@ -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);

4
source/tools/atlas/GameInterface/Messages.h
View File

@ -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

4
source/tools/atlas/GameInterface/View.cpp
View File

@ -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);

4
source/tools/atlas/GameInterface/View.h
View File

@ -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);