asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7851 from shlomif/fix-some-compilation-warnings

Browse source 
Get rid of some compilation warnings.
This commit is contained in:
Rémi Verschelde 2017-02-26 20:22:48 +01:00 committed by GitHub
commit 1ec8b9fb7d
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/tests/test_string.cpp
View file

@ -835,7 +835,6 @@ bool test_28() {
bool test_29() {
bool error = false;
bool state = true;
bool success = false;

10
modules/dds/texture_loader_dds.cpp
View file

@ -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();

1
modules/gdscript/gd_editor.cpp
View file

@ -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: {

2
platform/x11/os_x11.cpp
View file

@ -1241,7 +1241,7 @@ static Property read_property(Display* p_display, Window p_window, Atom p_proper
}while(bytes_after != 0);
Property p = {ret, actual_format, nitems, actual_type};
Property p = {ret, actual_format, (int)nitems, actual_type};
return p;
}