From 0a2c387d5c375aa9dd9e828f100ab55deb8dac72 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Tue, 21 Feb 2017 11:59:19 +0200 Subject: Fix some compilation warnings. Redone the commit based on the input in https://github.com/godotengine/godot/pull/7851 . Not all warnings were fixed but it's a start. --- modules/dds/texture_loader_dds.cpp | 10 +++++----- modules/gdscript/gd_editor.cpp | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'modules') diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index 5295183c3..600cae991 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -114,7 +114,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, uint32_t width = f->get_32(); uint32_t height = f->get_32(); uint32_t pitch = f->get_32(); - uint32_t depth = f->get_32(); + /* uint32_t depth = */ f->get_32(); uint32_t mipmaps = f->get_32(); //skip 11 @@ -130,7 +130,7 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, } - uint32_t format_size = f->get_32(); + /* uint32_t format_size = */ f->get_32(); uint32_t format_flags = f->get_32(); uint32_t format_fourcc = f->get_32(); uint32_t format_rgb_bits = f->get_32(); @@ -139,9 +139,9 @@ RES ResourceFormatDDS::load(const String &p_path, const String& p_original_path, uint32_t format_blue_mask = f->get_32(); uint32_t format_alpha_mask = f->get_32(); - uint32_t caps_1 = f->get_32(); - uint32_t caps_2 = f->get_32(); - uint32_t caps_ddsx = f->get_32(); + /* uint32_t caps_1 = */ f->get_32(); + /* uint32_t caps_2 = */ f->get_32(); + /* uint32_t caps_ddsx = */ f->get_32(); //reserved skip f->get_32(); diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index 114a25fee..1a38ff4f5 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -2645,6 +2645,7 @@ Error GDScriptLanguage::lookup_code(const String& p_code, const String& p_symbol switch(p.get_completion_type()) { + case GDParser::COMPLETION_GET_NODE: case GDParser::COMPLETION_NONE: { } break; case GDParser::COMPLETION_BUILT_IN_TYPE_CONSTANT: { -- cgit v1.2.3-70-g09d2