From 4ffe5bd2478667a1ea850eb26ebba5c6e1c561b1 Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Wed, 25 Dec 2024 12:38:24 +0100 Subject: [PATCH] misc: drop __cdecl attribute --- src/tr2/decomp/decomp.c | 48 +++---- src/tr2/decomp/decomp.h | 51 ++++--- src/tr2/decomp/flares.c | 22 +-- src/tr2/decomp/flares.h | 22 +-- src/tr2/decomp/savegame.c | 24 ++-- src/tr2/decomp/savegame.h | 25 ++-- src/tr2/decomp/skidoo.c | 30 ++-- src/tr2/decomp/skidoo.h | 32 ++--- src/tr2/decomp/stats.c | 12 +- src/tr2/decomp/stats.h | 12 +- src/tr2/game/box.c | 16 +-- src/tr2/game/box.h | 19 ++- src/tr2/game/camera.c | 34 ++--- src/tr2/game/camera.h | 34 ++--- src/tr2/game/collide.c | 11 +- src/tr2/game/collide.h | 11 +- src/tr2/game/creature.c | 44 +++--- src/tr2/game/creature.h | 44 +++--- src/tr2/game/demo.c | 8 +- src/tr2/game/demo.h | 8 +- src/tr2/game/effects.c | 10 +- src/tr2/game/effects.h | 10 +- src/tr2/game/game.c | 14 +- src/tr2/game/game.h | 14 +- src/tr2/game/gamebuf.c | 6 +- src/tr2/game/gamebuf.h | 6 +- src/tr2/game/gameflow.c | 12 +- src/tr2/game/gameflow.h | 12 +- src/tr2/game/gun/gun.c | 6 +- src/tr2/game/gun/gun.h | 6 +- src/tr2/game/gun/gun_misc.c | 20 ++- src/tr2/game/gun/gun_misc.h | 19 ++- src/tr2/game/gun/gun_pistols.c | 14 +- src/tr2/game/gun/gun_pistols.h | 18 +-- src/tr2/game/gun/gun_rifle.c | 22 +-- src/tr2/game/gun/gun_rifle.h | 22 +-- src/tr2/game/inventory/backpack.c | 8 +- src/tr2/game/inventory/backpack.h | 10 +- src/tr2/game/inventory/common.c | 18 +-- src/tr2/game/inventory/common.h | 22 +-- src/tr2/game/inventory/ring.c | 34 ++--- src/tr2/game/inventory/ring.h | 32 ++--- src/tr2/game/items.c | 49 ++++--- src/tr2/game/items.h | 48 +++---- src/tr2/game/lara/cheat.c | 4 +- src/tr2/game/lara/cheat.h | 4 +- src/tr2/game/lara/cheat_keys.c | 2 +- src/tr2/game/lara/cheat_keys.h | 2 +- src/tr2/game/lara/col.c | 104 +++++++------- src/tr2/game/lara/col.h | 102 ++++++------- src/tr2/game/lara/control.c | 22 +-- src/tr2/game/lara/control.h | 22 +-- src/tr2/game/lara/draw.c | 4 +- src/tr2/game/lara/draw.h | 4 +- src/tr2/game/lara/hair.c | 6 +- src/tr2/game/lara/hair.h | 6 +- src/tr2/game/lara/look.c | 6 +- src/tr2/game/lara/look.h | 6 +- src/tr2/game/lara/misc.c | 80 +++++------ src/tr2/game/lara/misc.h | 74 +++++----- src/tr2/game/lara/state.c | 134 +++++++++--------- src/tr2/game/lara/state.h | 134 +++++++++--------- src/tr2/game/level.c | 2 +- src/tr2/game/level.h | 2 +- src/tr2/game/los.c | 13 +- src/tr2/game/los.h | 11 +- src/tr2/game/lot.c | 12 +- src/tr2/game/lot.h | 12 +- src/tr2/game/math_misc.c | 3 +- src/tr2/game/math_misc.h | 3 +- src/tr2/game/matrix.c | 50 +++---- src/tr2/game/matrix.h | 50 +++---- src/tr2/game/music.h | 16 +-- src/tr2/game/music/music_main.c | 16 +-- src/tr2/game/objects/common.c | 10 +- src/tr2/game/objects/common.h | 12 +- src/tr2/game/objects/creatures/bandit_1.c | 2 +- src/tr2/game/objects/creatures/bandit_1.h | 2 +- src/tr2/game/objects/creatures/bandit_2.c | 2 +- src/tr2/game/objects/creatures/bandit_2.h | 2 +- src/tr2/game/objects/creatures/barracuda.c | 2 +- src/tr2/game/objects/creatures/barracuda.h | 2 +- src/tr2/game/objects/creatures/bartoli.c | 4 +- src/tr2/game/objects/creatures/bartoli.h | 4 +- src/tr2/game/objects/creatures/big_eel.c | 2 +- src/tr2/game/objects/creatures/big_eel.h | 2 +- src/tr2/game/objects/creatures/big_spider.c | 2 +- src/tr2/game/objects/creatures/big_spider.h | 2 +- src/tr2/game/objects/creatures/bird.c | 4 +- src/tr2/game/objects/creatures/bird.h | 4 +- .../game/objects/creatures/bird_guardian.c | 2 +- .../game/objects/creatures/bird_guardian.h | 2 +- src/tr2/game/objects/creatures/cultist_1.c | 4 +- src/tr2/game/objects/creatures/cultist_1.h | 4 +- src/tr2/game/objects/creatures/cultist_2.c | 2 +- src/tr2/game/objects/creatures/cultist_2.h | 2 +- src/tr2/game/objects/creatures/cultist_3.c | 4 +- src/tr2/game/objects/creatures/cultist_3.h | 4 +- src/tr2/game/objects/creatures/diver.c | 6 +- src/tr2/game/objects/creatures/diver.h | 6 +- src/tr2/game/objects/creatures/dog.c | 2 +- src/tr2/game/objects/creatures/dog.h | 2 +- src/tr2/game/objects/creatures/dragon.c | 6 +- src/tr2/game/objects/creatures/dragon.h | 7 +- src/tr2/game/objects/creatures/eel.c | 2 +- src/tr2/game/objects/creatures/eel.h | 2 +- src/tr2/game/objects/creatures/jelly.c | 2 +- src/tr2/game/objects/creatures/jelly.h | 2 +- src/tr2/game/objects/creatures/monk.c | 2 +- src/tr2/game/objects/creatures/monk.h | 2 +- src/tr2/game/objects/creatures/mouse.c | 2 +- src/tr2/game/objects/creatures/mouse.h | 2 +- src/tr2/game/objects/creatures/shark.c | 2 +- src/tr2/game/objects/creatures/shark.h | 2 +- .../game/objects/creatures/skidoo_driver.c | 4 +- .../game/objects/creatures/skidoo_driver.h | 4 +- src/tr2/game/objects/creatures/spider.c | 4 +- src/tr2/game/objects/creatures/spider.h | 4 +- src/tr2/game/objects/creatures/tiger.c | 2 +- src/tr2/game/objects/creatures/tiger.h | 2 +- src/tr2/game/objects/creatures/trex.c | 2 +- src/tr2/game/objects/creatures/trex.h | 2 +- src/tr2/game/objects/creatures/winston.c | 2 +- src/tr2/game/objects/creatures/winston.h | 2 +- src/tr2/game/objects/creatures/worker_1.c | 2 +- src/tr2/game/objects/creatures/worker_1.h | 2 +- src/tr2/game/objects/creatures/worker_2.c | 2 +- src/tr2/game/objects/creatures/worker_2.h | 2 +- src/tr2/game/objects/creatures/worker_3.c | 2 +- src/tr2/game/objects/creatures/worker_3.h | 2 +- src/tr2/game/objects/creatures/xian_common.c | 2 +- src/tr2/game/objects/creatures/xian_common.h | 2 +- src/tr2/game/objects/creatures/xian_knight.c | 4 +- src/tr2/game/objects/creatures/xian_knight.h | 4 +- .../game/objects/creatures/xian_spearman.c | 4 +- .../game/objects/creatures/xian_spearman.h | 4 +- src/tr2/game/objects/creatures/yeti.c | 2 +- src/tr2/game/objects/creatures/yeti.h | 2 +- src/tr2/game/objects/effects/blood.c | 2 +- src/tr2/game/objects/effects/blood.h | 2 +- src/tr2/game/objects/effects/body_part.c | 2 +- src/tr2/game/objects/effects/body_part.h | 2 +- src/tr2/game/objects/effects/bubble.c | 2 +- src/tr2/game/objects/effects/bubble.h | 2 +- src/tr2/game/objects/effects/dart_effect.c | 2 +- src/tr2/game/objects/effects/dart_effect.h | 2 +- src/tr2/game/objects/effects/ember.c | 2 +- src/tr2/game/objects/effects/ember.h | 2 +- src/tr2/game/objects/effects/explosion.c | 2 +- src/tr2/game/objects/effects/explosion.h | 2 +- src/tr2/game/objects/effects/flame.c | 2 +- src/tr2/game/objects/effects/flame.h | 2 +- src/tr2/game/objects/effects/glow.c | 2 +- src/tr2/game/objects/effects/glow.h | 2 +- src/tr2/game/objects/effects/gun_flash.c | 2 +- src/tr2/game/objects/effects/gun_flash.h | 2 +- src/tr2/game/objects/effects/hot_liquid.c | 2 +- src/tr2/game/objects/effects/hot_liquid.h | 2 +- src/tr2/game/objects/effects/missile_common.c | 4 +- src/tr2/game/objects/effects/missile_common.h | 4 +- src/tr2/game/objects/effects/ricochet.c | 2 +- src/tr2/game/objects/effects/ricochet.h | 2 +- src/tr2/game/objects/effects/snow_sprite.c | 2 +- src/tr2/game/objects/effects/snow_sprite.h | 2 +- src/tr2/game/objects/effects/splash.c | 2 +- src/tr2/game/objects/effects/splash.h | 2 +- src/tr2/game/objects/effects/twinkle.c | 2 +- src/tr2/game/objects/effects/twinkle.h | 2 +- src/tr2/game/objects/effects/water_sprite.c | 2 +- src/tr2/game/objects/effects/water_sprite.h | 2 +- src/tr2/game/objects/general/alarm_sound.c | 2 +- src/tr2/game/objects/general/alarm_sound.h | 2 +- src/tr2/game/objects/general/bell.c | 2 +- src/tr2/game/objects/general/bell.h | 2 +- src/tr2/game/objects/general/big_bowl.c | 2 +- src/tr2/game/objects/general/big_bowl.h | 2 +- src/tr2/game/objects/general/bird_tweeter.c | 2 +- src/tr2/game/objects/general/bird_tweeter.h | 2 +- src/tr2/game/objects/general/bridge_common.c | 2 +- src/tr2/game/objects/general/bridge_common.h | 2 +- src/tr2/game/objects/general/bridge_flat.c | 4 +- src/tr2/game/objects/general/bridge_flat.h | 4 +- src/tr2/game/objects/general/bridge_tilt_1.c | 4 +- src/tr2/game/objects/general/bridge_tilt_1.h | 4 +- src/tr2/game/objects/general/bridge_tilt_2.c | 4 +- src/tr2/game/objects/general/bridge_tilt_2.h | 4 +- src/tr2/game/objects/general/clock_chimes.c | 4 +- src/tr2/game/objects/general/clock_chimes.h | 4 +- src/tr2/game/objects/general/copter.c | 2 +- src/tr2/game/objects/general/copter.h | 2 +- src/tr2/game/objects/general/detonator.c | 4 +- src/tr2/game/objects/general/detonator.h | 5 +- src/tr2/game/objects/general/ding_dong.c | 2 +- src/tr2/game/objects/general/ding_dong.h | 2 +- src/tr2/game/objects/general/door.c | 10 +- src/tr2/game/objects/general/door.h | 10 +- src/tr2/game/objects/general/drawbridge.c | 8 +- src/tr2/game/objects/general/drawbridge.h | 9 +- src/tr2/game/objects/general/earthquake.c | 2 +- src/tr2/game/objects/general/earthquake.h | 2 +- src/tr2/game/objects/general/final_cutscene.c | 2 +- src/tr2/game/objects/general/final_cutscene.h | 2 +- .../objects/general/final_level_counter.c | 14 +- src/tr2/game/objects/general/general.c | 2 +- src/tr2/game/objects/general/general.h | 2 +- src/tr2/game/objects/general/gong_bonger.c | 2 +- src/tr2/game/objects/general/gong_bonger.h | 2 +- src/tr2/game/objects/general/grenade.c | 2 +- src/tr2/game/objects/general/grenade.h | 2 +- src/tr2/game/objects/general/harpoon_bolt.c | 2 +- src/tr2/game/objects/general/harpoon_bolt.h | 2 +- src/tr2/game/objects/general/keyhole.c | 4 +- src/tr2/game/objects/general/keyhole.h | 5 +- src/tr2/game/objects/general/lara_alarm.c | 2 +- src/tr2/game/objects/general/lara_alarm.h | 2 +- src/tr2/game/objects/general/lift.c | 10 +- src/tr2/game/objects/general/lift.h | 10 +- src/tr2/game/objects/general/mini_copter.c | 2 +- src/tr2/game/objects/general/mini_copter.h | 2 +- src/tr2/game/objects/general/movable_block.c | 14 +- src/tr2/game/objects/general/movable_block.h | 16 +-- src/tr2/game/objects/general/pickup.c | 2 +- src/tr2/game/objects/general/pickup.h | 3 +- src/tr2/game/objects/general/puzzle_hole.c | 2 +- src/tr2/game/objects/general/puzzle_hole.h | 3 +- src/tr2/game/objects/general/secret.c | 2 +- src/tr2/game/objects/general/secret.h | 2 +- src/tr2/game/objects/general/sphere_of_doom.c | 6 +- src/tr2/game/objects/general/sphere_of_doom.h | 7 +- src/tr2/game/objects/general/switch.c | 8 +- src/tr2/game/objects/general/switch.h | 10 +- src/tr2/game/objects/general/trapdoor.c | 8 +- src/tr2/game/objects/general/trapdoor.h | 8 +- src/tr2/game/objects/general/waterfall.c | 2 +- src/tr2/game/objects/general/waterfall.h | 2 +- src/tr2/game/objects/general/window.c | 8 +- src/tr2/game/objects/general/window.h | 8 +- src/tr2/game/objects/general/zipline.c | 4 +- src/tr2/game/objects/general/zipline.h | 5 +- src/tr2/game/objects/setup.c | 8 +- src/tr2/game/objects/setup.h | 8 +- src/tr2/game/objects/traps/blade.c | 4 +- src/tr2/game/objects/traps/blade.h | 4 +- src/tr2/game/objects/traps/dart.c | 2 +- src/tr2/game/objects/traps/dart.h | 2 +- src/tr2/game/objects/traps/dart_emitter.c | 2 +- src/tr2/game/objects/traps/dart_emitter.h | 2 +- src/tr2/game/objects/traps/dying_monk.c | 4 +- src/tr2/game/objects/traps/dying_monk.h | 4 +- src/tr2/game/objects/traps/ember_emitter.c | 2 +- src/tr2/game/objects/traps/ember_emitter.h | 2 +- src/tr2/game/objects/traps/falling_block.c | 6 +- src/tr2/game/objects/traps/falling_block.h | 6 +- src/tr2/game/objects/traps/falling_ceiling.c | 2 +- src/tr2/game/objects/traps/falling_ceiling.h | 2 +- src/tr2/game/objects/traps/flame_emitter.c | 2 +- src/tr2/game/objects/traps/flame_emitter.h | 2 +- src/tr2/game/objects/traps/gondola.c | 2 +- src/tr2/game/objects/traps/gondola.h | 2 +- src/tr2/game/objects/traps/hook.c | 2 +- src/tr2/game/objects/traps/hook.h | 2 +- src/tr2/game/objects/traps/icicle.c | 2 +- src/tr2/game/objects/traps/icicle.h | 2 +- src/tr2/game/objects/traps/killer_statue.c | 4 +- src/tr2/game/objects/traps/killer_statue.h | 4 +- src/tr2/game/objects/traps/mine.c | 2 +- src/tr2/game/objects/traps/mine.h | 2 +- src/tr2/game/objects/traps/pendulum.c | 2 +- src/tr2/game/objects/traps/pendulum.h | 2 +- src/tr2/game/objects/traps/propeller.c | 2 +- src/tr2/game/objects/traps/propeller.h | 2 +- src/tr2/game/objects/traps/rolling_ball.c | 6 +- src/tr2/game/objects/traps/rolling_ball.h | 7 +- src/tr2/game/objects/traps/spike_ceiling.c | 2 +- src/tr2/game/objects/traps/spike_ceiling.h | 2 +- src/tr2/game/objects/traps/spike_wall.c | 2 +- src/tr2/game/objects/traps/spike_wall.h | 2 +- src/tr2/game/objects/traps/spikes.c | 2 +- src/tr2/game/objects/traps/spikes.h | 3 +- src/tr2/game/objects/traps/spinning_blade.c | 4 +- src/tr2/game/objects/traps/spinning_blade.h | 2 +- src/tr2/game/objects/traps/springboard.c | 2 +- src/tr2/game/objects/traps/springboard.h | 2 +- src/tr2/game/objects/traps/teeth_trap.c | 4 +- src/tr2/game/objects/traps/teeth_trap.h | 4 +- src/tr2/game/objects/vehicles/boat.c | 23 ++- src/tr2/game/objects/vehicles/boat.h | 22 +-- src/tr2/game/objects/vehicles/skidoo_armed.c | 4 +- src/tr2/game/objects/vehicles/skidoo_armed.h | 6 +- src/tr2/game/output.c | 64 ++++----- src/tr2/game/output.h | 76 +++++----- src/tr2/game/overlay.c | 20 +-- src/tr2/game/overlay.h | 18 +-- src/tr2/game/random.c | 10 +- src/tr2/game/random.h | 10 +- src/tr2/game/requester.c | 25 ++-- src/tr2/game/requester.h | 24 ++-- src/tr2/game/room.c | 33 +++-- src/tr2/game/room.h | 38 +++-- src/tr2/game/room_draw.c | 12 +- src/tr2/game/room_draw.h | 12 +- src/tr2/game/shell/common.c | 4 +- src/tr2/game/shell/common.h | 2 +- src/tr2/game/sound.c | 16 +-- src/tr2/game/sound.h | 17 ++- src/tr2/game/spawn.c | 22 +-- src/tr2/game/spawn.h | 22 +-- src/tr2/game/text.c | 8 +- src/tr2/game/text.h | 8 +- 309 files changed, 1486 insertions(+), 1559 deletions(-) diff --git a/src/tr2/decomp/decomp.c b/src/tr2/decomp/decomp.c index 3972d9c28..a638f2f9e 100644 --- a/src/tr2/decomp/decomp.c +++ b/src/tr2/decomp/decomp.c @@ -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); @@ -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; @@ -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; @@ -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; @@ -189,7 +189,7 @@ 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]; @@ -197,7 +197,7 @@ void __cdecl CutscenePlayerGen_Initialise(const int16_t item_num) 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; @@ -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) { @@ -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) { @@ -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)) { @@ -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; @@ -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; @@ -430,7 +430,7 @@ 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) { @@ -438,7 +438,7 @@ bool __cdecl S_LoadLevelFile( 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); @@ -446,7 +446,7 @@ void __cdecl S_UnloadLevelFile(void) 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++) { @@ -454,7 +454,7 @@ void __cdecl GetValidLevelsList(REQUEST_INFO *const req) } } -void __cdecl InitialiseGameFlags(void) +void InitialiseGameFlags(void) { for (int32_t i = 0; i < MAX_CD_TRACKS; i++) { g_MusicTrackFlags[i] = 0; @@ -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; @@ -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); @@ -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; @@ -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) { @@ -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; @@ -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; diff --git a/src/tr2/decomp/decomp.h b/src/tr2/decomp/decomp.h index e2ce630cc..3ec713f27 100644 --- a/src/tr2/decomp/decomp.h +++ b/src/tr2/decomp/decomp.h @@ -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); diff --git a/src/tr2/decomp/flares.c b/src/tr2/decomp/flares.c index a70a24751..2b911f3e8 100644 --- a/src/tr2/decomp/flares.c +++ b/src/tr2/decomp/flares.c @@ -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; @@ -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, @@ -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]; @@ -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) { @@ -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; @@ -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) { @@ -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; @@ -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; @@ -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) { diff --git a/src/tr2/decomp/flares.h b/src/tr2/decomp/flares.h index 6c1fe161f..edd7f2b00 100644 --- a/src/tr2/decomp/flares.h +++ b/src/tr2/decomp/flares.h @@ -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); diff --git a/src/tr2/decomp/savegame.c b/src/tr2/decomp/savegame.c index ca25a24b5..f8e5d924f 100644 --- a/src/tr2/decomp/savegame.c +++ b/src/tr2/decomp/savegame.c @@ -542,7 +542,7 @@ static void M_WriteFlares(void) } } -void __cdecl InitialiseStartInfo(void) +void InitialiseStartInfo(void) { if (g_SaveGame.bonus_flag) { return; @@ -565,7 +565,7 @@ void __cdecl InitialiseStartInfo(void) g_SaveGame.bonus_flag = 0; } -void __cdecl ModifyStartInfo(const int32_t level_num) +void ModifyStartInfo(const int32_t level_num) { START_INFO *start = &g_SaveGame.start[level_num]; start->has_pistols = 1; @@ -642,7 +642,7 @@ void __cdecl ModifyStartInfo(const int32_t level_num) } } -void __cdecl CreateStartInfo(const int32_t level_num) +void CreateStartInfo(const int32_t level_num) { START_INFO *const start = &g_SaveGame.start[level_num]; @@ -720,7 +720,7 @@ void __cdecl CreateStartInfo(const int32_t level_num) start->gun_status = LGS_ARMLESS; } -void __cdecl CreateSaveGameInfo(void) +void CreateSaveGameInfo(void) { g_SaveGame.current_level = g_CurrentLevel; @@ -771,7 +771,7 @@ void __cdecl CreateSaveGameInfo(void) M_WriteFlares(); } -void __cdecl ExtractSaveGameInfo(void) +void ExtractSaveGameInfo(void) { Lara_InitialiseInventory(g_CurrentLevel); Inv_AddItemNTimes(O_PICKUP_ITEM_1, g_SaveGame.num_pickup[0]); @@ -831,13 +831,13 @@ void __cdecl ExtractSaveGameInfo(void) M_ReadFlares(); } -void __cdecl ResetSG(void) +void ResetSG(void) { g_SavegameBufPos = 0; g_SavegameBufPtr = g_SaveGame.buffer; } -void __cdecl WriteSG(const void *const pointer, const size_t size) +void WriteSG(const void *const pointer, const size_t size) { g_SavegameBufPos += size; if (g_SavegameBufPos >= MAX_SG_BUFFER_SIZE) { @@ -848,14 +848,14 @@ void __cdecl WriteSG(const void *const pointer, const size_t size) g_SavegameBufPtr += size; } -void __cdecl ReadSG(void *const pointer, const size_t size) +void ReadSG(void *const pointer, const size_t size) { g_SavegameBufPos += size; memcpy(pointer, g_SavegameBufPtr, size); g_SavegameBufPtr += size; } -void __cdecl GetSavedGamesList(REQUEST_INFO *const req) +void GetSavedGamesList(REQUEST_INFO *const req) { Requester_SetSize(req, 10, -32); if (req->selected >= req->visible_count) { @@ -869,7 +869,7 @@ void __cdecl GetSavedGamesList(REQUEST_INFO *const req) sizeof(uint32_t) * MAX_REQUESTER_ITEMS); } -bool __cdecl S_FrontEndCheck(void) +bool S_FrontEndCheck(void) { Requester_Init(&g_LoadGameRequester); @@ -912,7 +912,7 @@ bool __cdecl S_FrontEndCheck(void) return true; } -int32_t __cdecl S_SaveGame( +int32_t S_SaveGame( const void *const save_data, const size_t save_size, const int32_t slot_num) { char file_name[80]; @@ -944,7 +944,7 @@ int32_t __cdecl S_SaveGame( return true; } -int32_t __cdecl S_LoadGame( +int32_t S_LoadGame( void *const save_data, const size_t save_size, const int32_t slot_num) { char file_name[80]; diff --git a/src/tr2/decomp/savegame.h b/src/tr2/decomp/savegame.h index 82e5a5ad5..da991ec62 100644 --- a/src/tr2/decomp/savegame.h +++ b/src/tr2/decomp/savegame.h @@ -2,18 +2,17 @@ #include "global/types.h" -void __cdecl InitialiseStartInfo(void); -void __cdecl ModifyStartInfo(int32_t level_num); -void __cdecl CreateStartInfo(int32_t level_num); -void __cdecl CreateSaveGameInfo(void); -void __cdecl ExtractSaveGameInfo(void); +void InitialiseStartInfo(void); +void ModifyStartInfo(int32_t level_num); +void CreateStartInfo(int32_t level_num); +void CreateSaveGameInfo(void); +void ExtractSaveGameInfo(void); -void __cdecl ResetSG(void); -void __cdecl WriteSG(const void *pointer, size_t size); -void __cdecl ReadSG(void *pointer, size_t size); +void ResetSG(void); +void WriteSG(const void *pointer, size_t size); +void ReadSG(void *pointer, size_t size); -void __cdecl GetSavedGamesList(REQUEST_INFO *req); -bool __cdecl S_FrontEndCheck(void); -int32_t __cdecl S_SaveGame( - const void *save_data, size_t save_size, int32_t slot_num); -int32_t __cdecl S_LoadGame(void *save_data, size_t save_size, int32_t slot_num); +void GetSavedGamesList(REQUEST_INFO *req); +bool S_FrontEndCheck(void); +int32_t S_SaveGame(const void *save_data, size_t save_size, int32_t slot_num); +int32_t S_LoadGame(void *save_data, size_t save_size, int32_t slot_num); diff --git a/src/tr2/decomp/skidoo.c b/src/tr2/decomp/skidoo.c index b4747167b..0c898cfd2 100644 --- a/src/tr2/decomp/skidoo.c +++ b/src/tr2/decomp/skidoo.c @@ -148,7 +148,7 @@ static bool M_CheckBaddieCollision(ITEM *const item, ITEM *const skidoo) return true; } -void __cdecl Skidoo_Initialise(const int16_t item_num) +void Skidoo_Initialise(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; @@ -165,7 +165,7 @@ void __cdecl Skidoo_Initialise(const int16_t item_num) item->data = skidoo_data; } -int32_t __cdecl Skidoo_CheckGetOn(const int16_t item_num, COLL_INFO *const coll) +int32_t Skidoo_CheckGetOn(const int16_t item_num, COLL_INFO *const coll) { if (!g_Input.action || g_Lara.gun_status != LGS_ARMLESS || g_LaraItem->gravity) { @@ -202,7 +202,7 @@ int32_t __cdecl Skidoo_CheckGetOn(const int16_t item_num, COLL_INFO *const coll) return get_on; } -void __cdecl Skidoo_Collision( +void Skidoo_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { if (lara_item->hit_points < 0 || g_Lara.skidoo != NO_ITEM) { @@ -243,7 +243,7 @@ void __cdecl Skidoo_Collision( item->hit_points = 1; } -void __cdecl Skidoo_BaddieCollision(ITEM *const skidoo) +void Skidoo_BaddieCollision(ITEM *const skidoo) { int16_t roomies[12]; const int32_t roomies_count = @@ -260,7 +260,7 @@ void __cdecl Skidoo_BaddieCollision(ITEM *const skidoo) } } -int32_t __cdecl Skidoo_TestHeight( +int32_t Skidoo_TestHeight( const ITEM *const item, const int32_t z_off, const int32_t x_off, XYZ_32 *const out_pos) { @@ -277,7 +277,7 @@ int32_t __cdecl Skidoo_TestHeight( return Room_GetHeight(sector, out_pos->x, out_pos->y, out_pos->z); } -void __cdecl Skidoo_DoSnowEffect(ITEM *const skidoo) +void Skidoo_DoSnowEffect(ITEM *const skidoo) { const int16_t effect_num = Effect_Create(skidoo->room_num); if (effect_num == NO_EFFECT) { @@ -310,7 +310,7 @@ void __cdecl Skidoo_DoSnowEffect(ITEM *const skidoo) CLAMPL(effect->shade, 0); } -int32_t __cdecl Skidoo_Dynamics(ITEM *const skidoo) +int32_t Skidoo_Dynamics(ITEM *const skidoo) { SKIDOO_INFO *const skidoo_data = skidoo->data; @@ -462,7 +462,7 @@ int32_t __cdecl Skidoo_Dynamics(ITEM *const skidoo) return collide; } -int32_t __cdecl Skidoo_UserControl( +int32_t Skidoo_UserControl( ITEM *const skidoo, const int32_t height, int32_t *const out_pitch) { SKIDOO_INFO *const skidoo_data = skidoo->data; @@ -537,7 +537,7 @@ int32_t __cdecl Skidoo_UserControl( return drive; } -int32_t __cdecl Skidoo_CheckGetOffOK(int32_t direction) +int32_t Skidoo_CheckGetOffOK(int32_t direction) { ITEM *const skidoo = Item_Get(g_Lara.skidoo); @@ -577,7 +577,7 @@ int32_t __cdecl Skidoo_CheckGetOffOK(int32_t direction) return true; } -void __cdecl Skidoo_Animation( +void Skidoo_Animation( ITEM *const skidoo, const int32_t collide, const int32_t dead) { const SKIDOO_INFO *const skidoo_data = skidoo->data; @@ -686,7 +686,7 @@ void __cdecl Skidoo_Animation( } } -void __cdecl Skidoo_Explode(const ITEM *const skidoo) +void Skidoo_Explode(const ITEM *const skidoo) { const int16_t effect_num = Effect_Create(skidoo->room_num); if (effect_num != NO_EFFECT) { @@ -705,7 +705,7 @@ void __cdecl Skidoo_Explode(const ITEM *const skidoo) g_Lara.skidoo = NO_ITEM; } -int32_t __cdecl Skidoo_CheckGetOff(void) +int32_t Skidoo_CheckGetOff(void) { ITEM *const skidoo = &g_Items[g_Lara.skidoo]; @@ -764,7 +764,7 @@ int32_t __cdecl Skidoo_CheckGetOff(void) return true; } -void __cdecl Skidoo_Guns(void) +void Skidoo_Guns(void) { WEAPON_INFO *const winfo = &g_Weapons[LGT_SKIDOO]; Gun_GetNewTarget(winfo); @@ -797,7 +797,7 @@ void __cdecl Skidoo_Guns(void) Creature_Effect(skidoo, &g_Skidoo_RightGun, Spawn_GunShot); } -int32_t __cdecl Skidoo_Control(void) +int32_t Skidoo_Control(void) { ITEM *const skidoo = Item_Get(g_Lara.skidoo); SKIDOO_INFO *const skidoo_data = skidoo->data; @@ -943,7 +943,7 @@ int32_t __cdecl Skidoo_Control(void) return Skidoo_CheckGetOff(); } -void __cdecl Skidoo_Draw(const ITEM *const item) +void Skidoo_Draw(const ITEM *const item) { int32_t track_mesh = 0; const SKIDOO_INFO *const skidoo_data = item->data; diff --git a/src/tr2/decomp/skidoo.h b/src/tr2/decomp/skidoo.h index f94d5f755..bac0b6338 100644 --- a/src/tr2/decomp/skidoo.h +++ b/src/tr2/decomp/skidoo.h @@ -14,21 +14,19 @@ extern BITE g_Skidoo_LeftGun; extern BITE g_Skidoo_RightGun; -void __cdecl Skidoo_Initialise(int16_t item_num); -int32_t __cdecl Skidoo_CheckGetOn(int16_t item_num, COLL_INFO *coll); -void __cdecl Skidoo_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl Skidoo_BaddieCollision(ITEM *skidoo); -int32_t __cdecl Skidoo_TestHeight( +void Skidoo_Initialise(int16_t item_num); +int32_t Skidoo_CheckGetOn(int16_t item_num, COLL_INFO *coll); +void Skidoo_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Skidoo_BaddieCollision(ITEM *skidoo); +int32_t Skidoo_TestHeight( const ITEM *item, int32_t z_off, int32_t x_off, XYZ_32 *out_pos); -void __cdecl Skidoo_DoSnowEffect(ITEM *skidoo); -int32_t __cdecl Skidoo_Dynamics(ITEM *skidoo); -int32_t __cdecl Skidoo_UserControl( - ITEM *skidoo, int32_t height, int32_t *out_pitch); -int32_t __cdecl Skidoo_CheckGetOffOK(int32_t direction); -void __cdecl Skidoo_Animation(ITEM *skidoo, int32_t collide, int32_t dead); -void __cdecl Skidoo_Explode(const ITEM *skidoo); -int32_t __cdecl Skidoo_CheckGetOff(void); -void __cdecl Skidoo_Guns(void); -int32_t __cdecl Skidoo_Control(void); -void __cdecl Skidoo_Draw(const ITEM *item); +void Skidoo_DoSnowEffect(ITEM *skidoo); +int32_t Skidoo_Dynamics(ITEM *skidoo); +int32_t Skidoo_UserControl(ITEM *skidoo, int32_t height, int32_t *out_pitch); +int32_t Skidoo_CheckGetOffOK(int32_t direction); +void Skidoo_Animation(ITEM *skidoo, int32_t collide, int32_t dead); +void Skidoo_Explode(const ITEM *skidoo); +int32_t Skidoo_CheckGetOff(void); +void Skidoo_Guns(void); +int32_t Skidoo_Control(void); +void Skidoo_Draw(const ITEM *item); diff --git a/src/tr2/decomp/stats.c b/src/tr2/decomp/stats.c index 2dfd43972..27a0157cb 100644 --- a/src/tr2/decomp/stats.c +++ b/src/tr2/decomp/stats.c @@ -57,7 +57,7 @@ static STATS M_GetEndGameStats(void) return result; } -void __cdecl ShowGymStatsText(const char *const time_str, const int32_t type) +void ShowGymStatsText(const char *const time_str, const int32_t type) { char text1[32]; char text2[32]; @@ -116,7 +116,7 @@ void __cdecl ShowGymStatsText(const char *const time_str, const int32_t type) g_StatsRequester.ready = 1; } -void __cdecl ShowStatsText(const char *const time_str, const int32_t type) +void ShowStatsText(const char *const time_str, const int32_t type) { char buffer[32] = { 0 }; @@ -216,7 +216,7 @@ void __cdecl ShowStatsText(const char *const time_str, const int32_t type) g_StatsRequester.ready = 1; } -void __cdecl ShowEndStatsText(void) +void ShowEndStatsText(void) { char buffer[32]; @@ -300,7 +300,7 @@ void __cdecl ShowEndStatsText(void) g_StatsRequester.ready = 1; } -int32_t __cdecl LevelStats(const int32_t level_num) +int32_t LevelStats(const int32_t level_num) { START_INFO *const start = &g_SaveGame.start[level_num]; start->statistics.timer = g_SaveGame.statistics.timer; @@ -351,7 +351,7 @@ int32_t __cdecl LevelStats(const int32_t level_num) return 0; } -int32_t __cdecl GameStats(const int32_t level_num) +int32_t GameStats(const int32_t level_num) { START_INFO *const start = &g_SaveGame.start[level_num]; start->statistics.timer = g_SaveGame.statistics.timer; @@ -427,7 +427,7 @@ int32_t __cdecl GameStats(const int32_t level_num) return 0; } -int32_t __cdecl AddAssaultTime(uint32_t time) +int32_t AddAssaultTime(uint32_t time) { ASSAULT_STATS *const stats = &g_Assault; diff --git a/src/tr2/decomp/stats.h b/src/tr2/decomp/stats.h index a1fd64478..6d279081f 100644 --- a/src/tr2/decomp/stats.h +++ b/src/tr2/decomp/stats.h @@ -2,10 +2,10 @@ #include -void __cdecl ShowGymStatsText(const char *time_str, int32_t type); -void __cdecl ShowStatsText(const char *time_str, int32_t type); -void __cdecl ShowEndStatsText(void); +void ShowGymStatsText(const char *time_str, int32_t type); +void ShowStatsText(const char *time_str, int32_t type); +void ShowEndStatsText(void); -int32_t __cdecl LevelStats(int32_t level_num); -int32_t __cdecl GameStats(int32_t level_num); -int32_t __cdecl AddAssaultTime(uint32_t time); +int32_t LevelStats(int32_t level_num); +int32_t GameStats(int32_t level_num); +int32_t AddAssaultTime(uint32_t time); diff --git a/src/tr2/game/box.c b/src/tr2/game/box.c index 304390a7b..f5a2f152d 100644 --- a/src/tr2/game/box.c +++ b/src/tr2/game/box.c @@ -24,7 +24,7 @@ (BOX_CLIP_LEFT | BOX_CLIP_RIGHT | BOX_CLIP_TOP | BOX_CLIP_BOTTOM) // = 15 #define BOX_CLIP_SECONDARY 16 -int32_t __cdecl Box_SearchLOT(LOT_INFO *const lot, const int32_t expansion) +int32_t Box_SearchLOT(LOT_INFO *const lot, const int32_t expansion) { int16_t *zone; if (lot->fly) { @@ -101,7 +101,7 @@ int32_t __cdecl Box_SearchLOT(LOT_INFO *const lot, const int32_t expansion) return true; } -int32_t __cdecl Box_UpdateLOT(LOT_INFO *const lot, const int32_t expansion) +int32_t Box_UpdateLOT(LOT_INFO *const lot, const int32_t expansion) { if (lot->required_box == NO_BOX || lot->required_box == lot->target_box) { goto end; @@ -124,7 +124,7 @@ int32_t __cdecl Box_UpdateLOT(LOT_INFO *const lot, const int32_t expansion) return Box_SearchLOT(lot, expansion); } -void __cdecl Box_TargetBox(LOT_INFO *const lot, const int16_t box_num) +void Box_TargetBox(LOT_INFO *const lot, const int16_t box_num) { const BOX_INFO *const box = &g_Boxes[box_num & BOX_NUM_BITS]; @@ -143,7 +143,7 @@ void __cdecl Box_TargetBox(LOT_INFO *const lot, const int16_t box_num) } } -int32_t __cdecl Box_StalkBox( +int32_t Box_StalkBox( const ITEM *const item, const ITEM *const enemy, const int16_t box_num) { const BOX_INFO *const box = &g_Boxes[box_num]; @@ -175,7 +175,7 @@ int32_t __cdecl Box_StalkBox( return enemy_quad != baddie_quad || ABS(enemy_quad - box_quad) != 2; } -int32_t __cdecl Box_EscapeBox( +int32_t Box_EscapeBox( const ITEM *const item, const ITEM *const enemy, const int16_t box_num) { const BOX_INFO *const box = &g_Boxes[box_num]; @@ -194,7 +194,7 @@ int32_t __cdecl Box_EscapeBox( || ((x > 0) == (item->pos.x > enemy->pos.x)); } -int32_t __cdecl Box_ValidBox( +int32_t Box_ValidBox( const ITEM *const item, const int16_t zone_num, const int16_t box_num) { const CREATURE *const creature = item->data; @@ -221,7 +221,7 @@ int32_t __cdecl Box_ValidBox( && item->pos.x < (box->bottom << WALL_SHIFT)); } -TARGET_TYPE __cdecl Box_CalculateTarget( +TARGET_TYPE Box_CalculateTarget( XYZ_32 *const target, const ITEM *const item, LOT_INFO *const lot) { Box_UpdateLOT(lot, BOX_MAX_EXPANSION); @@ -385,7 +385,7 @@ TARGET_TYPE __cdecl Box_CalculateTarget( return TARGET_NONE; } -int32_t __cdecl Box_BadFloor( +int32_t Box_BadFloor( const int32_t x, const int32_t y, const int32_t z, const int32_t box_height, const int32_t next_height, int16_t room_num, const LOT_INFO *const lot) { diff --git a/src/tr2/game/box.h b/src/tr2/game/box.h index e42a26736..316d6263d 100644 --- a/src/tr2/game/box.h +++ b/src/tr2/game/box.h @@ -7,17 +7,14 @@ #define BOX_BLOCKABLE 0x8000 #define BOX_ZONE(num) (((num) / STEP_L) - 1) -int32_t __cdecl Box_SearchLOT(LOT_INFO *lot, int32_t expansion); -int32_t __cdecl Box_UpdateLOT(LOT_INFO *lot, int32_t expansion); -void __cdecl Box_TargetBox(LOT_INFO *lot, int16_t box_num); -int32_t __cdecl Box_StalkBox( - const ITEM *item, const ITEM *enemy, int16_t box_num); -int32_t __cdecl Box_EscapeBox( - const ITEM *item, const ITEM *enemy, int16_t box_num); -int32_t __cdecl Box_ValidBox( - const ITEM *item, int16_t zone_num, int16_t box_num); -TARGET_TYPE __cdecl Box_CalculateTarget( +int32_t Box_SearchLOT(LOT_INFO *lot, int32_t expansion); +int32_t Box_UpdateLOT(LOT_INFO *lot, int32_t expansion); +void Box_TargetBox(LOT_INFO *lot, int16_t box_num); +int32_t Box_StalkBox(const ITEM *item, const ITEM *enemy, int16_t box_num); +int32_t Box_EscapeBox(const ITEM *item, const ITEM *enemy, int16_t box_num); +int32_t Box_ValidBox(const ITEM *item, int16_t zone_num, int16_t box_num); +TARGET_TYPE Box_CalculateTarget( XYZ_32 *target, const ITEM *item, LOT_INFO *lot); -int32_t __cdecl Box_BadFloor( +int32_t Box_BadFloor( int32_t x, int32_t y, int32_t z, int32_t box_height, int32_t next_height, int16_t room_num, const LOT_INFO *lot); diff --git a/src/tr2/game/camera.c b/src/tr2/game/camera.c index 860cb5bf1..dd2c86992 100644 --- a/src/tr2/game/camera.c +++ b/src/tr2/game/camera.c @@ -28,14 +28,14 @@ #define MAX_ELEVATION (85 * PHD_DEGREE) // = 15470 -void __cdecl Camera_Initialise(void) +void Camera_Initialise(void) { Camera_ResetPosition(); Output_AlterFOV(GAME_FOV * PHD_DEGREE); Camera_Update(); } -void __cdecl Camera_ResetPosition(void) +void Camera_ResetPosition(void) { ASSERT(g_LaraItem != NULL); g_Camera.shift = g_LaraItem->pos.y - WALL_L; @@ -65,7 +65,7 @@ void __cdecl Camera_ResetPosition(void) g_Camera.fixed_camera = 0; } -void __cdecl Camera_Move(const GAME_VECTOR *target, int32_t speed) +void Camera_Move(const GAME_VECTOR *target, int32_t speed) { g_Camera.pos.x += (target->x - g_Camera.pos.x) / speed; g_Camera.pos.z += (target->z - g_Camera.pos.z) / speed; @@ -151,7 +151,7 @@ void __cdecl Camera_Move(const GAME_VECTOR *target, int32_t speed) } } -void __cdecl Camera_Clip( +void Camera_Clip( int32_t *x, int32_t *y, int32_t *h, int32_t target_x, int32_t target_y, int32_t target_h, int32_t left, int32_t top, int32_t right, int32_t bottom) { @@ -169,7 +169,7 @@ void __cdecl Camera_Clip( } } -void __cdecl Camera_Shift( +void Camera_Shift( int32_t *x, int32_t *y, int32_t *h, int32_t target_x, int32_t target_y, int32_t target_h, int32_t left, int32_t top, int32_t right, int32_t bottom) { @@ -216,7 +216,7 @@ void __cdecl Camera_Shift( } } -const SECTOR *__cdecl Camera_GoodPosition( +const SECTOR *Camera_GoodPosition( int32_t x, int32_t y, int32_t z, int16_t room_num) { const SECTOR *sector = Room_GetSector(x, y, z, &room_num); @@ -229,9 +229,9 @@ const SECTOR *__cdecl Camera_GoodPosition( return sector; } -void __cdecl Camera_SmartShift( +void Camera_SmartShift( GAME_VECTOR *target, - void(__cdecl *shift)( + void (*shift)( int32_t *x, int32_t *y, int32_t *h, int32_t target_x, int32_t target_y, int32_t target_h, int32_t left, int32_t top, int32_t right, int32_t bottom)) @@ -451,7 +451,7 @@ void __cdecl Camera_SmartShift( Room_GetSector(target->x, target->y, target->z, &target->room_num); } -void __cdecl Camera_Chase(const ITEM *item) +void Camera_Chase(const ITEM *item) { g_Camera.target_elevation += item->rot.x; g_Camera.target_elevation = MIN(g_Camera.target_elevation, MAX_ELEVATION); @@ -482,7 +482,7 @@ void __cdecl Camera_Chase(const ITEM *item) Camera_Move(&target, g_Camera.speed); } -int32_t __cdecl Camera_ShiftClamp(GAME_VECTOR *pos, int32_t clamp) +int32_t Camera_ShiftClamp(GAME_VECTOR *pos, int32_t clamp) { int32_t x = pos->x; int32_t y = pos->y; @@ -524,7 +524,7 @@ int32_t __cdecl Camera_ShiftClamp(GAME_VECTOR *pos, int32_t clamp) return 0; } -void __cdecl Camera_Combat(const ITEM *item) +void Camera_Combat(const ITEM *item) { g_Camera.target.z = item->pos.z; g_Camera.target.x = item->pos.x; @@ -578,7 +578,7 @@ void __cdecl Camera_Combat(const ITEM *item) Camera_Move(&target, g_Camera.speed); } -void __cdecl Camera_Look(const ITEM *item) +void Camera_Look(const ITEM *item) { XYZ_32 old = { .x = g_Camera.target.x, @@ -632,7 +632,7 @@ void __cdecl Camera_Look(const ITEM *item) Camera_Move(&target, g_Camera.speed); } -void __cdecl Camera_Fixed(void) +void Camera_Fixed(void) { const OBJECT_VECTOR *fixed = &g_Camera.fixed[g_Camera.num]; GAME_VECTOR target = { @@ -656,7 +656,7 @@ void __cdecl Camera_Fixed(void) } } -void __cdecl Camera_Update(void) +void Camera_Update(void) { if (g_Rooms[g_Camera.pos.room_num].flags & RF_UNDERWATER) { Sound_Effect(SFX_UNDERWATER, NULL, SPM_ALWAYS); @@ -800,7 +800,7 @@ void __cdecl Camera_Update(void) g_IsChunkyCamera = 0; } -void __cdecl Camera_LoadCutsceneFrame(void) +void Camera_LoadCutsceneFrame(void) { g_CineFrameIdx++; if (g_CineFrameIdx >= g_NumCineFrames) { @@ -852,7 +852,7 @@ void __cdecl Camera_LoadCutsceneFrame(void) } } -void __cdecl Camera_UpdateCutscene(void) +void Camera_UpdateCutscene(void) { const CINE_FRAME *frame = &g_CineData[g_CineFrameIdx]; int32_t tx = frame->tx; @@ -884,7 +884,7 @@ void __cdecl Camera_UpdateCutscene(void) campos.x, campos.y, campos.z, camtar.x, camtar.y, camtar.z, roll); } -void __cdecl Camera_Legacy_RefreshFromTrigger(int16_t type, const int16_t *fd) +void Camera_Legacy_RefreshFromTrigger(int16_t type, const int16_t *fd) { ASSERT_FAIL(); } diff --git a/src/tr2/game/camera.h b/src/tr2/game/camera.h index bbf5792c3..6d0de4289 100644 --- a/src/tr2/game/camera.h +++ b/src/tr2/game/camera.h @@ -2,32 +2,32 @@ #include "global/types.h" -void __cdecl Camera_Initialise(void); -void __cdecl Camera_ResetPosition(void); -void __cdecl Camera_Move(const GAME_VECTOR *target, int32_t speed); -void __cdecl Camera_Clip( +void Camera_Initialise(void); +void Camera_ResetPosition(void); +void Camera_Move(const GAME_VECTOR *target, int32_t speed); +void Camera_Clip( int32_t *x, int32_t *y, int32_t *h, int32_t target_x, int32_t target_y, int32_t target_h, int32_t left, int32_t top, int32_t right, int32_t bottom); -void __cdecl Camera_Shift( +void Camera_Shift( int32_t *x, int32_t *y, int32_t *h, int32_t target_x, int32_t target_y, int32_t target_h, int32_t left, int32_t top, int32_t right, int32_t bottom); -const SECTOR *__cdecl Camera_GoodPosition( +const SECTOR *Camera_GoodPosition( int32_t x, int32_t y, int32_t z, int16_t room_num); -void __cdecl Camera_SmartShift( +void Camera_SmartShift( GAME_VECTOR *target, - void(__cdecl *shift)( + void (*shift)( int32_t *x, int32_t *y, int32_t *h, int32_t target_x, int32_t target_y, int32_t target_h, int32_t left, int32_t top, int32_t right, int32_t bottom)); -void __cdecl Camera_Chase(const ITEM *item); -int32_t __cdecl Camera_ShiftClamp(GAME_VECTOR *pos, int32_t clamp); -void __cdecl Camera_Combat(const ITEM *item); -void __cdecl Camera_Look(const ITEM *item); -void __cdecl Camera_Fixed(void); -void __cdecl Camera_Update(void); -void __cdecl Camera_LoadCutsceneFrame(void); -void __cdecl Camera_UpdateCutscene(void); +void Camera_Chase(const ITEM *item); +int32_t Camera_ShiftClamp(GAME_VECTOR *pos, int32_t clamp); +void Camera_Combat(const ITEM *item); +void Camera_Look(const ITEM *item); +void Camera_Fixed(void); +void Camera_Update(void); +void Camera_LoadCutsceneFrame(void); +void Camera_UpdateCutscene(void); void Camera_RefreshFromTrigger(const TRIGGER *trigger); // TODO: eliminate -void __cdecl Camera_Legacy_RefreshFromTrigger(int16_t type, const int16_t *fd); +void Camera_Legacy_RefreshFromTrigger(int16_t type, const int16_t *fd); diff --git a/src/tr2/game/collide.c b/src/tr2/game/collide.c index 54cd7cfed..ab7c88747 100644 --- a/src/tr2/game/collide.c +++ b/src/tr2/game/collide.c @@ -8,7 +8,7 @@ #include -void __cdecl Collide_GetCollisionInfo( +void Collide_GetCollisionInfo( COLL_INFO *const coll, const int32_t x_pos, const int32_t y_pos, const int32_t z_pos, int16_t room_num, const int32_t obj_height) { @@ -289,7 +289,7 @@ void __cdecl Collide_GetCollisionInfo( } } -int32_t __cdecl Collide_CollideStaticObjects( +int32_t Collide_CollideStaticObjects( COLL_INFO *const coll, const int32_t x, const int32_t y, const int32_t z, const int16_t room_num, const int32_t height) { @@ -448,8 +448,7 @@ int32_t __cdecl Collide_CollideStaticObjects( return 0; } -int32_t __cdecl Collide_TestCollision( - ITEM *const item, const ITEM *const lara_item) +int32_t Collide_TestCollision(ITEM *const item, const ITEM *const lara_item) { SPHERE slist_baddie[34]; SPHERE slist_lara[34]; @@ -486,7 +485,7 @@ int32_t __cdecl Collide_TestCollision( return touch_bits; } -int32_t __cdecl Collide_GetSpheres( +int32_t Collide_GetSpheres( const ITEM *const item, SPHERE *const spheres, const bool world_space) { if (item == NULL) { @@ -567,7 +566,7 @@ int32_t __cdecl Collide_GetSpheres( return object->mesh_count; } -void __cdecl Collide_GetJointAbsPosition( +void Collide_GetJointAbsPosition( const ITEM *const item, XYZ_32 *const out_vec, const int32_t joint) { const OBJECT *const object = Object_GetObject(item->object_id); diff --git a/src/tr2/game/collide.h b/src/tr2/game/collide.h index fdcd9a3fd..1affaa1ca 100644 --- a/src/tr2/game/collide.h +++ b/src/tr2/game/collide.h @@ -2,18 +2,17 @@ #include "global/types.h" -void __cdecl Collide_GetCollisionInfo( +void Collide_GetCollisionInfo( COLL_INFO *coll, int32_t x_pos, int32_t y_pos, int32_t z_pos, int16_t room_num, int32_t obj_height); -int32_t __cdecl Collide_CollideStaticObjects( +int32_t Collide_CollideStaticObjects( COLL_INFO *coll, int32_t x, int32_t y, int32_t z, int16_t room_num, int32_t height); -int32_t __cdecl Collide_TestCollision(ITEM *item, const ITEM *lara_item); +int32_t Collide_TestCollision(ITEM *item, const ITEM *lara_item); -int32_t __cdecl Collide_GetSpheres( - const ITEM *item, SPHERE *spheres, bool world_space); +int32_t Collide_GetSpheres(const ITEM *item, SPHERE *spheres, bool world_space); -void __cdecl Collide_GetJointAbsPosition( +void Collide_GetJointAbsPosition( const ITEM *item, XYZ_32 *out_vec, int32_t joint); diff --git a/src/tr2/game/creature.c b/src/tr2/game/creature.c index bc69f2f3d..dd97a52b3 100644 --- a/src/tr2/game/creature.c +++ b/src/tr2/game/creature.c @@ -34,7 +34,7 @@ #define CREATURE_SHOOT_RANGE SQUARE(WALL_L * 8) // = 0x4000000 = 67108864 #define CREATURE_SHOOT_HIT_CHANCE 0x2000 -void __cdecl Creature_Initialise(const int16_t item_num) +void Creature_Initialise(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; item->rot.y += (Random_GetControl() - PHD_90) >> 1; @@ -42,7 +42,7 @@ void __cdecl Creature_Initialise(const int16_t item_num) item->data = 0; } -int32_t __cdecl Creature_Activate(const int16_t item_num) +int32_t Creature_Activate(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; if (item->status != IS_INVISIBLE) { @@ -57,7 +57,7 @@ int32_t __cdecl Creature_Activate(const int16_t item_num) return true; } -void __cdecl Creature_AIInfo(ITEM *const item, AI_INFO *const info) +void Creature_AIInfo(ITEM *const item, AI_INFO *const info) { CREATURE *const creature = (CREATURE *)item->data; if (creature == NULL) { @@ -136,8 +136,7 @@ void __cdecl Creature_AIInfo(ITEM *const item, AI_INFO *const info) && ABS(enemy->pos.y - item->pos.y) <= STEP_L; } -void __cdecl Creature_Mood( - const ITEM *item, const AI_INFO *info, int32_t violent) +void Creature_Mood(const ITEM *item, const AI_INFO *info, int32_t violent) { CREATURE *const creature = item->data; if (creature == NULL) { @@ -300,7 +299,7 @@ void __cdecl Creature_Mood( Box_CalculateTarget(&creature->target, item, lot); } -int32_t __cdecl Creature_CheckBaddieOverlap(const int16_t item_num) +int32_t Creature_CheckBaddieOverlap(const int16_t item_num) { ITEM *item = &g_Items[item_num]; @@ -328,7 +327,7 @@ int32_t __cdecl Creature_CheckBaddieOverlap(const int16_t item_num) return false; } -void __cdecl Creature_Die(const int16_t item_num, const bool explode) +void Creature_Die(const int16_t item_num, const bool explode) { ITEM *const item = &g_Items[item_num]; @@ -378,7 +377,7 @@ void __cdecl Creature_Die(const int16_t item_num, const bool explode) } } -int32_t __cdecl Creature_Animate( +int32_t Creature_Animate( const int16_t item_num, const int16_t angle, const int16_t tilt) { ITEM *const item = &g_Items[item_num]; @@ -631,7 +630,7 @@ int32_t __cdecl Creature_Animate( return true; } -int16_t __cdecl Creature_Turn(ITEM *const item, int16_t max_turn) +int16_t Creature_Turn(ITEM *const item, int16_t max_turn) { const CREATURE *const creature = item->data; if (creature == NULL || item->speed == 0 || max_turn == 0) { @@ -654,14 +653,14 @@ int16_t __cdecl Creature_Turn(ITEM *const item, int16_t max_turn) return angle; } -void __cdecl Creature_Tilt(ITEM *const item, int16_t angle) +void Creature_Tilt(ITEM *const item, int16_t angle) { angle = 4 * angle - item->rot.z; CLAMP(angle, -MAX_TILT, MAX_TILT); item->rot.z += angle; } -void __cdecl Creature_Head(ITEM *item, int16_t required) +void Creature_Head(ITEM *item, int16_t required) { CREATURE *const creature = item->data; if (creature == NULL) { @@ -675,7 +674,7 @@ void __cdecl Creature_Head(ITEM *item, int16_t required) CLAMP(creature->head_rotation, -HEAD_ARC, HEAD_ARC); } -void __cdecl Creature_Neck(ITEM *const item, const int16_t required) +void Creature_Neck(ITEM *const item, const int16_t required) { CREATURE *const creature = item->data; if (creature == NULL) { @@ -689,7 +688,7 @@ void __cdecl Creature_Neck(ITEM *const item, const int16_t required) CLAMP(creature->neck_rotation, -HEAD_ARC, HEAD_ARC); } -void __cdecl Creature_Float(const int16_t item_num) +void Creature_Float(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; @@ -715,7 +714,7 @@ void __cdecl Creature_Float(const int16_t item_num) } } -void __cdecl Creature_Underwater(ITEM *const item, const int32_t depth) +void Creature_Underwater(ITEM *const item, const int32_t depth) { const int32_t wh = Room_GetWaterHeight( item->pos.x, item->pos.y, item->pos.z, item->room_num); @@ -731,9 +730,9 @@ void __cdecl Creature_Underwater(ITEM *const item, const int32_t depth) } } -int16_t __cdecl Creature_Effect( +int16_t Creature_Effect( const ITEM *const item, const BITE *const bite, - int16_t(__cdecl *const spawn)( + int16_t (*const spawn)( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num)) { @@ -743,7 +742,7 @@ int16_t __cdecl Creature_Effect( pos.x, pos.y, pos.z, item->speed, item->rot.y, item->room_num); } -int32_t __cdecl Creature_Vault( +int32_t Creature_Vault( const int16_t item_num, const int16_t angle, int32_t vault, const int32_t shift) { @@ -800,7 +799,7 @@ int32_t __cdecl Creature_Vault( return vault; } -void __cdecl Creature_Kill( +void Creature_Kill( ITEM *const item, const int32_t kill_anim, const int32_t kill_state, const int32_t lara_kill_state) { @@ -836,8 +835,7 @@ void __cdecl Creature_Kill( g_Camera.pos.room_num = g_LaraItem->room_num; } -void __cdecl Creature_GetBaddieTarget( - const int16_t item_num, const int32_t goody) +void Creature_GetBaddieTarget(const int16_t item_num, const int32_t goody) { ITEM *const item = &g_Items[item_num]; CREATURE *const creature = item->data; @@ -902,7 +900,7 @@ void __cdecl Creature_GetBaddieTarget( } } -void __cdecl Creature_Collision( +void Creature_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = &g_Items[item_num]; @@ -920,7 +918,7 @@ void __cdecl Creature_Collision( } } -int32_t __cdecl Creature_CanTargetEnemy( +int32_t Creature_CanTargetEnemy( const ITEM *const item, const AI_INFO *const info) { const CREATURE *const creature = item->data; @@ -957,7 +955,7 @@ bool Creature_IsAlly(const ITEM *const item) return Object_IsObjectType(item->object_id, g_AllyObjects); } -int32_t __cdecl Creature_ShootAtLara( +int32_t Creature_ShootAtLara( ITEM *const item, const AI_INFO *const info, const BITE *const gun, const int16_t extra_rotation, const int32_t damage) { diff --git a/src/tr2/game/creature.h b/src/tr2/game/creature.h index d0f968f38..bb05b41f2 100644 --- a/src/tr2/game/creature.h +++ b/src/tr2/game/creature.h @@ -4,35 +4,33 @@ #include -void __cdecl Creature_Initialise(int16_t item_num); -int32_t __cdecl Creature_Activate(int16_t item_num); -void __cdecl Creature_AIInfo(ITEM *item, AI_INFO *info); -void __cdecl Creature_Mood( - const ITEM *item, const AI_INFO *info, int32_t violent); -int32_t __cdecl Creature_CheckBaddieOverlap(int16_t item_num); -void __cdecl Creature_Die(int16_t item_num, bool explode); -int32_t __cdecl Creature_Animate(int16_t item_num, int16_t angle, int16_t tilt); -int16_t __cdecl Creature_Turn(ITEM *item, int16_t max_turn); -void __cdecl Creature_Tilt(ITEM *item, int16_t angle); -void __cdecl Creature_Head(ITEM *item, int16_t required); -void __cdecl Creature_Neck(ITEM *item, int16_t required); -void __cdecl Creature_Float(int16_t item_num); -void __cdecl Creature_Underwater(ITEM *item, int32_t depth); -int16_t __cdecl Creature_Effect( +void Creature_Initialise(int16_t item_num); +int32_t Creature_Activate(int16_t item_num); +void Creature_AIInfo(ITEM *item, AI_INFO *info); +void Creature_Mood(const ITEM *item, const AI_INFO *info, int32_t violent); +int32_t Creature_CheckBaddieOverlap(int16_t item_num); +void Creature_Die(int16_t item_num, bool explode); +int32_t Creature_Animate(int16_t item_num, int16_t angle, int16_t tilt); +int16_t Creature_Turn(ITEM *item, int16_t max_turn); +void Creature_Tilt(ITEM *item, int16_t angle); +void Creature_Head(ITEM *item, int16_t required); +void Creature_Neck(ITEM *item, int16_t required); +void Creature_Float(int16_t item_num); +void Creature_Underwater(ITEM *item, int32_t depth); +int16_t Creature_Effect( const ITEM *item, const BITE *bite, - int16_t(__cdecl *spawn)( + int16_t (*spawn)( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num)); -int32_t __cdecl Creature_Vault( +int32_t Creature_Vault( int16_t item_num, int16_t angle, int32_t vault, int32_t shift); -void __cdecl Creature_Kill( +void Creature_Kill( ITEM *item, int32_t kill_anim, int32_t kill_state, int32_t lara_kill_state); -void __cdecl Creature_GetBaddieTarget(int16_t item_num, int32_t goody); -void __cdecl Creature_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -int32_t __cdecl Creature_CanTargetEnemy(const ITEM *item, const AI_INFO *info); +void Creature_GetBaddieTarget(int16_t item_num, int32_t goody); +void Creature_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +int32_t Creature_CanTargetEnemy(const ITEM *item, const AI_INFO *info); bool Creature_IsEnemy(const ITEM *item); bool Creature_IsAlly(const ITEM *item); -int32_t __cdecl Creature_ShootAtLara( +int32_t Creature_ShootAtLara( ITEM *item, const AI_INFO *info, const BITE *gun, int16_t extra_rotation, int32_t damage); diff --git a/src/tr2/game/demo.c b/src/tr2/game/demo.c index 2bf7bc0b8..a0ef0388b 100644 --- a/src/tr2/game/demo.c +++ b/src/tr2/game/demo.c @@ -35,7 +35,7 @@ static void M_RestoreConfig(void) g_SaveGame.bonus_flag = m_OldConfig.bonus_flag; } -int32_t __cdecl Demo_Control(int32_t level_num) +int32_t Demo_Control(int32_t level_num) { if (level_num < 0 && !g_GameFlow.num_demos) { return GFD_EXIT_TO_TITLE; @@ -54,7 +54,7 @@ int32_t __cdecl Demo_Control(int32_t level_num) return GF_DoLevelSequence(level_num, GFL_DEMO); } -int32_t __cdecl Demo_Start(int32_t level_num) +int32_t Demo_Start(int32_t level_num) { if (level_num < 0 && !g_GameFlow.num_demos) { return GFD_EXIT_TO_TITLE; @@ -122,7 +122,7 @@ int32_t __cdecl Demo_Start(int32_t level_num) return dir; } -void __cdecl Demo_LoadLaraPos(void) +void Demo_LoadLaraPos(void) { g_LaraItem->pos.x = g_DemoPtr[0]; g_LaraItem->pos.y = g_DemoPtr[1]; @@ -144,7 +144,7 @@ void __cdecl Demo_LoadLaraPos(void) g_DemoCount += 8; } -bool __cdecl Demo_GetInput(void) +bool Demo_GetInput(void) { if (g_DemoCount >= MAX_DEMO_SIZE) { return false; diff --git a/src/tr2/game/demo.h b/src/tr2/game/demo.h index 27030c441..ecf001660 100644 --- a/src/tr2/game/demo.h +++ b/src/tr2/game/demo.h @@ -2,7 +2,7 @@ #include "global/types.h" -int32_t __cdecl Demo_Control(int32_t level_num); -int32_t __cdecl Demo_Start(int32_t level_num); -void __cdecl Demo_LoadLaraPos(void); -bool __cdecl Demo_GetInput(void); +int32_t Demo_Control(int32_t level_num); +int32_t Demo_Start(int32_t level_num); +void Demo_LoadLaraPos(void); +bool Demo_GetInput(void); diff --git a/src/tr2/game/effects.c b/src/tr2/game/effects.c index 363051f84..896e58e89 100644 --- a/src/tr2/game/effects.c +++ b/src/tr2/game/effects.c @@ -51,7 +51,7 @@ static void M_RemoveDrawn(const int16_t effect_num) } } -void __cdecl Effect_InitialiseArray(void) +void Effect_InitialiseArray(void) { m_Effects = GameBuf_Alloc(MAX_EFFECTS * sizeof(EFFECT), GBUF_EFFECTS_ARRAY); m_NextEffectFree = 0; @@ -79,7 +79,7 @@ int16_t Effect_GetActiveNum(void) return m_NextEffectActive; } -int16_t __cdecl Effect_Create(const int16_t room_num) +int16_t Effect_Create(const int16_t room_num) { int16_t effect_num = m_NextEffectFree; if (effect_num == NO_EFFECT) { @@ -102,7 +102,7 @@ int16_t __cdecl Effect_Create(const int16_t room_num) return effect_num; } -void __cdecl Effect_Kill(const int16_t effect_num) +void Effect_Kill(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); M_RemoveActive(effect_num); @@ -112,7 +112,7 @@ void __cdecl Effect_Kill(const int16_t effect_num) m_NextEffectFree = effect_num; } -void __cdecl Effect_NewRoom(const int16_t effect_num, const int16_t room_num) +void Effect_NewRoom(const int16_t effect_num, const int16_t room_num) { EFFECT *const effect = Effect_Get(effect_num); ROOM *room = Room_Get(effect->room_num); @@ -136,7 +136,7 @@ void __cdecl Effect_NewRoom(const int16_t effect_num, const int16_t room_num) room->effect_num = effect_num; } -void __cdecl Effect_Draw(const int16_t effect_num) +void Effect_Draw(const int16_t effect_num) { const EFFECT *const effect = Effect_Get(effect_num); const OBJECT *const object = Object_GetObject(effect->object_id); diff --git a/src/tr2/game/effects.h b/src/tr2/game/effects.h index 5595bd299..9ddaaeb55 100644 --- a/src/tr2/game/effects.h +++ b/src/tr2/game/effects.h @@ -4,11 +4,11 @@ #define NO_EFFECT (-1) -void __cdecl Effect_InitialiseArray(void); +void Effect_InitialiseArray(void); EFFECT *Effect_Get(int16_t effect_num); int16_t Effect_GetNum(const EFFECT *effect); int16_t Effect_GetActiveNum(void); -int16_t __cdecl Effect_Create(int16_t room_num); -void __cdecl Effect_Kill(int16_t effect_num); -void __cdecl Effect_NewRoom(int16_t effect_num, int16_t room_num); -void __cdecl Effect_Draw(int16_t effect_num); +int16_t Effect_Create(int16_t room_num); +void Effect_Kill(int16_t effect_num); +void Effect_NewRoom(int16_t effect_num, int16_t room_num); +void Effect_Draw(int16_t effect_num); diff --git a/src/tr2/game/game.c b/src/tr2/game/game.c index 06b685979..2a2296475 100644 --- a/src/tr2/game/game.c +++ b/src/tr2/game/game.c @@ -34,7 +34,7 @@ static int32_t m_FrameCount = 0; static bool m_Exiting = false; static FADER m_ExitFader = { 0 }; -int32_t __cdecl Game_Control(int32_t nframes, const bool demo_mode) +int32_t Game_Control(int32_t nframes, const bool demo_mode) { Fader_Control(&m_ExitFader); @@ -192,7 +192,7 @@ int32_t __cdecl Game_Control(int32_t nframes, const bool demo_mode) return 0; } -int32_t __cdecl Game_ControlCinematic(void) +int32_t Game_ControlCinematic(void) { Fader_Control(&m_ExitFader); @@ -250,7 +250,7 @@ int32_t __cdecl Game_ControlCinematic(void) return 0; } -int32_t __cdecl Game_Draw(void) +int32_t Game_Draw(void) { Output_BeginScene(); Room_DrawAllRooms(g_Camera.pos.room_num); @@ -268,7 +268,7 @@ int32_t __cdecl Game_Draw(void) return g_Camera.num_frames; } -int32_t __cdecl Game_DrawCinematic(void) +int32_t Game_DrawCinematic(void) { g_CameraUnderwater = false; Output_BeginScene(); @@ -284,7 +284,7 @@ int32_t __cdecl Game_DrawCinematic(void) return g_Camera.num_frames; } -int16_t __cdecl Game_Start( +int16_t Game_Start( const int32_t level_num, const GAMEFLOW_LEVEL_TYPE level_type) { if (level_type == GFL_NORMAL || level_type == GFL_SAVED @@ -352,7 +352,7 @@ int16_t __cdecl Game_Start( return GFD_START_GAME | LV_FIRST; } -int32_t __cdecl Game_Loop(const bool demo_mode) +int32_t Game_Loop(const bool demo_mode) { g_OverlayStatus = 1; Camera_Initialise(); @@ -384,7 +384,7 @@ int32_t __cdecl Game_Loop(const bool demo_mode) return dir; } -int32_t __cdecl Game_LoopCinematic(const int32_t level_num) +int32_t Game_LoopCinematic(const int32_t level_num) { if (!Level_Initialise(level_num, GFL_CUTSCENE)) { return 2; diff --git a/src/tr2/game/game.h b/src/tr2/game/game.h index f7f501783..12364ff7f 100644 --- a/src/tr2/game/game.h +++ b/src/tr2/game/game.h @@ -2,12 +2,12 @@ #include "global/types.h" -int32_t __cdecl Game_Control(int32_t nframes, bool demo_mode); -int32_t __cdecl Game_ControlCinematic(void); -int32_t __cdecl Game_Draw(void); -int32_t __cdecl Game_DrawCinematic(void); -int16_t __cdecl Game_Start(int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type); -int32_t __cdecl Game_Loop(bool demo_mode); -int32_t __cdecl Game_LoopCinematic(int32_t level_num); +int32_t Game_Control(int32_t nframes, bool demo_mode); +int32_t Game_ControlCinematic(void); +int32_t Game_Draw(void); +int32_t Game_DrawCinematic(void); +int16_t Game_Start(int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type); +int32_t Game_Loop(bool demo_mode); +int32_t Game_LoopCinematic(int32_t level_num); bool Game_IsPlayable(void); void Game_ProcessInput(void); diff --git a/src/tr2/game/gamebuf.c b/src/tr2/game/gamebuf.c index 9db523d57..4a3bfea0e 100644 --- a/src/tr2/game/gamebuf.c +++ b/src/tr2/game/gamebuf.c @@ -73,14 +73,14 @@ void GameBuf_Init(const int32_t cap) g_GameBuf_MemBase = Memory_Alloc(cap); } -void __cdecl GameBuf_Reset(void) +void GameBuf_Reset(void) { g_GameBuf_MemPtr = g_GameBuf_MemBase; g_GameBuf_MemFree = m_Cap; g_GameBuf_MemUsed = 0; } -void __cdecl GameBuf_Shutdown(void) +void GameBuf_Shutdown(void) { Memory_FreePointer(&g_GameBuf_MemBase); m_Cap = 0; @@ -105,7 +105,7 @@ void *GameBuf_Alloc(const size_t alloc_size, const GAME_BUFFER buffer) return result; } -void __cdecl GameBuf_Free(const size_t free_size) +void GameBuf_Free(const size_t free_size) { const size_t aligned_size = (free_size + 3) & ~3; if (aligned_size > g_GameBuf_MemUsed) { diff --git a/src/tr2/game/gamebuf.h b/src/tr2/game/gamebuf.h index fea83a95b..813f28129 100644 --- a/src/tr2/game/gamebuf.h +++ b/src/tr2/game/gamebuf.h @@ -5,6 +5,6 @@ #include void GameBuf_Init(int32_t cap); -void __cdecl GameBuf_Reset(void); -void __cdecl GameBuf_Shutdown(void); -void __cdecl GameBuf_Free(size_t free_size); +void GameBuf_Reset(void); +void GameBuf_Shutdown(void); +void GameBuf_Free(size_t free_size); diff --git a/src/tr2/game/gameflow.c b/src/tr2/game/gameflow.c index 7cda4cff6..8f43d33d3 100644 --- a/src/tr2/game/gameflow.c +++ b/src/tr2/game/gameflow.c @@ -191,7 +191,7 @@ static void M_ModifyInventory_Item( } // TODO: inline me into GF_LoadScriptFile -bool __cdecl GF_LoadFromFile(const char *const file_name) +bool GF_LoadFromFile(const char *const file_name) { BENCHMARK *const benchmark = Benchmark_Start(); DWORD bytes_read; @@ -327,7 +327,7 @@ bool __cdecl GF_LoadFromFile(const char *const file_name) return true; } -int32_t __cdecl GF_LoadScriptFile(const char *const fname) +int32_t GF_LoadScriptFile(const char *const fname) { g_GF_SunsetEnabled = false; @@ -347,7 +347,7 @@ int32_t __cdecl GF_LoadScriptFile(const char *const fname) return true; } -int32_t __cdecl GF_DoFrontendSequence(void) +int32_t GF_DoFrontendSequence(void) { GF_N_LoadStrings(-1); const GAME_FLOW_DIR dir = @@ -355,7 +355,7 @@ int32_t __cdecl GF_DoFrontendSequence(void) return dir == GFD_EXIT_GAME; } -int32_t __cdecl GF_DoLevelSequence( +int32_t GF_DoLevelSequence( const int32_t start_level, const GAMEFLOW_LEVEL_TYPE type) { GF_N_LoadStrings(start_level); @@ -380,7 +380,7 @@ int32_t __cdecl GF_DoLevelSequence( } } -int32_t __cdecl GF_InterpretSequence( +int32_t GF_InterpretSequence( const int16_t *ptr, GAMEFLOW_LEVEL_TYPE type, const int32_t seq_type) { g_GF_NoFloor = 0; @@ -603,7 +603,7 @@ int32_t __cdecl GF_InterpretSequence( return dir; } -void __cdecl GF_ModifyInventory(const int32_t level, const int32_t type) +void GF_ModifyInventory(const int32_t level, const int32_t type) { START_INFO *const start = &g_SaveGame.start[level]; diff --git a/src/tr2/game/gameflow.h b/src/tr2/game/gameflow.h index d14d8f415..e3122e2ff 100644 --- a/src/tr2/game/gameflow.h +++ b/src/tr2/game/gameflow.h @@ -4,10 +4,10 @@ #include -bool __cdecl GF_LoadFromFile(const char *file_name); -int32_t __cdecl GF_LoadScriptFile(const char *fname); -int32_t __cdecl GF_DoFrontendSequence(void); -int32_t __cdecl GF_DoLevelSequence(int32_t level, GAMEFLOW_LEVEL_TYPE type); -int32_t __cdecl GF_InterpretSequence( +bool GF_LoadFromFile(const char *file_name); +int32_t GF_LoadScriptFile(const char *fname); +int32_t GF_DoFrontendSequence(void); +int32_t GF_DoLevelSequence(int32_t level, GAMEFLOW_LEVEL_TYPE type); +int32_t GF_InterpretSequence( const int16_t *ptr, GAMEFLOW_LEVEL_TYPE type, int32_t seq_type); -void __cdecl GF_ModifyInventory(int32_t level, int32_t type); +void GF_ModifyInventory(int32_t level, int32_t type); diff --git a/src/tr2/game/gun/gun.c b/src/tr2/game/gun/gun.c index 6aa3334d7..2f5f42ea8 100644 --- a/src/tr2/game/gun/gun.c +++ b/src/tr2/game/gun/gun.c @@ -12,7 +12,7 @@ #include -void __cdecl Gun_Control(void) +void Gun_Control(void) { if (g_Lara.left_arm.flash_gun > 0) { g_Lara.left_arm.flash_gun--; @@ -229,7 +229,7 @@ void __cdecl Gun_Control(void) } } -void __cdecl Gun_InitialiseNewWeapon(void) +void Gun_InitialiseNewWeapon(void) { g_Lara.left_arm.flash_gun = 0; g_Lara.left_arm.frame_num = 0; @@ -284,7 +284,7 @@ void __cdecl Gun_InitialiseNewWeapon(void) } } -int32_t __cdecl Gun_GetWeaponAnim(const LARA_GUN_TYPE gun_type) +int32_t Gun_GetWeaponAnim(const LARA_GUN_TYPE gun_type) { switch (gun_type) { case LGT_UNARMED: diff --git a/src/tr2/game/gun/gun.h b/src/tr2/game/gun/gun.h index ada32ff8a..2f58497a8 100644 --- a/src/tr2/game/gun/gun.h +++ b/src/tr2/game/gun/gun.h @@ -2,9 +2,9 @@ #include "global/types.h" -void __cdecl Gun_Control(void); -void __cdecl Gun_InitialiseNewWeapon(void); -int32_t __cdecl Gun_GetWeaponAnim(LARA_GUN_TYPE gun_type); +void Gun_Control(void); +void Gun_InitialiseNewWeapon(void); +int32_t Gun_GetWeaponAnim(LARA_GUN_TYPE gun_type); // TODO: make this a struct GAME_OBJECT_ID Gun_GetGunObject(LARA_GUN_TYPE gun_type); diff --git a/src/tr2/game/gun/gun_misc.c b/src/tr2/game/gun/gun_misc.c index 0118c3449..f9ec6c714 100644 --- a/src/tr2/game/gun/gun_misc.c +++ b/src/tr2/game/gun/gun_misc.c @@ -25,7 +25,7 @@ static LARA_STATE m_HoldStates[] = { LS_PICKUP, LS_SWITCH_ON, LS_SWITCH_OFF, (LARA_STATE)-1, }; -int32_t __cdecl Gun_CheckForHoldingState(const LARA_STATE state) +int32_t Gun_CheckForHoldingState(const LARA_STATE state) { if (g_Lara.extra_anim) { return false; @@ -41,7 +41,7 @@ int32_t __cdecl Gun_CheckForHoldingState(const LARA_STATE state) return false; } -void __cdecl Gun_TargetInfo(const WEAPON_INFO *const winfo) +void Gun_TargetInfo(const WEAPON_INFO *const winfo) { if (!g_Lara.target) { g_Lara.left_arm.lock = 0; @@ -102,7 +102,7 @@ void __cdecl Gun_TargetInfo(const WEAPON_INFO *const winfo) g_Lara.target_angles[1] = angles[1]; } -void __cdecl Gun_GetNewTarget(const WEAPON_INFO *const winfo) +void Gun_GetNewTarget(const WEAPON_INFO *const winfo) { GAME_VECTOR start; start.pos.x = g_LaraItem->pos.x; @@ -168,7 +168,7 @@ void __cdecl Gun_GetNewTarget(const WEAPON_INFO *const winfo) Gun_TargetInfo(winfo); } -void __cdecl Gun_AimWeapon(const WEAPON_INFO *const winfo, LARA_ARM *const arm) +void Gun_AimWeapon(const WEAPON_INFO *const winfo, LARA_ARM *const arm) { const int16_t speed = winfo->aim_speed; @@ -198,7 +198,7 @@ void __cdecl Gun_AimWeapon(const WEAPON_INFO *const winfo, LARA_ARM *const arm) arm->rot.z = 0; } -int32_t __cdecl Gun_FireWeapon( +int32_t Gun_FireWeapon( const LARA_GUN_TYPE weapon_type, ITEM *const target, const ITEM *const src, const int16_t *const angles) { @@ -296,8 +296,7 @@ int32_t __cdecl Gun_FireWeapon( } } -void __cdecl Gun_FindTargetPoint( - const ITEM *const item, GAME_VECTOR *const target) +void Gun_FindTargetPoint(const ITEM *const item, GAME_VECTOR *const target) { const BOUNDS_16 *const bounds = &Item_GetBestFrame(item)->bounds; const int32_t x = bounds->min_x + (bounds->max_x - bounds->min_x) / 2; @@ -311,7 +310,7 @@ void __cdecl Gun_FindTargetPoint( target->room_num = item->room_num; } -void __cdecl Gun_HitTarget( +void Gun_HitTarget( ITEM *const item, const GAME_VECTOR *const hit_pos, const int32_t damage) { if (item->hit_points > 0 && item->hit_points <= damage @@ -337,8 +336,7 @@ void __cdecl Gun_HitTarget( } } -void __cdecl Gun_SmashItem( - const int16_t item_num, const LARA_GUN_TYPE weapon_type) +void Gun_SmashItem(const int16_t item_num, const LARA_GUN_TYPE weapon_type) { ITEM *const item = &g_Items[item_num]; @@ -359,7 +357,7 @@ void __cdecl Gun_SmashItem( } } -void __cdecl Gun_DrawFlash(const LARA_GUN_TYPE weapon_type, const int32_t clip) +void Gun_DrawFlash(const LARA_GUN_TYPE weapon_type, const int32_t clip) { int16_t shade; int32_t y; diff --git a/src/tr2/game/gun/gun_misc.h b/src/tr2/game/gun/gun_misc.h index f2f01cb8a..7dc8b5532 100644 --- a/src/tr2/game/gun/gun_misc.h +++ b/src/tr2/game/gun/gun_misc.h @@ -29,15 +29,14 @@ typedef enum { LA_G_SURF_UNDRAW = 9, } LARA_GUN_ANIMATION; -int32_t __cdecl Gun_CheckForHoldingState(const LARA_STATE state); -void __cdecl Gun_TargetInfo(const WEAPON_INFO *winfo); -void __cdecl Gun_GetNewTarget(const WEAPON_INFO *winfo); -void __cdecl Gun_AimWeapon(const WEAPON_INFO *winfo, LARA_ARM *arm); -int32_t __cdecl Gun_FireWeapon( +int32_t Gun_CheckForHoldingState(const LARA_STATE state); +void Gun_TargetInfo(const WEAPON_INFO *winfo); +void Gun_GetNewTarget(const WEAPON_INFO *winfo); +void Gun_AimWeapon(const WEAPON_INFO *winfo, LARA_ARM *arm); +int32_t Gun_FireWeapon( LARA_GUN_TYPE weapon_type, ITEM *target, const ITEM *src, const int16_t *angles); -void __cdecl Gun_FindTargetPoint(const ITEM *item, GAME_VECTOR *target); -void __cdecl Gun_HitTarget( - ITEM *item, const GAME_VECTOR *hit_pos, int32_t damage); -void __cdecl Gun_SmashItem(int16_t item_num, LARA_GUN_TYPE weapon_type); -void __cdecl Gun_DrawFlash(LARA_GUN_TYPE weapon_type, int32_t clip); +void Gun_FindTargetPoint(const ITEM *item, GAME_VECTOR *target); +void Gun_HitTarget(ITEM *item, const GAME_VECTOR *hit_pos, int32_t damage); +void Gun_SmashItem(int16_t item_num, LARA_GUN_TYPE weapon_type); +void Gun_DrawFlash(LARA_GUN_TYPE weapon_type, int32_t clip); diff --git a/src/tr2/game/gun/gun_pistols.c b/src/tr2/game/gun/gun_pistols.c index 27ca40ab3..8226a1f3a 100644 --- a/src/tr2/game/gun/gun_pistols.c +++ b/src/tr2/game/gun/gun_pistols.c @@ -11,7 +11,7 @@ static bool m_UziRight = false; static bool m_UziLeft = false; -void __cdecl Gun_Pistols_SetArmInfo(LARA_ARM *const arm, const int32_t frame) +void Gun_Pistols_SetArmInfo(LARA_ARM *const arm, const int32_t frame) { const int16_t anim_idx = g_Objects[O_LARA_PISTOLS].anim_idx; @@ -29,7 +29,7 @@ void __cdecl Gun_Pistols_SetArmInfo(LARA_ARM *const arm, const int32_t frame) arm->frame_base = g_Anims[arm->anim_num].frame_ptr; } -void __cdecl Gun_Pistols_Draw(const LARA_GUN_TYPE weapon_type) +void Gun_Pistols_Draw(const LARA_GUN_TYPE weapon_type) { int16_t frame = g_Lara.left_arm.frame_num + 1; @@ -47,7 +47,7 @@ void __cdecl Gun_Pistols_Draw(const LARA_GUN_TYPE weapon_type) Gun_Pistols_SetArmInfo(&g_Lara.left_arm, frame); } -void __cdecl Gun_Pistols_Undraw(const LARA_GUN_TYPE weapon_type) +void Gun_Pistols_Undraw(const LARA_GUN_TYPE weapon_type) { int16_t frame_l = g_Lara.left_arm.frame_num; if (frame_l >= LF_G_RECOIL_START && frame_l <= LF_G_RECOIL_END) { @@ -110,7 +110,7 @@ void __cdecl Gun_Pistols_Undraw(const LARA_GUN_TYPE weapon_type) } } -void __cdecl Gun_Pistols_Ready(const LARA_GUN_TYPE weapon_type) +void Gun_Pistols_Ready(const LARA_GUN_TYPE weapon_type) { g_Lara.gun_status = LGS_READY; g_Lara.target = NULL; @@ -129,7 +129,7 @@ void __cdecl Gun_Pistols_Ready(const LARA_GUN_TYPE weapon_type) g_Lara.right_arm.rot.z = 0; } -void __cdecl Gun_Pistols_DrawMeshes(const LARA_GUN_TYPE weapon_type) +void Gun_Pistols_DrawMeshes(const LARA_GUN_TYPE weapon_type) { Gun_SetLaraHandLMesh(weapon_type); Gun_SetLaraHandRMesh(weapon_type); @@ -149,7 +149,7 @@ void Gun_Pistols_UndrawMeshRight(const LARA_GUN_TYPE weapon_type) Gun_SetLaraHolsterRMesh(weapon_type); } -void __cdecl Gun_Pistols_Control(const LARA_GUN_TYPE weapon_type) +void Gun_Pistols_Control(const LARA_GUN_TYPE weapon_type) { const WEAPON_INFO *const winfo = &g_Weapons[weapon_type]; @@ -197,7 +197,7 @@ void __cdecl Gun_Pistols_Control(const LARA_GUN_TYPE weapon_type) } } -void __cdecl Gun_Pistols_Animate(const LARA_GUN_TYPE weapon_type) +void Gun_Pistols_Animate(const LARA_GUN_TYPE weapon_type) { const WEAPON_INFO *const winfo = &g_Weapons[weapon_type]; diff --git a/src/tr2/game/gun/gun_pistols.h b/src/tr2/game/gun/gun_pistols.h index 85a935d64..fb6c6a5d3 100644 --- a/src/tr2/game/gun/gun_pistols.h +++ b/src/tr2/game/gun/gun_pistols.h @@ -2,12 +2,12 @@ #include "global/types.h" -void __cdecl Gun_Pistols_SetArmInfo(LARA_ARM *arm, int32_t frame); -void __cdecl Gun_Pistols_Draw(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Pistols_Undraw(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Pistols_Ready(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Pistols_DrawMeshes(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Pistols_UndrawMeshLeft(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Pistols_UndrawMeshRight(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Pistols_Control(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Pistols_Animate(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_SetArmInfo(LARA_ARM *arm, int32_t frame); +void Gun_Pistols_Draw(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_Undraw(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_Ready(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_DrawMeshes(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_UndrawMeshLeft(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_UndrawMeshRight(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_Control(LARA_GUN_TYPE weapon_type); +void Gun_Pistols_Animate(LARA_GUN_TYPE weapon_type); diff --git a/src/tr2/game/gun/gun_rifle.c b/src/tr2/game/gun/gun_rifle.c index 5df6b73af..814b78d91 100644 --- a/src/tr2/game/gun/gun_rifle.c +++ b/src/tr2/game/gun/gun_rifle.c @@ -18,19 +18,19 @@ static bool m_M16Firing = false; static bool m_HarpoonFired = false; -void __cdecl Gun_Rifle_DrawMeshes(const LARA_GUN_TYPE weapon_type) +void Gun_Rifle_DrawMeshes(const LARA_GUN_TYPE weapon_type) { Gun_SetLaraHandRMesh(weapon_type); g_Lara.back_gun = O_LARA; } -void __cdecl Gun_Rifle_UndrawMeshes(const LARA_GUN_TYPE weapon_type) +void Gun_Rifle_UndrawMeshes(const LARA_GUN_TYPE weapon_type) { Gun_SetLaraHandRMesh(LGT_UNARMED); g_Lara.back_gun = Gun_GetWeaponAnim(weapon_type); } -void __cdecl Gun_Rifle_Ready(const LARA_GUN_TYPE weapon_type) +void Gun_Rifle_Ready(const LARA_GUN_TYPE weapon_type) { g_Lara.gun_status = LGS_READY; g_Lara.target = NULL; @@ -52,7 +52,7 @@ void __cdecl Gun_Rifle_Ready(const LARA_GUN_TYPE weapon_type) g_Lara.right_arm.rot.z = 0; } -void __cdecl Gun_Rifle_Control(const LARA_GUN_TYPE weapon_type) +void Gun_Rifle_Control(const LARA_GUN_TYPE weapon_type) { const WEAPON_INFO *const winfo = &g_Weapons[weapon_type]; @@ -88,7 +88,7 @@ void __cdecl Gun_Rifle_Control(const LARA_GUN_TYPE weapon_type) } } -void __cdecl Gun_Rifle_FireShotgun(void) +void Gun_Rifle_FireShotgun(void) { bool fired = false; @@ -114,7 +114,7 @@ void __cdecl Gun_Rifle_FireShotgun(void) } } -void __cdecl Gun_Rifle_FireM16(const bool running) +void Gun_Rifle_FireM16(const bool running) { int16_t angles[2]; angles[0] = g_Lara.left_arm.rot.y + g_LaraItem->rot.y; @@ -135,7 +135,7 @@ void __cdecl Gun_Rifle_FireM16(const bool running) } } -void __cdecl Gun_Rifle_FireHarpoon(void) +void Gun_Rifle_FireHarpoon(void) { if (g_Lara.harpoon_ammo.ammo <= 0) { return; @@ -191,7 +191,7 @@ void __cdecl Gun_Rifle_FireHarpoon(void) g_SaveGame.statistics.shots++; } -void __cdecl Gun_Rifle_FireGrenade(void) +void Gun_Rifle_FireGrenade(void) { if (g_Lara.grenade_ammo.ammo <= 0) { return; @@ -230,7 +230,7 @@ void __cdecl Gun_Rifle_FireGrenade(void) g_SaveGame.statistics.shots++; } -void __cdecl Gun_Rifle_Draw(const LARA_GUN_TYPE weapon_type) +void Gun_Rifle_Draw(const LARA_GUN_TYPE weapon_type) { ITEM *item; if (g_Lara.weapon_item != NO_ITEM) { @@ -273,7 +273,7 @@ void __cdecl Gun_Rifle_Draw(const LARA_GUN_TYPE weapon_type) item->frame_num - g_Anims[item->anim_num].frame_base; } -void __cdecl Gun_Rifle_Undraw(const LARA_GUN_TYPE weapon_type) +void Gun_Rifle_Undraw(const LARA_GUN_TYPE weapon_type) { ITEM *const item = &g_Items[g_Lara.weapon_item]; if (g_Lara.water_status == LWS_SURFACE) { @@ -308,7 +308,7 @@ void __cdecl Gun_Rifle_Undraw(const LARA_GUN_TYPE weapon_type) item->frame_num - g_Anims[item->anim_num].frame_base; } -void __cdecl Gun_Rifle_Animate(const LARA_GUN_TYPE weapon_type) +void Gun_Rifle_Animate(const LARA_GUN_TYPE weapon_type) { const bool running = weapon_type == LGT_M16 && g_LaraItem->speed != 0; ITEM *const item = &g_Items[g_Lara.weapon_item]; diff --git a/src/tr2/game/gun/gun_rifle.h b/src/tr2/game/gun/gun_rifle.h index 39ca02e01..dabec3e85 100644 --- a/src/tr2/game/gun/gun_rifle.h +++ b/src/tr2/game/gun/gun_rifle.h @@ -2,14 +2,14 @@ #include "global/types.h" -void __cdecl Gun_Rifle_DrawMeshes(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Rifle_UndrawMeshes(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Rifle_Ready(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Rifle_Control(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Rifle_FireShotgun(void); -void __cdecl Gun_Rifle_FireM16(bool running); -void __cdecl Gun_Rifle_FireHarpoon(void); -void __cdecl Gun_Rifle_FireGrenade(void); -void __cdecl Gun_Rifle_Draw(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Rifle_Undraw(LARA_GUN_TYPE weapon_type); -void __cdecl Gun_Rifle_Animate(LARA_GUN_TYPE weapon_type); +void Gun_Rifle_DrawMeshes(LARA_GUN_TYPE weapon_type); +void Gun_Rifle_UndrawMeshes(LARA_GUN_TYPE weapon_type); +void Gun_Rifle_Ready(LARA_GUN_TYPE weapon_type); +void Gun_Rifle_Control(LARA_GUN_TYPE weapon_type); +void Gun_Rifle_FireShotgun(void); +void Gun_Rifle_FireM16(bool running); +void Gun_Rifle_FireHarpoon(void); +void Gun_Rifle_FireGrenade(void); +void Gun_Rifle_Draw(LARA_GUN_TYPE weapon_type); +void Gun_Rifle_Undraw(LARA_GUN_TYPE weapon_type); +void Gun_Rifle_Animate(LARA_GUN_TYPE weapon_type); diff --git a/src/tr2/game/inventory/backpack.c b/src/tr2/game/inventory/backpack.c index 0bd4d5224..79915957d 100644 --- a/src/tr2/game/inventory/backpack.c +++ b/src/tr2/game/inventory/backpack.c @@ -4,7 +4,7 @@ #include "game/items.h" #include "global/vars.h" -void __cdecl Inv_InsertItem(INVENTORY_ITEM *const inv_item) +void Inv_InsertItem(INVENTORY_ITEM *const inv_item) { int32_t n; @@ -39,7 +39,7 @@ void __cdecl Inv_InsertItem(INVENTORY_ITEM *const inv_item) } } -int32_t __cdecl Inv_AddItem(const GAME_OBJECT_ID object_id) +int32_t Inv_AddItem(const GAME_OBJECT_ID object_id) { const GAME_OBJECT_ID inv_object_id = Inv_GetItemOption(object_id); @@ -300,7 +300,7 @@ void Inv_AddItemNTimes(GAME_OBJECT_ID object_id, int32_t qty) } } -int32_t __cdecl Inv_RequestItem(const GAME_OBJECT_ID object_id) +int32_t Inv_RequestItem(const GAME_OBJECT_ID object_id) { const GAME_OBJECT_ID inv_object_id = Inv_GetItemOption(object_id); @@ -319,7 +319,7 @@ int32_t __cdecl Inv_RequestItem(const GAME_OBJECT_ID object_id) return 0; } -void __cdecl Inv_RemoveAllItems(void) +void Inv_RemoveAllItems(void) { g_Inv_MainObjectsCount = 0; g_Inv_KeyObjectsCount = 0; diff --git a/src/tr2/game/inventory/backpack.h b/src/tr2/game/inventory/backpack.h index 947fc7eed..e92aa780d 100644 --- a/src/tr2/game/inventory/backpack.h +++ b/src/tr2/game/inventory/backpack.h @@ -2,10 +2,10 @@ #include "global/types.h" -void __cdecl Inv_InsertItem(INVENTORY_ITEM *inv_item); -int32_t __cdecl Inv_AddItem(GAME_OBJECT_ID object_id); +void Inv_InsertItem(INVENTORY_ITEM *inv_item); +int32_t Inv_AddItem(GAME_OBJECT_ID object_id); void Inv_AddItemNTimes(GAME_OBJECT_ID object_id, int32_t qty); -int32_t __cdecl Inv_RequestItem(GAME_OBJECT_ID object_id); -void __cdecl Inv_RemoveAllItems(void); +int32_t Inv_RequestItem(GAME_OBJECT_ID object_id); +void Inv_RemoveAllItems(void); void Inv_ClearSelection(void); -int32_t __cdecl Inv_RemoveItem(GAME_OBJECT_ID object_id); +int32_t Inv_RemoveItem(GAME_OBJECT_ID object_id); diff --git a/src/tr2/game/inventory/common.c b/src/tr2/game/inventory/common.c index 267fda70d..e74541488 100644 --- a/src/tr2/game/inventory/common.c +++ b/src/tr2/game/inventory/common.c @@ -104,7 +104,7 @@ static void M_End(RING_INFO *const ring) Output_UnloadBackground(); } -void __cdecl Inv_InitColors(void) +void Inv_InitColors(void) { struct { RGB_888 rgb; @@ -131,7 +131,7 @@ void __cdecl Inv_InitColors(void) } } -void __cdecl Inv_Construct(void) +void Inv_Construct(void) { Output_SetupAboveWater(0); @@ -472,7 +472,7 @@ static void M_Draw( g_Camera.num_frames = frames; } -int32_t __cdecl Inv_Display(int32_t inventory_mode) +int32_t Inv_Display(int32_t inventory_mode) { FADER fader = { 0 }; @@ -1037,7 +1037,7 @@ int32_t Inv_DisplayKeys(const GAME_OBJECT_ID receptacle_type_id) return Inv_Display(INV_KEYS_MODE); } -void __cdecl Inv_SelectMeshes(INVENTORY_ITEM *const inv_item) +void Inv_SelectMeshes(INVENTORY_ITEM *const inv_item) { switch (inv_item->object_id) { case O_PASSPORT_OPTION: @@ -1074,7 +1074,7 @@ void __cdecl Inv_SelectMeshes(INVENTORY_ITEM *const inv_item) } } -int32_t __cdecl Inv_AnimateInventoryItem(INVENTORY_ITEM *const inv_item) +int32_t Inv_AnimateInventoryItem(INVENTORY_ITEM *const inv_item) { if (inv_item->current_frame == inv_item->goal_frame) { Inv_SelectMeshes(inv_item); @@ -1106,7 +1106,7 @@ GAME_OBJECT_ID Inv_GetItemOption(const GAME_OBJECT_ID object_id) return Object_GetCognate(object_id, g_ItemToInvObjectMap); } -void __cdecl Inv_RingIsOpen(RING_INFO *const ring) +void Inv_RingIsOpen(RING_INFO *const ring) { if (g_Inv_Mode == INV_TITLE_MODE) { return; @@ -1164,7 +1164,7 @@ void __cdecl Inv_RingIsOpen(RING_INFO *const ring) } } -void __cdecl Inv_RingIsNotOpen(RING_INFO *const ring) +void Inv_RingIsNotOpen(RING_INFO *const ring) { Text_Remove(g_Inv_TagText); g_Inv_TagText = NULL; @@ -1180,7 +1180,7 @@ void __cdecl Inv_RingIsNotOpen(RING_INFO *const ring) g_Inv_DownArrow2 = NULL; } -void __cdecl Inv_RingNotActive(const INVENTORY_ITEM *const inv_item) +void Inv_RingNotActive(const INVENTORY_ITEM *const inv_item) { if (g_Inv_ItemText[0] == NULL) { if (inv_item->object_id != O_PASSPORT_OPTION) { @@ -1257,7 +1257,7 @@ void __cdecl Inv_RingNotActive(const INVENTORY_ITEM *const inv_item) } } -void __cdecl Inv_RingActive(void) +void Inv_RingActive(void) { M_RemoveItemsText(); } diff --git a/src/tr2/game/inventory/common.h b/src/tr2/game/inventory/common.h index 5389ee8f4..61ff33bcc 100644 --- a/src/tr2/game/inventory/common.h +++ b/src/tr2/game/inventory/common.h @@ -2,16 +2,16 @@ #include "global/types.h" -void __cdecl Inv_InitColors(void); -void __cdecl Inv_Construct(void); -int32_t __cdecl Inv_Display(int32_t inventory_mode); +void Inv_InitColors(void); +void Inv_Construct(void); +int32_t Inv_Display(int32_t inventory_mode); int32_t Inv_DisplayKeys(GAME_OBJECT_ID receptacle_type_id); -void __cdecl Inv_SelectMeshes(INVENTORY_ITEM *inv_item); -int32_t __cdecl Inv_AnimateInventoryItem(INVENTORY_ITEM *inv_item); -void __cdecl Inv_DrawInventoryItem(INVENTORY_ITEM *inv_item); +void Inv_SelectMeshes(INVENTORY_ITEM *inv_item); +int32_t Inv_AnimateInventoryItem(INVENTORY_ITEM *inv_item); +void Inv_DrawInventoryItem(INVENTORY_ITEM *inv_item); GAME_OBJECT_ID Inv_GetItemOption(GAME_OBJECT_ID object_id); -void __cdecl Inv_RingIsOpen(RING_INFO *ring); -void __cdecl Inv_RingIsNotOpen(RING_INFO *ring); -void __cdecl Inv_RingNotActive(const INVENTORY_ITEM *inv_item); -void __cdecl Inv_RingActive(void); -void __cdecl Inv_RemoveInventoryText(void); +void Inv_RingIsOpen(RING_INFO *ring); +void Inv_RingIsNotOpen(RING_INFO *ring); +void Inv_RingNotActive(const INVENTORY_ITEM *inv_item); +void Inv_RingActive(void); +void Inv_RemoveInventoryText(void); diff --git a/src/tr2/game/inventory/ring.c b/src/tr2/game/inventory/ring.c index ea6fbe3c5..4fc527674 100644 --- a/src/tr2/game/inventory/ring.c +++ b/src/tr2/game/inventory/ring.c @@ -39,7 +39,7 @@ void Inv_Ring_SetRequestedObjectID(const GAME_OBJECT_ID object_id) m_RequestedObjectID = object_id; } -void __cdecl Inv_Ring_Init( +void Inv_Ring_Init( RING_INFO *const ring, const RING_TYPE type, INVENTORY_ITEM **const list, const int16_t qty, const int16_t current, IMOTION_INFO *const imo) { @@ -93,8 +93,7 @@ void __cdecl Inv_Ring_Init( ring->light.z = 1024; } -void __cdecl Inv_Ring_GetView( - const RING_INFO *const ring, PHD_3DPOS *const view) +void Inv_Ring_GetView(const RING_INFO *const ring, PHD_3DPOS *const view) { int16_t angles[2]; @@ -109,7 +108,7 @@ void __cdecl Inv_Ring_GetView( view->rot.z = 0; } -void __cdecl Inv_Ring_Light(const RING_INFO *const ring) +void Inv_Ring_Light(const RING_INFO *const ring) { g_LsDivider = 0x6000; int16_t angles[2]; @@ -117,15 +116,14 @@ void __cdecl Inv_Ring_Light(const RING_INFO *const ring) Output_RotateLight(angles[1], angles[0]); } -void __cdecl Inv_Ring_CalcAdders( - RING_INFO *const ring, const int16_t rotation_duration) +void Inv_Ring_CalcAdders(RING_INFO *const ring, const int16_t rotation_duration) { ring->angle_adder = PHD_360 / ring->number_of_objects; ring->rot_adder_l = ring->angle_adder / rotation_duration; ring->rot_adder_r = -ring->angle_adder / rotation_duration; } -void __cdecl Inv_Ring_DoMotions(RING_INFO *const ring) +void Inv_Ring_DoMotions(RING_INFO *const ring) { IMOTION_INFO *const imo = ring->imo; @@ -193,7 +191,7 @@ void __cdecl Inv_Ring_DoMotions(RING_INFO *const ring) } } -void __cdecl Inv_Ring_RotateLeft(RING_INFO *const ring) +void Inv_Ring_RotateLeft(RING_INFO *const ring) { ring->rotating = 1; if (ring->current_object == 0) { @@ -205,7 +203,7 @@ void __cdecl Inv_Ring_RotateLeft(RING_INFO *const ring) ring->rot_adder = ring->rot_adder_l; } -void __cdecl Inv_Ring_RotateRight(RING_INFO *const ring) +void Inv_Ring_RotateRight(RING_INFO *const ring) { ring->rotating = 1; if (ring->current_object + 1 >= ring->number_of_objects) { @@ -217,7 +215,7 @@ void __cdecl Inv_Ring_RotateRight(RING_INFO *const ring) ring->rot_adder = ring->rot_adder_r; } -void __cdecl Inv_Ring_MotionInit( +void Inv_Ring_MotionInit( RING_INFO *const ring, const int16_t frames, const RING_STATUS status, const RING_STATUS status_target) { @@ -246,7 +244,7 @@ void __cdecl Inv_Ring_MotionInit( imo->misc = 0; } -void __cdecl Inv_Ring_MotionSetup( +void Inv_Ring_MotionSetup( RING_INFO *const ring, const RING_STATUS status, const RING_STATUS status_target, const int16_t frames) { @@ -258,14 +256,14 @@ void __cdecl Inv_Ring_MotionSetup( imo->camera_y_rate = 0; } -void __cdecl Inv_Ring_MotionRadius(RING_INFO *const ring, const int16_t target) +void Inv_Ring_MotionRadius(RING_INFO *const ring, const int16_t target) { IMOTION_INFO *const imo = ring->imo; imo->radius_target = target; imo->radius_rate = (target - ring->radius) / imo->count; } -void __cdecl Inv_Ring_MotionRotation( +void Inv_Ring_MotionRotation( RING_INFO *const ring, const int16_t rotation, const int16_t target) { IMOTION_INFO *const imo = ring->imo; @@ -273,23 +271,21 @@ void __cdecl Inv_Ring_MotionRotation( imo->rotate_rate = rotation / imo->count; } -void __cdecl Inv_Ring_MotionCameraPos( - RING_INFO *const ring, const int16_t target) +void Inv_Ring_MotionCameraPos(RING_INFO *const ring, const int16_t target) { IMOTION_INFO *const imo = ring->imo; imo->camera_y_target = target; imo->camera_y_rate = (target - ring->camera.pos.y) / imo->count; } -void __cdecl Inv_Ring_MotionCameraPitch( - RING_INFO *const ring, const int16_t target) +void Inv_Ring_MotionCameraPitch(RING_INFO *const ring, const int16_t target) { IMOTION_INFO *const imo = ring->imo; imo->camera_pitch_target = target; imo->camera_pitch_rate = target / imo->count; } -void __cdecl Inv_Ring_MotionItemSelect( +void Inv_Ring_MotionItemSelect( RING_INFO *const ring, const INVENTORY_ITEM *const inv_item) { IMOTION_INFO *const imo = ring->imo; @@ -304,7 +300,7 @@ void __cdecl Inv_Ring_MotionItemSelect( imo->item_z_trans_rate = inv_item->z_trans_sel / imo->count; } -void __cdecl Inv_Ring_MotionItemDeselect( +void Inv_Ring_MotionItemDeselect( RING_INFO *const ring, const INVENTORY_ITEM *const inv_item) { IMOTION_INFO *const imo = ring->imo; diff --git a/src/tr2/game/inventory/ring.h b/src/tr2/game/inventory/ring.h index ab06661e0..654bf4b26 100644 --- a/src/tr2/game/inventory/ring.h +++ b/src/tr2/game/inventory/ring.h @@ -3,27 +3,25 @@ #include "global/types.h" void Inv_Ring_SetRequestedObjectID(const GAME_OBJECT_ID object_id); -void __cdecl Inv_Ring_Init( +void Inv_Ring_Init( RING_INFO *ring, RING_TYPE type, INVENTORY_ITEM **list, int16_t qty, int16_t current, IMOTION_INFO *imo); -void __cdecl Inv_Ring_GetView(const RING_INFO *ring, PHD_3DPOS *view); -void __cdecl Inv_Ring_Light(const RING_INFO *ring); -void __cdecl Inv_Ring_CalcAdders(RING_INFO *ring, int16_t rotation_duration); -void __cdecl Inv_Ring_DoMotions(RING_INFO *ring); -void __cdecl Inv_Ring_RotateLeft(RING_INFO *ring); -void __cdecl Inv_Ring_RotateRight(RING_INFO *ring); -void __cdecl Inv_Ring_MotionInit( +void Inv_Ring_GetView(const RING_INFO *ring, PHD_3DPOS *view); +void Inv_Ring_Light(const RING_INFO *ring); +void Inv_Ring_CalcAdders(RING_INFO *ring, int16_t rotation_duration); +void Inv_Ring_DoMotions(RING_INFO *ring); +void Inv_Ring_RotateLeft(RING_INFO *ring); +void Inv_Ring_RotateRight(RING_INFO *ring); +void Inv_Ring_MotionInit( RING_INFO *ring, int16_t frames, RING_STATUS status, RING_STATUS status_target); -void __cdecl Inv_Ring_MotionSetup( +void Inv_Ring_MotionSetup( RING_INFO *ring, RING_STATUS status, RING_STATUS status_target, int16_t frames); -void __cdecl Inv_Ring_MotionRadius(RING_INFO *ring, int16_t target); -void __cdecl Inv_Ring_MotionRotation( - RING_INFO *ring, int16_t rotation, int16_t target); -void __cdecl Inv_Ring_MotionCameraPos(RING_INFO *ring, int16_t target); -void __cdecl Inv_Ring_MotionCameraPitch(RING_INFO *ring, int16_t target); -void __cdecl Inv_Ring_MotionItemSelect( - RING_INFO *ring, const INVENTORY_ITEM *inv_item); -void __cdecl Inv_Ring_MotionItemDeselect( +void Inv_Ring_MotionRadius(RING_INFO *ring, int16_t target); +void Inv_Ring_MotionRotation(RING_INFO *ring, int16_t rotation, int16_t target); +void Inv_Ring_MotionCameraPos(RING_INFO *ring, int16_t target); +void Inv_Ring_MotionCameraPitch(RING_INFO *ring, int16_t target); +void Inv_Ring_MotionItemSelect(RING_INFO *ring, const INVENTORY_ITEM *inv_item); +void Inv_Ring_MotionItemDeselect( RING_INFO *ring, const INVENTORY_ITEM *inv_item); diff --git a/src/tr2/game/items.c b/src/tr2/game/items.c index f75fc7a5f..0e56376e6 100644 --- a/src/tr2/game/items.c +++ b/src/tr2/game/items.c @@ -51,7 +51,7 @@ static OBJECT_BOUNDS M_ConvertBounds(const int16_t *const bounds_in) }; } -void __cdecl Item_InitialiseArray(const int32_t num_items) +void Item_InitialiseArray(const int32_t num_items) { ASSERT(num_items > 0); g_NextItemFree = g_LevelItemCount; @@ -71,7 +71,7 @@ int32_t Item_GetTotalCount(void) return m_MaxUsedItemCount; } -int16_t __cdecl Item_Create(void) +int16_t Item_Create(void) { const int16_t item_num = g_NextItemFree; if (item_num != NO_ITEM) { @@ -82,7 +82,7 @@ int16_t __cdecl Item_Create(void) return item_num; } -void __cdecl Item_Kill(const int16_t item_num) +void Item_Kill(const int16_t item_num) { Item_RemoveActive(item_num); Item_RemoveDrawn(item_num); @@ -105,7 +105,7 @@ void __cdecl Item_Kill(const int16_t item_num) } } -void __cdecl Item_Initialise(const int16_t item_num) +void Item_Initialise(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; item->anim_num = g_Objects[item->object_id].anim_idx; @@ -168,7 +168,7 @@ void __cdecl Item_Initialise(const int16_t item_num) } } -void __cdecl Item_RemoveActive(const int16_t item_num) +void Item_RemoveActive(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; if (!item->active) { @@ -192,7 +192,7 @@ void __cdecl Item_RemoveActive(const int16_t item_num) } } -void __cdecl Item_RemoveDrawn(const int16_t item_num) +void Item_RemoveDrawn(const int16_t item_num) { const ITEM *const item = &g_Items[item_num]; if (item->room_num == NO_ROOM) { @@ -214,7 +214,7 @@ void __cdecl Item_RemoveDrawn(const int16_t item_num) } } -void __cdecl Item_AddActive(const int16_t item_num) +void Item_AddActive(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; if (g_Objects[item->object_id].control == NULL) { @@ -231,7 +231,7 @@ void __cdecl Item_AddActive(const int16_t item_num) g_NextItemActive = item_num; } -void __cdecl Item_NewRoom(const int16_t item_num, const int16_t room_num) +void Item_NewRoom(const int16_t item_num, const int16_t room_num) { ITEM *const item = &g_Items[item_num]; ROOM *room = NULL; @@ -259,7 +259,7 @@ void __cdecl Item_NewRoom(const int16_t item_num, const int16_t room_num) room->item_num = item_num; } -int32_t __cdecl Item_GlobalReplace( +int32_t Item_GlobalReplace( const GAME_OBJECT_ID src_object_id, const GAME_OBJECT_ID dst_object_id) { int32_t changed = 0; @@ -279,7 +279,7 @@ int32_t __cdecl Item_GlobalReplace( return changed; } -void __cdecl Item_ClearKilled(void) +void Item_ClearKilled(void) { // Remove corpses and other killed items. Part of OG performance // improvements, generously used in Opera House and Barkhang Monastery @@ -298,7 +298,7 @@ bool Item_IsSmashable(const ITEM *item) return (item->object_id == O_WINDOW_1 || item->object_id == O_BELL); } -void __cdecl Item_ShiftCol(ITEM *const item, COLL_INFO *const coll) +void Item_ShiftCol(ITEM *const item, COLL_INFO *const coll) { item->pos.x += coll->shift.x; item->pos.y += coll->shift.y; @@ -308,7 +308,7 @@ void __cdecl Item_ShiftCol(ITEM *const item, COLL_INFO *const coll) coll->shift.x = 0; } -void __cdecl Item_UpdateRoom(ITEM *const item, const int32_t height) +void Item_UpdateRoom(ITEM *const item, const int32_t height) { int32_t x = item->pos.x; int32_t y = height + item->pos.y; @@ -322,7 +322,7 @@ void __cdecl Item_UpdateRoom(ITEM *const item, const int32_t height) } } -int32_t __cdecl Item_TestBoundsCollide( +int32_t Item_TestBoundsCollide( const ITEM *const src_item, const ITEM *const dst_item, const int32_t radius) { @@ -352,7 +352,7 @@ int32_t __cdecl Item_TestBoundsCollide( // clang-format on } -int32_t __cdecl Item_TestPosition( +int32_t Item_TestPosition( const int16_t *const bounds_in, const ITEM *const src_item, const ITEM *const dst_item) { @@ -403,7 +403,7 @@ int32_t __cdecl Item_TestPosition( // clang-format on } -void __cdecl Item_AlignPosition( +void Item_AlignPosition( const XYZ_32 *const vec, const ITEM *const src_item, ITEM *const dst_item) { dst_item->rot = src_item->rot; @@ -441,7 +441,7 @@ void __cdecl Item_AlignPosition( dst_item->pos.z = new_pos.z; } -void __cdecl Item_Animate(ITEM *const item) +void Item_Animate(ITEM *const item) { item->hit_status = 0; item->touch_bits = 0; @@ -586,7 +586,7 @@ void __cdecl Item_Animate(ITEM *const item) item->pos.z += (item->speed * Math_Cos(item->rot.y)) >> W2V_SHIFT; } -int32_t __cdecl Item_GetAnimChange(ITEM *const item, const ANIM *const anim) +int32_t Item_GetAnimChange(ITEM *const item, const ANIM *const anim) { if (item->current_anim_state == item->goal_anim_state) { return false; @@ -614,7 +614,7 @@ int32_t __cdecl Item_GetAnimChange(ITEM *const item, const ANIM *const anim) return false; } -void __cdecl Item_Translate( +void Item_Translate( ITEM *const item, const int32_t x, const int32_t y, const int32_t z) { const int32_t c = Math_Cos(item->rot.y); @@ -624,7 +624,7 @@ void __cdecl Item_Translate( item->pos.z += ((c * z - s * x) >> W2V_SHIFT); } -int32_t __cdecl Item_IsTriggerActive(ITEM *const item) +int32_t Item_IsTriggerActive(ITEM *const item) { const bool ok = !(item->flags & IF_REVERSE); @@ -648,8 +648,7 @@ int32_t __cdecl Item_IsTriggerActive(ITEM *const item) return ok; } -int32_t __cdecl Item_GetFrames( - const ITEM *item, FRAME_INFO *frmptr[], int32_t *rate) +int32_t Item_GetFrames(const ITEM *item, FRAME_INFO *frmptr[], int32_t *rate) { const ANIM *const anim = &g_Anims[item->anim_num]; const int32_t cur_frame_num = item->frame_num - anim->frame_base; @@ -676,7 +675,7 @@ int32_t __cdecl Item_GetFrames( return numerator; } -BOUNDS_16 *__cdecl Item_GetBoundsAccurate(const ITEM *const item) +BOUNDS_16 *Item_GetBoundsAccurate(const ITEM *const item) { int32_t rate; FRAME_INFO *frmptr[2]; @@ -698,7 +697,7 @@ BOUNDS_16 *__cdecl Item_GetBoundsAccurate(const ITEM *const item) return result; } -FRAME_INFO *__cdecl Item_GetBestFrame(const ITEM *const item) +FRAME_INFO *Item_GetBestFrame(const ITEM *const item) { FRAME_INFO *frmptr[2]; int32_t rate; @@ -706,7 +705,7 @@ FRAME_INFO *__cdecl Item_GetBestFrame(const ITEM *const item) return frmptr[(frac > rate / 2) ? 1 : 0]; } -bool __cdecl Item_IsNearItem( +bool Item_IsNearItem( const ITEM *const item, const XYZ_32 *const pos, const int32_t distance) { const XYZ_32 d = { @@ -739,7 +738,7 @@ ITEM *Item_Get(const int16_t item_num) return &g_Items[item_num]; } -int32_t __cdecl Item_Explode( +int32_t Item_Explode( const int16_t item_num, const int32_t mesh_bits, const int16_t damage) { ITEM *const item = &g_Items[item_num]; diff --git a/src/tr2/game/items.h b/src/tr2/game/items.h index a170f38eb..f976258a5 100644 --- a/src/tr2/game/items.h +++ b/src/tr2/game/items.h @@ -2,36 +2,34 @@ #include "global/types.h" -void __cdecl Item_InitialiseArray(int32_t num_items); +void Item_InitialiseArray(int32_t num_items); int32_t Item_GetTotalCount(void); -int16_t __cdecl Item_Create(void); -void __cdecl Item_Kill(int16_t item_num); -void __cdecl Item_Initialise(int16_t item_num); -void __cdecl Item_RemoveActive(int16_t item_num); -void __cdecl Item_RemoveDrawn(int16_t item_num); -void __cdecl Item_AddActive(int16_t item_num); -void __cdecl Item_NewRoom(int16_t item_num, int16_t room_num); -int32_t __cdecl Item_GlobalReplace( +int16_t Item_Create(void); +void Item_Kill(int16_t item_num); +void Item_Initialise(int16_t item_num); +void Item_RemoveActive(int16_t item_num); +void Item_RemoveDrawn(int16_t item_num); +void Item_AddActive(int16_t item_num); +void Item_NewRoom(int16_t item_num, int16_t room_num); +int32_t Item_GlobalReplace( GAME_OBJECT_ID src_object_id, GAME_OBJECT_ID dst_object_id); -void __cdecl Item_ClearKilled(void); -void __cdecl Item_ShiftCol(ITEM *item, COLL_INFO *coll); -void __cdecl Item_UpdateRoom(ITEM *item, int32_t height); -int32_t __cdecl Item_TestBoundsCollide( +void Item_ClearKilled(void); +void Item_ShiftCol(ITEM *item, COLL_INFO *coll); +void Item_UpdateRoom(ITEM *item, int32_t height); +int32_t Item_TestBoundsCollide( const ITEM *src_item, const ITEM *dst_item, int32_t radius); -int32_t __cdecl Item_TestPosition( +int32_t Item_TestPosition( const int16_t *bounds, const ITEM *src_item, const ITEM *dst_item); -void __cdecl Item_AlignPosition( +void Item_AlignPosition( const XYZ_32 *vec, const ITEM *src_item, ITEM *dst_item); -void __cdecl Item_Animate(ITEM *item); -int32_t __cdecl Item_GetAnimChange(ITEM *item, const ANIM *anim); -void __cdecl Item_Translate(ITEM *item, int32_t x, int32_t y, int32_t z); -int32_t __cdecl Item_IsTriggerActive(ITEM *item); -int32_t __cdecl Item_GetFrames( - const ITEM *item, FRAME_INFO *frmptr[], int32_t *rate); -BOUNDS_16 *__cdecl Item_GetBoundsAccurate(const ITEM *item); -FRAME_INFO *__cdecl Item_GetBestFrame(const ITEM *item); -bool __cdecl Item_IsNearItem( - const ITEM *item, const XYZ_32 *pos, int32_t distance); +void Item_Animate(ITEM *item); +int32_t Item_GetAnimChange(ITEM *item, const ANIM *anim); +void Item_Translate(ITEM *item, int32_t x, int32_t y, int32_t z); +int32_t Item_IsTriggerActive(ITEM *item); +int32_t Item_GetFrames(const ITEM *item, FRAME_INFO *frmptr[], int32_t *rate); +BOUNDS_16 *Item_GetBoundsAccurate(const ITEM *item); +FRAME_INFO *Item_GetBestFrame(const ITEM *item); +bool Item_IsNearItem(const ITEM *item, const XYZ_32 *pos, int32_t distance); bool Item_IsSmashable(const ITEM *item); int32_t Item_GetDistance(const ITEM *item, const XYZ_32 *target); diff --git a/src/tr2/game/lara/cheat.c b/src/tr2/game/lara/cheat.c index e8ef133b9..f0675ee69 100644 --- a/src/tr2/game/lara/cheat.c +++ b/src/tr2/game/lara/cheat.c @@ -104,7 +104,7 @@ static void M_ResetGunStatus(void) g_Lara.right_arm.frame_base = g_Anims[g_LaraItem->anim_num].frame_ptr; } -void __cdecl Lara_Cheat_EndLevel(void) +void Lara_Cheat_EndLevel(void) { g_LevelComplete = true; Console_Log(GS(OSD_COMPLETE_LEVEL)); @@ -247,7 +247,7 @@ bool Lara_Cheat_OpenNearestDoor(void) return false; } -void __cdecl Lara_Cheat_GetStuff(void) +void Lara_Cheat_GetStuff(void) { M_GiveAllGunsImpl(); M_GiveAllMedpacksImpl(); diff --git a/src/tr2/game/lara/cheat.h b/src/tr2/game/lara/cheat.h index 4ec8fd765..1773c2a9e 100644 --- a/src/tr2/game/lara/cheat.h +++ b/src/tr2/game/lara/cheat.h @@ -3,10 +3,10 @@ #include #include -void __cdecl Lara_Cheat_EndLevel(void); +void Lara_Cheat_EndLevel(void); bool Lara_Cheat_EnterFlyMode(void); bool Lara_Cheat_ExitFlyMode(void); -void __cdecl Lara_Cheat_GetStuff(void); +void Lara_Cheat_GetStuff(void); bool Lara_Cheat_GiveAllKeys(void); bool Lara_Cheat_GiveAllGuns(void); bool Lara_Cheat_GiveAllItems(void); diff --git a/src/tr2/game/lara/cheat_keys.c b/src/tr2/game/lara/cheat_keys.c index b072aff94..7e4e723ef 100644 --- a/src/tr2/game/lara/cheat_keys.c +++ b/src/tr2/game/lara/cheat_keys.c @@ -59,7 +59,7 @@ static void M_ExplodeLara(void) g_LaraItem->flags |= IF_ONE_SHOT; } -void __cdecl Lara_Cheat_CheckKeys(void) +void Lara_Cheat_CheckKeys(void) { if (g_CurrentLevel == LV_GYM) { return; diff --git a/src/tr2/game/lara/cheat_keys.h b/src/tr2/game/lara/cheat_keys.h index d0da351ca..01ee7519b 100644 --- a/src/tr2/game/lara/cheat_keys.h +++ b/src/tr2/game/lara/cheat_keys.h @@ -1,3 +1,3 @@ #pragma once -void __cdecl Lara_Cheat_CheckKeys(void); +void Lara_Cheat_CheckKeys(void); diff --git a/src/tr2/game/lara/col.c b/src/tr2/game/lara/col.c index 57a3fb896..aff208dab 100644 --- a/src/tr2/game/lara/col.c +++ b/src/tr2/game/lara/col.c @@ -13,7 +13,7 @@ #include -void __cdecl Lara_CollideStop(ITEM *const item, const COLL_INFO *const coll) +void Lara_CollideStop(ITEM *const item, const COLL_INFO *const coll) { switch (coll->old_anim_state) { case LS_STOP: @@ -40,7 +40,7 @@ void __cdecl Lara_CollideStop(ITEM *const item, const COLL_INFO *const coll) } } -bool __cdecl Lara_Fallen(ITEM *const item, const COLL_INFO *const coll) +bool Lara_Fallen(ITEM *const item, const COLL_INFO *const coll) { if (coll->side_mid.floor <= STEPUP_HEIGHT || g_Lara.water_status == LWS_WADE) { @@ -55,8 +55,7 @@ bool __cdecl Lara_Fallen(ITEM *const item, const COLL_INFO *const coll) return true; } -bool __cdecl Lara_TestWaterClimbOut( - ITEM *const item, const COLL_INFO *const coll) +bool Lara_TestWaterClimbOut(ITEM *const item, const COLL_INFO *const coll) { if (coll->coll_type != COLL_FRONT || !g_Input.action || coll->side_front.type == HT_BIG_SLOPE) { @@ -137,8 +136,7 @@ bool __cdecl Lara_TestWaterClimbOut( return true; } -bool __cdecl Lara_TestWaterStepOut( - ITEM *const item, const COLL_INFO *const coll) +bool Lara_TestWaterStepOut(ITEM *const item, const COLL_INFO *const coll) { if (coll->coll_type == COLL_FRONT || coll->side_mid.type == HT_BIG_SLOPE || coll->side_mid.floor >= 0) { @@ -172,7 +170,7 @@ bool __cdecl Lara_TestWaterStepOut( return true; } -void __cdecl Lara_SurfaceCollision(ITEM *const item, COLL_INFO *const coll) +void Lara_SurfaceCollision(ITEM *const item, COLL_INFO *const coll) { coll->facing = g_Lara.move_angle; Collide_GetCollisionInfo( @@ -214,7 +212,7 @@ void Lara_Col_Empty(ITEM *item, COLL_INFO *coll) { } -void __cdecl Lara_Col_Walk(ITEM *item, COLL_INFO *coll) +void Lara_Col_Walk(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -277,7 +275,7 @@ void __cdecl Lara_Col_Walk(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_Run(ITEM *item, COLL_INFO *coll) +void Lara_Col_Run(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; coll->slopes_are_walls = 1; @@ -331,7 +329,7 @@ void __cdecl Lara_Col_Run(ITEM *item, COLL_INFO *coll) item->pos.y += MIN(coll->side_mid.floor, 50); } -void __cdecl Lara_Col_Stop(ITEM *item, COLL_INFO *coll) +void Lara_Col_Stop(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -352,7 +350,7 @@ void __cdecl Lara_Col_Stop(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_ForwardJump(ITEM *item, COLL_INFO *coll) +void Lara_Col_ForwardJump(ITEM *item, COLL_INFO *coll) { if (item->speed < 0) { g_Lara.move_angle = item->rot.y + PHD_180; @@ -389,7 +387,7 @@ void __cdecl Lara_Col_ForwardJump(ITEM *item, COLL_INFO *coll) Lara_Animate(item); } -void __cdecl Lara_Col_FastBack(ITEM *item, COLL_INFO *coll) +void Lara_Col_FastBack(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -420,7 +418,7 @@ void __cdecl Lara_Col_FastBack(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_TurnRight(ITEM *item, COLL_INFO *coll) +void Lara_Col_TurnRight(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -447,12 +445,12 @@ void __cdecl Lara_Col_TurnRight(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_TurnLeft(ITEM *item, COLL_INFO *coll) +void Lara_Col_TurnLeft(ITEM *item, COLL_INFO *coll) { Lara_Col_TurnRight(item, coll); } -void __cdecl Lara_Col_Death(ITEM *item, COLL_INFO *coll) +void Lara_Col_Death(ITEM *item, COLL_INFO *coll) { Sound_StopEffect(SFX_LARA_FALL); g_Lara.move_angle = item->rot.y; @@ -469,7 +467,7 @@ void __cdecl Lara_Col_Death(ITEM *item, COLL_INFO *coll) g_Lara.air = -1; } -void __cdecl Lara_Col_FastFall(ITEM *item, COLL_INFO *coll) +void Lara_Col_FastFall(ITEM *item, COLL_INFO *coll) { item->gravity = 1; coll->bad_pos = NO_BAD_POS; @@ -497,7 +495,7 @@ void __cdecl Lara_Col_FastFall(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_Hang(ITEM *item, COLL_INFO *coll) +void Lara_Col_Hang(ITEM *item, COLL_INFO *coll) { Lara_HangTest(item, coll); if (item->goal_anim_state != LS_HANG) { @@ -534,7 +532,7 @@ void __cdecl Lara_Col_Hang(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_Reach(ITEM *item, COLL_INFO *coll) +void Lara_Col_Reach(ITEM *item, COLL_INFO *coll) { item->gravity = 1; g_Lara.move_angle = item->rot.y; @@ -562,7 +560,7 @@ void __cdecl Lara_Col_Reach(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_Splat(ITEM *item, COLL_INFO *coll) +void Lara_Col_Splat(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; coll->slopes_are_pits = 1; @@ -579,12 +577,12 @@ void __cdecl Lara_Col_Splat(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_Land(ITEM *item, COLL_INFO *coll) +void Lara_Col_Land(ITEM *item, COLL_INFO *coll) { Lara_Col_Stop(item, coll); } -void __cdecl Lara_Col_Compress(ITEM *item, COLL_INFO *coll) +void Lara_Col_Compress(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -612,7 +610,7 @@ void __cdecl Lara_Col_Compress(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_Back(ITEM *item, COLL_INFO *coll) +void Lara_Col_Back(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -656,7 +654,7 @@ void __cdecl Lara_Col_Back(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_StepRight(ITEM *item, COLL_INFO *coll) +void Lara_Col_StepRight(ITEM *item, COLL_INFO *coll) { if (item->current_anim_state == LS_STEP_RIGHT) { g_Lara.move_angle = item->rot.y + PHD_90; @@ -690,36 +688,36 @@ void __cdecl Lara_Col_StepRight(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_StepLeft(ITEM *item, COLL_INFO *coll) +void Lara_Col_StepLeft(ITEM *item, COLL_INFO *coll) { Lara_Col_StepRight(item, coll); } -void __cdecl Lara_Col_Slide(ITEM *item, COLL_INFO *coll) +void Lara_Col_Slide(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; Lara_SlideSlope(item, coll); } -void __cdecl Lara_Col_BackJump(ITEM *item, COLL_INFO *coll) +void Lara_Col_BackJump(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y + PHD_180; Lara_Col_Jumper(item, coll); } -void __cdecl Lara_Col_RightJump(ITEM *item, COLL_INFO *coll) +void Lara_Col_RightJump(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y + PHD_90; Lara_Col_Jumper(item, coll); } -void __cdecl Lara_Col_LeftJump(ITEM *item, COLL_INFO *coll) +void Lara_Col_LeftJump(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y - PHD_90; Lara_Col_Jumper(item, coll); } -void __cdecl Lara_Col_UpJump(ITEM *item, COLL_INFO *coll) +void Lara_Col_UpJump(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; coll->bad_pos = NO_BAD_POS; @@ -762,7 +760,7 @@ void __cdecl Lara_Col_UpJump(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_Fallback(ITEM *item, COLL_INFO *coll) +void Lara_Col_Fallback(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y + PHD_180; coll->bad_pos = NO_BAD_POS; @@ -787,32 +785,32 @@ void __cdecl Lara_Col_Fallback(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_HangLeft(ITEM *item, COLL_INFO *coll) +void Lara_Col_HangLeft(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y - PHD_90; Lara_HangTest(item, coll); g_Lara.move_angle = item->rot.y - PHD_90; } -void __cdecl Lara_Col_HangRight(ITEM *item, COLL_INFO *coll) +void Lara_Col_HangRight(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y + PHD_90; Lara_HangTest(item, coll); g_Lara.move_angle = item->rot.y + PHD_90; } -void __cdecl Lara_Col_SlideBack(ITEM *item, COLL_INFO *coll) +void Lara_Col_SlideBack(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y + PHD_180; Lara_SlideSlope(item, coll); } -void __cdecl Lara_Col_Null(ITEM *item, COLL_INFO *coll) +void Lara_Col_Null(ITEM *item, COLL_INFO *coll) { Lara_Col_Default(item, coll); } -void __cdecl Lara_Col_Roll(ITEM *item, COLL_INFO *coll) +void Lara_Col_Roll(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -832,7 +830,7 @@ void __cdecl Lara_Col_Roll(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_Roll2(ITEM *item, COLL_INFO *coll) +void Lara_Col_Roll2(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -860,7 +858,7 @@ void __cdecl Lara_Col_Roll2(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_SwanDive(ITEM *item, COLL_INFO *coll) +void Lara_Col_SwanDive(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; coll->bad_pos = NO_BAD_POS; @@ -879,7 +877,7 @@ void __cdecl Lara_Col_SwanDive(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_FastDive(ITEM *item, COLL_INFO *coll) +void Lara_Col_FastDive(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; coll->bad_pos = NO_BAD_POS; @@ -903,7 +901,7 @@ void __cdecl Lara_Col_FastDive(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_Wade(ITEM *item, COLL_INFO *coll) +void Lara_Col_Wade(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; coll->slopes_are_walls = 1; @@ -957,7 +955,7 @@ void __cdecl Lara_Col_Wade(ITEM *item, COLL_INFO *coll) item->pos.y += MIN(coll->side_mid.floor, 50); } -void __cdecl Lara_Col_Default(ITEM *item, COLL_INFO *coll) +void Lara_Col_Default(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; coll->slopes_are_walls = 1; @@ -968,7 +966,7 @@ void __cdecl Lara_Col_Default(ITEM *item, COLL_INFO *coll) Lara_GetCollisionInfo(item, coll); } -void __cdecl Lara_Col_Jumper(ITEM *item, COLL_INFO *coll) +void Lara_Col_Jumper(ITEM *item, COLL_INFO *coll) { coll->bad_pos = NO_BAD_POS; coll->bad_neg = -STEPUP_HEIGHT; @@ -990,7 +988,7 @@ void __cdecl Lara_Col_Jumper(ITEM *item, COLL_INFO *coll) item->pos.y += coll->side_mid.floor; } -void __cdecl Lara_Col_ClimbLeft(ITEM *item, COLL_INFO *coll) +void Lara_Col_ClimbLeft(ITEM *item, COLL_INFO *coll) { if (Lara_CheckForLetGo(item, coll)) { return; @@ -1005,7 +1003,7 @@ void __cdecl Lara_Col_ClimbLeft(ITEM *item, COLL_INFO *coll) Lara_DoClimbLeftRight(item, coll, result, shift); } -void __cdecl Lara_Col_ClimbRight(ITEM *item, COLL_INFO *coll) +void Lara_Col_ClimbRight(ITEM *item, COLL_INFO *coll) { if (Lara_CheckForLetGo(item, coll)) { return; @@ -1019,7 +1017,7 @@ void __cdecl Lara_Col_ClimbRight(ITEM *item, COLL_INFO *coll) Lara_DoClimbLeftRight(item, coll, result, shift); } -void __cdecl Lara_Col_ClimbStance(ITEM *item, COLL_INFO *coll) +void Lara_Col_ClimbStance(ITEM *item, COLL_INFO *coll) { if (Lara_CheckForLetGo(item, coll) || item->anim_num != LA_LADDER_IDLE) { return; @@ -1119,7 +1117,7 @@ void __cdecl Lara_Col_ClimbStance(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_Col_Climbing(ITEM *item, COLL_INFO *coll) +void Lara_Col_Climbing(ITEM *item, COLL_INFO *coll) { if (Lara_CheckForLetGo(item, coll) || item->anim_num != LA_LADDER_UP) { return; @@ -1175,7 +1173,7 @@ void __cdecl Lara_Col_Climbing(ITEM *item, COLL_INFO *coll) item->pos.y -= yshift; } -void __cdecl Lara_Col_ClimbDown(ITEM *item, COLL_INFO *coll) +void Lara_Col_ClimbDown(ITEM *item, COLL_INFO *coll) { if (Lara_CheckForLetGo(item, coll) || item->anim_num != LA_LADDER_DOWN) { return; @@ -1246,7 +1244,7 @@ void __cdecl Lara_Col_ClimbDown(ITEM *item, COLL_INFO *coll) item->pos.y -= yshift; } -void __cdecl Lara_Col_SurfSwim(ITEM *item, COLL_INFO *coll) +void Lara_Col_SurfSwim(ITEM *item, COLL_INFO *coll) { coll->bad_neg = -STEPUP_HEIGHT; g_Lara.move_angle = item->rot.y; @@ -1254,36 +1252,36 @@ void __cdecl Lara_Col_SurfSwim(ITEM *item, COLL_INFO *coll) Lara_TestWaterClimbOut(item, coll); } -void __cdecl Lara_Col_SurfBack(ITEM *item, COLL_INFO *coll) +void Lara_Col_SurfBack(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y + PHD_180; Lara_SurfaceCollision(item, coll); } -void __cdecl Lara_Col_SurfLeft(ITEM *item, COLL_INFO *coll) +void Lara_Col_SurfLeft(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y - PHD_90; Lara_SurfaceCollision(item, coll); } -void __cdecl Lara_Col_SurfRight(ITEM *item, COLL_INFO *coll) +void Lara_Col_SurfRight(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y + PHD_90; Lara_SurfaceCollision(item, coll); } -void __cdecl Lara_Col_SurfTread(ITEM *item, COLL_INFO *coll) +void Lara_Col_SurfTread(ITEM *item, COLL_INFO *coll) { g_Lara.move_angle = item->rot.y; Lara_SurfaceCollision(item, coll); } -void __cdecl Lara_Col_Swim(ITEM *item, COLL_INFO *coll) +void Lara_Col_Swim(ITEM *item, COLL_INFO *coll) { Lara_SwimCollision(item, coll); } -void __cdecl Lara_Col_UWDeath(ITEM *item, COLL_INFO *coll) +void Lara_Col_UWDeath(ITEM *item, COLL_INFO *coll) { item->hit_points = -1; g_Lara.air = -1; diff --git a/src/tr2/game/lara/col.h b/src/tr2/game/lara/col.h index bd7d550eb..cd1650a5e 100644 --- a/src/tr2/game/lara/col.h +++ b/src/tr2/game/lara/col.h @@ -3,56 +3,56 @@ #include "global/types.h" // TODO: make static -void __cdecl Lara_CollideStop(ITEM *item, const COLL_INFO *coll); -bool __cdecl Lara_Fallen(ITEM *item, const COLL_INFO *coll); -bool __cdecl Lara_TestWaterClimbOut(ITEM *item, const COLL_INFO *coll); -bool __cdecl Lara_TestWaterStepOut(ITEM *item, const COLL_INFO *coll); -void __cdecl Lara_SurfaceCollision(ITEM *item, COLL_INFO *coll); +void Lara_CollideStop(ITEM *item, const COLL_INFO *coll); +bool Lara_Fallen(ITEM *item, const COLL_INFO *coll); +bool Lara_TestWaterClimbOut(ITEM *item, const COLL_INFO *coll); +bool Lara_TestWaterStepOut(ITEM *item, const COLL_INFO *coll); +void Lara_SurfaceCollision(ITEM *item, COLL_INFO *coll); void Lara_Col_Empty(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Walk(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Run(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Stop(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_ForwardJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_FastBack(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_TurnRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_TurnLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Death(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_FastFall(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Hang(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Reach(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Splat(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Land(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Compress(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Back(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_StepRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_StepLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Slide(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_BackJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_RightJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_LeftJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_UpJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Fallback(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_HangLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_HangRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_SlideBack(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Null(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Roll(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Roll2(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_SwanDive(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_FastDive(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Wade(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Default(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Jumper(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_ClimbLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_ClimbRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_ClimbStance(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Climbing(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_ClimbDown(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_SurfSwim(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_SurfBack(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_SurfLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_SurfRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_SurfTread(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_Swim(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Col_UWDeath(ITEM *item, COLL_INFO *coll); +void Lara_Col_Walk(ITEM *item, COLL_INFO *coll); +void Lara_Col_Run(ITEM *item, COLL_INFO *coll); +void Lara_Col_Stop(ITEM *item, COLL_INFO *coll); +void Lara_Col_ForwardJump(ITEM *item, COLL_INFO *coll); +void Lara_Col_FastBack(ITEM *item, COLL_INFO *coll); +void Lara_Col_TurnRight(ITEM *item, COLL_INFO *coll); +void Lara_Col_TurnLeft(ITEM *item, COLL_INFO *coll); +void Lara_Col_Death(ITEM *item, COLL_INFO *coll); +void Lara_Col_FastFall(ITEM *item, COLL_INFO *coll); +void Lara_Col_Hang(ITEM *item, COLL_INFO *coll); +void Lara_Col_Reach(ITEM *item, COLL_INFO *coll); +void Lara_Col_Splat(ITEM *item, COLL_INFO *coll); +void Lara_Col_Land(ITEM *item, COLL_INFO *coll); +void Lara_Col_Compress(ITEM *item, COLL_INFO *coll); +void Lara_Col_Back(ITEM *item, COLL_INFO *coll); +void Lara_Col_StepRight(ITEM *item, COLL_INFO *coll); +void Lara_Col_StepLeft(ITEM *item, COLL_INFO *coll); +void Lara_Col_Slide(ITEM *item, COLL_INFO *coll); +void Lara_Col_BackJump(ITEM *item, COLL_INFO *coll); +void Lara_Col_RightJump(ITEM *item, COLL_INFO *coll); +void Lara_Col_LeftJump(ITEM *item, COLL_INFO *coll); +void Lara_Col_UpJump(ITEM *item, COLL_INFO *coll); +void Lara_Col_Fallback(ITEM *item, COLL_INFO *coll); +void Lara_Col_HangLeft(ITEM *item, COLL_INFO *coll); +void Lara_Col_HangRight(ITEM *item, COLL_INFO *coll); +void Lara_Col_SlideBack(ITEM *item, COLL_INFO *coll); +void Lara_Col_Null(ITEM *item, COLL_INFO *coll); +void Lara_Col_Roll(ITEM *item, COLL_INFO *coll); +void Lara_Col_Roll2(ITEM *item, COLL_INFO *coll); +void Lara_Col_SwanDive(ITEM *item, COLL_INFO *coll); +void Lara_Col_FastDive(ITEM *item, COLL_INFO *coll); +void Lara_Col_Wade(ITEM *item, COLL_INFO *coll); +void Lara_Col_Default(ITEM *item, COLL_INFO *coll); +void Lara_Col_Jumper(ITEM *item, COLL_INFO *coll); +void Lara_Col_ClimbLeft(ITEM *item, COLL_INFO *coll); +void Lara_Col_ClimbRight(ITEM *item, COLL_INFO *coll); +void Lara_Col_ClimbStance(ITEM *item, COLL_INFO *coll); +void Lara_Col_Climbing(ITEM *item, COLL_INFO *coll); +void Lara_Col_ClimbDown(ITEM *item, COLL_INFO *coll); +void Lara_Col_SurfSwim(ITEM *item, COLL_INFO *coll); +void Lara_Col_SurfBack(ITEM *item, COLL_INFO *coll); +void Lara_Col_SurfLeft(ITEM *item, COLL_INFO *coll); +void Lara_Col_SurfRight(ITEM *item, COLL_INFO *coll); +void Lara_Col_SurfTread(ITEM *item, COLL_INFO *coll); +void Lara_Col_Swim(ITEM *item, COLL_INFO *coll); +void Lara_Col_UWDeath(ITEM *item, COLL_INFO *coll); diff --git a/src/tr2/game/lara/control.c b/src/tr2/game/lara/control.c index 6ee92c384..1876fe360 100644 --- a/src/tr2/game/lara/control.c +++ b/src/tr2/game/lara/control.c @@ -192,7 +192,7 @@ static void (*m_CollisionRoutines[])(ITEM *item, COLL_INFO *coll) = { // clang-format on }; -void __cdecl Lara_HandleAboveWater(ITEM *const item, COLL_INFO *const coll) +void Lara_HandleAboveWater(ITEM *const item, COLL_INFO *const coll) { coll->old.x = item->pos.x; coll->old.y = item->pos.y; @@ -265,7 +265,7 @@ void __cdecl Lara_HandleAboveWater(ITEM *const item, COLL_INFO *const coll) Room_TestTriggers(item); } -void __cdecl Lara_HandleSurface(ITEM *const item, COLL_INFO *const coll) +void Lara_HandleSurface(ITEM *const item, COLL_INFO *const coll) { g_Camera.target_elevation = -22 * PHD_DEGREE; @@ -323,7 +323,7 @@ void __cdecl Lara_HandleSurface(ITEM *const item, COLL_INFO *const coll) Room_TestTriggers(item); } -void __cdecl Lara_HandleUnderwater(ITEM *const item, COLL_INFO *const coll) +void Lara_HandleUnderwater(ITEM *const item, COLL_INFO *const coll) { coll->old.x = item->pos.x; coll->old.y = item->pos.y; @@ -412,7 +412,7 @@ void __cdecl Lara_HandleUnderwater(ITEM *const item, COLL_INFO *const coll) Room_TestTriggers(item); } -void __cdecl Lara_Control(const int16_t item_num) +void Lara_Control(const int16_t item_num) { ITEM *const item = g_LaraItem; @@ -674,12 +674,12 @@ void __cdecl Lara_Control(const int16_t item_num) g_Lara.last_pos = item->pos; } -void __cdecl Lara_ControlExtra(const int16_t item_num) +void Lara_ControlExtra(const int16_t item_num) { Item_Animate(&g_Items[item_num]); } -void __cdecl Lara_Animate(ITEM *const item) +void Lara_Animate(ITEM *const item) { item->frame_num++; @@ -818,7 +818,7 @@ void __cdecl Lara_Animate(ITEM *const item) item->pos.z += (item->speed * Math_Cos(g_Lara.move_angle)) >> W2V_SHIFT; } -void __cdecl Lara_UseItem(const GAME_OBJECT_ID object_id) +void Lara_UseItem(const GAME_OBJECT_ID object_id) { ITEM *const item = g_LaraItem; @@ -889,13 +889,13 @@ void __cdecl Lara_UseItem(const GAME_OBJECT_ID object_id) } } -void __cdecl Lara_InitialiseLoad(const int16_t item_num) +void Lara_InitialiseLoad(const int16_t item_num) { g_Lara.item_num = item_num; g_LaraItem = &g_Items[item_num]; } -void __cdecl Lara_Initialise(const GAMEFLOW_LEVEL_TYPE type) +void Lara_Initialise(const GAMEFLOW_LEVEL_TYPE type) { ITEM *const item = g_LaraItem; @@ -985,7 +985,7 @@ void __cdecl Lara_Initialise(const GAMEFLOW_LEVEL_TYPE type) } } -void __cdecl Lara_InitialiseInventory(const int32_t level_num) +void Lara_InitialiseInventory(const int32_t level_num) { Inv_RemoveAllItems(); @@ -1091,7 +1091,7 @@ void __cdecl Lara_InitialiseInventory(const int32_t level_num) Gun_InitialiseNewWeapon(); } -void __cdecl Lara_InitialiseMeshes(const int32_t level_num) +void Lara_InitialiseMeshes(const int32_t level_num) { for (int32_t i = 0; i < LM_NUMBER_OF; i++) { g_Lara.mesh_ptrs[i] = g_Meshes[g_Objects[O_LARA].mesh_idx + i]; diff --git a/src/tr2/game/lara/control.h b/src/tr2/game/lara/control.h index 47c9a8fdb..7024deb08 100644 --- a/src/tr2/game/lara/control.h +++ b/src/tr2/game/lara/control.h @@ -2,26 +2,26 @@ #include "global/types.h" -void __cdecl Lara_HandleAboveWater(ITEM *item, COLL_INFO *coll); +void Lara_HandleAboveWater(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_HandleSurface(ITEM *item, COLL_INFO *coll); +void Lara_HandleSurface(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_HandleUnderwater(ITEM *item, COLL_INFO *coll); +void Lara_HandleUnderwater(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_Control(int16_t item_num); -void __cdecl Lara_ControlExtra(int16_t item_num); +void Lara_Control(int16_t item_num); +void Lara_ControlExtra(int16_t item_num); -void __cdecl Lara_Animate(ITEM *item); +void Lara_Animate(ITEM *item); -void __cdecl Lara_UseItem(GAME_OBJECT_ID object_id); +void Lara_UseItem(GAME_OBJECT_ID object_id); -void __cdecl Lara_InitialiseLoad(int16_t item_num); +void Lara_InitialiseLoad(int16_t item_num); -void __cdecl Lara_Initialise(GAMEFLOW_LEVEL_TYPE type); +void Lara_Initialise(GAMEFLOW_LEVEL_TYPE type); -void __cdecl Lara_InitialiseInventory(int32_t level_num); +void Lara_InitialiseInventory(int32_t level_num); -void __cdecl Lara_InitialiseMeshes(int32_t level_num); +void Lara_InitialiseMeshes(int32_t level_num); void Lara_GetOffVehicle(void); void Lara_SwapSingleMesh(LARA_MESH mesh, GAME_OBJECT_ID); diff --git a/src/tr2/game/lara/draw.c b/src/tr2/game/lara/draw.c index 494985483..797860d72 100644 --- a/src/tr2/game/lara/draw.c +++ b/src/tr2/game/lara/draw.c @@ -8,7 +8,7 @@ #include "game/random.h" #include "global/vars.h" -void __cdecl Lara_Draw(const ITEM *const item) +void Lara_Draw(const ITEM *const item) { FRAME_INFO *frame; MATRIX saved_matrix; @@ -342,7 +342,7 @@ void __cdecl Lara_Draw(const ITEM *const item) g_PhdWinBottom = bottom; } -void __cdecl Lara_Draw_I( +void Lara_Draw_I( const ITEM *const item, const FRAME_INFO *const frame1, const FRAME_INFO *const frame2, const int32_t frac, const int32_t rate) { diff --git a/src/tr2/game/lara/draw.h b/src/tr2/game/lara/draw.h index 544e44b9a..87200fca5 100644 --- a/src/tr2/game/lara/draw.h +++ b/src/tr2/game/lara/draw.h @@ -2,7 +2,7 @@ #include "global/types.h" -void __cdecl Lara_Draw(const ITEM *item); -void __cdecl Lara_Draw_I( +void Lara_Draw(const ITEM *item); +void Lara_Draw_I( const ITEM *item, const FRAME_INFO *frame1, const FRAME_INFO *frame2, int32_t frac, int32_t rate); diff --git a/src/tr2/game/lara/hair.c b/src/tr2/game/lara/hair.c index a8bf45502..e149547a8 100644 --- a/src/tr2/game/lara/hair.c +++ b/src/tr2/game/lara/hair.c @@ -22,7 +22,7 @@ static XYZ_32 m_HairVelocity[HAIR_SEGMENTS + 1]; static HAIR_SEGMENT m_HairSegments[HAIR_SEGMENTS + 1]; static int32_t m_HairWind; -void __cdecl Lara_Hair_Initialise(void) +void Lara_Hair_Initialise(void) { const int32_t *const bone_base = &g_AnimBones[g_Objects[O_LARA_HAIR].bone_idx]; @@ -43,7 +43,7 @@ void __cdecl Lara_Hair_Initialise(void) } } -void __cdecl Lara_Hair_Control(const bool in_cutscene) +void Lara_Hair_Control(const bool in_cutscene) { const FRAME_INFO *frame; if (g_Lara.hit_direction < 0) { @@ -297,7 +297,7 @@ void __cdecl Lara_Hair_Control(const bool in_cutscene) } } -void __cdecl Lara_Hair_Draw(void) +void Lara_Hair_Draw(void) { int16_t **mesh_ptr = &g_Meshes[g_Objects[O_LARA_HAIR].mesh_idx]; for (int32_t i = 0; i < HAIR_SEGMENTS; i++) { diff --git a/src/tr2/game/lara/hair.h b/src/tr2/game/lara/hair.h index 7738e62ea..78f091178 100644 --- a/src/tr2/game/lara/hair.h +++ b/src/tr2/game/lara/hair.h @@ -2,6 +2,6 @@ #include -void __cdecl Lara_Hair_Initialise(void); -void __cdecl Lara_Hair_Control(bool in_cutscene); -void __cdecl Lara_Hair_Draw(void); +void Lara_Hair_Initialise(void); +void Lara_Hair_Control(bool in_cutscene); +void Lara_Hair_Draw(void); diff --git a/src/tr2/game/lara/look.c b/src/tr2/game/lara/look.c index 72268f83e..28fe05192 100644 --- a/src/tr2/game/lara/look.c +++ b/src/tr2/game/lara/look.c @@ -4,7 +4,7 @@ #include "global/const.h" #include "global/vars.h" -void __cdecl Lara_LookUpDown(void) +void Lara_LookUpDown(void) { g_Camera.type = CAM_LOOK; @@ -25,7 +25,7 @@ void __cdecl Lara_LookUpDown(void) } } -void __cdecl Lara_LookLeftRight(void) +void Lara_LookLeftRight(void) { g_Camera.type = CAM_LOOK; @@ -44,7 +44,7 @@ void __cdecl Lara_LookLeftRight(void) } } -void __cdecl Lara_ResetLook(void) +void Lara_ResetLook(void) { if (g_Camera.type == CAM_LOOK) { return; diff --git a/src/tr2/game/lara/look.h b/src/tr2/game/lara/look.h index a3b41d150..809bec770 100644 --- a/src/tr2/game/lara/look.h +++ b/src/tr2/game/lara/look.h @@ -1,5 +1,5 @@ #pragma once -void __cdecl Lara_LookUpDown(void); -void __cdecl Lara_LookLeftRight(void); -void __cdecl Lara_ResetLook(void); +void Lara_LookUpDown(void); +void Lara_LookLeftRight(void); +void Lara_ResetLook(void); diff --git a/src/tr2/game/lara/misc.c b/src/tr2/game/lara/misc.c index ffa0090d3..c498c3b66 100644 --- a/src/tr2/game/lara/misc.c +++ b/src/tr2/game/lara/misc.c @@ -25,11 +25,10 @@ #define CLIMB_HANG 900 #define CLIMB_SHIFT 70 -static void __cdecl M_TakeHit( +static void M_TakeHit( ITEM *const lara_item, const int32_t dx, const int32_t dz); -static void __cdecl M_TakeHit( - ITEM *const lara_item, const int32_t dx, const int32_t dz) +static void M_TakeHit(ITEM *const lara_item, const int32_t dx, const int32_t dz) { const int16_t hit_angle = lara_item->rot.y + PHD_180 - Math_Atan(dz, dx); g_Lara.hit_direction = Math_GetDirection(hit_angle); @@ -40,7 +39,7 @@ static void __cdecl M_TakeHit( CLAMPG(g_Lara.hit_frame, 34); } -void __cdecl Lara_GetCollisionInfo(ITEM *item, COLL_INFO *coll) +void Lara_GetCollisionInfo(ITEM *item, COLL_INFO *coll) { coll->facing = g_Lara.move_angle; Collide_GetCollisionInfo( @@ -48,7 +47,7 @@ void __cdecl Lara_GetCollisionInfo(ITEM *item, COLL_INFO *coll) LARA_HEIGHT); } -void __cdecl Lara_SlideSlope(ITEM *item, COLL_INFO *coll) +void Lara_SlideSlope(ITEM *item, COLL_INFO *coll) { coll->bad_pos = NO_BAD_POS; coll->bad_neg = -STEP_L * 2; @@ -85,7 +84,7 @@ void __cdecl Lara_SlideSlope(ITEM *item, COLL_INFO *coll) } } -int32_t __cdecl Lara_HitCeiling(ITEM *item, COLL_INFO *coll) +int32_t Lara_HitCeiling(ITEM *item, COLL_INFO *coll) { if (coll->coll_type != COLL_TOP && coll->coll_type != COLL_CLAMP) { return 0; @@ -104,7 +103,7 @@ int32_t __cdecl Lara_HitCeiling(ITEM *item, COLL_INFO *coll) return 1; } -int32_t __cdecl Lara_DeflectEdge(ITEM *item, COLL_INFO *coll) +int32_t Lara_DeflectEdge(ITEM *item, COLL_INFO *coll) { switch (coll->coll_type) { case COLL_FRONT: @@ -131,7 +130,7 @@ int32_t __cdecl Lara_DeflectEdge(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_DeflectEdgeJump(ITEM *item, COLL_INFO *coll) +void Lara_DeflectEdgeJump(ITEM *item, COLL_INFO *coll) { Item_ShiftCol(item, coll); switch (coll->coll_type) { @@ -182,7 +181,7 @@ void __cdecl Lara_DeflectEdgeJump(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_SlideEdgeJump(ITEM *item, COLL_INFO *coll) +void Lara_SlideEdgeJump(ITEM *item, COLL_INFO *coll) { Item_ShiftCol(item, coll); @@ -215,8 +214,7 @@ void __cdecl Lara_SlideEdgeJump(ITEM *item, COLL_INFO *coll) } } -int32_t __cdecl Lara_TestWall( - ITEM *item, int32_t front, int32_t right, int32_t down) +int32_t Lara_TestWall(ITEM *item, int32_t front, int32_t right, int32_t down) { int32_t x = item->pos.x; int32_t y = item->pos.y + down; @@ -272,7 +270,7 @@ int32_t __cdecl Lara_TestWall( return 2; } -int32_t __cdecl Lara_TestHangOnClimbWall(ITEM *item, COLL_INFO *coll) +int32_t Lara_TestHangOnClimbWall(ITEM *item, COLL_INFO *coll) { if (!g_Lara.climb_status || item->fall_speed < 0) { return 0; @@ -319,7 +317,7 @@ int32_t __cdecl Lara_TestHangOnClimbWall(ITEM *item, COLL_INFO *coll) } } -int32_t __cdecl Lara_TestClimbStance(ITEM *item, COLL_INFO *coll) +int32_t Lara_TestClimbStance(ITEM *item, COLL_INFO *coll) { int32_t shift_r; int32_t result_r = Lara_TestClimbPos( @@ -361,7 +359,7 @@ int32_t __cdecl Lara_TestClimbStance(ITEM *item, COLL_INFO *coll) return 1; } -void __cdecl Lara_HangTest(ITEM *item, COLL_INFO *coll) +void Lara_HangTest(ITEM *item, COLL_INFO *coll) { coll->bad_pos = NO_BAD_POS; coll->bad_neg = NO_BAD_NEG; @@ -495,7 +493,7 @@ void __cdecl Lara_HangTest(ITEM *item, COLL_INFO *coll) item->pos.y += hdif; } -int32_t __cdecl Lara_TestEdgeCatch(ITEM *item, COLL_INFO *coll, int32_t *edge) +int32_t Lara_TestEdgeCatch(ITEM *item, COLL_INFO *coll, int32_t *edge) { const BOUNDS_16 *const bounds = Item_GetBoundsAccurate(item); int32_t hdif1 = coll->side_front.floor - bounds->min_y; @@ -517,7 +515,7 @@ int32_t __cdecl Lara_TestEdgeCatch(ITEM *item, COLL_INFO *coll, int32_t *edge) return ABS(coll->side_left.floor - coll->side_right.floor) < SLOPE_DIF; } -int32_t __cdecl Lara_TestHangJumpUp(ITEM *item, COLL_INFO *coll) +int32_t Lara_TestHangJumpUp(ITEM *item, COLL_INFO *coll) { if (coll->coll_type != COLL_FRONT || !g_Input.action || g_Lara.gun_status != LGS_ARMLESS || coll->hit_static @@ -559,7 +557,7 @@ int32_t __cdecl Lara_TestHangJumpUp(ITEM *item, COLL_INFO *coll) return 1; } -int32_t __cdecl Lara_TestHangJump(ITEM *item, COLL_INFO *coll) +int32_t Lara_TestHangJump(ITEM *item, COLL_INFO *coll) { if (coll->coll_type != COLL_FRONT || !g_Input.action || g_Lara.gun_status != LGS_ARMLESS || coll->hit_static @@ -608,7 +606,7 @@ int32_t __cdecl Lara_TestHangJump(ITEM *item, COLL_INFO *coll) return 1; } -int32_t __cdecl Lara_TestHangSwingIn(ITEM *item, int16_t angle) +int32_t Lara_TestHangSwingIn(ITEM *item, int16_t angle) { int32_t x = item->pos.x; int32_t y = item->pos.y; @@ -635,7 +633,7 @@ int32_t __cdecl Lara_TestHangSwingIn(ITEM *item, int16_t angle) return height != NO_HEIGHT && height - y > 0 && ceiling - y < -400; } -int32_t __cdecl Lara_TestVault(ITEM *item, COLL_INFO *coll) +int32_t Lara_TestVault(ITEM *item, COLL_INFO *coll) { if (coll->coll_type != COLL_FRONT || !g_Input.action || g_Lara.gun_status != LGS_ARMLESS) { @@ -728,7 +726,7 @@ int32_t __cdecl Lara_TestVault(ITEM *item, COLL_INFO *coll) return 1; } -int32_t __cdecl Lara_TestSlide(ITEM *item, COLL_INFO *coll) +int32_t Lara_TestSlide(ITEM *item, COLL_INFO *coll) { if (ABS(coll->x_tilt) <= 2 && ABS(coll->z_tilt) <= 2) { return 0; @@ -777,7 +775,7 @@ int32_t __cdecl Lara_TestSlide(ITEM *item, COLL_INFO *coll) return 1; } -int16_t __cdecl Lara_FloorFront(ITEM *item, int16_t ang, int32_t dist) +int16_t Lara_FloorFront(ITEM *item, int16_t ang, int32_t dist) { const int32_t x = item->pos.x + ((dist * Math_Sin(ang)) >> W2V_SHIFT); const int32_t y = item->pos.y - LARA_HEIGHT; @@ -791,7 +789,7 @@ int16_t __cdecl Lara_FloorFront(ITEM *item, int16_t ang, int32_t dist) return height; } -int32_t __cdecl Lara_LandedBad(ITEM *item, COLL_INFO *coll) +int32_t Lara_LandedBad(ITEM *item, COLL_INFO *coll) { const int32_t x = item->pos.x; const int32_t y = item->pos.y; @@ -818,7 +816,7 @@ int32_t __cdecl Lara_LandedBad(ITEM *item, COLL_INFO *coll) return item->hit_points <= 0; } -int32_t __cdecl Lara_CheckForLetGo(ITEM *item, COLL_INFO *coll) +int32_t Lara_CheckForLetGo(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed = 0; @@ -838,7 +836,7 @@ int32_t __cdecl Lara_CheckForLetGo(ITEM *item, COLL_INFO *coll) return 1; } -void __cdecl Lara_GetJointAbsPosition(XYZ_32 *vec, int32_t joint) +void Lara_GetJointAbsPosition(XYZ_32 *vec, int32_t joint) { FRAME_INFO *frmptr[2] = { NULL, NULL }; if (g_Lara.hit_direction < 0) { @@ -943,7 +941,7 @@ void __cdecl Lara_GetJointAbsPosition(XYZ_32 *vec, int32_t joint) Matrix_Pop(); } -void __cdecl Lara_GetJointAbsPosition_I( +void Lara_GetJointAbsPosition_I( ITEM *item, XYZ_32 *vec, FRAME_INFO *frame1, FRAME_INFO *frame2, int32_t frac, int32_t rate) { @@ -1020,7 +1018,7 @@ void __cdecl Lara_GetJointAbsPosition_I( Matrix_Pop(); } -void __cdecl Lara_TakeHit(ITEM *const lara_item, const COLL_INFO *const coll) +void Lara_TakeHit(ITEM *const lara_item, const COLL_INFO *const coll) { const int32_t dx = g_Lara.spaz_effect->pos.x - lara_item->pos.x; const int32_t dz = g_Lara.spaz_effect->pos.z - lara_item->pos.z; @@ -1028,7 +1026,7 @@ void __cdecl Lara_TakeHit(ITEM *const lara_item, const COLL_INFO *const coll) g_Lara.spaz_effect_count--; } -void __cdecl Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) +void Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) { lara_item->hit_status = 0; g_Lara.hit_direction = -1; @@ -1093,7 +1091,7 @@ void __cdecl Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll) g_Inv_Chosen = -1; } -void __cdecl Lara_Push( +void Lara_Push( const ITEM *const item, ITEM *const lara_item, COLL_INFO *const coll, const bool spaz_on, const bool big_push) { @@ -1170,7 +1168,7 @@ void __cdecl Lara_Push( } } -int32_t __cdecl Lara_MovePosition(XYZ_32 *vec, ITEM *item, ITEM *lara_item) +int32_t Lara_MovePosition(XYZ_32 *vec, ITEM *item, ITEM *lara_item) { const XYZ_16 rot = { .x = item->rot.x, @@ -1224,12 +1222,12 @@ int32_t __cdecl Lara_MovePosition(XYZ_32 *vec, ITEM *item, ITEM *lara_item) return result; } -int32_t __cdecl Lara_IsNearItem(const XYZ_32 *const pos, const int32_t distance) +int32_t Lara_IsNearItem(const XYZ_32 *const pos, const int32_t distance) { return Item_IsNearItem(g_LaraItem, pos, distance); } -int32_t __cdecl Lara_TestClimb( +int32_t Lara_TestClimb( const int32_t x, const int32_t y, const int32_t z, const int32_t x_front, const int32_t z_front, const int32_t item_height, const int16_t item_room, int32_t *const shift) @@ -1348,7 +1346,7 @@ int32_t __cdecl Lara_TestClimb( return hang ? -1 : 0; } -int32_t __cdecl Lara_TestClimbPos( +int32_t Lara_TestClimbPos( const ITEM *const item, const int32_t front, const int32_t right, const int32_t origin, const int32_t height, int32_t *const shift) { @@ -1393,7 +1391,7 @@ int32_t __cdecl Lara_TestClimbPos( x, y, z, x_front, z_front, height, item->room_num, shift); } -void __cdecl Lara_DoClimbLeftRight( +void Lara_DoClimbLeftRight( ITEM *const item, const COLL_INFO *const coll, const int32_t result, const int32_t shift) { @@ -1433,7 +1431,7 @@ void __cdecl Lara_DoClimbLeftRight( } } -int32_t __cdecl Lara_TestClimbUpPos( +int32_t Lara_TestClimbUpPos( const ITEM *const item, const int32_t front, const int32_t right, int32_t *const shift, int32_t *const ledge) { @@ -1534,7 +1532,7 @@ int32_t __cdecl Lara_TestClimbUpPos( return 0; } -int32_t __cdecl Lara_GetWaterDepth( +int32_t Lara_GetWaterDepth( const int32_t x, const int32_t y, const int32_t z, int16_t room_num) { const ROOM *r = &g_Rooms[room_num]; @@ -1601,7 +1599,7 @@ int32_t __cdecl Lara_GetWaterDepth( return NO_HEIGHT; } -void __cdecl Lara_TestWaterDepth(ITEM *const item, const COLL_INFO *const coll) +void Lara_TestWaterDepth(ITEM *const item, const COLL_INFO *const coll) { int16_t room_num = item->room_num; @@ -1629,7 +1627,7 @@ void __cdecl Lara_TestWaterDepth(ITEM *const item, const COLL_INFO *const coll) } } -void __cdecl Lara_SwimCollision(ITEM *const item, COLL_INFO *const coll) +void Lara_SwimCollision(ITEM *const item, COLL_INFO *const coll) { if (item->rot.x < -PHD_90 || item->rot.x > PHD_90) { g_Lara.move_angle = item->rot.y + PHD_180; @@ -1696,7 +1694,7 @@ void __cdecl Lara_SwimCollision(ITEM *const item, COLL_INFO *const coll) } } -void __cdecl Lara_WaterCurrent(COLL_INFO *const coll) +void Lara_WaterCurrent(COLL_INFO *const coll) { ITEM *const item = g_LaraItem; @@ -1791,7 +1789,7 @@ void __cdecl Lara_WaterCurrent(COLL_INFO *const coll) coll->old = item->pos; } -void __cdecl Lara_CatchFire(void) +void Lara_CatchFire(void) { if (g_Lara.burn || g_Lara.water_status == LWS_CHEAT) { return; @@ -1809,7 +1807,7 @@ void __cdecl Lara_CatchFire(void) g_Lara.burn = 1; } -void __cdecl Lara_TouchLava(ITEM *const item) +void Lara_TouchLava(ITEM *const item) { if (item->hit_points < 0 || g_Lara.water_status == LWS_CHEAT) { return; @@ -1839,7 +1837,7 @@ void __cdecl Lara_TouchLava(ITEM *const item) } } -void __cdecl Lara_Extinguish(void) +void Lara_Extinguish(void) { if (!g_Lara.burn) { return; diff --git a/src/tr2/game/lara/misc.h b/src/tr2/game/lara/misc.h index 9fcf129ac..d44c24410 100644 --- a/src/tr2/game/lara/misc.h +++ b/src/tr2/game/lara/misc.h @@ -2,83 +2,81 @@ #include "global/types.h" -void __cdecl Lara_GetCollisionInfo(ITEM *item, COLL_INFO *coll); +void Lara_GetCollisionInfo(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_SlideSlope(ITEM *item, COLL_INFO *coll); +void Lara_SlideSlope(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_HitCeiling(ITEM *item, COLL_INFO *coll); +int32_t Lara_HitCeiling(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_DeflectEdge(ITEM *item, COLL_INFO *coll); +int32_t Lara_DeflectEdge(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_DeflectEdgeJump(ITEM *item, COLL_INFO *coll); +void Lara_DeflectEdgeJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_SlideEdgeJump(ITEM *item, COLL_INFO *coll); +void Lara_SlideEdgeJump(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_TestWall( - ITEM *item, int32_t front, int32_t right, int32_t down); +int32_t Lara_TestWall(ITEM *item, int32_t front, int32_t right, int32_t down); -int32_t __cdecl Lara_TestHangOnClimbWall(ITEM *item, COLL_INFO *coll); +int32_t Lara_TestHangOnClimbWall(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_TestClimbStance(ITEM *item, COLL_INFO *coll); +int32_t Lara_TestClimbStance(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_HangTest(ITEM *item, COLL_INFO *coll); +void Lara_HangTest(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_TestEdgeCatch(ITEM *item, COLL_INFO *coll, int32_t *edge); +int32_t Lara_TestEdgeCatch(ITEM *item, COLL_INFO *coll, int32_t *edge); -int32_t __cdecl Lara_TestHangJumpUp(ITEM *item, COLL_INFO *coll); +int32_t Lara_TestHangJumpUp(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_TestHangJump(ITEM *item, COLL_INFO *coll); +int32_t Lara_TestHangJump(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_TestHangSwingIn(ITEM *item, int16_t angle); +int32_t Lara_TestHangSwingIn(ITEM *item, int16_t angle); -int32_t __cdecl Lara_TestVault(ITEM *item, COLL_INFO *coll); +int32_t Lara_TestVault(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_TestSlide(ITEM *item, COLL_INFO *coll); +int32_t Lara_TestSlide(ITEM *item, COLL_INFO *coll); -int16_t __cdecl Lara_FloorFront(ITEM *item, int16_t ang, int32_t dist); +int16_t Lara_FloorFront(ITEM *item, int16_t ang, int32_t dist); -int32_t __cdecl Lara_LandedBad(ITEM *item, COLL_INFO *coll); +int32_t Lara_LandedBad(ITEM *item, COLL_INFO *coll); -int32_t __cdecl Lara_CheckForLetGo(ITEM *item, COLL_INFO *coll); +int32_t Lara_CheckForLetGo(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_GetJointAbsPosition(XYZ_32 *vec, int32_t joint); +void Lara_GetJointAbsPosition(XYZ_32 *vec, int32_t joint); -void __cdecl Lara_GetJointAbsPosition_I( +void Lara_GetJointAbsPosition_I( ITEM *item, XYZ_32 *vec, FRAME_INFO *frame1, FRAME_INFO *frame2, int32_t frac, int32_t rate); -void __cdecl Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll); -void __cdecl Lara_TakeHit(ITEM *lara_item, const COLL_INFO *coll); -void __cdecl Lara_Push( +void Lara_BaddieCollision(ITEM *lara_item, COLL_INFO *coll); +void Lara_TakeHit(ITEM *lara_item, const COLL_INFO *coll); +void Lara_Push( const ITEM *item, ITEM *lara_item, COLL_INFO *coll, bool spaz_on, bool big_push); -int32_t __cdecl Lara_MovePosition(XYZ_32 *vec, ITEM *item, ITEM *lara_item); -int32_t __cdecl Lara_IsNearItem(const XYZ_32 *pos, int32_t distance); +int32_t Lara_MovePosition(XYZ_32 *vec, ITEM *item, ITEM *lara_item); +int32_t Lara_IsNearItem(const XYZ_32 *pos, int32_t distance); -int32_t __cdecl Lara_TestClimb( +int32_t Lara_TestClimb( int32_t x, int32_t y, int32_t z, int32_t x_front, int32_t z_front, int32_t item_height, int16_t item_room, int32_t *shift); -int32_t __cdecl Lara_TestClimbPos( +int32_t Lara_TestClimbPos( const ITEM *item, int32_t front, int32_t right, int32_t origin, int32_t height, int32_t *shift); -void __cdecl Lara_DoClimbLeftRight( +void Lara_DoClimbLeftRight( ITEM *item, const COLL_INFO *coll, int32_t result, int32_t shift); -int32_t __cdecl Lara_TestClimbUpPos( +int32_t Lara_TestClimbUpPos( const ITEM *item, int32_t front, int32_t right, int32_t *shift, int32_t *ledge); -int32_t __cdecl Lara_GetWaterDepth( - int32_t x, int32_t y, int32_t z, int16_t room_num); +int32_t Lara_GetWaterDepth(int32_t x, int32_t y, int32_t z, int16_t room_num); -void __cdecl Lara_TestWaterDepth(ITEM *item, const COLL_INFO *coll); +void Lara_TestWaterDepth(ITEM *item, const COLL_INFO *coll); -void __cdecl Lara_SwimCollision(ITEM *item, COLL_INFO *coll); +void Lara_SwimCollision(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_WaterCurrent(COLL_INFO *coll); +void Lara_WaterCurrent(COLL_INFO *coll); -void __cdecl Lara_CatchFire(void); +void Lara_CatchFire(void); -void __cdecl Lara_TouchLava(ITEM *item); +void Lara_TouchLava(ITEM *item); diff --git a/src/tr2/game/lara/state.c b/src/tr2/game/lara/state.c index 97f455162..7fff321d7 100644 --- a/src/tr2/game/lara/state.c +++ b/src/tr2/game/lara/state.c @@ -14,7 +14,7 @@ #include -void __cdecl Lara_SwimTurn(ITEM *const item) +void Lara_SwimTurn(ITEM *const item) { if (g_Input.forward) { item->rot.x -= LARA_TURN_RATE_UW; @@ -37,7 +37,7 @@ void Lara_State_Empty(ITEM *item, COLL_INFO *coll) { } -void __cdecl Lara_State_Walk(ITEM *item, COLL_INFO *coll) +void Lara_State_Walk(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_STOP; @@ -65,7 +65,7 @@ void __cdecl Lara_State_Walk(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Run(ITEM *item, COLL_INFO *coll) +void Lara_State_Run(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_DEATH; @@ -113,7 +113,7 @@ void __cdecl Lara_State_Run(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Stop(ITEM *item, COLL_INFO *coll) +void Lara_State_Stop(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_DEATH; @@ -174,7 +174,7 @@ void __cdecl Lara_State_Stop(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_ForwardJump(ITEM *item, COLL_INFO *coll) +void Lara_State_ForwardJump(ITEM *item, COLL_INFO *coll) { if (item->goal_anim_state == LS_SWAN_DIVE || item->goal_anim_state == LS_REACH) { @@ -206,7 +206,7 @@ void __cdecl Lara_State_ForwardJump(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_FastBack(ITEM *item, COLL_INFO *coll) +void Lara_State_FastBack(ITEM *item, COLL_INFO *coll) { item->goal_anim_state = LS_STOP; if (g_Input.left) { @@ -218,7 +218,7 @@ void __cdecl Lara_State_FastBack(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_TurnRight(ITEM *item, COLL_INFO *coll) +void Lara_State_TurnRight(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_STOP; @@ -250,7 +250,7 @@ void __cdecl Lara_State_TurnRight(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_TurnLeft(ITEM *item, COLL_INFO *coll) +void Lara_State_TurnLeft(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_STOP; @@ -282,14 +282,14 @@ void __cdecl Lara_State_TurnLeft(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Death(ITEM *item, COLL_INFO *coll) +void Lara_State_Death(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; coll->enable_spaz = 0; coll->enable_baddie_push = 0; } -void __cdecl Lara_State_FastFall(ITEM *item, COLL_INFO *coll) +void Lara_State_FastFall(ITEM *item, COLL_INFO *coll) { item->speed = item->speed * 95 / 100; if (item->fall_speed == DAMAGE_START + DAMAGE_LENGTH) { @@ -297,7 +297,7 @@ void __cdecl Lara_State_FastFall(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Hang(ITEM *item, COLL_INFO *coll) +void Lara_State_Hang(ITEM *item, COLL_INFO *coll) { if (g_Input.look) { Lara_LookUpDown(); @@ -314,7 +314,7 @@ void __cdecl Lara_State_Hang(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Reach(ITEM *item, COLL_INFO *coll) +void Lara_State_Reach(ITEM *item, COLL_INFO *coll) { g_Camera.target_angle = CAM_REACH_ANGLE; if (item->fall_speed > LARA_FAST_FALL_SPEED) { @@ -322,12 +322,12 @@ void __cdecl Lara_State_Reach(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Splat(ITEM *item, COLL_INFO *coll) +void Lara_State_Splat(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; } -void __cdecl Lara_State_Compress(ITEM *item, COLL_INFO *coll) +void Lara_State_Compress(ITEM *item, COLL_INFO *coll) { if (g_Lara.water_status != LWS_WADE) { if (g_Input.forward @@ -360,7 +360,7 @@ void __cdecl Lara_State_Compress(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Back(ITEM *item, COLL_INFO *coll) +void Lara_State_Back(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_STOP; @@ -382,13 +382,13 @@ void __cdecl Lara_State_Back(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Null(ITEM *item, COLL_INFO *coll) +void Lara_State_Null(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; } -void __cdecl Lara_State_FastTurn(ITEM *item, COLL_INFO *coll) +void Lara_State_FastTurn(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_STOP; @@ -408,7 +408,7 @@ void __cdecl Lara_State_FastTurn(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_StepRight(ITEM *item, COLL_INFO *coll) +void Lara_State_StepRight(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; if (item->hit_points <= 0) { @@ -429,7 +429,7 @@ void __cdecl Lara_State_StepRight(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_StepLeft(ITEM *item, COLL_INFO *coll) +void Lara_State_StepLeft(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; if (item->hit_points <= 0) { @@ -450,7 +450,7 @@ void __cdecl Lara_State_StepLeft(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Slide(ITEM *item, COLL_INFO *coll) +void Lara_State_Slide(ITEM *item, COLL_INFO *coll) { g_Camera.flags = CF_NO_CHUNKY; g_Camera.target_elevation = CAM_SLIDE_ELEVATION; @@ -459,7 +459,7 @@ void __cdecl Lara_State_Slide(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_BackJump(ITEM *item, COLL_INFO *coll) +void Lara_State_BackJump(ITEM *item, COLL_INFO *coll) { g_Camera.target_angle = CAM_BACK_JUMP_ANGLE; if (item->fall_speed > LARA_FAST_FALL_SPEED) { @@ -475,7 +475,7 @@ void __cdecl Lara_State_BackJump(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_RightJump(ITEM *item, COLL_INFO *coll) +void Lara_State_RightJump(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; if (item->fall_speed > LARA_FAST_FALL_SPEED) { @@ -488,7 +488,7 @@ void __cdecl Lara_State_RightJump(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_LeftJump(ITEM *item, COLL_INFO *coll) +void Lara_State_LeftJump(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; if (item->fall_speed > LARA_FAST_FALL_SPEED) { @@ -501,14 +501,14 @@ void __cdecl Lara_State_LeftJump(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_UpJump(ITEM *item, COLL_INFO *coll) +void Lara_State_UpJump(ITEM *item, COLL_INFO *coll) { if (item->fall_speed > LARA_FAST_FALL_SPEED) { item->goal_anim_state = LS_FAST_FALL; } } -void __cdecl Lara_State_Fallback(ITEM *item, COLL_INFO *coll) +void Lara_State_Fallback(ITEM *item, COLL_INFO *coll) { if (item->fall_speed > LARA_FAST_FALL_SPEED) { item->goal_anim_state = LS_FAST_FALL; @@ -520,7 +520,7 @@ void __cdecl Lara_State_Fallback(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_HangLeft(ITEM *item, COLL_INFO *coll) +void Lara_State_HangLeft(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; @@ -531,7 +531,7 @@ void __cdecl Lara_State_HangLeft(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_HangRight(ITEM *item, COLL_INFO *coll) +void Lara_State_HangRight(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; @@ -542,14 +542,14 @@ void __cdecl Lara_State_HangRight(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_SlideBack(ITEM *item, COLL_INFO *coll) +void Lara_State_SlideBack(ITEM *item, COLL_INFO *coll) { if (g_Input.jump && !g_Input.forward) { item->goal_anim_state = LS_BACK_JUMP; } } -void __cdecl Lara_State_PushBlock(ITEM *item, COLL_INFO *coll) +void Lara_State_PushBlock(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; coll->enable_spaz = 0; @@ -559,7 +559,7 @@ void __cdecl Lara_State_PushBlock(ITEM *item, COLL_INFO *coll) g_Camera.target_elevation = CAM_PUSH_BLOCK_ELEVATION; } -void __cdecl Lara_State_PPReady(ITEM *item, COLL_INFO *coll) +void Lara_State_PPReady(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; @@ -569,7 +569,7 @@ void __cdecl Lara_State_PPReady(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Pickup(ITEM *item, COLL_INFO *coll) +void Lara_State_Pickup(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; coll->enable_spaz = 0; @@ -579,7 +579,7 @@ void __cdecl Lara_State_Pickup(ITEM *item, COLL_INFO *coll) g_Camera.target_distance = CAM_PICKUP_DISTANCE; } -void __cdecl Lara_State_PickupFlare(ITEM *item, COLL_INFO *coll) +void Lara_State_PickupFlare(ITEM *item, COLL_INFO *coll) { Lara_State_Pickup(item, coll); if (item->frame_num == g_Anims[item->anim_num].frame_end - 1) { @@ -587,7 +587,7 @@ void __cdecl Lara_State_PickupFlare(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll) +void Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; coll->enable_spaz = 0; @@ -598,7 +598,7 @@ void __cdecl Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll) g_Camera.speed = CAM_SWITCH_ON_SPEED; } -void __cdecl Lara_State_UseKey(ITEM *item, COLL_INFO *coll) +void Lara_State_UseKey(ITEM *item, COLL_INFO *coll) { g_Lara.look = 0; coll->enable_spaz = 0; @@ -608,14 +608,14 @@ void __cdecl Lara_State_UseKey(ITEM *item, COLL_INFO *coll) g_Camera.target_distance = CAM_USE_KEY_DISTANCE; } -void __cdecl Lara_State_Special(ITEM *item, COLL_INFO *coll) +void Lara_State_Special(ITEM *item, COLL_INFO *coll) { g_Camera.flags = CF_FOLLOW_CENTRE; g_Camera.target_angle = CAM_SPECIAL_ANGLE; g_Camera.target_elevation = CAM_SPECIAL_ELEVATION; } -void __cdecl Lara_State_SwanDive(ITEM *item, COLL_INFO *coll) +void Lara_State_SwanDive(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 1; @@ -625,7 +625,7 @@ void __cdecl Lara_State_SwanDive(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_FastDive(ITEM *item, COLL_INFO *coll) +void Lara_State_FastDive(ITEM *item, COLL_INFO *coll) { if (g_Input.roll && item->goal_anim_state == LS_FAST_DIVE) { item->goal_anim_state = LS_TWIST; @@ -635,14 +635,14 @@ void __cdecl Lara_State_FastDive(ITEM *item, COLL_INFO *coll) item->speed = item->speed * 95 / 100; } -void __cdecl Lara_State_WaterOut(ITEM *item, COLL_INFO *coll) +void Lara_State_WaterOut(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; g_Camera.flags = CF_FOLLOW_CENTRE; } -void __cdecl Lara_State_Wade(ITEM *item, COLL_INFO *coll) +void Lara_State_Wade(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_STOP; @@ -673,7 +673,7 @@ void __cdecl Lara_State_Wade(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Zipline(ITEM *item, COLL_INFO *coll) +void Lara_State_Zipline(ITEM *item, COLL_INFO *coll) { g_Camera.target_angle = CAM_ZIPLINE_ANGLE; @@ -687,7 +687,7 @@ void __cdecl Lara_State_Zipline(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Extra_Breath(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_Breath(ITEM *item, COLL_INFO *coll) { item->anim_num = LA_STAND_IDLE; item->frame_num = g_Anims[item->anim_num].frame_base; @@ -701,7 +701,7 @@ void __cdecl Lara_State_Extra_Breath(ITEM *item, COLL_INFO *coll) Output_AlterFOV(GAME_FOV * PHD_DEGREE); } -void __cdecl Lara_State_Extra_YetiKill(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_YetiKill(ITEM *item, COLL_INFO *coll) { g_Camera.target_angle = CAM_YETI_KILL_ANGLE; g_Camera.target_distance = CAM_YETI_KILL_DISTANCE; @@ -711,7 +711,7 @@ void __cdecl Lara_State_Extra_YetiKill(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Extra_SharkKill(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_SharkKill(ITEM *item, COLL_INFO *coll) { g_Camera.target_angle = CAM_SHARK_KILL_ANGLE; g_Camera.target_distance = CAM_SHARK_KILL_DISTANCE; @@ -730,20 +730,20 @@ void __cdecl Lara_State_Extra_SharkKill(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Extra_Airlock(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_Airlock(ITEM *item, COLL_INFO *coll) { g_Camera.target_angle = CAM_AIRLOCK_ANGLE; g_Camera.target_elevation = CAM_AIRLOCK_ELEVATION; } -void __cdecl Lara_State_Extra_GongBong(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_GongBong(ITEM *item, COLL_INFO *coll) { g_Camera.target_angle = CAM_GONG_BONG_ANGLE; g_Camera.target_elevation = CAM_GONG_BONG_ELEVATION; g_Camera.target_distance = CAM_GONG_BONG_DISTANCE; } -void __cdecl Lara_State_Extra_DinoKill(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_DinoKill(ITEM *item, COLL_INFO *coll) { g_Camera.flags = CF_FOLLOW_CENTRE; g_Camera.target_angle = CAM_TREX_KILL_ANGLE; @@ -754,7 +754,7 @@ void __cdecl Lara_State_Extra_DinoKill(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Extra_PullDagger(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_PullDagger(ITEM *item, COLL_INFO *coll) { int32_t frame_num_rel = item->frame_num - g_Anims[item->anim_num].frame_base; @@ -776,12 +776,12 @@ void __cdecl Lara_State_Extra_PullDagger(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Extra_StartAnim(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_StartAnim(ITEM *item, COLL_INFO *coll) { Room_TestTriggers(item); } -void __cdecl Lara_State_Extra_StartHouse(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_StartHouse(ITEM *item, COLL_INFO *coll) { int32_t frame_num_rel = item->frame_num - g_Anims[item->anim_num].frame_base; @@ -801,7 +801,7 @@ void __cdecl Lara_State_Extra_StartHouse(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Extra_FinalAnim(ITEM *item, COLL_INFO *coll) +void Lara_State_Extra_FinalAnim(ITEM *item, COLL_INFO *coll) { item->hit_points = 1000; @@ -824,7 +824,7 @@ void __cdecl Lara_State_Extra_FinalAnim(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_ClimbLeft(ITEM *item, COLL_INFO *coll) +void Lara_State_ClimbLeft(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; @@ -835,7 +835,7 @@ void __cdecl Lara_State_ClimbLeft(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_ClimbRight(ITEM *item, COLL_INFO *coll) +void Lara_State_ClimbRight(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; @@ -846,7 +846,7 @@ void __cdecl Lara_State_ClimbRight(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_ClimbStance(ITEM *item, COLL_INFO *coll) +void Lara_State_ClimbStance(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; @@ -867,14 +867,14 @@ void __cdecl Lara_State_ClimbStance(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Climbing(ITEM *item, COLL_INFO *coll) +void Lara_State_Climbing(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; g_Camera.target_elevation = CAM_CLIMBING_ELEVATION; } -void __cdecl Lara_State_ClimbEnd(ITEM *item, COLL_INFO *coll) +void Lara_State_ClimbEnd(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; @@ -882,14 +882,14 @@ void __cdecl Lara_State_ClimbEnd(ITEM *item, COLL_INFO *coll) g_Camera.target_angle = CAM_CLIMB_END_ELEVATION; } -void __cdecl Lara_State_ClimbDown(ITEM *item, COLL_INFO *coll) +void Lara_State_ClimbDown(ITEM *item, COLL_INFO *coll) { coll->enable_spaz = 0; coll->enable_baddie_push = 0; g_Camera.target_elevation = CAM_CLIMB_DOWN_ELEVATION; } -void __cdecl Lara_State_SurfSwim(ITEM *item, COLL_INFO *coll) +void Lara_State_SurfSwim(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_UW_DEATH; @@ -909,7 +909,7 @@ void __cdecl Lara_State_SurfSwim(ITEM *item, COLL_INFO *coll) CLAMPG(item->fall_speed, LARA_MAX_SURF_SPEED); } -void __cdecl Lara_State_SurfBack(ITEM *item, COLL_INFO *coll) +void Lara_State_SurfBack(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_UW_DEATH; @@ -929,7 +929,7 @@ void __cdecl Lara_State_SurfBack(ITEM *item, COLL_INFO *coll) CLAMPG(item->fall_speed, LARA_MAX_SURF_SPEED); } -void __cdecl Lara_State_SurfLeft(ITEM *item, COLL_INFO *coll) +void Lara_State_SurfLeft(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_UW_DEATH; @@ -949,7 +949,7 @@ void __cdecl Lara_State_SurfLeft(ITEM *item, COLL_INFO *coll) CLAMPG(item->fall_speed, LARA_MAX_SURF_SPEED); } -void __cdecl Lara_State_SurfRight(ITEM *item, COLL_INFO *coll) +void Lara_State_SurfRight(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_UW_DEATH; @@ -969,7 +969,7 @@ void __cdecl Lara_State_SurfRight(ITEM *item, COLL_INFO *coll) CLAMPG(item->fall_speed, LARA_MAX_SURF_SPEED); } -void __cdecl Lara_State_SurfTread(ITEM *item, COLL_INFO *coll) +void Lara_State_SurfTread(ITEM *item, COLL_INFO *coll) { item->fall_speed -= 4; CLAMPL(item->fall_speed, 0); @@ -1017,7 +1017,7 @@ void __cdecl Lara_State_SurfTread(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Swim(ITEM *item, COLL_INFO *coll) +void Lara_State_Swim(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_UW_DEATH; @@ -1044,7 +1044,7 @@ void __cdecl Lara_State_Swim(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Glide(ITEM *item, COLL_INFO *coll) +void Lara_State_Glide(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_UW_DEATH; @@ -1069,7 +1069,7 @@ void __cdecl Lara_State_Glide(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Tread(ITEM *item, COLL_INFO *coll) +void Lara_State_Tread(ITEM *item, COLL_INFO *coll) { if (item->hit_points <= 0) { item->goal_anim_state = LS_UW_DEATH; @@ -1097,14 +1097,14 @@ void __cdecl Lara_State_Tread(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_Dive(ITEM *item, COLL_INFO *coll) +void Lara_State_Dive(ITEM *item, COLL_INFO *coll) { if (g_Input.forward) { item->rot.x -= PHD_DEGREE; } } -void __cdecl Lara_State_UWDeath(ITEM *item, COLL_INFO *coll) +void Lara_State_UWDeath(ITEM *item, COLL_INFO *coll) { item->gravity = 0; item->fall_speed -= 8; @@ -1120,7 +1120,7 @@ void __cdecl Lara_State_UWDeath(ITEM *item, COLL_INFO *coll) } } -void __cdecl Lara_State_UWTwist(ITEM *item, COLL_INFO *coll) +void Lara_State_UWTwist(ITEM *item, COLL_INFO *coll) { item->fall_speed = 0; } diff --git a/src/tr2/game/lara/state.h b/src/tr2/game/lara/state.h index 6d07c3885..085d76e55 100644 --- a/src/tr2/game/lara/state.h +++ b/src/tr2/game/lara/state.h @@ -5,72 +5,72 @@ #include "global/types.h" // TODO: make static -void __cdecl Lara_SwimTurn(ITEM *item); +void Lara_SwimTurn(ITEM *item); void Lara_State_Empty(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Walk(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Run(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Stop(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_ForwardJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_FastBack(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_TurnRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_TurnLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Death(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_FastFall(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Hang(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Reach(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Splat(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Compress(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Back(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Null(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_FastTurn(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_StepRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_StepLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Slide(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_BackJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_RightJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_LeftJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_UpJump(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Fallback(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_HangLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_HangRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SlideBack(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_PushBlock(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_PPReady(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Pickup(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_PickupFlare(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_UseKey(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Special(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SwanDive(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_FastDive(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_WaterOut(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Wade(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Zipline(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_Breath(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_YetiKill(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_SharkKill(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_Airlock(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_GongBong(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_DinoKill(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_PullDagger(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_StartAnim(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_StartHouse(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Extra_FinalAnim(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_ClimbLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_ClimbRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_ClimbStance(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Climbing(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_ClimbEnd(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_ClimbDown(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SurfSwim(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SurfBack(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SurfLeft(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SurfRight(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_SurfTread(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Swim(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Glide(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Tread(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_Dive(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_UWDeath(ITEM *item, COLL_INFO *coll); -void __cdecl Lara_State_UWTwist(ITEM *item, COLL_INFO *coll); +void Lara_State_Walk(ITEM *item, COLL_INFO *coll); +void Lara_State_Run(ITEM *item, COLL_INFO *coll); +void Lara_State_Stop(ITEM *item, COLL_INFO *coll); +void Lara_State_ForwardJump(ITEM *item, COLL_INFO *coll); +void Lara_State_FastBack(ITEM *item, COLL_INFO *coll); +void Lara_State_TurnRight(ITEM *item, COLL_INFO *coll); +void Lara_State_TurnLeft(ITEM *item, COLL_INFO *coll); +void Lara_State_Death(ITEM *item, COLL_INFO *coll); +void Lara_State_FastFall(ITEM *item, COLL_INFO *coll); +void Lara_State_Hang(ITEM *item, COLL_INFO *coll); +void Lara_State_Reach(ITEM *item, COLL_INFO *coll); +void Lara_State_Splat(ITEM *item, COLL_INFO *coll); +void Lara_State_Compress(ITEM *item, COLL_INFO *coll); +void Lara_State_Back(ITEM *item, COLL_INFO *coll); +void Lara_State_Null(ITEM *item, COLL_INFO *coll); +void Lara_State_FastTurn(ITEM *item, COLL_INFO *coll); +void Lara_State_StepRight(ITEM *item, COLL_INFO *coll); +void Lara_State_StepLeft(ITEM *item, COLL_INFO *coll); +void Lara_State_Slide(ITEM *item, COLL_INFO *coll); +void Lara_State_BackJump(ITEM *item, COLL_INFO *coll); +void Lara_State_RightJump(ITEM *item, COLL_INFO *coll); +void Lara_State_LeftJump(ITEM *item, COLL_INFO *coll); +void Lara_State_UpJump(ITEM *item, COLL_INFO *coll); +void Lara_State_Fallback(ITEM *item, COLL_INFO *coll); +void Lara_State_HangLeft(ITEM *item, COLL_INFO *coll); +void Lara_State_HangRight(ITEM *item, COLL_INFO *coll); +void Lara_State_SlideBack(ITEM *item, COLL_INFO *coll); +void Lara_State_PushBlock(ITEM *item, COLL_INFO *coll); +void Lara_State_PPReady(ITEM *item, COLL_INFO *coll); +void Lara_State_Pickup(ITEM *item, COLL_INFO *coll); +void Lara_State_PickupFlare(ITEM *item, COLL_INFO *coll); +void Lara_State_SwitchOn(ITEM *item, COLL_INFO *coll); +void Lara_State_UseKey(ITEM *item, COLL_INFO *coll); +void Lara_State_Special(ITEM *item, COLL_INFO *coll); +void Lara_State_SwanDive(ITEM *item, COLL_INFO *coll); +void Lara_State_FastDive(ITEM *item, COLL_INFO *coll); +void Lara_State_WaterOut(ITEM *item, COLL_INFO *coll); +void Lara_State_Wade(ITEM *item, COLL_INFO *coll); +void Lara_State_Zipline(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_Breath(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_YetiKill(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_SharkKill(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_Airlock(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_GongBong(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_DinoKill(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_PullDagger(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_StartAnim(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_StartHouse(ITEM *item, COLL_INFO *coll); +void Lara_State_Extra_FinalAnim(ITEM *item, COLL_INFO *coll); +void Lara_State_ClimbLeft(ITEM *item, COLL_INFO *coll); +void Lara_State_ClimbRight(ITEM *item, COLL_INFO *coll); +void Lara_State_ClimbStance(ITEM *item, COLL_INFO *coll); +void Lara_State_Climbing(ITEM *item, COLL_INFO *coll); +void Lara_State_ClimbEnd(ITEM *item, COLL_INFO *coll); +void Lara_State_ClimbDown(ITEM *item, COLL_INFO *coll); +void Lara_State_SurfSwim(ITEM *item, COLL_INFO *coll); +void Lara_State_SurfBack(ITEM *item, COLL_INFO *coll); +void Lara_State_SurfLeft(ITEM *item, COLL_INFO *coll); +void Lara_State_SurfRight(ITEM *item, COLL_INFO *coll); +void Lara_State_SurfTread(ITEM *item, COLL_INFO *coll); +void Lara_State_Swim(ITEM *item, COLL_INFO *coll); +void Lara_State_Glide(ITEM *item, COLL_INFO *coll); +void Lara_State_Tread(ITEM *item, COLL_INFO *coll); +void Lara_State_Dive(ITEM *item, COLL_INFO *coll); +void Lara_State_UWDeath(ITEM *item, COLL_INFO *coll); +void Lara_State_UWTwist(ITEM *item, COLL_INFO *coll); diff --git a/src/tr2/game/level.c b/src/tr2/game/level.c index f3f44ad0a..2b5b6cd44 100644 --- a/src/tr2/game/level.c +++ b/src/tr2/game/level.c @@ -871,7 +871,7 @@ static void M_CompleteSetup(void) Benchmark_End(benchmark, NULL); } -bool __cdecl Level_Load(const char *const file_name, const int32_t level_num) +bool Level_Load(const char *const file_name, const int32_t level_num) { BENCHMARK *const benchmark = Benchmark_Start(); diff --git a/src/tr2/game/level.h b/src/tr2/game/level.h index de1d2a692..8a31cfd9e 100644 --- a/src/tr2/game/level.h +++ b/src/tr2/game/level.h @@ -4,4 +4,4 @@ #include -bool __cdecl Level_Load(const char *file_name, int32_t level_num); +bool Level_Load(const char *file_name, int32_t level_num); diff --git a/src/tr2/game/los.c b/src/tr2/game/los.c index 23b9cf9c0..89c602a25 100644 --- a/src/tr2/game/los.c +++ b/src/tr2/game/los.c @@ -9,8 +9,7 @@ #include #include -int32_t __cdecl LOS_CheckX( - const GAME_VECTOR *const start, GAME_VECTOR *const target) +int32_t LOS_CheckX(const GAME_VECTOR *const start, GAME_VECTOR *const target) { const int32_t dx = target->x - start->x; if (dx == 0) { @@ -116,8 +115,7 @@ int32_t __cdecl LOS_CheckX( return 1; } -int32_t __cdecl LOS_CheckZ( - const GAME_VECTOR *const start, GAME_VECTOR *const target) +int32_t LOS_CheckZ(const GAME_VECTOR *const start, GAME_VECTOR *const target) { const int32_t dz = target->z - start->z; if (dz == 0) { @@ -223,7 +221,7 @@ int32_t __cdecl LOS_CheckZ( return 1; } -int32_t __cdecl LOS_ClipTarget( +int32_t LOS_ClipTarget( const GAME_VECTOR *const start, GAME_VECTOR *const target, const SECTOR *const sector) { @@ -252,8 +250,7 @@ int32_t __cdecl LOS_ClipTarget( return 1; } -int32_t __cdecl LOS_Check( - const GAME_VECTOR *const start, GAME_VECTOR *const target) +int32_t LOS_Check(const GAME_VECTOR *const start, GAME_VECTOR *const target) { int32_t los1; int32_t los2; @@ -289,7 +286,7 @@ int32_t __cdecl LOS_Check( return 0; } -int32_t __cdecl LOS_CheckSmashable( +int32_t LOS_CheckSmashable( const GAME_VECTOR *const start, const GAME_VECTOR *const target) { const int32_t dx = target->x - start->x; diff --git a/src/tr2/game/los.h b/src/tr2/game/los.h index f01892247..7db997536 100644 --- a/src/tr2/game/los.h +++ b/src/tr2/game/los.h @@ -2,10 +2,9 @@ #include "global/types.h" -int32_t __cdecl LOS_CheckX(const GAME_VECTOR *start, GAME_VECTOR *target); -int32_t __cdecl LOS_CheckZ(const GAME_VECTOR *start, GAME_VECTOR *target); -int32_t __cdecl LOS_ClipTarget( +int32_t LOS_CheckX(const GAME_VECTOR *start, GAME_VECTOR *target); +int32_t LOS_CheckZ(const GAME_VECTOR *start, GAME_VECTOR *target); +int32_t LOS_ClipTarget( const GAME_VECTOR *start, GAME_VECTOR *target, const SECTOR *sector); -int32_t __cdecl LOS_Check(const GAME_VECTOR *start, GAME_VECTOR *target); -int32_t __cdecl LOS_CheckSmashable( - const GAME_VECTOR *start, const GAME_VECTOR *target); +int32_t LOS_Check(const GAME_VECTOR *start, GAME_VECTOR *target); +int32_t LOS_CheckSmashable(const GAME_VECTOR *start, const GAME_VECTOR *target); diff --git a/src/tr2/game/lot.c b/src/tr2/game/lot.c index 5ec162de3..24315ebfe 100644 --- a/src/tr2/game/lot.c +++ b/src/tr2/game/lot.c @@ -8,7 +8,7 @@ #include #include -void __cdecl LOT_InitialiseArray(void) +void LOT_InitialiseArray(void) { g_BaddieSlots = GameBuf_Alloc(NUM_SLOTS * sizeof(CREATURE), GBUF_CREATURE_DATA); @@ -23,7 +23,7 @@ void __cdecl LOT_InitialiseArray(void) g_SlotsUsed = 0; } -void __cdecl LOT_DisableBaddieAI(const int16_t item_num) +void LOT_DisableBaddieAI(const int16_t item_num) { CREATURE *creature; @@ -42,7 +42,7 @@ void __cdecl LOT_DisableBaddieAI(const int16_t item_num) } } -bool __cdecl LOT_EnableBaddieAI(const int16_t item_num, const bool always) +bool LOT_EnableBaddieAI(const int16_t item_num, const bool always) { if (g_Lara.item_num == item_num) { if (g_Lara.creature != NULL) { @@ -96,7 +96,7 @@ bool __cdecl LOT_EnableBaddieAI(const int16_t item_num, const bool always) return true; } -void __cdecl LOT_InitialiseSlot(const int16_t item_num, const int32_t slot) +void LOT_InitialiseSlot(const int16_t item_num, const int32_t slot) { CREATURE *const creature = &g_BaddieSlots[slot]; @@ -171,7 +171,7 @@ void __cdecl LOT_InitialiseSlot(const int16_t item_num, const int32_t slot) g_SlotsUsed++; } -void __cdecl LOT_CreateZone(ITEM *const item) +void LOT_CreateZone(ITEM *const item) { CREATURE *const creature = item->data; @@ -204,7 +204,7 @@ void __cdecl LOT_CreateZone(ITEM *const item) } } -void __cdecl LOT_ClearLOT(LOT_INFO *const lot) +void LOT_ClearLOT(LOT_INFO *const lot) { lot->search_num = 0; lot->head = NO_BOX; diff --git a/src/tr2/game/lot.h b/src/tr2/game/lot.h index f9c634254..6c2575f6c 100644 --- a/src/tr2/game/lot.h +++ b/src/tr2/game/lot.h @@ -2,9 +2,9 @@ #include "global/types.h" -void __cdecl LOT_InitialiseArray(void); -void __cdecl LOT_DisableBaddieAI(int16_t item_num); -bool __cdecl LOT_EnableBaddieAI(int16_t item_num, bool always); -void __cdecl LOT_InitialiseSlot(int16_t item_num, int32_t slot); -void __cdecl LOT_CreateZone(ITEM *item); -void __cdecl LOT_ClearLOT(LOT_INFO *LOT); +void LOT_InitialiseArray(void); +void LOT_DisableBaddieAI(int16_t item_num); +bool LOT_EnableBaddieAI(int16_t item_num, bool always); +void LOT_InitialiseSlot(int16_t item_num, int32_t slot); +void LOT_CreateZone(ITEM *item); +void LOT_ClearLOT(LOT_INFO *LOT); diff --git a/src/tr2/game/math_misc.c b/src/tr2/game/math_misc.c index c40de706a..2fe973245 100644 --- a/src/tr2/game/math_misc.c +++ b/src/tr2/game/math_misc.c @@ -4,8 +4,7 @@ #include -void __cdecl Math_GetVectorAngles( - int32_t x, int32_t y, int32_t z, int16_t *dest) +void Math_GetVectorAngles(int32_t x, int32_t y, int32_t z, int16_t *dest) { dest[0] = Math_Atan(z, x); diff --git a/src/tr2/game/math_misc.h b/src/tr2/game/math_misc.h index 387fdd738..e8eb45d5a 100644 --- a/src/tr2/game/math_misc.h +++ b/src/tr2/game/math_misc.h @@ -2,5 +2,4 @@ #include -void __cdecl Math_GetVectorAngles( - int32_t x, int32_t y, int32_t z, int16_t *dest); +void Math_GetVectorAngles(int32_t x, int32_t y, int32_t z, int16_t *dest); diff --git a/src/tr2/game/matrix.c b/src/tr2/game/matrix.c index fcb996a60..3117f5775 100644 --- a/src/tr2/game/matrix.c +++ b/src/tr2/game/matrix.c @@ -22,7 +22,7 @@ void Matrix_ResetStack(void) g_MatrixPtr = &m_MatrixStack[0]; } -void __cdecl Matrix_GenerateW2V(const PHD_3DPOS *viewpos) +void Matrix_GenerateW2V(const PHD_3DPOS *viewpos) { g_MatrixPtr = &m_MatrixStack[0]; int32_t sx = Math_Sin(viewpos->rot.x); @@ -56,13 +56,13 @@ void __cdecl Matrix_GenerateW2V(const PHD_3DPOS *viewpos) g_W2VMatrix = *g_MatrixPtr; } -void __cdecl Matrix_Push(void) +void Matrix_Push(void) { g_MatrixPtr++; g_MatrixPtr[0] = g_MatrixPtr[-1]; } -void __cdecl Matrix_PushUnit(void) +void Matrix_PushUnit(void) { MATRIX *mptr = ++g_MatrixPtr; mptr->_00 = (1 << W2V_SHIFT); @@ -79,12 +79,12 @@ void __cdecl Matrix_PushUnit(void) mptr->_23 = 0; } -void __cdecl Matrix_Pop(void) +void Matrix_Pop(void) { g_MatrixPtr--; } -void __cdecl Matrix_LookAt( +void Matrix_LookAt( int32_t xsrc, int32_t ysrc, int32_t zsrc, int32_t xtar, int32_t ytar, int32_t ztar, int16_t roll) { @@ -101,7 +101,7 @@ void __cdecl Matrix_LookAt( Matrix_GenerateW2V(&viewer); } -void __cdecl Matrix_RotX(int16_t rx) +void Matrix_RotX(int16_t rx) { if (!rx) { return; @@ -128,7 +128,7 @@ void __cdecl Matrix_RotX(int16_t rx) mptr->_22 = r1 >> W2V_SHIFT; } -void __cdecl Matrix_RotY(int16_t ry) +void Matrix_RotY(int16_t ry) { if (!ry) { return; @@ -155,7 +155,7 @@ void __cdecl Matrix_RotY(int16_t ry) mptr->_22 = r1 >> W2V_SHIFT; } -void __cdecl Matrix_RotZ(int16_t rz) +void Matrix_RotZ(int16_t rz) { if (!rz) { return; @@ -182,7 +182,7 @@ void __cdecl Matrix_RotZ(int16_t rz) mptr->_21 = r1 >> W2V_SHIFT; } -void __cdecl Matrix_RotYXZ(int16_t ry, int16_t rx, int16_t rz) +void Matrix_RotYXZ(int16_t ry, int16_t rx, int16_t rz) { int32_t r0, r1; MATRIX *mptr = g_MatrixPtr; @@ -246,7 +246,7 @@ void __cdecl Matrix_RotYXZ(int16_t ry, int16_t rx, int16_t rz) } } -void __cdecl Matrix_RotYXZpack(uint32_t rpack) +void Matrix_RotYXZpack(uint32_t rpack) { MATRIX *mptr = g_MatrixPtr; int32_t r0, r1; @@ -313,7 +313,7 @@ void __cdecl Matrix_RotYXZpack(uint32_t rpack) } } -void __cdecl Matrix_RotYXZsuperpack(const int16_t **pprot, int32_t index) +void Matrix_RotYXZsuperpack(const int16_t **pprot, int32_t index) { const uint16_t *prot = (const uint16_t *)*pprot; @@ -349,7 +349,7 @@ void __cdecl Matrix_RotYXZsuperpack(const int16_t **pprot, int32_t index) *pprot = (int16_t *)prot; } -bool __cdecl Matrix_TranslateRel(int32_t x, int32_t y, int32_t z) +bool Matrix_TranslateRel(int32_t x, int32_t y, int32_t z) { MATRIX *mptr = g_MatrixPtr; mptr->_03 += z * mptr->_02 + y * mptr->_01 + x * mptr->_00; @@ -361,7 +361,7 @@ bool __cdecl Matrix_TranslateRel(int32_t x, int32_t y, int32_t z) && ABS(mptr->_23) <= g_PhdFarZ); } -void __cdecl Matrix_TranslateAbs(int32_t x, int32_t y, int32_t z) +void Matrix_TranslateAbs(int32_t x, int32_t y, int32_t z) { MATRIX *mptr = g_MatrixPtr; const int32_t dx = x - g_W2VMatrix._03; @@ -380,7 +380,7 @@ void Matrix_TranslateSet(const int32_t x, const int32_t y, const int32_t z) mptr->_23 = z << W2V_SHIFT; } -void __cdecl Matrix_InitInterpolate(int32_t frac, int32_t rate) +void Matrix_InitInterpolate(int32_t frac, int32_t rate) { g_IMRate = rate; g_IMFrac = frac; @@ -388,7 +388,7 @@ void __cdecl Matrix_InitInterpolate(int32_t frac, int32_t rate) *g_IMMatrixPtr = *g_MatrixPtr; } -void __cdecl Matrix_Interpolate(void) +void Matrix_Interpolate(void) { const int32_t frac = g_IMFrac; const int32_t rate = g_IMRate; @@ -424,7 +424,7 @@ void __cdecl Matrix_Interpolate(void) } } -void __cdecl Matrix_InterpolateArm(void) +void Matrix_InterpolateArm(void) { const int32_t frac = g_IMFrac; const int32_t rate = g_IMRate; @@ -460,20 +460,20 @@ void __cdecl Matrix_InterpolateArm(void) } } -void __cdecl Matrix_Push_I(void) +void Matrix_Push_I(void) { Matrix_Push(); g_IMMatrixPtr[1] = g_IMMatrixPtr[0]; g_IMMatrixPtr++; } -void __cdecl Matrix_Pop_I(void) +void Matrix_Pop_I(void) { g_MatrixPtr--; g_IMMatrixPtr--; } -void __cdecl Matrix_RotX_I(int16_t ang) +void Matrix_RotX_I(int16_t ang) { Matrix_RotX(ang); MATRIX *old_matrix = g_MatrixPtr; @@ -482,7 +482,7 @@ void __cdecl Matrix_RotX_I(int16_t ang) g_MatrixPtr = old_matrix; } -void __cdecl Matrix_RotY_I(int16_t ang) +void Matrix_RotY_I(int16_t ang) { Matrix_RotY(ang); MATRIX *old_matrix = g_MatrixPtr; @@ -491,7 +491,7 @@ void __cdecl Matrix_RotY_I(int16_t ang) g_MatrixPtr = old_matrix; } -void __cdecl Matrix_RotZ_I(int16_t ang) +void Matrix_RotZ_I(int16_t ang) { Matrix_RotZ(ang); MATRIX *old_matrix = g_MatrixPtr; @@ -500,7 +500,7 @@ void __cdecl Matrix_RotZ_I(int16_t ang) g_MatrixPtr = old_matrix; } -void __cdecl Matrix_RotYXZ_I(int16_t y, int16_t x, int16_t z) +void Matrix_RotYXZ_I(int16_t y, int16_t x, int16_t z) { Matrix_RotYXZ(y, x, z); MATRIX *old_matrix = g_MatrixPtr; @@ -509,7 +509,7 @@ void __cdecl Matrix_RotYXZ_I(int16_t y, int16_t x, int16_t z) g_MatrixPtr = old_matrix; } -void __cdecl Matrix_RotYXZsuperpack_I( +void Matrix_RotYXZsuperpack_I( const int16_t **pprot1, const int16_t **pprot2, int32_t index) { Matrix_RotYXZsuperpack(pprot1, index); @@ -519,7 +519,7 @@ void __cdecl Matrix_RotYXZsuperpack_I( g_MatrixPtr = old_matrix; } -void __cdecl Matrix_TranslateRel_I(int32_t x, int32_t y, int32_t z) +void Matrix_TranslateRel_I(int32_t x, int32_t y, int32_t z) { Matrix_TranslateRel(x, y, z); MATRIX *old_matrix = g_MatrixPtr; @@ -528,7 +528,7 @@ void __cdecl Matrix_TranslateRel_I(int32_t x, int32_t y, int32_t z) g_MatrixPtr = old_matrix; } -void __cdecl Matrix_TranslateRel_ID( +void Matrix_TranslateRel_ID( int32_t x, int32_t y, int32_t z, int32_t x2, int32_t y2, int32_t z2) { Matrix_TranslateRel(x, y, z); diff --git a/src/tr2/game/matrix.h b/src/tr2/game/matrix.h index ad3b7d3f1..ece4c54e6 100644 --- a/src/tr2/game/matrix.h +++ b/src/tr2/game/matrix.h @@ -25,35 +25,35 @@ extern MATRIX *g_IMMatrixPtr; extern MATRIX g_W2VMatrix; void Matrix_ResetStack(void); -void __cdecl Matrix_GenerateW2V(const PHD_3DPOS *viewpos); +void Matrix_GenerateW2V(const PHD_3DPOS *viewpos); -void __cdecl Matrix_Push(void); -void __cdecl Matrix_PushUnit(void); -void __cdecl Matrix_Pop(void); -void __cdecl Matrix_LookAt( +void Matrix_Push(void); +void Matrix_PushUnit(void); +void Matrix_Pop(void); +void Matrix_LookAt( int32_t xsrc, int32_t ysrc, int32_t zsrc, int32_t xtar, int32_t ytar, int32_t ztar, int16_t roll); -void __cdecl Matrix_RotX(int16_t rx); -void __cdecl Matrix_RotY(int16_t ry); -void __cdecl Matrix_RotZ(int16_t rz); -void __cdecl Matrix_RotYXZ(int16_t ry, int16_t rx, int16_t rz); -void __cdecl Matrix_RotYXZpack(uint32_t rpack); -void __cdecl Matrix_RotYXZsuperpack(const int16_t **pprot, int32_t index); -bool __cdecl Matrix_TranslateRel(int32_t x, int32_t y, int32_t z); -void __cdecl Matrix_TranslateAbs(int32_t x, int32_t y, int32_t z); +void Matrix_RotX(int16_t rx); +void Matrix_RotY(int16_t ry); +void Matrix_RotZ(int16_t rz); +void Matrix_RotYXZ(int16_t ry, int16_t rx, int16_t rz); +void Matrix_RotYXZpack(uint32_t rpack); +void Matrix_RotYXZsuperpack(const int16_t **pprot, int32_t index); +bool Matrix_TranslateRel(int32_t x, int32_t y, int32_t z); +void Matrix_TranslateAbs(int32_t x, int32_t y, int32_t z); void Matrix_TranslateSet(int32_t x, int32_t y, int32_t z); -void __cdecl Matrix_InitInterpolate(int32_t frac, int32_t rate); -void __cdecl Matrix_Interpolate(void); -void __cdecl Matrix_InterpolateArm(void); -void __cdecl Matrix_Push_I(void); -void __cdecl Matrix_Pop_I(void); -void __cdecl Matrix_RotX_I(int16_t ang); -void __cdecl Matrix_RotY_I(int16_t ang); -void __cdecl Matrix_RotZ_I(int16_t ang); -void __cdecl Matrix_RotYXZ_I(int16_t y, int16_t x, int16_t z); -void __cdecl Matrix_RotYXZsuperpack_I( +void Matrix_InitInterpolate(int32_t frac, int32_t rate); +void Matrix_Interpolate(void); +void Matrix_InterpolateArm(void); +void Matrix_Push_I(void); +void Matrix_Pop_I(void); +void Matrix_RotX_I(int16_t ang); +void Matrix_RotY_I(int16_t ang); +void Matrix_RotZ_I(int16_t ang); +void Matrix_RotYXZ_I(int16_t y, int16_t x, int16_t z); +void Matrix_RotYXZsuperpack_I( const int16_t **pprot1, const int16_t **pprot2, int32_t index); -void __cdecl Matrix_TranslateRel_I(int32_t x, int32_t y, int32_t z); -void __cdecl Matrix_TranslateRel_ID( +void Matrix_TranslateRel_I(int32_t x, int32_t y, int32_t z); +void Matrix_TranslateRel_ID( int32_t x, int32_t y, int32_t z, int32_t x2, int32_t y2, int32_t z2); diff --git a/src/tr2/game/music.h b/src/tr2/game/music.h index 0d7ff044d..7a490cf70 100644 --- a/src/tr2/game/music.h +++ b/src/tr2/game/music.h @@ -81,20 +81,20 @@ typedef enum { MPM_TRACKED, } MUSIC_PLAY_MODE; -bool __cdecl Music_Init(void); -void __cdecl Music_Shutdown(void); +bool Music_Init(void); +void Music_Shutdown(void); void Music_Play(MUSIC_TRACK_ID track_id, MUSIC_PLAY_MODE mode); -void __cdecl Music_Stop(void); -bool __cdecl Music_PlaySynced(int16_t track_id); -double __cdecl Music_GetTimestamp(void); +void Music_Stop(void); +bool Music_PlaySynced(int16_t track_id); +double Music_GetTimestamp(void); bool Music_SeekTimestamp(double timestamp); -void __cdecl Music_SetVolume(int32_t volume); +void Music_SetVolume(int32_t volume); MUSIC_TRACK_ID Music_GetCurrentTrack(void); MUSIC_TRACK_ID Music_GetLastPlayedTrack(void); MUSIC_TRACK_ID Music_GetDelayedTrack(void); void Music_Pause(void); void Music_Unpause(void); -int32_t __cdecl Music_GetRealTrack(int32_t track_id); +int32_t Music_GetRealTrack(int32_t track_id); // TODO: eliminate -void __cdecl Music_Legacy_Play(int16_t track_id, bool is_looped); +void Music_Legacy_Play(int16_t track_id, bool is_looped); diff --git a/src/tr2/game/music/music_main.c b/src/tr2/game/music/music_main.c index 2ef15b037..9c7cb6c6d 100644 --- a/src/tr2/game/music/music_main.c +++ b/src/tr2/game/music/music_main.c @@ -73,7 +73,7 @@ static void M_StreamFinished(const int32_t stream_id, void *const user_data) } } -bool __cdecl Music_Init(void) +bool Music_Init(void) { bool result = false; @@ -95,7 +95,7 @@ bool __cdecl Music_Init(void) return result; } -void __cdecl Music_Shutdown(void) +void Music_Shutdown(void) { if (m_AudioStreamID < 0) { return; @@ -109,7 +109,7 @@ void __cdecl Music_Shutdown(void) Audio_Stream_Close(m_AudioStreamID); } -void __cdecl Music_Legacy_Play(int16_t track_id, bool is_looped) +void Music_Legacy_Play(int16_t track_id, bool is_looped) { Music_Play(track_id, is_looped ? MPM_LOOPED : MPM_ALWAYS); } @@ -166,7 +166,7 @@ void Music_Play(const MUSIC_TRACK_ID track_id, const MUSIC_PLAY_MODE mode) } } -void __cdecl Music_Stop(void) +void Music_Stop(void) { if (m_AudioStreamID < 0) { return; @@ -178,13 +178,13 @@ void __cdecl Music_Stop(void) M_StopActiveStream(); } -bool __cdecl Music_PlaySynced(int16_t track_id) +bool Music_PlaySynced(int16_t track_id) { Music_Play(track_id, false); return true; } -double __cdecl Music_GetTimestamp(void) +double Music_GetTimestamp(void) { if (m_AudioStreamID < 0) { return -1.0; @@ -200,7 +200,7 @@ bool Music_SeekTimestamp(double timestamp) return Audio_Stream_SeekTimestamp(m_AudioStreamID, timestamp); } -void __cdecl Music_SetVolume(int32_t volume) +void Music_SetVolume(int32_t volume) { m_MusicVolume = volume ? volume / 10.0f : 0.0f; if (m_AudioStreamID >= 0) { @@ -239,7 +239,7 @@ void Music_Unpause(void) Audio_Stream_Unpause(m_AudioStreamID); } -int32_t __cdecl Music_GetRealTrack(const int32_t track_id) +int32_t Music_GetRealTrack(const int32_t track_id) { const int8_t skipped_track_ids[] = { 2, 19, 20, 26, -1 }; int32_t idx = 0; diff --git a/src/tr2/game/objects/common.c b/src/tr2/game/objects/common.c index 509f1fa32..2752c3ee9 100644 --- a/src/tr2/game/objects/common.c +++ b/src/tr2/game/objects/common.c @@ -20,7 +20,7 @@ void Object_DrawDummyItem(const ITEM *const item) { } -void __cdecl Object_DrawAnimatingItem(const ITEM *item) +void Object_DrawAnimatingItem(const ITEM *item) { FRAME_INFO *frames[2]; int32_t rate; @@ -130,7 +130,7 @@ void __cdecl Object_DrawAnimatingItem(const ITEM *item) Matrix_Pop(); } -void __cdecl Object_DrawUnclippedItem(const ITEM *const item) +void Object_DrawUnclippedItem(const ITEM *const item) { const VIEWPORT old_vp = *Viewport_Get(); @@ -145,7 +145,7 @@ void __cdecl Object_DrawUnclippedItem(const ITEM *const item) Viewport_Restore(&old_vp); } -void __cdecl Object_DrawSpriteItem(const ITEM *const item) +void Object_DrawSpriteItem(const ITEM *const item) { Output_CalculateStaticMeshLight( item->pos.x, item->pos.y, item->pos.z, item->shade_1, item->shade_2, @@ -160,7 +160,7 @@ void __cdecl Object_DrawSpriteItem(const ITEM *const item) g_LsAdder + 4096, 0); } -void __cdecl Object_Collision( +void Object_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = &g_Items[item_num]; @@ -178,7 +178,7 @@ void __cdecl Object_Collision( } } -void __cdecl Object_Collision_Trap( +void Object_Collision_Trap( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = &g_Items[item_num]; diff --git a/src/tr2/game/objects/common.h b/src/tr2/game/objects/common.h index d9df644ed..1fd441e94 100644 --- a/src/tr2/game/objects/common.h +++ b/src/tr2/game/objects/common.h @@ -5,15 +5,13 @@ #include void Object_DrawDummyItem(const ITEM *item); -void __cdecl Object_DrawAnimatingItem(const ITEM *item); -void __cdecl Object_DrawUnclippedItem(const ITEM *item); -void __cdecl Object_DrawSpriteItem(const ITEM *item); +void Object_DrawAnimatingItem(const ITEM *item); +void Object_DrawUnclippedItem(const ITEM *item); +void Object_DrawSpriteItem(const ITEM *item); -void __cdecl Object_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Object_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl Object_Collision_Trap( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Object_Collision_Trap(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); BOUNDS_16 Object_GetBoundingBox( const OBJECT *obj, const FRAME_INFO *frame, uint32_t mesh_bits); diff --git a/src/tr2/game/objects/creatures/bandit_1.c b/src/tr2/game/objects/creatures/bandit_1.c index a4f011138..07eb118a5 100644 --- a/src/tr2/game/objects/creatures/bandit_1.c +++ b/src/tr2/game/objects/creatures/bandit_1.c @@ -74,7 +74,7 @@ void Bandit1_Setup(void) g_AnimBones[obj->bone_idx + 8 * 4] |= BF_ROT_Y; } -void __cdecl Bandit1_Control(const int16_t item_num) +void Bandit1_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/bandit_1.h b/src/tr2/game/objects/creatures/bandit_1.h index 5df95bd6a..3d3133b0f 100644 --- a/src/tr2/game/objects/creatures/bandit_1.h +++ b/src/tr2/game/objects/creatures/bandit_1.h @@ -3,4 +3,4 @@ #include void Bandit1_Setup(void); -void __cdecl Bandit1_Control(int16_t item_num); +void Bandit1_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/bandit_2.c b/src/tr2/game/objects/creatures/bandit_2.c index 0e8f1eb79..cb0a794a8 100644 --- a/src/tr2/game/objects/creatures/bandit_2.c +++ b/src/tr2/game/objects/creatures/bandit_2.c @@ -104,7 +104,7 @@ void Bandit2B_Setup(void) g_AnimBones[obj->bone_idx + 8 * 4] |= BF_ROT_Y; } -void __cdecl Bandit2_Control(const int16_t item_num) +void Bandit2_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/bandit_2.h b/src/tr2/game/objects/creatures/bandit_2.h index 9d802673b..91b7041a9 100644 --- a/src/tr2/game/objects/creatures/bandit_2.h +++ b/src/tr2/game/objects/creatures/bandit_2.h @@ -4,4 +4,4 @@ void Bandit2_Setup(void); void Bandit2B_Setup(void); -void __cdecl Bandit2_Control(int16_t item_num); +void Bandit2_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/barracuda.c b/src/tr2/game/objects/creatures/barracuda.c index 14d25143e..78c9a23e4 100644 --- a/src/tr2/game/objects/creatures/barracuda.c +++ b/src/tr2/game/objects/creatures/barracuda.c @@ -65,7 +65,7 @@ void Barracuda_Setup(void) g_AnimBones[obj->bone_idx + 6 * 4] |= BF_ROT_Y; } -void __cdecl Barracuda_Control(const int16_t item_num) +void Barracuda_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/barracuda.h b/src/tr2/game/objects/creatures/barracuda.h index 1a634c469..650754f26 100644 --- a/src/tr2/game/objects/creatures/barracuda.h +++ b/src/tr2/game/objects/creatures/barracuda.h @@ -3,4 +3,4 @@ #include void Barracuda_Setup(void); -void __cdecl Barracuda_Control(int16_t item_num); +void Barracuda_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/bartoli.c b/src/tr2/game/objects/creatures/bartoli.c index 1a370ca0c..fdc265705 100644 --- a/src/tr2/game/objects/creatures/bartoli.c +++ b/src/tr2/game/objects/creatures/bartoli.c @@ -76,7 +76,7 @@ void Bartoli_Setup(void) obj->save_anim = 1; } -void __cdecl Bartoli_Initialise(const int16_t item_num) +void Bartoli_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); item->pos.x -= 2 * STEP_L; @@ -117,7 +117,7 @@ void __cdecl Bartoli_Initialise(const int16_t item_num) g_LevelItemCount += 2; } -void __cdecl Bartoli_Control(const int16_t item_num) +void Bartoli_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/creatures/bartoli.h b/src/tr2/game/objects/creatures/bartoli.h index eddeae60b..ede59ed8a 100644 --- a/src/tr2/game/objects/creatures/bartoli.h +++ b/src/tr2/game/objects/creatures/bartoli.h @@ -4,5 +4,5 @@ void Bartoli_Setup(void); -void __cdecl Bartoli_Initialise(int16_t item_num); -void __cdecl Bartoli_Control(int16_t item_num); +void Bartoli_Initialise(int16_t item_num); +void Bartoli_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/big_eel.c b/src/tr2/game/objects/creatures/big_eel.c index 2812520c1..ade282d4c 100644 --- a/src/tr2/game/objects/creatures/big_eel.c +++ b/src/tr2/game/objects/creatures/big_eel.c @@ -59,7 +59,7 @@ void BigEel_Setup(void) obj->water_creature = 1; } -void __cdecl BigEel_Control(const int16_t item_num) +void BigEel_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const ITEM *const lara_item = Lara_GetItem(); diff --git a/src/tr2/game/objects/creatures/big_eel.h b/src/tr2/game/objects/creatures/big_eel.h index 1cff40948..6d16abf34 100644 --- a/src/tr2/game/objects/creatures/big_eel.h +++ b/src/tr2/game/objects/creatures/big_eel.h @@ -3,4 +3,4 @@ #include void BigEel_Setup(void); -void __cdecl BigEel_Control(int16_t item_num); +void BigEel_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/big_spider.c b/src/tr2/game/objects/creatures/big_spider.c index ea96f4681..fb87e6246 100644 --- a/src/tr2/game/objects/creatures/big_spider.c +++ b/src/tr2/game/objects/creatures/big_spider.c @@ -56,7 +56,7 @@ void BigSpider_Setup(void) obj->save_anim = 1; } -void __cdecl BigSpider_Control(const int16_t item_num) +void BigSpider_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/big_spider.h b/src/tr2/game/objects/creatures/big_spider.h index db20fa33c..628c55b0d 100644 --- a/src/tr2/game/objects/creatures/big_spider.h +++ b/src/tr2/game/objects/creatures/big_spider.h @@ -3,4 +3,4 @@ #include void BigSpider_Setup(void); -void __cdecl BigSpider_Control(int16_t item_num); +void BigSpider_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/bird.c b/src/tr2/game/objects/creatures/bird.c index 23e4d67bd..b205f7691 100644 --- a/src/tr2/game/objects/creatures/bird.c +++ b/src/tr2/game/objects/creatures/bird.c @@ -85,7 +85,7 @@ void Bird_SetupCrow(void) obj->save_anim = 1; } -void __cdecl Bird_Initialise(const int16_t item_num) +void Bird_Initialise(const int16_t item_num) { Creature_Initialise(item_num); ITEM *const item = &g_Items[item_num]; @@ -102,7 +102,7 @@ void __cdecl Bird_Initialise(const int16_t item_num) } } -void __cdecl Bird_Control(const int16_t item_num) +void Bird_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/bird.h b/src/tr2/game/objects/creatures/bird.h index 777c4a110..cf82acab7 100644 --- a/src/tr2/game/objects/creatures/bird.h +++ b/src/tr2/game/objects/creatures/bird.h @@ -5,5 +5,5 @@ void Bird_SetupEagle(void); void Bird_SetupCrow(void); -void __cdecl Bird_Initialise(int16_t item_num); -void __cdecl Bird_Control(int16_t item_num); +void Bird_Initialise(int16_t item_num); +void Bird_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/bird_guardian.c b/src/tr2/game/objects/creatures/bird_guardian.c index edec73a1f..6b84bd0c9 100644 --- a/src/tr2/game/objects/creatures/bird_guardian.c +++ b/src/tr2/game/objects/creatures/bird_guardian.c @@ -74,7 +74,7 @@ void BirdGuardian_Setup(void) g_AnimBones[obj->bone_idx + 14 * 4] |= BF_ROT_Y; } -void __cdecl BirdGuardian_Control(const int16_t item_num) +void BirdGuardian_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/bird_guardian.h b/src/tr2/game/objects/creatures/bird_guardian.h index 466e585d4..b91308bd2 100644 --- a/src/tr2/game/objects/creatures/bird_guardian.h +++ b/src/tr2/game/objects/creatures/bird_guardian.h @@ -3,4 +3,4 @@ #include void BirdGuardian_Setup(void); -void __cdecl BirdGuardian_Control(int16_t item_num); +void BirdGuardian_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/cultist_1.c b/src/tr2/game/objects/creatures/cultist_1.c index 2c2644028..2823454e6 100644 --- a/src/tr2/game/objects/creatures/cultist_1.c +++ b/src/tr2/game/objects/creatures/cultist_1.c @@ -130,7 +130,7 @@ void Cultist1B_Setup(void) g_AnimBones[obj->bone_idx] |= BF_ROT_Y; } -void __cdecl Cultist1_Initialise(const int16_t item_num) +void Cultist1_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (Random_GetControl() < 0x4000) { @@ -141,7 +141,7 @@ void __cdecl Cultist1_Initialise(const int16_t item_num) } } -void __cdecl Cultist1_Control(const int16_t item_num) +void Cultist1_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/cultist_1.h b/src/tr2/game/objects/creatures/cultist_1.h index 16d536627..b2c4f5e3e 100644 --- a/src/tr2/game/objects/creatures/cultist_1.h +++ b/src/tr2/game/objects/creatures/cultist_1.h @@ -6,5 +6,5 @@ void Cultist1_Setup(void); void Cultist1A_Setup(void); void Cultist1B_Setup(void); -void __cdecl Cultist1_Initialise(int16_t item_num); -void __cdecl Cultist1_Control(int16_t item_num); +void Cultist1_Initialise(int16_t item_num); +void Cultist1_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/cultist_2.c b/src/tr2/game/objects/creatures/cultist_2.c index 9c6101e28..08eb5abe5 100644 --- a/src/tr2/game/objects/creatures/cultist_2.c +++ b/src/tr2/game/objects/creatures/cultist_2.c @@ -72,7 +72,7 @@ void Cultist2_Setup(void) g_AnimBones[obj->bone_idx + 8 * 4] |= BF_ROT_Y; } -void __cdecl Cultist2_Control(const int16_t item_num) +void Cultist2_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/cultist_2.h b/src/tr2/game/objects/creatures/cultist_2.h index be23b18ad..1e7a7cd57 100644 --- a/src/tr2/game/objects/creatures/cultist_2.h +++ b/src/tr2/game/objects/creatures/cultist_2.h @@ -3,4 +3,4 @@ #include void Cultist2_Setup(void); -void __cdecl Cultist2_Control(int16_t item_num); +void Cultist2_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/cultist_3.c b/src/tr2/game/objects/creatures/cultist_3.c index 00a7a26e6..e211d6aee 100644 --- a/src/tr2/game/objects/creatures/cultist_3.c +++ b/src/tr2/game/objects/creatures/cultist_3.c @@ -73,7 +73,7 @@ void Cultist3_Setup(void) obj->save_anim = 1; } -void __cdecl Cultist3_Initialise(const int16_t item_num) +void Cultist3_Initialise(const int16_t item_num) { Creature_Initialise(item_num); ITEM *const item = Item_Get(item_num); @@ -83,7 +83,7 @@ void __cdecl Cultist3_Initialise(const int16_t item_num) item->current_anim_state = CULTIST_3_STATE_WAIT; } -void __cdecl Cultist3_Control(const int16_t item_num) +void Cultist3_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/cultist_3.h b/src/tr2/game/objects/creatures/cultist_3.h index 10975aef7..8795492b0 100644 --- a/src/tr2/game/objects/creatures/cultist_3.h +++ b/src/tr2/game/objects/creatures/cultist_3.h @@ -3,5 +3,5 @@ #include void Cultist3_Setup(void); -void __cdecl Cultist3_Initialise(int16_t item_num); -void __cdecl Cultist3_Control(int16_t item_num); +void Cultist3_Initialise(int16_t item_num); +void Cultist3_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/diver.c b/src/tr2/game/objects/creatures/diver.c index bcc199e3c..ced403421 100644 --- a/src/tr2/game/objects/creatures/diver.c +++ b/src/tr2/game/objects/creatures/diver.c @@ -50,7 +50,7 @@ static const SECTOR *M_GetRelSector( return &r->sectors[sector_pos.z + r->size.z * sector_pos.x]; } -int32_t __cdecl Diver_GetWaterSurface( +int32_t Diver_GetWaterSurface( const int32_t x, const int32_t y, const int32_t z, const int16_t room_num) { const ROOM *r = Room_Get(room_num); @@ -102,7 +102,7 @@ void Diver_Setup(void) g_AnimBones[obj->bone_idx + 14 * 4] |= BF_ROT_Z; } -void __cdecl Diver_Control(int16_t item_num) +void Diver_Control(int16_t item_num) { if (!Creature_Activate(item_num)) { return; @@ -270,7 +270,7 @@ void __cdecl Diver_Control(int16_t item_num) } } -int16_t __cdecl Diver_Harpoon( +int16_t Diver_Harpoon( const int32_t x, const int32_t y, const int32_t z, const int16_t speed, const int16_t y_rot, const int16_t room_num) { diff --git a/src/tr2/game/objects/creatures/diver.h b/src/tr2/game/objects/creatures/diver.h index 96b2bc1e5..e56d8d8f5 100644 --- a/src/tr2/game/objects/creatures/diver.h +++ b/src/tr2/game/objects/creatures/diver.h @@ -2,13 +2,13 @@ #include -int32_t __cdecl Diver_GetWaterSurface( +int32_t Diver_GetWaterSurface( int32_t x, int32_t y, int32_t z, int16_t room_num); void Diver_Setup(void); -void __cdecl Diver_Control(int16_t item_num); +void Diver_Control(int16_t item_num); -int16_t __cdecl Diver_Harpoon( +int16_t Diver_Harpoon( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num); diff --git a/src/tr2/game/objects/creatures/dog.c b/src/tr2/game/objects/creatures/dog.c index 4420fdeae..7f026d2e5 100644 --- a/src/tr2/game/objects/creatures/dog.c +++ b/src/tr2/game/objects/creatures/dog.c @@ -80,7 +80,7 @@ void Dog_Setup(void) g_AnimBones[obj->bone_idx + 19 * 4] |= BF_ROT_Y; } -void __cdecl Dog_Control(const int16_t item_num) +void Dog_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/dog.h b/src/tr2/game/objects/creatures/dog.h index 0d866a5c9..89c0f0bca 100644 --- a/src/tr2/game/objects/creatures/dog.h +++ b/src/tr2/game/objects/creatures/dog.h @@ -3,4 +3,4 @@ #include void Dog_Setup(void); -void __cdecl Dog_Control(int16_t item_num); +void Dog_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/dragon.c b/src/tr2/game/objects/creatures/dragon.c index 28af8571c..939e74487 100644 --- a/src/tr2/game/objects/creatures/dragon.c +++ b/src/tr2/game/objects/creatures/dragon.c @@ -167,7 +167,7 @@ void Dragon_SetupBack(void) obj->save_anim = 1; } -void __cdecl Dragon_Collision( +void Dragon_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = Item_Get(item_num); @@ -214,7 +214,7 @@ void __cdecl Dragon_Collision( } } -void __cdecl Dragon_Bones(const int16_t item_num) +void Dragon_Bones(const int16_t item_num) { const int16_t bone_front_item_num = Item_Create(); const int16_t bone_back_item_num = Item_Create(); @@ -251,7 +251,7 @@ void __cdecl Dragon_Bones(const int16_t item_num) bone_front->mesh_bits = ~0xC00000u; } -void __cdecl Dragon_Control(const int16_t item_num) +void Dragon_Control(const int16_t item_num) { const int16_t dragon_back_item_num = item_num; ITEM *const dragon_back_item = Item_Get(item_num); diff --git a/src/tr2/game/objects/creatures/dragon.h b/src/tr2/game/objects/creatures/dragon.h index 0bea4e094..13d2c3dde 100644 --- a/src/tr2/game/objects/creatures/dragon.h +++ b/src/tr2/game/objects/creatures/dragon.h @@ -6,9 +6,8 @@ void Dragon_SetupFront(void); void Dragon_SetupBack(void); -void __cdecl Dragon_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Dragon_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl Dragon_Bones(int16_t item_num); +void Dragon_Bones(int16_t item_num); -void __cdecl Dragon_Control(int16_t item_num); +void Dragon_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/eel.c b/src/tr2/game/objects/creatures/eel.c index 39fd06320..bea5416d3 100644 --- a/src/tr2/game/objects/creatures/eel.c +++ b/src/tr2/game/objects/creatures/eel.c @@ -59,7 +59,7 @@ void Eel_Setup(void) obj->water_creature = 1; } -void __cdecl Eel_Control(const int16_t item_num) +void Eel_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/creatures/eel.h b/src/tr2/game/objects/creatures/eel.h index fe72645a2..4cf947820 100644 --- a/src/tr2/game/objects/creatures/eel.h +++ b/src/tr2/game/objects/creatures/eel.h @@ -3,4 +3,4 @@ #include void Eel_Setup(void); -void __cdecl Eel_Control(int16_t item_num); +void Eel_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/jelly.c b/src/tr2/game/objects/creatures/jelly.c index 4fe622626..c2f4493e7 100644 --- a/src/tr2/game/objects/creatures/jelly.c +++ b/src/tr2/game/objects/creatures/jelly.c @@ -46,7 +46,7 @@ void Jelly_Setup(void) obj->water_creature = 1; } -void __cdecl Jelly_Control(const int16_t item_num) +void Jelly_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/jelly.h b/src/tr2/game/objects/creatures/jelly.h index 800ea9938..33363b03a 100644 --- a/src/tr2/game/objects/creatures/jelly.h +++ b/src/tr2/game/objects/creatures/jelly.h @@ -3,4 +3,4 @@ #include void Jelly_Setup(void); -void __cdecl Jelly_Control(int16_t item_num); +void Jelly_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/monk.c b/src/tr2/game/objects/creatures/monk.c index 00d727631..8c104ff97 100644 --- a/src/tr2/game/objects/creatures/monk.c +++ b/src/tr2/game/objects/creatures/monk.c @@ -100,7 +100,7 @@ void Monk2_Setup(void) g_AnimBones[obj->bone_idx + 6 * 4] |= BF_ROT_Y; } -void __cdecl Monk_Control(const int16_t item_num) +void Monk_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/monk.h b/src/tr2/game/objects/creatures/monk.h index bccc3fab2..fd9fb2595 100644 --- a/src/tr2/game/objects/creatures/monk.h +++ b/src/tr2/game/objects/creatures/monk.h @@ -4,4 +4,4 @@ void Monk1_Setup(void); void Monk2_Setup(void); -void __cdecl Monk_Control(int16_t item_num); +void Monk_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/mouse.c b/src/tr2/game/objects/creatures/mouse.c index 0d95bcd47..ca7b4f6f4 100644 --- a/src/tr2/game/objects/creatures/mouse.c +++ b/src/tr2/game/objects/creatures/mouse.c @@ -66,7 +66,7 @@ void Mouse_Setup(void) g_AnimBones[obj->bone_idx + 3 * 4] |= BF_ROT_Y; } -void __cdecl Mouse_Control(const int16_t item_num) +void Mouse_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/mouse.h b/src/tr2/game/objects/creatures/mouse.h index dc04b840f..1778999f5 100644 --- a/src/tr2/game/objects/creatures/mouse.h +++ b/src/tr2/game/objects/creatures/mouse.h @@ -3,4 +3,4 @@ #include void Mouse_Setup(void); -void __cdecl Mouse_Control(int16_t item_num); +void Mouse_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/shark.c b/src/tr2/game/objects/creatures/shark.c index e96d1bd3e..b23f9e5fe 100644 --- a/src/tr2/game/objects/creatures/shark.c +++ b/src/tr2/game/objects/creatures/shark.c @@ -74,7 +74,7 @@ void Shark_Setup(void) g_AnimBones[obj->bone_idx + 9 * 4] |= BF_ROT_Y; } -void __cdecl Shark_Control(const int16_t item_num) +void Shark_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/shark.h b/src/tr2/game/objects/creatures/shark.h index 724c6e3f1..1b12f1062 100644 --- a/src/tr2/game/objects/creatures/shark.h +++ b/src/tr2/game/objects/creatures/shark.h @@ -3,4 +3,4 @@ #include void Shark_Setup(void); -void __cdecl Shark_Control(int16_t item_num); +void Shark_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/skidoo_driver.c b/src/tr2/game/objects/creatures/skidoo_driver.c index b4a18c8c1..8dd3c7752 100644 --- a/src/tr2/game/objects/creatures/skidoo_driver.c +++ b/src/tr2/game/objects/creatures/skidoo_driver.c @@ -184,7 +184,7 @@ void SkidooDriver_Setup(void) obj->save_anim = 1; } -void __cdecl SkidooDriver_Initialise(const int16_t item_num) +void SkidooDriver_Initialise(const int16_t item_num) { ITEM *const skidoo_driver = Item_Get(item_num); @@ -206,7 +206,7 @@ void __cdecl SkidooDriver_Initialise(const int16_t item_num) g_LevelItemCount++; } -void __cdecl SkidooDriver_Control(const int16_t driver_item_num) +void SkidooDriver_Control(const int16_t driver_item_num) { ITEM *const driver_item = Item_Get(driver_item_num); diff --git a/src/tr2/game/objects/creatures/skidoo_driver.h b/src/tr2/game/objects/creatures/skidoo_driver.h index 363ea4ae9..ca52a40b2 100644 --- a/src/tr2/game/objects/creatures/skidoo_driver.h +++ b/src/tr2/game/objects/creatures/skidoo_driver.h @@ -5,5 +5,5 @@ #define SKIDOO_DRIVER_HITPOINTS 100 void SkidooDriver_Setup(void); -void __cdecl SkidooDriver_Initialise(int16_t item_num); -void __cdecl SkidooDriver_Control(int16_t item_num); +void SkidooDriver_Initialise(int16_t item_num); +void SkidooDriver_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/spider.c b/src/tr2/game/objects/creatures/spider.c index d3b4f209e..200e98261 100644 --- a/src/tr2/game/objects/creatures/spider.c +++ b/src/tr2/game/objects/creatures/spider.c @@ -65,7 +65,7 @@ void Spider_Setup(void) obj->save_anim = 1; } -void __cdecl Spider_Leap(const int16_t item_num, const int16_t angle) +void Spider_Leap(const int16_t item_num, const int16_t angle) { ITEM *const item = Item_Get(item_num); const XYZ_32 old_pos = item->pos; @@ -86,7 +86,7 @@ void __cdecl Spider_Leap(const int16_t item_num, const int16_t angle) Creature_Animate(item_num, angle, 0); } -void __cdecl Spider_Control(const int16_t item_num) +void Spider_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/spider.h b/src/tr2/game/objects/creatures/spider.h index 3758dcaf8..2dbd4d378 100644 --- a/src/tr2/game/objects/creatures/spider.h +++ b/src/tr2/game/objects/creatures/spider.h @@ -3,5 +3,5 @@ #include void Spider_Setup(void); -void __cdecl Spider_Leap(int16_t item_num, int16_t angle); -void __cdecl Spider_Control(int16_t item_num); +void Spider_Leap(int16_t item_num, int16_t angle); +void Spider_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/tiger.c b/src/tr2/game/objects/creatures/tiger.c index 7446206a6..f43f88cbd 100644 --- a/src/tr2/game/objects/creatures/tiger.c +++ b/src/tr2/game/objects/creatures/tiger.c @@ -71,7 +71,7 @@ void Tiger_Setup(void) g_AnimBones[obj->bone_idx + 21 * 4] |= BF_ROT_Y; } -void __cdecl Tiger_Control(const int16_t item_num) +void Tiger_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/tiger.h b/src/tr2/game/objects/creatures/tiger.h index 53bf03105..1be4c8e25 100644 --- a/src/tr2/game/objects/creatures/tiger.h +++ b/src/tr2/game/objects/creatures/tiger.h @@ -3,4 +3,4 @@ #include void Tiger_Setup(void); -void __cdecl Tiger_Control(int16_t item_num); +void Tiger_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/trex.c b/src/tr2/game/objects/creatures/trex.c index 69f93af22..a3f9db3de 100644 --- a/src/tr2/game/objects/creatures/trex.c +++ b/src/tr2/game/objects/creatures/trex.c @@ -67,7 +67,7 @@ void TRex_Setup(void) g_AnimBones[obj->bone_idx + 11 * 4] |= BF_ROT_Y; } -void __cdecl TRex_Control(const int16_t item_num) +void TRex_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/trex.h b/src/tr2/game/objects/creatures/trex.h index e58f3c94c..a0354d39f 100644 --- a/src/tr2/game/objects/creatures/trex.h +++ b/src/tr2/game/objects/creatures/trex.h @@ -3,4 +3,4 @@ #include void TRex_Setup(void); -void __cdecl TRex_Control(int16_t item_num); +void TRex_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/winston.c b/src/tr2/game/objects/creatures/winston.c index 3e1d7c3ea..22056c854 100644 --- a/src/tr2/game/objects/creatures/winston.c +++ b/src/tr2/game/objects/creatures/winston.c @@ -43,7 +43,7 @@ void Winston_Setup(void) obj->save_anim = 1; } -void __cdecl Winston_Control(const int16_t item_num) +void Winston_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/winston.h b/src/tr2/game/objects/creatures/winston.h index 5a46f1fbd..46a80e457 100644 --- a/src/tr2/game/objects/creatures/winston.h +++ b/src/tr2/game/objects/creatures/winston.h @@ -3,4 +3,4 @@ #include void Winston_Setup(void); -void __cdecl Winston_Control(int16_t item_num); +void Winston_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/worker_1.c b/src/tr2/game/objects/creatures/worker_1.c index 1896ddb73..b1c20568d 100644 --- a/src/tr2/game/objects/creatures/worker_1.c +++ b/src/tr2/game/objects/creatures/worker_1.c @@ -69,7 +69,7 @@ void Worker1_Setup(void) g_AnimBones[obj->bone_idx + 13 * 4] |= BF_ROT_Y; } -void __cdecl Worker1_Control(const int16_t item_num) +void Worker1_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/worker_1.h b/src/tr2/game/objects/creatures/worker_1.h index cae4ad14f..74d13b632 100644 --- a/src/tr2/game/objects/creatures/worker_1.h +++ b/src/tr2/game/objects/creatures/worker_1.h @@ -3,4 +3,4 @@ #include void Worker1_Setup(void); -void __cdecl Worker1_Control(int16_t item_num); +void Worker1_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/worker_2.c b/src/tr2/game/objects/creatures/worker_2.c index bf4b61b58..c4393eea4 100644 --- a/src/tr2/game/objects/creatures/worker_2.c +++ b/src/tr2/game/objects/creatures/worker_2.c @@ -117,7 +117,7 @@ void Worker5_Setup(void) g_AnimBones[obj->bone_idx + 13 * 4] |= BF_ROT_Y; } -void __cdecl Worker2_Control(const int16_t item_num) +void Worker2_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/worker_2.h b/src/tr2/game/objects/creatures/worker_2.h index 4e232e484..2dedc28a8 100644 --- a/src/tr2/game/objects/creatures/worker_2.h +++ b/src/tr2/game/objects/creatures/worker_2.h @@ -5,4 +5,4 @@ void Worker2_Setup(void); void Worker5_Setup(void); -void __cdecl Worker2_Control(int16_t item_num); +void Worker2_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/worker_3.c b/src/tr2/game/objects/creatures/worker_3.c index 8595ae0ba..3bb60946f 100644 --- a/src/tr2/game/objects/creatures/worker_3.c +++ b/src/tr2/game/objects/creatures/worker_3.c @@ -115,7 +115,7 @@ void Worker4_Setup(void) g_AnimBones[obj->bone_idx + 4 * 4] |= BF_ROT_Y; } -void __cdecl Worker3_Control(const int16_t item_num) +void Worker3_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/worker_3.h b/src/tr2/game/objects/creatures/worker_3.h index a5e43140a..382ce5885 100644 --- a/src/tr2/game/objects/creatures/worker_3.h +++ b/src/tr2/game/objects/creatures/worker_3.h @@ -4,4 +4,4 @@ void Worker3_Setup(void); void Worker4_Setup(void); -void __cdecl Worker3_Control(int16_t item_num); +void Worker3_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/xian_common.c b/src/tr2/game/objects/creatures/xian_common.c index ac1ac5c43..bcb038764 100644 --- a/src/tr2/game/objects/creatures/xian_common.c +++ b/src/tr2/game/objects/creatures/xian_common.c @@ -7,7 +7,7 @@ #include "global/vars.h" // TODO: this duplicates Object_DrawAnimatingItem almost entirely -void __cdecl XianWarrior_Draw(const ITEM *item) +void XianWarrior_Draw(const ITEM *item) { FRAME_INFO *frames[2]; int32_t rate; diff --git a/src/tr2/game/objects/creatures/xian_common.h b/src/tr2/game/objects/creatures/xian_common.h index 0a807ceeb..5e4901dab 100644 --- a/src/tr2/game/objects/creatures/xian_common.h +++ b/src/tr2/game/objects/creatures/xian_common.h @@ -2,4 +2,4 @@ #include "global/types.h" -void __cdecl XianWarrior_Draw(const ITEM *item); +void XianWarrior_Draw(const ITEM *item); diff --git a/src/tr2/game/objects/creatures/xian_knight.c b/src/tr2/game/objects/creatures/xian_knight.c index eb86c4f75..8fd364906 100644 --- a/src/tr2/game/objects/creatures/xian_knight.c +++ b/src/tr2/game/objects/creatures/xian_knight.c @@ -59,7 +59,7 @@ static void M_Initialise(const int16_t item_num) item->mesh_bits = 0; } -void __cdecl XianKnight_SparkleTrail(const ITEM *const item) +void XianKnight_SparkleTrail(const ITEM *const item) { const int16_t effect_num = Effect_Create(item->room_num); if (effect_num != NO_EFFECT) { @@ -104,7 +104,7 @@ void XianKnight_Setup(void) g_AnimBones[obj->bone_idx + 16 * 4] |= BF_ROT_Y; } -void __cdecl XianKnight_Control(const int16_t item_num) +void XianKnight_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/xian_knight.h b/src/tr2/game/objects/creatures/xian_knight.h index 5f4c9e174..51f1efa57 100644 --- a/src/tr2/game/objects/creatures/xian_knight.h +++ b/src/tr2/game/objects/creatures/xian_knight.h @@ -3,5 +3,5 @@ #include "global/types.h" void XianKnight_Setup(void); -void __cdecl XianKnight_SparkleTrail(const ITEM *item); -void __cdecl XianKnight_Control(int16_t item_num); +void XianKnight_SparkleTrail(const ITEM *item); +void XianKnight_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/xian_spearman.c b/src/tr2/game/objects/creatures/xian_spearman.c index 4a3dfe978..fe76ff138 100644 --- a/src/tr2/game/objects/creatures/xian_spearman.c +++ b/src/tr2/game/objects/creatures/xian_spearman.c @@ -122,7 +122,7 @@ void XianSpearman_Setup(void) g_AnimBones[obj->bone_idx + 12 * 4] |= BF_ROT_Y; } -void __cdecl XianSpearman_DoDamage( +void XianSpearman_DoDamage( const ITEM *const item, CREATURE *const creature, const int32_t damage) { if ((creature->flags & 1) == 0 @@ -142,7 +142,7 @@ void __cdecl XianSpearman_DoDamage( } } -void __cdecl XianSpearman_Control(const int16_t item_num) +void XianSpearman_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/xian_spearman.h b/src/tr2/game/objects/creatures/xian_spearman.h index 4c43fe766..1d8f49c6a 100644 --- a/src/tr2/game/objects/creatures/xian_spearman.h +++ b/src/tr2/game/objects/creatures/xian_spearman.h @@ -3,6 +3,6 @@ #include "global/types.h" void XianSpearman_Setup(void); -void __cdecl XianSpearman_DoDamage( +void XianSpearman_DoDamage( const ITEM *item, CREATURE *creature, int32_t damage); -void __cdecl XianSpearman_Control(int16_t item_num); +void XianSpearman_Control(int16_t item_num); diff --git a/src/tr2/game/objects/creatures/yeti.c b/src/tr2/game/objects/creatures/yeti.c index 5d49113b6..974e9b82e 100644 --- a/src/tr2/game/objects/creatures/yeti.c +++ b/src/tr2/game/objects/creatures/yeti.c @@ -95,7 +95,7 @@ void Yeti_Setup(void) g_AnimBones[obj->bone_idx + 14 * 4] |= BF_ROT_Y; } -void __cdecl Yeti_Control(const int16_t item_num) +void Yeti_Control(const int16_t item_num) { if (!Creature_Activate(item_num)) { return; diff --git a/src/tr2/game/objects/creatures/yeti.h b/src/tr2/game/objects/creatures/yeti.h index a78cf05f2..5be15d3f8 100644 --- a/src/tr2/game/objects/creatures/yeti.h +++ b/src/tr2/game/objects/creatures/yeti.h @@ -3,4 +3,4 @@ #include void Yeti_Setup(void); -void __cdecl Yeti_Control(int16_t item_num); +void Yeti_Control(int16_t item_num); diff --git a/src/tr2/game/objects/effects/blood.c b/src/tr2/game/objects/effects/blood.c index 04cd563df..ea30f50e3 100644 --- a/src/tr2/game/objects/effects/blood.c +++ b/src/tr2/game/objects/effects/blood.c @@ -5,7 +5,7 @@ #include "game/objects/common.h" #include "global/vars.h" -void __cdecl Blood_Control(const int16_t effect_num) +void Blood_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); const OBJECT *const obj = Object_GetObject(effect->object_id); diff --git a/src/tr2/game/objects/effects/blood.h b/src/tr2/game/objects/effects/blood.h index 7d1ace4e4..d7b2a2552 100644 --- a/src/tr2/game/objects/effects/blood.h +++ b/src/tr2/game/objects/effects/blood.h @@ -3,4 +3,4 @@ #include "global/types.h" void Blood_Setup(void); -void __cdecl Blood_Control(int16_t effect_num); +void Blood_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/body_part.c b/src/tr2/game/objects/effects/body_part.c index 5cc9c64b0..37c35693b 100644 --- a/src/tr2/game/objects/effects/body_part.c +++ b/src/tr2/game/objects/effects/body_part.c @@ -17,7 +17,7 @@ void BodyPart_Setup(void) obj->mesh_count = 0; } -void __cdecl BodyPart_Control(const int16_t effect_num) +void BodyPart_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); effect->rot.x += 5 * PHD_DEGREE; diff --git a/src/tr2/game/objects/effects/body_part.h b/src/tr2/game/objects/effects/body_part.h index 46fcf4193..c76454518 100644 --- a/src/tr2/game/objects/effects/body_part.h +++ b/src/tr2/game/objects/effects/body_part.h @@ -4,4 +4,4 @@ void BodyPart_Setup(void); -void __cdecl BodyPart_Control(int16_t effect_num); +void BodyPart_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/bubble.c b/src/tr2/game/objects/effects/bubble.c index 2fbcbba5a..4ab518138 100644 --- a/src/tr2/game/objects/effects/bubble.c +++ b/src/tr2/game/objects/effects/bubble.c @@ -11,7 +11,7 @@ void Bubble_Setup(void) obj->control = Bubble_Control; } -void __cdecl Bubble_Control(const int16_t effect_num) +void Bubble_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); effect->rot.y += 9 * PHD_DEGREE; diff --git a/src/tr2/game/objects/effects/bubble.h b/src/tr2/game/objects/effects/bubble.h index 412be3e77..57d352006 100644 --- a/src/tr2/game/objects/effects/bubble.h +++ b/src/tr2/game/objects/effects/bubble.h @@ -3,4 +3,4 @@ #include "global/types.h" void Bubble_Setup(void); -void __cdecl Bubble_Control(int16_t effect_num); +void Bubble_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/dart_effect.c b/src/tr2/game/objects/effects/dart_effect.c index 4174cb4cc..eb5ada868 100644 --- a/src/tr2/game/objects/effects/dart_effect.c +++ b/src/tr2/game/objects/effects/dart_effect.c @@ -4,7 +4,7 @@ #include "game/objects/common.h" #include "global/vars.h" -void __cdecl DartEffect_Control(int16_t effect_num) +void DartEffect_Control(int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); const OBJECT *const obj = Object_GetObject(effect->object_id); diff --git a/src/tr2/game/objects/effects/dart_effect.h b/src/tr2/game/objects/effects/dart_effect.h index 772328ce6..eb142f987 100644 --- a/src/tr2/game/objects/effects/dart_effect.h +++ b/src/tr2/game/objects/effects/dart_effect.h @@ -3,4 +3,4 @@ #include void DartEffect_Setup(void); -void __cdecl DartEffect_Control(int16_t effect_num); +void DartEffect_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/ember.c b/src/tr2/game/objects/effects/ember.c index 04b3dfaa4..93f653835 100644 --- a/src/tr2/game/objects/effects/ember.c +++ b/src/tr2/game/objects/effects/ember.c @@ -7,7 +7,7 @@ #include "game/room.h" #include "global/vars.h" -void __cdecl Ember_Control(const int16_t effect_num) +void Ember_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); effect->fall_speed += GRAVITY; diff --git a/src/tr2/game/objects/effects/ember.h b/src/tr2/game/objects/effects/ember.h index aaf4a1a11..4165eec7f 100644 --- a/src/tr2/game/objects/effects/ember.h +++ b/src/tr2/game/objects/effects/ember.h @@ -2,5 +2,5 @@ #include -void __cdecl Ember_Control(int16_t effect_num); +void Ember_Control(int16_t effect_num); void Ember_Setup(void); diff --git a/src/tr2/game/objects/effects/explosion.c b/src/tr2/game/objects/effects/explosion.c index d516edbbd..2a502578b 100644 --- a/src/tr2/game/objects/effects/explosion.c +++ b/src/tr2/game/objects/effects/explosion.c @@ -5,7 +5,7 @@ #include "game/output.h" #include "global/vars.h" -void __cdecl Explosion_Control(const int16_t effect_num) +void Explosion_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); const OBJECT *const obj = Object_GetObject(effect->object_id); diff --git a/src/tr2/game/objects/effects/explosion.h b/src/tr2/game/objects/effects/explosion.h index bbf6baf56..29bb135a5 100644 --- a/src/tr2/game/objects/effects/explosion.h +++ b/src/tr2/game/objects/effects/explosion.h @@ -3,4 +3,4 @@ #include "global/types.h" void Explosion_Setup(void); -void __cdecl Explosion_Control(int16_t effect_num); +void Explosion_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/flame.c b/src/tr2/game/objects/effects/flame.c index a504b9817..dc5e602a4 100644 --- a/src/tr2/game/objects/effects/flame.c +++ b/src/tr2/game/objects/effects/flame.c @@ -11,7 +11,7 @@ #include -void __cdecl Flame_Control(const int16_t effect_num) +void Flame_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); diff --git a/src/tr2/game/objects/effects/flame.h b/src/tr2/game/objects/effects/flame.h index a952ed55a..5267ae84d 100644 --- a/src/tr2/game/objects/effects/flame.h +++ b/src/tr2/game/objects/effects/flame.h @@ -2,5 +2,5 @@ #include -void __cdecl Flame_Control(int16_t effect_num); +void Flame_Control(int16_t effect_num); void Flame_Setup(void); diff --git a/src/tr2/game/objects/effects/glow.c b/src/tr2/game/objects/effects/glow.c index 13d4bc80e..093d0a66c 100644 --- a/src/tr2/game/objects/effects/glow.c +++ b/src/tr2/game/objects/effects/glow.c @@ -3,7 +3,7 @@ #include "game/effects.h" #include "global/vars.h" -void __cdecl Glow_Control(const int16_t effect_num) +void Glow_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); diff --git a/src/tr2/game/objects/effects/glow.h b/src/tr2/game/objects/effects/glow.h index e0c5cb0f3..93f402311 100644 --- a/src/tr2/game/objects/effects/glow.h +++ b/src/tr2/game/objects/effects/glow.h @@ -3,4 +3,4 @@ #include "global/types.h" void Glow_Setup(void); -void __cdecl Glow_Control(int16_t effect_num); +void Glow_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/gun_flash.c b/src/tr2/game/objects/effects/gun_flash.c index cf907ac12..9fe9e5a6c 100644 --- a/src/tr2/game/objects/effects/gun_flash.c +++ b/src/tr2/game/objects/effects/gun_flash.c @@ -5,7 +5,7 @@ #include "game/random.h" #include "global/vars.h" -void __cdecl GunFlash_Control(const int16_t effect_num) +void GunFlash_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); diff --git a/src/tr2/game/objects/effects/gun_flash.h b/src/tr2/game/objects/effects/gun_flash.h index 1c2f18a62..e59d2c879 100644 --- a/src/tr2/game/objects/effects/gun_flash.h +++ b/src/tr2/game/objects/effects/gun_flash.h @@ -3,4 +3,4 @@ #include "global/types.h" void GunFlash_Setup(void); -void __cdecl GunFlash_Control(int16_t effect_num); +void GunFlash_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/hot_liquid.c b/src/tr2/game/objects/effects/hot_liquid.c index 484952505..78fb70a71 100644 --- a/src/tr2/game/objects/effects/hot_liquid.c +++ b/src/tr2/game/objects/effects/hot_liquid.c @@ -6,7 +6,7 @@ #include "game/sound.h" #include "global/vars.h" -void __cdecl HotLiquid_Control(const int16_t effect_num) +void HotLiquid_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); OBJECT *const obj = Object_GetObject(O_HOT_LIQUID); diff --git a/src/tr2/game/objects/effects/hot_liquid.h b/src/tr2/game/objects/effects/hot_liquid.h index 1582fc6ee..e00e0e5c9 100644 --- a/src/tr2/game/objects/effects/hot_liquid.h +++ b/src/tr2/game/objects/effects/hot_liquid.h @@ -3,4 +3,4 @@ #include "global/types.h" void HotLiquid_Setup(void); -void __cdecl HotLiquid_Control(int16_t effect_num); +void HotLiquid_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/missile_common.c b/src/tr2/game/objects/effects/missile_common.c index c1cfb95d3..67abe0cfd 100644 --- a/src/tr2/game/objects/effects/missile_common.c +++ b/src/tr2/game/objects/effects/missile_common.c @@ -13,7 +13,7 @@ #include -void __cdecl Missile_Control(const int16_t effect_num) +void Missile_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); @@ -94,7 +94,7 @@ void __cdecl Missile_Control(const int16_t effect_num) } } -void __cdecl Missile_ShootAtLara(EFFECT *const effect) +void Missile_ShootAtLara(EFFECT *const effect) { const int32_t dx = g_LaraItem->pos.x - effect->pos.x; const int32_t dy = g_LaraItem->pos.y - effect->pos.y; diff --git a/src/tr2/game/objects/effects/missile_common.h b/src/tr2/game/objects/effects/missile_common.h index 3c77e1c59..0911eabba 100644 --- a/src/tr2/game/objects/effects/missile_common.h +++ b/src/tr2/game/objects/effects/missile_common.h @@ -2,5 +2,5 @@ #include "global/types.h" -void __cdecl Missile_Control(int16_t effect_num); -void __cdecl Missile_ShootAtLara(EFFECT *effect); +void Missile_Control(int16_t effect_num); +void Missile_ShootAtLara(EFFECT *effect); diff --git a/src/tr2/game/objects/effects/ricochet.c b/src/tr2/game/objects/effects/ricochet.c index 571adee23..7ab30009c 100644 --- a/src/tr2/game/objects/effects/ricochet.c +++ b/src/tr2/game/objects/effects/ricochet.c @@ -3,7 +3,7 @@ #include "game/effects.h" #include "global/vars.h" -void __cdecl Spawn_Ricochet_Control(const int16_t effect_num) +void Spawn_Ricochet_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); effect->counter--; diff --git a/src/tr2/game/objects/effects/ricochet.h b/src/tr2/game/objects/effects/ricochet.h index 87e8c7905..b0792ddf3 100644 --- a/src/tr2/game/objects/effects/ricochet.h +++ b/src/tr2/game/objects/effects/ricochet.h @@ -3,4 +3,4 @@ #include "global/types.h" void Spawn_Ricochet_Setup(void); -void __cdecl Spawn_Ricochet_Control(int16_t effect_num); +void Spawn_Ricochet_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/snow_sprite.c b/src/tr2/game/objects/effects/snow_sprite.c index b2f3650ee..191c07aa9 100644 --- a/src/tr2/game/objects/effects/snow_sprite.c +++ b/src/tr2/game/objects/effects/snow_sprite.c @@ -4,7 +4,7 @@ #include "game/math.h" #include "global/vars.h" -void __cdecl SnowSprite_Control(const int16_t effect_num) +void SnowSprite_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); const OBJECT *const obj = Object_GetObject(effect->object_id); diff --git a/src/tr2/game/objects/effects/snow_sprite.h b/src/tr2/game/objects/effects/snow_sprite.h index 7258521c4..d01e61052 100644 --- a/src/tr2/game/objects/effects/snow_sprite.h +++ b/src/tr2/game/objects/effects/snow_sprite.h @@ -3,4 +3,4 @@ #include "global/types.h" void SnowSprite_Setup(void); -void __cdecl SnowSprite_Control(int16_t effect_num); +void SnowSprite_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/splash.c b/src/tr2/game/objects/effects/splash.c index ad37d53ba..b2ac0e829 100644 --- a/src/tr2/game/objects/effects/splash.c +++ b/src/tr2/game/objects/effects/splash.c @@ -12,7 +12,7 @@ void Spawn_Splash_Setup(void) obj->semi_transparent = 1; } -void __cdecl Spawn_Splash_Control(const int16_t effect_num) +void Spawn_Splash_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); const OBJECT *const object = Object_GetObject(effect->object_id); diff --git a/src/tr2/game/objects/effects/splash.h b/src/tr2/game/objects/effects/splash.h index 4a4f5d719..845a70ea7 100644 --- a/src/tr2/game/objects/effects/splash.h +++ b/src/tr2/game/objects/effects/splash.h @@ -3,4 +3,4 @@ #include "global/types.h" void Spawn_Splash_Setup(void); -void __cdecl Spawn_Splash_Control(int16_t effect_num); +void Spawn_Splash_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/twinkle.c b/src/tr2/game/objects/effects/twinkle.c index 05afd9460..3a4d5a3ce 100644 --- a/src/tr2/game/objects/effects/twinkle.c +++ b/src/tr2/game/objects/effects/twinkle.c @@ -51,7 +51,7 @@ void Twinkle_Setup(void) obj->control = Twinkle_Control; } -void __cdecl Twinkle_Control(const int16_t effect_num) +void Twinkle_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); effect->frame_num--; diff --git a/src/tr2/game/objects/effects/twinkle.h b/src/tr2/game/objects/effects/twinkle.h index 62bff49b0..4152a3b29 100644 --- a/src/tr2/game/objects/effects/twinkle.h +++ b/src/tr2/game/objects/effects/twinkle.h @@ -4,4 +4,4 @@ void Twinkle_Setup(void); -void __cdecl Twinkle_Control(int16_t effect_num); +void Twinkle_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/effects/water_sprite.c b/src/tr2/game/objects/effects/water_sprite.c index c3f811380..a7181c39b 100644 --- a/src/tr2/game/objects/effects/water_sprite.c +++ b/src/tr2/game/objects/effects/water_sprite.c @@ -4,7 +4,7 @@ #include "game/math.h" #include "global/vars.h" -void __cdecl WaterSprite_Control(const int16_t effect_num) +void WaterSprite_Control(const int16_t effect_num) { EFFECT *const effect = Effect_Get(effect_num); const OBJECT *const obj = Object_GetObject(effect->object_id); diff --git a/src/tr2/game/objects/effects/water_sprite.h b/src/tr2/game/objects/effects/water_sprite.h index 03cd26345..21b16bf4d 100644 --- a/src/tr2/game/objects/effects/water_sprite.h +++ b/src/tr2/game/objects/effects/water_sprite.h @@ -3,4 +3,4 @@ #include "global/types.h" void WaterSprite_Setup(void); -void __cdecl WaterSprite_Control(int16_t effect_num); +void WaterSprite_Control(int16_t effect_num); diff --git a/src/tr2/game/objects/general/alarm_sound.c b/src/tr2/game/objects/general/alarm_sound.c index edb0f387e..c8691c28b 100644 --- a/src/tr2/game/objects/general/alarm_sound.c +++ b/src/tr2/game/objects/general/alarm_sound.c @@ -3,7 +3,7 @@ #include "game/output.h" #include "game/sound.h" -void __cdecl AlarmSound_Control(int16_t item_num) +void AlarmSound_Control(int16_t item_num) { ITEM *const item = Item_Get(item_num); if ((item->flags & IF_CODE_BITS) != IF_CODE_BITS) { diff --git a/src/tr2/game/objects/general/alarm_sound.h b/src/tr2/game/objects/general/alarm_sound.h index 84a02d710..393c660c4 100644 --- a/src/tr2/game/objects/general/alarm_sound.h +++ b/src/tr2/game/objects/general/alarm_sound.h @@ -3,4 +3,4 @@ #include "global/types.h" void AlarmSound_Setup(void); -void __cdecl AlarmSound_Control(int16_t item_num); +void AlarmSound_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/bell.c b/src/tr2/game/objects/general/bell.c index cad4ec16b..f3928807f 100644 --- a/src/tr2/game/objects/general/bell.c +++ b/src/tr2/game/objects/general/bell.c @@ -19,7 +19,7 @@ void Bell_Setup(void) obj->save_anim = 1; } -void __cdecl Bell_Control(const int16_t item_num) +void Bell_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/bell.h b/src/tr2/game/objects/general/bell.h index 01f13867c..08010e667 100644 --- a/src/tr2/game/objects/general/bell.h +++ b/src/tr2/game/objects/general/bell.h @@ -3,4 +3,4 @@ #include "global/types.h" void Bell_Setup(void); -void __cdecl Bell_Control(int16_t item_num); +void Bell_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/big_bowl.c b/src/tr2/game/objects/general/big_bowl.c index 95861712e..9944426df 100644 --- a/src/tr2/game/objects/general/big_bowl.c +++ b/src/tr2/game/objects/general/big_bowl.c @@ -33,7 +33,7 @@ static void M_CreateHotLiquid(const ITEM *const bowl_item) } } -void __cdecl BigBowl_Control(const int16_t item_num) +void BigBowl_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/big_bowl.h b/src/tr2/game/objects/general/big_bowl.h index 404768b2f..7a4d16619 100644 --- a/src/tr2/game/objects/general/big_bowl.h +++ b/src/tr2/game/objects/general/big_bowl.h @@ -3,4 +3,4 @@ #include "global/types.h" void BigBowl_Setup(void); -void __cdecl BigBowl_Control(int16_t item_num); +void BigBowl_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/bird_tweeter.c b/src/tr2/game/objects/general/bird_tweeter.c index ceb398d2e..e89756a85 100644 --- a/src/tr2/game/objects/general/bird_tweeter.c +++ b/src/tr2/game/objects/general/bird_tweeter.c @@ -4,7 +4,7 @@ #include "game/random.h" #include "game/sound.h" -void __cdecl BirdTweeter_Control(const int16_t item_num) +void BirdTweeter_Control(const int16_t item_num) { const ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/bird_tweeter.h b/src/tr2/game/objects/general/bird_tweeter.h index 134e64603..4f01ee1a6 100644 --- a/src/tr2/game/objects/general/bird_tweeter.h +++ b/src/tr2/game/objects/general/bird_tweeter.h @@ -3,4 +3,4 @@ #include "global/types.h" void BirdTweeter_Setup(OBJECT *obj); -void __cdecl BirdTweeter_Control(int16_t item_num); +void BirdTweeter_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/bridge_common.c b/src/tr2/game/objects/general/bridge_common.c index 31cd3f107..c672eb333 100644 --- a/src/tr2/game/objects/general/bridge_common.c +++ b/src/tr2/game/objects/general/bridge_common.c @@ -1,6 +1,6 @@ #include "game/objects/general/bridge_common.h" -int32_t __cdecl Bridge_GetOffset( +int32_t Bridge_GetOffset( const ITEM *const item, const int32_t x, const int32_t z) { switch (item->rot.y) { diff --git a/src/tr2/game/objects/general/bridge_common.h b/src/tr2/game/objects/general/bridge_common.h index 243f325f2..da5090619 100644 --- a/src/tr2/game/objects/general/bridge_common.h +++ b/src/tr2/game/objects/general/bridge_common.h @@ -2,4 +2,4 @@ #include "global/types.h" -int32_t __cdecl Bridge_GetOffset(const ITEM *item, int32_t x, int32_t z); +int32_t Bridge_GetOffset(const ITEM *item, int32_t x, int32_t z); diff --git a/src/tr2/game/objects/general/bridge_flat.c b/src/tr2/game/objects/general/bridge_flat.c index 160eb420c..546817c6e 100644 --- a/src/tr2/game/objects/general/bridge_flat.c +++ b/src/tr2/game/objects/general/bridge_flat.c @@ -7,7 +7,7 @@ void BridgeFlat_Setup(void) obj->floor = BridgeFlat_Floor; } -void __cdecl BridgeFlat_Floor( +void BridgeFlat_Floor( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -16,7 +16,7 @@ void __cdecl BridgeFlat_Floor( } } -void __cdecl BridgeFlat_Ceiling( +void BridgeFlat_Ceiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { diff --git a/src/tr2/game/objects/general/bridge_flat.h b/src/tr2/game/objects/general/bridge_flat.h index b5be5f333..878bb0af2 100644 --- a/src/tr2/game/objects/general/bridge_flat.h +++ b/src/tr2/game/objects/general/bridge_flat.h @@ -4,8 +4,8 @@ void BridgeFlat_Setup(void); -void __cdecl BridgeFlat_Floor( +void BridgeFlat_Floor( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl BridgeFlat_Ceiling( +void BridgeFlat_Ceiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); diff --git a/src/tr2/game/objects/general/bridge_tilt_1.c b/src/tr2/game/objects/general/bridge_tilt_1.c index 50b5aa044..d089f75e7 100644 --- a/src/tr2/game/objects/general/bridge_tilt_1.c +++ b/src/tr2/game/objects/general/bridge_tilt_1.c @@ -9,7 +9,7 @@ void BridgeTilt1_Setup(void) obj->floor = BridgeTilt1_Floor; } -void __cdecl BridgeTilt1_Floor( +void BridgeTilt1_Floor( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -23,7 +23,7 @@ void __cdecl BridgeTilt1_Floor( *out_height = offset_height; } -void __cdecl BridgeTilt1_Ceiling( +void BridgeTilt1_Ceiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { diff --git a/src/tr2/game/objects/general/bridge_tilt_1.h b/src/tr2/game/objects/general/bridge_tilt_1.h index 648b764df..bb31a1825 100644 --- a/src/tr2/game/objects/general/bridge_tilt_1.h +++ b/src/tr2/game/objects/general/bridge_tilt_1.h @@ -4,8 +4,8 @@ void BridgeTilt1_Setup(void); -void __cdecl BridgeTilt1_Floor( +void BridgeTilt1_Floor( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl BridgeTilt1_Ceiling( +void BridgeTilt1_Ceiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); diff --git a/src/tr2/game/objects/general/bridge_tilt_2.c b/src/tr2/game/objects/general/bridge_tilt_2.c index bb9fce52e..cd3e3504c 100644 --- a/src/tr2/game/objects/general/bridge_tilt_2.c +++ b/src/tr2/game/objects/general/bridge_tilt_2.c @@ -9,7 +9,7 @@ void BridgeTilt2_Setup(void) obj->floor = BridgeTilt2_Floor; } -void __cdecl BridgeTilt2_Floor( +void BridgeTilt2_Floor( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -23,7 +23,7 @@ void __cdecl BridgeTilt2_Floor( *out_height = offset_height; } -void __cdecl BridgeTilt2_Ceiling( +void BridgeTilt2_Ceiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { diff --git a/src/tr2/game/objects/general/bridge_tilt_2.h b/src/tr2/game/objects/general/bridge_tilt_2.h index cf60665c9..0047232dd 100644 --- a/src/tr2/game/objects/general/bridge_tilt_2.h +++ b/src/tr2/game/objects/general/bridge_tilt_2.h @@ -4,8 +4,8 @@ void BridgeTilt2_Setup(void); -void __cdecl BridgeTilt2_Floor( +void BridgeTilt2_Floor( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl BridgeTilt2_Ceiling( +void BridgeTilt2_Ceiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); diff --git a/src/tr2/game/objects/general/clock_chimes.c b/src/tr2/game/objects/general/clock_chimes.c index 1d594bf7b..62ea3c45f 100644 --- a/src/tr2/game/objects/general/clock_chimes.c +++ b/src/tr2/game/objects/general/clock_chimes.c @@ -6,7 +6,7 @@ #include -void __cdecl DoChimeSound(const ITEM *const item) +void DoChimeSound(const ITEM *const item) { const ITEM *const lara_item = Lara_GetItem(); XYZ_32 pos = lara_item->pos; @@ -16,7 +16,7 @@ void __cdecl DoChimeSound(const ITEM *const item) Sound_Effect(SFX_DOOR_CHIME, &pos, SPM_NORMAL); } -void __cdecl ClockChimes_Control(const int16_t item_num) +void ClockChimes_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (item->timer == 0) { diff --git a/src/tr2/game/objects/general/clock_chimes.h b/src/tr2/game/objects/general/clock_chimes.h index f0459ffc1..630ba3b5b 100644 --- a/src/tr2/game/objects/general/clock_chimes.h +++ b/src/tr2/game/objects/general/clock_chimes.h @@ -3,5 +3,5 @@ #include "global/types.h" void ClockChimes_Setup(void); -void __cdecl DoChimeSound(const ITEM *item); -void __cdecl ClockChimes_Control(int16_t item_num); +void DoChimeSound(const ITEM *item); +void ClockChimes_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/copter.c b/src/tr2/game/objects/general/copter.c index a6caf5905..df3c0e54b 100644 --- a/src/tr2/game/objects/general/copter.c +++ b/src/tr2/game/objects/general/copter.c @@ -15,7 +15,7 @@ typedef enum { // clang-format on } COPTER_STATE; -void __cdecl Copter_Control(const int16_t item_num) +void Copter_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const ITEM *const lara_item = Lara_GetItem(); diff --git a/src/tr2/game/objects/general/copter.h b/src/tr2/game/objects/general/copter.h index a4623c8e3..2491e9ace 100644 --- a/src/tr2/game/objects/general/copter.h +++ b/src/tr2/game/objects/general/copter.h @@ -3,4 +3,4 @@ #include void Copter_Setup(void); -void __cdecl Copter_Control(int16_t item_num); +void Copter_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/detonator.c b/src/tr2/game/objects/general/detonator.c index 2fcbb5a30..ca9120d58 100644 --- a/src/tr2/game/objects/general/detonator.c +++ b/src/tr2/game/objects/general/detonator.c @@ -49,7 +49,7 @@ void Detonator2_Setup(void) obj->save_anim = 1; } -void __cdecl Detonator_Control(const int16_t item_num) +void Detonator_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); Item_Animate(item); @@ -71,7 +71,7 @@ void __cdecl Detonator_Control(const int16_t item_num) } // TODO: split gong shenanigans into a separate routine -void __cdecl Detonator_Collision( +void Detonator_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { if (g_Lara.extra_anim) { diff --git a/src/tr2/game/objects/general/detonator.h b/src/tr2/game/objects/general/detonator.h index 44fef0cdd..c482c85e9 100644 --- a/src/tr2/game/objects/general/detonator.h +++ b/src/tr2/game/objects/general/detonator.h @@ -5,7 +5,6 @@ void Detonator1_Setup(void); void Detonator2_Setup(void); -void __cdecl Detonator_Control(int16_t item_num); +void Detonator_Control(int16_t item_num); -void __cdecl Detonator_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Detonator_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); diff --git a/src/tr2/game/objects/general/ding_dong.c b/src/tr2/game/objects/general/ding_dong.c index 2a70b8a3e..56c8ba284 100644 --- a/src/tr2/game/objects/general/ding_dong.c +++ b/src/tr2/game/objects/general/ding_dong.c @@ -3,7 +3,7 @@ #include "game/objects/common.h" #include "game/sound.h" -void __cdecl DingDong_Control(const int16_t item_num) +void DingDong_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if ((item->flags & IF_CODE_BITS) == IF_CODE_BITS) { diff --git a/src/tr2/game/objects/general/ding_dong.h b/src/tr2/game/objects/general/ding_dong.h index 6fbe21667..c2988c5f1 100644 --- a/src/tr2/game/objects/general/ding_dong.h +++ b/src/tr2/game/objects/general/ding_dong.h @@ -3,4 +3,4 @@ #include "global/types.h" void DingDong_Setup(void); -void __cdecl DingDong_Control(int16_t item_num); +void DingDong_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/door.c b/src/tr2/game/objects/general/door.c index b463020d1..c4b21287c 100644 --- a/src/tr2/game/objects/general/door.c +++ b/src/tr2/game/objects/general/door.c @@ -56,7 +56,7 @@ static void M_Initialise( door_pos->old_sector = *door_pos->sector; } -void __cdecl Door_Shut(DOORPOS_DATA *const d) +void Door_Shut(DOORPOS_DATA *const d) { SECTOR *const sector = d->sector; if (d->sector == NULL) { @@ -79,7 +79,7 @@ void __cdecl Door_Shut(DOORPOS_DATA *const d) } } -void __cdecl Door_Open(DOORPOS_DATA *const d) +void Door_Open(DOORPOS_DATA *const d) { if (d->sector == NULL) { return; @@ -103,7 +103,7 @@ void Door_Setup(OBJECT *const obj) obj->save_anim = 1; } -void __cdecl Door_Initialise(const int16_t item_num) +void Door_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); DOOR_DATA *door = GameBuf_Alloc(sizeof(DOOR_DATA), GBUF_EXTRA_DOOR_STUFF); @@ -161,7 +161,7 @@ void __cdecl Door_Initialise(const int16_t item_num) } } -void __cdecl Door_Control(const int16_t item_num) +void Door_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); DOOR_DATA *const data = item->data; @@ -189,7 +189,7 @@ void __cdecl Door_Control(const int16_t item_num) Item_Animate(item); } -void __cdecl Door_Collision( +void Door_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = &g_Items[item_num]; diff --git a/src/tr2/game/objects/general/door.h b/src/tr2/game/objects/general/door.h index e5c7eeb4e..fe925c81e 100644 --- a/src/tr2/game/objects/general/door.h +++ b/src/tr2/game/objects/general/door.h @@ -7,11 +7,11 @@ typedef enum { DOOR_STATE_OPEN = 1, } DOOR_STATE; -void __cdecl Door_Shut(DOORPOS_DATA *d); -void __cdecl Door_Open(DOORPOS_DATA *d); +void Door_Shut(DOORPOS_DATA *d); +void Door_Open(DOORPOS_DATA *d); void Door_Setup(OBJECT *obj); -void __cdecl Door_Initialise(int16_t item_num); -void __cdecl Door_Control(int16_t item_num); -void __cdecl Door_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Door_Initialise(int16_t item_num); +void Door_Control(int16_t item_num); +void Door_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); diff --git a/src/tr2/game/objects/general/drawbridge.c b/src/tr2/game/objects/general/drawbridge.c index 4aac4a845..4a14389de 100644 --- a/src/tr2/game/objects/general/drawbridge.c +++ b/src/tr2/game/objects/general/drawbridge.c @@ -22,7 +22,7 @@ void Drawbridge_Setup(void) obj->save_anim = 1; } -int32_t __cdecl Drawbridge_IsItemOnTop( +int32_t Drawbridge_IsItemOnTop( const ITEM *const item, const int32_t z, const int32_t x) { // drawbridge sector @@ -54,7 +54,7 @@ int32_t __cdecl Drawbridge_IsItemOnTop( return false; } -void __cdecl Drawbridge_Floor( +void Drawbridge_Floor( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -68,7 +68,7 @@ void __cdecl Drawbridge_Floor( *out_height = item->pos.y; } -void __cdecl Drawbridge_Ceiling( +void Drawbridge_Ceiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -82,7 +82,7 @@ void __cdecl Drawbridge_Ceiling( *out_height = item->pos.y + STEP_L; } -void __cdecl Drawbridge_Collision( +void Drawbridge_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { const ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/drawbridge.h b/src/tr2/game/objects/general/drawbridge.h index 16bfb2078..304f72e67 100644 --- a/src/tr2/game/objects/general/drawbridge.h +++ b/src/tr2/game/objects/general/drawbridge.h @@ -4,13 +4,12 @@ void Drawbridge_Setup(void); -int32_t __cdecl Drawbridge_IsItemOnTop(const ITEM *item, int32_t z, int32_t x); +int32_t Drawbridge_IsItemOnTop(const ITEM *item, int32_t z, int32_t x); -void __cdecl Drawbridge_Floor( +void Drawbridge_Floor( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl Drawbridge_Ceiling( +void Drawbridge_Ceiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl Drawbridge_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Drawbridge_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); diff --git a/src/tr2/game/objects/general/earthquake.c b/src/tr2/game/objects/general/earthquake.c index dbed89b0a..bc924ebbf 100644 --- a/src/tr2/game/objects/general/earthquake.c +++ b/src/tr2/game/objects/general/earthquake.c @@ -18,7 +18,7 @@ static void M_Activate(const int16_t earth_item_num) earth_item->timer = 0; } -void __cdecl Earthquake_Control(const int16_t item_num) +void Earthquake_Control(const int16_t item_num) { const ITEM *const item = Item_Get(item_num); if (Random_GetDraw() < 512) { diff --git a/src/tr2/game/objects/general/earthquake.h b/src/tr2/game/objects/general/earthquake.h index 6da79ea02..1dc3833c0 100644 --- a/src/tr2/game/objects/general/earthquake.h +++ b/src/tr2/game/objects/general/earthquake.h @@ -3,4 +3,4 @@ #include "global/types.h" void Earthquake_Setup(void); -void __cdecl Earthquake_Control(int16_t item_num); +void Earthquake_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/final_cutscene.c b/src/tr2/game/objects/general/final_cutscene.c index c8f4ee533..efaffc80c 100644 --- a/src/tr2/game/objects/general/final_cutscene.c +++ b/src/tr2/game/objects/general/final_cutscene.c @@ -3,7 +3,7 @@ #include "game/items.h" #include "global/vars.h" -void __cdecl FinalCutscene_Control(const int16_t item_num) +void FinalCutscene_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (g_FinalBossActive >= 5 * FRAMES_PER_SECOND) { diff --git a/src/tr2/game/objects/general/final_cutscene.h b/src/tr2/game/objects/general/final_cutscene.h index 15fd5711e..13933fed3 100644 --- a/src/tr2/game/objects/general/final_cutscene.h +++ b/src/tr2/game/objects/general/final_cutscene.h @@ -3,4 +3,4 @@ #include "global/types.h" void FinalCutscene_Setup(void); -void __cdecl FinalCutscene_Control(int16_t item_num); +void FinalCutscene_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/final_level_counter.c b/src/tr2/game/objects/general/final_level_counter.c index 7d327b7dd..cc0d442a1 100644 --- a/src/tr2/game/objects/general/final_level_counter.c +++ b/src/tr2/game/objects/general/final_level_counter.c @@ -13,11 +13,11 @@ #define CUTSCENE_DELAY (5 * FRAMES_PER_SECOND) // = 150 -static int16_t __cdecl M_FindBestBoss(void); -static void __cdecl M_ActivateLastBoss(void); -static void __cdecl M_PrepareCutscene(int16_t item_num); +static int16_t M_FindBestBoss(void); +static void M_ActivateLastBoss(void); +static void M_PrepareCutscene(int16_t item_num); -static int16_t __cdecl M_FindBestBoss(void) +static int16_t M_FindBestBoss(void) { int32_t best_dist = 0; int16_t best_item = g_FinalBossItem[0]; @@ -51,7 +51,7 @@ static int16_t __cdecl M_FindBestBoss(void) return best_item; } -static void __cdecl M_ActivateLastBoss(void) +static void M_ActivateLastBoss(void) { const int16_t item_num = M_FindBestBoss(); ITEM *const item = &g_Items[item_num]; @@ -63,7 +63,7 @@ static void __cdecl M_ActivateLastBoss(void) g_FinalBossActive = 1; } -static void __cdecl M_PrepareCutscene(const int16_t item_num) +static void M_PrepareCutscene(const int16_t item_num) { if (g_Lara.gun_type == LGT_FLARE) { Flare_Undraw(); @@ -92,7 +92,7 @@ void FinalLevelCounter_Setup(void) obj->save_flags = 1; } -void __cdecl FinalLevelCounter_Control(const int16_t item_num) +void FinalLevelCounter_Control(const int16_t item_num) { if (g_SaveGame.statistics.kills == g_FinalLevelCount && !g_FinalBossActive) { diff --git a/src/tr2/game/objects/general/general.c b/src/tr2/game/objects/general/general.c index ff7ebcb00..88062d2cd 100644 --- a/src/tr2/game/objects/general/general.c +++ b/src/tr2/game/objects/general/general.c @@ -13,7 +13,7 @@ typedef enum { // clang-format on } GENERAL_STATE; -void __cdecl General_Control(const int16_t item_num) +void General_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/general.h b/src/tr2/game/objects/general/general.h index 0ddd969b0..407f250e9 100644 --- a/src/tr2/game/objects/general/general.h +++ b/src/tr2/game/objects/general/general.h @@ -3,4 +3,4 @@ #include void General_Setup(void); -void __cdecl General_Control(int16_t item_num); +void General_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/gong_bonger.c b/src/tr2/game/objects/general/gong_bonger.c index 0e932559f..d15c6eea6 100644 --- a/src/tr2/game/objects/general/gong_bonger.c +++ b/src/tr2/game/objects/general/gong_bonger.c @@ -22,7 +22,7 @@ void GongBonger_Setup(void) obj->save_anim = 1; } -void __cdecl GongBonger_Control(const int16_t item_num) +void GongBonger_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/gong_bonger.h b/src/tr2/game/objects/general/gong_bonger.h index cefa558e2..f5df94006 100644 --- a/src/tr2/game/objects/general/gong_bonger.h +++ b/src/tr2/game/objects/general/gong_bonger.h @@ -4,4 +4,4 @@ void GongBonger_Setup(void); -void __cdecl GongBonger_Control(int16_t item_num); +void GongBonger_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/grenade.c b/src/tr2/game/objects/general/grenade.c index 2b29294e8..548d741a6 100644 --- a/src/tr2/game/objects/general/grenade.c +++ b/src/tr2/game/objects/general/grenade.c @@ -39,7 +39,7 @@ void Grenade_Setup(void) obj->save_position = 1; } -void __cdecl Grenade_Control(int16_t item_num) +void Grenade_Control(int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/grenade.h b/src/tr2/game/objects/general/grenade.h index 2a1b883dc..d234b6c29 100644 --- a/src/tr2/game/objects/general/grenade.h +++ b/src/tr2/game/objects/general/grenade.h @@ -4,4 +4,4 @@ void Grenade_Setup(void); -void __cdecl Grenade_Control(int16_t item_num); +void Grenade_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/harpoon_bolt.c b/src/tr2/game/objects/general/harpoon_bolt.c index e0d4e2493..bc7ff70a9 100644 --- a/src/tr2/game/objects/general/harpoon_bolt.c +++ b/src/tr2/game/objects/general/harpoon_bolt.c @@ -15,7 +15,7 @@ void HarpoonBolt_Setup(void) obj->save_position = 1; } -void __cdecl HarpoonBolt_Control(const int16_t item_num) +void HarpoonBolt_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/harpoon_bolt.h b/src/tr2/game/objects/general/harpoon_bolt.h index 17ab15703..78abffcde 100644 --- a/src/tr2/game/objects/general/harpoon_bolt.h +++ b/src/tr2/game/objects/general/harpoon_bolt.h @@ -3,4 +3,4 @@ #include "global/types.h" void HarpoonBolt_Setup(void); -void __cdecl HarpoonBolt_Control(int16_t item_num); +void HarpoonBolt_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/keyhole.c b/src/tr2/game/objects/general/keyhole.c index e0b488d59..258d030ce 100644 --- a/src/tr2/game/objects/general/keyhole.c +++ b/src/tr2/game/objects/general/keyhole.c @@ -48,7 +48,7 @@ void Keyhole_Setup(OBJECT *const obj) obj->save_flags = 1; } -void __cdecl Keyhole_Collision( +void Keyhole_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { if (lara_item->current_anim_state != LS_STOP) { @@ -92,7 +92,7 @@ void __cdecl Keyhole_Collision( } } -int32_t __cdecl Keyhole_Trigger(const int16_t item_num) +int32_t Keyhole_Trigger(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; if (item->status != IS_ACTIVE || g_Lara.gun_status == LGS_HANDS_BUSY) { diff --git a/src/tr2/game/objects/general/keyhole.h b/src/tr2/game/objects/general/keyhole.h index 178d4cb70..7fdabdad9 100644 --- a/src/tr2/game/objects/general/keyhole.h +++ b/src/tr2/game/objects/general/keyhole.h @@ -4,7 +4,6 @@ void Keyhole_Setup(OBJECT *obj); -void __cdecl Keyhole_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Keyhole_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -int32_t __cdecl Keyhole_Trigger(int16_t item_num); +int32_t Keyhole_Trigger(int16_t item_num); diff --git a/src/tr2/game/objects/general/lara_alarm.c b/src/tr2/game/objects/general/lara_alarm.c index 51ee2b764..3e95cef9b 100644 --- a/src/tr2/game/objects/general/lara_alarm.c +++ b/src/tr2/game/objects/general/lara_alarm.c @@ -3,7 +3,7 @@ #include "game/objects/common.h" #include "game/sound.h" -void __cdecl LaraAlarm_Control(const int16_t item_num) +void LaraAlarm_Control(const int16_t item_num) { const ITEM *const item = Item_Get(item_num); if ((item->flags & IF_CODE_BITS) == IF_CODE_BITS) { diff --git a/src/tr2/game/objects/general/lara_alarm.h b/src/tr2/game/objects/general/lara_alarm.h index 56ba597af..cec108684 100644 --- a/src/tr2/game/objects/general/lara_alarm.h +++ b/src/tr2/game/objects/general/lara_alarm.h @@ -3,4 +3,4 @@ #include "global/types.h" void LaraAlarm_Setup(void); -void __cdecl LaraAlarm_Control(int16_t item_num); +void LaraAlarm_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/lift.c b/src/tr2/game/objects/general/lift.c index 462f9a8e8..217fd5f1a 100644 --- a/src/tr2/game/objects/general/lift.c +++ b/src/tr2/game/objects/general/lift.c @@ -27,7 +27,7 @@ void Lift_Setup(void) obj->save_anim = 1; } -void __cdecl Lift_Initialise(const int16_t item_num) +void Lift_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); @@ -39,7 +39,7 @@ void __cdecl Lift_Initialise(const int16_t item_num) item->data = lift_data; } -void __cdecl Lift_Control(const int16_t item_num) +void Lift_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); LIFT_INFO *const lift_data = item->data; @@ -82,7 +82,7 @@ void __cdecl Lift_Control(const int16_t item_num) } } -void __cdecl Lift_FloorCeiling( +void Lift_FloorCeiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_floor, int32_t *const out_ceiling) { @@ -153,7 +153,7 @@ void __cdecl Lift_FloorCeiling( } } -void __cdecl Lift_Floor( +void Lift_Floor( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -165,7 +165,7 @@ void __cdecl Lift_Floor( } } -void __cdecl Lift_Ceiling( +void Lift_Ceiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { diff --git a/src/tr2/game/objects/general/lift.h b/src/tr2/game/objects/general/lift.h index 290d85e36..ae728c259 100644 --- a/src/tr2/game/objects/general/lift.h +++ b/src/tr2/game/objects/general/lift.h @@ -8,12 +8,12 @@ typedef struct __PACKING { } LIFT_INFO; void Lift_Setup(void); -void __cdecl Lift_Initialise(int16_t item_num); -void __cdecl Lift_Control(int16_t item_num); -void __cdecl Lift_FloorCeiling( +void Lift_Initialise(int16_t item_num); +void Lift_Control(int16_t item_num); +void Lift_FloorCeiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_floor, int32_t *out_ceiling); -void __cdecl Lift_Floor( +void Lift_Floor( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl Lift_Ceiling( +void Lift_Ceiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); diff --git a/src/tr2/game/objects/general/mini_copter.c b/src/tr2/game/objects/general/mini_copter.c index 485a1f995..2110caae8 100644 --- a/src/tr2/game/objects/general/mini_copter.c +++ b/src/tr2/game/objects/general/mini_copter.c @@ -8,7 +8,7 @@ #include #include -void __cdecl MiniCopter_Control(const int16_t item_num) +void MiniCopter_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const ITEM *const lara_item = Lara_GetItem(); diff --git a/src/tr2/game/objects/general/mini_copter.h b/src/tr2/game/objects/general/mini_copter.h index 5c1d801be..57490bfad 100644 --- a/src/tr2/game/objects/general/mini_copter.h +++ b/src/tr2/game/objects/general/mini_copter.h @@ -3,4 +3,4 @@ #include void MiniCopter_Setup(void); -void __cdecl MiniCopter_Control(int16_t item_num); +void MiniCopter_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/movable_block.c b/src/tr2/game/objects/general/movable_block.c index 576f331a0..89a9d06f9 100644 --- a/src/tr2/game/objects/general/movable_block.c +++ b/src/tr2/game/objects/general/movable_block.c @@ -20,7 +20,7 @@ typedef enum { MOVABLE_BLOCK_STATE_PULL = 3, } MOVABLE_BLOCK_STATE; -int32_t __cdecl MovableBlock_TestDestination( +int32_t MovableBlock_TestDestination( const ITEM *const item, const int32_t block_height) { int16_t room_num = item->room_num; @@ -31,7 +31,7 @@ int32_t __cdecl MovableBlock_TestDestination( return floor == NO_HEIGHT || (floor == item->pos.y - block_height); } -int32_t __cdecl MovableBlock_TestPush( +int32_t MovableBlock_TestPush( const ITEM *const item, const int32_t block_height, const uint16_t quadrant) { if (!MovableBlock_TestDestination(item, block_height)) { @@ -88,7 +88,7 @@ int32_t __cdecl MovableBlock_TestPush( return true; } -int32_t __cdecl MovableBlock_TestPull( +int32_t MovableBlock_TestPull( const ITEM *const item, const int32_t block_height, const uint16_t quadrant) { if (!MovableBlock_TestDestination(item, block_height)) { @@ -166,7 +166,7 @@ int32_t __cdecl MovableBlock_TestPull( return true; } -void __cdecl MovableBlock_Initialise(const int16_t item_num) +void MovableBlock_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (item->status != IS_INVISIBLE) { @@ -174,7 +174,7 @@ void __cdecl MovableBlock_Initialise(const int16_t item_num) } } -void __cdecl MovableBlock_Control(const int16_t item_num) +void MovableBlock_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); @@ -214,7 +214,7 @@ void __cdecl MovableBlock_Control(const int16_t item_num) } } -void __cdecl MovableBlock_Collision( +void MovableBlock_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = Item_Get(item_num); @@ -316,7 +316,7 @@ void __cdecl MovableBlock_Collision( } } -void __cdecl MovableBlock_Draw(const ITEM *const item) +void MovableBlock_Draw(const ITEM *const item) { if (item->status == IS_ACTIVE) { Object_DrawUnclippedItem(item); diff --git a/src/tr2/game/objects/general/movable_block.h b/src/tr2/game/objects/general/movable_block.h index e1c358921..68416c9e1 100644 --- a/src/tr2/game/objects/general/movable_block.h +++ b/src/tr2/game/objects/general/movable_block.h @@ -2,22 +2,20 @@ #include "global/types.h" -int32_t __cdecl MovableBlock_TestDestination( - const ITEM *item, int32_t block_height); +int32_t MovableBlock_TestDestination(const ITEM *item, int32_t block_height); -int32_t __cdecl MovableBlock_TestPush( +int32_t MovableBlock_TestPush( const ITEM *item, int32_t block_height, uint16_t quadrant); -int32_t __cdecl MovableBlock_TestPull( +int32_t MovableBlock_TestPull( const ITEM *item, int32_t block_height, uint16_t quadrant); -void __cdecl MovableBlock_Initialise(int16_t item_num); +void MovableBlock_Initialise(int16_t item_num); -void __cdecl MovableBlock_Control(int16_t item_num); +void MovableBlock_Control(int16_t item_num); -void __cdecl MovableBlock_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void MovableBlock_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl MovableBlock_Draw(const ITEM *item); +void MovableBlock_Draw(const ITEM *item); void MovableBlock_Setup(OBJECT *obj); diff --git a/src/tr2/game/objects/general/pickup.c b/src/tr2/game/objects/general/pickup.c index b4b1c7b2b..ece0fc5ea 100644 --- a/src/tr2/game/objects/general/pickup.c +++ b/src/tr2/game/objects/general/pickup.c @@ -280,7 +280,7 @@ void Pickup_Draw(const ITEM *const item) Matrix_Pop(); } -void __cdecl Pickup_Collision( +void Pickup_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { if (g_Lara.water_status == LWS_ABOVE_WATER diff --git a/src/tr2/game/objects/general/pickup.h b/src/tr2/game/objects/general/pickup.h index 127a12077..eebf461d9 100644 --- a/src/tr2/game/objects/general/pickup.h +++ b/src/tr2/game/objects/general/pickup.h @@ -6,7 +6,6 @@ void Pickup_Setup(OBJECT *obj); void Pickup_Draw(const ITEM *item); -void __cdecl Pickup_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Pickup_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); int32_t Pickup_Trigger(int16_t item_num); diff --git a/src/tr2/game/objects/general/puzzle_hole.c b/src/tr2/game/objects/general/puzzle_hole.c index 4d97a9d4c..5fb018672 100644 --- a/src/tr2/game/objects/general/puzzle_hole.c +++ b/src/tr2/game/objects/general/puzzle_hole.c @@ -60,7 +60,7 @@ void PuzzleHole_Setup(OBJECT *const obj, const bool done) obj->save_flags = 1; } -void __cdecl PuzzleHole_Collision( +void PuzzleHole_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/puzzle_hole.h b/src/tr2/game/objects/general/puzzle_hole.h index 53a43a58c..74b4f1355 100644 --- a/src/tr2/game/objects/general/puzzle_hole.h +++ b/src/tr2/game/objects/general/puzzle_hole.h @@ -4,5 +4,4 @@ void PuzzleHole_Setup(OBJECT *obj, bool done); -void __cdecl PuzzleHole_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void PuzzleHole_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); diff --git a/src/tr2/game/objects/general/secret.c b/src/tr2/game/objects/general/secret.c index 48e7bd494..fb03ba9a2 100644 --- a/src/tr2/game/objects/general/secret.c +++ b/src/tr2/game/objects/general/secret.c @@ -4,7 +4,7 @@ #include "game/objects/common.h" #include "game/objects/general/pickup.h" -void __cdecl Secret2_Control(int16_t item_num) +void Secret2_Control(int16_t item_num) { ITEM *const item = Item_Get(item_num); item->status = IS_INVISIBLE; diff --git a/src/tr2/game/objects/general/secret.h b/src/tr2/game/objects/general/secret.h index e49fc5476..88f603016 100644 --- a/src/tr2/game/objects/general/secret.h +++ b/src/tr2/game/objects/general/secret.h @@ -3,4 +3,4 @@ #include "global/types.h" void Secret2_Setup(void); -void __cdecl Secret2_Control(int16_t item_num); +void Secret2_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/sphere_of_doom.c b/src/tr2/game/objects/general/sphere_of_doom.c index 54ceb48e9..ae334a5ab 100644 --- a/src/tr2/game/objects/general/sphere_of_doom.c +++ b/src/tr2/game/objects/general/sphere_of_doom.c @@ -12,7 +12,7 @@ #define SPHERE_OF_DOOM_RADIUS (STEP_L * 5 / 2) // = 640 -void __cdecl SphereOfDoom_Collision( +void SphereOfDoom_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { if (Room_Get(lara_item->room_num)->flags & RF_UNDERWATER) { @@ -52,7 +52,7 @@ void __cdecl SphereOfDoom_Collision( lara_item->goal_anim_state = LS_FORWARD_JUMP; } -void __cdecl SphereOfDoom_Control(const int16_t item_num) +void SphereOfDoom_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); item->timer += 64; @@ -73,7 +73,7 @@ void __cdecl SphereOfDoom_Control(const int16_t item_num) } } -void __cdecl SphereOfDoom_Draw(const ITEM *const item) +void SphereOfDoom_Draw(const ITEM *const item) { Matrix_Push(); Matrix_TranslateAbs(item->pos.x, item->pos.y, item->pos.z); diff --git a/src/tr2/game/objects/general/sphere_of_doom.h b/src/tr2/game/objects/general/sphere_of_doom.h index 9f25e7cb5..be5266812 100644 --- a/src/tr2/game/objects/general/sphere_of_doom.h +++ b/src/tr2/game/objects/general/sphere_of_doom.h @@ -3,7 +3,6 @@ #include "global/types.h" void SphereOfDoom_Setup(OBJECT *obj, bool transparent); -void __cdecl SphereOfDoom_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl SphereOfDoom_Control(int16_t item_num); -void __cdecl SphereOfDoom_Draw(const ITEM *item); +void SphereOfDoom_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void SphereOfDoom_Control(int16_t item_num); +void SphereOfDoom_Draw(const ITEM *item); diff --git a/src/tr2/game/objects/general/switch.c b/src/tr2/game/objects/general/switch.c index 811e528c7..919be1b35 100644 --- a/src/tr2/game/objects/general/switch.c +++ b/src/tr2/game/objects/general/switch.c @@ -94,7 +94,7 @@ void Switch_Setup(OBJECT *const obj, const bool underwater) obj->save_anim = 1; } -void __cdecl Switch_Collision( +void Switch_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = &g_Items[item_num]; @@ -126,7 +126,7 @@ void __cdecl Switch_Collision( Item_Animate(item); } -void __cdecl Switch_CollisionUW( +void Switch_CollisionUW( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = &g_Items[item_num]; @@ -169,7 +169,7 @@ void __cdecl Switch_CollisionUW( Item_Animate(item); } -void __cdecl Switch_Control(const int16_t item_num) +void Switch_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); item->flags |= IF_CODE_BITS; @@ -180,7 +180,7 @@ void __cdecl Switch_Control(const int16_t item_num) Item_Animate(item); } -int32_t __cdecl Switch_Trigger(const int16_t item_num, const int16_t timer) +int32_t Switch_Trigger(const int16_t item_num, const int16_t timer) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/general/switch.h b/src/tr2/game/objects/general/switch.h index 02d6fd524..80394bc44 100644 --- a/src/tr2/game/objects/general/switch.h +++ b/src/tr2/game/objects/general/switch.h @@ -4,12 +4,10 @@ void Switch_Setup(OBJECT *obj, bool underwater); -void __cdecl Switch_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Switch_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl Switch_CollisionUW( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Switch_CollisionUW(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl Switch_Control(int16_t item_num); +void Switch_Control(int16_t item_num); -int32_t __cdecl Switch_Trigger(int16_t item_num, int16_t timer); +int32_t Switch_Trigger(int16_t item_num, int16_t timer); diff --git a/src/tr2/game/objects/general/trapdoor.c b/src/tr2/game/objects/general/trapdoor.c index 551d359f9..835fe60c5 100644 --- a/src/tr2/game/objects/general/trapdoor.c +++ b/src/tr2/game/objects/general/trapdoor.c @@ -16,7 +16,7 @@ void Trapdoor_Setup(OBJECT *const obj) obj->save_anim = 1; } -int32_t __cdecl Trapdoor_IsItemOnTop( +int32_t Trapdoor_IsItemOnTop( const ITEM *const item, const int32_t x, const int32_t z) { const BOUNDS_16 *const orig_bounds = &Item_GetBestFrame(item)->bounds; @@ -56,7 +56,7 @@ int32_t __cdecl Trapdoor_IsItemOnTop( return false; } -void __cdecl Trapdoor_Floor( +void Trapdoor_Floor( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -70,7 +70,7 @@ void __cdecl Trapdoor_Floor( *out_height = item->pos.y; } -void __cdecl Trapdoor_Ceiling( +void Trapdoor_Ceiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -85,7 +85,7 @@ void __cdecl Trapdoor_Ceiling( } } -void __cdecl Trapdoor_Control(const int16_t item_num) +void Trapdoor_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (Item_IsTriggerActive(item)) { diff --git a/src/tr2/game/objects/general/trapdoor.h b/src/tr2/game/objects/general/trapdoor.h index 36dfcf65a..67bf3acdb 100644 --- a/src/tr2/game/objects/general/trapdoor.h +++ b/src/tr2/game/objects/general/trapdoor.h @@ -2,12 +2,12 @@ #include "global/types.h" -int32_t __cdecl Trapdoor_IsItemOnTop(const ITEM *item, int32_t x, int32_t z); +int32_t Trapdoor_IsItemOnTop(const ITEM *item, int32_t x, int32_t z); void Trapdoor_Setup(OBJECT *obj); -void __cdecl Trapdoor_Floor( +void Trapdoor_Floor( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl Trapdoor_Ceiling( +void Trapdoor_Ceiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl Trapdoor_Control(int16_t item_num); +void Trapdoor_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/waterfall.c b/src/tr2/game/objects/general/waterfall.c index b651e6da2..42acbc09c 100644 --- a/src/tr2/game/objects/general/waterfall.c +++ b/src/tr2/game/objects/general/waterfall.c @@ -12,7 +12,7 @@ #define WATERFALL_RANGE (WALL_L * 10) // = 10240 -void __cdecl Waterfall_Control(const int16_t item_num) +void Waterfall_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const ITEM *const lara_item = Lara_GetItem(); diff --git a/src/tr2/game/objects/general/waterfall.h b/src/tr2/game/objects/general/waterfall.h index 0f1679720..17b9e60a6 100644 --- a/src/tr2/game/objects/general/waterfall.h +++ b/src/tr2/game/objects/general/waterfall.h @@ -3,4 +3,4 @@ #include "global/types.h" void Waterfall_Setup(void); -void __cdecl Waterfall_Control(int16_t item_num); +void Waterfall_Control(int16_t item_num); diff --git a/src/tr2/game/objects/general/window.c b/src/tr2/game/objects/general/window.c index c6053dbae..07cbb6f19 100644 --- a/src/tr2/game/objects/general/window.c +++ b/src/tr2/game/objects/general/window.c @@ -31,7 +31,7 @@ void Window_2_Setup(void) obj->save_anim = 1; } -void __cdecl Window_Initialise(const int16_t item_num) +void Window_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); item->flags = 0; @@ -48,7 +48,7 @@ void __cdecl Window_Initialise(const int16_t item_num) } } -void __cdecl Window_1_Control(const int16_t item_num) +void Window_1_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (item->flags & IF_ONE_SHOT) { @@ -70,7 +70,7 @@ void __cdecl Window_1_Control(const int16_t item_num) } } -void __cdecl Window_2_Control(const int16_t item_num) +void Window_2_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (item->flags & IF_ONE_SHOT) { @@ -97,7 +97,7 @@ void __cdecl Window_2_Control(const int16_t item_num) Item_RemoveActive(item_num); } -void __cdecl Window_Smash(const int16_t item_num) +void Window_Smash(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const ROOM *const r = Room_Get(item->room_num); diff --git a/src/tr2/game/objects/general/window.h b/src/tr2/game/objects/general/window.h index e3e6abc17..cd296eb23 100644 --- a/src/tr2/game/objects/general/window.h +++ b/src/tr2/game/objects/general/window.h @@ -5,7 +5,7 @@ void Window_1_Setup(void); void Window_2_Setup(void); -void __cdecl Window_Initialise(int16_t item_num); -void __cdecl Window_1_Control(int16_t item_num); -void __cdecl Window_2_Control(int16_t item_num); -void __cdecl Window_Smash(int16_t item_num); +void Window_Initialise(int16_t item_num); +void Window_1_Control(int16_t item_num); +void Window_2_Control(int16_t item_num); +void Window_Smash(int16_t item_num); diff --git a/src/tr2/game/objects/general/zipline.c b/src/tr2/game/objects/general/zipline.c index 8985753dd..65fb0f0fc 100644 --- a/src/tr2/game/objects/general/zipline.c +++ b/src/tr2/game/objects/general/zipline.c @@ -18,7 +18,7 @@ typedef enum { ZIPLINE_STATE_HANG = 2, } ZIPLINE_STATE; -void __cdecl Zipline_Collision( +void Zipline_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { if (!g_Input.action || g_Lara.gun_status != LGS_ARMLESS @@ -51,7 +51,7 @@ void __cdecl Zipline_Collision( item->flags |= IF_ONE_SHOT; } -void __cdecl Zipline_Control(const int16_t item_num) +void Zipline_Control(const int16_t item_num) { ITEM *const item = &g_Items[item_num]; if (item->status != IS_ACTIVE) { diff --git a/src/tr2/game/objects/general/zipline.h b/src/tr2/game/objects/general/zipline.h index 6c90f7b9c..5526f9ead 100644 --- a/src/tr2/game/objects/general/zipline.h +++ b/src/tr2/game/objects/general/zipline.h @@ -2,9 +2,8 @@ #include "global/types.h" -void __cdecl Zipline_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Zipline_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); -void __cdecl Zipline_Control(int16_t item_num); +void Zipline_Control(int16_t item_num); void Zipline_Setup(void); diff --git a/src/tr2/game/objects/setup.c b/src/tr2/game/objects/setup.c index 4d3c6b41a..b5853ebe3 100644 --- a/src/tr2/game/objects/setup.c +++ b/src/tr2/game/objects/setup.c @@ -143,7 +143,7 @@ static void M_SetupLaraExtra(void) obj->control = Lara_ControlExtra; } -void __cdecl Object_SetupBaddyObjects(void) +void Object_SetupBaddyObjects(void) { M_SetupLara(); M_SetupLaraExtra(); @@ -188,7 +188,7 @@ void __cdecl Object_SetupBaddyObjects(void) Winston_Setup(); } -void __cdecl Object_SetupTrapObjects(void) +void Object_SetupTrapObjects(void) { Blade_Setup(); DartEmitter_Setup(); @@ -223,7 +223,7 @@ void __cdecl Object_SetupTrapObjects(void) TeethTrap_Setup(); } -void __cdecl Object_SetupGeneralObjects(void) +void Object_SetupGeneralObjects(void) { Boat_Setup(); SkidooArmed_Setup(); @@ -374,7 +374,7 @@ void __cdecl Object_SetupGeneralObjects(void) Secret2_Setup(); } -void __cdecl Object_SetupAllObjects(void) +void Object_SetupAllObjects(void) { for (int32_t i = 0; i < O_NUMBER_OF; i++) { OBJECT *const object = Object_GetObject(i); diff --git a/src/tr2/game/objects/setup.h b/src/tr2/game/objects/setup.h index 66afd8238..ae1b63dd0 100644 --- a/src/tr2/game/objects/setup.h +++ b/src/tr2/game/objects/setup.h @@ -1,6 +1,6 @@ #pragma once -void __cdecl Object_SetupAllObjects(void); -void __cdecl Object_SetupGeneralObjects(void); -void __cdecl Object_SetupBaddyObjects(void); -void __cdecl Object_SetupTrapObjects(void); +void Object_SetupAllObjects(void); +void Object_SetupGeneralObjects(void); +void Object_SetupBaddyObjects(void); +void Object_SetupTrapObjects(void); diff --git a/src/tr2/game/objects/traps/blade.c b/src/tr2/game/objects/traps/blade.c index 2f46e211e..ac9bf32a8 100644 --- a/src/tr2/game/objects/traps/blade.c +++ b/src/tr2/game/objects/traps/blade.c @@ -28,7 +28,7 @@ typedef enum { // clang-format on } BLADE_ANIM; -void __cdecl Blade_Initialise(const int16_t item_num) +void Blade_Initialise(const int16_t item_num) { const OBJECT *const obj = Object_GetObject(O_BLADE); ITEM *const item = Item_Get(item_num); @@ -37,7 +37,7 @@ void __cdecl Blade_Initialise(const int16_t item_num) item->current_anim_state = BLADE_STATE_STOP; } -void __cdecl Blade_Control(const int16_t item_num) +void Blade_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/blade.h b/src/tr2/game/objects/traps/blade.h index 004e1cb8e..a4afc63c4 100644 --- a/src/tr2/game/objects/traps/blade.h +++ b/src/tr2/game/objects/traps/blade.h @@ -3,5 +3,5 @@ #include void Blade_Setup(void); -void __cdecl Blade_Initialise(int16_t item_num); -void __cdecl Blade_Control(int16_t item_num); +void Blade_Initialise(int16_t item_num); +void Blade_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/dart.c b/src/tr2/game/objects/traps/dart.c index 533db807e..0e5524f5d 100644 --- a/src/tr2/game/objects/traps/dart.c +++ b/src/tr2/game/objects/traps/dart.c @@ -35,7 +35,7 @@ static void M_Hit(const int16_t item_num) } } -void __cdecl Dart_Control(const int16_t item_num) +void Dart_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (item->touch_bits != 0) { diff --git a/src/tr2/game/objects/traps/dart.h b/src/tr2/game/objects/traps/dart.h index 642c9c2f6..e5cd24f14 100644 --- a/src/tr2/game/objects/traps/dart.h +++ b/src/tr2/game/objects/traps/dart.h @@ -3,4 +3,4 @@ #include void Dart_Setup(void); -void __cdecl Dart_Control(int16_t item_num); +void Dart_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/dart_emitter.c b/src/tr2/game/objects/traps/dart_emitter.c index f5afca00e..888461997 100644 --- a/src/tr2/game/objects/traps/dart_emitter.c +++ b/src/tr2/game/objects/traps/dart_emitter.c @@ -55,7 +55,7 @@ static void M_CreateDart(ITEM *const item) Sound_Effect(SFX_CIRCLE_BLADE, &dart_item->pos, SPM_NORMAL); } -void __cdecl DartEmitter_Control(const int16_t item_num) +void DartEmitter_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/dart_emitter.h b/src/tr2/game/objects/traps/dart_emitter.h index 2c8a9733d..3da5913ba 100644 --- a/src/tr2/game/objects/traps/dart_emitter.h +++ b/src/tr2/game/objects/traps/dart_emitter.h @@ -3,4 +3,4 @@ #include void DartEmitter_Setup(void); -void __cdecl DartEmitter_Control(int16_t item_num); +void DartEmitter_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/dying_monk.c b/src/tr2/game/objects/traps/dying_monk.c index 9c12c561c..9a4810fe0 100644 --- a/src/tr2/game/objects/traps/dying_monk.c +++ b/src/tr2/game/objects/traps/dying_monk.c @@ -11,7 +11,7 @@ #define MAX_ROOMIES 2 -void __cdecl DyingMonk_Initialise(const int16_t item_num) +void DyingMonk_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); @@ -38,7 +38,7 @@ void __cdecl DyingMonk_Initialise(const int16_t item_num) item->data = roomies; } -void __cdecl DyingMonk_Control(const int16_t item_num) +void DyingMonk_Control(const int16_t item_num) { const ITEM *const item = Item_Get(item_num); const int32_t *const roomies = item->data; diff --git a/src/tr2/game/objects/traps/dying_monk.h b/src/tr2/game/objects/traps/dying_monk.h index ba7e610d9..b7db86fbc 100644 --- a/src/tr2/game/objects/traps/dying_monk.h +++ b/src/tr2/game/objects/traps/dying_monk.h @@ -2,6 +2,6 @@ #include -void __cdecl DyingMonk_Initialise(int16_t item_num); -void __cdecl DyingMonk_Control(int16_t item_num); +void DyingMonk_Initialise(int16_t item_num); +void DyingMonk_Control(int16_t item_num); void DyingMonk_Setup(void); diff --git a/src/tr2/game/objects/traps/ember_emitter.c b/src/tr2/game/objects/traps/ember_emitter.c index 1b0f9550e..76078e68a 100644 --- a/src/tr2/game/objects/traps/ember_emitter.c +++ b/src/tr2/game/objects/traps/ember_emitter.c @@ -6,7 +6,7 @@ #include "game/sound.h" #include "global/vars.h" -void __cdecl EmberEmitter_Control(const int16_t item_num) +void EmberEmitter_Control(const int16_t item_num) { const ITEM *const item = Item_Get(item_num); const int16_t effect_num = Effect_Create(item->room_num); diff --git a/src/tr2/game/objects/traps/ember_emitter.h b/src/tr2/game/objects/traps/ember_emitter.h index 079ab873b..c39052809 100644 --- a/src/tr2/game/objects/traps/ember_emitter.h +++ b/src/tr2/game/objects/traps/ember_emitter.h @@ -2,5 +2,5 @@ #include -void __cdecl EmberEmitter_Control(int16_t item_num); +void EmberEmitter_Control(int16_t item_num); void EmberEmitter_Setup(void); diff --git a/src/tr2/game/objects/traps/falling_block.c b/src/tr2/game/objects/traps/falling_block.c index bfd0067b5..4d20fed2a 100644 --- a/src/tr2/game/objects/traps/falling_block.c +++ b/src/tr2/game/objects/traps/falling_block.c @@ -9,7 +9,7 @@ static int32_t M_GetOrigin(const GAME_OBJECT_ID object_id) return object_id == O_FALLING_BLOCK_3 ? WALL_L : STEP_L * 2; } -void __cdecl FallingBlock_Control(const int16_t item_num) +void FallingBlock_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const int32_t origin = M_GetOrigin(item->object_id); @@ -62,7 +62,7 @@ void __cdecl FallingBlock_Control(const int16_t item_num) } } -void __cdecl FallingBlock_Floor( +void FallingBlock_Floor( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { @@ -74,7 +74,7 @@ void __cdecl FallingBlock_Floor( } } -void __cdecl FallingBlock_Ceiling( +void FallingBlock_Ceiling( const ITEM *const item, const int32_t x, const int32_t y, const int32_t z, int32_t *const out_height) { diff --git a/src/tr2/game/objects/traps/falling_block.h b/src/tr2/game/objects/traps/falling_block.h index fe7562e67..1c86ad06f 100644 --- a/src/tr2/game/objects/traps/falling_block.h +++ b/src/tr2/game/objects/traps/falling_block.h @@ -2,9 +2,9 @@ #include "global/types.h" -void __cdecl FallingBlock_Control(int16_t item_num); -void __cdecl FallingBlock_Floor( +void FallingBlock_Control(int16_t item_num); +void FallingBlock_Floor( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); -void __cdecl FallingBlock_Ceiling( +void FallingBlock_Ceiling( const ITEM *item, int32_t x, int32_t y, int32_t z, int32_t *out_height); void FallingBlock_Setup(OBJECT *obj); diff --git a/src/tr2/game/objects/traps/falling_ceiling.c b/src/tr2/game/objects/traps/falling_ceiling.c index 3e8852c18..264cf812f 100644 --- a/src/tr2/game/objects/traps/falling_ceiling.c +++ b/src/tr2/game/objects/traps/falling_ceiling.c @@ -7,7 +7,7 @@ #define FALLING_CEILING_DAMAGE 300 -void __cdecl FallingCeiling_Control(const int16_t item_num) +void FallingCeiling_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/falling_ceiling.h b/src/tr2/game/objects/traps/falling_ceiling.h index d2363d624..80fdc2e18 100644 --- a/src/tr2/game/objects/traps/falling_ceiling.h +++ b/src/tr2/game/objects/traps/falling_ceiling.h @@ -3,4 +3,4 @@ #include void FallingCeiling_Setup(void); -void __cdecl FallingCeiling_Control(int16_t item_num); +void FallingCeiling_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/flame_emitter.c b/src/tr2/game/objects/traps/flame_emitter.c index 2a87f353c..5eb45c4d6 100644 --- a/src/tr2/game/objects/traps/flame_emitter.c +++ b/src/tr2/game/objects/traps/flame_emitter.c @@ -5,7 +5,7 @@ #include "game/objects/common.h" #include "global/vars.h" -void __cdecl FlameEmitter_Control(const int16_t item_num) +void FlameEmitter_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/flame_emitter.h b/src/tr2/game/objects/traps/flame_emitter.h index aeb047c0d..258c97ada 100644 --- a/src/tr2/game/objects/traps/flame_emitter.h +++ b/src/tr2/game/objects/traps/flame_emitter.h @@ -1,4 +1,4 @@ #include -void __cdecl FlameEmitter_Control(int16_t item_num); +void FlameEmitter_Control(int16_t item_num); void FlameEmitter_Setup(void); diff --git a/src/tr2/game/objects/traps/gondola.c b/src/tr2/game/objects/traps/gondola.c index cfa6140b1..a3a9000e7 100644 --- a/src/tr2/game/objects/traps/gondola.c +++ b/src/tr2/game/objects/traps/gondola.c @@ -6,7 +6,7 @@ #define GONDOLA_SINK_SPEED 50 -void __cdecl Gondola_Control(const int16_t item_num) +void Gondola_Control(const int16_t item_num) { ITEM *const gondola = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/gondola.h b/src/tr2/game/objects/traps/gondola.h index 03d9f3ce3..0c1f1548b 100644 --- a/src/tr2/game/objects/traps/gondola.h +++ b/src/tr2/game/objects/traps/gondola.h @@ -10,5 +10,5 @@ typedef enum { GONDOLA_STATE_LAND = 4, } GONDOLA_STATE; -void __cdecl Gondola_Control(int16_t item_num); +void Gondola_Control(int16_t item_num); void Gondola_Setup(void); diff --git a/src/tr2/game/objects/traps/hook.c b/src/tr2/game/objects/traps/hook.c index 38fa6fbc5..1018c5068 100644 --- a/src/tr2/game/objects/traps/hook.c +++ b/src/tr2/game/objects/traps/hook.c @@ -10,7 +10,7 @@ #define HOOK_DAMAGE 50 -void __cdecl Hook_Control(const int16_t item_num) +void Hook_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/hook.h b/src/tr2/game/objects/traps/hook.h index 4a31733f9..9693fc798 100644 --- a/src/tr2/game/objects/traps/hook.h +++ b/src/tr2/game/objects/traps/hook.h @@ -4,4 +4,4 @@ void Hook_Setup(void); -void __cdecl Hook_Control(int16_t item_num); +void Hook_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/icicle.c b/src/tr2/game/objects/traps/icicle.c index 7d1d79b46..ac38a9256 100644 --- a/src/tr2/game/objects/traps/icicle.c +++ b/src/tr2/game/objects/traps/icicle.c @@ -16,7 +16,7 @@ typedef enum { // clang-format on } ICICLE_STATE; -void __cdecl Icicle_Control(const int16_t item_num) +void Icicle_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/icicle.h b/src/tr2/game/objects/traps/icicle.h index eb67d4aa4..af537fa15 100644 --- a/src/tr2/game/objects/traps/icicle.h +++ b/src/tr2/game/objects/traps/icicle.h @@ -3,4 +3,4 @@ #include void Icicle_Setup(void); -void __cdecl Icicle_Control(int16_t item_num); +void Icicle_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/killer_statue.c b/src/tr2/game/objects/traps/killer_statue.c index fc0a1ae3a..66c301942 100644 --- a/src/tr2/game/objects/traps/killer_statue.c +++ b/src/tr2/game/objects/traps/killer_statue.c @@ -30,7 +30,7 @@ typedef enum { // clang-format on } KILLER_STATUE_ANIM; -void __cdecl KillerStatue_Initialise(const int16_t item_num) +void KillerStatue_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const OBJECT *const obj = Object_GetObject(item->object_id); @@ -39,7 +39,7 @@ void __cdecl KillerStatue_Initialise(const int16_t item_num) item->current_anim_state = KILLER_STATUE_STATE_STOP; } -void __cdecl KillerStatue_Control(const int16_t item_num) +void KillerStatue_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/killer_statue.h b/src/tr2/game/objects/traps/killer_statue.h index e9cf72d06..449ccdb81 100644 --- a/src/tr2/game/objects/traps/killer_statue.h +++ b/src/tr2/game/objects/traps/killer_statue.h @@ -3,5 +3,5 @@ #include void KillerStatue_Setup(void); -void __cdecl KillerStatue_Initialise(int16_t item_num); -void __cdecl KillerStatue_Control(int16_t item_num); +void KillerStatue_Initialise(int16_t item_num); +void KillerStatue_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/mine.c b/src/tr2/game/objects/traps/mine.c index bc799c250..a25caa589 100644 --- a/src/tr2/game/objects/traps/mine.c +++ b/src/tr2/game/objects/traps/mine.c @@ -79,7 +79,7 @@ static void M_Explode(ITEM *const mine_item) mine_item->collidable = 0; } -void __cdecl Mine_Control(const int16_t item_num) +void Mine_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); if (item->flags & IF_ONE_SHOT) { diff --git a/src/tr2/game/objects/traps/mine.h b/src/tr2/game/objects/traps/mine.h index 91e3e1f49..7464f789f 100644 --- a/src/tr2/game/objects/traps/mine.h +++ b/src/tr2/game/objects/traps/mine.h @@ -2,5 +2,5 @@ #include "global/types.h" -void __cdecl Mine_Control(int16_t item_num); +void Mine_Control(int16_t item_num); void Mine_Setup(void); diff --git a/src/tr2/game/objects/traps/pendulum.c b/src/tr2/game/objects/traps/pendulum.c index 7a2c9ed1b..b0714882a 100644 --- a/src/tr2/game/objects/traps/pendulum.c +++ b/src/tr2/game/objects/traps/pendulum.c @@ -10,7 +10,7 @@ #define PENDULUM_DAMAGE 50 -void __cdecl Pendulum_Control(const int16_t item_num) +void Pendulum_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/pendulum.h b/src/tr2/game/objects/traps/pendulum.h index 4b9d0d906..6bfed6e6f 100644 --- a/src/tr2/game/objects/traps/pendulum.h +++ b/src/tr2/game/objects/traps/pendulum.h @@ -3,4 +3,4 @@ #include "game/objects/common.h" void Pendulum_Setup(OBJECT *obj); -void __cdecl Pendulum_Control(int16_t item_num); +void Pendulum_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/propeller.c b/src/tr2/game/objects/traps/propeller.c index 640dc89aa..b97821cac 100644 --- a/src/tr2/game/objects/traps/propeller.c +++ b/src/tr2/game/objects/traps/propeller.c @@ -17,7 +17,7 @@ typedef enum { // clang-format on } PROPELLER_STATE; -void __cdecl Propeller_Control(const int16_t item_num) +void Propeller_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/propeller.h b/src/tr2/game/objects/traps/propeller.h index 7808d7049..f53d4a0e2 100644 --- a/src/tr2/game/objects/traps/propeller.h +++ b/src/tr2/game/objects/traps/propeller.h @@ -3,4 +3,4 @@ #include "game/objects/common.h" void Propeller_Setup(OBJECT *obj, bool is_underwater); -void __cdecl Propeller_Control(int16_t item_num); +void Propeller_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/rolling_ball.c b/src/tr2/game/objects/traps/rolling_ball.c index d50ff5e1b..40823256b 100644 --- a/src/tr2/game/objects/traps/rolling_ball.c +++ b/src/tr2/game/objects/traps/rolling_ball.c @@ -17,7 +17,7 @@ #define ROLLING_BALL_DAMAGE_AIR 100 #define ROLL_SHAKE_RANGE (WALL_L * 10) // = 10240 -void __cdecl RollingBall_Initialise(const int16_t item_num) +void RollingBall_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); @@ -31,7 +31,7 @@ void __cdecl RollingBall_Initialise(const int16_t item_num) item->data = data; } -void __cdecl RollingBall_Control(const int16_t item_num) +void RollingBall_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); @@ -140,7 +140,7 @@ void __cdecl RollingBall_Control(const int16_t item_num) } } -void __cdecl RollingBall_Collision( +void RollingBall_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/rolling_ball.h b/src/tr2/game/objects/traps/rolling_ball.h index 7430ee806..d72c05055 100644 --- a/src/tr2/game/objects/traps/rolling_ball.h +++ b/src/tr2/game/objects/traps/rolling_ball.h @@ -2,8 +2,7 @@ #include "global/types.h" -void __cdecl RollingBall_Initialise(int16_t item_num); -void __cdecl RollingBall_Control(int16_t item_num); -void __cdecl RollingBall_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void RollingBall_Initialise(int16_t item_num); +void RollingBall_Control(int16_t item_num); +void RollingBall_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); void RollingBall_Setup(OBJECT *obj); diff --git a/src/tr2/game/objects/traps/spike_ceiling.c b/src/tr2/game/objects/traps/spike_ceiling.c index 2f7f3ec20..af7e4e353 100644 --- a/src/tr2/game/objects/traps/spike_ceiling.c +++ b/src/tr2/game/objects/traps/spike_ceiling.c @@ -44,7 +44,7 @@ static void M_HitLara(ITEM *const item) Sound_Effect(SFX_LARA_FLESH_WOUND, &item->pos, SPM_NORMAL); } -void __cdecl SpikeCeiling_Control(const int16_t item_num) +void SpikeCeiling_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/spike_ceiling.h b/src/tr2/game/objects/traps/spike_ceiling.h index ea011481a..693561242 100644 --- a/src/tr2/game/objects/traps/spike_ceiling.h +++ b/src/tr2/game/objects/traps/spike_ceiling.h @@ -2,5 +2,5 @@ #include "global/types.h" -void __cdecl SpikeCeiling_Control(int16_t item_num); +void SpikeCeiling_Control(int16_t item_num); void SpikeCeiling_Setup(void); diff --git a/src/tr2/game/objects/traps/spike_wall.c b/src/tr2/game/objects/traps/spike_wall.c index ee7f9d91d..f7eae5044 100644 --- a/src/tr2/game/objects/traps/spike_wall.c +++ b/src/tr2/game/objects/traps/spike_wall.c @@ -51,7 +51,7 @@ static void M_HitLara(ITEM *const item) Sound_Effect(SFX_LARA_FLESH_WOUND, &item->pos, SPM_NORMAL); } -void __cdecl SpikeWall_Control(const int16_t item_num) +void SpikeWall_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/spike_wall.h b/src/tr2/game/objects/traps/spike_wall.h index 9f2acb0e1..762329c9b 100644 --- a/src/tr2/game/objects/traps/spike_wall.h +++ b/src/tr2/game/objects/traps/spike_wall.h @@ -2,5 +2,5 @@ #include "global/types.h" -void __cdecl SpikeWall_Control(int16_t item_num); +void SpikeWall_Control(int16_t item_num); void SpikeWall_Setup(void); diff --git a/src/tr2/game/objects/traps/spikes.c b/src/tr2/game/objects/traps/spikes.c index aa39626bc..b5e04e105 100644 --- a/src/tr2/game/objects/traps/spikes.c +++ b/src/tr2/game/objects/traps/spikes.c @@ -8,7 +8,7 @@ #define SPIKE_DAMAGE 15 -void __cdecl Spikes_Collision( +void Spikes_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/spikes.h b/src/tr2/game/objects/traps/spikes.h index bc3c8212b..fed75d1e7 100644 --- a/src/tr2/game/objects/traps/spikes.h +++ b/src/tr2/game/objects/traps/spikes.h @@ -3,5 +3,4 @@ #include "global/types.h" void Spikes_Setup(void); -void __cdecl Spikes_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void Spikes_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); diff --git a/src/tr2/game/objects/traps/spinning_blade.c b/src/tr2/game/objects/traps/spinning_blade.c index 56fa3f7fa..f4a591a31 100644 --- a/src/tr2/game/objects/traps/spinning_blade.c +++ b/src/tr2/game/objects/traps/spinning_blade.c @@ -30,7 +30,7 @@ typedef enum { // clang-format on } SPINNING_BLADE_ANIM; -void __cdecl M_Initialise(const int16_t item_num) +void M_Initialise(const int16_t item_num) { ITEM *const item = Item_Get(item_num); const OBJECT *const obj = Object_GetObject(item->object_id); @@ -39,7 +39,7 @@ void __cdecl M_Initialise(const int16_t item_num) item->current_anim_state = SPINNING_BLADE_STATE_STOP; } -void __cdecl SpinningBlade_Control(const int16_t item_num) +void SpinningBlade_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); bool spinning = false; diff --git a/src/tr2/game/objects/traps/spinning_blade.h b/src/tr2/game/objects/traps/spinning_blade.h index 56257748a..e7ea70bbd 100644 --- a/src/tr2/game/objects/traps/spinning_blade.h +++ b/src/tr2/game/objects/traps/spinning_blade.h @@ -3,4 +3,4 @@ #include void SpinningBlade_Setup(void); -void __cdecl SpinningBlade_Control(int16_t item_num); +void SpinningBlade_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/springboard.c b/src/tr2/game/objects/traps/springboard.c index b999086a2..1d7e7d8f5 100644 --- a/src/tr2/game/objects/traps/springboard.c +++ b/src/tr2/game/objects/traps/springboard.c @@ -15,7 +15,7 @@ typedef enum { // clang-format on } SPRINGBOARD_STATE; -void __cdecl Springboard_Control(const int16_t item_num) +void Springboard_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); ITEM *const lara_item = Lara_GetItem(); diff --git a/src/tr2/game/objects/traps/springboard.h b/src/tr2/game/objects/traps/springboard.h index 19dcdfb70..3e8347898 100644 --- a/src/tr2/game/objects/traps/springboard.h +++ b/src/tr2/game/objects/traps/springboard.h @@ -3,4 +3,4 @@ #include void Springboard_Setup(void); -void __cdecl Springboard_Control(int16_t item_num); +void Springboard_Control(int16_t item_num); diff --git a/src/tr2/game/objects/traps/teeth_trap.c b/src/tr2/game/objects/traps/teeth_trap.c index 0330057e6..fd774dae1 100644 --- a/src/tr2/game/objects/traps/teeth_trap.c +++ b/src/tr2/game/objects/traps/teeth_trap.c @@ -24,14 +24,14 @@ static const BITE m_Teeth[6] = { // clang-format on }; -void __cdecl TeethTrap_Bite(ITEM *const item, const BITE *const bite) +void TeethTrap_Bite(ITEM *const item, const BITE *const bite) { XYZ_32 pos = bite->pos; Collide_GetJointAbsPosition(item, &pos, bite->mesh_num); Spawn_Blood(pos.x, pos.y, pos.z, item->speed, item->rot.y, item->room_num); } -void __cdecl TeethTrap_Control(const int16_t item_num) +void TeethTrap_Control(const int16_t item_num) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/traps/teeth_trap.h b/src/tr2/game/objects/traps/teeth_trap.h index 49ce2df68..8f27e00ae 100644 --- a/src/tr2/game/objects/traps/teeth_trap.h +++ b/src/tr2/game/objects/traps/teeth_trap.h @@ -3,5 +3,5 @@ #include "global/types.h" void TeethTrap_Setup(void); -void __cdecl TeethTrap_Bite(ITEM *item, const BITE *bite); -void __cdecl TeethTrap_Control(int16_t item_num); +void TeethTrap_Bite(ITEM *item, const BITE *bite); +void TeethTrap_Control(int16_t item_num); diff --git a/src/tr2/game/objects/vehicles/boat.c b/src/tr2/game/objects/vehicles/boat.c index a9d127c30..9baf183d3 100644 --- a/src/tr2/game/objects/vehicles/boat.c +++ b/src/tr2/game/objects/vehicles/boat.c @@ -57,7 +57,7 @@ typedef enum { BOAT_STATE_DEATH = 8, } BOAT_STATE; -void __cdecl Boat_Initialise(const int16_t item_num) +void Boat_Initialise(const int16_t item_num) { BOAT_INFO *boat_data = GameBuf_Alloc(sizeof(BOAT_INFO), GBUF_TEMP_ALLOC); boat_data->boat_turn = 0; @@ -83,8 +83,7 @@ void Boat_Setup(void) obj->save_anim = 1; } -int32_t __cdecl Boat_CheckGetOn( - const int16_t item_num, const COLL_INFO *const coll) +int32_t Boat_CheckGetOn(const int16_t item_num, const COLL_INFO *const coll) { if (g_Lara.gun_status != LGS_ARMLESS) { return 0; @@ -145,7 +144,7 @@ int32_t __cdecl Boat_CheckGetOn( return get_on; } -void __cdecl Boat_Collision( +void Boat_Collision( const int16_t item_num, ITEM *const lara, COLL_INFO *const coll) { if (lara->hit_points < 0 || g_Lara.skidoo != NO_ITEM) { @@ -205,7 +204,7 @@ void __cdecl Boat_Collision( } } -int32_t __cdecl Boat_TestWaterHeight( +int32_t Boat_TestWaterHeight( const ITEM *const item, const int32_t z_off, const int32_t x_off, XYZ_32 *const pos) { @@ -235,7 +234,7 @@ int32_t __cdecl Boat_TestWaterHeight( return height - 5; } -void __cdecl Boat_DoShift(const int32_t boat_num) +void Boat_DoShift(const int32_t boat_num) { ITEM *const boat = &g_Items[boat_num]; int16_t item_num = g_Rooms[boat->room_num].item_num; @@ -281,7 +280,7 @@ void __cdecl Boat_DoShift(const int32_t boat_num) } } -void __cdecl Boat_DoWakeEffect(const ITEM *const boat) +void Boat_DoWakeEffect(const ITEM *const boat) { g_MatrixPtr->_23 = 0; Output_CalculateLight( @@ -324,7 +323,7 @@ void __cdecl Boat_DoWakeEffect(const ITEM *const boat) } } -int32_t __cdecl Boat_DoDynamics( +int32_t Boat_DoDynamics( const int32_t height, int32_t fall_speed, int32_t *const y) { if (height > *y) { @@ -344,7 +343,7 @@ int32_t __cdecl Boat_DoDynamics( return fall_speed; } -int32_t __cdecl Boat_Dynamics(const int16_t boat_num) +int32_t Boat_Dynamics(const int16_t boat_num) { ITEM *const boat = &g_Items[boat_num]; BOAT_INFO *const boat_data = (BOAT_INFO *)boat->data; @@ -484,7 +483,7 @@ int32_t __cdecl Boat_Dynamics(const int16_t boat_num) return collide; } -int32_t __cdecl Boat_UserControl(ITEM *const boat) +int32_t Boat_UserControl(ITEM *const boat) { int32_t no_turn = 1; @@ -555,7 +554,7 @@ int32_t __cdecl Boat_UserControl(ITEM *const boat) return no_turn; } -void __cdecl Boat_Animation(const ITEM *const boat, const int32_t collide) +void Boat_Animation(const ITEM *const boat, const int32_t collide) { ITEM *const lara = g_LaraItem; const BOAT_INFO *const boat_data = (const BOAT_INFO *)boat->data; @@ -626,7 +625,7 @@ void __cdecl Boat_Animation(const ITEM *const boat, const int32_t collide) } } -void __cdecl Boat_Control(const int16_t item_num) +void Boat_Control(const int16_t item_num) { ITEM *const lara = g_LaraItem; ITEM *const boat = &g_Items[item_num]; diff --git a/src/tr2/game/objects/vehicles/boat.h b/src/tr2/game/objects/vehicles/boat.h index c41377b55..dddc027fb 100644 --- a/src/tr2/game/objects/vehicles/boat.h +++ b/src/tr2/game/objects/vehicles/boat.h @@ -4,16 +4,16 @@ #include -void __cdecl Boat_Initialise(int16_t item_num); +void Boat_Initialise(int16_t item_num); void Boat_Setup(void); -int32_t __cdecl Boat_CheckGetOn(int16_t item_num, const COLL_INFO *coll); -void __cdecl Boat_Collision(int16_t item_num, ITEM *lara, COLL_INFO *coll); -int32_t __cdecl Boat_TestWaterHeight( +int32_t Boat_CheckGetOn(int16_t item_num, const COLL_INFO *coll); +void Boat_Collision(int16_t item_num, ITEM *lara, COLL_INFO *coll); +int32_t Boat_TestWaterHeight( const ITEM *item, int32_t z_off, int32_t x_off, XYZ_32 *pos); -void __cdecl Boat_DoShift(int32_t boat_num); -void __cdecl Boat_DoWakeEffect(const ITEM *boat); -int32_t __cdecl Boat_DoDynamics(int32_t height, int32_t fall_speed, int32_t *y); -int32_t __cdecl Boat_Dynamics(int16_t boat_num); -int32_t __cdecl Boat_UserControl(ITEM *boat); -void __cdecl Boat_Animation(const ITEM *boat, int32_t collide); -void __cdecl Boat_Control(int16_t item_num); +void Boat_DoShift(int32_t boat_num); +void Boat_DoWakeEffect(const ITEM *boat); +int32_t Boat_DoDynamics(int32_t height, int32_t fall_speed, int32_t *y); +int32_t Boat_Dynamics(int16_t boat_num); +int32_t Boat_UserControl(ITEM *boat); +void Boat_Animation(const ITEM *boat, int32_t collide); +void Boat_Control(int16_t item_num); diff --git a/src/tr2/game/objects/vehicles/skidoo_armed.c b/src/tr2/game/objects/vehicles/skidoo_armed.c index 55728b112..fd7ec2e04 100644 --- a/src/tr2/game/objects/vehicles/skidoo_armed.c +++ b/src/tr2/game/objects/vehicles/skidoo_armed.c @@ -31,7 +31,7 @@ void SkidooArmed_Setup(void) obj->save_anim = 1; } -void __cdecl SkidooArmed_Push( +void SkidooArmed_Push( const ITEM *const item, ITEM *const lara_item, const int32_t radius) { const int32_t dx = lara_item->pos.x - item->pos.x; @@ -73,7 +73,7 @@ void __cdecl SkidooArmed_Push( lara_item->pos.z = item->pos.z + ((rz * cy - rx * sy) >> W2V_SHIFT); } -void __cdecl SkidooArmed_Collision( +void SkidooArmed_Collision( const int16_t item_num, ITEM *const lara_item, COLL_INFO *const coll) { ITEM *const item = Item_Get(item_num); diff --git a/src/tr2/game/objects/vehicles/skidoo_armed.h b/src/tr2/game/objects/vehicles/skidoo_armed.h index 5a55efcdb..c5ba004fd 100644 --- a/src/tr2/game/objects/vehicles/skidoo_armed.h +++ b/src/tr2/game/objects/vehicles/skidoo_armed.h @@ -4,8 +4,6 @@ void SkidooArmed_Setup(void); -void __cdecl SkidooArmed_Push( - const ITEM *item, ITEM *lara_item, int32_t radius); +void SkidooArmed_Push(const ITEM *item, ITEM *lara_item, int32_t radius); -void __cdecl SkidooArmed_Collision( - int16_t item_num, ITEM *lara_item, COLL_INFO *coll); +void SkidooArmed_Collision(int16_t item_num, ITEM *lara_item, COLL_INFO *coll); diff --git a/src/tr2/game/output.c b/src/tr2/game/output.c index 86c76c402..9ba1fa0cf 100644 --- a/src/tr2/game/output.c +++ b/src/tr2/game/output.c @@ -100,7 +100,7 @@ static const int16_t *M_CalcRoomVerticesWibble(const int16_t *obj_ptr) return obj_ptr; } -void __cdecl Output_InsertPolygons(const int16_t *obj_ptr, const int32_t clip) +void Output_InsertPolygons(const int16_t *obj_ptr, const int32_t clip) { g_FltWinLeft = 0.0f; g_FltWinTop = 0.0f; @@ -119,8 +119,7 @@ void __cdecl Output_InsertPolygons(const int16_t *obj_ptr, const int32_t clip) } } -void __cdecl Output_InsertPolygons_I( - const int16_t *const ptr, const int32_t clip) +void Output_InsertPolygons_I(const int16_t *const ptr, const int32_t clip) { Matrix_Push(); Matrix_Interpolate(); @@ -128,7 +127,7 @@ void __cdecl Output_InsertPolygons_I( Matrix_Pop(); } -void __cdecl Output_InsertRoom(const int16_t *obj_ptr, int32_t is_outside) +void Output_InsertRoom(const int16_t *obj_ptr, int32_t is_outside) { g_FltWinLeft = g_PhdWinLeft; g_FltWinTop = g_PhdWinTop; @@ -156,7 +155,7 @@ void __cdecl Output_InsertRoom(const int16_t *obj_ptr, int32_t is_outside) Output_InsertRoomSprite(obj_ptr + 1, *obj_ptr); } -void __cdecl Output_InsertSkybox(const int16_t *obj_ptr) +void Output_InsertSkybox(const int16_t *obj_ptr) { g_FltWinLeft = g_PhdWinLeft; g_FltWinTop = g_PhdWinTop; @@ -177,7 +176,7 @@ void __cdecl Output_InsertSkybox(const int16_t *obj_ptr) } } -const int16_t *__cdecl Output_CalcObjectVertices(const int16_t *obj_ptr) +const int16_t *Output_CalcObjectVertices(const int16_t *obj_ptr) { const double base_z = g_Config.rendering.enable_zbuffer ? 0.0 @@ -253,7 +252,7 @@ const int16_t *__cdecl Output_CalcObjectVertices(const int16_t *obj_ptr) return total_clip == 0 ? obj_ptr : 0; } -const int16_t *__cdecl Output_CalcSkyboxLight(const int16_t *obj_ptr) +const int16_t *Output_CalcSkyboxLight(const int16_t *obj_ptr) { int32_t count = *obj_ptr++; if (count > 0) { @@ -270,7 +269,7 @@ const int16_t *__cdecl Output_CalcSkyboxLight(const int16_t *obj_ptr) return obj_ptr; } -const int16_t *__cdecl Output_CalcVerticeLight(const int16_t *obj_ptr) +const int16_t *Output_CalcVerticeLight(const int16_t *obj_ptr) { int32_t vtx_count = *obj_ptr++; @@ -323,8 +322,7 @@ const int16_t *__cdecl Output_CalcVerticeLight(const int16_t *obj_ptr) return obj_ptr; } -const int16_t *__cdecl Output_CalcRoomVertices( - const int16_t *obj_ptr, int32_t far_clip) +const int16_t *Output_CalcRoomVertices(const int16_t *obj_ptr, int32_t far_clip) { const double base_z = g_Config.rendering.enable_zbuffer ? 0.0 @@ -418,7 +416,7 @@ const int16_t *__cdecl Output_CalcRoomVertices( return obj_ptr; } -void __cdecl Output_RotateLight(int16_t pitch, int16_t yaw) +void Output_RotateLight(int16_t pitch, int16_t yaw) { g_LsYaw = yaw; g_LsPitch = pitch; @@ -438,12 +436,12 @@ void __cdecl Output_RotateLight(int16_t pitch, int16_t yaw) g_LsVectorView.z = (m->_20 * x + m->_21 * y + m->_22 * z) >> W2V_SHIFT; } -void __cdecl Output_AlterFOV(int16_t fov) +void Output_AlterFOV(int16_t fov) { Viewport_AlterFOV(fov); } -const int16_t *__cdecl Output_InsertRoomSprite( +const int16_t *Output_InsertRoomSprite( const int16_t *obj_ptr, const int32_t vtx_count) { for (int32_t i = 0; i < vtx_count; i++) { @@ -472,7 +470,7 @@ const int16_t *__cdecl Output_InsertRoomSprite( return obj_ptr; } -void __cdecl Output_DrawSprite( +void Output_DrawSprite( const uint32_t flags, int32_t x, int32_t y, int32_t z, const int16_t sprite_idx, int16_t shade, const int16_t scale) { @@ -568,7 +566,7 @@ void __cdecl Output_DrawSprite( Render_InsertSprite(zv, x0, y0, x1, y1, sprite_idx, shade); } -void __cdecl Output_DrawPickup( +void Output_DrawPickup( const int32_t sx, const int32_t sy, const int32_t scale, const int16_t sprite_idx, const int16_t shade) { @@ -582,7 +580,7 @@ void __cdecl Output_DrawPickup( } } -void __cdecl Output_DrawScreenSprite2D( +void Output_DrawScreenSprite2D( const int32_t sx, const int32_t sy, const int32_t sz, const int32_t scale_h, const int32_t scale_v, const int16_t sprite_idx, const int16_t shade, const uint16_t flags) @@ -598,7 +596,7 @@ void __cdecl Output_DrawScreenSprite2D( } } -void __cdecl Output_DrawScreenSprite( +void Output_DrawScreenSprite( const int32_t sx, const int32_t sy, const int32_t sz, const int32_t scale_h, const int32_t scale_v, const int16_t sprite_idx, const int16_t shade, const uint16_t flags) @@ -614,7 +612,7 @@ void __cdecl Output_DrawScreenSprite( } } -bool __cdecl Output_MakeScreenshot(const char *const path) +bool Output_MakeScreenshot(const char *const path) { LOG_INFO("Taking screenshot"); GFX_Context_ScheduleScreenshot(path); @@ -737,13 +735,13 @@ void Output_DrawScreenFBox( Render_InsertTransQuad(sx, sy, width + 1, height + 1, g_PhdNearZ + 8 * z); } -void __cdecl Output_DrawHealthBar(const int32_t percent) +void Output_DrawHealthBar(const int32_t percent) { g_IsShadeEffect = false; M_InsertBar(6, 6, 105, 9, percent, INV_COLOR_RED, INV_COLOR_ORANGE); } -void __cdecl Output_DrawAirBar(const int32_t percent) +void Output_DrawAirBar(const int32_t percent) { g_IsShadeEffect = false; M_InsertBar( @@ -770,7 +768,7 @@ int16_t Output_FindColor( return best_idx; } -void __cdecl Output_DoAnimateTextures(const int32_t ticks) +void Output_DoAnimateTextures(const int32_t ticks) { m_TickComp += ticks; while (m_TickComp > TICKS_PER_FRAME * 5) { @@ -788,7 +786,7 @@ void __cdecl Output_DoAnimateTextures(const int32_t ticks) } } -void __cdecl Output_InsertShadow( +void Output_InsertShadow( int16_t radius, const BOUNDS_16 *bounds, const ITEM *item) { const int32_t x1 = bounds->min_x; @@ -835,7 +833,7 @@ void __cdecl Output_InsertShadow( Matrix_Pop(); } -void __cdecl Output_CalculateWibbleTable(void) +void Output_CalculateWibbleTable(void) { for (int32_t i = 0; i < WIBBLE_SIZE; i++) { const int32_t sine = Math_Sin(i * PHD_360 / WIBBLE_SIZE); @@ -849,7 +847,7 @@ void __cdecl Output_CalculateWibbleTable(void) } } -int32_t __cdecl Output_GetObjectBounds(const BOUNDS_16 *const bounds) +int32_t Output_GetObjectBounds(const BOUNDS_16 *const bounds) { const MATRIX *const m = g_MatrixPtr; if (m->_23 >= g_PhdFarZ) { @@ -915,7 +913,7 @@ int32_t __cdecl Output_GetObjectBounds(const BOUNDS_16 *const bounds) return 1; } -void __cdecl Output_CalculateLight( +void Output_CalculateLight( const int32_t x, const int32_t y, const int32_t z, const int16_t room_num) { const ROOM *const r = &g_Rooms[room_num]; @@ -1010,7 +1008,7 @@ void __cdecl Output_CalculateLight( CLAMPG(g_LsAdder, 0x1FFF); } -void __cdecl Output_CalculateStaticLight(const int16_t adder) +void Output_CalculateStaticLight(const int16_t adder) { g_LsAdder = adder - 0x1000; const int32_t depth = g_MatrixPtr->_23 >> W2V_SHIFT; @@ -1018,7 +1016,7 @@ void __cdecl Output_CalculateStaticLight(const int16_t adder) CLAMPG(g_LsAdder, 0x1FFF); } -void __cdecl Output_CalculateStaticMeshLight( +void Output_CalculateStaticMeshLight( const int32_t x, const int32_t y, const int32_t z, const int32_t shade_1, const int32_t shade_2, const ROOM *const room) { @@ -1055,7 +1053,7 @@ void __cdecl Output_CalculateStaticMeshLight( Output_CalculateStaticLight(adder); } -void __cdecl Output_CalculateObjectLighting( +void Output_CalculateObjectLighting( const ITEM *const item, const BOUNDS_16 *const bounds) { if (item->shade_1 >= 0) { @@ -1083,7 +1081,7 @@ void __cdecl Output_CalculateObjectLighting( Output_CalculateLight(pos.x, pos.y, pos.z, item->room_num); } -void __cdecl Output_LightRoom(ROOM *const room) +void Output_LightRoom(ROOM *const room) { if (room->light_mode != 0) { const ROOM_LIGHT_TABLE *const light_table = @@ -1151,7 +1149,7 @@ void __cdecl Output_LightRoom(ROOM *const room) } } -void __cdecl Output_SetupBelowWater(const bool is_underwater) +void Output_SetupBelowWater(const bool is_underwater) { g_IsWet = is_underwater; Render_SetWet(is_underwater); @@ -1160,14 +1158,14 @@ void __cdecl Output_SetupBelowWater(const bool is_underwater) g_IsShadeEffect = true; } -void __cdecl Output_SetupAboveWater(const bool is_underwater) +void Output_SetupAboveWater(const bool is_underwater) { g_IsWibbleEffect = is_underwater; g_IsWaterEffect = false; g_IsShadeEffect = is_underwater; } -void __cdecl Output_AnimateTextures(const int32_t ticks) +void Output_AnimateTextures(const int32_t ticks) { g_WibbleOffset = (g_WibbleOffset + (ticks / TICKS_PER_FRAME)) % WIBBLE_SIZE; g_RoomLightShades[1] = Random_GetDraw() % WIBBLE_SIZE; @@ -1185,7 +1183,7 @@ void __cdecl Output_AnimateTextures(const int32_t ticks) Output_DoAnimateTextures(ticks); } -void __cdecl Output_AddDynamicLight( +void Output_AddDynamicLight( const int32_t x, const int32_t y, const int32_t z, const int32_t intensity, const int32_t falloff) { diff --git a/src/tr2/game/output.h b/src/tr2/game/output.h index 22cf6adda..a5fb2a1e7 100644 --- a/src/tr2/game/output.h +++ b/src/tr2/game/output.h @@ -14,53 +14,53 @@ typedef struct { float g; } VERTEX_INFO; -void __cdecl Output_InsertPolygons(const int16_t *obj_ptr, int32_t clip); -void __cdecl Output_InsertPolygons_I(const int16_t *ptr, int32_t clip); -void __cdecl Output_InsertRoom(const int16_t *obj_ptr, int32_t is_outside); -void __cdecl Output_InsertSkybox(const int16_t *obj_ptr); -const int16_t *__cdecl Output_CalcObjectVertices(const int16_t *obj_ptr); -const int16_t *__cdecl Output_CalcSkyboxLight(const int16_t *obj_ptr); -const int16_t *__cdecl Output_CalcVerticeLight(const int16_t *obj_ptr); -const int16_t *__cdecl Output_CalcRoomVertices( +void Output_InsertPolygons(const int16_t *obj_ptr, int32_t clip); +void Output_InsertPolygons_I(const int16_t *ptr, int32_t clip); +void Output_InsertRoom(const int16_t *obj_ptr, int32_t is_outside); +void Output_InsertSkybox(const int16_t *obj_ptr); +const int16_t *Output_CalcObjectVertices(const int16_t *obj_ptr); +const int16_t *Output_CalcSkyboxLight(const int16_t *obj_ptr); +const int16_t *Output_CalcVerticeLight(const int16_t *obj_ptr); +const int16_t *Output_CalcRoomVertices( const int16_t *obj_ptr, int32_t far_clip); -void __cdecl Output_RotateLight(int16_t pitch, int16_t yaw); -void __cdecl Output_AlterFOV(int16_t fov); +void Output_RotateLight(int16_t pitch, int16_t yaw); +void Output_AlterFOV(int16_t fov); -const int16_t *__cdecl Output_InsertRoomSprite( +const int16_t *Output_InsertRoomSprite( const int16_t *obj_ptr, int32_t vtx_count); -void __cdecl Output_InsertClippedPoly_Textured( +void Output_InsertClippedPoly_Textured( int32_t vtx_count, float z, int16_t poly_type, int16_t tex_page); -void __cdecl Output_InsertPoly_Gouraud( +void Output_InsertPoly_Gouraud( int32_t vtx_count, float z, int32_t red, int32_t green, int32_t blue, int16_t poly_type); -void __cdecl Output_DrawClippedPoly_Textured(int32_t vtx_count); +void Output_DrawClippedPoly_Textured(int32_t vtx_count); -void __cdecl Output_DrawPoly_Gouraud( +void Output_DrawPoly_Gouraud( int32_t vtx_count, int32_t red, int32_t green, int32_t blue); -void __cdecl Output_DrawSprite( +void Output_DrawSprite( uint32_t flags, int32_t x, int32_t y, int32_t z, int16_t sprite_idx, int16_t shade, int16_t scale); -void __cdecl Output_DrawPickup( +void Output_DrawPickup( int32_t sx, int32_t sy, int32_t scale, int16_t sprite_idx, int16_t shade); -void __cdecl Output_DrawScreenSprite2D( +void Output_DrawScreenSprite2D( int32_t sx, int32_t sy, int32_t sz, int32_t scale_h, int32_t scale_v, int16_t sprite_idx, int16_t shade, uint16_t flags); -void __cdecl Output_DrawScreenSprite( +void Output_DrawScreenSprite( int32_t sx, int32_t sy, int32_t sz, int32_t scale_h, int32_t scale_v, int16_t sprite_idx, int16_t shade, uint16_t flags); -void __cdecl Output_DrawScaledSpriteC(const int16_t *obj_ptr); +void Output_DrawScaledSpriteC(const int16_t *obj_ptr); void Output_ClearDepthBuffer(void); -bool __cdecl Output_MakeScreenshot(const char *path); +bool Output_MakeScreenshot(const char *path); void Output_InsertBackPolygon(int32_t x0, int32_t y0, int32_t x1, int32_t y1); @@ -80,8 +80,8 @@ void Output_DrawScreenFBox( int32_t sx, int32_t sy, int32_t z, int32_t width, int32_t height, uint8_t color_idx, const void *gour, uint16_t flags); -void __cdecl Output_DrawHealthBar(int32_t percent); -void __cdecl Output_DrawAirBar(int32_t percent); +void Output_DrawHealthBar(int32_t percent); +void Output_DrawAirBar(int32_t percent); void Output_LoadBackgroundFromFile(const char *file_name); void Output_LoadBackgroundFromObject(void); @@ -91,24 +91,22 @@ void Output_BeginScene(void); int32_t Output_EndScene(void); int16_t Output_FindColor(int32_t red, int32_t green, int32_t blue); -void __cdecl Output_DoAnimateTextures(int32_t ticks); -void __cdecl Output_InsertShadow( +void Output_DoAnimateTextures(int32_t ticks); +void Output_InsertShadow( int16_t radius, const BOUNDS_16 *bounds, const ITEM *item); -void __cdecl Output_CalculateWibbleTable(void); -int32_t __cdecl Output_GetObjectBounds(const BOUNDS_16 *bounds); -void __cdecl Output_CalculateLight( - int32_t x, int32_t y, int32_t z, int16_t room_num); -void __cdecl Output_CalculateStaticLight(int16_t adder); -void __cdecl Output_CalculateStaticMeshLight( +void Output_CalculateWibbleTable(void); +int32_t Output_GetObjectBounds(const BOUNDS_16 *bounds); +void Output_CalculateLight(int32_t x, int32_t y, int32_t z, int16_t room_num); +void Output_CalculateStaticLight(int16_t adder); +void Output_CalculateStaticMeshLight( int32_t x, int32_t y, int32_t z, int32_t shade_1, int32_t shade_2, const ROOM *room); -void __cdecl Output_CalculateObjectLighting( - const ITEM *item, const BOUNDS_16 *bounds); -void __cdecl Output_LightRoom(ROOM *room); -void __cdecl Output_SetupBelowWater(bool is_underwater); -void __cdecl Output_SetupAboveWater(bool is_underwater); -void __cdecl Output_AnimateTextures(int32_t ticks); - -void __cdecl Output_AddDynamicLight( +void Output_CalculateObjectLighting(const ITEM *item, const BOUNDS_16 *bounds); +void Output_LightRoom(ROOM *room); +void Output_SetupBelowWater(bool is_underwater); +void Output_SetupAboveWater(bool is_underwater); +void Output_AnimateTextures(int32_t ticks); + +void Output_AddDynamicLight( int32_t x, int32_t y, int32_t z, int32_t intensity, int32_t falloff); diff --git a/src/tr2/game/overlay.c b/src/tr2/game/overlay.c index 6e315e09f..32990a5fd 100644 --- a/src/tr2/game/overlay.c +++ b/src/tr2/game/overlay.c @@ -70,7 +70,7 @@ static float M_Ease(const int32_t cur_frame, const int32_t max_frames) return result; } -bool __cdecl Overlay_FlashCounter(const int32_t ticks) +bool Overlay_FlashCounter(const int32_t ticks) { if (m_FlashCounter > 0) { m_FlashCounter -= ticks; @@ -82,7 +82,7 @@ bool __cdecl Overlay_FlashCounter(const int32_t ticks) return m_FlashState; } -void __cdecl Overlay_DrawAssaultTimer(void) +void Overlay_DrawAssaultTimer(void) { if (g_CurrentLevel != 0 || !g_IsAssaultTimerDisplay) { return; @@ -131,7 +131,7 @@ void __cdecl Overlay_DrawAssaultTimer(void) } } -void __cdecl Overlay_DrawGameInfo(const bool pickup_state) +void Overlay_DrawGameInfo(const bool pickup_state) { Overlay_DrawAmmoInfo(); Overlay_DrawModeInfo(); @@ -249,7 +249,7 @@ void Overlay_HideGameInfo(void) g_DisplayModeTextInfo = NULL; } -void __cdecl Overlay_MakeAmmoString(char *const string) +void Overlay_MakeAmmoString(char *const string) { char result[128] = ""; @@ -275,7 +275,7 @@ void __cdecl Overlay_MakeAmmoString(char *const string) strcpy(string, result); } -void __cdecl Overlay_DrawAmmoInfo(void) +void Overlay_DrawAmmoInfo(void) { if (g_Lara.gun_status != LGS_READY || g_OverlayStatus <= 0 || g_SaveGame.bonus_flag) { @@ -325,7 +325,7 @@ void __cdecl Overlay_DrawAmmoInfo(void) } } -void __cdecl Overlay_InitialisePickUpDisplay(void) +void Overlay_InitialisePickUpDisplay(void) { for (int32_t i = 0; i < MAX_PICKUPS; i++) { m_Pickups[i].phase = DPP_DEAD; @@ -455,7 +455,7 @@ static void M_DrawPickupSprite(const DISPLAY_PICKUP *const pickup) Output_DrawPickup(x, y, scale, sprite_num, 4096); } -void __cdecl Overlay_DrawPickups(const bool timed) +void Overlay_DrawPickups(const bool timed) { for (int i = 0; i < MAX_PICKUPS; i++) { const DISPLAY_PICKUP *const pickup = &m_Pickups[i]; @@ -471,7 +471,7 @@ void __cdecl Overlay_DrawPickups(const bool timed) } } -void __cdecl Overlay_AddDisplayPickup(const int16_t object_id) +void Overlay_AddDisplayPickup(const int16_t object_id) { if (object_id == O_SECRET_1 || object_id == O_SECRET_2 || object_id == O_SECRET_3) { @@ -520,7 +520,7 @@ void __cdecl Overlay_AddDisplayPickup(const int16_t object_id) } } -void __cdecl Overlay_DisplayModeInfo(const char *const string) +void Overlay_DisplayModeInfo(const char *const string) { if (string == NULL) { Text_Remove(g_DisplayModeTextInfo); @@ -538,7 +538,7 @@ void __cdecl Overlay_DisplayModeInfo(const char *const string) g_DisplayModeInfoTimer = 2.5 * FRAMES_PER_SECOND; } -void __cdecl Overlay_DrawModeInfo(void) +void Overlay_DrawModeInfo(void) { if (g_DisplayModeTextInfo == NULL) { return; diff --git a/src/tr2/game/overlay.h b/src/tr2/game/overlay.h index 0c06b5328..bc1aacb9b 100644 --- a/src/tr2/game/overlay.h +++ b/src/tr2/game/overlay.h @@ -2,17 +2,17 @@ #include "global/types.h" -void __cdecl Overlay_DrawAssaultTimer(void); -void __cdecl Overlay_DrawGameInfo(bool pickup_state); +void Overlay_DrawAssaultTimer(void); +void Overlay_DrawGameInfo(bool pickup_state); void Overlay_DrawHealthBar(void); void Overlay_DrawAirBar(void); void Overlay_HideGameInfo(void); -void __cdecl Overlay_MakeAmmoString(char *string); -void __cdecl Overlay_DrawAmmoInfo(void); -void __cdecl Overlay_InitialisePickUpDisplay(void); -void __cdecl Overlay_DrawPickups(bool pickup_state); -void __cdecl Overlay_AddDisplayPickup(int16_t object_id); -void __cdecl Overlay_DisplayModeInfo(const char *string); +void Overlay_MakeAmmoString(char *string); +void Overlay_DrawAmmoInfo(void); +void Overlay_InitialisePickUpDisplay(void); +void Overlay_DrawPickups(bool pickup_state); +void Overlay_AddDisplayPickup(int16_t object_id); +void Overlay_DisplayModeInfo(const char *string); -void __cdecl Overlay_DrawModeInfo(void); +void Overlay_DrawModeInfo(void); void Overlay_Animate(int32_t ticks); diff --git a/src/tr2/game/random.c b/src/tr2/game/random.c index 8ca2c5a0a..46cbc5bcc 100644 --- a/src/tr2/game/random.c +++ b/src/tr2/game/random.c @@ -7,29 +7,29 @@ static int32_t m_RandControl = 0xD371F947; static int32_t m_RandDraw = 0xD371F947; -void __cdecl Random_SeedControl(const int32_t seed) +void Random_SeedControl(const int32_t seed) { m_RandControl = seed; } -void __cdecl Random_SeedDraw(const int32_t seed) +void Random_SeedDraw(const int32_t seed) { m_RandDraw = seed; } -int32_t __cdecl Random_GetControl(void) +int32_t Random_GetControl(void) { m_RandControl = 0x41C64E6D * m_RandControl + 12345; return (m_RandControl >> 10) & 0x7FFF; } -int32_t __cdecl Random_GetDraw(void) +int32_t Random_GetDraw(void) { m_RandDraw = 0x41C64E6D * m_RandDraw + 12345; return (m_RandDraw >> 10) & 0x7FFF; } -void __cdecl Random_Seed(void) +void Random_Seed(void) { time_t lt = time(0); struct tm *tptr = localtime(<); diff --git a/src/tr2/game/random.h b/src/tr2/game/random.h index 6674c929a..b209d5321 100644 --- a/src/tr2/game/random.h +++ b/src/tr2/game/random.h @@ -2,8 +2,8 @@ #include -void __cdecl Random_SeedControl(int32_t seed); -void __cdecl Random_SeedDraw(int32_t seed); -int32_t __cdecl Random_GetControl(void); -int32_t __cdecl Random_GetDraw(void); -void __cdecl Random_Seed(void); +void Random_SeedControl(int32_t seed); +void Random_SeedDraw(int32_t seed); +int32_t Random_GetControl(void); +int32_t Random_GetDraw(void); +void Random_Seed(void); diff --git a/src/tr2/game/requester.c b/src/tr2/game/requester.c index 8d422a72a..ebfc08ec8 100644 --- a/src/tr2/game/requester.c +++ b/src/tr2/game/requester.c @@ -34,7 +34,7 @@ static void M_ClearTextStrings(REQUEST_INFO *const req) } } -void __cdecl Requester_Init(REQUEST_INFO *const req) +void Requester_Init(REQUEST_INFO *const req) { M_ClearTextStrings(req); @@ -65,13 +65,13 @@ void __cdecl Requester_Init(REQUEST_INFO *const req) req->render_height = g_PhdWinHeight; } -void __cdecl Requester_Shutdown(REQUEST_INFO *const req) +void Requester_Shutdown(REQUEST_INFO *const req) { M_ClearTextStrings(req); req->ready = 0; } -int32_t __cdecl Requester_Display( +int32_t Requester_Display( REQUEST_INFO *const req, const bool destroy, const bool backgrounds) { int32_t line_qty = req->visible_count; @@ -335,15 +335,14 @@ int32_t __cdecl Requester_Display( return req->selected + 1; } -void __cdecl Requester_RemoveAllItems(REQUEST_INFO *const req) +void Requester_RemoveAllItems(REQUEST_INFO *const req) { req->items_count = 0; req->line_offset = 0; req->selected = 0; } -void __cdecl Requester_Item_CenterAlign( - REQUEST_INFO *const req, TEXTSTRING *const text) +void Requester_Item_CenterAlign(REQUEST_INFO *const req, TEXTSTRING *const text) { if (text == NULL) { return; @@ -352,8 +351,7 @@ void __cdecl Requester_Item_CenterAlign( text->pos.x = req->x_pos; } -void __cdecl Requester_Item_LeftAlign( - REQUEST_INFO *const req, TEXTSTRING *const text) +void Requester_Item_LeftAlign(REQUEST_INFO *const req, TEXTSTRING *const text) { if (text == NULL) { return; @@ -367,8 +365,7 @@ void __cdecl Requester_Item_LeftAlign( text->background.offset.x = x; } -void __cdecl Requester_Item_RightAlign( - REQUEST_INFO *const req, TEXTSTRING *const text) +void Requester_Item_RightAlign(REQUEST_INFO *const req, TEXTSTRING *const text) { if (text == NULL) { return; @@ -382,7 +379,7 @@ void __cdecl Requester_Item_RightAlign( text->background.offset.x = -x; } -void __cdecl Requester_SetHeading( +void Requester_SetHeading( REQUEST_INFO *const req, const char *const text1, const uint32_t flags1, const char *const text2, const uint32_t flags2) { @@ -409,7 +406,7 @@ void __cdecl Requester_SetHeading( } } -void __cdecl Requester_ChangeItem( +void Requester_ChangeItem( REQUEST_INFO *const req, const int32_t item, const char *const text1, const uint32_t flags1, const char *const text2, const uint32_t flags2) { @@ -434,7 +431,7 @@ void __cdecl Requester_ChangeItem( } } -void __cdecl Requester_AddItem( +void Requester_AddItem( REQUEST_INFO *const req, const char *const text1, const uint32_t flags1, const char *const text2, const uint32_t flags2) { @@ -462,7 +459,7 @@ void __cdecl Requester_AddItem( req->items_count++; } -void __cdecl Requester_SetSize( +void Requester_SetSize( REQUEST_INFO *const req, const int32_t max_lines, const int32_t y_pos) { int32_t visible_lines = g_PhdWinHeight / 2 / 18; diff --git a/src/tr2/game/requester.h b/src/tr2/game/requester.h index f431374f6..a26473d22 100644 --- a/src/tr2/game/requester.h +++ b/src/tr2/game/requester.h @@ -2,22 +2,20 @@ #include "global/types.h" -void __cdecl Requester_Init(REQUEST_INFO *req); -void __cdecl Requester_Shutdown(REQUEST_INFO *req); -int32_t __cdecl Requester_Display( - REQUEST_INFO *req, bool destroy, bool backgrounds); -void __cdecl Requester_RemoveAllItems(REQUEST_INFO *req); -void __cdecl Requester_Item_CenterAlign(REQUEST_INFO *req, TEXTSTRING *text); -void __cdecl Requester_Item_LeftAlign(REQUEST_INFO *req, TEXTSTRING *text); -void __cdecl Requester_Item_RightAlign(REQUEST_INFO *req, TEXTSTRING *text); -void __cdecl Requester_SetHeading( +void Requester_Init(REQUEST_INFO *req); +void Requester_Shutdown(REQUEST_INFO *req); +int32_t Requester_Display(REQUEST_INFO *req, bool destroy, bool backgrounds); +void Requester_RemoveAllItems(REQUEST_INFO *req); +void Requester_Item_CenterAlign(REQUEST_INFO *req, TEXTSTRING *text); +void Requester_Item_LeftAlign(REQUEST_INFO *req, TEXTSTRING *text); +void Requester_Item_RightAlign(REQUEST_INFO *req, TEXTSTRING *text); +void Requester_SetHeading( REQUEST_INFO *req, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2); -void __cdecl Requester_ChangeItem( +void Requester_ChangeItem( REQUEST_INFO *req, int32_t item, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2); -void __cdecl Requester_AddItem( +void Requester_AddItem( REQUEST_INFO *req, const char *text1, uint32_t flags1, const char *text2, uint32_t flags2); -void __cdecl Requester_SetSize( - REQUEST_INFO *req, int32_t max_lines, int32_t y_pos); +void Requester_SetSize(REQUEST_INFO *req, int32_t max_lines, int32_t y_pos); diff --git a/src/tr2/game/room.c b/src/tr2/game/room.c index 399693a00..2c5bf5f66 100644 --- a/src/tr2/game/room.c +++ b/src/tr2/game/room.c @@ -450,8 +450,7 @@ int16_t Room_GetIndexFromPos(const int32_t x, const int32_t y, const int32_t z) return room_num; } -int32_t __cdecl Room_FindByPos( - const int32_t x, const int32_t y, const int32_t z) +int32_t Room_FindByPos(const int32_t x, const int32_t y, const int32_t z) { for (int32_t i = 0; i < g_RoomCount; i++) { const ROOM *const room = &g_Rooms[i]; @@ -469,7 +468,7 @@ int32_t __cdecl Room_FindByPos( return NO_ROOM_NEG; } -int32_t __cdecl Room_FindGridShift(int32_t src, const int32_t dst) +int32_t Room_FindGridShift(int32_t src, const int32_t dst) { const int32_t src_w = src >> WALL_SHIFT; const int32_t dst_w = dst >> WALL_SHIFT; @@ -485,7 +484,7 @@ int32_t __cdecl Room_FindGridShift(int32_t src, const int32_t dst) } } -void __cdecl Room_GetNearbyRooms( +void Room_GetNearbyRooms( const int32_t x, const int32_t y, const int32_t z, const int32_t r, const int32_t h, const int16_t room_num) { @@ -502,14 +501,14 @@ void __cdecl Room_GetNearbyRooms( Room_GetNewRoom(x - r, y - h, z - r, room_num); } -void __cdecl Room_GetNewRoom( +void Room_GetNewRoom( const int32_t x, const int32_t y, const int32_t z, int16_t room_num) { Room_GetSector(x, y, z, &room_num); Room_MarkToBeDrawn(room_num); } -int16_t __cdecl Room_GetTiltType( +int16_t Room_GetTiltType( const SECTOR *sector, const int32_t x, const int32_t y, const int32_t z) { sector = Room_GetPitSector(sector, x, z); @@ -547,7 +546,7 @@ SECTOR *Room_GetSkySector( return (SECTOR *)sector; } -SECTOR *__cdecl Room_GetSector( +SECTOR *Room_GetSector( const int32_t x, const int32_t y, const int32_t z, int16_t *const room_num) { SECTOR *sector = NULL; @@ -613,7 +612,7 @@ SECTOR *__cdecl Room_GetSector( return sector; } -int32_t __cdecl Room_GetWaterHeight( +int32_t Room_GetWaterHeight( const int32_t x, const int32_t y, const int32_t z, int16_t room_num) { const SECTOR *sector = NULL; @@ -673,7 +672,7 @@ int32_t __cdecl Room_GetWaterHeight( } } -int32_t __cdecl Room_GetHeight( +int32_t Room_GetHeight( const SECTOR *sector, const int32_t x, const int32_t y, const int32_t z) { g_HeightType = 0; @@ -707,7 +706,7 @@ int32_t __cdecl Room_GetHeight( return height; } -void __cdecl Room_Legacy_TestTriggers(const int16_t *fd, bool heavy) +void Room_Legacy_TestTriggers(const int16_t *fd, bool heavy) { ASSERT_FAIL(); } @@ -721,7 +720,7 @@ void Room_TestTriggers(const ITEM *const item) M_TestSectorTrigger(item, sector); } -int32_t __cdecl Room_GetCeiling( +int32_t Room_GetCeiling( const SECTOR *const sector, const int32_t x, const int32_t y, const int32_t z) { @@ -749,13 +748,13 @@ int32_t __cdecl Room_GetCeiling( return height; } -int16_t __cdecl Room_Legacy_GetDoor(const SECTOR *const sector) +int16_t Room_Legacy_GetDoor(const SECTOR *const sector) { ASSERT_FAIL(); return NO_ROOM; } -void __cdecl Room_AlterFloorHeight(const ITEM *const item, const int32_t height) +void Room_AlterFloorHeight(const ITEM *const item, const int32_t height) { int16_t room_num = item->room_num; @@ -788,7 +787,7 @@ bool Room_GetFlipStatus(void) return g_FlipStatus; } -void __cdecl Room_FlipMap(void) +void Room_FlipMap(void) { for (int32_t i = 0; i < g_RoomCount; i++) { ROOM *const r = &g_Rooms[i]; @@ -816,7 +815,7 @@ void __cdecl Room_FlipMap(void) g_FlipStatus = !g_FlipStatus; } -void __cdecl Room_RemoveFlipItems(const ROOM *const r) +void Room_RemoveFlipItems(const ROOM *const r) { int16_t item_num = r->item_num; @@ -845,7 +844,7 @@ void __cdecl Room_RemoveFlipItems(const ROOM *const r) } } -void __cdecl Room_AddFlipItems(const ROOM *const r) +void Room_AddFlipItems(const ROOM *const r) { int16_t item_num = r->item_num; while (item_num != NO_ITEM) { @@ -867,7 +866,7 @@ void __cdecl Room_AddFlipItems(const ROOM *const r) } } -void __cdecl Room_Legacy_TriggerMusicTrack( +void Room_Legacy_TriggerMusicTrack( const int16_t track, const int16_t flags, const int16_t type) { ASSERT_FAIL(); diff --git a/src/tr2/game/room.h b/src/tr2/game/room.h index 03c01d7f7..0abaf286b 100644 --- a/src/tr2/game/room.h +++ b/src/tr2/game/room.h @@ -9,37 +9,31 @@ extern int32_t g_FlipEffect; int16_t Room_GetIndexFromPos(int32_t x, int32_t y, int32_t z); -int32_t __cdecl Room_FindByPos(int32_t x, int32_t y, int32_t z); -int32_t __cdecl Room_FindGridShift(int32_t src, int32_t dst); -void __cdecl Room_GetNearbyRooms( +int32_t Room_FindByPos(int32_t x, int32_t y, int32_t z); +int32_t Room_FindGridShift(int32_t src, int32_t dst); +void Room_GetNearbyRooms( int32_t x, int32_t y, int32_t z, int32_t r, int32_t h, int16_t room_num); -void __cdecl Room_GetNewRoom(int32_t x, int32_t y, int32_t z, int16_t room_num); -int16_t __cdecl Room_GetTiltType( - const SECTOR *sector, int32_t x, int32_t y, int32_t z); +void Room_GetNewRoom(int32_t x, int32_t y, int32_t z, int16_t room_num); +int16_t Room_GetTiltType(const SECTOR *sector, int32_t x, int32_t y, int32_t z); // TODO: poor abstraction void Room_InitCinematic(void); SECTOR *Room_GetPitSector(const SECTOR *sector, int32_t x, int32_t z); SECTOR *Room_GetSkySector(const SECTOR *sector, int32_t x, int32_t z); -SECTOR *__cdecl Room_GetSector( - int32_t x, int32_t y, int32_t z, int16_t *room_num); +SECTOR *Room_GetSector(int32_t x, int32_t y, int32_t z, int16_t *room_num); -int32_t __cdecl Room_GetWaterHeight( - int32_t x, int32_t y, int32_t z, int16_t room_num); -int32_t __cdecl Room_GetHeight( - const SECTOR *sector, int32_t x, int32_t y, int32_t z); -int32_t __cdecl Room_GetCeiling( - const SECTOR *sector, int32_t x, int32_t y, int32_t z); +int32_t Room_GetWaterHeight(int32_t x, int32_t y, int32_t z, int16_t room_num); +int32_t Room_GetHeight(const SECTOR *sector, int32_t x, int32_t y, int32_t z); +int32_t Room_GetCeiling(const SECTOR *sector, int32_t x, int32_t y, int32_t z); void Room_TestTriggers(const ITEM *item); -void __cdecl Room_AlterFloorHeight(const ITEM *item, int32_t height); -void __cdecl Room_FlipMap(void); -void __cdecl Room_RemoveFlipItems(const ROOM *r); -void __cdecl Room_AddFlipItems(const ROOM *r); +void Room_AlterFloorHeight(const ITEM *item, int32_t height); +void Room_FlipMap(void); +void Room_RemoveFlipItems(const ROOM *r); +void Room_AddFlipItems(const ROOM *r); // TODO: eliminate -int16_t __cdecl Room_Legacy_GetDoor(const SECTOR *sector); -void __cdecl Room_Legacy_TestTriggers(const int16_t *fd, bool heavy); -void __cdecl Room_Legacy_TriggerMusicTrack( - int16_t value, int16_t flags, int16_t type); +int16_t Room_Legacy_GetDoor(const SECTOR *sector); +void Room_Legacy_TestTriggers(const int16_t *fd, bool heavy); +void Room_Legacy_TriggerMusicTrack(int16_t value, int16_t flags, int16_t type); diff --git a/src/tr2/game/room_draw.c b/src/tr2/game/room_draw.c index d7fb0ed81..1452fa433 100644 --- a/src/tr2/game/room_draw.c +++ b/src/tr2/game/room_draw.c @@ -22,7 +22,7 @@ void Room_MarkToBeDrawn(const int16_t room_num) } } -void __cdecl Room_GetBounds(void) +void Room_GetBounds(void) { while (g_BoundStart != g_BoundEnd) { const int16_t room_num = g_BoundRooms[g_BoundStart++ % MAX_BOUND_ROOMS]; @@ -93,7 +93,7 @@ void __cdecl Room_GetBounds(void) } } -void __cdecl Room_SetBounds( +void Room_SetBounds( const int16_t *obj_ptr, int32_t room_num, const ROOM *parent) { ROOM *const r = &g_Rooms[room_num]; @@ -235,7 +235,7 @@ void __cdecl Room_SetBounds( } } -void __cdecl Room_Clip(const ROOM *const r) +void Room_Clip(const ROOM *const r) { int32_t xv[8]; int32_t yv[8]; @@ -357,7 +357,7 @@ void __cdecl Room_Clip(const ROOM *const r) Output_InsertBackPolygon(min_x, min_y, max_x, max_y); } -void __cdecl Room_DrawSingleRoomGeometry(const int16_t room_num) +void Room_DrawSingleRoomGeometry(const int16_t room_num) { ROOM *const r = &g_Rooms[room_num]; @@ -384,7 +384,7 @@ void __cdecl Room_DrawSingleRoomGeometry(const int16_t room_num) } } -void __cdecl Room_DrawSingleRoomObjects(const int16_t room_num) +void Room_DrawSingleRoomObjects(const int16_t room_num) { ROOM *const r = &g_Rooms[room_num]; @@ -455,7 +455,7 @@ void __cdecl Room_DrawSingleRoomObjects(const int16_t room_num) r->bound_bottom = 0; } -void __cdecl Room_DrawAllRooms(const int16_t current_room) +void Room_DrawAllRooms(const int16_t current_room) { ROOM *const r = &g_Rooms[current_room]; r->test_left = 0; diff --git a/src/tr2/game/room_draw.h b/src/tr2/game/room_draw.h index b8332fb25..24d571d62 100644 --- a/src/tr2/game/room_draw.h +++ b/src/tr2/game/room_draw.h @@ -3,10 +3,10 @@ #include "global/types.h" void Room_MarkToBeDrawn(int16_t room_num); -void __cdecl Room_GetBounds(void); -void __cdecl Room_SetBounds( +void Room_GetBounds(void); +void Room_SetBounds( const int16_t *obj_ptr, int32_t room_num, const ROOM *parent); -void __cdecl Room_Clip(const ROOM *r); -void __cdecl Room_DrawAllRooms(int16_t current_room); -void __cdecl Room_DrawSingleRoomGeometry(int16_t room_num); -void __cdecl Room_DrawSingleRoomObjects(int16_t room_num); +void Room_Clip(const ROOM *r); +void Room_DrawAllRooms(int16_t current_room); +void Room_DrawSingleRoomGeometry(int16_t room_num); +void Room_DrawSingleRoomObjects(int16_t room_num); diff --git a/src/tr2/game/shell/common.c b/src/tr2/game/shell/common.c index 9751093b8..8233c0279 100644 --- a/src/tr2/game/shell/common.c +++ b/src/tr2/game/shell/common.c @@ -326,7 +326,7 @@ static void M_DisplayLegal(void) } // TODO: refactor the hell out of me -void __cdecl Shell_Main(void) +void Shell_Main(void) { GameString_Init(); EnumMap_Init(); @@ -459,7 +459,7 @@ void __cdecl Shell_Main(void) Config_Write(); } -void __cdecl Shell_Shutdown(void) +void Shell_Shutdown(void) { GameString_Shutdown(); Console_Shutdown(); diff --git a/src/tr2/game/shell/common.h b/src/tr2/game/shell/common.h index eb65230b1..b2baf8f8b 100644 --- a/src/tr2/game/shell/common.h +++ b/src/tr2/game/shell/common.h @@ -4,7 +4,7 @@ #include -void __cdecl Shell_Main(void); +void Shell_Main(void); void Shell_Start(); const char *Shell_GetGameflowPath(void); diff --git a/src/tr2/game/sound.c b/src/tr2/game/sound.c index e77a9310c..bfba7f72f 100644 --- a/src/tr2/game/sound.c +++ b/src/tr2/game/sound.c @@ -127,7 +127,7 @@ static void M_UpdateSlot(SOUND_SLOT *const slot) slot->handle, M_ConvertVolumeToDecibel(slot->volume)); } -void __cdecl Sound_Init(void) +void Sound_Init(void) { m_DecibelLUT[0] = -10000; for (int32_t i = 1; i < DECIBEL_LUT_SIZE; i++) { @@ -144,7 +144,7 @@ void __cdecl Sound_Init(void) g_SoundIsActive = true; } -void __cdecl Sound_Shutdown(void) +void Sound_Shutdown(void) { if (!g_SoundIsActive) { return; @@ -154,12 +154,12 @@ void __cdecl Sound_Shutdown(void) M_ClearAllSlots(); } -void __cdecl Sound_SetMasterVolume(int32_t volume) +void Sound_SetMasterVolume(int32_t volume) { m_MasterVolume = volume * 64.0f / 10.0f; } -void __cdecl Sound_UpdateEffects(void) +void Sound_UpdateEffects(void) { for (int32_t i = 0; i < g_SoundEffectCount; i++) { OBJECT_VECTOR *const sound = &g_SoundEffects[i]; @@ -170,7 +170,7 @@ void __cdecl Sound_UpdateEffects(void) } } -void __cdecl Sound_Effect( +void Sound_Effect( const SOUND_EFFECT_ID sample_id, const XYZ_32 *const pos, const uint32_t flags) { @@ -335,7 +335,7 @@ void __cdecl Sound_Effect( } } -void __cdecl Sound_StopEffect(const SOUND_EFFECT_ID sample_id) +void Sound_StopEffect(const SOUND_EFFECT_ID sample_id) { if (!g_SoundIsActive) { return; @@ -353,13 +353,13 @@ void __cdecl Sound_StopEffect(const SOUND_EFFECT_ID sample_id) } } -void __cdecl Sound_StopAllSamples(void) +void Sound_StopAllSamples(void) { Audio_Sample_CloseAll(); M_ClearAllSlots(); } -void __cdecl Sound_EndScene(void) +void Sound_EndScene(void) { if (!g_SoundIsActive) { return; diff --git a/src/tr2/game/sound.h b/src/tr2/game/sound.h index 2abf69bf6..7ab33d1ee 100644 --- a/src/tr2/game/sound.h +++ b/src/tr2/game/sound.h @@ -6,15 +6,14 @@ #define SOUND_DEFAULT_PITCH 0x10000 -void __cdecl Sound_Init(void); -void __cdecl Sound_Shutdown(void); +void Sound_Init(void); +void Sound_Shutdown(void); -void __cdecl Sound_SetMasterVolume(int32_t volume); -void __cdecl Sound_UpdateEffects(void); -void __cdecl Sound_Effect( - SOUND_EFFECT_ID sample_id, const XYZ_32 *pos, uint32_t flags); -void __cdecl Sound_StopEffect(SOUND_EFFECT_ID sample_id); -void __cdecl Sound_StopAllSamples(void); -void __cdecl Sound_EndScene(void); +void Sound_SetMasterVolume(int32_t volume); +void Sound_UpdateEffects(void); +void Sound_Effect(SOUND_EFFECT_ID sample_id, const XYZ_32 *pos, uint32_t flags); +void Sound_StopEffect(SOUND_EFFECT_ID sample_id); +void Sound_StopAllSamples(void); +void Sound_EndScene(void); int32_t Sound_GetMinVolume(void); int32_t Sound_GetMaxVolume(void); diff --git a/src/tr2/game/spawn.c b/src/tr2/game/spawn.c index dede1ccd0..5b0fba080 100644 --- a/src/tr2/game/spawn.c +++ b/src/tr2/game/spawn.c @@ -12,7 +12,7 @@ #define BARTOLI_LIGHT_RANGE (5 * WALL_L) // = 5120 -int16_t __cdecl Spawn_FireStream( +int16_t Spawn_FireStream( const int32_t x, const int32_t y, const int32_t z, int16_t speed, const int16_t y_rot, const int16_t room_num) { @@ -46,7 +46,7 @@ int16_t __cdecl Spawn_FireStream( return effect_num; } -void __cdecl Spawn_MysticLight(const int16_t item_num) +void Spawn_MysticLight(const int16_t item_num) { const ITEM *const item = &g_Items[item_num]; @@ -76,7 +76,7 @@ void __cdecl Spawn_MysticLight(const int16_t item_num) // clang-format on } -void __cdecl Spawn_Bubble(const XYZ_32 *const pos, const int16_t room_num) +void Spawn_Bubble(const XYZ_32 *const pos, const int16_t room_num) { const int16_t effect_num = Effect_Create(room_num); if (effect_num == NO_EFFECT) { @@ -90,7 +90,7 @@ void __cdecl Spawn_Bubble(const XYZ_32 *const pos, const int16_t room_num) effect->speed = 10 + ((Random_GetDraw() * 6) / 0x8000); } -void __cdecl Spawn_Splash(const ITEM *const item) +void Spawn_Splash(const ITEM *const item) { const int32_t water_height = Room_GetWaterHeight( item->pos.x, item->pos.y, item->pos.z, item->room_num); @@ -114,7 +114,7 @@ void __cdecl Spawn_Splash(const ITEM *const item) } } -int16_t __cdecl Spawn_GunShot( +int16_t Spawn_GunShot( const int32_t x, const int32_t y, const int32_t z, const int16_t speed, const int16_t y_rot, const int16_t room_num) { @@ -138,7 +138,7 @@ int16_t __cdecl Spawn_GunShot( return effect_num; } -int16_t __cdecl Spawn_GunHit( +int16_t Spawn_GunHit( const int32_t x, const int32_t y, const int32_t z, const int16_t speed, const int16_t y_rot, const int16_t room_num) { @@ -152,7 +152,7 @@ int16_t __cdecl Spawn_GunHit( return Spawn_GunShot(x, y, z, speed, y_rot, room_num); } -int16_t __cdecl Spawn_GunMiss( +int16_t Spawn_GunMiss( const int32_t x, const int32_t y, const int32_t z, const int16_t speed, const int16_t y_rot, const int16_t room_num) { @@ -168,7 +168,7 @@ int16_t __cdecl Spawn_GunMiss( return Spawn_GunShot(x, y, z, speed, y_rot, room_num); } -int16_t __cdecl Spawn_Knife( +int16_t Spawn_Knife( const int32_t x, const int32_t y, const int32_t z, const int16_t speed, const int16_t y_rot, const int16_t room_num) { @@ -193,7 +193,7 @@ int16_t __cdecl Spawn_Knife( return effect_num; } -int16_t __cdecl Spawn_Blood( +int16_t Spawn_Blood( const int32_t x, const int32_t y, const int32_t z, const int16_t speed, const int16_t y_rot, const int16_t room_num) { @@ -212,7 +212,7 @@ int16_t __cdecl Spawn_Blood( return effect_num; } -void __cdecl Spawn_BloodBath( +void Spawn_BloodBath( const int32_t x, const int32_t y, const int32_t z, const int16_t speed, const int16_t y_rot, const int16_t room_num, const int32_t count) { @@ -224,7 +224,7 @@ void __cdecl Spawn_BloodBath( } } -void __cdecl Spawn_Ricochet(const GAME_VECTOR *const pos) +void Spawn_Ricochet(const GAME_VECTOR *const pos) { const int16_t effect_num = Effect_Create(pos->room_num); if (effect_num != NO_EFFECT) { diff --git a/src/tr2/game/spawn.h b/src/tr2/game/spawn.h index 42608ac2e..ea37e7cd9 100644 --- a/src/tr2/game/spawn.h +++ b/src/tr2/game/spawn.h @@ -2,38 +2,38 @@ #include "game/items.h" -int16_t __cdecl Spawn_FireStream( +int16_t Spawn_FireStream( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num); -void __cdecl Spawn_MysticLight(int16_t item_num); +void Spawn_MysticLight(int16_t item_num); -void __cdecl Spawn_Bubble(const XYZ_32 *pos, int16_t room_num); +void Spawn_Bubble(const XYZ_32 *pos, int16_t room_num); -void __cdecl Spawn_Splash(const ITEM *item); +void Spawn_Splash(const ITEM *item); -int16_t __cdecl Spawn_GunShot( +int16_t Spawn_GunShot( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t yrot, int16_t room_num); -int16_t __cdecl Spawn_GunHit( +int16_t Spawn_GunHit( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num); -int16_t __cdecl Spawn_GunMiss( +int16_t Spawn_GunMiss( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num); -int16_t __cdecl Spawn_Knife( +int16_t Spawn_Knife( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num); -int16_t __cdecl Spawn_Blood( +int16_t Spawn_Blood( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num); -void __cdecl Spawn_BloodBath( +void Spawn_BloodBath( int32_t x, int32_t y, int32_t z, int16_t speed, int16_t y_rot, int16_t room_num, int32_t count); -void __cdecl Spawn_Ricochet(const GAME_VECTOR *pos); +void Spawn_Ricochet(const GAME_VECTOR *pos); diff --git a/src/tr2/game/text.c b/src/tr2/game/text.c index 8b2179a9a..43e35e80c 100644 --- a/src/tr2/game/text.c +++ b/src/tr2/game/text.c @@ -6,7 +6,7 @@ #include -void __cdecl Text_DrawBorder( +void Text_DrawBorder( const int32_t x, const int32_t y, const int32_t z, const int32_t width, const int32_t height) { @@ -38,7 +38,7 @@ void __cdecl Text_DrawBorder( Output_DrawScreenSprite2D(x0, y0, z, scale_h, h, mesh_idx + 7, 0x1000, 0); } -void __cdecl Text_DrawText(TEXTSTRING *const text) +void Text_DrawText(TEXTSTRING *const text) { if (text->flags.drawn) { return; @@ -155,12 +155,12 @@ void __cdecl Text_DrawText(TEXTSTRING *const text) } } -int32_t __cdecl Text_GetScaleH(const uint32_t value) +int32_t Text_GetScaleH(const uint32_t value) { return value * g_PhdWinWidth / 640; } -int32_t __cdecl Text_GetScaleV(const uint32_t value) +int32_t Text_GetScaleV(const uint32_t value) { return value * g_PhdWinHeight / 480; } diff --git a/src/tr2/game/text.h b/src/tr2/game/text.h index 72452db1a..9d2ddf7cf 100644 --- a/src/tr2/game/text.h +++ b/src/tr2/game/text.h @@ -6,9 +6,9 @@ #define TEXT_HEIGHT 15 -void __cdecl Text_DrawBorder( +void Text_DrawBorder( int32_t x, int32_t y, int32_t z, int32_t width, int32_t height); -void __cdecl Text_DrawText(TEXTSTRING *text); +void Text_DrawText(TEXTSTRING *text); -int32_t __cdecl Text_GetScaleH(uint32_t value); -int32_t __cdecl Text_GetScaleV(uint32_t value); +int32_t Text_GetScaleH(uint32_t value); +int32_t Text_GetScaleV(uint32_t value);