X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpiece.cpp;h=84ed22d78dd47740fcffa34a0d51620f748a7c0b;hb=412d68fe4f3e32b3314141a861554e18940ff556;hp=382ed6456312604c73e2ceea1f9ad40b37c9776e;hpb=fa322b376823a1d8868eb45d07e2e4331359faae;p=stockfish

diff --git a/src/piece.cpp b/src/piece.cpp
index 382ed645..84ed22d7 100644
--- a/src/piece.cpp
+++ b/src/piece.cpp
@@ -22,10 +22,11 @@
 //// Includes
 ////
 
-#include <cstring>
+#include <string>
 
 #include "piece.h"
 
+using namespace std;
 
 ////
 //// Functions
@@ -33,13 +34,16 @@
 
 /// Translating piece types to/from English piece letters
 
-static const char PieceChars[] = " pnbrqk";
+static const string PieceChars(" pnbrqk PNBRQK");
 
-int piece_type_to_char(PieceType pt, bool upcase) {
-  return upcase? toupper(PieceChars[pt]) : PieceChars[pt];
+char piece_type_to_char(PieceType pt, bool upcase) {
+
+  return PieceChars[pt + upcase * 7];
 }
 
 PieceType piece_type_from_char(char c) {
-  const char* ch = strchr(PieceChars, tolower(c));
-  return ch? PieceType(ch - PieceChars) : NO_PIECE_TYPE;
+
+  size_t idx = PieceChars.find(c);
+
+  return idx != string::npos ? PieceType(idx % 7) : NO_PIECE_TYPE;
 }