diff --git a/loadRooms.js b/loadRooms.js index 4032159..65ca300 100644 --- a/loadRooms.js +++ b/loadRooms.js @@ -1,10 +1,5 @@ // var rm_TitleScreen = OS.R.Add("Default"); // var rm_Ocean = OS.R.Add("Ocean", { -var rm_Trade = OS.R.Add("Trade", { - width: OS.camera.width, - height: OS.camera.height, - backgroundColor: "#D9BEA5" -}); var rm_Ocean = OS.R.Add("Default", { width: pixel(64) * 50, //50x50 map of 64x64 squares. This will allow a single pixel on the map to represent a 64x square and fit comfortably on screen. height: pixel(64) * 50, @@ -14,7 +9,6 @@ var rm_Ocean = OS.R.Add("Default", { function loadRooms() { // OS.AddScript("rooms/titleScreen.js"); OS.AddScript("rooms/oceanRoom.js"); - OS.AddScript("rooms/tradeRoom.js"); // OS.SetRoom(rm_TitleScreen); OS.SetRoom(rm_Ocean); diff --git a/rooms/oceanRoom.js b/rooms/oceanRoom.js index 6c7b7fe..c45cfcc 100644 --- a/rooms/oceanRoom.js +++ b/rooms/oceanRoom.js @@ -39,9 +39,6 @@ rm_Ocean.DoFirst = function () { this.mapUpTriggerTarget = this.height - (OS.camera.height - OS.camera.vBorder); this.mapDownTrigger = this.height - OS.camera.vBorder; this.mapDownTriggerTarget = OS.camera.height - OS.camera.vBorder; - - // THIS IS JUST FOR MAKING TRADE ROOM TESTING EASIER. DO NOT SHIP LIKE THIS!!!! - // OS.SetRoom(rm_Trade); } rm_Ocean.Do = function () { // Move G.oceanParticle around based on player's movement. diff --git a/rooms/tradeRoom.js b/rooms/tradeRoom.js deleted file mode 100644 index 428662c..0000000 --- a/rooms/tradeRoom.js +++ /dev/null @@ -1,16 +0,0 @@ -function tradeRoom () {} - -rm_Trade.DoFirst = function () { - OS.canvas.style.background = this.background.color; -} - -rm_Trade.Do = function () {} - -rm_Trade.DrawAbove = function () { - drawTradeGUI(); -} - -rm_Trade.DoLast = function () { - // Clear Objects on room exit. This is best practice unless you need persistent objects. - //rm_Trade.objects = {}; -}