godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Shlomi Fish 2017-02-21 11:59:19 +02:00
parent f6950956bd
commit 0a2c387d5c
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 test_29() {
bool error = false;
bool state = true; bool state = true;
bool success = false; 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 width = f->get_32();
uint32_t height = f->get_32(); uint32_t height = f->get_32();
uint32_t pitch = 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(); uint32_t mipmaps = f->get_32();
//skip 11 //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_flags = f->get_32();
uint32_t format_fourcc = f->get_32(); uint32_t format_fourcc = f->get_32();
uint32_t format_rgb_bits = 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_blue_mask = f->get_32();
uint32_t format_alpha_mask = f->get_32(); uint32_t format_alpha_mask = f->get_32();
uint32_t caps_1 = f->get_32(); /* uint32_t caps_1 = */ f->get_32();
uint32_t caps_2 = f->get_32(); /* uint32_t caps_2 = */ f->get_32();
uint32_t caps_ddsx = f->get_32(); /* uint32_t caps_ddsx = */ f->get_32();
//reserved skip //reserved skip
f->get_32(); 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()) { switch(p.get_completion_type()) {
case GDParser::COMPLETION_GET_NODE:
case GDParser::COMPLETION_NONE: { case GDParser::COMPLETION_NONE: {
} break; } break;
case GDParser::COMPLETION_BUILT_IN_TYPE_CONSTANT: { 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); }while(bytes_after != 0);
Property p = {ret, actual_format, nitems, actual_type}; Property p = {ret, actual_format, (int)nitems, actual_type};
return p; return p;
} }