X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpiece.cpp;h=a9adf57366e7ae5b731718524fa942399d048db5;hb=358ccf206ba142a68c7b5b3622a79cc309107f6d;hp=707c8c57dfae3d53ae3de96d44de1a40d53e91f4;hpb=f0858cd22972c0f893ab8d012a0f1783cd9faff2;p=stockfish

diff --git a/src/piece.cpp b/src/piece.cpp
index 707c8c57..a9adf573 100644
--- a/src/piece.cpp
+++ b/src/piece.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,29 +17,23 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
-#include <cstring>
+#include <string>
 
 #include "piece.h"
 
+static const std::string PieceChars(" pnbrqk PNBRQK");
 
-////
-//// Functions
-////
 
 /// Translating piece types to/from English piece letters
 
-static const char PieceChars[] = " pnbrqk";
-
 char piece_type_to_char(PieceType pt, bool upcase) {
-  return upcase? toupper(PieceChars[pt]) : PieceChars[pt];
+
+  return PieceChars[pt + (upcase ? 7 : 0)];
 }
 
 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 != std::string::npos ? PieceType(idx % 7) : PIECE_TYPE_NONE;
 }