revert switch build

Xeeynamo · Jan 20, 2021 · c035e3d · c035e3d
1 parent 8440983
commit c035e3d
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 517 deletions.
diff --git a/Sonic1.NX/Makefile b/Sonic1.NX/Makefile
diff --git a/Sonic1.NX/icon.jpg b/Sonic1.NX/icon.jpg
diff --git a/Sonic1.NX/romfs/readme.md b/Sonic1.NX/romfs/readme.md
diff --git a/Sonic12Decomp/Debug.hpp b/Sonic12Decomp/Debug.hpp
@@ -34,7 +34,6 @@ inline void printLog(const char *msg, ...)
         if (file) {
             fWrite(&buffer, 1, StrLength(buffer), file);
             fClose(file);
-            RETRO_FILE_COMMIT_FUNC(0);
         }
     }
 #endif
@@ -73,7 +72,6 @@ inline void printLog(const ushort *msg)
             if (endLine)
                 fWrite(&el, 2, 1, file);
             fClose(file);
-            RETRO_FILE_COMMIT_FUNC(0);
         }
     }
 #endif
@@ -104,7 +102,7 @@ void processStageSelect();
 
 // added due to lack of normal main menu
 void initStartMenu(int mode);
-void processStartMenu(); 
+void processStartMenu();
 void setTextMenu(int mode);
 
-#endif //!DEBUG_H
+#endif //! DEBUG_H
diff --git a/Sonic12Decomp/Ini.cpp b/Sonic12Decomp/Ini.cpp
@@ -235,7 +235,6 @@ int IniParser::SetComment(const char *section, const char *key, const char *comm
 
 void IniParser::Write(const char *filename)
 {
-#ifndef RETRO_DISABLE_SETTINGS_SAVE
     char pathBuffer[0x80];
 
 #if RETRO_PLATFORM == RETRO_OSX
@@ -300,6 +299,4 @@ void IniParser::Write(const char *filename)
     }
 
     fClose(f);
-    RETRO_FILE_COMMIT_FUNC(0);
-#endif
 }
diff --git a/Sonic12Decomp/Input.cpp b/Sonic12Decomp/Input.cpp
@@ -12,11 +12,7 @@ int touchID[8];
 int touches = 0;
 
 InputButton inputDevice[9];
-#ifdef RETRO_USING_KEYBOARD
 int inputType = 0;
-#else
-int inputType = 1;
-#endif
 
 int LSTICK_DEADZONE   = 20000;
 int RSTICK_DEADZONE   = 20000;
@@ -51,39 +47,25 @@ bool getControllerButton(byte buttonID)
     else {
         switch (buttonID) {
             default: break;
-            case SDL_CONTROLLER_BUTTON_DPAD_UP:
-                return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) < -LSTICK_DEADZONE;
-            case SDL_CONTROLLER_BUTTON_DPAD_DOWN:
-                return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) > LSTICK_DEADZONE;
-            case SDL_CONTROLLER_BUTTON_DPAD_LEFT:
-                return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) < -LSTICK_DEADZONE;
-            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
-                return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) > LSTICK_DEADZONE;
+            case SDL_CONTROLLER_BUTTON_DPAD_UP: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) < -LSTICK_DEADZONE;
+            case SDL_CONTROLLER_BUTTON_DPAD_DOWN: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) > LSTICK_DEADZONE;
+            case SDL_CONTROLLER_BUTTON_DPAD_LEFT: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) < -LSTICK_DEADZONE;
+            case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) > LSTICK_DEADZONE;
         }
     }
 
     switch (buttonID) {
         default: break;
-        case SDL_CONTROLLER_BUTTON_ZL:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_TRIGGERLEFT) > LTRIGGER_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_ZR:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_TRIGGERRIGHT) > RTRIGGER_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_LSTICK_UP:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) < -LSTICK_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_LSTICK_DOWN:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) > LSTICK_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_LSTICK_LEFT:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) < -LSTICK_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_LSTICK_RIGHT:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) > LSTICK_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_RSTICK_UP:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTY) < -RSTICK_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_RSTICK_DOWN:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTY) > RSTICK_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_RSTICK_LEFT:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTX) < -RSTICK_DEADZONE;
-        case SDL_CONTROLLER_BUTTON_RSTICK_RIGHT:
-            return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTX) > RSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_ZL: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_TRIGGERLEFT) > LTRIGGER_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_ZR: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_TRIGGERRIGHT) > RTRIGGER_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_LSTICK_UP: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) < -LSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_LSTICK_DOWN: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTY) > LSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_LSTICK_LEFT: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) < -LSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_LSTICK_RIGHT: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_LEFTX) > LSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_RSTICK_UP: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTY) < -RSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_RSTICK_DOWN: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTY) > RSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_RSTICK_LEFT: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTX) < -RSTICK_DEADZONE;
+        case SDL_CONTROLLER_BUTTON_RSTICK_RIGHT: return SDL_GameControllerGetAxis(controller, SDL_CONTROLLER_AXIS_RIGHTX) > RSTICK_DEADZONE;
     }
 
     return false;
