RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Conflicts fixed

Browse source
This commit is contained in:
Nekotekina 2014-08-22 18:30:39 +04:00
commit 7a466b7fb7
33 changed files with 397 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/SysCalls/lv2/sys_timer.cpp
View file

@ -11,7 +11,7 @@ s32 sys_timer_create(mem32_t timer_id)
{
sys_timer.Warning("sys_timer_create(timer_id_addr=0x%x)", timer_id.GetAddr());
timer_id = sys_timer.GetNewId(new timer);
timer_id = sys_timer.GetNewId(new timer, TYPE_TIMER);
return CELL_OK;
}