From 5ea3b8f9cd7e183e947187ffa62348b70bf6048d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 25 Feb 2006 00:46:56 +0000
Subject: - avoid using typedef for structs (it is just not necessary in C++) -
 added a const/static here and there - started to reduce header dependencies

svn-id: r20856
---
 engines/cine/anim.cpp       |  2 --
 engines/cine/anim.h         |  4 ----
 engines/cine/cine.h         |  2 --
 engines/cine/font.cpp       |  7 +++++--
 engines/cine/font.h         |  4 ++--
 engines/cine/object.h       |  6 ++----
 engines/cine/pal.h          |  2 --
 engines/cine/part.h         |  8 ++++----
 engines/cine/prc.cpp        |  1 +
 engines/cine/prc.h          |  2 --
 engines/cine/script.h       |  4 ++--
 engines/cine/sfx_player.h   |  8 ++++----
 engines/cine/sound_driver.h |  4 ++--
 engines/cine/various.cpp    |  1 +
 engines/cine/various.h      | 10 ++--------
 15 files changed, 25 insertions(+), 40 deletions(-)

(limited to 'engines')

diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index 435c6edfa8..d36ac0737a 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -36,8 +36,6 @@ struct animHeader2Struct {
 	uint16 field_E;
 };
 
-typedef struct animHeader2Struct animHeader2Struct;
-
 uint16 frameVar0 = 0;
 
 animHeaderStruct animHeader;
diff --git a/engines/cine/anim.h b/engines/cine/anim.h
index 00e7e6764b..91cd560ee6 100644
--- a/engines/cine/anim.h
+++ b/engines/cine/anim.h
@@ -50,15 +50,11 @@ struct animHeaderStruct {
 	uint16 field_14;
 };
 
-typedef struct animHeaderStruct animHeaderStruct;
-
 struct animDataEntry {
 	char name[9];
 	uint8 param;
 };
 
-typedef struct animDataEntry animDataEntry;
-
 extern animDataEntry animData[];
 
 void loadResource(char *animName);
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 290a23acb2..fc4b66a073 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -35,7 +35,6 @@
 #include "base/engine.h"
 #include "base/gameDetector.h"
 
-#include "cine/font.h"
 #include "cine/various.h"
 #include "cine/flip_support.h"
 #include "cine/texte.h"
@@ -51,7 +50,6 @@
 #include "cine/pal.h"
 #include "cine/gfx.h"
 #include "cine/anim.h"
-#include "cine/auto00.h"
 #include "cine/unpack.h"
 #include "cine/bg_list.h"
 #include "cine/sfx_player.h"
diff --git a/engines/cine/font.cpp b/engines/cine/font.cpp
index 0cd96af135..69bac063a8 100644
--- a/engines/cine/font.cpp
+++ b/engines/cine/font.cpp
@@ -22,11 +22,14 @@
  *
  */
 
