diff options
| author | Rémi Verschelde | 2017-01-14 18:03:38 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-18 21:14:33 +0100 |
| commit | dbf013757658ad48bb61242ed69ad4145a946863 (patch) | |
| tree | 578688f4bbdd6affa4239558c9251eea26a61611 /modules | |
| parent | 75bf6a997875cab08866eb9e8ee6c75923fe8c96 (diff) | |
| download | godot-dbf013757658ad48bb61242ed69ad4145a946863.tar.gz godot-dbf013757658ad48bb61242ed69ad4145a946863.tar.zst godot-dbf013757658ad48bb61242ed69ad4145a946863.zip | |
Style: Fix statements ending with ';;'
(cherry picked from commit f44ee891beaad397481dd88da41cb80e6539774f)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gd_compiler.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 2 | ||||
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 2 | ||||
| -rw-r--r-- | modules/gridmap/grid_map.cpp | 8 | ||||
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 6 | ||||
| -rw-r--r-- | modules/squish/image_compress_squish.cpp | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index 50a13b9d0..e5cb70da6 100644 --- a/modules/gdscript/gd_compiler.cpp +++ b/modules/gdscript/gd_compiler.cpp @@ -1421,7 +1421,7 @@ Error GDCompiler::_parse_function(GDScript *p_script,const GDParser::ClassNode * //funciton and class if (p_class->name) { - signature+="::"+String(p_class->name)+"."+String(func_name);; + signature+="::"+String(p_class->name)+"."+String(func_name); } else { signature+="::"+String(func_name); } diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index 62699976b..9d3a84d02 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -544,7 +544,7 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va String str; for(int i=0;i<p_arg_count;i++) { - String os = p_args[i]->operator String();; + String os = p_args[i]->operator String(); if (i==0) str=os; diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 1ca3170ff..6301a0a1b 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -425,7 +425,7 @@ bool GDScript::_update_exports() { } } - members_cache.clear();; + members_cache.clear(); member_default_values_cache.clear(); for(int i=0;i<c->variables.size();i++) { diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 7d3991b12..22e79f7fc 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -65,7 +65,7 @@ bool GridMap::_set(const StringName& p_name, const Variant& p_value) { int amount=cells.size(); DVector<int>::Read r = cells.read(); ERR_FAIL_COND_V(amount&1,false); // not even - cell_map.clear();; + cell_map.clear(); for(int i=0;i<amount/3;i++) { @@ -90,7 +90,7 @@ bool GridMap::_set(const StringName& p_name, const Variant& p_value) { int amount=cells.size(); DVector<int>::Read r = cells.read(); ERR_FAIL_COND_V(amount%3,false); // not even - cell_map.clear();; + cell_map.clear(); for(int i=0;i<amount/3;i++) { IndexKey ik; @@ -123,7 +123,7 @@ bool GridMap::_set(const StringName& p_name, const Variant& p_value) { Octant &g = *octant_map[ok]; g.baked=b; - g.bake_instance=VS::get_singleton()->instance_create();; + g.bake_instance=VS::get_singleton()->instance_create(); VS::get_singleton()->instance_set_base(g.bake_instance,g.baked->get_rid()); VS::get_singleton()->instance_geometry_set_baked_light(g.bake_instance,baked_light_instance?baked_light_instance->get_baked_light_instance():RID()); } @@ -908,7 +908,7 @@ void GridMap::_octant_bake(const OctantKey &p_key, const Ref<TriangleMesh>& p_tm if (V) V=V->next(); else - V=st->get_vertex_array().front();; + V=st->get_vertex_array().front(); int lc = p_lights.size(); const BakeLight* bl = p_lights.ptr(); float ofs = cell_size*0.02; diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 246f2eecc..b6922bf1c 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -903,7 +903,7 @@ void GridMapEditor::edit(GridMap *p_gridmap) { Vector3 axis; axis[i]=1; Vector3 axis_n1; - axis_n1[(i+1)%3]=cell_size[(i+1)%3];; + axis_n1[(i+1)%3]=cell_size[(i+1)%3]; Vector3 axis_n2; axis_n2[(i+2)%3]=cell_size[(i+2)%3]; @@ -1275,8 +1275,8 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { edit_mode = memnew(OptionButton); edit_mode->set_area_as_parent_rect(); - edit_mode->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,24);; - edit_mode->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,14);; + edit_mode->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,24); + edit_mode->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,14); edit_mode->add_item("Tiles"); edit_mode->add_item("Areas"); hb->add_child(edit_mode); diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp index e90996e34..27f13f8e8 100644 --- a/modules/squish/image_compress_squish.cpp +++ b/modules/squish/image_compress_squish.cpp @@ -54,12 +54,12 @@ void image_compress_squish(Image *p_image) { if (p_image->get_format()==Image::FORMAT_GRAYSCALE_ALPHA) { //compressed normalmap - target_format = Image::FORMAT_BC3; squish_comp|=squish::kDxt5;; + target_format = Image::FORMAT_BC3; squish_comp|=squish::kDxt5; } else if (p_image->detect_alpha()!=Image::ALPHA_NONE) { - target_format = Image::FORMAT_BC2; squish_comp|=squish::kDxt3;; + target_format = Image::FORMAT_BC2; squish_comp|=squish::kDxt3; } else { - target_format = Image::FORMAT_BC1; shift=1; squish_comp|=squish::kDxt1;; + target_format = Image::FORMAT_BC1; shift=1; squish_comp|=squish::kDxt1; } p_image->convert(Image::FORMAT_RGBA); //always expects rgba |
