more namespace updates

Author: jaredonline

Cargo.lock

@@ -9,5 +9,5 @@ build = "sh .build.sh"
 [dependencies.tcod]
 git = "https://github.com/tomassedovic/tcod-rs.git"
 
-[dependencies.stainless]
-git = "https://github.com/reem/stainless.git"
+#[dependencies.stainless]
+#git = "https://github.com/reem/stainless.git"

Cargo.toml

@@ -40,21 +40,21 @@ impl InputComponent<KeyState> for TcodInputComponent {
     fn translate_input(&self, key_state: KeyState) -> KeyboardInput {
         let key : Key = if key_state.shift {
             match key_state.key {
-                self::tcod::Special(tcod::KeyCode::Number5) => Key::Printable('%'),
-                self::tcod::Special(tcod::KeyCode::Number6) => Key::Printable('^'),
-                self::tcod::Special(tcod::KeyCode::Number8) => Key::Printable('*'),
-                _                                           => Key::SpecialKey(KeyCode::None)
+                self::tcod::Key::Special(tcod::KeyCode::Number5) => Key::Printable('%'),
+                self::tcod::Key::Special(tcod::KeyCode::Number6) => Key::Printable('^'),
+                self::tcod::Key::Special(tcod::KeyCode::Number8) => Key::Printable('*'),
+                _                                                => Key::SpecialKey(KeyCode::None)
             }
         } else {
             match key_state.key {
-                self::tcod::Printable('/')                 => Key::Printable('/'),
-                self::tcod::Special(tcod::KeyCode::Up)     => Key::SpecialKey(KeyCode::Up),
-                self::tcod::Special(tcod::KeyCode::Down)   => Key::SpecialKey(KeyCode::Down),
-                self::tcod::Special(tcod::KeyCode::Left)   => Key::SpecialKey(KeyCode::Left),
-                self::tcod::Special(tcod::KeyCode::Right)  => Key::SpecialKey(KeyCode::Right),
-                self::tcod::Special(tcod::KeyCode::Shift)  => Key::SpecialKey(KeyCode::Shift),
-                self::tcod::Special(tcod::KeyCode::Escape) => Key::SpecialKey(KeyCode::Escape),
-                _                                          => Key::SpecialKey(KeyCode::None)
+                self::tcod::Key::Printable('/')                 => Key::Printable('/'),
+                self::tcod::Key::Special(tcod::KeyCode::Up)     => Key::SpecialKey(KeyCode::Up),
+                self::tcod::Key::Special(tcod::KeyCode::Down)   => Key::SpecialKey(KeyCode::Down),
+                self::tcod::Key::Special(tcod::KeyCode::Left)   => Key::SpecialKey(KeyCode::Left),
+                self::tcod::Key::Special(tcod::KeyCode::Right)  => Key::SpecialKey(KeyCode::Right),
+                self::tcod::Key::Special(tcod::KeyCode::Shift)  => Key::SpecialKey(KeyCode::Shift),
+                self::tcod::Key::Special(tcod::KeyCode::Escape) => Key::SpecialKey(KeyCode::Escape),
+                _                                               => Key::SpecialKey(KeyCode::None)
             }
         };
 

src/input.rs

@@ -2,7 +2,7 @@ extern crate tcod;
 extern crate dwemthys;
 
 use dwemthys::game::Game;
-use dwemthys::input::{SpecialKey, KeyCode};
+use dwemthys::input::{Key, KeyCode};
 use tcod::Console;
 
 #[cfg(not(test))]
@@ -16,8 +16,8 @@ fn main() {
 
         // update game state
         match keypress.key {
-            SpecialKey(KeyCode::Escape) => game.exit = true,
-            _                           => {}
+            Key::SpecialKey(KeyCode::Escape) => game.exit = true,
+            _                                => {}
         }
         game.update();
 

src/main.rs

@@ -56,7 +56,7 @@ impl RenderingComponent for TcodRenderingComponent {
         let messages = window.get_messages();
 
         for message in messages.iter() {
-            window.print_message(0, line, tcod::Left, message.as_slice());
+            window.print_message(0, line, tcod::TextAlignment::Left, message.as_slice());
             line = line + 1;
         }
 

src/rendering/renderers.rs

@@ -15,7 +15,7 @@ pub enum PointEquality {
     PointsNotEqual
 }
 
-#[deriving(Clone, Show)]
+#[deriving(Clone, Show, PartialEq, Eq)]
 pub struct Point {
     pub x: i32,
     pub y: i32