From 9e40247af0bc94123f80a753c8f1bffc69784113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandro=20S=C3=A1nchez=20Bach?= Date: Mon, 7 Apr 2014 14:40:50 +0200 Subject: [PATCH] Fixed error in SC_Pad.cpp and Readme.md updated --- README.md | 19 ++++++++++++++----- rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 258905cf7f..735c9a46db 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,21 @@ -rpcs3 +RPCS3 ===== -PS3 emulator/debugger +An open-source PlayStation 3 emulator/debugger written in C++. -The [FAQ](https://github.com/DHrpcs3/rpcs3/wiki/FAQ) has some basic information. +You can find some basic information in the [FAQ](https://github.com/DHrpcs3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162). -For discussion about the emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162). +### Dependencies -If you want to contribute please take a took at the [Coding Style](https://github.com/DHrpcs3/rpcs3/wiki/Coding-Style) and [Roadmap](https://github.com/DHrpcs3/rpcs3/wiki/Roadmap) pages. +* [Visual C++ Redistributable Packages for Visual Studio 2013](http://www.microsoft.com/en-us/download/details.aspx?id=40784) +* [OpenAL32.dll](http://www.mediafire.com/?nwt3ilty2mo) + +### Development + +If you want to contribute please take a took at the [Coding Style](https://github.com/DHrpcs3/rpcs3/wiki/Coding-Style), [Roadmap](https://github.com/DHrpcs3/rpcs3/wiki/Roadmap) and [Developer Information](https://github.com/DHrpcs3/rpcs3/wiki/Developer-Information) pages. You should as well contact any of the developers in the forum in order to know about the current situation of the emulator. + +### Building To initialize the repository don't forget to execute `git submodule update --init` to pull the wxWidgets source. +* __Windows__: Install *Visual Studio 2013*. Then open the *.SLN* file, and press *Build* > *Rebuild Solution*. +* __Linux__: *TODO* diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp index 1111dd0445..f0dbd7792e 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp @@ -86,7 +86,7 @@ int cellPadGetData(u32 port_no, u32 data_addr) u16 d1 = 0; u16 d2 = 0; - pad.m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; + pads[port_no].m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES; s32 len = 0; for(Button& button : pads[port_no].m_buttons)