From ec21450522e3c2124f3510eef5cfd88420483248 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 26 Jun 2014 18:18:01 -0700
Subject: Low hanging fruit

---
 src/map/trade.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/map/trade.cpp')

diff --git a/src/map/trade.cpp b/src/map/trade.cpp
index 7a4913a..c21fd27 100644
--- a/src/map/trade.cpp
+++ b/src/map/trade.cpp
@@ -44,7 +44,7 @@ void trade_traderequest(dumb_ptr<map_session_data> sd, BlockId target_id)
 
     nullpo_retv(sd);
 
-    if ((target_sd = map_id2sd(target_id)) != NULL)
+    if ((target_sd = map_id2sd(target_id)) != nullptr)
     {
         if (!battle_config.invite_request_check)
         {
@@ -97,7 +97,7 @@ void trade_tradeack(dumb_ptr<map_session_data> sd, int type)
     dumb_ptr<map_session_data> target_sd;
     nullpo_retv(sd);
 
-    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != NULL)
+    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != nullptr)
     {
         clif_tradestart(target_sd, type);
         clif_tradestart(sd, type);
@@ -134,7 +134,7 @@ void trade_tradeadditem(dumb_ptr<map_session_data> sd, IOff2 index, int amount)
 
     nullpo_retv(sd);
 
-    if (((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != NULL)
+    if (((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != nullptr)
         && (sd->deal_locked < 1))
     {
         if (!index.ok())
@@ -153,7 +153,7 @@ void trade_tradeadditem(dumb_ptr<map_session_data> sd, IOff2 index, int amount)
             for (IOff0 i : IOff0::iter())
             {
                 if (!target_sd->status.inventory[i].nameid
-                    && target_sd->inventory_data[i] == NULL)
+                    && target_sd->inventory_data[i] == nullptr)
                     free_++;
             }
             for (trade_i = 0; trade_i < TRADE_MAX; trade_i++)
@@ -169,7 +169,7 @@ void trade_tradeadditem(dumb_ptr<map_session_data> sd, IOff2 index, int amount)
                     {
                         if (target_sd->status.inventory[i].nameid ==
                             sd->status.inventory[index.unshift()].nameid
-                            && target_sd->inventory_data[i] != NULL)
+                            && target_sd->inventory_data[i] != nullptr)
                         {
                             id = target_sd->inventory_data[i];
                             if (id->type != ItemType::WEAPON
@@ -225,7 +225,7 @@ void trade_tradeadditem(dumb_ptr<map_session_data> sd, IOff2 index, int amount)
                         if (target_sd->status.inventory[i].nameid ==
                             sd->status.
                             inventory[sd->deal_item_index[trade_i].unshift()].nameid
-                            && target_sd->inventory_data[i] != NULL)
+                            && target_sd->inventory_data[i] != nullptr)
                         {
                             id = target_sd->inventory_data[i];
                             if (id->type != ItemType::WEAPON
@@ -272,7 +272,7 @@ void trade_tradeok(dumb_ptr<map_session_data> sd)
 
     }
 
-    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != NULL)
+    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != nullptr)
     {
         sd->deal_locked = 1;
         clif_tradeitemok(sd, IOff2::from(0), 0, 0);
@@ -292,7 +292,7 @@ void trade_tradecancel(dumb_ptr<map_session_data> sd)
 
     nullpo_retv(sd);
 
-    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != NULL)
+    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != nullptr)
     {
         for (trade_i = 0; trade_i < TRADE_MAX; trade_i++)
         {                       //give items back (only virtual)
@@ -347,7 +347,7 @@ void trade_tradecommit(dumb_ptr<map_session_data> sd)
 
     nullpo_retv(sd);
 
-    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != NULL)
+    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != nullptr)
     {
         MAP_LOG_PC(sd, " TRADECOMMIT WITH %d GIVE %d GET %d"_fmt,
                 target_sd->status_key.char_id, sd->deal_zeny,
@@ -451,7 +451,7 @@ void trade_verifyzeny(dumb_ptr<map_session_data> sd)
 
     nullpo_retv(sd);
 
-    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != NULL)
+    if ((target_sd = map_id2sd(account_to_block(sd->trade_partner))) != nullptr)
     {
         if (sd->deal_zeny > sd->status.zeny)
         {
-- 
cgit v1.2.3-60-g2f50