remove theme references to memcards

etternagame · Dec 6, 2018 · 933e8f0 · 933e8f0
1 parent fc88c33
commit 933e8f0
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 184 deletions.
diff --git a/Themes/Til Death/BGAnimations/ScreenSelectProfile overlay.lua b/Themes/Til Death/BGAnimations/ScreenSelectProfile overlay.lua
@@ -178,53 +178,7 @@ function LoadPlayerStuff(Player)
 end
 
 function UpdateInternal3(self, Player)
-	local pn = (Player == PLAYER_1) and 1
-	local frame = self:GetChild(string.format("P%uFrame", pn))
-	local scroller = frame:GetChild("Scroller")
-	local seltext = frame:GetChild("SelectedProfileText")
-	local joinframe = frame:GetChild("JoinFrame")
-	local smallframe = frame:GetChild("SmallFrame")
-	local bigframe = frame:GetChild("BigFrame")
-
-	if GAMESTATE:IsHumanPlayer(Player) then
-		frame:visible(true)
-		if MEMCARDMAN:GetCardState(Player) == "MemoryCardState_none" then
-			--using profile if any
-			joinframe:visible(false)
-			smallframe:visible(true)
-			bigframe:visible(true)
-			seltext:visible(true)
-			scroller:visible(true)
-			local ind = SCREENMAN:GetTopScreen():GetProfileIndex(Player)
-			if ind > 0 then
-				scroller:SetDestinationItem(ind - 1)
-				seltext:settext(PROFILEMAN:GetLocalProfileFromIndex(ind - 1):GetDisplayName())
-			else
-				if SCREENMAN:GetTopScreen():SetProfileIndex(Player, 1) then
-					scroller:SetDestinationItem(0)
-					self:queuecommand("UpdateInternal2")
-				else
-					joinframe:visible(true)
-					smallframe:visible(false)
-					bigframe:visible(false)
-					scroller:visible(false)
-					seltext:settext("No profile")
-				end
-			end
-		else
-			--using card
-			smallframe:visible(false)
-			scroller:visible(false)
-			seltext:settext("CARD")
-			SCREENMAN:GetTopScreen():SetProfileIndex(Player, 0)
-		end
-	else
-		joinframe:visible(true)
-		scroller:visible(false)
-		seltext:visible(false)
-		smallframe:visible(false)
-		bigframe:visible(false)
-	end
+
 end
 
 local t = Def.ActorFrame {}

diff --git a/Themes/_fallback/BGAnimations/ScreenSelectProfile overlay.lua b/Themes/_fallback/BGAnimations/ScreenSelectProfile overlay.lua
@@ -178,53 +178,7 @@ function LoadPlayerStuff(Player)
 end
 
 function UpdateInternal3(self, Player)
-	local pn = (Player == PLAYER_1) and 1 or 2
-	local frame = self:GetChild(string.format("P%uFrame", pn))
-	local scroller = frame:GetChild("Scroller")
-	local seltext = frame:GetChild("SelectedProfileText")
-	local joinframe = frame:GetChild("JoinFrame")
-	local smallframe = frame:GetChild("SmallFrame")
-	local bigframe = frame:GetChild("BigFrame")
-
-	if GAMESTATE:IsHumanPlayer(Player) then
-		frame:visible(true)
-		if MEMCARDMAN:GetCardState(Player) == "MemoryCardState_none" then
-			--using profile if any
-			joinframe:visible(false)
-			smallframe:visible(true)
-			bigframe:visible(true)
-			seltext:visible(true)
-			scroller:visible(true)
-			local ind = SCREENMAN:GetTopScreen():GetProfileIndex(Player)
-			if ind > 0 then
-				scroller:SetDestinationItem(ind - 1)
-				seltext:settext(PROFILEMAN:GetLocalProfileFromIndex(ind - 1):GetDisplayName())
-			else
-				if SCREENMAN:GetTopScreen():SetProfileIndex(Player, 1) then
-					scroller:SetDestinationItem(0)
-					self:queuecommand("UpdateInternal2")
-				else
-					joinframe:visible(true)
-					smallframe:visible(false)
-					bigframe:visible(false)
-					scroller:visible(false)
-					seltext:settext("No profile")
-				end
-			end
-		else
-			--using card
-			smallframe:visible(false)
-			scroller:visible(false)
-			seltext:settext("CARD")
-			SCREENMAN:GetTopScreen():SetProfileIndex(Player, 0)
-		end
-	else
-		joinframe:visible(true)
-		scroller:visible(false)
-		seltext:visible(false)
-		smallframe:visible(false)
-		bigframe:visible(false)
-	end
+
 end
 
 local t =

