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

[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:
be41405969 AVALANCHE: Fix Nim.


Commit: be41405969c6aa6a7472562eafda0092b9b97e52
    https://github.com/scummvm/scummvm/commit/be41405969c6aa6a7472562eafda0092b9b97e52
Author: urukgit (koppirnyo at gmail.com)
Date: 2013-11-22T09:39:51-08:00

Commit Message:
AVALANCHE: Fix Nim.

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



diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp
index e7a73b5..cc4681b 100644
--- a/engines/avalanche/nim.cpp
+++ b/engines/avalanche/nim.cpp
@@ -30,69 +30,71 @@
 
 namespace Avalanche {
 
-	Nim::Nim(AvalancheEngine *vm) {
-		_vm = vm;
-	}
-
-	void Nim::playNim() {
-		warning("STUB: Nim::playNim()");
-	}
-
-	void Nim::chalk(int x,int y, Common::String z) {
-		warning("STUB: Nim::chalk()");
-	}
-
-	void Nim::setup() {
-		warning("STUB: Nim::setup()");
-	}
-
-	void Nim::plotStone(byte x,byte y) {
-		warning("STUB: Nim::plotStone()");
-	}
-
-	void Nim::board() {
-		warning("STUB: Nim::board()");
-	}
-
-	void Nim::startMove() {
-		warning("STUB: Nim::startMove()");
-	}
-
-	void Nim::showChanges() {
-		warning("STUB: Nim::showChanges()");
-	}
-
-	void Nim::blip() {
-		warning("STUB: Nim::blip()");
-	}
-
-	void Nim::checkMouse() {
-		warning("STUB: Nim::checkMouse()");
-	}
-
-	void Nim::less() {
-		warning("STUB: Nim::less()");
-	}
-
-	void Nim::takeSome() {
-		warning("STUB: Nim::takeSome()");
-	}
-
-	void Nim::endOfGame() {
-		warning("STUB: Nim::endOfGame()");
-	}
-
-	void Nim::dogFood() {
-		warning("STUB: Nim::dogFood()");
-	}
-
-	bool Nim::find(byte x) {
-		warning("STUB: Nim::find()");
-		return true;
-	}
-
-	void Nim::findAp(byte start,byte stepsize) {
-		warning("STUB: Nim::findAp()");
-	}
+const char * const Nim::names[2] = {"Avalot", "Dogfood"};
+
+Nim::Nim(AvalancheEngine *vm) {
+	_vm = vm;
+}
+
+void Nim::playNim() {
+	warning("STUB: Nim::playNim()");
+}
+
+void Nim::chalk(int x,int y, Common::String z) {
+	warning("STUB: Nim::chalk()");
+}
+
+void Nim::setup() {
+	warning("STUB: Nim::setup()");
+}
+
+void Nim::plotStone(byte x,byte y) {
+	warning("STUB: Nim::plotStone()");
+}
+
+void Nim::board() {
+	warning("STUB: Nim::board()");
+}
+
+void Nim::startMove() {
+	warning("STUB: Nim::startMove()");
+}
+
+void Nim::showChanges() {
+	warning("STUB: Nim::showChanges()");
+}
+
+void Nim::blip() {
+	warning("STUB: Nim::blip()");
+}
+
+void Nim::checkMouse() {
+	warning("STUB: Nim::checkMouse()");
+}
+
+void Nim::less() {
+	warning("STUB: Nim::less()");
+}
+
+void Nim::takeSome() {
+	warning("STUB: Nim::takeSome()");
+}
+
+void Nim::endOfGame() {
+	warning("STUB: Nim::endOfGame()");
+}
+
+void Nim::dogFood() {
+	warning("STUB: Nim::dogFood()");
+}
+
+bool Nim::find(byte x) {
+	warning("STUB: Nim::find()");
+	return true;
+}
+
+void Nim::findAp(byte start,byte stepsize) {
+	warning("STUB: Nim::findAp()");
+}
 
 } // End of namespace Avalanche
diff --git a/engines/avalanche/nim.h b/engines/avalanche/nim.h
index 9d421c4..087f1e8 100644
--- a/engines/avalanche/nim.h
+++ b/engines/avalanche/nim.h
@@ -38,7 +38,7 @@ public:
 private:
 	AvalancheEngine *_vm;
 
-	const Common::String names[2] = {"Avalot", "Dogfood"};
+	static const char * const names[2];
 	byte old[3];
 	byte stones[3];
 	byte stonePic[4][23][7]; // Picture of Nimstone.