Release 1.0.0

Author: dronelektron

build.sh

@@ -2,4 +2,5 @@
 
 PLUGIN_NAME="class-manager"
 
-spcomp scripting/$PLUGIN_NAME.sp scripting/modules/*.sp -i scripting/include -o plugins/$PLUGIN_NAME.smx
+cd scripting
+spcomp $PLUGIN_NAME.sp -i include -o ../plugins/$PLUGIN_NAME.smx

scripting/class-manager.sp

@@ -5,47 +5,39 @@
 #pragma semicolon 1
 #pragma newdecls required
 
-#include "class"
-#include "team"
-#include "message"
-#include "menu"
+#include "cm/class"
+#include "cm/menu"
+#include "cm/message"
+#include "cm/team"
+
+#include "modules/class.sp"
+#include "modules/console-variable.sp"
+#include "modules/menu.sp"
+#include "modules/message.sp"
+#include "modules/player.sp"
+#include "modules/team.sp"
+#include "modules/use-case.sp"
 
 public Plugin myinfo = {
     name = "Class manager",
     author = "Dron-elektron",
     description = "Allows you to perform various operations on player classes",
-    version = "0.1.1",
-    url = ""
-}
-
-char ADMIN_MENU[] = "adminmenu";
-TopMenu g_adminMenu = null;
+    version = "1.0.0",
+    url = "https://github.com/dronelektron/class-manager"
+};
 
 public void OnPluginStart() {
-    FindClassLimitConVars();
+    Variable_FindClassLimits();
+    AdminMenu_Create();
     LoadTranslations("class-manager.phrases");
-
-    TopMenu topMenu;
-
-    if (LibraryExists(ADMIN_MENU) && (topMenu = GetAdminTopMenu()) != null) {
-        OnAdminMenuReady(topMenu);
-    }
 }
 
 public void OnLibraryRemoved(const char[] name) {
-    if (StrEqual(name, ADMIN_MENU, false)) {
-        g_adminMenu = null;
+    if (strcmp(name, ADMIN_MENU) == 0) {
+        AdminMenu_Destroy();
     }
 }
 
-public void OnAdminMenuReady(Handle aTopMenu) {
-    TopMenu topMenu = TopMenu.FromHandle(aTopMenu);
-
-    if (topMenu == g_adminMenu) {
-        return;
-    }
-
-    g_adminMenu = topMenu;
-
-    AddClassManagerToAdminMenu();
+public void OnAdminMenuReady(Handle topMenu) {
+    AdminMenu_OnReady(topMenu);
 }

scripting/include/class.inc scripting/include/cm/class.incscripting/include/class.inc renamed to scripting/include/cm/class.inc

@@ -3,6 +3,10 @@
 #endif
 #define _class_included
 
+#define CLASS_NAME_SIZE 32
+#define CLASS_DISABLED 0
+#define CLASS_UNLIMITED -1
+
 enum {
     Class_Unknown = -1,
     Class_Rifleman,
@@ -11,4 +15,4 @@ enum {
     Class_Sniper,
     Class_Mg,
     Class_Rocket
-}
+};

scripting/include/menu.inc scripting/include/cm/menu.incscripting/include/menu.inc renamed to scripting/include/cm/menu.inc

@@ -20,3 +20,5 @@
 #define ALLIES "Allies"
 #define AXIS "Axis"
 #define BOTH_TEAMS "Both teams"
+
+#define ADMIN_MENU "adminmenu"

scripting/include/message.inc scripting/include/cm/message.incscripting/include/message.inc renamed to scripting/include/cm/message.inc

@@ -3,9 +3,11 @@
 #endif
 #define _team_included
 
+#define TEAM_NAME_SIZE 32
+
 enum {
     Team_Unassigned = 0,
     Team_Spectator,
     Team_Allies,
     Team_Axis
-}
+};

scripting/include/team.inc scripting/include/cm/team.incscripting/include/team.inc renamed to scripting/include/cm/team.inc

@@ -0,0 +1,5 @@
+static char g_classNames[][] = {RIFLEMAN, ASSAULT, SUPPORT, SNIPER, MG, ROCKET};
+
+void Class_GetName(int class, char[] className) {
+    strcopy(className, CLASS_NAME_SIZE, g_classNames[class]);
+}

scripting/modules/class.sp

@@ -19,26 +19,26 @@ static char g_limitAxisConVarNames[][] = {
 static ConVar g_limitAlliesConVars[Class_Rocket + 1] = {null, ...};
 static ConVar g_limitAxisConVars[Class_Rocket + 1] = {null, ...};
 
-void FindClassLimitConVars() {
+void Variable_FindClassLimits() {
     for (int i = Class_Rifleman; i <= Class_Rocket; i++) {
         g_limitAlliesConVars[i] = FindConVar(g_limitAlliesConVarNames[i]);
         g_limitAxisConVars[i] = FindConVar(g_limitAxisConVarNames[i]);
 
-        g_limitAlliesConVars[i].AddChangeHook(ConVarChanged_ClassLimit);
-        g_limitAxisConVars[i].AddChangeHook(ConVarChanged_ClassLimit);
+        g_limitAlliesConVars[i].AddChangeHook(Variable_ClassLimitChanged);
+        g_limitAxisConVars[i].AddChangeHook(Variable_ClassLimitChanged);
     }
 }
 
-void ConVarChanged_ClassLimit(ConVar conVar, char[] oldValue, char[] newValue) {
+void Variable_ClassLimitChanged(ConVar conVar, char[] oldValue, char[] newValue) {
     int team;
     int class;
     int limit = StringToInt(newValue);
 
-    GetConVarTeamAndClass(conVar, team, class);
-    MovePlayersToSpectator(team, class, limit);
+    Variable_GetTeamAndClass(conVar, team, class);
+    UseCase_MoveToSpectator(team, class, limit);
 }
 
-void GetConVarTeamAndClass(ConVar conVar, int& team, int& class) {
+void Variable_GetTeamAndClass(ConVar conVar, int& team, int& class) {
     team = Team_Unassigned;
     class = Class_Unknown;
 
@@ -59,7 +59,7 @@ void GetConVarTeamAndClass(ConVar conVar, int& team, int& class) {
     }
 }
 
-void SetConVarValue(int team, int class, int limit) {
+void Variable_SetClassLimit(int team, int class, int limit) {
     if (team == Team_Allies) {
         g_limitAlliesConVars[class].SetInt(limit);
     } else if (team == Team_Axis) {

scripting/modules/convar.sp scripting/modules/console-variable.spscripting/modules/convar.sp renamed to scripting/modules/console-variable.sp

@@ -1,35 +1,65 @@
+static TopMenu g_adminMenu = null;
+
 static TopMenuObject g_classManagerCategory = INVALID_TOPMENUOBJECT;
 static TopMenuObject g_menuItemClasses[Class_Rocket + 1] = {INVALID_TOPMENUOBJECT, ...};
 
 static int g_selectedClass[MAXPLAYERS + 1] = {Class_Unknown, ...};
 static int g_selectedLimit[MAXPLAYERS + 1] = {-1, ...};
 
-static char teamNames[][] = {ALLIES, AXIS};
-static char classNames[][] = {RIFLEMAN, ASSAULT, SUPPORT, SNIPER, MG, ROCKET};
+void AdminMenu_Create() {
+    TopMenu topMenu = GetAdminTopMenu();
+
+    if (LibraryExists(ADMIN_MENU) && topMenu != null) {
+        OnAdminMenuReady(topMenu);
+    }
+}
+
+void AdminMenu_Destroy() {
+    g_adminMenu = null;
+}
+
+void AdminMenu_OnReady(Handle topMenuHandle) {
+    TopMenu topMenu = TopMenu.FromHandle(topMenuHandle);
+
+    if (topMenu == g_adminMenu) {
+        return;
+    }
+
+    g_adminMenu = topMenu;
+
+    AdminMenu_Fill();
+}
 
-void AddClassManagerToAdminMenu() {
-    g_classManagerCategory = g_adminMenu.AddCategory(CLASS_MANAGER, TopMenuHandler_ClassManager);
+void AdminMenu_Fill() {
+    g_classManagerCategory = g_adminMenu.AddCategory(CLASS_MANAGER, AdminMenuHandler_ClassManager);
 
     if (g_classManagerCategory == INVALID_TOPMENUOBJECT) {
         return;
     }
 
+    char className[CLASS_NAME_SIZE];
+
     for (int class = Class_Rifleman; class <= Class_Rocket; class++) {
-        g_menuItemClasses[class] = g_adminMenu.AddItem(classNames[class], TopMenuHandler_ClassManager, g_classManagerCategory);
+        Class_GetName(class, className);
+
+        g_menuItemClasses[class] = g_adminMenu.AddItem(className, AdminMenuHandler_ClassManager, g_classManagerCategory);
     }
 }
 
-public void TopMenuHandler_ClassManager(TopMenu topmenu, TopMenuAction action, TopMenuObject topobj_id, int param, char[] buffer, int maxlength) {
+public void AdminMenuHandler_ClassManager(TopMenu topmenu, TopMenuAction action, TopMenuObject topobj_id, int param, char[] buffer, int maxlength) {
     if (action == TopMenuAction_DisplayOption) {
         if (topobj_id == g_classManagerCategory) {
             Format(buffer, maxlength, "%T", CLASS_MANAGER, param);
 
             return;
         }
 
+        char className[CLASS_NAME_SIZE];
+
         for (int class = Class_Rifleman; class <= Class_Rocket; class++) {
             if (topobj_id == g_menuItemClasses[class]) {
-                Format(buffer, maxlength, "%T", classNames[class], param);
+                Class_GetName(class, className);
+                Format(buffer, maxlength, "%T", className, param);
 
                 break;
             }
@@ -42,22 +72,22 @@ public void TopMenuHandler_ClassManager(TopMenu topmenu, TopMenuAction action, T
         for (int class = Class_Rifleman; class <= Class_Rocket; class++) {
             if (topobj_id == g_menuItemClasses[class]) {
                 g_selectedClass[param] = class;
-                CreateClassActionMenu(param);
+                Menu_ClassAction(param);
 
                 break;
             }
         }
     }
 }
 
-void CreateClassActionMenu(int client) {
+void Menu_ClassAction(int client) {
     Menu menu = new Menu(MenuHandler_ClassAction);
 
     menu.SetTitle("%T", SELECT_ACTION, client);
 
-    AddTranslatedMenuItem(menu, ENABLE_CLASS, ENABLE_CLASS, client);
-    AddTranslatedMenuItem(menu, DISABLE_CLASS, DISABLE_CLASS, client);
-    AddTranslatedMenuItem(menu, SET_CLASS_LIMIT, SET_CLASS_LIMIT, client);
+    Menu_AddItem(menu, ENABLE_CLASS, ENABLE_CLASS, client);
+    Menu_AddItem(menu, DISABLE_CLASS, DISABLE_CLASS, client);
+    Menu_AddItem(menu, SET_CLASS_LIMIT, SET_CLASS_LIMIT, client);
 
     menu.ExitBackButton = true;
     menu.Display(client, MENU_TIME_FOREVER);
@@ -70,15 +100,15 @@ int MenuHandler_ClassAction(Menu menu, MenuAction action, int param1, int param2
         menu.GetItem(param2, info, sizeof(info));
 
         if (StrEqual(info, ENABLE_CLASS)) {
-            g_selectedLimit[param1] = -1;
+            g_selectedLimit[param1] = CLASS_UNLIMITED;
 
-            CreateTeamMenu(param1);
+            Menu_TeamAction(param1);
         } else if (StrEqual(info, DISABLE_CLASS)) {
-            g_selectedLimit[param1] = 0;
+            g_selectedLimit[param1] = CLASS_DISABLED;
 
-            CreateTeamMenu(param1);
+            Menu_TeamAction(param1);
         } else if (StrEqual(info, SET_CLASS_LIMIT)) {
-            CreateClassLimitMenu(param1);
+            Menu_ClassLimit(param1);
         }
     } else {
         MenuHandler_Default(menu, action, param1, param2);
@@ -87,7 +117,7 @@ int MenuHandler_ClassAction(Menu menu, MenuAction action, int param1, int param2
     return 0;
 }
 
-void CreateClassLimitMenu(int client) {
+void Menu_ClassLimit(int client) {
     Menu menu = new Menu(MenuHandler_ClassLimit);
     char info[TEXT_BUFFER_MAX_SIZE];
 
@@ -110,22 +140,22 @@ int MenuHandler_ClassLimit(Menu menu, MenuAction action, int param1, int param2)
         menu.GetItem(param2, info, sizeof(info));
         g_selectedLimit[param1] = StringToInt(info);
 
-        CreateTeamMenu(param1);
+        Menu_TeamAction(param1);
     } else {
         MenuHandler_Default(menu, action, param1, param2);
     }
 
     return 0;
 }
 
-void CreateTeamMenu(int client) {
+void Menu_TeamAction(int client) {
     Menu menu = new Menu(MenuHandler_TeamAction);
 
     menu.SetTitle("%T", "Select team", client);
 
-    AddTranslatedMenuItem(menu, ALLIES, ALLIES, client);
-    AddTranslatedMenuItem(menu, AXIS, AXIS, client);
-    AddTranslatedMenuItem(menu, BOTH_TEAMS, BOTH_TEAMS, client);
+    Menu_AddItem(menu, ALLIES, ALLIES, client);
+    Menu_AddItem(menu, AXIS, AXIS, client);
+    Menu_AddItem(menu, BOTH_TEAMS, BOTH_TEAMS, client);
 
     menu.ExitBackButton = true;
     menu.Display(client, MENU_TIME_FOREVER);
@@ -140,16 +170,12 @@ int MenuHandler_TeamAction(Menu menu, MenuAction action, int param1, int param2)
         menu.GetItem(param2, info, sizeof(info));
 
         if (StrEqual(info, ALLIES)) {
-            SetConVarValue(Team_Allies, class, limit);
-            NotifyAboutClassLimitChange(param1, Team_Allies, class, limit);
+            UseCase_ChangeClassLimit(param1, Team_Allies, class, limit);
         } else if (StrEqual(info, AXIS)) {
-            SetConVarValue(Team_Axis, class, limit);
-            NotifyAboutClassLimitChange(param1, Team_Axis, class, limit);
+            UseCase_ChangeClassLimit(param1, Team_Axis, class, limit);
         } else if (StrEqual(info, BOTH_TEAMS)) {
-            SetConVarValue(Team_Allies, class, limit);
-            NotifyAboutClassLimitChange(param1, Team_Allies, class, limit);
-            SetConVarValue(Team_Axis, class, limit);
-            NotifyAboutClassLimitChange(param1, Team_Axis, class, limit);
+            UseCase_ChangeClassLimit(param1, Team_Allies, class, limit);
+            UseCase_ChangeClassLimit(param1, Team_Axis, class, limit);
         }
     } else {
         MenuHandler_Default(menu, action, param1, param2);
@@ -168,7 +194,7 @@ void MenuHandler_Default(Menu menu, MenuAction action, int param1, int param2) {
     }
 }
 
-void AddTranslatedMenuItem(Menu menu, char[] info, any ...) {
+void Menu_AddItem(Menu menu, char[] info, any ...) {
     char item[TEXT_BUFFER_MAX_SIZE];
 
     VFormat(item, sizeof(item), "%T", 3);

scripting/modules/menu.sp

@@ -1,8 +1,21 @@
-void NotifyAboutClassLimitChange(int client, int team, int class, int limit) {
-    ShowActivity2(client, PREFIX, "%t", "Class limit was changed", classNames[class], teamNames[team - 2], limit);
-    LogAction(client, -1, "\"%L\" changed class limit of '%s' in team '%s' to '%d'", client, classNames[class], teamNames[team - 2], limit);
+void Message_ClassLimitChanged(int client, int team, int class, int limit) {
+    char teamName[TEAM_NAME_SIZE];
+    char className[CLASS_NAME_SIZE];
+
+    Team_GetName(team - 2, teamName);
+    Class_GetName(class, className);
+    MessageActivity_ClassLimitChanged(client, teamName, className, limit);
+    MessageLog_ClassLimitChanged(client, teamName, className, limit);
+}
+
+void MessageActivity_ClassLimitChanged(int client, const char[] teamName, const char[] className, int limit) {
+    ShowActivity2(client, PREFIX, "%t", "Class limit was changed", className, teamName, limit);
+}
+
+void MessageLog_ClassLimitChanged(int client, const char[] teamName, const char[] className, int limit) {
+    LogAction(client, -1, "\"%L\" changed class limit of '%s' in team '%s' to '%d'", client, className, teamName, limit);
 }
 
-void NotifyAboutSpectatorTeam(int client) {
+void MessagePrint_YouWasMovedToSpectators(int client) {
     PrintToChat(client, "%s%t", PREFIX, "You was moved to spectator team");
 }