Conflicts fixed

This commit is contained in:
Nekotekina 2014-03-29 12:04:38 +04:00
commit 98024cbb01
38 changed files with 1046 additions and 769 deletions

View file

@ -9,6 +9,9 @@ void StaticAnalyse(void* ptr, u32 size, u32 base)
{
u32* data = (u32*)ptr; size /= 4;
if(!Ini.HLEHookStFunc.GetValue())
return;
// TODO: optimize search
for (u32 i = 0; i < size; i++)
{