[Scummvm-cvs-logs] SF.net SVN: scummvm: [31905] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31905
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31905&view=rev
Author:   lordhoto
Date:     2008-05-06 10:44:00 -0700 (Tue, 06 May 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_hof.cpp
    scummvm/trunk/engines/kyra/kyra_mr.cpp
    scummvm/trunk/engines/kyra/kyra_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp	2008-05-06 17:30:52 UTC (rev 31904)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp	2008-05-06 17:44:00 UTC (rev 31905)
@@ -318,11 +318,9 @@
 
 	_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)

Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp	2008-05-06 17:30:52 UTC (rev 31904)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp	2008-05-06 17:44:00 UTC (rev 31905)
@@ -71,13 +71,11 @@
 	_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 @@
 	debugC(9, kDebugLevelMain, "KyraEngine_MR::startup()");
 	musicUpdate(0);
 
-	memset(_flagsTable, 0, sizeof(_flagsTable));
-
 	_gamePlayBuffer = new uint8[64000];
 	musicUpdate(0);
 	musicUpdate(0);

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-05-06 17:30:52 UTC (rev 31904)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-05-06 17:44:00 UTC (rev 31905)
@@ -66,6 +66,9 @@
 
 	_debugger = 0;
 	_screenBuffer = 0;
+
+	memset(&_mainCharacter, 0, sizeof(_mainCharacter));
+	memset(&_mainCharacter.inventory, -1, sizeof(_mainCharacter.inventory));
 }
 
 KyraEngine_v2::~KyraEngine_v2() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.