diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-19 07:36:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 07:36:09 +0200 |
| commit | 1f519e7ebb836bdf52bc47e6873c5374fb673bdf (patch) | |
| tree | 8d374d230723c93d6b38dd8342ad63935ed81608 | |
| parent | 6626ac463eed0124736b8ef60bf82ba42a253200 (diff) | |
| parent | 9698571d61889bbb6da2be4cc471157499beb0d2 (diff) | |
Merge pull request #5787 from akien-mga/pr-fix-warnings
Fix multichar character constant warning
| -rw-r--r-- | drivers/dds/texture_loader_dds.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dds/texture_loader_dds.cpp b/drivers/dds/texture_loader_dds.cpp index 0cef77e638..0cc84f02f7 100644 --- a/drivers/dds/texture_loader_dds.cpp +++ b/drivers/dds/texture_loader_dds.cpp @@ -162,20 +162,20 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, DDSFormat dds_format; - if (format_flags&DDPF_FOURCC && format_fourcc=='1TXD') { + if (format_flags&DDPF_FOURCC && format_fourcc==0x31545844) { //'1TXD' dds_format=DDS_DXT1; - } else if (format_flags&DDPF_FOURCC && format_fourcc=='3TXD') { + } else if (format_flags&DDPF_FOURCC && format_fourcc==0x33545844) { //'3TXD' dds_format=DDS_DXT3; - } else if (format_flags&DDPF_FOURCC && format_fourcc=='5TXD') { + } else if (format_flags&DDPF_FOURCC && format_fourcc==0x35545844) { //'5TXD' dds_format=DDS_DXT5; - } else if (format_flags&DDPF_FOURCC && format_fourcc=='1ITA') { + } else if (format_flags&DDPF_FOURCC && format_fourcc==0x31495441) { //'1ITA' dds_format=DDS_ATI1; - } else if (format_flags&DDPF_FOURCC && format_fourcc=='2ITA') { + } else if (format_flags&DDPF_FOURCC && format_fourcc==0x32495441) { //'2ITA' dds_format=DDS_ATI2; |