[Scummvm-git-logs] scummvm master -> 1d3dc9cb13f5d4fc85a8517dcd6ad6dfbcd3d196

[Strangerke]

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:
1d3dc9cb13 KINGDOM: Small rework to silence a coverity warning


Commit: 1d3dc9cb13f5d4fc85a8517dcd6ad6dfbcd3d196
    https://github.com/scummvm/scummvm/commit/1d3dc9cb13f5d4fc85a8517dcd6ad6dfbcd3d196
Author: Strangerke (Strangerke at scummvm.org)
Date: 2020-06-10T13:22:59+01:00

Commit Message:
KINGDOM: Small rework to silence a coverity warning

Changed paths:
    engines/kingdom/kingdom.cpp
    engines/kingdom/logic.cpp
    engines/kingdom/logic.h


diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index ba02dea8cf..728d5212d6 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -162,7 +162,6 @@ Common::Error KingdomGame::run() {
 	_console = new Console(this);
 
 	_logic = new Logic(this);
-	_logic->initVariables();
 
 	setupPics();
 	initTools();
diff --git a/engines/kingdom/logic.cpp b/engines/kingdom/logic.cpp
index 636d4e686d..61d9c392df 100644
--- a/engines/kingdom/logic.cpp
+++ b/engines/kingdom/logic.cpp
@@ -26,6 +26,7 @@
 namespace Kingdom {
 
 Logic::Logic(KingdomGame* vm) : _vm(vm) {
+	initVariables();
 }
 
 void Logic::initVariables() {
diff --git a/engines/kingdom/logic.h b/engines/kingdom/logic.h
index 2e07605c44..35a15cab9d 100644
--- a/engines/kingdom/logic.h
+++ b/engines/kingdom/logic.h
@@ -23,8 +23,6 @@
 #ifndef KINGDOM_LOGIC_H
 #define KINGDOM_LOGIC_H
 
-#include "gui/debugger.h"
-
 namespace Kingdom {
 
 class KingdomGame;
@@ -282,6 +280,7 @@ public:
 	void increaseHealth();
 	void endCredits();
 	void gameHelp_Sub43C();
+	void initVariables();
 
 public:
 	explicit Logic(Kingdom::KingdomGame *vm);
@@ -290,7 +289,6 @@ public:
 	void gameHelp();
 	void inventoryDel(int item);
 	void inventoryAdd(int item);
-	void initVariables();
 	void executeOpcode();
 	void initPlay();
 	void switchAS();