[Scummvm-cvs-logs] scummvm master -> 1f89c4e34100d5628809efd56edb024306667331

[tramboi]

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:
1f89c4e341 DREAMWEB: Less direct references to kIcons1 and kIcons2


Commit: 1f89c4e34100d5628809efd56edb024306667331
    https://github.com/scummvm/scummvm/commit/1f89c4e34100d5628809efd56edb024306667331
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T08:11:42-08:00

Commit Message:
DREAMWEB: Less direct references to kIcons1 and kIcons2

Changed paths:
    engines/dreamweb/object.cpp
    engines/dreamweb/vgagrafx.cpp



diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4877937..4caeddf 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -104,10 +104,10 @@ void DreamGenContext::obIcons() {
 	getAnyAd(&value1, &value2);
 	if (value1 != 0xff) {
 		// can open it
-		showFrame((Frame *)getSegment(data.word(kIcons2)).ptr(0, 0), 210, 1, 4, 0);
+		showFrame(icons2(), 210, 1, 4, 0);
 	}
 
-	showFrame((Frame *)getSegment(data.word(kIcons2)).ptr(0, 0), 260, 1, 1, 0);
+	showFrame(icons2(), 260, 1, 1, 0);
 }
 
 void DreamGenContext::examineOb(bool examineAgain) {
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 1c297f1..a14c416 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -493,18 +493,16 @@ void DreamGenContext::loadPalFromIFF() {
 }
 
 void DreamGenContext::createPanel() {
-	Frame *icons = (Frame *)getSegment(data.word(kIcons2)).ptr(0, 0);
-	showFrame(icons, 0, 8, 0, 2);
-	showFrame(icons, 160, 8, 0, 2);
-	showFrame(icons, 0, 104, 0, 2);
-	showFrame(icons, 160, 104, 0, 2);
+	showFrame(icons2(), 0, 8, 0, 2);
+	showFrame(icons2(), 160, 8, 0, 2);
+	showFrame(icons2(), 0, 104, 0, 2);
+	showFrame(icons2(), 160, 104, 0, 2);
 }
 
 void DreamGenContext::createPanel2() {
 	createPanel();
-	Frame *icons = (Frame *)getSegment(data.word(kIcons2)).ptr(0, 0);
-	showFrame(icons, 0, 0, 5, 2);
-	showFrame(icons, 160, 0, 5, 2);
+	showFrame(icons2(), 0, 0, 5, 2);
+	showFrame(icons2(), 160, 0, 5, 2);
 }
 
 } /*namespace dreamgen */