diff options
| author | Jakob Fries <jakob.fries@gmail.com> | 2008-02-02 11:08:31 +0000 |
|---|---|---|
| committer | Jakob Fries <jakob.fries@gmail.com> | 2008-02-02 11:08:31 +0000 |
| commit | e2de77ea14d131ac4a92ed2f947d7b34715886fa (patch) | |
| tree | 492511ccb7357ed7a156e496274f8bdafd353c25 | |
| parent | aaf75f52391509f2efa7d1df2178f36898a563ea (diff) | |
| download | zcatch-e2de77ea14d131ac4a92ed2f947d7b34715886fa.tar.gz zcatch-e2de77ea14d131ac4a92ed2f947d7b34715886fa.zip | |
should compile on windows now
| -rw-r--r-- | src/engine/client/ec_gfx.c | 1 | ||||
| -rw-r--r-- | src/game/client/gc_console.cpp | 8 | ||||
| -rw-r--r-- | src/game/client/gc_menu.cpp | 20 |
3 files changed, 7 insertions, 22 deletions
diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c index c13b7c7e..7d39fdff 100644 --- a/src/engine/client/ec_gfx.c +++ b/src/engine/client/ec_gfx.c @@ -17,6 +17,7 @@ /* compressed textures */ #define GL_COMPRESSED_RGB_ARB 0x84ED #define GL_COMPRESSED_RGBA_ARB 0x84EE +#define GL_COMPRESSED_ALPHA_ARB 0x84E9 #define TEXTURE_MAX_ANISOTROPY_EXT 0x84FE diff --git a/src/game/client/gc_console.cpp b/src/game/client/gc_console.cpp index 2eb4dc52..f6e881df 100644 --- a/src/game/client/gc_console.cpp +++ b/src/game/client/gc_console.cpp @@ -16,6 +16,10 @@ extern "C" { #include "../g_version.h" +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + enum { CONSOLE_CLOSED, @@ -28,7 +32,7 @@ static unsigned int console_input_len = 0; static char console_input[256] = {0}; static int console_state = CONSOLE_CLOSED; static float state_change_end = 0.0f; -static const float state_change_duration = 0.2f; +static const float state_change_duration = 0.1f; static char backlog[256][256] = {{0}}; static int backlog_len; @@ -175,7 +179,7 @@ void console_toggle() static float console_scale_func(float t) { //return t; - return cosf((1.0f-t)*M_PI*0.5f); + return sinf(acosf(1.0f-t)); } void console_render() diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp index 6b982c37..fb39f85f 100644 --- a/src/game/client/gc_menu.cpp +++ b/src/game/client/gc_menu.cpp @@ -557,8 +557,6 @@ static void menu2_render_background() } } -extern "C" void *gfx_font_set; - void render_loading(float percent) { // need up date this here to get correct @@ -1743,24 +1741,6 @@ int menu2_render() RECT screen = *ui_screen(); gfx_mapscreen(screen.x, screen.y, screen.w, screen.h); - if (0) - { - gfx_clear(0.65f,0.78f,0.9f); - - - for (int i = 0; i < 24; i++) - { - float size = i * 0.5 + 8; - char temp[64]; - sprintf(temp, "%f: Ingen tomte i jul", size); - gfx_text(0, 50, 10 + i*int(size), size, temp, -1); - gfx_text(gfx_font_set, 400, 10 + i*int(size), size, temp, -1); - } - - return 0; - } - - static bool first = true; if(first) { |