Fixed prop count limit

Removed prop amount check when opening files
Fixed undo text
This commit is contained in:
tbzipper 2011-11-01 22:44:04 +00:00
parent 35905fa525
commit a1f665db03
2 changed files with 9 additions and 7 deletions

View File

@ -619,9 +619,9 @@ local function DoGenericPhysics( Entity, data, Player )
if ( IsValid(Phys) ) then
Phys:SetPos( Args.Pos )
Phys:SetAngle( Args.Angle )
if ( Args.Frozen == true ) then
//if ( Args.Frozen == true ) then
Phys:EnableMotion( false )
end
//end
Player:AddFrozenPhysicsObject( Entity, Phys )
end
end
@ -731,7 +731,7 @@ local function CreateEntityFromTable(EntTable, Player)
end
end
//local sent = false
local sent = false
local status, valid
local GENERIC = false
// This class is unregistered. Instead of failing try using a generic
@ -1115,7 +1115,7 @@ local function AdvDupe2_Spawn()
local phys
local edit
for _,v in pairs( Queue.CreatedEntities ) do
//if(!IsValid(v))then v = nil continue end
if(!IsValid(v))then v = nil continue end
edit = true
if(Queue.EntityList[_].BuildDupeInfo.DupeParentID!=nil && Queue.Parenting)then
v:SetParent(Queue.CreatedEntities[Queue.EntityList[_].BuildDupeInfo.DupeParentID])
@ -1182,6 +1182,7 @@ local function AdvDupe2_Spawn()
undo.AddEntity( v )
end
undo.SetCustomUndoText("Undone "..(Queue.Name or "Advanced Duplication"))
undo.SetPlayer( Queue.Player )
undo.Finish()
@ -1287,6 +1288,7 @@ function AdvDupe2.InitPastingQueue(Player, PositionOffset, AngleOffset, OrigPos,
end
Queue.Current = 1
Queue.Name = Player.AdvDupe2.Name
Queue.Entity = true
Queue.Constraint = false
Queue.Parenting = Parenting

View File

@ -927,7 +927,7 @@ if SERVER then
AdvDupe2.Notify(ply,"Amount of constraints is greater than "..GetConVarString("AdvDupe2_MaxConstraints"),NOTIFY_ERROR)
return false
end
/*
local entcount = table.Count(dupe["Entities"])
if(tonumber(GetConVarString("AdvDupe2_MaxEntities"))>0)then
@ -940,7 +940,7 @@ if SERVER then
AdvDupe2.Notify(ply,"Amount of entities is greater than "..GetConVarString("sbox_maxprops"),NOTIFY_ERROR)
return false
end
end
end*/
end
ply.AdvDupe2.Entities = {}
@ -998,7 +998,7 @@ if SERVER then
ply.AdvDupe2.HeadEnt = dupe["HeadEnt"]
end
//ply.AdvDupe2.Name = name[#name]
ply.AdvDupe2.Name = name
umsg.Start("AdvDupe2_SetDupeInfo", ply)
umsg.String(name)