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

various fixes

Browse Source
This commit is contained in:
Alexander S. Aganichev
2002-07-19 06:04:58 +00:00
parent 105c2e765d
commit 7e7d37a0dd
6 changed files with 105 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
golded3/gealst.cpp
View File

@@ -103,14 +103,15 @@ extern "C" int AreaListCmp(const Area** __a, const Area** __b) {
switch(*ptr) {
case '-':
rev = true;
A = b; B = a;
A = b; B = a;
break;
case '+':
rev = false;
A = a; B = b;
A = a; B = b;
break;
case 'A':
case 'a':
sepfirst = true;
if((cmp = A->aka().compare(B->aka())) != 0)
return cmp;
break;
@@ -151,6 +152,7 @@ extern "C" int AreaListCmp(const Area** __a, const Area** __b) {
break;
case 'G':
case 'g':
sepfirst = true;
if((cmp = compare_groups(A->groupid(), B->groupid())) != 0)
return cmp;
break;
@@ -211,6 +213,7 @@ extern "C" int AreaListCmp(const Area** __a, const Area** __b) {
break;
case 'T':
case 't':
sepfirst = true;
if((cmp = compare_two(CFG->areatypeorder[A->type()&0xFF], CFG->areatypeorder[B->type()&0xFF])) != 0)
return cmp;
break;
@@ -292,15 +295,15 @@ extern "C" int AreaListCmp(const Area** __a, const Area** __b) {
break;
case 'S':
case 's':
sepfirst = not rev;
if((cmp = compare_two(B->isseparator(), A->isseparator())) != 0)
return cmp;
break;
}
ptr++;
}
if(cmp == 0) {
cmp = compare_two(b->isseparator(), a->isseparator());
return sepfirst?-cmp:cmp;
cmp = compare_two(B->isseparator(), A->isseparator());
}
return cmp;

2
golded3/geglob.cpp
View File

@@ -255,7 +255,7 @@ bool inline samekey(gkey key1, gkey key2) {
if(key1 >= KK_Commands) // special key
return false;
return (tolower(key1) == key2) or (toupper(key1) == key2);
return (tolower(key1) == key2) or (tolower(key2) == key1);
}