From e6c5f95d733c0dd3cc005ffe66d097bf869fdfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20Fa=C5=82kowski?= Date: Sat, 16 Mar 2024 15:48:22 +0100 Subject: [PATCH] Fixed drugtypes and drugitems background tags causing subsequent tags in the same background to be skipped --- Tactical/XML_Background.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Tactical/XML_Background.cpp b/Tactical/XML_Background.cpp index 5caac1cde..26fa67b82 100644 --- a/Tactical/XML_Background.cpp +++ b/Tactical/XML_Background.cpp @@ -168,7 +168,7 @@ backgroundStartElementHandle(void *userData, const XML_Char *name, const XML_Cha else if (strcmp(name, "drugitems") == 0 && pData->curElement == ELEMENT) { pData->curElement = ELEMENT_VECTOR_OF_NUMBERS; - pData->curBackground.valueVectors[BackgroundVectorTypes::BG_DRUGUSE_TYPES].clear(); + pData->curBackground.valueVectors[BackgroundVectorTypes::BG_DRUGUSE_ITEMS].clear(); pData->maxReadDepth++; //we are not skipping this element } @@ -693,6 +693,14 @@ backgroundEndElementHandle(void *userData, const XML_Char *name) pData->curElement = ELEMENT; pData->curBackground.uiFlags |= (UINT16)atol(pData->szCharData) ? BACKGROUND_CIVGROUPLOYAL : 0; } + else if (strcmp(name, "drugtypes") == 0) + { + pData->curElement = ELEMENT; + } + else if (strcmp(name, "drugitems") == 0) + { + pData->curElement = ELEMENT; + } else if (strcmp(name, "drugtype") == 0) { pData->curElement = ELEMENT_VECTOR_OF_NUMBERS;