Push changes

Project64Netplay · Jun 5, 2021 · ad3835b · ad3835b
1 parent 7d9d5ee
commit ad3835b
Show file tree

Hide file tree

Showing 8 changed files with 979 additions and 971 deletions.
diff --git a/Source/Project64-core/Version.h b/Source/Project64-core/Version.h
@@ -16,7 +16,7 @@
 
 #define VER_FILE_DESCRIPTION_STR    "Project64 Netplay"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
-#define VER_FILE_VERSION_STR        "June 4, 2021"
+#define VER_FILE_VERSION_STR        "June 5, 2021"
 
 
 #define VER_PRODUCTNAME_STR         "Project64 Netplay"

diff --git a/Source/Project64/UserInterface/MainMenuClass.cpp b/Source/Project64/UserInterface/MainMenuClass.cpp
@@ -14,7 +14,6 @@ m_ResetAccelerators(true),
 m_Gui(hMainWindow)
 {
     ResetMenu();
-	ShellExecute(NULL, NULL, "AutoUpdater.exe", "/A", NULL, SW_SHOWNORMAL);
     hMainWindow->SetWindowMenu(this);
 
     m_ChangeUISettingList.push_back(Info_ShortCutsChanged);
@@ -534,7 +533,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
     case ID_HELP_ABOUTSETTINGFILES: m_Gui->AboutIniBox(); break;
 	case ID_NETPLAY_REPLACESAVES: ShellExecute(NULL, "open", "Replace.bat", NULL, NULL, SW_SHOWMAXIMIZED); break;
 	case ID_NETPLAY_ME: ShellExecute(NULL, "open", "https://discord.com/invite/F55qYKm", NULL, NULL, SW_SHOWMAXIMIZED); break;
-	case ID_NETPLAY_UPDATE_EMU: ShellExecute(NULL, NULL, "AutoUpdater.exe", "/A", NULL, SW_SHOWNORMAL); break;
+	case ID_NETPLAY_UPDATE_EMU: ShellExecute(NULL, "open", "Updater.bat", NULL, NULL, SW_SHOWMAXIMIZED); break;
 
     default:
         if (MenuID >= ID_RECENT_ROM_START && MenuID < ID_RECENT_ROM_END)

diff --git a/Source/UserFiles/Config/Project64.cfg b/Source/UserFiles/Config/Project64.cfg
@@ -1,16 +1,11 @@
-[2829657E-A0621877-C:45]
-Cheat0=1
-Cheat1=1
-
 [7C3829D9-6E8247CE-C:45]
 Cheat0=1
 Cheat33=1
 Cheat34=1
 Cheat36=1
 Cheat37=1
 Cheat38=1
-Cheat41=1
-Cheat43=1
+Cheat42=1
 
 [9EA95858-AF72B618-C:45]
 Cheat0=1
@@ -20,44 +15,39 @@ Cheat29=1
 Cheat30=1
 Cheat31=1
 Cheat37=1
-Cheat38=1
 
 [45273CD7-9E783101-C:45]
 Cheat0=1
-Cheat27=1
-Cheat28=1
-Cheat29=1
-Cheat30=1
-Cheat31=1
+Cheat33=1
+Cheat34=1
+Cheat36=1
 Cheat37=1
 Cheat38=1
+Cheat42=1
 
 [4520A1AF-D513BD4D-C:45]
 Cheat0=1
-Cheat27=1
-Cheat28=1
-Cheat29=1
-Cheat30=1
-Cheat31=1
+Cheat33=1
+Cheat34=1
+Cheat36=1
 Cheat37=1
 Cheat38=1
+Cheat42=1
 
 [45220719-B1D316DD-C:45]
 Cheat0=1
-Cheat27=1
-Cheat28=1
-Cheat29=1
-Cheat30=1
-Cheat31=1
+Cheat33=1
+Cheat34=1
+Cheat36=1
 Cheat37=1
 Cheat38=1
+Cheat42=1
 
 [453C9FCD-B3AB05D9-C:45]
 Cheat0=1
-Cheat27=1
-Cheat28=1
-Cheat29=1
-Cheat30=1
-Cheat31=1
+Cheat33=1
+Cheat34=1
+Cheat36=1
 Cheat37=1
 Cheat38=1
+Cheat42=1
diff --git a/Source/UserFiles/Config/Project64.cht b/Source/UserFiles/Config/Project64.cht
diff --git a/Source/UserFiles/Plugin/Updater/7z.dll b/Source/UserFiles/Plugin/Updater/7z.dll
diff --git a/Source/UserFiles/Plugin/Updater/7z.exe b/Source/UserFiles/Plugin/Updater/7z.exe
diff --git a/Source/UserFiles/Plugin/Updater/wget.exe b/Source/UserFiles/Plugin/Updater/wget.exe
diff --git a/Source/UserFiles/Updater.bat b/Source/UserFiles/Updater.bat
@@ -0,0 +1,32 @@
+@echo off
+title Project 64 Netplay Updater
+:choice
+set /P c=Are you sure you want to continue[Y/N]?
+if /I "%c%" EQU "Y" goto :Start
+if /I "%c%" EQU "N" goto :Exit
+goto :Exit
+
+:Start
+TASKKILL /IM "Project64 Netplay.exe" /F
+"Plugin/Updater/wget.exe" https://github.com/Project64Netplay/Compiled/archive/refs/heads/main.zip
+"Plugin/Updater/7z.exe" x main.zip
+cd Plugin
+cd GFX
+move GlideN64.ini ..\..\
+cd ..\..\
+rmdir Config /s
+rmdir Plugin /s
+rmdir Save /s
+cd Compiled-main
+move Config ..\
+move Plugin ..\
+move Save ..\
+move "Project64 Netplay.exe" ..\
+cd ..\
+rmdir Compiled-main /s
+DEL main.zip
+move GlideN64.ini Plugin\GFX
+move NRage.ini Config
+move Project64.cfg Config
+:Exit
+EXIT