From ad012c6da25b09c137aeba4989c8ba09888a1a78 Mon Sep 17 00:00:00 2001 From: nomdenom Date: Mon, 1 Oct 2018 21:37:40 -0700 Subject: [PATCH] fixup: update decls.h --- Absolute/absolute-decls.h | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Absolute/absolute-decls.h b/Absolute/absolute-decls.h index 8f1ab2b10..d48f59bfd 100644 --- a/Absolute/absolute-decls.h +++ b/Absolute/absolute-decls.h @@ -444,7 +444,7 @@ void __cdecl d_InitL5Dungeon(); void __cdecl d_L5ClearFlags(); void __cdecl d_L5firstRoom(); void __fastcall d_L5drawRoom(int x,int y,int w,int h); -void __fastcall d_L5roomGen(int x,int y,int w,int h,BOOL dir); +void __fastcall d_L5roomGen(int x,int y,int w,int h,int dir); BOOL __fastcall d_L5checkRoom(int x,int y,int width,int height); int __cdecl d_L5GetArea(); void __cdecl d_L5makeDungeon(); @@ -599,14 +599,14 @@ void __cdecl d_dx_reinit(); void __cdecl d_j_dx_reinit(); void d_j_effects_cpp_init(...); // Unknown signature void __cdecl d_effects_cpp_init(); -bool __fastcall d_effect_is_playing(int nSFX); +BOOL __fastcall d_effect_is_playing(int nSFX); void __cdecl d_sfx_stop(); void __fastcall d_InitMonsterSND(int monst); void __cdecl d_FreeEffects(); void __fastcall d_PlayEffect(int i,int mode); -int __fastcall d_calc_snd_position(int x,int y,int * plVolume,int * plPan); +BOOL __fastcall d_calc_snd_position(int x,int y,int * plVolume,int * plPan); void __fastcall d_PlaySFX(int psfx); -void __fastcall d_PlaySFX_priv(TSFX * pSFX,char loc,int x,int y); +void __fastcall d_PlaySFX_priv(TSFX * pSFX,BOOL loc,int x,int y); void __fastcall d_stream_play(TSFX * pSFX,int lVolume,int lPan); int __fastcall d_RndSFX(int psfx); void __fastcall d_PlaySfxLoc(int psfx,int x,int y); @@ -1327,7 +1327,7 @@ void __fastcall d_mpqapi_free_block(int block_offset,int block_size); _BLOCKENTRY * __fastcall d_mpqapi_new_block(int * block_index); int __fastcall d_mpqapi_get_hash_index_of_path(const char * pszName); int __fastcall d_mpqapi_get_hash_index(short index,int hash_a,int hash_b,int locale); -void __fastcall d_mpqapi_remove_hash_entries(BOOL (__stdcall * fnGetName)(int,char *)); +void __fastcall d_mpqapi_remove_hash_entries(BOOL (__stdcall * fnGetName)(DWORD,char *)); BOOL __fastcall d_mpqapi_write_file(const char * pszName,const char * pbData,DWORD dwLen); _BLOCKENTRY * __fastcall d_mpqapi_add_file(const char * pszName,_BLOCKENTRY * pBlk,int block_index); bool __fastcall d_mpqapi_write_file_contents(const char * pszName,const char * pbData,int dwLen,_BLOCKENTRY * pBlk); @@ -1726,39 +1726,39 @@ void __cdecl d_pfile_cpp_init(); void __cdecl d_pfile_init_save_directory(); void __fastcall d_pfile_check_available_space(char * pszDir); void __cdecl d_pfile_write_hero(); -int __fastcall d_pfile_get_save_num_from_name(char * name); -void __fastcall d_pfile_encode_hero(PkPlayerStruct * pPack); -bool __fastcall d_pfile_open_archive(bool a1,int save_num); -void __fastcall d_pfile_get_save_path(char * pszBuf,int dwBufSize,int save_num); -void __fastcall d_pfile_flush(bool is_single_player,int save_num); +unsigned int __fastcall d_pfile_get_save_num_from_name(const char * name); +void __fastcall d_pfile_encode_hero(const PkPlayerStruct * pPack); +BOOL __fastcall d_pfile_open_archive(BOOL a1,unsigned int save_num); +void __fastcall d_pfile_get_save_path(char * pszBuf,DWORD dwBufSize,unsigned int save_num); +void __fastcall d_pfile_flush(BOOL is_single_player,unsigned int save_num); bool __fastcall d_pfile_create_player_description(char * dst,int len); int __fastcall d_pfile_create_save_file(char * name_1,char * name_2); void __cdecl d_pfile_flush_W(); -void __fastcall d_game_2_ui_player(PlayerStruct * p,_uiheroinfo * heroinfo,BOOL bHasSaveFile); -char __fastcall d_game_2_ui_class(PlayerStruct * p); +void __fastcall d_game_2_ui_player(const PlayerStruct * p,_uiheroinfo * heroinfo,BOOL bHasSaveFile); +unsigned char __fastcall d_game_2_ui_class(const PlayerStruct * p); BOOL __stdcall d_pfile_ui_set_hero_infos(BOOL (__stdcall * ui_add_hero_info)(_uiheroinfo *)); -char * __fastcall d_GetSaveDirectory(char * dst,int dst_size,int save_num); -bool __fastcall d_pfile_read_hero(void * archive,PkPlayerStruct * pPack); -void * __fastcall d_pfile_open_save_archive(int * unused,int save_num); -void __fastcall d_pfile_SFileCloseArchive(void * hsArchive); -BOOL __fastcall d_pfile_archive_contains_game(void * hsArchive); +char * __fastcall d_GetSaveDirectory(char * dst,int dst_size,unsigned int save_num); +BOOL __fastcall d_pfile_read_hero(void * archive,PkPlayerStruct * pPack); +HANDLE __fastcall d_pfile_open_save_archive(int * unused,unsigned int save_num); +void __fastcall d_pfile_SFileCloseArchive(HANDLE hsArchive); +BOOL __fastcall d_pfile_archive_contains_game(HANDLE hsArchive); BOOL __stdcall d_pfile_ui_set_class_stats(int player_class_nr,_uidefaultstats * class_stats); -int __fastcall d_pfile_get_player_class(int player_class_nr); +char __fastcall d_pfile_get_player_class(unsigned int player_class_nr); BOOL __stdcall d_pfile_ui_save_create(_uiheroinfo * heroinfo); -BOOL __stdcall d_pfile_get_file_name(int lvl,char * dst); +BOOL __stdcall d_pfile_get_file_name(DWORD lvl,char * dst); BOOL __stdcall d_pfile_delete_save(_uiheroinfo * hero_info); void __cdecl d_pfile_read_player_from_save(); void __fastcall d_GetTempLevelNames(char * szTemp); void __fastcall d_GetPermLevelNames(char * szPerm); void __fastcall d_pfile_get_game_name(char * dst); void __cdecl d_pfile_remove_temp_files(); -BOOL __stdcall d_GetTempSaveNames(int dwIndex,char * szTemp); +BOOL __stdcall d_GetTempSaveNames(DWORD dwIndex,char * szTemp); void __cdecl d_pfile_rename_temp_to_perm(); -bool __stdcall d_GetPermSaveNames(int dwIndex,char * szPerm); +BOOL __stdcall d_GetPermSaveNames(DWORD dwIndex,char * szPerm); void __fastcall d_pfile_write_save_file(char * pszName,void * pbData,int dwLen,int qwLen); -void __fastcall d_pfile_strcpy(char * dst,char * src); +void __fastcall d_pfile_strcpy(char * dst,const char * src); char * __fastcall d_pfile_read(char * pszName,int * pdwLen); -void __fastcall d_pfile_update(bool force_save); +void __fastcall d_pfile_update(BOOL force_save); void d_j_player_cpp_init(...); // Unknown signature void __cdecl d_player_cpp_init(); void __fastcall d_SetPlayerGPtrs(UCHAR * pData,UCHAR ** pAnim); @@ -1944,24 +1944,24 @@ void __fastcall d_SHA1ProcessMessageBlock(SHA1Context * context); void __fastcall d_SHA1Reset(int n); void d_j_sound_cpp_init(...); // Unknown signature void __cdecl d_sound_cpp_init(); -void __fastcall d_snd_update(bool bStopAll); +void __fastcall d_snd_update(BOOL bStopAll); void __fastcall d_snd_stop_snd(TSnd * pSnd); -bool __fastcall d_snd_playing(TSnd * pSnd); +BOOL __fastcall d_snd_playing(TSnd * pSnd); void __fastcall d_snd_play_snd(TSnd * pSnd,int lVolume,int lPan); IDirectSoundBuffer * __fastcall d_sound_dup_channel(IDirectSoundBuffer * DSB); -bool __fastcall d_sound_file_reload(TSnd * sound_file,IDirectSoundBuffer * DSB); +BOOL __fastcall d_sound_file_reload(TSnd * sound_file,IDirectSoundBuffer * DSB); TSnd * __fastcall d_sound_file_load(char * path); void __fastcall d_sound_CreateSoundBuffer(TSnd * sound_file); void __fastcall d_sound_file_cleanup(TSnd * sound_file); void __fastcall d_snd_init(HWND hWnd); void __fastcall d_sound_load_volume(char * value_name,int * value); -void __fastcall d_sound_create_primary_buffer(int music_track); -int __fastcall d_sound_DirectSoundCreate(GUID * guid,IDirectSound ** DS,int always_null); +void __fastcall d_sound_create_primary_buffer(HANDLE music_track); +HRESULT __fastcall d_sound_DirectSoundCreate(LPGUID lpGuid,LPDIRECTSOUND * ppDS,LPUNKNOWN pUnkOuter); void __cdecl d_sound_cleanup(); void __fastcall d_sound_store_volume(char * key,int value); void __cdecl d_music_stop(); void __fastcall d_music_start(int nTrack); -void __fastcall d_sound_disable_music(bool disable); +void __fastcall d_sound_disable_music(BOOL disable); int __fastcall d_sound_get_or_set_music_volume(int volume); int __fastcall d_sound_get_or_set_sound_volume(int volume); int __fastcall d_GetManaAmount(int id,int sn); @@ -2193,7 +2193,7 @@ bool __fastcall d_WCloseFile(void * file); int __fastcall d_WGetFileSize(HANDLE hsFile,unsigned long * a2); void __fastcall d_WGetFileArchive(HANDLE hsFile,int * a2,char * dwInitParam); int __fastcall d_WOpenFile(char * dwInitParam,HANDLE * phsFile,int a3); -void __fastcall d_WReadFile(HANDLE hsFile,char * buf,int a3); +void __fastcall d_WReadFile(HANDLE hsFile,LPVOID buf,int a3); int __fastcall d_WSetFilePointer(HANDLE file1,int offset,HANDLE file2,int whence); int __fastcall d_LoadWaveFormat(HANDLE hsFile,WAVEFORMATEX * pwfx); void * __fastcall d_AllocateMemFile(HANDLE hsFile,MEMFILE * pMemFile,unsigned int dwPos);