diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 31ed8fb59..8f612a37b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,10 @@ D1X-Rebirth Changelog +20110410 +-------- +main/net_udp.c: Allow multi_send_fire when necessary and not crop to PPS so fix weapons with high firing rate +main/game.c, main/gamerend.c, main/gauges.c, main/net_udp.c, main/titles.c: Fixed text-related annoyances: "Show reticle names" now named "Show player names on HUD"; Fixed positions of strings TXT_CLOAKED and TXT_CRUISE in CM_FULL_SCREEN; Fixed typo in tracker timeout screen; Fixed scaling of tab_stop in briefings (again); Removed some little D2 code for briefings as it broke some briefing screens + 20110408 -------- main/net_udp.c: Allow multi_send_fire when necessary and not crop to PPS so fix weapons with high firing rate diff --git a/main/game.c b/main/game.c index c045e3870..722578c36 100644 --- a/main/game.c +++ b/main/game.c @@ -796,7 +796,7 @@ void show_netgame_help() #else m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "Alt-F2/F3 (\x85-SHIFT-s/\x85-o)\t SAVE/LOAD COOP GAME"; #endif - m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "ALT-F4\t SHOW RETICLE NAMES"; + m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "ALT-F4\t SHOW PLAYER NAMES ON HUD"; m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "F7\t TOGGLE KILL LIST"; m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "F8\t SEND MESSAGE"; m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "(SHIFT-)F9 to F12\t (DEFINE)SEND MACRO"; diff --git a/main/gamerend.c b/main/gamerend.c index 4883d0d04..829fc8b05 100644 --- a/main/gamerend.c +++ b/main/gamerend.c @@ -321,7 +321,7 @@ void game_draw_hud_stuff() if (Game_mode & GM_MULTI) y -= LINE_SPACING * 10; else - y -= LINE_SPACING * 5; + y -= LINE_SPACING * 6; } else if (PlayerCfg.CockpitMode[1] == CM_STATUS_BAR) { if (Game_mode & GM_MULTI) y -= LINE_SPACING * 6; diff --git a/main/gauges.c b/main/gauges.c index 14478259b..60961c585 100644 --- a/main/gauges.c +++ b/main/gauges.c @@ -1176,7 +1176,7 @@ void hud_show_cloak_invuln(void) int y = grd_curcanv->cv_bitmap.bm_h; if (Game_mode & GM_MULTI) - y -= LINE_SPACING*7; + y -= LINE_SPACING*8; else y -= LINE_SPACING*4; @@ -1190,7 +1190,7 @@ void hud_show_cloak_invuln(void) int y = grd_curcanv->cv_bitmap.bm_h; if (Game_mode & GM_MULTI) - y -= LINE_SPACING*10; + y -= LINE_SPACING*9; else y -= LINE_SPACING*5; diff --git a/main/net_udp.c b/main/net_udp.c index 8d13df4d4..3f3d4f787 100644 --- a/main/net_udp.c +++ b/main/net_udp.c @@ -4089,7 +4089,7 @@ void net_udp_do_frame(int force, int listen) iAttempts = 0; // Warn - nm_messagebox( TXT_WARNING, 1, TXT_OK, "No response from tracker!\nPossible causes:\nTracker s down\nYour port is likely not open!\n\nTracker: %s\nGame port: %s", GameArg.MplTrackerAddr, UDP_MyPort ); + nm_messagebox( TXT_WARNING, 1, TXT_OK, "No response from tracker!\nPossible causes:\nTracker is down\nYour port is likely not open!\n\nTracker: %s\nGame port: %s", GameArg.MplTrackerAddr, UDP_MyPort ); } } #endif diff --git a/main/titles.c b/main/titles.c index d47e11510..02ff13451 100644 --- a/main/titles.c +++ b/main/titles.c @@ -506,7 +506,6 @@ int briefing_process_char(briefing *br) ; } else if (ch == 'T') { br->tab_stop = get_message_num(&br->message); - br->tab_stop*=FSPACX(1+HIRESMODE); br->prev_ch = 10; // read to eoln } else if (ch == 'R') { if (br->robot_canv != NULL) @@ -517,8 +516,6 @@ int briefing_process_char(briefing *br) init_spinning_robot(br); br->robot_num = get_message_num(&br->message); - while (*br->message++ != 10) - ; br->prev_ch = 10; // read to eoln } else if (ch == 'N') { if (br->robot_canv != NULL) @@ -577,8 +574,8 @@ int briefing_process_char(briefing *br) } else if (ch == '$' || ch == ';') // Print a $/; put_char_delay(br, ch); } else if (ch == '\t') { // Tab - if (br->text_x - br->screen->text_ulx < br->tab_stop) - br->text_x = br->screen->text_ulx + br->tab_stop; + if (br->text_x - br->screen->text_ulx < FSPACX(br->tab_stop)) + br->text_x = br->screen->text_ulx + FSPACX(br->tab_stop); } else if ((ch == ';') && (br->prev_ch == 10)) { while (*br->message++ != 10) ;