1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Spreadpatterns did never work since their externalization. Now they should work.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2014-11-01 13:31:51 +00:00
parent 8857e0772b
commit 62cb6f44fa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/LOS.cpp
+1 -1
View File
@@ -182,7 +182,7 @@ INT32 GetSpreadPattern( OBJECTTYPE * pObj )
//If there are attachments, check them. Stop on the first one with something defined. //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 //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){ 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. //An attachment has it, and it trumps everything, so return it's value.
return n;} return n;}
} }
Tactical/XML_SpreadPatterns.cpp
+2 -2
View File
@@ -123,7 +123,7 @@ spreadpatternStartElementHandle(void *userData, const XML_Char *name, const XML_
|| strcmp(name, "y") == 0 || strcmp(name, "y") == 0
|| strcmp(name, "xspread") == 0 || strcmp(name, "xspread") == 0
|| strcmp(name, "yspread") == 0 || strcmp(name, "yspread") == 0
|| strcmp(name, "Name") == 0 || strcmp(name, "NAME") == 0
|| strcmp(name, "method") == 0 || strcmp(name, "method") == 0
)) ))
@@ -204,7 +204,7 @@ spreadpatternEndElementHandle(void *userData, const XML_Char *name)
d = fabs( atof(pData->szCharData) ); d = fabs( atof(pData->szCharData) );
gpSpreadPattern[giSpreadPatternCount-1].yspread = d; gpSpreadPattern[giSpreadPatternCount-1].yspread = d;
} }
else if(strcmp(name, "Name") == 0) else if(strcmp(name, "NAME") == 0)
{ {
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
//Trim whitespace. //Trim whitespace.