diff --git a/Themes/_fallback/Languages/de.ini b/Themes/_fallback/Languages/de.ini
@@ -1792,11 +1792,7 @@ Exit=Exit
 [ScreenOptionsMasterPrefs]
 Off=Aus
 
-[ScreenOptionsMemoryCard]
-Error mounting card: %s=Error mounting card: %s
-(no label)=(no label)
-size ???=size ???
-%dMB=%dMB
+
 
 [ScreenOptionsService]
 HeaderText=Optionen

diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
@@ -1762,12 +1762,6 @@ Exit=Exit
 [ScreenOptionsMasterPrefs]
 Off=Off
 
-[ScreenOptionsMemoryCard]
-Error mounting card: %s=Error mounting card: %s
-(no label)=(no label)
-size ???=size ???
-%dMB=%dMB
-
 [ScreenOptionsService]
 HeaderText=Options
 HeaderSubText=You can configure the game here

diff --git a/Themes/_fallback/Languages/es.ini b/Themes/_fallback/Languages/es.ini
@@ -1770,11 +1770,6 @@ Exit=Salir
 [ScreenOptionsMasterPrefs]
 Off=Off
 
-[ScreenOptionsMemoryCard]
-Error mounting card: %s=No se pudo montar la tarjeta: %s
-(no label)=(sin nombre)
-size ???=tamaño ???
-%dMB=%dMB
 
 [ScreenOptionsService]
 HeaderText=Opciones

diff --git a/Themes/_fallback/Languages/fr.ini b/Themes/_fallback/Languages/fr.ini
@@ -1772,12 +1772,6 @@ Exit=Quitter
 [ScreenOptionsMasterPrefs]
 Off=Off
 
-[ScreenOptionsMemoryCard]
-Error mounting card: %s=Error mounting card: %s
-(no label)=(no label)
-size ???=size ???
-%dMB=%dMB
-
 [ScreenOptionsService]
 HeaderText=Options
 HeaderSubText=You can configure the game here

diff --git a/Themes/_fallback/Languages/ja.ini b/Themes/_fallback/Languages/ja.ini
@@ -1933,13 +1933,6 @@ Exit=Exit
 // 放置します
 Off=Off
 
-[ScreenOptionsMemoryCard]
-// 済
-Error mounting card: %s=USBメモリ'%s'の認識に失敗しました。
-(no label)=(no label)
-size ???=size ???
-%dMB=%dMB
-
 [ScreenOptionsService]
 // 放置します
 HeaderText=Options

diff --git a/Themes/_fallback/Languages/nl.ini b/Themes/_fallback/Languages/nl.ini
@@ -1757,11 +1757,6 @@ Exit=Exit
 [ScreenOptionsMasterPrefs]
 Off=Uit
 
-[ScreenOptionsMemoryCard]
-Error mounting card: %s=Probleem bij het mounten van kaart: %s
-(no label)=(geen label)
-size ???=Grootte ???
-%dMB=%dMB
 
 [ScreenOptionsService]
 HeaderText=Opties

diff --git a/Themes/_fallback/Languages/pl.ini b/Themes/_fallback/Languages/pl.ini
@@ -1744,12 +1744,6 @@ Exit=Wyjście
 [ScreenOptionsMasterPrefs]
 Off=Wyłącz
 
-[ScreenOptionsMemoryCard]
-Error mounting card: %s=Błąd podłączania karty: %s
-(no label)=(brak nazwy)
-size ???=rozmiar ???
-%dMB=%dMB
-
 [ScreenOptionsService]
 HeaderText=Opcje
 HeaderSubText=Tu można skonfigurować grę.

diff --git a/Themes/_fallback/Languages/zh.ini b/Themes/_fallback/Languages/zh.ini
@@ -1825,12 +1825,6 @@ Exit=Exit
 [ScreenOptionsMasterPrefs]
 Off=Off
 
