From d583415cfbe9ba4944c35e6e063c6e9d7d1d8fae Mon Sep 17 00:00:00 2001 From: zicodxx Date: Wed, 28 Mar 2012 12:02:15 +0200 Subject: [PATCH] in netgame info screen some setting-descriptions were interchanged and displayed wrong toggles --- CHANGELOG.txt | 1 + main/net_udp.c | 20 ++++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d0bb3cc84..9e6354587 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ main/slew.c: Fix compile-time error when building without editor arch/sdl/jukebox.c, main/songs.c: Allow .flac to be a filename extension for sng file and jukebox main/state.c: properly disable cheats when loading a saved game so only cheats that were stored are re-enabled main/collide.c, main/physics.c: Fixed double wall-object-damage introduced 20111124 by applying more strict rules to wall-colliding and wall-scraping where latter now is player-exclusive +main/net_udp.c: in netgame info screen some setting-descriptions were interchanged and displayed wrong toggles 20120324 -------- diff --git a/main/net_udp.c b/main/net_udp.c index 2e1f65141..a34b9c00c 100644 --- a/main/net_udp.c +++ b/main/net_udp.c @@ -5063,18 +5063,15 @@ static int show_game_rules_handler(window *wind, d_event *event, netgame_info *n gr_string( 0x8000, FSPACY(35), "NETGAME INFO" ); grd_curcanv->cv_font = GAME_FONT; - - gr_printf( FSPACX( 25),FSPACY( 55), "Reactor Life:"); gr_printf( FSPACX( 25),FSPACY( 61), "Max Time:"); gr_printf( FSPACX( 25),FSPACY( 67), "Kill Goal:"); gr_printf( FSPACX( 25),FSPACY( 73), "Packets per sec.:"); - gr_printf( FSPACX(155),FSPACY( 55), "Show Players On Automap:"); - gr_printf( FSPACX(155),FSPACY( 61), "Invul when reappearing:"); - gr_printf( FSPACX(155),FSPACY( 67), "Bright player ships:"); - gr_printf( FSPACX(155),FSPACY( 73), "Show enemy names on hud:"); + gr_printf( FSPACX(155),FSPACY( 55), "Invul when reappearing:"); + gr_printf( FSPACX(155),FSPACY( 61), "Bright player ships:"); + gr_printf( FSPACX(155),FSPACY( 67), "Show enemy names on hud:"); + gr_printf( FSPACX(155),FSPACY( 73), "Show players on automap:"); gr_printf( FSPACX(155),FSPACY( 79), "No friendly Fire:"); - gr_printf( FSPACX( 25),FSPACY(100), "Allowed Objects"); gr_printf( FSPACX( 25),FSPACY(110), "Laser Upgrade:"); gr_printf( FSPACX( 25),FSPACY(116), "Quad Laser:"); @@ -5094,13 +5091,12 @@ static int show_game_rules_handler(window *wind, d_event *event, netgame_info *n gr_printf( FSPACX(115),FSPACY( 61), "%i Min", netgame->PlayTimeAllowed*5); gr_printf( FSPACX(115),FSPACY( 67), "%i", netgame->KillGoal*5); gr_printf( FSPACX(115),FSPACY( 73), "%i", netgame->PacketsPerSec); - gr_printf( FSPACX(275),FSPACY( 55), netgame->ShowEnemyNames?"ON":"OFF"); - gr_printf( FSPACX(275),FSPACY( 61), netgame->game_flags&NETGAME_FLAG_SHOW_MAP?"ON":"OFF"); - gr_printf( FSPACX(275),FSPACY( 67), netgame->InvulAppear?"ON":"OFF"); - gr_printf( FSPACX(275),FSPACY( 73), netgame->BrightPlayers?"ON":"OFF"); + gr_printf( FSPACX(275),FSPACY( 55), netgame->InvulAppear?"ON":"OFF"); + gr_printf( FSPACX(275),FSPACY( 61), netgame->BrightPlayers?"ON":"OFF"); + gr_printf( FSPACX(275),FSPACY( 67), netgame->ShowEnemyNames?"ON":"OFF"); + gr_printf( FSPACX(275),FSPACY( 73), netgame->game_flags&NETGAME_FLAG_SHOW_MAP?"ON":"OFF"); gr_printf( FSPACX(275),FSPACY( 79), netgame->NoFriendlyFire?"ON":"OFF"); - gr_printf( FSPACX(130),FSPACY(110), netgame->AllowedItems&NETFLAG_DOLASER?"YES":"NO"); gr_printf( FSPACX(130),FSPACY(116), netgame->AllowedItems&NETFLAG_DOQUAD?"YES":"NO"); gr_printf( FSPACX(130),FSPACY(122), netgame->AllowedItems&NETFLAG_DOVULCAN?"YES":"NO");