From 45764de138c130766cb48981052058ac4be0e4e6 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 6 Jun 2009 17:44:24 +0000 Subject: Cleanup svn-id: r41251 --- engines/agi/agi.h | 7 ------- engines/agi/detection.cpp | 4 ++-- engines/agi/loader_v2.cpp | 2 +- engines/agi/loader_v3.cpp | 2 +- engines/agi/picture.cpp | 2 +- engines/agi/picture.h | 2 +- engines/agi/saveload.cpp | 10 +++++----- engines/agi/sprite.cpp | 2 +- engines/agi/sprite.h | 2 +- 9 files changed, 13 insertions(+), 20 deletions(-) diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 3153514196..255733ede8 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -63,9 +63,6 @@ typedef signed int Err; #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 @@ typedef signed int Err; #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 diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 78d56bbbc7..63557712b0 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -928,14 +928,14 @@ SaveStateList AgiMetaEngine::listSaves(const char *target) const { 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); diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp index 15e27f6939..fd875b7fbc 100644 --- a/engines/agi/loader_v2.cpp +++ b/engines/agi/loader_v2.cpp @@ -151,7 +151,7 @@ int AgiLoader_v2::unloadResource(int t, int n) { */ 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; diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp index 5829476c13..81e81bed24 100644 --- a/engines/agi/loader_v3.cpp +++ b/engines/agi/loader_v3.cpp @@ -212,7 +212,7 @@ int AgiLoader_v3::unloadResource(int t, int n) { * 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; diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp index 20dd893a42..d6801d7cea 100644 --- a/engines/agi/picture.cpp +++ b/engines/agi/picture.cpp @@ -231,7 +231,7 @@ void PictureMgr::absoluteDrawLine() { /************************************************************************** ** okToFill **************************************************************************/ -INLINE int PictureMgr::isOkFillHere(int x, int y) { +int PictureMgr::isOkFillHere(int x, int y) { uint8 p; x += _xOffset; diff --git a/engines/agi/picture.h b/engines/agi/picture.h index 17cdf50b58..fa77e87bb6 100644 --- a/engines/agi/picture.h +++ b/engines/agi/picture.h @@ -70,7 +70,7 @@ private: 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); diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index 2438601b0c..94680cf3b5 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -540,7 +540,7 @@ const char *AgiEngine::getSavegameFilename(int num) { } 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 @@ getout: } 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::saveGameDialog() { } 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::saveGameSimple() { } 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::loadGameDialog() { } int AgiEngine::loadGameSimple() { - char fileName[MAX_PATH]; + char fileName[MAXPATHLEN]; int rc = 0; sprintf(fileName, "%s", getSavegameFilename(0)); diff --git a/engines/agi/sprite.cpp b/engines/agi/sprite.cpp index d2ad494f4e..f3c0b7365c 100644 --- a/engines/agi/sprite.cpp +++ b/engines/agi/sprite.cpp @@ -268,7 +268,7 @@ bool SpritesMgr::testNotUpdating(VtEntry *v, AgiEngine *vm) { /** * Convert sprite priority to y value. */ -INLINE int SpritesMgr::prioToY(int p) { +int SpritesMgr::prioToY(int p) { int i; if (p == 0) diff --git a/engines/agi/sprite.h b/engines/agi/sprite.h index 0bdb405fd5..407871ebbd 100644 --- a/engines/agi/sprite.h +++ b/engines/agi/sprite.h @@ -60,7 +60,7 @@ private: 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 *)); -- cgit v1.2.3