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

fix enum cast warnings on clang

This commit is contained in:
karroffel 2018-10-04 09:17:59 +02:00
parent 171be91804
commit a0f206aae8
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/input.cpp
View File

@ -42,7 +42,7 @@ Input *Input::get_singleton() {
} }
void Input::set_mouse_mode(MouseMode p_mode) { void Input::set_mouse_mode(MouseMode p_mode) {
ERR_FAIL_INDEX(p_mode, 4); ERR_FAIL_INDEX((int)p_mode, 4);
OS::get_singleton()->set_mouse_mode((OS::MouseMode)p_mode); OS::get_singleton()->set_mouse_mode((OS::MouseMode)p_mode);
} }

8
scene/2d/camera_2d.cpp
View File

@ -422,14 +422,14 @@ void Camera2D::clear_current() {
void Camera2D::set_limit(Margin p_margin, int p_limit) { void Camera2D::set_limit(Margin p_margin, int p_limit) {
ERR_FAIL_INDEX(p_margin, 4); ERR_FAIL_INDEX((int)p_margin, 4);
limit[p_margin] = p_limit; limit[p_margin] = p_limit;
update(); update();
} }
int Camera2D::get_limit(Margin p_margin) const { int Camera2D::get_limit(Margin p_margin) const {
ERR_FAIL_INDEX_V(p_margin, 4, 0); ERR_FAIL_INDEX_V((int)p_margin, 4, 0);
return limit[p_margin]; return limit[p_margin];
} }
@ -446,14 +446,14 @@ bool Camera2D::is_limit_smoothing_enabled() const {
void Camera2D::set_drag_margin(Margin p_margin, float p_drag_margin) { void Camera2D::set_drag_margin(Margin p_margin, float p_drag_margin) {
ERR_FAIL_INDEX(p_margin, 4); ERR_FAIL_INDEX((int)p_margin, 4);
drag_margin[p_margin] = p_drag_margin; drag_margin[p_margin] = p_drag_margin;
update(); update();
} }
float Camera2D::get_drag_margin(Margin p_margin) const { float Camera2D::get_drag_margin(Margin p_margin) const {
ERR_FAIL_INDEX_V(p_margin, 4, 0); ERR_FAIL_INDEX_V((int)p_margin, 4, 0);
return drag_margin[p_margin]; return drag_margin[p_margin];
} }

2
scene/2d/collision_polygon_2d.cpp
View File

@ -247,7 +247,7 @@ Vector<Point2> CollisionPolygon2D::get_polygon() const {
void CollisionPolygon2D::set_build_mode(BuildMode p_mode) { void CollisionPolygon2D::set_build_mode(BuildMode p_mode) {
ERR_FAIL_INDEX(p_mode, 2); ERR_FAIL_INDEX((int)p_mode, 2);
build_mode = p_mode; build_mode = p_mode;
if (parent) { if (parent) {
_build_polygon(); _build_polygon();

2
scene/3d/audio_stream_player_3d.cpp
View File

@ -814,7 +814,7 @@ AudioStreamPlayer3D::AttenuationModel AudioStreamPlayer3D::get_attenuation_model
void AudioStreamPlayer3D::set_out_of_range_mode(OutOfRangeMode p_mode) { void AudioStreamPlayer3D::set_out_of_range_mode(OutOfRangeMode p_mode) {
ERR_FAIL_INDEX(p_mode, 2); ERR_FAIL_INDEX((int)p_mode, 2);
out_of_range_mode = p_mode; out_of_range_mode = p_mode;
} }

4
scene/gui/control.cpp
View File

@ -2235,13 +2235,13 @@ String Control::_get_tooltip() const {
void Control::set_focus_neighbour(Margin p_margin, const NodePath &p_neighbour) { void Control::set_focus_neighbour(Margin p_margin, const NodePath &p_neighbour) {
ERR_FAIL_INDEX(p_margin, 4); ERR_FAIL_INDEX((int)p_margin, 4);
data.focus_neighbour[p_margin] = p_neighbour; data.focus_neighbour[p_margin] = p_neighbour;
} }
NodePath Control::get_focus_neighbour(Margin p_margin) const { NodePath Control::get_focus_neighbour(Margin p_margin) const {
ERR_FAIL_INDEX_V(p_margin, 4, NodePath()); ERR_FAIL_INDEX_V((int)p_margin, 4, NodePath());
return data.focus_neighbour[p_margin]; return data.focus_neighbour[p_margin];
} }

4
scene/gui/label.cpp
View File

@ -511,7 +511,7 @@ void Label::regenerate_word_cache() {
void Label::set_align(Align p_align) { void Label::set_align(Align p_align) {
ERR_FAIL_INDEX(p_align, 4); ERR_FAIL_INDEX((int)p_align, 4);
align = p_align; align = p_align;
update(); update();
} }
@ -523,7 +523,7 @@ Label::Align Label::get_align() const {
void Label::set_valign(VAlign p_align) { void Label::set_valign(VAlign p_align) {
ERR_FAIL_INDEX(p_align, 4); ERR_FAIL_INDEX((int)p_align, 4);
valign = p_align; valign = p_align;
update(); update();
} }

2
scene/gui/line_edit.cpp
View File

@ -527,7 +527,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
void LineEdit::set_align(Align p_align) { void LineEdit::set_align(Align p_align) {
ERR_FAIL_INDEX(p_align, 4); ERR_FAIL_INDEX((int)p_align, 4);
align = p_align; align = p_align;
update(); update();
} }

4
scene/gui/nine_patch_rect.cpp
View File

@ -110,7 +110,7 @@ Ref<Texture> NinePatchRect::get_texture() const {
void NinePatchRect::set_patch_margin(Margin p_margin, int p_size) { void NinePatchRect::set_patch_margin(Margin p_margin, int p_size) {
ERR_FAIL_INDEX(p_margin, 4); ERR_FAIL_INDEX((int)p_margin, 4);
margin[p_margin] = p_size; margin[p_margin] = p_size;
update(); update();
minimum_size_changed(); minimum_size_changed();
@ -132,7 +132,7 @@ void NinePatchRect::set_patch_margin(Margin p_margin, int p_size) {
int NinePatchRect::get_patch_margin(Margin p_margin) const { int NinePatchRect::get_patch_margin(Margin p_margin) const {
ERR_FAIL_INDEX_V(p_margin, 4, 0); ERR_FAIL_INDEX_V((int)p_margin, 4, 0);
return margin[p_margin]; return margin[p_margin];
} }

4
scene/gui/texture_progress.cpp
View File

@ -59,14 +59,14 @@ Ref<Texture> TextureProgress::get_over_texture() const {
} }
void TextureProgress::set_stretch_margin(Margin p_margin, int p_size) { void TextureProgress::set_stretch_margin(Margin p_margin, int p_size) {
ERR_FAIL_INDEX(p_margin, 4); ERR_FAIL_INDEX((int)p_margin, 4);
stretch_margin[p_margin] = p_size; stretch_margin[p_margin] = p_size;
update(); update();
minimum_size_changed(); minimum_size_changed();
} }
int TextureProgress::get_stretch_margin(Margin p_margin) const { int TextureProgress::get_stretch_margin(Margin p_margin) const {
ERR_FAIL_INDEX_V(p_margin, 4, 0); ERR_FAIL_INDEX_V((int)p_margin, 4, 0);
return stretch_margin[p_margin]; return stretch_margin[p_margin];
} }

2
scene/resources/animation.cpp
View File

@ -1901,7 +1901,7 @@ void Animation::value_track_set_update_mode(int p_track, UpdateMode p_mode) {
ERR_FAIL_INDEX(p_track, tracks.size()); ERR_FAIL_INDEX(p_track, tracks.size());
Track *t = tracks[p_track]; Track *t = tracks[p_track];
ERR_FAIL_COND(t->type != TYPE_VALUE); ERR_FAIL_COND(t->type != TYPE_VALUE);
ERR_FAIL_INDEX(p_mode, 4); ERR_FAIL_INDEX((int)p_mode, 4);
ValueTrack *vt = static_cast<ValueTrack *>(t); ValueTrack *vt = static_cast<ValueTrack *>(t);
vt->update_mode = p_mode; vt->update_mode = p_mode;

6
scene/resources/style_box.cpp
View File

@ -136,7 +136,7 @@ Ref<Texture> StyleBoxTexture::get_normal_map() const {
void StyleBoxTexture::set_margin_size(Margin p_margin, float p_size) { void StyleBoxTexture::set_margin_size(Margin p_margin, float p_size) {
ERR_FAIL_INDEX(p_margin, 4); ERR_FAIL_INDEX((int)p_margin, 4);
margin[p_margin] = p_size; margin[p_margin] = p_size;
emit_changed(); emit_changed();
@ -200,7 +200,7 @@ Size2 StyleBoxTexture::get_center_size() const {
void StyleBoxTexture::set_expand_margin_size(Margin p_expand_margin, float p_size) { void StyleBoxTexture::set_expand_margin_size(Margin p_expand_margin, float p_size) {
ERR_FAIL_INDEX(p_expand_margin, 4); ERR_FAIL_INDEX((int)p_expand_margin, 4);
expand_margin[p_expand_margin] = p_size; expand_margin[p_expand_margin] = p_size;
emit_changed(); emit_changed();
} }
@ -223,7 +223,7 @@ void StyleBoxTexture::set_expand_margin_size_all(float p_expand_margin_size) {
float StyleBoxTexture::get_expand_margin_size(Margin p_expand_margin) const { float StyleBoxTexture::get_expand_margin_size(Margin p_expand_margin) const {
ERR_FAIL_INDEX_V(p_expand_margin, 4, 0); ERR_FAIL_INDEX_V((int)p_expand_margin, 4, 0);
return expand_margin[p_expand_margin]; return expand_margin[p_expand_margin];
} }