Emulation/daedalus
1
0
Fork 0
mirror of https://github.com/DaedalusX64/daedalus.git synced 2024-05-18 12:00:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Select is now menu button again

Browse source
This commit is contained in:
Wally4000 2022-05-03 22:30:47 +10:00
parent 484051d232
commit c0f19235a8
4 changed files with 13 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.vscode/settings.json vendored
View file

@ -82,6 +82,10 @@
"variant": "cpp",
"__functional_base": "cpp",
"filesystem": "cpp",
"ranges": "cpp"
"ranges": "cpp",
"version": "cpp"
}
{
"editor.formatOnSave": true
}
}

10
Source/SysPSP/main.cpp
View file

@ -189,12 +189,12 @@ void HandleEndOfFrame()
// If KernelButtons.prx not found. Use select for pause instead
if(oldButtons != pad.Buttons)
{
if( gCheatsEnabled && (pad.Buttons & PSP_CTRL_SELECT) )
{
CheatCodes_Activate( GS_BUTTON );
}
// if( gCheatsEnabled && (pad.Buttons & PSP_CTRL_SELECT) )
// {
// CheatCodes_Activate( GS_BUTTON );
// }
if(pad.Buttons & PSP_CTRL_HOME)
if(pad.Buttons & PSP_CTRL_SELECT)
activate_pause_menu = true;
}

6
Source/SysPosix/Utility/CondPosix.cpp
View file

@ -25,7 +25,7 @@ Cond * CondCreate()
void CondDestroy(Cond * cond)
{
pthread_cond_destroy( (pthread_cond_t *)cond );
// pthread_cond_destroy( (pthread_cond_t *)cond );
free( cond );
}
@ -49,14 +49,14 @@ void CondWait(Cond * cond, Mutex * mutex, double timeout)
{
if (timeout <= 0)
{
pthread_cond_wait( (pthread_cond_t *)cond, &mutex->mMutex );
// pthread_cond_wait( (pthread_cond_t *)cond, &mutex->mMutex );
}
else
{
timespec wait;
ComputeWait(timeout, &wait);
pthread_cond_timedwait( (pthread_cond_t *)cond, &mutex->mMutex, &wait );
// pthread_cond_timedwait( (pthread_cond_t *)cond, &mutex->mMutex, &wait );
}
}

74
Source/SysPosix/Utility/IOPosix.cpp
View file

@ -32,80 +32,6 @@ namespace IO
{
const char kPathSeparator = '/';
namespace File
{
bool Move( const char * p_existing, const char * p_new )
{
return rename( p_existing, p_new ) >= 0;
}
bool Delete( const char * p_file )
{
return remove( p_file ) == 0;
}
bool Exists( const char * p_path )
{
FILE * fh = fopen( p_path, "rb" );
if ( fh )
{
fclose( fh );
return true;
}
else
{
return false;
}
}
#ifdef DAEDALUS_PSP
int Stat( const char *p_file, SceIoStat *stat )
{
return sceIoGetstat ( p_file, stat );
}
#endif
}
namespace Directory
{
bool Create( const char * p_path )
{
return mkdir( p_path, 0777 ) == 0;
}
bool EnsureExists( const char * p_path )
{
if ( IsDirectory(p_path) )
return true;
// Make sure parent exists,
IO::Filename p_path_parent;
IO::Path::Assign( p_path_parent, p_path );
IO::Path::RemoveBackslash( p_path_parent );
if( IO::Path::RemoveFileSpec( p_path_parent ) )
{
// Recursively create parents. Need to be careful of stack overflow
if( !EnsureExists( p_path_parent ) )
return false;
}
return Create( p_path );
}
bool IsDirectory( const char * p_path )
{
struct stat s;
if(stat( p_path, &s ) == 0)
{
if(s.st_mode & S_IFDIR)
{
return true;
}
}
return false;
}
}
namespace Path
{
char * Combine( char * p_dest, const char * p_dir, const char * p_file )