comparison mm7_3.cpp @ 1294:6bbd50bda571

Слияние
author Ritor1
date Mon, 17 Jun 2013 09:09:30 +0600
parents 24bc24b64ec2 62f4cdaa726b
children 86a83e12d795
comparison
equal deleted inserted replaced
1293:557c0c3cc314 1294:6bbd50bda571
23 #include "GUIFont.h" 23 #include "GUIFont.h"
24 #include "GUIProgressBar.h" 24 #include "GUIProgressBar.h"
25 #include "Party.h" 25 #include "Party.h"
26 #include "AudioPlayer.h" 26 #include "AudioPlayer.h"
27 #include "Outdoor.h" 27 #include "Outdoor.h"
28 #include "Outdoor_stuff.h"
28 #include "IndoorCamera.h" 29 #include "IndoorCamera.h"
29 #include "Overlays.h" 30 #include "Overlays.h"
30 #include "LOD.h" 31 #include "LOD.h"
31 #include "Actor.h" 32 #include "Actor.h"
32 #include "Allocator.h" 33 #include "Allocator.h"
1624 if (!pParty->bTurnBasedModeOn) 1625 if (!pParty->bTurnBasedModeOn)
1625 { 1626 {
1626 auto v67 = GetTickCount() / 500; 1627 auto v67 = GetTickCount() / 500;
1627 if (dword_720CDC != v67 ) 1628 if (dword_720CDC != v67 )
1628 { 1629 {
1629 dword_4F8580[3 * dword_4F8580[0] + 1] = pParty->vPosition.x; 1630 dword_4F8580[3 * dword_4F8580[1]] = pParty->vPosition.x;
1630 dword_4F8580[3 * dword_4F8580[0] + 2] = pParty->vPosition.y; 1631 dword_4F8580[3 * dword_4F8580[2]] = pParty->vPosition.y;
1631 dword_4F8580[3 * dword_4F8580[0]++ + 3] = pParty->vPosition.z; 1632 dword_4F8580[3 * dword_4F8580[3]] = pParty->vPosition.z;
1632 if ( dword_4F8580[0] > 60 ) 1633 if ( dword_4F8580[0] > 60 )
1633 dword_4F8580[0] = 1; 1634 dword_4F8580[0] = 1;
1634 } 1635 }
1635 dword_720CDC = v67; 1636 dword_720CDC = v67;
1636 } 1637 }