TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2000-11-04 02:16:12 +00:00
parent 43f23a2a55
commit a0ed36e4c0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandatool/src/egg-palettize/Sources.pp
View File

@ -3,7 +3,7 @@
#define LOCAL_LIBS \ #define LOCAL_LIBS \
eggbase progbase eggbase progbase
#define OTHER_LIBS \ #define OTHER_LIBS \
egg:c linmath:c putil:c express:c pnmimagetypes:c \ egg:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \
pandaegg:m panda:m pandaexpress:m \ pandaegg:m panda:m pandaexpress:m \
dtoolutil:c dconfig:c dtool:m pystub dtoolutil:c dconfig:c dtool:m pystub

14
pandatool/src/egg-palettize/attribFile.cxx
View File

@ -907,8 +907,8 @@ parse_params(const vector<string> &words, istream &infile,
bool AttribFile:: bool AttribFile::
parse_packing(const vector<string> &words, istream &infile, parse_packing(const vector<string> &words, istream &infile,
string &line, int &line_num) { string &line, int &line_num) {
if (words.size() != 3 || words[1] != "is" || if (!(words.size() == 3 && words[1] == "is" &&
(words[2] != "optimal" && words[2] != "suboptimal")) { (words[2] == "optimal" || words[2] == "suboptimal"))) {
nout << "Expected 'packing is {optimal|suboptimal}'\n"; nout << "Expected 'packing is {optimal|suboptimal}'\n";
return false; return false;
} }
@ -1073,7 +1073,7 @@ parse_palette(const vector<string> &words, istream &infile,
} }
string filename = words[1]; string filename = words[1];
if (words[2] != "size") { if (!(words[2] == "size")) {
nout << "Expected keyword 'size'\n"; nout << "Expected keyword 'size'\n";
return false; return false;
} }
@ -1096,21 +1096,21 @@ parse_palette(const vector<string> &words, istream &infile,
Texture *texture = get_texture(twords[0]); Texture *texture = get_texture(twords[0]);
if (twords[1] != "at") { if (!(twords[1] == "at")) {
nout << "Expected keyword 'at'\n"; nout << "Expected keyword 'at'\n";
return false; return false;
} }
int left = atoi(twords[2].c_str()); int left = atoi(twords[2].c_str());
int top = atoi(twords[3].c_str()); int top = atoi(twords[3].c_str());
if (twords[4] != "size") { if (!(twords[4] == "size")) {
nout << "Expected keyword 'size'\n"; nout << "Expected keyword 'size'\n";
return false; return false;
} }
int xsize = atoi(twords[5].c_str()); int xsize = atoi(twords[5].c_str());
int ysize = atoi(twords[6].c_str()); int ysize = atoi(twords[6].c_str());
if (twords[7] != "margin") { if (!(twords[7] == "margin")) {
nout << "Expected keyword 'margin'\n"; nout << "Expected keyword 'margin'\n";
return false; return false;
} }
@ -1138,7 +1138,7 @@ parse_unplaced(const vector<string> &words, istream &infile,
Texture *texture = get_texture(words[1]); Texture *texture = get_texture(words[1]);
if (words[2] != "because") { if (!(words[2] == "because")) {
nout << "Expected keyword 'because'\n"; nout << "Expected keyword 'because'\n";
return false; return false;
} }