Skip to content
This repository has been archived by the owner. It is now read-only.

/ re3 Archived

Permalink
Browse files
Merge pull request #1 from GTAmodding/miami 
Miami
  • Loading branch information
@Fire-Head
Fire-Head committed May 26, 2020
2 parents 8ff72f0 + 7f60be9 commit ae8a377f26f9b56b5156b0462c30c5c49af7dd8a
Unified Split
Showing with 20,678 additions and 15,732 deletions.
  1. +15 −0 .travis.yml
  2. +2 −6 eax/eax.h
  3. BIN gamefiles/models/menu.txd
  4. +1 −1 librw
  5. +48 −16 premake5.lua
  6. +1 −1 src/animation/AnimBlendAssocGroup.cpp
  7. +2 −1 src/animation/AnimBlendAssociation.h
  8. +67 −66 src/animation/AnimManager.cpp
  9. +3 −3 src/animation/AnimationId.h
  10. +37 −37 src/audio/AudioCollision.cpp
  11. +6,435 −0 src/audio/AudioLogic.cpp
  12. +685 −9,599 src/audio/AudioManager.cpp
  13. +19 −85 src/audio/AudioManager.h
  14. +1 −1 src/audio/AudioScriptObject.cpp
  15. +0 −130 src/audio/AudioScriptObject.h
  16. +3 −3 src/audio/DMAudio.cpp
  17. +1 −1 src/audio/DMAudio.h
  18. +2 −4 src/audio/MusicManager.cpp
  19. +1 −2 src/audio/PoliceRadio.cpp
  20. +41 −72 src/audio/oal/aldlist.cpp
  21. +33 −13 src/audio/oal/aldlist.h
  22. +2 −2 src/audio/oal/channel.cpp
  23. +0 −1 src/audio/oal/channel.h
  24. +1 −0 src/audio/oal/oal_utils.cpp
  25. +0 −1 src/audio/oal/oal_utils.h
  26. +4 −4 src/audio/oal/stream.cpp
  27. +0 −1 src/audio/oal/stream.h
  28. +1 −1 src/audio/sampman.h
  29. +6 −2 src/audio/sampman_miles.cpp
  30. +368 −0 src/audio/sampman_null.cpp
  31. +10 −6 src/audio/sampman_oal.cpp
  32. +294 −292 src/audio/soundlist.h
  33. +11 −29 src/control/CarAI.cpp
  34. +61 −16 src/control/CarCtrl.cpp
  35. +10 −9 src/control/CarCtrl.h
  36. +2 −0 src/control/Curves.cpp
  37. +15 −20 src/control/Garages.cpp
  38. +0 −1 src/control/Garages.h
  39. +28 −26 src/control/OnscreenTimer.cpp
  40. +3 −2 src/control/OnscreenTimer.h
  41. +3 −2 src/control/Phones.cpp
  42. +88 −128 src/control/Pickups.cpp
  43. +5 −3 src/control/Pickups.h
  44. +25 −2 src/control/Replay.cpp
  45. +1 −1 src/control/Replay.h
  46. +2 −2 src/control/RoadBlocks.cpp
  47. +1 −1 src/control/RoadBlocks.h
  48. +2,647 −618 src/control/Script.cpp
  49. +27 −15 src/control/Script.h
  50. +319 −0 src/control/SetPieces.cpp
  51. +48 −0 src/control/SetPieces.h
  52. +3 −1 src/control/TrafficLights.cpp
  53. +22 −22 src/core/Cam.cpp
  54. +27 −38 src/core/Camera.cpp
  55. +6 −4 src/core/Camera.h
  56. +1 −1 src/core/ColStore.cpp
  57. +20 −17 src/core/Collision.cpp
  58. +3 −3 src/core/Collision.h
  59. +27 −7 src/core/ControllerConfig.cpp
  60. +2 −0 src/core/ControllerConfig.h
  61. +4 −2 src/core/EventList.h
  62. +43 −8 src/core/FileLoader.cpp
  63. +1 −0 src/core/FileLoader.h
  64. +815 −1,170 src/core/Frontend.cpp
  65. +210 −168 src/core/Frontend.h
  66. +30 −7 src/core/Game.cpp
  67. +2 −0 src/core/Game.h
  68. +3 −8 src/core/MenuScreens.h
  69. +70 −34 src/core/Pad.cpp
  70. +1 −1 src/core/Pad.h
  71. +0 −2 src/core/Placeable.cpp
  72. +0 −1 src/core/Placeable.h
  73. +7 −4 src/core/PlayerInfo.cpp
  74. +7 −1 src/core/PlayerInfo.h
  75. +174 −109 src/core/Radar.cpp
  76. +106 −40 src/core/Radar.h
  77. +19 −0 src/core/Stats.cpp
  78. +16 −9 src/core/Stats.h
  79. +17 −17 src/core/Streaming.cpp
  80. +71 −64 src/core/SurfaceTable.cpp
  81. +29 −72 src/core/SurfaceTable.h
  82. +14 −14 src/core/TempColModels.cpp
  83. +1 −1 src/core/Timer.h
  84. +100 −55 src/core/World.cpp
  85. +6 −3 src/core/World.h
  86. +7 −6 src/core/Zones.cpp
  87. +7 −8 src/core/config.h
  88. +88 −99 src/core/main.cpp
  89. +24 −5 src/core/re3.cpp
  90. +22 −0 src/entities/Building.cpp
  91. +2 −0 src/entities/Building.h
  92. +15 −0 src/entities/Dummy.cpp
  93. +2 −0 src/entities/Dummy.h
  94. +343 −212 src/entities/Entity.cpp
  95. +9 −5 src/entities/Entity.h
  96. +421 −146 src/entities/Physical.cpp
  97. +11 −7 src/entities/Physical.h
  98. +1 −1 src/fakerw/fake.cpp
  99. +2 −1 src/math/Matrix.h
  100. +1 −3 src/math/Vector2D.h
  101. +0 −13 src/math/math.cpp
  102. +3 −3 src/modelinfo/ModelIndices.cpp
  103. +245 −323 src/modelinfo/ModelIndices.h
  104. +1 −1 src/modelinfo/PedModelInfo.cpp
  105. +34 −8 src/objects/Object.cpp
  106. +15 −16 src/objects/Object.h
  107. +102 −6 src/peds/CivilianPed.cpp
  108. +5 −0 src/peds/CivilianPed.h
  109. +3 −3 src/peds/CopPed.cpp
  110. +9 −9 src/peds/EmergencyPed.cpp
  111. +58 −11 src/peds/Gangs.cpp
  112. +22 −9 src/peds/Gangs.h
  113. +1,137 −523 src/peds/Ped.cpp
  114. +173 −38 src/peds/Ped.h
  115. +775 −0 src/peds/PedAttractor.cpp
  116. +196 −0 src/peds/PedAttractor.h
  117. +16 −6 src/peds/PedIK.cpp
  118. +1 −1 src/peds/PedIK.h
  119. +87 −58 src/peds/PlayerPed.cpp
  120. +1 −0 src/peds/PlayerPed.h
  121. +15 −60 src/peds/Population.cpp
  122. +1 −1 src/peds/Population.h
  123. +11 −1 src/render/2dEffect.h
  124. +5 −0 src/render/Clouds.cpp
  125. +10 −7 src/render/Coronas.cpp
  126. +4 −2 src/render/Coronas.h
  127. +28 −28 src/render/Credits.cpp
  128. +14 −15 src/render/Draw.cpp
  129. +2 −4 src/render/Draw.h
  130. +2 −2 src/render/Fluff.cpp
  131. +1 −1 src/render/Font.h
  132. +6 −5 src/render/Glass.cpp
  133. +368 −92 src/render/Hud.cpp
  134. +43 −0 src/render/Hud.h
  135. +36 −0 src/render/Occlusion.cpp
  136. +19 −0 src/render/Occlusion.h
  137. +3 −2 src/render/Particle.cpp
  138. +9 −6 src/render/Renderer.cpp
  139. +7 −6 src/render/Shadows.cpp
  140. +2 −2 src/render/Skidmarks.cpp
  141. +1 −0 src/render/SpecialFX.cpp
  142. +2 −0 src/render/SpecialFX.h
  143. +2 −2 src/render/Sprite.cpp
  144. +7 −8 src/render/Sprite2d.cpp
  145. +6 −2 src/render/Timecycle.cpp
  146. +2 −2 src/render/Timecycle.h
  147. +118 −66 src/render/Weather.cpp
  148. +11 −17 src/render/Weather.h
  149. +8 −0 src/render/WindModifiers.cpp
  150. +7 −0 src/render/WindModifiers.h
  151. +3 −3 src/rw/Lights.cpp
  152. +11 −0 src/rw/RwHelper.cpp
  153. +2 −0 src/rw/VisibilityPlugins.cpp
  154. +6 −2 src/save/GenericGameStorage.cpp
  155. +2 −1 src/save/GenericGameStorage.h
  156. +17 −17 src/skel/glfw/glfw.cpp
  157. +1 −1 src/skel/platform.h
  158. +8 −8 src/skel/skeleton.cpp
  159. +9 −9 src/skel/skeleton.h
  160. BIN src/skel/win/gta3.ico
  161. BIN src/skel/win/gtavc.ico
  162. +28 −18 src/skel/win/win.cpp
  163. +1 −1 src/skel/win/win.rc
  164. +220 −42 src/text/Text.cpp
  165. +44 −3 src/text/Text.h
  166. +108 −90 src/vehicles/Automobile.cpp
  167. +6 −2 src/vehicles/Automobile.h
  168. +78 −1 src/vehicles/Boat.cpp
  169. +1 −0 src/vehicles/Boat.h
  170. +3 −2 src/vehicles/CarGen.cpp
  171. +9 −4 src/vehicles/Cranes.cpp
  172. +191 −55 src/vehicles/HandlingMgr.cpp
  173. +73 −5 src/vehicles/HandlingMgr.h
  174. +1 −53 src/vehicles/Heli.cpp
  175. +2 −0 src/vehicles/Plane.cpp
  176. +1,294 −235 src/vehicles/Vehicle.cpp
  177. +76 −21 src/vehicles/Vehicle.h
  178. +1 −1 src/weapons/ShotInfo.cpp
  179. +586 −164 src/weapons/Weapon.cpp
  180. +9 −6 src/weapons/Weapon.h
  181. +32 −14 src/weapons/WeaponInfo.cpp
  182. +2 −1 src/weapons/WeaponInfo.h
  183. +30 −12 src/weapons/WeaponType.h
