archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-16 07:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/miami' into miami

Browse Source
This commit is contained in:
Nikolay Korolev
2020-09-13 12:06:44 +03:00
parent e5faeea2e5 25a22cc6f2
commit 084efb1f14
22 changed files with 1444 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/Game.cpp
View File

@ -463,8 +463,7 @@ bool CGame::Initialise(const char* datFile)
#ifdef USE_TEXTURE_POOL
_TexturePoolsUnknown(true);
#endif
// TODO(Miami)
// DMAudio.SetStartingTrackPositions(1);
DMAudio.SetStartingTrackPositions(true);
DMAudio.ChangeMusicMode(MUSICMODE_GAME);
return true;
}

22
src/core/Stats.cpp
View File

@ -4,6 +4,7 @@
#include "Text.h"
#include "World.h"
#include "Pad.h"
#include "DMAudio.h"
#include <climits>
@ -102,7 +103,7 @@ float CStats::LongestWheelieDist;
float CStats::LongestStoppieDist;
float CStats::Longest2WheelDist;
// --MIAMI: functions below are done except TODOs, but there are some to be moved from Frontend
// --MIAMI: functions below are done, but there are some to be moved from Frontend
void CStats::Init()
{
@ -198,9 +199,7 @@ void CStats::Init()
NoMoreHurricanes = 0;
ShowChaseStatOnScreen = 0;
abSonyCDs[0] = 0;
// TODO(Miami): Change this with PopulateFavoriteRadioStationList(); !!
for (int i = 0; i < NUM_RADIOS; i++)
FavoriteRadioStationList[i] = 0.0f;
PopulateFavoriteRadioStationList();
NumPropertyOwned = 0;
for (int i = 0; i < TOTAL_PROPERTIES; i++)
@ -471,6 +470,11 @@ void CStats::AddPropertyAsOwned(int32 id)
}
}
float CStats::GetFavoriteRadioStationList(int32 station)
{
return FavoriteRadioStationList[station];
}
void CStats::SaveStats(uint8 *buf, uint32 *size)
{
CheckPointReachedSuccessfully();
@ -652,7 +656,7 @@ void CStats::SaveStats(uint8 *buf, uint32 *size)
CopyToBuf(buf, TotalLegitimateKills);
CopyToBuf(buf, LastMissionPassedName);
CopyToBuf(buf, CheatedCount);
// TODO(Miami): Set favourite radio stations!!
PopulateFavoriteRadioStationList();
CopyToBuf(buf, FavoriteRadioStationList);
assert(buf - buf_start == *size);
@ -757,3 +761,11 @@ void CStats::LoadStats(uint8 *buf, uint32 size)
assert(buf - buf_start == size);
#undef CopyFromBuf
}
void
CStats::PopulateFavoriteRadioStationList()
{
float* pListenTimeArray = DMAudio.GetListenTimeArray();
for (int i = 0; i < NUM_RADIOS; i++)
FavoriteRadioStationList[i] = pListenTimeArray[i];
}

2
src/core/Stats.h
View File

@ -145,4 +145,6 @@ public:
static void LongestTimeInBloodRing(int32);
static void AddPropertyAsOwned(int32);
static void PopulateFavoriteRadioStationList();
static float GetFavoriteRadioStationList(int32);
};