Browse Source

Merge pull request #370 from Areloch/MiscBaseGameUIFixes

Misc. BaseGame UI fixes
Brian Roberts 4 years ago
parent
commit
72ee2260ca

+ 9 - 1
Engine/source/gui/controls/guiGameListMenuCtrl.cpp

@@ -391,7 +391,7 @@ void GuiGameListMenuCtrl::onRenderKeybindOption(Row* row, Point2I currentOffset)
    //drawer->drawBitmap(row->mBitmap, )
 
    Point2I button;
-   button.x = currentOffset.x + columnSplit + (columnSplit / 2)/* + (optionWidth / 2)*/;
+   button.x = currentOffset.x + columnSplit + (columnSplit / 2.5)/* + (optionWidth / 2)*/;
    button.y = currentOffset.y + (rowHeight / 4);
 
    Point2I buttonSize;
@@ -885,6 +885,14 @@ bool GuiGameListMenuCtrl::onKeyDown(const GuiEvent &event)
          changeRow(1);
          return true;
 
+      case KEY_LEFT:
+         changeOption(-1);
+         return true;
+
+      case KEY_RIGHT:
+         changeOption(1);
+         return true;
+
       case KEY_A:
       case KEY_RETURN:
       case KEY_NUMPADENTER:

+ 1 - 1
Templates/BaseGame/game/data/ui/guis/optionsMenu.gui

@@ -206,7 +206,7 @@
          willFirstRespond = "1";
          hScrollBar = "alwaysOff";
          vScrollBar = "dynamic";
-         lockHorizScroll = "0";
+         lockHorizScroll = "1";
          lockVertScroll = "0";
          constantThumbHeight = "0";
          childMargin = "0 0";

+ 11 - 2
Templates/BaseGame/game/data/ui/guis/pauseMenu.cs

@@ -7,7 +7,12 @@ function PauseMenuList::onAdd(%this)
 
 function PauseMenu::onWake(%this)
 {
-   $timescale = 0;
+   if($Server::ServerType $= "SinglePlayer")
+   {
+      $timescale = 0;
+      
+      sfxSetChannelVolume( $SimAudioType, $pref::SFX::channelVolume[ 0 ] );
+   }
    
    PauseMenuList.hidden = false;
    PauseMenuList.setFirstResponder();
@@ -17,7 +22,11 @@ function PauseMenu::onWake(%this)
 
 function PauseMenu::onSleep(%this)
 {
-   $timescale = 1;
+   if($Server::ServerType $= "SinglePlayer")
+   {
+      $timescale = 1;
+      sfxSetChannelVolume( $SimAudioType, $pref::SFX::channelVolume[ $SimAudioType ] );
+   }
 }
 
 function PauseMenu::onReturnTo(%this)