@@ -184,6 +166,6 @@ void CheckKeyDown(InputData *input, byte flags)
         input->C = inputDevice[6].hold;
     if (flags & 0x80)
         input->start = inputDevice[7].hold;
-    //if (flags & 0x80)
+    // if (flags & 0x80)
     //   anyHold = inputDevice[8].hold;
 }
diff --git a/Sonic12Decomp/RetroEngine.cpp b/Sonic12Decomp/RetroEngine.cpp
@@ -39,10 +39,8 @@ bool processEvents()
                     case SDL_WINDOWEVENT_CLOSE: return false;
                 }
                 break;
-#ifndef RETRO_DISABLE_CONTROLLER_HOTSWAP
             case SDL_CONTROLLERDEVICEADDED: controllerInit(SDL_NumJoysticks() - 1); break;
             case SDL_CONTROLLERDEVICEREMOVED: controllerClose(SDL_NumJoysticks() - 1); break;
-#endif
             case SDL_WINDOWEVENT_CLOSE:
                 if (Engine.window) {
                     SDL_DestroyWindow(Engine.window);
@@ -217,7 +215,7 @@ void RetroEngine::Init()
 
     InitUserdata();
     char *dest = new char[0x200];
-    StrCopy(dest, BASE_RO_PATH);
+    StrCopy(dest, BASE_PATH);
     StrAdd(dest, Engine.dataFile);
     CheckRSDKFile(dest);
     InitNativeObjectSystem();
@@ -251,8 +249,8 @@ void RetroEngine::Init()
 #endif // RSDK_DEBUG
 #endif // RETRO_USE_NETWORKING
 
-    gameMode = ENGINE_MAINGAME;
-    running  = false;
+    gameMode          = ENGINE_MAINGAME;
+    running           = false;
     finishedStartMenu = false;
     if (LoadGameConfig("Data/Game/GameConfig.bin")) {
         if (InitRenderDevice()) {
@@ -330,7 +328,7 @@ void RetroEngine::Init()
         }
     }
 
-    FileIO* ver = fOpen("gamever.txt", "w");
+    FileIO *ver = fOpen("gamever.txt", "w");
     if (ver) {
         fWrite(ENGINE_VER, sizeof(ENGINE_VER), 1, ver);
         fClose(ver);
@@ -571,8 +569,6 @@ bool RetroEngine::LoadGameConfig(const char *filePath)
 void RetroEngine::Callback(int callbackID)
 {
     switch (callbackID) {
-        default:
-            printLog("Callback: Unknown (%d)", callbackID);
-            break;
+        default: printLog("Callback: Unknown (%d)", callbackID); break;
     }
 }
diff --git a/Sonic12Decomp/RetroEngine.hpp b/Sonic12Decomp/RetroEngine.hpp
@@ -33,8 +33,7 @@ typedef unsigned int uint;
 #define RETRO_ANDROID  (5)
 #define RETRO_WP7      (6)
 // Custom Platforms start here
-#define RETRO_VITA     (7)
-#define RETRO_NX       (8)
+#define RETRO_VITA (7)
 
 // Platform types (Game manages platform-specific code such as HUD position using this rather than the above)
 #define RETRO_STANDARD (0)
@@ -54,65 +53,32 @@ typedef unsigned int uint;
 #elif defined __vita__
 #define RETRO_PLATFORM (RETRO_VITA)
 #define RETRO_PLATTYPE (RETRO_STANDARD)
-#elif defined __SWITCH__
-#define RETRO_PLATFORM (RETRO_NX)
-#define RETRO_PLATTYPE (RETRO_STANDARD)
 #else
 #define RETRO_PLATFORM (RETRO_WIN)
 #define RETRO_PLATTYPE (RETRO_STANDARD)
 #endif
 
 #if RETRO_PLATFORM == RETRO_VITA
 #if RETRO_GAME_SONIC == 1
-#define BASE_PATH            "ux0:data/Sonic1/"
-#define BASE_RO_PATH         "ux0:data/Sonic1/"
+#define BASE_PATH "ux0:data/Sonic1/"
 #elif RETRO_GAME_SONIC == 2
-#define BASE_PATH            "ux0:data/Sonic2/"
-#define BASE_RO_PATH         "ux0:data/Sonic2/"
+#define BASE_PATH "ux0:data/Sonic2/"
 #else
 #error "RETRO_GAME_SONIC not defined"
 #endif
 #define DEFAULT_SCREEN_XSIZE 480
 #define DEFAULT_FULLSCREEN   false
-#define SCREEN_YSIZE (272)
-#elif RETRO_PLATFORM == RETRO_NX
-#include "platform/nx.h"
-
-#ifdef NX_APPLICATION_ID
-#define BASE_PATH "save:/"
-#else
-#define BASE_PATH ""
-#endif
-#define BASE_RO_PATH "romfs:/"
-#define DEFAULT_SCREEN_XSIZE 480
-#define DEFAULT_FULLSCREEN   false
 #define SCREEN_YSIZE         (272)
-#define DEFAULT_WINDOW_SCALE 4
-#define RETRO_DISABLE_CONTROLLER_HOTSWAP
-#define RETRO_DISABLE_SETTINGS_SAVE
-#define RETRO_DISABLE_LOG
-#define RETRO_FILE_COMMIT_FUNC commitSave
 #else
 #define BASE_PATH            ""
-#define BASE_RO_PATH         ""
-#define DEFAULT_SCREEN_XSIZE 424 
+#define DEFAULT_SCREEN_XSIZE 424
 #define DEFAULT_FULLSCREEN   false
 #define SCREEN_YSIZE         (240)
 #define RETRO_USING_MOUSE
 #define RETRO_USING_TOUCH
-#define RETRO_USING_KEYBOARD
-
-#endif
-
-#ifndef DEFAULT_WINDOW_SCALE
-#define DEFAULT_WINDOW_SCALE 2
-#endif
-
-#ifndef RETRO_FILE_COMMIT_FUNC
-#define RETRO_FILE_COMMIT_FUNC(x)
 #endif
 
-#if RETRO_PLATFORM == RETRO_WINDOWS || RETRO_PLATFORM == RETRO_OSX || RETRO_PLATFORM == RETRO_VITA || RETRO_PLATFORM == RETRO_NX
+#if RETRO_PLATFORM == RETRO_WINDOWS || RETRO_PLATFORM == RETRO_OSX || RETRO_PLATFORM == RETRO_VITA
 #define RETRO_USING_SDL (1)
 #else // Since its an else & not an elif these platforms probably aren't supported yet
 #define RETRO_USING_SDL (0)