From acffe66ebe63f3ecc970db0feab33a6e85a7d1f4 Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Sun, 10 Feb 2008 01:48:39 +0000
Subject: [PATCH] flashified the console

---
 data/console.png               | Bin 0 -> 1314 bytes
 data/console_bar.png           | Bin 0 -> 1862 bytes
 datasrc/teewars.ds             |   7 +++++++
 src/engine/external/pa.c       |   6 +++++-
 src/game/client/gc_console.cpp |  15 +++++++++++++--
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 data/console.png
 create mode 100644 data/console_bar.png

diff --git a/data/console.png b/data/console.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2bb589bdfa1d87f74b8859446cba14f6bb8b33b
GIT binary patch
literal 1314
zcmV+-1>O3IP)<h;3K|Lk000e1NJLTq004jh002M;1^@s6($;@}00001b5ch_0Itp)
z=>Px(+(|@1RCwC$U0aW;Fc2O~p}>P+f|r;5;rsjcMU+Hr6sX+J6C304#>xOK{hl@^
zYdY;Ww{~WneSd$~aD}h0FPP0{paSZ;hM%7w(0B}T`$1Wj$_S^DEWHt+C<<kSQ%M$W
z0kj3s1keP~E<n40jzMofNYhjq;f9vQFbuG58!XELLI@a!0hCfO4CB{A6-5DMSwdA+
zaJgI{%d%cA7rkdTg%H3Pllt(55QDe?N-4Om3y$Nw+(Sw!P)hHvJxx<ck_6p~(MOsi
zI|2IEe#^38u~>AnZ;UZujDhd_AcTO!;Q*J*rC$R0zOM=J229fg&-1`_U6k)<jKOBJ
zfh0-bcsxR$=lBH3^IU2-AcW|Aqi!*q&A{_Kn9t|E$mF^%xULJFb2uK4P}en17SJG$
zV`;S?d+me}SglsQ9sV`u^Es?mD<Fj65<mz6Ns>r+_(_t05CYZYZ#J7jtz+XBOw+_8
zfUH&kbIrDG!+O2G8@UgWZLHU8ux%TU07X#%=Uke@=bWRZO{Qr=5Col>-mY9x5Ck7t
z0`iVVWmz`*!_Tq|P5TKUuv{)jb@*Ma?XCZcqG;6Dszp&i6h&y!{&Kk-h1q}R4wlR1
zpXxZ?B0yDDu;1^Ys;bcmkG(d}^Q1_J8Drpi9u5JTyMZW*Mn!_EsvwFYw4C2G%|TMV
zPg2CT@jxrbk!2Z#VK@qRP!t7(VTc-^{6(XNM%y*FjvVqlhwXMdXkeIS8Em&()Z0GG
zve2$~G2yx{SeAuHfX4LhcDq4RM9w+vb~|)ev{)=aR<v3BN1<&T$8b8G!1sN0ZAp>@
z;yCWb{ZLA!ehp=e0j2b<z4|z}X;QG}`LgSc6GA{7$Eer4_spp5XdaHx32=Q-VHkpG
zn&3FjTLlr%zAH^rNYfPkRqq}g$B~`@j^p%8fa@SJ&vW3MgJBrpIL>bw)U%SP=I=C3
z2QB6_3`6>2n8pnlhVgPQQLnekvV_y=B-O@!`nWPSS<dHk_gR3-Xp=&zAd4oz?S>FC
zDOofD?!*97l0_5X&K<y%WYGlB7C>XtF^}GY|5Mi~$)X8xgQ+#gY655rpmB{cmc3!h
zq6u&VtR~E{%7U8o%J>*0LkWDBvUE;>HqXJY`s0Uq4xZY4gw6=iWkJYoe|+BsAyb-<
z@G$`>rKlxgj4@cR*S(g6B}pRve1vx!dp{z8@B4%F$746G7DXZbe1vxu<xg3FO8xPV
za5x;K)&4eXZ@r66fBcY@Gq!Da)*t^Yg_3nXLYq{UwB2~s`s1JBcsxo+fVOKUZ8TrS
z{`hBTid$s?=e%{=Oy1pSRr}-L(WpLC&`$!tzgVodb}a~k(f7v(L4fkzbzQ@LzaRa4
zg#CX1r^#V23E=y_6s6L(ZKLJxD$hqCuQW@x{&*})rRsbH@=E(<1Lm4loR9F30E{td
z`{OZh@S6DuLk5OIh|cCC5S6sQueGZ*AAvr~`DO2qH%$}uDY>p|h~pT}=QHZC=mxzG
zi&mvQx{q3dCOGVJT>P!M?|oeSl=|bl!sT*-FbrG$V8pXSAM6Jsrq&;i5uJ0+f9E4e
z_meRyX#ce=L(V5C%M#A#^UEInA@N@pFtz5$se{~e0jfYHSu_DO0kjLyE<jrVZ2>yQ
YKe*`&YU7JK@Bjb+07*qoM6N<$f*!Sg8UO$Q

literal 0
HcmV?d00001

diff --git a/data/console_bar.png b/data/console_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..978007734e1f02a3198347950d939fcd7e6dde0d
GIT binary patch
literal 1862
zcmX9<d00~E9zJA|H4l+jD=*q*#uhCVEE6Wna6t|6=9=biqq$;6O;V;TR_^9ZnM-C)
z<euV^@|e4nqve`tu9&!{hL>_fLAVFzpL5Q0e$V@T@9%xz@AoCxU$TbnMeGFt07kfo
zcLV?k_z9RQL&4{oS8)^gg4}YnHV0TenhOB18zA7#obQYZcnfxF6!qQ0z<@a3wX5Nl
z@7?#OsM){?C27YG5MJL@E~*JEHM;ZpP&Aj8hfby>e)>;k*{*6+qcR)Y2JfJh&(BUe
zGwD-3sC%u;Jw2;A3E!tiqay;FSKwV#YW?P%I6LRAmClJ1!TCp#y6HQAG;N0bm7e)%
z0y2HSu6+JBIR{A<Ikllx{>=OauP8R7=BTIM&*@pxye{I~88zea=BMqNYW2S9<l-=K
zKjDN1os^lhY40kY@Lg`AG!IJ`bicUC5IsU(GM0Wm)3h3glsf;=u7RXAXnt^WJcyd%
zbW$yfYC1=HpGrYUh%^sFKOA~KpLvl45v>G^yEC<vJ#m11Gg?2wv^6<1*v+yc^CzU{
zfg|@udC{Ie7bL<$CN3D}+m7hv=n)KW=$p2?jg|Ek6{&CseL$ck%@ILAf<+CwK<94p
z+nF&{ORf~O>()Cstz_#-KfuO(SkVs{?5F{>QSRc{=*Judl@jR#EbzoZ)fIi%t>vNX
zR7~AUkr<<ZofNB10GQ7o9zGhc%?gD?vS!8`4gHgE=HoyvRk)WhQ#FD}WP<eA3PuE<
zORWnhD=Kxkmk^;tN_a#Q@dMwTo`lu27!r3~Wg!6&1{OW&y{?fX{i*Rml<fKpb>tQu
z6l+7f6f)of9behYj6g|hyx+`^8ztrHZu8@Chb4PL0e#r%G1&_|UYuIL^(z-Ni`$y}
z2h@HuWZ1>~{M;O8W1spqZ@%obf_R-s73|mO-th9><66eUvyxOp`9fY2?gU_yq?LZ`
z8b8ZZWR|KXT}Ye$MFBD1ENp~Cy&ZKrsvMPio=V}2l$X3;@6ZM*KcTs6v=Hx};#MV2
z>Y*C2zVVui5f>)6et=8zB-~MejlDN#15FA0-|ZQ@_Qs30KeM)xATFCWilC1j%vk)g
zuWODIXJt9tLZ09M&u&|VWe`%xYS*c3XEtNEATZ2A`UfLyQVE2;qPZjJZKa8!8CxU$
zXoTtjFKpS2B~R4vYj#AX;fnt3@XmxlvcBoYt|g&Tx!Sx94Yc1?mZm}X?|Wc3u~C`t
z<9RIXke}RoV{zd)aG~_y<oUA)REKsvfBRf_1E%ihxd6vW7QW>=D(&CNgw=SnSGi}H
zys+zR-DWVJ%hD4@^tzAqMg!cl?iwKD`V}kI1jf3yU#>e3mk;f$vgy(O+b=vWNx(vj
z_(S(;{jkZLA@j4>Ed5B+k60U77J=n+58lcFYm>RZD-HJ_ohKK3VNA2G_JFNWO+?y*
zz{jNat|a0+3@Yl&U*yuI2BQvnBFhiS@(?ZTfL>e1_ha*AIhRrkzRPp9)Q00j?bDFm
z?k+075u3$TYU0^ylNJR;TlPSsCH?qF*nT6n<ea45$z^H>Ss<H?^RbieF`{SfYqR&6
zrQG0K$Ha>Gs{3$q6PhO^sv%&ms<>%w8C0B<FHEt*v*qL(H`{qY>A}mM9wwZ0DnGu6
z9br78Xyq%CqI9L16Z*#8nN7A1Ghx%QzI_T=*1jTLl?-g22^VgH=ivm|Y;1@hKm?5$
zdQJ0$`Ff?GDY0HxH7EnOClH9$izgKfytmOLfN8pFnUf(n7FS|bUD(~d-i!u&9g%UM
zAm!c{*@vFg9-Qo&9slI9kxZ7yfNCQ483x=D{_Oe}@$u``^~1}Xu^?%2?ier;ZRj7F
zZ@|HP6ZYdq{?wHP=qj9!+`wT0O!?zmXSv}%ap&;KsZktIfbHJ#9SxPf&XKRrkY+ev
zYW*C+Gp^&g2B(S)TV-9)iW)*dc7!>;T9&EXl_eisd!&UJ`czEO%Q~$N%wnyK>e8_E
zJSA+vP$CRWloi8#iLbOh{59_g1>vkyPs#E?gZ~qt2A%owYnLJHRgHDRVsD{<B+p;g
z42=n?KGRX4NAM#yTkv{<Z220sI~9de$ndRc&hEh@B-abuzc`4cdG`e$L1hA;$ts~0
z)Q7!6r(Qo-g8$a)(8Pd)#Db;Puolw5*Eh4?pe|Yt4EJ+hr1CqlNU7~AE(BN#iF(XM
z1QMHHnM7EwYYfZXH2egP`yhj$>dKzZ_4iKaQGE<Q)KkUCaoYZu${yHdNTsh;vi^1*
z>dIjKJGXy0FJ|myyibQ_g^eZ@s0fyB1bZ%^mGK~hVrp@ugT3dkSTHjtwAmo6_`jqD
zpGF;>7C5b7E5AGC^jO6%EoP(Oy4K$ec(%qh2uNX2hHD&IJMO<hw3lC#1j|c!mbq`t
F{{h+5(ewZS

literal 0
HcmV?d00001

diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds
index 860700b49..ac3d37483 100644
--- a/datasrc/teewars.ds
+++ b/datasrc/teewars.ds
@@ -242,6 +242,13 @@ images {
 	browseicons {
 		filename "data/browse_icons.png"
 	}
+
+	console_bg {
+		filename "data/console.png"
+	}
+	console_bar {
+		filename "data/console_bar.png"
+	}
 }
 
 powerups {
diff --git a/src/engine/external/pa.c b/src/engine/external/pa.c
index 71afc0654..24b773c51 100644
--- a/src/engine/external/pa.c
+++ b/src/engine/external/pa.c
@@ -23,9 +23,13 @@
 		#include "portaudio/pa_ringbuffer.c"
 	#else
 		#define HAVE_SYS_SOUNDCARD_H
+		
 		#define PA_USE_ALSA
 		#include "portaudio/pa_linux_alsa.c"
-		//#include "portaudio/pa_unix_oss.c"
+		
+		/*#define PA_USE_OSS
+		#include "portaudio/pa_unix_oss.c" */
+		
 		#include "portaudio/pa_unix_hostapis.c"
 	#endif
 #elif defined(CONF_FAMILY_WINDOWS)
diff --git a/src/game/client/gc_console.cpp b/src/game/client/gc_console.cpp
index 4b70739f3..c04477a12 100644
--- a/src/game/client/gc_console.cpp
+++ b/src/game/client/gc_console.cpp
@@ -1,4 +1,5 @@
 #include "gc_console.h"
+#include "../generated/gc_data.h"
 
 extern "C" {
 	#include <engine/e_system.h>
@@ -262,12 +263,22 @@ void console_render()
 	gfx_mapscreen(screen.x, screen.y, screen.w, screen.h);
 
 
-    gfx_texture_set(-1);
+	gfx_texture_set(data->images[IMAGE_CONSOLE_BG].id);
     gfx_quads_begin();
-    gfx_setcolor(0.4,0.2,0.2,0.8);
+    gfx_setcolor(0.2f, 0.2f, 0.2f,0.8f);
+    gfx_quads_setsubset(0,-console_height*0.075f,screen.w*0.075f*0.5f,0);
     gfx_quads_drawTL(0,0,screen.w,console_height);
     gfx_quads_end();
 
+	gfx_texture_set(data->images[IMAGE_CONSOLE_BAR].id);
+    gfx_quads_begin();
+    gfx_setcolor(1.0f, 1.0f, 1.0f, 0.8f);
+    gfx_quads_setsubset(0,0.1f,screen.w*0.015f,1-0.1f);
+    gfx_quads_drawTL(0,console_height-10.0f,screen.w,10.0f);
+    gfx_quads_end();
+    
+    console_height -= 10.0f;
+
 	{
 		float font_size = 12.0f;
 		float row_height = font_size*1.4f;