mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-15 02:24:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse source 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
This commit is contained in:
Sergeanur 2021-01-23 15:14:15 +02:00
commit 904090cbb6
46 changed files with 155 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/audio/AudioLogic.cpp
View file

@ -41,7 +41,7 @@
#include "WindModifiers.h"
#include "Fluff.h"
#include "Script.h"
#include "Wanted.h"
const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
const int policeChannel = channels + 1;