From f012e7a8791042e0304e0109ec2665029fe15825 Mon Sep 17 00:00:00 2001 From: Ced2911 Date: Sat, 17 Aug 2013 15:12:42 +0200 Subject: [PATCH] [core] 360 fixes --- Core/Loaders.cpp | 3 ++- Core/MemMap.h | 2 +- Core/System.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp index d8a550668e..ce5fb68285 100644 --- a/Core/Loaders.cpp +++ b/Core/Loaders.cpp @@ -110,7 +110,8 @@ IdentifiedFileType Identify_File(std::string &filename) } u32 psar_offset = 0, psar_id = 0; - switch (id) { + u32 _id = id; + switch (_id) { case 'PBP\x00': fseek(f, 0x24, SEEK_SET); fread(&psar_offset, 4, 1, f); diff --git a/Core/MemMap.h b/Core/MemMap.h index c312ac95f8..0f6b424137 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -95,7 +95,7 @@ enum SCRATCHPAD_SIZE = 0x4000, SCRATCHPAD_MASK = SCRATCHPAD_SIZE - 1, -#if defined(_M_IX86) || defined(_M_ARM32) || defined (_XBOX) +#if defined(_M_IX86) || defined(_M_ARM32) || defined(_XBOX) // This wraparound should work for PSP too. MEMVIEW32_MASK = 0x3FFFFFFF, #endif diff --git a/Core/System.cpp b/Core/System.cpp index e4f18c3742..8400784731 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -15,7 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#if defined(_WIN32) && !defined(_XBOX) +#ifdef _WIN32 #include "Common/CommonWindows.h" #include #include @@ -468,7 +468,7 @@ std::string GetSysDirectory(PSPDirectories directoryType) { } } -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_XBOX) // Run this at startup time. Please use GetSysDirectory if you need to query where folders are. void InitSysDirectories() { if (!g_Config.memCardDirectory.empty() && !g_Config.flash0Directory.empty())