diff options
| author | Thierry Crozat | 2017-11-10 22:20:54 +0000 |
|---|---|---|
| committer | GitHub | 2017-11-10 22:20:54 +0000 |
| commit | 2b00829f09609447758dc55956dd6a345b878c4b (patch) | |
| tree | 06de1770adfa05ba89df7398dc48eb9fef1da133 /engines/kyra | |
| parent | b73892e441bc3fde3b36f76aa675c59a652ca95c (diff) | |
| parent | b1ba071ea8a128f94f70f9a28270644e5d70b6fb (diff) | |
| download | scummvm-rg350-2b00829f09609447758dc55956dd6a345b878c4b.tar.gz scummvm-rg350-2b00829f09609447758dc55956dd6a345b878c4b.tar.bz2 scummvm-rg350-2b00829f09609447758dc55956dd6a345b878c4b.zip | |
Merge pull request #1041 from criezy/variadic-undefined
Fix undefined behaviour in variadic functions
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/screen_lol.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/screen_lol.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index 6dd6080923..2531cb4cb1 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -54,7 +54,7 @@ Screen_LoL::~Screen_LoL() { delete[] _grayOverlay; } -void Screen_LoL::fprintString(const char *format, int x, int y, uint8 col1, uint8 col2, uint16 flags, ...) { +void Screen_LoL::fprintString(const char *format, int x, int y, uint8 col1, uint8 col2, uint flags, ...) { if (!format) return; @@ -90,7 +90,7 @@ void Screen_LoL::fprintString(const char *format, int x, int y, uint8 col1, uint printText(string, x, y, col1, col2); } -void Screen_LoL::fprintStringIntro(const char *format, int x, int y, uint8 c1, uint8 c2, uint8 c3, uint16 flags, ...) { +void Screen_LoL::fprintStringIntro(const char *format, int x, int y, uint8 c1, uint8 c2, uint8 c3, uint flags, ...) { char buffer[400]; va_list args; diff --git a/engines/kyra/screen_lol.h b/engines/kyra/screen_lol.h index 91d663d34f..49c6f90168 100644 --- a/engines/kyra/screen_lol.h +++ b/engines/kyra/screen_lol.h @@ -36,8 +36,8 @@ public: Screen_LoL(LoLEngine *vm, OSystem *system); ~Screen_LoL(); - void fprintString(const char *format, int x, int y, uint8 col1, uint8 col2, uint16 flags, ...) GCC_PRINTF(2, 8); - void fprintStringIntro(const char *format, int x, int y, uint8 c1, uint8 c2, uint8 c3, uint16 flags, ...) GCC_PRINTF(2, 9); + void fprintString(const char *format, int x, int y, uint8 col1, uint8 col2, uint flags, ...) GCC_PRINTF(2, 8); + void fprintStringIntro(const char *format, int x, int y, uint8 c1, uint8 c2, uint8 c3, uint flags, ...) GCC_PRINTF(2, 9); void drawShadedBox(int x1, int y1, int x2, int y2, int color1, int color2); |