Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -28,9 +28,9 @@ namespace AzGameFramework
    GameApplication::GameApplication()
    {
    }
- 
-    GameApplication::GameApplication(int* argc, char*** argv)
-        : Application(argc, argv)
+
+    GameApplication::GameApplication(int argc, char** argv)
+        : Application(&argc, &argv)
    {
    }

@@ -108,7 +108,7 @@ namespace AzGameFramework
    }

    void GameApplication::QueryApplicationType(AZ::ApplicationTypeQuery& appType) const
-    { 
+    {
        appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Game;
    };

@@ -24,7 +24,7 @@ namespace AzGameFramework
        AZ_CLASS_ALLOCATOR(GameApplication, AZ::SystemAllocator, 0);

        GameApplication();
-        GameApplication(int* argc, char*** argvS);
+        GameApplication(int argc, char** argvS);
        ~GameApplication();

        AZ::ComponentTypeList GetRequiredSystemComponents() const override;