[Scummvm-cvs-logs] scummvm master -> 616d9959f38c1facc2a0362173104dabe1ab1292

[urukgit]

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:
616d9959f3 AVALANCHE: Move/rename/implement SEU::titles().


Commit: 616d9959f38c1facc2a0362173104dabe1ab1292
    https://github.com/scummvm/scummvm/commit/616d9959f38c1facc2a0362173104dabe1ab1292
Author: uruk (koppirnyo at gmail.com)
Date: 2014-02-14T08:12:09-08:00

Commit Message:
AVALANCHE: Move/rename/implement SEU::titles().

Changed paths:
    engines/avalanche/graphics.cpp
    engines/avalanche/graphics.h
    engines/avalanche/shootemup.cpp
    engines/avalanche/shootemup.h



diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index e1d9223..a108737 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -698,6 +698,39 @@ void GraphicManager::helpDrawHighlight(byte which, Color color) {
 }
 
 /**
+ * @remarks	Originally called 'titles'
+ */
+void GraphicManager::seuDrawTitle() {
+	Common::File file;
+
+	if (!file.open("shoot1.avd"))
+		error("AVALANCHE: ShootEmUp: File not found: shoot1.avd");
+
+	const uint16 width = 320;
+	const uint16 height = 200;
+
+	Graphics::Surface picture = loadPictureRaw(file, width, height);
+
+	Graphics::Surface doubledPicture;
+	doubledPicture.create(width * 2, height, Graphics::PixelFormat::createFormatCLUT8());
+
+	// These cycles are for doubling the picture's width.
+	for (int x = (width * 2) - 2 ; x >= 0; x -= 2) {
+		for (int y = 0; y < height; y++) {
+			*(byte *)doubledPicture.getBasePtr(x, y) = *(byte *)doubledPicture.getBasePtr(x + 1, y) = *(byte *)picture.getBasePtr(x / 2, y);
+		}
+	}
+
+	drawPicture(_surface, doubledPicture, 0, 0);
+	refreshScreen();
+
+	picture.free();
+	doubledPicture.free();
+
+	file.close();
+}
+
+/**
  * This function mimics Pascal's getimage().
  */
 Graphics::Surface GraphicManager::loadPictureGraphic(Common::File &file) {
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index de7a07f..536a2c2 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -107,6 +107,9 @@ public:
 	void helpDrawButton(int y, byte which);
 	void helpDrawHighlight(byte which, Color color);
 
+	// Shoot em' up's functions:
+	void seuDrawTitle();
+
 	void clearAlso();
 	void clearTextBar();
 	void setAlsoLine(int x1, int y1, int x2, int y2, Color color);
diff --git a/engines/avalanche/shootemup.cpp b/engines/avalanche/shootemup.cpp
index 01c5a19..c9d089c 100644
--- a/engines/avalanche/shootemup.cpp
+++ b/engines/avalanche/shootemup.cpp
@@ -39,7 +39,7 @@ ShootEmUp::ShootEmUp(AvalancheEngine *vm) {
 }
 
 void ShootEmUp::run() {
-	titles();
+	_vm->_graphics->seuDrawTitle();
 	setup();
 	initRunner(20, 70, 48, 54, _vm->_rnd->getRandomNumber(4) + 1, _vm->_rnd->getRandomNumber(3) - 2);
 	initRunner(600, 70, 48, 54, _vm->_rnd->getRandomNumber(4) + 1, _vm->_rnd->getRandomNumber(3) - 2);
@@ -128,10 +128,6 @@ void ShootEmUp::initRunner(int16 xx, int16 yy, byte f1, byte f2, int8 ixx, int8
 	warning("STUB: ShootEmUp::initRunner()");
 }
 
-void ShootEmUp::titles() {
-	warning("STUB: ShootEmUp::titles()");
-}
-
 void ShootEmUp::moveAvvy() {
 	warning("STUB: ShootEmUp::moveAvvy()");
 }
diff --git a/engines/avalanche/shootemup.h b/engines/avalanche/shootemup.h
index 6a1f182..db1f113 100644
--- a/engines/avalanche/shootemup.h
+++ b/engines/avalanche/shootemup.h
@@ -58,7 +58,6 @@ private:
 	void instructions();
 	void setup();
 	void initRunner(int16 xx, int16 yy, byte f1, byte f2, int8 ixx, int8 iyy);
-	void titles();
 	void moveAvvy();
 	void readKbd();
 	void animate();