From cd20f09a9d8085d1082313fd1d58c87deeb30333 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 31 Jul 2007 18:08:40 +0000
Subject: Cleanup: removed dead code, fixed some comments and did some layout
 changes

svn-id: r28362
---
 engines/saga/actor.h            |  5 -----
 engines/saga/animation.cpp      | 13 ++-----------
 engines/saga/animation.h        |  2 +-
 engines/saga/detection_tables.h |  2 ++
 engines/saga/displayinfo.h      |  2 ++
 engines/saga/font.cpp           |  1 +
 engines/saga/gfx.cpp            |  5 +----
 engines/saga/image.cpp          |  1 +
 engines/saga/isomap.cpp         |  2 ++
 engines/saga/ite_introproc.cpp  |  1 -
 engines/saga/list.h             |  2 ++
 engines/saga/music.cpp          |  3 +++
 engines/saga/objectmap.cpp      |  1 +
 engines/saga/puzzle.h           |  2 ++
 engines/saga/render.cpp         |  1 +
 engines/saga/rscfile.cpp        |  1 +
 engines/saga/saga.h             |  2 +-
 engines/saga/saveload.cpp       |  8 --------
 engines/saga/sndres.cpp         |  2 +-
 engines/saga/sprite.cpp         |  1 +
 20 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/engines/saga/actor.h b/engines/saga/actor.h
index 1d9675b4cf..ef62661c6c 100644
--- a/engines/saga/actor.h
+++ b/engines/saga/actor.h
@@ -614,11 +614,6 @@ public:
 
 	void showActors(bool flag) { _showActors = flag; }
 
-	/*
-	uint16 _currentFrameIndex;
-	void frameTest() {
-		_currentFrameIndex++; 
-	}*/
 protected:
 	friend class Script;
 	bool loadActorResources(ActorData *actor);
diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp
index a8fa7005d8..7b3bdcd665 100644
--- a/engines/saga/animation.cpp
+++ b/engines/saga/animation.cpp
@@ -24,6 +24,7 @@
  */
 
 // Background animation management module
+
 #include "saga/saga.h"
 #include "saga/gfx.h"
 
