expirecheck for menus too

/soundlist
bjallamo · May 8, 2016 · 71a8d8c · 71a8d8c
1 parent c4d1d67
commit 71a8d8c
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/Funny Sounds/scripting/funny_sounds_with_menu.sma b/Funny Sounds/scripting/funny_sounds_with_menu.sma
@@ -73,18 +73,22 @@ public sayhandler(id) {
 	for(new i; i<g_aSize; i++) {
 		ArrayGetString(musicname, i, sSoundName, charsmax(sSoundName));
 		if(equali(message, sSoundName)) {
-			new usrtime = get_user_time(id);
-
-			if(usrtime >= g_iTimeExpired[id]) {
-				playsound(i);
-				g_iTimeExpired[id] = (usrtime + TIME_BETWEEN_SOUNDS);
-			}
-			else
-				ColorChat(id, NORMAL, "^4[%s]^1 %L", PREFIX, LANG_SERVER, "YOU_HAVE_TO_WAIT" , (g_iTimeExpired[id] - usrtime));
+			expirecheck(id, i);
 		}
 	}
 }
 
+expirecheck(id, item) {
+	new usrtime = get_user_time(id);
+
+	if(usrtime >= g_iTimeExpired[id]) {
+		playsound(item);
+		g_iTimeExpired[id] = (usrtime + TIME_BETWEEN_SOUNDS);
+	}
+	else
+		ColorChat(id, NORMAL, "^4[%s]^1 %L", PREFIX, LANG_SERVER, "YOU_HAVE_TO_WAIT" , (g_iTimeExpired[id] - usrtime));
+}
+
 playsound(item) {
 	new szSound[64]; ArrayGetString(musicpath, item, szSound, charsmax(szSound));
 	new makesound[128];
@@ -165,7 +169,7 @@ public musicmenu_h(id, menu, item) {
 		return PLUGIN_HANDLED;
 	}
 
-	playsound(item);
+	expirecheck(id, item);
 
 	menu_destroy(menu);
 	return PLUGIN_HANDLED;