forked from 0ad/0ad
Some fixes for OS X:
- Find enet properly - Type conversion of size_t's in JS This was SVN commit r6324.
This commit is contained in:
parent
b9c8aace70
commit
09f97a3422
@ -92,6 +92,7 @@ extern_lib_defs = {
|
||||
tinsert(package.config["Testing"].links, "enet_dbg")
|
||||
tinsert(package.config["Release"].links, "enet")
|
||||
else
|
||||
tinsert(package.includepaths, libraries_dir.."enet/include")
|
||||
tinsert(package.linkoptions, "-lenet")
|
||||
end
|
||||
end,
|
||||
|
@ -269,10 +269,10 @@ void CMapWriter::WriteXML(const char* filename,
|
||||
continue;
|
||||
|
||||
XML_Element("Entity");
|
||||
XML_Attribute("uid", (*unit)->GetID());
|
||||
XML_Attribute("uid", (unsigned) (*unit)->GetID());
|
||||
XML_Setting("Template", entity->m_base->m_Tag);
|
||||
|
||||
XML_Setting("Player", entity->GetPlayer()->GetPlayerID());
|
||||
XML_Setting("Player", (unsigned) entity->GetPlayer()->GetPlayerID());
|
||||
|
||||
{
|
||||
CVector3D position = entity->m_position;
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include "ps/GameAttributes.h"
|
||||
#include "ps/Player.h"
|
||||
#include "fsm.h"
|
||||
#include "enet/enet.h"
|
||||
#include <enet/enet.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -740,7 +740,7 @@ void CConsole::SaveHistory()
|
||||
{
|
||||
WriteBuffer buffer;
|
||||
const int linesToSkip = (int)m_deqBufHistory.size() - m_MaxHistoryLines;
|
||||
std::deque<std::wstring>::const_reverse_iterator it = m_deqBufHistory.rbegin();
|
||||
std::deque<std::wstring>::reverse_iterator it = m_deqBufHistory.rbegin();
|
||||
if(linesToSkip > 0)
|
||||
std::advance(it, linesToSkip);
|
||||
for (; it != m_deqBufHistory.rend(); ++it)
|
||||
|
@ -5,13 +5,13 @@
|
||||
#include "ScriptCustomTypes.h"
|
||||
|
||||
template <>
|
||||
CStrW ToNetString(const unsigned &val)
|
||||
CStrW ToNetString(const size_t &val)
|
||||
{
|
||||
return CStrW(val);
|
||||
}
|
||||
|
||||
template <>
|
||||
void SetFromNetString(unsigned &val, const CStrW& string)
|
||||
void SetFromNetString(size_t &val, const CStrW& string)
|
||||
{
|
||||
val=string.ToUInt();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user