Skip to content

Commit

Permalink
Minor bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lenosisnickerboa committed Apr 17, 2016
1 parent ef9c828 commit c2b7a36
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/config_file.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ proc SaveConfigFile {configName} {
puts $fileId "$key \"$value\""
}
}
set config [dict set config values $values]
set $configName [dict set config values $values]
close $fileId
}

Expand Down
1 change: 1 addition & 0 deletions src/csgosl.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
exec wish "$0" ${1+"$@"}

#Later:
#Shouldn't use custom map group name on command line (only for workshop mapgroup)
#Run: vote on/off
#Try newer img toolkit:
#IMG_URL="https://sourceforge.net/settings/mirror_choices?projectname=tkimg&filename=tkimg/1.4/tkimg%201.4.5/tkimg-1.4.5.zip"
Expand Down
4 changes: 3 additions & 1 deletion src/layout.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ proc CreateLayout {pageOptions pageComponents} {
proc CreatePageOptions {config} {
set configName [dict get $config name]
set prefix [dict get $config prefix]
#The prefix is hardcoded to Advanced-Tabs right now, these tabs are the only
#one using the default layout scheme
return [list \
configName "$configName" \
tabName "$prefix" \
help "$prefix" \
help "Advanced-Tabs" \
]
}

Expand Down
18 changes: 16 additions & 2 deletions src/server_support.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ proc StartServer {} {
} else {
chan configure stdout -buffering none
chan configure stderr -buffering none
exec >@stdout 2>@stderr "$serverControlScript" $control "$serverFolder/$srcdsName" \
Trace "Executing $serverControlScript $control \
$serverFolder/$srcdsName \
-game csgo $consoleCommand $rconCommand \
+game_type $gameType +game_mode $gameMode \
$mapGroupOption \
Expand All @@ -120,7 +121,19 @@ proc StartServer {} {
-maxplayers_override $players \
-tickrate $tickRate \
$passwordOption \
+hostname "\"$serverName\"" $serverPort $serverLan \
+hostname \"$serverName\" $serverPort $serverLan \
$options"
exec >@stdout 2>@stderr "$serverControlScript" $control \
$serverFolder/$srcdsName \
-game csgo $consoleCommand $rconCommand \
+game_type $gameType +game_mode $gameMode \
$mapGroupOption \
$mapOption \
$steamAccount $apiAuthKey \
-maxplayers_override $players \
-tickrate $tickRate \
$passwordOption \
+hostname \"$serverName\" $serverPort $serverLan \
$options
}
}
Expand Down Expand Up @@ -224,6 +237,7 @@ proc UpdateServer {} {
if {$currentOs == "windows"} {
RunAssync "\"$steamcmdFolder/$steamCmdExe\" +runscript \"$filename\""
} else {
Trace "$steamcmdFolder/$steamCmdExe +runscript $filename"
exec >@stdout 2>@stderr "$steamcmdFolder/$steamCmdExe" +runscript "$filename"
}

Expand Down
2 changes: 1 addition & 1 deletion src/widgets.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source [file join $starkit::topdir browser.tcl]
package require Tk

proc Help {subject} {
Browser "http://www.google.se/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#safe=off&q=$subject"
Browser "https://github.com/lenosisnickerboa/csgosl/wiki/Help-on-$subject"
}

proc GetDir {initialDir prompt} {
Expand Down

0 comments on commit c2b7a36

Please sign in to comment.