mirror of
https://github.com/GTAmodding/re3.git
synced 2025-07-15 14:24:09 +00:00
Merge remote-tracking branch 'origin/miami' into lcs
# 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:
commit
cea6b20c09
130 changed files with 92 additions and 669 deletions
|
@ -37,8 +37,6 @@
|
|||
#include "Bike.h"
|
||||
#include "Debug.h"
|
||||
|
||||
//--MIAMI: file done
|
||||
|
||||
const uint32 CBike::nSaveStructSize =
|
||||
#ifdef COMPATIBLE_SAVES
|
||||
1260;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue