* Remove remaining references to libZelda

This commit is contained in:
2014-04-20 03:28:28 -07:00
parent 0429eb57b8
commit d54dc30cb6
18 changed files with 150 additions and 150 deletions

View File

@@ -1,17 +1,17 @@
// This file is part of libZelda.
// This file is part of libAthena.
//
// libZelda is free software: you can redistribute it and/or modify
// libAthena 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,
// libAthena 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/>
// along with libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ALTTP_ENUMS_HPP__
#define __ALTTP_ENUMS_HPP__

View File

@@ -1,17 +1,17 @@
// This file is part of libZelda.
// This file is part of libAthena.
//
// libZelda is free software: you can redistribute it and/or modify
// libAthena 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,
// libAthena 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/>
// along with libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ALTTP_FILE_HPP__
#define __ALTTP_FILE_HPP__

View File

@@ -1,17 +1,17 @@
// This file is part of libZelda.
// This file is part of libAthena.
//
// libZelda is free software: you can redistribute it and/or modify
// libAthena 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,
// libAthena 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/>
// along with libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ALTTP_FILE_READER_HPP__
#define __ALTTP_FILE_READER_HPP__

View File

@@ -1,17 +1,17 @@
// This file is part of libZelda.
// This file is part of libAthena.
//
// libZelda is free software: you can redistribute it and/or modify
// libAthena 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,
// libAthena 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/>
// along with libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ALTTP_FILE_WRITER_HPP__
#define __ALTTP_FILE_WRITER_HPP__

View File

@@ -1,17 +1,17 @@
// This file is part of libZelda.
// This file is part of libAthena.
//
// libZelda is free software: you can redistribute it and/or modify
// libAthena 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,
// libAthena 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/>
// along with libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ALTTP_QUEST_HPP__
#define __ALTTP_QUEST_HPP__

View File

@@ -1,17 +1,17 @@
// This file is part of libZelda.
// This file is part of libAthena.
//
// libZelda is free software: you can redistribute it and/or modify
// libAthena 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,
// libAthena 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/>
// along with libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __ALTTP_STRUCTS_HPP__
#define __ALTTP_STRUCTS_HPP__

View File

@@ -1,17 +1,17 @@
// This file is part of libZelda.
// This file is part of libAthena.
//
// libZelda is free software: you can redistribute it and/or modify
// libAthena 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,
// libAthena 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/>
// along with libAthena. If not, see <http://www.gnu.org/licenses/>
#ifndef __BINARYREADER_HPP__
#define __BINARYREADER_HPP__

View File

@@ -16,7 +16,7 @@
#ifndef SSPRITE_HPP
#define SSPRITE_HPP
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
#include <vector>
#include <string>
#else
@@ -34,7 +34,7 @@ namespace Sakura
class SpriteFile;
class SpriteFrame;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
class Sprite
{
#else
@@ -52,7 +52,7 @@ public:
virtual ~Sprite();
virtual void setPosition(const float x, const float y);
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
virtual void setPosition(const Vector2Df& pos);
virtual Vector2Df position() const;
void setName(const std::string& name);
@@ -73,7 +73,7 @@ public:
*/
int stateId(int index) const;
void setStateIds(std::vector<int> ids);
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
std::vector<int> stateIds() const;
#else
QList<int> stateIds() const;
@@ -86,14 +86,14 @@ public:
bool removeFrame(SpriteFrame* Frame);
SpriteFrame* Frame(Uint32 id);
void setFrame(Uint32 id);
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setFrames(std::vector<SpriteFrame*> frames);
#else
void setFrames(QList<SpriteFrame*> frames);
#endif
Uint32 frameCount() const;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
std::vector<SpriteFrame*> frames() const;
#else
QList<SpriteFrame*> frames() const;
@@ -110,7 +110,7 @@ public:
void setRoot(SpriteFile* root);
SpriteFile* root() const;
#ifdef LIBZELDA_USE_QT
#ifdef ATHENA_USE_QT
signals:
void frameChanged(SpriteFrame* frame);
void nameChanged(QString);
@@ -118,7 +118,7 @@ signals:
#endif
private:
SpriteFile* m_root;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
std::string m_name;
Vector2Df m_position;
std::vector<int> m_stateIds; //!< Stores the texture id's for each state.
@@ -137,9 +137,9 @@ private:
} // Sakura
} // zelda
#ifdef LIBZELDA_USE_QT
#ifdef ATHENA_USE_QT
Q_DECLARE_METATYPE(Uint32)
Q_DECLARE_METATYPE(zelda::Sakura::Sprite*)
Q_DECLARE_METATYPE(Athena::Sakura::Sprite*)
#endif
#endif // SSPRITE_HPP

View File

