Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- added hard coded team chat hotkey H to configurable keys 

- changed dependency finder script to use only desired libs
This commit is contained in:
Mark Vejvoda 2010-08-27 21:43:47 +00:00
parent a2f013c51a
commit a9b0f31816
4 changed files with 70 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mk/linux/glestkeys.ini
View File

@ -39,6 +39,7 @@ HotKeySelectStoreUnit=T
HotKeySelectedUnitsAttack=A
HotKeySelectedUnitsStop=S
HotKeyToggleOSMouseEnabled=/
ChatTeamMode=H
; === propertyMap File ===

46
mk/linux/makedeps_folder.sh
View File

@ -20,8 +20,21 @@ sync_support_libs(){
local pFILE="$2" # bin file to scan for dependencies from
local files=""
local _cp="/bin/cp"
local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
local skip_deps=""
local keep_deps="libcurl libgnu libicu liblua libxerces"
local scan_via_skiplist=1
if [ -n "$skip_deps" ]; then
scan_via_skiplist=1
echo 'scanning for deps TO SKIP...'
elif [ -n "$keep_deps" ]; then
scan_via_skiplist=0
echo 'scanning for deps TO KEEP...'
fi
# get rid of blanks and (0x00007fff0117f000)
files="$(ldd $pFILE | awk '{ print $3 }' | sed -e '/^$/d' -e '/(*)$/d')"
@ -34,14 +47,27 @@ sync_support_libs(){
# echo ${_cp} -f $i ${d}
skipfile=0
for j in $(echo $skip_deps)
do
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
# echo Skipping file = [$i]
skipfile=1
break
fi
done
if [ $scan_via_skiplist -eq 1 ]; then
for j in $(echo $skip_deps)
do
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
# echo Skipping file = [$i]
skipfile=1
break
fi
done
elif [ $scan_via_skiplist -eq 0 ]; then
skipfile=1
for j in $(echo $keep_deps)
do
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
# echo Skipping file = [$i]
skipfile=0
break
fi
done
fi
if [ $skipfile -eq 0 ]; then
echo Including file = [$i]

30
mk/linux/mojosetup/megaglest-installer/makedeps_folder.sh
View File

@ -20,7 +20,20 @@ sync_support_libs(){
local pFILE="$2" # bin file to scan for dependencies from
local files=""
local _cp="/bin/cp"
local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
local skip_deps=""
local keep_deps="libcurl libgnu libicu liblua libxerces"
local scan_via_skiplist=1
if [ -n "$skip_deps" ]; then
scan_via_skiplist=1
echo 'scanning for deps TO SKIP...'
elif [ -n "$keep_deps" ]; then
scan_via_skiplist=0
echo 'scanning for deps TO KEEP...'
fi
# get rid of blanks and (0x00007fff0117f000)
files="$(ldd $pFILE | awk '{ print $3 }' | sed -e '/^$/d' -e '/(*)$/d')"
@ -34,14 +47,27 @@ sync_support_libs(){
# echo ${_cp} -f $i ${d}
skipfile=0
if [ $scan_via_skiplist -eq 1 ]; then
for j in $(echo $skip_deps)
do
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
# echo Skipping file = [$i]
skipfile=1
break
break
fi
done
elif [ $scan_via_skiplist -eq 0 ]; then
skipfile=1
for j in $(echo $keep_deps)
do
if [ `awk "BEGIN {print index(\"$i\", \"$j\")}"` -ne 0 ]; then
# echo Skipping file = [$i]
skipfile=0
break
fi
done
fi
if [ $skipfile -eq 0 ]; then
echo Including file = [$i]

8
source/glest_game/game/chat_manager.cpp
View File

@ -82,16 +82,18 @@ void ChatManager::keyDown(char key){
try {
Lang &lang= Lang::getInstance();
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
//toggle team mode
if(editEnabled == false && disableTeamMode == false && key=='H') {
if(editEnabled == false && disableTeamMode == false &&
key == configKeys.getCharKey("ChatTeamMode")) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,key,key);
if(teamMode){
if(teamMode == true) {
teamMode= false;
console->addLine(lang.get("ChatMode") + ": " + lang.get("All"));
}
else{
else {
teamMode= true;
console->addLine(lang.get("ChatMode") + ": " + lang.get("Team"));
}