xaymar/Gmod-PropHuntExtended
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 9 Wiki Activity

init: Update to new RoundManager and UI

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-08-15 15:46:32 +02:00
parent eafb71c5bb
commit ee89cbc05b
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gamemodes/prophuntextended/gamemode/cl_init.lua
+9 -4
View File
@@ -25,17 +25,21 @@
-- ------------------------------------------------------------------------- --
--! Includes
-- ------------------------------------------------------------------------- --
-- Early Init
include("sh_init.lua")
include("vgui/dlabeldpi.lua")
include("vgui/dframedpi.lua")
include("vgui/fontmanager.lua")
include("vgui/uimanager.lua")
include("client/roundmanager.lua")
-- Late Init
include("client/cl_ui_help.lua")
include("client/cl_ui_teamselection.lua")
include("client/hud/gamestatedisplay.lua")
include("client/ui/scoreboard.lua")
include("client/ui/help.lua")
include("client/ui/settings.lua")
include("client/hud/gamestatedisplay.lua")
include("client/cl_ui_help.lua")
include("client/cl_ui_teamselection.lua")
-- ------------------------------------------------------------------------- --
--! Code
@@ -52,7 +56,8 @@ function GM:Initialize()
self.UI = {}
self.UI.Help = vgui.Create("PHE_HelpUI")
self.UI.Scoreboard = vgui.Create("DScoreBoard")
self.UI.GameStateDisplay = vgui.Create("PHEHUDGameStateDisplay")
self.UI.GameStateDisplay = vgui.Create("PHE_GameState")
self.UI.GameStateDisplay:Show()
print("Prop Hunt CL: Complete.")
print("-------------------------------------------------------------------------")
source/gamemodes/prophuntextended/gamemode/init.lua
+3 -6
View File
@@ -43,11 +43,12 @@ AddCSLuaFile("client/ui/help.lua")
AddCSLuaFile("client/ui/settings.lua")
AddCSLuaFile("client/ui/scoreboard.lua")
AddCSLuaFile("client/hud/gamestatedisplay.lua")
AddCSLuaFile("client/roundmanager.lua")
AddCSLuaFile("client/cl_ui_help.lua")
AddCSLuaFile("client/cl_ui_teamselection.lua")
-- Client Init
AddCSLuaFile("cl_init.lua") -- Immediately executed when downloaded, weird bug.
AddCSLuaFile("cl_init.lua") -- Immediately executed when downloaded, weird behavior.
-- ------------------------------------------------------------------------- --
--! Code
@@ -86,7 +87,7 @@ function GM:Initialize()
self.Data.StateTime = 0
print("Prop Hunt: Initializing Round Manager")
self.RoundManager = roundManager(StatePreMatch)
RoundManager:SetState(StatePreRound)
print("Prop Hunt: Precaching...")
GAMEMODE.Config.Taunt:Seekers()
@@ -96,10 +97,6 @@ function GM:Initialize()
print("-------------------------------------------------------------------------")
end
function GM:Think()
self.RoundManager:Tick()
end
-- Player Connected
function GM:PlayerConnect(name, ip)
if GAMEMODE.Config:DebugLog() then print("Prop Hunt: Player '"..name.."' connecting from IP '"..ip.."'.") end