[Scummvm-git-logs] scummvm master -> 7871874dab045b012d8a6f48fe1fb642eb0f68a6

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7871874dab DM: Another attempt for compilation fixes on older compilers


Commit: 7871874dab045b012d8a6f48fe1fb642eb0f68a6
    https://github.com/scummvm/scummvm/commit/7871874dab045b012d8a6f48fe1fb642eb0f68a6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-10T20:44:30+02:00

Commit Message:
DM: Another attempt for compilation fixes on older compilers

Changed paths:
    Makefile.common
    engines/dm/timeline.h



diff --git a/Makefile.common b/Makefile.common
index a1f4312..1c6403d 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 030d18d..ef076be 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 {