mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-06-19 07:57:05 -04:00
Fix TWO_ACTOR_PARAMS overlap between pots
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#include "static_data.h"
|
||||
|
||||
#define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
|
||||
#define TWO_ACTOR_PARAMS(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
|
||||
|
||||
std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
#define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
|
||||
#define TWO_ACTOR_PARAMS(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
|
||||
|
||||
namespace RandomizerCheckObjects {
|
||||
bool AreaIsDungeon(RandomizerCheckArea area);
|
||||
|
||||
Reference in New Issue
Block a user