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 some weapon switching issues

Browse source
This commit is contained in:
Magnus Auvinen 2008-03-29 18:40:18 +00:00
parent 370cbbe79f
commit e822830056
3 changed files with 67 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/e_network.c
View file

@ -727,6 +727,10 @@ int netserver_recv(NETSERVER *s, NETPACKET *packet)
/* find matching slot */
for(i = 0; i < s->max_clients; i++)
{
/* must be in some sort of online state */
if(s->slots[i].conn.state == NETWORK_CONNSTATE_OFFLINE)
continue;
if(net_addr4_cmp(&s->slots[i].conn.peeraddr, &addr) == 0)
{
if(conn_feed(&s->slots[i].conn, &data, &addr))

6
src/game/server/gs_common.h
View file

@ -254,7 +254,8 @@ public:
int active_weapon;
int last_weapon;
int wanted_weapon;
int queued_weapon;
int reload_timer;
int attack_tick;
@ -335,6 +336,9 @@ public:
void set_weapon(int w);
void handle_weaponswitch();
void do_weaponswitch();
int handle_weapons();
int handle_ninja();

102
src/game/server/gs_server.cpp
View file

@ -708,7 +708,7 @@ void player::reset()
active_weapon = WEAPON_GUN;
last_weapon = WEAPON_HAMMER;
wanted_weapon = WEAPON_GUN;
queued_weapon = -1;
}
void player::destroy() { }
@ -716,9 +716,12 @@ void player::destroy() { }
void player::set_weapon(int w)
{
last_weapon = active_weapon;
queued_weapon = -1;
active_weapon = w;
if(active_weapon < 0 || active_weapon >= NUM_WEAPONS)
active_weapon = 0;
create_sound(pos, SOUND_WEAPON_SWITCH);
}
void player::respawn()
@ -927,7 +930,7 @@ void player::try_respawn()
active_weapon = WEAPON_GUN;
last_weapon = WEAPON_HAMMER;
wanted_weapon = WEAPON_GUN;
queued_weapon = 0;
reload_timer = 0;
@ -1044,11 +1047,61 @@ int player::handle_ninja()
return 0;
}
void player::do_weaponswitch()
{
if(reload_timer == 0 && queued_weapon != -1)
set_weapon(queued_weapon);
}
void player::handle_weaponswitch()
{
int wanted_weapon = active_weapon;
if(queued_weapon != -1)
wanted_weapon = queued_weapon;
// select weapon
int next = count_input(latest_previnput.next_weapon, latest_input.next_weapon).presses;
int prev = count_input(latest_previnput.prev_weapon, latest_input.prev_weapon).presses;
if(next < 128) // make sure we only try sane stuff
{
while(next) // next weapon selection
{
wanted_weapon = (wanted_weapon+1)%NUM_WEAPONS;
if(weapons[wanted_weapon].got)
next--;
}
}
if(prev < 128) // make sure we only try sane stuff
{
while(prev) // prev weapon selection
{
wanted_weapon = (wanted_weapon-1)<0?NUM_WEAPONS-1:wanted_weapon-1;
if(weapons[wanted_weapon].got)
prev--;
}
}
// direct weapon selection
if(latest_input.wanted_weapon)
wanted_weapon = input.wanted_weapon-1;
// check for insane values
if(wanted_weapon >= 0 && wanted_weapon < NUM_WEAPONS && wanted_weapon != active_weapon && weapons[wanted_weapon].got)
queued_weapon = wanted_weapon;
do_weaponswitch();
}
void player::fire_weapon()
{
if(reload_timer != 0 || active_weapon == WEAPON_NINJA)
return;
do_weaponswitch();
vec2 direction = normalize(vec2(latest_input.target_x, latest_input.target_y));
bool fullauto = false;
@ -1234,48 +1287,6 @@ int player::handle_weapons()
return handle_ninja();
}
// select weapon
int next = count_input(latest_previnput.next_weapon, latest_input.next_weapon).presses;
int prev = count_input(latest_previnput.prev_weapon, latest_input.prev_weapon).presses;
if(next < 128) // make sure we only try sane stuff
{
while(next) // next weapon selection
{
wanted_weapon = (wanted_weapon+1)%NUM_WEAPONS;
if(weapons[wanted_weapon].got)
next--;
}
}
if(prev < 128) // make sure we only try sane stuff
{
while(prev) // prev weapon selection
{
wanted_weapon = (wanted_weapon-1)<0?NUM_WEAPONS-1:wanted_weapon-1;
if(weapons[wanted_weapon].got)
prev--;
}
}
if(latest_input.wanted_weapon) // direct weapon selection
wanted_weapon = input.wanted_weapon-1;
if(wanted_weapon < 0 || wanted_weapon >= NUM_WEAPONS)
wanted_weapon = 0;
// switch weapon if wanted
if(data->weapons[active_weapon].duration <= 0)
{
if(wanted_weapon != -1 && wanted_weapon != active_weapon && wanted_weapon >= 0 && wanted_weapon < NUM_WEAPONS && weapons[wanted_weapon].got)
{
if(active_weapon != wanted_weapon)
create_sound(pos, SOUND_WEAPON_SWITCH);
set_weapon(wanted_weapon);
}
}
// fire weapon, if wanted
fire_weapon();
@ -1309,7 +1320,10 @@ void player::on_direct_input(NETOBJ_PLAYER_INPUT *new_input)
mem_copy(&latest_previnput, &latest_input, sizeof(latest_input));
mem_copy(&latest_input, new_input, sizeof(latest_input));
if(num_inputs > 2 && team != -1 && !dead)
{
handle_weaponswitch();
fire_weapon();
}
}
void player::tick()