YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sunset old XML child system

Browse Source
This commit is contained in:
Dominic Masters
2023-07-12 10:54:02 -07:00
parent 19c6575aaf
commit c2831f54e8
7 changed files with 67 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dawntools/vnscenetool/VNSceneParser.cpp
View File

@@ -29,9 +29,14 @@ int32_t VNSceneParser::onParse(
if(ret != 0) return ret;
// Now pass the VN Events
auto itChildren = node->children.begin();
while(itChildren != node->children.end()) {
Xml *child = *itChildren;
auto itChildren = node->childNodes.begin();
while(itChildren != node->childNodes.end()) {
if(itChildren->nodeType != XML_NODE_TYPE_ELEMENT) {
++itChildren;
continue;
}
Xml *child = itChildren->child;
if(child->node != "events") {
++itChildren;
continue;

33
src/dawntools/vnscenetool/events/VNChoiceEventParser.cpp
View File

@@ -22,9 +22,14 @@ int32_t VNChoiceParser::onParse(
std::string *error
) {
int32_t ret;
auto itChildren = node->children.begin();
while(itChildren != node->children.end()) {
Xml *child = *itChildren;
auto itChildren = node->childNodes.begin();
while(itChildren != node->childNodes.end()) {
if(itChildren->nodeType != XML_NODE_TYPE_ELEMENT) {
++itChildren;
continue;
}
Xml *child = itChildren->child;
// Parse strings
if(child->node == "string") {
@@ -61,16 +66,26 @@ int32_t VNChoicesEventParser::onParse(
std::string *error
) {
int32_t ret;
auto itChildren = node->children.begin();
while(itChildren != node->children.end()) {
Xml *child = *itChildren;
auto itChildren = node->childNodes.begin();
while(itChildren != node->childNodes.end()) {
if(itChildren->nodeType != XML_NODE_TYPE_ELEMENT) {
++itChildren;
continue;
}
Xml *child = itChildren->child;
// Parse strings
if(child->node == "title") {
auto itChildren2 = child->children.begin();
while(itChildren2 != child->children.end()) {
auto itChildren2 = child->childNodes.begin();
while(itChildren2 != child->childNodes.end()) {
if(itChildren2->nodeType != XML_NODE_TYPE_ELEMENT) {
++itChildren2;
continue;
}
VNText text;
ret = (VNTextParser()).parse(*itChildren2, &text, error);
ret = (VNTextParser()).parse(itChildren2->child, &text, error);
if(ret != 0) return ret;
out->titles.push_back(text);
++itChildren2;

11
src/dawntools/vnscenetool/events/VNSceneEventsParser.cpp
View File

@@ -24,9 +24,14 @@ int32_t VNSceneEventsParser::onParse(
) {
int32_t ret;
auto itChildren = node->children.begin();
while(itChildren != node->children.end()) {
Xml *child = *itChildren;
auto itChildren = node->childNodes.begin();
while(itChildren != node->childNodes.end()) {
if(itChildren->nodeType != XML_NODE_TYPE_ELEMENT) {
++itChildren;
continue;
}
Xml *child = itChildren->child;
struct VNSceneEvent event;
// Parse event(s)

11
src/dawntools/vnscenetool/events/VNTextEventParser.cpp
View File

@@ -47,9 +47,14 @@ int32_t VNTextEventParser::onParse(
std::string *error
) {
int32_t ret;
auto itChildren = node->children.begin();
while(itChildren != node->children.end()) {
Xml *child = *itChildren;
auto itChildren = node->childNodes.begin();
while(itChildren != node->childNodes.end()) {
if(itChildren->nodeType != XML_NODE_TYPE_ELEMENT) {
++itChildren;
continue;
}
Xml *child = itChildren->child;
// Parse strings
if(child->node == "string") {