mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 14:22:17 -05:00
Code Issues Projects Releases Wiki Activity

Fix TWO_ACTOR_PARAMS overlap between pots

Browse Source
This commit is contained in:
aMannus 2024-01-27 21:29:43 +01:00
parent 2a36ae1818
commit b37f531a26
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/location_list.cpp
View File

@ -1,6 +1,6 @@
#include "static_data.h" #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; std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;

2
soh/soh/Enhancements/randomizer/randomizer_check_objects.h
View File

@ -6,7 +6,7 @@
#include <vector> #include <vector>
#include <map> #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 { namespace RandomizerCheckObjects {
bool AreaIsDungeon(RandomizerCheckArea area); bool AreaIsDungeon(RandomizerCheckArea area);