Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2025-03-30 04:43:22 +00:00
Code Issues Projects Releases Wiki Activity

ResourceFiles library: support resource names

Browse Source
This commit is contained in:
Wolfgang Thaller 2014-11-08 00:53:12 +01:00
parent 3a98af6322
commit 1eda57de45
2 changed files with 30 additions and 4 deletions

33
ResourceFiles/ResourceFork.cc

@ -21,7 +21,7 @@ void Resources::writeFork(std::ostream& out) const
for(int i = 0; i < 0x100 - 16; i++) for(int i = 0; i < 0x100 - 16; i++)
byte(out, 0); byte(out, 0);
std::map< std::string, std::map<int, int> > resourceInfos; std::map< ResType, std::map<int, int> > resourceInfos;
std::streampos datastart = out.tellp(); std::streampos datastart = out.tellp();
for(auto& rr : resources) for(auto& rr : resources)
{ {
@ -42,7 +42,7 @@ void Resources::writeFork(std::ostream& out) const
word(out,0); word(out,0);
std::streampos typelist = out.tellp(); std::streampos typelist = out.tellp();
word(out,resourceInfos.size() - 1); word(out,resourceInfos.size() - 1);
for(std::map< std::string, std::map<int, int> >::iterator p = resourceInfos.begin(); for(std::map< ResType, std::map<int, int> >::iterator p = resourceInfos.begin();
p != resourceInfos.end(); ++p) p != resourceInfos.end(); ++p)
{ {
if(p->second.size()) if(p->second.size())
@ -53,7 +53,8 @@ void Resources::writeFork(std::ostream& out) const
} }
} }
int typeIndex = 0; int typeIndex = 0;
for(std::map< std::string, std::map<int, int> >::iterator p = resourceInfos.begin(); int nameOffset = 0;
for(std::map< ResType, std::map<int, int> >::iterator p = resourceInfos.begin();
p != resourceInfos.end(); ++p) p != resourceInfos.end(); ++p)
{ {
if(p->second.size()) if(p->second.size())
@ -66,8 +67,15 @@ void Resources::writeFork(std::ostream& out) const
for(std::map<int,int>::iterator q = p->second.begin(); q != p->second.end(); ++q) for(std::map<int,int>::iterator q = p->second.begin(); q != p->second.end(); ++q)
{ {
std::string name = resources.find(ResRef(p->first, q->first))->second.getName();
word(out,q->first); word(out,q->first);
word(out,-1); if(name.size() == 0)
word(out,-1);
else
{
word(out, nameOffset);
nameOffset += (name.size() > 255 ? 255 : name.size()) + 1;
}
longword(out,q->second); longword(out,q->second);
longword(out,0); longword(out,0);
} }
@ -77,6 +85,23 @@ void Resources::writeFork(std::ostream& out) const
out.seekp(resnameOffset); out.seekp(resnameOffset);
word(out, resnames - resmap); word(out, resnames - resmap);
out.seekp(resnames); out.seekp(resnames);
for(std::map< ResType, std::map<int, int> >::iterator p = resourceInfos.begin();
p != resourceInfos.end(); ++p)
{
for(std::map<int,int>::iterator q = p->second.begin(); q != p->second.end(); ++q)
{
std::string name = resources.find(ResRef(p->first, q->first))->second.getName();
if(name.size() > 0)
{
int sz = name.size() > 255 ? 255 : name.size();
byte(out, sz);
for(int i = 0; i < sz; i++)
byte(out, name[i]);
}
}
}
std::streampos end = out.tellp(); std::streampos end = out.tellp();
out.seekp(start + std::streampos(4)); out.seekp(start + std::streampos(4));
longword(out, resmap - start); longword(out, resmap - start);

1
ResourceFiles/ResourceFork.h

@ -21,6 +21,7 @@ public:
inline ResType getType() const { return type; } inline ResType getType() const { return type; }
inline int getID() const { return id; } inline int getID() const { return id; }
inline ResRef getTypeAndID() const { return ResRef(type, id); } inline ResRef getTypeAndID() const { return ResRef(type, id); }
std::string getName() const { return name; }
}; };
class Fork class Fork