- fixed newly added menu content.

source/common/menu/menudef.cpp

@@ -232,6 +232,26 @@ static bool CheckSkipOptionBlock(FScanner &sc)
 //
 //=============================================================================
 
+static bool CheckSkipNoSwBlock(FScanner& sc)
+{
+	sc.MustGetStringName("(");
+	sc.MustGetString();
+	bool res = sc.Compare("true");
+	sc.MustGetStringName(")");
+	if ((!!(g_gameType & GAMEFLAG_SHAREWARE)) == res)
+	{
+		SkipSubBlock(sc);
+		return !sc.CheckString("else");
+	}
+	return false;
+}
+
+//=============================================================================
+//
+//
+//
+//=============================================================================
+
 static void ParseListMenuBody(FScanner &sc, FListMenuDescriptor *desc)
 {
 	sc.MustGetStringName("{");
@@ -258,6 +278,14 @@ static void ParseListMenuBody(FScanner &sc, FListMenuDescriptor *desc)
 				ParseListMenuBody(sc, desc);
 			}
 		}
+		else if (sc.Compare("ifshareware"))
+		{
+			if (!CheckSkipNoSwBlock(sc))
+			{
+				// recursively parse sub-block
+				ParseListMenuBody(sc, desc);
+			}
+		}
 		else if (sc.Compare("Class"))
 		{
 			sc.MustGetString();
@@ -572,6 +600,14 @@ static void ParseImageScrollerBody(FScanner &sc, FImageScrollerDescriptor *desc)
 				ParseImageScrollerBody(sc, desc);
 			}
 		}
+		else if (sc.Compare("ifshareware"))
+		{
+			if (!CheckSkipNoSwBlock(sc))
+			{
+				// recursively parse sub-block
+				ParseImageScrollerBody(sc, desc);
+			}
+		}
 		else if (sc.Compare("ifoption"))
 		{
 			if (!CheckSkipOptionBlock(sc))
@@ -781,6 +817,14 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
 				ParseOptionMenuBody(sc, desc);
 			}
 		}
