diff options
| author | Fujnky <larsfunke1996@gmail.com> | 2010-09-03 22:30:46 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-09-04 16:23:20 +0200 |
| commit | 4123f28bbaa169ba8bb273f813fd7165e4f3a867 (patch) | |
| tree | 47402b9d6344170ff1b9e2b8813c1b1362eb1fbf | |
| parent | 538d968349faaec96ca010cc3fa0efdc13a05aed (diff) | |
| download | zcatch-4123f28bbaa169ba8bb273f813fd7165e4f3a867.tar.gz zcatch-4123f28bbaa169ba8bb273f813fd7165e4f3a867.zip | |
Improved demo player another bit.
* Replaced the reset button by more common stop button * Made the demo player automatically reset after demo ended
| -rw-r--r-- | data/demo_buttons.png | bin | 599 -> 616 bytes | |||
| -rw-r--r-- | datasrc/content.py | 2 | ||||
| -rw-r--r-- | src/game/client/components/menus_demo.cpp | 18 |
3 files changed, 14 insertions, 6 deletions
diff --git a/data/demo_buttons.png b/data/demo_buttons.png index 47a5c2f1..5f394102 100644 --- a/data/demo_buttons.png +++ b/data/demo_buttons.png Binary files differdiff --git a/datasrc/content.py b/datasrc/content.py index a11988b4..92e71b96 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -368,7 +368,7 @@ container.sprites.Add(Sprite("browse_unpure", set_browseicons, 3,0,1,1)) container.sprites.Add(Sprite("demobutton_play", set_demobuttons, 0,0,1,1)) container.sprites.Add(Sprite("demobutton_pause", set_demobuttons, 1,0,1,1)) -container.sprites.Add(Sprite("demobutton_reset", set_demobuttons, 2,0,1,1)) +container.sprites.Add(Sprite("demobutton_stop", set_demobuttons, 2,0,1,1)) container.sprites.Add(Sprite("demobutton_slower", set_demobuttons, 3,0,1,1)) container.sprites.Add(Sprite("demobutton_faster", set_demobuttons, 4,0,1,1)) diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp index ef9ac62d..82be758d 100644 --- a/src/game/client/components/menus_demo.cpp +++ b/src/game/client/components/menus_demo.cpp @@ -59,6 +59,9 @@ void CMenus::RenderDemoPlayer(CUIRect MainView) CUIRect SeekBar, ButtonBar; + int CurrentTick = pInfo->m_CurrentTick - pInfo->m_FirstTick; + int TotalTicks = pInfo->m_LastTick - pInfo->m_FirstTick; + if(m_MenuActive) { MainView.HSplitTop(SeekBarHeight, &SeekBar, &ButtonBar); @@ -75,9 +78,6 @@ void CMenus::RenderDemoPlayer(CUIRect MainView) RenderTools()->DrawUIRect(&SeekBar, vec4(0,0,0,0.5f), CUI::CORNER_ALL, 5.0f); - int CurrentTick = pInfo->m_CurrentTick - pInfo->m_FirstTick; - int TotalTicks = pInfo->m_LastTick - pInfo->m_FirstTick; - float Amount = CurrentTick/(float)TotalTicks; CUIRect FilledBar = SeekBar; @@ -120,7 +120,12 @@ void CMenus::RenderDemoPlayer(CUIRect MainView) if(Inside) UI()->SetHotItem(id); } - + + if(CurrentTick == TotalTicks) + { + DemoPlayer()->Pause(); + DemoPlayer()->SetPos(0); + } if(m_MenuActive) { @@ -141,11 +146,14 @@ void CMenus::RenderDemoPlayer(CUIRect MainView) DemoPlayer()->Unpause(); } + // stop button + ButtonBar.VSplitLeft(Margins, 0, &ButtonBar); ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar); static int s_ResetButton = 0; - if(DoButton_DemoPlayer_Sprite(&s_ResetButton, SPRITE_DEMOBUTTON_RESET, false, &Button)) + if(DoButton_DemoPlayer_Sprite(&s_ResetButton, SPRITE_DEMOBUTTON_STOP, false, &Button)) { + DemoPlayer()->Pause(); DemoPlayer()->SetPos(0); } |
