Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

(Missed from previous commit)

Browse Source 
This was SVN commit r6253.
This commit is contained in:
Ykkrosh 2008-07-19 00:40:08 +00:00
parent 0f9294ce17
commit 8f6d3a75a5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,7 @@ void ActorViewer::Render()
{
m.Terrain.MakeDirty(RENDERDATA_UPDATE_COLOR);
g_Renderer.SetClearColor(*(u32*)&m.Background);
g_Renderer.SetClearColor(m.Background);
// Disable shadows locally (avoid clobbering global state)
bool oldShadows = g_Renderer.GetOptionBool(CRenderer::OPT_SHADOWS);

8
source/tools/atlas/GameInterface/Shareable.h
View File

@ -111,9 +111,9 @@ template<int x> struct static_assert_test{};
sizeof(REQUIRE_TYPE_TO_BE_SHAREABLE_FAILURE< T, (bool)(Shareable<T>::TypeIsShareable) >)> \
static_assert_typedef_
// Should be an empty string when cast to either char* or wchar_t*
// (which requires length >= 4, since GCC's sizeof(wchar_t)==4)
static const char empty_str[4] = { 0, 0, 0, 0 };
template <typename T> const T* empty_str();
template <> const char* empty_str() { return ""; }
template <> const wchar_t* empty_str() { return L""; }
// Shareable strings:
template<typename C> class Shareable< std::basic_string<C> >
@ -170,7 +170,7 @@ public:
// without constructing a new std::basic_string then calling c_str on that
const C* c_str() const
{
return (buf && length) ? buf : (C*)empty_str;
return (buf && length) ? buf : empty_str<C>();
}
};