diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index 80b91f57..de5b633e 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -182,7 +182,7 @@ INT32 GetSpreadPattern( OBJECTTYPE * pObj ) //If there are attachments, check them. Stop on the first one with something defined. //Dear God, I hate C++ iterators. What a fugly mess. //WarmSteel - I made it even messier ;3 for (attachmentList::iterator iter = pObj[0][0]->attachments.begin(); iter != pObj[0][0]->attachments.end(); ++iter){ - if( n=Item[ iter->usItem ].spreadPattern && iter->exists()){ + if( (n=Item[ iter->usItem ].spreadPattern) && iter->exists()){ //An attachment has it, and it trumps everything, so return it's value. return n;} } diff --git a/Tactical/XML_SpreadPatterns.cpp b/Tactical/XML_SpreadPatterns.cpp index b94375a1..fec41143 100644 --- a/Tactical/XML_SpreadPatterns.cpp +++ b/Tactical/XML_SpreadPatterns.cpp @@ -123,7 +123,7 @@ spreadpatternStartElementHandle(void *userData, const XML_Char *name, const XML_ || strcmp(name, "y") == 0 || strcmp(name, "xspread") == 0 || strcmp(name, "yspread") == 0 - || strcmp(name, "Name") == 0 + || strcmp(name, "NAME") == 0 || strcmp(name, "method") == 0 )) @@ -204,7 +204,7 @@ spreadpatternEndElementHandle(void *userData, const XML_Char *name) d = fabs( atof(pData->szCharData) ); gpSpreadPattern[giSpreadPatternCount-1].yspread = d; } - else if(strcmp(name, "Name") == 0) + else if(strcmp(name, "NAME") == 0) { pData->curElement = ELEMENT; //Trim whitespace.