From c7f2ed7bb1404d7e39465b1726a0b69a0eced9d3 Mon Sep 17 00:00:00 2001 From: zico Date: Tue, 11 Jun 2013 00:48:23 +0200 Subject: [PATCH] Fixed briefing_screens array for Descent 1 Shareware --- CHANGELOG.txt | 4 ++++ main/titles.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 80b79a51b..4d4e019b7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D2X-Rebirth Changelog +20130611 +-------- +main/titles.c: Fixed briefing_screens array for Descent 1 Shareware + 20130610 -------- misc/hmp.c: Made hmp code actually read tempo. Due to missing documentation of the format I can only guess it's a 4 bit int diff --git a/main/titles.c b/main/titles.c index 514145e48..6d74d1df9 100644 --- a/main/titles.c +++ b/main/titles.c @@ -378,13 +378,14 @@ briefing_screen D1_Briefing_screens_share[] = { { "moon01.pcx", 3, 7, 10, 10, 300, 170 }, // level 3 { "venus01.pcx", 4, 8, 15, 15, 300, 200 }, // level 4 { "venus01.pcx", 5, 9, 15, 15, 300, 200 }, // level 5 + { "brief03.pcx", 6, 10, 20, 22, 257, 177 }, { "merc01.pcx", 6, 10, 10, 15, 300, 200 }, // level 6 { "merc01.pcx", 7, 11, 10, 15, 300, 200 }, // level 7 { "end01.pcx", ENDING_LEVEL_NUM_OEMSHARE, 1, 23, 40, 320, 200 }, // shareware end }; #define D1_Briefing_screens ((PHYSFSX_fsize("descent.hog")==D1_SHAREWARE_MISSION_HOGSIZE || PHYSFSX_fsize("descent.hog")==D1_SHAREWARE_10_MISSION_HOGSIZE)?D1_Briefing_screens_share:D1_Briefing_screens_full) -#define NUM_D1_BRIEFING_SCREENS (sizeof(D1_Briefing_screens_full)/sizeof(briefing_screen)) +#define NUM_D1_BRIEFING_SCREENS ((PHYSFSX_fsize("descent.hog")==D1_SHAREWARE_MISSION_HOGSIZE || PHYSFSX_fsize("descent.hog")==D1_SHAREWARE_10_MISSION_HOGSIZE)?(sizeof(D1_Briefing_screens_share)/sizeof(briefing_screen)):(sizeof(D1_Briefing_screens_full)/sizeof(briefing_screen))) typedef struct msgstream { int x;