abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Small fixes.

Browse Source 
This was SVN commit r16552.
This commit is contained in:
leper 2015-04-20 14:51:06 +00:00
parent a8c44d947c
commit 535d612e06
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/gui/session/session.js
View File

@ -220,12 +220,12 @@ function init(initData, hotloadData)
Engine.GetGUIObjectByName("menuExitButton").enabled = false; Engine.GetGUIObjectByName("menuExitButton").enabled = false;
if (hotloadData) if (hotloadData)
{
g_Selection.selected = hotloadData.selection; g_Selection.selected = hotloadData.selection;
}
// Starting for the first time: // Starting for the first time:
initMusic(); initMusic();
if (!g_IsObserver){ if (!g_IsObserver)
{
var civMusic = g_CivData[g_Players[Engine.GetPlayerID()].civ].Music; var civMusic = g_CivData[g_Players[Engine.GetPlayerID()].civ].Music;
global.music.storeTracks(civMusic); global.music.storeTracks(civMusic);
} }
@ -247,7 +247,8 @@ function init(initData, hotloadData)
function selectViewPlayer(playerID) function selectViewPlayer(playerID)
{ {
Engine.SetPlayerID(playerID); Engine.SetPlayerID(playerID);
if (playerID > 0) { if (playerID > 0)
{
Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[playerID].civ].Emblem; Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[playerID].civ].Emblem;
Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[playerID].civ].Name; Engine.GetGUIObjectByName("civIcon").tooltip = g_CivData[g_Players[playerID].civ].Name;
} }

4
source/gui/GUItext.cpp
View File

@ -181,9 +181,7 @@ void CGUIString::GenerateTextCall(const CGUI *pGUI,
Feedback.m_TextCalls.push_back(TextCall); Feedback.m_TextCalls.push_back(TextCall);
} }
break; break;
default: NODEFAULT;
LOGERROR("Encountered unexpected tag applied to text");
break;
} }
} }
else if (_to > _from && !Feedback.m_NewLine) else if (_to > _from && !Feedback.m_NewLine)