Further improvements in UI porting

1 files changed, 168 insertions, 166 deletions

diff --git a/src/ui/group.cpp b/src/ui/group.cpp
index d2cd192..da0aa37 100644
--- a/src/ui/group.cpp
+++ b/src/ui/group.cpp
@@ -33,10 +33,11 @@
 
 
 
-
+namespace Ui {
 // Object's constructor.
 
-CGroup::CGroup(CInstanceManager* iMan) : CControl(iMan)
+//CGroup::CGroup(CInstanceManager* iMan) : CControl(iMan)
+CGroup::CGroup() : CControl()
 {
 }
 
@@ -93,16 +94,16 @@ void CGroup::Draw()
         DrawShadow(m_pos, m_dim);
     }
 
-    dp = 0.5f/256.0f;
+    dp = 0.5f / 256.0f;
 
     if ( m_icon == 0 )  // hollow frame?
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x = 160.0f/256.0f;
-        uv1.y = 192.0f/256.0f;  // u-v texture
-        uv2.x = 192.0f/256.0f;
-        uv2.y = 224.0f/256.0f;
+        uv1.x = 160.0f / 256.0f;
+        uv1.y = 192.0f / 256.0f;  // u-v texture
+        uv2.x = 192.0f / 256.0f;
+        uv2.y = 224.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -115,10 +116,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x = 104.0f/256.0f;
-        uv1.y =  48.0f/256.0f;
-        uv2.x = 112.0f/256.0f;
-        uv2.y =  64.0f/256.0f;
+        uv1.x = 104.0f / 256.0f;
+        uv1.y =  48.0f / 256.0f;
+        uv2.x = 112.0f / 256.0f;
+        uv2.y =  64.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -129,10 +130,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x = 112.0f/256.0f;
-        uv1.y =  48.0f/256.0f;
-        uv2.x = 120.0f/256.0f;
-        uv2.y =  64.0f/256.0f;
+        uv1.x = 112.0f / 256.0f;
+        uv1.y =  48.0f / 256.0f;
+        uv2.x = 120.0f / 256.0f;
+        uv2.y =  64.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -143,10 +144,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x = 120.0f/256.0f;
-        uv1.y =  48.0f/256.0f;
-        uv2.x = 128.0f/256.0f;
-        uv2.y =  64.0f/256.0f;
+        uv1.x = 120.0f / 256.0f;
+        uv1.y =  48.0f / 256.0f;
+        uv2.x = 128.0f / 256.0f;
+        uv2.y =  64.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -157,10 +158,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x = 192.0f/256.0f;
-        uv1.y = 128.0f/256.0f;
-        uv2.x = 224.0f/256.0f;
-        uv2.y = 160.0f/256.0f;
+        uv1.x = 192.0f / 256.0f;
+        uv1.y = 128.0f / 256.0f;
+        uv2.x = 224.0f / 256.0f;
+        uv2.y = 160.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -171,10 +172,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x = 224.0f/256.0f;
-        uv1.y = 128.0f/256.0f;
-        uv2.x = 256.0f/256.0f;
-        uv2.y = 160.0f/256.0f;
+        uv1.x = 224.0f / 256.0f;
+        uv1.y = 128.0f / 256.0f;
+        uv2.x = 256.0f / 256.0f;
+        uv2.y = 160.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -185,26 +186,26 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
-        uv1.x =   0.0f/256.0f;  // brown transparent
-        uv1.y =  75.0f/256.0f;
-        uv2.x =  64.0f/256.0f;
-        uv2.y = 128.0f/256.0f;
+        uv1.x =   0.0f / 256.0f;  // brown transparent
+        uv1.y =  75.0f / 256.0f;
+        uv2.x =  64.0f / 256.0f;
+        uv2.y = 128.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
         uv2.y -= dp;
