master
AlmTech Software 5 years ago
parent b3cc18e4f2
commit d70a44c366
  1. 4
      gamemode/engine/derma/cl_menu.lua
  2. 2
      gamemode/engine/derma/menus/menu_character.lua
  3. 3
      gamemode/engine/derma/menus/menu_intro.lua
  4. 2
      gamemode/engine/derma/menus/menu_main.lua

@ -23,13 +23,13 @@ local function getMenuIDbyFileName( file )
end end
Quantum.Client.Menu.Load = function() Quantum.Client.Menu.Load = function()
local files = file.Find( GAMEMODE.FolderName .. "/gamemode/engine/derma/menus/menu_*.lua", "LUA" ) local files = file.Find( GM.FolderName .. "/gamemode/engine/derma/menus/menu_*.lua", "LUA" )
Quantum.Debug("Loading menus...") Quantum.Debug("Loading menus...")
if( !files == nil || #files <= 0 ) then Quantum.Error( "Failed to load menus! Menu files not found. Contact someone important!\nFiles: " .. tostring(files) .. " (" .. tostring(#files) .. ")" ) end if( !files == nil || #files <= 0 ) then Quantum.Error( "Failed to load menus! Menu files not found. Contact someone important!\nFiles: " .. tostring(files) .. " (" .. tostring(#files) .. ")" ) end
for i, file in pairs( files ) do -- pretty ineffective but this will only be run ONCE to load all of the menus for i, file in pairs( files ) do -- pretty ineffective but this will only be run ONCE to load all of the menus
local id = getMenuIDbyFileName( file ) -- get the menu id by removing ".lua" and "menu_" from it local id = getMenuIDbyFileName( file ) -- get the menu id by removing ".lua" and "menu_" from it
Quantum.Client.Menu.Menus[id] = include( GAMEMODE.FolderName .. "/gamemode/engine/derma/menus/" .. file ) -- put it into the table Quantum.Client.Menu.Menus[id] = include( GM.FolderName .. "/gamemode/engine/derma/menus/" .. file ) -- put it into the table
Quantum.Debug( "Loaded menu: '" .. tostring(id) .. "'" ) -- debug it Quantum.Debug( "Loaded menu: '" .. tostring(id) .. "'" ) -- debug it
end end
end end

@ -643,7 +643,7 @@ function menu.open( dt )
f:Close() -- close the frame f:Close() -- close the frame
-- Open the intro cinematic -- Open the intro cinematic
runIntroCinematic( Quantum.Client.selectedChar ) -- run the cinematic if it is the first time runIntroCinematic( Quantum.Client.selectedChar.char ) -- run the cinematic if it is the first time
-- else do nothing -- else do nothing
end end

@ -72,8 +72,7 @@ local scenes = { -- 5031.821777 3866.334961 120.090790;setang 0.898059 56.421352
} }
function intro.open( dt ) function intro.open()
local chars = dt.cont
local resScale = Quantum.Client.ResolutionScale local resScale = Quantum.Client.ResolutionScale
local sw, sh = ScrW(), ScrH() local sw, sh = ScrW(), ScrH()
local padding = 10 * resScale local padding = 10 * resScale

@ -72,8 +72,6 @@ function main.open(dt)
theme.renderblur( self, 2, 7 ) theme.renderblur( self, 2, 7 )
end end
f.OnClose = function( self ) f.OnClose = function( self )
--Quantum.Client.IsInMenu = false
--Quantum.Client.Cam.Stop()
Quantum.Client.Menu.Menus["character"].open( dt ) Quantum.Client.Menu.Menus["character"].open( dt )
end end

Loading…
Cancel
Save