diff options
| author | Eugene Sandulenko | 2019-11-24 17:06:38 +0100 | 
|---|---|---|
| committer | Eugene Sandulenko | 2019-11-24 18:42:45 +0100 | 
| commit | 8ecb3207eddc938b872ce90b9daa4db518337ace (patch) | |
| tree | c974af2f20f95445757c78d1d41d1a00aa43d902 | |
| parent | 9ecc24979cb9991d527fc728118df21454cd2a44 (diff) | |
| download | scummvm-rg350-8ecb3207eddc938b872ce90b9daa4db518337ace.tar.gz scummvm-rg350-8ecb3207eddc938b872ce90b9daa4db518337ace.tar.bz2 scummvm-rg350-8ecb3207eddc938b872ce90b9daa4db518337ace.zip  | |
DIRECTOR: JANITORIAL: Fix whitespace
| -rw-r--r-- | engines/director/cachedmactext.cpp | 24 | ||||
| -rw-r--r-- | engines/director/cachedmactext.h | 9 | ||||
| -rw-r--r-- | engines/director/score.cpp | 2 | 
3 files changed, 18 insertions, 17 deletions
diff --git a/engines/director/cachedmactext.cpp b/engines/director/cachedmactext.cpp index 51ee910e59..fecd9e933e 100644 --- a/engines/director/cachedmactext.cpp +++ b/engines/director/cachedmactext.cpp @@ -39,21 +39,23 @@ void CachedMacText::makeMacText() {  		_align = (Graphics::TextAlign)((int)_textCast->textAlign + 1);  	_macText = new Graphics::MacText(_textCast->_ftext, -	                                 _wm, -	                                 _macFont, -	                                 0x00, -	                                 0xff, -	                                 _width, -	                                 _align, -	                                 1); +										_wm, +										_macFont, +										0x00, +										0xff, +										_width, +										_align, +										1);  	// TODO destroy me + +	debug(5, "CachedMacText::makeMacText(): rendering '%s'", _textCast->_ftext.c_str());  }  CachedMacText::CachedMacText(TextCast *const textCast, -                             int version, -                             int defaultWidth, -                             Graphics::MacWindowManager *const wm -                            ) +								int version, +								int defaultWidth, +								Graphics::MacWindowManager *const wm +								)  	:  	_surface(NULL), _macFont(NULL),  	_macText(NULL), _width(defaultWidth), _dirty(true), _textCast(textCast), diff --git a/engines/director/cachedmactext.h b/engines/director/cachedmactext.h index 87d632ba6c..8adf275f15 100644 --- a/engines/director/cachedmactext.h +++ b/engines/director/cachedmactext.h @@ -47,18 +47,17 @@ private:  	bool _dirty;  	Graphics::ManagedSurface *_surface;  	void makeMacText(); +  public:  	CachedMacText(TextCast *const textCast, -	              int version, -	              int defaultWidth = -1, -	              Graphics::MacWindowManager *const wm = NULL -	             ); +					int version, +					int defaultWidth = -1, +					Graphics::MacWindowManager *const wm = NULL);  	void setWm(Graphics::MacWindowManager *wm);  	void clip(int width);  	void forceDirty();  	const Graphics::ManagedSurface *getSurface();  	int getLineCount(); -  };  } // End of namespace Director diff --git a/engines/director/score.cpp b/engines/director/score.cpp index e593f87c44..231efae0b8 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -596,7 +596,7 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,  		size2 = stream.readUint32();  		size1 = stream.readUint32();  		if (castType == 1) { -			if (size3 == 0)  +			if (size3 == 0)  				return;  			for (uint32 skip = 0; skip < (size1 - 4) / 4; skip++)  				stream.readUint32();  | 
