New NPC color tint bug

Shendare · #2 05-25-2009, 02:54 AM

Hey, you're right!

I think I fixed this in my pre-release testing, but managed to un-fix it before posting it on the forums.

That's what I get for working on personal stuff at work as well as home.

Multiple versions of code.

The Fix (hopefully Trev or someone can source it into the SVN pretty quickly):

zonedb.cpp - Line 1268

Code:

...
  tmpNPCType->drakkin_details = atoi(row[r++]);
  tmpNPCType->armor_tint = (atoi(row[r++]) & 0xFF);
  tmpNPCType->armor_tint |= (atoi(row[r++]) & 0xFF) << 8;
  tmpNPCType->armor_tint |= (atoi(row[r++]) & 0xFF) << 16;
  tmpNPCType->armor_tint |= (tmpNPCType->armor_tint) ? (0xFF << 24) : 0;

  tmpNPCType->see_invis = atoi(row[r++])==0?false:true;      // Mongrel: Set see_invis flag
...

...should be changed to...

Code:

...
  tmpNPCType->drakkin_details = atoi(row[r++]);
  tmpNPCType->armor_tint = (atoi(row[r++]) & 0xFF) << 16;
  tmpNPCType->armor_tint |= (atoi(row[r++]) & 0xFF) << 8;
  tmpNPCType->armor_tint |= (atoi(row[r++]) & 0xFF);
  tmpNPCType->armor_tint |= (tmpNPCType->armor_tint) ? (0xFF << 24) : 0;

  tmpNPCType->see_invis = atoi(row[r++])==0?false:true;      // Mongrel: Set see_invis flag
...

Just swapping the "(...0xFF) << 16;" and "(...0xFF);" lines and adjusting the "=" and "|=" to correlate.

- Shendare