Fix broadcast text loading.

brotalnia · Apr 23, 2020 · 170895f · 170895f
1 parent 2f49deb
commit 170895f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ScriptEditor/FormScriptEditor.Designer.cs b/ScriptEditor/FormScriptEditor.Designer.cs
diff --git a/ScriptEditor/FormScriptEditor.cs b/ScriptEditor/FormScriptEditor.cs
@@ -179,6 +179,7 @@ private void LoadControls()
             cmbTargetType.Items.Add(new ComboboxPair("Nearest Player", 23));
             cmbTargetType.Items.Add(new ComboboxPair("Nearest Hostile Player", 24));
             cmbTargetType.Items.Add(new ComboboxPair("Nearest Friendly Player", 25));
+            cmbTargetType.Items.Add(new ComboboxPair("Random Creature", 26));
             cmbTargetType.SelectedIndex = 0;
 
             // Add chat types to combo box.
@@ -2365,8 +2366,9 @@ private void SetTargetControlsBasedOnType(int target_type)
                     txtTargetParam2.Enabled = false;
                     break;
                 }
-                case 8: // Creature Entry
-                case 11: // GameObject Entry
+                case 8: // Nearest Creature with Entry
+                case 11: // Nearest GameObject with Entry
+                case 26: // Random Creature with Entry
                 {
                     lblTargetParam1.Text = "Entry:";
                     lblTargetParam2.Text = "Radius:";

diff --git a/ScriptEditor/GameData.cs b/ScriptEditor/GameData.cs
@@ -299,7 +299,7 @@ public static void LoadBroadcastTexts(string connString)
 
             MySqlConnection conn = new MySqlConnection(connString);
             MySqlCommand command = conn.CreateCommand();
-            command.CommandText = "SELECT `ID`, `MaleText`, `FemaleText`, `Type`, `Language` FROM `broadcast_text` ORDER BY `ID`";
+            command.CommandText = "SELECT `entry`, `male_text`, `female_text`, `chat_type`, `language_id` FROM `broadcast_text` ORDER BY `entry`";
             try
             {
                 conn.Open();