[Scummvm-cvs-logs] SF.net SVN: scummvm:[44356] scummvm/trunk/engines/sci/engine

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Sep 25 15:01:35 CEST 2009


Revision: 44356
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44356&view=rev
Author:   fingolfin
Date:     2009-09-25 13:01:35 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
SCI: Pedantic cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmath.cpp
    scummvm/trunk/engines/sci/engine/kmisc.cpp

Modified: scummvm/trunk/engines/sci/engine/kmath.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmath.cpp	2009-09-25 12:58:56 UTC (rev 44355)
+++ scummvm/trunk/engines/sci/engine/kmath.cpp	2009-09-25 13:01:35 UTC (rev 44356)
@@ -113,14 +113,14 @@
 	int angle = argv[0].toSint16();
 	int factor = argv[1].toSint16();
 
-	return make_reg(0, (int)(factor * 1.0 * sin(angle * PI / 180.0)));
+	return make_reg(0, (int)(factor * sin(angle * PI / 180.0)));
 }
 
 reg_t kTimesCos(EngineState *s, int, int argc, reg_t *argv) {
 	int angle = argv[0].toSint16();
 	int factor = argv[1].toSint16();
 
-	return make_reg(0, (int)(factor * 1.0 * cos(angle * PI / 180.0)));
+	return make_reg(0, (int)(factor * cos(angle * PI / 180.0)));
 }
 
 reg_t kCosDiv(EngineState *s, int, int argc, reg_t *argv) {

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-09-25 12:58:56 UTC (rev 44355)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-09-25 13:01:35 UTC (rev 44356)
@@ -72,7 +72,7 @@
 };
 
 reg_t kMemoryInfo(EngineState *s, int, int argc, reg_t *argv) {
-	uint16 size = 0x7fff;  // Must not be 0xffff, or some memory calculations will overflow
+	const uint16 size = 0x7fff;  // Must not be 0xffff, or some memory calculations will overflow
 
 	switch (argv[0].offset) {
 	case K_MEMORYINFO_LARGEST_HEAP_BLOCK:
@@ -107,10 +107,10 @@
 }
 
 enum {
-	_K_NEW_GETTIME_TICKS = 0,
-	_K_NEW_GETTIME_TIME_12HOUR = 1,
-	_K_NEW_GETTIME_TIME_24HOUR = 2,
-	_K_NEW_GETTIME_DATE = 3
+	K_NEW_GETTIME_TICKS = 0,
+	K_NEW_GETTIME_TIME_12HOUR = 1,
+	K_NEW_GETTIME_TIME_24HOUR = 2,
+	K_NEW_GETTIME_DATE = 3
 };
 
 reg_t kGetTime(EngineState *s, int, int argc, reg_t *argv) {
@@ -130,19 +130,19 @@
 	int mode = (argc > 0) ? argv[0].toUint16() : 0;
 
 	switch (mode) {
-	case _K_NEW_GETTIME_TICKS :
+	case K_NEW_GETTIME_TICKS :
 		retval = start_time * 60 / 1000;
 		debugC(2, kDebugLevelTime, "GetTime(elapsed) returns %d", retval);
 		break;
-	case _K_NEW_GETTIME_TIME_12HOUR :
+	case K_NEW_GETTIME_TIME_12HOUR :
 		retval = ((loc_time.tm_hour % 12) << 12) | (loc_time.tm_min << 6) | (loc_time.tm_sec);
 		debugC(2, kDebugLevelTime, "GetTime(12h) returns %d", retval);
 		break;
-	case _K_NEW_GETTIME_TIME_24HOUR :
+	case K_NEW_GETTIME_TIME_24HOUR :
 		retval = (loc_time.tm_hour << 11) | (loc_time.tm_min << 5) | (loc_time.tm_sec >> 1);
 		debugC(2, kDebugLevelTime, "GetTime(24h) returns %d", retval);
 		break;
-	case _K_NEW_GETTIME_DATE :
+	case K_NEW_GETTIME_DATE :
 		retval = loc_time.tm_mday | ((loc_time.tm_mon + 1) << 5) | (((loc_time.tm_year + 1900) & 0x7f) << 9);
 		debugC(2, kDebugLevelTime, "GetTime(date) returns %d", retval);
 		break;


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