[Scummvm-git-logs] scummvm master -> ef62755ace8082a2e928941d8739456e95a94c5c

aquadran noreply at scummvm.org
Thu Dec 30 12:49:10 UTC 2021


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:
ef62755ace WME3D: Remove pack flags, not needed.


Commit: ef62755ace8082a2e928941d8739456e95a94c5c
    https://github.com/scummvm/scummvm/commit/ef62755ace8082a2e928941d8739456e95a94c5c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-30T13:49:02+01:00

Commit Message:
WME3D: Remove pack flags, not needed.

Changed paths:
    engines/wintermute/base/gfx/3ds/mesh3ds.h
    engines/wintermute/base/gfx/shadow_volume.h


diff --git a/engines/wintermute/base/gfx/3ds/mesh3ds.h b/engines/wintermute/base/gfx/3ds/mesh3ds.h
index 0bc3fdd134c..a8902318c13 100644
--- a/engines/wintermute/base/gfx/3ds/mesh3ds.h
+++ b/engines/wintermute/base/gfx/3ds/mesh3ds.h
@@ -27,15 +27,11 @@
 
 namespace Wintermute {
 
-#include "common/pack-start.h"
-
 struct GeometryVertex {
 	float x;
 	float y;
 	float z;
-} PACKED_STRUCT;
-
-#include "common/pack-end.h"
+};
 
 class Mesh3DS {
 public:
diff --git a/engines/wintermute/base/gfx/shadow_volume.h b/engines/wintermute/base/gfx/shadow_volume.h
index 592ec0599fe..f88c19c6cd8 100644
--- a/engines/wintermute/base/gfx/shadow_volume.h
+++ b/engines/wintermute/base/gfx/shadow_volume.h
@@ -35,19 +35,15 @@
 
 namespace Wintermute {
 
-#include "common/pack-start.h"
-
 struct ShadowVertex {
+	float x;
+	float y;
+	float z;
 	uint8 r;
 	uint8 g;
 	uint8 b;
 	uint8 a;
-	float x;
-	float y;
-	float z;
-} PACKED_STRUCT;
-
-#include "common/pack-end.h"
+};
 
 class ShadowVolume : public BaseClass {
 public:




More information about the Scummvm-git-logs mailing list