[Scummvm-cvs-logs] SF.net SVN: scummvm: [24540] scummvm/trunk/engines/scumm/insane/insane.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Oct 28 01:00:34 CEST 2006


Revision: 24540
          http://svn.sourceforge.net/scummvm/?rev=24540&view=rev
Author:   fingolfin
Date:     2006-10-27 16:00:28 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
const and static, static and const, const and static, static and const... now everybody repeat it with me... 8-)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/insane/insane.cpp

Modified: scummvm/trunk/engines/scumm/insane/insane.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.cpp	2006-10-27 22:58:48 UTC (rev 24539)
+++ scummvm/trunk/engines/scumm/insane/insane.cpp	2006-10-27 23:00:28 UTC (rev 24540)
@@ -934,7 +934,7 @@
 }
 
 int Insane::calcTilt(int speed) {
-	const int tilt[7] = {-5, -4, -2, 0, 2, 4, 5};
+	static const int tilt[7] = {-5, -4, -2, 0, 2, 4, 5};
 	if (speed + 3 > 6)
 		return 0;
 
@@ -944,7 +944,7 @@
 bool Insane::actor1StateFlags(int state) {
 	// This is compressed table. It contains indexes where state
 	// changes. I.e. 0-33: true, 34-38: false 39-72: true, etc.
-	const int spans[] = {0, 34, 39, 73, 89, 90, 92, 93, 99, 100, 117};
+	static const int spans[] = {0, 34, 39, 73, 89, 90, 92, 93, 99, 100, 117};
 	bool retvalue = 0;
 	unsigned int i;
 
@@ -1099,7 +1099,7 @@
 }
 
 bool Insane::actor0StateFlags1(int state) {
-	const int spans[] = {0, 2, 34, 35, 39, 69, 98, 100, 117};
+	static const int spans[] = {0, 2, 34, 35, 39, 69, 98, 100, 117};
 	bool retvalue = 1;
 	unsigned int i;
 
@@ -1112,7 +1112,7 @@
 }
 
 bool Insane::actor0StateFlags2(int state) {
-	const int spans[] = {0, 10, 14, 34, 39, 73, 75, 79, 81, 90, 93, 94,
+	static const int spans[] = {0, 10, 14, 34, 39, 73, 75, 79, 81, 90, 93, 94,
 		 98, 100, 117, 133, 136, 153, 158, 200, 202, 209, 212, 213, 217,
 		 219, 236, 256, 259, 272, 277, 311, 312, 315, 317, 328, 331, 332,
 		 336, 338, 355, 379, 382, 391, 396, 440, 441, 447, 450, 451, 455,


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