From 7ce32bcd3aaba6ed7917ebd37a8a750eebfd1e69 Mon Sep 17 00:00:00 2001 From: InspirationByte Date: Mon, 7 Feb 2022 23:24:25 +0300 Subject: [PATCH] - added three removed missions --- data/DRIVER2/LANG/EN_MISSION.LTXT | 3 ++ src_rebuild/Game/C/glaunch.c | 3 ++ src_rebuild/Game/C/mission.c | 15 ++---- src_rebuild/Game/C/mission.h | 2 +- src_rebuild/Game/Frontend/FEmain.c | 75 ++++++++++++++++-------------- src_rebuild/Game/dr2locale.h | 3 ++ 6 files changed, 53 insertions(+), 48 deletions(-) diff --git a/data/DRIVER2/LANG/EN_MISSION.LTXT b/data/DRIVER2/LANG/EN_MISSION.LTXT index 164ea2c9..e25ca3fa 100644 --- a/data/DRIVER2/LANG/EN_MISSION.LTXT +++ b/data/DRIVER2/LANG/EN_MISSION.LTXT @@ -9,9 +9,11 @@ Tailing the drop Escape to the safe house Chase the intruder Caine's compound +Jones Rendezvous Leaving Chicago Follow up the lead Hijack the truck +Truck To The Lockup Stop the truck Find the clue Escape to ferry @@ -35,6 +37,7 @@ Steal the cop car Caine's cash Save Jones Boat jump +Lose The Cops Jones in trouble Chase the Gun Man Lenny escaping diff --git a/src_rebuild/Game/C/glaunch.c b/src_rebuild/Game/C/glaunch.c index f4dd417a..2db27d21 100644 --- a/src_rebuild/Game/C/glaunch.c +++ b/src_rebuild/Game/C/glaunch.c @@ -47,6 +47,7 @@ MISSION_STEP MissionLadder[] = { DML_MISSION, 3, 6, 0 }, { DML_FMV, 4, 7, 0 }, { DML_MISSION, 5, 7, 0 }, + { DML_MISSION, 5, 8, 0 }, { DML_RECAP, 5, 0, 0 }, { DML_MISSION, 5, 9, 0 }, { DML_FMV, 5, 8, 0 }, @@ -55,6 +56,7 @@ MISSION_STEP MissionLadder[] = { DML_FMV, 6, 10, 0 }, { DML_FMV, 6, 11, 0 }, { DML_MISSION, 7, 11, 0 }, + { DML_MISSION, 7, 12, 0 }, { DML_RECAP, 7, 0, 0 }, { DML_MISSION, 7, 13, 0 }, { DML_MISSION, 7, 14, 0 }, @@ -90,6 +92,7 @@ MISSION_STEP MissionLadder[] = { DML_MISSION, 16, 34, 1 }, { DML_FMV, 16, 22, 1 }, { DML_MISSION, 17, 35, 1 }, + { DML_MISSION, 17, 36, 1 }, { DML_RECAP, 17, 0, 1 }, { DML_MISSION, 17, 37, 1 }, { DML_FMV, 17, 23, 1 }, diff --git a/src_rebuild/Game/C/mission.c b/src_rebuild/Game/C/mission.c index bb5eee03..d1e71309 100644 --- a/src_rebuild/Game/C/mission.c +++ b/src_rebuild/Game/C/mission.c @@ -36,7 +36,7 @@ #include #endif // PSX -char* MissionName[37] = +char* MissionName[40] = { // Chicago M_LTXT_ID(MTXT_Surveillancetipoff), @@ -46,11 +46,13 @@ char* MissionName[37] = M_LTXT_ID(MTXT_Escapetothesafehouse), M_LTXT_ID(MTXT_Chasetheintruder), M_LTXT_ID(MTXT_Cainescompound), + M_LTXT_ID(MTXT_Jonesrendezvous), M_LTXT_ID(MTXT_LeavingChicago), // Havana M_LTXT_ID(MTXT_Followupthelead), M_LTXT_ID(MTXT_Hijackthetruck), + M_LTXT_ID(MTXT_Trucktothelockup), M_LTXT_ID(MTXT_Stopthetruck), M_LTXT_ID(MTXT_Findtheclue), M_LTXT_ID(MTXT_Escapetoferry), @@ -78,6 +80,7 @@ char* MissionName[37] = M_LTXT_ID(MTXT_Cainescash), M_LTXT_ID(MTXT_SaveJones), M_LTXT_ID(MTXT_Boatjump), + M_LTXT_ID(MTXT_Losethecops), M_LTXT_ID(MTXT_Jonesintrouble), M_LTXT_ID(MTXT_ChasetheGunMan), M_LTXT_ID(MTXT_Lennyescaping), @@ -689,16 +692,6 @@ void LoadMission(int missionnum) if (gCurrentMissionNumber - 1U < 40) { int titleId = gCurrentMissionNumber; - - if (titleId > 36) - titleId--; - - if (titleId > 11) - titleId--; - - if (titleId > 7) - titleId--; - gMissionTitle = GET_MISSION_TXT(MissionName[titleId - 1]); } else diff --git a/src_rebuild/Game/C/mission.h b/src_rebuild/Game/C/mission.h index 6a9d9df7..3a9f471d 100644 --- a/src_rebuild/Game/C/mission.h +++ b/src_rebuild/Game/C/mission.h @@ -1,7 +1,7 @@ #ifndef MISSION_H #define MISSION_H -extern char* MissionName[37]; +extern char* MissionName[40]; extern int GameLevel; extern int gInvincibleCar; diff --git a/src_rebuild/Game/Frontend/FEmain.c b/src_rebuild/Game/Frontend/FEmain.c index f59ffd62..60e48bba 100644 --- a/src_rebuild/Game/Frontend/FEmain.c +++ b/src_rebuild/Game/Frontend/FEmain.c @@ -330,13 +330,13 @@ char carNumLookup[4][10] = { int minmaxSelections[4][2] = { - { 0, 8 }, - { 8, 18 }, - { 18, 28 }, - { 28, 37 } + { 0, 9 }, + { 9, 20 }, + { 20, 30 }, + { 30, 40 } }; -BOTCH botch[38] = { +BOTCH botch[41] = { { 1, &MissionName[0]}, { 2, &MissionName[1]}, { 3, &MissionName[2]}, @@ -344,36 +344,39 @@ BOTCH botch[38] = { { 5, &MissionName[4]}, { 6, &MissionName[5]}, { 7, &MissionName[6]}, - { 9, &MissionName[7]}, - { 10, &MissionName[8]}, - { 11, &MissionName[9]}, - { 13, &MissionName[10]}, - { 14, &MissionName[11]}, - { 15, &MissionName[12]}, - { 16, &MissionName[13]}, - { 17, &MissionName[14]}, - { 18, &MissionName[15]}, - { 19, &MissionName[16]}, - { 20, &MissionName[17]}, - { 21, &MissionName[18]}, - { 22, &MissionName[19]}, - { 23, &MissionName[20]}, - { 24, &MissionName[21]}, - { 25, &MissionName[22]}, - { 26, &MissionName[23]}, - { 27, &MissionName[24]}, - { 28, &MissionName[25]}, - { 29, &MissionName[26]}, - { 30, &MissionName[27]}, - { 31, &MissionName[28]}, - { 32, &MissionName[29]}, - { 33, &MissionName[30]}, - { 34, &MissionName[31]}, - { 35, &MissionName[32]}, - { 37, &MissionName[33]}, - { 38, &MissionName[34]}, - { 39, &MissionName[35]}, - { 40, &MissionName[36]}, + { 8, &MissionName[7]}, + { 9, &MissionName[8]}, + { 10, &MissionName[9]}, + { 11, &MissionName[10]}, + { 12, &MissionName[11]}, + { 13, &MissionName[12]}, + { 14, &MissionName[13]}, + { 15, &MissionName[14]}, + { 16, &MissionName[15]}, + { 17, &MissionName[16]}, + { 18, &MissionName[17]}, + { 19, &MissionName[18]}, + { 20, &MissionName[19]}, + { 21, &MissionName[20]}, + { 22, &MissionName[21]}, + { 23, &MissionName[22]}, + { 24, &MissionName[23]}, + { 25, &MissionName[24]}, + { 26, &MissionName[25]}, + { 27, &MissionName[26]}, + { 28, &MissionName[27]}, + { 29, &MissionName[28]}, + { 30, &MissionName[29]}, + { 31, &MissionName[30]}, + { 32, &MissionName[31]}, + { 33, &MissionName[32]}, + { 34, &MissionName[33]}, + { 35, &MissionName[34]}, + { 36, &MissionName[35]}, + { 37, &MissionName[36]}, + { 38, &MissionName[37]}, + { 39, &MissionName[38]}, + { 40, &MissionName[39]}, { 0,NULL} }; @@ -2224,7 +2227,7 @@ int MissionSelectScreen(int bSetup) { if (botch[currMission + i].missNum > gFurthestMission || currMission + i >= minmaxSelections[currCity][1] || - currMission + i > 36) + currMission + i > 39) { done = true; } diff --git a/src_rebuild/Game/dr2locale.h b/src_rebuild/Game/dr2locale.h index 6653f7d4..5620aa69 100644 --- a/src_rebuild/Game/dr2locale.h +++ b/src_rebuild/Game/dr2locale.h @@ -144,9 +144,11 @@ enum MissionStrId MTXT_Escapetothesafehouse, MTXT_Chasetheintruder, MTXT_Cainescompound, + MTXT_Jonesrendezvous, MTXT_LeavingChicago, MTXT_Followupthelead, MTXT_Hijackthetruck, + MTXT_Trucktothelockup, MTXT_Stopthetruck, MTXT_Findtheclue, MTXT_Escapetoferry, @@ -170,6 +172,7 @@ enum MissionStrId MTXT_Cainescash, MTXT_SaveJones, MTXT_Boatjump, + MTXT_Losethecops, MTXT_Jonesintrouble, MTXT_ChasetheGunMan, MTXT_Lennyescaping,