TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

made Omega selectable even if it has no energy left and can't fire

Browse source
This commit is contained in:
zicodxx 2007-01-18 15:06:51 +00:00
parent 6195a1bb18
commit 93245db50e
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dxx-changelog.txt
View file

@ -3,6 +3,7 @@ D2X-Rebirth Changelog
20070118
--------
main/gauges.c: draw bomb count correctly in CM_FULL_SCREEN ... finally
main/laser.c: made Omega selectable even if it has no energy left and can't fire
20070117
--------

5
main/laser.c
View file

@ -495,11 +495,6 @@ void omega_charge_frame(void)
if (Player_is_dead)
return;
if ((Primary_weapon == OMEGA_INDEX) && (Omega_charge == 0) && (Players[Player_num].energy == 0)) {
Primary_weapon--;
auto_select_weapon(0);
}
// Don't charge while firing.
if ((Last_omega_fire_frame == FrameCount) || (Last_omega_fire_frame == FrameCount-1))
return;

4
main/weapon.c
View file

@ -641,7 +641,7 @@ void ReorderPrimary ()
{
m[i].type=NM_TYPE_MENU;
if (PrimaryOrder[i]==255)
m[i].text="ˆˆˆˆˆˆˆ Never autoselect ˆˆˆˆˆˆˆ";
m[i].text=" Never autoselect ";
else
m[i].text=(char *)PRIMARY_WEAPON_NAMES(PrimaryOrder[i]);
m[i].value=PrimaryOrder[i];
@ -663,7 +663,7 @@ void ReorderSecondary ()
{
m[i].type=NM_TYPE_MENU;
if (SecondaryOrder[i]==255)
m[i].text="ˆˆˆˆˆˆˆ Never autoselect ˆˆˆˆˆˆˆ";
m[i].text=" Never autoselect ";
else
m[i].text=(char *)SECONDARY_WEAPON_NAMES(SecondaryOrder[i]);
m[i].value=SecondaryOrder[i];