-        corner.x = 4.0f/640.0f;
-        corner.y = 4.0f/480.0f;
+        corner.x = 4.0f / 640.0f;
+        corner.y = 4.0f / 480.0f;
         DrawIcon(m_pos, m_dim, uv1, uv2, corner, 8.0f/256.0f);
     }
     if ( m_icon == 7 )
     {
         m_engine->SetTexture("button1.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =  64.0f/256.0f;
-        uv1.y =   0.0f/256.0f;
-        uv2.x =  96.0f/256.0f;
-        uv2.y =  32.0f/256.0f;
+        uv1.x =  64.0f / 256.0f;
+        uv1.y =   0.0f / 256.0f;
+        uv2.x =  96.0f / 256.0f;
+        uv2.y =  32.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -215,10 +216,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
-        uv1.x =  64.0f/256.0f;  // green transparent
-        uv1.y = 160.0f/256.0f;
-        uv2.x = 160.0f/256.0f;
-        uv2.y = 176.0f/256.0f;
+        uv1.x =  64.0f / 256.0f;  // green transparent
+        uv1.y = 160.0f / 256.0f;
+        uv2.x = 160.0f / 256.0f;
+        uv2.y = 176.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -229,7 +230,7 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
-        uv1.x =  64.0f/256.0f;  // red transparent
+        uv1.x =  64.0f / 256.0f;  // red transparent
         uv1.y = 176.0f/256.0f;
         uv2.x = 160.0f/256.0f;
         uv2.y = 192.0f/256.0f;
@@ -243,10 +244,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
-        uv1.x =  64.0f/256.0f;  // blue transparent
-        uv1.y = 192.0f/256.0f;
-        uv2.x = 160.0f/256.0f;
-        uv2.y = 208.0f/256.0f;
+        uv1.x =  64.0f / 256.0f;  // blue transparent
+        uv1.y = 192.0f / 256.0f;
+        uv2.x = 160.0f / 256.0f;
+        uv2.y = 208.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -257,10 +258,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
-        uv1.x =  64.0f/256.0f;  // yellow transparent
-        uv1.y = 224.0f/256.0f;
-        uv2.x = 160.0f/256.0f;
-        uv2.y = 240.0f/256.0f;
+        uv1.x =  64.0f / 256.0f;  // yellow transparent
+        uv1.y = 224.0f / 256.0f;
+        uv2.x = 160.0f / 256.0f;
+        uv2.y = 240.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -269,17 +270,17 @@ void CGroup::Draw()
     }
     if ( m_icon == 12 )  // viewfinder cross?
     {
-        dim.x = m_dim.x/2.0f;
-        dim.y = m_dim.y/2.0f;
+        dim.x = m_dim.x / 2.0f;
+        dim.y = m_dim.y / 2.0f;
 
         m_engine->SetTexture("mouse.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
         pos.x = m_pos.x-m_dim.x/300.0f;
         pos.y = m_pos.y+m_dim.y/300.0f+dim.y;
-        uv1.x =   0.5f/256.0f;
-        uv1.y = 192.5f/256.0f;
-        uv2.x =  63.5f/256.0f;
-        uv2.y = 255.5f/256.0f;
+        uv1.x =   0.5f / 256.0f;
+        uv1.y = 192.5f / 256.0f;
+        uv2.x =  63.5f / 256.0f;
+        uv2.y = 255.5f / 256.0f;
         DrawIcon(pos, dim, uv1, uv2);  // ul
         pos.x += dim.x;
         Math::Swap(uv1.x, uv2.x);
@@ -294,10 +295,10 @@ void CGroup::Draw()
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
         pos.x = m_pos.x+m_dim.x/300.0f;
         pos.y = m_pos.y-m_dim.y/300.0f+dim.y;
-        uv1.x =  64.5f/256.0f;
-        uv1.y = 192.5f/256.0f;
-        uv2.x = 127.5f/256.0f;
-        uv2.y = 255.5f/256.0f;
+        uv1.x =  64.5f / 256.0f;
+        uv1.y = 192.5f / 256.0f;
+        uv2.x = 127.5f / 256.0f;
+        uv2.y = 255.5f / 256.0f;
         DrawIcon(pos, dim, uv1, uv2);  // ul
         pos.x += dim.x;
         Math::Swap(uv1.x, uv2.x);
@@ -315,19 +316,19 @@ void CGroup::Draw()
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
         pos.x = m_pos.x-m_dim.x/150.0f;
         pos.y = m_pos.y+m_dim.y/150.0f;
-        uv1.x = 128.5f/256.0f;
-        uv1.y = 192.5f/256.0f;
-        uv2.x = 191.5f/256.0f;
-        uv2.y = 255.5f/256.0f;
+        uv1.x = 128.5f / 256.0f;
+        uv1.y = 192.5f / 256.0f;
+        uv2.x = 191.5f / 256.0f;
+        uv2.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
 
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
         pos.x = m_pos.x+m_dim.x/150.0f;
         pos.y = m_pos.y-m_dim.y/150.0f;
-        uv1.x = 192.5f/256.0f;
-        uv1.y = 192.5f/256.0f;
-        uv2.x = 255.5f/256.0f;
-        uv2.y = 255.5f/256.0f;
+        uv1.x = 192.5f / 256.0f;
+        uv1.y = 192.5f / 256.0f;
+        uv2.x = 255.5f / 256.0f;
+        uv2.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
     }
     if ( m_icon == 14 )  // corner upper / right?
@@ -336,19 +337,19 @@ void CGroup::Draw()
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
         pos.x = m_pos.x-m_dim.x/150.0f;
         pos.y = m_pos.y+m_dim.y/150.0f;
-        uv2.x = 128.5f/256.0f;
-        uv1.y = 192.5f/256.0f;
-        uv1.x = 191.5f/256.0f;
-        uv2.y = 255.5f/256.0f;
+        uv2.x = 128.5f / 256.0f;
+        uv1.y = 192.5f / 256.0f;
+        uv1.x = 191.5f / 256.0f;
+        uv2.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
 
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
         pos.x = m_pos.x+m_dim.x/150.0f;
         pos.y = m_pos.y-m_dim.y/150.0f;
-        uv2.x = 192.5f/256.0f;
-        uv1.y = 192.5f/256.0f;
-        uv1.x = 255.5f/256.0f;
-        uv2.y = 255.5f/256.0f;
+        uv2.x = 192.5f / 256.0f;
+        uv1.y = 192.5f / 256.0f;
+        uv1.x = 255.5f / 256.0f;
+        uv2.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
     }
     if ( m_icon == 15 )  // corner lower / left?
@@ -357,19 +358,19 @@ void CGroup::Draw()
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
         pos.x = m_pos.x-m_dim.x/150.0f;
         pos.y = m_pos.y+m_dim.y/150.0f;
-        uv1.x = 128.5f/256.0f;
-        uv2.y = 192.5f/256.0f;
-        uv2.x = 191.5f/256.0f;
-        uv1.y = 255.5f/256.0f;
+        uv1.x = 128.5f / 256.0f;
+        uv2.y = 192.5f / 256.0f;
+        uv2.x = 191.5f / 256.0f;
+        uv1.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
 
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
         pos.x = m_pos.x+m_dim.x/150.0f;
         pos.y = m_pos.y-m_dim.y/150.0f;
-        uv1.x = 192.5f/256.0f;
-        uv2.y = 192.5f/256.0f;
-        uv2.x = 255.5f/256.0f;
-        uv1.y = 255.5f/256.0f;
+        uv1.x = 192.5f / 256.0f;
+        uv2.y = 192.5f / 256.0f;
+        uv2.x = 255.5f / 256.0f;
+        uv1.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
     }
     if ( m_icon == 16 )  // corner lower / left?
