From b062b333b1ec7f05773687a5235ab0793144293e Mon Sep 17 00:00:00 2001
From: nick <nick@a97b1542-0b21-0410-a459-e47997c36f34>
Date: Sun, 25 May 2008 20:53:00 +0000
Subject: [PATCH] Something

git-svn-id: http://svn.nickg.me.uk/work/lander@423 a97b1542-0b21-0410-a459-e47997c36f34
---
 data/images/landingpad.png    | Bin 303 -> 298 bytes
 data/images/landingpadred.png | Bin 320 -> 320 bytes
 src/ElectricGate.cpp          |   6 ++----
 src/Main.cpp                  |   2 +-
 src/ObjectGrid.hpp            |   2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/data/images/landingpad.png b/data/images/landingpad.png
index b2e97d166c07f454e8b694fe024d649b8fd1bd71..ab656b4e936a2f9393a4f426d165f731460a36da 100644
GIT binary patch
delta 226
zcmV<803H9Y0;&R#P=5?5C27}}0002INkl<ZNXPAz(G9~O3`7qpd(cfFo0!eKNz5i?
z68aGwB@t9jgy=`>F9J`#<B$XV>(|TZf{5}+VP-Y}FsZore)Q!tGaIuP7m*>#d%a0F
zMFjk$)!O0!04XH^fVFmguQ?Xjl}_<8pBIM^!e(MRSd)4q{aZc@-{H5jQbz*?w6@;(
zEPRJowrW75{5<OGyqP2D(J;_6>LxD^Ag&we8FiCawq`)1>=E_*DQG0{l_@B{#5{Tm
cL<G!iUT-bLY`79$<NyEw07*qoM6N<$f+pZ(MF0Q*

delta 231
zcmV<D02u$O0<Qv)P=5sgwi)!Y0002NNkl<ZNXPAz!3~2j3`L(M_DDA&Y+^R^CWKAO
zB<X>=q9~~fLg}UdmiWp3`jRaGs+s}pt^nkz2Vhwi073`=$S?yyTI<C5FrTNMaU20K
zGwD<{#~4W|y}*4VfA0sM;k_1P1jrp*J;4yljrW7k@Xos43}ASa-$#9%mtjV46$4jB
zUFA~`YGnggMqTBdEgA4AuZa5d7E}^wxdmkdKiC5CI{>V=pn<mY#4n+Lwo*z7GZXO-
hKgX?PX2M^80S~o8#)J!?u^|8e002ovPDHLkV1nU|W9t9_

diff --git a/data/images/landingpadred.png b/data/images/landingpadred.png
index 5cec34e681be94bc73e8bb30111b823d3ad1e74a..ecf993310b212578d7113e7d549050d8c89745c7 100644
GIT binary patch
delta 248
zcmV<U00;lT0>A>0P=5?1EZ>{F0002eNkl<ZNXPAz%MF7t5JaCP`Y@e9D#7k-J7MVr
zDsc{B30N2@2_lDNPyRf4W=C4Xzka=(EkX$CN?{Rk0F{ZiZF_a|Nkp7mi>vA-%4@yK
z4po&PBLGe60hp!<0Pj5jgS!Dx&tZ+T-&go1^~4w#6V=+8fpPgmw$Fv%;qA_9V_@kh
zduZt>6MmIfg>JsvHDFQZ(G7*Dn?lqjzVrUUhI-$?nNgScIvci)fwQ7M;s*sn!GJ~i
yY1Bu2lX@h^eFI;ag855KS4_dEPgYeC5qAe4HNuzn-pA<x0000<MNUMnLSTYV&~Xv~

delta 248
zcmV<U00;lT0>A>0P=5p+%mk?_0002eNkl<ZNXPAz!41MN3`L)%?$K`2FbVEvW|F#_
z&`H7tS0yw^pi(aUTau^v`%AU}sA>jKy8_VX5rBD~0chJ6fJsgObO`{i&f9#SM}}bl
zz|5pk)tpko-50R@D9&Z!PxyFCDFNh$m6nc*kCu*#!k_TLhH)MYM3iN8Qzh!Y67?&7
zk`rjRZD7x+Yka(I8rU=H8b3Lp6$26F9#L=c7l(5mvHKJ}8Tj@Tq}3E`8u-N&NbCUs
ycjpML>q%_FxI9Ykj+u$XMXckaWM;x&e*rhH4#cmf2JTA$0000<MNUMnLSTX+@Ns1T

diff --git a/src/ElectricGate.cpp b/src/ElectricGate.cpp
index 8ec54b0..6128e25 100644
--- a/src/ElectricGate.cpp
+++ b/src/ElectricGate.cpp
@@ -22,15 +22,13 @@
 Image *ElectricGate::gateImage = NULL;
 
 ElectricGate::ElectricGate(Viewport *v, int length, bool vertical, int x, int y)
-   : length(length), vertical(vertical), viewport(v)
+   : length(length), vertical(vertical), viewport(v),
+     StaticObject(x, y)
 {
    LOAD_ONCE {
       gateImage = new Image("images/gateway.png");
    }
    
-   xpos = x;
-   ypos = y;
-   
    timer = rand() % 70 + 10;
 }
 
diff --git a/src/Main.cpp b/src/Main.cpp
index 64c7906..5cb9416 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 #ifdef DEBUG_WINDOW 
    width = DEBUG_WIN_X;
    height = DEBUG_WIN_Y;
-   fullscreen = false;
+   fullscreen = true;
 #else
    // width = GetSystemMetrics(SM_CXSCREEN);
    // height = GetSystemMetrics(SM_CYSCREEN);
diff --git a/src/ObjectGrid.hpp b/src/ObjectGrid.hpp
index cd94d3a..f5dc795 100644
--- a/src/ObjectGrid.hpp
+++ b/src/ObjectGrid.hpp
@@ -47,7 +47,7 @@ private:
 
 class StaticObject {
 public:
-   StaticObject(int xpos, int ypos, int width, int height)
+   StaticObject(int xpos, int ypos, int width=1, int height=1)
       : xpos(xpos), ypos(ypos), width(width), height(height) {}
    StaticObject() { StaticObject(0, 0, 1, 1); }
 
-- 
2.39.2