From dd6cfa839926744e7e747a56ca46873364e858e4 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 31 Jan 2016 01:56:05 -0600 Subject: [PATCH] clean up some debug warning stuff --- .../commoditiesMarket/CommoditiesMarket.cpp | 109 ++++++++---------- .../src/shared/object/CreatureObject.cpp | 6 +- .../src/shared/object/ServerObject.cpp | 6 +- .../src/shared/ScriptMethodsString.cpp | 9 +- 4 files changed, 59 insertions(+), 71 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp index 4643d9de..d2d55dfd 100755 --- a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp +++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp @@ -1112,9 +1112,8 @@ void CommoditiesMarket::install() } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send SetGameTime.\n")); -#endif + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send SetGameTime.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -1181,9 +1180,9 @@ void CommoditiesMarket::giveTime() { if (Clock::timeSeconds() - ConfigServerGame::getCommoditiesServerReconnectIntervalSec() > reconnectTime) { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send GiveTime.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GiveTime.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server reconnectTime = Clock::timeSeconds(); } @@ -1394,10 +1393,8 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n")); + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n")); getCommoditiesServerConnection(); //attempt to reconnect to commodities server -#endif } } CreateAuctionResponseMessage msg(NetworkId(itemId.getValue()), @@ -1512,9 +1509,8 @@ void CommoditiesMarket::auctionCreate(CreatureObject &owner, ServerObject &item, } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send AddAuction.\n")); -#endif + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddAuction.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -1584,9 +1580,9 @@ void CommoditiesMarket::transferVendorItemFromStockroom(CreatureObject &owner, N } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -1759,9 +1755,9 @@ void CommoditiesMarket::auctionCreateImmediate(CreatureObject &owner, ServerObje } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -1778,12 +1774,12 @@ void CommoditiesMarket::auctionCreatePermanent(const std::string &, const Server { if (!ConfigServerGame::getCommoditiesMarketEnabled()) return; -#ifdef DEBUG - WARNING(true, ("auctionCreatePermanent has been depricated and shouldn't be used. If you see this WARNING, add a line to catch cheaters in the command in CommandCppFuncs.cpp")); -#endif + + DEBUG_WARNING(true, ("auctionCreatePermanent has been depricated and shouldn't be used. If you see this WARNING, add a line to catch cheaters in the command in CommandCppFuncs.cpp")); + return; -#if 0 +#if 0 //what the hell is this? const NetworkId & itemId = item.getNetworkId(); int flags = AUCTION_ALWAYS_PRESENT; @@ -1831,9 +1827,9 @@ void CommoditiesMarket::auctionCreatePermanent(const std::string &, const Server } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } #endif @@ -1895,9 +1891,9 @@ void CommoditiesMarket::auctionBid(CreatureObject &bidder, AuctionId auctionId, } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send AddBid.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddBid.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } //response message will be sent in onAddBid @@ -1934,9 +1930,9 @@ void CommoditiesMarket::auctionCancel(const NetworkId &playerId, AuctionId aucti } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CancelAuction.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } } @@ -2104,9 +2100,9 @@ void CommoditiesMarket::auctionQueryHeaders( } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send QueryAuctionHeaders.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send QueryAuctionHeaders.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -2156,9 +2152,9 @@ void CommoditiesMarket::getAuctionDetails(CreatureObject &who, const NetworkId & } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send GetItemDetails.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetItemDetails.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } } @@ -2174,9 +2170,8 @@ void CommoditiesMarket::getVendorValue(ServerObject &container) } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorValue.\n")); -#endif + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorValue.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } } @@ -2194,9 +2189,8 @@ void CommoditiesMarket::createVendorMarket(const CreatureObject &who, ServerObje } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send CreateVendorMarket.\n")); -#endif + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CreateVendorMarket.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -2218,9 +2212,9 @@ void CommoditiesMarket::destroyVendorMarket(const NetworkId &playerId, ServerObj } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } } @@ -2238,9 +2232,8 @@ void CommoditiesMarket::deleteAuctionLocation(const NetworkId& locationId, const } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n")); -#endif + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send DestroyVendorMarket.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } } @@ -2260,9 +2253,9 @@ void CommoditiesMarket::isVendorOwner(CreatureObject &who, const NetworkId &cont } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorOwner.\n")); -#endif + + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetVendorOwner.\n")); + onIsVendorOwner(who.getNetworkId(), zeroNetworkId, zeroNetworkId); getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -2565,9 +2558,8 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId) } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send GetItem.\n")); -#endif + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send GetItem.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } } @@ -2593,7 +2585,7 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId) } else { - WARNING(true, ("[Commodities API] : No commodities server connection to send CleanupInvalidItemRetrieval.\n")); + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send CleanupInvalidItemRetrieval.\n")); getCommoditiesServerConnection(); //attempt to reconnect to commodities server } @@ -3412,9 +3404,8 @@ bool CommoditiesMarket::restoreItem(ServerObject& item, TangibleObject & vendor) } else { -#ifdef DEBUG - WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); -#endif + DEBUG_WARNING(true, ("[Commodities API] : No commodities server connection to send AddImmediateAuction.\n")); + getCommoditiesServerConnection(); //attempt to reconnect to commodities server } diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index 7836c1f4..336f2058 100755 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -1087,10 +1087,10 @@ static const ConstCharCrcLowerString templateName("object/creature/base/shared_c { m_defaultSharedTemplate = safe_cast( ObjectTemplateList::fetch(templateName)); -#ifdef DEBUG - WARNING(m_defaultSharedTemplate == NULL, ("Cannot create " + + DEBUG_WARNING(m_defaultSharedTemplate == NULL, ("Cannot create " "default shared object template %s", templateName.getString())); -#endif + if (m_defaultSharedTemplate != NULL) ExitChain::add (removeDefaultTemplate, "CreatureObject::removeDefaultTemplate"); } diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index a9867bbf..d2598408 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -1978,9 +1978,9 @@ void ServerObject::endBaselines() { FATAL(ConfigServerGame::getFatalOnGoldPobChange() && getCacheVersion() != 0, ("Object %s is a client cached object and the POB changed from [%d] to [%d]", getNetworkId().getValueString().c_str(), crcValue, portalProperty->getCrc())); -#ifdef DEBUG - WARNING(getCacheVersion() != 0, ("Object %s is a client cached object and the POB changed from [%d] to [%d]", getNetworkId().getValueString().c_str(), crcValue, portalProperty->getCrc())); -#endif + + DEBUG_WARNING(getCacheVersion() != 0, ("Object %s is a client cached object and the POB changed from [%d] to [%d]", getNetworkId().getValueString().c_str(), crcValue, portalProperty->getCrc())); + if (isAuthoritative()) setCacheVersion(0); } diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp index e8028233..344f0207 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsString.cpp @@ -100,12 +100,9 @@ jstring JNICALL ScriptMethodsStringNamespace::getString(JNIEnv *env, jobject sel JavaString result(localized); return result.getReturnValue(); } -#ifdef DEBUG - else - { - WARNING(true, ("JavaLibrary::log failed to localize the stringId(%s, %s)", table.c_str(), asciiId.c_str())); - } -#endif + + DEBUG_WARNING(true, ("JavaLibrary::log failed to localize the stringId(%s, %s)", table.c_str(), asciiId.c_str())); + return 0; } // JavaLibrary::getString