Changeset 14238

Timestamp:

01/30/10 10:39:16 (7 weeks ago)

Author:

skotlex

Message:

- Oops, realized the vsd cid check is before the null pointer check.

Files:

• branches/stable/src/map/vending.c (modified) (1 diff)

branches/stable/src/map/vending.c

@@ -65 +65 @@
 
     nullpo_retv(sd);
+
+    if( vsd == NULL || vsd->vender_id == 0 || vsd->vender_id == sd->bl.id )
+        return; // invalid shop
 #if PACKETVER >= 20100105
     if( vsd->status.char_id != cid )
         return; //Char-ID check
 #endif
-
-    if( vsd == NULL || vsd->vender_id == 0 || vsd->vender_id == sd->bl.id )
-        return; // invalid shop
     if( sd->bl.m != vsd->bl.m || !check_distance_bl(&sd->bl, &vsd->bl, AREA_SIZE) )
         return; // shop too far away