Merge remote-tracking branch 'mathewv/master'
This commit is contained in:
commit
e97d42f132
|
|
@ -127,9 +127,9 @@ class Doc_Message
|
|||
|
||||
# Prepare renderer
|
||||
@contents.clear
|
||||
@contents.font.color = Color.new(55, 46, 190, 255)
|
||||
@contents.font.color = Color.new(100, 92, 255, 255)
|
||||
if $game_switches[124] == true
|
||||
@contents.font.color = Color.new(105, 25, 44, 255)
|
||||
@contents.font.color = Color.new(255, 92, 100, 255)
|
||||
end
|
||||
x = 0
|
||||
y = 0
|
||||
|
|
|
|||
|
|
@ -498,13 +498,8 @@ class Game_Map
|
|||
end
|
||||
# Update map event
|
||||
for event in @events.values
|
||||
if (event.list != nil && event.list.size > 1) || (event.x * 128 > $game_map.display_x - (10 * 128)) &&
|
||||
(event.x * 128 < $game_map.display_x + (30 * 128)) &&
|
||||
(event.y * 128 > ($game_map.display_y) - (10 * 128) &&
|
||||
(event.y * 128 < ($game_map.display_y) + (27 * 128)))
|
||||
event.update
|
||||
end
|
||||
end
|
||||
# Update common event
|
||||
for common_event in @common_events.values
|
||||
common_event.update
|
||||
|
|
|
|||
Loading…
Reference in New Issue