Try disable tutorial on android TV to make google happy

supertuxkart · Nov 2, 2024 · 721018c · 721018c
1 parent d37558f
commit 721018c
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 0 deletions.
diff --git a/src/modes/overworld.cpp b/src/modes/overworld.cpp
@@ -38,6 +38,10 @@
 #include "tracks/track.hpp"
 #include "tracks/track_object_manager.hpp"
 
+#ifdef ANDROID
+#include <SDL_system.h>
+#endif
+
 //-----------------------------------------------------------------------------
 OverWorld::OverWorld() : World()
 {
@@ -242,6 +246,11 @@ void OverWorld::onFirePressed(Controller* who)
         {
             if (challenges[n].m_challenge_id == "tutorial")
             {
+#ifdef ANDROID
+                if (SDL_IsAndroidTV())
+                    return;
+#endif
+
                 scheduleTutorial();
                 return;
             }

diff --git a/src/states_screens/help/help_screen_1.cpp b/src/states_screens/help/help_screen_1.cpp
@@ -21,6 +21,10 @@
 #include "guiengine/widgets/button_widget.hpp"
 #include "modes/tutorial_utils.hpp"
 
+#ifdef ANDROID
+#include <SDL_system.h>
+#endif
+
 using namespace GUIEngine;
 
 // -----------------------------------------------------------------------------
@@ -37,6 +41,22 @@ void HelpScreen1::loadedFromFile()
 
 // -----------------------------------------------------------------------------
 
+void HelpScreen1::beforeAddingWidget()
+{
+#ifdef ANDROID
+    if (SDL_IsAndroidTV())
+    {
+        Widget* tutorial = getWidget("startTutorial");
+        if (tutorial)
+            tutorial->setVisible(false);
+
+        Widget* tutorial_icon = getWidget("tutorialIcon");
+        if (tutorial_icon)
+            tutorial_icon->setVisible(false);
+    }
+#endif
+}
+
 void HelpScreen1::eventCallback(Widget* widget, const std::string& name, const int playerID)
 {
     if (name == "startTutorial")

diff --git a/src/states_screens/help/help_screen_1.hpp b/src/states_screens/help/help_screen_1.hpp
@@ -35,6 +35,9 @@ class HelpScreen1 : public GUIEngine::Screen, public GUIEngine::ScreenSingleton<
 
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void loadedFromFile() OVERRIDE;
+
+    /** \brief implement callback from parent class GUIEngine::Screen */
+    virtual void beforeAddingWidget() OVERRIDE;
 
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,

diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
@@ -72,6 +72,10 @@
 
 #include <IrrlichtDevice.h>
 
+#ifdef ANDROID
+#include <SDL_system.h>
+#endif
+
 using namespace GUIEngine;
 using namespace Online;
 
@@ -119,6 +123,15 @@ void MainMenuScreen::beforeAddingWidget()
     if (w)
         w->setVisible(false);
 #endif
+
+#ifdef ANDROID
+    if (SDL_IsAndroidTV())
+    {
+        Widget* tutorial = getWidget("startTutorial");
+        if (tutorial)
+            tutorial->setVisible(false);
+    }
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -327,6 +340,12 @@ void MainMenuScreen::onUpdate(float delta)
     if (player->getUseFrequency() != 0)
         return;
 
+#ifdef ANDROID
+    // Don't show tutorial dialog on Android TV
+    if (SDL_IsAndroidTV())
+        return;
+#endif
+
     player->incrementUseFrequency();
     class PlayTutorial :
           public MessageDialog::IConfirmDialogListener

diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
@@ -58,6 +58,11 @@
 #include <IrrlichtDevice.h>
 #include <ISceneCollisionManager.h>
 #include <ISceneManager.h>
+
+#ifdef ANDROID
+#include <SDL_system.h>
+#endif
+
 using namespace irr;
 
 #include <algorithm>
@@ -526,6 +531,11 @@ void RaceGUIOverworld::drawGlobalMiniMap()
 
             if (challenges[n].m_challenge_id == "tutorial")
             {
+#ifdef ANDROID
+                if (SDL_IsAndroidTV())
+                    continue;
+#endif
+
                 gui::ScalableFont* font = GUIEngine::getTitleFont();
                 font->draw(_("Tutorial"), pos, video::SColor(255,255,255,255),
                            false, true /* vcenter */, NULL);