Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-25 20:02:33 +01:00
Code Issues Projects Releases Wiki Activity

- misc changes

Browse Source
This commit is contained in:
Ilya Shurumov 2021-09-06 21:57:27 +06:00 committed by InspirationByte
parent c300f8e315
commit 7b15d34a2f
4 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src_rebuild/Game/C/envsound.c
View File

@ -11,67 +11,67 @@ void AddEnvSounds(int level, int time)
switch (level) switch (level)
{ {
case 0: case 0:
AddEnvSnd(1, 0, 4, 2, 0, -225275, 674800, -207350, 657910); AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 2, 0, -225275, 674800, -207350, 657910);
AddEnvSnd(1, 0, 4, 2, 0, 73730, -359430, 88070, -387080); AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 2, 0, 73730, -359430, 88070, -387080);
AddEnvSnd(1, 0x10, 4, 3, 0, 177700, 77500, 222200, 61700); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, 0, 177700, 77500, 222200, 61700);
case 4: case 4:
AddEnvSnd(1, 0x10, 4, 0, -5000, 36250, -167050, 70250, -275700); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 0, -5000, 36250, -167050, 70250, -275700);
AddEnvSnd(1, 0x10, 4, 0, -5000, 36250, -157500, 70250, -126900); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 0, -5000, 36250, -157500, 70250, -126900);
AddEnvSnd(1, 0x10, 4, 0, -5000, 36250, -79500, 70250, -113500); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 0, -5000, 36250, -79500, 70250, -113500);
break; break;
case 1: case 1:
AddEnvSnd(3, 0, 4, 2, 2000, -232360, -266390, -232360, -266390); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 2, 2000, -232360, -266390, -232360, -266390);
AddEnvSnd(3, 0, 4, 2, 2000, 252200, -119500, 252200, -119500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 2, 2000, 252200, -119500, 252200, -119500);
case 5: case 5:
AddEnvSnd(1, 0, 4, 4, -3500, 324150, -363950, 339500, -323200); AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 4, -3500, 324150, -363950, 339500, -323200);
AddEnvSnd(1, 0, 4, 4, -3500, 339500, -326600, 354100, -332600); AddEnvSnd(1, 0, SOUND_BANK_ENVIRONMENT, 4, -3500, 339500, -326600, 354100, -332600);
if (level == 5) if (level == 5)
{ {
AddEnvSnd(1, 0x10, 4, 3, -4500, -113900, -181000, -82500, -2424832); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -113900, -181000, -82500, -2424832);
AddEnvSnd(1, 0x10, 4, 3, -4500, -100700, -258250, -89500, -292600); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -100700, -258250, -89500, -292600);
AddEnvSnd(1, 0x10, 4, 3, -4500, -186100, -321800, -89500, -292600); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -186100, -321800, -89500, -292600);
AddEnvSnd(1, 0x10, 4, 3, -4500, -282100, -302500, -191100, -321800); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -282100, -302500, -191100, -321800);
AddEnvSnd(1, 0x10, 4, 3, -4500, -273000, -301500, -294000, -247500); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -273000, -301500, -294000, -247500);
AddEnvSnd(1, 0x10, 4, 3, -4500, -3145728, -208600, -282500, -246500); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -3145728, -208600, -282500, -246500);
AddEnvSnd(1, 0x10, 4, 3, -4500, -142500, -128100, -90300, -163500); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -142500, -128100, -90300, -163500);
AddEnvSnd(1, 0x10, 4, 3, -4500, -272700, -114500, -157500, -151900); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -272700, -114500, -157500, -151900);
AddEnvSnd(1, 0x10, 4, 3, -4500, -154200, -126300, -134700, -65950); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -4500, -154200, -126300, -134700, -65950);
} }
break; break;
case 2: case 2:
case 6: case 6:
AddEnvSnd(1, 0x10, 4, 1, -6000, 177100, 918100, 207600, 874100); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 1, -6000, 177100, 918100, 207600, 874100);
AddEnvSnd(1, 0x10, 4, 1, -6000, 17000, 785500, -598016, 985750); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 1, -6000, 17000, 785500, -598016, 985750);
break; break;
case 3: case 3:
case 7: case 7:
AddEnvSnd(1, 0x10, 4, 3, -5000, -330600, 156700, -199100, 73750); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, -330600, 156700, -199100, 73750);
AddEnvSnd(1, 0x10, 4, 3, -5000, -84500, 406700, 256500, 378400); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, -84500, 406700, 256500, 378400);
AddEnvSnd(1, 0x10, 4, 3, -5000, -226200, -520600, 32300, -533400); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, -226200, -520600, 32300, -533400);
AddEnvSnd(1, 0x10, 4, 3, -5000, 37250, -402500, 561152, -533400); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, 37250, -402500, 561152, -533400);
AddEnvSnd(4, 0x18, 4, 3, -5000, 38000, -397500, 165000, -305000); AddEnvSnd(4, 0x18, SOUND_BANK_ENVIRONMENT, 3, -5000, 38000, -397500, 165000, -305000);
AddEnvSnd(1, 0x10, 4, 3, -5000, 162300, -1245184, 265250, -192500); AddEnvSnd(1, 0x10, SOUND_BANK_ENVIRONMENT, 3, -5000, 162300, -1245184, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, 176400, -196000, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, 176400, -196000, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, 162500, -195400, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, 162500, -195400, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -479232, -370100, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -479232, -370100, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -602112, -370700, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -602112, -370700, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -110800, -371700, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -110800, -371700, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -124300, -385000, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -124300, -385000, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -143900, -385000, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -143900, -385000, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -163600, -383700, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -163600, -383700, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -187100, -384100, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -187100, -384100, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -192600, -381300, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -192600, -381300, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -199000, -364700, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -199000, -364700, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -210700, -363500, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -210700, -363500, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -212700, -313800, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -212700, -313800, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -211800, -266500, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -211800, -266500, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -117450, -279600, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -117450, -279600, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -130100, -300200, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -130100, -300200, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -141300, -329500, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -141300, -329500, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -109850, -331800, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -109850, -331800, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -87350, -332450, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -87350, -332450, 265250, -192500);
AddEnvSnd(3, 0, 4, 0, -1000, -76150, -336150, 265250, -192500); AddEnvSnd(3, 0, SOUND_BANK_ENVIRONMENT, 0, -1000, -76150, -336150, 265250, -192500);
break; break;
} }
} }

