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

De-dupe defines

Browse Source
This commit is contained in:
aMannus 2024-01-27 21:37:15 +01:00
parent b37f531a26
commit 5148355588
3 changed files with 2 additions and 4 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,7 +1,5 @@
#include "static_data.h" #include "static_data.h"
#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;
std::vector<RandomizerCheck> KF_ShopLocations = { std::vector<RandomizerCheck> KF_ShopLocations = {

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

@ -6,6 +6,8 @@
#define MAX_TRICK_NAME_SIZE 50 #define MAX_TRICK_NAME_SIZE 50
#define TWO_ACTOR_PARAMS(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
// This should probably go in a less rando-specific location // This should probably go in a less rando-specific location
// but the best location will probably be in the modding engine // but the best location will probably be in the modding engine
// which doesn't exist yet. // which doesn't exist yet.

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

@ -6,8 +6,6 @@
#include <vector> #include <vector>
#include <map> #include <map>
#define TWO_ACTOR_PARAMS(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
namespace RandomizerCheckObjects { namespace RandomizerCheckObjects {
bool AreaIsDungeon(RandomizerCheckArea area); bool AreaIsDungeon(RandomizerCheckArea area);
bool AreaIsOverworld(RandomizerCheckArea area); bool AreaIsOverworld(RandomizerCheckArea area);