浏览代码

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.
Rémi Verschelde 9 年之前
父节点
当前提交
9698571d61
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      drivers/dds/texture_loader_dds.cpp

+ 5 - 5
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;