@@ -5,7 +5,7 @@ mod components;
5
5
mod database;
6
6
mod direction;
7
7
mod events;
8
- mod input_action_map ;
8
+ mod input_map ;
9
9
mod level;
10
10
mod movement;
11
11
mod plugins;
@@ -18,7 +18,7 @@ mod test;
18
18
use bevy:: prelude:: * ;
19
19
use bevy_kira_audio:: prelude:: * ;
20
20
use events:: * ;
21
- use input_action_map :: * ;
21
+ use input_map :: * ;
22
22
use leafwing_input_manager:: prelude:: * ;
23
23
use level:: * ;
24
24
use plugins:: performance_matrix:: * ;
@@ -46,15 +46,15 @@ fn load_config() -> Config {
46
46
config
47
47
}
48
48
49
- fn load_input_action_map ( ) -> InputMap < Action > {
49
+ fn load_input_map ( ) -> InputMap < Action > {
50
50
const KEYMAP_FILE_PATH : & str = "keymap.toml" ;
51
51
if !Path :: new ( KEYMAP_FILE_PATH ) . is_file ( ) {
52
- let default_keymap_toml = toml:: to_string ( & default_input_action_map ( ) ) . unwrap ( ) ;
52
+ let default_keymap_toml = toml:: to_string ( & default_input_map ( ) ) . unwrap ( ) ;
53
53
fs:: write ( KEYMAP_FILE_PATH , default_keymap_toml) . unwrap ( ) ;
54
54
}
55
55
let keymap_toml = fs:: read_to_string ( KEYMAP_FILE_PATH ) . unwrap ( ) ;
56
- let input_action_map : InputMap < Action > = toml:: from_str ( keymap_toml. as_str ( ) ) . unwrap ( ) ;
57
- input_action_map
56
+ let input_map : InputMap < Action > = toml:: from_str ( keymap_toml. as_str ( ) ) . unwrap ( ) ;
57
+ input_map
58
58
}
59
59
60
60
fn save_config ( config : Res < Config > ) {
@@ -163,9 +163,9 @@ fn main() {
163
163
. insert_resource ( player_movement)
164
164
. insert_resource ( AutoMoveState :: default ( ) ) ;
165
165
166
- let input_action_map = load_input_action_map ( ) ;
166
+ let input_map = load_input_map ( ) ;
167
167
app. init_resource :: < ActionState < Action > > ( )
168
- . insert_resource ( input_action_map ) ;
168
+ . insert_resource ( input_map ) ;
169
169
170
170
app. add_event :: < CrateEnterTarget > ( )
171
171
. add_event :: < CrateLeaveTarget > ( )
0 commit comments