[Scummvm-cvs-logs] SF.net SVN: scummvm: [29520] scummvm/trunk/engines/parallaction/gui_ns.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat Nov 17 00:08:17 CET 2007


Revision: 29520
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29520&view=rev
Author:   lordhoto
Date:     2007-11-16 15:08:17 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
Added const to static data.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/gui_ns.cpp

Modified: scummvm/trunk/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_ns.cpp	2007-11-16 22:59:40 UTC (rev 29519)
+++ scummvm/trunk/engines/parallaction/gui_ns.cpp	2007-11-16 23:08:17 UTC (rev 29520)
@@ -88,13 +88,13 @@
 #define PASSWORD_LEN	6
 
 
-static uint16 _amigaKeys[][PASSWORD_LEN] = {
+static const uint16 _amigaKeys[][PASSWORD_LEN] = {
 	{ 1, 3 ,7, 2, 4, 6 },		// dough
 	{ 5, 3, 6, 2, 2, 7 },		// dino
 	{ 0, 3, 6, 2, 2, 6 }		// donna
 };
 
-static uint16 _pcKeys[][PASSWORD_LEN] = {
+static const uint16 _pcKeys[][PASSWORD_LEN] = {
 	{ 1, 7 ,7, 2, 2, 6 },		// dough
 	{ 5, 3, 6, 1, 4, 7 },		// dino
 	{ 0, 2, 8, 5, 5, 1 }		// donna
@@ -217,14 +217,14 @@
 	return SELECT_CHARACTER;
 }
 
-static Common::Rect _dosLanguageSelectBlocks[4] = {
+static const Common::Rect _dosLanguageSelectBlocks[4] = {
 	Common::Rect(  80, 110, 128, 180 ),	// Italian
 	Common::Rect( 129,  85, 177, 155 ),	// French
 	Common::Rect( 178,  60, 226, 130 ),	// English
 	Common::Rect( 227,  35, 275, 105 )	// German
 };
 
-static Common::Rect _amigaLanguageSelectBlocks[4] = {
+static const Common::Rect _amigaLanguageSelectBlocks[4] = {
 	Common::Rect(  -1,  -1,  -1,  -1 ),	// Italian: not supported by Amiga multi-lingual version
 	Common::Rect( 129,  85, 177, 155 ),	// French
 	Common::Rect( 178,  60, 226, 130 ),	// English
@@ -234,7 +234,7 @@
 
 uint16 Parallaction_ns::guiChooseLanguage() {
 
-	Common::Rect *blocks;
+	const Common::Rect *blocks;
 
 	if (getPlatform() == Common::kPlatformAmiga) {
 		if (!(getFeatures() & GF_LANG_MULT)) {
@@ -309,7 +309,7 @@
 	return _si ? LOAD_GAME : NEW_GAME;
 }
 
-static Common::Rect codeSelectBlocks[9] = {
+static const Common::Rect codeSelectBlocks[9] = {
 	Common::Rect( 111, 129, 127, 153 ),		// na
 	Common::Rect( 128, 120, 144, 144 ),		// wa
 	Common::Rect( 145, 111, 161, 135 ),		// ra
@@ -321,7 +321,7 @@
 	Common::Rect( 247, 57, 263, 81 )		// ka
 };
 
-static Common::Rect codeTrueBlocks[9] = {
+static const Common::Rect codeTrueBlocks[9] = {
 	Common::Rect( 112, 130, 128, 154 ),
 	Common::Rect( 129, 121, 145, 145 ),
 	Common::Rect( 146, 112, 162, 136 ),
@@ -377,7 +377,7 @@
 	showSlide("password");	// loads background into kBitBack buffer
 
 
-	uint16 (*keys)[PASSWORD_LEN] = (getPlatform() == Common::kPlatformAmiga && (getFeatures() & GF_LANG_MULT)) ? _amigaKeys : _pcKeys;
+	const uint16 (*keys)[PASSWORD_LEN] = (getPlatform() == Common::kPlatformAmiga && (getFeatures() & GF_LANG_MULT)) ? _amigaKeys : _pcKeys;
 	int character = -1;
 	uint16 _di = 0;
 


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