[Scummvm-git-logs] scummvm master -> 894813870e75461cecee097e6ee2d5130241874e
digitall
noreply at scummvm.org
Mon Mar 7 18:31:42 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
894813870e SAGA2: Fix Redundant Declaration Warnings
Commit: 894813870e75461cecee097e6ee2d5130241874e
https://github.com/scummvm/scummvm/commit/894813870e75461cecee097e6ee2d5130241874e
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T18:30:58Z
Commit Message:
SAGA2: Fix Redundant Declaration Warnings
These warnings are generated by GCC if -Wredundant-decls is enabled.
Changed paths:
engines/saga2/audio.cpp
engines/saga2/button.h
engines/saga2/display.cpp
engines/saga2/display.h
engines/saga2/fta.h
engines/saga2/intrface.cpp
engines/saga2/main.cpp
engines/saga2/modal.cpp
engines/saga2/motion.cpp
engines/saga2/msgbox.cpp
engines/saga2/msgbox.h
engines/saga2/objects.cpp
engines/saga2/playmode.cpp
engines/saga2/saveload.cpp
engines/saga2/speech.cpp
engines/saga2/speech.h
engines/saga2/spelcast.cpp
engines/saga2/spellbuk.h
engines/saga2/tile.cpp
engines/saga2/tilemode.cpp
engines/saga2/towerfta.cpp
engines/saga2/towerfta.h
engines/saga2/transit.cpp
engines/saga2/tromode.cpp
engines/saga2/uidialog.cpp
diff --git a/engines/saga2/audio.cpp b/engines/saga2/audio.cpp
index e0bb999abd6..b2a03ceeb77 100644
--- a/engines/saga2/audio.cpp
+++ b/engines/saga2/audio.cpp
@@ -57,17 +57,10 @@ extern hResource *voiceResFile; // script resources
hResContext *voiceRes, *musicRes, *soundRes, *loopRes, *longRes;
bool haveKillerSoundCard();
-void writeConfig();
void disableBGLoop(bool s = true);
void enableBGLoop();
void audioStressTest();
extern GameObject *getViewCenterObject();
-void playSoundAt(uint32 s, Location playAt);
-void playSoundAt(uint32 s, Point32 playAt);
-bool sayVoiceAt(uint32 s[], Location l);
-bool sayVoiceAt(uint32 s[], Point32 l);
-void playLoopAt(uint32 s, Location l);
-void playLoopAt(uint32 s, Point32 l);
bool bufCheckResID(hResContext *hrc, uint32 s);
bool hResCheckResID(hResContext *hrc, uint32 s);
diff --git a/engines/saga2/button.h b/engines/saga2/button.h
index 7d919669df0..61c362ddf28 100644
--- a/engines/saga2/button.h
+++ b/engines/saga2/button.h
@@ -28,6 +28,7 @@
#include "saga2/panel.h"
#include "saga2/cmisc.h"
+#include "saga2/floating.h"
#include "saga2/idtypes.h"
//#include "saga2/sprite.h"
@@ -391,10 +392,7 @@ public:
/* ===================================================================== *
Misc functions
* ===================================================================== */
-// duplicate declaration in floating.h
-void drawCompressedImage(gPort &port, const Point16 pos, void *image);
-void drawCompressedImageGhosted(gPort &port, const Point16 pos, void *image);
void drawCompressedImageToMap(gPixelMap &map, void *image);
void writePlaqText(gPort &port,
diff --git a/engines/saga2/display.cpp b/engines/saga2/display.cpp
index fea155c6923..7bab54c86ff 100644
--- a/engines/saga2/display.cpp
+++ b/engines/saga2/display.cpp
@@ -56,10 +56,8 @@ static bool paletteSuspendFlag = false;
Prototypes
* ===================================================================== */
-void reDrawScreen();
void localCursorOn();
void localCursorOff();
-void loadingScreen();
void resetInputDevices();
APPFUNC(cmdWindowFunc); // main window event handler
static void switchOn();
diff --git a/engines/saga2/display.h b/engines/saga2/display.h
index 89e3458470d..6f419ca7414 100644
--- a/engines/saga2/display.h
+++ b/engines/saga2/display.h
@@ -76,7 +76,6 @@ bool paletteChangesEnabled();
void delayedDisplayEnable();
void externalPaletteIntrusion();
void reDrawScreen();
-void blackOut();
void showLoadMessage();
// ------------------------------------------------------------------------
@@ -85,12 +84,6 @@ void showLoadMessage();
void pushVidState();
void popVidState();
-// ------------------------------------------------------------------------
-// Calls to suspend audio
-
-void suspendAudio();
-void resumeAudio();
-
// ------------------------------------------------------------------------
// The display may be disabled for several reasons these track them
void blackOut();
diff --git a/engines/saga2/fta.h b/engines/saga2/fta.h
index a04a08bdb2c..a1b9582866e 100644
--- a/engines/saga2/fta.h
+++ b/engines/saga2/fta.h
@@ -185,12 +185,6 @@ void saveGlobals(Common::OutSaveFile *outS);
void loadGlobals(Common::InSaveFile *in);
inline void cleanupGlobals() {} // do nothing
-/* ===================================================================== *
- General redraw routine
- * ===================================================================== */
-
-void reDrawScreen();
-
/* ===================================================================== *
Script-related
* ===================================================================== */
diff --git a/engines/saga2/intrface.cpp b/engines/saga2/intrface.cpp
index b94a1c0e8b0..b8e77045766 100644
--- a/engines/saga2/intrface.cpp
+++ b/engines/saga2/intrface.cpp
@@ -198,20 +198,6 @@ public:
Imports
* ===================================================================== */
-#ifndef FTAASM_H
-extern void compositePixels(
- gPixelMap *compMap,
- gPixelMap *sprMap,
- int32 xpos,
- int32 ypos,
- uint8 *lookup);
-
-extern void unpackImage(gPixelMap *map,
- int32 width,
- int32 rowCount,
- int8 *srcData);
-#endif
-
// this is a redeclare of the struct in playmode.cpp
typedef struct {
Point16 size;
@@ -389,8 +375,6 @@ class CPortrait *Portrait;
// which brother is set in the individual controls
uint16 indivBrother;
-bool isBrotherDead(PlayerActorID brotherID);
-
/* ===================================================================== *
Global class declarations
* ===================================================================== */
diff --git a/engines/saga2/main.cpp b/engines/saga2/main.cpp
index ea94ed25271..453f1bf1a4f 100644
--- a/engines/saga2/main.cpp
+++ b/engines/saga2/main.cpp
@@ -45,6 +45,7 @@
#include "saga2/tromode.h"
#include "saga2/saveload.h"
#include "saga2/gamerate.h"
+#include "saga2/modal.h"
#include "saga2/msgbox.h"
#include "saga2/grabinfo.h"
@@ -133,19 +134,12 @@ void findProgramDir(char *argv); // save program home directory
APPFUNC(cmdWindowFunc); // main window event handler
// Exportable prototypes
-void EventLoop(bool &running, bool modal); // handles input and distributes
void SystemEventLoop();
void runPathFinder();
-bool setupGame();
-
-void mainEnable();
-void mainDisable();
void updateMainDisplay();
-void cleanupGame(); // auto-cleanup function
-void parseCommandLine(int argc, char *argv[]);
const char *getExeFromCommandLine(int argc, char *argv[]);
void WriteStatusF2(int16 line, const char *msg, ...);
bool initUserDialog();
@@ -194,7 +188,6 @@ void main_saga2() {
// Inner chunk of main - this bizzare nesting is required because VC++
// doesn't like try{} catch(){ } blocks in the same routine as its
// __try{} __except(){} blocks
-void updateActiveRegions();
static void mainLoop(bool &cleanExit_, int argc, char *argv[]) {
const char *exeFile = getExeFromCommandLine(argc, argv);
diff --git a/engines/saga2/modal.cpp b/engines/saga2/modal.cpp
index 1bddce2e758..cb6e999e70d 100644
--- a/engines/saga2/modal.cpp
+++ b/engines/saga2/modal.cpp
@@ -37,7 +37,6 @@ APPFUNC(cmdModalWindow);
void ModalModeSetup() {}
void ModalModeCleanup() {}
void ModalModeHandleTask() {}
-void ModalModeHandleKey(short, short);
GameMode ModalMode = {
nullptr, // no previous mode
diff --git a/engines/saga2/motion.cpp b/engines/saga2/motion.cpp
index e355f621f79..1d37d1de2ca 100644
--- a/engines/saga2/motion.cpp
+++ b/engines/saga2/motion.cpp
@@ -135,7 +135,6 @@ extern uint16 uMaxMasks[4],
vMinMasks[4];
extern SpellStuff *spellBook;
-void fallingDamage(GameObject *obj, int16 speed);
/* ===================================================================== *
PathMinder
diff --git a/engines/saga2/msgbox.cpp b/engines/saga2/msgbox.cpp
index 25af1d3b78a..30e389f2d23 100644
--- a/engines/saga2/msgbox.cpp
+++ b/engines/saga2/msgbox.cpp
@@ -61,13 +61,6 @@ extern BackWindow *mainWindow;
APPFUNC(cmdDialogQuit);
int16 MsgBox(const char *msg, const char *btnMsg1, const char *btnMsg2);
-void writePlaqText(gPort &port,
- const Rect16 &r,
- gFont *font,
- int16 textPos,
- textPallete &pal,
- bool hiLite,
- const char *msg, ...);
inline Rect16 butBox(int n, int i) {
return (n > 1 ? *mbButtonRects[i] : mbOneBtnRect);
diff --git a/engines/saga2/msgbox.h b/engines/saga2/msgbox.h
index fc09080f116..014a760be31 100644
--- a/engines/saga2/msgbox.h
+++ b/engines/saga2/msgbox.h
@@ -32,11 +32,6 @@ namespace Saga2 {
struct textPallete;
-void ModalModeSetup();
-void ModalModeCleanup();
-void ModalModeHandleTask();
-void ModalModeHandleKey(short, short);
-
//Modal Mode GameMode Object
extern GameMode ModalMode;
diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp
index 8abb99bdbb8..76c17f685e2 100644
--- a/engines/saga2/objects.cpp
+++ b/engines/saga2/objects.cpp
@@ -144,7 +144,6 @@ bool unstickObject(GameObject *obj);
void **LoadImageRes(hResContext *con, int16 resID, int16 numRes, char a, char b, char c);
void UnloadImageRes(void **images, int16 numRes);
-void drown(GameObject *obj);
/* ===================================================================== *
class Location member functions
diff --git a/engines/saga2/playmode.cpp b/engines/saga2/playmode.cpp
index da7527b92f5..a996359fa47 100644
--- a/engines/saga2/playmode.cpp
+++ b/engines/saga2/playmode.cpp
@@ -294,11 +294,6 @@ void PlayModeCleanup() {
REM: These should probably be moved elsewhere...
* ===================================================================== */
-extern void unpackImage(gPixelMap *map,
- int32 width,
- int32 rowCount,
- int8 *srcData);
-
typedef struct {
Point16 size;
int16 compress;
diff --git a/engines/saga2/saveload.cpp b/engines/saga2/saveload.cpp
index a87719fc7e2..d3d2521cbc8 100644
--- a/engines/saga2/saveload.cpp
+++ b/engines/saga2/saveload.cpp
@@ -37,6 +37,7 @@
#include "saga2/mission.h"
#include "saga2/tilemode.h"
#include "saga2/magic.h"
+#include "saga2/display.h"
#include "saga2/intrface.h"
#include "saga2/vpal.h"
#include "saga2/palette.h"
@@ -48,7 +49,6 @@ namespace Saga2 {
void updateMainDisplay();
void fadeUp();
void fadeDown();
-void enablePaletteChanges();
const ChunkID gameID = MKTAG('F', 'T', 'A', '2');
diff --git a/engines/saga2/speech.cpp b/engines/saga2/speech.cpp
index b8cf6fbb31f..a5b76fe61c2 100644
--- a/engines/saga2/speech.cpp
+++ b/engines/saga2/speech.cpp
@@ -33,6 +33,7 @@
#include "saga2/player.h"
#include "saga2/annoy.h"
#include "saga2/cmisc.h"
+#include "saga2/tile.h"
#include "saga2/tilemode.h"
namespace Saga2 {
diff --git a/engines/saga2/speech.h b/engines/saga2/speech.h
index ee6526e8e37..01ca4c705e3 100644
--- a/engines/saga2/speech.h
+++ b/engines/saga2/speech.h
@@ -35,10 +35,7 @@ namespace Saga2 {
#define CHARSPERSECOND 22
#define SHORTEST_DURATION TICKSPERSECOND
-void TileToScreenCoords(const TilePoint &tp, Point16 &p);
-void TileToScreenCoords(const TilePoint &tp, StaticPoint16 &p);
void updateSpeech();
-extern TilePoint centerActorCoords();
bool isVisible(GameObject *obj);
#ifdef FRANKC
diff --git a/engines/saga2/spelcast.cpp b/engines/saga2/spelcast.cpp
index 9b2352bdc58..8da752d3ff7 100644
--- a/engines/saga2/spelcast.cpp
+++ b/engines/saga2/spelcast.cpp
@@ -49,7 +49,7 @@ static MetaTilePtr prevMeta;
Prototypes
* ===================================================================== */
-blockageType checkNontact(Effectron *obj, const TilePoint &loc, GameObject **blockResultObj);
+blockageType checkNontact(Effectron *obj, const TilePoint &loc, GameObject **blockResultObj = nullptr);
int32 scatterer(int32 i, int32 m, int32 s);
/* ===================================================================== *
@@ -861,13 +861,6 @@ int16 tileNopeHeight(
Effectron *obj,
StandingTileInfo *sti = nullptr);
-//-----------------------------------------------------------------------
-// clone of checkContact()
-blockageType checkNontact(
- Effectron *obj,
- const TilePoint &loc,
- GameObject **blockResultObj = nullptr);
-
//-----------------------------------------------------------------------
// clone of objectCollision()
GameObject *objectNollision(Effectron *obj, const TilePoint &loc);
diff --git a/engines/saga2/spellbuk.h b/engines/saga2/spellbuk.h
index 851181fa5a6..2e78d92d089 100644
--- a/engines/saga2/spellbuk.h
+++ b/engines/saga2/spellbuk.h
@@ -215,7 +215,6 @@ SPECIALSPELL(CreateWraith);
SPECIALSPELL(SagaSpellCall);
SPECIALSPELL(CreateWWisp);
SPECIALSPELL(CreateFWisp);
-SPECIALSPELL(CreateWraith);
SPECIALSPELL(CreateFood);
} // End of namespace Saga2
diff --git a/engines/saga2/tile.cpp b/engines/saga2/tile.cpp
index 2ca7e9f40eb..1f453c2ec65 100644
--- a/engines/saga2/tile.cpp
+++ b/engines/saga2/tile.cpp
@@ -142,7 +142,6 @@ extern void updateActorTasks();
extern void updateObjectAppearances(int32 deltaTime);
extern void getViewTrackPos(TilePoint &tp);
extern GameObject *getViewCenterObject();
-extern TilePoint centerActorCoords();
void freeAllTileBanks();
void cycleTiles(uint32 elapsed);
diff --git a/engines/saga2/tilemode.cpp b/engines/saga2/tilemode.cpp
index df4bb871ec4..7c9fccc6f46 100644
--- a/engines/saga2/tilemode.cpp
+++ b/engines/saga2/tilemode.cpp
@@ -108,7 +108,6 @@ void navigatePath(TilePoint pick);
void moveActors(int32 deltaTime);
-void drawMainDisplay();
void updateMainDisplay();
#if DEBUG
diff --git a/engines/saga2/towerfta.cpp b/engines/saga2/towerfta.cpp
index 7f0eb3d7438..39eb3ae7483 100644
--- a/engines/saga2/towerfta.cpp
+++ b/engines/saga2/towerfta.cpp
@@ -90,7 +90,6 @@ TowerLayer tower[fullyInitialized] = {
* ===================================================================== */
//#include "saga2/loadmsg.h"
-bool initGUIMessagers();
void cleanupGUIMessagers();
bool openResources();
void closeResources();
@@ -133,16 +132,12 @@ TERMINATOR(termPlayOutro) {
// ------------------------------------------------------------------------
-extern INITIALIZER(initSystemTimer);
-
TERMINATOR(termSystemTimer) {
cleanupSystemTimer();
}
// ------------------------------------------------------------------------
-extern INITIALIZER(initAudio);
-
TERMINATOR (termAudio)
{
cleanupAudio();
@@ -290,8 +285,6 @@ TERMINATOR(termMainWindow) {
// ------------------------------------------------------------------------
-extern INITIALIZER(initGUIMessagers);
-
TERMINATOR(termGUIMessagers) {
cleanupGUIMessagers();
}
diff --git a/engines/saga2/towerfta.h b/engines/saga2/towerfta.h
index 726780f5285..51faa2bfaf3 100644
--- a/engines/saga2/towerfta.h
+++ b/engines/saga2/towerfta.h
@@ -36,10 +36,8 @@ INITIALIZER(initSystemConfig);
INITIALIZER(initPlayIntro);
TERMINATOR(termPlayOutro);
-INITIALIZER(initSystemTimer);
TERMINATOR(termSystemTimer);
-INITIALIZER(initAudio);
TERMINATOR (termAudio);
INITIALIZER(initResourceFiles);
diff --git a/engines/saga2/transit.cpp b/engines/saga2/transit.cpp
index 0497902e027..a97c4931bff 100644
--- a/engines/saga2/transit.cpp
+++ b/engines/saga2/transit.cpp
@@ -95,13 +95,10 @@ void SystemEventLoop();
// Fade to black
void clearTileAreaPort();
-void reDrawScreen() ;
void updateMainDisplay();
void updateActiveRegions();
-void drawMainDisplay();
void fadeUp();
void fadeDown();
-void clearTileAreaPort();
void displayUpdate();
void disableUserControls();
void enableUserControls();
diff --git a/engines/saga2/tromode.cpp b/engines/saga2/tromode.cpp
index 1e85a96d30c..361b2181c35 100644
--- a/engines/saga2/tromode.cpp
+++ b/engines/saga2/tromode.cpp
@@ -26,6 +26,7 @@
#include "common/config-manager.h"
#include "saga2/saga2.h"
+#include "saga2/annoy.h"
#include "saga2/detection.h"
#include "saga2/fta.h"
#include "saga2/player.h"
@@ -60,7 +61,6 @@ int16 OptionsDialog(bool disableSaveResume = false);
void SystemEventLoop();
void freeAllTileBanks();
void resetInputDevices();
-void blackOut();
void cursorFullHide(bool onOff);
static void doIntro();
diff --git a/engines/saga2/uidialog.cpp b/engines/saga2/uidialog.cpp
index ec1eb41f7be..5b7e86cb9d5 100644
--- a/engines/saga2/uidialog.cpp
+++ b/engines/saga2/uidialog.cpp
@@ -762,17 +762,12 @@ int16 FileDialog(int16 fileProcess) {
/* ===================================================================== *
Options dialog box
* ===================================================================== */
-void reDrawScreen() ;
void updateMainDisplay();
-void updateActiveRegions();
void drawMainDisplay();
void fadeUp();
void fadeDown();
void clearTileAreaPort();
void displayUpdate();
-void disableUserControls();
-void enableUserControls();
-void updateAllUserControls();
int16 OptionsDialog(bool disableSaveResume) {
// Save back buffer before opening the dialog
More information about the Scummvm-git-logs
mailing list