diff options
| author | SushiTee <weichel.sascha@gmail.com> | 2010-06-03 15:21:12 +0200 |
|---|---|---|
| committer | SushiTee <weichel.sascha@gmail.com> | 2010-06-03 15:21:12 +0200 |
| commit | 0115161463266a77bbe98d41f271f8ec49da43aa (patch) | |
| tree | 91fe8eb865502398fa149c3974d807d954513ba0 /src/game | |
| parent | c37335b115f69f8ab54403742640faff384d2747 (diff) | |
| parent | 5988b9d38801f0987f38c99fb944e1a861d07ef3 (diff) | |
| download | zcatch-0115161463266a77bbe98d41f271f8ec49da43aa.tar.gz zcatch-0115161463266a77bbe98d41f271f8ec49da43aa.zip | |
mergend stuff
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/client/components/hud.cpp | 12 | ||||
| -rw-r--r-- | src/game/client/components/menus.cpp | 2 | ||||
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp index fd44af41..a3ae5a4d 100644 --- a/src/game/client/components/hud.cpp +++ b/src/game/client/components/hud.cpp @@ -56,7 +56,7 @@ void CHud::RenderSuddenDeath() if(m_pClient->m_Snap.m_pGameobj->m_SuddenDeath) { float Half = 300.0f*Graphics()->ScreenAspect()/2.0f; - const char *pText = "Sudden Death"; + const char *pText = Localize("Sudden Death"); float FontSize = 12.0f; float w = TextRender()->TextWidth(0, FontSize, pText, -1); TextRender()->Text(0, Half-w/2, 2, FontSize, pText, -1); @@ -133,8 +133,8 @@ void CHud::RenderWarmupTimer() { char Buf[256]; float FontSize = 20.0f; - float w = TextRender()->TextWidth(0, FontSize, "Warmup", -1); - TextRender()->Text(0, 150*Graphics()->ScreenAspect()+-w/2, 50, FontSize, "Warmup", -1); + float w = TextRender()->TextWidth(0, FontSize, Localize("Warmup"), -1); + TextRender()->Text(0, 150*Graphics()->ScreenAspect()+-w/2, 50, FontSize, Localize("Warmup"), -1); int Seconds = m_pClient->m_Snap.m_pGameobj->m_Warmup/SERVER_TICK_SPEED; if(Seconds < 5) @@ -171,7 +171,7 @@ void CHud::RenderConnectionWarning() { if(Client()->ConnectionProblems()) { - const char *pText = "Connection Problems..."; + const char *pText = Localize("Connection Problems..."); float w = TextRender()->TextWidth(0, 24, pText, -1); TextRender()->Text(0, 150*Graphics()->ScreenAspect()-w/2, 50, 24, pText, -1); } @@ -186,7 +186,7 @@ void CHud::RenderTeambalanceWarning() int TeamDiff = m_pClient->m_Snap.m_aTeamSize[0]-m_pClient->m_Snap.m_aTeamSize[1]; if (g_Config.m_ClWarningTeambalance && (TeamDiff >= 2 || TeamDiff <= -2)) { - const char *pText = "Please balance teams!"; + const char *pText = Localize("Please balance teams!"); if(Flash) TextRender()->TextColor(1,1,0.5f,1); else @@ -214,7 +214,7 @@ void CHud::RenderVoting() char Buf[512]; TextRender()->Text(0x0, 5, 60, 6, m_pClient->m_pVoting->VoteDescription(), -1); - str_format(Buf, sizeof(Buf), "%ds left", m_pClient->m_pVoting->SecondsLeft()); + str_format(Buf, sizeof(Buf), Localize("%ds left"), m_pClient->m_pVoting->SecondsLeft()); float tw = TextRender()->TextWidth(0x0, 6, Buf, -1); TextRender()->Text(0x0, 5+100-tw, 60, 6, Buf, -1); diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 585c6d7a..b752f8cb 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -840,7 +840,7 @@ int CMenus::Render() } else if(m_Popup == POPUP_PASSWORD) { - pTitle = Localize("Password Incorrect"); + pTitle = Localize("Password incorrect"); pExtraText = Client()->ErrorString(); pButtonText = Localize("Try again"); } diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index b2b3e1ca..387ce104 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -1029,6 +1029,14 @@ void CEditor::DoQuadPoint(CQuad *q, int QuadIndex, int v) s_Operation = OP_CONTEXT_MENU; m_SelectedQuad = QuadIndex; UI()->SetActiveItem(pId); + if(!(m_SelectedPoints&(1<<v))) + { + if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT)) + m_SelectedPoints |= 1<<v; + else + m_SelectedPoints = 1<<v; + s_Moved = true; + } } } else |