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

Merge pull request #863 from JIghtuse/master 

Fix CppCheck 'duplicateExpression' warning
This commit is contained in:
Juan Linietsky 2014-12-01 21:45:26 -02:00
parent 5eb546e04b 1ce14e3321
commit 9d5a2cb847
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/globals.cpp
View File

@ -674,7 +674,7 @@ static Variant _decode_variant(const String& p_string) {
int w=params[2].to_int(); int w=params[2].to_int();
int h=params[3].to_int(); int h=params[3].to_int();
if (w == 0 && w == 0) { if (w == 0 && h == 0) {
//r_v = Image(w, h, imgformat); //r_v = Image(w, h, imgformat);
return Image(); return Image();
}; };

2
core/io/config_file.cpp
View File

@ -580,7 +580,7 @@ static Variant _decode_variant(const String& p_string) {
int w=params[2].to_int(); int w=params[2].to_int();
int h=params[3].to_int(); int h=params[3].to_int();
if (w == 0 && w == 0) { if (w == 0 && h == 0) {
//r_v = Image(w, h, imgformat); //r_v = Image(w, h, imgformat);
return Image(); return Image();
}; };

2
core/io/resource_format_xml.cpp
View File

@ -571,7 +571,7 @@ Error ResourceInteractiveLoaderXML::parse_property(Variant& r_v, String &r_name)
int w=width.to_int(); int w=width.to_int();
int h=height.to_int(); int h=height.to_int();
if (w == 0 && w == 0) { if (w == 0 && h == 0) {
//r_v = Image(w, h, imgformat); //r_v = Image(w, h, imgformat);
r_v=Image(); r_v=Image();
String sdfsdfg; String sdfsdfg;