Merge pull request #22 from engstrom/master

Moved EatMeatButton to beginning of combat UI
This commit is contained in:
Michael Townsend
2013-07-06 09:53:24 -07:00
+2 -2
View File
@@ -29,7 +29,7 @@ var Events = {
options: {}, // Nothing for now
activeEvent: null,
activeEvent: null,
activeScene: null,
eventPanel: null,
@@ -103,7 +103,7 @@ var Events = {
Events.createAttackButton('fists').prependTo(btns);
}
Events.createEatMeatButton().appendTo(btns);
Events.createEatMeatButton().prependTo(btns);
// Set up the enemy attack timer
Events._enemyAttackTimer = setTimeout(Events.enemyAttack, scene.attackDelay * 1000);