1
0
forked from 0ad/0ad

Minor fixes for Linux/GCC

This was SVN commit r1201.
This commit is contained in:
Simon Brenner 2004-09-26 21:21:34 +00:00
parent 39501530d4
commit 011666f393
5 changed files with 12 additions and 12 deletions

View File

@ -100,25 +100,25 @@ void CMaterial::SetTexture(const CStr &texture)
ComputeHash();
}
void CMaterial::SetDiffuse(SMaterialColor &color)
void CMaterial::SetDiffuse(const SMaterialColor &color)
{
m_Diffuse = color;
ComputeHash();
}
void CMaterial::SetAmbient(SMaterialColor &color)
void CMaterial::SetAmbient(const SMaterialColor &color)
{
m_Ambient = color;
ComputeHash();
}
void CMaterial::SetSpecular(SMaterialColor &color)
void CMaterial::SetSpecular(const SMaterialColor &color)
{
m_Specular = color;
ComputeHash();
}
void CMaterial::SetEmissive(SMaterialColor &color)
void CMaterial::SetEmissive(const SMaterialColor &color)
{
m_Emissive = color;
ComputeHash();

View File

@ -77,10 +77,10 @@ public:
bool UsesAlpha() { return m_Alpha; }
void SetTexture(const CStr &texture);
void SetDiffuse(SMaterialColor &color);
void SetAmbient(SMaterialColor &color);
void SetSpecular(SMaterialColor &color);
void SetEmissive(SMaterialColor &color);
void SetDiffuse(const SMaterialColor &color);
void SetAmbient(const SMaterialColor &color);
void SetSpecular(const SMaterialColor &color);
void SetEmissive(const SMaterialColor &color);
void SetSpecularPower(float power);
void SetUsesAlpha(bool flag);
@ -108,4 +108,4 @@ protected:
extern CMaterial NullMaterial;
extern CMaterial IdentityMaterial;
#endif
#endif

View File

@ -253,4 +253,4 @@ CMaterial &CMaterialManager::LoadMaterial(const char *file)
}
return *material;
}
}

View File

@ -18,4 +18,4 @@ private:
std::map<std::string, CMaterial *> m_Materials;
};
#endif
#endif

View File

@ -70,7 +70,7 @@ void CTurnManager::SendBatch(uint batch)
SendMessage(it->m_pMessage, it->m_ClientMask);
++it;
}
SendMessage(new CEndCommandBatch(), -1);
SendMessage(new CEndCommandBatch(), (uint)-1);
}
void CTurnManager::SendMessage(CNetMessage *pMsg, uint clientMask)