-#include "cine/cine.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
+#include "cine/font.h"
 
 namespace Cine {
 
-const characterEntry fontParamTable[256] = {
+const CharacterEntry fontParamTable[256] = {
 	{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
 	{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
 	{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
diff --git a/engines/cine/font.h b/engines/cine/font.h
index c86f552ccf..47284b3dac 100644
--- a/engines/cine/font.h
+++ b/engines/cine/font.h
@@ -27,12 +27,12 @@
 
 namespace Cine {
 
-struct characterEntry {
+struct CharacterEntry {
 	uint8 characterIdx;
 	uint8 characterWidth;
 };
 
-extern const characterEntry fontParamTable[256];
+extern const CharacterEntry fontParamTable[256];
 
 } // End of namespace Cine
 
diff --git a/engines/cine/object.h b/engines/cine/object.h
index f3373d0a97..c44db49767 100644
--- a/engines/cine/object.h
+++ b/engines/cine/object.h
@@ -27,7 +27,7 @@
 
 namespace Cine {
 
-typedef struct {
+struct objectStruct {
 	int16 x;
 	int16 y;
 	uint16 mask;
@@ -35,7 +35,7 @@ typedef struct {
 	int16 costume;
 	char name[20];
 	uint16 part;
-} objectStruct;
+};
 
 struct overlayHeadElement {
 	struct overlayHeadElement *next;
@@ -48,8 +48,6 @@ struct overlayHeadElement {
 	int16 var12;
 };
 
-typedef struct overlayHeadElement overlayHeadElement;
-
 #define NUM_MAX_OBJECT 255
 #define NUM_MAX_OBJECTDATA 255
 
diff --git a/engines/cine/pal.h b/engines/cine/pal.h
index 8893cac015..73a54afbfb 100644
--- a/engines/cine/pal.h
+++ b/engines/cine/pal.h
@@ -33,8 +33,6 @@ struct palEntryStruct {
 	uint8 pal2[16];
 };
 
-typedef struct palEntryStruct palEntryStruct;
-
 void loadPal(const char *fileName);
 
 extern uint16 tempPalette[256];
diff --git a/engines/cine/part.h b/engines/cine/part.h
index 0deb3655de..be3f2c4523 100644
--- a/engines/cine/part.h
+++ b/engines/cine/part.h
@@ -27,16 +27,16 @@
 
 namespace Cine {
 
-typedef struct {
+struct partBufferStruct{
 	char part_name[10];
 	uint32 varA;		/* unused */
 	uint32 offset;
 	uint32 packed_size;
 	uint32 unpacked_size;
 	uint32 var1A;		/* unused */
-} partBufferStruct;
+};
 
-typedef struct {
+struct animDataStruct {
 	uint16 width;
 	uint16 var1;
 	uint16 bpp;
@@ -47,7 +47,7 @@ typedef struct {
 	int16 fileIdx;
 	int16 frameIdx;
 	char name[10];
-} animDataStruct;
+};
 
 #define NUM_MAX_PARTDATA 255
 #define NUM_MAX_ANIMDATA 255
diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp
index 6ae7bebef1..fe0f9021df 100644
--- a/engines/cine/prc.cpp
+++ b/engines/cine/prc.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/auto00.h"
 
 namespace Cine {
 
diff --git a/engines/cine/prc.h b/engines/cine/prc.h
index f1e8b341d4..ebce0c5ac4 100644
--- a/engines/cine/prc.h
+++ b/engines/cine/prc.h
@@ -37,8 +37,6 @@ struct prcLinkedListStruct {
 	int16 scriptIdx;
 };
 
-typedef struct prcLinkedListStruct prcLinkedListStruct;
-
 extern prcLinkedListStruct globalScriptsHead;
 extern prcLinkedListStruct objScriptList;
 
diff --git a/engines/cine/script.h b/engines/cine/script.h
index 592a388a65..2fd598266f 100644
--- a/engines/cine/script.h
+++ b/engines/cine/script.h
@@ -29,11 +29,11 @@ namespace Cine {
 
 #define SCRIPT_STACK_SIZE 50
 
-typedef struct {
+struct scriptStruct {
 	byte *ptr;
 	uint16 var4;
 	int16 stack[SCRIPT_STACK_SIZE];
-} scriptStruct;
+};
 
 #define NUM_MAX_SCRIPT 50
 
diff --git a/engines/cine/sfx_player.h b/engines/cine/sfx_player.h
index eb48f2697d..fb66b95c5a 100644
--- a/engines/cine/sfx_player.h
+++ b/engines/cine/sfx_player.h
@@ -27,21 +27,21 @@
 
 namespace Cine {
 
-typedef struct {
+struct BasesonEntryStruct {
 	char name[14];
 	uint32 offset;
 	uint32 size;
 	uint32 unpackedSize;
-} BasesonEntryStruct;
+};
 
-typedef struct {
+struct sfxStateStruct {
 	uint8 *songData;
 	int currentInstrumentChannel[4];
 	uint8 *instruments[15];
 	int currentOrder;
 	int currentPos;
 	int numOrders;
-} sfxStateStruct;
+};
 
 extern uint16 snd_eventsDelay;
 extern int snd_songIsPlaying;
diff --git a/engines/cine/sound_driver.h b/engines/cine/sound_driver.h
index 250afa0d97..929801634a 100644
--- a/engines/cine/sound_driver.h
+++ b/engines/cine/sound_driver.h
@@ -46,12 +46,12 @@ namespace Cine {
 #define ADLIB_REG_FEEDBACK_STRENGTH_CONNECTION_TYPE 0xC0
 #define ADLIB_REG_WAVE_SELECT 0xE0
 
-typedef struct {
+struct sndDriverStruct {
 	void (*setupChannel) (int channelNum, const uint8 * data, int instrumentNum);
 	void (*setChannelFrequency) (int channelNum, int frequency);
 	void (*stopChannel) (int channelNum);
 	void (*playSound) (uint8 * data, int channelNum, int volume);
-} sndDriverStruct;
+};
 
 extern uint16 snd_fadeOutCounter, snd_songTicksCounter;
 extern uint8 *snd_adlibInstrumentsTable[4];
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index e4395ccd70..6dc24c396a 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cine/cine.h"
+#include "cine/font.h"
 
 namespace Cine {
 
diff --git a/engines/cine/various.h b/engines/cine/various.h
index 8065e662c7..4420a61d7e 100644
--- a/engines/cine/various.h
+++ b/engines/cine/various.h
@@ -38,10 +38,10 @@ int16 makeMenuChoice2(const commandeType commandList[], uint16 height, uint16 X,
 
 extern int16 allowSystemMenu;
 
-typedef struct {
+struct unk1Struct {
 	uint8 *ptr;
 	uint16 len;
-} unk1Struct;
+};
 
 #define NUM_MAX_MESSAGE 255
 
@@ -65,8 +65,6 @@ struct unkListElementStruct {
 	int16 var1E;
 };
 
-typedef struct unkListElementStruct unkListElementStruct;
-
 extern unkListElementStruct unkList;
 
 extern uint32 var6;
@@ -162,8 +160,6 @@ struct selectedObjStruct {
 	int16 param;
 };
 
-typedef struct selectedObjStruct selectedObjStruct;
-
 extern uint16 defaultMenuBoxColor;
 extern uint16 defaultMenuBoxColor2;
 
@@ -181,8 +177,6 @@ struct mouseStatusStruct {
 	int Y;
 };
 
-typedef struct mouseStatusStruct mouseStatusStruct;
-
 extern int16 additionalBgVScroll;
 
 void addUnkListElement(int16 param0, int16 param1, int16 param2, int16 param3, int16 param4, int16 param5, int16 param6, int16 param7, int16 param8);
-- 
cgit v1.2.3