@@ -386,16 +387,6 @@ void Anim::load(uint16 animId, const byte *animResourceData, size_t animResource
 
 	fillFrameOffsets(anim);
 
-	/*	char s[200];
-		sprintf(s, "d:\\anim%i",animId);
-		long flen=anim->resourceLength;
-		char *buf=(char*)anim->resourceData;
-		FILE*f;
-		f=fopen(s,"wb");
-		for (long i = 0; i < flen; i++)
-			fputc(buf[i],f);
-		fclose(f);*/
-
 	// Set animation data
 	anim->currentFrame = 0;
 	anim->completed = 0;
@@ -661,7 +652,7 @@ void Anim::decodeFrame(AnimationData *anim, size_t frameOffset, byte *buf, size_
 				yStart = readS.readUint16BE();
 			else
 				yStart = readS.readByte();
-			readS.readByte();		/* Skip pad byte */
+			readS.readByte();		// Skip pad byte
 			/*xPos = */readS.readUint16BE();
 			/*yPos = */readS.readUint16BE();
 			/*width = */readS.readUint16BE();
diff --git a/engines/saga/animation.h b/engines/saga/animation.h
index 2af57fb60f..f8cf90425f 100644
--- a/engines/saga/animation.h
+++ b/engines/saga/animation.h
@@ -209,4 +209,4 @@ private:
 
 } // End of namespace Saga
 
-#endif				/* ANIMATION_H_ */
+#endif				// ANIMATION_H_
diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h
index 22e5ccdc50..832d7b34d4 100644
--- a/engines/saga/detection_tables.h
+++ b/engines/saga/detection_tables.h
@@ -23,6 +23,8 @@
  *
  */
 
+// Game detection information and MD5s
+
 namespace Saga {
 
 static const GameResourceDescription ITE_Resources = {
diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h
index 3e1845abba..0d7bfaf554 100644
--- a/engines/saga/displayinfo.h
+++ b/engines/saga/displayinfo.h
@@ -23,6 +23,8 @@
  *
  */
 
+// Interface widget display information
+
 #ifndef SAGA_DISPLAYINFO_H
 #define SAGA_DISPLAYINFO_H
 
diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp
index caf41ab43e..c38c9e2110 100644
--- a/engines/saga/font.cpp
+++ b/engines/saga/font.cpp
@@ -24,6 +24,7 @@
  */
 
 // Font management and font drawing module
+
 #include "saga/saga.h"
 #include "saga/gfx.h"
 #include "saga/rscfile.h"
diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp
index 8d36ee0e12..56ffe04c96 100644
--- a/engines/saga/gfx.cpp
+++ b/engines/saga/gfx.cpp
@@ -130,10 +130,7 @@ void Surface::drawPolyLine(const Point *points, int count, int color) {
 	}
 }
 
-/**
-* Dissolve one image with another.
-* If flags if set to 1, do zero masking.
-*/
+// Dissolve one image with another. If flags is set to 1, do zero masking.
 void Surface::transitionDissolve(const byte *sourceBuffer, const Common::Rect &sourceRect, int flags, double percent) {
 #define XOR_MASK 0xB400;
 	int pixelcount = w * h;
diff --git a/engines/saga/image.cpp b/engines/saga/image.cpp
index f76258c565..9f72036634 100644
--- a/engines/saga/image.cpp
+++ b/engines/saga/image.cpp
@@ -24,6 +24,7 @@
  */
 
 // SAGA Image resource management routines
+
 #include "saga/saga.h"
 
 #include "saga/stream.h"
diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp
index 124242204b..4f635c6e3b 100644
--- a/engines/saga/isomap.cpp
+++ b/engines/saga/isomap.cpp
@@ -24,6 +24,7 @@
  */
 
 // Isometric level module
+
 #include "saga/saga.h"
 
 #include "saga/gfx.h"
@@ -1609,6 +1610,7 @@ void IsoMap::findTilePath(ActorData* actor, const Location &start, const Locatio
 /*	if (i > 64) {
 		i = 64;
 	}*/
+
 	actor->_walkStepsCount = i;
 	if (i) {
 		actor->setTileDirectionsSize(i, false);
diff --git a/engines/saga/ite_introproc.cpp b/engines/saga/ite_introproc.cpp
index ec4d07c069..1664969644 100644
--- a/engines/saga/ite_introproc.cpp
+++ b/engines/saga/ite_introproc.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-
 // Intro sequence scene procedures
 
 #include "saga/saga.h"
diff --git a/engines/saga/list.h b/engines/saga/list.h
index 28159475c3..1363155f43 100644
--- a/engines/saga/list.h
+++ b/engines/saga/list.h
@@ -23,6 +23,8 @@
  *
  */
 
+// List functions
+
 #ifndef SAGA_LIST_H
 #define SAGA_LIST_H
 
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 710485fc05..04e79c174d 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -22,6 +22,9 @@
  * $Id$
  *
  */
+
+// MIDI and digital music class
+
 #include "saga/saga.h"
 
 #include "saga/rscfile.h"
diff --git a/engines/saga/objectmap.cpp b/engines/saga/objectmap.cpp
index 52f2e89be7..9e633a6709 100644
--- a/engines/saga/objectmap.cpp
+++ b/engines/saga/objectmap.cpp
@@ -28,6 +28,7 @@
 // Polygon Hit Test code ( HitTestPoly() ) adapted from code (C) Eric Haines
 // appearing in Graphics Gems IV, "Point in Polygon Strategies."
 // p. 24-46, code: p. 34-45
+
 #include "saga/saga.h"
 
 #include "saga/gfx.h"
diff --git a/engines/saga/puzzle.h b/engines/saga/puzzle.h
index 92bf73e2a0..3713cbaab7 100644
--- a/engines/saga/puzzle.h
+++ b/engines/saga/puzzle.h
@@ -23,6 +23,8 @@
  *
  */
 
+// ITE puzzle scene
+
 #ifndef SAGA_PUZZLE_H
 #define SAGA_PUZZLE_H
 
diff --git a/engines/saga/render.cpp b/engines/saga/render.cpp
index 16536f762e..930476b4e2 100644
--- a/engines/saga/render.cpp
+++ b/engines/saga/render.cpp
@@ -24,6 +24,7 @@
  */
 
 // Main rendering loop
+
 #include "saga/saga.h"
 
 #include "saga/actor.h"
diff --git a/engines/saga/rscfile.cpp b/engines/saga/rscfile.cpp
index d308fcbe7e..3a60ae60e6 100644
--- a/engines/saga/rscfile.cpp
+++ b/engines/saga/rscfile.cpp
@@ -24,6 +24,7 @@
  */
 
 // RSC Resource file management module
+
 #include "saga/saga.h"
 
 #include "saga/actor.h"
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 220a563c14..43952fe564 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -551,7 +551,7 @@ public:
 	Resource *_resource;
 
 
-	/** Random number generator */
+	// Random number generator
 	Common::RandomSource _rnd;
 
 private:
diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index 48fcc16d4e..6f27e1b19b 100644
--- a/engines/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
@@ -154,14 +154,6 @@ void SagaEngine::fillSaveList() {
 		}
 		i++;
 	}
-/* 4debug
-	for (i = 0; i < 14; i++) {
-		sprintf(_saveFiles[i].name,"test%i", i);
-		_saveFiles[i].slotNumber = i;
-	}
-	_saveFilesCount = 14;
-	_saveFilesMaxCount = 14;
-	*/
 }
 
 
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index 9f783bd50d..3f1957b9c5 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -44,7 +44,7 @@
 namespace Saga {
 
 SndRes::SndRes(SagaEngine *vm) : _vm(vm) {
-	/* Load sound module resource file contexts */
+	// Load sound module resource file contexts
 	_sfxContext = _vm->_resource->getContext(GAME_SOUNDFILE);
 	if (_sfxContext == NULL) {
 		error("SndRes::SndRes resource context not found");
diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index bbe73a48a0..1a70a44bbd 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -24,6 +24,7 @@
  */
 
 // Sprite management module
+
 #include "saga/saga.h"
 
 #include "saga/gfx.h"
-- 
cgit v1.2.3