games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-17 20:58:07 +02:00
Code Issues Releases Activity

Merge pull request #5541 from IvanSavenko/crashfix

Browse Source 
[beta] Backport of fixes for crashes
This commit is contained in:
Ivan Savenko 2025-03-11 22:45:52 +02:00 committed by GitHub
commit f3bd6e0b9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 160 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/lobby/SelectionTab.cpp
View File

@ -617,7 +617,13 @@ void SelectionTab::sort()
if(!sortModeAscending)
{
if(firstMapIndex)
std::reverse(std::next(curItems.begin(), boost::starts_with(curItems[0]->folderName, "..") ? 1 : 0), std::next(curItems.begin(), firstMapIndex - 1));
{
auto startIt = std::next(curItems.begin(), boost::starts_with(curItems[0]->folderName, "..") ? 1 : 0);
auto endIt = std::next(curItems.begin(), firstMapIndex - 1);
if(startIt > endIt)
std::swap(startIt, endIt);
std::reverse(startIt, endIt);
}
std::reverse(std::next(curItems.begin(), firstMapIndex), curItems.end());
}

2
client/windows/CCastleInterface.cpp
View File

@ -398,6 +398,8 @@ void CHeroGSlot::gesture(bool on, const Point & initialPosition, const Point & f
std::vector<std::shared_ptr<CComponent>> resComps;
for(TResources::nziterator i(upgradableSlots.totalCosts); i.valid(); i++)
resComps.push_back(std::make_shared<CComponent>(ComponentType::RESOURCE, i->resType, i->resVal));
if(resComps.empty())
resComps.push_back(std::make_shared<CComponent>(ComponentType::RESOURCE, static_cast<GameResID>(GameResID::GOLD), 0)); // add at least gold, when there are no costs
resComps.back()->newLine = true;
for(auto & upgradeInfo : upgradableSlots.upgradeInfos)
resComps.push_back(std::make_shared<CComponent>(ComponentType::CREATURE, upgradeInfo.second.getUpgrade(), obj->Slots().at(upgradeInfo.first)->count));

103
launcher/firstLaunch/firstlaunch_moc.cpp
View File

@ -330,25 +330,6 @@ void FirstLaunchView::extractGogData()
return file;
};
auto checkMagic = [this](QString filename, QString filter, QByteArray magic)
{
QString titleErr = tr("You have to select %1 file!", "param is file extension").arg(filter);
QFile tmpFile(filename);
if(!tmpFile.open(QIODevice::ReadOnly))
{
QMessageBox::critical(this, tr("File cannot be opened"), tmpFile.errorString());
return false;
}
QByteArray magicFile = tmpFile.read(magic.length());
if(!magicFile.startsWith(magic))
{
QMessageBox::critical(this, tr("Invalid file selected"), titleErr);
return false;
}
return true;
};
QString filterBin = tr("GOG data") + " (*.bin)";
QString filterExe = tr("GOG installer") + " (*.exe)";
@ -363,10 +344,49 @@ void FirstLaunchView::extractGogData()
ui->pushButtonGogInstall->setVisible(false);
setEnabled(false);
QTimer::singleShot(100, this, [this, fileExe, fileBin, checkMagic, filterBin, filterExe](){ // background to make sure FileDialog is closed...
QTimer::singleShot(100, this, [this, fileBin, fileExe](){ // background to make sure FileDialog is closed...
extractGogDataAsync(fileBin, fileExe);
ui->progressBarGog->setVisible(false);
ui->pushButtonGogInstall->setVisible(true);
setEnabled(true);
});
#endif
}
void FirstLaunchView::extractGogDataAsync(QString filePathBin, QString filePathExe)
{
logGlobal->info("Extracting gog data from '%s' and '%s'", filePathBin.toStdString(), filePathExe.toStdString());
#ifdef ENABLE_INNOEXTRACT
auto checkMagic = [](QString filename, QString filter, QByteArray magic)
{
logGlobal->info("Checking file %s", filename.toStdString());
QFile tmpFile(filename);
if(!tmpFile.open(QIODevice::ReadOnly))
{
logGlobal->info("File cannot be opened: %s", tmpFile.errorString().toStdString());
return tr("Failed to open file: %1").arg(tmpFile.errorString());
}
QByteArray magicFile = tmpFile.read(magic.length());
if(!magicFile.startsWith(magic))
{
logGlobal->info("Invalid file selected: %s", filter.toStdString());
return tr("You have to select %1 file!", "param is file extension").arg(filter);
}
logGlobal->info("Checking file %s", filename.toStdString());
return QString();
};
QString filterBin = tr("GOG data") + " (*.bin)";
QString filterExe = tr("GOG installer") + " (*.exe)";
QDir tempDir(pathToQString(VCMIDirs::get().userDataPath()));
if(tempDir.cd("tmp"))
{
logGlobal->info("Cleaning up old data");
tempDir.removeRecursively(); // remove if already exists (e.g. previous crash)
tempDir.cdUp();
}
@ -374,21 +394,27 @@ void FirstLaunchView::extractGogData()
if(!tempDir.cd("tmp"))
return; // should not happen - but avoid deleting wrong folder in any case
logGlobal->info("Using '%s' as temporary directory", tempDir.path().toStdString());
QString tmpFileExe = tempDir.filePath("h3_gog.exe");
QString tmpFileBin = tempDir.filePath("h3_gog-1.bin");
Helper::performNativeCopy(fileExe, tmpFileExe);
Helper::performNativeCopy(fileBin, tmpFileBin);
if (!checkMagic(tmpFileBin, filterBin, QByteArray{"idska32"}) ||
!checkMagic(tmpFileExe, filterExe, QByteArray{"MZ"}))
return;
logGlobal->info("Installing exe '%s' ('%s')", tmpFileExe.toStdString(), fileExe.toStdString());
logGlobal->info("Installing bin '%s' ('%s')", tmpFileBin.toStdString(), fileBin.toStdString());
logGlobal->info("Performing native copy...");
Helper::performNativeCopy(filePathExe, tmpFileExe);
Helper::performNativeCopy(filePathBin, tmpFileBin);
logGlobal->info("Native copy completed");
QString errorText{};
if (errorText.isEmpty())
errorText = checkMagic(tmpFileBin, filterBin, QByteArray{"idska32"});
if (errorText.isEmpty())
errorText = checkMagic(tmpFileExe, filterExe, QByteArray{"MZ"});
logGlobal->info("Installing exe '%s' ('%s')", tmpFileExe.toStdString(), filePathExe.toStdString());
logGlobal->info("Installing bin '%s' ('%s')", tmpFileBin.toStdString(), filePathBin.toStdString());
auto isGogGalaxyExe = [](QString fileToTest) {
QFile file(fileToTest);
quint64 fileSize = file.size();
@ -404,22 +430,28 @@ void FirstLaunchView::extractGogData()
return data.contains(magicId);
};
if(errorText.isEmpty())
{
if(isGogGalaxyExe(tmpFileExe))
{
logGlobal->info("Gog Galaxy detected! Aborting...");
errorText = tr("You've provided a GOG Galaxy installer! This file doesn't contain the game. Please download the offline backup game installer!");
}
}
if(errorText.isEmpty())
{
logGlobal->info("Performing extraction using innoextract...");
errorText = Innoextract::extract(tmpFileExe, tempDir.path(), [this](float progress) {
ui->progressBarGog->setValue(progress * 100);
qApp->processEvents();
});
logGlobal->info("Extraction done!");
}
QString hashError;
if(!errorText.isEmpty())
hashError = Innoextract::getHashError(tmpFileExe, tmpFileBin, fileExe, fileBin);
ui->progressBarGog->setVisible(false);
ui->pushButtonGogInstall->setVisible(true);
setEnabled(true);
hashError = Innoextract::getHashError(tmpFileExe, tmpFileBin, filePathExe, filePathBin);
QStringList dirData = tempDir.entryList({"data"}, QDir::Filter::Dirs);
if(!errorText.isEmpty() || dirData.empty() || QDir(tempDir.filePath(dirData.front())).entryList({"*.lod"}, QDir::Filter::Files).empty())
@ -439,10 +471,11 @@ void FirstLaunchView::extractGogData()
tempDir.removeRecursively();
return;
}
logGlobal->info("Copying provided game files...");
copyHeroesData(tempDir.path(), true);
tempDir.removeRecursively();
});
#endif
}

