RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-01 04:51:49 +01:00
Code Issues Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Nekotekina 2015-09-08 13:47:00 +03:00
parent 4666f190db
commit cbe83ad8dd
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/BEType.h
View File

@ -557,7 +557,7 @@ public:
be_t(const be_t&) = default;
template<typename = std::enable_if_t<std::is_constructible<type, type>::value>> be_t(const type& value)
force_inline be_t(const type& value)
#ifdef IS_LE_MACHINE
: m_data(se_t<type, sizeof(stype)>::to(value))
#else
@ -736,7 +736,7 @@ public:
le_t(const le_t&) = default;
template<typename = std::enable_if_t<std::is_constructible<type, type>::value>> le_t(const type& value)
le_t(const type& value)
: m_data(value)
{
}

2
rpcs3/Emu/SysCalls/Modules/cellGameExec.cpp
View File

@ -33,7 +33,7 @@ s32 cellGameGetHomeLaunchOptionPath()
s32 cellGameGetBootGameInfo(vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execData)
{
cellGameExec.Todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execData=*0x%x)");
cellGameExec.Todo("cellGameGetBootGameInfo(type=*0x%x, dirName=*0x%x, execData=*0x%x)", type, dirName, execData);
// TODO: Support more boot types
*type = CELL_GAME_GAMETYPE_SYS;

2
rpcs3/Emu/SysCalls/Modules/cellSail.cpp
View File

@ -34,7 +34,7 @@ void playerBoot(vm::ptr<CellSailPlayer> pSelf, u64 userParam)
s32 cellSailMemAllocatorInitialize(vm::ptr<CellSailMemAllocator> pSelf, vm::ptr<CellSailMemAllocatorFuncs> pCallbacks)
{
cellSail.Warning("cellSailMemAllocatorInitialize(pSelf_addr=*0x%x, pCallbacks_addr=*0x%x)", pSelf, pCallbacks);
cellSail.Warning("cellSailMemAllocatorInitialize(pSelf=*0x%x, pCallbacks=*0x%x)", pSelf, pCallbacks);
pSelf->callbacks = pCallbacks;

3
rpcs3/Emu/System.cpp
View File

@ -1,7 +1,6 @@
#include "stdafx.h"
#include "Utilities/Log.h"
#include "Utilities/File.h"
#include "git-version.h"
#include "rpcs3/Ini.h"
#include "Emu/Memory/Memory.h"
#include "Emu/System.h"
@ -208,8 +207,6 @@ void Emulator::Load()
LOG_NOTICE(LOADER, "%s -> %s", GetVFS().m_devices[i]->GetPs3Path().c_str(), GetVFS().m_devices[i]->GetLocalPath().c_str());
}
LOG_NOTICE(LOADER, "");
LOG_NOTICE(LOADER, "RPCS3 version: %s", RPCS3_GIT_VERSION);
LOG_NOTICE(LOADER, "");
LOG_NOTICE(LOADER, "Settings:");

5
rpcs3/Gui/MainFrame.cpp
View File

@ -68,7 +68,7 @@ MainFrame::MainFrame()
, m_sys_menu_opened(false)
{
SetLabel(wxString::Format(_PRGNAME_ " " RPCS3_GIT_VERSION));
SetLabel(wxString::Format(_PRGNAME_ " " _PRGVER_ " " RPCS3_GIT_VERSION));
wxMenuBar* menubar = new wxMenuBar();
@ -161,6 +161,9 @@ MainFrame::MainFrame()
wxGetApp().Bind(wxEVT_KEY_DOWN, &MainFrame::OnKeyDown, this);
wxGetApp().Bind(wxEVT_DBG_COMMAND, &MainFrame::UpdateUI, this);
LOG_NOTICE(GENERAL, _PRGNAME_ " " _PRGVER_ " " RPCS3_GIT_VERSION);
LOG_NOTICE(GENERAL, "");
}
MainFrame::~MainFrame()