Advertisement
Guest User

git patch

a guest
Apr 3rd, 2016
64
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.66 KB | None | 0 0
  1. diff --git a/gemrb/includes/plugindef.h b/gemrb/includes/plugindef.h
  2. index c36636b..66d7ca6 100644
  3. --- a/gemrb/includes/plugindef.h
  4. +++ b/gemrb/includes/plugindef.h
  5. @@ -186,7 +186,7 @@ GEM_EXPORT_DLL const char* GemRBPlugin_Version()
  6.  
  7. #define GEMRB_PLUGIN(id, desc) \
  8. namespace { using namespace GemRB; \
  9. - bool doRegisterPlugin = (
  10. + bool doRegisterPlugin __attribute__((unused)) = (
  11.  
  12. #define PLUGIN_CLASS(id, cls) \
  13. PluginMgr::Get()->RegisterPlugin(id, &CreatePlugin<cls>::func ),
  14. diff --git a/gemrb/includes/voodooconst.h b/gemrb/includes/voodooconst.h
  15. index a5f998d..9129f97 100644
  16. --- a/gemrb/includes/voodooconst.h
  17. +++ b/gemrb/includes/voodooconst.h
  18. @@ -53,8 +53,7 @@ static const int VOODOO_FINDTRAP_RANGE = 10;
  19. // test cases: tob pp summoning spirit, pst portals, pst AR0405, AR0508, ar0500 (guards through gates)
  20. // it's about 3 times bigger in pst, perhaps related to the bigger sprite sizes and we modify it in Scriptable
  21. // The distance of operating a trigger, container, dialog buffer etc.
  22. -static unsigned int MAX_OPERATING_DISTANCE = 40; //a search square is 16x12 (diagonal of 20), so that's about two
  23. -static const unsigned int ___MOD = MAX_OPERATING_DISTANCE; // just to silence var-unused errors
  24. +static unsigned int MAX_OPERATING_DISTANCE __attribute__((unused)) = 40; //a search square is 16x12 (diagonal of 20), so that's about two
  25.  
  26. // used for the shout action, supposedly "slightly larger than the default visual radius of NPCs"
  27. // while it looks too big, it is needed this big in at least pst (help())
  28. diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
  29. index 367f575..748e559 100644
  30. --- a/gemrb/plugins/GUIScript/GUIScript.cpp
  31. +++ b/gemrb/plugins/GUIScript/GUIScript.cpp
  32. @@ -13620,7 +13620,7 @@ static PyObject* GemRB_SpellCast(PyObject * /*self*/, PyObject* args)
  33. core->FreeString(tmp);
  34. print("Target: %d", spelldata.Target);
  35. print("Range: %d", spelldata.Range);
  36. - if(! (1<<spelldata.type) & type) {
  37. + if(! ((1<<spelldata.type) & type)) {
  38. return RuntimeError( "Wrong type of spell!");
  39. }
  40.  
  41. diff --git a/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp b/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp
  42. index df686fb..ffe2cf2 100644
  43. --- a/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp
  44. +++ b/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp
  45. @@ -192,7 +192,7 @@ unsigned int AmbientMgrAL::AmbientSource::tick(unsigned int ticks, Point listene
  46. return UINT_MAX;
  47. }
  48.  
  49. - if ((!(ambient->getFlags() & IE_AMBI_ENABLED)) || (!ambient->getAppearance() & timeslice)) {
  50. + if ((!(ambient->getFlags() & IE_AMBI_ENABLED)) || !(ambient->getAppearance() & timeslice)) {
  51. // disabled
  52.  
  53. if (stream >= 0) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement