X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpiece.cpp;h=bb122bcd7a46fb1f70674129716f19ea25d6dba8;hp=707c8c57dfae3d53ae3de96d44de1a40d53e91f4;hb=49c50399fe39b7b80ebe1cba1b986e8759633e51;hpb=f0858cd22972c0f893ab8d012a0f1783cd9faff2 diff --git a/src/piece.cpp b/src/piece.cpp index 707c8c57..bb122bcd 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-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,10 +22,11 @@ //// Includes //// -#include +#include #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"); char piece_type_to_char(PieceType pt, bool upcase) { - return upcase? toupper(PieceChars[pt]) : PieceChars[pt]; + + 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; }