Fixed bug in ABC res patch after cleaning up code.

.github/workflows/main.yml

@@ -35,14 +35,22 @@ jobs:
       - name: Display Downloaded Artifacts
         run: find ./artifacts/
 
+      - name: Add 161 to github.run_number
+        run: |
+          NEW_RUN_NUMBER=$(( ${{ github.run_number }} + 161 ))
+          echo "NEW_RUN_NUMBER=$NEW_RUN_NUMBER" >> $GITHUB_ENV
+
+#      - name: Display Updated Number
+#        run: echo "Updated Run Number: ${{ env.NEW_RUN_NUMBER }}"
+
       - name: Create Preview Release
         if: github.ref == 'refs/heads/master'
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: v${{ github.run_number }}
+          automatic_release_tag: v${{ env.NEW_RUN_NUMBER }}
           prerelease: false
-          title: "Build v${{ github.run_number }}"
+          title: "Build v${{ env.NEW_RUN_NUMBER }}"
           files: |
             ./artifacts/linux-flatpak/lindbergh-loader.flatpak
             ./artifacts/linux-build/build.tar.gz

src/lindbergh/evdevinput.c

@@ -922,11 +922,11 @@ static ControllerStatus listControllers(Controllers *controllers)
                     strcat(controllerInput->inputName, "_");
                     strcat(controllerInput->inputName, codename(EV_KEY, code));
                     normaliseName(controllerInput->inputName);
-                    //                    if(snprintf(controllerInput->inputTechName, SIZE, "%s:KEY:%i", controllers->controller[i].path,
+                    if (snprintf(controllerInput->inputTechName, SIZE, "%s:KEY:%i", controllers->controller[i].path, code) >= 1024)
-                    //                    code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //		    strcpy(controllerInput->inputTechNegName, "-"); // unassignable value (not "" while some conf are empty)
+                    strcpy(controllerInput->inputTechNegName, "-"); // unassignable value (not "" while some conf are empty)
                 }
             }
         }
@@ -948,14 +948,14 @@ static ControllerStatus listControllers(Controllers *controllers)
                     strcat(controllerInput->inputName, "_");
                     strcat(controllerInput->inputName, codename(EV_ABS, code));
                     normaliseName(controllerInput->inputName);
