games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
This commit is contained in:
Nordsoft91 2022-10-08 22:55:15 +04:00 committed by GitHub
parent b6c0fcabbd
commit 23f80c58dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -62,7 +62,6 @@ option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)
option(ENABLE_LUA "Enable compilation of LUA scripting module" OFF)
option(ENABLE_LAUNCHER "Enable compilation of launcher" ON)
option(ENABLE_EDITOR "Enable compilation of map editor" ON)
option(ENABLE_TEST "Enable compilation of unit tests" ON)
if(APPLE_IOS)
set(BUNDLE_IDENTIFIER_PREFIX "" CACHE STRING "Bundle identifier prefix")
else()

2
mapeditor/Animation.h
View File

@ -60,7 +60,7 @@ public:
//duplicates frame at [sourceGroup, sourceFrame] as last frame in targetGroup
//and loads it if animation is preloaded
void duplicateImage(const size_t sourceGroup, const size_t sourceFrame, const size_t targetGroup);
void duplicateImage(size_t sourceGroup, size_t sourceFrame, size_t targetGroup);
// adjust the color of the animation, used in battle spell effects, e.g. Cloned objects

16
mapeditor/BitmapHandler.cpp
View File

@ -117,7 +117,7 @@ namespace BitmapHandler
return image;
}
else
{ //loading via SDL_Image
{ //loading via QImage
QImage image(QString::fromStdString(fullpath->make_preferred().string()));
if(!image.isNull())
{
@ -145,15 +145,13 @@ namespace BitmapHandler
QImage loadBitmap(const std::string & fname, bool setKey)
{
QImage image = loadBitmapFromDir("DATA/", fname, setKey);
if(image.isNull())
for(const auto dir : {"DATA/", "SPRITES/"})
{
image = loadBitmapFromDir("SPRITES/", fname, setKey);
if(image.isNull())
{
logGlobal->error("Error: Failed to find file %s", fname);
}
}
auto image = loadBitmapFromDir(dir, fname, setKey);
if(!image.isNull())
return image;
}
logGlobal->error("Error: Failed to find file %s", fname);
return {};
}
}

6
mapeditor/StdInc.h
View File

@ -19,7 +19,8 @@ template<class Type>
NumericPointer data_cast(Type * _pointer)
{
static_assert(sizeof(Type *) == sizeof(NumericPointer),
"Compilied for 64 bit arcitecture. Use NumericPointer = unsigned int");
"Compiled for 64 bit arcitecture. Use NumericPointer = unsigned int");
return reinterpret_cast<NumericPointer>(_pointer);
}
@ -27,7 +28,8 @@ template<class Type>
Type * data_cast(NumericPointer _numeric)
{
static_assert(sizeof(Type *) == sizeof(NumericPointer),
"Compilied for 64 bit arcitecture. Use NumericPointer = unsigned int");
"Compiled for 64 bit arcitecture. Use NumericPointer = unsigned int");
return reinterpret_cast<Type *>(_numeric);
}

2
mapeditor/inspector/rewardswidget.cpp
View File

@ -212,7 +212,7 @@ bool RewardsWidget::commitChanges()
void RewardsWidget::on_rewardList_activated(int index)
{
ui->rewardAmount->setText(QString::number(1));
ui->rewardAmount->setText(QStringLiteral("1"));
}
void RewardsWidget::addReward(int typeId, int listId, int amount)

11
mapeditor/mainwindow.cpp
View File

