diff options
| author |  Yuri Kunde Schlesner | 2015-07-25 12:50:32 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-07-25 12:50:32 -0700 |
| commit | 9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1 (patch) | |
| tree | 732bc1b978397a05fab07d5443fe05534ea39b37 /src/core/loader/3dsx.cpp | |
| parent | Merge pull request #981 from Subv/checkboxes (diff) | |
| parent | Vertex Shader : Undo casting (diff) | |
| download | yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.gz yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.xz yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.zip | |
Merge pull request #892 from zawata/another-warning-fixes
Yet More Warning Fixes
Diffstat (limited to 'src/core/loader/3dsx.cpp')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index d043fa9bd..530837d08 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp | |||
| @@ -191,7 +191,7 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, Shared | |||
| 191 | *pos = (addr); | 191 | *pos = (addr); |
| 192 | break; | 192 | break; |
| 193 | case 1: | 193 | case 1: |
| 194 | *pos = (addr - in_addr); | 194 | *pos = static_cast<u32>(addr - in_addr); |
| 195 | break; | 195 | break; |
| 196 | default: | 196 | default: |
| 197 | break; //this should never happen | 197 | break; //this should never happen |