Changeset 279 for trunk/src/game/AuctionHouse.cpp

Timestamp:

11/22/08 00:36:22 (17 years ago)

Author:

yumileroy

Message:

Merged commit 269 (5f0e38da128a).

Original author: gvcoman
Date: 2008-11-21 14:34:05-05:00

Files:

• trunk/src/game/AuctionHouse.cpp (modified) (4 diffs)

trunk/src/game/AuctionHouse.cpp

@@ -11 +11 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -90 +90 @@
         return false;
     }
-    data << auction->Id;
-    data << pItem->GetUInt32Value(OBJECT_FIELD_ENTRY);
+    data << (uint32) auction->Id;
+    data << (uint32) pItem->GetEntry();
 
     for (uint8 i = 0; i < MAX_INSPECTED_ENCHANTMENT_SLOT; i++)
@@ -246 +246 @@
         return;
     }
-    // prevent sending bag with items (cheat: can be placed in bag after adding equipped empty bag to auction)
+    // prevent sending bag with items (cheat: can be placed in bag after adding equiped empty bag to auction)
     if(!it)
     {
@@ -717 +717 @@
                                             if (il)
                                             {
-                                                if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty())
+                                                if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty())
                                                     name = il->Name[loc_idx];
                                             }