Merge branch 'master' of https://github.com/PurrCoding/cinema

Author: CattoGamer

cinema_modded/entities/entities/theater_door/sh_init.lua

@@ -4,4 +4,6 @@ ENT.AutomaticFrameAdvance = true
 
 ENT.DelayTime = 0.75 --how long until the screen begins to fade
 ENT.FadeTime = 0.80 --how long it takes to fade completely
-ENT.WaitTime = 0.10 --period for it to stay completely black
+ENT.WaitTime = 0.10 --period for it to stay completely black
+
+ENT.PhysgunDisabled = true -- Physgun cannot pick up this entity

cinema_modded/gamemode/i18n/init.lua

@@ -23,7 +23,7 @@ end
 if SERVER then return end
 
 local DefaultId = "en"
-local CurrentId = GetConVar("gmod_language"):GetString()
+local CurrentId = GetConVar("gmod_language"):GetString():lower()
 
 local I18nColors = include("colors.lua")
 local TranslationSchema = include("schema.lua")
@@ -174,6 +174,7 @@ end
 -- Language change callback
 cvars.AddChangeCallback("gmod_language", function(_, value_old, value_new)
 	if not CLIENT then return end
+	value_new = value_new:lower()
 	CurrentId = Languages[value_new] and value_new or DefaultId
 	RunConsoleCommand("cinema_langupdate")
 end)

cinema_modded/gamemode/player.lua

@@ -192,18 +192,16 @@ end
 function GM:PlayerCanSeePlayersChat( strText, bTeamOnly, pListener, pSpeaker )
 
 	-- Console 'say' command
-	if not IsValid(pSpeaker) then
+	if not IsValid( pSpeaker ) then
 		return true
 	end
 
-	-- Local chat functions as global chat in Cinema
+	-- Team chat will only boardcast to players in the same location
 	if bTeamOnly then
-		return true
+		return pSpeaker:GetLocation() == pListener:GetLocation()
 	end
 
-	-- Players should only receive chat messages from users in the same
-	-- theater if it wasn't global.
-	return pSpeaker:GetTheater() == pListener:GetTheater()
+	return true
 
 end
 

cinema_modded/gamemode/player_shd.lua

@@ -29,9 +29,9 @@ function GM:OnPlayerChat( player, strText, bTeamOnly, bPlayerIsDead )
 		table.insert( tab, "*DEAD* " )
 	end
 
-	if ( bTeamOnly ) then
+	if ( bTeamOnly and IsValid(player) ) then
 		table.insert( tab, Color( 123, 32, 29 ) )
-		table.insert( tab, "(GLOBAL) " )
+		table.insert( tab, "[" .. player:GetLocationName() .. "] " )
 	end
 
 	if ( IsValid( player ) ) then

cinema_modded/gamemode/shared.lua

@@ -5,10 +5,9 @@ GM.Website 		= "www.pixeltailgames.com"
 GM.TeamBased 	= false
 
 -- Enable sandbox functionalities
-local Cvar_DeriveSbox = CreateConVar("cinema_enable_sandbox", "0", {FCVAR_NOTIFY, FCVAR_REPLICATED,
-FCVAR_REPLICATED, FCVAR_LUA_SERVER, FCVAR_ARCHIVE}, "NEEDS SERVER RESTART!")
+local Cvar_DeriveSbox = GetConVar("cinema_enable_sandbox") -- This command is created by GMod itself (defined in cinema_modded.txt).
 
-if not GM.IsSandboxDerived and Cvar_DeriveSbox:GetBool() then
+if ( !GM.IsSandboxDerived and Cvar_DeriveSbox:GetBool() ) then
 	DeriveGamemode( "sandbox" )
 end