Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
sync
  • Loading branch information
Nick007J committed Jul 23, 2021
1 parent a4b92fe commit a7e673c2ec6a5ed25f3bae8caab90e2113158c03
Showing with 277 additions and 66 deletions.
  1. +1 −1 .vscode/settings.json
  2. +3 −3 codewarrior/re3.mcp.xml
  3. +2 −2 premake5.lua
  4. +106 −4 src/audio/sampman.h
  5. +109 −23 src/audio/sampman_miles.cpp
  6. +22 −17 src/audio/sampman_oal.cpp
  7. +3 −0 src/control/Garages.cpp
  8. +15 −13 src/control/Script.cpp
  9. +1 −0 src/control/Script.h
  10. +4 −0 src/control/Script6.cpp
  11. +1 −1 src/core/Fire.cpp
  12. +2 −2 src/core/config.h
  13. +8 −0 src/peds/PedFight.cpp
  14. 0 src/{render → renderer}/2dEffect.h
  15. 0 src/{render → renderer}/Antennas.cpp
  16. 0 src/{render → renderer}/Antennas.h
  17. 0 src/{render → renderer}/Clouds.cpp
  18. 0 src/{render → renderer}/Clouds.h
  19. 0 src/{render → renderer}/Console.cpp
  20. 0 src/{render → renderer}/Console.h
  21. 0 src/{render → renderer}/Coronas.cpp
  22. 0 src/{render → renderer}/Coronas.h
  23. 0 src/{render → renderer}/Credits.cpp
  24. 0 src/{render → renderer}/Credits.h
  25. 0 src/{render → renderer}/Draw.cpp
  26. 0 src/{render → renderer}/Draw.h
  27. 0 src/{render → renderer}/Fluff.cpp
  28. 0 src/{render → renderer}/Fluff.h
  29. 0 src/{render → renderer}/Font.cpp
  30. 0 src/{render → renderer}/Font.h
  31. 0 src/{render → renderer}/Glass.cpp
  32. 0 src/{render → renderer}/Glass.h
  33. 0 src/{render → renderer}/Hud.cpp
  34. 0 src/{render → renderer}/Hud.h
  35. 0 src/{render → renderer}/Instance.cpp
  36. 0 src/{render → renderer}/Instance.h
  37. 0 src/{render → renderer}/Lines.cpp
  38. 0 src/{render → renderer}/Lines.h
  39. 0 src/{render → renderer}/MBlur.cpp
  40. 0 src/{render → renderer}/MBlur.h
  41. 0 src/{render → renderer}/Particle.cpp
  42. 0 src/{render → renderer}/Particle.h
  43. 0 src/{render → renderer}/ParticleMgr.cpp
  44. 0 src/{render → renderer}/ParticleMgr.h
  45. 0 src/{render → renderer}/ParticleType.h
  46. 0 src/{render → renderer}/PlayerSkin.cpp
  47. 0 src/{render → renderer}/PlayerSkin.h
  48. 0 src/{render → renderer}/PointLights.cpp
  49. 0 src/{render → renderer}/PointLights.h
  50. 0 src/{render → renderer}/RenderBuffer.cpp
  51. 0 src/{render → renderer}/RenderBuffer.h
  52. 0 src/{render → renderer}/Renderer.cpp
  53. 0 src/{render → renderer}/Renderer.h
  54. 0 src/{render → renderer}/Rubbish.cpp
  55. 0 src/{render → renderer}/Rubbish.h
  56. 0 src/{render → renderer}/Shadows.cpp
  57. 0 src/{render → renderer}/Shadows.h
  58. 0 src/{render → renderer}/Skidmarks.cpp
  59. 0 src/{render → renderer}/Skidmarks.h
  60. 0 src/{render → renderer}/SpecialFX.cpp
  61. 0 src/{render → renderer}/SpecialFX.h
  62. 0 src/{render → renderer}/Sprite.cpp
  63. 0 src/{render → renderer}/Sprite.h
  64. 0 src/{render → renderer}/Sprite2d.cpp
  65. 0 src/{render → renderer}/Sprite2d.h
  66. 0 src/{render → renderer}/TexList.cpp
  67. 0 src/{render → renderer}/TexList.h
  68. 0 src/{render → renderer}/Timecycle.cpp
  69. 0 src/{render → renderer}/Timecycle.h
  70. 0 src/{render → renderer}/WaterCannon.cpp
  71. 0 src/{render → renderer}/WaterCannon.h
  72. 0 src/{render → renderer}/WaterLevel.cpp
  73. 0 src/{render → renderer}/WaterLevel.h
  74. 0 src/{render → renderer}/Weather.cpp
  75. 0 src/{render → renderer}/Weather.h
