From 436a27c40dc7d87c8bf555de2ffc4d1476528cc8 Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Tue, 17 Mar 2015 22:09:33 -0400 Subject: [PATCH 1/7] Fixed a few more UI translations --- Source/Project64/User Interface/Settings Config.cpp | 4 ++++ .../User Interface/Settings/Settings Page - Options.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Source/Project64/User Interface/Settings Config.cpp b/Source/Project64/User Interface/Settings Config.cpp index 0f82dabc3..0a35e0564 100644 --- a/Source/Project64/User Interface/Settings Config.cpp +++ b/Source/Project64/User Interface/Settings Config.cpp @@ -88,6 +88,10 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /* CConfigSettingSection * SettingsSection; + //Set the text for all gui Items + SetDlgItemTextW(m_hWnd, IDOK, GS(CHEAT_OK)); + SetDlgItemTextW(m_hWnd, IDCANCEL, GS(CHEAT_CANCEL)); + if (m_GameConfig) { if (g_Settings->LoadBool(Setting_RdbEditor)) diff --git a/Source/Project64/User Interface/Settings/Settings Page - Options.cpp b/Source/Project64/User Interface/Settings/Settings Page - Options.cpp index 5e37cbe14..d041e1c67 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Options.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Options.cpp @@ -25,7 +25,9 @@ CGeneralOptionsPage::CGeneralOptionsPage(CSettingConfig * SettingsConfig, HWND h SetDlgItemTextW(m_hWnd, IDC_SCREEN_SAVER, GS(OPTION_DISABLE_SS)); SetDlgItemTextW(m_hWnd, IDC_BASIC_MODE, GS(OPTION_BASIC_MODE)); SetDlgItemTextW(m_hWnd, IDC_MAXROMS_TXT, GS(RB_MAX_ROMS)); + SetDlgItemTextW(m_hWnd, IDC_ROMSEL_TEXT2, GS(RB_ROMS)); SetDlgItemTextW(m_hWnd, IDC_MAXROMDIR_TXT, GS(RB_MAX_DIRS)); + SetDlgItemTextW(m_hWnd, IDC_ROMSEL_TEXT4, GS(RB_DIRS)); AddModCheckBox(GetDlgItem(IDC_AUTOSLEEP),Setting_AutoSleep); AddModCheckBox(GetDlgItem(IDC_LOAD_FULLSCREEN),Setting_AutoFullscreen); From f2cacbf0451cacddcd52b671adc4f4714134ed34 Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Fri, 20 Mar 2015 14:36:29 -0400 Subject: [PATCH 2/7] Updated some more UI strings --- Lang/Chinese (Simplified).pj.Lang | 9 +- Lang/ChineseGB.pj.lang | 426 ------------------ Lang/English.pj.Lang | 5 +- Source/Project64/Multilanguage.h | 1 + .../Multilanguage/Language Class.cpp | 3 +- .../Settings Page - Advanced Options.cpp | 2 + .../Settings Page - Game - General.cpp | 2 + .../Settings Page - Game - Recompiler.cpp | 5 +- 8 files changed, 19 insertions(+), 434 deletions(-) delete mode 100644 Lang/ChineseGB.pj.lang diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 5e1707bdb..9eb2acf8e 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -230,7 +230,8 @@ #463# "记忆已选择的金手指" #464# "当运行rom时，禁用屏幕保护程序" #465# "显示帧速率" -#466# "改变帧速率的显示类型" +#466# "帧速率回显" +#467# "检查Project64是否已经在运行" //Rom Browser Tab #480# "最大 # Rom 记忆数 (最大 10):" @@ -340,8 +341,8 @@ #691# "游戏正在运行 (全屏)" // Frame Rate Option -#700# "每秒场消隐期" -#701# "每秒显示列表" +#700# "每秒垂直中断 (VI/s)" +#701# "每秒显示列表 (DL/s)" #702# "速度百分比" // Increase speed @@ -397,7 +398,7 @@ #1017# "请选择一个值:" #1018# "数值(&V)" #1019# "从" -#1020# "到" +#1020# "至" #1021# "说明(&N):" #1022# "添加金手指" #1023# "新建金手指" diff --git a/Lang/ChineseGB.pj.lang b/Lang/ChineseGB.pj.lang deleted file mode 100644 index 6880e44ef..000000000 --- a/Lang/ChineseGB.pj.lang +++ /dev/null @@ -1,426 +0,0 @@ -/********************************************************************************* -* What's New * -*********************************************************************************/ -//Alt+KEYS shortcut added (credit to mygod for pointing this out! Thanks) -//Review and minor mistake corrected - -/********************************************************************************* -* Meta Information * -*********************************************************************************/ -//About DLL -#1# "简体中文" -#2# "Maximus" -#3# "1.1" -#4# "10th September 2002" - -//About DLL Dialog -#5# "目前语文" -#6# "作者" -#7# "版本" -#8# "日期" -#9# "浏览网页" -#10# "游戏档资料库（.RDB）" -#11# "作弊码资料库（.CHT）" -#12# "游戏档讯息资料库（.RDX）" - -//About INI title -#20 # "关於INI" - -/********************************************************************************* -* Menu * -*********************************************************************************/ -//File Menu -#100# "文件 &F" -#101# "打开 &O" -#102# "讯息... &I" -#103# "开始模拟" -#104# "结束模拟" -#105# "选择文件夹..." -#106# "刷新" -#107# "最近使用游戏档" -#108# "最近使用游戏档文件夹" -#109# "离开 &X" - -//System Menu -#120# "系统 &S" -#121# "重新启动 &R" -#122# "暂停 &P" -#123# "萤幕抓取" -#124# "限制FPS" -#125# "储存 &S" -#126# "更名另存..." -#127# "读取 &R" -#128# "读取档案..." -#129# "快速存档 &T" -#130# "作弊码..." -#131# "作弊码按钮" -#132# "继续" - -//Options Menu -#140# "设置 &O" -#141# "全萤幕 &F" -#142# "常置桌面 &T" -#143# "影像设定..." -#144# "音效设定..." -#145# "输入设定..." -#146# "RSP设定..." -#147# "显示CPU使用率%" -#148# "设定... &S" - -//Debugger Menu -#160# "除错 &D" - -//Language Menu -#175# "语文 &L" - -//Help Menu -#180# "帮助 &H" -#181# "关於INI &I" -#182# "关於Project 64 &A" - -//Current Save Slot menu -#190# "初始设定" -#191# "快存捷径一" -#192# "快存捷径二" -#193# "快存捷径三" -#194# "快存捷径四" -#195# "快存捷径五" -#196# "快存捷径六" -#197# "快存捷径七" -#198# "快存捷径八" -#199# "快存捷径九" -#200# "快存捷径十" - -//Pop up Menu -#210# "执行游戏" -#211# "讯息" -#212# "游戏设定" -#213# "作弊码编辑" - -// Menu Descriptions -#250# "打开N64游戏档" -#251# "显示N64游戏档讯息" -#252# "开始执行游戏模拟" -#253# "停止执行游戏模拟" -#254# "选择游戏档文件夹" -#255# "刷新游戏档列示" -#256# "离开模拟器" -#257# "重新启动游戏档（变更设定）" -#258# "暂定/继续游戏" -#259# "抓取游戏画面" -#260# "限制FPS以变更模拟器执行速度" -#261# "进行快速存档" -#262# "进行快速存档（快存捷径选择）" -#263# "读取快存档" -#264# "读取指定快存档" -#265# "启动/关闭GAME SHARK作弊码" -#266# "特殊作弊码按钮" -#267# "全萤幕切换" -#268# "游戏视窗常置於桌面" -#269# "变更影像设定" -#270# "变更音效设定" -#271# "变更输入设定" -#272# "变更RSP设定" -#273# "显示目前处理器资源" -#274# "观看/变更目前系统设定" -#275# "观看使用手册" -#276# "观看常见问题集" -#277# "关於INI" -#278# "关於程式" -#279# "打开此游戏档" -#280# "选择此文件夹为指定文件夹" -#281# "变更语文设定" -#282# "选择此快存捷径" -#283# "执行此游戏档" -#284# "此游戏档讯息" -#285# "指定游戏档设定" -#286# "指定游戏档作弊码设定" - -/********************************************************************************* -* ROM Browser * -*********************************************************************************/ -//Rom Browser Fields -#300# "档案名" -#301# "游戏名称" -#302# "正常游戏档" -#303# "状况" -#304# "游戏档容量" -#305# "核心程式备注" -#306# "外挂程式备注" -#307# "使用者备注" -#308# "游戏标签" -#309# "发行公司" -#310# "国家" -#311# "设计公司" -#312# "CRC1" -#313# "CRC2" -#314# "CIC CHIP" -#315# "发行日期" -#316# "类型" -#317# "玩家人数" - -//Select Rom -#320# "选择此游戏档文件夹" - -//Messages -#340# "此为问题游戏档？请使用GOODN64确定或查阅最新版INI" - -/********************************************************************************* -* Option * -*********************************************************************************/ -//Options Title -#400# "设定" - -//Tabs -#401# "外挂程式" -#402# "文件夹" -#403# "选项" -#404# "游戏档选择" -#405# "进阶设定" -#406# "游戏档设定" -#407# "副档名连结" -#408# "游戏档备注" - -//Plugin Dialog -#420# "关於" -#421# "同位讯号处理器（RSP）外挂程式：" -#422# "影像外挂程式：" -#423# "音效外挂程式：" -#424# "输入设备外挂程式：" - -//Directory Dialog -#440# "外挂程式文件夹：" -#441# "游戏档文件夹：" -#442# "N64自动存档：" -#443# "快存：" -#444# "画面抓取：" -#445# "前次游戏档文件夹" -#446# "选择外挂程式文件夹" -#447# "选择游戏档文件夹" -#448# "选择自存档文件夹" -#449# "选择快存档文件夹" -#450# "选择抓取画面存档路径" - -//Options Dialog -#460# "当跳离模拟器视窗时暂停游戏" -#461# "直接切换为全萤幕" -#462# "隐藏进阶设定" -#463# "自动记忆所选择作弊码" - -//Rom Browser Tab -#480# "最大游戏档数记忆（最多十个）：" -#481# "游戏档" -#482# "最大游戏档路径数记忆（最多十个）：" -#483# "路径" -#484# "使用游戏档浏览器" -#485# "使用完整路径名称" -#486# "可用选项：" -#487# "以此次序显示：" -#488# "加入->" -#489# "<-删除" -#490# "移上" -#491# "移下" - -//Advanced Options -#500# "除非重新启动或更换游戏档，否则多数效果将无法更新/显示" -#501# "核心程式初始设定" -#502# "核心处理器模式：" -#503# "记忆体处理模式：" -#504# "记忆体容量（初始设定）：" -#505# "ADVANCED BLOCK LINKING：" -#506# "打开游戏档时自动开始进行模拟" -#507# "自动覆盖INI初始设定" -#508# "自动压缩快存档" - -//Rom Options -#520# "核心处理器模式：" -#521# "记忆体处理模式：" -#522# "记忆体容量：" -#523# "ADVANCED BLOCK LINKING：" -#524# "储存模式：" -#525# "COUNTER FACTOR：" -#526# "LARGE COMPILE BUFFER" -#527# "使用TLB" -#528# "REGISTER CACHING" -#529# "暂缓SI INTERRUPT" -#530# "SP HACK" -#531# "初始设定" - -//Core Styles -#540# "INTERPRETER" -#541# "RECOMPILER" -#542# "SYNCHRONISE CORES" - -//Self Mod Methods -#560# "NONE" -#561# "CACHE" -#562# "PROTECT MEMORY" -#563# "CHECK MEMORY & CACHE" -#564# "CHANGE MEMORY & CACHE" -#565# "CHECK MEMORY ADVANCED" - -//RDRAM Size -#580# "4 MB" -#581# "8 MB" - -//Advanced Block Linking -#600# "启动" -#601# "关闭" - -//Save Type -#620# "使用优先类型" -#621# "4KBIT EEPROM" -#622# "16KBIT EEPROM" -#623# "32KBYTES SRAM" -#624# "FLASHRAM" - -//Shell Integration Tab -#640# "连结副档名：" - -//Rom Notes -#660# "游戏档状况：" -#661# "核心程式备注：" -#662# "外挂程式备注：" - -/********************************************************************************* -* ROM Information * -*********************************************************************************/ -//Rom Info Title -#800# "游戏档资讯" - -//Rom Info Text -#801# "游戏名称：" -#802# "档案名称：" -#803# "位置：" -#804# "容量：" -#805# "游戏标签：" -#806# "设计公司：" -#807# "国家：" -#808# "CRC1：" -#809# "CRC2：" -#810# "CIC CHIP：" - -/********************************************************************************* -* Cheats * -*********************************************************************************/ -//Cheat List -#1000# "作弊码" -#1001# "作弊码：" -#1002# "备注：" -#1003# "全部选择" -#1004# "全部不选择" - -//Add Cheat -#1005# "加入作弊码" -#1006# "名称：" -#1007# "作弊码：" -#1008# "增加" -#1009# "清除" -#1010# "作弊码备注：" -#1011# "加入资料库" -#1022# "加入作弊码" -#1023# "新增作弊码" -#1024# "〈位置〉〈数值〉" -#1025# "选项：" -#1026# "〈位置〉〈数值〉" - -//Code extension -#1012# "进阶码" -#1013# "请选择使用数值：" -#1014# "确定" -#1015# "取消" - -//Digital Value -#1016# "数据" -#1017# "请输入数值：" -#1018# "数值" -#1019# "由" -#1020# "至" -#1021# "备注：" - -//Edit Cheat -#1027# "作弊码编辑" -#1028# "作弊码更新" - -//Cheat Popup Menu -#1040# "新增作弊码" -#1041# "编辑" -#1042# "删除" - -/********************************************************************************* -* Message * -*********************************************************************************/ -#2000# "*** 暂停 ***" -#2001# "继续" -#2002# "程式出现循环错误，模拟将停止。 - -请重新设定游戏" -#2003# "搜索记忆位置失败" -#2004# "影像外挂程式错误。 - -请确认是否有系统所支援外挂程式存在" -#2005# "音效外挂程式错误。 - -请确认是否有系统所支援外挂程式存在" -#2006# "RSP外挂程式错误。 - -请确认PROJECT64是否完整安装" -#2007# "输入外挂程式错误。 - -请确认是否有系统所支援外挂程式存在" -#2008# "无法读取外挂程式：" -#2009# "无法读取。 - -请确认游戏档设定" -#2010# "无法读取存档" -#2011# "无法读取EEPROM" -#2012# "无法读取FLASHRAM" -#2013# "无法读取MEMPAK" -#2014# "无法读取压缩档。 -请检查压缩档状况。 - -模拟器或许需要重新启动" -#2015# "无法打开文件" -#2016# "打开压缩档出错" -#2017# "此档案为错误游戏档。 - -请使用GOODN64确认" -#2018# "资料不明（国家）" -#2019# "资料不明（CIC CHIP）" -#2020# "资料不明（档案格式）" -#2021# "资料不明（记忆体执行错误） - -模拟停止" -#2022# "无法执行R4300I OPCODE" -#2023# "程式执行错误。 - -请确认游戏档设定" -#2024# "此快存档无法执行於此游戏档。 - -快存档必需使用於原本游戏档，区码及版本也必需相同。 -强迫读取将造成程式无法正常执行。 - -确定读取？" -#2025# "错误" -#2026# "版权资讯不明。此游戏档将无法正常执行。" -#2027# "拷贝防护失败" -#2028# "更换外挂程式后模拟器将重新启动。 -如果您不想失去目前游戏进度，请选择“否”并进行快存。 - -确定更换外挂程式？" -#2029# "更换外挂程式" -#2030# "模拟结束" -#2031# "模拟开始" -#2032# "无法读取快存捷径" -#2033# "读取快存捷径" -#2034# "将目前进度储存於" -#2035# "快存结束" -#2036# "游戏档位元更换（BYTE SWAPPING IMAGE）" -#2037# "选择N64游戏档" -#2038# "读取" -#2039# "读取游戏档" -#2040# "外挂程式尚未启动，游戏档无法执行" -#2041# "确定删除？" -#2042# "删除作弊码" -#2043# "此作弊码名称经已使用" -#2044# "此游戏档已无法新增作弊码" diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index e7e4a5fa8..5e872232f 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -230,7 +230,8 @@ #463# "Remember selected cheats" #464# "Disable Screen Saver when running rom" #465# "Display Frame Rate" -#466# "Change Frame Rate Display Type" +#466# "Frame Rate Display" +#467# "Check if project64 is already running" //Rom Browser Tab #480# "Max # of Roms Remembered (Max 10):" @@ -251,7 +252,7 @@ #500# "Most of these changes will not take effect till a new rom is opened or current rom is reset." #501# "Core Defaults" #502# "CPU core style:" -#503# "Self-mod code method:" +#503# "Self Mod Methods" #504# "Default Memory Size:" #505# "Advanced Block Linking:" #506# "Start Emulation when rom is opened?" diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index 1e5c5f4ab..49469f71d 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -260,6 +260,7 @@ enum LanguageStringID{ OPTION_DISABLE_SS =464, OPTION_DISPLAY_FR =465, OPTION_CHANGE_FR =466, + OPTION_CHECK_RUNNING =467, //Rom Browser Tab RB_MAX_ROMS = 480, diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 58e0b1553..0c07c8d07 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -225,7 +225,8 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(OPTION_REMEMBER_CHEAT, L"Remember selected cheats"); DEF_STR(OPTION_DISABLE_SS, L"Disable Screen Saver when running rom"); DEF_STR(OPTION_DISPLAY_FR, L"Display Frame Rate"); - DEF_STR(OPTION_CHANGE_FR, L"Change Frame Rate Display Type"); + DEF_STR(OPTION_CHECK_RUNNING, L"Check if project64 is already running"); + DEF_STR(OPTION_CHANGE_FR, L"Frame Rate Display"); //Rom Browser Tab DEF_STR(RB_MAX_ROMS, L"Max # of Roms Remembered (Max 10):"); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp index 7ce3df90c..c91c6e1bc 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp @@ -23,6 +23,8 @@ CAdvancedOptionsPage::CAdvancedOptionsPage (HWND hParent, const RECT & rcDispay SetDlgItemTextW(m_hWnd, IDC_ZIP, GS(ADVANCE_COMPRESS)); SetDlgItemTextW(m_hWnd, IDC_DEBUGGER, GS(ADVANCE_DEBUGGER)); SetDlgItemTextW(m_hWnd, IDC_REMEMBER_CHEAT, GS(OPTION_REMEMBER_CHEAT)); + SetDlgItemTextW(m_hWnd, IDC_CHECK_RUNNING, GS(OPTION_CHECK_RUNNING)); + SetDlgItemTextW(m_hWnd, IDC_DISPLAY_FRAMERATE, GS(OPTION_CHANGE_FR)); AddModCheckBox(GetDlgItem(IDC_START_ON_ROM_OPEN),Setting_AutoStart); AddModCheckBox(GetDlgItem(IDC_ZIP),Setting_AutoZipInstantSave); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp index e12a3fde0..feda78a97 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp @@ -20,6 +20,8 @@ CGameGeneralPage::CGameGeneralPage (HWND hParent, const RECT & rcDispay ) } //Set the text for all gui Items + SetDlgItemTextW(m_hWnd, IDC_GOOD_NAME_TEXT, GS(RB_GOODNAME)); + SetDlgItemTextW(m_hWnd, IDC_MEMORY_SIZE_TEXT, GS(ROM_MEM_SIZE)); SetDlgItemTextW(m_hWnd, IDC_SAVE_TYPE_TEXT, GS(ROM_SAVE_TYPE)); SetDlgItemTextW(m_hWnd, IDC_COUNTFACT_TEXT, GS(ROM_COUNTER_FACTOR)); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp index f69b6c960..6f8b5cf6b 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp @@ -22,8 +22,11 @@ CGameRecompilePage::CGameRecompilePage (HWND hParent, const RECT & rcDispay ) //Set the text for all gui Items SetDlgItemTextW(m_hWnd, IDC_CPU_TYPE_TEXT, GS(ROM_CPU_STYLE)); SetDlgItemTextW(m_hWnd, IDC_FUNCFIND_TEXT, GS(ROM_FUNC_FIND)); - SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); + SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); + SetDlgItemTextW(m_hWnd, IDC_BLOCK_LINKING, GS(ADVANCE_ABL)); + + SetDlgItemTextW(m_hWnd, IDC_SMM_FRAME, GS(ADVANCE_SMCM)); SetDlgItemTextW(m_hWnd, IDC_SMM_CACHE, GS(ADVANCE_SMM_CACHE)); SetDlgItemTextW(m_hWnd, IDC_SMM_DMA, GS(ADVANCE_SMM_PIDMA)); SetDlgItemTextW(m_hWnd, IDC_SMM_VALIDATE, GS(ADVANCE_SMM_VALIDATE)); From d3e1e1fc89d46f40c20441865ffb542de6ae98de Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Fri, 20 Mar 2015 15:38:55 -0400 Subject: [PATCH 3/7] Added even more updates Had to remove an unused string and replace it because there wasn't enough memory --- Lang/Chinese (Simplified).pj.Lang | 12 ++++++-- Lang/English.pj.Lang | 10 ++++++- Source/Project64/Multilanguage.h | 30 ++++++++++++------- .../Multilanguage/Language Class.cpp | 10 ++++++- .../User Interface/Settings Config.cpp | 3 ++ .../Settings Page - Game - General.cpp | 6 +++- 6 files changed, 55 insertions(+), 16 deletions(-) diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 9eb2acf8e..337a22ac5 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -276,13 +276,16 @@ #527# "使用 TLB" #528# "寄存缓冲器" #529# "延迟 SI 中断信号" -#530# "SP Hack" +#530# "VI 刷新率" #531# "默认" #532# "RSP 音频信号" #533# "固定音频定时" #534# "查询函数方案:" #535# "自定义自我修改方案" #536# "使用音频同步" +#537# "AI 每字节计数" +#538# "32位引擎" +#539# "延迟 DP 中断信号" //Core Styles #540# "注释器" @@ -334,7 +337,7 @@ #684# "目前设置为:" #685# "设置" #686# "移除" -#687# "将重置所存储的快捷键" +#687# "重置所有快捷键" #688# "游戏未运行" #689# "游戏正在运行" #690# "游戏正在运行 (窗口)" @@ -349,6 +352,11 @@ #710# "提高游戏速度" #711# "降低游戏速度" +//Bottom page buttons +#720# "重置此页" +#721# "全部重设" +#722# "应用" + /********************************************************************************* * ROM Information * *********************************************************************************/ diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index 5e872232f..7548be0e4 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -275,13 +275,16 @@ #527# "Use TLB" #528# "Register caching" #529# "Delay SI Interrupt" -#530# "SP Hack" +#530# "VI Interrupt Rate" #531# "Default" #532# "RSP Audio Signal" #533# "Fixed Audio Timing" #534# "Function lookup method:" #535# "Custom Self Mod Method" #536# "Sync using Audio" +#537# "AI Count Per Byte" +#538# "32 Bit Engine" +#539# "Delay DP Interrupt" //Core Styles #540# "Interpreter" @@ -348,6 +351,11 @@ #710# "Increase Game Speed" #711# "Decrease Game Speed" +//Bottom Page Buttons +#720# "Reset Page" +#721# "Reset All" +#722# "Apply" + /********************************************************************************* * ROM Information * *********************************************************************************/ diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index 49469f71d..a219f8d07 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -304,13 +304,16 @@ enum LanguageStringID{ ROM_USE_TLB = 527, ROM_REG_CACHE = 528, ROM_DELAY_SI = 529, - ROM_SP_HACK = 530, + ROM_VIREFRESH = 530, ROM_DEFAULT = 531, ROM_AUDIO_SIGNAL = 532, ROM_FIXED_AUDIO = 533, ROM_FUNC_FIND = 534, ROM_CUSTOM_SMM = 535, ROM_SYNC_AUDIO = 536, + ROM_COUNTPERBYTE = 537, + ROM_32BIT = 538, + ROM_DELAY_DP = 539, //Core Styles CORE_INTERPTER = 540, @@ -318,18 +321,18 @@ enum LanguageStringID{ CORE_SYNC = 542, //Self Mod Methods - SMCM_NONE = 560, - SMCM_CACHE = 561, - SMCM_PROECTED = 562, - SMCM_CHECK_MEM = 563, - SMCM_CHANGE_MEM = 564, - SMCM_CHECK_ADV = 565, - SMCM_CACHE2 = 566, + SMCM_NONE = 560, + SMCM_CACHE = 561, + SMCM_PROECTED = 562, + SMCM_CHECK_MEM = 563, + SMCM_CHANGE_MEM = 564, + SMCM_CHECK_ADV = 565, + SMCM_CACHE2 = 566, //Function Lookup memthod - FLM_PLOOKUP = 570, - FLM_VLOOKUP = 571, - FLM_CHANGEMEM = 572, + FLM_PLOOKUP = 570, + FLM_VLOOKUP = 571, + FLM_CHANGEMEM = 572, //RDRAM Size RDRAM_4MB = 580, @@ -377,6 +380,11 @@ enum LanguageStringID{ STR_INSREASE_SPEED = 710, STR_DECREASE_SPEED = 711, +//Bottom page buttons + BOTTOM_RESET_PAGE = 720, + BOTTOM_RESET_ALL = 721, + BOTTOM_APPLY = 722, + /********************************************************************************* * ROM Information * *********************************************************************************/ diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 0c07c8d07..750681753 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -270,13 +270,16 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(ROM_USE_TLB, L"Use TLB"); DEF_STR(ROM_REG_CACHE, L"Register caching"); DEF_STR(ROM_DELAY_SI, L"Delay SI Interrupt"); - DEF_STR(ROM_SP_HACK, L"SP Hack"); + DEF_STR(ROM_VIREFRESH, L"Vi Refresh Rate: "); DEF_STR(ROM_DEFAULT, L"Default"); DEF_STR(ROM_AUDIO_SIGNAL, L"RSP Audio Signal"); DEF_STR(ROM_FIXED_AUDIO, L"Fixed Audio Timing"); DEF_STR(ROM_FUNC_FIND, L"Function lookup method:"); DEF_STR(ROM_CUSTOM_SMM, L"Custom Self Mod Method"); DEF_STR(ROM_SYNC_AUDIO, L"Sync using Audio"); + DEF_STR(ROM_COUNTPERBYTE, L"AI Count Per Byte:"); + DEF_STR(ROM_32BIT, L"32 Bit Engine:"); + DEF_STR(ROM_DELAY_DP, L"Delay DP Interrupt:"); //Core Styles DEF_STR(CORE_INTERPTER, L"Interpreter"); @@ -342,6 +345,11 @@ void CLanguage::LoadDefaultStrings (void) // Increase speed DEF_STR(STR_INSREASE_SPEED, L"Increase Game Speed"); DEF_STR(STR_DECREASE_SPEED, L"Decrease Game Speed"); + +//Bottom page buttons + DEF_STR(BOTTOM_RESET_PAGE, L"Reset Page"); + DEF_STR(BOTTOM_RESET_ALL, L"Reset All"); + DEF_STR(BOTTOM_APPLY, L"Apply"); /********************************************************************************* * ROM Information * diff --git a/Source/Project64/User Interface/Settings Config.cpp b/Source/Project64/User Interface/Settings Config.cpp index 0a35e0564..fb4bf44e6 100644 --- a/Source/Project64/User Interface/Settings Config.cpp +++ b/Source/Project64/User Interface/Settings Config.cpp @@ -89,8 +89,11 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /* CConfigSettingSection * SettingsSection; //Set the text for all gui Items + SetDlgItemTextW(m_hWnd, IDC_RESET_PAGE, GS(BOTTOM_RESET_PAGE)); + SetDlgItemTextW(m_hWnd, IDC_RESET_ALL, GS(BOTTOM_RESET_ALL)); SetDlgItemTextW(m_hWnd, IDOK, GS(CHEAT_OK)); SetDlgItemTextW(m_hWnd, IDCANCEL, GS(CHEAT_CANCEL)); + SetDlgItemTextW(m_hWnd, IDAPPLY, GS(BOTTOM_APPLY)); if (m_GameConfig) { diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp index feda78a97..169a38d87 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp @@ -25,9 +25,13 @@ CGameGeneralPage::CGameGeneralPage (HWND hParent, const RECT & rcDispay ) SetDlgItemTextW(m_hWnd, IDC_MEMORY_SIZE_TEXT, GS(ROM_MEM_SIZE)); SetDlgItemTextW(m_hWnd, IDC_SAVE_TYPE_TEXT, GS(ROM_SAVE_TYPE)); SetDlgItemTextW(m_hWnd, IDC_COUNTFACT_TEXT, GS(ROM_COUNTER_FACTOR)); + SetDlgItemTextW(m_hWnd, IDC_VIREFESH_TEXT, GS(ROM_VIREFRESH)); + SetDlgItemTextW(m_hWnd, IDC_COUNTPERBYTE_TEXT, GS(ROM_COUNTPERBYTE)); - SetDlgItemTextW(m_hWnd, IDC_SYNC_AUDIO, GS(ROM_SYNC_AUDIO)); + SetDlgItemTextW(m_hWnd, IDC_ROM_32BIT, GS(ROM_32BIT)); SetDlgItemTextW(m_hWnd, IDC_ROM_FIXEDAUDIO, GS(ROM_FIXED_AUDIO)); + SetDlgItemTextW(m_hWnd, IDC_DELAY_DP, GS(ROM_DELAY_DP)); + SetDlgItemTextW(m_hWnd, IDC_SYNC_AUDIO, GS(ROM_SYNC_AUDIO)); SetDlgItemTextW(m_hWnd, IDC_USE_TLB, GS(ROM_USE_TLB)); SetDlgItemTextW(m_hWnd, IDC_DELAY_SI, GS(ROM_DELAY_SI)); SetDlgItemTextW(m_hWnd, IDC_AUDIO_SIGNAL, GS(ROM_AUDIO_SIGNAL)); From c7041f7a6173f4dbd247a4d0fd75422087646515 Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Fri, 20 Mar 2015 22:32:55 -0400 Subject: [PATCH 4/7] Restored SP_HACK --- Lang/Chinese (Simplified).pj.Lang | 16 +- Lang/ChineseB5.pj.lang | 426 ------------------ Lang/English.pj.Lang | 3 +- Source/Project64/Multilanguage.h | 3 +- .../Multilanguage/Language Class.cpp | 3 +- .../Settings Page - Game - Recompiler.cpp | 1 + 6 files changed, 15 insertions(+), 437 deletions(-) delete mode 100644 Lang/ChineseB5.pj.lang diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 337a22ac5..344a9948a 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -266,26 +266,26 @@ #514# "TLB 取消映射关系" //Rom Options -#520# "CPU 核心类型:" -#521# "自我修改码方案:" -#522# "记忆容量:" +#520# "CPU 内核类型:" +#521# "VI 刷新率" +#522# "内存容量:" #523# "扩展模块连接:" #524# "默认记忆类型:" #525# "计算因数:" #526# "较大的编译器缓冲" #527# "使用 TLB" #528# "寄存缓冲器" -#529# "延迟 SI 中断信号" -#530# "VI 刷新率" +#529# "SI 中断延迟" +#530# "快速度(SP)" #531# "默认" #532# "RSP 音频信号" -#533# "固定音频定时" +#533# "固定音频计时" #534# "查询函数方案:" #535# "自定义自我修改方案" -#536# "使用音频同步" +#536# "使用同步音频" #537# "AI 每字节计数" #538# "32位引擎" -#539# "延迟 DP 中断信号" +#539# "DP 中断延迟" //Core Styles #540# "注释器" diff --git a/Lang/ChineseB5.pj.lang b/Lang/ChineseB5.pj.lang deleted file mode 100644 index c125f3f74..000000000 --- a/Lang/ChineseB5.pj.lang +++ /dev/null @@ -1,426 +0,0 @@ -/********************************************************************************* -* What's New * -*********************************************************************************/ -//Alt+KEYS shortcut added (credit to mygod for pointing this out! Thanks) -//Review and some minor mistake corrected - -/********************************************************************************* -* Meta Information * -*********************************************************************************/ -//About DLL -#1 # "繁體中文" -#2 # "Maximus" -#3 # "1.1" -#4 # "10th September 2002" - -//About DLL Dialog -#5 # "目前語文" -#6 # "作者" -#7 # "版本" -#8 # "日期" -#9 # "瀏覽網頁" -#10 # "遊戲檔資料庫（.RDB）" -#11 # "作弊碼資料庫（.CHT）" -#12 # "遊戲檔訊息資料庫（.RDX）" - -//About INI title -#20 # "關於INI" - -/********************************************************************************* -* Menu * -*********************************************************************************/ -//File Menu -#100# "文件 &F" -#101# "打開 &O" -#102# "訊息... &I" -#103# "開始模擬" -#104# "結束模擬" -#105# "選擇文件夾..." -#106# "刷新" -#107# "最近使用遊戲檔" -#108# "最近使用遊戲檔文件夾" -#109# "離開 &X" - -//System Menu -#120# "系統 &S" -#121# "重新啟動 &R" -#122# "暫停 &P" -#123# "螢幕抓取" -#124# "限制FPS" -#125# "儲存 &S" -#126# "更名另存..." -#127# "快速讀取 &R" -#128# "讀取檔案..." -#129# "快速存檔 &T" -#130# "作弊碼..." -#131# "作弊碼按鈕" -#132# "繼續" - -//Options Menu -#140# "設置 &O" -#141# "全螢幕 &F" -#142# "常置桌面 &A &T" -#143# "影像設定..." -#144# "音效設定..." -#145# "輸入設定..." -#146# "RSP設定..." -#147# "顯示CPU使用率%" -#148# "設定... &S" - -//Debugger Menu -#160# "除錯 &D" - -//Language Menu -#175# "語文 &L" - -//Help Menu -#180# "幫助 &H" -#181# "關於INI &I" -#182# "關於Project 64 &A" - -//Current Save Slot menu -#190# "初始設定" -#191# "快存捷徑一" -#192# "快存捷徑二" -#193# "快存捷徑三" -#194# "快存捷徑四" -#195# "快存捷徑五" -#196# "快存捷徑六" -#197# "快存捷徑七" -#198# "快存捷徑八" -#199# "快存捷徑九" -#200# "快存捷徑十" - -//Pop up Menu -#210# "執行遊戲" -#211# "訊息" -#212# "遊戲設定" -#213# "作弊碼編輯" - -// Menu Descriptions -#250# "打開N64遊戲檔" -#251# "顯示N64遊戲檔訊息" -#252# "開始執行遊戲模擬" -#253# "停止執行遊戲模擬" -#254# "選擇遊戲檔文件夾" -#255# "刷新遊戲檔列示" -#256# "離開模擬器" -#257# "重新啟動遊戲檔（變更設定）" -#258# "暫定/繼續遊戲" -#259# "抓取遊戲畫面" -#260# "限制FPS以變更模擬器執行速度" -#261# "進行快速存檔" -#262# "進行快速存檔（快存捷徑選擇）" -#263# "讀取快存檔" -#264# "讀取指定快存檔" -#265# "啟動/關閉GAME SHARK作弊碼" -#266# "特殊作弊碼按鈕" -#267# "全螢幕切換" -#268# "遊戲視窗常置於桌面" -#269# "變更影像設定" -#270# "變更音效設定" -#271# "變更輸入設定" -#272# "變更RSP設定" -#273# "顯示目前處理器資源" -#274# "觀看/變更目前系統設定" -#275# "觀看使用手冊" -#276# "觀看常見問題集" -#277# "關於INI" -#278# "關於程式" -#279# "打開此遊戲檔" -#280# "選擇此文件夾為指定文件夾" -#281# "變更語文設定" -#282# "選擇此快存捷徑" -#283# "執行此遊戲檔" -#284# "此遊戲檔訊息" -#285# "指定遊戲檔設定" -#286# "指定遊戲檔作弊碼設定" - -/********************************************************************************* -* Rom Browser * -*********************************************************************************/ -//Rom Browser Fields -#300# "檔案名" -#301# "遊戲名稱" -#302# "正常遊戲檔" -#303# "狀況" -#304# "遊戲檔容量" -#305# "核心程式備註" -#306# "外挂程式備註" -#307# "使用者備註" -#308# "遊戲標籤" -#309# "發行公司" -#310# "國家" -#311# "設計公司" -#312# "CRC1" -#313# "CRC2" -#314# "CIC CHIP" -#315# "發行日期" -#316# "類型" -#317# "玩家人數" - -//Select Rom -#320# "選擇此遊戲檔文件夾" - -//Messages -#340# "此為問題遊戲檔？請使用GOODN64確定或查閱最新版INI" - -/********************************************************************************* -* Options * -*********************************************************************************/ -//Options Title -#400# "設定" - -//Tabs -#401# "外挂程式" -#402# "文件夾" -#403# "選項" -#404# "遊戲檔選擇" -#405# "進階設定" -#406# "遊戲檔設定" -#407# "副檔名連結" -#408# "遊戲檔備註" - -//Plugin Dialog -#420# "關於" -#421# "同位訊號處理器（RSP）外挂程式：" -#422# "影像外挂程式：" -#423# "音效外挂程式：" -#424# "輸入設備外挂程式：" - -//Directory Dialog -#440# "外挂程式文件夾：" -#441# "遊戲檔文件夾：" -#442# "N64自動存檔：" -#443# "快存：" -#444# "畫面抓取：" -#445# "前次遊戲檔文件夾" -#446# "選擇外挂程式文件夾" -#447# "選擇遊戲檔文件夾" -#448# "選擇自存檔文件夾" -#449# "選擇快存檔文件夾" -#450# "選擇抓取畫面存檔路徑" - -//Options Dialog -#460# "當跳離模擬器視窗時暫停遊戲" -#461# "直接切換為全螢幕" -#462# "隱藏進階設定" -#463# "自動記憶所選擇作弊碼" - -//Rom Browser Tab -#480# "最大遊戲檔數記憶（最多十個）：" -#481# "遊戲檔" -#482# "最大遊戲檔路徑數記憶（最多十個）：" -#483# "路徑" -#484# "使用遊戲檔瀏覽器" -#485# "使用完整路徑名稱" -#486# "可用選項：" -#487# "以此次序顯示：" -#488# "加入->" -#489# "<-刪除" -#490# "移上" -#491# "移下" - -//Advanced Options -#500# "除非重新啟動或更換遊戲檔，否則多數效果將無法更新/顯示" -#501# "核心程式初始設定" -#502# "核心處理器模式：" -#503# "記憶體處理模式：" -#504# "記憶體容量（初始設定）：" -#505# "ADVANCED BLOCK LINKING：" -#506# "打開遊戲檔時自動開始進行模擬" -#507# "自動覆蓋INI初始設定" -#508# "自動壓縮快存檔" - -//Rom Options -#520# "核心處理器模式：" -#521# "記憶體處理模式：" -#522# "記憶體容量：" -#523# "ADVANCED BLOCK LINKING：" -#524# "儲存模式：" -#525# "COUNTER FACTOR：" -#526# "LARGE COMPILE BUFFER" -#527# "使用TLB" -#528# "REGISTER CACHING" -#529# "暫緩SI INTERRUPT" -#530# "SP HACK" -#531# "初始設定" - -//Core Styles -#540# "INTERPRETER" -#541# "RECOMPILER" -#542# "SYNCHRONISE CORES" - -//Self Mod Methods -#560# "NONE" -#561# "CACHE" -#562# "PROTECT MEMORY" -#563# "CHECK MEMORY & CACHE" -#564# "CHANGE MEMORY & CACHE" -#565# "CHECK MEMORY ADVANCED" - -//RDRAM Size -#580# "4 MB" -#581# "8 MB" - -//Advanced Block Linking -#600# "啟動" -#601# "關閉" - -//Save Type -#620# "使用優先類型" -#621# "4KBIT EEPROM" -#622# "16KBIT EEPROM" -#623# "32KBYTES SRAM" -#624# "FLASHRAM" - -//Shell Integration Tab -#640# "連結副檔名：" - -//Rom Notes -#660# "遊戲檔狀況：" -#661# "核心程式備注：" -#662# "外挂程式備注：" - -/********************************************************************************* -* ROM Information * -*********************************************************************************/ -//Rom Info Title -#800# "遊戲檔資訊" - -//Rom Info Text -#801# "遊戲名稱：" -#802# "檔案名稱：" -#803# "位置：" -#804# "容量：" -#805# "遊戲標籤：" -#806# "設計公司：" -#807# "國家：" -#808# "CRC1：" -#809# "CRC2：" -#810# "CIC CHIP：" - -/********************************************************************************* -* Cheats * -*********************************************************************************/ -//Cheat List -#1000# "作弊碼" -#1001# "作弊碼：" -#1002# "備注：" -#1003# "全部選擇" -#1004# "全部不選擇" - -//Add Cheat -#1005# "加入作弊碼" -#1006# "名稱：" -#1007# "作弊碼：" -#1008# "增加" -#1009# "清除" -#1010# "作弊碼備注：" -#1011# "加入資料庫" -#1022# "加入作弊碼" -#1023# "新增作弊碼" -#1024# "〈位置〉〈數值〉" -#1025# "選項：" -#1026# "〈位置〉〈數值〉" - -//Code extension -#1012# "進階碼" -#1013# "請選擇使用數值：" -#1014# "確定" -#1015# "取消" - -//Digital Value -#1016# "數據" -#1017# "請輸入數值：" -#1018# "數值" -#1019# "由" -#1020# "至" -#1021# "備注：" - -//Edit Cheat -#1027# "作弊碼編輯" -#1028# "作弊碼更新" - -//Cheat Popup Menu -#1040# "新增作弊碼" -#1041# "編輯" -#1042# "刪除" - -/********************************************************************************* -* Messages * -*********************************************************************************/ -#2000# "*** 暫停 ***" -#2001# "繼續" -#2002# "程式出現循環錯誤，模擬將停止。 - -請重新設定遊戲" -#2003# "搜索記憶位置失敗" -#2004# "影像外挂程式錯誤。 - -請確認是否有系統所支援外挂程式存在" -#2005# "音效外挂程式錯誤。 - -請確認是否有系統所支援外挂程式存在" -#2006# "RSP外挂程式錯誤。 - -請確認PROJECT64是否完整安裝" -#2007# "輸入外挂程式錯誤。 - -請確認是否有系統所支援外挂程式存在" -#2008# "無法讀取外挂程式：" -#2009# "無法讀取。 - -請確認遊戲檔設定" -#2010# "無法讀取存檔" -#2011# "無法讀取EEPROM" -#2012# "無法讀取FLASHRAM" -#2013# "無法讀取MEMPAK" -#2014# "無法讀取壓縮檔。 -請檢查壓縮檔狀況。 - -模擬器或許需要重新啟動" -#2015# "無法打開文件" -#2016# "打開壓縮檔出錯" -#2017# "此檔案為錯誤遊戲檔。 - -請使用GOODN64確認" -#2018# "資料不明（國家）" -#2019# "資料不明（CIC CHIP）" -#2020# "資料不明（檔案格式）" -#2021# "資料不明（記憶體執行錯誤） - -模擬停止" -#2022# "無法執行R4300i OPCODE" -#2023# "程式執行錯誤。 - -請確認遊戲檔設定" -#2024# "此快存檔無法執行於此遊戲檔。 - -快存檔必需使用於原本遊戲檔，區碼及版本也必需相同。 -強迫讀取將造成程式無法正常執行。 - -確定讀取？" -#2025# "錯誤" -#2026# "版權資訊不明。此遊戲檔將無法正常執行。" -#2027# "拷貝防護失敗" -#2028# "更換外挂程式後模擬器將重新啟動。 -如果您不想失去目前遊戲進度，請選擇“否”並進行快存。 - -確定更換外挂程式？" -#2029# "更換外挂程式" -#2030# "模擬結束" -#2031# "模擬開始" -#2032# "無法讀取快存捷徑" -#2033# "讀取快存捷徑" -#2034# "將目前進度儲存於" -#2035# "快存結束" -#2036# "遊戲檔位元更換（BYTE SWAPPING IMAGE）" -#2037# "選擇N64遊戲檔" -#2038# "讀取" -#2039# "讀取遊戲檔" -#2040# "外挂程式尚未啟動，遊戲檔無法執行" -#2041# "確定刪除？" -#2042# "刪除作弊碼" -#2043# "此作弊碼名稱經已使用" -#2044# "此遊戲檔已無法新增作弊碼" diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index 7548be0e4..3b4e4dd1e 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -267,6 +267,7 @@ //Rom Options #520# "CPU core style:" +#521# "VI Refresh Rate:" #522# "Memory Size:" #523# "Advanced Block Linking:" #524# "Default Save type:" @@ -275,7 +276,7 @@ #527# "Use TLB" #528# "Register caching" #529# "Delay SI Interrupt" -#530# "VI Interrupt Rate" +#530# "Fast SP" #531# "Default" #532# "RSP Audio Signal" #533# "Fixed Audio Timing" diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index a219f8d07..e15e4e092 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -296,6 +296,7 @@ enum LanguageStringID{ //Rom Options ROM_CPU_STYLE = 520, + ROM_VIREFRESH = 521, ROM_MEM_SIZE = 522, ROM_ABL = 523, ROM_SAVE_TYPE = 524, @@ -304,7 +305,7 @@ enum LanguageStringID{ ROM_USE_TLB = 527, ROM_REG_CACHE = 528, ROM_DELAY_SI = 529, - ROM_VIREFRESH = 530, + ROM_SP_HACK = 530, ROM_DEFAULT = 531, ROM_AUDIO_SIGNAL = 532, ROM_FIXED_AUDIO = 533, diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 750681753..a6cc55936 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -262,6 +262,7 @@ void CLanguage::LoadDefaultStrings (void) //Rom Options DEF_STR(ROM_CPU_STYLE, L"CPU core style:"); + DEF_STR(ROM_VIREFRESH, L"VI Refresh Rate:"); DEF_STR(ROM_MEM_SIZE, L"Memory Size:"); DEF_STR(ROM_ABL, L"Advanced Block Linking:"); DEF_STR(ROM_SAVE_TYPE, L"Default Save type:"); @@ -270,7 +271,7 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(ROM_USE_TLB, L"Use TLB"); DEF_STR(ROM_REG_CACHE, L"Register caching"); DEF_STR(ROM_DELAY_SI, L"Delay SI Interrupt"); - DEF_STR(ROM_VIREFRESH, L"Vi Refresh Rate: "); + DEF_STR(ROM_SP_HACK, L"Fast SP"); DEF_STR(ROM_DEFAULT, L"Default"); DEF_STR(ROM_AUDIO_SIGNAL, L"RSP Audio Signal"); DEF_STR(ROM_FIXED_AUDIO, L"Fixed Audio Timing"); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp index 6f8b5cf6b..99730670b 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp @@ -25,6 +25,7 @@ CGameRecompilePage::CGameRecompilePage (HWND hParent, const RECT & rcDispay ) SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); SetDlgItemTextW(m_hWnd, IDC_BLOCK_LINKING, GS(ADVANCE_ABL)); + SetDlgItemTextW(m_hWnd, IDC_ROM_FASTSP, GS(ROM_SP_HACK)); SetDlgItemTextW(m_hWnd, IDC_SMM_FRAME, GS(ADVANCE_SMCM)); SetDlgItemTextW(m_hWnd, IDC_SMM_CACHE, GS(ADVANCE_SMM_CACHE)); From 4324f25394ab36e558ecae89fb39d13e37b8d48b Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Sat, 21 Mar 2015 09:16:27 -0400 Subject: [PATCH 5/7] Removed installer files for outdated language files --- Source/Installer/Installer.iss | 2 -- Source/Installer/package_zip.bat | 2 -- 2 files changed, 4 deletions(-) diff --git a/Source/Installer/Installer.iss b/Source/Installer/Installer.iss index 627ef1f93..48fb78358 100644 --- a/Source/Installer/Installer.iss +++ b/Source/Installer/Installer.iss @@ -34,8 +34,6 @@ Source: "{#BaseDir}\Lang\Bulgarian.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Chinese (Simplified).pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Chinese (Taiwan).pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Chinese (Traditional).pj.Lang"; DestDir: "{app}\Lang" -Source: "{#BaseDir}\Lang\ChineseB5.pj.lang"; DestDir: "{app}\Lang" -Source: "{#BaseDir}\Lang\ChineseGB.pj.lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Czech.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Danish.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Dutch.pj.Lang"; DestDir: "{app}\Lang" diff --git a/Source/Installer/package_zip.bat b/Source/Installer/package_zip.bat index 834097fe2..023088110 100644 --- a/Source/Installer/package_zip.bat +++ b/Source/Installer/package_zip.bat @@ -25,8 +25,6 @@ copy "%base_dir%\Lang\Bulgarian.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Chinese (Simplified).pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Chinese (Taiwan).pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Chinese (Traditional).pj.Lang" "%base_dir%\Bin\Package\Lang" -copy "%base_dir%\Lang\ChineseB5.pj.lang" "%base_dir%\Bin\Package\Lang" -copy "%base_dir%\Lang\ChineseGB.pj.lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Czech.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Danish.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Dutch.pj.Lang" "%base_dir%\Bin\Package\Lang" From 5f9f2937e734ebf536418743d761d689ab156505 Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Sun, 22 Mar 2015 13:05:15 -0400 Subject: [PATCH 6/7] changed sp_hack to fast sp --- Source/Project64/Multilanguage/Language Class.cpp | 2 +- .../Settings/Settings Page - Game - Recompiler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index a6cc55936..105598f45 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -271,7 +271,7 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(ROM_USE_TLB, L"Use TLB"); DEF_STR(ROM_REG_CACHE, L"Register caching"); DEF_STR(ROM_DELAY_SI, L"Delay SI Interrupt"); - DEF_STR(ROM_SP_HACK, L"Fast SP"); + DEF_STR(ROM_FAST_SP, L"Fast SP"); DEF_STR(ROM_DEFAULT, L"Default"); DEF_STR(ROM_AUDIO_SIGNAL, L"RSP Audio Signal"); DEF_STR(ROM_FIXED_AUDIO, L"Fixed Audio Timing"); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp index 99730670b..91325cfa5 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp @@ -25,7 +25,7 @@ CGameRecompilePage::CGameRecompilePage (HWND hParent, const RECT & rcDispay ) SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); SetDlgItemTextW(m_hWnd, IDC_BLOCK_LINKING, GS(ADVANCE_ABL)); - SetDlgItemTextW(m_hWnd, IDC_ROM_FASTSP, GS(ROM_SP_HACK)); + SetDlgItemTextW(m_hWnd, IDC_ROM_FASTSP, GS(ROM_FAST_SP)); SetDlgItemTextW(m_hWnd, IDC_SMM_FRAME, GS(ADVANCE_SMCM)); SetDlgItemTextW(m_hWnd, IDC_SMM_CACHE, GS(ADVANCE_SMM_CACHE)); From 8e6de534e657afb9ff32729a2cf1106e6da15aa2 Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Sun, 22 Mar 2015 13:17:42 -0400 Subject: [PATCH 7/7] Changed "SP Hack" setting to "Fast SP" --- Source/Project64/Settings/Settings Class.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Project64/Settings/Settings Class.cpp b/Source/Project64/Settings/Settings Class.cpp index 2459132bb..a10494d3f 100644 --- a/Source/Project64/Settings/Settings Class.cpp +++ b/Source/Project64/Settings/Settings Class.cpp @@ -192,7 +192,7 @@ void CSettings::AddHowToHandleSetting () AddHandler(Game_DelaySI, new CSettingTypeGame("Delay SI",Rdb_DelaySi)); AddHandler(Game_RspAudioSignal, new CSettingTypeGame("Audio Signal",Rdb_RspAudioSignal)); AddHandler(Game_32Bit, new CSettingTypeGame("32bit",Rdb_32Bit)); - AddHandler(Game_FastSP, new CSettingTypeGame("SP Hack",Rdb_FastSP)); + AddHandler(Game_FastSP, new CSettingTypeGame("Fast SP",Rdb_FastSP)); AddHandler(Game_CurrentSaveState, new CSettingTypeTempNumber(0)); AddHandler(Game_SyncViaAudio, new CSettingTypeGame("Sync Audio",Rdb_SyncViaAudio)); AddHandler(Game_UseHleGfx, new CSettingTypeGame("HLE GFX",Rdb_UseHleGfx));