empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(getcontact, putcontact): Remove the bit shifting that was in the

Browse source 
function to save space.  opt_LOSE_CONTACT changes negated
any space saving.
This commit is contained in:
Ron Koenderink 2005-11-18 22:58:54 +00:00
parent 7b94794365
commit 09b2530d97
1 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib/common/nat.c
View file

@ -133,17 +133,7 @@ agecontact(struct natstr *np)
int int
getcontact(struct natstr *np, natid them) getcontact(struct natstr *np, natid them)
{ {
int contact; return np->nat_contact[them];
if (opt_LOSE_CONTACT) {
contact = np->nat_contact[them];
} else {
int ind = them / 16;
int shift = (them % 16);
contact = (np->nat_contact[ind] >> shift) & 1;
}
return contact;
} }
void void
@ -173,18 +163,6 @@ putreject(struct natstr *np, natid them, int how, int what)
void void
putcontact(struct natstr *np, natid them, int contact) putcontact(struct natstr *np, natid them, int contact)
{ {
if (opt_LOSE_CONTACT) { if (np->nat_contact[them] < contact)
if (np->nat_contact[them] > contact)
return;
np->nat_contact[them] = contact; np->nat_contact[them] = contact;
} else {
int ind = them / 16;
int shift = them % 16;
int new = np->nat_contact[ind];
if (contact)
contact = 1;
new &= ~(1 << shift);
new |= (contact << shift);
np->nat_contact[ind] = new;
}
} }