--- AE/Installer/trunk/source/aeinstallerapp.cpp 2010/03/27 03:48:25 504 +++ AE/Installer/trunk/source/aeinstallerapp.cpp 2010/05/29 12:26:47 555 @@ -114,9 +114,9 @@ bool AEInstallerApp::OnInit() if (updateStatus) // updateStatus was set when MainWindow::CreateControls() was called during initialization of the window { - string updateMsg = "An update for the Anniversary Edition is available.\n"; // for some reason we can't set the initial value while using the '+' operator... - updateMsg = updateMsg + "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n" + - "(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command + string updateMsg = "An update for the Anniversary Edition is available.\n" + "Do you wish to update to Edition version " + updateAE.AEVersion + "?\n" + "(Current version is " + currentAE.AEVersion + ")\n"; // ...so we tack the rest on in a second command wxMessageDialog* updateNotification; switch (updateStatus) // for the meanings of these return values, see the comments preceding installer.cpp's GetUpdateStatus() @@ -130,7 +130,7 @@ bool AEInstallerApp::OnInit() break; case UPDATE_MNTH_REQD_ERR: updateMsg = "There is a patch in the updates/ folder, but it patches the\n"; - updateMsg = updateMsg + updateAE.AEVersion.substr(0, updateAE.AEVersion.length() - 1) + " release; it cannot update this version of the Edition."; + updateMsg = updateMsg + updateAE.AEVersion + " release; it cannot update this version of the Edition."; updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxOK | wxICON_EXCLAMATION, wxDefaultPosition); updateNotification->ShowModal(); break; @@ -139,14 +139,14 @@ bool AEInstallerApp::OnInit() if (updateNotification->ShowModal() == wxID_YES) ProcessAEUpdate(¤tAE, &updateAE, &installerJustUpdated); break; - case UPDATE_THIRD_PARTY: // there's an update with no globalization or Installer strings attached - updateMsg = (string)"One or more third party update(s) for Anniversary Edition package(s) are available.\n" + - (string)"Please note that the AE team assumes no responsibility for the content of third party mods" + - (string)"nor effects that a third party mod may have on your install.\n" + + case UPDATE_PKG_AVAIL: // there's an update with no globalization or Installer strings attached + updateMsg = (string)"One or more individual package updates for the Anniversary Edition are available.\n\n" + + (string)"Please note that the AE team assumes no responsibility for the content of third party mods, " + + (string)"nor effects that a third party mod may have on your install.\n\n" + (string)"Do you wish to install these update(s)?"; updateNotification = new wxMessageDialog(TheWindow, updateMsg.c_str(), "AE Installer Alert", wxYES_NO | wxICON_EXCLAMATION, wxDefaultPosition); if (updateNotification->ShowModal() == wxID_YES) - ProcessThirdPartyUpdates(); + ProcessPackageUpdates("../updates", "./packages"); break; case UPDATE_GLOB_AVAIL: // there's an update with globalization strings attached updateMsg = updateMsg + "**Note that the update requires you to reglobalize, which will take 5-20 minutes.**\n" +