edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

most gui things are now loaded by data compiler thingie. ingame menu now looks better.

Browse source
This commit is contained in:
Jakob Fries 2007-07-26 11:18:14 +00:00
parent 69581ebd27
commit f946cc6f5f
4 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
datasrc/teewars.ds
View file

@ -149,6 +149,26 @@ images {
backdrop {
filename "data/mountain_paralax.png"
}
gui_widgets {
filename "data/gui/gui_widgets.png"
}
menu_background {
filename "data/menu_background.png"
}
menu_butterfly {
filename "data/menu_butterfly.png"
}
cursor {
filename "data/gui/cursor.png"
}
banner {
filename "data/gui_logo.png"
}
cloud_1 {
filename "data/cloud-1.png"

13
src/game/client/game_client.cpp
View file

@ -1095,29 +1095,32 @@ void ingamemenu_render()
}
const int column1_x = 275;
const int row1_y = 250;
const int row1_y = 200;
const int row2_y = row1_y + 60;
const int row3_y = row2_y + 60;
gfx_blend_normal();
gfx_texture_set(-1);
gfx_quads_begin();
gfx_quads_setcolor(0,0,0,0.5f);
gfx_quads_drawTL(250, 225, 300, 160);
gfx_quads_drawTL(170, 120, 460, 300);
gfx_quads_end();
ui_do_image(data->images[IMAGE_BANNER].id, 214, 150, 384, 96);
if (ui_do_button(&menu_resume, "Resume Game", 0, column1_x, row1_y, 250, 48, draw_teewars_button))
if (ui_do_button(&menu_resume, "Resume Game", 0, column1_x, row2_y, 250, 48, draw_teewars_button))
{
menu_active = 0;
}
if (ui_do_button(&menu_quit, "Disconnect", 0, column1_x, row2_y, 250, 48, draw_teewars_button))
if (ui_do_button(&menu_quit, "Disconnect", 0, column1_x, row3_y, 250, 48, draw_teewars_button))
{
menu_active = 0;
main_client.disconnect();
}
gfx_texture_set(cursor_texture);
gfx_texture_set(data->images[IMAGE_CURSOR].id);
gfx_quads_begin();
gfx_quads_setcolor(1,1,1,1);
gfx_quads_drawTL(mx,my,24,24);

32
src/game/client/menu.cpp
View file

@ -41,12 +41,6 @@ enum gui_tileset_enum
tileset_inactive
};
int gui_tileset_texture;
int cursor_texture;
//int cloud1_texture, cloud2_texture, cloud3_texture;
int menu_background_texture;
int butterflies_texture;
void draw_area(gui_tileset_enum tileset, int areax, int areay, int areaw, int areah, float x, float y, float w, float h)
{
const float tex_w = 512.0, tex_h = 512.0;
@ -71,7 +65,7 @@ void draw_area(gui_tileset_enum tileset, int areax, int areay, int areaw, int ar
float te_y = (areay + areah) / tex_h;
gfx_blend_normal();
gfx_texture_set(gui_tileset_texture);
gfx_texture_set(data->images[IMAGE_GUI_WIDGETS].id);
gfx_quads_begin();
gfx_quads_setcolor(1,1,1,1);
gfx_quads_setsubset(
@ -192,7 +186,7 @@ void draw_background(float t)
gfx_quads_drawTL(4000 - fmod(t * 60, 4512), 300, 256, 256);
gfx_quads_end();
gfx_texture_set(menu_background_texture);
gfx_texture_set(data->images[IMAGE_MENU_BACKGROUND].id);
gfx_quads_begin();
gfx_quads_setcolor(1,1,1,1);
gfx_quads_setsubset(
@ -218,7 +212,7 @@ void draw_background(float t)
bool flip = angl > pi;
gfx_texture_set(butterflies_texture);
gfx_texture_set(data->images[IMAGE_MENU_BUTTERFLY].id);
gfx_quads_begin();
gfx_quads_setcolor(1, 1, 1, 1);
gfx_quads_setsubset(
@ -230,9 +224,6 @@ void draw_background(float t)
gfx_quads_end();
}
static int background_texture;
static int teewars_banner_texture;
static int music_menu;
static int music_menu_id = -1;
@ -735,12 +726,7 @@ static int main_render()
if (use_lan != last_lan)
client_serverbrowse_refresh(use_lan);
/*if (selected_index == -1)
{
ui_do_button(&join_button, "Join", 0, 620, 420, 128, 48, draw_teewars_button, (void *)1);
}
else */if (ui_do_button(&join_button, "Join", 0, 620, 420, 128, 48, draw_teewars_button))
if (ui_do_button(&join_button, "Join", 0, 620, 420, 128, 48, draw_teewars_button))
{
client_connect(address);
@ -1158,7 +1144,7 @@ static int menu_render()
if (screen != SCREEN_KERNING)
{
ui_do_image(teewars_banner_texture, 200, 20, 512, 128);
ui_do_image(data->images[IMAGE_BANNER].id, 200, 20, 512, 128);
ui_do_label(20.0f, 600.0f-40.0f, "Version: " TEEWARS_VERSION, 36);
}
@ -1181,12 +1167,6 @@ void modmenu_init()
// TODO: should be removed
current_font->font_texture = gfx_load_texture("data/big_font.png");
background_texture = gfx_load_texture("data/gui_bg.png");
gui_tileset_texture = gfx_load_texture("data/gui/gui_widgets.png");
teewars_banner_texture = gfx_load_texture("data/gui_logo.png");
cursor_texture = gfx_load_texture("data/gui/cursor.png");
menu_background_texture = gfx_load_texture("data/menu_background.png");
butterflies_texture = gfx_load_texture("data/menu_butterfly.png");
// TODO: should be removed
music_menu = snd_load_wav("data/audio/Music_Menu.wav");
@ -1236,7 +1216,7 @@ int modmenu_render()
// render butt ugly mouse cursor
// TODO: render nice cursor
gfx_texture_set(cursor_texture);
gfx_texture_set(data->images[IMAGE_CURSOR].id);
gfx_quads_begin();
gfx_quads_setcolor(1,1,1,1);
gfx_quads_drawTL(mx,my,24,24);

2
src/game/client/menu.h
View file

@ -1,8 +1,6 @@
#ifndef __MENU_H
#define __MENU_H
extern int cursor_texture;
void draw_image_button(void *id, const char *text, int checked, float x, float y, float w, float h, void *extra);
void draw_single_part_button(void *id, const char *text, int checked, float x, float y, float w, float h, void *extra);
void draw_menu_button(void *id, const char *text, int checked, float x, float y, float w, float h, void *extra);