Skip to content

Commit 3700132

Browse files
Xottab-DUTYXottab-DUTY
committed
xrGame: Compatibility with new XML parser
Thanks to Im-Dex From commit: Im-dex/xray-162@05490c8
1 parent ed8eac4 commit 3700132

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+109
-112
lines changed

‎src/xrGame/EliteDetector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void CUIArtefactDetectorElite::construct(CEliteDetector* p)
9797

9898
xr_sprintf(buff, "%s", p->ui_xml_tag());
9999
int num = uiXml.GetNodesNum(buff, 0, "palette");
100-
XML_NODE* pStoredRoot = uiXml.GetLocalRoot();
100+
XML_NODE pStoredRoot = uiXml.GetLocalRoot();
101101
uiXml.SetLocalRoot(uiXml.NavigateToNode(buff, 0));
102102
for (int idx = 0; idx < num; ++idx)
103103
{

‎src/xrGame/PhraseDialog.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void CPhraseDialog::load_shared(LPCSTR)
203203
pXML->SetLocalRoot(pXML->GetRoot());
204204

205205
// loading from XML
206-
XML_NODE* dialog_node = pXML->NavigateToNode(id_to_index::tag_name, item_data.pos_in_file);
206+
XML_NODE dialog_node = pXML->NavigateToNode(id_to_index::tag_name, item_data.pos_in_file);
207207
THROW3(dialog_node, "dialog id=", *item_data.id);
208208

209209
pXML->SetLocalRoot(dialog_node);
@@ -219,7 +219,7 @@ void CPhraseDialog::load_shared(LPCSTR)
219219
//заполнить граф диалога фразами
220220
data()->m_PhraseGraph.clear();
221221

222-
XML_NODE* phrase_list_node = pXML->NavigateToNode(dialog_node, "phrase_list", 0);
222+
XML_NODE phrase_list_node = pXML->NavigateToNode(dialog_node, "phrase_list", 0);
223223
if (NULL == phrase_list_node)
224224
{
225225
LPCSTR func = pXML->Read(dialog_node, "init_func", 0, "");
@@ -242,7 +242,7 @@ void CPhraseDialog::load_shared(LPCSTR)
242242
#endif
243243

244244
//ищем стартовую фразу
245-
XML_NODE* phrase_node = pXML->NavigateToNodeWithAttribute("phrase", "id", "0");
245+
XML_NODE phrase_node = pXML->NavigateToNodeWithAttribute("phrase", "id", "0");
246246
THROW(phrase_node);
247247
AddPhrase(pXML, phrase_node, "0", "");
248248
}
@@ -273,7 +273,7 @@ CPhrase* CPhraseDialog::AddPhrase(
273273
}
274274

275275
void CPhraseDialog::AddPhrase(
276-
CUIXml* pXml, XML_NODE* phrase_node, const shared_str& phrase_id, const shared_str& prev_phrase_id)
276+
CUIXml* pXml, XML_NODE phrase_node, const shared_str& phrase_id, const shared_str& prev_phrase_id)
277277
{
278278
LPCSTR sText = pXml->Read(phrase_node, "text", 0, "");
279279
int gw = pXml->ReadInt(phrase_node, "goodwill", 0, -10000);
@@ -292,7 +292,7 @@ void CPhraseDialog::AddPhrase(
292292
for (int i = 0; i < next_num; ++i)
293293
{
294294
LPCSTR next_phrase_id_str = pXml->Read(phrase_node, "next", i, "");
295-
XML_NODE* next_phrase_node = pXml->NavigateToNodeWithAttribute("phrase", "id", next_phrase_id_str);
295+
XML_NODE next_phrase_node = pXml->NavigateToNodeWithAttribute("phrase", "id", next_phrase_id_str);
296296
R_ASSERT2(next_phrase_node, next_phrase_id_str);
297297
AddPhrase(pXml, next_phrase_node, next_phrase_id_str, phrase_id);
298298
}

‎src/xrGame/PhraseDialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class CPhraseDialog : public CSharedClass<SPhraseDialogData, shared_str, false>,
133133
virtual void load_shared(LPCSTR);
134134

135135
//рекурсивное добавление фраз в граф
136-
void AddPhrase(CUIXml* pXml, XML_NODE* phrase_node, const shared_str& phrase_id, const shared_str& prev_phrase_id);
136+
void AddPhrase(CUIXml* pXml, XML_NODE phrase_node, const shared_str& phrase_id, const shared_str& prev_phrase_id);
137137

138138
public:
139139
CPhrase* AddPhrase(LPCSTR text, const shared_str& phrase_id, const shared_str& prev_phrase_id, int goodwil_level);

‎src/xrGame/PhraseScript.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "actor.h"
1212

1313
//загрузка из XML файла
14-
void CDialogScriptHelper::Load(CUIXml* uiXml, XML_NODE* phrase_node)
14+
void CDialogScriptHelper::Load(CUIXml* uiXml, XML_NODE phrase_node)
1515
{
1616
LoadSequence(uiXml, phrase_node, "precondition", m_Preconditions);
1717
LoadSequence(uiXml, phrase_node, "action", m_ScriptActions);
@@ -24,7 +24,7 @@ void CDialogScriptHelper::Load(CUIXml* uiXml, XML_NODE* phrase_node)
2424
}
2525

2626
template <class T>
27-
void CDialogScriptHelper::LoadSequence(CUIXml* uiXml, XML_NODE* phrase_node, LPCSTR tag, T& str_vector)
27+
void CDialogScriptHelper::LoadSequence(CUIXml* uiXml, XML_NODE phrase_node, LPCSTR tag, T& str_vector)
2828
{
2929
int tag_num = uiXml->GetNodesNum(phrase_node, tag);
3030
str_vector.clear();

‎src/xrGame/PhraseScript.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99

1010
class CGameObject;
1111
class CInventoryOwner;
12-
class TiXmlNode;
12+
class XML_NODE;
1313
class CUIXml;
1414

15-
typedef TiXmlNode XML_NODE;
16-
1715
class CDialogScriptHelper
1816
{
1917
public:
20-
void Load(CUIXml* ui_xml, XML_NODE* phrase_node);
18+
void Load(CUIXml* ui_xml, XML_NODE phrase_node);
2119

2220
bool Precondition(const CGameObject* pSpeaker, LPCSTR dialog_id, LPCSTR phrase_id) const;
2321
void Action(const CGameObject* pSpeaker, LPCSTR dialog_id, LPCSTR phrase_id) const;
@@ -43,7 +41,7 @@ class CDialogScriptHelper
4341
protected:
4442
//загрузка содержания последовательности тагов в контейнер строк
4543
template <class T>
46-
void LoadSequence(CUIXml* ui_xml, XML_NODE* phrase_node, LPCSTR tag, T& str_vector);
44+
void LoadSequence(CUIXml* ui_xml, XML_NODE phrase_node, LPCSTR tag, T& str_vector);
4745

4846
//манипуляции с информацией во время вызовов Precondition и Action
4947
virtual bool CheckInfo(const CInventoryOwner* pOwner) const;

‎src/xrGame/UIPlayerItem.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ UIPlayerItem::UIPlayerItem(ETeam team, ClientID const& clientId, UITeamState* ts
1919
VERIFY(m_teamPanels);
2020
myClientId = clientId;
2121
m_prevTeam = team;
22-
23-
m_player_node_root = NULL;
2422
}
2523

2624
UIPlayerItem::~UIPlayerItem() {}
@@ -29,7 +27,7 @@ void UIPlayerItem::Init(CUIXml& uiXml, LPCSTR playerNode, int index)
2927
CUIXmlInit::InitWindow(uiXml, playerNode, index, this);
3028
m_player_node_root = uiXml.NavigateToNode(playerNode, index);
3129
VERIFY2(m_player_node_root, "player item in team xml node not initialized");
32-
XML_NODE* prev_root = uiXml.GetLocalRoot();
30+
XML_NODE prev_root = uiXml.GetLocalRoot();
3331
uiXml.SetLocalRoot(m_player_node_root);
3432
InitTextParams(uiXml);
3533
InitIconParams(uiXml);
@@ -49,7 +47,7 @@ void UIPlayerItem::InitTextParams(CUIXml& uiXml)
4947
int temp_number = uiXml.GetNodesNum(m_player_node_root, TEXTPARAM_NODE_NAME);
5048
for (int i = 0; i < temp_number; ++i)
5149
{
52-
XML_NODE* text_param_node = uiXml.NavigateToNode(TEXTPARAM_NODE_NAME, i);
50+
XML_NODE text_param_node = uiXml.NavigateToNode(TEXTPARAM_NODE_NAME, i);
5351
if (!text_param_node)
5452
break;
5553
LPCSTR param_name = uiXml.ReadAttrib(text_param_node, "name", "param_name_not_set_in_name_attribute");
@@ -69,7 +67,7 @@ void UIPlayerItem::InitIconParams(CUIXml& uiXml)
6967
int temp_number = uiXml.GetNodesNum(m_player_node_root, ICONPARAM_NODE_NAME);
7068
for (int i = 0; i < temp_number; ++i)
7169
{
72-
XML_NODE* icon_param_node = uiXml.NavigateToNode(ICONPARAM_NODE_NAME, i);
70+
XML_NODE icon_param_node = uiXml.NavigateToNode(ICONPARAM_NODE_NAME, i);
7371
if (!icon_param_node)
7472
break;
7573
LPCSTR param_name = uiXml.ReadAttrib(icon_param_node, "name", "param_name_not_set_in_name_attribute");

‎src/xrGame/UIPlayerItem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class UIPlayerItem : public CUIWindow
2424
// we just call method RemovePlayer
2525
UITeamState* m_teamState;
2626
UITeamPanels* m_teamPanels;
27-
XML_NODE* m_player_node_root;
27+
XML_NODE m_player_node_root;
2828
ETeam m_prevTeam;
2929
s32 m_checkPoints;
3030

‎src/xrGame/UITeamHeader.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "UITeamState.h"
44
#include "ui/UIStatic.h"
55

6-
UITeamHeader::UITeamHeader(UITeamState const* const parent) : m_parent(parent), m_team_header_root(NULL) {}
6+
UITeamHeader::UITeamHeader(UITeamState const* const parent) : m_parent(parent), m_team_header_root() {}
77
UITeamHeader::~UITeamHeader() {}
88
void UITeamHeader::Update()
99
{
@@ -30,7 +30,7 @@ void UITeamHeader::InitColumnsStatics(CUIXml& uiXml)
3030
int tempNumber = uiXml.GetNodesNum(m_team_header_root, COLUMN_NODE_NAME);
3131
for (int i = 0; i < tempNumber; ++i)
3232
{
33-
XML_NODE* tempColumnNode = uiXml.NavigateToNode(COLUMN_NODE_NAME, i);
33+
XML_NODE tempColumnNode = uiXml.NavigateToNode(COLUMN_NODE_NAME, i);
3434
if (!tempColumnNode)
3535
break;
3636
LPCSTR tempColumnName = uiXml.ReadAttrib(tempColumnNode, "name", "column_not_set_in_name_attribute");
@@ -52,7 +52,7 @@ void UITeamHeader::InitFieldsStatics(CUIXml& uiXml)
5252
CStringTable st;
5353
for (int i = 0; i < tempNumber; ++i)
5454
{
55-
XML_NODE* tempFieldNode = uiXml.NavigateToNode(FILED_NODE_NAME, i);
55+
XML_NODE tempFieldNode = uiXml.NavigateToNode(FILED_NODE_NAME, i);
5656
if (!tempFieldNode)
5757
break;
5858
LPCSTR tempFieldName = uiXml.ReadAttrib(tempFieldNode, "name", "field_not_set_in_name_attribute");
@@ -71,7 +71,7 @@ void UITeamHeader::Init(CUIXml& uiXml, LPCSTR path)
7171
CUIXmlInit::InitWindow(uiXml, path, 0, this);
7272
m_team_header_root = uiXml.NavigateToNode(path, 0);
7373
VERIFY(m_team_header_root);
74-
XML_NODE* prevRoot = uiXml.GetLocalRoot();
74+
XML_NODE prevRoot = uiXml.GetLocalRoot();
7575
VERIFY(prevRoot);
7676
uiXml.SetLocalRoot(m_team_header_root);
7777
InitColumnsStatics(uiXml);

‎src/xrGame/UITeamHeader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class UITeamHeader : public CUIWindow
2828
TranslatedStrings m_translated_strings;
2929

3030
UITeamState const* const m_parent;
31-
XML_NODE* m_team_header_root;
31+
XML_NODE m_team_header_root;
3232

3333
void InitColumnsStatics(CUIXml& uiXml);
3434
void InitFieldsStatics(CUIXml& uiXml);

‎src/xrGame/UITeamPanels.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void UITeamPanels::Init(LPCSTR xmlName, LPCSTR panelsRootNode)
1818
{
1919
uiXml.Load(CONFIG_PATH, UI_PATH, xmlName);
2020
CUIXmlInit::InitWindow(uiXml, panelsRootNode, 0, this);
21-
XML_NODE* panelsRoot = uiXml.NavigateToNode(panelsRootNode, 0);
21+
XML_NODE panelsRoot = uiXml.NavigateToNode(panelsRootNode, 0);
2222
VERIFY(panelsRoot);
2323
uiXml.SetLocalRoot(panelsRoot);
2424

@@ -34,7 +34,7 @@ void UITeamPanels::InitAllFrames(shared_str const& frame_node)
3434
int number_of_items = uiXml.GetNodesNum(uiXml.GetLocalRoot(), frame_node.c_str());
3535
for (int i = 0; i < number_of_items; ++i)
3636
{
37-
XML_NODE* tempFrameNode = uiXml.NavigateToNode(frame_node.c_str(), i);
37+
XML_NODE tempFrameNode = uiXml.NavigateToNode(frame_node.c_str(), i);
3838
if (!tempFrameNode)
3939
break;
4040
LPCSTR frame_class = uiXml.ReadAttrib(tempFrameNode, "class", "class_of_frame_not_defined");
@@ -60,7 +60,7 @@ void UITeamPanels::InitAllTeams(shared_str const& team_node)
6060
int numberOfTeams = uiXml.GetNodesNum(uiXml.GetLocalRoot(), team_node.c_str());
6161
for (int i = 0; i < numberOfTeams; ++i)
6262
{
63-
XML_NODE* tempTeamNode = uiXml.NavigateToNode(team_node.c_str(), i);
63+
XML_NODE tempTeamNode = uiXml.NavigateToNode(team_node.c_str(), i);
6464
if (!tempTeamNode)
6565
break;
6666
LPCSTR tempTeamName = uiXml.ReadAttrib(tempTeamNode, "tname", "team_not_set_in_tname_xml_attribute");

0 commit comments

Comments
 (0)