AVALANCHE: Do renaming in Pingo.

4 files changed, 20 insertions, 26 deletions

diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 5ecd00925e..1f968db055 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -74,7 +74,8 @@ void Clock::update() { // TODO: Move variables from Gyro to here (or at least so
 		plotHands();
 
 	if ((_hour == 0) && (_oldHour != 0) && (_oldHour != 17717))
-		_vm->_scrolls->display(Common::String("Good morning!\n\nYes, it's just past midnight. Are you having an all-night Avvy session? Glad you like the game that much!"));
+		_vm->_scrolls->display(Common::String("Good morning!") + _vm->_scrolls->kControlNewLine + _vm->_scrolls->kControlNewLine
+		+ "Yes, it's just past midnight. Are you having an all-night Avvy session? Glad you like the game that much!");
 
 	_oldHour = _hour;
 	_oldHourAngle = _hourAngle;
@@ -110,7 +111,7 @@ void Clock::plotHands() {
 }
 
 void Clock::chime() {
-	warning("STUB: Lucerna::chime()");
+	warning("STUB: Clock::chime()");
 }
 
 Lucerna::Lucerna(AvalancheEngine *vm) : _fxHidden(false), _clock(vm) {
diff --git a/engines/avalanche/pingo2.cpp b/engines/avalanche/pingo2.cpp
index cc9592b623..c61b6bbabd 100644
--- a/engines/avalanche/pingo2.cpp
+++ b/engines/avalanche/pingo2.cpp
@@ -44,11 +44,11 @@ Pingo::Pingo(AvalancheEngine *vm) {
 	_vm = vm;
 }
 
-void Pingo::dplot(int16 x, int16 y, Common::String z) {
-	warning("STUB: Pingo::dplot()");
+void Pingo::dPlot(int16 x, int16 y, Common::String z) {
+	warning("STUB: Pingo::dPlot()");
 }
 
-void Pingo::bosskey() {
+void Pingo::bossKey() {
 #if 0
 const
 	months : array[0..11] of char = 'JFMAMJJASOND';
@@ -82,7 +82,7 @@ begin;
 	copy02;
 #endif
 
-	warning("STUB: Pingo::bosskey()");
+	warning("STUB: Pingo::bossKey()");
 }
 
 void Pingo::copy02() {   // taken from Wobble (below)
@@ -93,8 +93,8 @@ void Pingo::copy03() {   // taken from Wobble (below)
 	warning("STUB: Pingo::copy03()");
 }
 
-void Pingo::copypage(byte frp, byte top) { // taken from Copy02 (above)
-	warning("STUB: Pingo::copypage()");
+void Pingo::copyPage(byte frp, byte top) { // taken from Copy02 (above)
+	warning("STUB: Pingo::copyPage()");
 }
 
 void Pingo::wobble() {
@@ -109,7 +109,7 @@ void Pingo::zonk() {
 	warning("STUB: Pingo::zonk()");
 }
 
-void Pingo::winning_pic() {
+void Pingo::winningPic() {
 	Common::File f;
 	_vm->_lucerna->dusk();
 
@@ -128,12 +128,12 @@ void Pingo::winning_pic() {
 	}
 #endif
 
-	warning("STUB: Pingo::winning_pic()");
+	warning("STUB: Pingo::winningPic()");
 
 	f.close();
 
 	//setvisualpage(0);
-	warning("STUB: Pingo::winning_pic()");
+	warning("STUB: Pingo::winningPic()");
 
 	_vm->_lucerna->dawn();
 
@@ -146,7 +146,7 @@ void Pingo::winning_pic() {
 	major_redraw();
 #endif
 
-	warning("STUB: Pingo::winning_pic()");
+	warning("STUB: Pingo::winningPic()");
 }
 
 } // End of namespace Avalanche.
diff --git a/engines/avalanche/pingo2.h b/engines/avalanche/pingo2.h
index 1228ab2dbd..ee4fb587e7 100644
--- a/engines/avalanche/pingo2.h
+++ b/engines/avalanche/pingo2.h
@@ -40,25 +40,18 @@ class Pingo {
 public:
 	Pingo(AvalancheEngine *vm);
 
-	void bosskey();
-
+	void bossKey();
 	void copy02();
-
-	void copy03(); // Should always be replaced with _vm->_graph.refreshScreen(); - See Avalot::setup();
-
-	void copypage(byte frp, byte top);
-
+	void copy03();
+	void copyPage(byte frp, byte top);
 	void wobble();
-
 	void zonk();
-
-	void winning_pic();
+	void winningPic();
 
 private:
 	AvalancheEngine *_vm;
 
-	void dplot(int16 x, int16 y, Common::String z);
-
+	void dPlot(int16 x, int16 y, Common::String z);
 	void zl(int16 x1, int16 y1, int16 x2, int16 y2);
 };
 
diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp
index 2383d02fac..bc5a534eb7 100644
--- a/engines/avalanche/timeout2.cpp
+++ b/engines/avalanche/timeout2.cpp
@@ -621,14 +621,14 @@ void Timeout::arkata_shouts() {
 void Timeout::winning() {
 	_vm->_visa->dixi('q', 79);
 
-	_vm->_pingo->winning_pic();
+	_vm->_pingo->winningPic();
 	warning("STUB: Timeout::winning()");
 #if 0
 	do {
 		_vm->_lucerna->checkclick();
 	} while (!(_vm->_gyro->mrelease == 0));
 #endif
-	// TODO: To be implemented with Pingo::winning_pic().
+	// TODO: To be implemented with Pingo::winningPic().
 
 	_vm->_lucerna->callVerb(_vm->_acci->kVerbCodeScore);
 	_vm->_scrolls->display(" T H E    E N D ");