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

urukgit urukgit at users.noreply.github.com
Wed Mar 5 18:28:51 CET 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:
ce72606616 AVALANCHE: Implement MainMenu::centre().


Commit: ce72606616b7b57c7ba5e1e471e9370e2af747aa
    https://github.com/scummvm/scummvm/commit/ce72606616b7b57c7ba5e1e471e9370e2af747aa
Author: uruk (koppirnyo at gmail.com)
Date: 2014-03-05T09:28:15-08:00

Commit Message:
AVALANCHE: Implement MainMenu::centre().

Also rework connected functions.

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



diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index e1dd8e9..553556f 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -863,8 +863,8 @@ void GraphicManager::menuLoadPictures() {
 	file.close();
 }
 
-void GraphicManager::menuDrawBigText(FontType font, uint16 x, uint16 y, Common::String text, bool notted) {
-	drawBigText(_menu, text, font, 14, x, y, kColorBlack);
+void GraphicManager::menuDrawBigText(FontType font, uint16 x, uint16 y, Common::String text, Color color) {
+	drawBigText(_menu, text, font, 14, x, y, color);
 }
 
 /**
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index 3e8224b..270e04d 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -124,7 +124,7 @@ public:
 	void menuInitialize();
 	void menuClear();
 	void menuLoadPictures();
-	void menuDrawBigText(FontType font, uint16 x, uint16 y, Common::String text, bool notted);
+	void menuDrawBigText(FontType font, uint16 x, uint16 y, Common::String text, Color color);
 
 	void clearAlso();
 	void clearTextBar();
diff --git a/engines/avalanche/mainmenu.cpp b/engines/avalanche/mainmenu.cpp
index 058e1cf..0f64527 100644
--- a/engines/avalanche/mainmenu.cpp
+++ b/engines/avalanche/mainmenu.cpp
@@ -48,8 +48,8 @@ void MainMenu::run() {
 	option(4, "View the documentation.");
 	option(5, "Registration info.");
 	option(6, "Exit back to DOS.");
-	centre(275, _registrant);
-	centre(303, "Make your choice, or wait for the demo.");
+	centre(274, _registrant);
+	centre(301, "Make your choice, or wait for the demo.");
 
 	_vm->_graphics->menuRefreshScreen();
 
@@ -67,16 +67,17 @@ void MainMenu::loadFont() {
 }
 
 void MainMenu::loadRegiInfo() {
+	_registrant = "(Unregistered evaluation copy.)";
 	warning("STUB: MainMenu::loadRegiInfo()");
 }
 
 void MainMenu::option(byte which, Common::String what) {
-	_vm->_graphics->menuDrawBigText(_font, 127, 39 + which * 33, Common::String(which + 48) + ')', true);
-	_vm->_graphics->menuDrawBigText(_font, 191, 39 + which * 33, what, true);
+	_vm->_graphics->menuDrawBigText(_font, 127, 39 + which * 33, Common::String(which + 48) + ')', kColorBlack);
+	_vm->_graphics->menuDrawBigText(_font, 191, 39 + which * 33, what, kColorBlack);
 }
 
 void MainMenu::centre(int16 y, Common::String text) {
-	warning("STUB: MainMenu::centre()");
+	_vm->_graphics->menuDrawBigText(_font, 320 - text.size() * 8, y, text, kColorLightgray);
 }
 
 void MainMenu::wait() {






More information about the Scummvm-git-logs mailing list