From 365f30fcd8e03c640e109ac0f06abe63c7359c9e Mon Sep 17 00:00:00 2001 From: OV2 Date: Mon, 30 Jul 2012 19:18:14 +0200 Subject: [PATCH 1/2] Adjust input display position if displaying movie frame counter (gocha) --- gfx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx.cpp b/gfx.cpp index 040a1e8d..8111483d 100644 --- a/gfx.cpp +++ b/gfx.cpp @@ -2043,7 +2043,7 @@ static void DisplayPressedKeys (void) static int KeyOrder[] = { 8, 10, 7, 9, 0, 6, 14, 13, 5, 1, 4, 3, 2, 11, 12 }; // < ^ > v A B Y X L R S s enum controllers controller; - int line = 1; + int line = Settings.DisplayMovieFrame && S9xMovieActive() ? 2 : 1; int8 ids[4]; char string[255]; From fcdc393e2b74cf1ba0289c2d227bd6aac02285b3 Mon Sep 17 00:00:00 2001 From: OV2 Date: Mon, 30 Jul 2012 19:48:21 +0200 Subject: [PATCH 2/2] win32: make __forceinline tfw functions static (gocha) --- win32/_tfwopen.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32/_tfwopen.h b/win32/_tfwopen.h index 18471012..a354b073 100644 --- a/win32/_tfwopen.h +++ b/win32/_tfwopen.h @@ -267,11 +267,11 @@ public: #define fopen _tfwopen #undef remove -__forceinline int remove(const char *filename) { +__forceinline static int remove(const char *filename) { return _twremove(filename); } #undef open -__forceinline int open(const char *filename, int oflag, int pmode) { +__forceinline static int open(const char *filename, int oflag, int pmode) { return _twopen(filename, oflag, pmode); } #endif // _TFWOPEN_H