Merge branch 'hotfix'

This commit is contained in:
SilentSpike 2015-07-27 18:34:51 +01:00
commit 12dca2e684
5 changed files with 6 additions and 6 deletions

View File

@ -10,7 +10,7 @@
*
* Public: No
*/
#define DEBUG_MODE_FULL
//#define DEBUG_MODE_FULL
#include "script_component.hpp"
#define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson))

View File

@ -4,8 +4,8 @@
#define PREFIX ace
#define MAJOR 3
#define MINOR 1
#define PATCHLVL 2
#define MINOR 2
#define PATCHLVL 0
#define BUILD 0
#define VERSION MAJOR.MINOR.PATCHLVL.BUILD

View File

@ -30,7 +30,7 @@ _currentModes = GVAR(availableModes);
_newModes = _addModes arrayIntersect [0,1,2];
_newModes append (_currentModes - _removeModes);
_newModes arrayIntersect _newModes;
_newModes = _newModes arrayIntersect _newModes;
_newModes sort true;
// Can't become an empty array

View File

@ -26,7 +26,7 @@ params [["_addSides",[],[[]]], ["_removeSides",[],[[]]]];
_addSides append (GVAR(availableSides) - _removeSides);
// Only need array of unique sides
_addSides arrayIntersect _addSides;
_addSides = _addSides arrayIntersect _addSides;
GVAR(availableSides) = _addSides;

View File

@ -38,7 +38,7 @@ _currentModes = GVAR(availableVisions);
_newModes = _addModes arrayIntersect [-2,-1,0,1,2,3,4,5,6,7];
_newModes append (_currentModes - _removeModes);
_newModes arrayIntersect _newModes;
_newModes = _newModes arrayIntersect _newModes;
_newModes sort true;
// Can't become an empty array