archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-02 15:30:46 +00:00
Code Issues Packages 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
parent 8dab92d158 feb993e751
commit cea6b20c09
130 changed files with 92 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/skel/events.cpp
View File

@ -9,8 +9,6 @@
#include "events.h"
// --MIAMI: file done
/*
*****************************************************************************
*/

2
src/skel/glfw/glfw.cpp
View File

@ -44,8 +44,6 @@
#define MAX_SUBSYSTEMS (16)
// --MIAMI: file done
rw::EngineOpenParams openParams;
static RwBool ForegroundApp = TRUE;

2
src/skel/skeleton.cpp
View File

@ -13,8 +13,6 @@
#include "main.h"
#include "MemoryHeap.h"
// --MIAMI: file done
static RwBool DefaultVideoMode = TRUE;
RsGlobalType RsGlobal;

2
src/skel/win/win.cpp
View File

@ -53,8 +53,6 @@
#define MAX_SUBSYSTEMS (16)
// --MIAMI: file done
static RwBool ForegroundApp = TRUE;
static RwBool RwInitialised = FALSE;