[Scummvm-cvs-logs] SF.net SVN: scummvm: [28362] scummvm/trunk/engines/saga
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Jul 31 20:08:40 CEST 2007
Revision: 28362
http://scummvm.svn.sourceforge.net/scummvm/?rev=28362&view=rev
Author: thebluegr
Date: 2007-07-31 11:08:40 -0700 (Tue, 31 Jul 2007)
Log Message:
-----------
Cleanup: removed dead code, fixed some comments and did some layout changes
Modified Paths:
--------------
scummvm/trunk/engines/saga/actor.h
scummvm/trunk/engines/saga/animation.cpp
scummvm/trunk/engines/saga/animation.h
scummvm/trunk/engines/saga/detection_tables.h
scummvm/trunk/engines/saga/displayinfo.h
scummvm/trunk/engines/saga/font.cpp
scummvm/trunk/engines/saga/gfx.cpp
scummvm/trunk/engines/saga/image.cpp
scummvm/trunk/engines/saga/isomap.cpp
scummvm/trunk/engines/saga/ite_introproc.cpp
scummvm/trunk/engines/saga/list.h
scummvm/trunk/engines/saga/music.cpp
scummvm/trunk/engines/saga/objectmap.cpp
scummvm/trunk/engines/saga/puzzle.h
scummvm/trunk/engines/saga/render.cpp
scummvm/trunk/engines/saga/rscfile.cpp
scummvm/trunk/engines/saga/saga.h
scummvm/trunk/engines/saga/saveload.cpp
scummvm/trunk/engines/saga/sndres.cpp
scummvm/trunk/engines/saga/sprite.cpp
Modified: scummvm/trunk/engines/saga/actor.h
===================================================================
--- scummvm/trunk/engines/saga/actor.h 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/actor.h 2007-07-31 18:08:40 UTC (rev 28362)
@@ -614,11 +614,6 @@
void showActors(bool flag) { _showActors = flag; }
- /*
- uint16 _currentFrameIndex;
- void frameTest() {
- _currentFrameIndex++;
- }*/
protected:
friend class Script;
bool loadActorResources(ActorData *actor);
Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/animation.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -24,6 +24,7 @@
*/
// Background animation management module
+
#include "saga/saga.h"
#include "saga/gfx.h"
@@ -386,16 +387,6 @@
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 @@
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();
Modified: scummvm/trunk/engines/saga/animation.h
===================================================================
--- scummvm/trunk/engines/saga/animation.h 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/animation.h 2007-07-31 18:08:40 UTC (rev 28362)
@@ -209,4 +209,4 @@
} // End of namespace Saga
-#endif /* ANIMATION_H_ */
+#endif // ANIMATION_H_
Modified: scummvm/trunk/engines/saga/detection_tables.h
===================================================================
--- scummvm/trunk/engines/saga/detection_tables.h 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/detection_tables.h 2007-07-31 18:08:40 UTC (rev 28362)
@@ -23,6 +23,8 @@
*
*/
+// Game detection information and MD5s
+
namespace Saga {
static const GameResourceDescription ITE_Resources = {
Modified: scummvm/trunk/engines/saga/displayinfo.h
===================================================================
--- scummvm/trunk/engines/saga/displayinfo.h 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/displayinfo.h 2007-07-31 18:08:40 UTC (rev 28362)
@@ -23,6 +23,8 @@
*
*/
+// Interface widget display information
+
#ifndef SAGA_DISPLAYINFO_H
#define SAGA_DISPLAYINFO_H
Modified: scummvm/trunk/engines/saga/font.cpp
===================================================================
--- scummvm/trunk/engines/saga/font.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/font.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -24,6 +24,7 @@
*/
// Font management and font drawing module
+
#include "saga/saga.h"
#include "saga/gfx.h"
#include "saga/rscfile.h"
Modified: scummvm/trunk/engines/saga/gfx.cpp
===================================================================
--- scummvm/trunk/engines/saga/gfx.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/gfx.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -130,10 +130,7 @@
}
}
-/**
-* 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;
Modified: scummvm/trunk/engines/saga/image.cpp
===================================================================
--- scummvm/trunk/engines/saga/image.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/image.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -24,6 +24,7 @@
*/
// SAGA Image resource management routines
+
#include "saga/saga.h"
#include "saga/stream.h"
Modified: scummvm/trunk/engines/saga/isomap.cpp
===================================================================
--- scummvm/trunk/engines/saga/isomap.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/isomap.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -24,6 +24,7 @@
*/
// Isometric level module
+
#include "saga/saga.h"
#include "saga/gfx.h"
@@ -1609,6 +1610,7 @@
/* if (i > 64) {
i = 64;
}*/
+
actor->_walkStepsCount = i;
if (i) {
actor->setTileDirectionsSize(i, false);
Modified: scummvm/trunk/engines/saga/ite_introproc.cpp
===================================================================
--- scummvm/trunk/engines/saga/ite_introproc.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/ite_introproc.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -23,7 +23,6 @@
*
*/
-
// Intro sequence scene procedures
#include "saga/saga.h"
Modified: scummvm/trunk/engines/saga/list.h
===================================================================
--- scummvm/trunk/engines/saga/list.h 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/list.h 2007-07-31 18:08:40 UTC (rev 28362)
@@ -23,6 +23,8 @@
*
*/
+// List functions
+
#ifndef SAGA_LIST_H
#define SAGA_LIST_H
Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/music.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -22,6 +22,9 @@
* $Id$
*
*/
+
+// MIDI and digital music class
+
#include "saga/saga.h"
#include "saga/rscfile.h"
Modified: scummvm/trunk/engines/saga/objectmap.cpp
===================================================================
--- scummvm/trunk/engines/saga/objectmap.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/objectmap.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -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"
Modified: scummvm/trunk/engines/saga/puzzle.h
===================================================================
--- scummvm/trunk/engines/saga/puzzle.h 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/puzzle.h 2007-07-31 18:08:40 UTC (rev 28362)
@@ -23,6 +23,8 @@
*
*/
+// ITE puzzle scene
+
#ifndef SAGA_PUZZLE_H
#define SAGA_PUZZLE_H
Modified: scummvm/trunk/engines/saga/render.cpp
===================================================================
--- scummvm/trunk/engines/saga/render.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/render.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -24,6 +24,7 @@
*/
// Main rendering loop
+
#include "saga/saga.h"
#include "saga/actor.h"
Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/rscfile.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -24,6 +24,7 @@
*/
// RSC Resource file management module
+
#include "saga/saga.h"
#include "saga/actor.h"
Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/saga.h 2007-07-31 18:08:40 UTC (rev 28362)
@@ -551,7 +551,7 @@
Resource *_resource;
- /** Random number generator */
+ // Random number generator
Common::RandomSource _rnd;
private:
Modified: scummvm/trunk/engines/saga/saveload.cpp
===================================================================
--- scummvm/trunk/engines/saga/saveload.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/saveload.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -154,14 +154,6 @@
}
i++;
}
-/* 4debug
- for (i = 0; i < 14; i++) {
- sprintf(_saveFiles[i].name,"test%i", i);
- _saveFiles[i].slotNumber = i;
- }
- _saveFilesCount = 14;
- _saveFilesMaxCount = 14;
- */
}
Modified: scummvm/trunk/engines/saga/sndres.cpp
===================================================================
--- scummvm/trunk/engines/saga/sndres.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/sndres.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -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");
Modified: scummvm/trunk/engines/saga/sprite.cpp
===================================================================
--- scummvm/trunk/engines/saga/sprite.cpp 2007-07-31 17:41:10 UTC (rev 28361)
+++ scummvm/trunk/engines/saga/sprite.cpp 2007-07-31 18:08:40 UTC (rev 28362)
@@ -24,6 +24,7 @@
*/
// Sprite management module
+
#include "saga/saga.h"
#include "saga/gfx.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list