diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dds/texture_loader_dds.cpp | 10 | ||||
| -rw-r--r-- | drivers/unix/os_unix.cpp | 4 |
2 files changed, 5 insertions, 9 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; diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 8cb7c7b698..fd515d6dd3 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -357,7 +357,6 @@ Error OS_Unix::execute(const String& p_path, const List<String>& p_arguments,boo pid_t pid = fork(); ERR_FAIL_COND_V(pid<0,ERR_CANT_FORK); - //print("execute: %s\n",p_path.utf8().get_data()); if (pid==0) { @@ -394,8 +393,6 @@ Error OS_Unix::execute(const String& p_path, const List<String>& p_arguments,boo pid_t rpid = waitpid(pid,&status,0); if (r_exitcode) *r_exitcode=WEXITSTATUS(status); - - print("returned: %i, waiting for: %i\n",rpid,pid); } else { if (r_child_id) @@ -498,7 +495,6 @@ String OS_Unix::get_executable_path() const { char buf[256]; memset(buf,0,256); readlink("/proc/self/exe", buf, sizeof(buf)); - //print_line("Exec path is:"+String(buf)); String b; b.parse_utf8(buf); if (b=="") { |