archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-10 14:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	README.md
#	premake5.lua
This commit is contained in:
Sergeanur
2021-07-09 00:05:26 +03:00
parent 7a1ff3b2ad 72f6780905
commit d781db6c0f
12 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/control/Script.cpp
View File

@ -2573,20 +2573,16 @@ void CTheScripts::Shutdown()
int scriptToLoad = 0;
const char *scriptfile = "main.scm";
#ifdef _WIN32
#include <Windows.h>
#endif
int open_script()
{
// glfwGetKey doesn't work because of CGame::Initialise is blocking
#ifdef _WIN32
if (GetAsyncKeyState('G') & 0x8000)
// glfwGetKey doesn't work because of CGame::Initialise is blocking
CPad::UpdatePads();
if (CPad::GetPad(0)->GetChar('G'))
scriptToLoad = 0;
if (GetAsyncKeyState('R') & 0x8000)
if (CPad::GetPad(0)->GetChar('R'))
scriptToLoad = 1;
if (GetAsyncKeyState('D') & 0x8000)
if (CPad::GetPad(0)->GetChar('D'))
scriptToLoad = 2;
#endif
switch (scriptToLoad) {
case 0: scriptfile = "main.scm"; break;
case 1: scriptfile = "freeroam_lcs.scm"; break;