1
launcher/firstLaunch/firstlaunch_moc.h
View File

@ -42,6 +42,7 @@ class FirstLaunchView : public QWidget
QString getHeroesInstallDir();
void extractGogData();
void extractGogDataAsync(QString filePathBin, QString filePathExe);
void copyHeroesData(const QString & path = {}, bool move = false);
// Tab Mod Preset

14
lib/mapObjects/CGDwelling.cpp
View File

@ -474,9 +474,17 @@ void CGDwelling::heroAcceptsCreatures( const CGHeroInstance *h) const
SetAvailableCreatures sac;
sac.tid = id;
sac.creatures = creatures;
sac.creatures[0].first = !h->getArt(ArtifactPosition::MACH1); //ballista
sac.creatures[1].first = !h->getArt(ArtifactPosition::MACH3); //first aid tent
sac.creatures[2].first = !h->getArt(ArtifactPosition::MACH2); //ammo cart
for (auto & entry : sac.creatures)
{
CreatureID creature = entry.second.at(0);
ArtifactID warMachine = creature.toCreature()->warMachine;
if (h->hasArt(warMachine, true, false))
entry.first = 0;
else
entry.first = 1;
}
cb->sendAndApply(sac);
}

11
server/CGameHandler.cpp
View File

@ -2397,7 +2397,18 @@ bool CGameHandler::recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dst
COMPLAIN_RET_FALSE_IF(!hero, "Only hero can buy war machines");
COMPLAIN_RET_FALSE_IF(artId == ArtifactID::CATAPULT, "Catapult cannot be recruited!");
COMPLAIN_RET_FALSE_IF(nullptr == art, "Invalid war machine artifact");
COMPLAIN_RET_FALSE_IF(hero->hasArt(artId),"Hero already has this machine!");
bool hasFreeSlot = false;
for(auto slot : art->getPossibleSlots().at(ArtBearer::HERO))
if (hero->getArt(slot) == nullptr)
hasFreeSlot = true;
if (!hasFreeSlot)
{
auto slot = art->getPossibleSlots().at(ArtBearer::HERO).front();
removeArtifact(ArtifactLocation(hero->id, slot));
}
return giveHeroNewArtifact(hero, artId, ArtifactPosition::FIRST_AVAILABLE);
}
else