edshot99/ulib
1
0
Fork 0
forked from TeamUlysses/ulib
Code Pull Requests Activity

Trying to account for more possible Garry breakage in misc.lua

Browse Source
This commit is contained in:
Nayruden 2013-07-20 14:38:03 -06:00
parent 0f9baf01b8
commit d2b645a430
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lua/ulib/shared/misc.lua
View File

@ -268,7 +268,7 @@ end
v2.40 - Properly handles escaped quotes now.
]]
function ULib.parseKeyValues( str, convert )
local lines = ULib.explode( "\n", str )
local lines = ULib.explode( "\r?\n", str )
local parent_tables = {} -- Traces our way to root
local current_table = {}
local is_insert_last_op = false
@ -628,7 +628,7 @@ end
]]
function ULib.removeCommentHeader( data, comment_char )
comment_char = comment_char or ";"
local lines = ULib.explode( "\n", data )
local lines = ULib.explode( "\r?\n", data )
local end_comment_line = 0
for _, line in ipairs( lines ) do
local trimmed = line:Trim()
@ -666,7 +666,7 @@ function ULib.stringTimeToSeconds( str )
if str == nil or type( str ) == "number" then
return str
end
str = str:gsub( " ", "" )
local minutes = 0
local keycode_location = str:find( "%a" )