DM: Another attempt for compilation fixes on older compilers

scummvm · Sep 10, 2016 · 7871874 · 7871874
1 parent d973b23
commit 7871874
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -116,7 +116,9 @@ class TimelineEvent {
 		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 @@ class TimelineEvent {
 		uint16 _slot;
 		int16 _soundIndex;
 		byte _ticks;
-	} _C;
+	};
+
+	C_uionTimelineEvent _C;
 }; // @ EVENT
 
 class Timeline {