Skip to content
This repository was archived by the owner on Oct 4, 2024. It is now read-only.

Commit 1b6dd20

Browse files
rr-rr-
committed
docs: update signatures
1 parent d6f5c05 commit 1b6dd20

File tree

6 files changed

+299
-287
lines changed

6 files changed

+299
-287
lines changed

‎docs/progress.svg

Lines changed: 146 additions & 146 deletions
Loading

‎docs/progress.txt

Lines changed: 79 additions & 73 deletions
Large diffs are not rendered by default.

‎src/game/text.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
void __cdecl Text_Init(void)
2727
{
28-
DisplayModeInfo(0);
28+
Overlay_DisplayModeInfo(0);
2929
for (int i = 0; i < TEXT_MAX_STRINGS; i++) {
3030
g_TextstringTable[i].flags.all = 0;
3131
}

‎src/global/funcs.h

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,18 @@
203203
#define InitialiseHair ((void __cdecl (*)(void))0x00420EA0)
204204
#define HairControl ((void __cdecl (*)(int32_t in_cutscene))0x00420F20)
205205
#define DrawHair ((void __cdecl (*)(void))0x00421920)
206-
#define FlashIt ((int32_t __cdecl (*)(void))0x004219A0)
207-
#define DrawAssaultTimer ((void __cdecl (*)(void))0x004219D0)
208-
#define DrawGameInfo ((void __cdecl (*)(int32_t timed))0x00421B20)
209-
#define DrawHealthBar ((void __cdecl (*)(int32_t flash_state))0x00421B70)
210-
#define DrawAirBar ((void __cdecl (*)(int32_t flash_state))0x00421C20)
211-
#define MakeAmmoString ((void __cdecl (*)(char *string))0x00421CC0)
212-
#define DrawAmmoInfo ((void __cdecl (*)(void))0x00421CF0)
213-
#define InitialisePickUpDisplay ((void __cdecl (*)(void))0x00421E40)
214-
#define DrawPickups ((void __cdecl (*)(int32_t timed))0x00421E60)
215-
#define AddDisplayPickup ((void __cdecl (*)(int16_t obj_num))0x00421F60)
216-
#define DisplayModeInfo ((void __cdecl (*)(char* string))0x00421FD0)
217-
#define DrawModeInfo ((void __cdecl (*)(void))0x00422050)
206+
#define Overlay_FlashCounter ((int32_t __cdecl (*)(void))0x004219A0)
207+
#define Overlay_DrawAssaultTimer ((void __cdecl (*)(void))0x004219D0)
208+
#define Overlay_DrawGameInfo ((void __cdecl (*)(int32_t timed))0x00421B20)
209+
#define Overlay_DrawHealthBar ((void __cdecl (*)(int32_t flash_state))0x00421B70)
210+
#define Overlay_DrawAirBar ((void __cdecl (*)(int32_t flash_state))0x00421C20)
211+
#define Overlay_MakeAmmoString ((void __cdecl (*)(char *string))0x00421CC0)
212+
#define Overlay_DrawAmmoInfo ((void __cdecl (*)(void))0x00421CF0)
213+
#define Overlay_InitialisePickUpDisplay ((void __cdecl (*)(void))0x00421E40)
214+
#define Overlay_DrawPickups ((void __cdecl (*)(int32_t timed))0x00421E60)
215+
#define Overlay_AddDisplayPickup ((void __cdecl (*)(int16_t obj_num))0x00421F60)
216+
#define Overlay_DisplayModeInfo ((void __cdecl (*)(char* string))0x00421FD0)
217+
#define Overlay_DrawModeInfo ((void __cdecl (*)(void))0x00422050)
218218
#define Display_Inventory ((int32_t __cdecl (*)(int32_t inventory_mode))0x00422080)
219219
#define Construct_Inventory ((void __cdecl (*)(void))0x00423310)
220220
#define SelectMeshes ((void __cdecl (*)(struct INVENTORY_ITEM *inv_item))0x00423470)
@@ -605,22 +605,22 @@
605605
#define GetZBufferDepth ((DWORD __cdecl (*)(void))0x004488F0)
606606
#define CreateRenderBuffer ((void __cdecl (*)(void))0x00448920)
607607
#define CreatePictureBuffer ((void __cdecl (*)(void))0x004489D0)
608-
#define ClearBuffers ((void __cdecl (*)(DWORD flags, DWORD fillColor))0x00448A40)
608+
#define ClearBuffers ((void __cdecl (*)(DWORD flags, DWORD fill_color))0x00448A40)
609609
#define RestoreLostBuffers ((void __cdecl (*)(void))0x00448BF0)
610-
#define UpdateFrame ((void __cdecl (*)(bool needRunMessageLoop, LPRECT rect))0x00448D30)
610+
#define UpdateFrame ((void __cdecl (*)(bool need_run_message_loop, LPRECT rect))0x00448D30)
611611
#define WaitPrimaryBufferFlip ((void __cdecl (*)(void))0x00448E00)
612612
#define RenderInit ((bool __cdecl (*)(void))0x00448E40)
613-
#define RenderStart ((void __cdecl (*)(bool isReset))0x00448E50)
614-
#define RenderFinish ((void __cdecl (*)(bool needToClearTextures))0x00449200)
615-
#define ApplySettings ((bool __cdecl (*)(struct APP_SETTINGS *newSettings))0x004492F0)
613+
#define RenderStart ((void __cdecl (*)(bool is_reset))0x00448E50)
614+
#define RenderFinish ((void __cdecl (*)(bool need_to_clear_textures))0x00449200)
615+
#define ApplySettings ((bool __cdecl (*)(struct APP_SETTINGS *new_settings))0x004492F0)
616616
#define FmvBackToGame ((void __cdecl (*)(void))0x00449500)
617-
#define GameApplySettings ((void __cdecl (*)(struct APP_SETTINGS *newSettings))0x00449610)
617+
#define GameApplySettings ((void __cdecl (*)(struct APP_SETTINGS *new_settings))0x00449610)
618618
#define UpdateGameResolution ((void __cdecl (*)(void))0x00449850)
619-
#define DecodeErrorMessage ((LPCTSTR __cdecl (*)(DWORD errorCode))0x004498C0)
619+
#define DecodeErrorMessage ((LPCTSTR __cdecl (*)(DWORD error_code))0x004498C0)
620620
#define ReadFileSync ((BOOL __cdecl (*)(HANDLE handle, LPVOID lpBuffer, DWORD nBytesToRead, LPDWORD lpnBytesRead, LPOVERLAPPED lpOverlapped))0x004498D0)
621621
#define LoadTexturePages ((BOOL __cdecl (*)(HANDLE handle))0x00449920)
622622
#define LoadRooms ((BOOL __cdecl (*)(HANDLE handle))0x00449AB0)
623-
#define AdjustTextureUVs ((void __cdecl (*)(bool resetUvAdd))0x00449E50)
623+
#define AdjustTextureUVs ((void __cdecl (*)(bool reset_uv_add))0x00449E50)
624624
#define LoadObjects ((BOOL __cdecl (*)(HANDLE handle))0x00449EF0)
625625
#define LoadSprites ((BOOL __cdecl (*)(HANDLE handle))0x0044A470)
626626
#define LoadItems ((BOOL __cdecl (*)(HANDLE handle))0x0044A5B0)
@@ -632,36 +632,36 @@
632632
#define LoadAnimatedTextures ((BOOL __cdecl (*)(HANDLE handle))0x0044AC90)
633633
#define LoadCinematic ((BOOL __cdecl (*)(HANDLE handle))0x0044ACF0)
634634
#define LoadDemo ((BOOL __cdecl (*)(HANDLE handle))0x0044AD70)
635-
#define LoadDemoExternal ((void __cdecl (*)(LPCTSTR levelName))0x0044AE00)
635+
#define LoadDemoExternal ((void __cdecl (*)(LPCTSTR level_name))0x0044AE00)
636636
#define LoadSamples ((BOOL __cdecl (*)(HANDLE handle))0x0044AEA0)
637-
#define ChangeFileNameExtension ((void __cdecl (*)(char *fileName, const char *fileExt))0x0044B110)
638-
#define GetFullPath ((LPCTSTR __cdecl (*)(LPCTSTR fileName))0x0044B150)
637+
#define ChangeFileNameExtension ((void __cdecl (*)(char *file_name, const char *file_ext))0x0044B110)
638+
#define GetFullPath ((LPCTSTR __cdecl (*)(LPCTSTR file_name))0x0044B150)
639639
#define SelectDrive ((BOOL __cdecl (*)(void))0x0044B180)
640-
#define LoadLevel ((BOOL __cdecl (*)(LPCTSTR fileName, int32_t levelID))0x0044B260)
641-
#define S_LoadLevelFile ((BOOL __cdecl (*)(LPCTSTR fileName, int32_t levelID, GF_LEVEL_TYPE levelType))0x0044B4B0)
640+
#define LoadLevel ((BOOL __cdecl (*)(LPCTSTR file_name, int32_t level_num))0x0044B260)
641+
#define S_LoadLevelFile ((BOOL __cdecl (*)(LPCTSTR file_name, int32_t level_num, GF_LEVEL_TYPE level_type))0x0044B4B0)
642642
#define S_UnloadLevelFile ((void __cdecl (*)(void))0x0044B4D0)
643643
#define S_AdjustTexelCoordinates ((void __cdecl (*)(void))0x0044B500)
644-
#define S_ReloadLevelGraphics ((BOOL __cdecl (*)(BOOL reloadPalettes, BOOL reloadTexPages))0x0044B520)
645-
#define Read_Strings ((BOOL __cdecl (*)(DWORD dwCount, char **stringTable, char **stringBuffer, LPDWORD lpBufferSize, HANDLE handle))0x0044B5F0)
646-
#define S_LoadGameFlow ((BOOL __cdecl (*)(LPCTSTR fileName))0x0044B6C0)
647-
#define PlayFMV ((bool __cdecl (*)(LPCTSTR fileName))0x0044BDA0)
648-
#define WinPlayFMV ((void __cdecl (*)(LPCTSTR fileName, bool isPlayback))0x0044BE10)
649-
#define WinStopFMV ((void __cdecl (*)(bool isPlayback))0x0044C0F0)
650-
#define IntroFMV ((bool __cdecl (*)(LPCTSTR fileName1, LPCTSTR fileName2))0x0044C140)
644+
#define S_ReloadLevelGraphics ((BOOL __cdecl (*)(BOOL reload_palettes, BOOL reload_tex_pages))0x0044B520)
645+
#define Read_Strings ((BOOL __cdecl (*)(DWORD count, char **string_table, char **string_buf, LPDWORD buf_size, HANDLE handle))0x0044B5F0)
646+
#define S_LoadGameFlow ((BOOL __cdecl (*)(const char *file_name))0x0044B6C0)
647+
#define PlayFMV ((bool __cdecl (*)(const char *file_name))0x0044BDA0)
648+
#define WinPlayFMV ((void __cdecl (*)(const char *file_name, bool is_playback))0x0044BE10)
649+
#define WinStopFMV ((void __cdecl (*)(bool is_playback))0x0044C0F0)
650+
#define IntroFMV ((bool __cdecl (*)(const char *file_name1, const char *file_name2))0x0044C140)
651651
#define S_COLOUR ((uint16_t __cdecl (*)(int32_t red, int32_t green, int32_t blue))0x0044C1D0)
652652
#define S_DrawScreenLine ((void __cdecl (*)(int32_t x, int32_t y, int32_t z, int32_t x_len, int32_t y_len, BYTE color_idx, D3DCOLOR *gour, uint16_t flags))0x0044C200)
653653
#define S_DrawScreenBox ((void __cdecl (*)(int32_t sx, int32_t sy, int32_t z, int32_t width, int32_t height, BYTE color_idx, const struct GOURAUD_OUTLINE *gour, uint16_t flags))0x0044C240)
654654
#define S_DrawScreenFBox ((void __cdecl (*)(int32_t sx, int32_t sy, int32_t z, int32_t width, int32_t height, BYTE color_idx, const struct GOURAUD_FILL *gour, uint16_t flags))0x0044C360)
655655
#define S_FinishInventory ((void __cdecl (*)(void))0x0044C390)
656656
#define S_FadeToBlack ((void __cdecl (*)(void))0x0044C3A0)
657-
#define S_Wait ((void __cdecl (*)(int32_t timeout, BOOL inputCheck))0x0044C3F0)
658-
#define S_PlayFMV ((bool __cdecl (*)(LPCTSTR fileName))0x0044C450)
659-
#define S_IntroFMV ((bool __cdecl (*)(LPCTSTR fileName1, LPCTSTR fileName2))0x0044C460)
660-
#define StartGame ((int16_t __cdecl (*)(int32_t levelID, GF_LEVEL_TYPE levelType))0x0044C480)
661-
#define GameLoop ((int32_t __cdecl (*)(BOOL demoMode))0x0044C5D0)
657+
#define S_Wait ((void __cdecl (*)(int32_t timeout, BOOL input_check))0x0044C3F0)
658+
#define S_PlayFMV ((bool __cdecl (*)(const char *file_name))0x0044C450)
659+
#define S_IntroFMV ((bool __cdecl (*)(const char *file_name1, const char *file_name2))0x0044C460)
660+
#define StartGame ((int16_t __cdecl (*)(int32_t level_num, GF_LEVEL_TYPE level_type))0x0044C480)
661+
#define GameLoop ((int32_t __cdecl (*)(BOOL demo_mode))0x0044C5D0)
662662
#define LevelCompleteSequence ((int32_t __cdecl (*)(void))0x0044C670)
663-
#define LevelStats ((int32_t __cdecl (*)(int32_t levelID))0x0044C680)
664-
#define GameStats ((int32_t __cdecl (*)(int32_t levelID))0x0044C850)
663+
#define LevelStats ((int32_t __cdecl (*)(int32_t level_num))0x0044C680)
664+
#define GameStats ((int32_t __cdecl (*)(int32_t level_num))0x0044C850)
665665
#define GetValidLevelsList ((void __cdecl (*)(REQUEST_INFO *req))0x0044C9D0)
666666
#define GetSavedGamesList ((void __cdecl (*)(REQUEST_INFO *req))0x0044CA20)
667667
#define DisplayCredits ((void __cdecl (*)(void))0x0044CA70)
@@ -672,30 +672,30 @@
672672
#define HWR_ResetTexSource ((void __cdecl (*)(void))0x0044D110)
673673
#define HWR_ResetColorKey ((void __cdecl (*)(void))0x0044D140)
674674
#define HWR_ResetZBuffer ((void __cdecl (*)(void))0x0044D170)
675-
#define HWR_TexSource ((void __cdecl (*)(HWR_TEX_HANDLE texSource))0x0044D1D0)
675+
#define HWR_TexSource ((void __cdecl (*)(HWR_TEX_HANDLE tex_source))0x0044D1D0)
676676
#define HWR_EnableColorKey ((void __cdecl (*)(bool state))0x0044D200)
677677
#define HWR_EnableZBuffer ((void __cdecl (*)(bool z_write_enable, bool z_enable))0x0044D250)
678678
#define HWR_BeginScene ((void __cdecl (*)(void))0x0044D2E0)
679679
#define HWR_DrawPolyList ((void __cdecl (*)(void))0x0044D310)
680-
#define HWR_LoadTexturePages ((void __cdecl (*)(int32_t pagesCount, LPVOID pagesBuffer, RGB888 *palette))0x0044D490)
680+
#define HWR_LoadTexturePages ((void __cdecl (*)(int32_t pages_count, void *pages_buf, RGB888 *palette))0x0044D490)
681681
#define HWR_FreeTexturePages ((void __cdecl (*)(void))0x0044D520)
682682
#define HWR_GetPageHandles ((void __cdecl (*)(void))0x0044D570)
683683
#define HWR_VertexBufferFull ((bool __cdecl (*)(void))0x0044D5B0)
684684
#define HWR_Init ((bool __cdecl (*)(void))0x0044D5E0)
685685
#define S_InitialiseSystem ((BOOL __cdecl (*)(void))0x0044D610)
686686
#define GameBuf_Shutdown ((void __cdecl (*)(void))0x0044D670)
687687
#define init_game_malloc ((void __cdecl (*)(void))0x0044D690)
688-
#define game_malloc ((void *__cdecl (*)(DWORD allocSize, DWORD bufIndex))0x0044D6C0)
689-
#define game_free ((void __cdecl (*)(DWORD freeSize))0x0044D740)
688+
#define game_malloc ((void *__cdecl (*)(uint32_t alloc_size, uint32_t buf_index))0x0044D6C0)
689+
#define game_free ((void __cdecl (*)(uint32_t free_size))0x0044D740)
690690
#define CalculateWibbleTable ((void __cdecl (*)(void))0x0044D780)
691-
#define RenderErrorBox ((int32_t __cdecl (*)(int32_t errorCode))0x0044E4E0)
691+
#define RenderErrorBox ((int32_t __cdecl (*)(int32_t error_code))0x0044E4E0)
692692
#define WinMain ((int32_t __stdcall (*)(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int32_t nShowCmd))0x0044E520)
693-
#define GameInit ((int32_t __cdecl (*)(bool skipCDInit))0x0044E700)
693+
#define GameInit ((int32_t __cdecl (*)(bool skip_cd_init))0x0044E700)
694694
#define Shell_Cleanup ((void __cdecl (*)(void))0x0044E770)
695695
#define WinGameStart ((int32_t __cdecl (*)(void))0x0044E7A0)
696696
#define Shell_Shutdown ((void __cdecl (*)(void))0x0044E820)
697697
#define ScreenShotPCX ((void __cdecl (*)(void))0x0044E8E0)
698-
#define CompPCX ((DWORD __cdecl (*)(BYTE *bitmap, DWORD width, DWORD height, RGB888 *palette, BYTE **pcxData))0x0044E9F0)
698+
#define CompPCX ((DWORD __cdecl (*)(BYTE *bitmap, DWORD width, DWORD height, RGB888 *palette, BYTE **pcx_data))0x0044E9F0)
699699
#define EncodeLinePCX ((DWORD __cdecl (*)(BYTE *src, DWORD width, BYTE *dst))0x0044EAA0)
700700
#define EncodePutPCX ((DWORD __cdecl (*)(BYTE value, BYTE num, BYTE *buffer))0x0044EB80)
701701
#define ScreenShot ((void __cdecl (*)(LPDDS screen))0x0044EBC0)
@@ -712,34 +712,34 @@
712712
#define S_RemoveCtrlText ((void __cdecl (*)(void))0x00450AA0)
713713
#define GetRenderHeight ((int32_t __cdecl (*)(void))0x00450AE0)
714714
#define GetRenderWidth ((int32_t __cdecl (*)(void))0x00450AF0)
715-
#define S_InitialisePolyList ((void __cdecl (*)(BOOL clearBackBuffer))0x00450B00)
715+
#define S_InitialisePolyList ((void __cdecl (*)(BOOL clear_back_buffer))0x00450B00)
716716
#define S_DumpScreen ((DWORD __cdecl (*)(void))0x00450BF0)
717717
#define S_ClearScreen ((void __cdecl (*)(void))0x00450C30)
718-
#define S_InitialiseScreen ((void __cdecl (*)(GF_LEVEL_TYPE levelType))0x00450C40)
718+
#define S_InitialiseScreen ((void __cdecl (*)(GF_LEVEL_TYPE level_type))0x00450C40)
719719
#define S_OutputPolyList ((void __cdecl (*)(void))0x00450C80)
720-
#define S_GetObjectBounds ((int32_t __cdecl (*)(int16_t *bPtr))0x00450CC0)
720+
#define S_GetObjectBounds ((int32_t __cdecl (*)(int16_t *obj_ptr))0x00450CC0)
721721
#define S_InsertBackPolygon ((void __cdecl (*)(int32_t x0, int32_t y0, int32_t x1, int32_t y1))0x00450F30)
722-
#define S_PrintShadow ((void __cdecl (*)(int16_t radius, int16_t *bPtr, ITEM_INFO *item))0x00450F80)
722+
#define S_PrintShadow ((void __cdecl (*)(int16_t radius, int16_t *obj_ptr, ITEM_INFO *item))0x00450F80)
723723
#define S_CalculateLight ((void __cdecl (*)(int32_t x, int32_t y, int32_t z, int16_t room_num))0x00451180)
724724
#define S_CalculateStaticLight ((void __cdecl (*)(int16_t adder))0x00451480)
725725
#define S_CalculateStaticMeshLight ((void __cdecl (*)(int32_t x, int32_t y, int32_t z, int32_t shade1, int32_t shade2, ROOM_INFO *room))0x004514C0)
726726
#define S_LightRoom ((void __cdecl (*)(ROOM_INFO *room))0x004515F0)
727727
#define S_DrawHealthBar ((void __cdecl (*)(int32_t percent))0x00451800)
728728
#define S_DrawAirBar ((void __cdecl (*)(int32_t percent))0x004519D0)
729-
#define AnimateTextures ((void __cdecl (*)(int32_t nTicks))0x00451BD0)
729+
#define AnimateTextures ((void __cdecl (*)(int32_t ticks))0x00451BD0)
730730
#define S_SetupBelowWater ((void __cdecl (*)(BOOL underwater))0x00451C90)
731731
#define S_SetupAboveWater ((void __cdecl (*)(BOOL underwater))0x00451CF0)
732-
#define S_AnimateTextures ((void __cdecl (*)(int32_t nTicks))0x00451D20)
733-
#define S_DisplayPicture ((void __cdecl (*)(LPCTSTR fileName, BOOL isTitle))0x00451DE0)
732+
#define S_AnimateTextures ((void __cdecl (*)(int32_t ticks))0x00451D20)
733+
#define S_DisplayPicture ((void __cdecl (*)(const char *file_name, BOOL is_title))0x00451DE0)
734734
#define S_SyncPictureBufferPalette ((void __cdecl (*)(void))0x00451EF0)
735735
#define S_DontDisplayPicture ((void __cdecl (*)(void))0x00451F70)
736736
#define ScreenDump ((void __cdecl (*)(void))0x00451F80)
737737
#define ScreenPartialDump ((void __cdecl (*)(void))0x00451F90)
738-
#define FadeToPal ((void __cdecl (*)(int32_t fadeValue, RGB888 *palette))0x00451FA0)
739-
#define ScreenClear ((void __cdecl (*)(bool isPhdWinSize))0x00452170)
738+
#define FadeToPal ((void __cdecl (*)(int32_t fade_value, RGB888 *palette))0x00451FA0)
739+
#define ScreenClear ((void __cdecl (*)(bool is_phd_win_size))0x00452170)
740740
#define S_CopyScreenToBuffer ((void __cdecl (*)(void))0x004521A0)
741741
#define S_CopyBufferToScreen ((void __cdecl (*)(void))0x00452250)
742-
#define DecompPCX ((BOOL __cdecl (*)(LPCBYTE pcx, DWORD pcxSize, LPBYTE pic, RGB888 *pal))0x004522A0)
742+
#define DecompPCX ((BOOL __cdecl (*)(const uint8_t *pcx, size_t pcx_size, LPBYTE pic, RGB888 *pal))0x004522A0)
743743
#define OpenGameRegistryKey ((bool __cdecl (*)(LPCTSTR key))0x004523C0)
744744
#define CloseGameRegistryKey ((LONG __cdecl (*)(void))0x00452410)
745745
#define SE_WriteAppSettings ((bool __cdecl (*)(APP_SETTINGS *settings))0x00452420)
@@ -779,27 +779,27 @@
779779
#define CheckCheatMode ((void __cdecl (*)(void))0x00454D60)
780780
#define S_SaveSettings ((void __cdecl (*)(void))0x004550C0)
781781
#define S_LoadSettings ((void __cdecl (*)(void))0x00455140)
782-
#define CopyBitmapPalette ((void __cdecl (*)(RGB888 *srcPal, BYTE *srcBitmap, int32_t bitmapSize, RGB888 *destPal))0x004557A0)
783-
#define FindNearestPaletteEntry ((BYTE __cdecl (*)(RGB888 *palette, int32_t red, int32_t green, int32_t blue, bool ignoreSysPalette))0x004558E0)
784-
#define SyncSurfacePalettes ((void __cdecl (*)(void *srcData, int32_t width, int32_t height, int32_t srcPitch, RGB888 *srcPalette, void *dstData, int32_t dstPitch, RGB888 *dstPalette, bool preserveSysPalette))0x004559B0)
782+
#define CopyBitmapPalette ((void __cdecl (*)(RGB888 *src_pal, BYTE *src_bitmap, int32_t bitmap_size, RGB888 *dest_pal))0x004557A0)
783+
#define FindNearestPaletteEntry ((BYTE __cdecl (*)(RGB888 *palette, int32_t red, int32_t green, int32_t blue, bool ignore_sys_palette))0x004558E0)
784+
#define SyncSurfacePalettes ((void __cdecl (*)(void *src_data, int32_t width, int32_t height, int32_t src_pitch, RGB888 *src_palette, void *dst_data, int32_t dst_pitch, RGB888 *dst_palette, bool preserve_sys_palette))0x004559B0)
785785
#define CreateTexturePalette ((int32_t __cdecl (*)(RGB888 *pal))0x00455A60)
786786
#define GetFreePaletteIndex ((int32_t __cdecl (*)(void))0x00455AF0)
787-
#define FreePalette ((void __cdecl (*)(int32_t paletteIndex))0x00455B10)
788-
#define SafeFreePalette ((void __cdecl (*)(int32_t paletteIndex))0x00455B40)
787+
#define FreePalette ((void __cdecl (*)(int32_t palette_idx))0x00455B10)
788+
#define SafeFreePalette ((void __cdecl (*)(int32_t palette_idx))0x00455B40)
789789
#define CreateTexturePage ((int32_t __cdecl (*)(int32_t width, int32_t height, bool alpha))0x00455B90)
790790
#define GetFreeTexturePageIndex ((int32_t __cdecl (*)(void))0x00455C00)
791791
#define CreateTexturePageSurface ((bool __cdecl (*)(TEXPAGE_DESC *desc))0x00455C20)
792792
#define TexturePageInit ((bool __cdecl (*)(TEXPAGE_DESC *page))0x00455CC0)
793793
#define Create3DTexture ((LPDIRECT3DTEXTURE2 __cdecl (*)(LPDDS surface))0x00455E40)
794-
#define SafeFreeTexturePage ((void __cdecl (*)(int32_t pageIndex))0x00455E70)
795-
#define FreeTexturePage ((void __cdecl (*)(int32_t pageIndex))0x00455E90)
794+
#define SafeFreeTexturePage ((void __cdecl (*)(int32_t page_idx))0x00455E70)
795+
#define FreeTexturePage ((void __cdecl (*)(int32_t page_idx))0x00455E90)
796796
#define TexturePageReleaseVidMemSurface ((void __cdecl (*)(TEXPAGE_DESC *page))0x00455ED0)
797797
#define FreeTexturePages ((void __cdecl (*)(void))0x00455F10)
798-
#define LoadTexturePage ((bool __cdecl (*)(int32_t pageIndex, bool reset))0x00455F40)
798+
#define LoadTexturePage ((bool __cdecl (*)(int32_t page_idx, bool reset))0x00455F40)
799799
#define ReloadTextures ((bool __cdecl (*)(bool reset))0x00455FF0)
800-
#define GetTexturePageHandle ((HWR_TEX_HANDLE __cdecl (*)(int32_t pageIndex))0x00456030)
801-
#define AddTexturePage8 ((int32_t __cdecl (*)(int32_t width, int32_t height, BYTE *pageBuffer, int32_t palIndex))0x00456070)
802-
#define AddTexturePage16 ((int32_t __cdecl (*)(int32_t width, int32_t height, BYTE *pageBuffer))0x00456170)
800+
#define GetTexturePageHandle ((HWR_TEX_HANDLE __cdecl (*)(int32_t page_idx))0x00456030)
801+
#define AddTexturePage8 ((int32_t __cdecl (*)(int32_t width, int32_t height, BYTE *page_buf, int32_t pal_idx))0x00456070)
802+
#define AddTexturePage16 ((int32_t __cdecl (*)(int32_t width, int32_t height, BYTE *page_buf))0x00456170)
803803
#define EnumTextureFormatsCallback ((HRESULT __stdcall (*)(LPDDSDESC lpDdsd, LPVOID lpContext))0x00456310)
804804
#define EnumerateTextureFormats ((HRESULT __cdecl (*)(void))0x00456430)
805805
#define CleanupTextures ((void __cdecl (*)(void))0x00456460)

‎src/global/types.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,11 @@ typedef enum GF_LEVEL_TYPE {
678678
GFL_MIDSTORY,
679679
} GF_LEVEL_TYPE;
680680

681+
typedef struct PICKUP_INFO {
682+
int16_t timer;
683+
int16_t sprite;
684+
} PICKUP_INFO;
685+
681686
typedef struct INVENTORY_ITEM {
682687
char *string;
683688
int16_t obj_num;

‎src/global/vars.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@
192192
#define g_NextItemActive (*(int16_t*)0x005207C8)
193193
#define g_NextEffectActive (*(int16_t*)0x005207CA)
194194
#define g_PrevItemActive (*(int16_t*)0x005207CC)
195+
#define g_Pickups (*(struct PICKUP_INFO(*)[12])0x00521CA0)
195196
#define g_GameFlow (*(struct GAME_FLOW*)0x00521DE0)
196197
#define g_SoundFxCount (*(int32_t*)0x00521FDC)
197198
#define g_Objects (*(struct OBJECT_INFO(*)[265])0x00522000)

0 commit comments

Comments
 (0)