7
src_rebuild/Game/C/gamesnd.c
View File

@ -459,12 +459,11 @@ void LoadLevelSFX(int missionNum)
i = 0; i = 0;
do { for (i = 0; i < 3; i++)
{
if (MissionHeader->residentModels[i] == MissionHeader->residentModels[3]) if (MissionHeader->residentModels[i] == MissionHeader->residentModels[3])
cop_model = i; cop_model = i;
}
i++;
} while (i < 3);
} }
else else
{ {

2
src_rebuild/Game/C/mc_snd.c
View File

@ -394,7 +394,7 @@ void InitializeMissionSound(void)
{ {
es_mobile[0] = AddEnvSnd(3, 0x20, SOUND_BANK_MISSION, GetMissionSound(14), 0, -10000, 0, 0, 0); es_mobile[0] = AddEnvSnd(3, 0x20, SOUND_BANK_MISSION, GetMissionSound(14), 0, -10000, 0, 0, 0);
} }
else if (gCurrentMissionNumber == 0x14) else if (gCurrentMissionNumber == 20)
{ {
jericho_in_back = 1; jericho_in_back = 1;
} }

2
src_rebuild/PsyCross/src/psx/LIBSPU.C
View File

@ -393,7 +393,7 @@ unsigned long SpuWrite(unsigned char* addr, unsigned long size)
//if (0x7EFF0 < size) //if (0x7EFF0 < size)
// size = 0x7EFF0; // size = 0x7EFF0;
int wptr_ofs = s_SpuMemory.writeptr - s_SpuMemory.samplemem; volatile int wptr_ofs = s_SpuMemory.writeptr - s_SpuMemory.samplemem;
if (wptr_ofs+size > SPU_REALMEMSIZE) if (wptr_ofs+size > SPU_REALMEMSIZE)
{ {