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

[lordhoto at users.sourceforge.net]

Revision: 40798
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40798&view=rev
Author:   lordhoto
Date:     2009-05-23 00:05:16 +0000 (Sat, 23 May 2009)

Log Message:
-----------
Reserve opcode array entries beforehand, should save some reallocation and copying.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_hof.cpp
    scummvm/trunk/engines/kyra/script_lok.cpp
    scummvm/trunk/engines/kyra/script_lol.cpp
    scummvm/trunk/engines/kyra/script_mr.cpp

Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp	2009-05-22 23:22:13 UTC (rev 40797)
+++ scummvm/trunk/engines/kyra/script_hof.cpp	2009-05-23 00:05:16 UTC (rev 40798)
@@ -1482,6 +1482,7 @@
 void KyraEngine_HoF::setupOpcodeTable() {
 	Common::Array<const Opcode*> *table = 0;
 
+	_opcodes.reserve(176);
 	SetOpcodeTable(_opcodes);
 	// 0x00
 	Opcode(o2_setCharacterFacingRefresh);
@@ -1705,6 +1706,7 @@
 	Opcode(o2_demoFinale);
 	Opcode(o2_dummy);
 
+	_opcodesAnimation.reserve(6);
 	SetOpcodeTable(_opcodesAnimation);
 
 	// 0x00
@@ -1718,6 +1720,7 @@
 
 	// ---- TIM opcodes
 
+	_timOpcodes.reserve(4);
 	// 0x00
 	OpcodeTim(t2_initChat);
 	OpcodeTim(t2_updateSceneAnim);

Modified: scummvm/trunk/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lok.cpp	2009-05-22 23:22:13 UTC (rev 40797)
+++ scummvm/trunk/engines/kyra/script_lok.cpp	2009-05-23 00:05:16 UTC (rev 40798)
@@ -1773,6 +1773,7 @@
 void KyraEngine_LoK::setupOpcodeTable() {
 	Common::Array<const Opcode *> *table = 0;
 
+	_opcodes.reserve(157);
 	SetOpcodeTable(_opcodes);
 	// 0x00
 	Opcode(o1_magicInMouseItem);

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-05-22 23:22:13 UTC (rev 40797)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-05-23 00:05:16 UTC (rev 40798)
@@ -2250,6 +2250,7 @@
 void LoLEngine::setupOpcodeTable() {
 	Common::Array<const Opcode*> *table = 0;
 
+	_opcodes.reserve(192);
 	SetOpcodeTable(_opcodes);
 	// 0x00
 	Opcode(olol_setWallType);
@@ -2540,6 +2541,8 @@
 	OpcodeUnImpl();
 
 	Common::Array<const TIMOpcode*> *timTable = 0;
+
+	_timIntroOpcodes.reserve(8);
 	SetTimOpcodeTable(_timIntroOpcodes);
 
 	// 0x00
@@ -2554,6 +2557,7 @@
 	OpcodeTimUnImpl();
 	OpcodeTimUnImpl();
 
+	_timIngameOpcodes.reserve(17);
 	SetTimOpcodeTable(_timIngameOpcodes);
 
 	// 0x00

Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp	2009-05-22 23:22:13 UTC (rev 40797)
+++ scummvm/trunk/engines/kyra/script_mr.cpp	2009-05-23 00:05:16 UTC (rev 40798)
@@ -1149,6 +1149,7 @@
 void KyraEngine_MR::setupOpcodeTable() {
 	Common::Array<const Opcode*> *table = 0;
 
+	_opcodes.reserve(176);
 	SetOpcodeTable(_opcodes);
 	// 0x00
 	Opcode(o3_getMalcolmShapes);
@@ -1371,18 +1372,20 @@
 	OpcodeUnImpl();
 	Opcode(o3_dummy);
 
+	_opcodesAnimation.reserve(8);
 	SetOpcodeTable(_opcodesAnimation);
 	// 0x00
 	Opcode(o2a_setAnimationShapes);
 	Opcode(o3a_setCharacterFrame);
 	Opcode(o3_playSoundEffect);
 	Opcode(o3_dummy);
-	// 0x0a
+	// 0x04
 	Opcode(o2a_setResetFrame);
 	Opcode(o1_getRand);
 	Opcode(o3_getMalcolmShapes);
 	Opcode(o3_dummy);
 
+	_opcodesDialog.reserve(5);
 	SetOpcodeTable(_opcodesDialog);
 	// 0x00
 	Opcode(o3d_updateAnim);


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