Subversion Repositories spk

Rev

Rev 115 | Rev 118 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 115 Rev 116
Line 1976... Line 1976...
1976 
							if ( valtype.Compare("SPTYPE_STRING") ) {
 1976 
							if ( valtype.Compare("SPTYPE_STRING") ) {
1977 
								Utils::String file = strs[i].token(";", 3);
 1977 
								Utils::String file = strs[i].token(";", 3);
1978 
								list->PushBack(CyString(file), "", true);
 1978 
								list->PushBack(CyString(file), "", true);
1979 
							}
 1979 
							}
1980 
						}
 1980 
						}
1981 
/*
 - 
 
1982 
						for ( int i = 2; i < max; i++ )
 - 
 
1983 
						{
 - 
 
1984 
							Utils::String s = strs[i];
 - 
 
1985 
							if ( s.isin(";") )
 - 
 
1986 
								s = s.token(";", 1);
 - 
 
1987 
							if ( !s.isNumber() && !s.Compare("NULL") && s.isin(".") )
 - 
 
1988 
								list->PushBack(s, "", true);
 - 
 
1989 
						}
 - 
 
1990 
						*/
 - 
 
1991 
					}
 1981 
					}
1992 
 
 1982 
 
1993 
					CLEANSPLIT(strs, max)
 1983 
					CLEANSPLIT(strs, max)
1994 
				}
 1984 
				}
1995 
			}
 1985 
			}
Line 2072... Line 2062...
2072 
 
 2062 
 
2073 
	for ( SStringList *node = lTextures.Head(); node; node = node->next )
 2063 
	for ( SStringList *node = lTextures.Head(); node; node = node->next )
2074 
	{
 2064 
	{
2075 
		CFileIO F(node->str);
 2065 
		CFileIO F(node->str);
2076 
		if ( F.CheckFileExtension("fx") ) {
 2066 
		if ( F.CheckFileExtension("fx") ) {
- 
 
 2067 
			/*
2077 
			pVfs->extractGameFileToPackage(this, ";shader\\1_1\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
 2068 
			if ( !pVfs->extractGameFileToPackage(this, ";shader\\1_1\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2069 
				pVfs->extractGameFileToPackage(this, "shader\\1_1\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
2078 
			pVfs->extractGameFileToPackage(this, ";shader\\1_4\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
 2070 
			if ( !pVfs->extractGameFileToPackage(this, ";shader\\1_4\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2071 
				pVfs->extractGameFileToPackage(this, "shader\\1_4\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
2079 
			pVfs->extractGameFileToPackage(this, ";shader\\2_0\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
 2072 
			if ( !pVfs->extractGameFileToPackage(this, ";shader\\2_0\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2073 
				pVfs->extractGameFileToPackage(this, "shader\\2_0\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
2080 
			pVfs->extractGameFileToPackage(this, ";shader\\2_a\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
 2074 
			if ( !pVfs->extractGameFileToPackage(this, ";shader\\2_a\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2075 
				pVfs->extractGameFileToPackage(this, "shader\\2_a\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
2081 
			pVfs->extractGameFileToPackage(this, ";shader\\2_b\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
 2076 
			if ( !pVfs->extractGameFileToPackage(this, ";shader\\2_b\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2077 
				pVfs->extractGameFileToPackage(this, "shader\\2_b\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
2082 
			pVfs->extractGameFileToPackage(this, ";shader\\3_0\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
 2078 
			if ( !pVfs->extractGameFileToPackage(this, ";shader\\3_0\\"; + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2079 
				pVfs->extractGameFileToPackage(this, "shader\\3_0\\" + CFileIO(node->str.ToString()).ChangeFileExtension("fb").ToString(), FILETYPE_SHIPOTHER);
- 
 
 2080 
				*/
2083 
		}
 2081 
		}
2084 
		else {
 2082 
		else {
2085 
			if ( !pVfs->extractGameFileToPackage(this, "dds\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) ) {
 2083 
			if ( pVfs->extractGameFileToPackage(this, "dds\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
2086 
				if ( F.CheckFileExtension(";dds") )
 2084 
				continue;
- 
 
 2085 
 
2087 
					pVfs->extractGameFileToPackage(this, "dds\\&quot; + Utils::String(node->str.ToString()).token(".", -1), FILETYPE_SHIPOTHER);
 2086 
			if ( pVfs->extractGameFileToPackage(this, "dds\\&quot; + Utils::String(node->str.ToString()).token(".", -1), FILETYPE_SHIPOTHER) )
2088 
				else {
 2087 
				continue;
- 
 
 2088 
 
2089 
					if ( !pVfs->extractGameFileToPackage(this, "dds\\" + Utils::String(node->str.ToString()) + ".dds", FILETYPE_SHIPOTHER) )
 2089 
			if ( pVfs->extractGameFileToPackage(this, "dds\\" + Utils::String(node->str.ToString()) + ".dds", FILETYPE_SHIPOTHER) )
- 
 
 2090 
				continue;
- 
 
 2091 
 
- 
 
 2092 
			if ( pVfs->extractGameFileToPackage(this, "dds\\" + Utils::String(F.ChangeFileExtension("dds").ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2093 
				continue;
- 
 
 2094 
 
2090 
						pVfs->extractGameFileToPackage(this, &quot;textures\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER);
 2095 
			if ( pVfs->extractGameFileToPackage(this, &quot;textures\\" + Utils::String(node->str.ToString()), FILETYPE_SHIPOTHER) )
- 
 
 2096 
				continue;
- 
 
 2097 
 
- 
 
 2098 
			if ( pVfs->extractGameFileToPackage(this, "textures\\" + Utils::String(node->str.ToString()).token(".", -1), FILETYPE_SHIPOTHER) )
- 
 
 2099 
				continue;
- 
 
 2100 
 
- 
 
 2101 
			if ( pVfs->extractGameFileToPackage(this, "textures\\" + Utils::String(node->str.ToString()) + ".jpg", FILETYPE_SHIPOTHER) )
2091 
				}
 2102 
				continue;
- 
 
 2103 
 
- 
 
 2104 
			if ( pVfs->extractGameFileToPackage(this, "textures\\" + Utils::String(F.ChangeFileExtension("jpg").ToString()), FILETYPE_SHIPOTHER) )
2092 
			}
 2105 
				continue;
2093 
		}
 2106 
		}
2094 
	}
 2107 
	}
2095 
}
 2108 
}
2096 
 
 2109 
 
2097 
bool CXspFile::AddTextFromFile(const Utils::String &sFile, int textId)
 2110 
bool CXspFile::AddTextFromFile(const Utils::String &sFile, int textId)