address PR comments

Author: bobtista

Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp

@@ -148,9 +148,9 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
 	/*
 	** process the header info
 	*/
-    strlcpy(ModelName,header.Name,W3D_NAME_LEN);
-    strlcpy(BasePoseName,header.HierarchyName,W3D_NAME_LEN);
-    strcpy(Name,ModelName);
+	strlcpy(ModelName,header.Name,W3D_NAME_LEN);
+	strlcpy(BasePoseName,header.HierarchyName,W3D_NAME_LEN);
+	strcpy(Name,ModelName);
 
 	/*
 	** Just allocate a node for the number of sub objects we're expecting

Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp

@@ -115,18 +115,11 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 	char				fileBuf[_MAX_PATH];
 
 	if (systemMaps)
-		strlcpy(dirBuf, "Maps\\", ARRAY_SIZE(dirBuf));
+		strcpy(dirBuf, "Maps\\");
 	else
 	{
 		snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	}
-
-	int len = strlen(dirBuf);
-
-	if (len > 0 && dirBuf[len - 1] != '\\') {
-		dirBuf[len++] = '\\';
-		dirBuf[len] = 0;
-	}
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
 	if (pList == NULL) return;
 	pList->ResetContent();
@@ -139,9 +132,9 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 		do {
 			if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
 				continue;
-		if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-			continue;
-		}
+			if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+				continue;
+			}
 
 		snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
 			try {

Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp

@@ -433,7 +433,7 @@ void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
 	FilenameList::iterator it = filenameList.begin();
 	do {
 		AsciiString filename = *it;
-		strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
+		snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s", dirBuf, filename.str());
 		loadBitmap(fileBuf, filename.str());
 
 		++it;

GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp

@@ -115,18 +115,11 @@ void OpenMap::populateMapListbox( Bool systemMaps )
 	char				fileBuf[_MAX_PATH];
 
 	if (systemMaps)
-		strlcpy(dirBuf, "Maps\\", ARRAY_SIZE(dirBuf));
+		strcpy(dirBuf, "Maps\\");
 	else
 	{
 		snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
 	}
-
-	int len = strlen(dirBuf);
-
-	if (len > 0 && dirBuf[len - 1] != '\\') {
-		dirBuf[len++] = '\\';
-		dirBuf[len] = 0;
-	}
 	CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
 	if (pList == NULL) return;
 	pList->ResetContent();

GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp

@@ -434,7 +434,7 @@ void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
 	FilenameList::iterator it = filenameList.begin();
 	do {
 		AsciiString filename = *it;
-		strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
+		snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s", dirBuf, filename.str());
 		loadBitmap(fileBuf, filename.str());
 
 		++it;