* Taseditor: Markers are bound to Input by default; some minor fixes

* fixed docs

[[Split portion of a mixed commit.]]
This commit is contained in:
ansstuff 2012-07-23 16:45:36 +00:00
parent a40e4c655a
commit e5c10de5c9
8 changed files with 12 additions and 7 deletions

View File

@ -1,6 +1,8 @@
19-Jul-2012 - AnS - Taseditor: Lua registermanual allows changing the "Run function" button caption; Markers are always restored when deploying Bookmarks
01-Jul-2012 - AnS - new hotkey "Run Manual Lua function"
24-Jun-2012 - AnS - Taseditor: drawing selected_slot border in Branches Tree
24-Jun-2012 - zeromus - add ability for CNROM games to choose whether they have bus conflicts (fixes Colorful Dragon (Unl) (Sachen), since it flakes out if bus conflicts are emulated)
23-Jun-2012 - zeromus - add m116 from fceu-mm; fix mapper 178 big PRG support
20-Jun-2012 - zeromus - fix savestate engine to throw errors when a buggy SFORMAT is passed to AddExState, and fix those errors in m015 and m253

Binary file not shown.

View File

@ -5,7 +5,7 @@ Copyright (c) 2011-2012 AnS
(The MIT License)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVID ED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------
Main - Main gate between emulator and Taseditor
[Singleton]

View File

@ -1239,6 +1239,10 @@ int HISTORY::GetCategoryOfOperation(int mod_type)
return CATEGORY_MARKERS_CHANGE;
case MODTYPE_LUA_CHANGE:
return CATEGORY_INPUT_MARKERS_CHANGE;
case MODTYPE_ADJUST_UP:
case MODTYPE_ADJUST_DOWN:
return CATEGORY_INPUT_MARKERS_CHANGE;
}
// if undefined
return CATEGORY_OTHER;

View File

@ -40,7 +40,7 @@ TASEDITOR_CONFIG::TASEDITOR_CONFIG()
enable_hot_changes = true;
jump_to_undo = true;
follow_note_context = true;
bind_markers = false;
bind_markers = true;
empty_marker_notes = true;
combine_consecutive = false;
use_1p_rec = true;

View File

@ -730,14 +730,14 @@ void TASEDITOR_WINDOW::RecheckPatternsMenu()
moo.cbSize = sizeof(moo);
moo.fMask = MIIM_TYPE;
moo.fType = MFT_STRING;
moo.cch = PATTERNMENU_MAX_VISIBLE_NAME;
moo.cch = PATTERNS_MAX_VISIBLE_NAME;
int x;
x = GetMenuItemInfo(hmenu, PATTERNS_MENU_POS, true, &moo);
std::string tmp = patterns_menu_prefix;
tmp += editor.autofire_patterns_names[taseditor_config.current_pattern];
// clamp this string
if (tmp.size() > PATTERNMENU_MAX_VISIBLE_NAME)
tmp = tmp.substr(0, PATTERNMENU_MAX_VISIBLE_NAME);
if (tmp.size() > PATTERNS_MAX_VISIBLE_NAME)
tmp = tmp.substr(0, PATTERNS_MAX_VISIBLE_NAME);
moo.dwTypeData = (LPSTR)tmp.c_str();
moo.cch = tmp.size();
x = SetMenuItemInfo(hmenu, PATTERNS_MENU_POS, true, &moo);

View File

@ -8,7 +8,6 @@
#define PATTERNS_MENU_POS 5
#define PATTERNS_MAX_VISIBLE_NAME 50
#define PATTERNMENU_MAX_VISIBLE_NAME PATTERNS_MAX_VISIBLE_NAME + 6 // + "Pattern: "
struct Window_items_struct
{

Binary file not shown.