[Scummvm-cvs-logs] scummvm master -> 4cb9a2c809d7b66a4065de68247153f1057c84be

bluegr md5 at scummvm.org
Tue Oct 11 01:11:44 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4cb9a2c809 SCI: kBitmap(1) is kDisposeTextBitmap


Commit: 4cb9a2c809d7b66a4065de68247153f1057c84be
    https://github.com/scummvm/scummvm/commit/4cb9a2c809d7b66a4065de68247153f1057c84be
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-10T16:03:40-07:00

Commit Message:
SCI: kBitmap(1) is kDisposeTextBitmap

Changed paths:
    engines/sci/engine/kgraphics.cpp



diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index b1314ef..be86cb5 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -1640,14 +1640,11 @@ reg_t kBitmap(EngineState *s, int argc, reg_t *argv) {
 		uint16 transparent = (argc >= 8) ? argv[7].toUint16() : 0;
 		warning("kBitmap(0): width %d, height %d, skip %d, back %d, width2 %d, height2 %d, transparent %d",
 				width, height, skip, back, width2, height2, transparent);
-		// returns a pointer to a bitmap
+		return NULL_REG;	// TODO: return a hunk handle for the new bitmap surface
 		}
 		break;
-	case 1:	// dispose bitmap surface
-		// 1 param, bitmap pointer, called e.g. from MenuItem::dispose
-		// in Torin's Passage, script 64893
-		warning("kBitmap(1), bitmap ptr %04x:%04x", PRINT_REG(argv[1]));
-		break;
+	case 1:	// dispose text bitmap surface
+		return kDisposeTextBitmap(s, argc - 1, argv + 1);
 	case 2:	// dispose bitmap surface, with extra param
 		// 2 params, called e.g. from MenuItem::dispose in Torin's Passage,
 		// script 64893






More information about the Scummvm-git-logs mailing list