Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/gemrb/includes/plugindef.h b/gemrb/includes/plugindef.h
- index c36636b..66d7ca6 100644
- --- a/gemrb/includes/plugindef.h
- +++ b/gemrb/includes/plugindef.h
- @@ -186,7 +186,7 @@ GEM_EXPORT_DLL const char* GemRBPlugin_Version()
- #define GEMRB_PLUGIN(id, desc) \
- namespace { using namespace GemRB; \
- - bool doRegisterPlugin = (
- + bool doRegisterPlugin __attribute__((unused)) = (
- #define PLUGIN_CLASS(id, cls) \
- PluginMgr::Get()->RegisterPlugin(id, &CreatePlugin<cls>::func ),
- diff --git a/gemrb/includes/voodooconst.h b/gemrb/includes/voodooconst.h
- index a5f998d..9129f97 100644
- --- a/gemrb/includes/voodooconst.h
- +++ b/gemrb/includes/voodooconst.h
- @@ -53,8 +53,7 @@ static const int VOODOO_FINDTRAP_RANGE = 10;
- // test cases: tob pp summoning spirit, pst portals, pst AR0405, AR0508, ar0500 (guards through gates)
- // it's about 3 times bigger in pst, perhaps related to the bigger sprite sizes and we modify it in Scriptable
- // The distance of operating a trigger, container, dialog buffer etc.
- -static unsigned int MAX_OPERATING_DISTANCE = 40; //a search square is 16x12 (diagonal of 20), so that's about two
- -static const unsigned int ___MOD = MAX_OPERATING_DISTANCE; // just to silence var-unused errors
- +static unsigned int MAX_OPERATING_DISTANCE __attribute__((unused)) = 40; //a search square is 16x12 (diagonal of 20), so that's about two
- // used for the shout action, supposedly "slightly larger than the default visual radius of NPCs"
- // while it looks too big, it is needed this big in at least pst (help())
- diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
- index 367f575..748e559 100644
- --- a/gemrb/plugins/GUIScript/GUIScript.cpp
- +++ b/gemrb/plugins/GUIScript/GUIScript.cpp
- @@ -13620,7 +13620,7 @@ static PyObject* GemRB_SpellCast(PyObject * /*self*/, PyObject* args)
- core->FreeString(tmp);
- print("Target: %d", spelldata.Target);
- print("Range: %d", spelldata.Range);
- - if(! (1<<spelldata.type) & type) {
- + if(! ((1<<spelldata.type) & type)) {
- return RuntimeError( "Wrong type of spell!");
- }
- diff --git a/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp b/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp
- index df686fb..ffe2cf2 100644
- --- a/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp
- +++ b/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp
- @@ -192,7 +192,7 @@ unsigned int AmbientMgrAL::AmbientSource::tick(unsigned int ticks, Point listene
- return UINT_MAX;
- }
- - if ((!(ambient->getFlags() & IE_AMBI_ENABLED)) || (!ambient->getAppearance() & timeslice)) {
- + if ((!(ambient->getFlags() & IE_AMBI_ENABLED)) || !(ambient->getAppearance() & timeslice)) {
- // disabled
- if (stream >= 0) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement