mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 00:36:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2136 from akortunov/warnfix

Browse source 
Fix "-Wstring-plus-int" warnings
This commit is contained in:
Bret Curtis 2019-01-20 19:46:30 +01:00 committed by GitHub
commit 75c5b9de00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/tools/search.cpp
View file

@ -78,7 +78,7 @@ void CSMTools::Search::searchRecordStateCell (const CSMWorld::IdTableBase *model
std::vector<std::string> states = std::vector<std::string> states =
CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_Modification); CSMWorld::Columns::getEnums (CSMWorld::Columns::ColumnId_Modification);
const std::string hint = "r: " + model->getColumnId (index.column()); const std::string hint = "r: " + std::to_string(model->getColumnId(index.column()));
messages.add (id, states.at(data), hint); messages.add (id, states.at(data), hint);
} }
} }

2
apps/openmw/mwmechanics/alchemy.cpp
View file

@ -154,7 +154,7 @@ void MWMechanics::Alchemy::updateEffects()
if (magicEffect->mData.mBaseCost<=0) if (magicEffect->mData.mBaseCost<=0)
{ {
const std::string os = "invalid base cost for magic effect " + iter->mId; const std::string os = "invalid base cost for magic effect " + std::to_string(iter->mId);
throw std::runtime_error (os); throw std::runtime_error (os);
} }