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

- bump version

Browse Source 
- little fixes to DoMissionSound
This commit is contained in:
Ilya Shurumov 2020-10-06 23:21:38 +06:00
parent ca63407d31
commit 34b1d981cb
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src_rebuild/GAME/C/MC_SND.C
View File

@ -834,36 +834,35 @@ void DoMissionSound(void)
bodgevar += 4; bodgevar += 4;
} }
else if (bodgevar == 5) else if (bodgevar >= 4)
{ {
x = (int)(((long long)Mission.timer[0].count * 0x57619f1) >> 0x20); x = (int)(((long long)Mission.timer[0].count * 0x57619f1) >> 0x20);
if ((Mission.timer[0].count / 3000) * 3000 != Mission.timer[0].count + 100) if (Mission.timer[0].count / 3000 * 3000 == Mission.timer[0].count + 100)
return; {
cVar1 = GetMissionSound(29);
Start3DSoundVolPitch(-1, 5, cVar1, -0x382c, -0x114, 0xcd383, -0x5dc, 0x1000 - ((x >> 4) - (Mission.timer[0].count >> 0x1f)));
}
cVar1 = GetMissionSound(29); if (bodgevar >= 5)
Start3DSoundVolPitch(-1, 5, cVar1, -0x382c, -0x114, 0xcd383, -0x5dc, 0x1000 - ((x >> 4) - (Mission.timer[0].count >> 0x1f)));
}
else if (bodgevar < 8) // [A] capture 6 and 7
{
if (bodgevar == 7)
{ {
if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -0x514) if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -0x514)
{ {
cVar1 = GetMissionSound(20); cVar1 = GetMissionSound(20);
Start3DSoundVolPitch(-1, 5, cVar1, -0x2ffb, -0x113, 0xcd61b, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee); Start3DSoundVolPitch(-1, 5, cVar1, -0x2ffb, -0x113, 0xcd61b, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee);
} }
}
// bodgevar 6 & 7 (is this a bug?) if (bodgevar >= 6)
{
if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -800) if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -800)
{ {
cVar1 = GetMissionSound(20); cVar1 = GetMissionSound(20);
Start3DSoundVolPitch(-1, 5, cVar1, -0x34aa, -0xfa, 0xcd5e0, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee); Start3DSoundVolPitch(-1, 5, cVar1, -0x34aa, -0xfa, 0xcd5e0, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee);
} }
} }
} }
break; break;
case 32: case 32:
if (holdall == -1) if (holdall == -1)
@ -914,7 +913,7 @@ void DoMissionSound(void)
bodgevar += 4; bodgevar += 4;
} }
else if (bodgevar == 5) else if (bodgevar >= 5)
{ {
x = (int)(((long long)Mission.timer[0].count * 0x57619f1) >> 0x20); x = (int)(((long long)Mission.timer[0].count * 0x57619f1) >> 0x20);
@ -922,10 +921,17 @@ void DoMissionSound(void)
cVar1 = GetMissionSound(20); cVar1 = GetMissionSound(20);
Start3DSoundVolPitch(-1, 5, cVar1, 0x31330, -0xb1, 0x5e0e0, -0x5dc, 0x1000 - ((x >> 4) - (Mission.timer[0].count >> 0x1f))); Start3DSoundVolPitch(-1, 5, cVar1, 0x31330, -0xb1, 0x5e0e0, -0x5dc, 0x1000 - ((x >> 4) - (Mission.timer[0].count >> 0x1f)));
} }
}
else if (bodgevar < 8) // [A] capture 6 and 7 if (bodgevar >= 6)
{ {
if (bodgevar == 7) if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -800)
{
cVar1 = GetMissionSound(20);
Start3DSoundVolPitch(-1, 5, cVar1, 0x312b0, -0xb1, 0x5f050, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee);
}
}
if (bodgevar >= 7)
{ {
if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -0x514) if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -0x514)
{ {
@ -933,13 +939,6 @@ void DoMissionSound(void)
Start3DSoundVolPitch(-1, 5, cVar1, 0x30ad0, -0xb1, 0x5f050, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee); Start3DSoundVolPitch(-1, 5, cVar1, 0x30ad0, -0xb1, 0x5f050, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee);
} }
} }
// bodgevar 6 & 7 (is this a bug?)
if ((Mission.timer[0].count / 3000) * 3000 == Mission.timer[0].count + -800)
{
cVar1 = GetMissionSound(20);
Start3DSoundVolPitch(-1, 5, cVar1, 0x312b0, -0xb1, 0x5f050, -0x5dc, 0x1000 - Mission.timer[0].count / 0x2ee);
}
} }
break; break;
case 39: case 39:

2
src_rebuild/GAME/VERSION.H
View File

@ -1,7 +1,7 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
#define GAME_VERSION_N "1.0 alpha" #define GAME_VERSION_N "2.0 alpha"
#define GAME_TITLE "REDRIVER2" #define GAME_TITLE "REDRIVER2"
#define GAME_VERSION GAME_TITLE " " GAME_VERSION_N #define GAME_VERSION GAME_TITLE " " GAME_VERSION_N