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

 	CyString *str = data.SplitToken("\n", &max);
 	if ( str && max )
+	{
 		for ( int i = 0; i < max; i++ )
+		{
-			CyString line = str[i];
+			Utils::String line = str[i].ToString();
-			if ( line.Empty() )
+			if ( line.empty() )
 				continue;
 			// filter out any spaces, tabs in front
-			line.RemoveChar('\t');
+			line.removeChar('\t');
-			line.RemoveChar('\r');
+			line.removeChar('\r');
-			CyString linenospace = line;
+			Utils::String linenospace = line;
-			linenospace.RemoveFirstSpace();
+			linenospace.removeFirstSpace();
-			if ( linenospace.Empty() )
+			if ( linenospace.empty() )
 				continue;
 			// check for any comments
-			if ( linenospace.Left(2) == "//" )
+			if ( linenospace.left(2) == "//" )
 				continue;
 			if ( linenospace[0] == '#' )
 				continue;
 			// all commands start with a keyword followed by a colon, if one doesn't exist, it cant be a valid line
-			if ( !line.IsIn(':') )
+			if ( !line.contains(':'))
 				continue;
-			CyString first = line.GetToken(":", 1, 1);
+			Utils::String first = line.token(":", 1);
-			CyString rest = line.GetToken(":", 2).RemoveFirstSpace();
+			Utils::String rest = line.tokens(":", 2).removeFirstSpace();
-			CyString checkType = first;
+			Utils::String checkType = first;
 			bool shared = false;
-			if ( checkType.Left(6).Compare("Shared") )
+			if ( checkType.left(6).Compare("Shared") )
+			{
-				checkType = first.Right(-6);
+				checkType = first.right(-6);
 				shared = true;
+			}
+			bool packed = false;
+			if (checkType.right(3).compare("PCK"))
+			{
+				checkType = checkType.left(-3);
+				packed = true;
+			}
 			// now check type name
 			int filetype = GetFileTypeFromString(checkType);
-			if ( filetype == -1 )
+			if (filetype == -1)
+			{
-				archive->LoadPackageData(first.ToString(), rest.ToString(), Utils::String::Null(), otherGames, gameAddons, NULL);
+				archive->LoadPackageData(first, rest, Utils::String::Null(), otherGames, gameAddons, NULL);
+			}
+		}
+	}
 	CLEANSPLIT(str, max)
+}

Subversion Repositories spk

(root)//libspk/src/Packages.cpp – Rev 152 → 155