From 7f0918cc1eaecdb74e388a5b16e6937028f47c35 Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Sun, 21 Jan 2018 12:16:03 +0000
Subject: [PATCH] [Change] Increase UI resolution to 800x600.

---
 icons/cpanel.png      | Bin 2383 -> 2465 bytes
 src/main.cpp          |   4 ++--
 src/sbre/brender.cpp  |   2 --
 src/space_station.cpp |   2 +-
 src/view.h            |   6 +++---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/icons/cpanel.png b/icons/cpanel.png
index fab6461cf4941f6b5f6016b47d2d7f9045670649..8ba12f16c1a324ab3d4bc557fe4d0b063b8da30f 100644
GIT binary patch
literal 2465
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
V)(2h|aSj>+YYThx%46PF{s;B{RJ;HH

delta 2342
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
Yp)c#@>H2X(8rBB5<2GjH$2{Wx2F?~j+5i9m

diff --git a/src/main.cpp b/src/main.cpp
index fe94878..af21a43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -233,7 +233,7 @@ void L3D::MainLoop(void) {
   station->SetPosition(vector3d(0,0,0));
   Space::AddBody(station);
 
-  SpaceStation* station2 = new SpaceStation(SpaceStation::GROUND_FLAVOURED);;
+  SpaceStation* station2 = new SpaceStation(SpaceStation::GROUND_FLAVOURED);
   station2->SetLabel("Dfighter's point");
   station2->SetFrame(*pframe->m_children.begin()); /* Rotating frame of planet. */
   station2->OrientOnSurface(EARTH_RADIUS, M_PI/4, M_PI/4);
@@ -245,7 +245,7 @@ void L3D::MainLoop(void) {
   //player->SetPosition(vector3d(0,0,2000));
   //player->SetFrame(pframe);
 
-  Gui::Init(scrWidth, scrHeight, 640, 480);
+  Gui::Init(scrWidth, scrHeight, 800, 600);
 
   cpan = new ShipCpanel();
   cpan->ShowAll();
diff --git a/src/sbre/brender.cpp b/src/sbre/brender.cpp
index e54f0ef..f4148d5 100644
--- a/src/sbre/brender.cpp
+++ b/src/sbre/brender.cpp
@@ -256,9 +256,7 @@ void sbreGenCollMesh(CollMesh* pCMesh, int model, ObjParams* pParam, float s) {
 void GenCollMeshInternal(Vector* pPos, Matrix* pOrient, int model, ObjParams* pParam,
                           float s, CollMesh* pCMesh) {
   Model* pModel = ppModel[model];
-
   Vector* pVtx = (Vector*)alloca(sizeof(Vector)*(pModel->cvStart+pModel->numCVtx));
-  
   ResolveVertices(pModel, pVtx, pParam);
 #if 0
   for(int i = 6; i < pModel->cvStart+pModel->numCVtx; i++) {
diff --git a/src/space_station.cpp b/src/space_station.cpp
index 6cbdb45..acbbc6d 100644
--- a/src/space_station.cpp
+++ b/src/space_station.cpp
@@ -111,7 +111,7 @@ void SpaceStation::OrientLaunchingShip(Ship* ship) const {
   const int dockMethod = stationTypes[m_type].dockMethod;
   if(dockMethod == SpaceStationType::ORBITAL) {
     /*
-     * Position ship in middle of docking bat, pointing out of it.
+     * Position ship in middle of docking bay, pointing out of it.
      * TODO: Need to do forced thrusting thing.
      * TODO: ang vel not zeroed for some reason..
      */
diff --git a/src/view.h b/src/view.h
index 3f743a2..896bb63 100644
--- a/src/view.h
+++ b/src/view.h
@@ -11,16 +11,16 @@
  */
  class View : public Gui::Fixed {
  public:
-  View(void) : Gui::Fixed(640, 416) {
+  View(void) : Gui::Fixed(Gui::Screen::GetWidth(), Gui::Screen::GetHeight()-64) {
     Gui::Screen::AddBaseWidget(this, 0, 64);
 
     m_rightButtonBar = new Gui::Fixed(128, 26);
     m_rightButtonBar->SetBgColor(.65, .65, .65);
-    Gui::Screen::AddBaseWidget(m_rightButtonBar, 512, 0);
+    Gui::Screen::AddBaseWidget(m_rightButtonBar, Gui::Screen::GetWidth()-128, 0);
 
     m_rightRegion2 = new Gui::Fixed(122, 17);
     m_rightRegion2->SetTransparency(true);
-    Gui::Screen::AddBaseWidget(m_rightRegion2, 517, 26);
+    Gui::Screen::AddBaseWidget(m_rightRegion2, Gui::Screen::GetWidth()-123, 26);
   }
   virtual ~View(void) { delete m_rightButtonBar; delete m_rightRegion2; }
   virtual void ShowAll(void) {