1 files changed, 20 insertions, 18 deletions
diff --git a/gamemode/server/player_functions.lua b/gamemode/server/player_functions.lua
index b335553..09de491 100644
--- a/gamemode/server/player_functions.lua
+++ b/gamemode/server/player_functions.lua
@@ -150,9 +150,9 @@ function PlayerMeta:SetResource( resource, int )
 	PrintTable(resource)
 	print(int)
 
-	if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end
+	--if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end
 
-	self.Resources[resource] = int
+	--self.Resources[resource] = int
 
 	if(net.Start("gms_SetResource",false)) then
 		net.WriteString(resource.Name)
@@ -186,6 +186,10 @@ function PlayerMeta:IncResource( resource, int )
 	if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end
 	local all = self:GetAllResources()
 	local max = self.MaxResources
+	print("When adding resources, max resource is:")
+	print(max)
+	print("All is:")
+	print(all)
 
 	if ( all + int > max ) then
 		self.Resources[resource] = self.Resources[resource] + ( max - all )
@@ -196,10 +200,12 @@ function PlayerMeta:IncResource( resource, int )
 	end
 
 	self:SetResource(resource, self:GetResource( resource ))
+	print("Now all is:")
+	print(self:GetAllResources())
 end
 
 function PlayerMeta:DecResource( resource, int )
-	if ( !self.Resources[resource] ) then self.Resources[resource] = 0 end
+	if ( self.Resources[resource] == nil ) then self.Resources[resource] = 0 end
 	self.Resources[resource] = self.Resources[resource] - int
 
 	local r = self.Resources[resource]
@@ -215,12 +221,14 @@ function PlayerMeta:DecResource( resource, int )
 end
 
 function PlayerMeta:GetAllResources()
+	print("Totaling data in:")
+	PrintTable(self.Resources)
 	local num = 0
 
 	for k, v in pairs( self.Resources ) do
 		num = num + v
 	end
-
+	print("Total was " .. num)
 	return num
 end
 
@@ -290,6 +298,9 @@ function PlayerMeta:GetBuildingSite()
 end
 
 function PlayerMeta:DropResource( resource, int )
+	print("PlayerMeta:DropResource")
+	print("Resource:" .. resource)
+	print("Ammount:" .. int)
 	local nearby = {}
 
 	for k, v in pairs( ents.FindByClass( "gms_resource*" ) ) do
@@ -653,18 +664,9 @@ end
 
 function PlayerMeta:CancelProcess()
 	if ( !self.InProcess ) then return end
-
-	local v = self.ProcessTable
-	if ( !v.Cancel ) then return end
-
-	if ( v.Owner and v.Owner != NULL and IsValid( v.Owner ) ) then
-		v.Owner:Freeze( false )
-		v.Owner:StopProcessBar()
-		v.Owner.InProcess = false
-		v.Owner:SendMessage( "Cancelled.", 3, Color( 200, 0, 0, 255 ) )
-	end
-
-	v.IsStopped = true
-	timer.Destroy( "GMS_ProcessTimer_" .. v.TimerID )
-	GAMEMODE:RemoveProcessThink( v )
+	timer.Destroy("process")
+	self:Freeze(false)
+	self.InProcess = false
+	self:SendMessage( "Cancelled.", 3, Color( 200, 0, 0, 255 ) )
+	self:StopProcessBar()
 end