diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-25 18:41:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 18:41:25 +0200 |
| commit | 6273ec901faec2823c8f4801244d1cffbbe9b118 (patch) | |
| tree | 26c5315496bbab4194850eefb54deae9e81831f4 | |
| parent | f86176d20b75598de78f117c06f55ef193115fd6 (diff) | |
| parent | a2b8ef6d5108f1822f323e23e8546878e3ec8fe3 (diff) | |
Merge pull request #5902 from 29jm/fix-warnings
Fix some warnings
| -rw-r--r-- | servers/audio/audio_mixer_sw.h | 3 | ||||
| -rw-r--r-- | servers/audio_server.h | 3 | ||||
| -rw-r--r-- | tools/editor/editor_node.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/servers/audio/audio_mixer_sw.h b/servers/audio/audio_mixer_sw.h index 950ed19af6..e924b518cc 100644 --- a/servers/audio/audio_mixer_sw.h +++ b/servers/audio/audio_mixer_sw.h @@ -69,8 +69,7 @@ private: MIX_VOLRAMP_FRAC_MASK=MIX_VOLRAMP_FRAC_LEN-1, MIX_FILTER_FRAC_BITS=16, MIX_FILTER_RAMP_FRAC_BITS=8, - MIX_VOL_MOVE_TO_24=4, - MAX_REVERBS=4 + MIX_VOL_MOVE_TO_24=4 }; diff --git a/servers/audio_server.h b/servers/audio_server.h index 50194af4a5..9e21e6b183 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -65,7 +65,8 @@ public: REVERB_SMALL, REVERB_MEDIUM, REVERB_LARGE, - REVERB_HALL + REVERB_HALL, + MAX_REVERBS }; virtual ChannelID channel_alloc(RID p_sample)=0; diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 30b89cacc5..2839708f8d 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1213,7 +1213,7 @@ void EditorNode::_dialog_action(String p_file) { case FILE_SAVE_SCENE: case FILE_SAVE_AS_SCENE: { - if (file->get_mode()==FileDialog::MODE_SAVE_FILE) { + if (file->get_mode()==EditorFileDialog::MODE_SAVE_FILE) { //_save_scene(p_file); _save_scene_with_preview(p_file); @@ -1223,7 +1223,7 @@ void EditorNode::_dialog_action(String p_file) { } break; case FILE_SAVE_AND_RUN: { - if (file->get_mode()==FileDialog::MODE_SAVE_FILE) { + if (file->get_mode()==EditorFileDialog::MODE_SAVE_FILE) { //_save_scene(p_file); _save_scene_with_preview(p_file); @@ -1448,7 +1448,7 @@ void EditorNode::_dialog_action(String p_file) { } break; default: { //save scene? - if (file->get_mode()==FileDialog::MODE_SAVE_FILE) { + if (file->get_mode()==EditorFileDialog::MODE_SAVE_FILE) { //_save_scene(p_file); _save_scene_with_preview(p_file); |