Merge pull request GmodStarfall#139 from Xandaros/starfallUsed

Rename starfall_used to starfallUsed
daranable · Mar 23, 2014 · 9b633ca · 9b633ca
2 parents d7e4e8d + 153ecec
commit 9b633ca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lua/entities/starfall_screen/cl_init.lua b/lua/entities/starfall_screen/cl_init.lua
@@ -73,7 +73,7 @@ usermessage.Hook( "starfall_screen_used", function ( data )
 	local screen = Entity( data:ReadShort() )
 	local activator = Entity( data:ReadShort() )
 
-	screen:runScriptHook( "starfall_used", SF.Entities.Wrap( activator ) )
+	screen:runScriptHook( "starfallUsed", SF.Entities.Wrap( activator ) )
 
 	-- Error message copying
 	if screen.error then

diff --git a/lua/entities/starfall_screen/init.lua b/lua/entities/starfall_screen/init.lua
@@ -163,7 +163,7 @@ function ENT:Use( activator )
 		umsg.End( )
 	end
 	if self.sharedscreen then
-		self:runScriptHook( "starfall_used", SF.Entities.Wrap( activator ) )
+		self:runScriptHook( "starfallUsed", SF.Entities.Wrap( activator ) )
 	end
 end
 

diff --git a/lua/starfall/libs_cl/render.lua b/lua/starfall/libs_cl/render.lua
@@ -498,6 +498,11 @@ function render_library.getScreenPos()
 	return pos, rot
 end
 
+--- Called when a player uses the screen
+-- @name starfallUsed
+-- @class hook
+-- @param activator Player using the screen
+
 ---
 -- @name Screen information table
 -- @class table