Reverting/reworking Mike's change on thises/prelords. Zeth says that this is crashing on psp - while sizeof(string) shouldn't eval to 0, I don't fully trust this to evaluate correctly on psp, so I'm reverting out the change. Since these are staticly sized arrays, there's no point in trying to calculate their size programatically. (If they were true dynamic containers, then it would make more sense, but then you'd simply call size() on them anyway.)

While at it, moved the string arrays to be global const declarations - there were two duplicate sets of keywords for lords, and they were being created/destroyed on each call to parseMagicLine.  No point in constantly reallocating these strings, we know we're going to contantly reuse them.

projects/mtg/src/CardSelector.cpp

@@ -16,32 +16,37 @@ using std::cout;
 #undef True
 #endif
 
+// small sized cards are 40 * 28, use this as a compensation factor
+const float kCardRatio = 28.0f / 40.0f;
+// allow a slight fudge factor of 4 pixels when comparing distances (ie ~ 1/10th of a small card's diagonal length)
+const float kSlopValue = 4.0f;
+
 struct Left: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
-        return ref->x - test->x > fabs(ref->y - test->y);
+        return (ref->x - test->x) * kCardRatio > fabs(ref->y - test->y) - kSlopValue;
     }
 };
 struct Right: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
-        return test->x - ref->x > fabs(ref->y - test->y);
+        return (test->x - ref->x) * kCardRatio > fabs(ref->y - test->y) - kSlopValue;
     }
 };
 struct Up: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
-        return ref->y - test->y > fabs(ref->x - test->x);
+        return ref->y - test->y > fabs(ref->x - test->x) * kCardRatio - kSlopValue;
     }
 };
 struct Down: public Exp
 {
     static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)
     {
-        return test->y - ref->y > fabs(ref->x - test->x);
+        return test->y - ref->y > fabs(ref->x - test->x) * kCardRatio - kSlopValue;
     }
 };
 struct Diff: public Exp

projects/mtg/src/MTGAbility.cpp

@@ -11,6 +11,12 @@
 #include "Translate.h"
 #include "ThisDescriptor.h"
 
+const string kLordKeywords[] = { "foreach(", "lord(", "aslongas(", "teach(", "all(" };
+const size_t kLordKeywordsCount = 5;
+
+const string kThisKeywords[] = { "this(", "thisforeach(" };
+const size_t kThisKeywordsCount = 2;
+
 int AbilityFactory::countCards(TargetChooser * tc, Player * player, int option)
 {
     int result = 0;
@@ -693,11 +699,10 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     }
 
     //rather dirty way to stop thises and lords from conflicting with each other.
-    string prelords[] = { "foreach(", "lord(", "aslongas(", "teach(", "all(" };
     size_t lord = string::npos;
-    for (int j = 0; j < 5; ++j)
+    for (size_t j = 0; j < kLordKeywordsCount; ++j)
     {
-        size_t found2 = s.find(prelords[j]);
+        size_t found2 = s.find(kLordKeywords[j]);
         if (found2 != string::npos && ((found == string::npos) || found2 < found))
         {
             lord = found2;
@@ -705,12 +710,11 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     }
 
     //This, ThisForEach;
-    string thises[] = { "this(", "thisforeach(" };
     found = string::npos;
     int i = -1;
-    for (size_t j = 0; j < sizeof(thises)/sizeof(string); j++)
+    for (size_t j = 0; j < kThisKeywordsCount; ++j)
     {
-        size_t found2 = s.find(thises[j]);
+        size_t found2 = s.find(kThisKeywords[j]);
         if (found2 != string::npos && ((found == string::npos) || found2 < found))
         {
             found = found2;
@@ -722,7 +726,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
         //why does tc even exist here? This shouldn't happen...
         SAFE_DELETE(tc); //http://code.google.com/p/wagic/issues/detail?id=424
 
-        size_t header = thises[i].size();
+        size_t header = kThisKeywords[i].size();
         size_t end = s.find(")", found + header);
         string s1;
         if (found == 0 || end != s.size() - 1)
@@ -789,12 +793,12 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     }
 
     //Lord, foreach, aslongas
-    string lords[] = { "lord(", "foreach(", "aslongas(", "teach(", "all(" };
+
     found = string::npos;
     i = -1;
-	for (size_t j = 0; j < sizeof(lords)/sizeof(string); ++j)
+	for (size_t j = 0; j < kLordKeywordsCount; ++j)
     {
-        size_t found2 = s.find(lords[j]);
+        size_t found2 = s.find(kLordKeywords[j]);
         if (found2 != string::npos && ((found == string::npos) || found2 < found))
         {
             found = found2;
@@ -804,7 +808,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     if (found != string::npos)
     {
         SAFE_DELETE(tc);
-        size_t header = lords[i].size();
+        size_t header = kLordKeywords[i].size();
         size_t end = s.find(")", found + header);
         string s1;
         if (found == 0 || end != s.size() - 1)