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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Mar 8 14:32:27 CET 2009


Revision: 39225
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39225&view=rev
Author:   lordhoto
Date:     2009-03-08 13:32:27 +0000 (Sun, 08 Mar 2009)

Log Message:
-----------
- Cleanup
- Add FIXME

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-03-08 13:28:22 UTC (rev 39224)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-03-08 13:32:27 UTC (rev 39225)
@@ -84,7 +84,7 @@
 	_itemsInPlay = 0;
 	_itemProperties = 0;
 	_itemInHand = 0;
-	memset(_inventory, 0, 48 * sizeof(uint16));
+	memset(_inventory, 0, sizeof(_inventory));
 	_inventoryCurItem = 0;
 	_hideControls = 0;
 	_lastCharInventory = -1;
@@ -118,7 +118,7 @@
 	_scriptDirection = 0;
 	_currentDirection = 0;
 	_currentBlock = 0;
-	memset(_currentBlockPropertyIndex, 0, 18 * sizeof(uint16));
+	memset(_currentBlockPropertyIndex, 0, sizeof(_currentBlockPropertyIndex));
 
 	_scrollSceneBuffer = 0;
 	_smoothScrollModeNormal = 1;
@@ -141,7 +141,7 @@
 	_scriptAssignedLevelShape = 0;
 	_blockDrawingBuffer = 0;
 	_sceneWindowBuffer = 0;
-	memset (_doorShapes, 0, 2 * sizeof(uint8*));
+	memset(_doorShapes, 0, sizeof(_doorShapes));
 
 	_lampOilStatus = _brightness = _lampStatusUnk = 0;
 	_lampStatusSuspended = false;
@@ -187,13 +187,13 @@
 
 	_floatingMouseArrowControl = 0;
 
-	memset(_activeTim, 0, 10 * sizeof(TIM*));
+	memset(_activeTim, 0, sizeof(TIM));
 	memset(_activeVoiceFile, 0, sizeof(_activeVoiceFile));
 	memset(_openDoorState, 0, sizeof(_openDoorState));
 
 	_pageBuffer1 = _pageBuffer2 = 0;
 
-	memset(_charStatsTemp, 0, 5 * sizeof(int));
+	memset(_charStatsTemp, 0, sizeof(_charStatsTemp));
 	
 	_unkBt1 = _unkBt2 = 0;
 	_dialogueField = false;
@@ -358,7 +358,8 @@
 	memset(_pageBuffer1, 0, 0xfa00);
 	_pageBuffer2 = new uint8[0xfa00];
 	memset(_pageBuffer2, 0, 0xfa00);
-
+ 
+	// FIXME: Why do we allocate a 401 entry array, if only 400 entries are used?
 	_itemsInPlay = new ItemInPlay[401];
 	memset(_itemsInPlay, 0, sizeof(ItemInPlay) * 400);
 


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




More information about the Scummvm-git-logs mailing list