From 70174ac4053cbc04a18e0dc006835eff4605d3c4 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Thu, 12 Dec 2013 12:08:36 +0100 Subject: [PATCH] Warn fix, cleanup, update buttons.svg --- Core/Dialog/PSPOskDialog.cpp | 2 +- Core/HLE/sceAtrac.cpp | 1 - UI/GameInfoCache.cpp | 6 +- UI/GameInfoCache.h | 2 +- native | 2 +- source_assets/image/buttons.svg | 115 +++++++++++++++++++++++++++----- 6 files changed, 104 insertions(+), 24 deletions(-) diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 8c50246783..a0273a69e8 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -721,7 +721,7 @@ void PSPOskDialog::RenderKeyboard() result = CombinationString(false); - u32 drawIndex = result.size() > drawLimit ? result.size() - drawLimit : 0; + u32 drawIndex = (u32)(result.size() > drawLimit ? result.size() - drawLimit : 0); drawIndex = result.size() == limit + 1 ? drawIndex - 1 : drawIndex; // When the length reached limit, the last character don't fade in and out. for (u32 i = 0; i < drawLimit; ++i, ++drawIndex) { diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index d1b3cef54d..b7db665f4c 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1875,7 +1875,6 @@ const HLEFunction sceAtrac3plus[] = { {0x0C116E1B,WrapI_IUUUU,"sceAtracLowLevelDecode"}, }; - void Register_sceAtrac3plus() { // Two names RegisterModule("sceATRAC3plus_Library", ARRAY_SIZE(sceAtrac3plus), sceAtrac3plus); diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index cede129e3f..79c471b91a 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -523,7 +523,7 @@ void GameInfoCache::FlushBGs() { // This may run off-main-thread and we thus can't use the global // pspFileSystem (well, we could with synchronization but there might not // even be a game running). -GameInfo *GameInfoCache::GetInfo(const std::string &gamePath, bool wantBG, bool synchronous) { +GameInfo *GameInfoCache::GetInfo(const std::string &gamePath, bool wantBG) { auto iter = info_.find(gamePath); if (iter != info_.end()) { GameInfo *info = iter->second; @@ -584,10 +584,6 @@ again: GameInfoWorkItem *item = new GameInfoWorkItem(gamePath, info); gameInfoWQ_->Add(item); - if (synchronous) { - gameInfoWQ_->Wait(item); - } - info_[gamePath] = info; return info; } diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h index 75d8d1b4d4..696f6e4826 100644 --- a/UI/GameInfoCache.h +++ b/UI/GameInfoCache.h @@ -115,7 +115,7 @@ public: // but filled in later asynchronously in the background. So keep calling this, // redrawing the UI often. Only set wantBG if you really want it because // it's big. bgTextures may be discarded over time as well. - GameInfo *GetInfo(const std::string &gamePath, bool wantBG, bool synchronous = false); + GameInfo *GetInfo(const std::string &gamePath, bool wantBG); void Decimate(); // Deletes old info. void FlushBGs(); // Gets rid of all BG textures. diff --git a/native b/native index b0ab77d4c2..c25cf61f54 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit b0ab77d4c24b887b3b40ea0512f2e590f4fe36f0 +Subproject commit c25cf61f54c02f439a934d0318849b16cfca8bde diff --git a/source_assets/image/buttons.svg b/source_assets/image/buttons.svg index 87e2e2e9d3..e5ee91fddb 100644 --- a/source_assets/image/buttons.svg +++ b/source_assets/image/buttons.svg @@ -1166,6 +1166,69 @@ operator="over" result="composite2" /> + + + + + + + + + + + + + + @@ -1292,15 +1355,15 @@ d="m 107.20702,8.5620214 -8.258373,8.2583646 -8.25575,-8.2557466 -1.91343,1.9134266 8.25575,8.255749 -8.25575,8.255748 1.91605,1.916045 8.25575,-8.255748 8.255753,8.255748 1.91342,-1.913427 -8.25575,-8.255748 8.25837,-8.258367 -1.91604,-1.9160446 z" id="rect4968" inkscape:connector-curvature="0" - inkscape:export-filename="D:\Dev\Emulatorer\potemkin\gfx\cross.png" + inkscape:export-filename="C:\dev\ppsspp\source_assets\image\cross.png" inkscape:export-xdpi="135" inkscape:export-ydpi="135" /> @@ -1309,7 +1372,7 @@ d="m 98.629957,31.849006 c -5.92963,0 -10.73686,4.807225 -10.73686,10.736856 0,5.929635 4.80723,10.736852 10.73686,10.736852 5.929633,0 10.734713,-4.807217 10.734713,-10.736852 0,-5.929631 -4.80508,-10.736856 -10.734713,-10.736856 z m 0,2.41326 c 4.596833,0 8.321443,3.72677 8.321443,8.323596 0,4.596824 -3.72461,8.323598 -8.321443,8.323598 -4.59682,0 -8.3236,-3.726774 -8.3236,-8.323598 0,-4.596826 3.72678,-8.323596 8.3236,-8.323596 z" id="path5012" inkscape:connector-curvature="0" - inkscape:export-filename="D:\Dev\Emulatorer\potemkin\gfx\circle.png" + inkscape:export-filename="C:\dev\ppsspp\source_assets\image\circle.png" inkscape:export-xdpi="135" inkscape:export-ydpi="135" /> + style="filter:url(#filter5168)" + inkscape:export-filename="C:\dev\ppsspp\source_assets\image\start.png" + inkscape:export-xdpi="135" + inkscape:export-ydpi="135"> + + + +