OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

No time for games, pushed to future.

Browse source
This commit is contained in:
Mari the Deer 2020-11-06 13:09:07 +01:00
commit 6d1f557db5
6 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
zscript/swwm_kbase.zsc
View file

@ -24,7 +24,6 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
TAB_KEYS,
TAB_LIBRARY,
TAB_STORE,
TAB_GAME,
TAB_TRADING,
TAB_CHAT,
TAB_SECRET,
@ -127,7 +126,7 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
LoreSeparator = TexMan.CheckForTexture("graphics/KBase/LibraryTabSeparator.png",TexMan.Type_MiscPatch);
LoreSeparatorW = TexMan.CheckForTexture("graphics/KBase/LibraryTabSeparatorJP.png",TexMan.Type_MiscPatch);
curtab = CVar.GetCVar('swwm_lasttab',players[consoleplayer]).GetInt();
int maxtab = multiplayer?TAB_CHAT:TAB_GAME;
int maxtab = multiplayer?TAB_CHAT:TAB_STORE;
if ( (curtab < TAB_MISSION) || (curtab > maxtab) ) curtab = TAB_MISSION;
if ( curtab == TAB_LIBRARY ) sel1 = CVar.GetCVar('swwm_lastloretab',players[consoleplayer]).GetInt();
else if ( curtab == TAB_STATS ) sel1 = CVar.GetCVar('swwm_laststattab',players[consoleplayer]).GetInt();
@ -316,7 +315,7 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
kcode = 0;
break;
}
int maxtab = multiplayer?TAB_CHAT:TAB_GAME;
int maxtab = multiplayer?TAB_CHAT:TAB_STORE;
switch ( mkey )
{
case MKEY_BACK:
@ -766,11 +765,11 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
static const string tabnames[] =
{
"$SWWM_MISSTAB", "$SWWM_STATTAB", "$SWWM_INVTAB", "$SWWM_KEYTAB",
"$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_GAMETAB", "$SWWM_TRADETAB",
"$SWWM_CHATTAB", "$SWWM_SECRETTAB", "$SWWM_HELPTAB"
"$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_TRADETAB", "$SWWM_CHATTAB",
"$SWWM_SECRETTAB", "$SWWM_HELPTAB"
};
xx = 0;
int maxtab = multiplayer?TAB_CHAT:TAB_GAME;
int maxtab = multiplayer?TAB_CHAT:TAB_STORE;
for ( int i=TAB_MISSION; i<=maxtab; i++ )
{
len = fnt.StringWidth(tabnames[i])+6;
@ -2415,8 +2414,8 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
static const string tabnames[] =
{
"$SWWM_MISSTAB", "$SWWM_STATTAB", "$SWWM_INVTAB", "$SWWM_KEYTAB",
"$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_GAMETAB", "$SWWM_TRADETAB",
"$SWWM_CHATTAB", "$SWWM_SECRETTAB", "$SWWM_HELPTAB"
"$SWWM_KBASETAB", "$SWWM_STORETAB", "$SWWM_TRADETAB", "$SWWM_CHATTAB",
"$SWWM_SECRETTAB", "$SWWM_HELPTAB"
};
static const string ltabnames[] =
{
@ -2426,7 +2425,7 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
{
"$SWWM_STATTAB0", "$SWWM_STATTAB1", "$SWWM_STATTAB2", "$SWWM_STATTAB3"
};
int maxtab = multiplayer?TAB_CHAT:TAB_GAME;
int maxtab = multiplayer?TAB_CHAT:TAB_STORE;
int mx = maxtab;
if ( curtab > TAB_CHAT ) mx++;
for ( int i=0; i<=mx; i++ )
@ -2908,11 +2907,6 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
Screen.DrawTexture(WindowSeparatorH,false,origin.x,origin.y+377,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
}
}
else if ( curtab == TAB_GAME )
{
str = StringTable.Localize("$SWWM_COMINGSOON");
Screen.DrawText(fnt,Font.CR_FIRE,(ss.x-fnt.StringWidth(str))/2.,(ss.y-fnt.GetHeight())/2.,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
}
else if ( curtab == TAB_TRADING )
{
if ( !sub )