mirror of
https://github.com/RPCS3/rpcs3.git
synced 2024-11-22 02:32:36 +01:00
Minor fixes
* Modified some .gitignore's * Removed some #include <vector>'s and other stuff...
This commit is contained in:
parent
c541176a32
commit
1fd42c34c2
3
.gitignore
vendored
3
.gitignore
vendored
@ -55,6 +55,3 @@ rpcs3/git-version.h
|
|||||||
!/bin/dev_hdd0/game/
|
!/bin/dev_hdd0/game/
|
||||||
/bin/dev_hdd0/game/*
|
/bin/dev_hdd0/game/*
|
||||||
!/bin/dev_hdd0/game/TEST12345/
|
!/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
6
bin/dev_hdd0/home/00000001/savedata/.gitignore
vendored
Normal 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
6
bin/dev_hdd0/home/00000001/trophy/.gitignore
vendored
Normal 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,4 +1,3 @@
|
|||||||
#include <vector>
|
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "VFS.h"
|
#include "VFS.h"
|
||||||
#include "Emu/HDD/HDD.h"
|
#include "Emu/HDD/HDD.h"
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include "vfsDevice.h"
|
#include "vfsDevice.h"
|
||||||
|
|
||||||
enum vfsDeviceType
|
enum vfsDeviceType
|
||||||
|
@ -294,7 +294,7 @@ public:
|
|||||||
out.Create(tex.GetWidth(), tex.GetHeight(), data, alpha);
|
out.Create(tex.GetWidth(), tex.GetHeight(), data, alpha);
|
||||||
out.SaveFile(name, wxBITMAP_TYPE_PNG);
|
out.SaveFile(name, wxBITMAP_TYPE_PNG);
|
||||||
|
|
||||||
free(alldata);
|
delete[] alldata;
|
||||||
//free(data);
|
//free(data);
|
||||||
//free(alpha);
|
//free(alpha);
|
||||||
}
|
}
|
||||||
|
@ -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());
|
sys_spinlock.Log("sys_spinlock_unlock(lock_addr=0x%x)", lock.GetAddr());
|
||||||
|
|
||||||
again:
|
while(true)
|
||||||
switch (lock->mutex.unlock(lock->mutex.GetOwner()))
|
|
||||||
{
|
{
|
||||||
case SMR_PERMITTED: goto again;
|
if (lock->mutex.unlock(lock->mutex.GetOwner()) != SMR_PERMITTED)
|
||||||
default: break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,7 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
class VFSEntrySettingsDialog : public wxDialog
|
class VFSEntrySettingsDialog : public wxDialog
|
||||||
{
|
{
|
||||||
wxTextCtrl* m_tctrl_dev_path;
|
wxTextCtrl* m_tctrl_dev_path;
|
||||||
|
@ -19,6 +19,7 @@ bool TROPUSRLoader::Load(const std::string& filepath, const std::string& configp
|
|||||||
if (m_file)
|
if (m_file)
|
||||||
Close();
|
Close();
|
||||||
|
|
||||||
|
// TODO: This seems to be always true... A bug in ExistsFile() ?
|
||||||
if (!Emu.GetVFS().ExistsFile(filepath))
|
if (!Emu.GetVFS().ExistsFile(filepath))
|
||||||
Generate(filepath, configpath);
|
Generate(filepath, configpath);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user