From 51ffd6d9c64eb2ae5fdf572c32087337ab1042c8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 2 Oct 2016 01:00:07 +0200 Subject: [PATCH] - fixed some warnings. - A_SetRenderStyle should not default to STYLE_None. --- src/p_mobj.cpp | 2 +- src/serializer.cpp | 1 - wadsrc/static/actors/actor.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 90a800fa7..e39a07b2d 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -3526,7 +3526,7 @@ void AActor::Tick () sector_t *sec = node->m_sector; DVector2 scrollv; - if (level.Scrolls.Size() > (sec-sectors)) + if (level.Scrolls.Size() > unsigned(sec-sectors)) { scrollv = level.Scrolls[sec - sectors]; } diff --git a/src/serializer.cpp b/src/serializer.cpp index 47e096b7b..a4714292a 100644 --- a/src/serializer.cpp +++ b/src/serializer.cpp @@ -821,7 +821,6 @@ void FSerializer::WriteObjects() for (unsigned i = 0; i < w->mDObjects.Size(); i++) { auto obj = w->mDObjects[i]; - player_t *player; BeginObject(nullptr); w->Key("classtype"); diff --git a/wadsrc/static/actors/actor.txt b/wadsrc/static/actors/actor.txt index fc73b02f3..713e1497f 100644 --- a/wadsrc/static/actors/actor.txt +++ b/wadsrc/static/actors/actor.txt @@ -218,7 +218,7 @@ ACTOR Actor native //: Thinker native void A_LogInt(int whattoprint); native void A_LogFloat(float whattoprint); native void A_SetTranslucent(float alpha, int style = 0); - native void A_SetRenderStyle(float alpha, int style = 0); + native void A_SetRenderStyle(float alpha, int style); action native A_FadeIn(float reduce = 0.1, int flags = 0); action native A_FadeOut(float reduce = 0.1, int flags = 1); //bool remove == true native void A_FadeTo(float target, float amount = 0.1, int flags = 0);