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

Fixed issue with strings in localisation templates

This commit is contained in:
Barry Harris 2011-12-14 20:13:20 +00:00
parent 866ce29da5
commit bafa279da0
5 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/burner/win32/menu.cpp
View File

@ -484,7 +484,7 @@ void CreateArcaderesItem()
MENUITEMINFO menuItem = {sizeof(MENUITEMINFO), MIIM_TYPE, MFT_STRING, 0, 0, NULL, NULL, NULL, 0, szItemText, 0, 0, };
// horizontal oriented
FBALoadString(hAppInst, IDS_MENU + 0, szItemText, 256);
FBALoadString(hAppInst, IDS_MENU_0, szItemText, 256);
if ((bDrvOkay) && !(BurnDrvGetFlags() & BDF_ORIENTATION_VERTICAL)) {
BurnDrvGetVisibleSize(&nGameWidth, &nGameHeight);
_stprintf(szItemText + _tcslen(szItemText), _T("\t(%i x %i)"), nGameWidth, nGameHeight);
@ -496,7 +496,7 @@ void CreateArcaderesItem()
TCHAR szItemText2[256];
MENUITEMINFO menuItem2 = {sizeof(MENUITEMINFO), MIIM_TYPE, MFT_STRING, 0, 0, NULL, NULL, NULL, 0, szItemText2, 0, 0, };
FBALoadString(hAppInst, IDS_MENU + 0, szItemText2, 256);
FBALoadString(hAppInst, IDS_MENU_0, szItemText2, 256);
if (bDrvOkay && BurnDrvGetFlags() & BDF_ORIENTATION_VERTICAL) {
BurnDrvGetVisibleSize(&nGameWidth, &nGameHeight);
_stprintf(szItemText + _tcslen(szItemText2), _T("\t(%i x %i)"), nGameWidth, nGameHeight);
@ -511,7 +511,7 @@ static void CreateOtherresItem(bool bOther)
TCHAR szItemText[256];
MENUITEMINFO menuItem = {sizeof(MENUITEMINFO), MIIM_TYPE, MFT_STRING, 0, 0, NULL, NULL, NULL, 0, szItemText, 0, 0 };
FBALoadString(hAppInst, IDS_MENU + 1, szItemText, 256);
FBALoadString(hAppInst, IDS_MENU_1, szItemText, 256);
if (bOther) {
_stprintf(szItemText + _tcslen(szItemText), _T("\t(%i x %i)"), nVidHorWidth, nVidHorHeight);
}
@ -525,7 +525,7 @@ static void CreateOtherresItemVer(bool bOther)
TCHAR szItemText[256];
MENUITEMINFO menuItem = {sizeof(MENUITEMINFO), MIIM_TYPE, MFT_STRING, 0, 0, NULL, NULL, NULL, 0, szItemText, 0, 0 };
FBALoadString(hAppInst, IDS_MENU + 1, szItemText, 256);
FBALoadString(hAppInst, IDS_MENU_1, szItemText, 256);
if (bOther) {
_stprintf(szItemText + _tcslen(szItemText), _T("\t(%i x %i)"), nVidVerWidth, nVidVerHeight);
}
@ -560,7 +560,7 @@ static void CreateOtherGammaItem(bool bOther)
TCHAR szItemText[256];
MENUITEMINFO menuItem = {sizeof(MENUITEMINFO), MIIM_TYPE, MFT_STRING, 0, 0, NULL, NULL, NULL, 0, szItemText, 0, 0 };
FBALoadString(hAppInst, IDS_MENU + 2, szItemText, 256);
FBALoadString(hAppInst, IDS_MENU_2, szItemText, 256);
if (bOther) {
_stprintf(szItemText + _tcslen(szItemText), _T("\t(%1.2f)"), nGamma);
}
@ -574,7 +574,7 @@ static void CreateCPUSpeedItem(bool bOther)
TCHAR szItemText[256];
MENUITEMINFO menuItem = {sizeof(MENUITEMINFO), MIIM_TYPE, MFT_STRING, 0, 0, NULL, NULL, NULL, 0, szItemText, 0, 0 };
FBALoadString(hAppInst, IDS_MENU + 3, szItemText, 256);
FBALoadString(hAppInst, IDS_MENU_3, szItemText, 256);
if (bOther) {
_stprintf(szItemText + _tcslen(szItemText), _T("\t(%d%%)"), nBurnCPUSpeedAdjust * 100 / 256);
}
@ -588,11 +588,11 @@ static void CreateStateslotItems()
TCHAR szItemText[256];
MENUITEMINFO menuItem = {sizeof(MENUITEMINFO), MIIM_TYPE, MFT_STRING, 0, 0, NULL, NULL, NULL, 0, szItemText, 0, 0 };
_sntprintf(szItemText, 256, FBALoadStringEx(hAppInst, IDS_MENU + 4, true), nSavestateSlot);
_sntprintf(szItemText, 256, FBALoadStringEx(hAppInst, IDS_MENU_4, true), nSavestateSlot);
menuItem.cch = _tcslen(szItemText);
SetMenuItemInfo(hMenu, MENU_STATE_LOAD_SLOT, 0, &menuItem);
_sntprintf(szItemText, 256, FBALoadStringEx(hAppInst, IDS_MENU + 5, true), nSavestateSlot);
_sntprintf(szItemText, 256, FBALoadStringEx(hAppInst, IDS_MENU_5, true), nSavestateSlot);
menuItem.cch = _tcslen(szItemText);
SetMenuItemInfo(hMenu, MENU_STATE_SAVE_SLOT, 0, &menuItem);
}

2
src/burner/win32/resource.h
View File

@ -3,7 +3,7 @@
// Used by app.rc
//
#define IDS_STRING 5000
#define IDS_STRING 200
#define BMP_SPLASH 1
#define BMP_ABOUT 2

52
src/burner/win32/resource_string.h
View File

@ -1,5 +1,5 @@
#define IDS_ERROR (IDS_STRING + 500)
#define IDS_MENU (IDS_STRING + 800)
#define IDS_ERROR (IDS_STRING + 600)
#define IDS_FIRSTRUN1 (IDS_STRING + 0)
#define IDS_FIRSTRUN2 (IDS_STRING + 1)
@ -111,13 +111,6 @@
#define IDS_CD_SELECT_IMAGE (IDS_STRING + 241)
#define IDS_SEL_FILTERS (IDS_STRING + 250)
#define IDS_SEL_HARDWARE (IDS_STRING + 251)
#define IDS_SEL_CAVE (IDS_STRING + 252)
@ -181,6 +174,13 @@
#define IDS_IPSMANAGER_TITLE (IDS_STRING + 370)
#define IDS_MENU_0 (IDS_STRING + 380)
#define IDS_MENU_1 (IDS_STRING + 381)
#define IDS_MENU_2 (IDS_STRING + 382)
#define IDS_MENU_3 (IDS_STRING + 383)
#define IDS_MENU_4 (IDS_STRING + 384)
#define IDS_MENU_5 (IDS_STRING + 385)
#define IDS_ERR_ERROR (IDS_ERROR + 0)
#define IDS_ERR_WARNING (IDS_ERROR + 1)
#define IDS_ERR_INFORMATION (IDS_ERROR + 2)
@ -209,24 +209,22 @@
#define IDS_ERR_LOAD_DISK (IDS_ERROR + 30)
#define IDS_ERR_LOAD_DISK_CRC (IDS_ERROR + 31)
#define IDS_ERR_BURN_INIT (IDS_ERROR + 50)
#define IDS_ERR_BURN_INIT (IDS_ERROR + 40)
#define IDS_ERR_UI_NOSUPPORT (IDS_ERROR + 100)
#define IDS_ERR_UI_WINDOW (IDS_ERROR + 101)
#define IDS_ERR_UI_MODULE (IDS_ERROR + 102)
#define IDS_ERR_UI_TRIPLE (IDS_ERROR + 103)
#define IDS_ERR_UI_FULL_NOMODE (IDS_ERROR + 104)
#define IDS_ERR_UI_FULL_PROBLEM (IDS_ERROR + 105)
#define IDS_ERR_UI_FULL_CUSTRES (IDS_ERROR + 106)
#define IDS_ERR_UI_NOSUPPORT (IDS_ERROR + 50)
#define IDS_ERR_UI_WINDOW (IDS_ERROR + 51)
#define IDS_ERR_UI_MODULE (IDS_ERROR + 52)
#define IDS_ERR_UI_TRIPLE (IDS_ERROR + 53)
#define IDS_ERR_UI_FULL_NOMODE (IDS_ERROR + 54)
#define IDS_ERR_UI_FULL_PROBLEM (IDS_ERROR + 55)
#define IDS_ERR_UI_FULL_CUSTRES (IDS_ERROR + 56)
#define IDS_ERR_DISK_CREATE (IDS_ERROR + 150)
#define IDS_ERR_DISK_LOAD (IDS_ERROR + 151)
#define IDS_ERR_DISK_UNAVAIL (IDS_ERROR + 152)
#define IDS_ERR_DISK_TOONEW (IDS_ERROR + 153)
#define IDS_ERR_DISK_TOOOLD (IDS_ERROR + 154)
#define IDS_ERR_DISK_CREATE (IDS_ERROR + 70)
#define IDS_ERR_DISK_LOAD (IDS_ERROR + 71)
#define IDS_ERR_DISK_UNAVAIL (IDS_ERROR + 72)
#define IDS_ERR_DISK_TOONEW (IDS_ERROR + 73)
#define IDS_ERR_DISK_TOOOLD (IDS_ERROR + 74)
#define IDS_ERR_NO_NETPLAYDLL (IDS_ERROR + 160)
#define IDS_ERR_NO_DRIVER_SELECTED (IDS_ERROR + 170)
#define IDS_ERR_NO_DRIVER_SEL_SLOT1 (IDS_ERROR + 175)
#define IDS_ERR_NO_NETPLAYDLL (IDS_ERROR + 80)
#define IDS_ERR_NO_DRIVER_SELECTED (IDS_ERROR + 81)
#define IDS_ERR_NO_DRIVER_SEL_SLOT1 (IDS_ERROR + 82)

16
src/burner/win32/string.rc
View File

@ -54,7 +54,7 @@ BEGIN
IDS_NETPLAY_START "*** Starting netplay: "
IDS_NETPLAY_START_YOU "*** You are player %i. "
IDS_NETPLAY_START_TOTAL "There are %i total players."
IDS_NETPLAY_DROP "*** Player %1i «%.32hs» dropped from the game."
IDS_NETPLAY_DROP "*** Player %1i <%.32hs> dropped from the game."
IDS_NETPLAY_TOOMUCH "too much text"
IDS_SSHOT_SAVED "PNG saved"
@ -111,13 +111,6 @@ BEGIN
IDS_CD_SELECT_IMAGE "Select CD-ROM image..."
IDS_MENU + 0 "&Arcade"
IDS_MENU + 1 "&Other..."
IDS_MENU + 2 "&Other Gamma value..."
IDS_MENU + 3 "Adjust &CPU speed..."
IDS_MENU + 4 "Load state from active slot (no %d)\tF9"
IDS_MENU + 5 "Save state to active slot (no %d)\tF10"
IDS_SEL_FILTERS "Filters"
IDS_SEL_HARDWARE "Hardware"
IDS_SEL_CAVE "Cave"
@ -181,6 +174,13 @@ BEGIN
IDS_IPSMANAGER_TITLE "IPS Patch Manager"
IDS_MENU_0 "&Arcade"
IDS_MENU_1 "&Other..."
IDS_MENU_2 "&Other Gamma value..."
IDS_MENU_3 "Adjust &CPU speed..."
IDS_MENU_4 "Load state from active slot (no %d)\tF9"
IDS_MENU_5 "Save state to active slot (no %d)\tF10"
IDS_ERR_ERROR "Error"
IDS_ERR_WARNING "Warning"
IDS_ERR_INFORMATION "Information"

1
whatsnew.html
View File

@ -116,6 +116,7 @@
<li>Updated Vez CPU core interface to allocate memory rather than use an array, and added support for auto-acknowledging IRQs [iq_132]</li>
<li>Fixed crash when taking screenshots of vertical or flipped games using blitters other than the D3D enhanced blitter [Barry]</li>
<li>Added option to DirectDraw blitter to force flipping as it isn't usually detected as available, see help file for more information [Barry]</li>
<li>Fixed issue with strings in localisation templates [Barry, doomking]</li>
<li>Updated help file [Barry]</li>
<li>Matched all sets to MAME 0.144u2 [Barry]</li>
<li>Matched the Megadrive sets to MESS 0.144u2 [Barry]</li>