archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-30 09:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	README.md
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/render/Renderer.cpp
#	src/vehicles/Plane.cpp
This commit is contained in:
Sergeanur
2020-07-22 18:29:17 +03:00
parent b182fa4bb8 afc38c0d72
commit f882586eb8
9 changed files with 111 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@
#include "platform.h"
#include "crossplatform.h"
#include "patcher.h"
#include "main.h"
#include "FileMgr.h"
#include "Text.h"
@ -1383,7 +1382,6 @@ main(int argc, char *argv[])
#endif
RwV2d pos;
RwInt32 i;
// StaticPatcher::Apply();
#ifndef _WIN32
struct sigaction act;

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

@ -76,7 +76,6 @@ static psGlobalType PsGlobal;
{debug(TEXT("FAILED(hr=0x%x) in ") TEXT(#x) TEXT("\n"), hr); return;}
#include "common.h"
#include "patcher.h"
#include "main.h"
#include "FileMgr.h"
#include "Text.h"
@ -1939,7 +1938,6 @@ WinMain(HINSTANCE instance,
RwV2d pos;
RwInt32 argc, i;
RwChar **argv;
StaticPatcher::Apply();
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
// TODO: make this an option somewhere