From 3e7f66da896a740057f49b8526276794e064e954 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 6 May 2008 17:44:00 +0000
Subject: Cleanup.

svn-id: r31905
---
 engines/kyra/kyra_hof.cpp | 2 --
 engines/kyra/kyra_mr.cpp  | 4 ----
 engines/kyra/kyra_v2.cpp  | 3 +++
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index f400173cb0..c97bea4c93 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -318,11 +318,9 @@ void KyraEngine_HoF::startup() {
 
 	_screen->setShapePages(5, 3);
 
-	memset(&_mainCharacter, 0, sizeof(_mainCharacter));
 	_mainCharacter.height = 0x30;
 	_mainCharacter.facing = 4;
 	_mainCharacter.animFrame = 0x12;
-	memset(_mainCharacter.inventory, -1, sizeof(_mainCharacter.inventory));
 
 	memset(_sceneAnims, 0, sizeof(_sceneAnims));
 	for (int i = 0; i < ARRAYSIZE(_sceneAnimMovie); ++i)
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 9aa50637d0..c54a3278dd 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -71,13 +71,11 @@ KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngi
 	_gfxBackUpRect = 0;
 	_paletteOverlay = 0;
 	_sceneList = 0;
-	memset(&_mainCharacter, 0, sizeof(_mainCharacter));
 	_mainCharacter.sceneId = 9;
 	_mainCharacter.height = 0x4C;
 	_mainCharacter.facing = 5;
 	_mainCharacter.animFrame = 0x57;
 	_mainCharacter.walkspeed = 5;
-	memset(_mainCharacter.inventory, -1, sizeof(_mainCharacter.inventory));
 	_text = 0;
 	_commandLineY = 189;
 	_inventoryState = false;
@@ -539,8 +537,6 @@ void KyraEngine_MR::startup() {
 	debugC(9, kDebugLevelMain, "KyraEngine_MR::startup()");
 	musicUpdate(0);
 
-	memset(_flagsTable, 0, sizeof(_flagsTable));
-
 	_gamePlayBuffer = new uint8[64000];
 	musicUpdate(0);
 	musicUpdate(0);
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 422984490a..c3d5b430b9 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -66,6 +66,9 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const Engi
 
 	_debugger = 0;
 	_screenBuffer = 0;
+
+	memset(&_mainCharacter, 0, sizeof(_mainCharacter));
+	memset(&_mainCharacter.inventory, -1, sizeof(_mainCharacter.inventory));
 }
 
 KyraEngine_v2::~KyraEngine_v2() {
-- 
cgit v1.2.3