summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-07-04 15:00:41 +0200
committereray orçunus <erayorcunus@gmail.com>2020-07-04 15:01:07 +0200
commit1cea84d2b1673bfd86e1698c27c381e1488c77cf (patch)
tree41fcb374c97437d25261ffbf3e430313997f13ef /src
parentMerge branch 'master' of https://github.com/GTAmodding/re3 into erorcun (diff)
downloadre3-1cea84d2b1673bfd86e1698c27c381e1488c77cf.tar
re3-1cea84d2b1673bfd86e1698c27c381e1488c77cf.tar.gz
re3-1cea84d2b1673bfd86e1698c27c381e1488c77cf.tar.bz2
re3-1cea84d2b1673bfd86e1698c27c381e1488c77cf.tar.lz
re3-1cea84d2b1673bfd86e1698c27c381e1488c77cf.tar.xz
re3-1cea84d2b1673bfd86e1698c27c381e1488c77cf.tar.zst
re3-1cea84d2b1673bfd86e1698c27c381e1488c77cf.zip
Diffstat (limited to 'src')
-rw-r--r--src/peds/Ped.cpp2
-rw-r--r--src/skel/glfw/glfw.cpp3
-rw-r--r--src/skel/win/win.cpp3
3 files changed, 6 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 67fe7788..7a1bc3fc 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4359,7 +4359,7 @@ CPed::RestorePreviousState(void)
case PED_WANDER_PATH:
m_nPedState = PED_WANDER_PATH;
bIsRunning = false;
- if (!bFindNewNodeAfterStateRestore) {
+ if (bFindNewNodeAfterStateRestore) {
if (m_pNextPathNode) {
CVector diff = m_pNextPathNode->GetPosition() - GetPosition();
if (diff.MagnitudeSqr() < sq(7.0f)) {
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 5e0c178c..21aace7a 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1367,11 +1367,14 @@ WinMain(HINSTANCE instance,
RwChar** argv;
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
+#if 0
// TODO: make this an option somewhere
AllocConsole();
freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
+#endif
+
#else
int
main(int argc, char *argv[])
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index e1fb5b7f..52941d7d 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1929,12 +1929,13 @@ WinMain(HINSTANCE instance,
StaticPatcher::Apply();
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE);
-
+#if 0
// TODO: make this an option somewhere
AllocConsole();
freopen("CONIN$", "r", stdin);
freopen("CONOUT$", "w", stdout);
freopen("CONOUT$", "w", stderr);
+#endif
/*
* Initialize the platform independent data.