diff mm7_4.cpp @ 1284:2767980b98bb

Слияние
author Ritor1
date Sat, 15 Jun 2013 17:39:20 +0600
parents 8a196c858180 1803172dffd9
children 86a83e12d795
line wrap: on
line diff
--- a/mm7_4.cpp	Sat Jun 15 17:39:01 2013 +0600
+++ b/mm7_4.cpp	Sat Jun 15 17:39:20 2013 +0600
@@ -24,6 +24,7 @@
 #include "Party.h"
 #include "AudioPlayer.h"
 #include "Outdoor.h"
+#include "Outdoor_stuff.h"
 #include "IndoorCamera.h"
 #include "LOD.h"
 #include "Actor.h"
@@ -3594,26 +3595,26 @@
             v37 = &p2DEvents[(signed int)a4 - 1].fPriceMultiplier;
             v38 = *v37;
             v39 = a3->GetValue();
-            v29 = pPlayer->_4B8233(v39, v38);
+            v29 = pPlayer->GetBaseBuyingPrice(v39, v38);
           switch ( a5 )
           {
             case 3:
               v44 = *v37;
               v45 = a3->GetValue();
-              v29 = pPlayer->_4B8213(v45, v44);
+              v29 = pPlayer->GetBaseSellingPrice(v45, v44);
               break;
             case 4:
-              v29 = pPlayer->_4B824B(*v37);
+              v29 = pPlayer->GetBaseIdentifyPrice(*v37);
               break;
             case 5:
               v42 = *v37;
               v43 = a3->GetValue();
-              v29 = pPlayer->_4B8265(v43, v42);
+              v29 = pPlayer->GetBaseRepairPrice(v43, v42);
               break;
             case 6:
               v40 = *v37;
               v41 = a3->GetValue();
-              v29 = pPlayer->_4B8213(v41, v40) / 2;
+              v29 = pPlayer->GetBaseSellingPrice(v41, v40) / 2;
               break;
             }
             goto _continue_sprintf;