bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to the recent patches

Browse Source
This commit is contained in:
Alexander S. Aganichev
2002-09-23 09:23:45 +00:00
parent c283d9e260
commit dbeb60a30e
7 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
golded3/gckeys.cpp
View File

@@ -922,7 +922,7 @@ static void SetKeybDefaults() {
int keys = (sizeof(DefaultKeyset) / sizeof(CmdKey)) - 1;
int k = 0;
while(k < keys) {
if(tmp->key < 0xFF)
if(tmp->key <= 0xFF)
tmp->key = (gkey)tolower(tmp->key);
KeyCmdAdd(tmp->cmd, tmp->key, tmp->type);
tmp++;

8
golded3/geglob.cpp
View File

@@ -255,6 +255,10 @@ bool inline samekey(gkey key1, gkey key2) {
if(key1 >= KK_Commands) // special key
return false;
if(key1 == key2)
return true;
if((key1 > 0xFF) || (key2 > 0xFF))
return false;
return (tolower(key1) == key2) or (tolower(key2) == key1);
}
@@ -265,7 +269,7 @@ int IsMacro(gkey key, int type) {
std::vector<Macro>::iterator m = CFG->macro.begin();
while(m != CFG->macro.end()) {
if(((key == m->key) or samekey(key, m->key)) and (type == m->type))
if(samekey(key, m->key) and (type == m->type))
return true;
m++;
}
@@ -280,7 +284,7 @@ int PlayMacro(gkey key, int type) {
std::vector<Macro>::iterator m = CFG->macro.begin();
while(m != CFG->macro.end()) {
if(((key == m->key) or samekey(key, m->key)) and (type == m->type)) {
if(samekey(key, m->key) and (type == m->type)) {
RunMacro(&(*m));
return true;
}