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

Merge branch 'master' of http://www.pj64-emu.com:8090/project64.development

This commit is contained in:
zilmar 2013-04-11 12:06:28 +10:00
parent f1b743e5ed 7055c1bad9
commit d5dd94a4d7
7 changed files with 1182 additions and 968 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/Inno Setup/Project64_Bundle.exe
View File

Binary file not shown.

1
Config/Blank Project64.rdb Normal file
View File

@ -0,0 +1 @@
// empty rdb file (leave at root of emulator so 1.6 plugins work)

2027
Config/Project64.rdb
View File

File diff suppressed because it is too large Load Diff

5
Source/Project64/Multilanguage/Language Class.cpp
View File

@ -27,6 +27,11 @@ void CLanguage::LoadDefaultStrings (void)
DEF_STR(INI_CURRENT_RDX, "Extended Rom Info (.RDX)"); DEF_STR(INI_CURRENT_RDX, "Extended Rom Info (.RDX)");
DEF_STR(INI_TITLE, "About INI Files" ); DEF_STR(INI_TITLE, "About INI Files" );
DEF_STR(LANGUAGE_NAME, "" );
DEF_STR(LANGUAGE_AUTHOR, "" );
DEF_STR(LANGUAGE_VERSION, "" );
DEF_STR(LANGUAGE_DATE, "" );
/********************************************************************************* /*********************************************************************************
* Numbers * * Numbers *
*********************************************************************************/ *********************************************************************************/

7
Source/Project64/N64 System/N64 Class.cpp
View File

@ -286,6 +286,13 @@ void CN64System::StartEmulation2 ( bool NewThread )
CInterpreterCPU::BuildCPU(); CInterpreterCPU::BuildCPU();
DWORD CpuType = g_Settings->LoadDword(Game_CpuType); DWORD CpuType = g_Settings->LoadDword(Game_CpuType);
if(CpuType == CPU_SyncCores && !g_Settings->LoadBool(Debugger_Enabled))
{
g_Settings->SaveDword(Game_CpuType, CPU_Recompiler);
CpuType = CPU_Recompiler;
}
if (CpuType == CPU_SyncCores) if (CpuType == CPU_SyncCores)
{ {
g_Notify->DisplayMessage(5,"Copy Plugins"); g_Notify->DisplayMessage(5,"Copy Plugins");

5
Source/Project64/N64 System/Recompiler/Code Block.cpp
View File

@ -483,6 +483,11 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
IncludeDelaySlot = true; IncludeDelaySlot = true;
break; break;
default: default:
if (Command.Hex == 0x0407000D)
{
EndBlock = true;
break;
}
g_Notify->BreakPoint(__FILE__,__LINE__); g_Notify->BreakPoint(__FILE__,__LINE__);
return false; return false;
} }

1
Source/Project64/User Interface/Gui Class.cpp
View File

@ -166,7 +166,6 @@ DWORD CALLBACK AboutIniBoxProc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam,
char String[200],String2[200]; char String[200],String2[200];
SetWindowText(hDlg, GS(INI_TITLE)); SetWindowText(hDlg, GS(INI_TITLE));
//Language //Language
SetDlgItemText(hDlg,IDC_LAN,GS(INI_CURRENT_LANG)); SetDlgItemText(hDlg,IDC_LAN,GS(INI_CURRENT_LANG));
sprintf(String,"%s: %s",GS(INI_AUTHOR),GS(LANGUAGE_AUTHOR)); sprintf(String,"%s: %s",GS(INI_AUTHOR),GS(LANGUAGE_AUTHOR));