Преглед изворни кода

vcmi: rename updater and limiter files

Konstantin пре 2 година
родитељ
комит
713e3004df

+ 2 - 2
AI/VCAI/VCAI.cpp

@@ -22,8 +22,8 @@
 #include "../../lib/CGameState.h"
 #include "../../lib/NetPacksBase.h"
 #include "../../lib/NetPacks.h"
-#include "../../lib/bonuses/ILimiter.h"
-#include "../../lib/bonuses/IUpdater.h"
+#include "../../lib/bonuses/Limiters.h"
+#include "../../lib/bonuses/Updaters.h"
 #include "../../lib/serializer/CTypeList.h"
 #include "../../lib/serializer/BinarySerializer.h"
 #include "../../lib/serializer/BinaryDeserializer.h"

+ 2 - 2
client/CPlayerInterface.cpp

@@ -43,8 +43,8 @@
 #include "../lib/CArtHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
-#include "../lib/bonuses/ILimiter.h"
-#include "../lib/bonuses/IUpdater.h"
+#include "../lib/bonuses/Limiters.h"
+#include "../lib/bonuses/Updaters.h"
 #include "../lib/serializer/CTypeList.h"
 #include "../lib/serializer/BinaryDeserializer.h"
 #include "../lib/serializer/BinarySerializer.h"

+ 4 - 4
cmake_modules/VCMI_lib.cmake

@@ -29,8 +29,8 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE)
 
 		${MAIN_LIB_DIR}/bonuses/CBonusProxy.cpp
 		${MAIN_LIB_DIR}/bonuses/HeroBonus.cpp
-		${MAIN_LIB_DIR}/bonuses/ILimiter.cpp
-		${MAIN_LIB_DIR}/bonuses/IUpdater.cpp
+		${MAIN_LIB_DIR}/bonuses/Limiters.cpp
+		${MAIN_LIB_DIR}/bonuses/Updaters.cpp
 
 		${MAIN_LIB_DIR}/events/ApplyDamage.cpp
 		${MAIN_LIB_DIR}/events/GameResumed.cpp
@@ -306,8 +306,8 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE)
 
 		${MAIN_LIB_DIR}/bonuses/CBonusProxy.h
 		${MAIN_LIB_DIR}/bonuses/HeroBonus.h
-		${MAIN_LIB_DIR}/bonuses/ILimiter.h
-		${MAIN_LIB_DIR}/bonuses/IUpdater.h
+		${MAIN_LIB_DIR}/bonuses/Limiters.h
+		${MAIN_LIB_DIR}/bonuses/Updaters.h
 
 		${MAIN_LIB_DIR}/events/ApplyDamage.h
 		${MAIN_LIB_DIR}/events/GameResumed.h

+ 2 - 2
lib/CCreatureHandler.cpp

@@ -19,8 +19,8 @@
 #include "CModHandler.h"
 #include "GameSettings.h"
 #include "StringConstants.h"
-#include "bonuses/ILimiter.h"
-#include "bonuses/IUpdater.h"
+#include "bonuses/Limiters.h"
+#include "bonuses/Updaters.h"
 #include "serializer/JsonDeserializer.h"
 #include "serializer/JsonUpdater.h"
 #include "mapObjects/CObjectClassesHandler.h"

+ 2 - 2
lib/CHeroHandler.cpp

@@ -24,8 +24,8 @@
 #include "CSkillHandler.h"
 #include "mapObjects/CObjectClassesHandler.h"
 #include "BattleFieldHandler.h"
-#include "bonuses/ILimiter.h"
-#include "bonuses/IUpdater.h"
+#include "bonuses/Limiters.h"
+#include "bonuses/Updaters.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

+ 2 - 2
lib/IGameCallback.cpp

@@ -18,8 +18,8 @@
 #include "CModHandler.h"
 #include "BattleFieldHandler.h"
 #include "ObstacleHandler.h"
-#include "bonuses/ILimiter.h"
-#include "bonuses/IUpdater.h"
+#include "bonuses/Limiters.h"
+#include "bonuses/Updaters.h"
 
 #include "serializer/CSerializer.h" // for SAVEGAME_MAGIC
 #include "serializer/BinaryDeserializer.h"

