vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Menu: Fix warning by casting explicitly.

Browse source
This commit is contained in:
Marco Cawthorne 2020-07-01 08:31:16 +02:00
parent a0ba14d5de
commit c033f5d88e
53 changed files with 742 additions and 382 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/menu-fn/colors.cpp
View file

@ -66,7 +66,8 @@ Colors_RGB255_to_HEX(vector color)
return Colors_RGB8_to_HEX(color / 255);
}
void Colors_Init(void)
void
Colors_Init(void)
{
int c;
vector coltmp;

9
src/menu-fn/m_addserver.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_addserver_init(void)
void
menu_addserver_init(void)
{
}
void menu_addserver_draw(void)
void
menu_addserver_draw(void)
{
}
void menu_addserver_input(float evtype, float scanx, float chary, float devid)
void
menu_addserver_input(float evtype, float scanx, float chary, float devid)
{
}

9
src/menu-fn/m_advancedcontrols.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_advancedcontrols_init(void)
void
menu_advancedcontrols_init(void)
{
}
void menu_advancedcontrols_draw(void)
void
menu_advancedcontrols_draw(void)
{
}
void menu_advancedcontrols_input(float evtype, float scanx, float chary, float devid)
void
menu_advancedcontrols_input(float evtype, float scanx, float chary, float devid)
{
}

16
src/menu-fn/m_advancedcustomize.cpp
View file

@ -18,7 +18,8 @@ CWidget fn_advcustomize;
CMainButton ac_btnDone;
CMainButton ac_btnCancel;
void ac_btndone_start(void)
void
ac_btndone_start(void)
{
static void ac_btndone_end(void) {
g_menupage = PAGE_CUSTOMIZE;
@ -31,7 +32,9 @@ void ac_btndone_start(void)
header.SetHeader(HEAD_ADVANCED);
header.SetExecute(ac_btndone_end);
}
void ac_btncancel_start(void)
void
ac_btncancel_start(void)
{
static void ac_btncancel_end(void) {
g_menupage = PAGE_CUSTOMIZE;
@ -45,7 +48,8 @@ void ac_btncancel_start(void)
header.SetExecute(ac_btncancel_end);
}
void menu_advancedcustomize_init(void)
void
menu_advancedcustomize_init(void)
{
fn_advcustomize = spawn(CWidget);
ac_btnDone = spawn(CMainButton);
@ -61,13 +65,15 @@ void menu_advancedcustomize_init(void)
Widget_Add(fn_advcustomize, ac_btnCancel);
}
void menu_advancedcustomize_draw(void)
void
menu_advancedcustomize_draw(void)
{
Widget_Draw(fn_advcustomize);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_ADVOPTIONS],[460,80], [1,1,1], 1.0f, 1);
}
void menu_advancedcustomize_input(float evtype, float scanx, float chary, float devid)
void
menu_advancedcustomize_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_advcustomize, evtype, scanx, chary, devid);
}

9
src/menu-fn/m_advancedmpoptions.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_advancedmpoptions_init(void)
void
menu_advancedmpoptions_init(void)
{
}
void menu_advancedmpoptions_draw(void)
void
menu_advancedmpoptions_draw(void)
{
}
void menu_advancedmpoptions_input(float evtype, float scanx, float chary, float devid)
void
menu_advancedmpoptions_input(float evtype, float scanx, float chary, float devid)
{
}

38
src/menu-fn/m_audio.cpp
View file

@ -29,7 +29,8 @@ CSlider au_sldMusicVolume;
#endif
/* Button Callbacks */
void au_btndone_start(void)
void
au_btndone_start(void)
{
static void au_btndone_end(void) {
g_menupage = PAGE_CONFIGURATION;
@ -42,40 +43,53 @@ void au_btndone_start(void)
header.SetHeader(HEAD_AUDIO);
header.SetExecute(au_btndone_end);
}
void au_sldvolume_changed(float val)
void
au_sldvolume_changed(float val)
{
cvar_set("volume", ftos(val));
}
void au_sldsuitvolume_changed(float val)
void
au_sldsuitvolume_changed(float val)
{
cvar_set("suitvolume", ftos(val));
}
#ifndef ACCURATE
void au_sldmusicvolume_changed(float val)
void
au_sldmusicvolume_changed(float val)
{
cvar_set("bgmvolume", ftos(val));
}
#endif
void au_cxcdmusic_changed(float val)
void
au_cxcdmusic_changed(float val)
{
}
void au_cxhqsound_changed(float val)
void
au_cxhqsound_changed(float val)
{
cvar_set("loadas8bit", ftos(1-val));
localcmd("snd_restart");
}
void au_cxa3dsound_changed(float val)
void
au_cxa3dsound_changed(float val)
{
}
void au_cxeaxsound_changed(float val)
void
au_cxeaxsound_changed(float val)
{
cvar_set("snd_eax", ftos(val));
}
void menu_audio_init(void)
void
menu_audio_init(void)
{
fn_audio = spawn(CWidget);
au_btnDone = spawn(CMainButton);
@ -126,7 +140,8 @@ void menu_audio_init(void)
Widget_Add(fn_audio, au_cxEAXSound);
}
void menu_audio_draw(void)
void
menu_audio_draw(void)
{
Widget_Draw(fn_audio);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_AUDIO],[460,80], [1,1,1], 1.0f, 1);
@ -154,7 +169,8 @@ void menu_audio_draw(void)
#endif
}
void menu_audio_input(float evtype, float scanx, float chary, float devid)
void
menu_audio_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_audio, evtype, scanx, chary, devid);
}

34
src/menu-fn/m_chatrooms.cpp
View file

@ -22,7 +22,6 @@ CMainButton cr_btnListRooms;
CMainButton cr_btnSearch;
CMainButton cr_btnServers;
CMainButton cr_btnDone;
CScrollbar cr_sbHistory;
CTextBuffer cr_lbHistory;
CListBox cr_lbUsers;
CDialog cr_dgConnect;
@ -238,7 +237,8 @@ irc_receive(string buffer)
}
/* initial connect */
void cr_makeconnection(void)
void
cr_makeconnection(void)
{
int i;
i = TCP_Connect(&tcp_irc, "tcp://irc.frag-net.com:6667");
@ -252,7 +252,8 @@ void cr_makeconnection(void)
}
/* when ENTER is pressed on the message box */
void cr_input_enter(string text)
void
cr_input_enter(string text)
{
if (!text)
return;
@ -270,12 +271,14 @@ void cr_input_enter(string text)
cr_tbInput.SetText("");
}
void cr_closeconnection(void)
void
cr_closeconnection(void)
{
TCP_Disconnect(&tcp_irc);
}
void cr_btndone_start(void)
void
cr_btndone_start(void)
{
static void cr_btndone_end(void) {
g_menupage = PAGE_MULTIPLAYER;
@ -290,7 +293,8 @@ void cr_btndone_start(void)
header.SetExecute(cr_btndone_end);
}
void cr_btnlistrooms_start(void)
void
cr_btnlistrooms_start(void)
{
static void cr_btnlistrooms_end(void) {
g_menupage = PAGE_CHATROOMS_LIST;
@ -308,12 +312,14 @@ void cr_btnlistrooms_start(void)
}
/* 'Done' button */
void cr_btnservers_prepare(void)
void
cr_btnservers_prepare(void)
{
cr_btnservers_start();
}
void menu_chatrooms_init(void)
void
menu_chatrooms_init(void)
{
fn_chatrooms = spawn(CWidget);
cr_btnListRooms = spawn(CMainButton);
@ -377,7 +383,8 @@ void menu_chatrooms_init(void)
cr_dgConnect = spawn(CDialog);
}
string menu_chatrooms_gettopic(void)
string
menu_chatrooms_gettopic(void)
{
if (g_ircroom.m_strTopic)
return g_ircroom.m_strTopic;
@ -385,7 +392,8 @@ string menu_chatrooms_gettopic(void)
return "No topic.";
}
void menu_chatrooms_draw(void)
void
menu_chatrooms_draw(void)
{
static float timeout;
@ -431,13 +439,15 @@ void menu_chatrooms_draw(void)
/* this function is run, even when the menu is visibly closed. we need to keep
* the TCP session with the IRC server alive afterall */
void menu_chatrooms_keepalive(void)
void
menu_chatrooms_keepalive(void)
{
TCP_Frame(&tcp_irc);
irc_receive(TCP_Receive(&tcp_irc));
}
void menu_chatrooms_input(float evtype, float scanx, float chary, float devid)
void
menu_chatrooms_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_chatrooms, evtype, scanx, chary, devid);
}

6
src/menu-fn/m_chatroomslist.cpp
View file

@ -128,7 +128,8 @@ void menu_chatroomslist_init(void)
Widget_Add(fn_chatroomslist, crl_btnCancel);
}
void menu_chatroomslist_draw(void)
void
menu_chatroomslist_draw(void)
{
Widget_Draw(fn_chatroomslist);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_ROOMS],[460,80], [1,1,1], 1.0f, 1);
@ -143,7 +144,8 @@ void menu_chatroomslist_draw(void)
}
}
void menu_chatroomslist_input(float evtype, float scanx, float chary, float devid)
void
menu_chatroomslist_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_chatroomslist, evtype, scanx, chary, devid);
}

28
src/menu-fn/m_configuration.cpp
View file

@ -23,7 +23,8 @@ CMainButton cf_btnUpdate;
CMainButton cf_btnDone;
/* Button Callbacks */
void btn_controls_start(void)
void
btn_controls_start(void)
{
static void btn_controls_end(void) {
g_menupage = PAGE_CONTROLS;
@ -36,7 +37,9 @@ void btn_controls_start(void)
header.SetHeader(HEAD_CONTROLS);
header.SetExecute(btn_controls_end);
}
void btn_audio_start(void)
void
btn_audio_start(void)
{
static void btn_audio_end(void) {
g_menupage = PAGE_AUDIO;
@ -49,7 +52,9 @@ void btn_audio_start(void)
header.SetHeader(HEAD_AUDIO);
header.SetExecute(btn_audio_end);
}
void btn_video_start(void)
void
btn_video_start(void)
{
static void btn_video_end(void) {
g_menupage = PAGE_VIDEO;
@ -62,12 +67,16 @@ void btn_video_start(void)
header.SetHeader(HEAD_VIDEO);
header.SetExecute(btn_video_end);
}
void cf_btnupdates_start(void)
void
cf_btnupdates_start(void)
{
localsound("../media/launch_upmenu1.wav");
g_menupage = PAGE_UPDATES;
}
void cf_btndone_start(void)
void
cf_btndone_start(void)
{
static void cf_btndone_end(void) {
g_menupage = PAGE_MAIN;
@ -82,7 +91,8 @@ void cf_btndone_start(void)
}
/* Init */
void menu_configuration_init(void)
void
menu_configuration_init(void)
{
fn_configuration = spawn(CWidget);
cf_btnControls = spawn(CMainButton);
@ -123,7 +133,8 @@ void menu_configuration_init(void)
}
/* Drawing */
void menu_configuration_draw(void)
void
menu_configuration_draw(void)
{
Widget_Draw(fn_configuration);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_CONFIG],[460,80], [1,1,1], 1.0f, 1);
@ -142,7 +153,8 @@ void menu_configuration_draw(void)
1.0f, 0, font_label);
}
void menu_configuration_input(float evtype, float scanx, float chary, float devid)
void
menu_configuration_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_configuration, evtype, scanx, chary, devid);
}

