games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

formatting

Browse Source
This commit is contained in:
AlexVinS 2017-06-06 19:45:34 +03:00
parent a31c28ec33
commit 0190c9804e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/widgets/CArtifactHolder.cpp
View File

@ -166,7 +166,7 @@ void CHeroArtPlace::clickLeft(tribool down, bool previousState)
//should not happen, catapult cannot be selected
logGlobal->error("Attempt to move Catapult");
}
else if (cur->isBig())
else if(cur->isBig())
{
//war machines cannot go to backpack
LOCPLINT->showInfoDialog(boost::str(boost::format(CGI->generaltexth->allTexts[153]) % cur->Name()));

8
config/artifacts.json
View File

@ -18,25 +18,25 @@
{
"index" : 3,
"type" : ["HERO"],
"warMachine":"catapult"
"warMachine" : "catapult"
},
"ballista":
{
"index" : 4,
"type" : ["HERO"],
"warMachine":"ballista"
"warMachine" : "ballista"
},
"ammoCart":
{
"index" : 5,
"type" : ["HERO"],
"warMachine":"ammoCart"
"warMachine" : "ammoCart"
},
"firstAidTent":
{
"index" : 6,
"type" : ["HERO"],
"warMachine":"firstAidTent"
"warMachine" : "firstAidTent"
},
"centaurAxe":
{

4
server/CGameHandler.cpp
View File

@ -6048,9 +6048,9 @@ void CGameHandler::putArtifact(const ArtifactLocation &al, const CArtifactInstan
sendAndApply(&pa);
}
bool CGameHandler::giveHeroNewArtifact(const CGHeroInstance* h, const CArtifact* art)
bool CGameHandler::giveHeroNewArtifact(const CGHeroInstance * h, const CArtifact * art)
{
COMPLAIN_RET_FALSE_IF(art->possibleSlots.at(ArtBearer::HERO).empty(),"Not a hero artifact!");
COMPLAIN_RET_FALSE_IF(art->possibleSlots.at(ArtBearer::HERO).empty(), "Not a hero artifact!");
ArtifactPosition slot = art->possibleSlots.at(ArtBearer::HERO).front();

2
server/CGameHandler.h
View File

@ -143,7 +143,7 @@ public:
void removeAfterVisit(const CGObjectInstance *object) override;
bool giveHeroNewArtifact(const CGHeroInstance *h, const CArtifact *art);
bool giveHeroNewArtifact(const CGHeroInstance * h, const CArtifact * art);
void giveHeroNewArtifact(const CGHeroInstance *h, const CArtifact *artType, ArtifactPosition pos) override;
void giveHeroArtifact(const CGHeroInstance *h, const CArtifactInstance *a, ArtifactPosition pos) override;
void putArtifact(const ArtifactLocation &al, const CArtifactInstance *a) override;