mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-06 18:14:09 +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/render/Renderer.cpp
View file

@ -28,8 +28,6 @@
#include "custompipes.h"
#include "Frontend.h"
//--MIAMI: file done
bool gbShowPedRoadGroups;
bool gbShowCarRoadGroups;
bool gbShowCollisionPolys;
@ -1202,7 +1200,6 @@ CEntity::RemoveLighting(bool)
{
}
// --MIAMI: Done
bool
CPed::SetupLighting(void)
{
@ -1228,7 +1225,6 @@ CPed::SetupLighting(void)
return false;
}
// --MIAMI: Done
void
CPed::RemoveLighting(bool reset)
{