[Scummvm-git-logs] scummvm master -> c569f4b40d1bbda65e8d608813ab496487d5a08d

[digitall]

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:
c569f4b40d ULTIMA: Remove Redundant Declarations


Commit: c569f4b40d1bbda65e8d608813ab496487d5a08d
    https://github.com/scummvm/scummvm/commit/c569f4b40d1bbda65e8d608813ab496487d5a08d
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-07T10:20:55Z

Commit Message:
ULTIMA: Remove Redundant Declarations

These cause GCC Warnings when -Wredundant-decls is enabled.

Changed paths:
    engines/ultima/nuvie/actors/actor_manager.cpp
    engines/ultima/nuvie/script/script.cpp
    engines/ultima/nuvie/script/script_actor.cpp
    engines/ultima/ultima4/map/mapmgr.cpp


diff --git a/engines/ultima/nuvie/actors/actor_manager.cpp b/engines/ultima/nuvie/actors/actor_manager.cpp
index 2ad18302bd8..0fe8291516a 100644
--- a/engines/ultima/nuvie/actors/actor_manager.cpp
+++ b/engines/ultima/nuvie/actors/actor_manager.cpp
@@ -49,8 +49,6 @@ namespace Nuvie {
 #define ACTOR_TEMP_INIT 255
 #define SCHEDULE_SIZE 5
 
-void config_get_path(Configuration *config, Std::string filename, Std::string &path);
-
 ActorManager::ActorManager(Configuration *cfg, Map *m, TileManager *tm, ObjManager *om, GameClock *c) {
 	uint16 i;
 
diff --git a/engines/ultima/nuvie/script/script.cpp b/engines/ultima/nuvie/script/script.cpp
index 390e9c82b20..50d7f84de64 100644
--- a/engines/ultima/nuvie/script/script.cpp
+++ b/engines/ultima/nuvie/script/script.cpp
@@ -107,8 +107,6 @@ An actor schedule entry
 @int z
  */
 
-extern bool nscript_new_actor_var(lua_State *L, uint16 actor_num);
-
 struct ScriptObjRef {
 	uint16 refcount;
 	iAVLKey key;
diff --git a/engines/ultima/nuvie/script/script_actor.cpp b/engines/ultima/nuvie/script/script_actor.cpp
index 890eb09466a..7ae3e220f1c 100644
--- a/engines/ultima/nuvie/script/script_actor.cpp
+++ b/engines/ultima/nuvie/script/script_actor.cpp
@@ -122,8 +122,6 @@ extern int nscript_obj_new(lua_State *L, Obj *obj);
 extern int nscript_u6llist_iter(lua_State *L);
 extern int nscript_init_u6link_iter(lua_State *L, U6LList *list, bool is_recursive);
 
-bool nscript_new_actor_var(lua_State *L, uint16 actor_num);
-
 static int nscript_actor_new(lua_State *L);
 static int nscript_actor_clone(lua_State *L);
 static int nscript_get_actor_from_num(lua_State *L);
diff --git a/engines/ultima/ultima4/map/mapmgr.cpp b/engines/ultima/ultima4/map/mapmgr.cpp
index a3584e6d6ff..97e3345057a 100644
--- a/engines/ultima/ultima4/map/mapmgr.cpp
+++ b/engines/ultima/ultima4/map/mapmgr.cpp
@@ -43,8 +43,6 @@ namespace Ultima4 {
 
 MapMgr *MapMgr::_instance = nullptr;
 
-extern bool shrineCanEnter(const Portal *p);
-
 MapMgr *MapMgr::getInstance() {
 	if (_instance == nullptr)
 		_instance = new MapMgr();