-[ScreenOptionsMemoryCard]
-Error mounting card: %s=記憶卡辨認錯誤: %s
-(no label)=(標籤未設定)
-size ???=size ???
-%dMB=%dMB
-
 [ScreenOptionsService]
 HeaderText=Options
 HeaderSubText=You can configure the game here

diff --git a/Themes/_fallback/base._ini b/Themes/_fallback/base._ini
@@ -1904,7 +1904,6 @@ StageFrameX=SCREEN_CENTER_X+234
 StageFrameY=SCREEN_CENTER_Y-172
 StageFrameOnCommand=draworder,-2;addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 StageFrameOffCommand=linear,0.5;addx,SCREEN_WIDTH*0.6
-MemoryCardIcons=true
 CancelTransitionsOut=false
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP+35
@@ -1919,16 +1918,6 @@ HelpX=SCREEN_CENTER_X
 HelpY=SCREEN_BOTTOM-20
 HelpOnCommand=shadowlength,0;strokecolor,color("#4e4e4e");draworder,1;zoomy,0;linear,0.5;zoomy,1;diffuseblink;
 HelpOffCommand=linear,0.5;zoomy,0
-MemoryCardDisplayP1X=SCREEN_LEFT+10;
-MemoryCardDisplayP1Y=SCREEN_CENTER_Y+220
-MemoryCardDisplayP1OnCommand=draworder,97;
-MemoryCardDisplayP1OffCommand=
-//MemoryCardDisplayP1OffCommand=bouncebegin,0.5;addx,-25;
-MemoryCardDisplayP2X=SCREEN_RIGHT-10;
-MemoryCardDisplayP2Y=SCREEN_CENTER_Y+220
-MemoryCardDisplayP2OnCommand=draworder,97;
-MemoryCardDisplayP2OffCommand=
-//MemoryCardDisplayP2OffCommand=bouncebegin,0.5;addx,25;
 TimerMetricsGroup="MenuTimer"
 TimerX=SCREEN_CENTER_X+273
 TimerY=SCREEN_TOP+26
@@ -3864,11 +3853,6 @@ SortLevel5Color=color("0,1,0,1")
 [Inventory]
 ItemUseRateSeconds=0
 
-[ScreenMemcardSaveEditsAfterDeleteSteps]
-
-[ScreenMemcardSaveEditsAfterSave]
-
-[ScreenMemcardSaveEditsAfterExit]
 
 [ScreenMiniMenu]
 Class="ScreenMiniMenu"
@@ -4445,11 +4429,3 @@ NextScreen="ScreenOptionsEdit"
 [ScreenServiceAction]
 Class="ScreenServiceAction"
 Fallback="ScreenOptionsEditChild"
-
-[ScreenServiceActionCopyEditsMachineToMemoryCard]
-Fallback="ScreenServiceAction"
-Actions="CopyEditsMachineToMemoryCard"
-
-[ScreenServiceActionCopyEditsMemoryCardToMachine]
-Fallback="ScreenServiceAction"
-Actions="CopyEditsMemoryCardToMachine"
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
@@ -1413,16 +1413,6 @@ CancelTransitionsOut=false
 #
 ShowCreditDisplay=true
 AllowDisabledPlayerInput=false
-MemoryCardIcons=false
-#
-MemoryCardDisplayP1X=
-MemoryCardDisplayP1Y=
-MemoryCardDisplayP1OnCommand=
-MemoryCardDisplayP1OffCommand=
-MemoryCardDisplayP2X=
-MemoryCardDisplayP2Y=
-MemoryCardDisplayP2OnCommand=
-MemoryCardDisplayP2OffCommand=
 #
 TimerStealth=false
 ForceTimer=false
@@ -1469,16 +1459,6 @@ CancelTransitionsOut=false
 #
 ShowCreditDisplay=true
 AllowDisabledPlayerInput=false
-MemoryCardIcons=false
-#
-MemoryCardDisplayP1X=
-MemoryCardDisplayP1Y=
-MemoryCardDisplayP1OnCommand=
-MemoryCardDisplayP1OffCommand=
-MemoryCardDisplayP2X=
-MemoryCardDisplayP2Y=
-MemoryCardDisplayP2OnCommand=
-MemoryCardDisplayP2OffCommand=
 #
 TimerStealth=false
 ForceTimer=false