mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge branch 'hotfix'
This commit is contained in:
commit
12dca2e684
@ -10,7 +10,7 @@
|
|||||||
*
|
*
|
||||||
* Public: No
|
* Public: No
|
||||||
*/
|
*/
|
||||||
#define DEBUG_MODE_FULL
|
//#define DEBUG_MODE_FULL
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
#define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson))
|
#define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson))
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
#define PREFIX ace
|
#define PREFIX ace
|
||||||
|
|
||||||
#define MAJOR 3
|
#define MAJOR 3
|
||||||
#define MINOR 1
|
#define MINOR 2
|
||||||
#define PATCHLVL 2
|
#define PATCHLVL 0
|
||||||
#define BUILD 0
|
#define BUILD 0
|
||||||
|
|
||||||
#define VERSION MAJOR.MINOR.PATCHLVL.BUILD
|
#define VERSION MAJOR.MINOR.PATCHLVL.BUILD
|
||||||
|
@ -30,7 +30,7 @@ _currentModes = GVAR(availableModes);
|
|||||||
_newModes = _addModes arrayIntersect [0,1,2];
|
_newModes = _addModes arrayIntersect [0,1,2];
|
||||||
_newModes append (_currentModes - _removeModes);
|
_newModes append (_currentModes - _removeModes);
|
||||||
|
|
||||||
_newModes arrayIntersect _newModes;
|
_newModes = _newModes arrayIntersect _newModes;
|
||||||
_newModes sort true;
|
_newModes sort true;
|
||||||
|
|
||||||
// Can't become an empty array
|
// Can't become an empty array
|
||||||
|
@ -26,7 +26,7 @@ params [["_addSides",[],[[]]], ["_removeSides",[],[[]]]];
|
|||||||
_addSides append (GVAR(availableSides) - _removeSides);
|
_addSides append (GVAR(availableSides) - _removeSides);
|
||||||
|
|
||||||
// Only need array of unique sides
|
// Only need array of unique sides
|
||||||
_addSides arrayIntersect _addSides;
|
_addSides = _addSides arrayIntersect _addSides;
|
||||||
|
|
||||||
GVAR(availableSides) = _addSides;
|
GVAR(availableSides) = _addSides;
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ _currentModes = GVAR(availableVisions);
|
|||||||
_newModes = _addModes arrayIntersect [-2,-1,0,1,2,3,4,5,6,7];
|
_newModes = _addModes arrayIntersect [-2,-1,0,1,2,3,4,5,6,7];
|
||||||
_newModes append (_currentModes - _removeModes);
|
_newModes append (_currentModes - _removeModes);
|
||||||
|
|
||||||
_newModes arrayIntersect _newModes;
|
_newModes = _newModes arrayIntersect _newModes;
|
||||||
_newModes sort true;
|
_newModes sort true;
|
||||||
|
|
||||||
// Can't become an empty array
|
// Can't become an empty array
|
||||||
|
Loading…
Reference in New Issue
Block a user