[Scummvm-cvs-logs] scummvm master -> ec17a7ece693a3e5d301d16c34b1833c4ba26cf7

Strangerke Strangerke at scummvm.org
Fri Jun 6 07:21:07 CEST 2014


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:
ec17a7ece6 CRUISE: disable more efficiently some code


Commit: ec17a7ece693a3e5d301d16c34b1833c4ba26cf7
    https://github.com/scummvm/scummvm/commit/ec17a7ece693a3e5d301d16c34b1833c4ba26cf7
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-06-06T07:19:56+02:00

Commit Message:
CRUISE: disable more efficiently some code

Changed paths:
    engines/cruise/saveload.cpp



diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp
index 0f49646..a9fc622 100644
--- a/engines/cruise/saveload.cpp
+++ b/engines/cruise/saveload.cpp
@@ -915,17 +915,14 @@ Common::Error loadSavegameData(int saveGameIdx) {
 
 	while (currentcellHead) {
 		if (currentcellHead->type == 5) {
-			uint8 *ptr = mainProc14(currentcellHead->overlay, currentcellHead->idx);
-
 			ASSERT(0);
-
-			if (ptr) {
-				ASSERT(0);
-				//*(int16 *)(currentcellHead->datas+0x2E) = getSprite(ptr,*(int16 *)(currentcellHead->datas+0xE));
-			} else {
-				ASSERT(0);
-				//*(int16 *)(currentcellHead->datas+0x2E) = 0;
-			}
+#if 0
+			uint8 *ptr = mainProc14(currentcellHead->overlay, currentcellHead->idx);
+			if (ptr)
+				*(int16 *)(currentcellHead->datas+0x2E) = getSprite(ptr,*(int16 *)(currentcellHead->datas+0xE));
+			else
+				*(int16 *)(currentcellHead->datas+0x2E) = 0;
+#endif
 		}
 
 		currentcellHead = currentcellHead->next;






More information about the Scummvm-git-logs mailing list