Changed beta updater channel to use a separate devmessages.txt file

hikari-no-yume · Jan 29, 2012 · 1ed6e84 · 1ed6e84
1 parent 946121c
commit 1ed6e84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 38 deletions.
diff --git a/Source/gg2/Objects/Menus/DevMessageChecker.events/Create.xml b/Source/gg2/Objects/Menus/DevMessageChecker.events/Create.xml
@@ -15,7 +15,10 @@
       <arguments>
         <argument kind="STRING">var host, path;
 host = "www.ganggarrison.com";
-path = "/devmessages.txt";
+if(global.updaterBetaChannel)
+    path = "/devmessages_beta.txt";
+else
+    path = "/devmessages.txt";
 
 socket = noone;
 

diff --git a/Source/gg2/Objects/Menus/DevMessageChecker.events/Step.xml b/Source/gg2/Objects/Menus/DevMessageChecker.events/Step.xml
@@ -47,21 +47,14 @@ if(tcp_eof(socket)) {
     messageArray[a] = response;
     a += 1;
 
-    var c, latestVersion, latestVersionMessage, latestVersionChannel;
-    latestVersion = VERSION;
-    latestVersionMessage = "";
-    latestVersionChannel = "";
+    var c;
     for(c = 0; c &lt; a; c += 2)
     {
         switch(messageArray[c])
         {
         case "ShowMessage":
             show_message(messageArray[c+1]);
             break;
-        case "BetaVersion":
-            if(not global.updaterBetaChannel)
-                break;
-            // deliberate fall-through
         case "Version":
             versioncheck = (messageArray[c+1]);
             versionend = string_pos("!",versioncheck);
@@ -70,26 +63,16 @@ if(tcp_eof(socket)) {
             changes=string_copy(versioncheck,versionend+1,changeslength);
             if(real(version) &gt; VERSION)
             {
-                latestVersion = real(version);
-                latestVersionMessage = changes;
-                if(messageArray[c]=="BetaVersion")
-                    latestVersionChannel = "beta";
-                else
-                    latestVersionChannel = "release";
+                update = show_message_ext("Updates have been made to Gang Garrison 2!##"+changes,"Update","Cancel","");
+                if (update == 1){
+                    room_goto(UpdaterRoom);
+                    exit;
+                }
             }
             break;
         }
     }
 
-    if(latestVersion &gt; VERSION) {
-        update = show_message_ext("Updates have been made to Gang Garrison 2!##"+latestVersionMessage,"Update","Cancel","");
-        if (update == 1){
-            global.updateDownloadChannel = latestVersionChannel;
-            room_goto(UpdaterRoom);
-            exit;
-        }
-    }
-
     instance_destroy();
     exit;
 }

diff --git a/Source/gg2/Objects/Updater.events/Create.xml b/Source/gg2/Objects/Updater.events/Create.xml
@@ -24,21 +24,10 @@ window_oldfullscreen = window_get_fullscreen();
 window_set_fullscreen(false);
 window_set_showborder(false);
 
-switch(global.updateDownloadChannel)
-{
-case "release":
+if(global.updaterBetaChannel)
+    updaterSuffix = "_beta";
+else
     updaterSuffix = "";
-    break;
-case "beta":
-    updaterSuffix = "beta";
-    break;
-default:
-    show_message("Error updating: Unknown update channel "+global.updateDownloadChannel);
-    window_set_showborder(window_oldshowborder);
-    window_set_fullscreen(window_oldfullscreen);
-    room_goto_fix(Menu);
-    exit;
-}
 
 if(file_exists("gg2update.exe"))
     file_delete("gg2update.exe");