@@ -16,7 +16,7 @@
#ifndef SSPRITEFILE_HPP
#define SSPRITEFILE_HPP
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
#include <vector>
#include <unordered_map>
#else
@@ -41,7 +41,7 @@ struct STexture
};
class Sprite;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
class SpriteFile
{
#else
@@ -99,7 +99,7 @@ public:
* \param size
* \param origin
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
SpriteFile(const Vector2Di& size, const Vector2Df& origin);
#else
SpriteFile(const QSize& size, const QPoint& origin);
@@ -107,7 +107,7 @@ public:
~SpriteFile();
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
public:
#else
public slots:
@@ -124,7 +124,7 @@ public slots:
* \brief setSize
* \param size
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setSize(const Vector2Di& size);
#else
void setSize(const QSize& size);
@@ -134,7 +134,7 @@ public slots:
* \brief size
* \return
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
Vector2Di size() const;
#else
QSize size() const;
@@ -163,7 +163,7 @@ public slots:
* \brief setOrigin
* \param origin
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setOrigin(const Vector2Df& origin);
#else
void setOrigin(const QPoint& origin);
@@ -173,7 +173,7 @@ public slots:
* \brief origin
* \return
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
Vector2Df origin() const;
#else
QPoint origin() const;
@@ -211,7 +211,7 @@ public slots:
*/
STexture* texture(Uint32 id);
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
std::vector<STexture*> textures() const;
#else
QList<STexture*> textures() const;
@@ -222,7 +222,7 @@ public slots:
* \param textures
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setTextures(std::vector<STexture*> textures);
#else
void setTextures(QList<STexture*> textures);
@@ -230,19 +230,19 @@ public slots:
void addSprite(Sprite* sprite);
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void removeSprite(const std::string& name);
#else
void removeSprite(const QString& name);
#endif
void removeSprite(Sprite* sprite);
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setSprites(std::unordered_map<std::string, Sprite*> sprites);
#else
void setSprites(QMap<QString, Sprite*> sprites);
#endif
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
Sprite* sprite(const std::string& name);
std::unordered_map<std::string, Sprite*> sprites() const;
#else
@@ -252,13 +252,13 @@ public slots:
Uint32 spriteCount() const;
#ifdef LIBZELDA_USE_QT
#ifdef ATHENA_USE_QT
signals:
void originChanged(QPoint);
void sizeChanged(QSize);
#endif
private:
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
std::vector<STexture*> m_textures;
Vector2Di m_size;
Vector2Df m_origin;
@@ -273,8 +273,8 @@ signals:
} // Sakura
} // Zelda
#ifdef LIBZELDA_USE_QT
Q_DECLARE_METATYPE(zelda::Sakura::SpriteFile*)
Q_DECLARE_METATYPE(zelda::Sakura::STexture*)
#ifdef ATHENA_USE_QT
Q_DECLARE_METATYPE(Athena::Sakura::SpriteFile*)
Q_DECLARE_METATYPE(Athena::Sakura::STexture*)
#endif
#endif // SSPRITE_HPP

View File

@@ -19,7 +19,7 @@
#include "Athena/Global.hpp"
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
#include <vector>
#else
#include <QObject>
@@ -34,7 +34,7 @@ namespace Sakura
class Sprite;
class SpritePart;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
class SpriteFrame
{
#else
@@ -63,7 +63,7 @@ public:
*/
float frameTime() const;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setParts(std::vector<SpritePart*> parts);
std::vector<SpritePart*> parts() const;
#else
@@ -75,14 +75,14 @@ public:
void setRoot(Sprite* root);
Sprite* root() const;
#ifdef LIBZELDA_USE_QT
#ifdef ATHENA_USE_QT
signals:
void frameTimeChanged(float);
#endif
private:
Sprite* m_root;
float m_frameTime;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
std::vector<SpritePart*> m_parts;
#else
QList<SpritePart*> m_parts;
@@ -92,8 +92,8 @@ private:
} // Sakura
} // zelda
#ifdef LIBZELDA_USE_QT
Q_DECLARE_METATYPE(zelda::Sakura::SpriteFrame*);
#ifdef ATHENA_USE_QT
Q_DECLARE_METATYPE(Athena::Sakura::SpriteFrame*);
#endif
#endif // SSPRITEFRAME_HPP

View File

@@ -17,7 +17,7 @@
#define SSPRITEPART_HPP
#include "Athena/Global.hpp"
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
# include <vector>
#else
# include <QObject>
@@ -34,7 +34,7 @@ namespace Sakura
{
class SpriteFrame;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
class SpritePart
{
#else
@@ -55,7 +55,7 @@ public:
virtual ~SpritePart();
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setName(const std::string& name);
std::string name() const;
#else
@@ -77,7 +77,7 @@ public:
* \brief setOffset
* \param offset
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setOffset(const Vector2Df& offset);
#else
void setOffset(const QPoint& offset);
@@ -87,7 +87,7 @@ public:
* \brief offset
* \return
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
Vector2Df offset() const;
#else
QPoint offset() const;
@@ -104,7 +104,7 @@ public:
* \brief setTextureOffset
* \param texOff
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setTextureOffset(const Vector2Df& offset);
#else
void setTextureOffset(const QPoint& offset);
@@ -114,7 +114,7 @@ public:
* \brief textureOffset
* \return
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
Vector2Df textureOffset() const;
#else
QPoint textureOffset() const;
@@ -131,7 +131,7 @@ public:
* \brief setSize
* \param size
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
void setSize(const Vector2Di& size);
#else
void setSize(const QSize& size);
@@ -141,7 +141,7 @@ public:
* \brief size
* \return
*/
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
Vector2Di size() const;
#else
QSize size() const;
@@ -174,7 +174,7 @@ public:
void setRoot(SpriteFrame* root);
SpriteFrame* root() const;
#ifdef LIBZELDA_USE_QT
#ifdef ATHENA_USE_QT
signals:
void nameChanged(QString);
void orientationChanged(bool,bool);
@@ -186,13 +186,13 @@ signals:
private:
SpriteFrame* m_root;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
std::string m_name;
#else
QString m_name;
#endif
bool m_hasCollision;
#ifndef LIBZELDA_USE_QT
#ifndef ATHENA_USE_QT
Vector2Df m_offset;
Vector2Df m_textureOffset;
Vector2Di m_size;
@@ -208,8 +208,8 @@ private:
}
}
#ifdef LIBZELDA_USE_QT
Q_DECLARE_METATYPE(zelda::Sakura::SpritePart*)
#ifdef ATHENA_USE_QT
Q_DECLARE_METATYPE(Athena::Sakura::SpritePart*)
#endif
#endif // SSPRITEPART_HPP