diff options
| author | Alex Bevilacqua | 2011-02-16 15:32:47 -0500 |
|---|---|---|
| committer | Alex Bevilacqua | 2011-02-16 15:32:47 -0500 |
| commit | 1a84b04ce139cb026cb4a90dea6b8ce2b6fd716c (patch) | |
| tree | 2bda59c1e1aec0e79c9802a0c0ea7f2637a16aa5 | |
| parent | 36b1fe111ea20ccb83f66e675e01773376aa7f7b (diff) | |
| parent | 75c99ac175c235956b76cc230c6bd44e42de58eb (diff) | |
| download | scummvm-rg350-1a84b04ce139cb026cb4a90dea6b8ce2b6fd716c.tar.gz scummvm-rg350-1a84b04ce139cb026cb4a90dea6b8ce2b6fd716c.tar.bz2 scummvm-rg350-1a84b04ce139cb026cb4a90dea6b8ce2b6fd716c.zip | |
Merge branch 'tsage-linux-compatibility' into tsage
| -rw-r--r-- | engines/engines.mk | 5 | ||||
| -rw-r--r-- | engines/tsage/saveload.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/engines/engines.mk b/engines/engines.mk index eea4ffc0b9..b0f57135aa 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -176,6 +176,11 @@ DEFINES += -DENABLE_TOUCHE=$(ENABLE_TOUCHE) MODULES += engines/touche endif +ifdef ENABLE_TSAGE +DEFINES += -DENABLE_TSAGE=$(ENABLE_TSAGE) +MODULES += engines/tsage +endif + ifdef ENABLE_TUCKER DEFINES += -DENABLE_TUCKER=$(ENABLE_TUCKER) MODULES += engines/tucker diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index 054d968105..efaa8d696e 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -52,8 +52,8 @@ struct tSageSavegameHeader { /*--------------------------------------------------------------------------*/ #define SYNC_POINTER(x) s.syncPointer((SavedObject **)&x) -#define SYNC_ENUM(FIELD, TYPE) int v_##FIELD## = (int)FIELD; s.syncAsUint16LE(v_##FIELD##); \ - if (s.isLoading()) FIELD = (TYPE)v_##FIELD##; +#define SYNC_ENUM(FIELD, TYPE) int v_##FIELD = (int)FIELD; s.syncAsUint16LE(v_##FIELD); \ + if (s.isLoading()) FIELD = (TYPE)v_##FIELD; /** * Derived serialiser class with extra synchronisation types |