diff options
| -rw-r--r-- | Makefile.common | 5 | ||||
| -rw-r--r-- | engines/dm/timeline.h | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index a1f43128a2..1c6403db0d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -182,10 +182,13 @@ else GITROOT := git://github.com/scummvm/scummvm.git endif +# Amiga needs date in another format +AMIGA_DATE = $(shell date '+%d.%m.%Y') + # Define the Subversion revision if available, either autodetected or # specified by the user, but only for base/version.cpp. ifneq ($(origin VER_REV), undefined) -base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\" +base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\" -DAMIGA_DATE=\"$(AMIGA_DATE)\" endif ###################################################################### diff --git a/engines/dm/timeline.h b/engines/dm/timeline.h index 030d18db12..ef076be593 100644 --- a/engines/dm/timeline.h +++ b/engines/dm/timeline.h @@ -116,7 +116,9 @@ public: int16 _lightPower; uint16 _slot; // Thing int16 _slotOrdinal; - } _B; + }; + + B_unionTimelineEvent _B; int16 getMapXY() { return (_B._location._mapX << 8) + _B._location._mapY; } @@ -142,7 +144,9 @@ public: uint16 _slot; int16 _soundIndex; byte _ticks; - } _C; + }; + + C_uionTimelineEvent _C; }; // @ EVENT class Timeline { |