Merge pull request #14 from hobnob/features/shortcuts

Adds shortcuts for the scoreboard
Dave-and-Mike · Nov 28, 2012 · 522bb2e · 522bb2e
2 parents c3b2586 + 28e3561
commit 522bb2e
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 2 deletions.
diff --git a/img/apple-touch-icon-114x114.png b/img/apple-touch-icon-114x114.png
diff --git a/img/apple-touch-icon-72x72.png b/img/apple-touch-icon-72x72.png
diff --git a/img/favicon.ico b/img/favicon.ico
diff --git a/img/touch-icon-iphone.png b/img/touch-icon-iphone.png
diff --git a/index.htm b/index.htm
@@ -3,6 +3,12 @@
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  <link media="screen" href="css/main.css" rel="stylesheet" type="text/css" />
+
+ <link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico">
+ <link rel="apple-touch-icon" sizes="114x114" href="img/touch-icon-114x114.png" />
+ <link rel="apple-touch-icon" sizes="72x72" href="img/touch-icon-72x72.png" />
+ <link rel="apple-touch-icon" href="img/touch-icon-iphone.png" />
+
  <script type="text/javascript" src="js/jquery-1.8.2.js"></script>
  <script type="text/javascript" src="js/gamejs/yabble.js"></script>
  <script type="text/javascript" src="js/gamejs/gamejs.min.js"></script>
@@ -14,7 +20,7 @@
  require.run('main');
  });
  </script>
- <title>Clone Game</title>
+ <title>Alge's Escapade</title>
  </head>
  <body>
  <div id="preload">

diff --git a/js/lib/world.js b/js/lib/world.js
@@ -263,7 +263,9 @@ function world()
  isCurrentPlayer = true;
  }
 
- colliders[i].b.handleCollision( colliders[i].a, isCurrentPlayer );
+ colliders[i].b.handleCollision(
+ colliders[i].a, isCurrentPlayer
+ );
  }
  }
 

diff --git a/js/main.js b/js/main.js
@@ -36,6 +36,41 @@ gamejs.ready(function() {
  mainWindow.draw( mainSurface );
  };
 
+ //Set up listeners for the body when a scorecard is present
+ $('body').keydown(function(event){
+ //Only check key presses if the scorcard is shown
+ if ( $('#game_scorecard').is(":visible") )
+ {
+ switch ( event.keyCode )
+ {
+ //Enter, Space, up, w, and e will all move
+ //to the next level
+ case 13:
+ case 32:
+ case 38:
+ case 87:
+ case 69:
+ $('#game_scorecard .nextLevel').click();
+ event.preventDefault();
+ break;
+ //Escape will quit to the menu
+ case 27:
+ $('#game_scorecard .mainMenu').click();
+ event.preventDefault();
+ break;
+ //r will reset the level
+ case 82:
+ $('#game_scorecard .resetLevel').click();
+ event.preventDefault();
+ break;
+
+ }
+ }
+ });
+
+ //Remove the loading bar
  $('#preload').remove();
+
+ //Set up the tick function, run at 60fps
  gamejs.time.fpsCallback(tick, self, 60);
 });