Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 20:58:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

types: rename O_UZI to O_UZI_ANIM

Browse source
This commit is contained in:
walkawayy 2024-08-10 11:06:46 -04:00
parent 6cd480b702
commit 2dfca21ee8
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/gun/gun.c
View file

@ -119,7 +119,7 @@ void Gun_Control(void)
case LGT_PISTOLS:
if (g_Lara.pistols.ammo && g_Input.action) {
g_Lara.mesh_ptrs[LM_HEAD] =
g_Meshes[g_Objects[O_UZI].mesh_index + LM_HEAD];
g_Meshes[g_Objects[O_UZI_ANIM].mesh_index + LM_HEAD];
}
if (g_Camera.type != CAM_CINEMATIC && g_Camera.type != CAM_LOOK) {
g_Camera.type = CAM_COMBAT;
@ -130,7 +130,7 @@ void Gun_Control(void)
case LGT_MAGNUMS:
if (g_Lara.magnums.ammo && g_Input.action) {
g_Lara.mesh_ptrs[LM_HEAD] =
g_Meshes[g_Objects[O_UZI].mesh_index + LM_HEAD];
g_Meshes[g_Objects[O_UZI_ANIM].mesh_index + LM_HEAD];
}
if (g_Camera.type != CAM_CINEMATIC && g_Camera.type != CAM_LOOK) {
g_Camera.type = CAM_COMBAT;
@ -141,7 +141,7 @@ void Gun_Control(void)
case LGT_UZIS:
if (g_Lara.uzis.ammo && g_Input.action) {
g_Lara.mesh_ptrs[LM_HEAD] =
g_Meshes[g_Objects[O_UZI].mesh_index + LM_HEAD];
g_Meshes[g_Objects[O_UZI_ANIM].mesh_index + LM_HEAD];
}
if (g_Camera.type != CAM_CINEMATIC && g_Camera.type != CAM_LOOK) {
g_Camera.type = CAM_COMBAT;
@ -152,7 +152,7 @@ void Gun_Control(void)
case LGT_SHOTGUN:
if (g_Lara.shotgun.ammo && g_Input.action) {
g_Lara.mesh_ptrs[LM_HEAD] =
g_Meshes[g_Objects[O_UZI].mesh_index + LM_HEAD];
g_Meshes[g_Objects[O_UZI_ANIM].mesh_index + LM_HEAD];
}
if (g_Camera.type != CAM_CINEMATIC && g_Camera.type != CAM_LOOK) {
g_Camera.type = CAM_COMBAT;

6
src/game/gun/gun_pistols.c
View file

@ -113,7 +113,7 @@ void Gun_Pistols_DrawMeshes(LARA_GUN_TYPE weapon_type)
if (weapon_type == LGT_MAGNUMS) {
object_num = O_MAGNUM_ANIM;
} else if (weapon_type == LGT_UZIS) {
object_num = O_UZI;
object_num = O_UZI_ANIM;
}
g_Lara.mesh_ptrs[LM_HAND_L] =
@ -132,7 +132,7 @@ void Gun_Pistols_UndrawMeshLeft(LARA_GUN_TYPE weapon_type)
if (weapon_type == LGT_MAGNUMS) {
object_num = O_MAGNUM_ANIM;
} else if (weapon_type == LGT_UZIS) {
object_num = O_UZI;
object_num = O_UZI_ANIM;
}
g_Lara.mesh_ptrs[LM_THIGH_L] =
g_Meshes[g_Objects[object_num].mesh_index + LM_THIGH_L];
@ -147,7 +147,7 @@ void Gun_Pistols_UndrawMeshRight(LARA_GUN_TYPE weapon_type)
if (weapon_type == LGT_MAGNUMS) {
object_num = O_MAGNUM_ANIM;
} else if (weapon_type == LGT_UZIS) {
object_num = O_UZI;
object_num = O_UZI_ANIM;
}
g_Lara.mesh_ptrs[LM_THIGH_R] =
g_Meshes[g_Objects[object_num].mesh_index + LM_THIGH_R];

2
src/game/lara/lara.c
View file

@ -633,7 +633,7 @@ void Lara_InitialiseMeshes(int32_t level_num)
holster_object_num = O_MAGNUM_ANIM;
break;
case LGT_UZIS:
holster_object_num = O_UZI;
holster_object_num = O_UZI_ANIM;
break;
}

2
src/global/types.h
View file

@ -29,7 +29,7 @@ typedef enum GAME_OBJECT_ID {
O_PISTOL_ANIM = 1,
O_SHOTGUN_ANIM = 2,
O_MAGNUM_ANIM = 3,
O_UZI = 4,
O_UZI_ANIM = 4,
O_LARA_EXTRA = 5,
O_BACON_LARA = 6,
O_WOLF = 7,