@@ -378,45 +379,45 @@ void CGroup::Draw()
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
         pos.x = m_pos.x-m_dim.x/150.0f;
         pos.y = m_pos.y+m_dim.y/150.0f;
-        uv2.x = 128.5f/256.0f;
-        uv2.y = 192.5f/256.0f;
-        uv1.x = 191.5f/256.0f;
-        uv1.y = 255.5f/256.0f;
+        uv2.x = 128.5f / 256.0f;
+        uv2.y = 192.5f / 256.0f;
+        uv1.x = 191.5f / 256.0f;
+        uv1.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
 
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
         pos.x = m_pos.x+m_dim.x/150.0f;
         pos.y = m_pos.y-m_dim.y/150.0f;
-        uv2.x = 192.5f/256.0f;
-        uv2.y = 192.5f/256.0f;
-        uv1.x = 255.5f/256.0f;
-        uv1.y = 255.5f/256.0f;
+        uv2.x = 192.5f / 256.0f;
+        uv2.y = 192.5f / 256.0f;
+        uv1.x = 255.5f / 256.0f;
+        uv1.y = 255.5f / 256.0f;
         DrawIcon(pos, m_dim, uv1, uv2);
     }
     if ( m_icon == 17 )
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =   0.0f/256.0f;  // blue frame
-        uv1.y =  75.0f/256.0f;
-        uv2.x =  64.0f/256.0f;
-        uv2.y = 128.0f/256.0f;
+        uv1.x =   0.0f / 256.0f;  // blue frame
+        uv1.y =  75.0f / 256.0f;
+        uv2.x =  64.0f / 256.0f;
+        uv2.y = 128.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
         uv2.y -= dp;
