Added a hashmap macro

[kaka/rust-sdl-test.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 256cc3c..9195583 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,9 +2,10 @@ extern crate rand;
 extern crate sdl2;
 extern crate time;
 
-use game::app::*;
+use core::game::GameState;
+use core::app::*;
 
-mod game;
+mod core;
 #[macro_use]
 mod common;
 mod boll;
@@ -17,7 +18,8 @@ fn main() {
     println!("starting...");
     let mut app = App::new()
         .with_resolution(SCREEN_WIDTH, SCREEN_HEIGHT)
-        .with_state(Box::new(ActiveState::new((SCREEN_WIDTH as u32, SCREEN_HEIGHT as u32))))
+//        .with_state(Box::new(ActiveState::new((SCREEN_WIDTH as u32, SCREEN_HEIGHT as u32))))
+        .with_state(Box::new(GameState::new()))
         .with_title("SDL test")
         .build()
         .unwrap();