@@ -13,7 +13,7 @@
"src/modelinfo",
"src/objects",
"src/peds",
"src/render",
"src/renderer",
"src/rw",
"src/save",
"src/skel",
@@ -187,7 +187,7 @@
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
<SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
</SETTING>
@@ -6424,7 +6424,7 @@
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
<SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
</SETTING>
@@ -14281,7 +14281,7 @@
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
</GROUP>
<GROUP><NAME>render</NAME>
<GROUP><NAME>renderer</NAME>
<FILEREF>
<TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
@@ -264,7 +264,7 @@ project "re3"
files { addSrcFiles("src/modelinfo") }
files { addSrcFiles("src/objects") }
files { addSrcFiles("src/peds") }
files { addSrcFiles("src/render") }
files { addSrcFiles("src/renderer") }
files { addSrcFiles("src/rw") }
files { addSrcFiles("src/save") }
files { addSrcFiles("src/skel") }
@@ -293,7 +293,7 @@ project "re3"
includedirs { "src/modelinfo" }
includedirs { "src/objects" }
includedirs { "src/peds" }
includedirs { "src/render" }
includedirs { "src/renderer" }
includedirs { "src/rw" }
includedirs { "src/save/" }
includedirs { "src/skel/" }
@@ -259,8 +259,8 @@ static char StreamedNameTable[][25] = {
"AUDIO\\door_2.OPUS", "AUDIO\\door_3.OPUS", "AUDIO\\door_4.OPUS", "AUDIO\\door_5.OPUS", "AUDIO\\door_6.OPUS", "AUDIO\\t3_a.OPUS",
"AUDIO\\t3_b.OPUS", "AUDIO\\t3_c.OPUS", "AUDIO\\k1_b.OPUS", "AUDIO\\cat1.OPUS"};
#else
#if defined(PS2_AUDIO_PATHS)
static char StreamedNameTable[][25]=
#ifdef PS2_AUDIO_PATHS
static char PS2StreamedNameTable[][25]=
{
"AUDIO\\MUSIC\\HEAD.VB",
"AUDIO\\MUSIC\\CLASS.VB",
@@ -357,7 +357,110 @@ static char StreamedNameTable[][25]=
"AUDIO\\PHONE\\MT_PH4.VB",
"AUDIO\\MUSIC\\MISCOM.VB",
"AUDIO\\MUSIC\\END.VB",
#else
"AUDIO\\lib_a1.WAV",
"AUDIO\\lib_a2.WAV",
"AUDIO\\lib_a.WAV",
"AUDIO\\lib_b.WAV",
"AUDIO\\lib_c.WAV",
"AUDIO\\lib_d.WAV",
"AUDIO\\l2_a.WAV",
"AUDIO\\j4t_1.WAV",
"AUDIO\\j4t_2.WAV",
"AUDIO\\j4t_3.WAV",
"AUDIO\\j4t_4.WAV",
"AUDIO\\j4_a.WAV",
"AUDIO\\j4_b.WAV",
"AUDIO\\j4_c.WAV",
"AUDIO\\j4_d.WAV",
"AUDIO\\j4_e.WAV",
"AUDIO\\j4_f.WAV",
"AUDIO\\j6_1.WAV",
"AUDIO\\j6_a.WAV",
"AUDIO\\j6_b.WAV",
"AUDIO\\j6_c.WAV",
"AUDIO\\j6_d.WAV",
"AUDIO\\t4_a.WAV",
"AUDIO\\s1_a.WAV",
"AUDIO\\s1_a1.WAV",
"AUDIO\\s1_b.WAV",
"AUDIO\\s1_c.WAV",
"AUDIO\\s1_c1.WAV",
"AUDIO\\s1_d.WAV",
"AUDIO\\s1_e.WAV",
"AUDIO\\s1_f.WAV",
"AUDIO\\s1_g.WAV",
"AUDIO\\s1_h.WAV",
"AUDIO\\s1_i.WAV",
"AUDIO\\s1_j.WAV",
"AUDIO\\s1_k.WAV",
"AUDIO\\s1_l.WAV",
"AUDIO\\s3_a.WAV",
"AUDIO\\s3_b.WAV",
"AUDIO\\el3_a.WAV",
"AUDIO\\mf1_a.WAV",
"AUDIO\\mf2_a.WAV",
"AUDIO\\mf3_a.WAV",
"AUDIO\\mf3_b.WAV",
"AUDIO\\mf3_b1.WAV",
"AUDIO\\mf3_c.WAV",
"AUDIO\\mf4_a.WAV",
"AUDIO\\mf4_b.WAV",
"AUDIO\\mf4_c.WAV",
"AUDIO\\a1_a.WAV",
"AUDIO\\a3_a.WAV",
"AUDIO\\a5_a.WAV",
"AUDIO\\a4_a.WAV",
"AUDIO\\a4_b.WAV",
"AUDIO\\a4_c.WAV",
"AUDIO\\a4_d.WAV",
"AUDIO\\k1_a.WAV",
"AUDIO\\k3_a.WAV",
"AUDIO\\r1_a.WAV",
"AUDIO\\r2_a.WAV",
"AUDIO\\r2_b.WAV",
"AUDIO\\r2_c.WAV",
"AUDIO\\r2_d.WAV",
"AUDIO\\r2_e.WAV",
"AUDIO\\r2_f.WAV",
"AUDIO\\r2_g.WAV",
"AUDIO\\r2_h.WAV",
"AUDIO\\r5_a.WAV",
"AUDIO\\r6_a.WAV",
"AUDIO\\r6_a1.WAV",
"AUDIO\\r6_b.WAV",
"AUDIO\\lo2_a.WAV",
"AUDIO\\lo6_a.WAV",
"AUDIO\\yd2_a.WAV",
"AUDIO\\yd2_b.WAV",
"AUDIO\\yd2_c.WAV",
"AUDIO\\yd2_c1.WAV",
"AUDIO\\yd2_d.WAV",
"AUDIO\\yd2_e.WAV",
"AUDIO\\yd2_f.WAV",
"AUDIO\\yd2_g.WAV",
"AUDIO\\yd2_h.WAV",
"AUDIO\\yd2_ass.WAV",
"AUDIO\\yd2_ok.WAV",
"AUDIO\\h5_a.WAV",
"AUDIO\\h5_b.WAV",
"AUDIO\\h5_c.WAV",
"AUDIO\\ammu_a.WAV",
"AUDIO\\ammu_b.WAV",
"AUDIO\\ammu_c.WAV",
"AUDIO\\door_1.WAV",
"AUDIO\\door_2.WAV",
"AUDIO\\door_3.WAV",
"AUDIO\\door_4.WAV",
"AUDIO\\door_5.WAV",
"AUDIO\\door_6.WAV",
"AUDIO\\t3_a.WAV",
"AUDIO\\t3_b.WAV",
"AUDIO\\t3_c.WAV",
"AUDIO\\k1_b.WAV",
"AUDIO\\cat1.WAV"
};
#endif

static char StreamedNameTable[][25] =
{
"AUDIO\\HEAD.WAV",
@@ -455,7 +558,6 @@ static char StreamedNameTable[][25] =
"AUDIO\\MT_PH4.MP3",
"AUDIO\\MISCOM.WAV",
"AUDIO\\END.MP3",
#endif
"AUDIO\\lib_a1.WAV",
"AUDIO\\lib_a2.WAV",
"AUDIO\\lib_a.WAV",

0 comments on commit a7e673c

Please sign in to comment.