From 2240a45c4191454a4d2290db614fcc8b1b32ce7c Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 21 Jan 2009 22:50:24 -0500 Subject: Expanded "..." contraction in switch statements --- sigmod/Badge.cpp | 5 ++++- sigmod/Nature.cpp | 5 ++++- sigmod/Species.cpp | 12 ++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'sigmod') diff --git a/sigmod/Badge.cpp b/sigmod/Badge.cpp index 60d1815c..ef6a58f4 100644 --- a/sigmod/Badge.cpp +++ b/sigmod/Badge.cpp @@ -127,7 +127,10 @@ CHECK_BEGIN_ARRAY(Badge, Sigcore::Fraction&, stat, multiplier, Stat, stat) { case ST_SpecialDefense: if (sigmod()->rules()->specialSplit()) - case ST_Attack ... ST_Special: + case ST_Attack: + case ST_Defense: + case ST_Speed: + case ST_Special: break; default: EBOUNDS(stat, "Attack", sigmod()->rules()->specialSplit() ? "SpecialDefense" : "Special"); diff --git a/sigmod/Nature.cpp b/sigmod/Nature.cpp index 1872000a..5bbaa99e 100644 --- a/sigmod/Nature.cpp +++ b/sigmod/Nature.cpp @@ -109,7 +109,10 @@ CHECK_BEGIN_ARRAY(Nature, Sigcore::Fraction&, stat, multiplier, Stat, stat) { case ST_SpecialDefense: if (sigmod()->rules()->specialSplit()) - case ST_Attack ... ST_Special: + case ST_Attack: + case ST_Defense: + case ST_Speed: + case ST_Special: break; default: EBOUNDS(stat, "Attack", sigmod()->rules()->specialSplit() ? "SpecialDefense" : "Special"); diff --git a/sigmod/Species.cpp b/sigmod/Species.cpp index 7e4fb57d..1da1b26b 100644 --- a/sigmod/Species.cpp +++ b/sigmod/Species.cpp @@ -299,7 +299,11 @@ CHECK_BEGIN_ARRAY(Species, int, baseStat, baseStat, Stat, stat) { case ST_SpecialDefense: if (sigmod()->rules()->specialSplit()) - case ST_HP ... ST_Special: + case ST_HP: + case ST_Attack: + case ST_Defense: + case ST_Speed: + case ST_Special: break; default: EBOUNDS(stat, "HP", sigmod()->rules()->specialSplit() ? "SpecialDefense" : "Special"); @@ -312,7 +316,11 @@ CHECK_BEGIN_ARRAY(Species, int, effortValue, effortValue, Stat, stat) { case ST_SpecialDefense: if (sigmod()->rules()->specialSplit()) - case ST_HP ... ST_Special: + case ST_HP: + case ST_Attack: + case ST_Defense: + case ST_Speed: + case ST_Special: break; default: EBOUNDS(stat, "HP", sigmod()->rules()->specialSplit() ? "SpecialDefense" : "Special"); -- cgit