diff options
| author | 2015-01-06 21:10:12 +0000 | |
|---|---|---|
| committer | 2015-01-15 21:21:26 +0000 | |
| commit | 2d63df90a9d64d3961be07ef0a959bc48b42c73b (patch) | |
| tree | 79de4eaa1c5e22618d5eef6793d757c6f6d9aa94 /src/core/loader | |
| parent | Loader: Remove the useless THREEDSXReader class. (diff) | |
| download | yuzu-2d63df90a9d64d3961be07ef0a959bc48b42c73b.tar.gz yuzu-2d63df90a9d64d3961be07ef0a959bc48b42c73b.tar.xz yuzu-2d63df90a9d64d3961be07ef0a959bc48b42c73b.zip | |
Loader: Initialize the default NCCH values in the class declaration, not in the constructor.
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/ncch.cpp | 4 | ||||
| -rw-r--r-- | src/core/loader/ncch.h | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 0793cc7cd..883a0f753 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp | |||
| @@ -102,10 +102,6 @@ static bool LZSS_Decompress(u8* compressed, u32 compressed_size, u8* decompresse | |||
| 102 | /// AppLoader_NCCH constructor | 102 | /// AppLoader_NCCH constructor |
| 103 | AppLoader_NCCH::AppLoader_NCCH(const std::string& filename) { | 103 | AppLoader_NCCH::AppLoader_NCCH(const std::string& filename) { |
| 104 | this->filename = filename; | 104 | this->filename = filename; |
| 105 | is_compressed = false; | ||
| 106 | entry_point = 0; | ||
| 107 | ncch_offset = 0; | ||
| 108 | exefs_offset = 0; | ||
| 109 | } | 105 | } |
| 110 | 106 | ||
| 111 | /// AppLoader_NCCH destructor | 107 | /// AppLoader_NCCH destructor |
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index 184a20d98..578513f77 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h | |||
| @@ -216,11 +216,11 @@ private: | |||
| 216 | std::string filename; | 216 | std::string filename; |
| 217 | 217 | ||
| 218 | bool is_loaded = false; | 218 | bool is_loaded = false; |
| 219 | bool is_compressed; | 219 | bool is_compressed = false; |
| 220 | 220 | ||
| 221 | u32 entry_point; | 221 | u32 entry_point = 0; |
| 222 | u32 ncch_offset; // Offset to NCCH header, can be 0 or after NCSD header | 222 | u32 ncch_offset = 0; // Offset to NCCH header, can be 0 or after NCSD header |
| 223 | u32 exefs_offset; | 223 | u32 exefs_offset = 0; |
| 224 | 224 | ||
| 225 | NCCH_Header ncch_header; | 225 | NCCH_Header ncch_header; |
| 226 | ExeFs_Header exefs_header; | 226 | ExeFs_Header exefs_header; |