9
src/menu-fn/m_contentcontrol.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_contentcontrol_init(void)
void
menu_contentcontrol_init(void)
{
}
void menu_contentcontrol_draw(void)
void
menu_contentcontrol_draw(void)
{
}
void menu_contentcontrol_input(float evtype, float scanx, float chary, float devid)
void
menu_contentcontrol_input(float evtype, float scanx, float chary, float devid)
{
}

27
src/menu-fn/m_controls.cpp
View file

@ -31,7 +31,8 @@ CDialog mp_dgBind;
var int g_controlquery = -1;
void ctrl_btnok_start(void)
void
ctrl_btnok_start(void)
{
static void ctrl_btnok_end(void) {
g_menupage = PAGE_CONFIGURATION;
@ -45,7 +46,9 @@ void ctrl_btnok_start(void)
header.SetHeader(HEAD_CONTROLS);
header.SetExecute(ctrl_btnok_end);
}
void ctrl_btncancel_start(void)
void
ctrl_btncancel_start(void)
{
static void ctrl_btnok_end(void) {
g_menupage = PAGE_CONFIGURATION;
@ -59,13 +62,17 @@ void ctrl_btncancel_start(void)
header.SetHeader(HEAD_CONTROLS);
header.SetExecute(ctrl_btnok_end);
}
void ctrl_sbcontrols_changed(int val)
void
ctrl_sbcontrols_changed(int val)
{
ctrl_lbActDesc.SetScroll(val);
ctrl_lbActBind1.SetScroll(val);
ctrl_lbActBind2.SetScroll(val);
}
void ctrl_lb_clicked(int val)
void
ctrl_lb_clicked(int val)
{
static float clicked_last;
static int val_last;
@ -88,7 +95,8 @@ void ctrl_lb_clicked(int val)
clicked_last = time + 0.5f;
}
void menu_controls_update(void)
void
menu_controls_update(void)
{
int c, j, k, i;
@ -124,7 +132,8 @@ void menu_controls_update(void)
}
}
void menu_controls_init(void)
void
menu_controls_init(void)
{
fn_controls = spawn(CWidget);
mp_dgBind = spawn(CDialog);
@ -217,7 +226,8 @@ void menu_controls_init(void)
}
float g_ctrl_refresh;
void menu_controls_draw(void)
void
menu_controls_draw(void)
{
Widget_Draw(fn_controls);
@ -240,7 +250,8 @@ void menu_controls_draw(void)
}
}
void menu_controls_input(float evtype, float scanx, float chary, float devid)
void
menu_controls_input(float evtype, float scanx, float chary, float devid)
{
/* this comes first, or else the dialog will skip immediately */
if (g_controlquery >= 0) {

19
src/menu-fn/m_creategame.cpp
View file

@ -31,7 +31,8 @@ CScrollbar create_sbMaps;
string *g_maps;
int g_mapcount;
void create_btnok_start(void)
void
create_btnok_start(void)
{
static string startmap;
static void create_btnok_end(void) {
@ -57,7 +58,9 @@ void create_btnok_start(void)
header.SetHeader(HEAD_CREATEGAME);
header.SetExecute(create_btnok_end);
}
void create_btncancel_start(void)
void
create_btncancel_start(void)
{
static void create_btncancel_end(void) {
g_menupage = PAGE_LANGAMES;
@ -71,12 +74,14 @@ void create_btncancel_start(void)
header.SetExecute(create_btncancel_end);
}
void create_sbmaps_changed(int val)
void
create_sbmaps_changed(int val)
{
create_lbMaps.SetScroll(val);
}
void menu_creategame_init(void)
void
menu_creategame_init(void)
{
fn_create = spawn(CWidget);
create_btnAdv = spawn(CMainButton);
@ -143,7 +148,8 @@ void menu_creategame_init(void)
search_end(mapsearch);
}
void menu_creategame_draw(void)
void
menu_creategame_draw(void)
{
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_CREATEGAME],[460,80], [1,1,1], 1.0f, 1);
@ -160,7 +166,8 @@ void menu_creategame_draw(void)
Widget_Draw(fn_createshared);
}
void menu_creategame_input(float evtype, float scanx, float chary, float devid)
void
menu_creategame_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_create, evtype, scanx, chary, devid);
Widget_Input(fn_createshared, evtype, scanx, chary, devid);

16
src/menu-fn/m_creategame_inet.cpp
View file

@ -19,7 +19,8 @@ CMainButton createinet_btnAdv;
CMainButton createinet_btnOk;
CMainButton createinet_btnCancel;
void createinet_btnok_start(void)
void
createinet_btnok_start(void)
{
static string startmap;
static void createinet_btnok_end(void) {
@ -47,7 +48,9 @@ void createinet_btnok_start(void)
header.SetHeader(HEAD_CREATEGAME);
header.SetExecute(createinet_btnok_end);
}
void createinet_btncancel_start(void)
void
createinet_btncancel_start(void)
{
static void createinet_btncancel_end(void) {
g_menupage = PAGE_INTERNETGAMES;
@ -61,7 +64,8 @@ void createinet_btncancel_start(void)
header.SetExecute(createinet_btncancel_end);
}
void menu_creategameinet_init(void)
void
menu_creategameinet_init(void)
{
fn_createinet = spawn(CWidget);
createinet_btnAdv = spawn(CMainButton);
@ -83,7 +87,8 @@ void menu_creategameinet_init(void)
Widget_Add(fn_createinet, createinet_btnCancel);
}
void menu_creategameinet_draw(void)
void
menu_creategameinet_draw(void)
{
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_CREATEGAME],[460,80], [1,1,1], 1.0f, 1);
drawpic([g_menuofs[0]+550,g_menuofs[1]+10], "gfx/shell/fragnet",[80,80], [1,1,1], 1.0f, 0);
@ -101,7 +106,8 @@ void menu_creategameinet_draw(void)
Widget_Draw(fn_createshared);
}
void menu_creategameinet_input(float evtype, float scanx, float chary, float devid)
void
menu_creategameinet_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_createinet, evtype, scanx, chary, devid);
Widget_Input(fn_createshared, evtype, scanx, chary, devid);

36
src/menu-fn/m_customgame.cpp
View file

@ -15,14 +15,16 @@
*/
/* local game/mod info parsing */
void games_set(int id)
void
games_set(int id)
{
gameinfo_current = id;
setwindowcaption(games[id].game);
cvar_set("com_fullgamename", games[id].game);
}
void games_init(void)
void
games_init(void)
{
int id;
float county;
@ -179,7 +181,8 @@ CMainButton customgame_btnRefresh;
CMainButton customgame_btnDeactivate;
CMainButton customgame_btnDone;
void customgame_btnactivate_start(void)
void
customgame_btnactivate_start(void)
{
int nextgame = customgame_lbMods.GetSelected();
@ -199,13 +202,17 @@ void customgame_btnactivate_start(void)
localcmd("stopmusic\nsnd_restart\nwait\nvid_reload\nmenu_restart\nmenu_customgame\n");
cvar_init();
}
void customgame_btninstall_start(void)
void
customgame_btninstall_start(void)
{
int gid = customgame_lbMods.GetSelected();
print(sprintf("Requesting download for http://www.frag-net.com/mods/%s.fmf...\n", games[gid].gamedir));
localcmd(sprintf("fs_changegame %s http://www.frag-net.com/mods/%s.fmf\n", games[gid].gamedir, games[gid].gamedir));
}
void customgame_btndeactivate_start(void)
void
customgame_btndeactivate_start(void)
{
localcmd("gamedir \"\"\n");
localcmd("stopmusic\nsnd_restart\nwait\nvid_reload\n");
@ -213,7 +220,8 @@ void customgame_btndeactivate_start(void)
localcmd("menu_customgame\n");
}
void customgame_btndone_start(void)
void
customgame_btndone_start(void)
{
static void customgame_btndone_end(void) {
g_menupage = PAGE_MAIN;
@ -226,12 +234,15 @@ void customgame_btndone_start(void)
header.SetHeader(HEAD_CUSTOM);
header.SetExecute(customgame_btndone_end);
}
void customgame_sbmods_changed(int val)
void
customgame_sbmods_changed(int val)
{
customgame_lbMods.SetScroll(val);
}
void customgame_lbmods_changed(void)
void
customgame_lbmods_changed(void)
{
int gid = customgame_lbMods.GetSelected();
@ -244,7 +255,8 @@ void customgame_lbmods_changed(void)
}
}
void menu_customgame_init(void)
void
menu_customgame_init(void)
{
fn_customgame = spawn(CWidget);
customgame_dlgWait = spawn(CDialog);
@ -303,7 +315,8 @@ void menu_customgame_init(void)
Widget_Add(fn_customgame, customgame_sbMods);
}
void menu_customgame_draw(void)
void
menu_customgame_draw(void)
{
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_CUSTOM],[460,80], [1,1,1], 1.0f, 1);
Widget_Draw(fn_customgame);
@ -333,7 +346,8 @@ void menu_customgame_draw(void)
customgame_sbMods.SetMax(gameinfo_count-1); /* don't show our current game */
}
void menu_customgame_input(float evtype, float scanx, float chary, float devid)
void
menu_customgame_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_customgame, evtype, scanx, chary, devid);
}

22
src/menu-fn/m_customize.cpp
View file

