ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Taseditor: no "Autopause at the end of the Movie" when Recording 

* Taseditor: fixed bug with adding new item to History Log
This commit is contained in:
ansstuff 2013-01-20 20:25:19 +00:00
parent af76d60cd7
commit 9a2566dacc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/win/taseditor/history.cpp
View File

@ -436,24 +436,24 @@ void HISTORY::redo()
// ----------------------------
void HISTORY::AddItemToHistory(SNAPSHOT &snap, int cur_branch)
{
history_cursor_pos++;
history_total_items = history_cursor_pos + 1;
// history uses conveyor of items (vector with fixed size) to aviod frequent reallocations caused by vector resizing, which would be awfully expensive with such large objects as SNAPSHOT and BOOKMARK
if (history_total_items >= history_size)
{
// reached the end of available history_size - move history_start_pos (thus deleting oldest snapshot)
history_cursor_pos = history_size-1;
// reached the end of available history_size
// move history_start_pos (thus deleting oldest snapshot)
history_start_pos = (history_start_pos + 1) % history_size;
} else
{
// didn't reach the end of history yet
history_cursor_pos++;
history_total_items = history_cursor_pos+1;
UpdateHistoryList();
// and restore history_cursor_pos and history_total_items
history_cursor_pos--;
history_total_items--;
}
// write data
int real_pos = (history_start_pos + history_cursor_pos) % history_size;
snapshots[real_pos] = snap;
backup_bookmarks[real_pos].free();
backup_current_branch[real_pos] = cur_branch;
UpdateHistoryList();
RedrawHistoryList();
}
void HISTORY::AddItemToHistory(SNAPSHOT &snap, int cur_branch, BOOKMARK &bookm)

2
src/drivers/win/taseditor/playback.cpp
View File

@ -177,7 +177,7 @@ void PLAYBACK::update()
// pause when seeking hits pause_frame
if (pause_frame && currFrameCounter + 1 >= pause_frame)
SeekingStop();
else if (currFrameCounter >= GetLostPosition() && currFrameCounter >= currMovieData.getNumRecords() - 1 && must_autopause_at_the_end && taseditor_config.autopause_at_finish)
else if (currFrameCounter >= GetLostPosition() && currFrameCounter >= currMovieData.getNumRecords() - 1 && must_autopause_at_the_end && taseditor_config.autopause_at_finish && !TaseditorIsRecording())
// pause at the end of the movie
PauseEmulation();