1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 03:30:00 +00:00

Merge pull request #846 from withmorten/ini

add -console cmdline arg instead of #if 0/1
This commit is contained in:
erorcun 2020-12-01 04:21:00 +03:00 committed by GitHub
commit 4ec60676e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 14 deletions

View file

@ -1453,12 +1453,14 @@ WinMain(HINSTANCE instance,
RwChar** argv; RwChar** argv;
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE); SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
#if 0 #ifndef MASTER
// TODO: make this an option somewhere if (strstr(cmdLine, "-console"))
AllocConsole(); {
freopen("CONIN$", "r", stdin); AllocConsole();
freopen("CONOUT$", "w", stdout); freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stderr); freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
}
#endif #endif
#else #else

View file

@ -2011,16 +2011,18 @@ WinMain(HINSTANCE instance,
RwChar **argv; RwChar **argv;
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE); SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
#ifdef USE_CUSTOM_ALLOCATOR #ifndef MASTER
InitMemoryMgr(); if (strstr(cmdLine, "-console"))
{
AllocConsole();
freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
}
#endif #endif
#if 1 #ifdef USE_CUSTOM_ALLOCATOR
// TODO: make this an option somewhere InitMemoryMgr();
AllocConsole();
freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
#endif #endif
/* /*