| Line 3760... |
Line 3760... |
| 3760 |
for (CListNode<SNeededLibrary> *node = neededList->Front(); node; node = node->next())
|
3760 |
for (CListNode<SNeededLibrary> *node = neededList->Front(); node; node = node->next())
|
| 3761 |
{
|
3761 |
{
|
| 3762 |
SNeededLibrary *nl = node->Data();
|
3762 |
SNeededLibrary *nl = node->Data();
|
| 3763 |
if (!checkInstalledDependacy((nl->sName.Compare("<package>")) ? p->name() : nl->sName, (nl->sAuthor.Compare("<author>")) ? p->author() : nl->sAuthor, nl->sMinVersion, (nl->sName.Compare("<package>")) ? false : onlyEnabled, (nl->sName.Compare("<package>")) ? false : includePrepared))
|
3763 |
if (!checkInstalledDependacy((nl->sName.Compare("<package>")) ? p->name() : nl->sName, (nl->sAuthor.Compare("<author>")) ? p->author() : nl->sAuthor, nl->sMinVersion, (nl->sName.Compare("<package>")) ? false : onlyEnabled, (nl->sName.Compare("<package>")) ? false : includePrepared))
|
| 3764 |
{
|
3764 |
{
|
| 3765 |
bool found = true;
|
3765 |
bool found = false;
|
| 3766 |
for (auto itr = packages.Front(); itr; itr = itr->next())
|
3766 |
for (auto itr = packages.Front(); itr; itr = itr->next())
|
| 3767 |
{
|
3767 |
{
|
| 3768 |
if (itr->Data()->name().Compare(nl->sName) && itr->Data()->author().Compare(nl->sAuthor))
|
3768 |
if (itr->Data()->name().Compare(nl->sName) && itr->Data()->author().Compare(nl->sAuthor) && nl->sMinVersion.compareVersion(itr->Data()->version()) >= 0)
|
| 3769 |
{
|
3769 |
{
|
| 3770 |
if (!findAllNeededDependacies(itr->Data(), packages, foundPackages, onlyEnabled, includePrepared))
|
3770 |
if (!findAllNeededDependacies(itr->Data(), packages, foundPackages, onlyEnabled, includePrepared))
|
| 3771 |
return false;
|
3771 |
return false;
|
| 3772 |
if (foundPackages)
|
3772 |
if (foundPackages)
|
| 3773 |
{
|
3773 |
{
|
| Line 5057... |
Line 5057... |
| 5057 |
int CPackages::GetGameAddons(Utils::CStringList &exes)
|
5057 |
int CPackages::GetGameAddons(Utils::CStringList &exes)
|
| 5058 |
{
|
5058 |
{
|
| 5059 |
return m_gameExe.GetGameAddons(m_sCurrentDir.ToString(), exes);
|
5059 |
return m_gameExe.GetGameAddons(m_sCurrentDir.ToString(), exes);
|
| 5060 |
}
|
5060 |
}
|
| 5061 |
|
5061 |
|
| 5062 |
CyString CPackages::GetGameTypesString(CBaseFile *package, bool includeVersion)
|
5062 |
Utils::String CPackages::getGameTypesString(CBaseFile *package, bool includeVersion)
|
| 5063 |
{
|
5063 |
{
|
| 5064 |
if ( !package->AnyGameCompatability() )
|
5064 |
if ( !package->AnyGameCompatability() )
|
| 5065 |
return NullString;
|
5065 |
return "";
|
| 5066 |
|
5066 |
|
| 5067 |
Utils::String sGames;
|
5067 |
Utils::String sGames;
|
| 5068 |
for ( CListNode<SGameCompat> *gNode = package->GetGameCompatabilityList()->Front(); gNode; gNode = gNode->next() ) {
|
5068 |
for ( CListNode<SGameCompat> *gNode = package->GetGameCompatabilityList()->Front(); gNode; gNode = gNode->next() ) {
|
| 5069 |
if ( !sGames.empty() )
|
5069 |
if ( !sGames.empty() )
|
| 5070 |
sGames += ", ";
|
5070 |
sGames += ", ";
|