Merge pull request #47 from rpgtkoolmv/fix_face

fix lack of reserveFace

Author: krmbn0576

js/rpg_scenes/Scene_Menu.js

@@ -48,6 +48,7 @@ Scene_Menu.prototype.createGoldWindow = function() {
 
 Scene_Menu.prototype.createStatusWindow = function() {
     this._statusWindow = new Window_MenuStatus(this._commandWindow.width, 0);
+    this._statusWindow.reserveFaceImages();
     this.addWindow(this._statusWindow);
 };
 

js/rpg_scenes/Scene_Skill.js

@@ -21,6 +21,10 @@ Scene_Skill.prototype.create = function() {
     this.createStatusWindow();
     this.createItemWindow();
     this.createActorWindow();
+};
+
+Scene_Skill.prototype.start = function() {
+    Scene_ItemBase.prototype.start.call(this);
     this.refreshActor();
 };
 
@@ -41,6 +45,7 @@ Scene_Skill.prototype.createStatusWindow = function() {
     var ww = Graphics.boxWidth - wx;
     var wh = this._skillTypeWindow.height;
     this._statusWindow = new Window_SkillStatus(wx, wy, ww, wh);
+    this._statusWindow.reserveFaceImages();
     this.addWindow(this._statusWindow);
 };
 

js/rpg_scenes/Scene_Status.js

@@ -20,7 +20,12 @@ Scene_Status.prototype.create = function() {
     this._statusWindow.setHandler('cancel',   this.popScene.bind(this));
     this._statusWindow.setHandler('pagedown', this.nextActor.bind(this));
     this._statusWindow.setHandler('pageup',   this.previousActor.bind(this));
+    this._statusWindow.reserveFaceImages();
     this.addWindow(this._statusWindow);
+};
+
+Scene_Status.prototype.start = function() {
+    Scene_MenuBase.prototype.start.call(this);
     this.refreshActor();
 };
 

js/rpg_windows/Window_Base.js

@@ -697,3 +697,9 @@ Window_Base.prototype.canvasToLocalY = function(y) {
     }
     return y;
 };
+
+Window_Base.prototype.reserveFaceImages = function() {
+    $gameParty.members().forEach(function(actor) {
+        ImageManager.reserveFace(actor.faceName());
+    }, this);
+};

js/rpg_windows/Window_MenuStatus.js

@@ -16,7 +16,6 @@ Window_MenuStatus.prototype.initialize = function(x, y) {
     Window_Selectable.prototype.initialize.call(this, x, y, width, height);
     this._formationMode = false;
     this._pendingIndex = -1;
-    this.loadImages();
     this.refresh();
 };
 

js/rpg_windows/Window_Message.js

@@ -22,6 +22,7 @@ Window_Message.prototype.initialize = function() {
 };
 
 Window_Message.prototype.initMembers = function() {
+    this._imageReservationId = Utils.generateRuntimeId();
     this._background = 0;
     this._positionType = 2;
     this._waitCount = 0;
@@ -251,11 +252,12 @@ Window_Message.prototype.newPage = function(textState) {
 };
 
 Window_Message.prototype.loadMessageFace = function() {
-    this._faceBitmap = ImageManager.loadFace($gameMessage.faceName());
+    this._faceBitmap = ImageManager.reserveFace($gameMessage.faceName(), 0, this._imageReservationId);
 };
 
 Window_Message.prototype.drawMessageFace = function() {
     this.drawFace($gameMessage.faceName(), $gameMessage.faceIndex(), 0, 0);
+    ImageManager.releaseReservation(this._imageReservationId);
 };
 
 Window_Message.prototype.newLineX = function() {

js/rpg_windows/Window_Status.js

@@ -14,6 +14,7 @@ Window_Status.prototype.initialize = function() {
     var width = Graphics.boxWidth;
     var height = Graphics.boxHeight;
     Window_Selectable.prototype.initialize.call(this, 0, 0, width, height);
+    this._actor = null;
     this.refresh();
     this.activate();
 };