Изменены пункты меню для сохранения

Author: AlexandrKozlovskiy

PlainInstead.cpp

@@ -109,10 +109,10 @@ BEGIN_MESSAGE_MAP(CPlainInsteadApp, CWinApp)
 	//ON_COMMAND(ID_FILE_NEW, &CWinApp::OnFileNew)
 	//ON_COMMAND(ID_FILE_NEW_GAME, OnFileNewGame)
 	ON_COMMAND(	ID_FILE_OPEN,  OnFileOpen)
-	ON_COMMAND(ID_FILE_OPEN_WITH_RELOAD, OnFileOpenWithReload)
+	ON_COMMAND(ID_FILE_OPEN_WITHOUT_RELOAD, OnFileOpenWithoutReload)
 	ON_COMMAND(ID_FILE_SAVE_GAME, OnFileSave)
 	ON_UPDATE_COMMAND_UI(ID_FILE_OPEN, &CPlainInsteadApp::OnUpdateFileOpen)
-	ON_UPDATE_COMMAND_UI(ID_FILE_OPEN_WITH_RELOAD, &CPlainInsteadApp::OnUpdateFileOpen)
+	ON_UPDATE_COMMAND_UI(ID_FILE_OPEN_WITHOUT_RELOAD, &CPlainInsteadApp::OnUpdateFileOpen)
 	ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_GAME, &CPlainInsteadApp::OnUpdateFileSaveGame)
 	ON_COMMAND(ID_VIEW_FULL_HIST, &CPlainInsteadApp::OnViewFullHist)
 	ON_COMMAND(ID_VIEW_PREV_HIST, &CPlainInsteadApp::OnViewPrevHist)
@@ -504,11 +504,11 @@ void CPlainInsteadApp::OnFileOpen(boolean reload)
 		}
 	}
 void CPlainInsteadApp::OnFileOpen() {
-	OnFileOpen(false);
-}
-void CPlainInsteadApp::OnFileOpenWithReload() {
 	OnFileOpen(true);
 }
+void CPlainInsteadApp::OnFileOpenWithoutReload() {
+	OnFileOpen(false);
+}
 void CPlainInsteadApp::StartNewGameFile(CString file, CString name)
 {
 	millis = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();

PlainInstead.h

@@ -38,7 +38,7 @@ int soundsVolumeBeforeMute;
 protected:
 void OnFileOpen(boolean reload);
 void OnFileOpen();
-	void OnFileOpenWithReload();
+	void OnFileOpenWithoutReload();
 	void OnFileSave();
     //void OnFileNewGame();
 	afx_msg void OnAppAbout();

PlainInstead.rc

@@ -113,7 +113,7 @@ BEGIN
         MENUITEM "&�������� ���\t\tCtrl+M",     ID_OPEN_MANAGER
         MENUITEM "&�������� ���� � ����������\t\tCtrl+N", ID_ADD_GAME_TO_LIB
         MENUITEM "&������� ����������\tCtrl+O", ID_FILE_OPEN
-        MENUITEM "&������� ���������� � ������������� ����������\tCtrl+Shift+O", ID_FILE_OPEN_WITH_RELOAD
+        MENUITEM "&������� ���������� ��� ������������ ����������\tCtrl+Shift+O", ID_FILE_OPEN_WITHOUT_RELOAD
         MENUITEM "��&������� ����\tCtrl+S",     ID_FILE_SAVE_GAME
         MENUITEM "������ ���� &������\tCtrl+R", ID_RESTART_MENU
         MENUITEM SEPARATOR
@@ -170,7 +170,7 @@ BEGIN
     "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
     "T",            ID_ENTER_SETUP,         VIRTKEY, CONTROL, NOINVERT
     "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
-    "O",            ID_FILE_OPEN_WITH_RELOAD, VIRTKEY, SHIFT, CONTROL, NOINVERT
+    "O",            ID_FILE_OPEN_WITHOUT_RELOAD, VIRTKEY, SHIFT, CONTROL, NOINVERT
     "S",            ID_FILE_SAVE_GAME,      VIRTKEY, CONTROL, NOINVERT
     VK_F3,          ID_FIND_NEXT,           VIRTKEY, NOINVERT
     "F",            ID_FIND_TEXT,           VIRTKEY, CONTROL, NOINVERT

resource.h

@@ -171,7 +171,7 @@
 #define ID_32912                        32912
 #define ID_Menu                         32913
 #define ID_Menu32914                    32914
-#define ID_FILE_OPEN_WITH_RELOAD        32915
+#define ID_FILE_OPEN_WITHOUT_RELOAD        32915
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED