snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mathewv/master'

This commit is contained in:
Vinyl Darkscratch 2016-12-20 13:09:17 -08:00
parent d16959f0e8 6f7091db62
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 # Prepare renderer
@contents.clear @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 if $game_switches[124] == true
@contents.font.color = Color.new(105, 25, 44, 255) @contents.font.color = Color.new(255, 92, 100, 255)
end end
x = 0 x = 0
y = 0 y = 0

5
scripts/Game_Map.rb
View File

@ -498,13 +498,8 @@ class Game_Map
end end
# Update map event # Update map event
for event in @events.values 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 event.update
end end
end
# Update common event # Update common event
for common_event in @common_events.values for common_event in @common_events.values
common_event.update common_event.update