Browse Source

Merge pull request #5902 from 29jm/fix-warnings

Fix some warnings
Rémi Verschelde 9 years ago
parent
commit
6273ec901f
3 changed files with 6 additions and 6 deletions
  1. 1 2
      servers/audio/audio_mixer_sw.h
  2. 2 1
      servers/audio_server.h
  3. 3 3
      tools/editor/editor_node.cpp

+ 1 - 2
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
 	};
 
 

+ 2 - 1
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;

+ 3 - 3
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);