mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-05 03:34:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
This commit is contained in:
Sergeanur 2021-01-22 15:04:09 +02:00
commit cea6b20c09
130 changed files with 92 additions and 669 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/entities/Entity.cpp
View file

@ -27,8 +27,6 @@
#include "Dummy.h"
#include "WindModifiers.h"
//--MIAMI: file done
int gBuildings;
CEntity::CEntity(void)
@ -693,7 +691,7 @@ float BannerWindTabel[] = {
0.28f, 0.28f, 0.22f, 0.1f, 0.0f, -0.1f, -0.17f, -0.12f
};
//--MIAMI: unused
// unused
void
CEntity::ModifyMatrixForBannerInWind(void)
{