@ -26,7 +26,8 @@ int g_modelcount;
string *g_sprays;
int g_sprayscount;
void cz_btndone_start(void)
void
cz_btndone_start(void)
{
static void cz_btndone_end(void) {
g_menupage = PAGE_MULTIPLAYER;
@ -40,7 +41,9 @@ void cz_btndone_start(void)
header.SetHeader(HEAD_CUSTOMIZE);
header.SetExecute(cz_btndone_end);
}
void cz_btnadvanced_start(void)
void
cz_btnadvanced_start(void)
{
static void cz_btnadvanced_end(void) {
g_menupage = PAGE_ADVANCEDCUSTOMIZE;
@ -54,7 +57,8 @@ void cz_btnadvanced_start(void)
header.SetExecute(cz_btnadvanced_end);
}
void cz_cbModelChanged(void)
void
cz_cbModelChanged(void)
{
string mdl = cz_psModel.GetPic();
tokenizebyseparator(mdl, "/");
@ -62,14 +66,16 @@ void cz_cbModelChanged(void)
localcmd(sprintf("setinfo model %s\n", argv(2)));
}
void cz_cbSprayChanged(void)
void
cz_cbSprayChanged(void)
{
string mdl = cz_psSpray.GetPic();
localcmd(sprintf("seta _cl_playerspray %s\n", mdl));
localcmd(sprintf("setinfoblob spray %s\n", mdl));
}
void menu_customize_init(void)
void
menu_customize_init(void)
{
int sid = 0;
g_sprayscount = 0;
@ -153,7 +159,8 @@ void menu_customize_init(void)
Widget_Add(fn_customize, cz_psModel);
}
void menu_customize_draw(void)
void
menu_customize_draw(void)
{
Widget_Draw(fn_customize);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_CUSTOMIZE],[460,80], [1,1,1], 1.0f, 1);
@ -165,7 +172,8 @@ void menu_customize_draw(void)
1.0f, 0, font_arial);
}
void menu_customize_input(float evtype, float scanx, float chary, float devid)
void
menu_customize_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_customize, evtype, scanx, chary, devid);
}

9
src/menu-fn/m_filter.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_filter_init(void)
void
menu_filter_init(void)
{
}
void menu_filter_draw(void)
void
menu_filter_draw(void)
{
}
void menu_filter_input(float evtype, float scanx, float chary, float devid)
void
menu_filter_input(float evtype, float scanx, float chary, float devid)
{
}

29
src/menu-fn/m_internetgames.cpp
View file

@ -35,7 +35,8 @@ CListBox inet_lbServers_Addresses;
CScrollbar inet_sbServers;
/* Button Callbacks */
void inet_btnjoin(void)
void
inet_btnjoin(void)
{
string addr = inet_lbServers_Addresses.GetSelectedItem();
@ -43,7 +44,9 @@ void inet_btnjoin(void)
localcmd(sprintf("connect %s\n", addr));
}
}
void inet_btncreate_start(void)
void
inet_btncreate_start(void)
{
static void inet_btncreate_end(void) {
g_menupage = PAGE_CREATEGAMEINET;
@ -58,7 +61,8 @@ void inet_btncreate_start(void)
header.SetExecute(inet_btncreate_end);
}
void inet_btndone_start(void)
void
inet_btndone_start(void)
{
static void inet_btndone_end(void) {
g_menupage = PAGE_MULTIPLAYER;
@ -72,7 +76,8 @@ void inet_btndone_start(void)
header.SetExecute(inet_btndone_end);
}
void inet_btnrefresh(void)
void
inet_btnrefresh(void)
{
int count = 0;
int added = 0;
@ -117,7 +122,8 @@ void inet_btnrefresh(void)
inet_sbServers.SetMax(added);
}
void inet_lb_clicked(int val)
void
inet_lb_clicked(int val)
{
inet_lbServers_Name.SetSelected(val, FALSE);
inet_lbServers_Ping.SetSelected(val, FALSE);
@ -126,7 +132,9 @@ void inet_lb_clicked(int val)
inet_lbServers_Players.SetSelected(val, FALSE);
inet_lbServers_Addresses.SetSelected(val, FALSE);
}
void inet_lb_changed(int val)
void
inet_lb_changed(int val)
{
inet_lbServers_Name.SetScroll(val);
inet_lbServers_Ping.SetScroll(val);
@ -135,7 +143,8 @@ void inet_lb_changed(int val)
inet_lbServers_Players.SetScroll(val);
}
void menu_internetgames_init(void)
void
menu_internetgames_init(void)
{
fn_inet = spawn(CWidget);
@ -238,7 +247,8 @@ void menu_internetgames_init(void)
Widget_Add(fn_inet, inet_btnDone);
}
void menu_internetgames_draw(void)
void
menu_internetgames_draw(void)
{
Widget_Draw(fn_inet);
resorthostcache();
@ -258,7 +268,8 @@ void menu_internetgames_draw(void)
1.0f, 0, font_arial);
}
void menu_internetgames_input(float evtype, float scanx, float chary, float devid)
void
menu_internetgames_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_inet, evtype, scanx, chary, devid);
}

9
src/menu-fn/m_intro.cpp
View file

@ -26,12 +26,14 @@ enum
float g_intro_progress;
int g_intro_stage;
void m_intro_skip(void)
void
m_intro_skip(void)
{
g_intro_progress = INTRO_TIME;
}
void m_intro_draw(void)
void
m_intro_draw(void)
{
float alpha;
if (clientstate() == 2) {
@ -69,7 +71,8 @@ void m_intro_draw(void)
g_intro_progress += frametime;
}
void m_intro_input(float evtype, float scanx, float chary, float devid)
void
m_intro_input(float evtype, float scanx, float chary, float devid)
{
if (evtype == IE_KEYDOWN) {
if (scanx == K_ESCAPE) {

27
src/menu-fn/m_langames.cpp
View file

@ -31,7 +31,8 @@ CListBox lan_lbServers_Addresses;
CScrollbar lan_sbServers;
/* Button Callbacks */
void lan_btnjoin(void)
void
lan_btnjoin(void)
{
string addr = lan_lbServers_Addresses.GetSelectedItem();
@ -40,7 +41,8 @@ void lan_btnjoin(void)
}
}
void lan_btncreate_start(void)
void
lan_btncreate_start(void)
{
static void lan_btncreate_end(void) {
g_menupage = PAGE_CREATEGAME;
@ -55,7 +57,8 @@ void lan_btncreate_start(void)
header.SetExecute(lan_btncreate_end);
}
void lan_btndone_start(void)
void
lan_btndone_start(void)
{
static void lan_btndone_end(void) {
g_menupage = PAGE_MULTIPLAYER;
@ -69,7 +72,8 @@ void lan_btndone_start(void)
header.SetExecute(lan_btndone_end);
}
void lan_btnrefresh(void)
void
lan_btnrefresh(void)
{
int count = 0;
int added = 0;
@ -111,7 +115,8 @@ void lan_btnrefresh(void)
lan_sbServers.SetMax(added);
}
void lan_lb_clicked(int val)
void
lan_lb_clicked(int val)
{
lan_lbServers_Name.SetSelected(val, FALSE);
lan_lbServers_Ping.SetSelected(val, FALSE);
@ -121,7 +126,8 @@ void lan_lb_clicked(int val)
lan_lbServers_Addresses.SetSelected(val, FALSE);
}
void lan_lb_changed(int val)
void
lan_lb_changed(int val)
{
lan_lbServers_Name.SetScroll(val);
lan_lbServers_Ping.SetScroll(val);
@ -131,7 +137,8 @@ void lan_lb_changed(int val)
lan_lbServers_Addresses.SetScroll(val);
}
void menu_langames_init(void)
void
menu_langames_init(void)
{
fn_lan = spawn(CWidget);
@ -210,7 +217,8 @@ void menu_langames_init(void)
Widget_Add(fn_lan, lan_sbServers);
}
void menu_langames_draw(void)
void
menu_langames_draw(void)
{
Widget_Draw(fn_lan);
Master_ResortCache();
@ -229,7 +237,8 @@ void menu_langames_draw(void)
1.0f, 0, font_arial);
}
void menu_langames_input(float evtype, float scanx, float chary, float devid)
void
menu_langames_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_lan, evtype, scanx, chary, devid);
}

27
src/menu-fn/m_loadgame.cpp
View file

@ -26,19 +26,22 @@ CListBox lg_lbSaves;
CFrame lg_frSaves;
CFrame lg_frPreview;
void lg_btnload(void)
void
lg_btnload(void)
{
int i = lg_lbSaves.GetSelected();
localcmd(sprintf("load %s\n", g_savegames[i]));
}
void lg_btnunsave(void)
void
lg_btnunsave(void)
{
int i = lg_lbSaves.GetSelected();
localcmd(sprintf("unsavegame %s\n", g_savegames[i]));
}
void lg_btncancel_start(void)
void
lg_btncancel_start(void)
{
static void lg_btncancel_end(void) {
g_menupage = PAGE_MAIN;
@ -52,16 +55,19 @@ void lg_btncancel_start(void)
header.SetExecute(lg_btncancel_end);
}
void lg_lbsaves_changed(int val)
void
lg_lbsaves_changed(int val)
{
}
void up_sbsaves_changed(int val)
void
up_sbsaves_changed(int val)
{
lg_lbSaves.SetScroll(val);
}
void menu_loadgame_refreshsaves(void)
void
menu_loadgame_refreshsaves(void)
{
searchhandle searchy;
lg_lbSaves.Clear();
@ -78,7 +84,8 @@ void menu_loadgame_refreshsaves(void)
lg_lbSaves.SetSelected(0, TRUE);
}
void menu_loadgame_init(void)
void
menu_loadgame_init(void)
{
fn_loadgame = spawn(CWidget);
@ -127,7 +134,8 @@ void menu_loadgame_init(void)
menu_loadgame_refreshsaves();
}
void menu_loadgame_draw(void)
void
menu_loadgame_draw(void)
{
Widget_Draw(fn_loadgame);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_LOAD],[460,80], [1,1,1], 1.0f, 1);
@ -140,7 +148,8 @@ void menu_loadgame_draw(void)
drawpic([g_menuofs[0]+390,g_menuofs[1]+140], sprintf("saves/%s/screeny.tga", g_savegames[i]),[220,165], [1,1,1], 1.0f, 1);
}
void menu_loadgame_input(float evtype, float scanx, float chary, float devid)
void
menu_loadgame_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_loadgame, evtype, scanx, chary, devid);
}

50
src/menu-fn/m_main.cpp
View file

