Subversion Repositories spk

Rev

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

Rev 14 Rev 43
Line 1067... Line 1067...
1067 
		}
 1067 
		}
1068 
	}
 1068 
	}
1069 
 
 1069 
 
1070 
}
 1070 
}
1071 
 
 1071 
 
1072 
bool CBaseFile::InstallFiles ( CyString destdir, CProgressInfo *progress, CLinkList<C_File> *filelist, CyStringList *errorStr, bool enabled, CPackages *packages )
 1072 
void CBaseFile::_install_renameText(CPackages *pPackages)
1073 
{
 1073 
{
1074 
	if ( enabled )
 - 
 
1075 
	{
 - 
 
1076 
/*		int startfake = packages->FindNextFakePatch();
 1074 
	int starttext = pPackages->FindNextTextFile();
1077 
		while ( startfake < 99 )
 - 
 
1078 
		{
 - 
 
1079 
			CyString filename = destdir;
 - 
 
1080 
			if ( !filename.Empty() )
 - 
 
1081 
				filename += "/";
 - 
 
1082 
			filename += CyString::Number((long)startfake).PadNumber(2);
 - 
 
1083 
 
 - 
 
1084 
			if ( !CFileIO(filename + ".cat").Exists() )
 - 
 
1085 
			{
 - 
 
1086 
				if ( !CFileIO(filename + ".dat").Exists() )
 - 
 
1087 
					break;
 - 
 
1088 
			}
 - 
 
1089 
			startfake++;
 - 
 
1090 
		}
 - 
 
1091 
 
 - 
 
1092 
		for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
 1075 
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() ) {
1093 
		{
 - 
 
1094 
			C_File *fit = node->Data();
 1076 
		C_File *fit = node->Data();
1095 
			// only do fake patchs
 - 
 
1096 
			if ( !fit->IsFakePatch() )
 1077 
		if ( !fit->IsAutoTextFile() )
1097 
				continue;
 - 
 
1098 
 
 - 
 
1099 
			if ( !fit->CheckFileExt ("cat") && !fit->CheckFileExt("dat") )
 - 
 
1100 
				continue;
 1078 
			continue;
1101 
 
 1079 
 
1102 
			// search for the name on the list
 - 
 
1103 
			SStringList *opposite = lPatches.FindString(fit->GetBaseName());
 1080 
		CyString newname = SPK::FormatTextName(starttext, pPackages->GetLanguage(), (pPackages->GetCurrentGameFlags() & EXEFLAG_TCTEXT));
1104 
			CyString newname;
 - 
 
1105 
			if ( opposite )
 - 
 
1106 
				newname = opposite->data;
 - 
 
1107 
			else
 - 
 
1108 
			{
 - 
 
1109 
				newname = CyString::Number((long)startfake).PadNumber(2);
 - 
 
1110 
				lPatches.PushBack(fit->GetBaseName(), newname);
 - 
 
1111 
			}
 - 
 
1112 
 
 - 
 
1113 
			// rename the file
 - 
 
1114 
			fit->FixOriginalName();
 1081 
		fit->FixOriginalName();
1115 
			fit->SetName ( newname + "." + fit->GetFileExt() );
 1082 
		fit->SetName ( newname + "." + fit->GetFileExt() );
1116 
 
 - 
 
1117 
			// find the next gap
 - 
 
1118 
			if ( !opposite )
 - 
 
1119 
			{
 - 
 
1120 
				startfake++; // make sure we moved past the one we've just used
 - 
 
1121 
				while ( startfake < 99 )
 - 
 
1122 
				{
 - 
 
1123 
					CyString filename = destdir;
 - 
 
1124 
					if ( !filename.Empty() )
 - 
 
1125 
						filename += "/";
 - 
 
1126 
					filename += CyString::Number((long)startfake).PadNumber(2);
 - 
 
1127 
 
 - 
 
1128 
					if ( !CFileIO(filename + ".cat").Exists() )
 - 
 
1129 
					{
 - 
 
1130 
						if ( !CFileIO(filename + ".dat").Exists() )
 - 
 
1131 
							break;
 - 
 
1132 
					}
 - 
 
1133 
					startfake++;
 - 
 
1134 
				}
 - 
 
1135 
			}
 - 
 
1136 
		}
 - 
 
1137 
		*/
 - 
 
1138 
		this->_install_adjustFakePatches(packages);
 - 
 
1139 
 
 1083 
 
1140 
		// find renameable text file
 - 
 
1141 
		if ( packages )
 - 
 
1142 
		{
 - 
 
1143 
			int starttext = packages->FindNextTextFile();
 - 
 
1144 
			/*
 - 
 
1145 
			while ( starttext < 9999 )
 - 
 
1146 
			{
 - 
 
1147 
				CyString filename = destdir;
 - 
 
1148 
				if ( !filename.Empty() )
 - 
 
1149 
					filename += "/t/";
 - 
 
1150 
				filename += SPK::FormatTextName(starttext, packages->GetLanguage(), (packages->GetCurrentGameFlags() & EXEFLAG_TCTEXT));
 - 
 
1151 
 
 - 
 
1152 
				if ( !CFileIO(filename + ".xml").Exists() )
 - 
 
1153 
				{
 - 
 
1154 
					if ( !CFileIO(filename + ".pck").Exists() )
 - 
 
1155 
						break;
 - 
 
1156 
				}
 - 
 
1157 
				starttext++;
 1084 
		++starttext;
1158 
			}*/
 - 
 
1159 
 
 - 
 
1160 
			for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
 - 
 
1161 
			{
 1085 
	}
1162 
				C_File *fit = node->Data();
 - 
 
1163 
				if ( !fit->IsAutoTextFile() )
 - 
 
1164 
					continue;
 - 
 
1165 
 
 1086 
}
1166 
				CyString newname = SPK::FormatTextName(starttext, packages->GetLanguage(), (packages->GetCurrentGameFlags() & EXEFLAG_TCTEXT));
 - 
 
1167 
				fit->FixOriginalName();
 - 
 
1168 
				fit->SetName ( newname + "." + fit->GetFileExt() );
 - 
 
1169 
 
 1087 
 
1170 
				++starttext;
 - 
 
- 
 
 1088 
bool CBaseFile::InstallFiles ( CyString destdir, CProgressInfo *progress, CLinkList<C_File> *filelist, CyStringList *errorStr, bool enabled, CPackages *packages )
1171 
			}
 1089 
{
1172 
		}
 1090 
	if ( enabled ) {
- 
 
 1091 
		this->_install_adjustFakePatches(packages);
- 
 
 1092 
		if ( packages ) this->_install_renameText(packages);
1173 
	}
 1093 
	}
1174 
 
 1094 
 
1175 
	CDirIO Dir(destdir);
 1095 
	CDirIO Dir(destdir);
1176 
	int fileCount = 0;
 1096 
	int fileCount = 0;
1177 
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
 1097 
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )