Mercurial > mm7

changeset 1669:bd28d08e2c75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Tue, 17 Sep 2013 22:55:48 +0600
parents d17247968bd6 (diff) 466c5e15f524 (current diff)
children 014eb02bd0e6
files IndoorCamera.cpp IndoorCamera.h OutdoorCamera.cpp OutdoorCamera.h UI/UIMainMenu.cpp
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/UI/UIMainMenu.cpp	Tue Sep 17 18:39:32 2013 +0200
+++ b/UI/UIMainMenu.cpp	Tue Sep 17 22:55:48 2013 +0600
@@ -21,12 +21,8 @@
 //----- (0041B578) --------------------------------------------------------
 void MainMenuUI_LoadFontsAndSomeStuff()
 {
-  pIcons_LOD->SetupPalettes(pRenderer->uTargetRBits,
-                            pRenderer->uTargetGBits,
-                            pRenderer->uTargetBBits);
-  pPaletteManager->SetColorChannelInfo(pRenderer->uTargetRBits,
-                                       pRenderer->uTargetGBits,
-                                       pRenderer->uTargetBBits);
+  pIcons_LOD->SetupPalettes(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
+  pPaletteManager->SetColorChannelInfo(pRenderer->uTargetRBits, pRenderer->uTargetGBits, pRenderer->uTargetBBits);
   pPaletteManager->RecalculateAll();
 
   for (uint i = 0; i < 480; ++i)