Skip to content

Commit 3ac05ca

Browse files
committed
- DrawDrivingGameOverlays MP text adjusted for NTSC/PAL
1 parent 6299674 commit 3ac05ca

1 file changed

Lines changed: 21 additions & 25 deletions

File tree

src_rebuild/Game/C/overlay.c

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -555,19 +555,7 @@ void DrawDrivingGameOverlays(void)
555555
break;
556556
case GAME_CHECKPOINT:
557557

558-
if (NumPlayers > 1)
559-
{
560-
x = PrintString(G_LTXT(GTXT_Checks), gOverlayXPos, 36);
561-
562-
sprintf(string, "%d/5", gPlayerScore.items);
563-
PrintString(string, x + 3, 36);
564-
565-
x = PrintString(G_LTXT(GTXT_Checks), gOverlayXPos, 150);
566-
567-
sprintf(string, "%d/5", gPlayerScore.P2items);
568-
PrintString(string, x + 3, 150);
569-
}
570-
else
558+
if (NumPlayers == 1)
571559
{
572560
table = &ScoreTables.CheckpointTable[GameLevel][gSubGameNumber][0];
573561
x = PrintStringRightAligned(G_LTXT(GTXT_Checks), gOverlayXOppPos + 70, 16);
@@ -578,6 +566,18 @@ void DrawDrivingGameOverlays(void)
578566
x = PrintString(G_LTXT(GTXT_Best), gOverlayXPos, 36);
579567
PrintScoreTableTime(x + 3, 36, table->time);
580568
}
569+
else
570+
{
571+
x = PrintString(G_LTXT(GTXT_Checks), gOverlayXPos, 36);
572+
573+
sprintf(string, "%d/5", gPlayerScore.items);
574+
PrintString(string, x + 3, 36);
575+
576+
x = PrintString(G_LTXT(GTXT_Checks), gOverlayXPos, SCREEN_H / 2 + 22);
577+
578+
sprintf(string, "%d/5", gPlayerScore.P2items);
579+
PrintString(string, x + 3, SCREEN_H / 2 + 22);
580+
}
581581

582582
break;
583583
case GAME_GATERACE:
@@ -602,10 +602,10 @@ void DrawDrivingGameOverlays(void)
602602
sprintf(string, "%d / %d", gPlayerScore.items, 100);
603603

604604
PrintString(string, x + 3, 36);
605-
x = PrintString(G_LTXT(GTXT_Gate), gOverlayXPos, 150);
605+
x = PrintString(G_LTXT(GTXT_Gate), gOverlayXPos, SCREEN_H / 2 + 22);
606606

607607
sprintf(string, "%d / %d", gPlayerScore.P2items, 100);
608-
PrintString(string, x + 3, 150);
608+
PrintString(string, x + 3, SCREEN_H / 2 + 22);
609609
}
610610
break;
611611
case GAME_TRAILBLAZER:
@@ -635,39 +635,35 @@ void DrawDrivingGameOverlays(void)
635635

636636
x = PrintString(G_LTXT(GTXT_Flags), gOverlayXPos, 132);
637637
sprintf(string, "%d", gPlayerScore.P2items);
638-
PrintString(string, x + 3, 132);
638+
PrintString(string, x + 3, SCREEN_H / 2 + 4);
639639
break;
640640
case GAME_SECRET:
641641
y = 36;
642642

643-
i = 0;
644-
do
643+
for (i = 0; i < gNumRaceTrackLaps; i++)
645644
{
646645
sprintf(string, "%s %d:", G_LTXT(GTXT_Lap), i+1);
647646

648647
x = PrintString(string, gOverlayXPos, y);
649648
PrintScoreTableTime(x + 3, y, gLapTimes[0][i]);
650649

651650
y += 16;
652-
i++;
653-
} while (i < gNumRaceTrackLaps);
651+
}
654652

655653

656654
if (NumPlayers > 1)
657655
{
658-
y = 150;
656+
y = SCREEN_H / 2 + 22;
659657

660-
i = 0;
661-
do
658+
for(i = 0; i < gNumRaceTrackLaps; i++)
662659
{
663660
sprintf(string, "%s %d:", G_LTXT(GTXT_Lap), i+1);
664661

665662
x = PrintString(string, gOverlayXPos, y);
666663
PrintScoreTableTime(x + 3, y, gLapTimes[1][i]);
667664

668665
y += 16;
669-
i++;
670-
} while (i < gNumRaceTrackLaps);
666+
}
671667
}
672668
break;
673669
}

0 commit comments

Comments
 (0)