* disabled changing PPU/PAL/input_type when Taseditor is engaged

* Tasedit: File->Recent projects
* enhanced Reload hotkey (Ctrl-F1), now it loads last ROM or last TAS Editor project

src/drivers/win/config.cpp

@@ -89,6 +89,7 @@ extern int TasEdit_undo_levels;
 extern int TASEdit_autosave_period;
 extern bool TASEdit_jump_to_undo;
 extern int TASEdit_last_export_type;
+extern char* recent_projects[];
 
 //window positions and sizes:
 extern int ChtPosX,ChtPosY;
@@ -164,6 +165,17 @@ static CFGSTRUCT fceuconfig[] = {
 	ACS(ramWatchRecent[3]),
 	ACS(ramWatchRecent[4]),
 
+	ACS(recent_projects[0]),
+	ACS(recent_projects[1]),
+	ACS(recent_projects[2]),
+	ACS(recent_projects[3]),
+	ACS(recent_projects[4]),
+	ACS(recent_projects[5]),
+	ACS(recent_projects[6]),
+	ACS(recent_projects[7]),
+	ACS(recent_projects[8]),
+	ACS(recent_projects[9]),
+
 	AC(gNoBGFillColor),
 	AC(ntsccol),AC(ntsctint),AC(ntschue),
 

src/drivers/win/input.cpp

@@ -1274,6 +1274,16 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 
 		UpdateFourscoreState(hwndDlg);
 
+		if(FCEUMOV_Mode(MOVIEMODE_TASEDIT))
+		{
+			// disable changing fourscore and ports
+			EnableWindow(GetDlgItem(hwndDlg, CHECK_ENABLE_FOURSCORE), false);
+			EnableWindow(GetDlgItem(hwndDlg, CHECK_ENABLE_MICROPHONE), false);
+			EnableWindow(GetDlgItem(hwndDlg, COMBO_PAD1), false);
+			EnableWindow(GetDlgItem(hwndDlg, COMBO_PAD2), false);
+			EnableWindow(GetDlgItem(hwndDlg, COMBO_FAM), false);
+		}
+
 		break;
 
 	case WM_CLOSE:

src/drivers/win/mapinput.cpp

@@ -70,7 +70,7 @@ static struct
 	{ EMUCMD_SCRIPT_RELOAD,				SCAN_L | CMD_KEY_SHIFT,		},
 	{ EMUCMD_OPENROM,					SCAN_O | CMD_KEY_CTRL,	    },
 	{ EMUCMD_CLOSEROM,					SCAN_W | CMD_KEY_CTRL,		},
-	{ EMUCMD_RELOADROM,					SCAN_R | CMD_KEY_CTRL  | CMD_KEY_SHIFT ,	},
+	{ EMUCMD_RELOAD,					SCAN_F1 | CMD_KEY_CTRL ,	},
 	{ EMUCMD_MISC_UNDOREDOSAVESTATE,	SCAN_Z | CMD_KEY_CTRL, },
 	{ EMUCMD_MISC_TOGGLEFULLSCREEN,		SCAN_ENTER | CMD_KEY_ALT, },
 	{ EMUCMD_TASEDIT_REWIND,		SCAN_GRAVE, },

src/drivers/win/memview.cpp

@@ -140,7 +140,7 @@ int TableFileLoaded;
 
 int MemView_wndx, MemView_wndy;
 int MemFind_wndx, MemFind_wndy;
-int MemViewSizeX=625,MemViewSizeY=242;
+int MemViewSizeX = 580, MemViewSizeY = 248;
 static RECT newMemViewRect;
 
 static char chartable[256];
@@ -1716,7 +1716,7 @@ void DoMemView() {
 		hMemView = CreateWindowEx(0,"MEMVIEW","Memory Editor",
 			//WS_OVERLAPPEDWINDOW|WS_CLIPSIBLINGS,  /* Style */
 			WS_SYSMENU|WS_MAXIMIZEBOX|WS_MINIMIZEBOX|WS_THICKFRAME|WS_VSCROLL,
-			CW_USEDEFAULT,CW_USEDEFAULT,625,242,  /* X,Y ; Width, Height */
+			CW_USEDEFAULT,CW_USEDEFAULT,580,248,  /* X,Y ; Width, Height */
 			NULL,NULL,fceu_hInstance,NULL ); 
 		ShowWindow (hMemView, SW_SHOW) ;
 		UpdateCaption();

src/drivers/win/tasedit.cpp

@@ -63,8 +63,14 @@ bool TASEdit_enable_hot_changes = true;
 bool TASEdit_jump_to_undo = true;
 int TASEdit_last_export_type = EXPORT_TYPE_1P;
 
+// Recent Menu
+HMENU recent_projects_menu;
+char* recent_projects[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+const unsigned int MENU_FIRST_RECENT_PROJECT = 55000;
+const unsigned int MAX_NUMBER_OF_RECENT_PROJECTS = sizeof(recent_projects)/sizeof(*recent_projects);
+
 // resources
-string tasedithelp = "{16CDE0C4-02B0-4A60-A88D-076319909A4D}"; //Name of TASEdit Help page
+string tasedithelp = "{16CDE0C4-02B0-4A60-A88D-076319909A4D}"; //Name of TAS Editor Help page
 char buttonNames[NUM_JOYPAD_BUTTONS][2] = {"A", "B", "S", "T", "U", "D", "L", "R"};
 char windowCaptioBase[] = "TAS Editor";
 extern char recordingCaptions[5][30];
@@ -767,14 +773,13 @@ void OpenProject()
 {
 	if (!AskSaveProject()) return;
 
-	const char filter[] = "TASEdit Project (*.tas)\0*.tas\0\0";
-
 	OPENFILENAME ofn;
 	memset(&ofn, 0, sizeof(ofn));
 	ofn.lStructSize = sizeof(ofn);
 	ofn.hwndOwner = hwndTasEdit;
 	ofn.hInstance = fceu_hInstance;
-	ofn.lpstrTitle = "Open TASEdit Project...";
+	ofn.lpstrTitle = "Open TAS Editor Project";
+	const char filter[] = "TAS Editor Project (*.tas)\0*.tas\0\0";
 	ofn.lpstrFilter = filter;
 
 	char nameo[2048];
@@ -788,21 +793,19 @@ void OpenProject()
 
 	if(GetOpenFileName(&ofn))							// If it is a valid filename
 	{
-		std::string tempstr = nameo;					//Make a temporary string for filename
+		// If they haven't put ".tas" after it, stick it on ourselves
-		char drv[512], dir[512], name[512], ext[512];	//For getting the filename!
+		if (!strstr(nameo, ".tas"))
-		if(tempstr.rfind(".tas") == std::string::npos)	//If they haven't put ".tas" after it, stick it on ourselves
+			strcat(nameo, ".tas");
-			tempstr.append(".tas");						
+		LoadProject(nameo);
-		splitpath(tempstr.c_str(), drv, dir, name, ext);	//Split the path...
+	}
-		project.SetProjectName(name);
+}
-		project.SetProjectFile(tempstr);
+bool LoadProject(char* fullname)
-		//Set the fm2 name
+{
-		std::string thisfm2name = name;
-		thisfm2name.append(".fm2");
-		project.SetFM2Name(thisfm2name);
 	// remember to update fourscore status
 	bool last_fourscore = currMovieData.fourscore;
-		// Load project
+	// try to load project
-		project.LoadProject(project.GetProjectFile());
+	if (project.load(fullname))
+	{
 		// update fourscore status
 		if (last_fourscore && !currMovieData.fourscore)
 		{
@@ -813,25 +816,52 @@ void OpenProject()
 			tasedit_list.AddFourscore();
 			FCEUD_SetInput(currMovieData.fourscore, currMovieData.microphone, (ESI)currMovieData.ports[0], (ESI)currMovieData.ports[1], (ESIFC)currMovieData.ports[2]);
 		}
+		UpdateRecentProjectsArray(fullname);
 		RedrawTasedit();
 		RedrawWindowCaption();
+		return true;
+	} else
+	{
+		// failed to load
+		RedrawTasedit();
+		RedrawWindowCaption();
+		return false;
+	}
+}
+void LoadRecentProject(int slot)
+{
+	char*& fname = recent_projects[slot];
+	if(fname && AskSaveProject())
+	{
+		if (!LoadProject(fname))
+		{
+			int result = MessageBox(hwndTasEdit, "Remove from list?", "Could Not Open Recent Project", MB_YESNO);
+			if (result == IDYES)
+				RemoveRecentProject(slot);
+		}
 	}
 }
 
 // Saves current project
 bool SaveProjectAs()
 {
-	const char filter[]="TASEdit Project (*.tas)\0*.tas\0All Files (*.*)\0*.*\0\0";
+	const char filter[] = "TAS Editor Project (*.tas)\0*.tas\0All Files (*.*)\0*.*\0\0";
 	OPENFILENAME ofn;
 	memset(&ofn, 0, sizeof(ofn));
 	ofn.lStructSize = sizeof(ofn);
 	ofn.hwndOwner = hwndTasEdit;
 	ofn.hInstance = fceu_hInstance;
-	ofn.lpstrTitle = "Save TASEdit Project As...";
+	ofn.lpstrTitle = "Save TAS Editor Project As...";
 	ofn.lpstrFilter = filter;
 
 	char nameo[2048];
+	if (project.GetProjectName().empty())
+		// suggest ROM name for this project
 		strcpy(nameo, mass_replace(GetRomName(), "|", ".").c_str());	//convert | to . for archive filenames
+	else
+		// suggest current name
+		strncpy(nameo, project.GetProjectName().c_str(), 2047);
+
 	ofn.lpstrFile = nameo;
 	ofn.lpstrDefExt = "tas";
 	ofn.nMaxFile = 2048;
@@ -841,16 +871,9 @@ bool SaveProjectAs()
 
 	if(GetSaveFileName(&ofn))								//If it is a valid filename
 	{
-		std::string tempstr = nameo;						//Make a temporary string for filename
+		project.RenameProject(nameo);
-		char drv[512], dir[512], name[512], ext[512];		//For getting the filename!
+		project.save();
-
+		UpdateRecentProjectsArray(nameo);
-		splitpath(tempstr.c_str(), drv, dir, name, ext);	//Split it up...
-		project.SetProjectName(name);
-		project.SetProjectFile(tempstr);
-		std::string thisfm2name = name;
-		thisfm2name.append(".fm2");							//Setup the fm2 name
-		project.SetFM2Name(thisfm2name);					//Set the project's fm2 name
-		project.saveProject();
 	} else return false;
 	// saved successfully - remove * mark from caption
 	RedrawWindowCaption();
@@ -858,7 +881,7 @@ bool SaveProjectAs()
 }
 bool SaveProject()
 {
-	if (!project.saveProject())
+	if (!project.save())
 		return SaveProjectAs();
 	else
 		RedrawWindowCaption();
@@ -885,7 +908,7 @@ bool AskSaveProject()
 extern bool LoadFM2(MovieData& movieData, EMUFILE* fp, int size, bool stopAfterHeader);
 void Import()
 {
-	const char filter[] = "FCEUX Movie Files, TASEdit Projects\0*.fm2;*.tas\0All Files (*.*)\0*.*\0\0";
+	const char filter[] = "FCEUX Movie Files, TAS Editor Projects\0*.fm2;*.tas\0All Files (*.*)\0*.*\0\0";
 	OPENFILENAME ofn;
 	memset(&ofn, 0, sizeof(ofn));
 	ofn.lStructSize = sizeof(ofn);
@@ -907,7 +930,7 @@ void Import()
 		MovieData md;
 		if (LoadFM2(md, &ifs, ifs.size(), false))
 		{
-			// loaded successfully, now register changes
+			// loaded successfully, now register input changes
 			char drv[512], dir[512], name[1024], ext[512];
 			splitpath(nameo, drv, dir, name, ext);
 			strcat(name, ext);
@@ -972,7 +995,8 @@ void Export()
 	if (DialogBox(fceu_hInstance, MAKEINTRESOURCE(IDD_TASEDIT_EXPORT), hwndTasEdit, ExportProc) > 0)
 	{
 		const char filter[] = "FCEUX Movie File (*.fm2)\0*.fm2\0All Files (*.*)\0*.*\0\0";
-		char fname[2048] = {0};
+		char fname[2048];
+		strcpy(fname, project.GetFM2Name().c_str());
 		OPENFILENAME ofn;
 		memset(&ofn, 0, sizeof(ofn));
 		ofn.lStructSize = sizeof(ofn);
@@ -1140,7 +1164,16 @@ BOOL CALLBACK WndprocTasEdit(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				LostFocus();
 			break;
 		case WM_COMMAND:
-			switch(LOWORD(wParam))
+			{
+				unsigned int loword_wparam = LOWORD(wParam);
+				// first check clicking Recent submenu item
+				if (loword_wparam >= MENU_FIRST_RECENT_PROJECT && loword_wparam < MENU_FIRST_RECENT_PROJECT + MAX_NUMBER_OF_RECENT_PROJECTS)
+				{
+					LoadRecentProject(loword_wparam - MENU_FIRST_RECENT_PROJECT);
+					break;
+				}
+				// then check all other commands
+				switch(loword_wparam)
 				{
 				case ID_FILE_OPENPROJECT:
 					OpenProject();
@@ -1193,7 +1226,7 @@ BOOL CALLBACK WndprocTasEdit(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					break;
 				case ID_HELP_TASEDITHELP:
 					OpenHelpWindow(tasedithelp);
-				//link to TASEdit in help menu
+					//link to TAS Editor in help menu
 					break;
 				case ACCEL_INS:
 				case ID_EDIT_INSERT:
@@ -1516,9 +1549,9 @@ BOOL CALLBACK WndprocTasEdit(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 						break;
 					}
 			
-
 				}
 				break;
+			}
 		case WM_SYSKEYDOWN:
 		{
 			if (wParam == VK_F10)
@@ -1554,6 +1587,8 @@ void EnterTasEdit()
 
 		hmenu = GetMenu(hwndTasEdit);
 		hrmenu = LoadMenu(fceu_hInstance,"TASEDITCONTEXTMENUS");
+		recent_projects_menu = CreateMenu();
+		UpdateRecentProjectsMenu();
 		// check option ticks
 		CheckDlgButton(hwndTasEdit, CHECK_FOLLOW_CURSOR, TASEdit_follow_playback?MF_CHECKED : MF_UNCHECKED);
 		CheckDlgButton(hwndTasEdit, CHECK_TURBO_SEEK, TASEdit_turbo_seek?MF_CHECKED : MF_UNCHECKED);
@@ -1595,7 +1630,7 @@ void EnterTasEdit()
 			FCEUI_StopMovie();
 			greenzone.TryDumpIncremental(lagFlag != 0);
 		}
-		// switch to tasedit mode
+		// switch to taseditor mode
 		movieMode = MOVIEMODE_TASEDIT;
 		currMovieData.ports[0] = SI_GAMEPAD;
 		currMovieData.ports[1] = SI_GAMEPAD;
@@ -1612,7 +1647,7 @@ void EnterTasEdit()
 		selection.init();
 		SetFocus(history.hwndHistoryList);		// set focus only once, to show selection cursor
 		SetFocus(tasedit_list.hwndList);
-		FCEU_DispMessage("Tasedit engaged", 0);
+		FCEU_DispMessage("TAS Editor engaged", 0);
 	}
 }
 
@@ -1629,7 +1664,7 @@ bool ExitTasEdit()
 	EnableAutosave = saved_EnableAutosave;
 	DoPriority();
 	UpdateCheckedMenuItems();
-	// clear "Background TASEdit input"
+	// clear "Background TAS Editor input"
 	KeyboardClearBackgroundAccessBit(KEYBACKACCESS_TASEDIT);
 	JoystickClearBackgroundAccessBit(JOYBACKACCESS_TASEDIT);
 	// release memory
@@ -1641,9 +1676,9 @@ bool ExitTasEdit()
 	history.free();
 	playback.SeekingStop();
 	selection.free();
-	// switch off tasedit mode
+	// switch off taseditor mode
 	movieMode = MOVIEMODE_INACTIVE;
-	FCEU_DispMessage("Tasedit disengaged", 0);
+	FCEU_DispMessage("TAS Editor disengaged", 0);
 	CreateCleanMovie();
 	return true;
 }
@@ -1651,15 +1686,116 @@ bool ExitTasEdit()
 void GotFocus()
 {
 	TASEdit_focus = true;
-	// set "Background TASEdit input"
+	// set "Background TAS Editor input"
 	KeyboardSetBackgroundAccessBit(KEYBACKACCESS_TASEDIT);
 	JoystickSetBackgroundAccessBit(JOYBACKACCESS_TASEDIT);
 }
 void LostFocus()
 {
 	TASEdit_focus = false;
-	// clear "Background TASEdit input"
+	// clear "Background TAS Editor input"
 	KeyboardClearBackgroundAccessBit(KEYBACKACCESS_TASEDIT);
 	JoystickClearBackgroundAccessBit(JOYBACKACCESS_TASEDIT);
 }
+// --------------------------------------------------------------------------------------------
+void UpdateRecentProjectsMenu()
+{
+	MENUITEMINFO moo;
+	int x;
+	moo.cbSize = sizeof(moo);
+	moo.fMask = MIIM_SUBMENU | MIIM_STATE;
+	GetMenuItemInfo(GetSubMenu(hmenu, 0), ID_TASEDIT_FILE_RECENT, FALSE, &moo);
+	moo.hSubMenu = recent_projects_menu;
+	moo.fState = recent_projects[0] ? MFS_ENABLED : MFS_GRAYED;
+	SetMenuItemInfo(GetSubMenu(hmenu, 0), ID_TASEDIT_FILE_RECENT, FALSE, &moo);
 
+	// Remove all recent files submenus
+	for(x = 0; x < MAX_NUMBER_OF_RECENT_PROJECTS; x++)
+	{
+		RemoveMenu(recent_projects_menu, MENU_FIRST_RECENT_PROJECT + x, MF_BYCOMMAND);
+	}
+	// Recreate the menus
+	for(x = MAX_NUMBER_OF_RECENT_PROJECTS - 1; x >= 0; x--)
+	{  
+		// Skip empty strings
+		if(!recent_projects[x]) continue;
+
+		string tmp = recent_projects[x];
+		// clamp this string to 128 chars
+		if(tmp.size() > 128)
+			tmp = tmp.substr(0, 128);
+
+		moo.cbSize = sizeof(moo);
+		moo.fMask = MIIM_DATA | MIIM_ID | MIIM_TYPE;
+		// Insert the menu item
+		moo.cch = tmp.size();
+		moo.fType = 0;
+		moo.wID = MENU_FIRST_RECENT_PROJECT + x;
+		moo.dwTypeData = (LPSTR)tmp.c_str();
+		InsertMenuItem(recent_projects_menu, 0, 1, &moo);
+	}
+
+	// if recent_projects is empty, "Recent" manu should be grayed
+	int i;
+	for (i = 0; i < MAX_NUMBER_OF_RECENT_PROJECTS; ++i)
+		if (recent_projects[i]) break;
+	if (i < MAX_NUMBER_OF_RECENT_PROJECTS)
+		EnableMenuItem(hmenu, ID_TASEDIT_FILE_RECENT, MF_ENABLED);
+	else
+		EnableMenuItem(hmenu, ID_TASEDIT_FILE_RECENT, MF_GRAYED);
+
+	DrawMenuBar(hwndTasEdit);
+}
+void UpdateRecentProjectsArray(const char* addString)
+{
+	// find out if the filename is already in the recent files list
+	for(unsigned int x = 0; x < MAX_NUMBER_OF_RECENT_PROJECTS; x++)
+	{
+		if(recent_projects[x])
+		{
+			if(!strcmp(recent_projects[x], addString))    // Item is already in list
+			{
+				// If the filename is in the file list don't add it again, move it up in the list instead
+				char* tmp = recent_projects[x];			// save pointer
+				for(int y = x; y; y--)
+					// Move items down.
+					recent_projects[y] = recent_projects[y - 1];
+				// Put item on top.
+				recent_projects[0] = tmp;
+				UpdateRecentProjectsMenu();
+				return;
+			}
+		}
+	}
+	// The filename wasn't found in the list. That means we need to add it.
+	// If there's no space left in the recent files list, get rid of the last item in the list
+	if(recent_projects[MAX_NUMBER_OF_RECENT_PROJECTS-1])
+		free(recent_projects[MAX_NUMBER_OF_RECENT_PROJECTS-1]);
+	// Move other items down
+	for(unsigned int x = MAX_NUMBER_OF_RECENT_PROJECTS-1; x; x--)
+		recent_projects[x] = recent_projects[x-1];
+	// Add new item
+	recent_projects[0] = (char*)malloc(strlen(addString) + 1);
+	strcpy(recent_projects[0], addString);
+
+	UpdateRecentProjectsMenu();
+}
+void RemoveRecentProject(unsigned int which)
+{
+	if (which >= MAX_NUMBER_OF_RECENT_PROJECTS) return;
+	// Remove the item
+	if(recent_projects[which])
+		free(recent_projects[which]);
+	// If the item is not the last one in the list, shift the remaining ones up
+	if (which < MAX_NUMBER_OF_RECENT_PROJECTS-1)
+	{
+		// Move the remaining items up
+		for(unsigned int x = which+1; x < MAX_NUMBER_OF_RECENT_PROJECTS; ++x)
+		{
+			recent_projects[x-1] = recent_projects[x];	// Shift each remaining item up by 1
+		}
+	}
+	recent_projects[MAX_NUMBER_OF_RECENT_PROJECTS-1] = 0;	// Clear out the last item since it is empty now
+
+	UpdateRecentProjectsMenu();
+}

src/drivers/win/tasedit.h

@@ -28,6 +28,8 @@ void RedrawTasedit();
 void RedrawWindowCaption();
 void ToggleJoypadBit(int column_index, int row_index, UINT KeyFlags);
 void OpenProject();
+bool LoadProject(char* fullname);
+void LoadRecentProject(int slot);
 bool SaveProject();
 bool SaveProjectAs();
 bool AskSaveProject();
@@ -49,3 +51,6 @@ bool PasteInsert();
 void GotFocus();
 void LostFocus();
 
+void UpdateRecentProjectsMenu();
+void UpdateRecentProjectsArray(const char* addString);
+void RemoveRecentProject(unsigned int which);

src/drivers/win/taseditlib/taseditproj.cpp

@@ -1,5 +1,6 @@
 //Implementation file of TASEdit Project class
 #include "taseditproj.h"
+#include "utils/xstring.h"
 
 extern MARKERS markers;
 extern BOOKMARKS bookmarks;
@@ -12,6 +13,7 @@ extern TASEDIT_LIST tasedit_list;
 extern TASEDIT_SELECTION selection;
 
 extern void FCEU_printf(char *format, ...);
+extern void FCEU_PrintError(char *format, ...);
 extern bool SaveProject();
 extern void RedrawWindowCaption();
 
@@ -24,9 +26,9 @@ TASEDIT_PROJECT::TASEDIT_PROJECT()
 void TASEDIT_PROJECT::init()
 {
 	// init new project
+	projectFile = "";
 	projectName = "";
 	fm2FileName = "";
-	projectFile="";
 
 	reset();
 }
@@ -47,7 +49,7 @@ void TASEDIT_PROJECT::update()
 	
 }
 
-bool TASEDIT_PROJECT::saveProject()
+bool TASEDIT_PROJECT::save()
 {
 	std::string PFN = GetProjectFile();
 	if (PFN.empty()) return false;
@@ -68,17 +70,20 @@ bool TASEDIT_PROJECT::saveProject()
 	this->reset();
 	return true;
 }
-
+bool TASEDIT_PROJECT::load(char* fullname)
-extern bool LoadFM2(MovieData& movieData, EMUFILE* fp, int size, bool stopAfterHeader);
-bool TASEDIT_PROJECT::LoadProject(std::string PFN)
 {
-	const char* filename = PFN.c_str();
+	EMUFILE_FILE ifs(fullname, "rb");
 
-	EMUFILE_FILE ifs(filename, "rb");
+	if(ifs.fail())
+	{
+		FCEU_PrintError("Error opening %s!", fullname);
+		return false;
+	}
 
-	FCEU_printf("\nLoading TASEdit project %s\n", filename);
+	FCEU_printf("\nLoading TAS Editor project %s...\n", fullname);
 
 	bool error;
+	extern bool LoadFM2(MovieData& movieData, EMUFILE* fp, int size, bool stopAfterHeader);
 	if (LoadFM2(currMovieData, &ifs, ifs.size(), false))
 	{
 		LoadSubtitles(currMovieData);
@@ -144,33 +149,34 @@ bool TASEDIT_PROJECT::LoadProject(std::string PFN)
 	playback.reset();
 	recorder.reset();
 	screenshot_display.reset();
+
 	reset();
+	RenameProject(fullname);
 	return true;
 }
+
+void TASEDIT_PROJECT::RenameProject(char* new_fullname)
+{
+	projectFile = new_fullname;
+	char drv[512], dir[512], name[512], ext[512];		// For getting the filename
+	splitpath(new_fullname, drv, dir, name, ext);
+	projectName = name;
+	std::string thisfm2name = name;
+	thisfm2name.append(".fm2");
+	fm2FileName = thisfm2name;
+}
 // -----------------------------------------------------------------
-std::string TASEDIT_PROJECT::GetProjectName()
-{
-	return projectName;
-}
-void TASEDIT_PROJECT::SetProjectName(std::string e)
-{
-	projectName = e;
-}
-std::string TASEDIT_PROJECT::GetFM2Name()
-{
-	return fm2FileName;
-}
-void TASEDIT_PROJECT::SetFM2Name(std::string e)
-{
-	fm2FileName = e;
-}
 std::string TASEDIT_PROJECT::GetProjectFile()
 {
 	return projectFile;
 }
-void TASEDIT_PROJECT::SetProjectFile(std::string e)
+std::string TASEDIT_PROJECT::GetProjectName()
 {
-	projectFile = e;
+	return projectName;
+}
+std::string TASEDIT_PROJECT::GetFM2Name()
+{
+	return fm2FileName;
 }
 
 void TASEDIT_PROJECT::SetProjectChanged()

src/drivers/win/taseditlib/taseditproj.h

@@ -26,17 +26,14 @@ public:
 	void reset();
 	void update();
 
-	bool saveProject();
+	bool save();
-	bool LoadProject(std::string PFN);
+	bool load(char* fullname);
 
-	bool Export2FM2(std::string filename);	//creates a fm2 out of header, comments, subtitles, and main branch input log, return false if any errors occur
+	void RenameProject(char* new_fullname);
 
-	std::string GetProjectName();
-	void SetProjectName(std::string e);
-	std::string GetFM2Name();
-	void SetFM2Name(std::string e);
 	std::string GetProjectFile();
-	void SetProjectFile(std::string e);
+	std::string GetProjectName();
+	std::string GetFM2Name();
 
 	void SetProjectChanged();
 	bool GetProjectChanged();
@@ -49,11 +46,8 @@ private:
 	bool changed;
 	int next_save_shedule;
 
-	std::string projectName;			//The TASEdit Project's name
+	std::string projectFile;	// full path
-	std::string fm2FileName;			//The main branch ilog file (todo rename more appropriately)
+	std::string projectName;	// file name only
-	std::string projectFile; 			//The TASEdit Project's filename (For saving purposes) //adelikat: TODO: why the hell is this different from project name??!
+	std::string fm2FileName;	// same as projectName but with .fm2 extension instead of .tas
-	std::vector<std::string> inputlogs;	//List of associated .ilog files
-	std::vector<std::string> comments;
-	std::vector<std::string> subtitles;
 
 };

src/drivers/win/window.cpp

@@ -90,9 +90,9 @@ using namespace std;
 //Handles----------------------------------------------
 static HMENU fceumenu = 0;	  //Main menu.
 HWND pwindow;				  //Client Area
-static HMENU recentmenu;	  //Recent Menu
+HMENU recentmenu;				//Recent Menu
-static HMENU recentluamenu;   //Recent Lua Files Menu
+HMENU recentluamenu;			//Recent Lua Files Menu
-static HMENU recentmoviemenu; //Recent Movie Files Menu
+HMENU recentmoviemenu;			//Recent Movie Files Menu
 HMENU hfceuxcontext;		  //Handle to context menu
 HMENU hfceuxcontextsub;		  //Handle to context sub menu
 HWND MainhWnd;				  //Main FCEUX(Parent) window Handle.  Dialogs should use GetMainHWND() to get this
@@ -197,7 +197,6 @@ void SetMainWindowText()
 		SetWindowText(hAppWnd, FCEU_NAME_AND_VERSION);
 }
 
-
 bool HasRecentFiles()
 {
 	for (int x = 0; x < MAX_NUMBER_OF_RECENT_FILES; x++)
@@ -205,7 +204,6 @@ bool HasRecentFiles()
 		if (recent_files[x])
 			return true;
 	}
-
 	return false;
 }
 
@@ -606,7 +604,6 @@ void RemoveRecentItem(unsigned int which, char**bufferArray, const unsigned int
 	bufferArray[MAX-1] = 0;	//Clear out the last item since it is empty now no matter what
 }
 
-
 /// Updates recent files / recent directories menu
 /// @param menu Menu handle of the main window's menu
 /// @param strs Strings to add to the menu
@@ -747,6 +744,23 @@ void AddRecentFile(const char *filename)
 	UpdateRecentArray(filename, recent_files, MAX_NUMBER_OF_RECENT_FILES, recentmenu, MENU_RECENT_FILES, MENU_FIRST_RECENT_FILE);
 }
 
+void LoadRecentRom(int slot)
+{
+	char*& fname = recent_files[slot];
+	if(fname)
+	{
+		if (!ALoad(fname))
+		{
+			int result = MessageBox(hAppWnd, "Remove from list?", "Could Not Open Recent File", MB_YESNO);
+			if (result == IDYES)
+			{
+				RemoveRecentItem(slot, recent_files, MAX_NUMBER_OF_RECENT_FILES);
+				UpdateRMenu(recentmenu, recent_files, MENU_RECENT_FILES, MENU_FIRST_RECENT_FILE);
+			}
+		}
+	}
+}
+
 void UpdateLuaRMenu(HMENU menu, char **strs, unsigned int mitem, unsigned int baseid)
 {
 	MENUITEMINFO moo;
@@ -1523,26 +1537,14 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 			wParam &= 0xFFFF;
 
 			// A menu item from the recent files menu was clicked.
-			if(wParam >= MENU_FIRST_RECENT_FILE && wParam <= MENU_FIRST_RECENT_FILE + MAX_NUMBER_OF_RECENT_FILES - 1)
+			if(wParam >= MENU_FIRST_RECENT_FILE && wParam < MENU_FIRST_RECENT_FILE + MAX_NUMBER_OF_RECENT_FILES)
 			{
-				char*& fname = recent_files[wParam - MENU_FIRST_RECENT_FILE];
+				LoadRecentRom(wParam - MENU_FIRST_RECENT_FILE);
-				if(fname)
-				{
-					if (!ALoad(fname))
-					{
-						int result = MessageBox(hWnd,"Remove from list?", "Could Not Open Recent File", MB_YESNO);
-						if (result == IDYES)
-						{
-							RemoveRecentItem((wParam - MENU_FIRST_RECENT_FILE), recent_files, MAX_NUMBER_OF_RECENT_FILES);
-							UpdateRMenu(recentmenu, recent_files, MENU_RECENT_FILES, MENU_FIRST_RECENT_FILE);
-						}
-					}
-				}
 			}
 			
 			// A menu item for the recent lua files menu was clicked.
 			#ifdef _S9XLUA_H
-			if(wParam >= LUA_FIRST_RECENT_FILE && wParam <= LUA_FIRST_RECENT_FILE + MAX_NUMBER_OF_LUA_RECENT_FILES - 1)
+			if(wParam >= LUA_FIRST_RECENT_FILE && wParam < LUA_FIRST_RECENT_FILE + MAX_NUMBER_OF_LUA_RECENT_FILES)
 			{
 				char*& fname = recent_lua[wParam - LUA_FIRST_RECENT_FILE];
 				if(fname)
@@ -1563,7 +1565,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 			#endif
 
 			// A menu item for the recent movie files menu was clicked.
-			if(wParam >= MOVIE_FIRST_RECENT_FILE && wParam <= MOVIE_FIRST_RECENT_FILE + MAX_NUMBER_OF_MOVIE_RECENT_FILES - 1)
+			if(wParam >= MOVIE_FIRST_RECENT_FILE && wParam < MOVIE_FIRST_RECENT_FILE + MAX_NUMBER_OF_MOVIE_RECENT_FILES)
 			{
 				char*& fname = recent_movie[wParam - MOVIE_FIRST_RECENT_FILE];
 				if(fname)
@@ -2271,7 +2273,12 @@ adelikat: Outsourced this to a remappable hotkey
 		EnableMenuItem(fceumenu,MENU_STOP_AVI,MF_BYCOMMAND | (FCEUI_AviIsRecording()?MF_ENABLED:MF_GRAYED));
 		EnableMenuItem(fceumenu,MENU_STOP_WAV,MF_BYCOMMAND | (loggingSound?MF_ENABLED:MF_GRAYED));
 		EnableMenuItem(fceumenu,ID_FILE_CLOSELUAWINDOWS,MF_BYCOMMAND | (LuaConsoleHWnd?MF_ENABLED:MF_GRAYED));
-
+		if (FCEUMOV_Mode(MOVIEMODE_TASEDIT))
+		{
+			EnableMenuItem(fceumenu, MENU_PAL, false);
+			EnableMenuItem(fceumenu, ID_NEWPPU, false);
+			EnableMenuItem(fceumenu, ID_OLDPPU, false);
+		}
 		CheckMenuItem(fceumenu, ID_NEWPPU, newppu ? MF_CHECKED : MF_UNCHECKED);
 		CheckMenuItem(fceumenu, ID_OLDPPU, !newppu ? MF_CHECKED : MF_UNCHECKED);
 

src/input.cpp

@@ -764,7 +764,7 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
 	{ EMUCMD_FRAMEADV_SKIPLAG,				EMUCMDTYPE_MISC,	FA_SkipLag,		  0, 0,  "Frame Adv.-Skip Lag", 0},
 	{ EMUCMD_OPENROM,						EMUCMDTYPE_TOOL,	OpenRom,		  0, 0,  "Open ROM", 0},
 	{ EMUCMD_CLOSEROM,						EMUCMDTYPE_TOOL,	CloseRom,		  0, 0,	 "Close ROM", 0},
-	{ EMUCMD_RELOADROM,						EMUCMDTYPE_TOOL,	ReloadRom,		  0, 0,	 "Reload ROM", 0},
+	{ EMUCMD_RELOAD,						EMUCMDTYPE_TOOL,	ReloadRom,		  0, 0,	 "Reload ROM or TAS Editor Project", EMUCMDFLAG_TASEDIT },
 	{ EMUCMD_MISC_DISPLAY_MOVIESUBTITLES,	EMUCMDTYPE_MISC,	MovieSubtitleToggle,0,0,"Toggle Movie Subtitles", 0},
 	{ EMUCMD_MISC_UNDOREDOSAVESTATE,		EMUCMDTYPE_MISC,	UndoRedoSavestate,  0,0,"Undo/Redo Savestate",    0},
 	{ EMUCMD_MISC_TOGGLEFULLSCREEN,			EMUCMDTYPE_MISC,	ToggleFullscreen, 0, 0, "Toggle Fullscreen",	  0},
@@ -776,7 +776,7 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
 	{ EMUCMD_TOOL_RAMSEARCHGTE,				EMUCMDTYPE_TOOL,	RamSearchOpGTE,	  0, 0, "Ram Search - Greater Than or Equal", 0},
 	{ EMUCMD_TOOL_RAMSEARCHEQ,				EMUCMDTYPE_TOOL,	RamSearchOpEQ,	  0, 0, "Ram Search - Equal",	  0},
 	{ EMUCMD_TOOL_RAMSEARCHNE,				EMUCMDTYPE_TOOL,	RamSearchOpNE,	  0, 0, "Ram Search - Not Equal", 0},
-	{ EMUCMD_TASEDIT_REWIND,				EMUCMDTYPE_MISC,	TaseditRewindOn, TaseditRewindOff, 0, "Rewind Frame (TASEditor-only)", EMUCMDFLAG_TASEDIT},
+	{ EMUCMD_TASEDIT_REWIND,				EMUCMDTYPE_MISC,	TaseditRewindOn, TaseditRewindOff, 0, "Rewind Frame (TAS Editor only)", EMUCMDFLAG_TASEDIT },
 	{ EMUCMD_RERECORD_DISPLAY_TOGGLE,		EMUCMDTYPE_MISC,	FCEUI_MovieToggleRerecordDisplay, 0, 0, "Toggle Rerecord Display", EMUCMDFLAG_TASEDIT },
 };
 
@@ -1112,10 +1112,16 @@ static void CloseRom(void)
 static void ReloadRom(void)
 {
 #ifdef WIN32
-  char*& fname = recent_files[0];
+	if (FCEUMOV_Mode(MOVIEMODE_TASEDIT))
-	if(fname)
 	{
-	  ALoad(fname);
+		// load most recent project
+		extern void LoadRecentProject(int slot);
+		LoadRecentProject(0);
+	} else
+	{
+		// load most recent ROM
+		extern void LoadRecentRom(int slot);
+		LoadRecentRom(0);
 	}
 #endif
 }

src/input.h

@@ -217,7 +217,7 @@ enum EMUCMD
 	//Currently only windows (but sdl could easily add onto these)
 	EMUCMD_OPENROM,
 	EMUCMD_CLOSEROM,
-	EMUCMD_RELOADROM,
+	EMUCMD_RELOAD,
 	//-----------------------------
 	EMUCMD_MISC_DISPLAY_MOVIESUBTITLES,
 	EMUCMD_MISC_UNDOREDOSAVESTATE,