OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-23 01:30:05 +00:00
Code Issues Projects Releases Wiki Activity

More PR fixes

Browse Source
This commit is contained in:
inspuration 2014-06-24 15:06:21 -04:00
parent 5e4b592dc6
commit 3340a3a498
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/citra_qt/bootmanager.cpp
View File

@ -207,7 +207,6 @@ void GRenderWindow::keyPressEvent(QKeyEvent* event)
button_reg |= GetKeyBinding(event); button_reg |= GetKeyBinding(event);
HID::SetButtonReg(button_reg); HID::SetButtonReg(button_reg);
return;
} }
void GRenderWindow::keyReleaseEvent(QKeyEvent* event) void GRenderWindow::keyReleaseEvent(QKeyEvent* event)

1
src/citra_qt/bootmanager.hxx
View File

@ -1,4 +1,3 @@
#include <map>
#include <QThread> #include <QThread>
#include <QGLWidget> #include <QGLWidget>
#include "common/common.h" #include "common/common.h"

3
src/core/hle/kernel/shared_memory.cpp
View File

@ -37,7 +37,7 @@ public:
inline void Write(T &var, const u32 addr); inline void Write(T &var, const u32 addr);
u32 size; u32 size;
u8* mem_ptr = NULL; u8* mem_ptr;
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -48,6 +48,7 @@ SharedMemory* CreateSharedMemory(Handle& handle, u32 size) {
SharedMemory* mem = new SharedMemory; SharedMemory* mem = new SharedMemory;
handle = Kernel::g_object_pool.Create(mem); handle = Kernel::g_object_pool.Create(mem);
mem->size = size; mem->size = size;
mem->mem_ptr = nullptr;
return mem; return mem;
} }

2
src/core/hw/hid.h
View File

@ -20,7 +20,7 @@ enum {
OFFSET_BUTTONS = 0x1c, OFFSET_BUTTONS = 0x1c,
}; };
const int g_num_pad_items = 12; static const int g_num_pad_items = 12;
enum PAD { enum PAD {
PAD_A = (1 << 0), PAD_A = (1 << 0),