-        corner.x = 6.0f/640.0f;
-        corner.y = 6.0f/480.0f;
+        corner.x = 6.0f / 640.0f;
+        corner.y = 6.0f / 480.0f;
         DrawIcon(m_pos, m_dim, uv1, uv2, corner, 2.0f/256.0f);
     }
     if ( m_icon == 18 )  // arrow> for SatCom?
     {
         m_engine->SetTexture("button1.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x =   0.0f/256.0f;  // >
-        uv1.y = 192.0f/256.0f;
-        uv2.x =  32.0f/256.0f;
-        uv2.y = 224.0f/256.0f;
+        uv1.x =   0.0f / 256.0f;   // >
+        uv1.y = 192.0f / 256.0f;
+        uv2.x =  32.0f / 256.0f;
+        uv2.y = 224.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -427,10 +428,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button1.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x = 224.0f/256.0f;  // SatCom symbol
-        uv1.y = 224.0f/256.0f;
-        uv2.x = 256.0f/256.0f;
-        uv2.y = 256.0f/256.0f;
+        uv1.x = 224.0f / 256.0f;  // SatCom symbol
+        uv1.y = 224.0f / 256.0f;
+        uv2.x = 256.0f / 256.0f;
+        uv2.y = 256.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -441,10 +442,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button1.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x = 224.0f/256.0f;
-        uv1.y =  32.0f/256.0f;
-        uv2.x = 256.0f/256.0f;
-        uv2.y =  64.0f/256.0f;
+        uv1.x = 224.0f / 256.0f;
+        uv1.y =  32.0f / 256.0f;
+        uv2.x = 256.0f / 256.0f;
+        uv2.y =  64.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -455,10 +456,10 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE);
-        uv1.x = 160.0f/256.0f;
-        uv1.y =  32.0f/256.0f;
-        uv2.x = 192.0f/256.0f;
-        uv2.y =  64.0f/256.0f;
+        uv1.x = 160.0f / 256.0f;
+        uv1.y =  32.0f / 256.0f;
+        uv2.x = 192.0f / 256.0f;
+        uv2.y =  64.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -469,16 +470,16 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =  64.0f/256.0f;  // opaque yellow
-        uv1.y = 224.0f/256.0f;
-        uv2.x = 160.0f/256.0f;
-        uv2.y = 240.0f/256.0f;
+        uv1.x =  64.0f / 256.0f;  // opaque yellow
+        uv1.y = 224.0f / 256.0f;
+        uv2.x = 160.0f / 256.0f;
+        uv2.y = 240.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
         uv2.y -= dp;
-        corner.x = 5.0f/640.0f;
-        corner.y = 5.0f/480.0f;
+        corner.x = 5.0f / 640.0f;
+        corner.y = 5.0f / 480.0f;
         DrawIcon(m_pos, m_dim, uv1, uv2, corner, 3.0f/256.0f);
     }
 
