8000 re #30 - updated tests to use correct combat message type · randomcoding/PSAI-MessageRelay@fa37e3d · GitHub
[go: up one dir, main page]
Skip to content

Commit fa37e3d

Browse files
author
tim@5f1bb9e6-f381-11dc-ac94-59e6f598b727
committed
re #30 - updated tests to use correct combat message type
1 parent e4ec57a commit fa37e3d

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

‎src/xml/PsaiXmlGenerator.cpp

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323

2424
using namespace XERCES_CPP_NAMESPACE;
2525

26-
27-
28-
const PsaiStringUtilities& stringUtils = PsaiStringUtilities::getStringUtils();
29-
PsaiXmlUtils& xmlUtils = *(new PsaiXmlUtils());
26+
static const PsaiStringUtilities& stringUtils = PsaiStringUtilities::getStringUtils();
27+
static PsaiXmlUtils& xmlUtils = *(new PsaiXmlUtils());
3028

3129
PsaiXmlGenerator::PsaiXmlGenerator()
3230
{
@@ -56,7 +54,7 @@ DOMElement& PsaiXmlGenerator::addVectorElement(DOMDocument& doc, DOMElement& par
5654
return vectorElement;
5755
}
5856

59-
DOMElement& PsaiXmlGenerator::addClientNumberElement(DOMDocument& doc, DOMElement& parentElement, uint32_t clientNumber, PsaiXmlUtils& xmlUtils)
57+
DOMElement& PsaiXmlGenerator::addClientNumberElement(DOMDocument& doc, DOMElement& parentElement, uint32_t clientNumber)
6058
{
6159
return xmlUtils.createDomElement(doc, parentElement, PsaiXmlConstants::ELEMENT_CLIENT_NUM, stringUtils.convertToString(clientNumber));
6260
}
@@ -88,7 +86,7 @@ String PsaiXmlGenerator::toXml(const psChatMessage& msg)
8886

8987
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_CHAT_CHAT_TYPE, xmlUtils.getChatTypeAsString(msg.iChatType));
9088

91-
addClientNumberElement(doc, messageElement, getClientNumber(msg), xmlUtils);
89+
addClientNumberElement(doc, messageElement, getClientNumber(msg));
9290

9391
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
9492

@@ -109,7 +107,7 @@ String PsaiXmlGenerator::toXml(const psPlaySoundMessage& msg)
109107

110108
DOMElement& messageElement = xmlUtils.createDomElement(doc, root, PsaiXmlConstants::TYPE_PLAY_SOUND_MESSAGE);
111109
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_PLAY_SOUND_SOUND, msg.sound.GetDataSafe());
112-
addClientNumberElement(doc, messageElement, getClientNumber(msg), xmlUtils);
110+
addClientNumberElement(doc, messageElement, getClientNumber(msg));
113111

114112
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
115113

@@ -134,7 +132,7 @@ String PsaiXmlGenerator::toXml(const psSoundEventMessage& msg)
134132
String typeString = stringUtils.convertToString(msg.type);
135133

136134
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_SOUNT_EVENT_TYPE, typeString);
137-
addClientNumberElement(doc, messageElement, getClientNumber(msg), xmlUtils);
135+
addClientNumberElement(doc, messageElement, getClientNumber(msg));
138136
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
139137
xmlUtils.clearXmlUtils();
140138
}
@@ -182,7 +180,7 @@ String PsaiXmlGenerator::toXml(const psPersistItem& msg)
182180
String yRot = stringUtils.convertToString(msg.yRot);
183181
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_PERSIST_ITEM_Y_ROTATION, yRot);
184182

185-
addClientNumberElement(doc, messageElement, getClientNumber(msg), xmlUtils);
183+
addClientNumberElement(doc, messageElement, getClientNumber(msg));
186184

187185
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
188186

