Cleanup: removed dead code, fixed some comments and did some layout changes

svn-id: r28362
This commit is contained in:
Filippos Karapetis 2007-07-31 18:08:40 +00:00
parent 03d7990a34
commit cd20f09a9d
20 changed files with 25 additions and 32 deletions

View File

@ -614,11 +614,6 @@ public:
void showActors(bool flag) { _showActors = flag; }
/*
uint16 _currentFrameIndex;
void frameTest() {
_currentFrameIndex++;
}*/
protected:
friend class Script;
bool loadActorResources(ActorData *actor);

View File

@ -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();

View File

@ -209,4 +209,4 @@ private:
} // End of namespace Saga
#endif /* ANIMATION_H_ */
#endif // ANIMATION_H_

View File

@ -23,6 +23,8 @@
*
*/
// Game detection information and MD5s
namespace Saga {
static const GameResourceDescription ITE_Resources = {

View File

@ -23,6 +23,8 @@
*
*/
// Interface widget display information
#ifndef SAGA_DISPLAYINFO_H
#define SAGA_DISPLAYINFO_H

View File

@ -24,6 +24,7 @@
*/
// Font management and font drawing module
#include "saga/saga.h"
#include "saga/gfx.h"
#include "saga/rscfile.h"

View File

@ -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;

View File

@ -24,6 +24,7 @@
*/
// SAGA Image resource management routines
#include "saga/saga.h"
#include "saga/stream.h"

View File

@ -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);

View File

@ -23,7 +23,6 @@
*
*/
// Intro sequence scene procedures
#include "saga/saga.h"

View File

@ -23,6 +23,8 @@
*
*/
// List functions
#ifndef SAGA_LIST_H
#define SAGA_LIST_H

View File

@ -22,6 +22,9 @@
* $Id$
*
*/
// MIDI and digital music class
#include "saga/saga.h"
#include "saga/rscfile.h"

View File

@ -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"

View File

@ -23,6 +23,8 @@
*
*/
// ITE puzzle scene
#ifndef SAGA_PUZZLE_H
#define SAGA_PUZZLE_H

View File

@ -24,6 +24,7 @@
*/
// Main rendering loop
#include "saga/saga.h"
#include "saga/actor.h"

View File

@ -24,6 +24,7 @@
*/
// RSC Resource file management module
#include "saga/saga.h"
#include "saga/actor.h"

View File

@ -551,7 +551,7 @@ public:
Resource *_resource;
/** Random number generator */
// Random number generator
Common::RandomSource _rnd;
private:

View File

@ -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;
*/
}

View File

@ -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");

View File

@ -24,6 +24,7 @@
*/
// Sprite management module
#include "saga/saga.h"
#include "saga/gfx.h"