+ 2 - 2
lib/JsonNode.cpp

@@ -14,8 +14,8 @@
 #include "ScopeGuard.h"
 
 #include "bonuses/HeroBonus.h"
-#include "bonuses/ILimiter.h"
-#include "bonuses/IUpdater.h"
+#include "bonuses/Limiters.h"
+#include "bonuses/Updaters.h"
 #include "filesystem/Filesystem.h"
 #include "VCMI_Lib.h" //for identifier resolution
 #include "CModHandler.h"

+ 2 - 2
lib/battle/BattleInfo.cpp

@@ -9,8 +9,8 @@
  */
 #include "StdInc.h"
 #include "BattleInfo.h"
-#include "bonuses/ILimiter.h"
-#include "bonuses/IUpdater.h"
+#include "bonuses/Limiters.h"
+#include "bonuses/Updaters.h"
 #include "../CStack.h"
 #include "../CHeroHandler.h"
 #include "../NetPacks.h"

+ 2 - 2
lib/bonuses/HeroBonus.cpp

@@ -10,8 +10,8 @@
 
 #include "StdInc.h"
 #include "HeroBonus.h"
-#include "ILimiter.h"
-#include "IUpdater.h"
+#include "Limiters.h"
+#include "Updaters.h"
 
 #include "../VCMI_Lib.h"
 #include "../spells/CSpellHandler.h"

+ 0 - 1
lib/bonuses/HeroBonus.h

@@ -14,7 +14,6 @@
 
 VCMI_LIB_NAMESPACE_BEGIN
 
-class CCreature;
 struct Bonus;
 class IBonusBearer;
 class CBonusSystemNode;

+ 2 - 2
lib/bonuses/ILimiter.cpp → lib/bonuses/Limiters.cpp

@@ -1,5 +1,5 @@
 /*
- * ILimiter.cpp, part of VCMI engine
+ * Limiters.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -9,7 +9,7 @@
  */
 
 #include "StdInc.h"
-#include "ILimiter.h"
+#include "Limiters.h"
 
 #include "../VCMI_Lib.h"
 #include "../spells/CSpellHandler.h"

+ 1 - 1
lib/bonuses/ILimiter.h → lib/bonuses/Limiters.h

@@ -1,5 +1,5 @@
 /*
- * ILimiter.h, part of VCMI engine
+ * Limiters.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

+ 3 - 3
lib/bonuses/IUpdater.cpp → lib/bonuses/Updaters.cpp

@@ -1,5 +1,5 @@
 /*
- * IUpdater.cpp, part of VCMI engine
+ * Updaters.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -10,8 +10,8 @@
 
 #include "StdInc.h"
 
-#include "IUpdater.h"
-#include "ILimiter.h"
+#include "Updaters.h"
+#include "Limiters.h"
 
 #include "../mapObjects/CGHeroInstance.h"
 #include "../CStack.h"

+ 1 - 1
lib/bonuses/IUpdater.h → lib/bonuses/Updaters.h

@@ -1,5 +1,5 @@
 /*
- * IUpdater.h, part of VCMI engine
+ * Updaters.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

+ 2 - 2
lib/registerTypes/RegisterTypes.h

@@ -22,8 +22,8 @@
 #include "../mapObjects/CommonConstructors.h"
 #include "../mapObjects/MapObjects.h"
 #include "../battle/CObstacleInstance.h"
-#include "../bonuses/ILimiter.h"
-#include "../bonuses/IUpdater.h"
+#include "../bonuses/Limiters.h"
+#include "../bonuses/Updaters.h"
 #include "../CStack.h"
 
 VCMI_LIB_NAMESPACE_BEGIN

+ 1 - 1
lib/spells/effects/Moat.cpp

@@ -16,7 +16,7 @@
 
 #include "../../NetPacks.h"
 #include "../../mapObjects/CGTownInstance.h"
-#include "../../bonuses/ILimiter.h"
+#include "../../bonuses/Limiters.h"
 #include "../../battle/IBattleState.h"
 #include "../../battle/CBattleInfoCallback.h"
 #include "../../serializer/JsonSerializeFormat.h"