mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-26 02:07:26 +00:00
Code Issues Releases Wiki Activity

Some more warning related stuff, but changed my mind about re-enabling the remaining ones :/

Browse source
This commit is contained in:
fgenesis 2017-01-19 23:44:30 +01:00
parent 7a60f493a5
commit d7cdb72143
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BBGE/Base.h
View file

@ -50,11 +50,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#pragma warning(disable:4505) // unreferenced local function has been removed #pragma warning(disable:4505) // unreferenced local function has been removed
#pragma warning(disable:4702) // unreachable code #pragma warning(disable:4702) // unreachable code
#pragma warning(disable:4127) // conditional expression is constant #pragma warning(disable:4127) // conditional expression is constant
#pragma warning(disable:4706) // assignment within conditional expression //#pragma warning(disable:4706) // assignment within conditional expression
#pragma warning(disable:4389) // signed/unsigned mismatch //#pragma warning(disable:4389) // signed/unsigned mismatch
#pragma warning(disable:4189) // UqqqqSEFUL: local variable is initialized but not referenced //#pragma warning(disable:4189) // UqqqqSEFUL: local variable is initialized but not referenced
#endif #endif
#include <stddef.h> #include <stddef.h>

8
BBGE/SkeletalSprite.cpp
View file

@ -74,7 +74,7 @@ Bone::Bone() : Quad()
animated = ANIM_ALL; animated = ANIM_ALL;
originalScale = Vector(1,1); originalScale = Vector(1,1);
boneIdx = pidx = -1; boneIdx = pidx = -1;
rbp = 0; rbp = false;
segmentChain = 0; segmentChain = 0;
minDist = maxDist = 128; minDist = maxDist = 128;
@ -904,7 +904,7 @@ bool SkeletalSprite::saveSkeletal(const std::string &fn)
bone->SetAttribute("sel", this->bones[i]->selectable); bone->SetAttribute("sel", this->bones[i]->selectable);
} }
if (this->bones[i]->rbp) if (this->bones[i]->rbp)
bone->SetAttribute("rbp", this->bones[i]->rbp); bone->SetAttribute("rbp", (int)this->bones[i]->rbp);
if (this->bones[i]->originalRenderPass) if (this->bones[i]->originalRenderPass)
bone->SetAttribute("pass", this->bones[i]->originalRenderPass); bone->SetAttribute("pass", this->bones[i]->originalRenderPass);
if (this->bones[i]->offset.x) if (this->bones[i]->offset.x)
@ -1053,7 +1053,7 @@ Bone *SkeletalSprite::getBoneByIdx(size_t idx)
return 0; return 0;
} }
Bone *SkeletalSprite::initBone(int idx, std::string gfx, int pidx, int rbp, std::string name, float cr, bool fh, bool fv) Bone *SkeletalSprite::initBone(int idx, std::string gfx, int pidx, bool rbp, std::string name, float cr, bool fh, bool fv)
{ {
Bone *b = new Bone; Bone *b = new Bone;
b->boneIdx = idx; b->boneIdx = idx;
@ -1162,7 +1162,7 @@ void SkeletalSprite::loadSkin(const std::string &fn)
if (boneXml->Attribute("rq")) if (boneXml->Attribute("rq"))
{ {
int rq = atoi(boneXml->Attribute("rq")); int rq = atoi(boneXml->Attribute("rq"));
b->renderQuad = rq; b->renderQuad = !!rq;
} }
std::string gfx; std::string gfx;

5
BBGE/SkeletalSprite.h
View file

@ -61,7 +61,8 @@ public:
std::string gfx; std::string gfx;
std::string name; std::string name;
size_t boneIdx; size_t boneIdx;
int pidx, rbp; int pidx;
bool rbp;
std::string prt; std::string prt;
std::vector<Vector> changeStrip; std::vector<Vector> changeStrip;
@ -282,7 +283,7 @@ protected:
size_t selectedBone; size_t selectedBone;
friend class AnimationLayer; friend class AnimationLayer;
std::vector<AnimationLayer> animLayers; std::vector<AnimationLayer> animLayers;
Bone* initBone(int idx, std::string gfx, int pidx, int rbp=0, std::string name="", float cr=0, bool fh=false, bool fv=false); Bone* initBone(int idx, std::string gfx, int pidx, bool rbp=false, std::string name="", float cr=0, bool fh=false, bool fv=false);
void deleteBones(); void deleteBones();
void onUpdate(float dt); void onUpdate(float dt);
}; };