[Scummvm-git-logs] scummvm master -> 35438cde828ae64777e2cd420f144eb5a044a72d

digitall noreply at scummvm.org
Mon Mar 7 20:12:40 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:
35438cde82 CHEWY: Fix Redundant Declaration Warnings


Commit: 35438cde828ae64777e2cd420f144eb5a044a72d
    https://github.com/scummvm/scummvm/commit/35438cde828ae64777e2cd420f144eb5a044a72d
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T20:11:55Z

Commit Message:
CHEWY: Fix Redundant Declaration Warnings

These are emitted by GCC if -Wredundant-decls is enabled.

Changed paths:
    engines/chewy/globals.h
    engines/chewy/main.cpp
    engines/chewy/room.h


diff --git a/engines/chewy/globals.h b/engines/chewy/globals.h
index 7693dae9c98..302a8236de3 100644
--- a/engines/chewy/globals.h
+++ b/engines/chewy/globals.h
@@ -304,7 +304,6 @@ void hideCur();
 void showCur();
 
 void alloc_buffers();
-void free_buffers();
 
 bool mainLoop(int16 mode);
 
@@ -472,8 +471,6 @@ void zoom_mov_anpass(ObjMov *om, MovInfo *mi);
 void calc_zoom(int16 y, int16 zoomFactorX, int16 zoomFactorY,
                ObjMov *om);
 
-void load_chewy_taf(int16 taf_nr);
-
 bool startAtsWait(int16 txtNr, int16 txtMode, int16 col, int16 mode);
 void startAadWait(int16 diaNr);
 
diff --git a/engines/chewy/main.cpp b/engines/chewy/main.cpp
index 1dae703f9af..f85a4826ede 100644
--- a/engines/chewy/main.cpp
+++ b/engines/chewy/main.cpp
@@ -41,8 +41,6 @@ static const int16 invent_display[4][2] = {
 	{5, 0}, { 265, 0 }, { 265, 149 }, { 5, 149 }
 };
 
-extern void switchRoom(int16 nr);
-
 void game_main() {
 	_G(fontMgr) = new FontMgr();
 
diff --git a/engines/chewy/room.h b/engines/chewy/room.h
index f32e46a5e4a..94d822a6900 100644
--- a/engines/chewy/room.h
+++ b/engines/chewy/room.h
@@ -125,7 +125,7 @@ private:
 	Common::Stream *_roomHandle[MAX_ROOM_HANDLE];
 };
 
-extern void load_chewy_taf(int16 taf_nr);
+void load_chewy_taf(int16 taf_nr);
 extern void switchRoom(int16 nr);
 extern void calc_person_look();
 




More information about the Scummvm-git-logs mailing list