renamed kTransactionPixelFormatNotSupported to kTransactionFormatNotSupported, retyped all Graphics::PixelFormat * parameters to const Graphics::PixelFormat *, (hopefully) repaired all memory leaks on screen and cursor format changes, provided OSystem::getScreenFormat and OSystem::getSupportedFormats methods for when ENABLE_RGB_COLOR is not set, completely forgot the "commit early, commit often" mantra.

svn-id: r41972

2 files changed, 3 insertions, 3 deletions

diff --git a/engines/engine.cpp b/engines/engine.cpp
index 198bfceaed..8769219c2b 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -124,7 +124,7 @@ void initCommonGFX(bool defaultTo1XScaler) {
 	if (gameDomain && gameDomain->contains("fullscreen"))
 		g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
 }
-void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::PixelFormat *format) {
+void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics::PixelFormat *format) {
 
 	g_system->beginGFXTransaction();
 
@@ -155,7 +155,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::Pixel
 
 	// Just show warnings then these occur:
 #ifdef ENABLE_RGB_COLOR
-	if (gfxError & OSystem::kTransactionPixelFormatNotSupported) {
+	if (gfxError & OSystem::kTransactionFormatNotSupported) {
 		Common::String message = "Could not initialize color format.";
 
 		GUI::MessageDialog dialog(message);
diff --git a/engines/engine.h b/engines/engine.h
index 67454629e7..d59e8ed9bd 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -60,7 +60,7 @@ void initCommonGFX(bool defaultTo1XScaler);
  * Errors out when backend is not able to switch to the specified
  * mode.
  */
-void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::PixelFormat *format = NULL);
+void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics::PixelFormat *format = NULL);
 
 /**
  * Initializes graphics and shows error message.