Ensure MNTexts referencing strings from defs are set during menu init

skyjake · Feb 20, 2012 · 5aec052 · 5aec052
1 parent a407989
commit 5aec052
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/doomsday/plugins/common/src/hu_menu.c b/doomsday/plugins/common/src/hu_menu.c
@@ -2236,10 +2236,15 @@ static void initPageObjects(mn_page_t* page)
 
         switch(MNObject_Type(ob))
         {
-        case MN_TEXT:
-        case MN_MOBJPREVIEW:
+        case MN_TEXT: {
+            mndata_text_t* txt = (mndata_text_t*)ob->_typedata;
             MNObject_SetFlags(ob, FO_SET, MNF_NO_FOCUS);
-            break;
+
+            if(txt->text && (PTR2INT(txt->text) > 0 && PTR2INT(txt->text) < NUMTEXT))
+            {
+                txt->text = GET_TXT(PTR2INT(txt->text));
+            }
+            break; }
 
         case MN_BUTTON: {
             const mn_actioninfo_t* action = MNObject_Action(ob, MNA_MODIFIED);
@@ -2288,6 +2293,10 @@ static void initPageObjects(mn_page_t* page)
                 cbox->height = MNDATA_COLORBOX_HEIGHT;
             break; }
 
+        case MN_MOBJPREVIEW:
+            MNObject_SetFlags(ob, FO_SET, MNF_NO_FOCUS);
+            break;
+
         default: break;
         }
     }

diff --git a/doomsday/plugins/common/src/m_ctrl.c b/doomsday/plugins/common/src/m_ctrl.c
@@ -316,7 +316,7 @@ void Hu_MenuInitControlsPage(void)
             mndata_text_t* txt = &ControlsMenuTexts[textIdx++];
 
             ob->_type = MN_TEXT;
-            txt->text = (char*) binds->text;
+            txt->text = binds->text;
             ob->_typedata = txt;
             ob->_pageFontIdx = MENU_FONT1;
             ob->_pageColorIdx = MENU_COLOR2;