[Scummvm-cvs-logs] SF.net SVN: scummvm:[41251] scummvm/trunk/engines/agi
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Jun 6 19:44:25 CEST 2009
Revision: 41251
http://scummvm.svn.sourceforge.net/scummvm/?rev=41251&view=rev
Author: sev
Date: 2009-06-06 17:44:24 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/agi/agi.h
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/agi/loader_v2.cpp
scummvm/trunk/engines/agi/loader_v3.cpp
scummvm/trunk/engines/agi/picture.cpp
scummvm/trunk/engines/agi/picture.h
scummvm/trunk/engines/agi/saveload.cpp
scummvm/trunk/engines/agi/sprite.cpp
scummvm/trunk/engines/agi/sprite.h
Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/agi.h 2009-06-06 17:44:24 UTC (rev 41251)
@@ -63,9 +63,6 @@
#define MAX_WORDS 20
#define MAX_STRINGS 24 // MAX_STRINGS + 1 used for get.num
#define MAX_STRINGLEN 40
-#ifndef MAX_PATH
-#define MAX_PATH 260
-#endif
#define _EMPTY 0xfffff
#define EGO_OWNED 0xff
@@ -73,10 +70,6 @@
#define CRYPT_KEY_SIERRA "Avis Durgan"
#define CRYPT_KEY_AGDS "Alex Simkin"
-#ifndef INLINE
-#define INLINE
-#endif
-
#define MSG_BOX_COLOUR 0x0f // White
#define MSG_BOX_TEXT 0x00 // Black
#define MSG_BOX_LINE 0x04 // Red
Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/detection.cpp 2009-06-06 17:44:24 UTC (rev 41251)
@@ -928,14 +928,14 @@
int AgiMetaEngine::getMaximumSaveSlot() const { return 999; }
void AgiMetaEngine::removeSaveState(const char *target, int slot) const {
- char fileName[MAX_PATH];
+ char fileName[MAXPATHLEN];
sprintf(fileName, "%s.%03d", target, slot);
g_system->getSavefileManager()->removeSavefile(fileName);
}
SaveStateDescriptor AgiMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
const uint32 AGIflag = MKID_BE('AGI:');
- char fileName[MAX_PATH];
+ char fileName[MAXPATHLEN];
sprintf(fileName, "%s.%03d", target, slot);
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);
Modified: scummvm/trunk/engines/agi/loader_v2.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v2.cpp 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/loader_v2.cpp 2009-06-06 17:44:24 UTC (rev 41251)
@@ -151,7 +151,7 @@
*/
uint8 *AgiLoader_v2::loadVolRes(struct AgiDir *agid) {
uint8 *data = NULL;
- char x[MAX_PATH], *path;
+ char x[MAXPATHLEN], *path;
Common::File fp;
unsigned int sig;
Modified: scummvm/trunk/engines/agi/loader_v3.cpp
===================================================================
--- scummvm/trunk/engines/agi/loader_v3.cpp 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/loader_v3.cpp 2009-06-06 17:44:24 UTC (rev 41251)
@@ -212,7 +212,7 @@
* NULL is returned if unsucsessful.
*/
uint8 *AgiLoader_v3::loadVolRes(AgiDir *agid) {
- char x[MAX_PATH];
+ char x[MAXPATHLEN];
uint8 *data = NULL, *compBuffer;
Common::File fp;
Common::String path;
Modified: scummvm/trunk/engines/agi/picture.cpp
===================================================================
--- scummvm/trunk/engines/agi/picture.cpp 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/picture.cpp 2009-06-06 17:44:24 UTC (rev 41251)
@@ -231,7 +231,7 @@
/**************************************************************************
** okToFill
**************************************************************************/
-INLINE int PictureMgr::isOkFillHere(int x, int y) {
+int PictureMgr::isOkFillHere(int x, int y) {
uint8 p;
x += _xOffset;
Modified: scummvm/trunk/engines/agi/picture.h
===================================================================
--- scummvm/trunk/engines/agi/picture.h 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/picture.h 2009-06-06 17:44:24 UTC (rev 41251)
@@ -70,7 +70,7 @@
void drawLine(int x1, int y1, int x2, int y2);
void dynamicDrawLine();
void absoluteDrawLine();
- INLINE int isOkFillHere(int x, int y);
+ int isOkFillHere(int x, int y);
void agiFill(unsigned int x, unsigned int y);
void xCorner(bool skipOtherCoords = false);
void yCorner(bool skipOtherCoords = false);
Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/saveload.cpp 2009-06-06 17:44:24 UTC (rev 41251)
@@ -540,7 +540,7 @@
}
void AgiEngine::getSavegameDescription(int num, char *buf, bool showEmpty) {
- char fileName[MAX_PATH];
+ char fileName[MAXPATHLEN];
Common::InSaveFile *in;
debugC(4, kDebugLevelMain | kDebugLevelSavegame, "Current game id is %s", _targetName.c_str());
@@ -769,7 +769,7 @@
}
int AgiEngine::saveGameDialog() {
- char fileName[MAX_PATH];
+ char fileName[MAXPATHLEN];
char *desc;
const char *buttons[] = { "Do as I say!", "I regret", NULL };
char dstr[200];
@@ -854,7 +854,7 @@
}
int AgiEngine::saveGameSimple() {
- char fileName[MAX_PATH];
+ char fileName[MAXPATHLEN];
sprintf(fileName, "%s", getSavegameFilename(0));
int result = saveGame(fileName, "Default savegame");
@@ -864,7 +864,7 @@
}
int AgiEngine::loadGameDialog() {
- char fileName[MAX_PATH];
+ char fileName[MAXPATHLEN];
int rc, slot = 0;
int hm, vm, hp, vp; // box margins
int w;
@@ -905,7 +905,7 @@
}
int AgiEngine::loadGameSimple() {
- char fileName[MAX_PATH];
+ char fileName[MAXPATHLEN];
int rc = 0;
sprintf(fileName, "%s", getSavegameFilename(0));
Modified: scummvm/trunk/engines/agi/sprite.cpp
===================================================================
--- scummvm/trunk/engines/agi/sprite.cpp 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/sprite.cpp 2009-06-06 17:44:24 UTC (rev 41251)
@@ -268,7 +268,7 @@
/**
* Convert sprite priority to y value.
*/
-INLINE int SpritesMgr::prioToY(int p) {
+int SpritesMgr::prioToY(int p) {
int i;
if (p == 0)
Modified: scummvm/trunk/engines/agi/sprite.h
===================================================================
--- scummvm/trunk/engines/agi/sprite.h 2009-06-06 17:43:51 UTC (rev 41250)
+++ scummvm/trunk/engines/agi/sprite.h 2009-06-06 17:44:24 UTC (rev 41251)
@@ -60,7 +60,7 @@
void objsSaveArea(Sprite *s);
void objsRestoreArea(Sprite *s);
- FORCEINLINE int prioToY(int p);
+ int prioToY(int p);
Sprite *newSprite(VtEntry *v);
void sprAddlist(SpriteList &l, VtEntry *v);
void buildList(SpriteList &l, bool (*test)(VtEntry *, AgiEngine *));
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