GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-06-04 19:47:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into state_manager_2

Browse Source 
Conflicts:
	script/events.js
This commit is contained in:
LucidCrux
2013-07-24 21:01:59 -06:00
parent 2018ca3ae8 03867cae60
commit 766d3879c7
5 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/events.js
+4 -4
View File
@@ -77,7 +77,7 @@ var Events = {
Events.createFighterDiv('@', World.health, World.getMaxHealth()).attr('id', 'wanderer').appendTo(desc);
// Draw the enemy
Events.createFighterDiv(scene.char, scene.health, scene.health).attr('id', 'enemy').appendTo(desc);
Events.createFighterDiv(scene.chara, scene.health, scene.health).attr('id', 'enemy').appendTo(desc);
// Draw the action buttons
var btns = $('#buttons', Events.eventPanel());
@@ -595,8 +595,8 @@ var Events = {
}
},
createFighterDiv: function(char, hp, maxhp) {
var fighter = $('<div>').addClass('fighter').text(char).data('hp', hp).data('maxHp', maxhp);
createFighterDiv: function(chara, hp, maxhp) {
var fighter = $('<div>').addClass('fighter').text(chara).data('hp', hp).data('maxHp', maxhp);
$('<div>').addClass('hp').text(hp+'/'+maxhp).appendTo(fighter);
return fighter;
},
@@ -805,7 +805,7 @@ var Events = {
Engine.keyLock = false;
// Force refocus on the body. I hate you, IE.
$('body').focus();
});
});
},
handleStateUpdates: function(e){