@@ -201,7 +199,7 @@ String PsaiXmlGenerator::toXml(const psPersistActor& msg)
201199
DOMDocument& doc = xmlUtils.getDOMDocumentForMessageType(PsaiXmlConstants::MSGTYPE_PERSIST_ACTOR);
202200
DOMElement& root = *(doc.getDocumentElement());
203201
DOMElement& messageElement = xmlUtils.createDomElement(doc, root, PsaiXmlConstants::TYPE_PERSIST_ACTOR_MESSAGE);
204-
addClientNumberElement(doc, messageElement, getClientNumber(msg), xmlUtils);
202+
addClientNumberElement(doc, messageElement, getClientNumber(msg));
205203
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
206204
xmlUtils.clearXmlUtils();
207205
}
@@ -225,7 +223,7 @@ String PsaiXmlGenerator::toXml(const psPersistActionLocation& msg)
225223
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_PERSIST_ACTION_LOCATION_ID, stringUtils.convertToString(msg.eid.Unbox()));
226224
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_PERSIST_ACTION_LOCATION_NAME, msg.name.GetDataSafe());
227225

228-
addClientNumberElement(doc, messageElement, getClientNumber(msg), xmlUtils);
226+
addClientNumberElement(doc, messageElement, getClientNumber(msg));
229227
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
230228
xmlUtils.clearXmlUtils();
231229
}
@@ -243,7 +241,7 @@ String PsaiXmlGenerator::toXml(const psRemoveObject& msg)
243241
DOMElement& root = *(doc.getDocumentElement());
244242
DOMElement& messageElement = xmlUtils.createDomElement(doc, root, PsaiXmlConstants::TYPE_REMOVE_OBJECT_MESSAGE);
245243
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_REMOVE_OBJECT_OBJECT_ID, stringUtils.convertToString(msg.objectEID.Unbox()));
246-
addClientNumberElement(doc, messageElement, getClientNumber(msg), xmlUtils);
244+
addClientNumberElement(doc, messageElement, getClientNumber(msg));
247245
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
248246
xmlUtils.clearXmlUtils();
249247
}
@@ -288,6 +286,15 @@ String PsaiXmlGenerator::toXml(const psCombatEventMessage& msg)
288286
if (xmlUtils.initiliaseXmlUtils())
289287
{
290288
DOMDocument& doc = xmlUtils.getDOMDocumentForMessageType(PsaiXmlConstants::MSGTYPE_COMBATEVENT);
289+
DOMElement& root = xmlUtils.getDocumentRootElement(doc);
290+
DOMElement& messageElement = xmlUtils.createDomElement(doc, root, PsaiXmlConstants::TYPE_COMBAT_MESSAGE);
291+
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_COMBAT_ATTACKER_ID, stringUtils.convertToString(msg.attacker_id.Unbox()));
292+
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_COMBAT_DAMAGE, stringUtils.convertToString(msg.damage));
293+
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_COMBAT_TARGET_ID, stringUtils.convertToString(msg.target_id.Unbox()));
294+
xmlUtils.createDomElement(doc, messageElement, PsaiXmlConstants::ELEMENT_COMBAT_TARGET_LOCATION, stringUtils.convertToString(msg.target_location));
295+
296+
int clientNum = getClientNumber(msg);
297+
addClientNumberElement(doc, messageElement, clientNum);
291298

292299
xmlString = xmlUtils.convertDomDocumentToXmlString(doc);
293300
xmlUtils.clearXmlUtils();

‎tests/XmlGeneratorTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ csVector3 XmlGeneratorTest::worldVelocity(1.0, 1.0, 1.0);
443443
float XmlGeneratorTest::ang_velocity = 78.3;
444444

445445
// Combat message
446-
int XmlGeneratorTest::combatEventType = 10;
446+
int XmlGeneratorTest::combatEventType = COMBAT_DAMAGE;
447447
EID XmlGeneratorTest::attacker(15);
448448
EID XmlGeneratorTest::target(20);
449449
int XmlGeneratorTest::targetLocation = 5;

0 commit comments

Comments
 (0)
0