edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed rendering error with the katana and hook. made the rcon more verbose about entering password

Browse source
This commit is contained in:
Magnus Auvinen 2008-03-23 13:51:11 +00:00
parent 35aaf25a32
commit d3395a8e0a
3 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/game/client/gc_console.cpp
View file

@ -572,10 +572,15 @@ void console_render()
const char *prompt = "> ";
if(console_type)
{
if(client_rcon_authed())
prompt = "rcon> ";
if(client_state() == CLIENTSTATE_ONLINE)
{
if(client_rcon_authed())
prompt = "rcon> ";
else
prompt = "ENTER PASSWORD> ";
}
else
prompt = "rcon password> ";
prompt = "NOT CONNECTED> ";
}
gfx_text_ex(&cursor, prompt, -1);

1
src/game/client/gc_console.h
View file

@ -9,6 +9,7 @@ bool console_input_normal_binds(INPUT_EVENT e, void *user_data);
//void console_handle_input();
void console_clear(int type);
void console_toggle(int tpye);
void console_render();
int console_active();

53
src/game/client/gc_render_obj.cpp
View file

@ -279,6 +279,29 @@ void render_player(
NETOBJ_PLAYER_INFO info = *player_info;
tee_render_info render_info = client_datas[info.cid].render_info;
// check for teamplay modes
bool is_teamplay = false;
if(netobjects.gameobj && netobjects.gameobj->gametype != GAMETYPE_DM)
is_teamplay = true;
// check for ninja
if (player.weapon == WEAPON_NINJA)
{
// change the skin for the player to the ninja
int skin = skin_find("x_ninja");
if(skin != -1)
{
if(is_teamplay)
render_info.texture = skin_get(skin)->color_texture;
else
{
render_info.texture = skin_get(skin)->org_texture;
render_info.color_body = vec4(1,1,1,1);
render_info.color_feet = vec4(1,1,1,1);
}
}
}
// set size
render_info.size = 64.0f;
@ -286,10 +309,6 @@ void render_player(
float intratick = client_intratick();
float ticktime = client_ticktime();
bool is_teamplay = false;
if(netobjects.gameobj && netobjects.gameobj->gametype != GAMETYPE_DM)
is_teamplay = true;
if(player.health < 0) // dont render dead players
return;
@ -406,7 +425,7 @@ void render_player(
gfx_quads_setrotation(0);
gfx_quads_end();
render_hand(&client_datas[info.cid].render_info, position, normalize(hook_pos-pos), -pi/2, vec2(20, 0));
render_hand(&render_info, position, normalize(hook_pos-pos), -pi/2, vec2(20, 0));
}
// draw gun
@ -441,20 +460,6 @@ void render_player(
}
else if (player.weapon == WEAPON_NINJA)
{
// change the skin for the player to the ninja
int skin = skin_find("x_ninja");
if(skin != -1)
{
if(is_teamplay)
render_info.texture = skin_get(skin)->color_texture;
else
{
render_info.texture = skin_get(skin)->org_texture;
render_info.color_body = vec4(1,1,1,1);
render_info.color_feet = vec4(1,1,1,1);
}
}
p = position;
p.y += data->weapons[iw].offsety;
@ -529,10 +534,6 @@ void render_player(
vec2 muzzlepos = p + dir * data->weapons[iw].muzzleoffsetx + diry * offsety;
draw_sprite(muzzlepos.x, muzzlepos.y, data->weapons[iw].visual_size);
/*gfx_setcolor(1.0f,1.0f,1.0f,alpha);
vec2 diry(-dir.y,dir.x);
p += dir * muzzleparams[player.weapon].offsetx + diry * offsety;
gfx_quads_draw(p.x,p.y,muzzleparams[player.weapon].sizex, muzzleparams[player.weapon].sizey);*/
}
}
}
@ -540,9 +541,9 @@ void render_player(
switch (player.weapon)
{
case WEAPON_GUN: render_hand(&client_datas[info.cid].render_info, p, direction, -3*pi/4, vec2(-15, 4)); break;
case WEAPON_SHOTGUN: render_hand(&client_datas[info.cid].render_info, p, direction, -pi/2, vec2(-5, 4)); break;
case WEAPON_GRENADE: render_hand(&client_datas[info.cid].render_info, p, direction, -pi/2, vec2(-4, 7)); break;
case WEAPON_GUN: render_hand(&render_info, p, direction, -3*pi/4, vec2(-15, 4)); break;
case WEAPON_SHOTGUN: render_hand(&render_info, p, direction, -pi/2, vec2(-5, 4)); break;
case WEAPON_GRENADE: render_hand(&render_info, p, direction, -pi/2, vec2(-4, 7)); break;
}
}