diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-07-18 21:24:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-07-18 21:34:50 +0200 |
| commit | 9698571d61889bbb6da2be4cc471157499beb0d2 (patch) | |
| tree | a53c770f4a8ddd50c5f2c8cf4677649d2c76e470 | |
| parent | b0c2801458ed87f6e643c023e86488ee3a16c7f5 (diff) | |
Fix multichar character constant warning
Multi-character character constants are implementation defined,
and therefore they are risky to use for use when trying to be compatible
with so many different platforms. Fixes #2540.
| -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; |