Code cleanups

Unworking ColAccel Lotta other stuff I forgot about by now git-svn-id: svn://localhost/vcspc/trunk@31 9f344024-d43e-4b27-bde7-3d027e20192d
GTAmodding · Feb 17, 2014 · d7a256d056f0e12598f2390075c321419001a660 · d7a256d
1 parent 41be0d5
commit d7a256d056f0e12598f2390075c321419001a660
diff --git a/VCS PC/Audio.cpp b/VCS PC/Audio.cpp
@@ -2,6 +2,10 @@
 
 signed char	CAERadioTrackManager::bTracksPlayedRecently[NUM_RADIOSTATIONS];
 
+static std::map<short,tVehicleAudioSettings>	AudioSettingsMap;
+
+WRAPPER void CAudioEngine::ReportFrontendAudioEvent(long nSoundID, float fUnk, float fVolume) { WRAPARG(nSoundID); WRAPARG(fUnk); WRAPARG(fVolume); EAXJMP(0x506EA0); }
+
 signed char CAERadioTrackManager::GetNextTrackByStation(BYTE stationID)
 {
 	static const BYTE numberOfRadioTracks[NUM_RADIOSTATIONS] = 
@@ -30,4 +34,43 @@ bool CAERadioTrackManager::Load()
 	return true;
 }
 
-WRAPPER void CMusicManager::ReportFrontendAudioEvent(long nSoundID, float fUnk, float fVolume) { WRAPARG(nSoundID); WRAPARG(fUnk); WRAPARG(fVolume); EAXJMP(0x506EA0); }
+void CAEVehicleAudioEntity::GetVehicleAudioSettings(short nModelID)
+{
+   	AudioSettings = AudioSettingsMap[nModelID];
+}
+
+void CAEVehicleAudioEntity::LoadVehicleAudioSettings()
+{
+	if ( FILE* hFile = CFileMgr::OpenFile("DATA\\VEHAUDIOSETS.DAT", "r") )
+	{
+		while ( const char* pLine = CFileLoader::LoadLine(hFile) )
+		{
+			if ( pLine[0] && pLine[0] != '#' )
+			{
+				signed int				nModelID, nVehType, nEngineOn, nEngineOff, nRadioSound, nHornTon, nDoorSound, nUnk, nRadioNum, nRadioType, nScannerName;
+				tVehicleAudioSettings	NewEntry;
+				char					ModelName[40];
+
+				sscanf(pLine, "%s %d %d %d %d %f %f %d %f %d %d %d %d %d %f", ModelName, &nVehType, &nEngineOn, &nEngineOff, &nRadioSound,
+					&NewEntry.BassDepth, &NewEntry.unk1, &nHornTon, &NewEntry.HornFreq, &nDoorSound, &nUnk, &nRadioNum, &nRadioType, &nScannerName,
+					&NewEntry.EngineVolumeBoost);
+
+				CModelInfo::GetModelInfo(ModelName, &nModelID);
+
+				NewEntry.VehicleType = static_cast<signed char>(nVehType);
+				NewEntry.EngineOnSound = static_cast<short>(nEngineOn);
+				NewEntry.EngineOffSound = static_cast<short>(nEngineOff);
+				NewEntry.RadioSoundType = static_cast<signed char>(nRadioSound);
+				NewEntry.HornTon = static_cast<signed char>(nHornTon);
+				NewEntry.DoorSound = static_cast<signed char>(nDoorSound);
+				NewEntry.unk2 = static_cast<signed char>(nUnk);
+				NewEntry.RadioNum = static_cast<signed char>(nRadioNum);
+				NewEntry.RadioType = static_cast<signed char>(nRadioType);
+				NewEntry.PoliceScannerName = static_cast<signed char>(nScannerName);
+
+				AudioSettingsMap[static_cast<short>(nModelID)] = NewEntry;
+			}
+		}
+		CFileMgr::CloseFile(hFile);
+	}
+}
diff --git a/VCS PC/Audio.h b/VCS PC/Audio.h
@@ -33,6 +33,23 @@
 #define NJ_OFFSET			(MR_OFFSET+MR_STREAMS)
 #define RE_OFFSET			(NJ_OFFSET+NJ_STREAMS)
 
+struct tVehicleAudioSettings
+{
+	signed char		VehicleType;
+	short			EngineOnSound;
+	short			EngineOffSound;
+	signed char		RadioSoundType;		// 0 - standard, 1 - HQ, 2 - bikes
+	float			BassDepth;
+	float			unk1;
+	signed char		HornTon;
+	float			HornFreq;
+	signed char		DoorSound;
+	signed char		unk2;
+	signed char		RadioNum;
+	signed char		RadioType;
+	signed char		PoliceScannerName;
+	float			EngineVolumeBoost;
+};
 
 class CAERadioTrackManager
 {
@@ -46,10 +63,25 @@ class CAERadioTrackManager
 	static bool			Load();
 };
 
-class CMusicManager
+class CAEVehicleAudioEntity
+{
+private:
+	BYTE					pad[128];
+	tVehicleAudioSettings	AudioSettings;
+
+public:
+	void					GetVehicleAudioSettings(short nModelID);
+
+	// VCS PC class extension
+	static void				LoadVehicleAudioSettings();
+};
+
+class CAudioEngine
 {
 public:
 	void				ReportFrontendAudioEvent(long nSoundID, float fUnk, float fVolume);
 };
 
+static_assert(sizeof(tVehicleAudioSettings) == 0x24, "tVehicleAudioSettings has wrong size!");
+
 #endif
