mirror of
https://github.com/SWG-Source/src.git
synced 2026-07-31 00:15:55 -04:00
Merge branch 'master' into 'master'
fix order of ops See merge request !8
This commit is contained in:
@@ -614,7 +614,7 @@ inline int UpperHashString(const char *string)
|
||||
int h = 0;
|
||||
while (*string != 0)
|
||||
{
|
||||
h = ((31 * h) + ((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string)) ^ (h >> 26);
|
||||
h = ((31 * h) + (((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string) ^ (h >> 26)));
|
||||
string++;
|
||||
}
|
||||
return(h);
|
||||
|
||||
+1
-1
@@ -155,7 +155,7 @@ inline int UpperHashString(char *string)
|
||||
int h = 0;
|
||||
while (*string != 0)
|
||||
{
|
||||
h = ((31 * h) + ((((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string)) ^ (h >> 26)));
|
||||
h = ((31 * h) + (((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string) ^ (h >> 26)));
|
||||
string++;
|
||||
}
|
||||
return(h);
|
||||
|
||||
Reference in New Issue
Block a user