mirror of https://github.com/libAthena/athena.git
* Fix botched commit (forgot -a)
This commit is contained in:
Antidote
parent
8f550d3a5e
commit
e86d64e7bb
|
|
@ -16,6 +16,8 @@
|
||||||
#ifndef __ALTTP_ENUMS_HPP__
|
#ifndef __ALTTP_ENUMS_HPP__
|
||||||
#define __ALTTP_ENUMS_HPP__
|
#define __ALTTP_ENUMS_HPP__
|
||||||
|
|
||||||
|
#ifndef __DOXYGEN_IGNORE__
|
||||||
|
|
||||||
#include "Types.hpp"
|
#include "Types.hpp"
|
||||||
|
|
||||||
enum BowType : char
|
enum BowType : char
|
||||||
|
|
@ -103,4 +105,5 @@ enum ALTTPTagAlong
|
||||||
AfterBoss
|
AfterBoss
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif // __DOXYGEN_IGNORE__
|
||||||
#endif // __ALTTP_ENUMS_HPP__
|
#endif // __ALTTP_ENUMS_HPP__
|
||||||
|
|
|
||||||
|
|
@ -19,10 +19,13 @@
|
||||||
#include <Types.hpp>
|
#include <Types.hpp>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
class ALTTPQuest;
|
class ALTTPQuest;
|
||||||
|
|
||||||
/*! \class ALTTPFile
|
/*! \class ALTTPFile
|
||||||
* \brief A Link to the Past data container class
|
* \brief A Link to the Past data container class class
|
||||||
*
|
*
|
||||||
* Contains all relevant data for an A Link to the Past
|
* Contains all relevant data for an A Link to the Past
|
||||||
* SRM file.
|
* SRM file.
|
||||||
|
|
@ -84,4 +87,5 @@ private:
|
||||||
std::vector<ALTTPQuest*> m_backup;
|
std::vector<ALTTPQuest*> m_backup;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif // __ALTTP_FILE_HPP__
|
#endif // __ALTTP_FILE_HPP__
|
||||||
|
|
|
||||||
|
|
@ -21,14 +21,38 @@
|
||||||
#include "BinaryReader.hpp"
|
#include "BinaryReader.hpp"
|
||||||
#include "ALTTPQuest.hpp"
|
#include "ALTTPQuest.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
/*! \class ALTTPFileReader
|
||||||
|
* \brief A Link to the Past save data reader class
|
||||||
|
*
|
||||||
|
* A Class for reading binary data from an ALTTP Save File,
|
||||||
|
* all work is done using a memory buffer, and not read directly from the disk.
|
||||||
|
* \sa BinaryReader
|
||||||
|
*/
|
||||||
class ALTTPFile;
|
class ALTTPFile;
|
||||||
|
|
||||||
class ALTTPFileReader : public BinaryReader
|
class ALTTPFileReader : public io::BinaryReader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/*! \brief This constructor takes an existing buffer to read from.
|
||||||
|
*
|
||||||
|
* \param data The existing buffer
|
||||||
|
* \param length The length of the existing buffer
|
||||||
|
*/
|
||||||
ALTTPFileReader(Uint8*, Uint64);
|
ALTTPFileReader(Uint8*, Uint64);
|
||||||
|
|
||||||
|
/*! \brief This constructor creates an instance from a file on disk.
|
||||||
|
*
|
||||||
|
* \param filename The file to create the stream from
|
||||||
|
*/
|
||||||
ALTTPFileReader(const std::string&);
|
ALTTPFileReader(const std::string&);
|
||||||
|
|
||||||
|
/*! \brief Reads the SRAM data from the buffer
|
||||||
|
*
|
||||||
|
* \return ALTTPFile* SRAM data
|
||||||
|
*/
|
||||||
ALTTPFile* readFile();
|
ALTTPFile* readFile();
|
||||||
private:
|
private:
|
||||||
ALTTPRoomFlags* readRoomFlags();
|
ALTTPRoomFlags* readRoomFlags();
|
||||||
|
|
@ -36,4 +60,5 @@ private:
|
||||||
ALTTPDungeonItemFlags readDungeonFlags();
|
ALTTPDungeonItemFlags readDungeonFlags();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif // __ALTTP_FILE_READER_HPP__
|
#endif // __ALTTP_FILE_READER_HPP__
|
||||||
|
|
|
||||||
|
|
@ -21,15 +21,40 @@
|
||||||
#include <BinaryWriter.hpp>
|
#include <BinaryWriter.hpp>
|
||||||
#include "ALTTPQuest.hpp"
|
#include "ALTTPQuest.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
class ALTTPFile;
|
class ALTTPFile;
|
||||||
|
|
||||||
class ALTTPFileWriter : public BinaryWriter
|
/*! \class ALTTPFileWriter
|
||||||
|
* \brief A Link to the Past save data writer class
|
||||||
|
*
|
||||||
|
* A Class for writing binary data to an ALTTP Save File,
|
||||||
|
* all work is done using a memory buffer, and not written directly to the disk.
|
||||||
|
* \sa BinaryReader
|
||||||
|
*/
|
||||||
|
class ALTTPFileWriter : public io::BinaryWriter
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/*! \brief This constructor takes an existing buffer to write to.
|
||||||
|
*
|
||||||
|
* \param data The existing buffer
|
||||||
|
* \param length The length of the existing buffer
|
||||||
|
*/
|
||||||
ALTTPFileWriter(Uint8*, Uint64);
|
ALTTPFileWriter(Uint8*, Uint64);
|
||||||
|
|
||||||
|
/*! \brief This constructor creates an instance from a file on disk.
|
||||||
|
*
|
||||||
|
* \param filename The file to create the stream from
|
||||||
|
*/
|
||||||
ALTTPFileWriter(const std::string&);
|
ALTTPFileWriter(const std::string&);
|
||||||
|
|
||||||
|
/*! \brief Writes the given SRAM data to a file on disk
|
||||||
|
*
|
||||||
|
* \param file SRAM data to right
|
||||||
|
*/
|
||||||
void writeFile(ALTTPFile* file);
|
void writeFile(ALTTPFile* file);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void writeRoomFlags(ALTTPRoomFlags*);
|
void writeRoomFlags(ALTTPRoomFlags*);
|
||||||
void writeOverworldEvent(ALTTPOverworldEvent*);
|
void writeOverworldEvent(ALTTPOverworldEvent*);
|
||||||
|
|
@ -37,4 +62,6 @@ private:
|
||||||
Uint16 calculateChecksum(Uint32 game);
|
Uint16 calculateChecksum(Uint32 game);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
||||||
#endif // __ALTTP_FILE_WRITER_HPP__
|
#endif // __ALTTP_FILE_WRITER_HPP__
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,9 @@
|
||||||
#include "ALTTPStructs.hpp"
|
#include "ALTTPStructs.hpp"
|
||||||
#include "ALTTPEnums.hpp"
|
#include "ALTTPEnums.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
/*! \class ALTTPQuest
|
/*! \class ALTTPQuest
|
||||||
* \brief A Link to the Past Quest container class
|
* \brief A Link to the Past Quest container class
|
||||||
*
|
*
|
||||||
|
|
@ -31,146 +34,607 @@
|
||||||
class ALTTPQuest
|
class ALTTPQuest
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/*!
|
||||||
|
* \brief ALTTPQuest
|
||||||
|
*/
|
||||||
ALTTPQuest();
|
ALTTPQuest();
|
||||||
~ALTTPQuest();
|
~ALTTPQuest();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setRoomFlags
|
||||||
|
* \param flags
|
||||||
|
*/
|
||||||
void setRoomFlags(std::vector<ALTTPRoomFlags*> flags);
|
void setRoomFlags(std::vector<ALTTPRoomFlags*> flags);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setRoomFlags
|
||||||
|
* \param rf
|
||||||
|
* \param id
|
||||||
|
*/
|
||||||
void setRoomFlags(ALTTPRoomFlags* rf, Uint32 id);
|
void setRoomFlags(ALTTPRoomFlags* rf, Uint32 id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief roomFlags
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::vector<ALTTPRoomFlags*> roomFlags();
|
std::vector<ALTTPRoomFlags*> roomFlags();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief roomFlags
|
||||||
|
* \param id
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPRoomFlags* roomFlags(Uint32 id);
|
ALTTPRoomFlags* roomFlags(Uint32 id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setOverworldEvents
|
||||||
|
* \param events
|
||||||
|
*/
|
||||||
void setOverworldEvents(std::vector<ALTTPOverworldEvent*> events);
|
void setOverworldEvents(std::vector<ALTTPOverworldEvent*> events);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setOverworldEvents
|
||||||
|
* \param ow
|
||||||
|
* \param id
|
||||||
|
*/
|
||||||
void setOverworldEvents(ALTTPOverworldEvent* ow, Uint32 id);
|
void setOverworldEvents(ALTTPOverworldEvent* ow, Uint32 id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief overworldEvents
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::vector<ALTTPOverworldEvent*> overworldEvents() const;
|
std::vector<ALTTPOverworldEvent*> overworldEvents() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief overworldEvent
|
||||||
|
* \param id
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPOverworldEvent* overworldEvent(Uint32 id) const;
|
ALTTPOverworldEvent* overworldEvent(Uint32 id) const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setInventory
|
||||||
|
* \param inv
|
||||||
|
*/
|
||||||
void setInventory(ALTTPInventory* inv);
|
void setInventory(ALTTPInventory* inv);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief inventory
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPInventory* inventory() const;
|
ALTTPInventory* inventory() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setRupeeMax
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setRupeeMax(Uint16 val);
|
void setRupeeMax(Uint16 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief rupeeMax
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 rupeeMax() const;
|
Uint16 rupeeMax() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setRupeeCurrent
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setRupeeCurrent(Uint16 val);
|
void setRupeeCurrent(Uint16 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief rupeeCurrent
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 rupeeCurrent() const;
|
Uint16 rupeeCurrent() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setCompasses
|
||||||
|
* \param flags
|
||||||
|
*/
|
||||||
void setCompasses(ALTTPDungeonItemFlags flags);
|
void setCompasses(ALTTPDungeonItemFlags flags);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief compasses
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPDungeonItemFlags compasses() const;
|
ALTTPDungeonItemFlags compasses() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setBigKeys
|
||||||
|
* \param flags
|
||||||
|
*/
|
||||||
void setBigKeys(ALTTPDungeonItemFlags flags);
|
void setBigKeys(ALTTPDungeonItemFlags flags);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief bigKeys
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPDungeonItemFlags bigKeys() const;
|
ALTTPDungeonItemFlags bigKeys() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setDungeonMaps
|
||||||
|
* \param flags
|
||||||
|
*/
|
||||||
void setDungeonMaps(ALTTPDungeonItemFlags flags);
|
void setDungeonMaps(ALTTPDungeonItemFlags flags);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief dungeonMaps
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPDungeonItemFlags dungeonMaps() const;
|
ALTTPDungeonItemFlags dungeonMaps() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setWishingPond
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setWishingPond(Uint16 val);
|
void setWishingPond(Uint16 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief wishingPond
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 wishingPond() const;
|
Uint16 wishingPond() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setHealthMax
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setHealthMax(Uint8 val);
|
void setHealthMax(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief healthMax
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 healthMax() const;
|
Uint8 healthMax() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setHealth
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setHealth(Uint8 val);
|
void setHealth(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief health
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 health() const;
|
Uint8 health() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setMagicPower
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setMagicPower(Uint8 val);
|
void setMagicPower(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief magicPower
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 magicPower() const;
|
Uint8 magicPower() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setKeys
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setKeys(Uint8 val);
|
void setKeys(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief keys
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 keys() const;
|
Uint8 keys() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setBombUpgrades
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setBombUpgrades(Uint8 val);
|
void setBombUpgrades(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief bombUpgrades
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 bombUpgrades() const;
|
Uint8 bombUpgrades() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setArrowUpgrades
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setArrowUpgrades(Uint8 val);
|
void setArrowUpgrades(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief arrowUpgrades
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 arrowUpgrades() const;
|
Uint8 arrowUpgrades() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setHealthFiller
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setHealthFiller(Uint8 val);
|
void setHealthFiller(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief healthFiller
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 healthFiller() const;
|
Uint8 healthFiller() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setMagicFiller
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setMagicFiller(Uint8 val);
|
void setMagicFiller(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief magicFiller
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 magicFiller() const;
|
Uint8 magicFiller() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setPendants
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setPendants(ALTTPPendants val);
|
void setPendants(ALTTPPendants val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief pendants
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPPendants pendants() const;
|
ALTTPPendants pendants() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setBombFiller
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setBombFiller(Uint8 val);
|
void setBombFiller(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief bombFiller
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 bombFiller() const;
|
Uint8 bombFiller() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setArrowFiller
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setArrowFiller(Uint8 val);
|
void setArrowFiller(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief arrowFiller
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 arrowFiller() const;
|
Uint8 arrowFiller() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setArrows
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setArrows(Uint8 val);
|
void setArrows(Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief arrows
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 arrows() const;
|
Uint8 arrows() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setAbilityFlags
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setAbilityFlags(ALTTPAbilities val);
|
void setAbilityFlags(ALTTPAbilities val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief abilityFlags
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPAbilities abilityFlags() const;
|
ALTTPAbilities abilityFlags() const;
|
||||||
|
|
||||||
void setCrystals(ALTTPCrystals val);
|
/*!
|
||||||
|
* \brief setCrystals
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
|
void setCrystals(ALTTPCrystals val);\
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief crystals
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPCrystals crystals() const;
|
ALTTPCrystals crystals() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setMagicUsage
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setMagicUsage(ALTTPMagicUsage val);
|
void setMagicUsage(ALTTPMagicUsage val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief magicUsage
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPMagicUsage magicUsage() const;
|
ALTTPMagicUsage magicUsage() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setDungeonKeys
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setDungeonKeys(std::vector<Uint8> val);
|
void setDungeonKeys(std::vector<Uint8> val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setDungeonKeys
|
||||||
|
* \param id
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setDungeonKeys(Uint32 id, Uint8 val);
|
void setDungeonKeys(Uint32 id, Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief dungeonKeys
|
||||||
|
* \param id
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 dungeonKeys(Uint32 id) const;
|
Uint8 dungeonKeys(Uint32 id) const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief dungeonCount
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint32 dungeonCount() const;
|
Uint32 dungeonCount() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setProgressIndicator
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setProgressIndicator(ALTTPProgressIndicator val);
|
void setProgressIndicator(ALTTPProgressIndicator val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief progressIndicator
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPProgressIndicator progressIndicator() const;
|
ALTTPProgressIndicator progressIndicator() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setProgressFlags1
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setProgressFlags1(ALTTPProgressFlags1 val);
|
void setProgressFlags1(ALTTPProgressFlags1 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief progressFlags1
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPProgressFlags1 progressFlags1() const;
|
ALTTPProgressFlags1 progressFlags1() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setMapIcon
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setMapIcon(ALTTPMapIcon val);
|
void setMapIcon(ALTTPMapIcon val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief mapIcon
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPMapIcon mapIcon() const;
|
ALTTPMapIcon mapIcon() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setStartLocation
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setStartLocation(ALTTPStartLocation val);
|
void setStartLocation(ALTTPStartLocation val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief startLocation
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPStartLocation startLocation() const;
|
ALTTPStartLocation startLocation() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setProgressFlags2
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setProgressFlags2(ALTTPProgressFlags2 val);
|
void setProgressFlags2(ALTTPProgressFlags2 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief progressFlags2
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPProgressFlags2 progressFlags2() const;
|
ALTTPProgressFlags2 progressFlags2() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setLightDarkWorldIndicator
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setLightDarkWorldIndicator(ALTTPLightDarkWorldIndicator val);
|
void setLightDarkWorldIndicator(ALTTPLightDarkWorldIndicator val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief lightDarkWorldIndicator
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPLightDarkWorldIndicator lightDarkWorldIndicator() const;
|
ALTTPLightDarkWorldIndicator lightDarkWorldIndicator() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setTagAlong
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setTagAlong(ALTTPTagAlong val);
|
void setTagAlong(ALTTPTagAlong val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief tagAlong
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
ALTTPTagAlong tagAlong() const;
|
ALTTPTagAlong tagAlong() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setOldManFlags
|
||||||
|
* \param flags
|
||||||
|
*/
|
||||||
void setOldManFlags(std::vector<Uint8> flags);
|
void setOldManFlags(std::vector<Uint8> flags);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setOldManFlag
|
||||||
|
* \param id
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setOldManFlag(Uint32 id, Uint8 val);
|
void setOldManFlag(Uint32 id, Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief oldManFlag
|
||||||
|
* \param id
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 oldManFlag(Uint32 id);
|
Uint8 oldManFlag(Uint32 id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief oldManFlagCount
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint32 oldManFlagCount() const;
|
Uint32 oldManFlagCount() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setBombFlag
|
||||||
|
* \param flag
|
||||||
|
*/
|
||||||
void setBombFlag(Uint8 flag);
|
void setBombFlag(Uint8 flag);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief bombFlag
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 bombFlag() const;
|
Uint8 bombFlag() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setUnknown1
|
||||||
|
* \param flags
|
||||||
|
*/
|
||||||
void setUnknown1(std::vector<Uint8> flags);
|
void setUnknown1(std::vector<Uint8> flags);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setUnknown1
|
||||||
|
* \param id
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setUnknown1(Uint32 id, Uint8 val);
|
void setUnknown1(Uint32 id, Uint8 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief unknown1
|
||||||
|
* \param id
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 unknown1(Uint32 id);
|
Uint8 unknown1(Uint32 id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief unknown1Count
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint32 unknown1Count() const;
|
Uint32 unknown1Count() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setPlayerName
|
||||||
|
* \param playerName
|
||||||
|
*/
|
||||||
void setPlayerName(std::vector<Uint16> playerName);
|
void setPlayerName(std::vector<Uint16> playerName);
|
||||||
|
/*!
|
||||||
|
* \brief setPlayerName
|
||||||
|
* \param playerName
|
||||||
|
*/
|
||||||
void setPlayerName(const std::string& playerName);
|
void setPlayerName(const std::string& playerName);
|
||||||
|
/*!
|
||||||
|
* \brief playerName
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::vector<Uint16> playerName() const;
|
std::vector<Uint16> playerName() const;
|
||||||
|
/*!
|
||||||
|
* \brief playerNameToString
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::string playerNameToString() const;
|
std::string playerNameToString() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setValid
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setValid(bool val);
|
void setValid(bool val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief valid
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
bool valid();
|
bool valid();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setDungeonDeathTotals
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setDungeonDeathTotals(std::vector<Uint16> val);
|
void setDungeonDeathTotals(std::vector<Uint16> val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setDungeonDeathTotal
|
||||||
|
* \param id
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setDungeonDeathTotal(Uint32 id, Uint16 val);
|
void setDungeonDeathTotal(Uint32 id, Uint16 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief dungeonDeathTotal
|
||||||
|
* \param id
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 dungeonDeathTotal(Uint32 id) const;
|
Uint16 dungeonDeathTotal(Uint32 id) const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief dungeonDeathTotalCount
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 dungeonDeathTotalCount() const;
|
Uint16 dungeonDeathTotalCount() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setUnknown2
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setUnknown2(Uint16 val);
|
void setUnknown2(Uint16 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief unknown2
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 unknown2() const;
|
Uint16 unknown2() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setDeathSaveCount
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setDeathSaveCount(Uint16 val);
|
void setDeathSaveCount(Uint16 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief deathSaveCount
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 deathSaveCount() const;
|
Uint16 deathSaveCount() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setPostGameDeathCounter
|
||||||
|
* \param val
|
||||||
|
*/
|
||||||
void setPostGameDeathCounter(Int16 val);
|
void setPostGameDeathCounter(Int16 val);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief postGameDeathCounter
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Int16 postGameDeathCounter() const;
|
Int16 postGameDeathCounter() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setChecksum
|
||||||
|
* \param checksum
|
||||||
|
*/
|
||||||
void setChecksum(Uint16 checksum);
|
void setChecksum(Uint16 checksum);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief checksum
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 checksum() const;
|
Uint16 checksum() const;
|
||||||
private:
|
private:
|
||||||
std::vector<ALTTPRoomFlags*> m_roomFlags;
|
std::vector<ALTTPRoomFlags*> m_roomFlags;
|
||||||
|
|
@ -217,5 +681,6 @@ private:
|
||||||
Uint16 m_checksum;
|
Uint16 m_checksum;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
||||||
#endif // __ALTTP_QUEST_HPP__
|
#endif // __ALTTP_QUEST_HPP__
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,14 @@
|
||||||
#ifndef __ALTTP_STRUCTS_HPP__
|
#ifndef __ALTTP_STRUCTS_HPP__
|
||||||
#define __ALTTP_STRUCTS_HPP__
|
#define __ALTTP_STRUCTS_HPP__
|
||||||
|
|
||||||
|
#ifndef __DOXYGEN_IGNORE__
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "Types.hpp"
|
#include "Types.hpp"
|
||||||
|
|
||||||
/*! \struct ALTTPRoomFlags
|
namespace zelda
|
||||||
*/
|
{
|
||||||
|
|
||||||
struct ALTTPRoomFlags
|
struct ALTTPRoomFlags
|
||||||
{
|
{
|
||||||
bool Chest1:1;
|
bool Chest1:1;
|
||||||
|
|
@ -41,8 +44,6 @@ struct ALTTPRoomFlags
|
||||||
bool ChestOrTile:1;
|
bool ChestOrTile:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*! \struct ALTTPOverworldEvent
|
|
||||||
*/
|
|
||||||
struct ALTTPOverworldEvent
|
struct ALTTPOverworldEvent
|
||||||
{
|
{
|
||||||
bool Unused1:1;
|
bool Unused1:1;
|
||||||
|
|
@ -55,8 +56,6 @@ struct ALTTPOverworldEvent
|
||||||
bool Unused5:1;
|
bool Unused5:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*! \struct ALTTPInventory
|
|
||||||
*/
|
|
||||||
struct ALTTPInventory
|
struct ALTTPInventory
|
||||||
{
|
{
|
||||||
char Bow;
|
char Bow;
|
||||||
|
|
@ -88,12 +87,6 @@ struct ALTTPInventory
|
||||||
char Shield;
|
char Shield;
|
||||||
char Armor;
|
char Armor;
|
||||||
char BottleTypes[4];
|
char BottleTypes[4];
|
||||||
|
|
||||||
std::string bowType();
|
|
||||||
std::string boomerangType();
|
|
||||||
std::string magicType();
|
|
||||||
std::string armorType();
|
|
||||||
std::string bottleType(Uint32);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*! \struct ALTTPLightDarkWorldIndicator
|
/*! \struct ALTTPLightDarkWorldIndicator
|
||||||
|
|
@ -204,4 +197,7 @@ struct ALTTPProgressFlags2
|
||||||
bool SmithsHaveSword:1;
|
bool SmithsHaveSword:1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // __DOXYGEN_IGNORE__
|
||||||
#endif // __ALTTP_STRUCTS_HPP__
|
#endif // __ALTTP_STRUCTS_HPP__
|
||||||
|
|
|
||||||
|
|
@ -12,12 +12,17 @@
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
#ifndef __BINARYREADER_HPP__
|
#ifndef __BINARYREADER_HPP__
|
||||||
#define __BINARYREADER_HPP__
|
#define __BINARYREADER_HPP__
|
||||||
|
|
||||||
#include "Stream.hpp"
|
#include "Stream.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
/*! \class BinaryReader
|
/*! \class BinaryReader
|
||||||
* \brief A Stream class for reading binary data
|
* \brief A Stream class for reading binary data
|
||||||
*
|
*
|
||||||
|
|
@ -139,6 +144,13 @@ public:
|
||||||
*/
|
*/
|
||||||
std::string readUnicode();
|
std::string readUnicode();
|
||||||
|
|
||||||
|
/*! \brief Reads a string and advances the position in the file
|
||||||
|
*
|
||||||
|
* \return std::string The value at the current address
|
||||||
|
* \throw IOException when address is out of range
|
||||||
|
*/
|
||||||
|
std::string readString();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/*! \brief Overload of isOpenForWriting in Stream
|
/*! \brief Overload of isOpenForWriting in Stream
|
||||||
*
|
*
|
||||||
|
|
@ -155,7 +167,14 @@ protected:
|
||||||
* \throw IOException
|
* \throw IOException
|
||||||
*/
|
*/
|
||||||
void writeBytes(Int8*, Int64);
|
void writeBytes(Int8*, Int64);
|
||||||
std::string m_filepath;
|
std::string m_filepath; //!< Path to the target file
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#ifndef BINARYREADER_BASE
|
||||||
|
#define BINARYREADER_BASE \
|
||||||
|
private: \
|
||||||
|
typedef zelda::io::BinaryReader base;
|
||||||
|
#endif // BINARYREADER_BASE
|
||||||
|
#endif // __BINARYREADER_HPP__
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,11 @@
|
||||||
#include "Stream.hpp"
|
#include "Stream.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
|
|
||||||
/*! \class BinaryWriter
|
/*! \class BinaryWriter
|
||||||
* \brief A Stream class for writing binary data
|
* \brief A Stream class for writing binary data
|
||||||
*
|
*
|
||||||
|
|
@ -136,8 +141,15 @@ public:
|
||||||
protected:
|
protected:
|
||||||
Int8 readByte();
|
Int8 readByte();
|
||||||
Int8* readBytes(Int64);
|
Int8* readBytes(Int64);
|
||||||
bool isOpenForReading();
|
bool isOpenForReading(); //!< Overridden from \sa Stream
|
||||||
std::string m_filepath;
|
std::string m_filepath; //!< Path to the target file
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#ifndef BINARYWRITER_BASE
|
||||||
|
#define BINARYWRITER_BASE \
|
||||||
|
private: \
|
||||||
|
typedef zelda::io::BinaryWriter base;
|
||||||
|
#endif // BINARYWRITER_BASE
|
||||||
|
#endif // __BINARY_WRITER_HPP__
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
/*! \class Exception
|
/*! \class Exception
|
||||||
* \brief The baseclass for all Exceptions.
|
* \brief The baseclass for all Exceptions.
|
||||||
*
|
*
|
||||||
|
|
@ -33,7 +36,7 @@ public:
|
||||||
inline Exception(const std::string& message) :
|
inline Exception(const std::string& message) :
|
||||||
m_message(message)
|
m_message(message)
|
||||||
{
|
{
|
||||||
};
|
}
|
||||||
|
|
||||||
/*! \brief Returns the Error message of the exception
|
/*! \brief Returns the Error message of the exception
|
||||||
* \return std::string The error message
|
* \return std::string The error message
|
||||||
|
|
@ -41,9 +44,10 @@ public:
|
||||||
inline std::string message() const
|
inline std::string message() const
|
||||||
{
|
{
|
||||||
return m_message;
|
return m_message;
|
||||||
};
|
}
|
||||||
protected:
|
protected:
|
||||||
std::string m_message;
|
std::string m_message; //!< The error message string
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@
|
||||||
|
|
||||||
#include "Exception.hpp"
|
#include "Exception.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
/*! \class FileNotFoundException
|
/*! \class FileNotFoundException
|
||||||
* \brief An excpeption thrown when a file could not be found at the given path.
|
* \brief An excpeption thrown when a file could not be found at the given path.
|
||||||
*
|
*
|
||||||
|
|
@ -45,4 +48,6 @@ private:
|
||||||
std::string m_filename;
|
std::string m_filename;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,9 @@
|
||||||
#include "Exception.hpp"
|
#include "Exception.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
/*! \class IOException
|
/*! \class IOException
|
||||||
* \brief An excpeption thrown on inappropriate IO calls.
|
* \brief An excpeption thrown on inappropriate IO calls.
|
||||||
*
|
*
|
||||||
|
|
@ -40,4 +43,5 @@ public:
|
||||||
{};
|
{};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,10 @@
|
||||||
#define __INVALID_OPERATION_EXCEPTION_HPP__
|
#define __INVALID_OPERATION_EXCEPTION_HPP__
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <Exception.hpp>
|
#include "Exception.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
/*! \class InvalidOperationException
|
/*! \class InvalidOperationException
|
||||||
* \brief An excpeption thrown on Invalid Operations calls.
|
* \brief An excpeption thrown on Invalid Operations calls.
|
||||||
|
|
@ -39,4 +42,7 @@ public:
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
||||||
#endif // __INVALID_OPERATION_EXCEPTION_HPP__
|
#endif // __INVALID_OPERATION_EXCEPTION_HPP__
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
// This file is part of libZelda.
|
||||||
|
//
|
||||||
|
// libZelda is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// libZelda is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
|
#ifndef __MCFILE_HPP__
|
||||||
|
#define __MCFILE_HPP__
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
/*! \class MCFile
|
||||||
|
* \brief The Minish Cap data container class class
|
||||||
|
*
|
||||||
|
* Contains all relevant data for a The Minish Cap save,
|
||||||
|
* file.
|
||||||
|
*/
|
||||||
|
class MCFile
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
MCFile();
|
||||||
|
private:
|
||||||
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
#endif // __MCFILE_HPP__
|
||||||
|
|
@ -0,0 +1,62 @@
|
||||||
|
// This file is part of libZelda.
|
||||||
|
//
|
||||||
|
// libZelda is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// libZelda is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
|
#ifndef __MCFILEREADER_HPP__
|
||||||
|
#define __MCFILEREADER_HPP__
|
||||||
|
|
||||||
|
#include "Types.hpp"
|
||||||
|
#include "BinaryReader.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
class MCFile;
|
||||||
|
|
||||||
|
/*! \class MCFileReader
|
||||||
|
* \brief The Minish Cap Save save data reader class
|
||||||
|
*
|
||||||
|
* A Class for reading binary data from a The Minish Cap Save File,
|
||||||
|
* all work is done using a memory buffer, and not read directly from the disk.
|
||||||
|
* \sa BinaryReader
|
||||||
|
*/
|
||||||
|
class MCFileReader : public io::BinaryReader
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
/*!
|
||||||
|
* \brief This constructor takes an existing buffer to read from.
|
||||||
|
*
|
||||||
|
* \param data The existing buffer
|
||||||
|
* \param length The length of the existing buffer
|
||||||
|
*/
|
||||||
|
MCFileReader(Uint8*, Uint64);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief This constructor creates an instance from a file on disk.
|
||||||
|
*
|
||||||
|
* \param filename The file to create the stream from
|
||||||
|
*/
|
||||||
|
MCFileReader(const std::string&);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Reads the save data from the buffer
|
||||||
|
*
|
||||||
|
* \return MCFile* SRAM data
|
||||||
|
*/
|
||||||
|
MCFile* readFile();
|
||||||
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
||||||
|
#endif // __MCFILEREADER_HPP__
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
// This file is part of libZelda.
|
||||||
|
//
|
||||||
|
// libZelda is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// libZelda is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
|
#ifndef __MCFILEWRITER_HPP__
|
||||||
|
#define __MCFILEWRITER_HPP__
|
||||||
|
|
||||||
|
#include "Types.hpp"
|
||||||
|
#include "BinaryWriter.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
class MCFile;
|
||||||
|
|
||||||
|
/*! \class MCFileWriter
|
||||||
|
* \brief The Minish Cap Save save data writer class
|
||||||
|
*
|
||||||
|
* A Class for writing binary data to a The Minish Cap Save File,
|
||||||
|
* all work is done using a memory buffer, and not written directly from the disk.
|
||||||
|
* \sa BinaryWriter
|
||||||
|
*/
|
||||||
|
class MCFileWriter : public io::BinaryWriter
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
/*!
|
||||||
|
* \brief This constructor takes an existing buffer to write to.
|
||||||
|
*
|
||||||
|
* \param data The existing buffer
|
||||||
|
* \param length The length of the existing buffer
|
||||||
|
*/
|
||||||
|
MCFileWriter(Uint8*, Uint64);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief This constructor creates an instance from a file on disk.
|
||||||
|
*
|
||||||
|
* \param filename The file to create the stream from
|
||||||
|
*/
|
||||||
|
MCFileWriter(const std::string&);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Writes the given save data to a file on disk
|
||||||
|
*
|
||||||
|
* \param file Save data to write
|
||||||
|
*/
|
||||||
|
void writeFile(MCFile* file);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Uint16 calculateSlotChecksum(Uint32 game);
|
||||||
|
Uint16 calculateChecksum(Uint8* data, Uint32 length);
|
||||||
|
Uint8* reverse(Uint8* data, Uint32 length);
|
||||||
|
void unscramble();
|
||||||
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
||||||
|
#endif // __MCFILEWRITER_HPP__
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
#ifndef __MAINPAGE_HPP__
|
#ifndef __MAINPAGE_HPP__
|
||||||
#define __MAINPAGE_HPP__
|
#define __MAINPAGE_HPP__
|
||||||
|
|
||||||
|
|
@ -22,7 +23,7 @@
|
||||||
* <br />
|
* <br />
|
||||||
* libZelda provides several basic classes that can be used to read from
|
* libZelda provides several basic classes that can be used to read from
|
||||||
* and write to files, and memory, classes such as Stream, BinaryReader, BinaryWriter,
|
* and write to files, and memory, classes such as Stream, BinaryReader, BinaryWriter,
|
||||||
* and the currently work in progress TextStream.
|
* and TextStream.
|
||||||
* \section example_sec BinaryWriter example
|
* \section example_sec BinaryWriter example
|
||||||
* \code
|
* \code
|
||||||
* #include "BinaryWriter.hpp"
|
* #include "BinaryWriter.hpp"
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,11 @@
|
||||||
|
|
||||||
#include "Types.hpp"
|
#include "Types.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
|
|
||||||
/*! \class Stream
|
/*! \class Stream
|
||||||
* \brief Stream is the main class all streams inherit from
|
* \brief Stream is the main class all streams inherit from
|
||||||
*
|
*
|
||||||
|
|
@ -35,17 +40,6 @@ public:
|
||||||
//! \brief Default buffer block size.
|
//! \brief Default buffer block size.
|
||||||
static const Uint32 BLOCKSZ;
|
static const Uint32 BLOCKSZ;
|
||||||
|
|
||||||
/*! \enum Endian
|
|
||||||
* \brief Allows the user to specify the Endianness of the stream buffer.<br />
|
|
||||||
* The proper actions are automatically taken depending on platform and
|
|
||||||
* buffer settings
|
|
||||||
*/
|
|
||||||
enum Endian
|
|
||||||
{
|
|
||||||
LittleEndian, //!< Specifies that the Stream is Little Endian (LSB)
|
|
||||||
BigEndian //!< Specifies that the Stream is Big Endian (MSB)
|
|
||||||
};
|
|
||||||
|
|
||||||
/*! \enum SeekOrigin
|
/*! \enum SeekOrigin
|
||||||
* \brief Specifies how to seek in a stream.
|
* \brief Specifies how to seek in a stream.
|
||||||
*/
|
*/
|
||||||
|
|
@ -56,7 +50,6 @@ public:
|
||||||
End //!< Tells the Stream to seek from the End of the buffer.
|
End //!< Tells the Stream to seek from the End of the buffer.
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*! \brief The default constructor
|
/*! \brief The default constructor
|
||||||
*/
|
*/
|
||||||
Stream();
|
Stream();
|
||||||
|
|
@ -87,6 +80,11 @@ public:
|
||||||
* \throw IOException
|
* \throw IOException
|
||||||
*/
|
*/
|
||||||
virtual void writeBit(bool val);
|
virtual void writeBit(bool val);
|
||||||
|
/*! \brief Writes a byte at the current position and advances the position by one byte.
|
||||||
|
* \param byte The value to write
|
||||||
|
* \throw IOException
|
||||||
|
*/
|
||||||
|
virtual void writeUByte(Uint8 byte);
|
||||||
|
|
||||||
/*! \brief Writes a byte at the current position and advances the position by one byte.
|
/*! \brief Writes a byte at the current position and advances the position by one byte.
|
||||||
* \param byte The value to write
|
* \param byte The value to write
|
||||||
|
|
@ -94,6 +92,15 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void writeByte(Int8 byte);
|
virtual void writeByte(Int8 byte);
|
||||||
|
|
||||||
|
/*! \brief Writes the given buffer with the specified length, buffers can be bigger than the length
|
||||||
|
* however it's undefined behavior to try and write a buffer which is smaller than the given length.
|
||||||
|
*
|
||||||
|
* \param data The buffer to write
|
||||||
|
* \param length The amount to write
|
||||||
|
* \throw IOException
|
||||||
|
*/
|
||||||
|
virtual void writeUBytes(Uint8* data, Int64 length);
|
||||||
|
|
||||||
/*! \brief Writes the given buffer with the specified length, buffers can be bigger than the length
|
/*! \brief Writes the given buffer with the specified length, buffers can be bigger than the length
|
||||||
* however it's undefined behavior to try and write a buffer which is smaller than the given length.
|
* however it's undefined behavior to try and write a buffer which is smaller than the given length.
|
||||||
*
|
*
|
||||||
|
|
@ -212,7 +219,7 @@ public:
|
||||||
*
|
*
|
||||||
* \return Endian The current Stream Endianess
|
* \return Endian The current Stream Endianess
|
||||||
*/
|
*/
|
||||||
Endian endianness() const;
|
Endian endian() const;
|
||||||
|
|
||||||
|
|
||||||
/*! \brief Returns whether the stream is BigEndian
|
/*! \brief Returns whether the stream is BigEndian
|
||||||
|
|
@ -235,5 +242,6 @@ protected:
|
||||||
Uint8* m_data; //!< The Stream buffer
|
Uint8* m_data; //!< The Stream buffer
|
||||||
bool m_autoResize; //!< Whether the stream is autoresizing
|
bool m_autoResize; //!< Whether the stream is autoresizing
|
||||||
};
|
};
|
||||||
|
} // io
|
||||||
|
} // zelda
|
||||||
#endif // __STREAM_HPP__
|
#endif // __STREAM_HPP__
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,10 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
// TODO (Phil#1#): Need to actually use AccessMode
|
// TODO (Phil#1#): Need to actually use AccessMode
|
||||||
/*! \class TextStream
|
/*! \class TextStream
|
||||||
* \brief A Class for reading or writing Text data.
|
* \brief A Class for reading or writing Text data.
|
||||||
|
|
@ -154,5 +158,6 @@ private:
|
||||||
Uint32 m_currentLine;
|
Uint32 m_currentLine;
|
||||||
Uint32 m_startLength;
|
Uint32 m_startLength;
|
||||||
};
|
};
|
||||||
|
} // io
|
||||||
|
} // zelda
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,17 @@
|
||||||
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
|
/*! \enum Endian
|
||||||
|
* \brief Allows the user to specify the Endianness of data.<br />
|
||||||
|
* The proper actions are automatically taken depending on platform and
|
||||||
|
* buffer settings
|
||||||
|
*/
|
||||||
|
enum Endian
|
||||||
|
{
|
||||||
|
LittleEndian, //!< Specifies that the Stream is Little Endian (LSB)
|
||||||
|
BigEndian //!< Specifies that the Stream is Big Endian (MSB)
|
||||||
|
};
|
||||||
|
|
||||||
// 8 bits integer types
|
// 8 bits integer types
|
||||||
#if UCHAR_MAX == 0xFF
|
#if UCHAR_MAX == 0xFF
|
||||||
typedef signed char Int8;
|
typedef signed char Int8;
|
||||||
|
|
@ -56,4 +67,12 @@
|
||||||
typedef signed long long Int64;
|
typedef signed long long Int64;
|
||||||
typedef unsigned long long Uint64;
|
typedef unsigned long long Uint64;
|
||||||
|
|
||||||
|
#ifndef NULL
|
||||||
|
#ifdef __cplusplus
|
||||||
|
#define NULL 0
|
||||||
|
#else // __cplusplus
|
||||||
|
#define NULL (void*)0
|
||||||
|
#endif
|
||||||
|
#endif // NULL
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -20,22 +20,67 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <Types.hpp>
|
#include <Types.hpp>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief The WiiImage class
|
||||||
|
*/
|
||||||
class WiiImage
|
class WiiImage
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/*!
|
||||||
|
* \brief WiiImage
|
||||||
|
*/
|
||||||
WiiImage();
|
WiiImage();
|
||||||
|
/*!
|
||||||
|
* \brief WiiImage
|
||||||
|
* \param width
|
||||||
|
* \param height
|
||||||
|
* \param data
|
||||||
|
*/
|
||||||
WiiImage(Uint32 width, Uint32 height, Uint8* data);
|
WiiImage(Uint32 width, Uint32 height, Uint8* data);
|
||||||
~WiiImage();
|
~WiiImage();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setWidth
|
||||||
|
* \param width
|
||||||
|
*/
|
||||||
void setWidth(const Uint32 width);
|
void setWidth(const Uint32 width);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief width
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint32 width() const;
|
Uint32 width() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setHeight
|
||||||
|
* \param height
|
||||||
|
*/
|
||||||
void setHeight(const Uint32 height);
|
void setHeight(const Uint32 height);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief height
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint32 height() const;
|
Uint32 height() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setData
|
||||||
|
* \param data
|
||||||
|
*/
|
||||||
void setData(const Uint8* data);
|
void setData(const Uint8* data);
|
||||||
|
/*!
|
||||||
|
* \brief data
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8* data();
|
Uint8* data();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief toRGBA32 DOES NOT WORK!!! DO NOT USE!!!
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8* toRGBA32();
|
Uint8* toRGBA32();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
@ -44,41 +89,156 @@ private:
|
||||||
Uint8* m_data;
|
Uint8* m_data;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*! \class WiiBanner
|
||||||
|
* \brief Wii banner container class
|
||||||
|
*
|
||||||
|
* Contains all relevant data for a Wii banner.
|
||||||
|
*/
|
||||||
class WiiBanner
|
class WiiBanner
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
enum { NoCopy = 0x00000001, Bounce = 0x00000010, NoCopyBounce = NoCopy | Bounce };
|
enum
|
||||||
|
{
|
||||||
|
NoCopy = 0x00000001,
|
||||||
|
Bounce = 0x00000010,
|
||||||
|
NoCopyBounce = NoCopy | Bounce
|
||||||
|
};
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief WiiBanner
|
||||||
|
*/
|
||||||
WiiBanner();
|
WiiBanner();
|
||||||
|
/*!
|
||||||
|
* \brief WiiBanner
|
||||||
|
* \param gameId
|
||||||
|
* \param title
|
||||||
|
* \param subtitle
|
||||||
|
* \param m_banner
|
||||||
|
* \param icons
|
||||||
|
*/
|
||||||
WiiBanner(Uint32 gameId, const std::string& title, const std::string& subtitle, WiiImage* m_banner, std::vector<WiiImage*> icons);
|
WiiBanner(Uint32 gameId, const std::string& title, const std::string& subtitle, WiiImage* m_banner, std::vector<WiiImage*> icons);
|
||||||
virtual ~WiiBanner();
|
virtual ~WiiBanner();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setGameID
|
||||||
|
* \param id
|
||||||
|
*/
|
||||||
void setGameID(Uint64 id);
|
void setGameID(Uint64 id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief gameID
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint64 gameID() const;
|
Uint64 gameID() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setBannerImage
|
||||||
|
* \param banner
|
||||||
|
*/
|
||||||
void setBannerImage(WiiImage* banner);
|
void setBannerImage(WiiImage* banner);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief bannerImage
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
WiiImage* bannerImage() const;
|
WiiImage* bannerImage() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setBannerSize
|
||||||
|
* \param size
|
||||||
|
*/
|
||||||
void setBannerSize(Uint32 size);
|
void setBannerSize(Uint32 size);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief bannerSize
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint32 bannerSize() const;
|
Uint32 bannerSize() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setTitle
|
||||||
|
* \param title
|
||||||
|
*/
|
||||||
void setTitle(const std::string& title);
|
void setTitle(const std::string& title);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief title
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::string title() const;
|
std::string title() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setSubtitle
|
||||||
|
* \param subtitle
|
||||||
|
*/
|
||||||
void setSubtitle(const std::string& subtitle);
|
void setSubtitle(const std::string& subtitle);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief subtitle
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::string subtitle() const;
|
std::string subtitle() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief addIcon
|
||||||
|
* \param icon
|
||||||
|
*/
|
||||||
void addIcon(WiiImage* icon);
|
void addIcon(WiiImage* icon);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setIcon
|
||||||
|
* \param id
|
||||||
|
* \param icon
|
||||||
|
*/
|
||||||
void setIcon(Uint32 id, WiiImage* icon);
|
void setIcon(Uint32 id, WiiImage* icon);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief getIcon
|
||||||
|
* \param id
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
WiiImage* getIcon(Uint32 id) const;
|
WiiImage* getIcon(Uint32 id) const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief icons
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::vector<WiiImage*> icons() const;
|
std::vector<WiiImage*> icons() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setAnimationSpeed
|
||||||
|
* \param animSpeed
|
||||||
|
*/
|
||||||
void setAnimationSpeed(Uint16 animSpeed);
|
void setAnimationSpeed(Uint16 animSpeed);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief animationSpeed
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint16 animationSpeed() const;
|
Uint16 animationSpeed() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setPermissions
|
||||||
|
* \param permissions
|
||||||
|
*/
|
||||||
void setPermissions(Uint8 permissions);
|
void setPermissions(Uint8 permissions);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief permissions
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 permissions() const;
|
Uint8 permissions() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setFlags
|
||||||
|
* \param flags
|
||||||
|
*/
|
||||||
void setFlags(Uint32 flags);
|
void setFlags(Uint32 flags);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief flags
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint32 flags() const;
|
Uint32 flags() const;
|
||||||
protected:
|
protected:
|
||||||
private:
|
private:
|
||||||
|
|
@ -92,5 +252,6 @@ private:
|
||||||
std::string m_title;
|
std::string m_title;
|
||||||
std::string m_subtitle;
|
std::string m_subtitle;
|
||||||
};
|
};
|
||||||
|
} // zelda
|
||||||
|
|
||||||
#endif // WIIBANNER_H
|
#endif // WIIBANNER_H
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,22 @@
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <Types.hpp>
|
#include <Types.hpp>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
/*! \class WiiFile
|
||||||
|
* \brief Wii file container class
|
||||||
|
*
|
||||||
|
* Contains all relevant data for a file in a data.bin file.
|
||||||
|
*/
|
||||||
class WiiFile
|
class WiiFile
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
/*! \enum Permission
|
||||||
|
* \brief The Wii uses a bastardized unix permissions system so these flags
|
||||||
|
* reflect the file's individual permissions.
|
||||||
|
*/
|
||||||
enum Permission
|
enum Permission
|
||||||
{
|
{
|
||||||
OtherRead = 0x01,
|
OtherRead = 0x01,
|
||||||
|
|
@ -32,11 +45,14 @@ public:
|
||||||
OwnerWrite = 0x20,
|
OwnerWrite = 0x20,
|
||||||
|
|
||||||
// Mask values;
|
// Mask values;
|
||||||
OtherRW = (OtherRead|OtherWrite),
|
OtherRW = (OtherRead|OtherWrite), //!< Mask to get the Other group permissions
|
||||||
GroupRW = (GroupRead|GroupWrite),
|
GroupRW = (GroupRead|GroupWrite),
|
||||||
OwnerRW = (OwnerRead|OwnerWrite)
|
OwnerRW = (OwnerRead|OwnerWrite)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief The Type enum
|
||||||
|
*/
|
||||||
enum Type
|
enum Type
|
||||||
{
|
{
|
||||||
File = 0x01,
|
File = 0x01,
|
||||||
|
|
@ -44,29 +60,104 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
WiiFile();
|
WiiFile();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief WiiFile
|
||||||
|
* \param filename
|
||||||
|
*/
|
||||||
WiiFile(const std::string& filename);
|
WiiFile(const std::string& filename);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief WiiFile
|
||||||
|
* \param filename
|
||||||
|
* \param permissions
|
||||||
|
* \param data
|
||||||
|
* \param length
|
||||||
|
*/
|
||||||
WiiFile(const std::string& filename, Uint8 permissions, const Uint8* data, Uint32 length);
|
WiiFile(const std::string& filename, Uint8 permissions, const Uint8* data, Uint32 length);
|
||||||
virtual ~WiiFile();
|
virtual ~WiiFile();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setFilename
|
||||||
|
* \param filename
|
||||||
|
*/
|
||||||
void setFilename(const std::string& filename);
|
void setFilename(const std::string& filename);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief filename
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::string filename() const;
|
std::string filename() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setData
|
||||||
|
* \param data
|
||||||
|
*/
|
||||||
void setData(const Uint8* data);
|
void setData(const Uint8* data);
|
||||||
|
/*!
|
||||||
|
* \brief data
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8* data() const;
|
Uint8* data() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setLength
|
||||||
|
* \param len
|
||||||
|
*/
|
||||||
void setLength(const int len);
|
void setLength(const int len);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief length
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
int length() const;
|
int length() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setPermissions
|
||||||
|
* \param permissions
|
||||||
|
*/
|
||||||
void setPermissions(const Uint8 permissions);
|
void setPermissions(const Uint8 permissions);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief permissions
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 permissions() const;
|
Uint8 permissions() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setAttributes
|
||||||
|
* \param attr
|
||||||
|
*/
|
||||||
void setAttributes(const Uint8 attr);
|
void setAttributes(const Uint8 attr);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief attributes
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Uint8 attributes() const;
|
Uint8 attributes() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setType
|
||||||
|
* \param type
|
||||||
|
*/
|
||||||
void setType(Type type);
|
void setType(Type type);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief type
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
Type type() const;
|
Type type() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief isDirectory
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
bool isDirectory() const;
|
bool isDirectory() const;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief isFile
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
bool isFile() const;
|
bool isFile() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
@ -79,4 +170,5 @@ private:
|
||||||
Uint8* m_fileData;
|
Uint8* m_fileData;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif // WIIFILE_H
|
#endif // WIIFILE_H
|
||||||
|
|
|
||||||
|
|
@ -19,25 +19,67 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <Types.hpp>
|
#include <Types.hpp>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
class WiiFile;
|
class WiiFile;
|
||||||
class WiiBanner;
|
class WiiBanner;
|
||||||
class WiiImage;
|
class WiiImage;
|
||||||
class BinaryReader;
|
class BinaryReader;
|
||||||
class BinaryWriter;
|
class BinaryWriter;
|
||||||
|
|
||||||
|
/*! \class WiiSave
|
||||||
|
* \brief Wii data.bin container class
|
||||||
|
*
|
||||||
|
* Contains all relevant data for a Wii data.bin file.
|
||||||
|
*/
|
||||||
class WiiSave
|
class WiiSave
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief FileIterator
|
||||||
|
*/
|
||||||
typedef std::unordered_map<std::string, WiiFile*>::const_iterator FileIterator;
|
typedef std::unordered_map<std::string, WiiFile*>::const_iterator FileIterator;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief WiiSave
|
||||||
|
*/
|
||||||
WiiSave();
|
WiiSave();
|
||||||
|
/*!
|
||||||
|
* \brief ~WiiSave
|
||||||
|
*/
|
||||||
virtual ~WiiSave();
|
virtual ~WiiSave();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief addFile
|
||||||
|
* \param filename
|
||||||
|
* \param file
|
||||||
|
*/
|
||||||
void addFile(const std::string& filename, WiiFile* file);
|
void addFile(const std::string& filename, WiiFile* file);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief file
|
||||||
|
* \param filename
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
WiiFile* file(const std::string& filename) const;
|
WiiFile* file(const std::string& filename) const;
|
||||||
|
/*!
|
||||||
|
* \brief fileList
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
std::unordered_map<std::string, WiiFile*>& fileList();
|
std::unordered_map<std::string, WiiFile*>& fileList();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief setBanner
|
||||||
|
* \param banner
|
||||||
|
*/
|
||||||
void setBanner(WiiBanner* banner);
|
void setBanner(WiiBanner* banner);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief banner
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
WiiBanner* banner() const;
|
WiiBanner* banner() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
@ -48,4 +90,5 @@ private:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif // __WII__SAVE_HPP__
|
#endif // __WII__SAVE_HPP__
|
||||||
|
|
|
||||||
|
|
@ -19,17 +19,41 @@
|
||||||
#include <utility.hpp>
|
#include <utility.hpp>
|
||||||
#include <BinaryReader.hpp>
|
#include <BinaryReader.hpp>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
class WiiSave;
|
class WiiSave;
|
||||||
class WiiBanner;
|
class WiiBanner;
|
||||||
class WiiFile;
|
class WiiFile;
|
||||||
class WiiImage;
|
class WiiImage;
|
||||||
|
|
||||||
class WiiSaveReader : public BinaryReader
|
/*! \class WiiSaveReader
|
||||||
|
* \brief Wii data.bin reader class
|
||||||
|
*
|
||||||
|
* A Class for reading binary data from a wii data.bin file,
|
||||||
|
* all work is done using a memory buffer, and not read directly from the disk.
|
||||||
|
* \sa BinaryReader
|
||||||
|
*/
|
||||||
|
class WiiSaveReader : public io::BinaryReader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/*! \brief This constructor takes an existing buffer to read from.
|
||||||
|
*
|
||||||
|
* \param data The existing buffer
|
||||||
|
* \param length The length of the existing buffer
|
||||||
|
*/
|
||||||
WiiSaveReader(const Uint8*, Uint64);
|
WiiSaveReader(const Uint8*, Uint64);
|
||||||
|
|
||||||
|
/*! \brief This constructor creates an instance from a file on disk.
|
||||||
|
*
|
||||||
|
* \param filename The file to create the stream from
|
||||||
|
*/
|
||||||
WiiSaveReader(const std::string&);
|
WiiSaveReader(const std::string&);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief readSave
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
WiiSave* readSave();
|
WiiSave* readSave();
|
||||||
private:
|
private:
|
||||||
WiiBanner* readBanner();
|
WiiBanner* readBanner();
|
||||||
|
|
@ -37,4 +61,6 @@ private:
|
||||||
WiiImage* readImage(Uint32 width, Uint32 height);
|
WiiImage* readImage(Uint32 width, Uint32 height);
|
||||||
void readCerts(Uint32 totalSize);
|
void readCerts(Uint32 totalSize);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif // __WII_SAVE_READER_HPP__
|
#endif // __WII_SAVE_READER_HPP__
|
||||||
|
|
|
||||||
|
|
@ -12,23 +12,49 @@
|
||||||
//
|
//
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
#ifndef __WII_SAVE_WRITER_HPP__
|
#ifndef __WII_SAVE_WRITER_HPP__
|
||||||
#define __WII_SAVE_WRITER_HPP__
|
#define __WII_SAVE_WRITER_HPP__
|
||||||
|
|
||||||
#include <Types.hpp>
|
#include "Types.hpp"
|
||||||
#include <utility.hpp>
|
#include "utility.hpp"
|
||||||
#include <BinaryWriter.hpp>
|
#include "BinaryWriter.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
class WiiSave;
|
class WiiSave;
|
||||||
class WiiBanner;
|
class WiiBanner;
|
||||||
class WiiFile;
|
class WiiFile;
|
||||||
class WiiImage;
|
class WiiImage;
|
||||||
|
|
||||||
class WiiSaveWriter : public BinaryWriter
|
/*! \class WiiSaveWriter
|
||||||
|
* \brief Wii data.bin writer class
|
||||||
|
*
|
||||||
|
* A Class for writing binary data to a wii data.bin file,
|
||||||
|
* all work is done using a memory buffer, and not written directly to the disk.
|
||||||
|
* \sa BinaryReader
|
||||||
|
*/
|
||||||
|
class WiiSaveWriter : public io::BinaryWriter
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/*! \brief This constructor creates an instance from a file on disk.
|
||||||
|
*
|
||||||
|
* \param filename The file to create the stream from
|
||||||
|
*/
|
||||||
WiiSaveWriter(const std::string&);
|
WiiSaveWriter(const std::string&);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief writeSave
|
||||||
|
* \param save
|
||||||
|
* \param macAddress
|
||||||
|
* \param ngId
|
||||||
|
* \param ngPriv
|
||||||
|
* \param ngSig
|
||||||
|
* \param ngKeyId
|
||||||
|
* \param filepath
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
bool writeSave(WiiSave* save, Uint8* macAddress, Uint32 ngId, Uint8* ngPriv, Uint8* ngSig, Uint32 ngKeyId, const std::string& filepath = "");
|
bool writeSave(WiiSave* save, Uint8* macAddress, Uint32 ngId, Uint8* ngPriv, Uint8* ngSig, Uint32 ngKeyId, const std::string& filepath = "");
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
@ -38,4 +64,5 @@ private:
|
||||||
void writeCerts(Uint32 filesSize, Uint32 ngId, Uint8* ngPriv, Uint8* ngSig, Uint32 ngKeyId);
|
void writeCerts(Uint32 filesSize, Uint32 ngId, Uint8* ngPriv, Uint8* ngSig, Uint32 ngKeyId);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // zelda
|
||||||
#endif // __WII_SAVE_WRITER_HPP__
|
#endif // __WII_SAVE_WRITER_HPP__
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,3 @@ void aes_set_key(const Uint8 *key );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif //__AES_H_
|
#endif //__AES_H_
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
#ifndef BN_H
|
#ifndef BN_H
|
||||||
#define BN_H
|
#define BN_H
|
||||||
|
|
||||||
|
#ifndef __DOXYGEN_IGNORE__
|
||||||
|
|
||||||
#include <Types.hpp>
|
#include <Types.hpp>
|
||||||
|
|
||||||
int bn_compare(Uint8 *a, Uint8 *b, Uint32 n);
|
int bn_compare(Uint8 *a, Uint8 *b, Uint32 n);
|
||||||
|
|
@ -10,4 +12,5 @@ void bn_mul(Uint8 *d, Uint8 *a, Uint8 *b, Uint8 *N, Uint32 n);
|
||||||
void bn_exp(Uint8 *d, Uint8 *a, Uint8 *N, Uint32 n, Uint8 *e, Uint32 en);
|
void bn_exp(Uint8 *d, Uint8 *a, Uint8 *N, Uint32 n, Uint8 *e, Uint32 en);
|
||||||
void bn_inv(Uint8 *d, Uint8 *a, Uint8 *N, Uint32 n);
|
void bn_inv(Uint8 *d, Uint8 *a, Uint8 *N, Uint32 n);
|
||||||
|
|
||||||
|
#endif // __DOXYGEN_IGNORE__
|
||||||
#endif // BN_H
|
#endif // BN_H
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,14 @@
|
||||||
#ifndef MD5_H
|
#ifndef MD5_H
|
||||||
#define MD5_H
|
#define MD5_H
|
||||||
|
|
||||||
|
#ifndef __DOXYGEN_IGNORE__
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ========================================================================== **
|
/* ========================================================================== **
|
||||||
*
|
*
|
||||||
* MD5.h
|
* MD5.h
|
||||||
*
|
*
|
||||||
|
|
@ -82,24 +84,24 @@ extern "C"
|
||||||
*
|
*
|
||||||
* ========================================================================== **
|
* ========================================================================== **
|
||||||
*/
|
*/
|
||||||
/* -------------------------------------------------------------------------- **
|
/* -------------------------------------------------------------------------- **
|
||||||
* Typedefs:
|
* Typedefs:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
unsigned int ABCD[4];
|
unsigned int ABCD[4];
|
||||||
int b_used;
|
int b_used;
|
||||||
unsigned char block[64];
|
unsigned char block[64];
|
||||||
} auth_md5Ctx;
|
} auth_md5Ctx;
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- **
|
/* -------------------------------------------------------------------------- **
|
||||||
* Functions:
|
* Functions:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
auth_md5Ctx *auth_md5InitCtx(auth_md5Ctx *ctx);
|
auth_md5Ctx *auth_md5InitCtx(auth_md5Ctx *ctx);
|
||||||
/* ------------------------------------------------------------------------ **
|
/* ------------------------------------------------------------------------ **
|
||||||
* Initialize an MD5 context.
|
* Initialize an MD5 context.
|
||||||
*
|
*
|
||||||
* Input: ctx - A pointer to the MD5 context structure to be initialized.
|
* Input: ctx - A pointer to the MD5 context structure to be initialized.
|
||||||
|
|
@ -127,8 +129,8 @@ extern "C"
|
||||||
* ------------------------------------------------------------------------ **
|
* ------------------------------------------------------------------------ **
|
||||||
*/
|
*/
|
||||||
|
|
||||||
auth_md5Ctx *auth_md5SumCtx(auth_md5Ctx *ctx, const unsigned char *src, const int len);
|
auth_md5Ctx *auth_md5SumCtx(auth_md5Ctx *ctx, const unsigned char *src, const int len);
|
||||||
/* ------------------------------------------------------------------------ **
|
/* ------------------------------------------------------------------------ **
|
||||||
* Build an MD5 Message Digest within the given context.
|
* Build an MD5 Message Digest within the given context.
|
||||||
*
|
*
|
||||||
* Input: ctx - Pointer to the context in which the MD5 sum is being
|
* Input: ctx - Pointer to the context in which the MD5 sum is being
|
||||||
|
|
@ -144,8 +146,8 @@ extern "C"
|
||||||
* ------------------------------------------------------------------------ **
|
* ------------------------------------------------------------------------ **
|
||||||
*/
|
*/
|
||||||
|
|
||||||
auth_md5Ctx *auth_md5CloseCtx(auth_md5Ctx *ctx, unsigned char *dst);
|
auth_md5Ctx *auth_md5CloseCtx(auth_md5Ctx *ctx, unsigned char *dst);
|
||||||
/* ------------------------------------------------------------------------ **
|
/* ------------------------------------------------------------------------ **
|
||||||
* Close an MD5 Message Digest context and generate the final MD5 sum.
|
* Close an MD5 Message Digest context and generate the final MD5 sum.
|
||||||
*
|
*
|
||||||
* Input: ctx - Pointer to the context in which the MD5 sum is being
|
* Input: ctx - Pointer to the context in which the MD5 sum is being
|
||||||
|
|
@ -164,8 +166,8 @@ extern "C"
|
||||||
* ------------------------------------------------------------------------ **
|
* ------------------------------------------------------------------------ **
|
||||||
*/
|
*/
|
||||||
|
|
||||||
unsigned char * MD5(unsigned char * hash, const unsigned char *src, const int len);
|
unsigned char * MD5(unsigned char * hash, const unsigned char *src, const int len);
|
||||||
/* ------------------------------------------------------------------------ **
|
/* ------------------------------------------------------------------------ **
|
||||||
* Compute an MD5 message digest.
|
* Compute an MD5 message digest.
|
||||||
*
|
*
|
||||||
* Input: dst - Destination buffer into which the result will be written.
|
* Input: dst - Destination buffer into which the result will be written.
|
||||||
|
|
@ -198,8 +200,8 @@ extern "C"
|
||||||
* ------------------------------------------------------------------------ **
|
* ------------------------------------------------------------------------ **
|
||||||
*/
|
*/
|
||||||
|
|
||||||
unsigned char * MD5fromFile(unsigned char *dst, const char *src);
|
unsigned char * MD5fromFile(unsigned char *dst, const char *src);
|
||||||
/* ------------------------------------------------------------------------ **
|
/* ------------------------------------------------------------------------ **
|
||||||
* Compute an MD5 message digest.
|
* Compute an MD5 message digest.
|
||||||
*
|
*
|
||||||
* Input: dst - Destination buffer into which the result will be written.
|
* Input: dst - Destination buffer into which the result will be written.
|
||||||
|
|
@ -230,12 +232,13 @@ extern "C"
|
||||||
* ------------------------------------------------------------------------ **
|
* ------------------------------------------------------------------------ **
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const char * MD5ToString(const unsigned char *hash, char *dst);
|
const char * MD5ToString(const unsigned char *hash, char *dst);
|
||||||
unsigned char * StringToMD5(const char * hash, unsigned char * dst);
|
unsigned char * StringToMD5(const char * hash, unsigned char * dst);
|
||||||
|
|
||||||
/* ========================================================================== */
|
/* ========================================================================== */
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#endif // __DOXYGEN_IGNORE__
|
||||||
#endif /* AUTH_MD5_H */
|
#endif /* AUTH_MD5_H */
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
|
|
||||||
#ifndef _SHA1_H_
|
#ifndef _SHA1_H_
|
||||||
#define _SHA1_H_
|
#define _SHA1_H_
|
||||||
|
|
||||||
#include <Types.hpp>
|
#include <Types.hpp>
|
||||||
|
|
||||||
|
#ifndef __DOXYGEN_IGNORE__
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -43,4 +43,5 @@ Uint8* getSha1( Uint8 * stuff, Uint32 stuff_size );
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // __DOXYGEN_IGNORE__
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -33,45 +33,45 @@ DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
namespace utf8
|
namespace utf8
|
||||||
{
|
{
|
||||||
// Base for the exceptions that may be thrown from the library
|
// Base for the exceptions that may be thrown from the library
|
||||||
class exception : public ::std::exception {
|
class exception : public ::std::exception {
|
||||||
};
|
};
|
||||||
|
|
||||||
// Exceptions that may be thrown from the library functions.
|
// Exceptions that may be thrown from the library functions.
|
||||||
class invalid_code_point : public exception {
|
class invalid_code_point : public exception {
|
||||||
uint32_t cp;
|
uint32_t cp;
|
||||||
public:
|
public:
|
||||||
invalid_code_point(uint32_t cp) : cp(cp) {}
|
invalid_code_point(uint32_t cp) : cp(cp) {}
|
||||||
virtual const char* what() const throw() { return "Invalid code point"; }
|
virtual const char* what() const throw() { return "Invalid code point"; }
|
||||||
uint32_t code_point() const {return cp;}
|
uint32_t code_point() const {return cp;}
|
||||||
};
|
};
|
||||||
|
|
||||||
class invalid_utf8 : public exception {
|
class invalid_utf8 : public exception {
|
||||||
uint8_t u8;
|
uint8_t u8;
|
||||||
public:
|
public:
|
||||||
invalid_utf8 (uint8_t u) : u8(u) {}
|
invalid_utf8 (uint8_t u) : u8(u) {}
|
||||||
virtual const char* what() const throw() { return "Invalid UTF-8"; }
|
virtual const char* what() const throw() { return "Invalid UTF-8"; }
|
||||||
uint8_t utf8_octet() const {return u8;}
|
uint8_t utf8_octet() const {return u8;}
|
||||||
};
|
};
|
||||||
|
|
||||||
class invalid_utf16 : public exception {
|
class invalid_utf16 : public exception {
|
||||||
uint16_t u16;
|
uint16_t u16;
|
||||||
public:
|
public:
|
||||||
invalid_utf16 (uint16_t u) : u16(u) {}
|
invalid_utf16 (uint16_t u) : u16(u) {}
|
||||||
virtual const char* what() const throw() { return "Invalid UTF-16"; }
|
virtual const char* what() const throw() { return "Invalid UTF-16"; }
|
||||||
uint16_t utf16_word() const {return u16;}
|
uint16_t utf16_word() const {return u16;}
|
||||||
};
|
};
|
||||||
|
|
||||||
class not_enough_room : public exception {
|
class not_enough_room : public exception {
|
||||||
public:
|
public:
|
||||||
virtual const char* what() const throw() { return "Not enough space"; }
|
virtual const char* what() const throw() { return "Not enough space"; }
|
||||||
};
|
};
|
||||||
|
|
||||||
/// The library API - functions intended to be called by the users
|
/// The library API - functions intended to be called by the users
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
octet_iterator append(uint32_t cp, octet_iterator result)
|
octet_iterator append(uint32_t cp, octet_iterator result)
|
||||||
{
|
{
|
||||||
if (!utf8::internal::is_code_point_valid(cp))
|
if (!utf8::internal::is_code_point_valid(cp))
|
||||||
throw invalid_code_point(cp);
|
throw invalid_code_point(cp);
|
||||||
|
|
||||||
|
|
@ -93,11 +93,11 @@ namespace utf8
|
||||||
*(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
|
*(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename output_iterator>
|
template <typename octet_iterator, typename output_iterator>
|
||||||
output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
|
output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
|
||||||
{
|
{
|
||||||
while (start != end) {
|
while (start != end) {
|
||||||
octet_iterator sequence_start = start;
|
octet_iterator sequence_start = start;
|
||||||
internal::utf_error err_code = utf8::internal::validate_next(start, end);
|
internal::utf_error err_code = utf8::internal::validate_next(start, end);
|
||||||
|
|
@ -124,18 +124,18 @@ namespace utf8
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename output_iterator>
|
template <typename octet_iterator, typename output_iterator>
|
||||||
inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
|
inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
|
||||||
{
|
{
|
||||||
static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
|
static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
|
||||||
return utf8::replace_invalid(start, end, out, replacement_marker);
|
return utf8::replace_invalid(start, end, out, replacement_marker);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
uint32_t next(octet_iterator& it, octet_iterator end)
|
uint32_t next(octet_iterator& it, octet_iterator end)
|
||||||
{
|
{
|
||||||
uint32_t cp = 0;
|
uint32_t cp = 0;
|
||||||
internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
|
internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
|
||||||
switch (err_code) {
|
switch (err_code) {
|
||||||
|
|
@ -151,17 +151,17 @@ namespace utf8
|
||||||
throw invalid_code_point(cp);
|
throw invalid_code_point(cp);
|
||||||
}
|
}
|
||||||
return cp;
|
return cp;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
uint32_t peek_next(octet_iterator it, octet_iterator end)
|
uint32_t peek_next(octet_iterator it, octet_iterator end)
|
||||||
{
|
{
|
||||||
return utf8::next(it, end);
|
return utf8::next(it, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
uint32_t prior(octet_iterator& it, octet_iterator start)
|
uint32_t prior(octet_iterator& it, octet_iterator start)
|
||||||
{
|
{
|
||||||
// can't do much if it == start
|
// can't do much if it == start
|
||||||
if (it == start)
|
if (it == start)
|
||||||
throw not_enough_room();
|
throw not_enough_room();
|
||||||
|
|
@ -172,40 +172,40 @@ namespace utf8
|
||||||
if (it == start)
|
if (it == start)
|
||||||
throw invalid_utf8(*it); // error - no lead byte in the sequence
|
throw invalid_utf8(*it); // error - no lead byte in the sequence
|
||||||
return utf8::peek_next(it, end);
|
return utf8::peek_next(it, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Deprecated in versions that include "prior"
|
/// Deprecated in versions that include "prior"
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
uint32_t previous(octet_iterator& it, octet_iterator pass_start)
|
uint32_t previous(octet_iterator& it, octet_iterator pass_start)
|
||||||
{
|
{
|
||||||
octet_iterator end = it;
|
octet_iterator end = it;
|
||||||
while (utf8::internal::is_trail(*(--it)))
|
while (utf8::internal::is_trail(*(--it)))
|
||||||
if (it == pass_start)
|
if (it == pass_start)
|
||||||
throw invalid_utf8(*it); // error - no lead byte in the sequence
|
throw invalid_utf8(*it); // error - no lead byte in the sequence
|
||||||
octet_iterator temp = it;
|
octet_iterator temp = it;
|
||||||
return utf8::next(temp, end);
|
return utf8::next(temp, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename distance_type>
|
template <typename octet_iterator, typename distance_type>
|
||||||
void advance (octet_iterator& it, distance_type n, octet_iterator end)
|
void advance (octet_iterator& it, distance_type n, octet_iterator end)
|
||||||
{
|
{
|
||||||
for (distance_type i = 0; i < n; ++i)
|
for (distance_type i = 0; i < n; ++i)
|
||||||
utf8::next(it, end);
|
utf8::next(it, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
typename std::iterator_traits<octet_iterator>::difference_type
|
typename std::iterator_traits<octet_iterator>::difference_type
|
||||||
distance (octet_iterator first, octet_iterator last)
|
distance (octet_iterator first, octet_iterator last)
|
||||||
{
|
{
|
||||||
typename std::iterator_traits<octet_iterator>::difference_type dist;
|
typename std::iterator_traits<octet_iterator>::difference_type dist;
|
||||||
for (dist = 0; first < last; ++dist)
|
for (dist = 0; first < last; ++dist)
|
||||||
utf8::next(first, last);
|
utf8::next(first, last);
|
||||||
return dist;
|
return dist;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u16bit_iterator, typename octet_iterator>
|
template <typename u16bit_iterator, typename octet_iterator>
|
||||||
octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
|
octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
|
||||||
{
|
{
|
||||||
while (start != end) {
|
while (start != end) {
|
||||||
uint32_t cp = utf8::internal::mask16(*start++);
|
uint32_t cp = utf8::internal::mask16(*start++);
|
||||||
// Take care of surrogate pairs first
|
// Take care of surrogate pairs first
|
||||||
|
|
@ -228,11 +228,11 @@ namespace utf8
|
||||||
result = utf8::append(cp, result);
|
result = utf8::append(cp, result);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u16bit_iterator, typename octet_iterator>
|
template <typename u16bit_iterator, typename octet_iterator>
|
||||||
u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
|
u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
|
||||||
{
|
{
|
||||||
while (start != end) {
|
while (start != end) {
|
||||||
uint32_t cp = utf8::next(start, end);
|
uint32_t cp = utf8::next(start, end);
|
||||||
if (cp > 0xffff) { //make a surrogate pair
|
if (cp > 0xffff) { //make a surrogate pair
|
||||||
|
|
@ -243,33 +243,33 @@ namespace utf8
|
||||||
*result++ = static_cast<uint16_t>(cp);
|
*result++ = static_cast<uint16_t>(cp);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename u32bit_iterator>
|
template <typename octet_iterator, typename u32bit_iterator>
|
||||||
octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
|
octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
|
||||||
{
|
{
|
||||||
while (start != end)
|
while (start != end)
|
||||||
result = utf8::append(*(start++), result);
|
result = utf8::append(*(start++), result);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename u32bit_iterator>
|
template <typename octet_iterator, typename u32bit_iterator>
|
||||||
u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
|
u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
|
||||||
{
|
{
|
||||||
while (start != end)
|
while (start != end)
|
||||||
(*result++) = utf8::next(start, end);
|
(*result++) = utf8::next(start, end);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The iterator class
|
// The iterator class
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
|
class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
|
||||||
octet_iterator it;
|
octet_iterator it;
|
||||||
octet_iterator range_start;
|
octet_iterator range_start;
|
||||||
octet_iterator range_end;
|
octet_iterator range_end;
|
||||||
public:
|
public:
|
||||||
iterator () {};
|
iterator () {};
|
||||||
explicit iterator (const octet_iterator& octet_it,
|
explicit iterator (const octet_iterator& octet_it,
|
||||||
const octet_iterator& range_start,
|
const octet_iterator& range_start,
|
||||||
|
|
@ -318,7 +318,7 @@ namespace utf8
|
||||||
utf8::prior(it, range_start);
|
utf8::prior(it, range_start);
|
||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
}; // class iterator
|
}; // class iterator
|
||||||
|
|
||||||
} // namespace utf8
|
} // namespace utf8
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,73 +32,73 @@ DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
namespace utf8
|
namespace utf8
|
||||||
{
|
{
|
||||||
// The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
|
// The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
|
||||||
// You may need to change them to match your system.
|
// You may need to change them to match your system.
|
||||||
// These typedefs have the same names as ones from cstdint, or boost/cstdint
|
// These typedefs have the same names as ones from cstdint, or boost/cstdint
|
||||||
typedef unsigned char uint8_t;
|
typedef unsigned char uint8_t;
|
||||||
typedef unsigned short uint16_t;
|
typedef unsigned short uint16_t;
|
||||||
typedef unsigned int uint32_t;
|
typedef unsigned int uint32_t;
|
||||||
|
|
||||||
// Helper code - not intended to be directly called by the library users. May be changed at any time
|
// Helper code - not intended to be directly called by the library users. May be changed at any time
|
||||||
namespace internal
|
namespace internal
|
||||||
{
|
{
|
||||||
// Unicode constants
|
// Unicode constants
|
||||||
// Leading (high) surrogates: 0xd800 - 0xdbff
|
// Leading (high) surrogates: 0xd800 - 0xdbff
|
||||||
// Trailing (low) surrogates: 0xdc00 - 0xdfff
|
// Trailing (low) surrogates: 0xdc00 - 0xdfff
|
||||||
const uint16_t LEAD_SURROGATE_MIN = 0xd800u;
|
const uint16_t LEAD_SURROGATE_MIN = 0xd800u;
|
||||||
const uint16_t LEAD_SURROGATE_MAX = 0xdbffu;
|
const uint16_t LEAD_SURROGATE_MAX = 0xdbffu;
|
||||||
const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
|
const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
|
||||||
const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
|
const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
|
||||||
const uint16_t LEAD_OFFSET = LEAD_SURROGATE_MIN - (0x10000 >> 10);
|
const uint16_t LEAD_OFFSET = LEAD_SURROGATE_MIN - (0x10000 >> 10);
|
||||||
const uint32_t SURROGATE_OFFSET = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
|
const uint32_t SURROGATE_OFFSET = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
|
||||||
|
|
||||||
// Maximum valid value for a Unicode code point
|
// Maximum valid value for a Unicode code point
|
||||||
const uint32_t CODE_POINT_MAX = 0x0010ffffu;
|
const uint32_t CODE_POINT_MAX = 0x0010ffffu;
|
||||||
|
|
||||||
template<typename octet_type>
|
template<typename octet_type>
|
||||||
inline uint8_t mask8(octet_type oc)
|
inline uint8_t mask8(octet_type oc)
|
||||||
{
|
{
|
||||||
return static_cast<uint8_t>(0xff & oc);
|
return static_cast<uint8_t>(0xff & oc);
|
||||||
}
|
}
|
||||||
template<typename u16_type>
|
template<typename u16_type>
|
||||||
inline uint16_t mask16(u16_type oc)
|
inline uint16_t mask16(u16_type oc)
|
||||||
{
|
{
|
||||||
return static_cast<uint16_t>(0xffff & oc);
|
return static_cast<uint16_t>(0xffff & oc);
|
||||||
}
|
}
|
||||||
template<typename octet_type>
|
template<typename octet_type>
|
||||||
inline bool is_trail(octet_type oc)
|
inline bool is_trail(octet_type oc)
|
||||||
{
|
{
|
||||||
return ((utf8::internal::mask8(oc) >> 6) == 0x2);
|
return ((utf8::internal::mask8(oc) >> 6) == 0x2);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u16>
|
template <typename u16>
|
||||||
inline bool is_lead_surrogate(u16 cp)
|
inline bool is_lead_surrogate(u16 cp)
|
||||||
{
|
{
|
||||||
return (cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
|
return (cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u16>
|
template <typename u16>
|
||||||
inline bool is_trail_surrogate(u16 cp)
|
inline bool is_trail_surrogate(u16 cp)
|
||||||
{
|
{
|
||||||
return (cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
|
return (cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u16>
|
template <typename u16>
|
||||||
inline bool is_surrogate(u16 cp)
|
inline bool is_surrogate(u16 cp)
|
||||||
{
|
{
|
||||||
return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
|
return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u32>
|
template <typename u32>
|
||||||
inline bool is_code_point_valid(u32 cp)
|
inline bool is_code_point_valid(u32 cp)
|
||||||
{
|
{
|
||||||
return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
|
return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
inline typename std::iterator_traits<octet_iterator>::difference_type
|
inline typename std::iterator_traits<octet_iterator>::difference_type
|
||||||
sequence_length(octet_iterator lead_it)
|
sequence_length(octet_iterator lead_it)
|
||||||
{
|
{
|
||||||
uint8_t lead = utf8::internal::mask8(*lead_it);
|
uint8_t lead = utf8::internal::mask8(*lead_it);
|
||||||
if (lead < 0x80)
|
if (lead < 0x80)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
@ -110,11 +110,11 @@ namespace internal
|
||||||
return 4;
|
return 4;
|
||||||
else
|
else
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_difference_type>
|
template <typename octet_difference_type>
|
||||||
inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length)
|
inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length)
|
||||||
{
|
{
|
||||||
if (cp < 0x80) {
|
if (cp < 0x80) {
|
||||||
if (length != 1)
|
if (length != 1)
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -129,14 +129,14 @@ namespace internal
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
|
enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
|
||||||
|
|
||||||
/// Helper for get_sequence_x
|
/// Helper for get_sequence_x
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
utf_error increase_safely(octet_iterator& it, octet_iterator end)
|
utf_error increase_safely(octet_iterator& it, octet_iterator end)
|
||||||
{
|
{
|
||||||
if (++it == end)
|
if (++it == end)
|
||||||
return NOT_ENOUGH_ROOM;
|
return NOT_ENOUGH_ROOM;
|
||||||
|
|
||||||
|
|
@ -144,25 +144,25 @@ namespace internal
|
||||||
return INCOMPLETE_SEQUENCE;
|
return INCOMPLETE_SEQUENCE;
|
||||||
|
|
||||||
return UTF8_OK;
|
return UTF8_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}
|
#define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}
|
||||||
|
|
||||||
/// get_sequence_x functions decode utf-8 sequences of the length x
|
/// get_sequence_x functions decode utf-8 sequences of the length x
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
||||||
{
|
{
|
||||||
if (it == end)
|
if (it == end)
|
||||||
return NOT_ENOUGH_ROOM;
|
return NOT_ENOUGH_ROOM;
|
||||||
|
|
||||||
code_point = utf8::internal::mask8(*it);
|
code_point = utf8::internal::mask8(*it);
|
||||||
|
|
||||||
return UTF8_OK;
|
return UTF8_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
||||||
{
|
{
|
||||||
if (it == end)
|
if (it == end)
|
||||||
return NOT_ENOUGH_ROOM;
|
return NOT_ENOUGH_ROOM;
|
||||||
|
|
||||||
|
|
@ -173,11 +173,11 @@ namespace internal
|
||||||
code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
|
code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
|
||||||
|
|
||||||
return UTF8_OK;
|
return UTF8_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
||||||
{
|
{
|
||||||
if (it == end)
|
if (it == end)
|
||||||
return NOT_ENOUGH_ROOM;
|
return NOT_ENOUGH_ROOM;
|
||||||
|
|
||||||
|
|
@ -192,11 +192,11 @@ namespace internal
|
||||||
code_point += (*it) & 0x3f;
|
code_point += (*it) & 0x3f;
|
||||||
|
|
||||||
return UTF8_OK;
|
return UTF8_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
||||||
{
|
{
|
||||||
if (it == end)
|
if (it == end)
|
||||||
return NOT_ENOUGH_ROOM;
|
return NOT_ENOUGH_ROOM;
|
||||||
|
|
||||||
|
|
@ -215,13 +215,13 @@ namespace internal
|
||||||
code_point += (*it) & 0x3f;
|
code_point += (*it) & 0x3f;
|
||||||
|
|
||||||
return UTF8_OK;
|
return UTF8_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
|
#undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
|
||||||
{
|
{
|
||||||
// Save the original value of it so we can go back in case of failure
|
// Save the original value of it so we can go back in case of failure
|
||||||
// Of course, it does not make much sense with i.e. stream iterators
|
// Of course, it does not make much sense with i.e. stream iterators
|
||||||
octet_iterator original_it = it;
|
octet_iterator original_it = it;
|
||||||
|
|
@ -269,24 +269,24 @@ namespace internal
|
||||||
// Failure branch - restore the original value of the iterator
|
// Failure branch - restore the original value of the iterator
|
||||||
it = original_it;
|
it = original_it;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
|
inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
|
||||||
uint32_t ignored;
|
uint32_t ignored;
|
||||||
return utf8::internal::validate_next(it, end, ignored);
|
return utf8::internal::validate_next(it, end, ignored);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|
||||||
/// The library API - functions intended to be called by the users
|
/// The library API - functions intended to be called by the users
|
||||||
|
|
||||||
// Byte order mark
|
// Byte order mark
|
||||||
const uint8_t bom[] = {0xef, 0xbb, 0xbf};
|
const uint8_t bom[] = {0xef, 0xbb, 0xbf};
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
octet_iterator find_invalid(octet_iterator start, octet_iterator end)
|
octet_iterator find_invalid(octet_iterator start, octet_iterator end)
|
||||||
{
|
{
|
||||||
octet_iterator result = start;
|
octet_iterator result = start;
|
||||||
while (result != end) {
|
while (result != end) {
|
||||||
utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
|
utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
|
||||||
|
|
@ -294,34 +294,34 @@ namespace internal
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
inline bool is_valid(octet_iterator start, octet_iterator end)
|
inline bool is_valid(octet_iterator start, octet_iterator end)
|
||||||
{
|
{
|
||||||
return (utf8::find_invalid(start, end) == end);
|
return (utf8::find_invalid(start, end) == end);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
inline bool starts_with_bom (octet_iterator it, octet_iterator end)
|
inline bool starts_with_bom (octet_iterator it, octet_iterator end)
|
||||||
{
|
{
|
||||||
return (
|
return (
|
||||||
((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
|
((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
|
||||||
((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
|
((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
|
||||||
((it != end) && (utf8::internal::mask8(*it)) == bom[2])
|
((it != end) && (utf8::internal::mask8(*it)) == bom[2])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Deprecated in release 2.3
|
//Deprecated in release 2.3
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
inline bool is_bom (octet_iterator it)
|
inline bool is_bom (octet_iterator it)
|
||||||
{
|
{
|
||||||
return (
|
return (
|
||||||
(utf8::internal::mask8(*it++)) == bom[0] &&
|
(utf8::internal::mask8(*it++)) == bom[0] &&
|
||||||
(utf8::internal::mask8(*it++)) == bom[1] &&
|
(utf8::internal::mask8(*it++)) == bom[1] &&
|
||||||
(utf8::internal::mask8(*it)) == bom[2]
|
(utf8::internal::mask8(*it)) == bom[2]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} // namespace utf8
|
} // namespace utf8
|
||||||
|
|
||||||
#endif // header guard
|
#endif // header guard
|
||||||
|
|
|
||||||
|
|
@ -32,11 +32,11 @@ DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
namespace utf8
|
namespace utf8
|
||||||
{
|
{
|
||||||
namespace unchecked
|
namespace unchecked
|
||||||
{
|
{
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
octet_iterator append(uint32_t cp, octet_iterator result)
|
octet_iterator append(uint32_t cp, octet_iterator result)
|
||||||
{
|
{
|
||||||
if (cp < 0x80) // one octet
|
if (cp < 0x80) // one octet
|
||||||
*(result++) = static_cast<uint8_t>(cp);
|
*(result++) = static_cast<uint8_t>(cp);
|
||||||
else if (cp < 0x800) { // two octets
|
else if (cp < 0x800) { // two octets
|
||||||
|
|
@ -55,11 +55,11 @@ namespace utf8
|
||||||
*(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
|
*(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
uint32_t next(octet_iterator& it)
|
uint32_t next(octet_iterator& it)
|
||||||
{
|
{
|
||||||
uint32_t cp = utf8::internal::mask8(*it);
|
uint32_t cp = utf8::internal::mask8(*it);
|
||||||
typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
|
typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
|
||||||
switch (length) {
|
switch (length) {
|
||||||
|
|
@ -86,49 +86,49 @@ namespace utf8
|
||||||
}
|
}
|
||||||
++it;
|
++it;
|
||||||
return cp;
|
return cp;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
uint32_t peek_next(octet_iterator it)
|
uint32_t peek_next(octet_iterator it)
|
||||||
{
|
{
|
||||||
return utf8::unchecked::next(it);
|
return utf8::unchecked::next(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
uint32_t prior(octet_iterator& it)
|
uint32_t prior(octet_iterator& it)
|
||||||
{
|
{
|
||||||
while (utf8::internal::is_trail(*(--it))) ;
|
while (utf8::internal::is_trail(*(--it))) ;
|
||||||
octet_iterator temp = it;
|
octet_iterator temp = it;
|
||||||
return utf8::unchecked::next(temp);
|
return utf8::unchecked::next(temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
|
// Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
inline uint32_t previous(octet_iterator& it)
|
inline uint32_t previous(octet_iterator& it)
|
||||||
{
|
{
|
||||||
return utf8::unchecked::prior(it);
|
return utf8::unchecked::prior(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename distance_type>
|
template <typename octet_iterator, typename distance_type>
|
||||||
void advance (octet_iterator& it, distance_type n)
|
void advance (octet_iterator& it, distance_type n)
|
||||||
{
|
{
|
||||||
for (distance_type i = 0; i < n; ++i)
|
for (distance_type i = 0; i < n; ++i)
|
||||||
utf8::unchecked::next(it);
|
utf8::unchecked::next(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
typename std::iterator_traits<octet_iterator>::difference_type
|
typename std::iterator_traits<octet_iterator>::difference_type
|
||||||
distance (octet_iterator first, octet_iterator last)
|
distance (octet_iterator first, octet_iterator last)
|
||||||
{
|
{
|
||||||
typename std::iterator_traits<octet_iterator>::difference_type dist;
|
typename std::iterator_traits<octet_iterator>::difference_type dist;
|
||||||
for (dist = 0; first < last; ++dist)
|
for (dist = 0; first < last; ++dist)
|
||||||
utf8::unchecked::next(first);
|
utf8::unchecked::next(first);
|
||||||
return dist;
|
return dist;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u16bit_iterator, typename octet_iterator>
|
template <typename u16bit_iterator, typename octet_iterator>
|
||||||
octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
|
octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
|
||||||
{
|
{
|
||||||
while (start != end) {
|
while (start != end) {
|
||||||
uint32_t cp = utf8::internal::mask16(*start++);
|
uint32_t cp = utf8::internal::mask16(*start++);
|
||||||
// Take care of surrogate pairs first
|
// Take care of surrogate pairs first
|
||||||
|
|
@ -139,11 +139,11 @@ namespace utf8
|
||||||
result = utf8::unchecked::append(cp, result);
|
result = utf8::unchecked::append(cp, result);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename u16bit_iterator, typename octet_iterator>
|
template <typename u16bit_iterator, typename octet_iterator>
|
||||||
u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
|
u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
|
||||||
{
|
{
|
||||||
while (start < end) {
|
while (start < end) {
|
||||||
uint32_t cp = utf8::unchecked::next(start);
|
uint32_t cp = utf8::unchecked::next(start);
|
||||||
if (cp > 0xffff) { //make a surrogate pair
|
if (cp > 0xffff) { //make a surrogate pair
|
||||||
|
|
@ -154,31 +154,31 @@ namespace utf8
|
||||||
*result++ = static_cast<uint16_t>(cp);
|
*result++ = static_cast<uint16_t>(cp);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename u32bit_iterator>
|
template <typename octet_iterator, typename u32bit_iterator>
|
||||||
octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
|
octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
|
||||||
{
|
{
|
||||||
while (start != end)
|
while (start != end)
|
||||||
result = utf8::unchecked::append(*(start++), result);
|
result = utf8::unchecked::append(*(start++), result);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename octet_iterator, typename u32bit_iterator>
|
template <typename octet_iterator, typename u32bit_iterator>
|
||||||
u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
|
u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
|
||||||
{
|
{
|
||||||
while (start < end)
|
while (start < end)
|
||||||
(*result++) = utf8::unchecked::next(start);
|
(*result++) = utf8::unchecked::next(start);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The iterator class
|
// The iterator class
|
||||||
template <typename octet_iterator>
|
template <typename octet_iterator>
|
||||||
class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
|
class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
|
||||||
octet_iterator it;
|
octet_iterator it;
|
||||||
public:
|
public:
|
||||||
iterator () {};
|
iterator () {};
|
||||||
explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
|
explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
|
||||||
// the default "big three" are OK
|
// the default "big three" are OK
|
||||||
|
|
@ -218,9 +218,9 @@ namespace utf8
|
||||||
utf8::unchecked::prior(it);
|
utf8::unchecked::prior(it);
|
||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
}; // class iterator
|
}; // class iterator
|
||||||
|
|
||||||
} // namespace utf8::unchecked
|
} // namespace utf8::unchecked
|
||||||
} // namespace utf8
|
} // namespace utf8
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,10 +22,10 @@
|
||||||
bool isEmpty(Int8*, size_t);
|
bool isEmpty(Int8*, size_t);
|
||||||
|
|
||||||
unsigned short swapU16(unsigned short val );
|
unsigned short swapU16(unsigned short val );
|
||||||
short swap16 (short val );
|
short swap16 (short val );
|
||||||
unsigned int swapU32(unsigned int val);
|
unsigned int swapU32(unsigned int val);
|
||||||
int swap32 (int val );
|
int swap32 (int val );
|
||||||
long long swap64 (long long val);
|
long long swap64 (long long val);
|
||||||
|
|
||||||
float swapFloat(float val);
|
float swapFloat(float val);
|
||||||
double swapDouble(double val);
|
double swapDouble(double val);
|
||||||
|
|
@ -34,5 +34,6 @@ bool isSystemBigEndian();
|
||||||
|
|
||||||
void fillRandom(Uint8 * rndArea, Uint8 count);
|
void fillRandom(Uint8 * rndArea, Uint8 count);
|
||||||
|
|
||||||
|
void yaz0Decode(Uint8* src, Uint8* dst, Uint32 uncompressedSize);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ OUTPUT_DIRECTORY = doc
|
||||||
# source files, where putting all generated files in the same directory would
|
# source files, where putting all generated files in the same directory would
|
||||||
# otherwise cause performance problems for the file system.
|
# otherwise cause performance problems for the file system.
|
||||||
|
|
||||||
CREATE_SUBDIRS = NO
|
CREATE_SUBDIRS = Yes
|
||||||
|
|
||||||
# The OUTPUT_LANGUAGE tag is used to specify the language in which all
|
# The OUTPUT_LANGUAGE tag is used to specify the language in which all
|
||||||
# documentation generated by doxygen is written. Doxygen will use this
|
# documentation generated by doxygen is written. Doxygen will use this
|
||||||
|
|
@ -1586,7 +1586,7 @@ INCLUDE_FILE_PATTERNS =
|
||||||
# undefined via #undef or recursively expanded use the := operator
|
# undefined via #undef or recursively expanded use the := operator
|
||||||
# instead of the = operator.
|
# instead of the = operator.
|
||||||
|
|
||||||
PREDEFINED =
|
PREDEFINED = __DOXYGEN_IGNORE__
|
||||||
|
|
||||||
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
|
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
|
||||||
# this tag can be used to specify a list of macro names that should be expanded.
|
# this tag can be used to specify a list of macro names that should be expanded.
|
||||||
|
|
|
||||||
23
libzelda.pro
23
libzelda.pro
|
|
@ -1,7 +1,7 @@
|
||||||
CONFIG += staticlib
|
CONFIG += staticlib
|
||||||
TEMPLATE=lib
|
TEMPLATE=lib
|
||||||
TARGET=zelda
|
TARGET=zelda
|
||||||
QMAKE_CXXFLAGS = -std=c++11
|
QMAKE_CXXFLAGS += -std=c++0x
|
||||||
INCLUDEPATH += include
|
INCLUDEPATH += include
|
||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
|
|
@ -35,7 +35,13 @@ HEADERS += \
|
||||||
include/ALTTPFileWriter.hpp \
|
include/ALTTPFileWriter.hpp \
|
||||||
include/ALTTPFileReader.hpp \
|
include/ALTTPFileReader.hpp \
|
||||||
include/ALTTPFile.hpp \
|
include/ALTTPFile.hpp \
|
||||||
include/ALTTPEnums.hpp
|
include/ALTTPEnums.hpp \
|
||||||
|
include/MCFileReader.hpp \
|
||||||
|
include/MCFile.hpp \
|
||||||
|
include/MCFileWriter.hpp \
|
||||||
|
include/ZQuestFileWriter.hpp \
|
||||||
|
include/ZQuestFileReader.hpp \
|
||||||
|
include/ZQuest.hpp
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
src/utility.cpp \
|
src/utility.cpp \
|
||||||
|
|
@ -53,12 +59,19 @@ SOURCES += \
|
||||||
src/ec.cpp \
|
src/ec.cpp \
|
||||||
src/md5.c \
|
src/md5.c \
|
||||||
src/sha1.cpp \
|
src/sha1.cpp \
|
||||||
src/ALTTPStructs.cpp \
|
|
||||||
src/ALTTPQuest.cpp \
|
src/ALTTPQuest.cpp \
|
||||||
src/ALTTPFileWriter.cpp \
|
src/ALTTPFileWriter.cpp \
|
||||||
src/ALTTPFileReader.cpp \
|
src/ALTTPFileReader.cpp \
|
||||||
src/ALTTPFile.cpp
|
src/ALTTPFile.cpp \
|
||||||
|
src/MCFileReader.cpp \
|
||||||
|
src/MCFile.cpp \
|
||||||
|
src/MCFileWriter.cpp \
|
||||||
|
src/RARCFileReader.cpp \
|
||||||
|
src/RARCFileEntry.cpp \
|
||||||
|
src/ZQuestFileWriter.cpp \
|
||||||
|
src/ZQuestFileReader.cpp \
|
||||||
|
src/ZQuest.cpp
|
||||||
|
|
||||||
system("exec doxygen libzelda.conf")
|
system("exec doxygen libzelda.conf")
|
||||||
system("cd doc/latex && make")
|
#system("cd doc/latex && make")
|
||||||
system("cd ../../")
|
system("cd ../../")
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,10 @@
|
||||||
#include "ALTTPFile.hpp"
|
#include "ALTTPFile.hpp"
|
||||||
#include "ALTTPQuest.hpp"
|
#include "ALTTPQuest.hpp"
|
||||||
|
|
||||||
#include <InvalidOperationException.hpp>
|
#include "InvalidOperationException.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
ALTTPFile::ALTTPFile()
|
ALTTPFile::ALTTPFile()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
@ -51,3 +53,4 @@ Uint32 ALTTPFile::questCount() const
|
||||||
{
|
{
|
||||||
return m_quests.size();
|
return m_quests.size();
|
||||||
}
|
}
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@
|
||||||
#include "ALTTPQuest.hpp"
|
#include "ALTTPQuest.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
ALTTPFileReader::ALTTPFileReader(Uint8* data, Uint64 length)
|
ALTTPFileReader::ALTTPFileReader(Uint8* data, Uint64 length)
|
||||||
: BinaryReader(data, length)
|
: BinaryReader(data, length)
|
||||||
{
|
{
|
||||||
|
|
@ -35,6 +38,7 @@ ALTTPFile* ALTTPFileReader::readFile()
|
||||||
|
|
||||||
for (Uint32 i = 0; i < 6; i++)
|
for (Uint32 i = 0; i < 6; i++)
|
||||||
{
|
{
|
||||||
|
// Temporary values to use for each save
|
||||||
ALTTPQuest* quest = new ALTTPQuest();
|
ALTTPQuest* quest = new ALTTPQuest();
|
||||||
std::vector<ALTTPRoomFlags*> roomFlags;
|
std::vector<ALTTPRoomFlags*> roomFlags;
|
||||||
std::vector<ALTTPOverworldEvent*> owEvents;
|
std::vector<ALTTPOverworldEvent*> owEvents;
|
||||||
|
|
@ -193,13 +197,13 @@ ALTTPOverworldEvent* ALTTPFileReader::readOverworldEvent()
|
||||||
{
|
{
|
||||||
ALTTPOverworldEvent* event = new ALTTPOverworldEvent;
|
ALTTPOverworldEvent* event = new ALTTPOverworldEvent;
|
||||||
event->Unused1 = readBit();
|
event->Unused1 = readBit();
|
||||||
event->HeartPiece= readBit();
|
event->HeartPiece = readBit();
|
||||||
event->Overlay= readBit();
|
event->Overlay = readBit();
|
||||||
event->Unused2= readBit();
|
event->Unused2 = readBit();
|
||||||
event->Unused3= readBit();
|
event->Unused3 = readBit();
|
||||||
event->Unused4= readBit();
|
event->Unused4 = readBit();
|
||||||
event->Set= readBit();
|
event->Set = readBit();
|
||||||
event->Unused5= readBit();
|
event->Unused5 = readBit();
|
||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -224,3 +228,5 @@ ALTTPDungeonItemFlags ALTTPFileReader::readDungeonFlags()
|
||||||
|
|
||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@
|
||||||
#include "ALTTPQuest.hpp"
|
#include "ALTTPQuest.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
ALTTPFileWriter::ALTTPFileWriter(Uint8* data, Uint64 length)
|
ALTTPFileWriter::ALTTPFileWriter(Uint8* data, Uint64 length)
|
||||||
: BinaryWriter(data, length)
|
: BinaryWriter(data, length)
|
||||||
{
|
{
|
||||||
|
|
@ -180,9 +183,36 @@ void ALTTPFileWriter::writeDungeonItems(ALTTPDungeonItemFlags flags)
|
||||||
|
|
||||||
Uint16 ALTTPFileWriter::calculateChecksum(Uint32 game)
|
Uint16 ALTTPFileWriter::calculateChecksum(Uint32 game)
|
||||||
{
|
{
|
||||||
Uint16 sum = 0x5a5a;
|
/*
|
||||||
for (Uint32 i = 0; i < 0x4FE; i += 2)
|
* ALTTP's checksum is very basic
|
||||||
sum -= *(Uint16*)(m_data + (i + (0x500 * game)));
|
* It adds each word up and then subtracts the sum from 0x5a5a
|
||||||
|
* The number seems pretty arbitrary, but it enables the game to differentiate
|
||||||
|
* it from a number that just happens to equal the sum outright, preventing "false positives."
|
||||||
|
*
|
||||||
|
* Ignoring the algorithm for figuring out it's position in the buffer the equation is basically:
|
||||||
|
* s = s + w
|
||||||
|
* s = (0x5a5a - s);
|
||||||
|
* s == sum
|
||||||
|
* w == current word
|
||||||
|
*
|
||||||
|
* For those who don't know a word is a two byte pair, i.e 0xFF and 0xFE constitutes a word.
|
||||||
|
*/
|
||||||
|
|
||||||
return sum;
|
// First we start at 0
|
||||||
|
Uint16 sum = 0;
|
||||||
|
for (Uint32 i = 0; i < 0x4FE; i += 2)
|
||||||
|
// Add each word one by one
|
||||||
|
sum += *(Uint16*)(m_data + (i + (0x500 * game)));
|
||||||
|
|
||||||
|
// Subtract it from 0x5a5a to get our true checksum
|
||||||
|
return (0x5a5a - sum);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* There is one caveat to this algorithm however,
|
||||||
|
* It makes it difficult to manually edit this in a hex editor since it's not a common
|
||||||
|
* algorithm and most hexeditor with built in checksum calculators won't have it, however it's
|
||||||
|
* it's extremely basic, making it a non-issue really.
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,9 @@
|
||||||
#include "InvalidOperationException.hpp"
|
#include "InvalidOperationException.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
ALTTPQuest::ALTTPQuest()
|
ALTTPQuest::ALTTPQuest()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -676,3 +679,5 @@ Uint16 ALTTPQuest::checksum() const
|
||||||
{
|
{
|
||||||
return m_checksum;
|
return m_checksum;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,11 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
|
|
||||||
BinaryReader::BinaryReader(const Stream& stream) :
|
BinaryReader::BinaryReader(const Stream& stream) :
|
||||||
Stream(stream)
|
Stream(stream)
|
||||||
{
|
{
|
||||||
|
|
@ -67,7 +72,7 @@ BinaryReader::BinaryReader(const std::string& filename)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
done += blocksize;
|
done += blocksize;
|
||||||
}while (done < length);
|
} while (done < length);
|
||||||
|
|
||||||
fclose(in);
|
fclose(in);
|
||||||
m_length = length;
|
m_length = length;
|
||||||
|
|
@ -85,7 +90,6 @@ void BinaryReader::writeBytes(Int8*, Int64)
|
||||||
throw IOException("BinaryReader::writeBytes() -> Stream not open for writing");
|
throw IOException("BinaryReader::writeBytes() -> Stream not open for writing");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Int16 BinaryReader::readInt16()
|
Int16 BinaryReader::readInt16()
|
||||||
{
|
{
|
||||||
if (m_bitPosition > 0)
|
if (m_bitPosition > 0)
|
||||||
|
|
@ -99,7 +103,7 @@ Int16 BinaryReader::readInt16()
|
||||||
Int16 ret = *(Int16*)(m_data + m_position);
|
Int16 ret = *(Int16*)(m_data + m_position);
|
||||||
m_position += 2;
|
m_position += 2;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swap16(ret);
|
ret = swap16(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -116,7 +120,7 @@ Uint16 BinaryReader::readUInt16()
|
||||||
Uint16 ret = *(Uint16*)(m_data + m_position);
|
Uint16 ret = *(Uint16*)(m_data + m_position);
|
||||||
m_position += 2;
|
m_position += 2;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swapU16(ret);
|
ret = swapU16(ret);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -134,7 +138,7 @@ Int32 BinaryReader::readInt32()
|
||||||
Int32 ret = *(Int32*)(m_data + m_position);
|
Int32 ret = *(Int32*)(m_data + m_position);
|
||||||
m_position += 4;
|
m_position += 4;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swap32(ret);
|
ret = swap32(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -152,7 +156,7 @@ Uint32 BinaryReader::readUInt32()
|
||||||
Uint32 ret = *(Uint32*)(m_data + m_position);
|
Uint32 ret = *(Uint32*)(m_data + m_position);
|
||||||
m_position += 4;
|
m_position += 4;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swapU32(ret);
|
ret = swapU32(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -170,7 +174,7 @@ Int64 BinaryReader::readInt64()
|
||||||
Int64 ret = *(Int64*)(m_data + m_position);
|
Int64 ret = *(Int64*)(m_data + m_position);
|
||||||
m_position += 8;
|
m_position += 8;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swap64(ret);
|
ret = swap64(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -187,7 +191,7 @@ Uint64 BinaryReader::readUInt64()
|
||||||
Uint64 ret = *(Uint64*)(m_data + m_position);
|
Uint64 ret = *(Uint64*)(m_data + m_position);
|
||||||
m_position += 8;
|
m_position += 8;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swap64(ret);
|
ret = swap64(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -205,7 +209,7 @@ float BinaryReader::readFloat()
|
||||||
float ret = *(float*)(m_data + m_position);
|
float ret = *(float*)(m_data + m_position);
|
||||||
m_position += 4;
|
m_position += 4;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swapFloat(ret);
|
ret = swapFloat(ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -223,7 +227,7 @@ double BinaryReader::readDouble()
|
||||||
double ret = *(double*)(m_data + m_position);
|
double ret = *(double*)(m_data + m_position);
|
||||||
m_position += 8;
|
m_position += 8;
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
ret = swapDouble(ret);
|
ret = swapDouble(ret);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -262,8 +266,23 @@ std::string BinaryReader::readUnicode()
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string BinaryReader::readString()
|
||||||
|
{
|
||||||
|
std::string ret = "";
|
||||||
|
Uint8 chr = readByte();
|
||||||
|
|
||||||
|
while (chr != 0)
|
||||||
|
{
|
||||||
|
ret += chr;
|
||||||
|
chr = readByte();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
bool BinaryReader::isOpenForWriting()
|
bool BinaryReader::isOpenForWriting()
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,10 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
|
|
||||||
BinaryWriter::BinaryWriter(const Uint8* data, Uint64 length)
|
BinaryWriter::BinaryWriter(const Uint8* data, Uint64 length)
|
||||||
: Stream(data, length)
|
: Stream(data, length)
|
||||||
|
|
@ -72,7 +76,6 @@ void BinaryWriter::save(const std::string& filename)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
done += blocksize;
|
done += blocksize;
|
||||||
std::cout << "Wrote " << done << " bytes" << std::endl;
|
|
||||||
}while (done < m_length);
|
}while (done < m_length);
|
||||||
|
|
||||||
fclose(out);
|
fclose(out);
|
||||||
|
|
@ -101,7 +104,7 @@ void BinaryWriter::writeInt16(Int16 val)
|
||||||
else if (m_position > m_length)
|
else if (m_position > m_length)
|
||||||
throw IOException("BinaryWriter::WriteInt16() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteInt16() -> Position outside stream bounds");
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swap16(val);
|
val = swap16(val);
|
||||||
|
|
||||||
*(Int16*)(m_data + m_position) = val;
|
*(Int16*)(m_data + m_position) = val;
|
||||||
|
|
@ -122,7 +125,7 @@ void BinaryWriter::writeUInt16(Uint16 val)
|
||||||
throw IOException("BinaryWriter::WriteUInt16() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteUInt16() -> Position outside stream bounds");
|
||||||
|
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swapU16(val);
|
val = swapU16(val);
|
||||||
|
|
||||||
*(Uint16*)(m_data + m_position) = val;
|
*(Uint16*)(m_data + m_position) = val;
|
||||||
|
|
@ -142,7 +145,7 @@ void BinaryWriter::writeInt32(Int32 val)
|
||||||
else if (m_position > m_length)
|
else if (m_position > m_length)
|
||||||
throw IOException("BinaryWriter::WriteInt32() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteInt32() -> Position outside stream bounds");
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swap32(val);
|
val = swap32(val);
|
||||||
|
|
||||||
*(Int32*)(m_data + m_position) = val;
|
*(Int32*)(m_data + m_position) = val;
|
||||||
|
|
@ -162,7 +165,7 @@ void BinaryWriter::writeUInt32(Uint32 val)
|
||||||
else if (m_position > m_length)
|
else if (m_position > m_length)
|
||||||
throw IOException("BinaryWriter::WriteUInt32() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteUInt32() -> Position outside stream bounds");
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swap32(val);
|
val = swap32(val);
|
||||||
|
|
||||||
*(Uint32*)(m_data + m_position) = val;
|
*(Uint32*)(m_data + m_position) = val;
|
||||||
|
|
@ -183,7 +186,7 @@ void BinaryWriter::writeInt64(Int64 val)
|
||||||
throw IOException("BinaryWriter::WriteInt64() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteInt64() -> Position outside stream bounds");
|
||||||
|
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swap64(val);
|
val = swap64(val);
|
||||||
|
|
||||||
*(Int64*)(m_data + m_position) = val;
|
*(Int64*)(m_data + m_position) = val;
|
||||||
|
|
@ -203,7 +206,7 @@ void BinaryWriter::writeUInt64(Uint64 val)
|
||||||
else if (m_position > m_length)
|
else if (m_position > m_length)
|
||||||
throw IOException("BinaryWriter::WriteUInt64() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteUInt64() -> Position outside stream bounds");
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swap64(val);
|
val = swap64(val);
|
||||||
|
|
||||||
*(Uint64*)(m_data + m_position) = val;
|
*(Uint64*)(m_data + m_position) = val;
|
||||||
|
|
@ -223,7 +226,7 @@ void BinaryWriter::writeFloat(float val)
|
||||||
else if (m_position > m_length)
|
else if (m_position > m_length)
|
||||||
throw IOException("BinaryWriter::WriteFloat() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteFloat() -> Position outside stream bounds");
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swapFloat(val);
|
val = swapFloat(val);
|
||||||
|
|
||||||
*(float*)(m_data + m_position) = val;
|
*(float*)(m_data + m_position) = val;
|
||||||
|
|
@ -243,7 +246,7 @@ void BinaryWriter::writeDouble(double val)
|
||||||
else if (m_position > m_length)
|
else if (m_position > m_length)
|
||||||
throw IOException("BinaryWriter::WriteDouble() -> Position outside stream bounds");
|
throw IOException("BinaryWriter::WriteDouble() -> Position outside stream bounds");
|
||||||
|
|
||||||
if ((!isSystemBigEndian() && m_endian == Stream::BigEndian) || (isSystemBigEndian() && m_endian == Stream::LittleEndian))
|
if ((!isSystemBigEndian() && m_endian == BigEndian) || (isSystemBigEndian() && m_endian == LittleEndian))
|
||||||
val = swapDouble(val);
|
val = swapDouble(val);
|
||||||
|
|
||||||
*(double*)(m_data + m_position)= val;
|
*(double*)(m_data + m_position)= val;
|
||||||
|
|
@ -287,4 +290,5 @@ bool BinaryWriter::isOpenForReading()
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
} // io
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
// This file is part of libZelda.
|
||||||
|
//
|
||||||
|
// libZelda is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// libZelda is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
|
#include "MCFile.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
MCFile::MCFile()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
// This file is part of libZelda.
|
||||||
|
//
|
||||||
|
// libZelda is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// libZelda is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
|
#include "MCFileReader.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
MCFileReader::MCFileReader(Uint8* data, Uint64 length)
|
||||||
|
: BinaryReader(data, length)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
MCFileReader::MCFileReader(const std::string& filename)
|
||||||
|
: BinaryReader(filename)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
@ -0,0 +1,96 @@
|
||||||
|
// This file is part of libZelda.
|
||||||
|
//
|
||||||
|
// libZelda is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// libZelda is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with libZelda. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
|
||||||
|
#include "MCFileWriter.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
MCFileWriter::MCFileWriter(Uint8* data, Uint64 length)
|
||||||
|
: io::BinaryWriter(data, length)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
MCFileWriter::MCFileWriter(const std::string& filename)
|
||||||
|
: io::BinaryWriter(filename)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Check the implementation, it seems to work fine, however it's not exactly correct,
|
||||||
|
// looking at the disassembly, MC seems to do some weird checking that isn't being done with this solution
|
||||||
|
// need to figure out what it's doing and whether it's relevant to the checksum.
|
||||||
|
Uint16 MCFileWriter::calculateSlotChecksum(Uint32 game)
|
||||||
|
{
|
||||||
|
Uint16 first = calculateChecksum((m_data + 0x34 + (0x10 * game)), 4);
|
||||||
|
Uint16 second = calculateChecksum((m_data + 0x80 + (0x500 * game)), 0x500);
|
||||||
|
|
||||||
|
first = (first + second) & 0xFFFF;
|
||||||
|
Uint16 result = first << 16;
|
||||||
|
second = ~first&0xFFFF;
|
||||||
|
second += 1;
|
||||||
|
result += second;
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
Uint16 MCFileWriter::calculateChecksum(Uint8 *data, Uint32 length)
|
||||||
|
{
|
||||||
|
Uint16 sum = 0;
|
||||||
|
int i = length;
|
||||||
|
|
||||||
|
for (Uint32 j = 0; j < length; j += 2)
|
||||||
|
{
|
||||||
|
sum += *(Uint16*)(data + j) ^ i;
|
||||||
|
i -= 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
sum &= 0xFFFF;
|
||||||
|
|
||||||
|
return sum;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Rewrite this to be more optimized, the current solution takes quite a few cycles
|
||||||
|
Uint8* MCFileWriter::reverse(Uint8* data, Uint32 length)
|
||||||
|
{
|
||||||
|
Uint32 a = 0;
|
||||||
|
Uint32 swap;
|
||||||
|
|
||||||
|
for (;a<--length; a++)
|
||||||
|
{
|
||||||
|
swap = data[a];
|
||||||
|
data[a] = data[length];
|
||||||
|
data[length] = swap;
|
||||||
|
}
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// TODO: Rewrite this to be more optimized, unroll more??
|
||||||
|
void MCFileWriter::unscramble()
|
||||||
|
{
|
||||||
|
if (!m_data)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (Uint32 i = 0; i < m_length; i += 4)
|
||||||
|
{
|
||||||
|
Uint32 block1 = *(Uint32*)reverse((m_data + i), 4);
|
||||||
|
Uint32 block2 = *(Uint32*)reverse((m_data + i + 4), 4);
|
||||||
|
*(Uint32*)(m_data + i) = block2;
|
||||||
|
*(Uint32*)(m_data + i + 4) = block1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
@ -19,6 +19,10 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
|
|
||||||
const Uint32 Stream::BLOCKSZ = 512;
|
const Uint32 Stream::BLOCKSZ = 512;
|
||||||
|
|
||||||
|
|
@ -26,7 +30,7 @@ Stream::Stream() :
|
||||||
m_bitPosition(0),
|
m_bitPosition(0),
|
||||||
m_position(0),
|
m_position(0),
|
||||||
m_length(0),
|
m_length(0),
|
||||||
m_endian(Stream::LittleEndian),
|
m_endian(LittleEndian),
|
||||||
m_data(NULL),
|
m_data(NULL),
|
||||||
m_autoResize(true)
|
m_autoResize(true)
|
||||||
{}
|
{}
|
||||||
|
|
@ -34,7 +38,7 @@ Stream::Stream() :
|
||||||
Stream::Stream(const Uint8* data, Uint64 length) :
|
Stream::Stream(const Uint8* data, Uint64 length) :
|
||||||
m_bitPosition(0),
|
m_bitPosition(0),
|
||||||
m_position(0),
|
m_position(0),
|
||||||
m_endian(Stream::LittleEndian),
|
m_endian(LittleEndian),
|
||||||
m_autoResize(true)
|
m_autoResize(true)
|
||||||
{
|
{
|
||||||
if (length <= 0)
|
if (length <= 0)
|
||||||
|
|
@ -97,6 +101,11 @@ void Stream::writeBit(bool val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Stream::writeUByte(Uint8 byte)
|
||||||
|
{
|
||||||
|
writeByte((Int8)byte);
|
||||||
|
}
|
||||||
|
|
||||||
void Stream::writeByte(Int8 byte)
|
void Stream::writeByte(Int8 byte)
|
||||||
{
|
{
|
||||||
if (m_bitPosition > 0)
|
if (m_bitPosition > 0)
|
||||||
|
|
@ -113,6 +122,11 @@ void Stream::writeByte(Int8 byte)
|
||||||
m_position++;
|
m_position++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Stream::writeUBytes(Uint8* data, Int64 length)
|
||||||
|
{
|
||||||
|
writeBytes((Int8*)data, length);
|
||||||
|
}
|
||||||
|
|
||||||
void Stream::writeBytes(Int8* data, Int64 length)
|
void Stream::writeBytes(Int8* data, Int64 length)
|
||||||
{
|
{
|
||||||
if (m_bitPosition > 0)
|
if (m_bitPosition > 0)
|
||||||
|
|
@ -302,7 +316,10 @@ void Stream::setEndianess(Endian endian)
|
||||||
m_endian = endian;
|
m_endian = endian;
|
||||||
}
|
}
|
||||||
|
|
||||||
Stream::Endian Stream::endianness() const
|
Endian Stream::endian() const
|
||||||
{
|
{
|
||||||
return m_endian;
|
return m_endian;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // io
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,10 @@
|
||||||
#include "InvalidOperationException.hpp"
|
#include "InvalidOperationException.hpp"
|
||||||
#include "IOException.hpp"
|
#include "IOException.hpp"
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
namespace io
|
||||||
|
{
|
||||||
TextStream::TextStream(const std::string& filename, TextMode fileMode, AccessMode accessMode) :
|
TextStream::TextStream(const std::string& filename, TextMode fileMode, AccessMode accessMode) :
|
||||||
m_filename(filename),
|
m_filename(filename),
|
||||||
m_textmode(fileMode),
|
m_textmode(fileMode),
|
||||||
|
|
@ -256,3 +260,7 @@ void TextStream::loadLines()
|
||||||
m_lines.push_back(line);
|
m_lines.push_back(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // io
|
||||||
|
} // zelda
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,9 @@
|
||||||
#include <utility.hpp>
|
#include <utility.hpp>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
WiiImage::WiiImage(Uint32 width, Uint32 height, Uint8* data) :
|
WiiImage::WiiImage(Uint32 width, Uint32 height, Uint8* data) :
|
||||||
m_width(width),
|
m_width(width),
|
||||||
m_height(height),
|
m_height(height),
|
||||||
|
|
@ -178,3 +181,4 @@ Uint32 WiiBanner::flags() const
|
||||||
return m_flags;
|
return m_flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,11 @@
|
||||||
|
|
||||||
#include "WiiFile.hpp"
|
#include "WiiFile.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
|
//! TODO: Remove this?
|
||||||
WiiFile::WiiFile() :
|
WiiFile::WiiFile() :
|
||||||
m_permissions(WiiFile::GroupRW|WiiFile::OtherRW|WiiFile::OwnerRW),
|
m_permissions(WiiFile::GroupRW|WiiFile::OtherRW|WiiFile::OwnerRW),
|
||||||
m_attributes(0),
|
m_attributes(0),
|
||||||
|
|
@ -128,3 +133,4 @@ bool WiiFile::isFile() const
|
||||||
return (m_type == WiiFile::File);
|
return (m_type == WiiFile::File);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
#include "IOException.hpp"
|
#include "IOException.hpp"
|
||||||
#include "aes.h"
|
#include "aes.h"
|
||||||
#include "ec.h"
|
#include "ec.h"
|
||||||
#include <utility.hpp>
|
#include "utility.hpp"
|
||||||
#include "md5.h"
|
#include "md5.h"
|
||||||
#include "sha1.h"
|
#include "sha1.h"
|
||||||
|
|
||||||
|
|
@ -33,6 +33,9 @@
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
WiiSave::WiiSave()
|
WiiSave::WiiSave()
|
||||||
: m_banner(NULL)
|
: m_banner(NULL)
|
||||||
{
|
{
|
||||||
|
|
@ -79,3 +82,5 @@ WiiBanner* WiiSave::banner() const
|
||||||
{
|
{
|
||||||
return m_banner;
|
return m_banner;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,8 @@
|
||||||
#include <IOException.hpp>
|
#include <IOException.hpp>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
const Uint8 SD_KEY[16] = {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08, 0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
|
const Uint8 SD_KEY[16] = {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08, 0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
|
||||||
const Uint8 SD_IV[16] = {0x21, 0x67, 0x12, 0xe6, 0xaa, 0x1f, 0x68, 0x9f, 0x95, 0xc5, 0xa2, 0x23, 0x24, 0xdc, 0x6a, 0x98};
|
const Uint8 SD_IV[16] = {0x21, 0x67, 0x12, 0xe6, 0xaa, 0x1f, 0x68, 0x9f, 0x95, 0xc5, 0xa2, 0x23, 0x24, 0xdc, 0x6a, 0x98};
|
||||||
|
|
@ -288,3 +290,5 @@ void WiiSaveReader::readCerts(Uint32 totalSize)
|
||||||
|
|
||||||
check_ec(ngCert, apCert, sig, hash2);
|
check_ec(ngCert, apCert, sig, hash2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,9 @@
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
|
|
||||||
|
namespace zelda
|
||||||
|
{
|
||||||
|
|
||||||
const Uint8 SD_KEY[16] = {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08, 0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
|
const Uint8 SD_KEY[16] = {0xab, 0x01, 0xb9, 0xd8, 0xe1, 0x62, 0x2b, 0x08, 0xaf, 0xba, 0xd8, 0x4d, 0xbf, 0xc2, 0xa5, 0x5d};
|
||||||
const Uint8 SD_IV[16] = {0x21, 0x67, 0x12, 0xe6, 0xaa, 0x1f, 0x68, 0x9f, 0x95, 0xc5, 0xa2, 0x23, 0x24, 0xdc, 0x6a, 0x98};
|
const Uint8 SD_IV[16] = {0x21, 0x67, 0x12, 0xe6, 0xaa, 0x1f, 0x68, 0x9f, 0x95, 0xc5, 0xa2, 0x23, 0x24, 0xdc, 0x6a, 0x98};
|
||||||
const Uint8 MD5_BLANKER[16] = {0x0e, 0x65, 0x37, 0x81, 0x99, 0xbe, 0x45, 0x17, 0xab, 0x06, 0xec, 0x22, 0x45, 0x1a, 0x57, 0x93};
|
const Uint8 MD5_BLANKER[16] = {0x0e, 0x65, 0x37, 0x81, 0x99, 0xbe, 0x45, 0x17, 0xab, 0x06, 0xec, 0x22, 0x45, 0x1a, 0x57, 0x93};
|
||||||
|
|
@ -44,7 +47,7 @@ WiiSaveWriter::WiiSaveWriter(const std::string &filename)
|
||||||
: BinaryWriter(filename)
|
: BinaryWriter(filename)
|
||||||
{
|
{
|
||||||
this->setAutoResizing(true);
|
this->setAutoResizing(true);
|
||||||
this->setEndianess(Stream::BigEndian);
|
this->setEndianess(BigEndian);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -89,7 +92,7 @@ bool WiiSaveWriter::writeSave(WiiSave *save, Uint8 *macAddress, Uint32 ngId, Uin
|
||||||
|
|
||||||
void WiiSaveWriter::writeBanner(WiiBanner *banner)
|
void WiiSaveWriter::writeBanner(WiiBanner *banner)
|
||||||
{
|
{
|
||||||
this->setEndianess(Stream::BigEndian);
|
this->setEndianess(BigEndian);
|
||||||
this->setAutoResizing(true);
|
this->setAutoResizing(true);
|
||||||
this->writeInt64(banner->gameID());
|
this->writeInt64(banner->gameID());
|
||||||
this->writeInt32((0x60a0+0x1200)*banner->icons().size());
|
this->writeInt32((0x60a0+0x1200)*banner->icons().size());
|
||||||
|
|
@ -249,3 +252,5 @@ void WiiSaveWriter::writeCerts(Uint32 filesSize, Uint32 ngId, Uint8 *ngPriv, Uin
|
||||||
this->writeBytes((Int8*)ngCert, 0x180);
|
this->writeBytes((Int8*)ngCert, 0x180);
|
||||||
this->writeBytes((Int8*)apCert, 0x180);
|
this->writeBytes((Int8*)apCert, 0x180);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // zelda
|
||||||
|
|
|
||||||
12
src/aes.c
12
src/aes.c
|
|
@ -253,11 +253,11 @@ void encrypt(u8 *buff)
|
||||||
k=Nb;
|
k=Nb;
|
||||||
x=a; y=b;
|
x=a; y=b;
|
||||||
|
|
||||||
/* State alternates between a and b */
|
/* State alternates between a and b */
|
||||||
for (i=1;i<Nr;i++)
|
for (i=1;i<Nr;i++)
|
||||||
{ /* Nr is number of rounds. May be odd. */
|
{ /* Nr is number of rounds. May be odd. */
|
||||||
|
|
||||||
/* if Nb is fixed - unroll this next
|
/* if Nb is fixed - unroll this next
|
||||||
loop and hard-code in the values of fi[] */
|
loop and hard-code in the values of fi[] */
|
||||||
|
|
||||||
for (m=j=0;j<Nb;j++,m+=3)
|
for (m=j=0;j<Nb;j++,m+=3)
|
||||||
|
|
@ -271,7 +271,7 @@ void encrypt(u8 *buff)
|
||||||
t=x; x=y; y=t; /* swap pointers */
|
t=x; x=y; y=t; /* swap pointers */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Last Round - unroll if possible */
|
/* Last Round - unroll if possible */
|
||||||
for (m=j=0;j<Nb;j++,m+=3)
|
for (m=j=0;j<Nb;j++,m+=3)
|
||||||
{
|
{
|
||||||
y[j]=fkey[k++]^(u32)fbsub[(u8)x[j]]^
|
y[j]=fkey[k++]^(u32)fbsub[(u8)x[j]]^
|
||||||
|
|
@ -300,11 +300,11 @@ void decrypt(u8 *buff)
|
||||||
k=Nb;
|
k=Nb;
|
||||||
x=a; y=b;
|
x=a; y=b;
|
||||||
|
|
||||||
/* State alternates between a and b */
|
/* State alternates between a and b */
|
||||||
for (i=1;i<Nr;i++)
|
for (i=1;i<Nr;i++)
|
||||||
{ /* Nr is number of rounds. May be odd. */
|
{ /* Nr is number of rounds. May be odd. */
|
||||||
|
|
||||||
/* if Nb is fixed - unroll this next
|
/* if Nb is fixed - unroll this next
|
||||||
loop and hard-code in the values of ri[] */
|
loop and hard-code in the values of ri[] */
|
||||||
|
|
||||||
for (m=j=0;j<Nb;j++,m+=3)
|
for (m=j=0;j<Nb;j++,m+=3)
|
||||||
|
|
@ -317,7 +317,7 @@ void decrypt(u8 *buff)
|
||||||
t=x; x=y; y=t; /* swap pointers */
|
t=x; x=y; y=t; /* swap pointers */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Last Round - unroll if possible */
|
/* Last Round - unroll if possible */
|
||||||
for (m=j=0;j<Nb;j++,m+=3)
|
for (m=j=0;j<Nb;j++,m+=3)
|
||||||
{
|
{
|
||||||
y[j]=rkey[k++]^(u32)rbsub[(u8)x[j]]^
|
y[j]=rkey[k++]^(u32)rbsub[(u8)x[j]]^
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,11 @@
|
||||||
// Licensed under the terms of the GNU GPL, version 2
|
// Licensed under the terms of the GNU GPL, version 2
|
||||||
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
||||||
|
|
||||||
|
|
||||||
|
// TODO: Clean this code up and prune
|
||||||
|
// NOTE: It's pretty much been gutted from it's original form, does the original license even apply anymore?
|
||||||
|
|
||||||
|
// Not all of these headers are necessary, figure out which ones are actually used and prune those that are irrelevant.
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
@ -316,6 +321,8 @@ static void point_mul(Uint8 *d, Uint8 *a, Uint8 *b) // a is bignum
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// DUPE FUNCTION! NUKE IT!!
|
||||||
void sillyRandom(Uint8 * rndArea, Uint8 count)
|
void sillyRandom(Uint8 * rndArea, Uint8 count)
|
||||||
{
|
{
|
||||||
for(Uint16 i = 0; i < count; i++)
|
for(Uint16 i = 0; i < count; i++)
|
||||||
|
|
|
||||||
30
src/md5.c
30
src/md5.c
|
|
@ -110,32 +110,32 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static const uint8_t K[3][16] = {
|
static const uint8_t K[3][16] = {
|
||||||
/* Round 1: skipped (since it is simply sequential). */
|
/* Round 1: skipped (since it is simply sequential). */
|
||||||
{ 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12 }, /* R2 */
|
{ 1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12 }, /* R2 */
|
||||||
{ 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2 }, /* R3 */
|
{ 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2 }, /* R3 */
|
||||||
{ 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9 } /* R4 */
|
{ 0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9 } /* R4 */
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint8_t S[4][4] = { { 7, 12, 17, 22 }, /* Round 1 */
|
static const uint8_t S[4][4] = { { 7, 12, 17, 22 }, /* Round 1 */
|
||||||
{ 5, 9, 14, 20 }, /* Round 2 */
|
{ 5, 9, 14, 20 }, /* Round 2 */
|
||||||
{ 4, 11, 16, 23 }, /* Round 3 */
|
{ 4, 11, 16, 23 }, /* Round 3 */
|
||||||
{ 6, 10, 15, 21 } /* Round 4 */
|
{ 6, 10, 15, 21 } /* Round 4 */
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint32_t T[4][16] = { { 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, /* Round 1 */
|
static const uint32_t T[4][16] = { { 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, /* Round 1 */
|
||||||
0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, 0x6b901122, 0xfd987193,
|
0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, 0x6b901122, 0xfd987193,
|
||||||
0xa679438e, 0x49b40821 },
|
0xa679438e, 0x49b40821 },
|
||||||
|
|
||||||
{ 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, /* Round 2 */
|
{ 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, /* Round 2 */
|
||||||
0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, 0xa9e3e905, 0xfcefa3f8,
|
0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, 0xa9e3e905, 0xfcefa3f8,
|
||||||
0x676f02d9, 0x8d2a4c8a },
|
0x676f02d9, 0x8d2a4c8a },
|
||||||
|
|
||||||
{ 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, /* Round 3 */
|
{ 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, /* Round 3 */
|
||||||
0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, 0xd9d4d039, 0xe6db99e5,
|
0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, 0xd9d4d039, 0xe6db99e5,
|
||||||
0x1fa27cf8, 0xc4ac5665 },
|
0x1fa27cf8, 0xc4ac5665 },
|
||||||
|
|
||||||
{ 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, /* Round 4 */
|
{ 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, /* Round 4 */
|
||||||
0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, 0xf7537e82, 0xbd3af235,
|
0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, 0xf7537e82, 0xbd3af235,
|
||||||
0x2ad7d2bb, 0xeb86d391 }, };
|
0x2ad7d2bb, 0xeb86d391 }, };
|
||||||
|
|
||||||
/* -------------------------------------------------------------------------- **
|
/* -------------------------------------------------------------------------- **
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
|
||||||
0x6ED9EBA1,
|
0x6ED9EBA1,
|
||||||
0x8F1BBCDC,
|
0x8F1BBCDC,
|
||||||
0xCA62C1D6
|
0xCA62C1D6
|
||||||
};
|
};
|
||||||
int t; /* Loop counter */
|
int t; /* Loop counter */
|
||||||
unsigned temp; /* Temporary word value */
|
unsigned temp; /* Temporary word value */
|
||||||
unsigned W[80]; /* Word sequence */
|
unsigned W[80]; /* Word sequence */
|
||||||
|
|
|
||||||
|
|
@ -95,10 +95,70 @@ double swapDouble(double val)
|
||||||
retFloat[1] = convFloat[6];
|
retFloat[1] = convFloat[6];
|
||||||
retFloat[2] = convFloat[5];
|
retFloat[2] = convFloat[5];
|
||||||
retFloat[3] = convFloat[4];
|
retFloat[3] = convFloat[4];
|
||||||
retFloat[0] = convFloat[3];
|
retFloat[4] = convFloat[3];
|
||||||
retFloat[1] = convFloat[2];
|
retFloat[5] = convFloat[2];
|
||||||
retFloat[2] = convFloat[1];
|
retFloat[6] = convFloat[1];
|
||||||
retFloat[3] = convFloat[0];
|
retFloat[7] = convFloat[0];
|
||||||
|
|
||||||
return (double)((Uint64)retVal);
|
return (double)((Uint64)retVal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//src points to the yaz0 source data (to the "real" source data, not at the header!)
|
||||||
|
//dst points to a buffer uncompressedSize bytes large (you get uncompressedSize from
|
||||||
|
//the second 4 bytes in the Yaz0 header).
|
||||||
|
void yaz0Decode(Uint8* src, Uint8* dst, Uint32 uncompressedSize)
|
||||||
|
{
|
||||||
|
Uint32 srcPlace = 0, dstPlace = 0; //current read/write positions
|
||||||
|
|
||||||
|
Int32 validBitCount = 0; //number of valid bits left in "code" byte
|
||||||
|
Uint8 currCodeByte;
|
||||||
|
while(dstPlace < uncompressedSize)
|
||||||
|
{
|
||||||
|
//read new "code" byte if the current one is used up
|
||||||
|
if(validBitCount == 0)
|
||||||
|
{
|
||||||
|
currCodeByte = src[srcPlace];
|
||||||
|
++srcPlace;
|
||||||
|
validBitCount = 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
if((currCodeByte & 0x80) != 0)
|
||||||
|
{
|
||||||
|
//straight copy
|
||||||
|
dst[dstPlace] = src[srcPlace];
|
||||||
|
dstPlace++;
|
||||||
|
srcPlace++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//RLE part
|
||||||
|
Uint8 byte1 = src[srcPlace];
|
||||||
|
Uint8 byte2 = src[srcPlace + 1];
|
||||||
|
srcPlace += 2;
|
||||||
|
|
||||||
|
Uint32 dist = ((byte1 & 0xF) << 8) | byte2;
|
||||||
|
Uint32 copySource = dstPlace - (dist + 1);
|
||||||
|
|
||||||
|
Uint32 numBytes = byte1 >> 4;
|
||||||
|
if(numBytes == 0)
|
||||||
|
{
|
||||||
|
numBytes = src[srcPlace] + 0x12;
|
||||||
|
srcPlace++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
numBytes += 2;
|
||||||
|
|
||||||
|
//copy run
|
||||||
|
for(Uint32 i = 0; i < numBytes; ++i)
|
||||||
|
{
|
||||||
|
dst[dstPlace] = dst[copySource];
|
||||||
|
copySource++;
|
||||||
|
dstPlace++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//use next bit from "code" byte
|
||||||
|
currCodeByte <<= 1;
|
||||||
|
validBitCount-=1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue