Skip to content

Commit

Permalink
Merge pull request #1944 from realpack/master
Browse files Browse the repository at this point in the history
Remove superfluous tabs and white spaces
  • Loading branch information
thegrb93 authored Jun 30, 2019
2 parents 9a524dc + dcd618f commit b5460f8
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion lua/entities/base_wire_entity.lua
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ function ENT:ApplyDupeInfo(ply, ent, info, GetEntByID)
end

function ENT:PreEntityCopy()
duplicator.ClearEntityModifier(self, "WireDupeInfo")
duplicator.ClearEntityModifier(self, "WireDupeInfo")
-- build the DupeInfo table and save it as an entity mod
local DupeInfo = self:BuildDupeInfo()
if DupeInfo then
Expand Down
2 changes: 1 addition & 1 deletion lua/entities/gmod_wire_cameracontroller.lua
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ function ENT:WriteCell(address, value)
self:TriggerInput(key, value)
return true
else
value = tobool( value )
value = tobool( value )
if self[key] ~= value then
self[key] = value
self.NeedsSyncSettings = true
Expand Down
2 changes: 1 addition & 1 deletion lua/entities/gmod_wire_dhdd.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ end

function ENT:Think()
self.BaseClass.Think( self )

--[[
The workaround using WantsUpdate should not be required.
However, the server crashes (for no reason whatsoever) if you
Expand Down
2 changes: 1 addition & 1 deletion lua/entities/gmod_wire_digitalscreen/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ local function buildData(datastr, memory, pixelbit, range, bytesRemaining)
datastr[lengthIndex] = lengthStr[1]
range.length = iend - i
range.start = i

return bytesRemaining
end

Expand Down
2 changes: 1 addition & 1 deletion lua/entities/gmod_wire_expression2/core/constraint.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ end
'Parented'/'Parents'/'Parent'
'Wires'/'Wire'
or any constraint type names such as 'Weld', 'Axis', etc
Prefixing any of the keywords (except 'All') with '-' or '!' will negate the filter
Examples
entity():getConnectedEntities("all") => entity():getConnectedEntities() => entity():getConnectedEntities("") => all three are the same
Expand Down
4 changes: 2 additions & 2 deletions lua/entities/gmod_wire_expression2/core/custom/prop.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function PropCore.ValidSpawn(ply, model, isVehicle)
local ret -- DO NOT RETURN MID-FUNCTION OR 'LimitHit' WILL BREAK
local limithit = playerMeta.LimitHit
playerMeta.LimitHit = function() end

if not PropCore.WithinPropcoreLimits() then
ret = false
elseif not (util.IsValidProp( model ) and WireLib.CanModel(ply, model)) then
Expand All @@ -40,7 +40,7 @@ function PropCore.ValidSpawn(ply, model, isVehicle)
else
ret = gamemode.Call( "PlayerSpawnProp", ply, model ) ~= false
end

playerMeta.LimitHit = limithit
return ret
end
Expand Down
8 changes: 4 additions & 4 deletions lua/entities/gmod_wire_hologram.lua
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ if CLIENT then
clip.normal = norm
clip.origin = origin

if localentid ~= 0 then
clip.localentid = localentid
else
clip.localentid = nil
if localentid ~= 0 then
clip.localentid = localentid
else
clip.localentid = nil
end
end

Expand Down
6 changes: 3 additions & 3 deletions lua/entities/gmod_wire_vectorthruster.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function ENT:GetOffset( name )
end

function ENT:SetNormal( v )
self:SetNWVector( "vec", v )
self:SetNWVector( "vec", v )
end
function ENT:GetNormal()
return self:GetNWVector( "vec" )
Expand Down Expand Up @@ -104,10 +104,10 @@ function ENT:Initialize()
self.mul = 0
self.force = 0
self.calcforce = true

self.ForceLinear = vector_origin
self.ForceAngular = vector_origin

local max = self:OBBMaxs()
self.ThrustOffset = Vector( 0, 0, max.z )

Expand Down
2 changes: 1 addition & 1 deletion lua/wire/client/rendertarget_fix.lua
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ RTFix:Add("gmod_wire_textscreen","Text Screen", function( ent ) def( ent, "NeedR
RTFix:Add("gmod_wire_egp","EGP",function( ent ) def( ent, "NeedsUpdate" ) end)

-- EGP Emitter needs a check because it can optionally not use RTs
RTFix:Add("gmod_wire_egp_emitter","EGP Emitter",function( ent )
RTFix:Add("gmod_wire_egp_emitter","EGP Emitter",function( ent )
if ent:GetUseRT() then
def( ent, "NeedsUpdate" )
end
Expand Down
4 changes: 2 additions & 2 deletions lua/wire/client/text_editor/texteditor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,10 @@ do
local matchSearch = {
["{"] = { "}", true },
["}"] = { "{", false },

["["] = { "]", true },
["]"] = { "[", false },

["("] = { ")", true },
[")"] = { "(", false },
}
Expand Down
2 changes: 1 addition & 1 deletion lua/wire/client/text_editor/wire_expression2_editor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,7 @@ function Editor:Close()
self.chip = false

self:SaveEditorSettings()

hook.Run("WireEditorClose", self)
end

Expand Down
2 changes: 1 addition & 1 deletion lua/wire/gates/highspeed.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ GateActions["highspeed_read"] = {
inputtypes = { "NORMAL", "WIRELINK", "NORMAL" },
output = function(gate, Clk, Memory, Address)
if Clk <= 0 then return gate.Memory or 0 end

Address = math.floor(Address or -1)
if not Memory or not Memory.ReadCell or Address < 0 then
gate.Memory = 0
Expand Down
2 changes: 1 addition & 1 deletion lua/wire/server/wirelib.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ function WireLib.SetColor(ent, color)
else
rendermode = nil -- Don't modify the current stored modifier
end

ent:SetColor(color)
duplicator.StoreEntityModifier(ent, "colour", { Color = color, RenderMode = rendermode })
end
Expand Down
2 changes: 1 addition & 1 deletion lua/wire/stools/egp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if (SERVER) then
trace.Entity:SetTranslucent(self:GetClientNumber("translucent")~=0)
return true
end

local ply = self:GetOwner()
if (not ply:CheckLimit( "wire_egps" )) then return false end

Expand Down

0 comments on commit b5460f8

Please sign in to comment.