@ -45,18 +45,21 @@ CMainButton main_btnQuitCancel;
int main_quitdialog;
/* Button Callbacks */
void btn_console(void)
void
btn_console(void)
{
localcmd("toggleconsole\n");
}
void btn_resume(void)
void
btn_resume(void)
{
m_hide();
}
/* Button Callbacks */
void btn_newgame_start(void)
void
btn_newgame_start(void)
{
static void btn_newgame_end(void) {
g_menupage = PAGE_NEWGAME;
@ -69,13 +72,17 @@ void btn_newgame_start(void)
header.SetHeader(HEAD_NEWGAME);
header.SetExecute(btn_newgame_end);
}
void btn_training(void)
void
btn_training(void)
{
localcmd("stopmusic\n");
localcmd("maxplayers 1\n");
localcmd(sprintf("%s\n", games[gameinfo_current].trainingmap));
}
void btn_configuration_start(void)
void
btn_configuration_start(void)
{
static void btn_configuration_end(void) {
g_menupage = PAGE_CONFIGURATION;
@ -88,7 +95,9 @@ void btn_configuration_start(void)
header.SetHeader(HEAD_CONFIG);
header.SetExecute(btn_configuration_end);
}
void btn_loadgame_start(void)
void
btn_loadgame_start(void)
{
static void btn_loadgame_end(void) {
g_menupage = PAGE_LOADGAME;
@ -101,7 +110,9 @@ void btn_loadgame_start(void)
header.SetHeader(HEAD_LOAD);
header.SetExecute(btn_loadgame_end);
}
void btn_multiplayer_start(void)
void
btn_multiplayer_start(void)
{
static void btn_multiplayer_end(void) {
g_menupage = PAGE_MULTIPLAYER;
@ -114,7 +125,9 @@ void btn_multiplayer_start(void)
header.SetHeader(HEAD_MULTI);
header.SetExecute(btn_multiplayer_end);
}
void btn_customgame_start(void)
void
btn_customgame_start(void)
{
static void btn_customgame_end(void) {
g_menupage = PAGE_CUSTOMGAME;
@ -127,21 +140,28 @@ void btn_customgame_start(void)
header.SetHeader(HEAD_CUSTOM);
header.SetExecute(btn_customgame_end);
}
void btn_quit(void)
void
btn_quit(void)
{
main_quitdialog = TRUE;
}
void btn_quit_ok(void)
void
btn_quit_ok(void)
{
localcmd("quit\n");
}
void btn_quit_cancel(void)
void
btn_quit_cancel(void)
{
main_quitdialog = FALSE;
}
/* Init */
void menu_main_init(void)
void
menu_main_init(void)
{
/* Main Menu (Disconnected) */
fn_main = spawn(CWidget);
@ -288,7 +308,8 @@ void menu_main_init(void)
}
/* Drawing */
void menu_main_draw(void)
void
menu_main_draw(void)
{
if (clientstate() == 2) {
Widget_Draw(fn_main2);
@ -355,7 +376,8 @@ void menu_main_draw(void)
}
}
void menu_main_input(float evtype, float scanx, float chary, float devid)
void
menu_main_input(float evtype, float scanx, float chary, float devid)
{
if (autocvar_menu_intro == TRUE) {
if (g_intro_progress < INTRO_TIME) {

27
src/menu-fn/m_multiplayer.cpp
View file

@ -36,7 +36,8 @@ enum
CONNECT_CHAT
};
void mp_btndone_start(void)
void
mp_btndone_start(void)
{
static void mp_btndone_end(void) {
g_menupage = PAGE_MAIN;
@ -50,7 +51,8 @@ void mp_btndone_start(void)
header.SetExecute(mp_btndone_end);
}
void mp_btninet_start(void)
void
mp_btninet_start(void)
{
static void mp_btninet_end(void) {
g_menupage = PAGE_INTERNETGAMES;
@ -74,7 +76,8 @@ void mp_btninet_start(void)
}
/* this is from m_chatrooms.cpp */
void cr_btnservers_start(void)
void
cr_btnservers_start(void)
{
static void cr_btnservers_end(void) {
g_menupage = PAGE_INTERNETGAMES;
@ -99,7 +102,8 @@ void cr_btnservers_start(void)
}
}
void mp_btnlan_start(void)
void
mp_btnlan_start(void)
{
static void mp_btnlan_end(void) {
g_menupage = PAGE_LANGAMES;
@ -115,7 +119,8 @@ void mp_btnlan_start(void)
header.SetExecute(mp_btnlan_end);
}
void mp_btnchatrooms_start(void)
void
mp_btnchatrooms_start(void)
{
static void mp_btnchatrooms_end(void) {
g_menupage = PAGE_CHATROOMS;
@ -129,7 +134,8 @@ void mp_btnchatrooms_start(void)
header.SetExecute(mp_btnchatrooms_end);
}
void mp_btncustomize_start(void)
void
mp_btncustomize_start(void)
{
static void mp_btncustomize_end(void) {
g_menupage = PAGE_CUSTOMIZE;
@ -143,7 +149,8 @@ void mp_btncustomize_start(void)
header.SetExecute(mp_btncustomize_end);
}
void menu_multiplayer_init(void)
void
menu_multiplayer_init(void)
{
fn_multiplayer = spawn(CWidget);
mp_dgConnect = spawn(CDialog);
@ -199,7 +206,8 @@ void menu_multiplayer_init(void)
Master_UpdateCache();
}
void menu_multiplayer_draw(void)
void
menu_multiplayer_draw(void)
{
Widget_Draw(fn_multiplayer);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_MULTI],[460,80], [1,1,1], 1.0f, 1);
@ -237,7 +245,8 @@ void menu_multiplayer_draw(void)
}
}
void menu_multiplayer_input(float evtype, float scanx, float chary, float devid)
void
menu_multiplayer_input(float evtype, float scanx, float chary, float devid)
{
if (!g_connectstatus) {
Widget_Input(fn_multiplayer, evtype, scanx, chary, devid);

23
src/menu-fn/m_newgame.cpp
View file

@ -21,7 +21,8 @@ CMainButton ng_btnDifficult;
CMainButton ng_btnCancel;
/* Button Callbacks */
void ng_btneasy_start(void)
void
ng_btneasy_start(void)
{
static void ng_btneasy_end(void) {
g_menupage = PAGE_MAIN;
@ -37,7 +38,9 @@ void ng_btneasy_start(void)
header.SetHeader(HEAD_NEWGAME);
header.SetExecute(ng_btneasy_end);
}
void ng_btnnormal_start(void)
void
ng_btnnormal_start(void)
{
static void ng_btnnormal_end(void) {
g_menupage = PAGE_MAIN;
@ -53,7 +56,9 @@ void ng_btnnormal_start(void)
header.SetHeader(HEAD_NEWGAME);
header.SetExecute(ng_btnnormal_end);
}
void ng_btnhard_start(void)
void
ng_btnhard_start(void)
{
static void ng_btnhard_end(void) {
g_menupage = PAGE_MAIN;
@ -70,7 +75,8 @@ void ng_btnhard_start(void)
header.SetExecute(ng_btnhard_end);
}
void ng_btncancel_start(void)
void
ng_btncancel_start(void)
{
static void ng_btncancel_end(void) {
g_menupage = PAGE_MAIN;
@ -85,7 +91,8 @@ void ng_btncancel_start(void)
}
/* Init */
void menu_newgame_init(void)
void
menu_newgame_init(void)
{
fn_newgame = spawn(CWidget);
ng_btnEasy = spawn(CMainButton);
@ -114,7 +121,8 @@ void menu_newgame_init(void)
}
/* Drawing */
void menu_newgame_draw(void)
void
menu_newgame_draw(void)
{
Widget_Draw(fn_newgame);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_NEWGAME],[460,80], [1,1,1], 1.0f, 1);
@ -129,7 +137,8 @@ void menu_newgame_draw(void)
1.0f, 0, font_label);
}
void menu_newgame_input(float evtype, float scanx, float chary, float devid)
void
menu_newgame_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_newgame, evtype, scanx, chary, devid);
}

9
src/menu-fn/m_spectategames.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_spectategames_init(void)
void
menu_spectategames_init(void)
{
}
void menu_spectategames_draw(void)
void
menu_spectategames_draw(void)
{
}
void menu_spectategames_input(float evtype, float scanx, float chary, float devid)
void
menu_spectategames_input(float evtype, float scanx, float chary, float devid)
{
}

33
src/menu-fn/m_updates.cpp
View file

@ -32,7 +32,7 @@ enum
GPMI_FILESIZE, // size to download.
};
string(int packageidx, int desiredfield) getpackagemanagerinfo = #0;
string(int, int) getpackagemanagerinfo = #0;
var int g_updates_initialized = FALSE;
var int autocvar_menu_updating = FALSE;
@ -51,7 +51,8 @@ CScrollbar up_sbUpdates;
var string g_updates_previewpic;
/* Button Callbacks */
void up_btndone_start(void)
void
up_btndone_start(void)
{
cvar_set("menu_updating", "0");
localsound("../media/launch_dnmenu1.wav");
@ -59,7 +60,8 @@ void up_btndone_start(void)
localcmd("seta menu_installedpackages 1;cfg_save\n");
}
void up_btninstall_start(void)
void
up_btninstall_start(void)
{
int pkgid;
@ -69,7 +71,8 @@ void up_btninstall_start(void)
print(sprintf("Marking package %s for install.\n", updates[pkgid].title));
}
void up_btnremove_start(void)
void
up_btnremove_start(void)
{
int pkgid;
@ -79,14 +82,16 @@ void up_btnremove_start(void)
print(sprintf("Marking package %s for 'removal'.\n", updates[pkgid].title));
}
void up_btnapply_start(void)
void
up_btnapply_start(void)
{
cvar_set("menu_updating", "1");
localcmd("pkg apply\n");
print("Applying package changes.\n");
}
void up_lbupdates_changed(void)
void
up_lbupdates_changed(void)
{
int pkgid;
string newpic;
@ -96,13 +101,16 @@ void up_lbupdates_changed(void)
g_updates_previewpic = newpic;
precache_pic(g_updates_previewpic);
}
void up_sbupdates_changed(int val)
void
up_sbupdates_changed(int val)
{
up_lbUpdates.SetScroll(val);
}
/* Init */
void menu_updates_init(void)
void
menu_updates_init(void)
{
fn_updates = spawn(CWidget);
@ -155,7 +163,8 @@ void menu_updates_init(void)
Widget_Add(fn_updates, up_frPreview);
}
void menu_updates_refresh(void)
void
menu_updates_refresh(void)
{
int c;
update_count = 0;
@ -207,7 +216,8 @@ void menu_updates_refresh(void)
}
/* Drawing */
void menu_updates_draw(void)
void
menu_updates_draw(void)
{
float fl = 0;
@ -277,7 +287,8 @@ void menu_updates_draw(void)
drawpic([g_menuofs[0]+350+3,g_menuofs[1]+160+3], g_updates_previewpic, [256,128], [1,1,1], 1.0f);
}
void menu_updates_input(float evtype, float scanx, float chary, float devid)
void
menu_updates_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_updates, evtype, scanx, chary, devid);
}

20
src/menu-fn/m_video.cpp
View file

@ -19,8 +19,8 @@ CMainButton vd_btnVidOptions;
CMainButton vd_btnVidModes;
CMainButton vd_btnDone;
void vd_vidoptions_start(void)
void
vd_vidoptions_start(void)
{
static void vd_vidoptions_end(void) {
g_menupage = PAGE_VIDEOOPTIONS;
@ -33,7 +33,9 @@ void vd_vidoptions_start(void)
header.SetHeader(HEAD_VIDOPTIONS);
header.SetExecute(vd_vidoptions_end);
}
void vd_vidmodes_start(void)
void
vd_vidmodes_start(void)
{
static void vd_vidmodes_end(void) {
g_menupage = PAGE_VIDEOMODES;
@ -47,7 +49,8 @@ void vd_vidmodes_start(void)
header.SetExecute(vd_vidmodes_end);
}
void vd_btndone_start(void)
void
vd_btndone_start(void)
{
static void vd_btndone_end(void) {
g_menupage = PAGE_CONFIGURATION;
@ -61,7 +64,8 @@ void vd_btndone_start(void)
header.SetExecute(vd_btndone_end);
}
void menu_video_init(void)
void
menu_video_init(void)
{
fn_video = spawn(CWidget);
@ -84,7 +88,8 @@ void menu_video_init(void)
Widget_Add(fn_video, vd_btnDone);
}
void menu_video_draw(void)
void
menu_video_draw(void)
{
Widget_Draw(fn_video);
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_VIDEO],[460,80], [1,1,1], 1.0f, 1);
@ -96,7 +101,8 @@ void menu_video_draw(void)
1.0f, 0, font_label);
}
void menu_video_input(float evtype, float scanx, float chary, float devid)
void
menu_video_input(float evtype, float scanx, float chary, float devid)
{
Widget_Input(fn_video, evtype, scanx, chary, devid);
}

22
src/menu-fn/m_videomodes.cpp
View file

@ -58,7 +58,8 @@ static string g_resolutions[] = {
};
/* Button Callbacks */
void vm_btnok_start(void)
void
vm_btnok_start(void)
{
static void vm_btnok_end(void) {
g_menupage = PAGE_VIDEO;
@ -84,7 +85,9 @@ void vm_btnok_start(void)
header.SetHeader(HEAD_VIDMODES);
header.SetExecute(vm_btnok_end);
}
void vm_btncancel_start(void)
void
vm_btncancel_start(void)
{
static void vm_btncancel_end(void) {
g_menupage = PAGE_VIDEO;
@ -98,7 +101,8 @@ void vm_btncancel_start(void)
header.SetExecute(vm_btncancel_end);
}
void vm_cbwindowed_changed(float val)
void
vm_cbwindowed_changed(float val)
{
if (val) {
cvar_set("vid_fullscreen", "0");
@ -106,13 +110,15 @@ void vm_cbwindowed_changed(float val)
cvar_set("vid_fullscreen", "2");
}
}
void vm_sbres_changed(int val)
void
vm_sbres_changed(int val)
{
vm_lbRes.SetScroll(val);
}
/* Init */
void menu_videomodes_init(void)
void
menu_videomodes_init(void)
{
fn_vidmodes = spawn(CWidget);
@ -167,7 +173,8 @@ void menu_videomodes_init(void)
}
/* Draw */
void menu_videomodes_draw(void)
void
menu_videomodes_draw(void)
{
Widget_Draw(fn_vidmodes);
drawpic([g_menuofs[0] + 45, g_menuofs[1] + 45], g_bmp[HEAD_VIDMODES],
@ -181,7 +188,8 @@ void menu_videomodes_draw(void)
}
/* Input */
void menu_videomodes_input(float evtype, float x, float y, float devid)
void
menu_videomodes_input(float evtype, float x, float y, float devid)
{
Widget_Input(fn_vidmodes, evtype, x, y, devid);
}

24
src/menu-fn/m_videooptions.cpp
View file

@ -21,7 +21,8 @@ CSlider vo_sldGamma;
CSlider vo_sldGlare;
/* Button Callbacks */
void vo_btndone_start(void)
void
vo_btndone_start(void)
{
static void vo_btndone_end(void) {
g_menupage = PAGE_VIDEO;
@ -34,21 +35,28 @@ void vo_btndone_start(void)
header.SetHeader(HEAD_VIDOPTIONS);
header.SetExecute(vo_btndone_end);
}
void vo_sldscreensize_changed(float val)
void
vo_sldscreensize_changed(float val)
{
cvar_set("viewsize", ftos(floor(val * 120)));
}
void vo_sldgamma_changed(float val)
void
vo_sldgamma_changed(float val)
{
cvar_set("gamma", ftos(val));
}
void vo_sldglare_changed(float val)
void
vo_sldglare_changed(float val)
{
cvar_set("brightness", ftos(val * 0.5));
}
/* Init */
void menu_videooptions_init(void)
void
menu_videooptions_init(void)
{
fn_vidoptions = spawn(CWidget);
vo_btnDone = spawn(CMainButton);
@ -77,7 +85,8 @@ void menu_videooptions_init(void)
}
/* Drawing */
void menu_videooptions_draw(void)
void
menu_videooptions_draw(void)
{
Widget_Draw(fn_vidoptions);
drawpic([g_menuofs[0] + 45, g_menuofs[1] + 45], g_bmp[HEAD_VIDOPTIONS],
@ -99,7 +108,8 @@ void menu_videooptions_draw(void)
}
/* Input */
void menu_videooptions_input(float evtype, float x, float y, float devid)
void
menu_videooptions_input(float evtype, float x, float y, float devid)
{
Widget_Input(fn_vidoptions, evtype, x, y, devid);
}

9
src/menu-fn/m_viewgameinfo.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_viewgameinfo_init(void)
void
menu_viewgameinfo_init(void)
{
}
void menu_viewgameinfo_draw(void)
void
menu_viewgameinfo_draw(void)
{
}
void menu_viewgameinfo_input(float evtype, float scanx, float chary, float devid)
void
menu_viewgameinfo_input(float evtype, float scanx, float chary, float devid)
{
}

9
src/menu-fn/m_viewreadme.cpp
View file

@ -14,14 +14,17 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void menu_viewreadme_init(void)
void
menu_viewreadme_init(void)
{
}
void menu_viewreadme_draw(void)
void
menu_viewreadme_draw(void)
{
}
void menu_viewreadme_input(float evtype, float scanx, float chary, float devid)
void
menu_viewreadme_input(float evtype, float scanx, float chary, float devid)
{
}

22
src/menu-fn/master.cpp
View file

@ -25,7 +25,8 @@ float srv_fldMaxplayers;
float srv_fldMap;
float srv_fldGame;
string Master_Resolve(void)
string
Master_Resolve(void)
{
string out = netaddress_resolve(MASTER_DNS,MASTER_PORT);
print("Resolving master at ");
@ -41,7 +42,8 @@ string Master_Resolve(void)
return out;
}
int Master_GetTotalServers(void)
int
Master_GetTotalServers(void)
{
int a = gethostcachevalue(SLIST_HOSTCACHETOTALCOUNT);
@ -51,7 +53,8 @@ int Master_GetTotalServers(void)
return gethostcachevalue(SLIST_HOSTCACHETOTALCOUNT);
}
void Master_RefreshCache(void)
void
Master_RefreshCache(void)
{
print("Refreshing host cache...\n");
resethostcachemasks();
@ -66,7 +69,8 @@ void Master_RefreshCache(void)
}
}
void Master_UpdateCache(void)
void
Master_UpdateCache(void)
{
print("Updating host cache...\n");
resethostcachemasks();
@ -81,7 +85,8 @@ void Master_UpdateCache(void)
}
}
void Master_ResortCache(void)
void
Master_ResortCache(void)
{
resorthostcache();
srv_fldAdress = gethostcacheindexforkey("cname");
@ -93,7 +98,8 @@ void Master_ResortCache(void)
srv_fldGame = gethostcacheindexforkey("game");
}
void Master_GetInternetList(void)
void
Master_GetInternetList(void)
{
/*string url = sprintf("%s:%d",MASTER_DNS,MASTER_PORT);
localcmd("net_master1 \"localhost\"\n");
@ -116,7 +122,8 @@ void Master_GetInternetList(void)
Master_UpdateCache();
}
void Master_GetLANList(void)
void
Master_GetLANList(void)
{
/*localcmd("net_master1 \"localhost\"\n");
localcmd("net_master2 \"\"\n");
@ -137,4 +144,3 @@ void Master_GetLANList(void)
Master_UpdateCache();
}

9
src/menu-fn/menu.cpp
View file

@ -45,7 +45,8 @@ menupage_t g_mpage[] = {
{ menu_updates_init, menu_updates_draw, menu_updates_input }
};
void main_init(void)
void
main_init(void)
{
for (int i = 0; i < g_mpage.length; i++) {
g_mpage[i].m_init();
@ -54,13 +55,15 @@ void main_init(void)
header = spawn(CHeader);
}
void main_draw(void)
void
main_draw(void)
{
g_mpage[g_menupage].m_draw();
header.Draw();
}
void main_input(float evtype, float scanx, float chary, float devid)
void
main_input(float evtype, float scanx, float chary, float devid)
{
g_mpage[g_menupage].m_input(evtype, scanx, chary, devid);
}

3
src/menu-fn/servers.cpp
View file

@ -14,7 +14,8 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
int Server_IsLan(string address)
int
Server_IsLan(string address)
{
#if 0
return FALSE;

3
src/menu-fn/strings.cpp
View file

@ -14,7 +14,8 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
void Strings_Init(void)
void
Strings_Init(void)
{
filestream stringslst;
string lstline;

2
src/menu-fn/tcp.cpp
View file

@ -103,7 +103,7 @@ TCP_Frame(tcpinfo_t *in)
return;
/* if the send was unsuccessful, try next frame */
if (fwrite(in.m_fSocket, data, strlen(data)) <= 0) {
if (fwrite(in.m_fSocket, (void *)data, strlen(data)) <= 0) {
dprint("^1TCP_Frame^7: Unsuccessful frame\n");
return;
}

11
src/menu-fn/util.cpp
View file

@ -14,7 +14,9 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
int Util_CheckMouse(int x, int y, int sx, int sy) {
int
Util_CheckMouse(int x, int y, int sx, int sy)
{
int mins[2];
int maxs[2];
@ -35,7 +37,8 @@ int Util_CheckMouse(int x, int y, int sx, int sy) {
return FALSE;
}
string Util_CmdToKey(string cmd)
string
Util_CmdToKey(string cmd)
{
float fBindKey = tokenize(findkeysforcommand(cmd));
string sBindTx = "";
@ -54,6 +57,8 @@ string Util_CmdToKey(string cmd)
return sBindTx;
}
float lerp(float fA, float fB, float fPercent) {
float
lerp(float fA, float fB, float fPercent)
{
return (fA * (1 - fPercent)) + (fB * fPercent);
}

19
src/menu-fn/w_checkbox.cpp
View file

@ -22,12 +22,13 @@ class CCheckBox:CWidget
virtual void(float value) m_changed = 0;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(void(float val) vFunc) SetCallback;
virtual void(float val) SetValue;
virtual void(float, float, float, float) Input;
virtual void(void(float)) SetCallback;
virtual void(float) SetValue;
};
void CCheckBox::Draw(void)
void
CCheckBox::Draw(void)
{
if (m_click) {
drawpic([g_menuofs[0]+m_x,g_menuofs[1]+m_y], g_bmp[CB_DOWN],
@ -47,7 +48,8 @@ void CCheckBox::Draw(void)
[19,19], [1,1,1], 1.0f, 1);
}
}
void CCheckBox::Input(float type, float x, float y, float devid)
void
CCheckBox::Input(float type, float x, float y, float devid)
{
if (Util_CheckMouse(m_x, m_y, 19, 19) == TRUE) {
m_hover = TRUE;
@ -69,12 +71,15 @@ void CCheckBox::Input(float type, float x, float y, float devid)
}
}
}
void CCheckBox::SetCallback(void(float val) vFunc)
void
CCheckBox::SetCallback(void(float val) vFunc)
{
m_changed = vFunc;
}
void CCheckBox::SetValue(float val)
void
CCheckBox::SetValue(float val)
{
m_value = (int)val;
}

6
src/menu-fn/w_combobox.cpp
View file

@ -21,12 +21,14 @@ class CComboBox:CWidget
virtual void(void) Draw;
};
void CComboBox::CComboBox(void)
void
CComboBox::CComboBox(void)
{
}
void CComboBox::Draw(void)
void
CComboBox::Draw(void)
{
}

3
src/menu-fn/w_dialog.cpp
View file

@ -19,7 +19,8 @@ class CDialog:CWidget
virtual void(void) Draw;
};
void CDialog::Draw(void)
void
CDialog::Draw(void)
{
drawfill([g_menuofs[0]+160,g_menuofs[1]+160], [320,160], [0,0,0], 1.0f);
drawfill([g_menuofs[0]+161,g_menuofs[1]+161], [318,158], col_prompt_bg, 1.0f);

23
src/menu-fn/w_frame.cpp
View file

@ -20,18 +20,20 @@ class CFrame:CWidget
int m_bsize[2];
int m_size[2];
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(int w, int h) SetSize;
virtual void(int w) SetBorder;
virtual void(int, int) SetSize;
virtual void(int) SetBorder;
};
void CFrame::CFrame(void)
void
CFrame::CFrame(void)
{
m_bsize[0] = m_bsize[1] = 3;
}
void CFrame::Draw(void)
void
CFrame::Draw(void)
{
if (g_focuswidget == this) {
drawfill([g_menuofs[0] + m_x, g_menuofs[1] + m_y],
@ -47,7 +49,8 @@ void CFrame::Draw(void)
[0,0,0], 1.0f);
}
void CFrame::Input(float type, float x, float y, float devid)
void
CFrame::Input(float type, float x, float y, float devid)
{
if (Util_CheckMouse(m_x, m_y, m_size[0], m_size[1])) {
if (type == IE_KEYDOWN) {
@ -57,12 +60,16 @@ void CFrame::Input(float type, float x, float y, float devid)
}
}
}
void CFrame::SetSize(int x, int y)
void
CFrame::SetSize(int x, int y)
{
m_size[0] = x;
m_size[1] = y;
}
void CFrame::SetBorder(int x)
void
CFrame::SetBorder(int x)
{
m_bsize[0] = m_bsize[1] = x;
}

21
src/menu-fn/w_header.cpp
View file

@ -31,12 +31,13 @@ class CHeader:CWidget
virtual void(void) m_execute = 0;
virtual void(void) Draw;
virtual void(int x1, int y1, int x2, int y2) SetStartEndPos;
virtual void(int x1, int y1, int x2, int y2) SetStartEndSize;
virtual void(int i) SetHeader;
virtual void(int, int, int, int) SetStartEndPos;
virtual void(int, int, int, int) SetStartEndSize;
virtual void(int) SetHeader;
};
void CHeader::Draw(void)
void
CHeader::Draw(void)
{
int pos[2];
int size[2];
@ -72,17 +73,20 @@ void CHeader::Draw(void)
}
}
void CHeader::SetHeader(int i)
void
CHeader::SetHeader(int i)
{
m_header = i;
}
void CHeader::SetExecute(void(void) vFunc)
void
CHeader::SetExecute(void(void) vFunc)
{
m_execute = vFunc;
}
void CHeader::SetStartEndPos(int x1, int y1, int x2, int y2)
void
CHeader::SetStartEndPos(int x1, int y1, int x2, int y2)
{
m_start_x = x1;
m_start_y = y1;
@ -90,7 +94,8 @@ void CHeader::SetStartEndPos(int x1, int y1, int x2, int y2)
m_end_y = y2;
}
void CHeader::SetStartEndSize(int x1, int y1, int x2, int y2)
void
CHeader::SetStartEndSize(int x1, int y1, int x2, int y2)
{
m_start_w = x1;
m_start_h = y1;

22
src/menu-fn/w_label.cpp
View file

@ -27,7 +27,8 @@ class CLabel:CWidget
virtual void(void) Draw;
};
void CLabel::CLabel(void)
void
CLabel::CLabel(void)
{
m_label = "Label";
m_color = [1,1,1];
@ -35,23 +36,27 @@ void CLabel::CLabel(void)
m_sx = m_sy = 8;
}
void CLabel::Draw(void)
void
CLabel::Draw(void)
{
drawfont = m_font;
drawstring([m_x,m_y], m_label, [m_sx,m_sy], m_color, m_alpha, 0);
}
/* Sometimes all you need is a static label */
void WLabel_Static(int x, int y, string msg, int sx, int sy, vector col,
float alpha, float flags, int font)
void
WLabel_Static(int x, int y, string msg, int sx, int sy, vector col,
float alpha, float flags, int font)
{
drawfont = font;
x += g_menuofs[0];
y += g_menuofs[1];
drawstring([x,y], msg, [sx,sy], col, alpha, flags);
}
void WLabel_StaticR(int x, int y, string msg, int sx, int sy, vector col,
float alpha, float flags, int font)
void
WLabel_StaticR(int x, int y, string msg, int sx, int sy, vector col,
float alpha, float flags, int font)
{
drawfont = font;
x += g_menuofs[0] - stringwidth(msg, TRUE,[sx,sy]);
@ -59,8 +64,9 @@ void WLabel_StaticR(int x, int y, string msg, int sx, int sy, vector col,
drawstring([x,y], msg, [sx,sy], col, alpha, flags);
}
void WField_Static(int x, int y, string msg, int sx, int sy, vector col,
float alpha, float flags, int font)
void
WField_Static(int x, int y, string msg, int sx, int sy, vector col,
float alpha, float flags, int font)
{
drawfont = font;
x += g_menuofs[0];

53
src/menu-fn/w_listbox.cpp
View file

@ -23,31 +23,33 @@ class CListBox:CWidget
int m_count;
int m_scroll;
int m_selected;
virtual void(int val) m_execute = 0;
virtual void(int) m_execute = 0;
void(void) CListBox;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(string) AddEntry;
virtual void(int) DelEntry;
virtual void(void) Clear;
virtual void(int, int) SetSize;
virtual void(void(int val) func) SetChanged;
virtual void(void(int)) SetChanged;
virtual string(int) GetItem;
virtual void(int, string) SetItem;
virtual void(int, int) SetSelected;
virtual string() GetSelectedItem;
virtual string(void) GetSelectedItem;
virtual int(void) GetSelected;
virtual int(void) GetCount;
};
void CListBox::CListBox(void)
void
CListBox::CListBox(void)
{
m_selected = -1;
}
void CListBox::Draw(void)
void
CListBox::Draw(void)
{
int visible;
int pos[2];
@ -71,7 +73,8 @@ void CListBox::Draw(void)
}
}
void CListBox::Input(float type, float x, float y, float devid)
void
CListBox::Input(float type, float x, float y, float devid)
{
int visible;
int pos[2];
@ -93,7 +96,8 @@ void CListBox::Input(float type, float x, float y, float devid)
}
}
void CListBox::AddEntry(string m)
void
CListBox::AddEntry(string m)
{
for (int i = 0; i < LB_MAX_ENTRIES; i++) {
if (m_entries[i] == __NULL__) {
@ -104,7 +108,8 @@ void CListBox::AddEntry(string m)
}
}
void CListBox::DelEntry(int i)
void
CListBox::DelEntry(int i)
{
if (m_entries[i] != __NULL__) {
m_entries[i] = __NULL__;
@ -112,32 +117,37 @@ void CListBox::DelEntry(int i)
}
}
void CListBox::Clear(void)
void
CListBox::Clear(void)
{
for (int i = 0; i < LB_MAX_ENTRIES; i++) {
m_entries[i] = __NULL__;
}
}
void CListBox::SetSize(int w, int h)
void
CListBox::SetSize(int w, int h)
{
m_size[0] = w;
m_size[1] = h;
}
void CListBox::SetScroll(int i)
void
CListBox::SetScroll(int i)
{
if (i >= 0 && i < LB_MAX_ENTRIES) {
m_scroll = i;
}
}
void CListBox::SetChanged(void(int val) func)
void
CListBox::SetChanged(void(int val) func)
{
m_execute = func;
}
void CListBox::SetSelected(int i, int exec)
void
CListBox::SetSelected(int i, int exec)
{
if (m_entries[i] == __NULL__) {
return;
@ -150,23 +160,27 @@ void CListBox::SetSelected(int i, int exec)
}
}
int CListBox::GetSelected(void)
int
CListBox::GetSelected(void)
{
return m_selected;
}
string CListBox::GetItem(int i)
string
CListBox::GetItem(int i)
{
return m_entries[i];
}
void CListBox::SetItem(int i, string s)
void
CListBox::SetItem(int i, string s)
{
m_entries[i] = s;
}
string CListBox::GetSelectedItem(void)
string
CListBox::GetSelectedItem(void)
{
if (m_selected == -1) {
return __NULL__;
@ -174,7 +188,8 @@ string CListBox::GetSelectedItem(void)
return m_entries[m_selected];
}
int CListBox::GetCount(void)
int
CListBox::GetCount(void)
{
return m_count;
}

26
src/menu-fn/w_mainbutton.cpp
View file

@ -100,20 +100,22 @@ class CMainButton:CWidget
void(void) CMainButton;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(int i) SetImage;
virtual void(int i) SetLength;
virtual void(void(void) vFunc) SetExecute;
virtual void(int) SetImage;
virtual void(int) SetLength;
virtual void(void(void)) SetExecute;
};
void CMainButton::CMainButton(void)
void
CMainButton::CMainButton(void)
{
m_alpha = 1.0f;
m_length = 156;
}
void CMainButton::Draw(void)
void
CMainButton::Draw(void)
{
if (!m_execute) {
drawsubpic([g_menuofs[0]+m_x,g_menuofs[1]+m_y], [156,26], g_bmp[0],
@ -142,7 +144,8 @@ void CMainButton::Draw(void)
m_alpha = bound(0.0f, m_alpha, 1.0f);
}
void CMainButton::Input(float type, float x, float y, float devid)
void
CMainButton::Input(float type, float x, float y, float devid)
{
m_hover = Util_CheckMouse(m_x, m_y, m_length, 26);
@ -161,16 +164,19 @@ void CMainButton::Input(float type, float x, float y, float devid)
}
}
void CMainButton::SetImage(int i)
void
CMainButton::SetImage(int i)
{
m_bitmap = i;
}
void CMainButton::SetLength(int i)
void
CMainButton::SetLength(int i)
{
m_length = i;
}
void CMainButton::SetExecute(void(void) vFunc)
void
CMainButton::SetExecute(void(void) vFunc)
{
m_execute = vFunc;
}

32
src/menu-fn/w_modlist.cpp
View file

@ -32,20 +32,22 @@ class CModList:CWidget
void(void) CModList;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(int w, int h) SetSize;
//virtual void(void(int val) func) SetChanged;
virtual void(int i) SetSelected;
virtual void(int, int) SetSize;
//virtual void(void(int)) SetChanged;
virtual void(int) SetSelected;
virtual int(void) GetSelected;
};
void CModList::CModList(void)
void
CModList::CModList(void)
{
m_selected = -1;
}
void CModList::Draw(void)
void
CModList::Draw(void)
{
int visible;
int pos;
@ -121,7 +123,8 @@ void CModList::Draw(void)
}
}
void CModList::Input(float type, float x, float y, float devid)
void
CModList::Input(float type, float x, float y, float devid)
{
int visible;
int pos[2];
@ -148,23 +151,27 @@ void CModList::Input(float type, float x, float y, float devid)
}
}
void CModList::SetSize(int w, int h)
void
CModList::SetSize(int w, int h)
{
m_size[0] = w;
m_size[1] = h;
}
void CModList::SetScroll(int i)
void
CModList::SetScroll(int i)
{
m_scroll = i;
}
void CModList::SetChanged(void(void) func)
void
CModList::SetChanged(void(void) func)
{
m_changed = func;
}
void CModList::SetSelected(int i)
void
CModList::SetSelected(int i)
{
m_selected = i;
@ -173,7 +180,8 @@ void CModList::SetSelected(int i)
}
}
int CModList::GetSelected(void)
int
CModList::GetSelected(void)
{
return m_selected;
}

50
src/menu-fn/w_pictureswitch.cpp
View file

@ -30,24 +30,26 @@ class CPictureSwitch:CWidget
void(void) CPictureSwitch;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(string *m) SetPics;
virtual void(int val) SetValue;
virtual void(int val) SetMax;
virtual void(string val) SetValueS;
virtual void(int w, int h) SetSize;
virtual void(void(void) vFunc) SetCallback;
virtual void(string *) SetPics;
virtual void(int) SetValue;
virtual void(int) SetMax;
virtual void(string) SetValueS;
virtual void(int, int) SetSize;
virtual void(void(void)) SetCallback;
virtual string() GetPic;
};
void CPictureSwitch::CPictureSwitch(void)
void
CPictureSwitch::CPictureSwitch(void)
{
m_size[0] = 124;
m_size[1] = 124;
}
void CPictureSwitch::Draw(void)
void
CPictureSwitch::Draw(void)
{
drawfill([g_menuofs[0]+m_x,g_menuofs[1]+m_y], [m_size[0],m_size[1]], [0.25,0.25,0.25], 1.0f);
drawfill([g_menuofs[0]+m_x+3,g_menuofs[1]+m_y+3], [m_size[0]-6,m_size[1]-31], [0,0,0], 1.0f);
@ -62,7 +64,8 @@ void CPictureSwitch::Draw(void)
[1,1,1],1.0f, 0, font_arial);
}
void CPictureSwitch::Input(float type, float x, float y, float devid)
void
CPictureSwitch::Input(float type, float x, float y, float devid)
{
m_hoverPrev = Util_CheckMouse(m_x+3, m_y+m_size[1]-16, m_size[0]/2, 12);
m_hoverNext = Util_CheckMouse(m_x+m_size[0]-4-(m_size[0]/2), m_y+m_size[1]-16, m_size[0]/2, 12);
@ -86,12 +89,14 @@ void CPictureSwitch::Input(float type, float x, float y, float devid)
}
}
void CPictureSwitch::SetPics(string *m)
void
CPictureSwitch::SetPics(string *m)
{
m_pics = m;
}
void CPictureSwitch::SetValue(int val)
void
CPictureSwitch::SetValue(int val)
{
m_value = val;
@ -100,12 +105,14 @@ void CPictureSwitch::SetValue(int val)
}
}
void CPictureSwitch::SetMax(int val)
void
CPictureSwitch::SetMax(int val)
{
m_max = val;
}
void CPictureSwitch::SetValueS(string val)
void
CPictureSwitch::SetValueS(string val)
{
for (int i = 0; i < m_max; i++) {
if (m_pics[i] == val) {
@ -118,30 +125,35 @@ void CPictureSwitch::SetValueS(string val)
}
}
void CPictureSwitch::SetSize(int w, int h)
void
CPictureSwitch::SetSize(int w, int h)
{
m_size[0] = w;
m_size[1] = h;
}
void CPictureSwitch::SetPicSize(int w, int h)
void
CPictureSwitch::SetPicSize(int w, int h)
{
m_picsize[0] = w;
m_picsize[1] = h;
}
void CPictureSwitch::SetPicOffset(int w, int h)
void
CPictureSwitch::SetPicOffset(int w, int h)
{
m_picofs[0] = w;
m_picofs[1] = h;
}
void CPictureSwitch::SetCallback(void(void) vFunc)
void
CPictureSwitch::SetCallback(void(void) vFunc)
{
m_changed = vFunc;
}
string CPictureSwitch::GetPic(void)
string
CPictureSwitch::GetPic(void)
{
return m_pics[m_value];
}

38
src/menu-fn/w_scrollbar.cpp
View file

@ -25,7 +25,7 @@ class CScrollbar:CWidget
int m_minus;
int m_max;
float m_itemheight;
virtual void(int value) m_changed = 0;
virtual void(int) m_changed = 0;
int m_up_hover;
int m_up_hold;
@ -34,16 +34,17 @@ class CScrollbar:CWidget
void(void) CScrollbar;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(int val) SetScroll;
virtual void(int val) SetMax;
virtual void(int val) SetHeight;
virtual void(int val) SetItemheight;
virtual void(void(int val) vFunc) SetCallback;
virtual void(int) SetScroll;
virtual void(int) SetMax;
virtual void(int) SetHeight;
virtual void(int) SetItemheight;
virtual void(void(int)) SetCallback;
};
void CScrollbar::CScrollbar(void)
void
CScrollbar::CScrollbar(void)
{
/* There's the physical length (t_length) and the actual length
* (border, etc. ignored) */
@ -51,7 +52,8 @@ void CScrollbar::CScrollbar(void)
SetHeight(128);
}
void CScrollbar::Draw(void)
void
CScrollbar::Draw(void)
{
int barheight = 0;
int barstep = 0;
@ -100,7 +102,8 @@ void CScrollbar::Draw(void)
}
}
void CScrollbar::Input(float type, float x, float y, float devid)
void
CScrollbar::Input(float type, float x, float y, float devid)
{
int barheight = 0;
int barstep = 0;
@ -175,7 +178,8 @@ void CScrollbar::Input(float type, float x, float y, float devid)
}
}
void CScrollbar::SetScroll(int val)
void
CScrollbar::SetScroll(int val)
{
m_scroll = bound(0,val,m_max);
@ -184,24 +188,28 @@ void CScrollbar::SetScroll(int val)
}
}
void CScrollbar::SetMax(int val)
void
CScrollbar::SetMax(int val)
{
m_minus = (m_height + 20) / m_itemheight;
m_max = val - m_minus;
}
void CScrollbar::SetHeight(int val)
void
CScrollbar::SetHeight(int val)
{
m_height = val - 20;
m_theight = m_height - 32;
}
void CScrollbar::SetItemheight(int val)
void
CScrollbar::SetItemheight(int val)
{
m_itemheight = val;
}
void CScrollbar::SetCallback(void(int val) vFunc)
void
CScrollbar::SetCallback(void(int val) vFunc)
{
m_changed = vFunc;
}

