mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Merge branch 'mkxp-z' into dev
This commit is contained in:
@@ -23,13 +23,8 @@ class Game_System
|
||||
attr_accessor :bgm_position
|
||||
|
||||
def initialize
|
||||
if $RPGVX
|
||||
@map_interpreter = Game_Interpreter.new(0,true)
|
||||
@battle_interpreter = Game_Interpreter.new(0,false)
|
||||
else
|
||||
@map_interpreter = Interpreter.new(0,true)
|
||||
@battle_interpreter = Interpreter.new(0,false)
|
||||
end
|
||||
@map_interpreter = Interpreter.new(0, true)
|
||||
@battle_interpreter = Interpreter.new(0, false)
|
||||
@timer = 0
|
||||
@timer_working = false
|
||||
@save_disabled = false
|
||||
|
||||
@@ -31,8 +31,8 @@ class Game_Map
|
||||
|
||||
TILE_WIDTH = 32
|
||||
TILE_HEIGHT = 32
|
||||
X_SUBPIXELS = ($RPGVX) ? 8 : 4
|
||||
Y_SUBPIXELS = ($RPGVX) ? 8 : 4
|
||||
X_SUBPIXELS = 4
|
||||
Y_SUBPIXELS = 4
|
||||
REAL_RES_X = TILE_WIDTH * X_SUBPIXELS
|
||||
REAL_RES_Y = TILE_HEIGHT * Y_SUBPIXELS
|
||||
|
||||
@@ -44,7 +44,7 @@ class Game_Map
|
||||
|
||||
def setup(map_id)
|
||||
@map_id = map_id
|
||||
@map = load_data(sprintf("Data/Map%03d.%s",map_id,($RPGVX) ? "rvdata" : "rxdata"))
|
||||
@map = load_data(sprintf("Data/Map%03d.rxdata",map_id))
|
||||
tileset = $data_tilesets[@map.tileset_id]
|
||||
updateTileset
|
||||
@fog_ox = 0
|
||||
|
||||
Reference in New Issue
Block a user