yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #282 from N00byKing/patch-2 

Change comments from citra to yuzu
This commit is contained in:
bunnei 2018-03-26 23:37:05 -04:00 committed by GitHub
parent b4bf099793 3357e8d9ba
commit 1a28f4fa8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/pre-commit
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Enforce citra's whitespace policy # Enforce yuzu's whitespace policy
git config --local core.whitespace tab-in-indent,trailing-space git config --local core.whitespace tab-in-indent,trailing-space
paths_to_check="src/ CMakeLists.txt" paths_to_check="src/ CMakeLists.txt"

2
src/common/file_util.h
View File

@ -121,7 +121,7 @@ void CopyDir(const std::string& source_path, const std::string& dest_path);
// Set the current directory to given directory // Set the current directory to given directory
bool SetCurrentDir(const std::string& directory); bool SetCurrentDir(const std::string& directory);
// Returns a pointer to a string with a Citra data dir in the user's home // Returns a pointer to a string with a yuzu data dir in the user's home
// directory. To be used in "multi-user" mode (that is, installed). // directory. To be used in "multi-user" mode (that is, installed).
const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = ""); const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = "");

2
src/common/logging/log.h
View File

@ -85,7 +85,7 @@ enum class Class : ClassType {
Loader, ///< ROM loader Loader, ///< ROM loader
Input, ///< Input emulation Input, ///< Input emulation
Network, ///< Network emulation Network, ///< Network emulation
WebService, ///< Interface to Citra Web Services WebService, ///< Interface to yuzu Web Services
Count ///< Total number of logging classes Count ///< Total number of logging classes
}; };

2
src/common/x64/cpu_detect.cpp
View File

@ -54,7 +54,7 @@ static CPUCaps Detect() {
caps.num_cores = std::thread::hardware_concurrency(); caps.num_cores = std::thread::hardware_concurrency();
// Assumes the CPU supports the CPUID instruction. Those that don't would likely not support // Assumes the CPU supports the CPUID instruction. Those that don't would likely not support
// Citra at all anyway // yuzu at all anyway
int cpu_id[4]; int cpu_id[4];
memset(caps.brand_string, 0, sizeof(caps.brand_string)); memset(caps.brand_string, 0, sizeof(caps.brand_string));