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

[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:
cfef8111da DREAMWEB: 'calcfrframe' returns (width,height) in (cl,ch)


Commit: cfef8111da7f70bf676874dde8f529f673cbbc54
    https://github.com/scummvm/scummvm/commit/cfef8111da7f70bf676874dde8f529f673cbbc54
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-21T06:57:39-07:00

Commit Message:
DREAMWEB: 'calcfrframe' returns (width,height) in (cl,ch)

Changed paths:
    engines/dreamweb/backdrop.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index e1800ba..83e1b13 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -111,12 +111,21 @@ uint8 DreamGenContext::getmapad(const uint8 *setData) {
 }
 
 void DreamGenContext::calcfrframe() {
+	uint8 width, height;
+	calcfrframe(&width, &height);
+	cl = width;
+	ch = height;
+}
+
+void DreamGenContext::calcfrframe(uint8* width, uint8* height) {
 	const Frame *frame = (const Frame *)segRef(data.word(kFrsegment)).ptr(data.word(kCurrentframe) * sizeof(Frame), sizeof(Frame));
 	data.word(kSavesource) = data.word(kFramesad) + frame->ptr();
 	data.byte(kSavesize+0) = frame->width;
 	data.byte(kSavesize+1) = frame->height;
 	data.word(kOffsetx) = frame->x;
 	data.word(kOffsety) = frame->y;
+	*width = frame->width;
+	*height = frame->height;
 }
 
 void DreamGenContext::finalframe() {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 61a65a3..fd2a83e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -142,6 +142,7 @@
 	uint8 getxad(const uint8 *setData, uint8 *result);
 	uint8 getyad(const uint8 *setData, uint8 *result);
 	void calcfrframe();
+	void calcfrframe(uint8* width, uint8* height);
 	void finalframe();
 	void finalframe(uint16 *x, uint16 *y);
 	void showallobs();