From fa5909a9cc6faf820a26e1ea49a7db3e0c9836e0 Mon Sep 17 00:00:00 2001 From: lolbot-iichan Date: Wed, 8 Jan 2020 16:45:18 +0300 Subject: WINTERMUTE: Rename custo* variables as custom* --- engines/wintermute/base/base_frame.cpp | 8 ++++---- engines/wintermute/base/base_sub_frame.cpp | 8 ++++---- engines/wintermute/base/font/base_font_bitmap.cpp | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp index a821234ba0..6aa9785d84 100644 --- a/engines/wintermute/base/base_frame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -174,7 +174,7 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { int r = 255, g = 255, b = 255; int ar = 255, ag = 255, ab = 255, alpha = 255; int hotspotX = 0, hotspotY = 0; - bool custoTrans = false; + bool customTrans = false; bool editorSelected = false; bool is2DOnly = false; bool is3DOnly = false; @@ -196,7 +196,7 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { case TOKEN_TRANSPARENT: parser.scanStr(params, "%d,%d,%d", &r, &g, &b); - custoTrans = true; + customTrans = true; break; case TOKEN_RECT: @@ -310,7 +310,7 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { BaseSubFrame *sub = new BaseSubFrame(_gameRef); if (surface_file != nullptr) { - if (custoTrans) { + if (customTrans) { sub->setSurface(surface_file, false, r, g, b, lifeTime, keepLoaded); } else { sub->setSurface(surface_file, true, 0, 0, 0, lifeTime, keepLoaded); @@ -323,7 +323,7 @@ bool BaseFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { } sub->_alpha = BYTETORGBA(ar, ag, ab, alpha); - if (custoTrans) { + if (customTrans) { sub->_transparent = BYTETORGBA(r, g, b, 0xFF); } } diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 8ae6a736c7..039e481fe3 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -119,7 +119,7 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { Rect32 rect; int r = 255, g = 255, b = 255; int ar = 255, ag = 255, ab = 255, alpha = 255; - bool custoTrans = false; + bool customTrans = false; rect.setEmpty(); char *surfaceFile = nullptr; @@ -134,7 +134,7 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { case TOKEN_TRANSPARENT: parser.scanStr(params, "%d,%d,%d", &r, &g, &b); - custoTrans = true; + customTrans = true; break; case TOKEN_RECT: @@ -191,7 +191,7 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { } if (surfaceFile != nullptr) { - if (custoTrans) { + if (customTrans) { setSurface(surfaceFile, false, r, g, b, lifeTime, keepLoaded); } else { setSurface(surfaceFile, true, 0, 0, 0, lifeTime, keepLoaded); @@ -199,7 +199,7 @@ bool BaseSubFrame::loadBuffer(char *buffer, int lifeTime, bool keepLoaded) { } _alpha = BYTETORGBA(ar, ag, ab, alpha); - if (custoTrans) { + if (customTrans) { _transparent = BYTETORGBA(r, g, b, 0xFF); } diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 08917f21b6..0c3c0ae97d 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -360,10 +360,10 @@ bool BaseFontBitmap::loadBuffer(char *buffer) { int lastWidth = 0; int i; int r = 255, g = 255, b = 255; - bool custoTrans = false; + bool customTrans = false; #ifdef ENABLE_FOXTAIL int ar = 255, ag = 255, ab = 255; - bool custoAlpha = false; + bool customAlpha = false; #endif char *surfaceFile = nullptr; char *spriteFile = nullptr; @@ -385,13 +385,13 @@ bool BaseFontBitmap::loadBuffer(char *buffer) { case TOKEN_TRANSPARENT: parser.scanStr(params, "%d,%d,%d", &r, &g, &b); - custoTrans = true; + customTrans = true; break; #ifdef ENABLE_FOXTAIL case TOKEN_COLOR: parser.scanStr(params, "%d,%d,%d", &ar, &ag, &ab); - custoAlpha = true; + customAlpha = true; break; #endif @@ -467,13 +467,13 @@ bool BaseFontBitmap::loadBuffer(char *buffer) { if (surfaceFile != nullptr && !_sprite) { _subframe = new BaseSubFrame(_gameRef); - if (custoTrans) { + if (customTrans) { _subframe->setSurface(surfaceFile, false, r, g, b); } else { _subframe->setSurface(surfaceFile); } #ifdef ENABLE_FOXTAIL - if (custoAlpha) { + if (customAlpha) { _subframe->_alpha = BYTETORGBA(ar, ag, ab, 255); } #endif -- cgit v1.2.3