MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix color variable naming in t_descriptor_color

develop
Petr Mrázek 2011-05-07 03:48:41 +02:00
parent fc0f6f1e48
commit 97af676bdb
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/include/dfhack/modules/Materials.h
Unescape Escape View File

@ -27,9 +27,9 @@ namespace DFHack
struct t_descriptor_color struct t_descriptor_color
{ {
char id[128]; // id in the raws char id[128]; // id in the raws
float r; float red;
float v; float green;
float b; float blue;
char name[128]; //displayed name char name[128]; //displayed name
}; };
/** /**

6
library/modules/Materials.cpp
Unescape Escape View File

@ -325,9 +325,9 @@ bool Materials::ReadDescriptorColors (void)
t_descriptor_color col; t_descriptor_color col;
p->readSTLString (p_colors[i] + OG_Descriptors->getOffset ("rawname"), col.id, 128); p->readSTLString (p_colors[i] + OG_Descriptors->getOffset ("rawname"), col.id, 128);
p->readSTLString (p_colors[i] + OG_Descriptors->getOffset ("name"), col.name, 128); p->readSTLString (p_colors[i] + OG_Descriptors->getOffset ("name"), col.name, 128);
col.r = p->readFloat( p_colors[i] + OG_Descriptors->getOffset ("color_r") ); col.red = p->readFloat( p_colors[i] + OG_Descriptors->getOffset ("color_r") );
col.v = p->readFloat( p_colors[i] + OG_Descriptors->getOffset ("color_v") ); col.green = p->readFloat( p_colors[i] + OG_Descriptors->getOffset ("color_v") );
col.b = p->readFloat( p_colors[i] + OG_Descriptors->getOffset ("color_b") ); col.blue = p->readFloat( p_colors[i] + OG_Descriptors->getOffset ("color_b") );
color.push_back(col); color.push_back(col);
} }
return ReadNamesOnly(d->owner, OG_Descriptors->getAddress ("all_colors_vector"), alldesc ); return ReadNamesOnly(d->owner, OG_Descriptors->getAddress ("all_colors_vector"), alldesc );

6
tools/examples/creaturedump.cpp
Unescape Escape View File

@ -214,9 +214,9 @@ void printCreature(DFHack::Context * DF, const DFHack::t_creature & creature)
if(color<Materials->color.size()) if(color<Materials->color.size())
{ {
cout << Materials->color[color].name << "[" cout << Materials->color[color].name << "["
<< (unsigned int) (Materials->color[color].r*255) << ":" << (unsigned int) (Materials->color[color].red*255) << ":"
<< (unsigned int) (Materials->color[color].v*255) << ":" << (unsigned int) (Materials->color[color].green*255) << ":"
<< (unsigned int) (Materials->color[color].b*255) << "]"; << (unsigned int) (Materials->color[color].blue*255) << "]";
} }
else if (color < Materials->alldesc.size()) else if (color < Materials->alldesc.size())
{ {

6
tools/examples/materialtest.cpp
Unescape Escape View File

@ -68,9 +68,9 @@ int main (int numargs, const char ** args)
for(uint32_t i = 0; i < Materials->color.size();i++) for(uint32_t i = 0; i < Materials->color.size();i++)
{ {
cout << i << ": " << Materials->color[i].id << " - " << Materials->color[i].name << "[" cout << i << ": " << Materials->color[i].id << " - " << Materials->color[i].name << "["
<< (unsigned int) (Materials->color[i].r*255) << ":" << (unsigned int) (Materials->color[i].red*255) << ":"
<< (unsigned int) (Materials->color[i].v*255) << ":" << (unsigned int) (Materials->color[i].green*255) << ":"
<< (unsigned int) (Materials->color[i].b*255) << (unsigned int) (Materials->color[i].blue*255)
<< "]" << endl; << "]" << endl;
} }
cout << endl << "----==== All descriptors ====----" << endl; cout << endl << "----==== All descriptors ====----" << endl;