diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index ae1ae818..5a14d1d0 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -228,9 +228,9 @@ BEGIN BEGIN MENUITEM "&Select All", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", ID_TASEDIT_CUT, INACTIVE - MENUITEM "&Copy\tCtrl+C", ID_TASEDIT_COPY, INACTIVE - MENUITEM "&Paste\tCtrl+V", ID_TASEDIT_PASTE, INACTIVE + MENUITEM "Cu&t\tCtrl+X", ID_TASEDIT_CUT + MENUITEM "&Copy\tCtrl+C", ID_TASEDIT_COPY + MENUITEM "&Paste\tCtrl+V", ID_TASEDIT_PASTE MENUITEM "Paste to &New\tCtrl+Shift+V", ID_TASEDIT_PASTETONEW, INACTIVE MENUITEM "&Delete\tCtrl+Delete", ID_TASEDIT_DELETE MENUITEM SEPARATOR diff --git a/src/drivers/win/tasedit.cpp b/src/drivers/win/tasedit.cpp index 1d61e839..62e0c1c6 100644 --- a/src/drivers/win/tasedit.cpp +++ b/src/drivers/win/tasedit.cpp @@ -81,7 +81,7 @@ static void GetDispInfo(NMLVDISPINFO* nmlvDispInfo) item.pszText[0] = MovieRecord::mnemonics[bit]; item.pszText[1] = 0; } else - item.pszText[1] = 0; + item.pszText[0] = 0; } break; } @@ -284,11 +284,9 @@ bool JumpToFrame(int index) // Simply do a reset. if (index==0) { - extern int disableBatteryLoading; - disableBatteryLoading = 1; - PowerNES(); - disableBatteryLoading = 0; + poweron(false); currFrameCounter=0; + MovieData::dumpSavestateTo(&currMovieData.records[0].savestate,0); return true; } @@ -355,19 +353,9 @@ void DoubleClick(LPNMITEMACTIVATE info) static void ClearSelection() { int frameCount = ListView_GetItemCount(hwndList); - //LVITEM lvi; - //lvi.mask = LVIF_STATE; - //lvi.state = 0; - //lvi.stateMask = LVIS_SELECTED; ListView_SetItemState(hwndList,-1,0, LVIS_SELECTED); - //for(int i=0;icframe+1) + { + clipString << '+' << (*it-cframe) << '|'; + } + cframe=*it; + + int cjoy=0; + for (int joy=0; joy<2; ++joy) + { + while (currMovieData.records[*it].joysticks[joy] && cjoy0) + JumpToFrame(currFrameCounter-1); break; case TASEDIT_REWIND_FULL: