Everything should now use isTrading()
Everything should now use isMerchanting(), also fixed MERCHANT_CLOSE packet & ensured we were setting m_bIsMerchanting to a boolean, not an integer (i.e. TRUE -> true).