Skip to content

Commit

Permalink
misc: drop __cdecl attribute
Browse files Browse the repository at this point in the history
  • Loading branch information
@rr-
rr- committed Dec 25, 2024
1 parent e3d6d8c commit 4ffe5bd
Show file tree
Hide file tree
Showing 309 changed files with 1,486 additions and 1,559 deletions.
48 changes: 24 additions & 24 deletions src/tr2/decomp/decomp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ typedef enum {
LA_VEHICLE_HIT_BACK = 14,
} LARA_ANIM_VEHICLE;

int16_t __cdecl TitleSequence(void)
int16_t TitleSequence(void)
{
GF_N_LoadStrings(-1);

Expand Down Expand Up @@ -113,12 +113,12 @@ int16_t __cdecl TitleSequence(void)
return GFD_EXIT_GAME;
}

void __cdecl Game_SetCutsceneTrack(const int32_t track)
void Game_SetCutsceneTrack(const int32_t track)
{
g_CineTrackID = track;
}

void __cdecl CutscenePlayer_Control(const int16_t item_num)
void CutscenePlayer_Control(const int16_t item_num)
{
ITEM *const item = &g_Items[item_num];
item->rot.y = g_Camera.target_angle;
Expand All @@ -145,7 +145,7 @@ void __cdecl CutscenePlayer_Control(const int16_t item_num)
Item_Animate(item);
}

void __cdecl Lara_Control_Cutscene(const int16_t item_num)
void Lara_Control_Cutscene(const int16_t item_num)
{
ITEM *const item = &g_Items[item_num];
item->rot.y = g_Camera.target_angle;
Expand All @@ -164,7 +164,7 @@ void __cdecl Lara_Control_Cutscene(const int16_t item_num)
Lara_Animate(item);
}

void __cdecl CutscenePlayer1_Initialise(const int16_t item_num)
void CutscenePlayer1_Initialise(const int16_t item_num)
{
OBJECT *const obj = &g_Objects[O_LARA];
obj->draw_routine = Lara_Draw;
Expand All @@ -189,15 +189,15 @@ void __cdecl CutscenePlayer1_Initialise(const int16_t item_num)
g_Lara.hit_direction = -1;
}

void __cdecl CutscenePlayerGen_Initialise(const int16_t item_num)
void CutscenePlayerGen_Initialise(const int16_t item_num)
{
Item_AddActive(item_num);
ITEM *const item = &g_Items[item_num];
item->rot.y = 0;
item->dynamic_light = 0;
}

