Skip to content

Commit

Permalink
Hide player UI elements when initialising a game until they are expli…
Browse files Browse the repository at this point in the history
…citly turned on
  • Loading branch information
alexwarren committed May 7, 2013
1 parent a680262 commit 2e3ecf5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
3 changes: 3 additions & 0 deletions Legacy/LegacyGame.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11834,6 +11834,9 @@ ErrorHandler:
GameName = RetrieveParameter(Lines(GetDefineBlock("game").StartLine), NullThread)

m_player.UpdateGameName(GameName)
m_player.Show("Panes")
m_player.Show("Location")
m_player.Show("Command")

SetUpGameObject()
SetUpOptions()
Expand Down
3 changes: 0 additions & 3 deletions Player/Player.vb
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@ Public Class Player
If fromEditor Then
ctlToolbar.SimpleMode = editorSimpleMode
End If
SetPanesVisible(True)
SetCommandVisible(True)
SetLocationVisible(True)
SetStatusText("")
LocationUpdated("")
m_menu.ClearWindowMenu()
Expand Down
3 changes: 3 additions & 0 deletions PlayerController/playercore.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ div#gamePanes
padding: 2px;
background: #F9F9FF;
min-height: 100%;
display: none;
}
div#status
{
Expand All @@ -86,6 +87,7 @@ div#status
}
div#location
{
display: none;
padding-left: 4px;
padding-top: 4px;
}
Expand Down Expand Up @@ -132,6 +134,7 @@ div#divOutput
div#txtCommandDiv
{
height: 40px;
display: none;
}
#txtCommand
{
Expand Down
1 change: 1 addition & 0 deletions WebPlayer/Mobile/player.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ div#txtCommandDiv
opacity: 0.8;
position: static;
margin-left: 0px;
display: none;
}
#txtCommand
{
Expand Down
6 changes: 6 additions & 0 deletions WorldModel/WorldModel/WorldModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,12 @@ public void Begin()
try
{
m_timerRunner = new TimerRunner(this, !m_loadedFromSaved);
if (Version <= WorldModelVersion.v540)
{
PlayerUI.Show("Panes");
PlayerUI.Show("Location");
PlayerUI.Show("Command");
}
if (m_elements.ContainsKey(ElementType.Function, "InitInterface")) RunProcedure("InitInterface");
if (!m_loadedFromSaved)
{
Expand Down

0 comments on commit 2e3ecf5

Please sign in to comment.