openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Make some tables static const

Browse Source
This commit is contained in:
Celtic Minstrel
2016-08-15 17:46:14 -04:00
parent c6bbc0e2af
commit 4d739936cb
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/boe.combat.cpp
View File

@@ -3398,7 +3398,7 @@ bool monst_cast_mage(cCreature *caster,short targ) {
bool acted = false;
location target,ashes_loc,l;
cCreature *affected;
const eSpell caster_array[7][18] = {
static const eSpell caster_array[7][18] = {
{
eSpell::SPARK, eSpell::SPARK, eSpell::SPARK, eSpell::HASTE_MINOR, eSpell::HASTE_MINOR,
eSpell::HASTE_MINOR, eSpell::SPARK, eSpell::STRENGTH, eSpell::CLOUD_FLAME, eSpell::CLOUD_FLAME,
@@ -3439,7 +3439,7 @@ bool monst_cast_mage(cCreature *caster,short targ) {
// 0 - cast when slowed, 1 - don't have enough friends, 2 - lots of clustered enemies, 3 - low on health
// TODO: In column 3, level 1 monsters shouldn't have flame (a level 2 spell), and level 5 monsters shouldn't use haste.
// (The latter is because column 3 is also used if they're already hasted.)
eSpell emer_spells[7][4] = {
static const eSpell emer_spells[7][4] = {
{eSpell::HASTE_MINOR, eSpell::NONE, eSpell::NONE, eSpell::FLAME},
{eSpell::HASTE_MINOR, eSpell::SUMMON_BEAST, eSpell::CONFLAGRATION, eSpell::SLOW},
{eSpell::HASTE_MINOR, eSpell::SUMMON_WEAK, eSpell::FIREBALL, eSpell::SUMMON_WEAK},
@@ -3448,7 +3448,7 @@ bool monst_cast_mage(cCreature *caster,short targ) {
{eSpell::HASTE_MAJOR, eSpell::DEMON, eSpell::FIRESTORM, eSpell::DEMON},
{eSpell::HASTE_MAJOR, eSpell::SUMMON_MAJOR, eSpell::FIRESTORM, eSpell::SHOCKWAVE},
};
std::set<eSpell> area_effects = {
static const std::set<eSpell> area_effects = {
eSpell::CLOUD_STINK, eSpell::CONFLAGRATION, eSpell::FIREBALL, eSpell::WEB, eSpell::FIRESTORM, eSpell::SHOCKSTORM,
};
@@ -3735,7 +3735,7 @@ bool monst_cast_priest(cCreature *caster,short targ) {
bool acted = false;
location target,l;
cCreature *affected;
eSpell caster_array[7][10] = {
static const eSpell caster_array[7][10] = {
{
eSpell::BLESS_MINOR, eSpell::BLESS_MINOR, eSpell::BLESS_MINOR, eSpell::BLESS_MINOR, eSpell::WRACK,
eSpell::WRACK, eSpell::WRACK, eSpell::GOO, eSpell::GOO, eSpell::GOO,
@@ -3760,7 +3760,7 @@ bool monst_cast_priest(cCreature *caster,short targ) {
},
};
// 0 - cast when slowed, 1 - don't have enough friends, 2 - lots of clustered enemies, 3 - low on health
eSpell emer_spells[7][4] = {
static const eSpell emer_spells[7][4] = {
{eSpell::NONE, eSpell::BLESS_MINOR, eSpell::NONE, eSpell::HEAL_MINOR},
{eSpell::NONE, eSpell::SUMMON_SPIRIT, eSpell::NONE, eSpell::HEAL_MINOR},
{eSpell::NONE, eSpell::SUMMON_SPIRIT, eSpell::NONE, eSpell::HEAL},
@@ -3769,7 +3769,7 @@ bool monst_cast_priest(cCreature *caster,short targ) {
{eSpell::NONE, eSpell::SUMMON_HOST, eSpell::FLAMESTRIKE, eSpell::HEAL_ALL},
{eSpell::AVATAR, eSpell::AVATAR, eSpell::DIVINE_THUD, eSpell::REVIVE_ALL},
};
std::set<eSpell> area_effects = {eSpell::FLAMESTRIKE, eSpell::DIVINE_THUD};
static const std::set<eSpell> area_effects = {eSpell::FLAMESTRIKE, eSpell::DIVINE_THUD};
location ashes_loc;

2
src/boe.dlgutil.cpp
View File

@@ -1360,7 +1360,7 @@ void tip_of_day() {
static void put_scen_info(cDialog& me) {
unsigned int i;
std::ostringstream sout;
const char *difficulty[] = {"Low","Medium","High","Very High"};
static const char *difficulty[] = {"Low","Medium","High","Very High"};
for(i = 0; i < 3; i++) {
sout.clear();

4
src/boe.graphics.cpp
View File

@@ -1476,13 +1476,13 @@ void boom_space(location where,short mode,short type,short damage,short sound) {
void draw_pointing_arrows() {
rectangle sources[4] = {
static const rectangle sources[4] = {
{351,28,359,36}, // up
{351,10,359,18}, // left
{351,01,359,9}, // down
{351,19,359,27} // right
};
rectangle dests[8] = {
static const rectangle dests[8] = {
{7,100,15,108},{7,170,15,178},{140,7,148,15},{212,7,220,15},
{346,100,354,108},{346,170,354,178},{140,274,148,282},{212,274,220,282}
};