15 .travis.yml
View file
@@ -0,0 +1,15 @@
language: cpp
os: linux
dist: focal
matrix:
include:
- env: TARGET=release_linux-amd64-librw_gl3_glfw-oal
- env: TARGET=debug_linux-amd64-librw_gl3_glfw-oal
script:
- sudo apt-get update
- sudo apt-get -y install linux-libc-dev libopenal-dev libglew-dev libglfw3-dev libsndfile1-dev libmpg123-dev gcc-8-multilib g++-8-multilib
- mkdir -p "$TRAVIS_BUILD_DIR/build"
- cd "$TRAVIS_BUILD_DIR"
- ./premake5Linux --with-librw gmake2
- cd build
- CC=gcc-8 CXX=g++-8 make config=$TARGET -j4 verbose=1
8 eax/eax.h
View file
@@ -12,7 +12,7 @@
extern "C" { extern "C" {
#endif // __cplusplus #endif // __cplusplus


#ifndef OPENAL #ifndef AUDIO_OAL
#include <dsound.h> #include <dsound.h>


/* /*
@@ -49,13 +49,9 @@ extern "C" {
typedef void (CDECL *LPGETCURRENTVERSION)(LPDWORD major, LPDWORD minor); typedef void (CDECL *LPGETCURRENTVERSION)(LPDWORD major, LPDWORD minor);




#else // OPENAL #else // AUDIO_OAL
#ifndef _WIN32
#include <AL/al.h> #include <AL/al.h>
#include <string.h> #include <string.h>
#else
#include <al.h>
#endif


#ifndef GUID_DEFINED #ifndef GUID_DEFINED
#define GUID_DEFINED #define GUID_DEFINED
BIN -1.69 MB (83%) gamefiles/models/menu.txd
View file
Binary file not shown.
2 librw
Submodule librw updated 50 files
+3 −0 premake5.lua
+3 −2 src/base.cpp
+1 −0 src/d3d/d3d9matfx.cpp
+45 −0 src/gl/gl2_shaders/Makefile
+26 −0 src/gl/gl2_shaders/default.vert
+28 −0 src/gl/gl2_shaders/default_vs_gl2.inc
+15 −0 src/gl/gl2_shaders/header.frag
+72 −0 src/gl/gl2_shaders/header.vert
+17 −0 src/gl/gl2_shaders/header_fs.inc
+74 −0 src/gl/gl2_shaders/header_vs.inc
+20 −0 src/gl/gl2_shaders/im2d.vert
+22 −0 src/gl/gl2_shaders/im2d_gl2.inc
+18 −0 src/gl/gl2_shaders/im3d.vert
+20 −0 src/gl/gl2_shaders/im3d_gl2.inc
+32 −0 src/gl/gl2_shaders/matfx_env.frag
+30 −0 src/gl/gl2_shaders/matfx_env.vert
+66 −0 src/gl/gl2_shaders/matfx_gl2.inc
+16 −0 src/gl/gl2_shaders/simple.frag
+18 −0 src/gl/gl2_shaders/simple_fs_gl2.inc
+37 −0 src/gl/gl2_shaders/skin.vert
+39 −0 src/gl/gl2_shaders/skin_gl2.inc
+395 −97 src/gl/gl3device.cpp
+71 −32 src/gl/gl3immed.cpp
+14 −3 src/gl/gl3matfx.cpp
+15 −2 src/gl/gl3pipe.cpp
+56 −6 src/gl/gl3raster.cpp
+7 −1 src/gl/gl3render.cpp
+69 −1 src/gl/gl3shader.cpp
+22 −10 src/gl/gl3skin.cpp
+12 −3 src/gl/rwgl3.h
+1 −1 src/gl/rwgl3shader.h
+6 −1 src/gl/shaders/Makefile
+2 −24 src/gl/shaders/default.vert
+2 −24 src/gl/shaders/default_vs_gl3.inc
+24 −0 src/gl/shaders/header.frag
+77 −54 src/gl/shaders/header.vert
+26 −0 src/gl/shaders/header_fs.inc
+78 −54 src/gl/shaders/header_vs.inc
+1 −0 src/gl/shaders/im2d.vert
+1 −0 src/gl/shaders/im2d_gl3.inc
+1 −26 src/gl/shaders/matfx_env.frag
+2 −24 src/gl/shaders/matfx_env.vert
+4 −50 src/gl/shaders/matfx_gl3.inc
+1 −26 src/gl/shaders/simple.frag
+1 −26 src/gl/shaders/simple_fs_gl3.inc
+4 −24 src/gl/shaders/skin.vert
+4 −24 src/gl/shaders/skin_gl3.inc
+14 −0 src/raster.cpp
+11 −0 src/rwbase.h
+1 −0 src/rwobjects.h
64 premake5.lua
View file
@@ -23,6 +23,22 @@ else
Librw = os.getenv("LIBRW") or "librw" Librw = os.getenv("LIBRW") or "librw"
end end


function getsys(a)
if a == 'windows' then
return 'win'
end
return a
end

function getarch(a)
if a == 'x86_64' then
return 'amd64'
elseif a == 'ARM' then
return 'arm'
end
return a
end

workspace "reVC" workspace "reVC"
language "C++" language "C++"
configurations { "Debug", "Release" } configurations { "Debug", "Release" }
@@ -35,11 +51,16 @@ workspace "reVC"
"win-x86-RW33_d3d8-mss", "win-x86-RW33_d3d8-mss",
"win-x86-librw_d3d9-mss", "win-x86-librw_d3d9-mss",
"win-x86-librw_gl3_glfw-mss", "win-x86-librw_gl3_glfw-mss",
"win-x86-RW33_d3d8-oal",
"win-x86-librw_d3d9-oal",
"win-x86-librw_gl3_glfw-oal",
} }


filter { "system:linux" } filter { "system:linux" }
platforms { platforms {
"linux-x86-librw_gl3_glfw-oal", "linux-x86-librw_gl3_glfw-oal",
"linux-amd64-librw_gl3_glfw-oal",
"linux-arm-librw_gl3_glfw-oal",
} }


filter "configurations:Debug" filter "configurations:Debug"
@@ -58,6 +79,12 @@ workspace "reVC"
filter { "platforms:*x86*" } filter { "platforms:*x86*" }
architecture "x86" architecture "x86"


filter { "platforms:*amd64*" }
architecture "amd64"

filter { "platforms:*arm*" }
architecture "ARM"

filter { "platforms:*librw_d3d9*" } filter { "platforms:*librw_d3d9*" }
defines { "RW_D3D9" } defines { "RW_D3D9" }
if(not _OPTIONS["with-librw"]) then if(not _OPTIONS["with-librw"]) then
@@ -68,17 +95,12 @@ workspace "reVC"
defines { "RW_GL3" } defines { "RW_GL3" }
includedirs { path.join(_OPTIONS["glfwdir"], "include") } includedirs { path.join(_OPTIONS["glfwdir"], "include") }
includedirs { path.join(_OPTIONS["glewdir"], "include") } includedirs { path.join(_OPTIONS["glewdir"], "include") }

filter "platforms:win*librw_gl3_glfw*"
defines { "GLEW_STATIC" }
if(not _OPTIONS["with-librw"]) then if(not _OPTIONS["with-librw"]) then
libdirs { path.join(Librw, "lib/win-x86-gl3/%{cfg.buildcfg}") } libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
end end


filter "platforms:linux*librw_gl3_glfw*" filter "platforms:win*librw_gl3_glfw*"
if(not _OPTIONS["with-librw"]) then defines { "GLEW_STATIC" }
libdirs { path.join(Librw, "lib/linux-x86-gl3/%{cfg.buildcfg}") }
end


filter {} filter {}


@@ -164,12 +186,16 @@ project "reVC"
includedirs { "src/weapons" } includedirs { "src/weapons" }
includedirs { "src/extras" } includedirs { "src/extras" }
includedirs { "eax" } includedirs { "eax" }

includedirs { "milessdk/include" }
includedirs { "eax" }

libdirs { "milessdk/lib" }


filter "platforms:*mss"
defines { "AUDIO_MSS" }
includedirs { "milessdk/include" }
libdirs { "milessdk/lib" }

filter "platforms:*oal"
defines { "AUDIO_OAL" }

filter {}
if(os.getenv("GTA_VC_RE_DIR")) then if(os.getenv("GTA_VC_RE_DIR")) then
setpaths("$(GTA_VC_RE_DIR)/", "%(cfg.buildtarget.name)", "") setpaths("$(GTA_VC_RE_DIR)/", "%(cfg.buildtarget.name)", "")
end end
@@ -181,9 +207,15 @@ project "reVC"
characterset ("MBCS") characterset ("MBCS")
targetextension ".exe" targetextension ".exe"


filter "platforms:linux*" filter "platforms:win*oal"
targetextension ".elf" includedirs { "openal-soft/include" }
defines { "OPENAL" } includedirs { "libsndfile/include" }
includedirs { "mpg123/include" }
libdirs { "openal-soft/libs/Win32" }
libdirs { "libsndfile/lib" }
libdirs { "mpg123/lib" }

filter "platforms:linux*oal"
links { "openal", "mpg123", "sndfile", "pthread" } links { "openal", "mpg123", "sndfile", "pthread" }


filter "platforms:*RW33*" filter "platforms:*RW33*"
2 src/animation/AnimBlendAssocGroup.cpp
View file
@@ -104,7 +104,7 @@ strcmpIgnoringDigits(const char *s1, const char *s2)
c2 = toupper(c2); c2 = toupper(c2);
#endif #endif


if(c1 != c2) if(c1 && c2 && c1 != c2)
return false; return false;
} }
} }
3 src/animation/AnimBlendAssociation.h
View file
@@ -84,7 +84,8 @@ class CAnimBlendAssociation


void SetRun(void) { flags |= ASSOC_RUNNING; } void SetRun(void) { flags |= ASSOC_RUNNING; }


inline float GetTimeLeft() { return hierarchy->totalLength - currentTime; } float GetTimeLeft() { return hierarchy->totalLength - currentTime; }
float GetProgress() { return currentTime / hierarchy->totalLength; }


static CAnimBlendAssociation *FromLink(CAnimBlendLink *l) { static CAnimBlendAssociation *FromLink(CAnimBlendLink *l) {
return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link)); return (CAnimBlendAssociation*)((uint8*)l - offsetof(CAnimBlendAssociation, link));
133 src/animation/AnimManager.cpp
View file
@@ -134,13 +134,13 @@ AnimAssocDesc aStdAnimDescs[] = {
{ ANIM_DRIVE_LOW_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_DRIVE_LOW_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_DRIVEBY_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_DRIVEBY_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_DRIVEBY_L_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_DRIVEBY_LOW_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_DRIVEBY_L_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_DRIVEBY_LOW_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT | ASSOC_DRIVING }, { ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT | ASSOC_DRIVING },
{ ANIM_DRIVE_BOAT_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_DRIVE_BOAT_L, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_DRIVE_BOAT_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_DRIVE_BOAT_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_DRIVE_BOAT_BACK, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING }, { ANIM_BOAT_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_DRIVING },
{ ANIM_BIKE_PICKUP_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_BIKE_PICKUP_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
{ ANIM_BIKE_PICKUP_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_BIKE_PICKUP_L, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
{ ANIM_BIKE_PULLUP_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_BIKE_PULLUP_R, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
@@ -899,70 +899,71 @@ char const* aChainsawStrafeRightAnimations[] = {
}; };





#define awc(a) ARRAY_SIZE(a), a
const AnimAssocDefinition CAnimManager::ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_GROUPS] = { const AnimAssocDefinition CAnimManager::ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_GROUPS] = {
{ "man", "ped", MI_COP, 173, aStdAnimations, aStdAnimDescs }, { "man", "ped", MI_COP, awc(aStdAnimations), aStdAnimDescs },
{ "van", "van", MI_COP, 8, aVanAnimations, aVanAnimDescs }, { "van", "van", MI_COP, awc(aVanAnimations), aVanAnimDescs },
{ "coach", "coach", MI_COP, 5, aCoachAnimations, aCoachAnimDescs }, { "coach", "coach", MI_COP, awc(aCoachAnimations), aCoachAnimDescs },
{ "bikes", "bikes", MI_COP, 18, aBikesAnimations, aBikeAnimDescs }, { "bikes", "bikes", MI_COP, awc(aBikesAnimations), aBikeAnimDescs },
{ "bikev", "bikev", MI_COP, 18, aBikevAnimations, aBikeAnimDescs }, { "bikev", "bikev", MI_COP, awc(aBikevAnimations), aBikeAnimDescs },
{ "bikeh", "bikeh", MI_COP, 18, aBikehAnimations, aBikeAnimDescs }, { "bikeh", "bikeh", MI_COP, awc(aBikehAnimations), aBikeAnimDescs },
{ "biked", "biked", MI_COP, 18, aBikedAnimations, aBikeAnimDescs }, { "biked", "biked", MI_COP, awc(aBikedAnimations), aBikeAnimDescs },
{ "unarmed", "ped", MI_COP, 3, aUnarmedAnimations, aMeleeAnimDescs }, { "unarmed", "ped", MI_COP, awc(aUnarmedAnimations), aMeleeAnimDescs },
{ "screwdrv", "ped", MI_COP, 5, aScrewdriverAnimations, aMeleeAnimDescs }, { "screwdrv", "ped", MI_COP, awc(aScrewdriverAnimations), aMeleeAnimDescs },
{ "knife", "knife", MI_COP, 5, aKnifeAnimations, aMeleeAnimDescs }, { "knife", "knife", MI_COP, awc(aKnifeAnimations), aMeleeAnimDescs },
{ "baseball", "baseball", MI_COP, 5, aBaseballbatAnimations, aSwingAnimDescs }, { "baseball", "baseball", MI_COP, awc(aBaseballbatAnimations), aSwingAnimDescs },
{ "golfclub", "baseball", MI_COP, 5, aGolfclubAnimations, aSwingAnimDescs }, { "golfclub", "baseball", MI_COP, awc(aGolfclubAnimations), aSwingAnimDescs },
{ "chainsaw", "chainsaw", MI_COP, 3, aChainsawAnimations, aMeleeAnimDescs }, { "chainsaw", "chainsaw", MI_COP, awc(aChainsawAnimations), aMeleeAnimDescs },
{ "python", "python", MI_COP, 4, aPythonAnimations, aWeaponAnimDescs }, { "python", "python", MI_COP, awc(aPythonAnimations), aWeaponAnimDescs },
{ "colt45", "colt45", MI_COP, 5, aColtAnimations, aWeaponAnimDescs }, { "colt45", "colt45", MI_COP, awc(aColtAnimations), aWeaponAnimDescs },
{ "shotgun", "shotgun", MI_COP, 2, aShotgunAnimations, aWeaponAnimDescs }, { "shotgun", "shotgun", MI_COP, awc(aShotgunAnimations), aWeaponAnimDescs },
{ "buddy", "buddy", MI_COP, 2, aBuddyAnimations, aWeaponAnimDescs }, { "buddy", "buddy", MI_COP, awc(aBuddyAnimations), aWeaponAnimDescs },
{ "tec", "tec", MI_COP, 4, aTecAnimations, aWeaponAnimDescs }, { "tec", "tec", MI_COP, awc(aTecAnimations), aWeaponAnimDescs },
{ "uzi", "uzi", MI_COP, 4, aUziAnimations, aWeaponAnimDescs }, { "uzi", "uzi", MI_COP, awc(aUziAnimations), aWeaponAnimDescs },
{ "rifle", "rifle", MI_COP, 4, aRifleAnimations, aWeaponAnimDescs }, { "rifle", "rifle", MI_COP, awc(aRifleAnimations), aWeaponAnimDescs },
{ "m60", "m60", MI_COP, 3, aM60Animations, aWeaponAnimDescs }, { "m60", "m60", MI_COP, awc(aM60Animations), aWeaponAnimDescs },
{ "sniper", "sniper", MI_COP, 1, aSniperAnimations, aWeaponAnimDescs }, { "sniper", "sniper", MI_COP, awc(aSniperAnimations), aWeaponAnimDescs },
{ "grenade", "grenade", MI_COP, 3, aThrowAnimations, aWeaponAnimDescs }, { "grenade", "grenade", MI_COP, awc(aThrowAnimations), aWeaponAnimDescs },
{ "flame", "flame", MI_COP, 1, aFlamethrowerAnimations, aWeaponAnimDescs }, { "flame", "flame", MI_COP, awc(aFlamethrowerAnimations), aWeaponAnimDescs },
{ "medic", "medic", MI_COP, 1, aMedicAnimations, aMedicAnimDescs }, { "medic", "medic", MI_COP, awc(aMedicAnimations), aMedicAnimDescs },
{ "sunbathe", "sunbathe", MI_COP, 1, aSunbatheAnimations, aSunbatheAnimDescs }, { "sunbathe", "sunbathe", MI_COP, 1, aSunbatheAnimations, aSunbatheAnimDescs }, // NB: not using awc here!
{ "playidles", "playidles", MI_COP, 4, aPlayerIdleAnimations, aPlayerIdleAnimDescs }, { "playidles", "playidles", MI_COP, awc(aPlayerIdleAnimations), aPlayerIdleAnimDescs },
{ "riot", "riot", MI_COP, 7, aRiotAnimations, aRiotAnimDescs }, { "riot", "riot", MI_COP, awc(aRiotAnimations), aRiotAnimDescs },
{ "strip", "strip", MI_COP, 7, aStripAnimations, aStripAnimDescs }, { "strip", "strip", MI_COP, awc(aStripAnimations), aStripAnimDescs },
{ "lance", "lance", MI_COP, 1, aLanceAnimations, aSunbatheAnimDescs }, { "lance", "lance", MI_COP, awc(aLanceAnimations), aSunbatheAnimDescs },
{ "player", "ped", MI_COP, 5, aPlayerAnimations, aStdAnimDescs }, { "player", "ped", MI_COP, awc(aPlayerAnimations), aStdAnimDescs },
{ "playerrocket", "ped", MI_COP, 5, aPlayerWithRocketAnimations, aStdAnimDescs }, { "playerrocket", "ped", MI_COP, awc(aPlayerWithRocketAnimations), aStdAnimDescs },
{ "player1armed", "ped", MI_COP, 5, aPlayer1ArmedAnimations, aStdAnimDescs }, { "player1armed", "ped", MI_COP, awc(aPlayer1ArmedAnimations), aStdAnimDescs },
{ "player2armed", "ped", MI_COP, 5, aPlayer2ArmedAnimations, aStdAnimDescs }, { "player2armed", "ped", MI_COP, awc(aPlayer2ArmedAnimations), aStdAnimDescs },
{ "playerBBBat", "ped", MI_COP, 5, aPlayerBBBatAnimations, aStdAnimDescs }, { "playerBBBat", "ped", MI_COP, awc(aPlayerBBBatAnimations), aStdAnimDescs },
{ "playercsaw", "ped", MI_COP, 5, aPlayerChainsawAnimations, aStdAnimDescs }, { "playercsaw", "ped", MI_COP, awc(aPlayerChainsawAnimations), aStdAnimDescs },
{ "shuffle", "ped", MI_COP, 4, aShuffleAnimations, aStdAnimDescs }, { "shuffle", "ped", MI_COP, awc(aShuffleAnimations), aStdAnimDescs },
{ "oldman", "ped", MI_COP, 4, aOldAnimations, aStdAnimDescs }, { "oldman", "ped", MI_COP, awc(aOldAnimations), aStdAnimDescs },
{ "gang1", "ped", MI_COP, 4, aGang1Animations, aStdAnimDescs }, { "gang1", "ped", MI_COP, awc(aGang1Animations), aStdAnimDescs },
{ "gang2", "ped", MI_COP, 4, aGang2Animations, aStdAnimDescs }, { "gang2", "ped", MI_COP, awc(aGang2Animations), aStdAnimDescs },
{ "fatman", "ped", MI_COP, 4, aFatAnimations, aStdAnimDescs }, { "fatman", "ped", MI_COP, awc(aFatAnimations), aStdAnimDescs },
{ "oldfatman", "ped", MI_COP, 4, aOldFatAnimations, aStdAnimDescs }, { "oldfatman", "ped", MI_COP, awc(aOldFatAnimations), aStdAnimDescs },
{ "jogger", "ped", MI_COP, 4, aJoggerAnimations, aStdAnimDescs }, { "jogger", "ped", MI_COP, awc(aJoggerAnimations), aStdAnimDescs },
{ "woman", "ped", MI_COP, 4, aStdWomanAnimations, aStdAnimDescs }, { "woman", "ped", MI_COP, awc(aStdWomanAnimations), aStdAnimDescs },
{ "shopping", "ped", MI_COP, 4, aWomanShopAnimations, aStdAnimDescs }, { "shopping", "ped", MI_COP, awc(aWomanShopAnimations), aStdAnimDescs },
{ "busywoman", "ped", MI_COP, 4, aBusyWomanAnimations, aStdAnimDescs }, { "busywoman", "ped", MI_COP, awc(aBusyWomanAnimations), aStdAnimDescs },
{ "sexywoman", "ped", MI_COP, 4, aSexyWomanAnimations, aStdAnimDescs }, { "sexywoman", "ped", MI_COP, awc(aSexyWomanAnimations), aStdAnimDescs },
{ "fatwoman", "ped", MI_COP, 4, aFatWomanAnimations, aStdAnimDescs }, { "fatwoman", "ped", MI_COP, awc(aFatWomanAnimations), aStdAnimDescs },
{ "oldwoman", "ped", MI_COP, 4, aOldWomanAnimations, aStdAnimDescs }, { "oldwoman", "ped", MI_COP, awc(aOldWomanAnimations), aStdAnimDescs },
{ "jogwoman", "ped", MI_COP, 4, aJoggerWomanAnimations, aStdAnimDescs }, { "jogwoman", "ped", MI_COP, awc(aJoggerWomanAnimations), aStdAnimDescs },
{ "panicchunky", "ped", MI_COP, 4, aPanicChunkyAnimations, aStdAnimDescs }, { "panicchunky", "ped", MI_COP, awc(aPanicChunkyAnimations), aStdAnimDescs },
{ "skate", "skate", MI_COP, 4, aSkateAnimations, aStdAnimDescs }, { "skate", "skate", MI_COP, awc(aSkateAnimations), aStdAnimDescs },
{ "playerback", "ped", MI_COP, 5, aPlayerStrafeBackAnimations, aStdAnimDescs }, { "playerback", "ped", MI_COP, awc(aPlayerStrafeBackAnimations), aStdAnimDescs },
{ "playerleft", "ped", MI_COP, 5, aPlayerStrafeLeftAnimations, aStdAnimDescsSide }, { "playerleft", "ped", MI_COP, awc(aPlayerStrafeLeftAnimations), aStdAnimDescsSide },
{ "playerright", "ped", MI_COP, 5, aPlayerStrafeRightAnimations, aStdAnimDescsSide }, { "playerright", "ped", MI_COP, awc(aPlayerStrafeRightAnimations), aStdAnimDescsSide },
{ "rocketback", "ped", MI_COP, 5, aRocketStrafeBackAnimations, aStdAnimDescs }, { "rocketback", "ped", MI_COP, awc(aRocketStrafeBackAnimations), aStdAnimDescs },
{ "rocketleft", "ped", MI_COP, 5, aRocketStrafeLeftAnimations, aStdAnimDescsSide }, { "rocketleft", "ped", MI_COP, awc(aRocketStrafeLeftAnimations), aStdAnimDescsSide },
{ "rocketright", "ped", MI_COP, 5, aRocketStrafeRightAnimations, aStdAnimDescsSide }, { "rocketright", "ped", MI_COP, awc(aRocketStrafeRightAnimations), aStdAnimDescsSide },
{ "csawback", "ped", MI_COP, 5, aChainsawStrafeBackAnimations, aStdAnimDescs }, { "csawback", "ped", MI_COP, awc(aChainsawStrafeBackAnimations), aStdAnimDescs },
{ "csawleft", "ped", MI_COP, 5, aChainsawStrafeLeftAnimations, aStdAnimDescsSide }, { "csawleft", "ped", MI_COP, awc(aChainsawStrafeLeftAnimations), aStdAnimDescsSide },
{ "csawright", "ped", MI_COP, 5, aChainsawStrafeRightAnimations, aStdAnimDescsSide }, { "csawright", "ped", MI_COP, awc(aChainsawStrafeRightAnimations), aStdAnimDescsSide },
}; };
#undef awc


void void
CAnimManager::Initialise(void) CAnimManager::Initialise(void)
6 src/animation/AnimationId.h
View file
@@ -118,13 +118,13 @@ enum AnimationId
ANIM_DRIVE_LOW_R, ANIM_DRIVE_LOW_R,
ANIM_DRIVEBY_L, ANIM_DRIVEBY_L,
ANIM_DRIVEBY_R, ANIM_DRIVEBY_R,
ANIM_DRIVEBY_L_L, // TODO: is this LOW? ANIM_DRIVEBY_LOW_L,
ANIM_DRIVEBY_L_R, ANIM_DRIVEBY_LOW_R,
ANIM_CAR_LB, ANIM_CAR_LB,
ANIM_DRIVE_BOAT, ANIM_DRIVE_BOAT,
ANIM_DRIVE_BOAT_L, ANIM_DRIVE_BOAT_L,
ANIM_DRIVE_BOAT_R, ANIM_DRIVE_BOAT_R,
ANIM_DRIVE_BOAT_BACK, ANIM_BOAT_LB,


ANIM_BIKE_PICKUP_R, ANIM_BIKE_PICKUP_R,
ANIM_BIKE_PICKUP_L, ANIM_BIKE_PICKUP_L,

0 comments on commit ae8a377

Please sign in to comment.