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

ya i r need h4lp plz i iz shot

This commit is contained in:
unknown 2015-04-20 15:41:25 -04:00
parent 240d13366d
commit 3b9ec019bc
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64/N64 System/Cheat Class.cpp
View File

@ -1587,7 +1587,7 @@ int CCheats::TV_GetCheckState(HWND hwndTreeView, HWND hItem)
return ((int)(tvItem.state >> 12) -1); return ((int)(tvItem.state >> 12) -1);
} }
void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShotCut) void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShortCut)
{ {
MENUITEMINFOW MenuInfo; MENUITEMINFOW MenuInfo;
wchar_t String[256]; wchar_t String[256];
@ -1605,7 +1605,7 @@ void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, con
GetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo); GetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo);
wcscpy(String,Title); wcscpy(String,Title);
if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; } if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; }
if (ShotCut) { _swprintf(String,L"%s\t%s",String,ShotCut); } if (ShortCut) { _swprintf(String,L"%s\t%s",String,ShortCut); }
SetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo); SetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo);
} }

2
Source/Project64/N64 System/Cheat Class.h
View File

@ -83,7 +83,7 @@ private:
static bool TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state); static bool TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state);
static int TV_GetCheckState(HWND hwndTreeView, HWND hItem); static int TV_GetCheckState(HWND hwndTreeView, HWND hItem);
static DWORD AsciiToHex ( const char * HexValue ); static DWORD AsciiToHex ( const char * HexValue );
static void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShotCut ); static void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShortCut );
//UI Functions //UI Functions

4
Source/Project64/User Interface/Menu Class.cpp
View File

@ -58,11 +58,11 @@ bool CBaseMenu::AddMenu(HMENU hMenu, MenuItemList Items ) {
SetMenuItemInfo((HMENU)ItemID, (DWORD)MenuItem->SubMenu(), FALSE,&lpmii); SetMenuItemInfo((HMENU)ItemID, (DWORD)MenuItem->SubMenu(), FALSE,&lpmii);
} }
if (MenuItem->ShotCut().empty() == false) if (MenuItem->ShortCut().empty() == false)
{ {
String = Text; String = Text;
String += L"\t"; String += L"\t";
String += MenuItem->ShotCut(); String += MenuItem->ShortCut();
Text = String; Text = String;
} }
AppendMenuW(hMenu,uFlags,ItemID,Text.c_str()); AppendMenuW(hMenu,uFlags,ItemID,Text.c_str());

12
Source/Project64/User Interface/Menu Class.h
View File

@ -27,17 +27,17 @@ public:
{ {
Reset(NO_ID); Reset(NO_ID);
} }
MENU_ITEM ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShotCut = EMPTY_STDSTR, MENU_ITEM ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShortCut = EMPTY_STDSTR,
void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR) void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR)
{ {
Reset(ID,Title,ShotCut,SubMenu,ManualString); Reset(ID,Title,ShortCut,SubMenu,ManualString);
} }
void Reset ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShotCut2 = EMPTY_STDSTR, void Reset ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShortCut2 = EMPTY_STDSTR,
void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR) void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR)
{ {
this->m_ID = ID; this->m_ID = ID;
this->m_Title = Title; this->m_Title = Title;
this->m_ShotCut = ShotCut2; this->m_ShortCut = ShortCut2;
this->m_SubMenu = SubMenu; this->m_SubMenu = SubMenu;
this->m_ManualString = ManualString; this->m_ManualString = ManualString;
this->m_ItemTicked = false; this->m_ItemTicked = false;
@ -46,7 +46,7 @@ public:
int ID() const { return m_ID; } int ID() const { return m_ID; }
LanguageStringID Title() const { return m_Title; } LanguageStringID Title() const { return m_Title; }
const std::wstring & ShotCut() const { return m_ShotCut; } const std::wstring & ShortCut() const { return m_ShortCut; }
void * SubMenu() const { return m_SubMenu; } void * SubMenu() const { return m_SubMenu; }
const std::wstring & ManualString() const { return m_ManualString; } const std::wstring & ManualString() const { return m_ManualString; }
bool ItemTicked() const { return m_ItemTicked; } bool ItemTicked() const { return m_ItemTicked; }
@ -59,7 +59,7 @@ public:
private: private:
int m_ID; int m_ID;
LanguageStringID m_Title; LanguageStringID m_Title;
std::wstring m_ShotCut; std::wstring m_ShortCut;
void * m_SubMenu; void * m_SubMenu;
std::wstring m_ManualString; std::wstring m_ManualString;
bool m_ItemTicked; bool m_ItemTicked;

4
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -1022,7 +1022,7 @@ void CRomBrowser::LoadRomList (void) {
RomList_SortList(); RomList_SortList();
} }
void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShotCut) void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShortCut)
{ {
MENUITEMINFOW MenuInfo; MENUITEMINFOW MenuInfo;
wchar_t String[256]; wchar_t String[256];
@ -1040,7 +1040,7 @@ void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title,
GetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo); GetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo);
wcscpy(String,Title); wcscpy(String,Title);
if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; } if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; }
if (ShotCut) { swprintf(String,sizeof(String) / sizeof(String[0]),L"%s\t%s",String,ShotCut); } if (ShortCut) { swprintf(String,sizeof(String) / sizeof(String[0]),L"%s\t%s",String,ShortCut); }
SetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo); SetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo);
} }

2
Source/Project64/User Interface/Rom Browser.h
View File

@ -163,7 +163,7 @@ class CRomBrowser
static int GetCicChipID ( BYTE * RomData ); static int GetCicChipID ( BYTE * RomData );
bool LoadDataFromRomFile ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat ); bool LoadDataFromRomFile ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat );
void LoadRomList ( void ); void LoadRomList ( void );
void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShotCut); void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShortCut);
void SaveRomList ( strlist & FileList ); void SaveRomList ( strlist & FileList );
void RomList_ColoumnSortList ( DWORD pnmh ); void RomList_ColoumnSortList ( DWORD pnmh );
void RomList_GetDispInfo ( DWORD pnmh ); void RomList_GetDispInfo ( DWORD pnmh );