flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Manual merge (Fixed conflicts)

Browse Source
This commit is contained in:
andrew
2014-02-20 15:37:15 +02:00
parent 58a708825f 7b8ff7c986
commit 83d3a2eedf
106 changed files with 4207 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Map.cpp
View File

@@ -41,16 +41,6 @@ cMapDecorator::cMapDecorator(cMap * a_Map, cPlayer * a_Player)
template <typename T>
T Clamp(T a_X, T a_Min, T a_Max)
{
return std::min(std::max(a_X, a_Min), a_Max);
}
void cMapDecorator::Update(void)
{
if (m_Player != NULL)