WebSVN – spk – Diff – /libspk/src/Packages.cpp

 		if ( wp->type == type ) {
 			if ( wp->type == Ware_Custom && !wp->id.Compare(id) ) continue;
 			else if ( wp->type != Ware_Custom && wp->pos != pos ) continue;
 			if ( noto ) {
 				wp->notority  = value;
-				wp->bNotority = value;
+				wp->bNotority = true;
+			}
 			else wp->relval = value;
 			return;
+		}
+	}
 			WriteFile.remove();
+		}
+	}
+}
-bool CPackages::readWares(Utils::CStringList &list)
+bool CPackages::readWares(int iLang, CLinkList<SWareEntry> &list)
+{
-	CTextDB text;
-	// read through all text files and extract all the used wares
-	for(CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next()) {
-		C_File *file = node->Data();
-		if ( file->GetFileType() == FILETYPE_TEXT ) {
+	if ( iLang == 0 ) iLang = m_iLanguage;
-			Utils::String baseFile = CFileIO(file->filePointer()).baseName();
-			int lang = (baseFile.isin("-L")) ? baseFile.right(3) : baseFile.truncate(-4);
-			// read in the text file to the database
-			text.parseTextFile(17, 17, file->filePointer(), lang);
+	Utils::String empWares = this->empWaresForGame();
-		}
+	for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {
+		node->Data()->readWares(iLang, list, empWares);
+	}
-	text.setLanguage(44);
+	return true;
+}
-	// now go through all emp wares and get the ones we have text for
-	Utils::String empWares = empWaresForGame();
-	int totalWares = 0;
-	Utils::String *wares = empWares.tokenise("\n", &totalWares);
+bool CPackages::readCommands(int iLang, CLinkList<SCommandSlot> &list)
+{
-	for(int i = 0; i < totalWares; i++) {
+	if ( iLang == 0 ) iLang = m_iLanguage;
-		int textId = wares[i].token(";", 7).toLong();
+	for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {
-		if ( text.exists(44, 17, textId) ) {
+		node->Data()->readCommands(iLang, list);
-			list.pushBack(text.get(44, 17, textId), text.get(44, 17, textId + 1));
-		}
+	}
+	return true;
+}
+bool CPackages::readWingCommands(int iLang, CLinkList<SCommandSlot> &list)
+{
+	if ( iLang == 0 ) iLang = m_iLanguage;
+	for(CListNode<CBaseFile> *node = m_lPackages.Front(); node; node = node->next()) {
-	CLEANSPLIT(wares, totalWares);
+		node->Data()->readWingCommands(iLang, list);
+	}
 	return true;
+}
 int CPackages::_warePriceOverride(enum WareTypes type, int pos, const Utils::String &id)

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 88 → 89