diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-02-10 01:48:39 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-02-10 01:48:39 +0000 |
| commit | acffe66ebe63f3ecc970db0feab33a6e85a7d1f4 (patch) | |
| tree | f25c93e1d1d2266eaf1631a4217d3035e812ea09 /src | |
| parent | e1acdb8f10d0e7be2e9617af3daa39290c58dfd3 (diff) | |
| download | zcatch-acffe66ebe63f3ecc970db0feab33a6e85a7d1f4.tar.gz zcatch-acffe66ebe63f3ecc970db0feab33a6e85a7d1f4.zip | |
flashified the console
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/external/pa.c | 6 | ||||
| -rw-r--r-- | src/game/client/gc_console.cpp | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/engine/external/pa.c b/src/engine/external/pa.c index 71afc065..24b773c5 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 4b70739f..c04477a1 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; |