diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2017-02-18 21:55:55 -0500 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2017-02-18 21:55:55 -0500 |
| commit | a22cbeddc5f8fb61e87a30aa14ba354de5cf4431 (patch) | |
| tree | 297c1dbfb23185c5246e1dd7bdec52253a24ba60 /gamemode/server | |
| parent | f4ee62bb0725a3ae94477b2818071f506e4dfd9f (diff) | |
| download | artery-a22cbeddc5f8fb61e87a30aa14ba354de5cf4431.tar.gz artery-a22cbeddc5f8fb61e87a30aa14ba354de5cf4431.tar.bz2 artery-a22cbeddc5f8fb61e87a30aa14ba354de5cf4431.zip | |
Updates
Diffstat (limited to 'gamemode/server')
| -rw-r--r-- | gamemode/server/sv_database.lua | 2 | ||||
| -rw-r--r-- | gamemode/server/sv_loadplayer.lua | 4 | ||||
| -rw-r--r-- | gamemode/server/sv_mapconfig.lua | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/gamemode/server/sv_database.lua b/gamemode/server/sv_database.lua index 55c5346..4a72c68 100644 --- a/gamemode/server/sv_database.lua +++ b/gamemode/server/sv_database.lua @@ -1,4 +1,6 @@ --One-type setup stuff + +do return end print("Hello from database.lua!!") require("mysqloo") diff --git a/gamemode/server/sv_loadplayer.lua b/gamemode/server/sv_loadplayer.lua index 86673a7..ee4eee6 100644 --- a/gamemode/server/sv_loadplayer.lua +++ b/gamemode/server/sv_loadplayer.lua @@ -1,4 +1,4 @@ - +local sql = nrequire("core/database/sv_setup.lua") local models = {} for k = 1,9 do models[#models + 1] = "models/player/Group01/male_0" .. k .. ".mdl" @@ -7,7 +7,7 @@ end local function delayplayerload(ply) if ply:Alive() then - ART.loadPlayerData(ply) + sql.GetPlayerData(ply) else timer.Simple(1,function() delayplayerload(ply) diff --git a/gamemode/server/sv_mapconfig.lua b/gamemode/server/sv_mapconfig.lua index 7117a07..2448e27 100644 --- a/gamemode/server/sv_mapconfig.lua +++ b/gamemode/server/sv_mapconfig.lua @@ -1,5 +1,5 @@ --Loads map config form a file - +do return end function ART.CreateTownie(tbl) local npcent = ents.Create("npc_townie") for k,v in pairs(tbl) do |