fix: update fork and cicd

TheGalacticCouncil · Jan 9, 2024 · 92e5a21 · 92e5a21
1 parent 3cd949c
commit 92e5a21
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -29,7 +29,7 @@ jobs:
       - name: SeriousProton Checkout
         uses: actions/checkout@v2
         with:
-          repository: daid/SeriousProton
+          repository: TheGalacticCouncil/SeriousProton
           path: SeriousProton
           ref: master
       - name: EmptyEpsilon Checkout
@@ -55,7 +55,7 @@ jobs:
       - name: SeriousProton Checkout
         uses: actions/checkout@v2
         with:
-          repository: daid/SeriousProton
+          repository: TheGalacticCouncil/SeriousProton
           path: SeriousProton
           ref: master
       - name: EmptyEpsilon Checkout
@@ -78,7 +78,7 @@ jobs:
     steps:
       - name: Dependencies
         run: |
-          $sdl_version = "2.0.16"
+          $sdl_version = "2.28.5"
           $sdl_link = "https://libsdl.org/release/SDL2-devel-$sdl_version-VC.zip"
           $sdl_zip = "$env:GITHUB_WORKSPACE/sdl-dev.zip"
           (new-object System.Net.WebClient).DownloadFile($sdl_link, $sdl_zip)
@@ -113,7 +113,7 @@ jobs:
       - name: SeriousProton Checkout
         uses: actions/checkout@v2
         with:
-          repository: daid/SeriousProton
+          repository: TheGalacticCouncil/SeriousProton
           path: SeriousProton
           ref: master
       - name: Create Build Environment

diff --git a/docker/build.sh b/docker/build.sh
@@ -24,7 +24,7 @@ do
     continue
   fi
   SERIOUS_PROTON_BRANCH="${git_ref_name}"
-  output="$(git ls-remote --heads https://github.com/Daid/SeriousProton "${SERIOUS_PROTON_BRANCH}")"
+  output="$(git ls-remote --heads https://github.com/TheGalacticCouncil/SeriousProton "${SERIOUS_PROTON_BRANCH}")"
   if [ -n "${output}" ]; then
     echo "Found SeriousProton branch [${SERIOUS_PROTON_BRANCH}]."
     break
@@ -35,7 +35,7 @@ done
 
 echo "Using SeriousProton branch ${SERIOUS_PROTON_BRANCH} ..."
 
-git clone --depth=1 -b "${SERIOUS_PROTON_BRANCH}" https://github.com/Daid/SeriousProton.git "${PROJECT_DIR}"/SeriousProton
+git clone --depth=1 -b "${SERIOUS_PROTON_BRANCH}" https://github.com/TheGalacticCouncil/SeriousProton.git "${PROJECT_DIR}"/SeriousProton
 
 mkdir build
 cd build

diff --git a/src/screenComponents/shieldFreqencySelect.cpp b/src/screenComponents/shieldFreqencySelect.cpp
@@ -18,7 +18,7 @@ GuiShieldFrequencySelect::GuiShieldFrequencySelect(GuiContainer* owner, string i
 
     new_frequency = new GuiSelector(calibration_row, "", [this](int selected_shield_frequency, string value) {
         if (my_spaceship) {
-            my_spaceship->selected_shield_frequency = selected_shield_frequency;
+            my_spaceship->commandSetShieldFrequencySelection(selected_shield_frequency);
         }
     });
     new_frequency->setSize(120, 50);

diff --git a/src/spaceObjects/playerSpaceship.cpp b/src/spaceObjects/playerSpaceship.cpp
@@ -1863,22 +1863,26 @@ void PlayerSpaceship::onReceiveClientCommand(int32_t client_id, sp::io::DataBuff
             int32_t new_frequency;
             packet >> new_frequency;
 
-            if (new_frequency < 0)
+            selected_shield_frequency = new_frequency;
+
+            if (selected_shield_frequency < 0)
                 selected_shield_frequency = 0;
-            if (new_frequency > SpaceShip::max_frequency)
+            if (selected_shield_frequency > SpaceShip::max_frequency)
                 selected_shield_frequency = SpaceShip::max_frequency;
-            else
-                selected_shield_frequency = new_frequency;
         }
         break;
     case CMD_SET_NEXT_SHIELD_FREQUENCY_SELECTION:
+        std::cout << "processing CMD_SET_NEXT_SHIELD_FREQUENCY_SELECTION" << std::endl;
+        std::cout << selected_shield_frequency << std::endl;
         if (shield_calibration_delay <= 0.0) // TODO: Is it ok to change target while calibrating? I'd say no.
         {
             if (selected_shield_frequency != SpaceShip::max_frequency)
                 ++selected_shield_frequency;
         }
         break;
     case CMD_SET_PREVIOUS_SHIELD_FREQUENCY_SELECTION:
+        std::cout << "processing CMD_SET_PREVIOUS_SHIELD_FREQUENCY_SELECTION" << std::endl;
+        std::cout << selected_shield_frequency << std::endl;
         if (shield_calibration_delay <= 0.0) // TODO: Is it ok to change target while calibrating? I'd say no.
         {
             if (selected_shield_frequency != 0)
@@ -2356,13 +2360,15 @@ void PlayerSpaceship::commandSetShieldFrequencySelection(int32_t frequency)
 
 void PlayerSpaceship::commandSetNextShieldFrequencySelection()
 {
+    std::cout << "commandSetNextShieldFrequencySelection() called" << std::endl;
     sp::io::DataBuffer packet;
     packet << CMD_SET_NEXT_SHIELD_FREQUENCY_SELECTION;
     sendClientCommand(packet);
 }
 
 void PlayerSpaceship::commandSetPreviousShieldFrequencySelection()
 {
+    std::cout << "commandSetPreviousShieldFrequencySelection() called" << std::endl;
     sp::io::DataBuffer packet;
     packet << CMD_SET_PREVIOUS_SHIELD_FREQUENCY_SELECTION;
     sendClientCommand(packet);