[Scummvm-cvs-logs] scummvm master -> 439817d42ee75c30a1de9a3817f38360fef5a40d

urukgit urukgit at users.noreply.github.com
Sat Dec 21 19:02:57 CET 2013


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:
439817d42e AVALANCHE: Rename graphic functions connected to Nim.


Commit: 439817d42ee75c30a1de9a3817f38360fef5a40d
    https://github.com/scummvm/scummvm/commit/439817d42ee75c30a1de9a3817f38360fef5a40d
Author: uruk (koppirnyo at gmail.com)
Date: 2013-12-21T10:02:29-08:00

Commit Message:
AVALANCHE: Rename graphic functions connected to Nim.

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



diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index a512e3a..f23ef2a 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -464,7 +464,7 @@ void GraphicManager::drawRectangle(Common::Rect rect, Color color) {
 	_surface.frameRect(rect, color);
 }
 
-void GraphicManager::loadNim() {
+void GraphicManager::nimLoad() {
 	Common::File file;
 	Common::String filename = "nim.avd";
 
@@ -481,16 +481,16 @@ void GraphicManager::loadNim() {
 	file.close();
 }
 
-void GraphicManager::drawNimStone(int x, int y) {
+void GraphicManager::nimDrawStone(int x, int y) {
 	drawPicture(_surface, _nimStone, x, y);
 }
 
-void GraphicManager::drawNimInitials() {
+void GraphicManager::nimDrawInitials() {
 	for (int i = 0; i < 3; i++)
 		drawPicture(_surface, _nimInitials[i], 0, 75 + i * 35);
 }
 
-void GraphicManager::drawNimLogo() {
+void GraphicManager::nimDrawLogo() {
 	drawPicture(_surface, _nimLogo, 392, 5);
 }
 
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index d541602..e230896 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -80,10 +80,10 @@ public:
 	// For the mini-game "Nim".
 	void drawFilledRectangle(Common::Rect rect, Color color);
 	void drawRectangle(Common::Rect rect, Color color);
-	void loadNim();
-	void drawNimStone(int x, int y);
-	void drawNimInitials();
-	void drawNimLogo();
+	void nimLoad();
+	void nimDrawStone(int x, int y);
+	void nimDrawInitials();
+	void nimDrawLogo();
 
 	void clearAlso();
 	void clearTextBar();
diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp
index 7b944c1..6b36ab8 100644
--- a/engines/avalanche/nim.cpp
+++ b/engines/avalanche/nim.cpp
@@ -150,7 +150,7 @@ void Nim::chalk(int x, int y, Common::String text) {
 
 void Nim::setup() {
 	_vm->fadeIn();
-	_vm->_graphics->loadNim();
+	_vm->_graphics->nimLoad();
 
 	_vm->_graphics->drawFilledRectangle(Common::Rect(0, 0, 640, 200), kColorBlack);
 	// Upper left rectangle.
@@ -160,8 +160,8 @@ void Nim::setup() {
 	_vm->_graphics->drawRectangle(Common::Rect(394, 50, 635, 198), kColorRed);
 	_vm->_graphics->drawFilledRectangle(Common::Rect(395, 51, 634, 197), kColorBrown);
 		
-	_vm->_graphics->drawNimLogo();
-	_vm->_graphics->drawNimInitials();
+	_vm->_graphics->nimDrawLogo();
+	_vm->_graphics->nimDrawInitials();
 
 	_vm->_graphics->drawNormalText("SCOREBOARD:", _vm->_font, 8, 475, 45, kColorWhite);
 	_vm->_graphics->drawNormalText("Turn:", _vm->_font, 8, 420, 55, kColorYellow);
@@ -194,7 +194,7 @@ void Nim::board() {
 	_vm->_graphics->drawFilledRectangle(Common::Rect(57, 72, 393, 200), kColorBlack);
 	for (int i = 0; i < 3; i++)
 		for (int j = 0; j < _stones[i]; j++)
-			_vm->_graphics->drawNimStone(64 + j * 8 * 8, 75 + i * 35);
+			_vm->_graphics->nimDrawStone(64 + j * 8 * 8, 75 + i * 35);
 			// It's practically the body of the Pascal function "plotstone()", reimplemented.
 			// It's the only place where we use it, so there's no reason to keep it separated as a function.
 	_vm->_graphics->refreshScreen();






More information about the Scummvm-git-logs mailing list