From d6ddd31a599056b10def3f5f4dd1395c3bb5a27a Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sun, 18 Aug 2013 19:20:11 -0400 Subject: [PATCH] Proper file naming --- qcsrc/menu/classes.c | 16 +++++----- qcsrc/menu/xonotic/dialog_multiplayer.c | 2 +- ...ersetup.c => dialog_multiplayer_profile.c} | 32 +++++++++---------- ...air.c => dialog_settings_game_crosshair.c} | 0 ...setup_hud.c => dialog_settings_game_hud.c} | 0 ...rm.c => dialog_settings_game_hudconfirm.c} | 0 ...p_model.c => dialog_settings_game_model.c} | 0 ....c => dialog_settings_game_notification.c} | 0 ...tup_view.c => dialog_settings_game_view.c} | 0 ...apons.c => dialog_settings_game_weapons.c} | 0 10 files changed, 25 insertions(+), 25 deletions(-) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup.c => dialog_multiplayer_profile.c} (90%) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup_crosshair.c => dialog_settings_game_crosshair.c} (100%) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup_hud.c => dialog_settings_game_hud.c} (100%) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup_hudconfirm.c => dialog_settings_game_hudconfirm.c} (100%) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup_model.c => dialog_settings_game_model.c} (100%) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup_notification.c => dialog_settings_game_notification.c} (100%) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup_view.c => dialog_settings_game_view.c} (100%) rename qcsrc/menu/xonotic/{dialog_multiplayer_playersetup_weapons.c => dialog_settings_game_weapons.c} (100%) diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c index f35b40843..1a8d93bf7 100644 --- a/qcsrc/menu/classes.c +++ b/qcsrc/menu/classes.c @@ -37,7 +37,7 @@ #include "xonotic/dialog_settings_user.c" #include "xonotic/dialog_settings_misc.c" #include "xonotic/dialog_multiplayer.c" -#include "xonotic/dialog_multiplayer_playersetup.c" +#include "xonotic/dialog_multiplayer_profile.c" #include "xonotic/tabcontroller.c" #include "xonotic/textlabel.c" #include "xonotic/slider.c" @@ -79,12 +79,12 @@ #include "xonotic/dialog_singleplayer_winner.c" #include "xonotic/dialog_credits.c" #include "xonotic/credits.c" -#include "xonotic/dialog_multiplayer_playersetup_crosshair.c" -#include "xonotic/dialog_multiplayer_playersetup_hud.c" -#include "xonotic/dialog_multiplayer_playersetup_hudconfirm.c" -#include "xonotic/dialog_multiplayer_playersetup_model.c" -#include "xonotic/dialog_multiplayer_playersetup_view.c" -#include "xonotic/dialog_multiplayer_playersetup_weapons.c" +#include "xonotic/dialog_settings_game_crosshair.c" +#include "xonotic/dialog_settings_game_hud.c" +#include "xonotic/dialog_settings_game_hudconfirm.c" +#include "xonotic/dialog_settings_game_model.c" +#include "xonotic/dialog_settings_game_view.c" +#include "xonotic/dialog_settings_game_weapons.c" #include "xonotic/weaponslist.c" #include "xonotic/dialog_multiplayer_media.c" #include "xonotic/dialog_multiplayer_media_demo.c" @@ -116,4 +116,4 @@ #include "xonotic/dialog_hudpanel_physics.c" #include "xonotic/dialog_hudpanel_centerprint.c" #include "xonotic/slider_picmip.c" -#include "xonotic/dialog_multiplayer_playersetup_notification.c" +#include "xonotic/dialog_settings_game_notification.c" diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer.c index 564c86791..7d234c7fe 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer.c @@ -21,7 +21,7 @@ void XonoticMultiplayerDialog_fill(entity me) //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab())); //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Players"), makeXonoticDemoBrowserTab())); me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Media"), makeXonoticMediaTab())); - me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Profile"), makeXonoticPlayerSettingsTab())); + me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Profile"), makeXonoticProfileTab())); me.TR(me); me.TD(me, me.rows - 1, me.columns, mc); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_profile.c similarity index 90% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c rename to qcsrc/menu/xonotic/dialog_multiplayer_profile.c index d542536fa..668d808bf 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.c @@ -1,34 +1,34 @@ #ifdef INTERFACE -CLASS(XonoticPlayerSettingsTab) EXTENDS(XonoticTab) - METHOD(XonoticPlayerSettingsTab, fill, void(entity)) - METHOD(XonoticPlayerSettingsTab, draw, void(entity)) - ATTRIB(XonoticPlayerSettingsTab, title, string, _("Profile")) - ATTRIB(XonoticPlayerSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticPlayerSettingsTab, rows, float, 23) - ATTRIB(XonoticPlayerSettingsTab, columns, float, 6.2) // added extra .2 for center space - ATTRIB(XonoticPlayerSettingsTab, playerNameLabel, entity, NULL) - ATTRIB(XonoticPlayerSettingsTab, playerNameLabelAlpha, float, 0) -ENDCLASS(XonoticPlayerSettingsTab) -entity makeXonoticPlayerSettingsTab(); +CLASS(XonoticProfileTab) EXTENDS(XonoticTab) + METHOD(XonoticProfileTab, fill, void(entity)) + METHOD(XonoticProfileTab, draw, void(entity)) + ATTRIB(XonoticProfileTab, title, string, _("Profile")) + ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9) + ATTRIB(XonoticProfileTab, rows, float, 23) + ATTRIB(XonoticProfileTab, columns, float, 6.2) // added extra .2 for center space + ATTRIB(XonoticProfileTab, playerNameLabel, entity, NULL) + ATTRIB(XonoticProfileTab, playerNameLabelAlpha, float, 0) +ENDCLASS(XonoticProfileTab) +entity makeXonoticProfileTab(); #endif #ifdef IMPLEMENTATION -entity makeXonoticPlayerSettingsTab() +entity makeXonoticProfileTab() { entity me; - me = spawnXonoticPlayerSettingsTab(); + me = spawnXonoticProfileTab(); me.configureDialog(me); return me; } -void XonoticPlayerSettingsTab_draw(entity me) +void XonoticProfileTab_draw(entity me) { if(cvar_string("_cl_name") == "Player") me.playerNameLabel.alpha = ((mod(time * 2, 2) < 1) ? 1 : 0); else me.playerNameLabel.alpha = me.playerNameLabelAlpha; - SUPER(XonoticPlayerSettingsTab).draw(me); + SUPER(XonoticProfileTab).draw(me); } -void XonoticPlayerSettingsTab_fill(entity me) +void XonoticProfileTab_fill(entity me) { entity e, pms, label, box; float i; diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_crosshair.c b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.c similarity index 100% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup_crosshair.c rename to qcsrc/menu/xonotic/dialog_settings_game_crosshair.c diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c b/qcsrc/menu/xonotic/dialog_settings_game_hud.c similarity index 100% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hud.c rename to qcsrc/menu/xonotic/dialog_settings_game_hud.c diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hudconfirm.c b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c similarity index 100% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup_hudconfirm.c rename to qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c b/qcsrc/menu/xonotic/dialog_settings_game_model.c similarity index 100% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup_model.c rename to qcsrc/menu/xonotic/dialog_settings_game_model.c diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c b/qcsrc/menu/xonotic/dialog_settings_game_notification.c similarity index 100% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c rename to qcsrc/menu/xonotic/dialog_settings_game_notification.c diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_settings_game_view.c similarity index 100% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c rename to qcsrc/menu/xonotic/dialog_settings_game_view.c diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c b/qcsrc/menu/xonotic/dialog_settings_game_weapons.c similarity index 100% rename from qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c rename to qcsrc/menu/xonotic/dialog_settings_game_weapons.c -- 2.39.2