quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix keys

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@142 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2008-12-20 15:11:33 +00:00
parent 4f43944e44
commit 733ae2732e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cross-Makefile.conf
View File

@ -3,10 +3,10 @@
# edit the paths in here # edit the paths in here
# how to call the mingw tools # how to call the mingw tools
MINGW_EXEC_PREFIX = /home/divverent/mingw/bin/i386-mingw32- MINGW_EXEC_PREFIX = i586-mingw32msvc-
# where the dependencies package is extracted # where the dependencies package is extracted
RADIANT_DEPENDENCIES_PREFIX = /home/divverent/radiant-deps-mingw32/ RADIANT_DEPENDENCIES_PREFIX = $(HOME)/radiant-deps-mingw32/
# run the prefix fixing tool # run the prefix fixing tool
IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh) IGNORETHIS := $(shell cd $(RADIANT_DEPENDENCIES_PREFIX) && ./fixprefix.sh)

4
radiant/commands.cpp
View File

@ -267,6 +267,7 @@ void SaveCommandMap(const char* path)
m_file << name << "="; m_file << name << "=";
const char* key = global_keys_find(accelerator.key); const char* key = global_keys_find(accelerator.key);
if(!string_empty(key)) if(!string_empty(key))
{ {
m_file << key; m_file << key;
@ -328,6 +329,7 @@ public:
int modifiers = 0; int modifiers = 0;
const char* last = value + string_length(value); const char* last = value + string_length(value);
const char* keyEnd = stringrange_find(value, last, '+'); const char* keyEnd = stringrange_find(value, last, '+');
for(const char* modifier = keyEnd; modifier != last;) for(const char* modifier = keyEnd; modifier != last;)
{ {
const char* next = stringrange_find(modifier + 1, last, '+'); const char* next = stringrange_find(modifier + 1, last, '+');
@ -357,7 +359,7 @@ public:
// strBuff has been cleaned of it's modifiers .. switch between a regular key and a virtual one // strBuff has been cleaned of it's modifiers .. switch between a regular key and a virtual one
// based on length // based on length
if(keyEnd - value == 1) // most often case.. deal with first if(keyEnd - value == 1 && std::isalpha(value[0])) // most often case.. deal with first
{ {
accelerator.key = std::toupper(value[0]); accelerator.key = std::toupper(value[0]);
++m_count; ++m_count;