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

Avoid remultiplying netgame info y

Browse source
This commit is contained in:
Kp 2015-06-21 22:30:28 +00:00
parent 8600fb9fcb
commit 108d22fc80
1 changed files with 50 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
similar/main/net_udp.cpp
View file

@ -5539,55 +5539,58 @@ static void draw_game_rules(F f, const netgame_info &netgame)
const auto &&fspacx155 = fspacx(155);
const auto &&fspacx170 = fspacx(170);
const auto &&fspacx275 = fspacx(275);
f.show_bool_yn(fspacx25, fspacy(base_y + 75), fspacx130, "Laser Upgrade:", netgame.AllowedItems & NETFLAG_DOLASER);
const auto &&fspacy6 = fspacy(6);
auto x25y = fspacy(base_y + 69), x155y = fspacy(base_y + 20), x170y = x25y;
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Laser Upgrade:", netgame.AllowedItems & NETFLAG_DOLASER);
#if defined(DXX_BUILD_DESCENT_I)
f.show_bool_yn(fspacx25, fspacy(base_y + 81), fspacx130, "Quad Laser:", netgame.AllowedItems & NETFLAG_DOQUAD);
f.show_bool_yn(fspacx25, fspacy(base_y + 87), fspacx130, "Vulcan Cannon:", netgame.AllowedItems & NETFLAG_DOVULCAN);
f.show_bool_yn(fspacx25, fspacy(base_y + 93), fspacx130, "Spreadfire Cannon:", netgame.AllowedItems & NETFLAG_DOSPREAD);
f.show_bool_yn(fspacx25, fspacy(base_y + 99), fspacx130, "Plasma Cannon:", netgame.AllowedItems & NETFLAG_DOPLASMA);
f.show_bool_yn(fspacx25, fspacy(base_y + 105), fspacx130, "Fusion Cannon:", netgame.AllowedItems & NETFLAG_DOFUSION);
f.show_bool_yn(fspacx25, fspacy(base_y + 115), fspacx130, "Invulnerability:", netgame.AllowedItems & NETFLAG_DOINVUL);
f.show_bool_yn(fspacx25, fspacy(base_y + 121), fspacx130, "Cloak:", netgame.AllowedItems & NETFLAG_DOCLOAK);
f.show_bool_oo(fspacx155,fspacy(base_y + 26), fspacx275, "Bright player ships:", netgame.BrightPlayers);
f.show_bool_oo(fspacx155,fspacy(base_y + 32), fspacx275, "Show enemy names on hud:", netgame.ShowEnemyNames);
f.show_bool_oo(fspacx155,fspacy(base_y + 38), fspacx275, "Show players on automap:", netgame.game_flag.show_on_map);
f.show_bool_oo(fspacx155,fspacy(base_y + 44), fspacx275, "Invul vs allies:", netgame.NoFriendlyFire);
f.show_bool_yn(fspacx170,fspacy(base_y + 75), fspacx275, "Homing Missile:", netgame.AllowedItems & NETFLAG_DOHOMING);
f.show_bool_yn(fspacx170,fspacy(base_y + 81), fspacx275, "Proximity Bomb:", netgame.AllowedItems & NETFLAG_DOPROXIM);
f.show_bool_yn(fspacx170,fspacy(base_y + 87), fspacx275, "Smart Missile:", netgame.AllowedItems & NETFLAG_DOSMART);
f.show_bool_yn(fspacx170,fspacy(base_y + 93), fspacx275, "Mega Missile:", netgame.AllowedItems & NETFLAG_DOMEGA);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Quad Laser:", netgame.AllowedItems & NETFLAG_DOQUAD);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Vulcan Cannon:", netgame.AllowedItems & NETFLAG_DOVULCAN);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Spreadfire Cannon:", netgame.AllowedItems & NETFLAG_DOSPREAD);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Plasma Cannon:", netgame.AllowedItems & NETFLAG_DOPLASMA);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Fusion Cannon:", netgame.AllowedItems & NETFLAG_DOFUSION);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Invulnerability:", netgame.AllowedItems & NETFLAG_DOINVUL);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Cloak:", netgame.AllowedItems & NETFLAG_DOCLOAK);
f.show_bool_oo(fspacx155,x155y += fspacy6, fspacx275, "Bright player ships:", netgame.BrightPlayers);
f.show_bool_oo(fspacx155,x155y += fspacy6, fspacx275, "Show enemy names on hud:", netgame.ShowEnemyNames);
f.show_bool_oo(fspacx155,x155y += fspacy6, fspacx275, "Show players on automap:", netgame.game_flag.show_on_map);
f.show_bool_oo(fspacx155,x155y += fspacy6, fspacx275, "Invul vs allies:", netgame.NoFriendlyFire);
f.show_bool_yn(fspacx170,x170y += fspacy6, fspacx275, "Homing Missile:", netgame.AllowedItems & NETFLAG_DOHOMING);
f.show_bool_yn(fspacx170,x170y += fspacy6, fspacx275, "Proximity Bomb:", netgame.AllowedItems & NETFLAG_DOPROXIM);
f.show_bool_yn(fspacx170,x170y += fspacy6, fspacx275, "Smart Missile:", netgame.AllowedItems & NETFLAG_DOSMART);
f.show_bool_yn(fspacx170,x170y += fspacy6, fspacx275, "Mega Missile:", netgame.AllowedItems & NETFLAG_DOMEGA);
#elif defined(DXX_BUILD_DESCENT_II)
f.show_bool_yn(fspacx25, fspacy(base_y + 81), fspacx130, "Super Laser:", netgame.AllowedItems & NETFLAG_DOSUPERLASER);
f.show_bool_yn(fspacx25, fspacy(base_y + 87), fspacx130, "Quad Laser:", netgame.AllowedItems & NETFLAG_DOQUAD);
f.show_bool_yn(fspacx25, fspacy(base_y + 93), fspacx130, "Vulcan Cannon:", netgame.AllowedItems & NETFLAG_DOVULCAN);
f.show_bool_yn(fspacx25, fspacy(base_y + 99), fspacx130, "Gauss Cannon:", netgame.AllowedItems & NETFLAG_DOGAUSS);
f.show_bool_yn(fspacx25, fspacy(base_y + 105), fspacx130, "Spreadfire Cannon:", netgame.AllowedItems & NETFLAG_DOSPREAD);
f.show_bool_yn(fspacx25, fspacy(base_y + 111), fspacx130, "Helix Cannon:", netgame.AllowedItems & NETFLAG_DOHELIX);
f.show_bool_yn(fspacx25, fspacy(base_y + 117), fspacx130, "Plasma Cannon:", netgame.AllowedItems & NETFLAG_DOPLASMA);
f.show_bool_yn(fspacx25, fspacy(base_y + 123), fspacx130, "Phoenix Cannon:", netgame.AllowedItems & NETFLAG_DOPHOENIX);
f.show_bool_yn(fspacx25, fspacy(base_y + 129), fspacx130, "Fusion Cannon:", netgame.AllowedItems & NETFLAG_DOFUSION);
f.show_bool_yn(fspacx25, fspacy(base_y + 135), fspacx130, "Omega Cannon:", netgame.AllowedItems & NETFLAG_DOOMEGA);
f.show_bool_oo(fspacx155,fspacy(base_y + 26), fspacx275, "Marker camera views:", netgame.Allow_marker_view);
f.show_bool_oo(fspacx155,fspacy(base_y + 32), fspacx275, "Indestructible lights:", netgame.AlwaysLighting);
f.show_bool_oo(fspacx155,fspacy(base_y + 38), fspacx275, "Bright player ships:", netgame.BrightPlayers);
f.show_bool_oo(fspacx155,fspacy(base_y + 44), fspacx275, "Show enemy names on hud:", netgame.ShowEnemyNames);
f.show_bool_oo(fspacx155,fspacy(base_y + 50), fspacx275, "Show players on automap:", netgame.game_flag.show_on_map);
f.show_bool_oo(fspacx155,fspacy(base_y + 56), fspacx275, "Invul vs allies:", netgame.NoFriendlyFire);
f.show_bool_yn(fspacx170,fspacy(base_y + 75), fspacx275, "Flash Missile:", netgame.AllowedItems & NETFLAG_DOFLASH);
f.show_bool_yn(fspacx170,fspacy(base_y + 81), fspacx275, "Homing Missile:", netgame.AllowedItems & NETFLAG_DOHOMING);
f.show_bool_yn(fspacx170,fspacy(base_y + 87), fspacx275, "Guided Missile:", netgame.AllowedItems & NETFLAG_DOGUIDED);
f.show_bool_yn(fspacx170,fspacy(base_y + 93), fspacx275, "Proximity Bomb:", netgame.AllowedItems & NETFLAG_DOPROXIM);
f.show_bool_yn(fspacx170,fspacy(base_y + 99), fspacx275, "Smart Mine:", netgame.AllowedItems & NETFLAG_DOSMARTMINE);
f.show_bool_yn(fspacx170,fspacy(base_y + 105), fspacx275, "Smart Missile:", netgame.AllowedItems & NETFLAG_DOSMART);
f.show_bool_yn(fspacx170,fspacy(base_y + 111), fspacx275, "Mercury Missile:", netgame.AllowedItems & NETFLAG_DOMERCURY);
f.show_bool_yn(fspacx170,fspacy(base_y + 117), fspacx275, "Mega Missile:", netgame.AllowedItems & NETFLAG_DOMEGA);
f.show_bool_yn(fspacx170,fspacy(base_y + 123), fspacx275, "Earthshaker Missile:", netgame.AllowedItems & NETFLAG_DOSHAKER);
f.show_bool_yn(fspacx25, fspacy(base_y + 145), fspacx130, "Afterburner:", netgame.AllowedItems & NETFLAG_DOAFTERBURNER);
f.show_bool_yn(fspacx25, fspacy(base_y + 151), fspacx130, "Headlight:", netgame.AllowedItems & NETFLAG_DOHEADLIGHT);
f.show_bool_yn(fspacx25, fspacy(base_y + 157), fspacx130, "Energy->Shield Conv:", netgame.AllowedItems & NETFLAG_DOCONVERTER);
f.show_bool_yn(fspacx170,fspacy(base_y + 145), fspacx275, "Invulnerability:", netgame.AllowedItems & NETFLAG_DOINVUL);
f.show_bool_yn(fspacx170,fspacy(base_y + 151), fspacx275, "Cloaking Device:", netgame.AllowedItems & NETFLAG_DOCLOAK);
f.show_bool_yn(fspacx170,fspacy(base_y + 157), fspacx275, "Ammo Rack:", netgame.AllowedItems & NETFLAG_DOAMMORACK);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Super Laser:", netgame.AllowedItems & NETFLAG_DOSUPERLASER);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Quad Laser:", netgame.AllowedItems & NETFLAG_DOQUAD);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Vulcan Cannon:", netgame.AllowedItems & NETFLAG_DOVULCAN);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Gauss Cannon:", netgame.AllowedItems & NETFLAG_DOGAUSS);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Spreadfire Cannon:", netgame.AllowedItems & NETFLAG_DOSPREAD);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Helix Cannon:", netgame.AllowedItems & NETFLAG_DOHELIX);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Plasma Cannon:", netgame.AllowedItems & NETFLAG_DOPLASMA);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Phoenix Cannon:", netgame.AllowedItems & NETFLAG_DOPHOENIX);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Fusion Cannon:", netgame.AllowedItems & NETFLAG_DOFUSION);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Omega Cannon:", netgame.AllowedItems & NETFLAG_DOOMEGA);
f.show_bool_oo(fspacx155, x155y += fspacy6, fspacx275, "Marker camera views:", netgame.Allow_marker_view);
f.show_bool_oo(fspacx155, x155y += fspacy6, fspacx275, "Indestructible lights:", netgame.AlwaysLighting);
f.show_bool_oo(fspacx155, x155y += fspacy6, fspacx275, "Bright player ships:", netgame.BrightPlayers);
f.show_bool_oo(fspacx155, x155y += fspacy6, fspacx275, "Show enemy names on hud:", netgame.ShowEnemyNames);
f.show_bool_oo(fspacx155, x155y += fspacy6, fspacx275, "Show players on automap:", netgame.game_flag.show_on_map);
f.show_bool_oo(fspacx155, x155y += fspacy6, fspacx275, "Invul vs allies:", netgame.NoFriendlyFire);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Flash Missile:", netgame.AllowedItems & NETFLAG_DOFLASH);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Homing Missile:", netgame.AllowedItems & NETFLAG_DOHOMING);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Guided Missile:", netgame.AllowedItems & NETFLAG_DOGUIDED);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Proximity Bomb:", netgame.AllowedItems & NETFLAG_DOPROXIM);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Smart Mine:", netgame.AllowedItems & NETFLAG_DOSMARTMINE);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Smart Missile:", netgame.AllowedItems & NETFLAG_DOSMART);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Mercury Missile:", netgame.AllowedItems & NETFLAG_DOMERCURY);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Mega Missile:", netgame.AllowedItems & NETFLAG_DOMEGA);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Earthshaker Missile:", netgame.AllowedItems & NETFLAG_DOSHAKER);
x25y = x170y = fspacy(base_y + 139);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Afterburner:", netgame.AllowedItems & NETFLAG_DOAFTERBURNER);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Headlight:", netgame.AllowedItems & NETFLAG_DOHEADLIGHT);
f.show_bool_yn(fspacx25, x25y += fspacy6, fspacx130, "Energy->Shield Conv:", netgame.AllowedItems & NETFLAG_DOCONVERTER);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Invulnerability:", netgame.AllowedItems & NETFLAG_DOINVUL);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Cloaking Device:", netgame.AllowedItems & NETFLAG_DOCLOAK);
f.show_bool_yn(fspacx170, x170y += fspacy6, fspacx275, "Ammo Rack:", netgame.AllowedItems & NETFLAG_DOAMMORACK);
#endif
}