diff --git a/gamemode/engine/core/sh_player_binds.lua b/gamemode/engine/core/sh_player_binds.lua index 0c29447..3d0b3e4 100644 --- a/gamemode/engine/core/sh_player_binds.lua +++ b/gamemode/engine/core/sh_player_binds.lua @@ -9,14 +9,11 @@ if SERVER then local keyfuncs = { - ["openCharMenu"] = function( pl ) - Quantum.Net.OpenMenu( pl, "character", Quantum.Server.Char.GetPlayerChars_cl( pl ) ) - end, ["mainMenu"] = function( pl ) - Quantum.Net.OpenMenu( pl, "main", Quantum.Server.Char.GetPlayerChars_cl( pl ) ) + Quantum.Net.OpenMenu( pl, "main", { chars = Quantum.Server.Char.GetPlayerChars_cl( pl ), resume = true } ) end, - ["intro"] = function( pl ) - Quantum.Net.OpenMenu( pl, "intro", {} ) + ["charinfo"] = function( pl ) + Quantum.Net.OpenMenu( pl, "charinfo", {} ) end } @@ -24,6 +21,6 @@ if SERVER then if( keyfuncs[key] ) then keyfuncs[key]( ply ) end end function GM:ShowHelp( ply ) keyfuncs["mainMenu"]( ply ) end - function GM:ShowSpare2( ply ) keyfuncs["intro"]( ply ) end + function GM:ShowSpare2( ply ) keyfuncs["charinfo"]( ply ) end end \ No newline at end of file diff --git a/gamemode/engine/derma/lib/cl_menu_fade.lua b/gamemode/engine/derma/lib/cl_menu_fade.lua index d4a79df..c227b9d 100644 --- a/gamemode/engine/derma/lib/cl_menu_fade.lua +++ b/gamemode/engine/derma/lib/cl_menu_fade.lua @@ -64,8 +64,6 @@ function fade.transition( parent, dt, start_delay, mid_delay, end_delay, inColor end end - Quantum.Debug("[Fade] First part done.") - elseif( self.time >= end_delay && !self.fadeIn ) then if( !self.runnedEndFunc ) then @@ -73,8 +71,6 @@ function fade.transition( parent, dt, start_delay, mid_delay, end_delay, inColor endFunc( dt ) self.runnedEndFunc = true self:Remove() -- remove the panel when finished - Quantum.Debug( "[Fade] Finished transition." ) - Quantum.Client.IsInMenu = false end diff --git a/gamemode/engine/derma/lib/cl_menu_pages.lua b/gamemode/engine/derma/lib/cl_menu_pages.lua index 9d38d24..d49f6d3 100644 --- a/gamemode/engine/derma/lib/cl_menu_pages.lua +++ b/gamemode/engine/derma/lib/cl_menu_pages.lua @@ -37,9 +37,8 @@ function page.New( parent, args ) local close = vgui.Create( "DButton", p ) close:SetText( args.CloseButtonText || "Close" ) - close:SetTextColor( args.CloseButtonTextColor || Color( 0, 0, 0, 255 ) ) + close:SetTextColor( args.CloseButtonTextColor || Color( 255, 255, 255, 255 ) ) close:SetFont( args.CloseButtonFont || "q_text" ) - --close:SetSize( args.closeW, args.closeH ) close:SizeToContents() local closeW, closeH = close:GetSize() close:SetSize( closeW + padding*2, closeH ) @@ -50,7 +49,7 @@ function page.New( parent, args ) end close.OnCursorEntered = function() surface.PlaySound( "UI/buttonrollover.wav" ) end close.Paint = args.CloseButtonPaint || function( self, w, h ) - theme.sharpbutton( self ) + theme.sharpblurrbutton( self ) end return p, close end diff --git a/gamemode/engine/derma/menus/menu_character.lua b/gamemode/engine/derma/menus/menu_character.lua index 5c679b7..05bf92c 100644 --- a/gamemode/engine/derma/menus/menu_character.lua +++ b/gamemode/engine/derma/menus/menu_character.lua @@ -459,7 +459,7 @@ end function menu.open( dt ) Quantum.Client.IsInMenu = true -- hide the hud - Quantum.Client.Chars = dt.cont + Quantum.Client.Chars = dt.cont.chars if( !f ) then local f = vgui.Create( "DFrame" ) f:SetTitle( "" ) diff --git a/gamemode/engine/derma/menus/menu_charinfo.lua b/gamemode/engine/derma/menus/menu_charinfo.lua index f538161..68b5d94 100644 --- a/gamemode/engine/derma/menus/menu_charinfo.lua +++ b/gamemode/engine/derma/menus/menu_charinfo.lua @@ -18,6 +18,7 @@ local padding_s = 4 * resScale local errorMdl = "models/player.mdl" function menu.open( dt ) + local items = dt.cont.items if( !f ) then local f = vgui.Create( "DFrame" ) f:SetSize( sw, sh ) @@ -30,7 +31,10 @@ function menu.open( dt ) Quantum.Client.Cam.Stop() end - -- Create the inventory page -- - f.inv = page.New( f, {} ) + -- Default is the inventory page -- + + --f.inv = page.New( f, {} ) end -end \ No newline at end of file +end + +return menu \ No newline at end of file diff --git a/gamemode/engine/derma/menus/menu_intro.lua b/gamemode/engine/derma/menus/menu_intro.lua index 6f526c1..1bcbfd9 100644 --- a/gamemode/engine/derma/menus/menu_intro.lua +++ b/gamemode/engine/derma/menus/menu_intro.lua @@ -120,7 +120,7 @@ function intro.open() skip:SetPos( f.w - skip.w - padding, f.h - skip.h - padding ) skip.DoClick = function( self ) surface.PlaySound( "UI/buttonclick.wav" ) - fade.transition( f, {}, 1, 1, 2, Color( 0, 0, 0, 255 ), true, Quantum.EmptyFunction, Quantum.EmptyFunction ) -- close the intro but smoothly + fade.transition( f, {}, 1, 1, 2, Color( 0, 0, 0, 255 ), true, Quantum.EmptyFunction, function() Quantum.Client.IsInMenu = false end ) -- close the intro but smoothly end skip.OnCursorEntered = function() surface.PlaySound( "UI/buttonrollover.wav" ) end diff --git a/gamemode/engine/derma/menus/menu_main.lua b/gamemode/engine/derma/menus/menu_main.lua index b82e746..25466e7 100644 --- a/gamemode/engine/derma/menus/menu_main.lua +++ b/gamemode/engine/derma/menus/menu_main.lua @@ -72,7 +72,7 @@ function main.open(dt) theme.renderblur( self, 2, 7 ) end f.OnClose = function( self ) - Quantum.Client.Menu.Menus["character"].open( dt ) + --Quantum.Client.Menu.Menus["character"].open( dt ) end Quantum.Client.Cam.Start( scenes[ game.GetMap() ][math.random( 1, table.Count(scenes[ game.GetMap() ])) ], false ) @@ -106,19 +106,59 @@ function main.open(dt) ---- BUTTONS ---- + -- resume button + + if( dt.cont.resume ) then + local res = vgui.Create( "DButton", f ) + res:SetText( "Resume" ) + res:SetFont( buttonFont ) + res:SetTextColor( buttonTextColor ) + + res:SizeToContents() + res.w, res.h = res:GetSize() + res:SetSize( buttonWidth, res.h ) + res.w, res.h = res:GetSize() + + res:SetPos( sw/2 - res.w/2, sub.y + res.h + padding * 20 ) + res.x, res.y = res:GetPos() + + res.Paint = function( self ) + theme.sharpbutton( self, buttonColor ) + end + res.DoClick = function( self ) + surface.PlaySound( "UI/buttonclick.wav" ) + f:Close() + Quantum.Client.Cam.Stop() + end + res.OnCursorEntered = function() surface.PlaySound( "UI/buttonrollover.wav" ) end + end + -- play button local play = vgui.Create( "DButton", f ) + play:SetText( "Play" ) play:SetFont( buttonFont ) - play:SetTextColor( buttonTextColor ) play:SizeToContents() play.w, play.h = play:GetSize() play:SetSize( buttonWidth, play.h ) play.w, play.h = play:GetSize() - play:SetPos( sw/2 - play.w/2, sub.y + play.h + padding*20 ) - play.x, play.y = play:GetPos() + play.x, play.y = sw/2 - play.w/2, sub.y + play.h + padding*20 + if( dt.cont.resume ) then + play:SetText( "Change Character" ) + play:SizeToContents() + play.w, play.h = play:GetSize() + play:SetSize( buttonWidth, play.h ) + play.w, play.h = play:GetSize() + + play.y = play.y + play.h + padding*2 + print( play.y ) + end + + play:SetTextColor( buttonTextColor ) + + play:SetPos( play.x, play.y ) play.Paint = function( self ) theme.sharpbutton( self, buttonColor ) @@ -127,6 +167,7 @@ function main.open(dt) play.DoClick = function( self ) surface.PlaySound( "UI/buttonclick.wav" ) f:Close() + Quantum.Client.Menu.Menus["character"].open( dt ) end play.OnCursorEntered = function() surface.PlaySound( "UI/buttonrollover.wav" ) end diff --git a/gamemode/engine/lib/client/cl_cinematic.lua b/gamemode/engine/lib/client/cl_cinematic.lua index aa8725f..1f0ad42 100644 --- a/gamemode/engine/lib/client/cl_cinematic.lua +++ b/gamemode/engine/lib/client/cl_cinematic.lua @@ -11,8 +11,7 @@ function Quantum.Client.Cam.InvertAngle( ang ) return Angle( -ang.x, ang.y, -ang function Quantum.Client.Cam.Stop() hook.Remove( "CalcView", "Quantum_Cinematic" ) - Quantum.Client.Cam.Temp.scene_index = nil -- remove the var becuase it is unneeded - Quantum.Debug( "Stopped cinematic." ) + Quantum.Client.Cam.Temp = nil -- remove the var becuase it is unneeded end function Quantum.Client.Cam.Start( scene, loop )