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

Strangerke Strangerke at scummvm.org
Sun Sep 11 22:33:25 CEST 2011


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:
e073fab211 CGE: Fix formatting of operator overloading


Commit: e073fab21131cae6bb0d9919b741ec0b440a948a
    https://github.com/scummvm/scummvm/commit/e073fab21131cae6bb0d9919b741ec0b440a948a
Author: Strangerke (strangerke at scummvm.org)
Date: 2011-09-11T13:24:40-07:00

Commit Message:
CGE: Fix formatting of operator overloading

Changed paths:
    engines/cge/bitmap.cpp
    engines/cge/bitmap.h
    engines/cge/sound.cpp



diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp
index cd440e0..3d2ca70 100644
--- a/engines/cge/bitmap.cpp
+++ b/engines/cge/bitmap.cpp
@@ -130,7 +130,7 @@ Bitmap::~Bitmap() {
 	delete[] _v;
 }
 
-Bitmap &Bitmap::operator = (const Bitmap &bmp) {
+Bitmap &Bitmap::operator=(const Bitmap &bmp) {
 	debugC(1, kCGEDebugBitmap, "&Bitmap::operator =");
 
 	uint8 *v0 = bmp._v;
diff --git a/engines/cge/bitmap.h b/engines/cge/bitmap.h
index 513438e..fbaeead 100644
--- a/engines/cge/bitmap.h
+++ b/engines/cge/bitmap.h
@@ -69,7 +69,7 @@ public:
 	static void init();
 	static void deinit();
 	Bitmap *code();
-	Bitmap &operator = (const Bitmap &bmp);
+	Bitmap &operator=(const Bitmap &bmp);
 	void hide(int16 x, int16 y);
 	void show(int16 x, int16 y);
 	void xShow(int16 x, int16 y);
diff --git a/engines/cge/sound.cpp b/engines/cge/sound.cpp
index e83a210..3052f79 100644
--- a/engines/cge/sound.cpp
+++ b/engines/cge/sound.cpp
@@ -166,7 +166,7 @@ DataCk *Fx::load(int idx, int ref) {
 	return wav;
 }
 
-DataCk *Fx::operator [](int ref) {
+DataCk *Fx::operator[](int ref) {
 	int i;
 	if ((i = find(ref)) < _size)
 		_current = _cache[i]._wav;






More information about the Scummvm-git-logs mailing list