47
src/menu-fn/w_servers.cpp
View file

@ -23,27 +23,29 @@ class CServerList:CWidget
int m_count;
int m_scroll;
int m_selected;
virtual void(int val) m_execute = 0;
virtual void(int) m_execute = 0;
void(void) CServerList;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(string m) AddEntry;
virtual void(string) AddEntry;
virtual void(void) Clear;
virtual void(int w, int h) SetSize;
virtual void(void(int val) func) SetChanged;
virtual void(int i) SetSelected;
virtual string() GetSelectedItem;
virtual void(int, int) SetSize;
virtual void(void(int)) SetChanged;
virtual void(int) SetSelected;
virtual string(void) GetSelectedItem;
virtual int(void) GetSelected;
};
void CServerList::CServerList(void)
void
CServerList::CServerList(void)
{
m_selected = -1;
}
void CServerList::Draw(void)
void
CServerList::Draw(void)
{
int visible;
int pos[2];
@ -65,7 +67,8 @@ void CServerList::Draw(void)
}
}
void CServerList::Input(float type, float x, float y, float devid)
void
CServerList::Input(float type, float x, float y, float devid)
{
int visible;
int pos[2];
@ -90,7 +93,8 @@ void CServerList::Input(float type, float x, float y, float devid)
}
}
void CServerList::AddEntry(string m)
void
CServerList::AddEntry(string m)
{
for (int i = 0; i < SL_MAX_ENTRIES; i++) {
if (m_entries[i] == __NULL__) {
@ -101,40 +105,47 @@ void CServerList::AddEntry(string m)
}
}
void CServerList::Clear(void)
void
CServerList::Clear(void)
{
for (int i = 0; i < SL_MAX_ENTRIES; i++) {
m_entries[i] = __NULL__;
}
}
void CServerList::SetSize(int w, int h)
void
CServerList::SetSize(int w, int h)
{
m_size[0] = w;
m_size[1] = h;
}
void CServerList::SetScroll(int i)
void
CServerList::SetScroll(int i)
{
m_scroll = i;
}
void CServerList::SetChanged(void(int val) func)
void
CServerList::SetChanged(void(int val) func)
{
m_execute = func;
}
void CServerList::SetSelected(int i)
void
CServerList::SetSelected(int i)
{
m_selected = i;
}
int CServerList::GetSelected(void)
int
CServerList::GetSelected(void)
{
return m_selected;
}
string CServerList::GetSelectedItem(void)
string
CServerList::GetSelectedItem(void)
{
if (m_selected == -1) {
return __NULL__;

23
src/menu-fn/w_slider.cpp
View file

@ -21,17 +21,18 @@ class CSlider:CWidget
int m_hover;
int m_hold;
float m_value;
virtual void(float value) m_changed = 0;
virtual void(float) m_changed = 0;
void(void) CSlider;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(float val) SetValue;
virtual void(void(float val) vFunc) SetCallback;
virtual void(float) SetValue;
virtual void(void(float)) SetCallback;
};
void CSlider::CSlider(void)
void
CSlider::CSlider(void)
{
/* There's the physical length (t_length) and the actual length
* (border, etc. ignored) */
@ -39,7 +40,8 @@ void CSlider::CSlider(void)
m_tlength = m_length - 27;
}
void CSlider::Draw(void)
void
CSlider::Draw(void)
{
drawfill([g_menuofs[0]+m_x,g_menuofs[1]+m_y], [m_length,8], [0.25,0.25,0.25], 1.0f);
drawfill([g_menuofs[0]+m_x+3,g_menuofs[1]+m_y+3], [m_length-6,2], [0,0,0], 1.0f);
@ -49,7 +51,8 @@ void CSlider::Draw(void)
[21,8], [1,1,1], 1.0f);
}
void CSlider::Input(float type, float x, float y, float devid)
void
CSlider::Input(float type, float x, float y, float devid)
{
if (Util_CheckMouse(m_x, m_y, m_length, 8) == TRUE) {
m_hover = TRUE;
@ -84,12 +87,14 @@ void CSlider::Input(float type, float x, float y, float devid)
}
}
void CSlider::SetValue(float val)
void
CSlider::SetValue(float val)
{
m_value = val;
}
void CSlider::SetCallback(void(float val) vFunc)
void
CSlider::SetCallback(void(float val) vFunc)
{
m_changed = vFunc;
}

19
src/menu-fn/w_textbox.cpp
View file

@ -32,17 +32,20 @@ class CTextBox:CWidget
void(void) CTextBox;
virtual void(void) Draw;
virtual void(float, float, float, float) Input;
virtual void(void(string) vFunc) SetCallOnEnter;
virtual void(string) SetText;
virtual void(int) SetLength;
};
void CTextBox::CTextBox(void)
void
CTextBox::CTextBox(void)
{
m_length = 184;
}
void CTextBox::Draw(void)
void
CTextBox::Draw(void)
{
if (g_focuswidget == this) {
drawfill([g_menuofs[0]+m_x,g_menuofs[1]+m_y], [m_length,24], [0.5,0.5,0.5], 1.0f);
@ -66,7 +69,8 @@ void CTextBox::Draw(void)
}
}
void CTextBox::Input(float type, float x, float y, float devid)
void
CTextBox::Input(float type, float x, float y, float devid)
{
if (type == IE_KEYDOWN) {
switch (x) {
@ -105,17 +109,20 @@ void CTextBox::Input(float type, float x, float y, float devid)
}
}
void CTextBox::SetCallOnEnter(void(string) vFunc)
void
CTextBox::SetCallOnEnter(void(string) vFunc)
{
m_onEnter = vFunc;
}
void CTextBox::SetText(string txt)
void
CTextBox::SetText(string txt)
{
m_text = txt;
}
void CTextBox::SetLength(int len)
void
CTextBox::SetLength(int len)
{
m_length = len;
}

24
src/menu-fn/w_textbuffer.cpp
View file

@ -20,22 +20,24 @@ class CTextBuffer:CWidget
{
int m_size[2];
string m_entries[TB_MAX_ENTRIES];
virtual void(int val) m_execute = 0;
virtual void(int) m_execute = 0;
void(void) CTextBuffer;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(string m) Insert;
virtual void(string) Insert;
virtual void(void) Clear;
virtual void(int, int) SetSize;
};
void CTextBuffer::CTextBuffer(void)
void
CTextBuffer::CTextBuffer(void)
{
}
void CTextBuffer::Draw(void)
void
CTextBuffer::Draw(void)
{
int visible;
int pos[2];
@ -55,12 +57,14 @@ void CTextBuffer::Draw(void)
}
}
void CTextBuffer::Input(float type, float x, float y, float devid)
void
CTextBuffer::Input(float type, float x, float y, float devid)
{
}
void CTextBuffer::Insert(string m)
void
CTextBuffer::Insert(string m)
{
for (int i = 0; i < TB_MAX_ENTRIES; i++) {
if (i == TB_MAX_ENTRIES - 1) {
@ -71,14 +75,16 @@ void CTextBuffer::Insert(string m)
}
}
void CTextBuffer::Clear(void)
void
CTextBuffer::Clear(void)
{
for (int i = 0; i < TB_MAX_ENTRIES; i++) {
m_entries[i] = __NULL__;
}
}
void CTextBuffer::SetSize(int w, int h)
void
CTextBuffer::SetSize(int w, int h)
{
m_size[0] = w;
m_size[1] = h;

35
src/menu-fn/w_updatelist.cpp
View file

@ -31,20 +31,22 @@ class CUpdateList:CWidget
void(void) CUpdateList;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(int w, int h) SetSize;
//virtual void(void(int val) func) SetChanged;
virtual void(int i) SetSelected;
virtual void(int, int) SetSize;
//virtual void(void(int)) SetChanged;
virtual void(int) SetSelected;
virtual int(void) GetSelected;
};
void CUpdateList::CUpdateList(void)
void
CUpdateList::CUpdateList(void)
{
m_selected = -1;
}
void CUpdateList::Draw(void)
void
CUpdateList::Draw(void)
{
int visible;
int pos;
@ -117,7 +119,8 @@ void CUpdateList::Draw(void)
}
}
void CUpdateList::Input(float type, float x, float y, float devid)
void
CUpdateList::Input(float type, float x, float y, float devid)
{
int visible;
int pos[2];
@ -141,23 +144,27 @@ void CUpdateList::Input(float type, float x, float y, float devid)
}
}
void CUpdateList::SetSize(int w, int h)
void
CUpdateList::SetSize(int w, int h)
{
m_size[0] = w;
m_size[1] = h;
}
void CUpdateList::SetScroll(int i)
void
CUpdateList::SetScroll(int i)
{
m_scroll = i;
}
void CUpdateList::SetChanged(void(void) func)
void
CUpdateList::SetChanged(void(void) func)
{
m_changed = func;
}
void CUpdateList::SetSelected(int i)
void
CUpdateList::SetSelected(int i)
{
m_selected = i;
@ -166,12 +173,14 @@ void CUpdateList::SetSelected(int i)
}
}
int CUpdateList::GetSelected(void)
int
CUpdateList::GetSelected(void)
{
return m_selected;
}
/*string CUpdateList::GetSelectedItem(void)
/*string
CUpdateList::GetSelectedItem(void)
{
if (m_selected == -1) {
return __NULL__;

25
src/menu-fn/widgets.cpp
View file

@ -23,32 +23,37 @@ class CWidget
void(void) CWidget;
virtual void(void) Draw;
virtual void(float type, float x, float y, float devid) Input;
virtual void(float, float, float, float) Input;
virtual void(int x, int y) SetPos;
virtual void(int, int) SetPos;
};
void CWidget::CWidget(void)
void
CWidget::CWidget(void)
{
m_x = g_menuofs[0];
m_y = g_menuofs[1];
}
void CWidget::Draw(void)
void
CWidget::Draw(void)
{
}
void CWidget::Input(float type, float x, float y, float devid)
void
CWidget::Input(float type, float x, float y, float devid)
{
}
void CWidget::SetPos(int x, int y)
void
CWidget::SetPos(int x, int y)
{
m_x = x;
m_y = y;
}
void Widget_Add(CWidget parent, CWidget item)
void
Widget_Add(CWidget parent, CWidget item)
{
CWidget wNext = parent;
CWidget wParent;
@ -60,7 +65,8 @@ void Widget_Add(CWidget parent, CWidget item)
item.m_parent = parent;
}
void Widget_Draw(CWidget start)
void
Widget_Draw(CWidget start)
{
CWidget wNext = start;
do {
@ -71,7 +77,8 @@ void Widget_Draw(CWidget start)
} while (wNext);
}
void Widget_Input(CWidget start, float type, float x, float y, float devid)
void
Widget_Input(CWidget start, float type, float x, float y, float devid)
{
CWidget wNext = start;
do {