diff options
| author |  chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb>
| 2014-02-10 15:08:58 +0000 |
|---|---|---|
| committer | chirs241097@gmail.com <chirs241097@gmail.com@c17bf020-1265-9734-9302-a83f62007ddb>
| 2014-02-10 15:08:58 +0000 |
| commit | 2748b33cd1330cc3da99ed62cd17859342079773 (patch) | |
| tree | 33648bb32ec69cbd3cefed430f6ce25890e7a47f /background.h | |
| parent | aa24dc151df4249483f9c46e0f11e47296a0e42a (diff) | |
| download | bullet-lab-remix-2748b33cd1330cc3da99ed62cd17859342079773.tar.xz | |
M resources/b_inter.png
M trunk/CHANGELOG.TXT
M trunk/VERSION.TXT
M trunk/background.h
M trunk/levels.h
M trunk/main.cpp
M trunk/menus.h
Diffstat (limited to 'background.h')
| -rw-r--r-- | background.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/background.h b/background.h index 718b42c..62c8424 100644 --- a/background.h +++ b/background.h @@ -216,7 +216,7 @@ private: public: bool Init() { - skyitem=hge->Texture_Load("e_skyitem.png"); + skyitem=hge->Texture_Load("./Resources/e_skyitem.png"); if(!skyitem) return false; sky=new hgeSprite(0, 0, 0, ScreenWidth, ScreenHeight); sea=new hgeDistortionMesh(SeaDisize, SeaDisize); @@ -457,13 +457,16 @@ public: } }; TDSky sky; +bool skyactive; DWORD ColorTransfer(DWORD a,DWORD t) { - int r=GETR(a),g=GETG(a),b=GETB(a); - int tr=GETR(t),tg=GETG(t),tb=GETB(t); + int r=GETR(a),g=GETG(a),b=GETB(a),sa=GETA(a); + int tr=GETR(t),tg=GETG(t),tb=GETB(t),ta=GETA(t); + if (sa<ta)++sa;if (sa>ta)--sa; if (r<tr)++r;if (r>tr)--r; if (g<tg)++g;if (g>tg)--g; if (b<tb)++b;if (b>tb)--b; - a=SETR(a,r);a=SETG(a,g);a=SETB(a,b); + a=SETR(a,r);a=SETG(a,g);a=SETB(a,b);a=SETA(a,sa); + return a; } |