Changeset 28 for trunk/src/game/TradeHandler.cpp

Timestamp:

11/19/08 13:24:39 (17 years ago)

Author:

yumileroy

Message:

[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

Original author: Neo2003
Date: 2008-10-09 08:42:22-05:00

Files:

• trunk/src/game/TradeHandler.cpp (modified) (7 diffs)

trunk/src/game/TradeHandler.cpp

@@ -27 +27 @@
 #include "Item.h"
 #include "SocialMgr.h"
+#include "Language.h"
 
 enum TradeStatus
@@ -256 +257 @@
     if( _player->tradeGold > _player->GetMoney() )
     {
-        SendNotification( "You do not have enough gold" );
+        SendNotification(LANG_NOT_ENOUGH_GOLD);
         _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
         _player->acceptTrade = false;
@@ -265 +266 @@
     if( _player->pTrader->tradeGold > _player->pTrader->GetMoney() )
     {
-        _player->pTrader->GetSession( )->SendNotification( "You do not have enough gold" );
+        _player->pTrader->GetSession( )->SendNotification(LANG_NOT_ENOUGH_GOLD);
         SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
         _player->pTrader->acceptTrade = false;
@@ -339 +340 @@
         if(!myCanCompleteTrade)
         {
-            SendNotification("You do not have enough free slots");
-            GetPlayer( )->pTrader->GetSession( )->SendNotification("Your partner does not have enough free bag slots");
+            SendNotification(LANG_NOT_FREE_TRADE_SLOTS);
+            GetPlayer( )->pTrader->GetSession( )->SendNotification(LANG_NOT_PARTNER_FREE_TRADE_SLOTS);
             SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
             _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
@@ -347 +348 @@
         else if (!hisCanCompleteTrade)
         {
-            SendNotification("Your partner does not have enough free bag slots");
-            GetPlayer()->pTrader->GetSession()->SendNotification("You do not have enough free slots");
+            SendNotification(LANG_NOT_PARTNER_FREE_TRADE_SLOTS);
+            GetPlayer()->pTrader->GetSession()->SendNotification(LANG_NOT_FREE_TRADE_SLOTS);
             SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
             _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
@@ -462 +463 @@
     }
 
-    if( GetPlayer()->hasUnitState(UNIT_STAT_STUNDED) )
+    if( GetPlayer()->hasUnitState(UNIT_STAT_STUNNED) )
     {
         SendTradeStatus(TRADE_STATUS_YOU_STUNNED);
@@ -508 +509 @@
     }
 
-    if( pOther->hasUnitState(UNIT_STAT_STUNDED) )
+    if( pOther->hasUnitState(UNIT_STAT_STUNNED) )
     {
         SendTradeStatus(TRADE_STATUS_TARGET_STUNNED);