[Scummvm-git-logs] scummvm master -> 69fa3871978ee633d1213ce7427c3a5004c8b3f9
sev-
noreply at scummvm.org
Tue Nov 29 00:37:23 UTC 2022
This automated email contains information about 11 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
95c755e8a3 AGOS: Use MSVC_PRINTF when GCC_PRINTF is used
5d23261964 GLK: Use MSVC_PRINTF when GCC_PRINTF is used
4a90e10942 ICB: Use MSVC_PRINTF when GCC_PRINTF is used
181b706e38 KYRA: Use MSVC_PRINTF in printMessage()
80b73d2cd8 SCUMM: Use MSVC_PRINTF when GCC_PRINTF is used
4a586e4909 SHERLOCK: Use MSVC_PRINTF when GCC_PRINTF is used
0c30c442b9 SKY: Use MSVC_PRINTF when GCC_PRINTF is used
47ee22ade1 SWORD1: Use MSVC_PRINTF when GCC_PRINTF is used
5a62dc4c37 TESTBED: Use MSVC_PRINTF when GCC_PRINTF is used
a86b22a40d ENGINES: Use MSVC_PRINTF when GCC_PRINTF is used
69fa387197 GUI: Use MSVC_PRINTF when GCC_PRINTF is used
Commit: 95c755e8a31e25618e6b0a2d53443e9b0eb8faca
https://github.com/scummvm/scummvm/commit/95c755e8a31e25618e6b0a2d53443e9b0eb8faca
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
AGOS: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/agos/agos.h
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 34ff0e40deb..9ceb1dd3368 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -728,7 +728,7 @@ protected:
void uncompressText(byte *ptr);
byte *uncompressToken(byte a, byte *ptr);
- void showMessageFormat(const char *s, ...) GCC_PRINTF(2, 3);
+ void showMessageFormat(MSVC_PRINTF const char *s, ...) GCC_PRINTF(2, 3);
const byte *getStringPtrByID(uint16 stringId, bool upperCase = false);
const byte *getLocalStringByID(uint16 stringId);
uint getNextStringID();
@@ -2083,7 +2083,7 @@ protected:
void printScreenText(uint vgaSpriteId, uint color, const char *stringPtr, int16 x, int16 y, int16 width) override;
void printInteractText(uint16 num, const char *string);
- void sendInteractText(uint16 num, const char *fmt, ...) GCC_PRINTF(3, 4);
+ void sendInteractText(uint16 num, MSVC_PRINTF const char *fmt, ...) GCC_PRINTF(3, 4);
void checkLinkBox();
void hyperLinkOn(uint16 x);
Commit: 5d23261964fd580215f95c5d50da849854429821
https://github.com/scummvm/scummvm/commit/5d23261964fd580215f95c5d50da849854429821
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
GLK: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/glk/adrift/scprotos.h
engines/glk/adrift/sxprotos.h
engines/glk/archetype/string.h
diff --git a/engines/glk/adrift/scprotos.h b/engines/glk/adrift/scprotos.h
index 8f6423caa3e..34171a10a65 100644
--- a/engines/glk/adrift/scprotos.h
+++ b/engines/glk/adrift/scprotos.h
@@ -63,9 +63,9 @@ typedef void (*sc_write_callbackref_t)(void *, const sc_byte *, sc_int);
/*
* Small utility and wrapper functions.
*/
-extern void sc_trace(const sc_char *format, ...) GCC_PRINTF(1, 2);
-extern void sc_error(const sc_char *format, ...) GCC_PRINTF(1, 2);
-extern void sc_fatal(const sc_char *format, ...) GCC_PRINTF(1, 2);
+extern void sc_trace(MSVC_PRINTF const sc_char *format, ...) GCC_PRINTF(1, 2);
+extern void sc_error(MSVC_PRINTF const sc_char *format, ...) GCC_PRINTF(1, 2);
+extern void sc_fatal(MSVC_PRINTF const sc_char *format, ...) GCC_PRINTF(1, 2);
extern void *sc_malloc(size_t size);
extern void *sc_realloc(void *pointer, size_t size);
extern void sc_free(void *pointer);
diff --git a/engines/glk/adrift/sxprotos.h b/engines/glk/adrift/sxprotos.h
index e2926c97889..395ec0d467d 100644
--- a/engines/glk/adrift/sxprotos.h
+++ b/engines/glk/adrift/sxprotos.h
@@ -49,9 +49,9 @@ typedef struct sx_test_descriptor_s {
/*
* Small utility and wrapper functions.
*/
-extern void sx_trace(const sc_char *format, ...) GCC_PRINTF(1, 2);
-extern void sx_error(const sc_char *format, ...) GCC_PRINTF(1, 2);
-extern void sx_fatal(const sc_char *format, ...) GCC_PRINTF(1, 2);
+extern void sx_trace(MSVC_PRINTF const sc_char *format, ...) GCC_PRINTF(1, 2);
+extern void sx_error(MSVC_PRINTF const sc_char *format, ...) GCC_PRINTF(1, 2);
+extern void sx_fatal(MSVC_PRINTF const sc_char *format, ...) GCC_PRINTF(1, 2);
extern void *sx_malloc(size_t size);
extern void *sx_realloc(void *pointer, size_t size);
extern void sx_free(void *pointer);
diff --git a/engines/glk/archetype/string.h b/engines/glk/archetype/string.h
index 72e59bac3e4..5c019548bd6 100644
--- a/engines/glk/archetype/string.h
+++ b/engines/glk/archetype/string.h
@@ -61,7 +61,7 @@ public:
return *this;
}
- static String format(const char *fmt, ...) GCC_PRINTF(1, 2);
+ static String format(MSVC_PRINTF const char *fmt, ...) GCC_PRINTF(1, 2);
static String vformat(const char *fmt, va_list args);
Commit: 4a90e109425528f0919f89eb521aaae0b8594516
https://github.com/scummvm/scummvm/commit/4a90e109425528f0919f89eb521aaae0b8594516
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
ICB: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/icb/common/px_string.h
diff --git a/engines/icb/common/px_string.h b/engines/icb/common/px_string.h
index 56b4dc36838..4488d5b12ef 100644
--- a/engines/icb/common/px_string.h
+++ b/engines/icb/common/px_string.h
@@ -95,7 +95,7 @@ inline pxString::~pxString() {
delete[] s;
}
-const char *pxVString(const char *format, ...) GCC_PRINTF(1, 2);
+const char *pxVString(MSVC_PRINTF const char *format, ...) GCC_PRINTF(1, 2);
class pxFlexiCharBuffer {
char *m_buffer; // The buffer itself
Commit: 181b706e380615f6d54b19263f2d32cce72f2dda
https://github.com/scummvm/scummvm/commit/181b706e380615f6d54b19263f2d32cce72f2dda
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
KYRA: Use MSVC_PRINTF in printMessage()
Can't do it for the other GCC_PRINTF cases because of the order they
use.
Changed paths:
engines/kyra/text/text_lol.h
diff --git a/engines/kyra/text/text_lol.h b/engines/kyra/text/text_lol.h
index 9a23671be6f..575ec92cf19 100644
--- a/engines/kyra/text/text_lol.h
+++ b/engines/kyra/text/text_lol.h
@@ -44,7 +44,7 @@ public:
void expandField();
void printDialogueText2(int dim, const char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
- void printMessage(uint16 type, const char *str, ...) GCC_PRINTF(3, 4);
+ void printMessage(uint16 type, MSVC_PRINTF const char *str, ...) GCC_PRINTF(3, 4);
int16 _scriptTextParameter;
Commit: 80b73d2cd86519b44104215a1463e557d81ebc4d
https://github.com/scummvm/scummvm/commit/80b73d2cd86519b44104215a1463e557d81ebc4d
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
SCUMM: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/scumm/scumm.h
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index bf2284dfd51..624f2815d51 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -111,7 +111,7 @@ enum {
};
/* SCUMM Debug Channels */
-void debugC(int level, const char *s, ...) GCC_PRINTF(2, 3);
+void debugC(int level, MSVC_PRINTF const char *s, ...) GCC_PRINTF(2, 3);
enum {
DEBUG_GENERAL = 1 << 0, // General debug
@@ -727,7 +727,7 @@ protected:
void restoreSurfacesPostGUI();
public:
- char displayMessage(const char *altButton, const char *message, ...) GCC_PRINTF(3, 4);
+ char displayMessage(const char *altButton, MSVC_PRINTF const char *message, ...) GCC_PRINTF(3, 4);
protected:
byte _fastMode = 0;
Commit: 4a586e490909d52765bb5bb45e1a0bdd05f502fa
https://github.com/scummvm/scummvm/commit/4a586e490909d52765bb5bb45e1a0bdd05f502fa
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
SHERLOCK: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/sherlock/screen.h
engines/sherlock/tattoo/tattoo_user_interface.h
diff --git a/engines/sherlock/screen.h b/engines/sherlock/screen.h
index 4648b3dfb6f..8115a0eafe9 100644
--- a/engines/sherlock/screen.h
+++ b/engines/sherlock/screen.h
@@ -105,12 +105,12 @@ public:
* Prints the text passed onto the back buffer at the given position and color.
* The string is then blitted to the screen
*/
- void print(const Common::Point &pt, uint color, const char *formatStr, ...) GCC_PRINTF(4, 5);
+ void print(const Common::Point &pt, uint color, MSVC_PRINTF const char *formatStr, ...) GCC_PRINTF(4, 5);
/**
* Print a strings onto the back buffer without blitting it to the screen
*/
- void gPrint(const Common::Point &pt, uint color, const char *formatStr, ...) GCC_PRINTF(4, 5);
+ void gPrint(const Common::Point &pt, uint color, MSVC_PRINTF const char *formatStr, ...) GCC_PRINTF(4, 5);
/**
* Copies a section of the second back buffer into the main back buffer
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h
index f1df02f784d..936a1b184ae 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.h
+++ b/engines/sherlock/tattoo/tattoo_user_interface.h
@@ -172,7 +172,7 @@ public:
/**
* This will display a text message in a dialog at the bottom of the screen
*/
- void putMessage(const char *formatStr, ...) GCC_PRINTF(2, 3);
+ void putMessage(MSVC_PRINTF const char *formatStr, ...) GCC_PRINTF(2, 3);
/**
* Makes a greyscale translation table for each palette entry in the table
Commit: 0c30c442b93fe4ec815179b613bd3586dea969d7
https://github.com/scummvm/scummvm/commit/0c30c442b93fe4ec815179b613bd3586dea969d7
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
SKY: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/sky/control.h
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 4d17f020b63..b3cb5d326ca 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -198,7 +198,7 @@ public:
void saveDescriptions(const Common::StringArray &list);
private:
- int displayMessage(const char *altButton, const char *message, ...) GCC_PRINTF(3, 4);
+ int displayMessage(const char *altButton, MSVC_PRINTF const char *message, ...) GCC_PRINTF(3, 4);
void initPanel();
void removePanel();
Commit: 47ee22ade16c9abadd00dc542fc850e02f53c570
https://github.com/scummvm/scummvm/commit/47ee22ade16c9abadd00dc542fc850e02f53c570
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
SWORD1: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/sword1/control.h
diff --git a/engines/sword1/control.h b/engines/sword1/control.h
index c9916bcf371..1c13ceaf005 100644
--- a/engines/sword1/control.h
+++ b/engines/sword1/control.h
@@ -99,7 +99,7 @@ public:
}
private:
- int displayMessage(const char *altButton, const char *message, ...) GCC_PRINTF(3, 4);
+ int displayMessage(const char *altButton, MSVC_PRINTF const char *message, ...) GCC_PRINTF(3, 4);
bool convertSaveGame(uint8 slot, char *desc);
void showSavegameNames();
Commit: 5a62dc4c37a26bd779c682f3252f27e8b51c4697
https://github.com/scummvm/scummvm/commit/5a62dc4c37a26bd779c682f3252f27e8b51c4697
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
TESTBED: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/testbed/testsuite.h
diff --git a/engines/testbed/testsuite.h b/engines/testbed/testsuite.h
index 5ff0ef5b914..76ad57a2023 100644
--- a/engines/testbed/testsuite.h
+++ b/engines/testbed/testsuite.h
@@ -148,8 +148,8 @@ public:
virtual const char *getName() const = 0;
virtual const char *getDescription() const = 0;
- static void logPrintf(const char *s, ...) GCC_PRINTF(1, 2);
- static void logDetailedPrintf(const char *s, ...) GCC_PRINTF(1, 2);
+ static void logPrintf(MSVC_PRINTF const char *s, ...) GCC_PRINTF(1, 2);
+ static void logDetailedPrintf(MSVC_PRINTF const char *s, ...) GCC_PRINTF(1, 2);
// Progress bar (Information Display) related methods.
/**
Commit: a86b22a40d59b5d4554dd9d5dbcb91f800f231e5
https://github.com/scummvm/scummvm/commit/a86b22a40d59b5d4554dd9d5dbcb91f800f231e5
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
ENGINES: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
engines/engine.h
diff --git a/engines/engine.h b/engines/engine.h
index adc7988dac6..f3adff10e4e 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -89,7 +89,7 @@ inline void GUIErrorMessageFormat(const Common::U32String &fmt, TParam... param)
/**
* Initialize graphics and show an error message.
*/
-void GUIErrorMessageFormat(const char *fmt, ...) GCC_PRINTF(1, 2);
+void GUIErrorMessageFormat(MSVC_PRINTF const char *fmt, ...) GCC_PRINTF(1, 2);
class Engine;
Commit: 69fa3871978ee633d1213ce7427c3a5004c8b3f9
https://github.com/scummvm/scummvm/commit/69fa3871978ee633d1213ce7427c3a5004c8b3f9
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T01:37:16+01:00
Commit Message:
GUI: Use MSVC_PRINTF when GCC_PRINTF is used
Changed paths:
gui/console.h
gui/debugger.h
diff --git a/gui/console.h b/gui/console.h
index 3cfd74eb12d..01effcfe5e5 100644
--- a/gui/console.h
+++ b/gui/console.h
@@ -143,7 +143,7 @@ public:
void handleKeyDown(Common::KeyState state) override;
void handleCommand(CommandSender *sender, uint32 cmd, uint32 data) override;
- int printFormat(int dummy, const char *format, ...) GCC_PRINTF(3, 4);
+ int printFormat(int dummy, MSVC_PRINTF const char *format, ...) GCC_PRINTF(3, 4);
int vprintFormat(int dummy, const char *format, va_list argptr);
void printChar(int c);
diff --git a/gui/debugger.h b/gui/debugger.h
index 31200bcd08f..d06eaf5cea0 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -45,7 +45,7 @@ public:
int getCharsPerLine();
- int debugPrintf(const char *format, ...) GCC_PRINTF(2, 3);
+ int debugPrintf(MSVC_PRINTF const char *format, ...) GCC_PRINTF(2, 3);
void debugPrintColumns(const Common::StringArray &list);
More information about the Scummvm-git-logs
mailing list