Changed some type names to match our coding guidelines.

svn-id: r44224

7 files changed, 34 insertions, 34 deletions

diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index d6aa32cc3b..a6efbc1820 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -134,7 +134,7 @@ void FWRenderer::clear() {
  * \param obj Object info
  * \param fillColor Sprite color
  */
-void FWRenderer::fillSprite(const objectStruct &obj, uint8 color) {
+void FWRenderer::fillSprite(const ObjectStruct &obj, uint8 color) {
 	const byte *data = animDataTable[obj.frame].data();
 	int x, y, width, height;
 
@@ -150,7 +150,7 @@ void FWRenderer::fillSprite(const objectStruct &obj, uint8 color) {
  * \param obj Object info
  * \param fillColor Sprite color
  */
-void FWRenderer::incrustMask(const objectStruct &obj, uint8 color) {
+void FWRenderer::incrustMask(const ObjectStruct &obj, uint8 color) {
 	const byte *data = animDataTable[obj.frame].data();
 	int x, y, width, height;
 
@@ -166,7 +166,7 @@ void FWRenderer::incrustMask(const objectStruct &obj, uint8 color) {
  * \param obj Object info
  * \param mask External mask
  */
-void FWRenderer::drawMaskedSprite(const objectStruct &obj, const byte *mask) {
+void FWRenderer::drawMaskedSprite(const ObjectStruct &obj, const byte *mask) {
 	const byte *data = animDataTable[obj.frame].data();
 	int x, y, width, height;
 
@@ -183,7 +183,7 @@ void FWRenderer::drawMaskedSprite(const objectStruct &obj, const byte *mask) {
 /*! \brief Draw color sprite
  * \param obj Object info
  */
-void FWRenderer::drawSprite(const objectStruct &obj) {
+void FWRenderer::drawSprite(const ObjectStruct &obj) {
 	const byte *mask = animDataTable[obj.frame].mask();
 	drawMaskedSprite(obj, mask);
 }
@@ -191,7 +191,7 @@ void FWRenderer::drawSprite(const objectStruct &obj) {
 /*! \brief Draw color sprite on background
  * \param obj Object info
  */
-void FWRenderer::incrustSprite(const objectStruct &obj) {
+void FWRenderer::incrustSprite(const ObjectStruct &obj) {
 	const byte *data = animDataTable[obj.frame].data();
 	const byte *mask = animDataTable[obj.frame].mask();
 	int x, y, width, height;
@@ -333,9 +333,9 @@ void FWRenderer::drawPlainBox(int x, int y, int width, int height, byte color) {
 	// Draw the filled rectangle
 	//
 	// Since the Amiga version uses a transparent boxes we need to decide whether:
-	//  - we draw a box, that should be the case then both width and height is greater than 1
-	//  - we draw a line, that should be the case then either width or height is 1
-	// When we draw a box and we're running an Amiga version we do use the special code to make
+	//  - we draw a box, that should be the case when both width and height is greater than 1
+	//  - we draw a line, that should be the case when either width or height is 1
+	// When we draw a box and we're running an Amiga version we do use special code to make
 	// the boxes transparent.
 	// When on the other hand we are drawing a line or are not running an Amiga version, we will
 	// always use the code, which simply fills the rect.
@@ -457,7 +457,7 @@ void FWRenderer::drawBackground() {
  */
 void FWRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 	int idx, len, width;
-	objectStruct *obj;
+	ObjectStruct *obj;
 	AnimData *sprite;
 	byte *mask;
 
@@ -937,7 +937,7 @@ void OSRenderer::clear() {
  * \param obj Object info
  * \param fillColor Sprite color
  */
-void OSRenderer::incrustMask(const objectStruct &obj, uint8 color) {
+void OSRenderer::incrustMask(const ObjectStruct &obj, uint8 color) {
 	const byte *data = animDataTable[obj.frame].data();
 	int x, y, width, height;
 
@@ -954,7 +954,7 @@ void OSRenderer::incrustMask(const objectStruct &obj, uint8 color) {
 /*! \brief Draw color sprite
  * \param obj Object info
  */
-void OSRenderer::drawSprite(const objectStruct &obj) {
+void OSRenderer::drawSprite(const ObjectStruct &obj) {
 	const byte *data = animDataTable[obj.frame].data();
 	int x, y, width, height, transColor;
 
@@ -970,7 +970,7 @@ void OSRenderer::drawSprite(const objectStruct &obj) {
 /*! \brief Draw color sprite
  * \param obj Object info
  */
-void OSRenderer::incrustSprite(const objectStruct &obj) {
+void OSRenderer::incrustSprite(const ObjectStruct &obj) {
 	const byte *data = animDataTable[obj.frame].data();
 	int x, y, width, height, transColor;
 
@@ -1036,7 +1036,7 @@ void OSRenderer::drawBackground() {
  */
 void OSRenderer::renderOverlay(const Common::List<overlay>::iterator &it) {
 	int len, idx, width, height;
-	objectStruct *obj;
+	ObjectStruct *obj;
 	AnimData *sprite;
 	byte *mask;
 	byte color;
diff --git a/engines/cine/gfx.h b/engines/cine/gfx.h
index f65bc31d1a..87fd92c639 100644
--- a/engines/cine/gfx.h
+++ b/engines/cine/gfx.h
@@ -85,9 +85,9 @@ protected:
 	int _changePal; ///< Load active palette to video backend on next frame
 	bool _showCollisionPage; ///< Should we show the collision page instead of the back buffer? Used for debugging.
 
-	void fillSprite(const objectStruct &obj, uint8 color = 0);
-	void drawMaskedSprite(const objectStruct &obj, const byte *mask);
-	virtual void drawSprite(const objectStruct &obj);
+	void fillSprite(const ObjectStruct &obj, uint8 color = 0);
+	void drawMaskedSprite(const ObjectStruct &obj, const byte *mask);
+	virtual void drawSprite(const ObjectStruct &obj);
 
 	void drawCommand();
 	void drawMessage(const char *str, int x, int y, int width, int color);
@@ -120,8 +120,8 @@ public:
 	void blit();
 	void setCommand(Common::String cmd);
 
-	virtual void incrustMask(const objectStruct &obj, uint8 color = 0);
-	virtual void incrustSprite(const objectStruct &obj);
+	virtual void incrustMask(const ObjectStruct &obj, uint8 color = 0);
+	virtual void incrustSprite(const ObjectStruct &obj);
 
 	virtual void loadBg16(const byte *bg, const char *name, unsigned int idx = 0);
 	virtual void loadCt16(const byte *ct, const char *name);
@@ -160,7 +160,7 @@ private:
 
 protected:
 
-	void drawSprite(const objectStruct &obj);
+	void drawSprite(const ObjectStruct &obj);
 	int drawChar(char character, int x, int y);
 	void drawBackground();
 	void renderOverlay(const Common::List<overlay>::iterator &it);
@@ -176,8 +176,8 @@ public:
 
 	void clear();
 
-	void incrustMask(const objectStruct &obj, uint8 color = 0);
-	void incrustSprite(const objectStruct &obj);
+	void incrustMask(const ObjectStruct &obj, uint8 color = 0);
+	void incrustSprite(const ObjectStruct &obj);
 
 	void loadBg16(const byte *bg, const char *name, unsigned int idx = 0);
 	void loadCt16(const byte *ct, const char *name);
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index 9781975f7c..42139a37c3 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -35,12 +35,12 @@
 
 namespace Cine {
 
-Common::Array<objectStruct> objectTable;
+Common::Array<ObjectStruct> objectTable;
 Common::List<overlay> overlayList;
 
 /*! \brief Resets all elements in the object table. */
 void resetObjectTable() {
-	for (Common::Array<objectStruct>::iterator it = objectTable.begin(); it != objectTable.end(); it++) {
+	for (Common::Array<ObjectStruct>::iterator it = objectTable.begin(); it != objectTable.end(); it++) {
 		it->clear();
 	}
 }
@@ -259,8 +259,8 @@ bool compareRanges(uint16 aStart, uint16 aEnd, uint16 bStart, uint16 bEnd) {
 
 uint16 compareObjectParamRanges(uint16 objIdx1, uint16 xAdd1, uint16 yAdd1, uint16 maskAdd1, uint16 objIdx2, uint16 xAdd2, uint16 yAdd2, uint16 maskAdd2) {
 	assert(objIdx1 < NUM_MAX_OBJECT && objIdx2 < NUM_MAX_OBJECT);
-	const objectStruct &obj1 = objectTable[objIdx1];
-	const objectStruct &obj2 = objectTable[objIdx2];
+	const ObjectStruct &obj1 = objectTable[objIdx1];
+	const ObjectStruct &obj2 = objectTable[objIdx2];
 
 	if (compareRanges(obj1.x,    obj1.x    + xAdd1,    obj2.x,    obj2.x    + xAdd2) &&
 		compareRanges(obj1.y,    obj1.y    + yAdd1,    obj2.y,    obj2.y    + yAdd2) &&
diff --git a/engines/cine/object.h b/engines/cine/object.h
index 3bf6cdcc42..e7c5144441 100644
--- a/engines/cine/object.h
+++ b/engines/cine/object.h
@@ -30,7 +30,7 @@
 
 namespace Cine {
 
-struct objectStruct {
+struct ObjectStruct {
 	int16 x;
 	int16 y;
 	uint16 mask;
@@ -63,7 +63,7 @@ struct overlay {
 #define NUM_MAX_OBJECT 255
 #define NUM_MAX_VAR 255
 
-extern Common::Array<objectStruct> objectTable;
+extern Common::Array<ObjectStruct> objectTable;
 extern Common::List<overlay> overlayList;
 
 void resetObjectTable();
diff --git a/engines/cine/script.h b/engines/cine/script.h
index 2d546b39a0..5b930e3f64 100644
--- a/engines/cine/script.h
+++ b/engines/cine/script.h
@@ -44,10 +44,10 @@ namespace Cine {
 
 class FWScript;
 
-typedef int (FWScript::*opFunc)();
+typedef int (FWScript::*OpFunc)();
 
 struct Opcode {
-	const opFunc proc;
+	const OpFunc proc;
 	const char *args;
 };
 
@@ -320,7 +320,7 @@ public:
  */
 class FWScriptInfo {
 protected:
-	virtual opFunc opcodeHandler(byte opcode) const;
+	virtual OpFunc opcodeHandler(byte opcode) const;
 
 public:
 	virtual ~FWScriptInfo() {}
@@ -338,7 +338,7 @@ public:
  */
 class OSScriptInfo : public FWScriptInfo {
 protected:
-	virtual opFunc opcodeHandler(byte opcode) const;
+	virtual OpFunc opcodeHandler(byte opcode) const;
 
 public:
 	virtual ~OSScriptInfo() {}
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index ff7952bef8..c9f7c3e2dd 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -672,7 +672,7 @@ int FWScript::execute() {
 	while (!ret) {
 		_line = _pos;
 		byte opcode = getNextByte();
-		opFunc handler = _info->opcodeHandler(opcode);
+		OpFunc handler = _info->opcodeHandler(opcode);
 
 		if (handler) {
 			ret = (this->*handler)();
@@ -713,7 +713,7 @@ const char *FWScriptInfo::opcodeInfo(byte opcode) const {
 /*! \brief Get opcode handler pointer
  * \param opcode Opcode to look for in opcode table
  */
-opFunc FWScriptInfo::opcodeHandler(byte opcode) const {
+OpFunc FWScriptInfo::opcodeHandler(byte opcode) const {
 	if (opcode == 0 || opcode > FWScript::_numOpcodes) {
 		return NULL;
 	}
diff --git a/engines/cine/script_os.cpp b/engines/cine/script_os.cpp
index 8e7511f387..293fabd669 100644
--- a/engines/cine/script_os.cpp
+++ b/engines/cine/script_os.cpp
@@ -308,7 +308,7 @@ const char *OSScriptInfo::opcodeInfo(byte opcode) const {
 /*! \brief Get opcode handler pointer
  * \param opcode Opcode to look for in opcode table
  */
-opFunc OSScriptInfo::opcodeHandler(byte opcode) const {
+OpFunc OSScriptInfo::opcodeHandler(byte opcode) const {
 	if (opcode == 0 || opcode > OSScript::_numOpcodes) {
 		return NULL;
 	}