Reanme more minor struct to comply with our naiming standards.

svn-id: r18646

5 files changed, 19 insertions, 27 deletions

diff --git a/saga/ite_introproc.cpp b/saga/ite_introproc.cpp
index 8d497d3790..33fe3e1001 100644
--- a/saga/ite_introproc.cpp
+++ b/saga/ite_introproc.cpp
@@ -86,7 +86,7 @@ int Scene::ITEStartProc() {
 	return SUCCESS;
 }
 
-Event *Scene::ITEQueueDialogue(Event *q_event, int n_dialogues, const INTRO_DIALOGUE dialogue[]) {
+Event *Scene::ITEQueueDialogue(Event *q_event, int n_dialogues, const IntroDialogue dialogue[]) {
 	TextListEntry textEntry;
 	TextListEntry *entry;
 	Event event;
@@ -161,7 +161,7 @@ enum {
 // Queue a page of credits text. The original interpreter did word-wrapping
 // automatically. We currently don't.
 
-Event *Scene::ITEQueueCredits(int delta_time, int duration, int n_credits, const INTRO_CREDIT credits[]) {
+Event *Scene::ITEQueueCredits(int delta_time, int duration, int n_credits, const IntroCredit credits[]) {
 	int game;
 	Common::Language lang;
 
@@ -377,7 +377,7 @@ int Scene::ITEIntroCave1Proc(int param) {
 	Event *q_event;
 	int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
 
-	static const INTRO_DIALOGUE dialogue[][4] = {
+	static const IntroDialogue dialogue[][4] = {
 		{ { // English
 			RID_CAVE_VOICE_0,
 			"We see the sky, we see the land, we see the water, "
@@ -465,7 +465,7 @@ int Scene::ITEIntroCave2Proc(int param) {
 	Event *q_event;
 	int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
 
-	static const INTRO_DIALOGUE dialogue[][3] = {
+	static const IntroDialogue dialogue[][3] = {
 		{ { // English
 			RID_CAVE_VOICE_4,
 			"The humans also knew the Secret of Life, and they "
@@ -549,7 +549,7 @@ int Scene::ITEIntroCave3Proc(int param) {
 	Event *q_event;
 	int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
 
-	static const INTRO_DIALOGUE dialogue[][3] = {
+	static const IntroDialogue dialogue[][3] = {
 		{ { // English
 			RID_CAVE_VOICE_7,
 			"They taught us how to use our hands, and how to "
@@ -633,7 +633,7 @@ int Scene::ITEIntroCave4Proc(int param) {
 	Event *q_event;
 	int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
 
-	static const INTRO_DIALOGUE dialogue[][4] = {
+	static const IntroDialogue dialogue[][4] = {
 		{ { // English
 			RID_CAVE_VOICE_10,
 			"And now we see the sky, the land, and the water that "
@@ -725,7 +725,7 @@ int Scene::ITEIntroValleyProc(int param) {
 	Event event;
 	Event *q_event;
 
-	static const INTRO_CREDIT credits[] = {
+	static const IntroCredit credits[] = {
 		{EN_USA, kITEAny, kCHeader, "Producer"},
 		{DE_DEU, kITEAny, kCHeader, "Produzent"},
 		{UNK_LANG, kITEAny, kCText, "Walter Hochbrueckner"},
@@ -831,7 +831,7 @@ int Scene::ITEIntroTreeHouseProc(int param) {
 	Event event;
 	Event *q_event;
 
-	static const INTRO_CREDIT credits1[] = {
+	static const IntroCredit credits1[] = {
 		{EN_USA, kITEAny, kCHeader, "Game Design"},
 		{DE_DEU, kITEAny, kCHeader, "Spielentwurf"},
 		{UNK_LANG, kITEAny, kCText, "Talin, Joe Pearce, Robert McNally"},
@@ -845,7 +845,7 @@ int Scene::ITEIntroTreeHouseProc(int param) {
 
 	int n_credits1 = ARRAYSIZE(credits1);
 
-	static const INTRO_CREDIT credits2[] = {
+	static const IntroCredit credits2[] = {
 		{UNK_LANG, kITEWyrmKeep, kCHeader, "Art Direction"},
 		{UNK_LANG, kITEWyrmKeep, kCText, "Allison Hershey"},
 		{EN_USA, kITEAny, kCHeader, "Art"},
@@ -920,7 +920,7 @@ int Scene::ITEIntroFairePathProc(int param) {
 	Event event;
 	Event *q_event;
 
-	static const INTRO_CREDIT credits1[] = {
+	static const IntroCredit credits1[] = {
 		{EN_USA, kITEAny, kCHeader, "Programming"},
 		{DE_DEU, kITEAny, kCHeader, "Programmiert von"},
 		{UNK_LANG, kITEAny, kCText, "Talin, Walter Hochbrueckner,"},
@@ -937,7 +937,7 @@ int Scene::ITEIntroFairePathProc(int param) {
 
 	int n_credits1 = ARRAYSIZE(credits1);
 
-	static const INTRO_CREDIT credits2[] = {
+	static const IntroCredit credits2[] = {
 		{EN_USA, kITEAny, kCHeader, "Directed by"},
 		{DE_DEU, kITEAny, kCHeader, "Regie"},
 		{UNK_LANG, kITEAny, kCText, "Talin"}
diff --git a/saga/palanim.cpp b/saga/palanim.cpp
index a81a31ac0a..5aa941b7b3 100644
--- a/saga/palanim.cpp
+++ b/saga/palanim.cpp
@@ -64,13 +64,13 @@ int PalAnim::loadPalAnim(const byte *resdata, size_t resdata_len) {
 
 	debug(3, "PalAnim::loadPalAnim(): Loading %d PALANIM entries.", _entryCount);
 
-	test_p = calloc(_entryCount, sizeof(PALANIM_ENTRY));
+	test_p = calloc(_entryCount, sizeof(PalanimEntry));
 	if (test_p == NULL) {
 		warning("PalAnim::loadPalAnim(): Allocation failure");
 		return MEM;
 	}
 
-	_entries = (PALANIM_ENTRY *)test_p;
+	_entries = (PalanimEntry *)test_p;
 
 	for (i = 0; i < _entryCount; i++) {
 		int color_count;
diff --git a/saga/palanim.h b/saga/palanim.h
index b8e7779fcf..582d08406a 100644
--- a/saga/palanim.h
+++ b/saga/palanim.h
@@ -30,7 +30,7 @@ namespace Saga {
 
 #define PALANIM_CYCLETIME 100
 
-struct PALANIM_ENTRY {
+struct PalanimEntry {
 	uint16 pal_count;
 	uint16 color_count;
 	uint16 cycle;
@@ -38,9 +38,6 @@ struct PALANIM_ENTRY {
 	Color *colors;
 };
 
-struct PALANIM_DATA {
-};
-
 class PalAnim {
  public:
 	PalAnim(SagaEngine *vm);
@@ -56,7 +53,7 @@ class PalAnim {
 
 	bool _loaded;
 	uint16 _entryCount;
-	PALANIM_ENTRY *_entries;
+	PalanimEntry *_entries;
 };
 
 } // End of namespace Saga
diff --git a/saga/saga.h b/saga/saga.h
index 4ca8b22a0e..c7e7931b03 100644
--- a/saga/saga.h
+++ b/saga/saga.h
@@ -242,11 +242,6 @@ struct StringsTable {
 	}
 };
 
-struct CLICKAREA {
-	int n_points;
-	Point *points;
-};
-
 enum GameIds {
 	// Dreamers Guild
 	GID_ITE_DEMO_G = 0,
diff --git a/saga/scene.h b/saga/scene.h
index 0a92dfbd50..5a3c5a9a27 100644
--- a/saga/scene.h
+++ b/saga/scene.h
@@ -191,12 +191,12 @@ typedef Common::List<LoadSceneParams> SceneQueueList;
 
 #define CREDIT_DURATION1 4000
 
-struct INTRO_DIALOGUE {
+struct IntroDialogue {
 	uint32 i_voice_rn;
 	const char *i_str;
 };
 
-struct INTRO_CREDIT {
+struct IntroCredit {
 	Common::Language lang;
 	int game;
 	int type;
@@ -334,8 +334,8 @@ class Scene {
 	static int SC_ITEIntroFaireTentProc(int param, void *refCon);
 
  private:
-	Event *ITEQueueDialogue(Event *q_event, int n_dialogues, const INTRO_DIALOGUE dialogue[]);
-	Event *ITEQueueCredits(int delta_time, int duration, int n_credits, const INTRO_CREDIT credits[]);
+	Event *ITEQueueDialogue(Event *q_event, int n_dialogues, const IntroDialogue dialogue[]);
+	Event *ITEQueueCredits(int delta_time, int duration, int n_credits, const IntroCredit credits[]);
 	int ITEIntroAnimProc(int param);
 	int ITEIntroCave1Proc(int param);
 	int ITEIntroCave2Proc(int param);