comparison mm7_4.cpp @ 1284:2767980b98bb

Слияние
author Ritor1
date Sat, 15 Jun 2013 17:39:20 +0600
parents 8a196c858180 1803172dffd9
children 86a83e12d795
comparison
equal deleted inserted replaced
1283:2a1ca27945e1 1284:2767980b98bb
22 #include "GUIWindow.h" 22 #include "GUIWindow.h"
23 #include "GUIFont.h" 23 #include "GUIFont.h"
24 #include "Party.h" 24 #include "Party.h"
25 #include "AudioPlayer.h" 25 #include "AudioPlayer.h"
26 #include "Outdoor.h" 26 #include "Outdoor.h"
27 #include "Outdoor_stuff.h"
27 #include "IndoorCamera.h" 28 #include "IndoorCamera.h"
28 #include "LOD.h" 29 #include "LOD.h"
29 #include "Actor.h" 30 #include "Actor.h"
30 #include "Allocator.h" 31 #include "Allocator.h"
31 #include "Events.h" 32 #include "Events.h"
3592 case 25: 3593 case 25:
3593 { 3594 {
3594 v37 = &p2DEvents[(signed int)a4 - 1].fPriceMultiplier; 3595 v37 = &p2DEvents[(signed int)a4 - 1].fPriceMultiplier;
3595 v38 = *v37; 3596 v38 = *v37;
3596 v39 = a3->GetValue(); 3597 v39 = a3->GetValue();
3597 v29 = pPlayer->_4B8233(v39, v38); 3598 v29 = pPlayer->GetBaseBuyingPrice(v39, v38);
3598 switch ( a5 ) 3599 switch ( a5 )
3599 { 3600 {
3600 case 3: 3601 case 3:
3601 v44 = *v37; 3602 v44 = *v37;
3602 v45 = a3->GetValue(); 3603 v45 = a3->GetValue();
3603 v29 = pPlayer->_4B8213(v45, v44); 3604 v29 = pPlayer->GetBaseSellingPrice(v45, v44);
3604 break; 3605 break;
3605 case 4: 3606 case 4:
3606 v29 = pPlayer->_4B824B(*v37); 3607 v29 = pPlayer->GetBaseIdentifyPrice(*v37);
3607 break; 3608 break;
3608 case 5: 3609 case 5:
3609 v42 = *v37; 3610 v42 = *v37;
3610 v43 = a3->GetValue(); 3611 v43 = a3->GetValue();
3611 v29 = pPlayer->_4B8265(v43, v42); 3612 v29 = pPlayer->GetBaseRepairPrice(v43, v42);
3612 break; 3613 break;
3613 case 6: 3614 case 6:
3614 v40 = *v37; 3615 v40 = *v37;
3615 v41 = a3->GetValue(); 3616 v41 = a3->GetValue();
3616 v29 = pPlayer->_4B8213(v41, v40) / 2; 3617 v29 = pPlayer->GetBaseSellingPrice(v41, v40) / 2;
3617 break; 3618 break;
3618 } 3619 }
3619 goto _continue_sprintf; 3620 goto _continue_sprintf;
3620 } 3621 }
3621 3622