Merge of GCC compilation fixes

This commit is contained in:
Paul Gilbert 2011-02-18 20:21:07 +11:00
commit d16b89d8f9
2 changed files with 7 additions and 2 deletions

View File

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

View File

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