libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 22:51:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Fix more warnings

Browse Source
This commit is contained in:
Eugene Sandulenko 2021-05-27 18:13:53 +02:00
parent 97fa02d7b8
commit 4319fd55f5
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
6 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/saga2/button.cpp
View File

@ -101,7 +101,7 @@ gCompImage::gCompImage(gPanelList &list,
resContext = NULL; resContext = NULL;
} }
gCompImage::gCompImage(gPanelList &list, const Rect16 &box, void *image, char *text, textPallete &pal, uint16 ident, gCompImage::gCompImage(gPanelList &list, const Rect16 &box, void *image, const char *text, textPallete &pal, uint16 ident,
AppFunc *cmd) : gControl(list, box, text, ident, cmd) { AppFunc *cmd) : gControl(list, box, text, ident, cmd) {
// setup a single image configuration // setup a single image configuration
init(); init();
@ -150,7 +150,7 @@ gCompImage::gCompImage(gPanelList &list, const Rect16 &box, void **images,
} }
gCompImage::gCompImage(gPanelList &list, const Rect16 &box, void **images, gCompImage::gCompImage(gPanelList &list, const Rect16 &box, void **images,
int16 numRes, int16 initial, char *text, textPallete &pal, int16 numRes, int16 initial, const char *text, textPallete &pal,
uint16 ident, AppFunc *cmd) : gControl(list, box, text, ident, cmd) { uint16 ident, AppFunc *cmd) : gControl(list, box, text, ident, cmd) {
init(); init();
@ -423,7 +423,7 @@ gCompButton::gCompButton(gPanelList &list, const Rect16 &box, void **images, int
extent = box; extent = box;
} }
gCompButton::gCompButton(gPanelList &list, const Rect16 &box, void **images, int16 numRes, char *text, textPallete &pal, uint16 ident, gCompButton::gCompButton(gPanelList &list, const Rect16 &box, void **images, int16 numRes, const char *text, textPallete &pal, uint16 ident,
AppFunc *cmd) : gCompImage(list, box, NULL, 0, 0, text, pal, ident, cmd) { AppFunc *cmd) : gCompImage(list, box, NULL, 0, 0, text, pal, ident, cmd) {
if (images[ 0 ] && images[ 1 ] && numRes == 2) { if (images[ 0 ] && images[ 1 ] && numRes == 2) {
forImage = images[ 0 ]; forImage = images[ 0 ];

6
engines/saga2/button.h
View File

@ -102,14 +102,14 @@ public:
gCompImage(gPanelList &, const Rect16 &, void *, uint16, AppFunc *cmd = NULL); gCompImage(gPanelList &, const Rect16 &, void *, uint16, AppFunc *cmd = NULL);
gCompImage(gPanelList &, const Rect16 &, void *, char *, gCompImage(gPanelList &, const Rect16 &, void *, const char *,
textPallete &, uint16, AppFunc *cmd = NULL); textPallete &, uint16, AppFunc *cmd = NULL);
gCompImage(gPanelList &, const Rect16 &, void **, int16, int16, gCompImage(gPanelList &, const Rect16 &, void **, int16, int16,
uint16, AppFunc *cmd = NULL); uint16, AppFunc *cmd = NULL);
gCompImage(gPanelList &, const Rect16 &, void **, int16, int16, gCompImage(gPanelList &, const Rect16 &, void **, int16, int16,
char *, textPallete &, uint16, AppFunc *cmd = NULL); const char *, textPallete &, uint16, AppFunc *cmd = NULL);
gCompImage(gPanelList &list, gCompImage(gPanelList &list,
const Rect16 &box, const Rect16 &box,
@ -209,7 +209,7 @@ public:
uint16, AppFunc *cmd = NULL); uint16, AppFunc *cmd = NULL);
gCompButton(gPanelList &, const Rect16 &, void **, int16, gCompButton(gPanelList &, const Rect16 &, void **, int16,
char *, textPallete &, uint16, AppFunc *cmd = NULL); const char *, textPallete &, uint16, AppFunc *cmd = NULL);
gCompButton(gPanelList &, const Rect16 &, void **, int16, void *, bool, gCompButton(gPanelList &, const Rect16 &, void **, int16, void *, bool,
uint16, AppFunc *cmd = NULL); uint16, AppFunc *cmd = NULL);

4
engines/saga2/msgbox.cpp
View File

@ -76,9 +76,7 @@ inline Rect16 butBox(int n, int i) {
* ===================================================================== */ * ===================================================================== */
bool userDialogAvailable(void); bool userDialogAvailable(void);
int16 userDialog(const char *title, char *msg, char *btnMsg1, int16 userDialog(const char *title, const char *msg, const char *btnMsg1, const char *btnMsg2, const char *btnMsg3);
char *btnMsg2,
char *btnMsg3);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Wrapper to avoid errors // Wrapper to avoid errors

3
engines/saga2/property.h
View File

@ -309,6 +309,7 @@ struct MetaTile;
class MetaTileProperty { class MetaTileProperty {
public: public:
virtual ~MetaTileProperty() {}
virtual bool operator()( virtual bool operator()(
MetaTile *mt, MetaTile *mt,
int16 mapNum, int16 mapNum,
@ -329,6 +330,8 @@ public:
propertyFunc(func) { propertyFunc(func) {
} }
virtual ~SimpleMetaTileProperty() {}
bool operator()( bool operator()(
MetaTile *mt, MetaTile *mt,
int16 mapNum, int16 mapNum,

24
engines/saga2/uidialog.cpp
View File

@ -803,7 +803,7 @@ void updateAllUserControls(void);
int16 OptionsDialog(bool disableSaveResume) { int16 OptionsDialog(bool disableSaveResume) {
// text for dialog // text for dialog
char *btnStrings[ numOptionsBtns ] = { { OPTN_DIALOG_BUTTON1 }, const char *btnStrings[ numOptionsBtns ] = { { OPTN_DIALOG_BUTTON1 },
{ OPTN_DIALOG_BUTTON2 }, { OPTN_DIALOG_BUTTON2 },
{ OPTN_DIALOG_BUTTON3 }, { OPTN_DIALOG_BUTTON3 },
{ OPTN_DIALOG_BUTTON4 }, { OPTN_DIALOG_BUTTON4 },
@ -811,7 +811,7 @@ int16 OptionsDialog(bool disableSaveResume) {
}; };
char *textStrings[ numOptionsTexts ] = { { OPTN_DIALOG_NAME }, const char *textStrings[ numOptionsTexts ] = { { OPTN_DIALOG_NAME },
{ OPTN_DIALOG_SLIDE1 }, { OPTN_DIALOG_SLIDE1 },
{ OPTN_DIALOG_SLIDE2 }, { OPTN_DIALOG_SLIDE2 },
{ OPTN_DIALOG_SLIDE3 }, { OPTN_DIALOG_SLIDE3 },
@ -998,7 +998,7 @@ int16 OptionsDialog(bool disableSaveResume) {
message dialog box message dialog box
* ===================================================================== */ * ===================================================================== */
char stripAccel(char *t, char *s) { char stripAccel(char *t, const char *s) {
char accel = '\0'; char accel = '\0';
char *underscore; char *underscore;
@ -1074,9 +1074,9 @@ void cleanupUserDialog(void) {
} }
int16 userDialog(const char *title, char *msg, char *bMsg1, int16 userDialog(const char *title, const char *msg, const char *bMsg1,
char *bMsg2, const char *bMsg2,
char *bMsg3) { const char *bMsg3) {
const maxBtns = 3; const maxBtns = 3;
uint8 numBtns = 0; uint8 numBtns = 0;
@ -1167,9 +1167,9 @@ bool userDialogAvailable(void) {
} }
void cleanupUserDialog(void) {} void cleanupUserDialog(void) {}
int16 userDialog(const char *title, char *msg, char *bMsg1, int16 userDialog(const char *title, const char *msg, const char *bMsg1,
char *bMsg2, const char *bMsg2,
char *bMsg3) { const char *bMsg3) {
const int maxBtns = 3; const int maxBtns = 3;
uint8 numBtns = 0; uint8 numBtns = 0;
@ -1411,7 +1411,7 @@ void CPlacardWindow::drawClipped(
} }
} }
CPlacardPanel::CPlacardPanel(gPanelList &gpl, const Rect16 &r, char *t, gFont *f, CPlacardPanel::CPlacardPanel(gPanelList &gpl, const Rect16 &r, const char *t, gFont *f,
int16 i, textPallete &p, int16 i2, AppFunc *cmd) : int16 i, textPallete &p, int16 i2, AppFunc *cmd) :
CPlaqText(gpl, r, t, f, i, p, i2, cmd) { CPlaqText(gpl, r, t, f, i, p, i2, cmd) {
@ -1420,9 +1420,7 @@ CPlacardPanel::CPlacardPanel(gPanelList &gpl, const Rect16 &r, char *t, gFont *f
void CPlacardPanel::positionText( void CPlacardPanel::positionText(const char *windowText, const Rect16 &textArea) {
char *windowText,
const Rect16 &textArea) {
if (windowText) { if (windowText) {
int16 i, int16 i,
yPos, yPos,

12
engines/saga2/uidialog.h
View File

@ -57,9 +57,9 @@ int16 OptionsDialog(bool disableSaveResume = FALSE);
void initFileFields(char **fieldStrings); void initFileFields(char **fieldStrings);
char **destroyFileFields(void); char **destroyFileFields(void);
bool getSaveName(int8 saveNo, SaveFileHeader &header); bool getSaveName(int8 saveNo, SaveFileHeader &header);
int16 userDialog(const char *title, char *msg, char *btnMsg1, int16 userDialog(const char *title, const char *msg, const char *btnMsg1,
char *btnMsg2, const char *btnMsg2,
char *btnMsg3); const char *btnMsg3);
void placardWindow(int8 type, char *text); void placardWindow(int8 type, char *text);
@ -126,9 +126,7 @@ class CPlacardPanel : public CPlaqText {
char *titleStrings[ maxLines ]; char *titleStrings[ maxLines ];
char titleBuf[ maxText ]; char titleBuf[ maxText ];
void positionText( void positionText(const char *windowText, const Rect16 &textArea);
char *windowText,
const Rect16 &textArea);
int16 SplitString( int16 SplitString(
char *text, char *text,
@ -136,7 +134,7 @@ class CPlacardPanel : public CPlaqText {
int16 maxStrings, int16 maxStrings,
char delimiter); char delimiter);
public: public:
CPlacardPanel(gPanelList &, const Rect16 &, char *, gFont *, CPlacardPanel(gPanelList &, const Rect16 &, const char *, gFont *,
int16, textPallete &, int16, AppFunc *cmd = NULL); int16, textPallete &, int16, AppFunc *cmd = NULL);
void drawClipped(gPort &, void drawClipped(gPort &,