- Renamed GUI -> Gui and capitalized as appropriate (e.g. SciGUIwindowMgr -> SciGuiWindowMgr)

- Renamed "cell" -> "cel"

svn-id: r44649

1 files changed, 46 insertions, 46 deletions

diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h
index 3749de520e..228f62188e 100644
--- a/engines/sci/gui/gui_gfx.h
+++ b/engines/sci/gui/gui_gfx.h
@@ -34,45 +34,45 @@ namespace Sci {
 #define SCI_PATTERN_CODE_USE_TEXTURE 0x20
 #define SCI_PATTERN_CODE_PENSIZE 0x07
 
-class SciGUIscreen;
-class SciGUIfont;
-class SciGUIpicture;
-class SciGUIview;
-class SciGUIgfx {
+class SciGuiScreen;
+class SciGuiFont;
+class SciGuiPicture;
+class SciGuiView;
+class SciGuiGfx {
 public:
-	SciGUIgfx(OSystem *system, EngineState *state, SciGUIscreen *screen);
-	~SciGUIgfx();
+	SciGuiGfx(OSystem *system, EngineState *state, SciGuiScreen *screen);
+	~SciGuiGfx();
 
 	void init(void);
 	void initPalette();
 	void initTimer();
 	static void timerHandler(void*ref);
 
-	GUIPort *mallocPort ();
+	GuiPort *mallocPort ();
 	byte *GetSegment(byte seg);
 	void ResetScreen();
 	void SetEGApalette();
-	void CreatePaletteFromData(byte *paletteData, GUIPalette *paletteOut);
+	void CreatePaletteFromData(byte *paletteData, GuiPalette *paletteOut);
 	bool SetResPalette(int16 resourceNo, int16 flag);
-	void SetPalette(GUIPalette *sciPal, int16 flag);
-	void MergePalettes(GUIPalette* pFrom, GUIPalette* pTo, uint16 flag);
-	uint16 MatchColor(GUIPalette* pPal, byte r, byte g, byte b);
-	void SetCLUT(GUIPalette*pal);
-	void GetCLUT(GUIPalette*pal);
-
-	GUIPort *SetPort(GUIPort *port);
-	GUIPort *GetPort();
+	void SetPalette(GuiPalette *sciPal, int16 flag);
+	void MergePalettes(GuiPalette* pFrom, GuiPalette* pTo, uint16 flag);
+	uint16 MatchColor(GuiPalette* pPal, byte r, byte g, byte b);
+	void SetCLUT(GuiPalette*pal);
+	void GetCLUT(GuiPalette*pal);
+
+	GuiPort *SetPort(GuiPort *port);
+	GuiPort *GetPort();
 	void SetOrigin(int16 left, int16 top);
 	void MoveTo(int16 left, int16 top);
 	void Move(int16 left, int16 top);
-	void OpenPort(GUIPort *port);
+	void OpenPort(GuiPort *port);
 	void PenColor(int16 color);
 	void PenMode(int16 mode);
 	void TextFace(int16 textFace);
 	int16 GetPointSize(void);
-	GUIResourceId GetFontId();
-	SciGUIfont *GetFont();
-	void SetFont(GUIResourceId fontId);
+	GuiResourceId GetFontId();
+	SciGuiFont *GetFont();
+	void SetFont(GuiResourceId fontId);
 
 	void ClearScreen(byte color = 255);
 	void InvertRect(const Common::Rect &rect);
@@ -90,17 +90,17 @@ public:
 
 	void SetTextFonts(int argc, reg_t *argv);
 	void SetTextColors(int argc, reg_t *argv);
-	int16 TextSize(Common::Rect &rect, const char *str, GUIResourceId fontId, int16 maxwidth);
-	void ShowString(const char *str, GUIResourceId orgFontId, int16 orgPenColor) {
+	int16 TextSize(Common::Rect &rect, const char *str, GuiResourceId fontId, int16 maxwidth);
+	void ShowString(const char *str, GuiResourceId orgFontId, int16 orgPenColor) {
 		ShowText(str, 0, (int16)strlen(str), orgFontId, orgPenColor);
 	}
-	void DrawString(const char *str, GUIResourceId orgFontId, int16 orgPenColor) {
+	void DrawString(const char *str, GuiResourceId orgFontId, int16 orgPenColor) {
 		DrawText(str, 0, (int16)strlen(str), orgFontId, orgPenColor);
 	}
-	void TextBox(const char *str, int16 bshow, const Common::Rect &rect, int16 align, GUIResourceId fontId);
+	void TextBox(const char *str, int16 bshow, const Common::Rect &rect, int16 align, GuiResourceId fontId);
 	void ShowBits(const Common::Rect &r, uint16 flags);
-	GUIMemoryHandle SaveBits(const Common::Rect &rect, byte screenFlags);
-	void RestoreBits(GUIMemoryHandle memoryHandle);
+	GuiMemoryHandle SaveBits(const Common::Rect &rect, byte screenFlags);
+	void RestoreBits(GuiMemoryHandle memoryHandle);
 
 	void Draw_Line(int16 left, int16 top, int16 right, int16 bottom, byte color, byte prio, byte control);
 	void Draw_Horiz(int16 left, int16 right, int16 top, byte flag, byte color, byte prio, byte control);
@@ -112,10 +112,10 @@ public:
 	void Draw_Pattern(int16 x, int16 y, byte pic_color, byte pic_priority, byte pic_control, byte code, byte texture);
 	void Pic_Fill(int16 x, int16 y, byte color, byte prio, byte control);
 	
-	void drawPicture(GUIResourceId pictureId, uint16 style, bool addToFlag, GUIResourceId paletteId);
-	void drawCell(GUIResourceId viewId, GUIViewLoopNo loopNo, GUIViewCellNo cellNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo);
+	void drawPicture(GuiResourceId pictureId, uint16 style, bool addToFlag, GuiResourceId paletteId);
+	void drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, byte priority, uint16 paletteNo);
 
-	void PaletteSetIntensity(int fromColor, int toColor, int intensity, GUIPalette *destPalette);
+	void PaletteSetIntensity(int fromColor, int toColor, int intensity, GuiPalette *destPalette);
 	void PaletteAnimate(byte fromColor, byte toColor, int speed);
 
 	int16 onControl(uint16 screenMask, Common::Rect rect);
@@ -124,47 +124,47 @@ public:
 	void AnimateFill();
 	void AnimateSort();
 	void AnimateUpdate();
-	void AnimateDrawCells();
+	void AnimateDrawCels();
 	void AnimateRestoreAndDelete();
 	void SetNowSeen(reg_t objectReference);
 
-	GUIPort *_menuPort;
+	GuiPort *_menuPort;
 	uint32 _sysTicks;
 	int32 _sysSpeed; // ticker timer in ms 
-	GUIPalette _sysPalette;
+	GuiPalette _sysPalette;
 
 	bool _picNotValid;
 
 private:
-	int16 TextCodeProcessing(const char *&text, GUIResourceId orgFontId, int16 orgPenColor);
-	void TextWidth(const char*text, int16 from, int16 len, GUIResourceId orgFontId, int16 &textWidth, int16 &textHeight);
-	void StringWidth(const char*str, GUIResourceId orgFontId, int16 &textWidth, int16 &textHeight);
-	int16 GetLongest(const char *str, int16 maxwidth, GUIResourceId orgFontId);
-	void DrawText(const char *str, int16 from, int16 len, GUIResourceId orgFontId, int16 orgPenColor);
-	void ShowText(const char *str, int16 from, int16 len, GUIResourceId orgFontId, int16 orgPenColor);
+	int16 TextCodeProcessing(const char *&text, GuiResourceId orgFontId, int16 orgPenColor);
+	void TextWidth(const char*text, int16 from, int16 len, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight);
+	void StringWidth(const char*str, GuiResourceId orgFontId, int16 &textWidth, int16 &textHeight);
+	int16 GetLongest(const char *str, int16 maxwidth, GuiResourceId orgFontId);
+	void DrawText(const char *str, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor);
+	void ShowText(const char *str, int16 from, int16 len, GuiResourceId orgFontId, int16 orgPenColor);
 
 	OSystem *_system;
 	EngineState *_s;
-	SciGUIscreen *_screen;
+	SciGuiScreen *_screen;
 
 	Common::Rect _bounds;
-	GUIPort *_mainPort;
-	GUIPort *_curPort;
+	GuiPort *_mainPort;
+	GuiPort *_curPort;
 	uint16 _clrPowers[256];
 
 	byte bMapColors;
-	GUIPalette *pPicPal;
-	Common::Array<GUIPalSchedule> _palSchedules;
+	GuiPalette *pPicPal;
+	Common::Array<GuiPalSchedule> _palSchedules;
 
 	int _textFontsCount;
-	GUIResourceId *_textFonts;
+	GuiResourceId *_textFonts;
 	int _textColorsCount;
 	uint16 *_textColors;
 
 	// Animate* related variables
 	List *_lastCast;
 
-	SciGUIfont *_font;
+	SciGuiFont *_font;
 };
 
 } // End of namespace Sci