@ -102,7 +102,7 @@ MainWindow::MainWindow(QWidget *parent) :
QDir::setCurrent(QApplication::applicationDirPath());
//configure logging
const boost::filesystem::path logPath = VCMIDirs::get().userCachePath() / "VCMI_Editor_log.txt";
const boost::filesystem::path logPath = VCMIDirs::get().userLogsPath() / "VCMI_Editor_log.txt";
console = new CConsoleHandler();
logConfig = new CBasicLogConfigurator(logPath, console);
logConfig->configureDefault();
@ -282,9 +282,10 @@ void MainWindow::on_actionOpen_triggered()
if(!getAnswerAboutUnsavedChanges())
return;
auto filenameSelect = QFileDialog::getOpenFileName(this, tr("Open Image"), QString::fromStdString(VCMIDirs::get().userCachePath().make_preferred().string()), tr("Homm3 Files (*.vmap *.h3m)"));
if(filenameSelect.isNull())
auto filenameSelect = QFileDialog::getOpenFileName(this, tr("Open map"),
QString::fromStdString(VCMIDirs::get().userCachePath().make_preferred().string()),
tr("All supported maps (*.vmap *.h3m);;VCMI maps(*.vmap);;HoMM3 maps(*.h3m)"));
if(filenameSelect.isEmpty())
return;
openMap(filenameSelect);
@ -517,7 +518,7 @@ void MainWindow::loadObjectsTree()
throw std::runtime_error("object browser exists");
//model
objectsModel.setHorizontalHeaderLabels(QStringList() << QStringLiteral("Type"));
objectsModel.setHorizontalHeaderLabels(QStringList() << tr("Type"));
objectBrowser = new ObjectBrowser(this);
objectBrowser->setSourceModel(&objectsModel);
objectBrowser->setDynamicSortFilter(false);

2
mapeditor/maphandler.cpp
View File

@ -191,7 +191,7 @@ void MapHandler::initObjectRects()
auto image = animation->getImage(0, obj->ID == Obj::HERO ? 2 : 0);
if(!image)
{
//workaound for prisons
//workaround for prisons
image = animation->getImage(0, 0);
if(!image)
continue;

2
mapeditor/mapview.cpp
View File

@ -128,7 +128,7 @@ void MapView::mouseMoveEvent(QMouseEvent *mouseEvent)
break;
case MapView::SelectionTool::Area:
if(mouseEvent->buttons() & Qt::RightButton || !mouseEvent->buttons() & Qt::LeftButton)
if(mouseEvent->buttons() & Qt::RightButton || !(mouseEvent->buttons() & Qt::LeftButton))
break;
sc->selectionTerrainView.clear();

6
mapeditor/playerparams.cpp
View File

@ -54,9 +54,7 @@ PlayerParams::PlayerParams(MapController & ctrl, int playerId, QWidget *parent)
{
if(playerInfo.hasMainTown && playerInfo.posOfMainTown == town->pos)
foundMainTown = townIndex;
auto name = town->name + ", (random)";
if(ctown->faction)
name = town->getObjectName();
const auto name = ctown->faction ? town->getObjectName() : town->name + ", (random)";
ui->mainTown->addItem(tr(name.c_str()), QVariant::fromValue(i));
++townIndex;
}
@ -75,7 +73,7 @@ PlayerParams::PlayerParams(MapController & ctrl, int playerId, QWidget *parent)
playerInfo.posOfMainTown = int3(-1, -1, -1);
}
ui->playerColor->setTitle(QString("PlayerID: %1").arg(playerId));
ui->playerColor->setTitle(tr("Player ID: %1").arg(playerId));
show();
}

2
mapeditor/validator.cpp
View File

@ -88,7 +88,7 @@ std::list<Validator::Issue> Validator::validate(const CMap * map)
{
bool has = amountOfCastles.count(ins->getOwner().getNum());
if(!has && ins->getOwner() != PlayerColor::NEUTRAL)
issues.emplace_back(QString("Town %1 has undefined owner %s").arg(ins->instanceName.c_str(), ins->getOwner().getStr().c_str()), true);
issues.emplace_back(tr("Town %1 has undefined owner %2").arg(ins->instanceName.c_str(), ins->getOwner().getStr().c_str()), true);
if(has)
++amountOfCastles[ins->getOwner().getNum()];
}

2
mapeditor/windownewmap.cpp
View File

@ -193,7 +193,7 @@ std::unique_ptr<CMap> generateEmptyMap(CMapGenOptions & options)
return std::move(map);
}
void WindowNewMap::on_okButtong_clicked()
void WindowNewMap::on_okButton_clicked()
{
EWaterContent::EWaterContent water = EWaterContent::RANDOM;
EMonsterStrength::EMonsterStrength monster = EMonsterStrength::RANDOM;

2
mapeditor/windownewmap.h
View File

@ -57,7 +57,7 @@ public:
private slots:
void on_cancelButton_clicked();
void on_okButtong_clicked();
void on_okButton_clicked();
void on_sizeCombo_activated(int index);