@@ -486,74 +487,74 @@ void CGroup::Draw()
     {
         m_engine->SetTexture("button3.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =  64.0f/256.0f;  // yellow
-        uv1.y = 192.0f/256.0f;
-        uv2.x =  80.0f/256.0f;
-        uv2.y = 208.0f/256.0f;
+        uv1.x =  64.0f / 256.0f;  // yellow
+        uv1.y = 192.0f / 256.0f;
+        uv2.x =  80.0f / 256.0f;
+        uv2.y = 208.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
         uv2.y -= dp;
-        corner.x = 4.0f/640.0f;
-        corner.y = 4.0f/480.0f;
+        corner.x = 4.0f / 640.0f;
+        corner.y = 4.0f / 480.0f;
         DrawIcon(m_pos, m_dim, uv1, uv2, corner, 2.0f/256.0f);
     }
     if ( m_icon == 24 )
     {
         m_engine->SetTexture("button3.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =  80.0f/256.0f;  // orange
-        uv1.y = 192.0f/256.0f;
-        uv2.x =  96.0f/256.0f;
-        uv2.y = 208.0f/256.0f;
+        uv1.x =  80.0f / 256.0f;  // orange
+        uv1.y = 192.0f / 256.0f;
+        uv2.x =  96.0f / 256.0f;
+        uv2.y = 208.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
         uv2.y -= dp;
-        corner.x = 4.0f/640.0f;
-        corner.y = 4.0f/480.0f;
+        corner.x = 4.0f / 640.0f;
+        corner.y = 4.0f / 480.0f;
         DrawIcon(m_pos, m_dim, uv1, uv2, corner, 2.0f/256.0f);
     }
     if ( m_icon == 25 )
     {
         m_engine->SetTexture("button3.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =  64.0f/256.0f;  // orange
-        uv1.y = 208.0f/256.0f;
-        uv2.x =  80.0f/256.0f;
-        uv2.y = 224.0f/256.0f;
+        uv1.x =  64.0f / 256.0f;  // orange
+        uv1.y = 208.0f / 256.0f;
+        uv2.x =  80.0f / 256.0f;
+        uv2.y = 224.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
         uv2.y -= dp;
-        corner.x = 4.0f/640.0f;
-        corner.y = 4.0f/480.0f;
+        corner.x = 4.0f / 640.0f;
+        corner.y = 4.0f / 480.0f;
         DrawIcon(m_pos, m_dim, uv1, uv2, corner, 2.0f/256.0f);
     }
     if ( m_icon == 26 )
     {
         m_engine->SetTexture("button3.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =  80.0f/256.0f;  // red
-        uv1.y = 208.0f/256.0f;
-        uv2.x =  96.0f/256.0f;
-        uv2.y = 224.0f/256.0f;
+        uv1.x =  80.0f / 256.0f;   // red
+        uv1.y = 208.0f / 256.0f;
+        uv2.x =  96.0f / 256.0f;
+        uv2.y = 224.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
         uv2.y -= dp;
-        corner.x = 4.0f/640.0f;
-        corner.y = 4.0f/480.0f;
+        corner.x = 4.0f / 640.0f;
+        corner.y = 4.0f / 480.0f;
         DrawIcon(m_pos, m_dim, uv1, uv2, corner, 2.0f/256.0f);
     }
     if ( m_icon == 27 )
     {
         m_engine->SetTexture("button3.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x =  32.0f/256.0f;
-        uv1.y =   0.0f/256.0f;
-        uv2.x =  64.0f/256.0f;
-        uv2.y =  32.0f/256.0f;
+        uv1.x =  32.0f / 256.0f;
+        uv1.y =   0.0f / 256.0f;
+        uv2.x =  64.0f / 256.0f;
+        uv2.y =  32.0f / 256.0f;
         uv1.x += dp;
         uv1.y += dp;
         uv2.x -= dp;
@@ -568,8 +569,8 @@ void CGroup::Draw()
 
         m_engine->SetTexture("button2.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        uv1.x = 32.0f/256.0f;
-        uv1.y = 32.0f/256.0f;
+        uv1.x = 32.0f / 256.0f;
+        uv1.y = 32.0f / 256.0f;
         uv2.x = uv1.x+32.0f/256.0f;
         uv2.y = uv1.y+32.0f/256.0f;
         uv1.x += dp;
@@ -580,12 +581,12 @@ void CGroup::Draw()
 
         m_engine->SetTexture("button3.tga");
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        pos.x +=  8.0f/640.0f;
-        pos.y +=  8.0f/480.0f;
-        dim.x -= 16.0f/640.0f;
-        dim.y -= 16.0f/480.0f;
-        uv1.x = 32.0f/256.0f;
-        uv1.y =  0.0f/256.0f;
+        pos.x +=  8.0f / 640.0f;
+        pos.y +=  8.0f / 480.0f;
+        dim.x -= 16.0f / 640.0f;
+        dim.y -= 16.0f / 480.0f;
+        uv1.x = 32.0f / 256.0f;
+        uv1.y =  0.0f / 256.0f;
         uv2.x = uv1.x+32.0f/256.0f;
         uv2.y = uv1.y+32.0f/256.0f;
         uv1.x += dp;
@@ -595,12 +596,12 @@ void CGroup::Draw()
         DrawIcon(pos, dim, uv1, uv2);
 
         m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
-        pos.x += 2.0f/640.0f;
-        pos.y += 2.0f/480.0f;
-        dim.x -= 4.0f/640.0f;
-        dim.y -= 4.0f/480.0f;
-        uv1.x = 0.0f/256.0f;
-        uv1.y = 0.0f/256.0f;
+        pos.x += 2.0f / 640.0f;
+        pos.y += 2.0f / 480.0f;
+        dim.x -= 4.0f / 640.0f;
+        dim.y -= 4.0f / 480.0f;
+        uv1.x = 0.0f / 256.0f;
+        uv1.y = 0.0f / 256.0f;
         uv2.x = uv1.x+32.0f/256.0f;
         uv2.y = uv1.y+32.0f/256.0f;
         uv1.x += dp;
@@ -610,10 +611,10 @@ void CGroup::Draw()
         DrawIcon(pos, dim, uv1, uv2);
 
         m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK);
-        pos.x +=  8.0f/640.0f;
-        pos.y +=  8.0f/480.0f;
-        dim.x -= 16.0f/640.0f;
-        dim.y -= 16.0f/480.0f;
+        pos.x +=  8.0f / 640.0f;
+        pos.y +=  8.0f / 480.0f;
+        dim.x -= 16.0f / 640.0f;
+        dim.y -= 16.0f / 480.0f;
         if ( m_icon == 100 )  icon = 43;  // base ?
         if ( m_icon == 101 )  icon = 32;  // factory ?
         if ( m_icon == 102 )  icon = 35;  // research ?
@@ -643,3 +644,4 @@ void CGroup::Draw()
 }
 
 
+}