OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Missed a merge conflict

Browse source
This commit is contained in:
Marisa the Magician 2019-09-11 15:47:51 +02:00
commit 3e5bd63029
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
zscript/utmenu.zsc
View file

@ -26,10 +26,7 @@ Class OptionMenuItemUTHudPreview : OptionMenuItem
{ {
int xpos = indent + CursorSpace(); int xpos = indent + CursorSpace();
int ypos = y+OptionMenuSettings.mLinespacing*CleanYfac_1; int ypos = y+OptionMenuSettings.mLinespacing*CleanYfac_1;
<<<<<<< HEAD
Screen.DrawFrame(xpos,ypos,64*CleanXFac_1,64*CleanYFac_1); Screen.DrawFrame(xpos,ypos,64*CleanXFac_1,64*CleanYFac_1);
=======
>>>>>>> experimental
Screen.DrawTexture(tex[0],false,xpos,ypos,DTA_CleanNoMove_1,true); Screen.DrawTexture(tex[0],false,xpos,ypos,DTA_CleanNoMove_1,true);
Color tintcolor = Color("White"); Color tintcolor = Color("White");
switch ( mColorP.GetInt() ) switch ( mColorP.GetInt() )
@ -52,7 +49,6 @@ Class OptionMenuItemUTHudPreview : OptionMenuItem
Screen.DrawTexture(tex[1],false,xpos,ypos,DTA_CleanNoMove_1,true,DTA_FillColor,tintcolor,DTA_Alpha,alpha,DTA_LegacyRenderStyle,STYLE_AddShaded); Screen.DrawTexture(tex[1],false,xpos,ypos,DTA_CleanNoMove_1,true,DTA_FillColor,tintcolor,DTA_Alpha,alpha,DTA_LegacyRenderStyle,STYLE_AddShaded);
return -1; return -1;
} }
<<<<<<< HEAD
} }
// changes to Tahoma // changes to Tahoma
@ -88,6 +84,3 @@ Class UTMessageBox : MessageBoxMenu
mMessage = textFont.BreakLines(Stringtable.Localize(message),generic_ui?600:300); mMessage = textFont.BreakLines(Stringtable.Localize(message),generic_ui?600:300);
} }
} }
=======
}
>>>>>>> experimental