Permalink
Browse files

Fix some minor things found by running Sizer on PPSSPP

  • Loading branch information...
hrydgard committed Nov 8, 2017
1 parent 8fe1712 commit 62b24edde14140bef2e18dd2a204c73983c255f0
Showing with 6 additions and 7 deletions.
  1. +4 −4 Common/KeyMap.cpp
  2. +1 −1 Common/KeyMap.h
  3. +1 −2 Core/HLE/sceUsbCam.h
View
@@ -395,7 +395,7 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) {
UpdateNativeMenuKeys();
}
const KeyMap_IntStrPair key_names[] = {
static const KeyMap_IntStrPair key_names[] = {
{NKCODE_A, "A"},
{NKCODE_B, "B"},
{NKCODE_C, "C"},
@@ -586,7 +586,7 @@ const KeyMap_IntStrPair key_names[] = {
{NKCODE_RIGHTBRACE, "}"},
};
const KeyMap_IntStrPair axis_names[] = {
static const KeyMap_IntStrPair axis_names[] = {
{JOYSTICK_AXIS_X, "X Axis"},
{JOYSTICK_AXIS_Y, "Y Axis"},
{JOYSTICK_AXIS_PRESSURE, "Pressure"},
@@ -874,7 +874,7 @@ void LoadFromIni(IniFile &file) {
IniFile::Section *controls = file.GetOrCreateSection("ControlMapping");
for (size_t i = 0; i < ARRAY_SIZE(psp_button_names); i++) {
std::string value;
controls->Get(psp_button_names[i].name.c_str(), &value, "");
controls->Get(psp_button_names[i].name, &value, "");
// Erase default mapping
g_controllerMap.erase(psp_button_names[i].key);
@@ -913,7 +913,7 @@ void SaveToIni(IniFile &file) {
value += ",";
}
controls->Set(psp_button_names[i].name.c_str(), value, "");
controls->Set(psp_button_names[i].name, value, "");
}
}
View
@@ -86,7 +86,7 @@ namespace KeyMap {
// Key & Button names
struct KeyMap_IntStrPair {
int key;
std::string name;
const char *name;
};
// Use if you need to display the textual name
View
@@ -46,8 +46,7 @@ typedef struct PspUsbCamSetupVideoParam {
int evlevel;
} PspUsbCamSetupVideoParam;
static unsigned char sceUsbCamDummyImage[] = {
static const unsigned char sceUsbCamDummyImage[] = {
0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x60,
0x00, 0x60, 0x00, 0x00, 0xFF, 0xE1, 0x00, 0x68, 0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x4D, 0x4D,
0x00, 0x2A, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x01, 0x1A, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01,

0 comments on commit 62b24ed

Please sign in to comment.