From e2bff090d6bdae6eb76112f3e75492ba05869eca Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 20 Jul 2019 21:08:49 +0200 Subject: [PATCH] Come up with names for all remaning arguments --- Source/control.cpp | 10 +++++----- Source/control.h | 2 +- Source/gamemenu.h | 26 +++++++++++++------------- Source/gmenu.cpp | 4 ++-- Source/gmenu.h | 4 ++-- Source/mainmenu.h | 2 +- Source/multi.cpp | 30 +++++++++++++++--------------- Source/multi.h | 10 +++++----- Source/nthread.cpp | 2 +- Source/nthread.h | 2 +- Source/pfile.cpp | 4 ++-- Source/pfile.h | 2 +- 12 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Source/control.cpp b/Source/control.cpp index 55d1a1c26..56baf06d6 100644 --- a/Source/control.cpp +++ b/Source/control.cpp @@ -2459,14 +2459,14 @@ void DrawTalkPan() } } -char *control_print_talk_msg(char *msg, int x, int y, int *a4, int color) +char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int color) { BYTE c; int width; x += 264; width = x; - *a4 = PitchTbl[y + 534] + x; + *nOffset = PitchTbl[y + 534] + x; while (*msg) { c = fontframe[gbFontTransTbl[(BYTE)*msg]]; @@ -2475,11 +2475,11 @@ char *control_print_talk_msg(char *msg, int x, int y, int *a4, int color) return msg; msg++; if (c) { - CPrintString(*a4, c, color); + CPrintString(*nOffset, c, color); } - *a4 += fontkern[c] + 1; + *nOffset += fontkern[c] + 1; } - return 0; + return NULL; } BOOL control_check_talk_btn() diff --git a/Source/control.h b/Source/control.h index 04fdb03c9..91507b899 100644 --- a/Source/control.h +++ b/Source/control.h @@ -109,7 +109,7 @@ void control_drop_gold(char vkey); void control_remove_gold(int pnum, int gold_index); void control_set_gold_curs(int pnum); void DrawTalkPan(); -char *control_print_talk_msg(char *msg, int x, int y, int *a4, int just); +char *control_print_talk_msg(char *msg, int x, int y, int *nOffset, int just); BOOL control_check_talk_btn(); void control_release_talk_btn(); void control_reset_talk_msg(); diff --git a/Source/gamemenu.h b/Source/gamemenu.h index 6244d84f0..96daa5428 100644 --- a/Source/gamemenu.h +++ b/Source/gamemenu.h @@ -3,28 +3,28 @@ #define __GAMEMENU_H__ void gamemenu_previous(); -void gamemenu_enable_single(TMenuItem *a1); -void gamemenu_enable_multi(TMenuItem *a1); +void gamemenu_enable_single(TMenuItem *pMenuItems); +void gamemenu_enable_multi(TMenuItem *pMenuItems); void gamemenu_off(); void gamemenu_handle_previous(); -void j_gamemenu_previous(BOOL a1); -void gamemenu_new_game(BOOL a1); -void gamemenu_quit_game(BOOL a1); -void gamemenu_load_game(BOOL a1); -void gamemenu_save_game(BOOL a1); -void gamemenu_restart_town(BOOL a1); -void gamemenu_options(BOOL a1); +void j_gamemenu_previous(BOOL bActivate); +void gamemenu_new_game(BOOL bActivate); +void gamemenu_quit_game(BOOL bActivate); +void gamemenu_load_game(BOOL bActivate); +void gamemenu_save_game(BOOL bActivate); +void gamemenu_restart_town(BOOL bActivate); +void gamemenu_options(BOOL bActivate); void gamemenu_get_music(); void gamemenu_sound_music_toggle(char **names, TMenuItem *menu_item, int gamma); void gamemenu_get_sound(); void gamemenu_get_color_cycling(); void gamemenu_get_gamma(); -void gamemenu_music_volume(BOOL a1); +void gamemenu_music_volume(BOOL bActivate); int gamemenu_slider_music_sound(TMenuItem *menu_item); -void gamemenu_sound_volume(BOOL a1); -void gamemenu_gamma(BOOL a1); +void gamemenu_sound_volume(BOOL bActivate); +void gamemenu_gamma(BOOL bActivate); int gamemenu_slider_gamma(); -void gamemenu_color_cycling(BOOL a1); +void gamemenu_color_cycling(BOOL bActivate); /* rdata */ extern char *music_toggle_names[]; diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp index 5acedfd9c..0b7a5165e 100644 --- a/Source/gmenu.cpp +++ b/Source/gmenu.cpp @@ -223,11 +223,11 @@ int gmenu_get_lfont(TMenuItem *pItem) return i - 2; } -BOOL gmenu_presskeys(int a1) +BOOL gmenu_presskeys(int vkey) { if (!sgpCurrentMenu) return 0; - switch (a1) { + switch (vkey) { case VK_RETURN: if ((sgpCurrItem->dwFlags & GMENU_ENABLED) != 0) { PlaySFX(IS_TITLEMOV); diff --git a/Source/gmenu.h b/Source/gmenu.h index c4ac6da3f..997aaffe9 100644 --- a/Source/gmenu.h +++ b/Source/gmenu.h @@ -21,10 +21,10 @@ BOOL gmenu_exception(); void gmenu_call_proc(TMenuItem *pItem, void (*gmFunc)(TMenuItem *)); void gmenu_up_down(BOOL isDown); void gmenu_draw(); -void gmenu_draw_menu_item(TMenuItem *pItem, int a2); +void gmenu_draw_menu_item(TMenuItem *pItem, int y); void gmenu_clear_buffer(int x, int y, int width, int height); int gmenu_get_lfont(TMenuItem *pItem); -BOOL gmenu_presskeys(int a1); +BOOL gmenu_presskeys(int vkey); void gmenu_left_right(BOOL isRight); BOOL gmenu_on_mouse_move(); BOOLEAN gmenu_valid_mouse_pos(int *plOffset); diff --git a/Source/mainmenu.h b/Source/mainmenu.h index 4561cede2..c2bc0dd63 100644 --- a/Source/mainmenu.h +++ b/Source/mainmenu.h @@ -17,7 +17,7 @@ int __stdcall mainmenu_select_hero_dialog( BOOL *multi); // new character? - unsure about this void mainmenu_loop(); BOOL mainmenu_single_player(); -BOOL mainmenu_init_menu(int a1); +BOOL mainmenu_init_menu(int type); BOOL mainmenu_multi_player(); void mainmenu_play_intro(); diff --git a/Source/multi.cpp b/Source/multi.cpp index 844e54f3a..3364b15ca 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -152,13 +152,13 @@ void NetSendHiPri(BYTE *pbMsg, BYTE bLen) } } -BYTE *multi_recv_packet(TBuffer *packet, BYTE *body, int *size) +BYTE *multi_recv_packet(TBuffer *pBuf, BYTE *body, int *size) { BYTE *src_ptr; size_t chunk_size; - if (packet->dwNextWriteOffset != 0) { - src_ptr = packet->bData; + if (pBuf->dwNextWriteOffset != 0) { + src_ptr = pBuf->bData; while (TRUE) { if (*src_ptr == 0) break; @@ -171,14 +171,14 @@ BYTE *multi_recv_packet(TBuffer *packet, BYTE *body, int *size) src_ptr += chunk_size; *size -= chunk_size; } - memcpy(packet->bData, src_ptr, (packet->bData - src_ptr) + packet->dwNextWriteOffset + 1); - packet->dwNextWriteOffset += (packet->bData - src_ptr); + memcpy(pBuf->bData, src_ptr, (pBuf->bData - src_ptr) + pBuf->dwNextWriteOffset + 1); + pBuf->dwNextWriteOffset += (pBuf->bData - src_ptr); return body; } return body; } -void multi_send_msg_packet(int pmask, BYTE *a2, BYTE len) +void multi_send_msg_packet(int pmask, BYTE *src, BYTE len) { DWORD v, p, t; TPkt pkt; @@ -186,7 +186,7 @@ void multi_send_msg_packet(int pmask, BYTE *a2, BYTE len) NetRecvPlrData(&pkt); t = len + 19; pkt.hdr.wLen = t; - memcpy(pkt.body, a2, len); + memcpy(pkt.body, src, len); for (v = 1, p = 0; p < MAX_PLRS; p++, v <<= 1) { if (v & pmask) { if (!SNetSendMessage(p, &pkt.hdr, t) && SErrGetLastError() != STORM_ERROR_INVALID_PLAYER) { @@ -338,9 +338,9 @@ int multi_handle_delta() } // Microsoft VisualC 2-11/net runtime -int multi_check_pkt_valid(TBuffer *a1) +int multi_check_pkt_valid(TBuffer *pBuf) { - return a1->dwNextWriteOffset == 0; + return pBuf->dwNextWriteOffset == 0; } void multi_mon_seeds() @@ -531,12 +531,12 @@ void multi_process_tmsgs() } } -void multi_send_zero_packet(DWORD pnum, char a2, void *pbSrc, DWORD dwLen) +void multi_send_zero_packet(DWORD pnum, char identifier, void *pbSrc, DWORD dwLen) { - DWORD v5, dwBody; + DWORD len, dwBody; TPkt pkt; int t; - v5 = 0; + len = 0; while (dwLen) { pkt.hdr.wCheck = 'ip'; pkt.hdr.px = 0; @@ -548,8 +548,8 @@ void multi_send_zero_packet(DWORD pnum, char a2, void *pbSrc, DWORD dwLen) pkt.hdr.bstr = 0; pkt.hdr.bmag = 0; pkt.hdr.bdex = 0; - pkt.body[0] = a2; - *(WORD *)&pkt.body[1] = v5; + pkt.body[0] = identifier; + *(WORD *)&pkt.body[1] = len; dwBody = gdwLargestMsgSize - 24; if (dwLen < dwBody) dwBody = dwLen; @@ -563,7 +563,7 @@ void multi_send_zero_packet(DWORD pnum, char a2, void *pbSrc, DWORD dwLen) } pbSrc = (char *)pbSrc + *(WORD *)&pkt.body[3]; dwLen -= *(WORD *)&pkt.body[3]; - v5 += *(WORD *)&pkt.body[3]; + len += *(WORD *)&pkt.body[3]; } } diff --git a/Source/multi.h b/Source/multi.h index 5766fbe4e..f25a4f939 100644 --- a/Source/multi.h +++ b/Source/multi.h @@ -20,12 +20,12 @@ void __cdecl dumphist(const char *pszFmt, ...); #endif void multi_msg_add(BYTE *pbMsg, BYTE bLen); void NetSendLoPri(BYTE *pbMsg, BYTE bLen); -void multi_copy_packet(TBuffer *buf, void *packet, BYTE size); +void multi_copy_packet(TBuffer *pBuf, void *packet, BYTE size); void multi_send_packet(void *packet, BYTE dwSize); void NetRecvPlrData(TPkt *pkt); void NetSendHiPri(BYTE *pbMsg, BYTE bLen); -BYTE *multi_recv_packet(TBuffer *packet, BYTE *body, int *size); -void multi_send_msg_packet(int pmask, BYTE *a2, BYTE len); +BYTE *multi_recv_packet(TBuffer *pBuf, BYTE *body, int *size); +void multi_send_msg_packet(int pmask, BYTE *src, BYTE len); void multi_msg_countdown(); void multi_parse_turn(int pnum, int turn); void multi_handle_turn_upper_bit(int pnum); @@ -34,14 +34,14 @@ void multi_clear_left_tbl(); void multi_player_left_msg(int pnum, int left); void multi_net_ping(); int multi_handle_delta(); -int multi_check_pkt_valid(TBuffer *a1); +int multi_check_pkt_valid(TBuffer *pBuf); void multi_mon_seeds(); void multi_begin_timeout(); void multi_check_drop_player(); void multi_process_network_packets(); void multi_handle_all_packets(int pnum, BYTE *pData, int nSize); void multi_process_tmsgs(); -void multi_send_zero_packet(DWORD pnum, char a2, void *pbSrc, DWORD dwLen); +void multi_send_zero_packet(DWORD pnum, char identifier, void *pbSrc, DWORD dwLen); void NetClose(); void multi_event_handler(BOOL add); void __stdcall multi_handle_events(_SNETEVENT *pEvt); diff --git a/Source/nthread.cpp b/Source/nthread.cpp index 54e26a016..0d6f47877 100644 --- a/Source/nthread.cpp +++ b/Source/nthread.cpp @@ -168,7 +168,7 @@ void nthread_start(BOOL set_turn_upper_bit) } } -unsigned int __stdcall nthread_handler(void *a1) +unsigned int __stdcall nthread_handler(void *) { int delta; int received; diff --git a/Source/nthread.h b/Source/nthread.h index 8b0a98c10..84263e95f 100644 --- a/Source/nthread.h +++ b/Source/nthread.h @@ -20,7 +20,7 @@ DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta); BOOL nthread_recv_turns(BOOL *pfSendAsync); void nthread_set_turn_upper_bit(); void nthread_start(BOOL set_turn_upper_bit); -unsigned int __stdcall nthread_handler(void *a1); +unsigned int __stdcall nthread_handler(void *); void nthread_cleanup(); void nthread_ignore_mutex(BOOL bStart); BOOL nthread_has_500ms_passed(BOOL unused); diff --git a/Source/pfile.cpp b/Source/pfile.cpp index 8da2e20ac..10fefc83b 100644 --- a/Source/pfile.cpp +++ b/Source/pfile.cpp @@ -95,7 +95,7 @@ void pfile_encode_hero(const PkPlayerStruct *pPack) mem_free_dbg(packed); } -BOOL pfile_open_archive(BOOL a1, DWORD save_num) +BOOL pfile_open_archive(BOOL update, DWORD save_num) { char FileName[MAX_PATH]; @@ -103,7 +103,7 @@ BOOL pfile_open_archive(BOOL a1, DWORD save_num) if (OpenMPQ(FileName, FALSE, save_num)) return TRUE; - if (a1 && gbMaxPlayers > 1) + if (update && gbMaxPlayers > 1) mpqapi_store_default_time(save_num); return FALSE; } diff --git a/Source/pfile.h b/Source/pfile.h index 58985a6fb..94233dfea 100644 --- a/Source/pfile.h +++ b/Source/pfile.h @@ -9,7 +9,7 @@ void pfile_check_available_space(char *pszDir); void pfile_write_hero(); DWORD pfile_get_save_num_from_name(const char *name); void pfile_encode_hero(const PkPlayerStruct *pPack); -BOOL pfile_open_archive(BOOL a1, DWORD save_num); +BOOL pfile_open_archive(BOOL update, DWORD save_num); void pfile_get_save_path(char *pszBuf, DWORD dwBufSize, DWORD save_num); void pfile_flush(BOOL is_single_player, DWORD save_num); BOOL pfile_create_player_description(char *dst, DWORD len);