+		else if (sc.Compare("ifshareware"))
+		{
+			if (!CheckSkipNoSwBlock(sc))
+			{
+				// recursively parse sub-block
+				ParseOptionMenuBody(sc, desc);
+			}
+		}
 		else if (sc.Compare("ifoption"))
 		{
 			if (!CheckSkipOptionBlock(sc))

source/common/menu/optionmenu.cpp

@@ -71,7 +71,7 @@ int OptionWidth(const char * s)
 void DrawOptionText(int x, int y, int color, const char *text, bool grayed)
 {
 	PalEntry overlay = grayed? PalEntry(96,48,0,0) : PalEntry(0,0,0);
-	DrawText (&twod, OptionFont(), color, x, y, text, DTA_CleanNoMove_1, true, DTA_ColorOverlay, overlay);
+	DrawText (&twod, OptionFont(), color, x, y, text, DTA_CleanNoMove_1, true, DTA_ColorOverlay, overlay, TAG_END);
 }
 
 //=============================================================================

wadsrc/static/demolition/language.csv

@@ -235,6 +235,7 @@ Reset to defaults,OPTMNU_DEFAULTS,,,,Obnovit původní,Auf Vorgaben zurücksetze
 Reset to last saved,OPTMNU_RESETTOSAVED,,,,Obnovit naposledy uložené,Auf gespeicherte Werte zurücksetzen,,Reŝanĝi al lasta konservo,Últimos Valores Guardados,,Palauta viimeksi tallennettu tila,Recharger dernière config.,Legutóbbi mentett beállítások használata,Reimposta ai valori salvati l'ultima volta,最後に保存した設定に戻す,이전 설정으로 초기화,Reset naar laatste opgeslagen,Resetuj do ostatnio zapisanych,Redefinir para última configuração salva,Redefinir para última configuração gravada,,Вернуть предыдущие настройки,Врати задње сачувано
 Go to console,OPTMNU_CONSOLE,,,,Jít do konzole,Öffne Konsole,,Iri al konzolo,Ir a la consola,,Mene konsoliin,Ouvrir la console,Konzol megnyitása,Vai alla console,コンソールを開く,콘솔로 이동,Ga naar de console,Przejdź do konsoli,Abrir console,Abrir consola,,Открыть консоль,Отвори конзолу
 ,Controls submenu,,,,,,,,,,,,,,,,,,,,,,
+Customize Controls,CNTRLMNU_TITLE,,,,Nastavení ovládání,Steuerung einstellen,,Agordi Regilojn,Personalizar Controles ,,Ohjausasetukset,Modifier contrôles,Irányítás testreszabása,Personalizza i controlli,キー配置変更,조작 사용자 지정,Instellen van de controle,Ustaw Klawisze,Configurar Controles,Configurar Controlos,,Настройки управления,Подешавања контрола
 "ENTER to change, BACKSPACE to clear",CNTRLMNU_SWITCHTEXT1,,,,"ENTER pro změnu, BACKSPACE pro smazání",ENTER: Editieren BACKSPACE: Löschen,,"ENTER klavo por ŝanĝi, BACKSPACE klavo por viŝi","ENTER para cambiar, BACKSPACE para limpiar",,"Aseta ENTERILLÄ, tyhjennä ASKELPALAUTTIMELLA","ENTREE pour changer, RET. ARRIERE pour effacer.","ENTER a változtatáshoz, BACKSPACE a törléshez","INVIO per modificare, BACKSPACE per ripulire",Enter で決定、BackSpaceで無効化,"바꿀려면 ENTER키, 지울려면 BACKSPACE키를 누르시오","ENTER om te veranderen, BACKSPACE om te wissen.","ENTER by zmienić, BACKSPACE by wyczyścić","ENTER para alterar, BACKSPACE para limpar",,,"ENTER — изменить, BACKSPACE — очистить","ENTER за промену, BACKSPACE за чишћење"
 "Press new key for control, ESC to cancel",CNTRLMNU_SWITCHTEXT2,,,,"Zmáčkni novou klávesu pro nastavení, ESC pro storno",Drücke eine Taste oder ESC um abzubrechen,,"Premi novan klavon por reakiri regilon, ESC por nuligi","Presiona una tecla para el control, ESC para cancelar",,"Valitse näppäin toiminnolle, ESC peruuttaa","Appuyez sur la nouvelle touche pour l'assigner,
 Appuyez sur ECHAP pour annuler.","Nyomj meg egy gombot, ESC a törléshez","Premi un nuovo tasto per il controllo, ESC per cancellare","登録したいキーを押すか, Escでキャンセル","명령을 얽으려면 아무 키를, 취소는 ESC키를 누르시오","Druk op de nieuwe toets voor controle, ESC om te annuleren.","Wciśnij nowy przycisk by zmienić klawisz, ESC by anulować","Aperte a nova tecla para o comando, ESC para cancelar","Carrega a nova tecla para o comando, ESC para cancelar",,"Нажмите клавишу управления, ESC для отмены","Притисните ново тастер за одређивање контроле, ESC за отказивање"
@@ -264,6 +265,7 @@ Strafe,CNTRLMNU_STRAFE,,,,Pohyb vlevo/vpravo,Seitwärts,,Flankmovi,Desplazamient
 Show Scoreboard,CNTRLMNU_SCOREBOARD,,,,Zobrazit tabulku skóre,Punktetafel anzeigen,,Montri poentartabulon,Mostrar Marcador,,Näytä pistetaulu,Afficher Scores (tenir),Eredményjelző megjelenítése,Mostra la tabella punteggio,スコアボード表示,점수창 표시,Scorebord tonen,Pokaż tablicę wyników,Mostrar pontuação,,,Таблица очков,Табела
 Action,CNTRLMNU_ACTION,,,,Akce,Aktion,,Ago,Acción,,Toiminta,,Akció,Azione,アクション,동작,Actie,Akcja,Ação,,,Основное,Радња
 Customize Action Controls,CNTRLMNU_ACTION_TITLE,,,,Nastavit ovládání akcí,Aktions-Steuerung einstellen,,Agordi Agajn Regilojn,Controles de Acción,,Toimintaohjausasetukset,Changer Contrôles Action,Akció beállítások testreszabása,Personalizza i controlli di azione,アクション操作設定,사용자 지정 동작 컨트롤,Aanpassen van de actiecontroles,Ustaw Klawisze Akcji,Configurar Comandos de Ação,Configurar Controlos de Ação,,Основные клавиши управления,Контроле радње
+Chat,CNTRLMNU_CHAT,,,,Chat,Chat,,Babilo,Chat,,Keskustelu,Chat,Chat,Chat,チャット,채팅,Chat,Czat,Chat,Conversar,,Чат,Ћаскање
 Say,CNTRLMNU_SAY,,,,Říct,Reden,,Diro,Hablar,,Sano,Parler,Üzenet ,Parla,発言,채팅하기,Zeg,Powiedz,Fala,Falar,,Сообщение,Пиши
 Customize Chat Controls,CNTRLMNU_CHAT_TITLE,,,,Nastavit ovládání chatu,Chat-Steuerung einstellen,,Agordi Babiladajn Regilojn,Controles de Chat,,Keskusteluohjausasetukset,Changer Contrôles Chat,Chat beállítások testreszabása,Personalizza i controlli della chat,チャット操作設定,사용자 지정 채팅 컨트롤,Chat-controles aanpassen aan uw wensen,Ustaw Klawisze Czatu,Configurar Comandos de Chat,Configurar Controlos de Chat,,Клавиши управления чатом,Контроле ћаскања
 Customize Weapon Controls,CNTRLMNU_WEAPONS_TITLE,,,,Nastavit ovládání zbraní,Waffen-Steuerung einstellen,,Agordi Armilojn Regilojn,Controles de Armas,,Aseohjausasetukset,Changer Contrôles Armes,Fegyver beállítások testreszabása,Personalizza i controlli delle armi,武器操作設定,사용자 지정 무기 컨트롤,Wapencontroles aanpassen aan uw eigen wensen,Ustaw Klawisze Broni,Configurar Comandos de Arma,Configurar Controlos de Armas,,Клавиши управления оружием,Контроле оружја
@@ -315,7 +317,8 @@ Jump Boots,CNTRLMNU_JUMPBOOTS,,,,,Sprungstiefel,,,,,,,,,,,,,,,,,
 Beast Vision,CNTRLMNU_BEASTVISION,,,,,,,,,,,,,,,,,,,,,,
 Tank Mode,CNTRLMNU_TANKMODE,,,,,Panzermodus,,,,,,,,,,,,,,,,,
 Smokes,CNTRLMNU_SMOKES,What precisely is this?,,,,,,,,,,,,,,,,,,,,,
-Fire Mission,CNTRLMNU_FIREMISSION,,,,,,,,,,,,,,,,,,,,,,
-Reload,CNTRLMENU_RELOAD,,,,,"Waffe laden
+Fire Mission,CNTRLMNU_FIRE_MISSION,,,,,,,,,,,,,,,,,,,,,,
+Reload,CNTRLMNU_RELOAD,,,,,"Waffe laden
 ",,,,,,,,,,,,,,,,,
-Radar,CNTRLMENU_RADAR,,,,,,,,,,,,,,,,,,,,,,
+Radar,CNTRLMNU_RADAR,,,,,,,,,,,,,,,,,,,,,,
+Other,CNTRLMNU_OTHER,,,,Ostatní,Andere,,Alia,Otros,,Muu,Autres,Más,Altro,その他,그 외 조작,Andere,Inne,Outro,,,Прочее,Остало

wadsrc/static/demolition/menudef.txt

@@ -433,7 +433,7 @@ ImageScroller "HelpMenu"
 	{
 		// The menu has no default binding, but if someone tries to open it anyway show the cool retro ads that were shipped with the game. :D
 		ImageItem "#5262"
-		ifnotshareware
+		ifshareware(false)
 		{
 			ImageItem "#5261"
 		}
@@ -537,7 +537,7 @@ ImageScroller "CreditsMenu"
 	}
 	ifgame(ShadowWarrior)
 	{
-		ifshareware
+		ifshareware(true)
 		{
 			ImageItem "#5110"
 			ImageItem "#5112"
@@ -648,7 +648,7 @@ OptionMenu "OptionsMenu"
 //
 //-------------------------------------------------------------------------------------------
 
-OptionMenu "CustomizeControls" protected
+OptionMenu "CustomizeControls"// protected
 {
 	Title "$CNTRLMNU_TITLE"
 
@@ -660,7 +660,7 @@ OptionMenu "CustomizeControls" protected
 	//Submenu    "$MAPCNTRLMNU_CONTROLS" , "MapControlsMenu" // todo after thorough cleanup
 }
 
-OptionMenu "ActionControlsMenu" protected
+OptionMenu "ActionControlsMenu"// protected
 {
 	Title "$CNTRLMNU_ACTION_TITLE"
 	ScrollTop 2
@@ -715,7 +715,7 @@ OptionMenu "ActionControlsMenu" protected
 	Control    "$CNTRLMNU_SCOREBOARD"       , "+show_dukematch_scores"
 }
 
-OptionMenu "ChatControlsMenu" protected
+OptionMenu "ChatControlsMenu"// protected
 {
 	Title "$CNTRLMNU_CHAT_TITLE"
 	ScrollTop 2
@@ -725,14 +725,14 @@ OptionMenu "ChatControlsMenu" protected
 	Control    "$CNTRLMNU_SAY"     , "+send_message"
 }
 
-OptionMenu "WeaponsControlMenu" protected
+OptionMenu "WeaponsControlMenu"// protected
 {
 	Title "$CNTRLMNU_WEAPONS_TITLE"
 	ScrollTop 2
 	StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage"
 
 	StaticText ""
-	Control    "$CNTRLMNU_NEXTWEAPON"     , "+nexct_weapon"
+	Control    "$CNTRLMNU_NEXTWEAPON"     , "+next_weapon"
 	Control    "$CNTRLMNU_PREVIOUSWEAPON" , "+previous_weapon"
 
 	StaticText ""
@@ -776,7 +776,7 @@ OptionMenu "WeaponsControlMenu" protected
 
 }
 
-OptionMenu "InventoryControlsMenu" protected
+OptionMenu "InventoryControlsMenu"// protected
 {
 	Title "$CNTRLMNU_INVENTORY_TITLE"
 	ScrollTop 2
@@ -786,8 +786,8 @@ OptionMenu "InventoryControlsMenu" protected
 	Control    "$CNTRLMNU_USEITEM"      , "+inventory"
 
 	StaticText ""
-	Control    "$CNTRLMNU_NEXTITEM"     , "+inventory_next"
-	Control    "$CNTRLMNU_PREVIOUSITEM" , "+inventory_prev"
+	Control    "$CNTRLMNU_NEXTITEM"     , "+inventory_right"
+	Control    "$CNTRLMNU_PREVIOUSITEM" , "+inventory_left"
 	
 	ifgame(Duke)
 	{
@@ -844,9 +844,9 @@ OptionMenu "InventoryControlsMenu" protected
 		Control    "$CNTRLMNU_NIGHTVISION" , "+nightvision"
 		Control    "$CNTRLMNU_MEDKIT" , "+medkit"
 	}
+}
 
-
-OptionMenu "OtherControlsMenu" protected
+OptionMenu "OtherControlsMenu"// protected
 {
 	Title "$CNTRLMNU_OTHER_TITLE"
 	ScrollTop 2