Merge pull request #69 from marmichalski/gcc

codenamecpp · web-flow · commit 3590a4e8d510 · 2021-12-01T21:39:55.000+02:00
Fix compilation with gcc
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
@@ -21,6 +21,13 @@ on:
 jobs:
   build-with-cmake:
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        compiler:
+          - [cc: gcc, cxx: g++]
+          - [cc: clang, cxx: clang++]
+
     steps:
       - uses: actions/checkout@v2
         with:
@@ -36,8 +43,8 @@ jobs:
         uses: ashutoshvarma/action-cmake-build@master
         with:
           build-dir: ${{ github.workspace }}/build
-          cc: clang
-          cxx: clang++
+          cc: ${{ matrix.compiler.cc }}
+          cxx: ${{ matrix.compiler.cxx }}
           build-type: Release
           configure-options: -DWITH_BOX2D=Yes
           parallel: 2
diff --git a/src/GameDefs.h b/src/GameDefs.h
@@ -364,7 +364,7 @@ struct TextureRegion
     {
         debug_assert(textureSize.x > 0);
         debug_assert(textureSize.y > 0);
-        float tcx = (1.0f / textureSize.x);
+        float tcx = (1.0f / textureSize.x);
         float tcy = (1.0f / textureSize.y);
         // compute texture region coordinates
         mRectangle = srcRectangle;
@@ -883,26 +883,22 @@ struct PedestrianCtlState
     }
 public:
     // on foot control actions
-    struct
-    {
-        bool mTurnLeft = false;
-        bool mTurnRight = false;
-        bool mWalkForward = false;
-        bool mWalkBackward = false;
-        bool mRun = false;
-        bool mShoot = false;
-        bool mJump = false;
-        bool mSpecial = false;
-
-        // overrides mTurnLeft/mTurnRight
-        bool mRotateToDesiredAngle = false;
-        cxx::angle_t mDesiredRotationAngle;
-    };
-    struct // in car control actions
-    {
-        float mAcceleration = 0.0f; // 0 means no acceleration, < 0 move reverse, > 0 full acceleration
-        float mSteerDirection = 0.0f; // 0 means no steer, < 0 steer left, > 0 steer right
-        bool mHandBrake = false;
-        bool mHorn = false;
-    };
-};
+    bool mTurnLeft = false;
+    bool mTurnRight = false;
+    bool mWalkForward = false;
+    bool mWalkBackward = false;
+    bool mRun = false;
+    bool mShoot = false;
+    bool mJump = false;
+    bool mSpecial = false;
+
+    // overrides mTurnLeft/mTurnRight
+    bool mRotateToDesiredAngle = false;
+    cxx::angle_t mDesiredRotationAngle;
+
+    // in car control actions
+    float mAcceleration = 0.0f; // 0 means no acceleration, < 0 move reverse, > 0 full acceleration
+    float mSteerDirection = 0.0f; // 0 means no steer, < 0 steer left, > 0 steer right
+    bool mHandBrake = false;
+    bool mHorn = false;
+};
