RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 04:02:42 +01:00
Code Issues Releases Wiki Activity

Minor fixes

Browse Source 
* Modified some .gitignore's
* Removed some #include <vector>'s
and other stuff...
This commit is contained in:
Alexandro Sánchez Bach 2014-03-27 16:40:58 +01:00
parent c541176a32
commit 1fd42c34c2
9 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -55,6 +55,3 @@ rpcs3/git-version.h
!/bin/dev_hdd0/game/
/bin/dev_hdd0/game/*
!/bin/dev_hdd0/game/TEST12345/
# Ignore other system generated files
bin/dev_hdd0/home/00000001/trophy

6
bin/dev_hdd0/home/00000001/savedata/.gitignore vendored Normal file
View File

@ -0,0 +1,6 @@
# Note: This folder has to exist. Once the User Account manager is implemented, make sure it creates this folder in case it's missing and delete this .gitignore file.
# Ignore everything in this directory
*
# Except this file
!.gitignore

6
bin/dev_hdd0/home/00000001/trophy/.gitignore vendored Normal file
View File

@ -0,0 +1,6 @@
# Note: This folder has to exist. Once the User Account manager is implemented, make sure it creates this folder in case it's missing and delete this .gitignore file.
# Ignore everything in this directory
*
# Except this file
!.gitignore

1
rpcs3/Emu/FS/VFS.cpp
View File

@ -1,4 +1,3 @@
#include <vector>
#include "stdafx.h"
#include "VFS.h"
#include "Emu/HDD/HDD.h"

1
rpcs3/Emu/FS/VFS.h
View File

@ -1,6 +1,5 @@
#pragma once
#include <vector>
#include "vfsDevice.h"
enum vfsDeviceType

2
rpcs3/Emu/GS/GL/GLGSRender.h
View File

@ -294,7 +294,7 @@ public:
out.Create(tex.GetWidth(), tex.GetHeight(), data, alpha);
out.SaveFile(name, wxBITMAP_TYPE_PNG);
free(alldata);
delete[] alldata;
//free(data);
//free(alpha);
}

7
rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp
View File

@ -44,10 +44,9 @@ void sys_spinlock_unlock(mem_ptr_t<spinlock> lock)
{
sys_spinlock.Log("sys_spinlock_unlock(lock_addr=0x%x)", lock.GetAddr());
again:
switch (lock->mutex.unlock(lock->mutex.GetOwner()))
while(true)
{
case SMR_PERMITTED: goto again;
default: break;
if (lock->mutex.unlock(lock->mutex.GetOwner()) != SMR_PERMITTED)
break;
}
}

2
rpcs3/Gui/VFSManager.h
View File

@ -1,7 +1,5 @@
#pragma once
#include <vector>
class VFSEntrySettingsDialog : public wxDialog
{
wxTextCtrl* m_tctrl_dev_path;

1
rpcs3/Loader/TROPUSR.cpp
View File

@ -19,6 +19,7 @@ bool TROPUSRLoader::Load(const std::string& filepath, const std::string& configp
if (m_file)
Close();
// TODO: This seems to be always true... A bug in ExistsFile() ?
if (!Emu.GetVFS().ExistsFile(filepath))
Generate(filepath, configpath);