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

Fixed ScEd again - renamed the network system's CCommand to CNetCommand, since ScEd used that name first :-P

Browse Source 
This was SVN commit r2337.
This commit is contained in:
Ykkrosh 2005-05-23 02:39:07 +00:00
parent 4d8c1014fb
commit aa027d20ec
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/ps/Network/AllNetMessages.h
View File

@ -202,30 +202,30 @@ START_NMT_CLASS_(EndCommandBatch)
NMT_FIELD_INT(m_TurnLength, u32, 2)
END_NMT_CLASS()
START_NMT_CLASS(CCommand, NMT_NONE)
START_NMT_CLASS(CNetCommand, NMT_NONE)
NMT_FIELD(CEntityList, m_Entities)
END_NMT_CLASS()
DERIVE_NMT_CLASS_(Command, Goto)
DERIVE_NMT_CLASS_(NetCommand, Goto)
NMT_FIELD_INT(m_TargetX, u32, 2)
NMT_FIELD_INT(m_TargetY, u32, 2)
END_NMT_CLASS()
DERIVE_NMT_CLASS_(Command, Patrol)
DERIVE_NMT_CLASS_(NetCommand, Patrol)
NMT_FIELD_INT(m_TargetX, u32, 2)
NMT_FIELD_INT(m_TargetY, u32, 2)
END_NMT_CLASS()
DERIVE_NMT_CLASS_(Command, AddWaypoint)
DERIVE_NMT_CLASS_(NetCommand, AddWaypoint)
NMT_FIELD_INT(m_TargetX, u32, 2)
NMT_FIELD_INT(m_TargetY, u32, 2)
END_NMT_CLASS()
DERIVE_NMT_CLASS_(Command, AttackMelee)
DERIVE_NMT_CLASS_(NetCommand, AttackMelee)
NMT_FIELD(HEntity, m_Target)
END_NMT_CLASS()
DERIVE_NMT_CLASS_(Command, Gather)
DERIVE_NMT_CLASS_(NetCommand, Gather)
NMT_FIELD(HEntity, m_Target)
END_NMT_CLASS()

2
source/ps/Network/NetMessage.cpp
View File

@ -82,7 +82,7 @@ void CNetMessage::ScriptingInit()
def(NMT_Gather);
}
CCommand *CNetMessage::CommandFromJSArgs(const CEntityList &entities, JSContext *cx, uintN argc, jsval *argv)
CNetCommand *CNetMessage::CommandFromJSArgs(const CEntityList &entities, JSContext *cx, uintN argc, jsval *argv)
{
assert(argc >= 1);

4
source/ps/Network/NetMessage.h
View File

@ -11,7 +11,7 @@
#include "AllNetMessages.h"
#undef ALLNETMSGS_DONT_CREATE_NMTS
class CCommand;
class CNetCommand;
struct CEntityList;
/**
@ -73,7 +73,7 @@ public:
*/
static void ScriptingInit();
static CCommand *CommandFromJSArgs(const CEntityList &entities, JSContext* cx, uintN argc, jsval* argv);
static CNetCommand *CommandFromJSArgs(const CEntityList &entities, JSContext* cx, uintN argc, jsval* argv);
};
typedef CNetMessage * (*NetMessageDeserializer) (const u8 *buffer, uint length);

4
source/tools/sced/ui/MainFrm.cpp
View File

@ -640,9 +640,7 @@ void CMainFrame::OnFileLoadMap()
// start everything idling
const std::vector<CUnit*>& units=g_UnitMan.GetUnits();
for (uint i=0;i<units.size();++i) {
if (units[i]->GetObject()->m_IdleAnim) {
units[i]->GetModel()->SetAnimation(units[i]->GetObject()->m_IdleAnim);
}
units[i]->SetRandomAnimation("idle");
}
} catch (CFileUnpacker::CFileOpenError) {
char buf[256];