snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-21 06:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mathewv/master'

Browse source
This commit is contained in:
Vinyl Darkscratch 2016-12-20 13:09:17 -08:00
commit e97d42f132
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/Doc_Message.rb
View file

@ -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

7
scripts/Game_Map.rb
View file

@ -498,12 +498,7 @@ 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
event.update
end
# Update common event
for common_event in @common_events.values