From d479341a5ac01e8d94563a4b2d38e365232c4d7b Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 30 Apr 2012 12:13:36 +0000 Subject: [PATCH] - gcc compile and warning fixes --- lib/BattleState.cpp | 5 ++++- lib/HeroBonus.cpp | 2 +- lib/Makefile.am | 1 + lib/Makefile.in | 24 +++++++++++++++++------- server/CGameHandler.cpp | 1 + 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/lib/BattleState.cpp b/lib/BattleState.cpp index 33480dced..0e395ac57 100644 --- a/lib/BattleState.cpp +++ b/lib/BattleState.cpp @@ -412,6 +412,8 @@ BattleHex BattleInfo::getClosestTile (bool attackerOwned, int initialPos, std::s int BattleInfo::getAvaliableHex(TCreature creID, bool attackerOwned, int initialPos) const { + /* + //FIXME: unused? int pos; if (initialPos > -1) pos = initialPos; @@ -422,6 +424,7 @@ int BattleInfo::getAvaliableHex(TCreature creID, bool attackerOwned, int initial else pos = GameConstants::BFIELD_WIDTH; //top right } + */ bool ac[GameConstants::BFIELD_SIZE]; std::set occupyable; @@ -1783,7 +1786,7 @@ BattleInfo * BattleInfo::setupBattle( int3 tile, int terrain, int terType, const RandGen r; auto ourRand = [&]{ return r.rand(); }; r.srand(tile); - const int sound = r.rand(1,8); //battle sound ID to play... can't do anything with it here + r.rand(1,8); //battle sound ID to play... can't do anything with it here int tilesToBlock = r.rand(5,12); const int specialBattlefield = battlefieldTypeToBI(terType); diff --git a/lib/HeroBonus.cpp b/lib/HeroBonus.cpp index 794f7121d..d94bb380e 100644 --- a/lib/HeroBonus.cpp +++ b/lib/HeroBonus.cpp @@ -17,7 +17,7 @@ #define FOREACH_RED_PARENT(pname) TNodes lparents; getRedParents(lparents); BOOST_FOREACH(CBonusSystemNode *pname, lparents) #define BONUS_NAME(x) ( #x, Bonus::x ) - DLL_LINKAGE const std::map bonusNameMap = boost::assign::map_list_of BONUS_LIST; + const std::map bonusNameMap = boost::assign::map_list_of BONUS_LIST; #undef BONUS_NAME #define BONUS_LOG_LINE(x) tlog5 << x << std::endl diff --git a/lib/Makefile.am b/lib/Makefile.am index 3beffb232..90d4fb444 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -42,6 +42,7 @@ libvcmi_la_SOURCES = \ CMapInfo.h \ CObjectHandler.cpp \ CObjectHandler.h \ + CObstacleInstance.cpp \ CObstacleInstance.h \ CSpellHandler.cpp \ CSpellHandler.h \ diff --git a/lib/Makefile.in b/lib/Makefile.in index e387276f0..a3c3e2ee2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -88,13 +88,13 @@ am_libvcmi_la_OBJECTS = libvcmi_la-BattleAction.lo \ libvcmi_la-CGameState.lo libvcmi_la-CGeneralTextHandler.lo \ libvcmi_la-CHeroHandler.lo libvcmi_la-CLodHandler.lo \ libvcmi_la-CLogger.lo libvcmi_la-CMapInfo.lo \ - libvcmi_la-CObjectHandler.lo libvcmi_la-CSpellHandler.lo \ - libvcmi_la-CTownHandler.lo libvcmi_la-CThreadHelper.lo \ - libvcmi_la-Connection.lo libvcmi_la-HeroBonus.lo \ - libvcmi_la-IGameCallback.lo libvcmi_la-JsonNode.lo \ - libvcmi_la-NetPacksLib.lo libvcmi_la-ResourceSet.lo \ - libvcmi_la-BattleHex.lo libvcmi_la-VCMI_Lib.lo \ - libvcmi_la-map.lo + libvcmi_la-CObjectHandler.lo libvcmi_la-CObstacleInstance.lo \ + libvcmi_la-CSpellHandler.lo libvcmi_la-CTownHandler.lo \ + libvcmi_la-CThreadHelper.lo libvcmi_la-Connection.lo \ + libvcmi_la-HeroBonus.lo libvcmi_la-IGameCallback.lo \ + libvcmi_la-JsonNode.lo libvcmi_la-NetPacksLib.lo \ + libvcmi_la-ResourceSet.lo libvcmi_la-BattleHex.lo \ + libvcmi_la-VCMI_Lib.lo libvcmi_la-map.lo libvcmi_la_OBJECTS = $(am_libvcmi_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -324,6 +324,7 @@ libvcmi_la_SOURCES = \ CMapInfo.h \ CObjectHandler.cpp \ CObjectHandler.h \ + CObstacleInstance.cpp \ CObstacleInstance.h \ CSpellHandler.cpp \ CSpellHandler.h \ @@ -451,6 +452,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CLogger.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CMapInfo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CObjectHandler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CObstacleInstance.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CSpellHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CThreadHelper.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CTownHandler.Plo@am__quote@ @@ -631,6 +633,14 @@ libvcmi_la-CObjectHandler.lo: CObjectHandler.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CObjectHandler.lo `test -f 'CObjectHandler.cpp' || echo '$(srcdir)/'`CObjectHandler.cpp +libvcmi_la-CObstacleInstance.lo: CObstacleInstance.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CObstacleInstance.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CObstacleInstance.Tpo -c -o libvcmi_la-CObstacleInstance.lo `test -f 'CObstacleInstance.cpp' || echo '$(srcdir)/'`CObstacleInstance.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CObstacleInstance.Tpo $(DEPDIR)/libvcmi_la-CObstacleInstance.Plo +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='CObstacleInstance.cpp' object='libvcmi_la-CObstacleInstance.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CObstacleInstance.lo `test -f 'CObstacleInstance.cpp' || echo '$(srcdir)/'`CObstacleInstance.cpp + libvcmi_la-CSpellHandler.lo: CSpellHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CSpellHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CSpellHandler.Tpo -c -o libvcmi_la-CSpellHandler.lo `test -f 'CSpellHandler.cpp' || echo '$(srcdir)/'`CSpellHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CSpellHandler.Tpo $(DEPDIR)/libvcmi_la-CSpellHandler.Plo diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp index e1eaab79f..d25aeca72 100644 --- a/server/CGameHandler.cpp +++ b/server/CGameHandler.cpp @@ -2548,6 +2548,7 @@ bool CGameHandler::moveArtifact(const ArtifactLocation &al1, const ArtifactLocat ma.src = src; ma.dst = dst; sendAndApply(&ma); + return true; } /**