diff --git a/VCS PC/CClock.cpp b/VCS PC/CClock.cpp
diff --git a/VCS PC/CClock.h b/VCS PC/CClock.h
diff --git a/VCS PC/CGridref.cpp b/VCS PC/CGridref.cpp
@@ -9,18 +9,18 @@ void CGridref::Draw()
 		BYTE	zoneY;
 
 		GetIDByPlayerPosition(&zoneX, &zoneY);
-		CFont::SetTextBackground(0, 0);
+		CFont::SetBackground(0, 0);
-		CFont::SetTextUseProportionalValues(false);
+		CFont::SetProportional(false);
 		CFont::SetFontStyle(FONT_Pricedown);
-		CFont::SetTextAlignment(ALIGN_Center);
+		CFont::SetOrientation(ALIGN_Center);
-		CFont::SetTextOutline(1);
+		CFont::SetEdge(1);
-		CFont::SetTextBorderRGBA(CRGBA(0, 0, 0, 255));
+		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 		CFont::SetScale(_width(0.35), _height(0.65));
 		CFont::SetColor(CRGBA(BaseColors[2]));
 		_snprintf(ZoneID, sizeof(ZoneID), "%c%d", zoneX + 100, zoneY);
 		CFont::PrintString(_x(150.0), _y(7.5), ZoneID);
 		CFont::PrintString(_x(115.0), _y(7.5), GetNameByID(zoneX, zoneY));
-		CFont::SetTextOutline(0);
+		CFont::SetEdge(0);
 	}
 }
 

diff --git a/VCS PC/CPed.cpp b/VCS PC/CPed.cpp
@@ -34,9 +34,9 @@ void CPed::GetBonePosition(CVector* result, int boneID, bool bUnk)
 	}
 }
 
-BYTE CPed::func_5E6580()
+BYTE CPed::GetWeaponSkill()
 {
-	DWORD	dwFunc = (DWORD)FUNC_CPed_func_5E6580;
+	DWORD	dwFunc = (DWORD)FUNC_CPed_GetWeaponSkill;
 	BYTE	bResult;
 	_asm
 	{
@@ -55,7 +55,7 @@ long double CPed::GetCrosshairSize()
 	long double crosshairSize;
 
 	weaponID = weaponSlots[m_bActiveWeapon].dwType;
-	unkData = func_5E6580();
+	unkData = GetWeaponSkill();
 	weapPtr = CWeaponInfo::GetWeaponInfo(weaponID, unkData);
 	crosshairSize = 0.5 / weapPtr->GetAccuracy();
 
@@ -68,8 +68,8 @@ long double CPed::GetCrosshairSize()
 void CPed::Remap()
 {
 	CPedData*	pTempPedData = &CPedData::pPedData[CPools::GetPedPool()->GetIndexOnly(this)];
-	CPedModelInfoVCS::AssignColoursToModel(pTempPedData->m_color1, pTempPedData->m_color2, pTempPedData->m_color3, pTempPedData->m_color4);
+	CPedModelInfoVCS::SetPedColour(pTempPedData->m_color1, pTempPedData->m_color2, pTempPedData->m_color3, pTempPedData->m_color4);
-	CPedModelInfoVCS::SetEnvironmentMap(m_pRwObject);
+	CPedModelInfoVCS::SetEditableMaterials(m_pRwObject);
 }
 
 CPed* CPedData::Constructor(CPed* pPed, WORD model)

diff --git a/VCS PC/CPed.h b/VCS PC/CPed.h
@@ -4,7 +4,7 @@
 #define WIN32_LEAN_AND_MEAN
 
 #define FUNC_CPed__GiveWeapon								0x5E6080
-#define FUNC_CPed_func_5E6580								0x5E6580
+#define FUNC_CPed_GetWeaponSkill								0x5E6580
 #define FUNC_CPed__GetBonePosition							0x5E4280
 
 class CPedFlags
@@ -146,7 +146,7 @@ class CPedFlags
 class CVehicle;
 class CPed;
 
-class CPlayerData
+class CPlayerPedData
 {
 public:
     CWanted* m_Wanted;												// 0x0
@@ -230,7 +230,7 @@ class NOVMT CPed : public CPhysical
 	BYTE				__pad1[820];
 	CPedFlags			pedFlags;
 	CPedIntelligence*	pPedIntelligence;
-	CPlayerData*		pPlayerData;
+	CPlayerPedData*		pPlayerData;
 	BYTE				__pad7[80];
 	int					iMoveAnimGroup;
 	BYTE				__pad2[104];
@@ -269,7 +269,7 @@ class NOVMT CPed : public CPhysical
 							{ return fHealth; };
 	inline float		GetArmour() 
 							{ return fArmour; };
-	inline CPlayerData*	GetPlayerData() 
+	inline CPlayerPedData*	GetPlayerData() 
 							{ return pPlayerData; };
 	inline BYTE			GetActiveWeapon() 
 							{ return m_bActiveWeapon; };
@@ -281,7 +281,7 @@ class NOVMT CPed : public CPhysical
 
 	void				GiveWeapon(int WeaponType, int WeaponAmmo);
 	void				GetBonePosition(CVector* result, int boneID, bool bUnk);
-	BYTE				func_5E6580();
+	BYTE				GetWeaponSkill();
 
 	long double			GetCrosshairSize();
 	void				Remap();
@@ -301,8 +301,7 @@ friend class CPed;
 
 	CPedData()
 		: m_color1(0), m_color2(0), m_color3(0), m_color4(0)
-	{
+	{}
-	}
 
 	void				SetColours(BYTE a, BYTE b, BYTE c, BYTE d)
 							{ m_color1 = a; m_color2 = b; m_color3 = c; m_color4 = d; };

diff --git a/VCS PC/CText.cpp b/VCS PC/CText.cpp