int32_t __cdecl Level_Initialise(
int32_t Level_Initialise(
const int32_t level_num, const GAMEFLOW_LEVEL_TYPE level_type)
{
g_GameInfo.current_level.num = level_num;
Expand Down Expand Up @@ -261,7 +261,7 @@ int32_t __cdecl Level_Initialise(
return true;
}

int32_t __cdecl Misc_Move3DPosTo3DPos(
int32_t Misc_Move3DPosTo3DPos(
PHD_3DPOS *const src_pos, const PHD_3DPOS *const dst_pos,
const int32_t velocity, const int16_t ang_add)
{
Expand Down Expand Up @@ -309,12 +309,12 @@ int32_t __cdecl Misc_Move3DPosTo3DPos(
// clang-format on
}

int32_t __cdecl LevelCompleteSequence(void)
int32_t LevelCompleteSequence(void)
{
return GFD_EXIT_TO_TITLE;
}

void __cdecl S_Wait(int32_t frames, const bool input_check)
void S_Wait(int32_t frames, const bool input_check)
{
if (input_check) {
while (frames > 0) {
Expand Down Expand Up @@ -354,14 +354,14 @@ void __cdecl S_Wait(int32_t frames, const bool input_check)
}
}

bool __cdecl S_InitialiseSystem(void)
bool S_InitialiseSystem(void)
{
Random_Seed();
Output_CalculateWibbleTable();
return 1;
}

void __cdecl DisplayCredits(void)
void DisplayCredits(void)
{
S_UnloadLevelFile();
if (!Level_Initialise(0, 0)) {
Expand Down Expand Up @@ -412,7 +412,7 @@ void __cdecl DisplayCredits(void)
}
}

void __cdecl IncreaseScreenSize(void)
void IncreaseScreenSize(void)
{
if (g_Config.rendering.sizer < 1.0) {
g_Config.rendering.sizer += 0.08;
Expand All @@ -421,7 +421,7 @@ void __cdecl IncreaseScreenSize(void)
}
}

void __cdecl DecreaseScreenSize(void)
void DecreaseScreenSize(void)
{
if (g_Config.rendering.sizer > 0.44) {
g_Config.rendering.sizer -= 0.08;
Expand All @@ -430,31 +430,31 @@ void __cdecl DecreaseScreenSize(void)
}
}

bool __cdecl S_LoadLevelFile(
bool S_LoadLevelFile(
const char *const file_name, const int32_t level_num,
const GAMEFLOW_LEVEL_TYPE level_type)
{
S_UnloadLevelFile();
return Level_Load(file_name, level_num);
}

void __cdecl S_UnloadLevelFile(void)
void S_UnloadLevelFile(void)
{
strcpy(g_LevelFileName, "");
memset(g_TexturePageBuffer8, 0, sizeof(uint8_t *) * MAX_TEXTURE_PAGES);
memset(g_TexturePageBuffer16, 0, sizeof(uint16_t *) * MAX_TEXTURE_PAGES);
g_TextureInfoCount = 0;
}

void __cdecl GetValidLevelsList(REQUEST_INFO *const req)
void GetValidLevelsList(REQUEST_INFO *const req)
{
Requester_RemoveAllItems(req);
for (int32_t i = 1; i < g_GameFlow.num_levels; i++) {
Requester_AddItem(req, g_GF_LevelNames[i], 0, NULL, 0);
}
}

void __cdecl InitialiseGameFlags(void)
void InitialiseGameFlags(void)
{
for (int32_t i = 0; i < MAX_CD_TRACKS; i++) {
g_MusicTrackFlags[i] = 0;
Expand All @@ -476,7 +476,7 @@ void __cdecl InitialiseGameFlags(void)
g_IsMonkAngry = false;
}

void __cdecl InitialiseLevelFlags(void)
void InitialiseLevelFlags(void)
{
g_SaveGame.statistics.secrets = 0;
g_SaveGame.statistics.timer = 0;
Expand All @@ -487,7 +487,7 @@ void __cdecl InitialiseLevelFlags(void)
g_SaveGame.statistics.medipacks = 0;
}

void __cdecl GetCarriedItems(void)
void GetCarriedItems(void)
{
for (int32_t item_num = 0; item_num < g_LevelItemCount; item_num++) {
ITEM *const item = Item_Get(item_num);
Expand Down Expand Up @@ -517,7 +517,7 @@ void __cdecl GetCarriedItems(void)
}
}

int32_t __cdecl DoShift(
int32_t DoShift(
ITEM *const vehicle, const XYZ_32 *const pos, const XYZ_32 *const old)
{
int32_t x = pos->x >> WALL_SHIFT;
Expand Down Expand Up @@ -602,7 +602,7 @@ int32_t __cdecl DoShift(
return 0;
}

int32_t __cdecl DoDynamics(
int32_t DoDynamics(
const int32_t height, const int32_t fall_speed, int32_t *const out_y)
{
if (height > *out_y) {
Expand All @@ -620,7 +620,7 @@ int32_t __cdecl DoDynamics(
return fall_speed + ((kick - fall_speed) >> 3);
}

int32_t __cdecl GetCollisionAnim(const ITEM *const vehicle, XYZ_32 *const moved)
int32_t GetCollisionAnim(const ITEM *const vehicle, XYZ_32 *const moved)
{
moved->x = vehicle->pos.x - moved->x;
moved->z = vehicle->pos.z - moved->z;
Expand Down Expand Up @@ -648,7 +648,7 @@ int32_t __cdecl GetCollisionAnim(const ITEM *const vehicle, XYZ_32 *const moved)
return 0;
}

void __cdecl InitialiseFinalLevel(void)
void InitialiseFinalLevel(void)
{
g_FinalBossActive = 0;
g_FinalBossCount = 0;
Expand Down
51 changes: 25 additions & 26 deletions src/tr2/decomp/decomp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,31 @@
// they'll need to be properly modularized. The same applies to all files
// within the decomp/ directory which are scheduled for extensive refactoring.

int16_t __cdecl TitleSequence(void);
void __cdecl Game_SetCutsceneTrack(int32_t track);
void __cdecl CutscenePlayer_Control(int16_t item_num);
void __cdecl Lara_Control_Cutscene(int16_t item_num);
void __cdecl CutscenePlayer1_Initialise(int16_t item_num);
void __cdecl CutscenePlayerGen_Initialise(int16_t item_num);
int32_t __cdecl Level_Initialise(
int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type);
int32_t __cdecl Misc_Move3DPosTo3DPos(
int16_t TitleSequence(void);
void Game_SetCutsceneTrack(int32_t track);
void CutscenePlayer_Control(int16_t item_num);
void Lara_Control_Cutscene(int16_t item_num);
void CutscenePlayer1_Initialise(int16_t item_num);
void CutscenePlayerGen_Initialise(int16_t item_num);
int32_t Level_Initialise(int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type);
int32_t Misc_Move3DPosTo3DPos(
PHD_3DPOS *src_pos, const PHD_3DPOS *dst_pos, int32_t velocity,
int16_t ang_add);
int32_t __cdecl LevelCompleteSequence(void);
void __cdecl S_Wait(int32_t frames, bool input_check);
bool __cdecl S_InitialiseSystem(void);
void __cdecl DisplayCredits(void);
void __cdecl S_InitialisePolyList(bool clear_back_buffer);
void __cdecl DecreaseScreenSize(void);
void __cdecl IncreaseScreenSize(void);
bool __cdecl S_LoadLevelFile(
int32_t LevelCompleteSequence(void);
void S_Wait(int32_t frames, bool input_check);
bool S_InitialiseSystem(void);
void DisplayCredits(void);
void S_InitialisePolyList(bool clear_back_buffer);
void DecreaseScreenSize(void);
void IncreaseScreenSize(void);
bool S_LoadLevelFile(
const char *file_name, int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type);
void __cdecl S_UnloadLevelFile(void);
void __cdecl GetValidLevelsList(REQUEST_INFO *req);
void __cdecl InitialiseGameFlags(void);
void __cdecl InitialiseLevelFlags(void);
void __cdecl GetCarriedItems(void);
int32_t __cdecl DoShift(ITEM *vehicle, const XYZ_32 *pos, const XYZ_32 *old);
int32_t __cdecl DoDynamics(int32_t height, int32_t fall_speed, int32_t *out_y);
int32_t __cdecl GetCollisionAnim(const ITEM *vehicle, XYZ_32 *moved);
void __cdecl InitialiseFinalLevel(void);
void S_UnloadLevelFile(void);
void GetValidLevelsList(REQUEST_INFO *req);
void InitialiseGameFlags(void);
void InitialiseLevelFlags(void);
void GetCarriedItems(void);
int32_t DoShift(ITEM *vehicle, const XYZ_32 *pos, const XYZ_32 *old);
int32_t DoDynamics(int32_t height, int32_t fall_speed, int32_t *out_y);
int32_t GetCollisionAnim(const ITEM *vehicle, XYZ_32 *moved);
void InitialiseFinalLevel(void);
22 changes: 11 additions & 11 deletions src/tr2/decomp/flares.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static bool M_CanThrowFlare(void)
|| g_LaraItem->current_anim_state == LS_FAST_DIVE;
}

int32_t __cdecl Flare_DoLight(const XYZ_32 *const pos, const int32_t flare_age)
int32_t Flare_DoLight(const XYZ_32 *const pos, const int32_t flare_age)
{
if (flare_age >= MAX_FLARE_AGE) {
return false;
Expand Down Expand Up @@ -71,7 +71,7 @@ int32_t __cdecl Flare_DoLight(const XYZ_32 *const pos, const int32_t flare_age)
return false;
}

void __cdecl Flare_DoInHand(const int32_t flare_age)
void Flare_DoInHand(const int32_t flare_age)
{
XYZ_32 vec = {
.x = 11,
Expand All @@ -97,7 +97,7 @@ void __cdecl Flare_DoInHand(const int32_t flare_age)
}
}

void __cdecl Flare_DrawInAir(const ITEM *const item)
void Flare_DrawInAir(const ITEM *const item)
{
int32_t rate;
FRAME_INFO *frames[2];
Expand All @@ -121,7 +121,7 @@ void __cdecl Flare_DrawInAir(const ITEM *const item)
Matrix_Pop();
}

void __cdecl Flare_Create(const bool thrown)
void Flare_Create(const bool thrown)
{
const int16_t item_num = Item_Create();
if (item_num == NO_ITEM) {
Expand Down Expand Up @@ -183,7 +183,7 @@ void __cdecl Flare_Create(const bool thrown)
item->status = IS_ACTIVE;
}

void __cdecl Flare_SetArm(const int32_t frame)
void Flare_SetArm(const int32_t frame)
{
int16_t anim_base;

Expand All @@ -203,7 +203,7 @@ void __cdecl Flare_SetArm(const int32_t frame)
g_Lara.left_arm.frame_base = g_Anims[g_Lara.left_arm.anim_num].frame_ptr;
}

void __cdecl Flare_Draw(void)
void Flare_Draw(void)
{
if (g_LaraItem->current_anim_state == LS_FLARE_PICKUP
|| g_LaraItem->current_anim_state == LS_PICKUP) {
Expand Down Expand Up @@ -247,7 +247,7 @@ void __cdecl Flare_Draw(void)
Flare_SetArm(frame_num);
}

void __cdecl Flare_Undraw(void)
void Flare_Undraw(void)
{
int16_t frame_num_1 = g_Lara.left_arm.frame_num;
int16_t frame_num_2 = g_Lara.flare_frame;
Expand Down Expand Up @@ -328,19 +328,19 @@ void __cdecl Flare_Undraw(void)
Flare_SetArm(frame_num_1);
}

void __cdecl Flare_DrawMeshes(void)
void Flare_DrawMeshes(void)
{
g_Lara.mesh_ptrs[LM_HAND_L] =
g_Meshes[g_Objects[O_LARA_FLARE].mesh_idx + LM_HAND_L];
}

void __cdecl Flare_UndrawMeshes(void)
void Flare_UndrawMeshes(void)
{
g_Lara.mesh_ptrs[LM_HAND_L] =
g_Meshes[g_Objects[O_LARA].mesh_idx + LM_HAND_L];
}

void __cdecl Flare_Ready(void)
void Flare_Ready(void)
{
g_Lara.gun_status = LGS_ARMLESS;
g_Lara.left_arm.rot.x = 0;
Expand All @@ -354,7 +354,7 @@ void __cdecl Flare_Ready(void)
g_Lara.target = NULL;
}

void __cdecl Flare_Control(const int16_t item_num)
void Flare_Control(const int16_t item_num)
{
ITEM *const item = &g_Items[item_num];
if (item->fall_speed) {
Expand Down
22 changes: 11 additions & 11 deletions src/tr2/decomp/flares.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ typedef enum {
LF_FL_DRAW_GOT_IT = (LF_FL_DRAW + 13), // = 46
} LARA_FLARE_ANIMATION_FRAME;

int32_t __cdecl Flare_DoLight(const XYZ_32 *pos, int32_t flare_age);
void __cdecl Flare_DoInHand(int32_t flare_age);
void __cdecl Flare_DrawInAir(const ITEM *item);
void __cdecl Flare_Create(bool thrown);
void __cdecl Flare_SetArm(int32_t frame);
void __cdecl Flare_Draw(void);
void __cdecl Flare_Undraw(void);
void __cdecl Flare_DrawMeshes(void);
void __cdecl Flare_UndrawMeshes(void);
void __cdecl Flare_Ready(void);
void __cdecl Flare_Control(int16_t item_num);
int32_t Flare_DoLight(const XYZ_32 *pos, int32_t flare_age);
void Flare_DoInHand(int32_t flare_age);
void Flare_DrawInAir(const ITEM *item);
void Flare_Create(bool thrown);
void Flare_SetArm(int32_t frame);
void Flare_Draw(void);
void Flare_Undraw(void);
void Flare_DrawMeshes(void);
void Flare_UndrawMeshes(void);
void Flare_Ready(void);
void Flare_Control(int16_t item_num);
Loading

0 comments on commit 4ffe5bd

Please sign in to comment.