games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Removed last instances of readNormalNr. Made readChar an inline.

Browse Source
This commit is contained in:
Frank Zago 2011-10-08 16:06:11 +00:00
parent 0903d6037c
commit 7b1ede449d
5 changed files with 62 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/CCreatureAnimation.h
View File

@ -34,19 +34,6 @@ private:
} ;
std::vector<SEntry> SEntries ;
std::string defName, curDir;
template< int bytCon > static int readNormalNr (int pos, unsigned char * str)
{
int ret=0;
int amp=1;
for (int i=0; i<bytCon; i++)
{
ret+=str[pos+i]*amp;
amp<<=8; //amp*=256;
}
return ret;
}
template<int bpp>
void putPixel(

1
client/CDefHandler.cpp
View File

@ -172,7 +172,6 @@ SDL_Surface * CDefHandler::getSprite (int SIndex, const unsigned char * FDef, co
add=0;
ret = SDL_CreateRGBSurface(SDL_SWSURFACE, FullWidth, FullHeight, 8, 0, 0, 0, 0);
//int tempee2 = readNormalNr(0,4,((unsigned char *)tempee.c_str()));
BaseOffset += sizeof(SSpriteDef);
int BaseOffsetor = BaseOffset;

22
lib/CLodHandler.cpp
View File

@ -27,28 +27,6 @@
*
*/
int readNormalNr (const unsigned char * bufor, int pos, int bytCon, bool cyclic)
{
int ret=0;
int amp=1;
for (int ir=0; ir<bytCon; ir++)
{
ret+=bufor[pos+ir]*amp;
amp*=256;
}
if(cyclic && bytCon<4 && ret>=amp/2)
{
ret = ret-amp;
}
return ret;
}
char readChar(const unsigned char * bufor, int &i)
{
return bufor[i++];
}
std::string readString(const unsigned char * bufor, int &i)
{
int len = read_le_u32(bufor + i); i+=4;

7
lib/CLodHandler.h
View File

@ -35,9 +35,10 @@ struct LodEntry {
ui32 size; /* little endian */
};
DLL_EXPORT int readNormalNr (const unsigned char * bufor, int pos, int bytCon = 4, bool cyclic = false);
DLL_EXPORT char readChar(const unsigned char * bufor, int &i);
static inline char readChar(const unsigned char * bufor, int &i)
{
return bufor[i++];
}
DLL_EXPORT std::string readString(const unsigned char * bufor, int &i);

71
lib/map.cpp
View File

@ -96,13 +96,24 @@ static unsigned char reverse(unsigned char arg)
void readCreatureSet(CCreatureSet *out, const unsigned char * bufor, int &i, int number, bool version) //version==true for >RoE maps
{
const int bytesPerCre = version ? 4 : 3,
idBytes = version ? 2 : 1,
maxID = version ? 0xffff : 0xff;
for(int ir=0;ir < number; ir++)
{
int creID = readNormalNr(bufor,i+ir*bytesPerCre, idBytes);
int count = readNormalNr(bufor,i+ir*bytesPerCre+idBytes, 2);
int creID;
int count;
if (version)
{
creID = read_le_u16(bufor + i+ir*bytesPerCre);
count = read_le_u16(bufor + i+ir*bytesPerCre + 2);
}
else
{
creID = bufor[i+ir*bytesPerCre];
count = read_le_u16(bufor + i+ir*bytesPerCre + 1);
}
if(creID == maxID) //empty slot
continue;
@ -597,8 +608,9 @@ int Mapa::loadSeerHut( const unsigned char * bufor, int i, CGObjectInstance *& n
case 5:
{
hut->rID = bufor[i]; ++i;
hut->rVal = readNormalNr(bufor,i, 3); i+=3;
i+=1;
/* Only the first 3 bytes are used. Skip the 4th. */
hut->rVal = read_le_u32(bufor + i) & 0x00ffffff;
i+=4;
break;
}
case 6:
@ -615,7 +627,14 @@ int Mapa::loadSeerHut( const unsigned char * bufor, int i, CGObjectInstance *& n
}
case 8:
{
hut->rID = readNormalNr(bufor,i, (version == RoE ? 1 : 2)); i+=(version == RoE ? 1 : 2);
if (version == RoE)
{
hut->rID = bufor[i]; i++;
}
else
{
hut->rID = read_le_u16(bufor + i); i+=2;
}
break;
}
case 9:
@ -1271,8 +1290,8 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
}
evnt->gainedExp = read_le_u32(bufor + i); i+=4;
evnt->manaDiff = read_le_u32(bufor + i); i+=4;
evnt->moraleDiff = readNormalNr(bufor,i, 1, true); ++i;
evnt->luckDiff = readNormalNr(bufor,i, 1, true); ++i;
evnt->moraleDiff = (si8)bufor[i]; ++i;
evnt->luckDiff = (si8)bufor[i]; ++i;
evnt->resources.resize(RESOURCE_QUANTITY);
for(int x=0; x<7; x++)
@ -1299,7 +1318,14 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
int gart = bufor[i]; ++i; //number of gained artifacts
for(int oo = 0; oo<gart; ++oo)
{
evnt->artifacts.push_back(readNormalNr(bufor,i, (version == RoE ? 1 : 2))); i+=(version == RoE ? 1 : 2);
if (version == RoE)
{
evnt->artifacts.push_back(bufor[i]); i++;
}
else
{
evnt->artifacts.push_back(read_le_u16(bufor + i)); i+=2;
}
}
int gspel = bufor[i]; ++i; //number of gained spells
@ -1394,7 +1420,16 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
cre->resources[j] = read_le_u32(bufor + i); i+=4;
}
int artID = readNormalNr(bufor,i, (version == RoE ? 1 : 2)); i+=(version == RoE ? 1 : 2);
int artID;
if (version == RoE)
{
artID = bufor[i]; i++;
}
else
{
artID = read_le_u16(bufor + i); i+=2;
}
if(version==RoE)
{
if(artID!=0xff)
@ -1588,8 +1623,8 @@ void Mapa::readObjects( const unsigned char * bufor, int &i)
box->gainedExp = read_le_u32(bufor + i); i+=4;
box->manaDiff = read_le_u32(bufor + i); i+=4;
box->moraleDiff = readNormalNr(bufor,i, 1, true); ++i;
box->luckDiff = readNormalNr(bufor,i, 1, true); ++i;
box->moraleDiff = (si8)bufor[i]; ++i;
box->luckDiff = (si8)bufor[i]; ++i;
box->resources.resize(RESOURCE_QUANTITY);
for(int x=0; x<7; x++)
@ -2052,9 +2087,17 @@ void Mapa::addNewArtifactInstance( CArtifactInstance *art )
bool Mapa::loadArtifactToSlot(CGHeroInstance *h, int slot, const unsigned char * bufor, int &i)
{
const int artmask = version == RoE ? 0xff : 0xffff;
const int artidlen = version == RoE ? 1 : 2;
int aid;
if (version == RoE)
{
aid = bufor[i]; i++;
}
else
{
aid = read_le_u16(bufor + i); i+=2;
}
int aid = readNormalNr(bufor,i, artidlen); i+=artidlen;
bool isArt = aid != artmask;
if(isArt)
{