Browse Source

formatting

AlexVinS 8 years ago
parent
commit
0190c9804e
4 changed files with 8 additions and 8 deletions
  1. 1 1
      client/widgets/CArtifactHolder.cpp
  2. 4 4
      config/artifacts.json
  3. 2 2
      server/CGameHandler.cpp
  4. 1 1
      server/CGameHandler.h

+ 1 - 1
client/widgets/CArtifactHolder.cpp

@@ -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()));

+ 4 - 4
config/artifacts.json

@@ -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":
 	{

+ 2 - 2
server/CGameHandler.cpp

@@ -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();
 

+ 1 - 1
server/CGameHandler.h

@@ -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;