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

* Taseditor: AdjustDown clones frames instead of inserting blank frames 

* Taseditor: changed HotChanges colors
This commit is contained in:
ansstuff 2012-09-15 15:03:54 +00:00
parent c9b850a472
commit 463ccb4086
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/win/res.rc
View File

@ -1478,11 +1478,11 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,7,80,50,14 DEFPUSHBUTTON "OK",IDOK,7,80,50,14
PUSHBUTTON "Cancel",IDCANCEL,114,80,50,14 PUSHBUTTON "Cancel",IDCANCEL,114,80,50,14
CONTROL " Copy current input",IDC_COPY_INPUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,14,75,10 CONTROL " Copy current Input",IDC_COPY_INPUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,14,75,10
CONTROL " 1 player",IDC_RADIO_1PLAYER,"Button",BS_AUTORADIOBUTTON,16,14,45,10 CONTROL " 1 player",IDC_RADIO_1PLAYER,"Button",BS_AUTORADIOBUTTON,16,14,45,10
CONTROL " 2 players",IDC_RADIO_2PLAYERS,"Button",BS_AUTORADIOBUTTON,16,27,45,10 CONTROL " 2 players",IDC_RADIO_2PLAYERS,"Button",BS_AUTORADIOBUTTON,16,27,45,10
CONTROL " Fourscore",IDC_RADIO_FOURSCORE,"Button",BS_AUTORADIOBUTTON,16,40,45,10 CONTROL " Fourscore",IDC_RADIO_FOURSCORE,"Button",BS_AUTORADIOBUTTON,16,40,45,10
CONTROL " Copy current markers",IDC_COPY_MARKERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,27,83,10 CONTROL " Copy current Markers",IDC_COPY_MARKERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,27,83,10
GROUPBOX "Input type",IDC_STATIC,5,3,67,52,BS_CENTER GROUPBOX "Input type",IDC_STATIC,5,3,67,52,BS_CENTER
EDITTEXT IDC_EDIT_AUTHOR,36,61,127,13,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_AUTHOR,36,61,127,13,ES_AUTOHSCROLL
LTEXT "Author:",IDC_STATIC,8,63,26,9 LTEXT "Author:",IDC_STATIC,8,63,26,9

4
src/drivers/win/taseditor/greenzone.cpp
View File

@ -430,8 +430,8 @@ void GREENZONE::AdjustDown()
{ {
int at = currFrameCounter - 1; int at = currFrameCounter - 1;
bool markers_changed = false; bool markers_changed = false;
// insert blank frame with lag // clone frame and insert lag
currMovieData.insertEmpty(at, 1); currMovieData.cloneRegion(at, 1);
laglog.InsertFrame(at, true, 1); laglog.InsertFrame(at, true, 1);
if (taseditor_config.bind_markers) if (taseditor_config.bind_markers)
{ {

3
src/drivers/win/taseditor/piano_roll.cpp
View File

@ -54,7 +54,8 @@ LRESULT APIENTRY MarkerDragBoxWndProc(HWND hwnd, UINT message, WPARAM wParam, LP
// resources // resources
char piano_roll_save_id[PIANO_ROLL_ID_LEN] = "PIANO_ROLL"; char piano_roll_save_id[PIANO_ROLL_ID_LEN] = "PIANO_ROLL";
char piano_roll_skipsave_id[PIANO_ROLL_ID_LEN] = "PIANO_ROLX"; char piano_roll_skipsave_id[PIANO_ROLL_ID_LEN] = "PIANO_ROLX";
COLORREF hot_changes_colors[16] = { 0x0, 0x5c4c44, 0x854604, 0xab2500, 0xc20006, 0xd6006f, 0xd40091, 0xba00a4, 0x9500ba, 0x7a00cc, 0x5800d4, 0x0045e2, 0x0063ea, 0x0079f4, 0x0092fa, 0x00aaff }; COLORREF hot_changes_colors[16] = { 0x0, 0x495249, 0x666361, 0x855a45, 0xa13620, 0xbd003f, 0xd6006f, 0xcc008b, 0xba00a1, 0x8b00ad, 0x5c00bf, 0x0003d1, 0x0059d6, 0x0077d9, 0x0096db, 0x00aede };
//COLORREF hot_changes_colors[16] = { 0x0, 0x5c4c44, 0x854604, 0xab2500, 0xc20006, 0xd6006f, 0xd40091, 0xba00a4, 0x9500ba, 0x7a00cc, 0x5800d4, 0x0045e2, 0x0063ea, 0x0079f4, 0x0092fa, 0x00aaff };
//COLORREF hot_changes_colors[16] = { 0x0, 0x661212, 0x842B4E, 0x652C73, 0x48247D, 0x383596, 0x2947AE, 0x1E53C1, 0x135DD2, 0x116EDA, 0x107EE3, 0x0F8EEB, 0x209FF4, 0x3DB1FD, 0x51C2FF, 0x4DCDFF }; //COLORREF hot_changes_colors[16] = { 0x0, 0x661212, 0x842B4E, 0x652C73, 0x48247D, 0x383596, 0x2947AE, 0x1E53C1, 0x135DD2, 0x116EDA, 0x107EE3, 0x0F8EEB, 0x209FF4, 0x3DB1FD, 0x51C2FF, 0x4DCDFF };
COLORREF header_lights_colors[11] = { 0x0, 0x007313, 0x009100, 0x1daf00, 0x42c700, 0x65d900, 0x91e500, 0xb0f000, 0xdaf700, 0xf0fc7c, 0xfcffba }; COLORREF header_lights_colors[11] = { 0x0, 0x007313, 0x009100, 0x1daf00, 0x42c700, 0x65d900, 0x91e500, 0xb0f000, 0xdaf700, 0xf0fc7c, 0xfcffba };

4
src/movie.cpp
View File

@ -126,12 +126,12 @@ void MovieData::insertEmpty(int at, int frames)
void MovieData::cloneRegion(int at, int frames) void MovieData::cloneRegion(int at, int frames)
{ {
if(at == -1) return; if (at < 0) return;
records.insert(records.begin() + at, frames, MovieRecord()); records.insert(records.begin() + at, frames, MovieRecord());
for(int i = 0; i < frames; i++) for(int i = 0; i < frames; i++)
records[i+at].Clone(records[i + at + frames]); records[i + at].Clone(records[i + at + frames]);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
MovieRecord::MovieRecord() MovieRecord::MovieRecord()