-                    //                    if(snprintf(controllerInput->inputTechName, SIZE, "%s:ABS:%i", controllers->controller[i].path,
+                    if (snprintf(controllerInput->inputTechName, SIZE, "%s:ABS:%i", controllers->controller[i].path, code) >= 1024)
-                    //                    code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //                    if(snprintf(controllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i",
+                    if (snprintf(controllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i", controllers->controller[i].path, code) >= 1024)
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
 
                     ControllerInput *minControllerInput =
                         &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
@@ -964,14 +964,15 @@ static ControllerStatus listControllers(Controllers *controllers)
                     minControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MIN;
                     strcpy(minControllerInput->inputName, controllerInput->inputName);
                     strcat(minControllerInput->inputName, "_MIN");
-                    //                    if(snprintf(minControllerInput->inputTechName, SIZE, "%s:ABS:%i:MIN",
+                    if (snprintf(minControllerInput->inputTechName, SIZE, "%s:ABS:%i:MIN", controllers->controller[i].path, code) >= 1024)
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //                    if(snprintf(minControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MIN",
+                    if (snprintf(minControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MIN", controllers->controller[i].path, code) >=
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                        1024)
-                    //                      // hum ok, truncated value
+                    {
-                    //                    }
+                        // hum ok, truncated value
+                    }
 
                     ControllerInput *maxControllerInput =
                         &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
@@ -980,27 +981,28 @@ static ControllerStatus listControllers(Controllers *controllers)
                     maxControllerInput->specialFunction = ANALOGUE_TO_DIGITAL_MAX;
                     strcpy(maxControllerInput->inputName, controllerInput->inputName);
                     strcat(maxControllerInput->inputName, "_MAX");
-                    //                    if(snprintf(maxControllerInput->inputTechName, SIZE, "%s:ABS:%i:MAX",
+                    if (snprintf(maxControllerInput->inputTechName, SIZE, "%s:ABS:%i:MAX", controllers->controller[i].path, code) >= 1024)
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                    {
-                    //                      // hum ok, truncated value
+                        // hum ok, truncated value
-                    //                    }
+                    }
-                    //                    if(snprintf(maxControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MAX",
+                    if (snprintf(maxControllerInput->inputTechNegName, SIZE, "%s:ABS_NEG:%i:MAX", controllers->controller[i].path, code) >=
-                    //                    controllers->controller[i].path, code) >= 1024) {
+                        1024)
-                    //                      // hum ok, truncated value
+                    {
-                    //                    }
+                        // hum ok, truncated value
+                    }
+
+                    ControllerInput *shakeControllerInput = &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
+                    shakeControllerInput->evType = EV_ABS;
+                    shakeControllerInput->evCode = code;
+                    shakeControllerInput->specialFunction = ANALOGUE_SHAKE;
+                    strcpy(shakeControllerInput->inputName, controllerInput->inputName);
+                    strcat(shakeControllerInput->inputName, "_SHAKE");
+                    if (snprintf(shakeControllerInput->inputTechName, SIZE, "%s:ABS:%i:SHAKE", controllers->controller[i].path, code) >=
+                        1024)
+                    {
+                        // hum ok, truncated value
+                    }
 
-                    //		    ControllerInput *shakeControllerInput =
-                    //		      &controllers->controller[i].inputs[controllers->controller[i].inputCount++];
-                    //                    shakeControllerInput->evType = EV_ABS;
-                    //                    shakeControllerInput->evCode = code;
-                    //                    shakeControllerInput->specialFunction = ANALOGUE_SHAKE;
-                    //                    strcpy(shakeControllerInput->inputName, controllerInput->inputName);
-                    //                    strcat(shakeControllerInput->inputName, "_SHAKE");
-                    //                    if(snprintf(shakeControllerInput->inputTechName, SIZE, "%s:ABS:%i:SHAKE",
-                    //                    controllers->controller[i].path, code) >= 1024) {
-                    //                      // hum ok, truncated value
-                    //                    }
-                    //
                     struct input_absinfo absoluteFeatures;
                     ioctl(controller, EVIOCGABS(code), &absoluteFeatures);
                     controllers->controller[i].absMin[code] = absoluteFeatures.minimum;

src/lindbergh/input.c

@@ -621,10 +621,13 @@ void sdlEventShooting(SDL_Event *event)
             setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
 
         else if (event->key.keysym.sym == SDLK_x)
-            setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
+            setSwitch(PLAYER_2, BUTTON_2, event->type == SDL_KEYDOWN);
 
         else if (event->key.keysym.sym == SDLK_c)
-            setSwitch(PLAYER_2, BUTTON_1, event->type == SDL_KEYDOWN);
+            setSwitch(PLAYER_2, BUTTON_3, event->type == SDL_KEYDOWN);
+
+        else if (event->key.keysym.sym == SDLK_v)
+            setSwitch(PLAYER_2, BUTTON_4, event->type == SDL_KEYDOWN);
 
         else if (event->key.keysym.sym == SDLK_u)
             setSwitch(PLAYER_2, BUTTON_UP, event->type == SDL_KEYDOWN);

src/lindbergh/resolution.c

@@ -370,8 +370,8 @@ int isTestMode()
 
 void myGlBindTexture(GLenum target, GLuint texture)
 {
-    // const char *targetName = "";
+    curTarget = target;
-    // switch (target)
+    curTextureID = texture;
 
     void (*_glBindTexture)(GLenum, GLuint) = dlsym(RTLD_NEXT, "glBindTexture");
     _glBindTexture(target, texture);