[Scummvm-cvs-logs] scummvm master -> 8e7ea5d461ef22e66a340e8c22497655f1a84f30
tramboi
bertrand_augereau at yahoo.fr
Fri Nov 18 15:01:35 CET 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
991370542b DREAMWEB: Fix (bad stride)
8e7ea5d461 DREAMWEB: 'worktoscreen' C++ flavour without dirtying the regs
Commit: 991370542b8276ac6a337c9efc0b6b66e890e6f5
https://github.com/scummvm/scummvm/commit/991370542b8276ac6a337c9efc0b6b66e890e6f5
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-18T05:57:01-08:00
Commit Message:
DREAMWEB: Fix (bad stride)
Changed paths:
engines/dreamweb/dreamweb.cpp
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index e686d22..84790d4 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -393,7 +393,7 @@ void DreamWebEngine::printUnderMonitor() {
++dst; ++src;
}
}
- dst += DreamGen::DreamGenContext::kScreenwidth;
+ dst += DreamGen::DreamGenContext::kScreenwidth - 170;
}
_system->unlockScreen();
}
Commit: 8e7ea5d461ef22e66a340e8c22497655f1a84f30
https://github.com/scummvm/scummvm/commit/8e7ea5d461ef22e66a340e8c22497655f1a84f30
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-18T05:58:23-08:00
Commit Message:
DREAMWEB: 'worktoscreen' C++ flavour without dirtying the regs
Changed paths:
engines/dreamweb/stubs.h
engines/dreamweb/vgagrafx.cpp
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 38c0932..892a24e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -46,6 +46,7 @@
void frameoutbh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
void frameoutfx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
void worktoscreen();
+ void workToScreenCPP();
void multiget();
void multiget(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
void convertkey();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 11ba45f..9871b5e 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -94,9 +94,13 @@ void DreamGenContext::multidump() {
cx = 0;
}
+void DreamGenContext::workToScreenCPP() {
+ engine->blit(workspace(), 320, 0, 0, 320, 200);
+}
+
void DreamGenContext::worktoscreen() {
+ workToScreenCPP();
uint size = 320 * 200;
- engine->blit(workspace(), 320, 0, 0, 320, 200);
di = si = size;
cx = 0;
}
More information about the Scummvm-git-logs
mailing list