diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a36f895 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.o +*.d +my-player +example-player +random-player +othello diff --git a/Makefile b/Makefile index 1f6de38..0d07e24 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,8 @@ OBJECTS = $(SRC_mcp:.cc=.o) $(SRC_common:.cc=.o) \ $(ASM_common:.S=.o) \ players/example-player.o \ players/random-player.o \ - players/my-player.o + players/my-player.o \ + players/playerlib.o CXXFLAGS += -std=c++11 -I. -g @@ -40,7 +41,7 @@ example-player: players/example-player.o my-player : players/my-player.o $(CXX) $^ -o $@ $(LDFLAGS) -random-player : players/random-player.o +random-player : players/random-player.o players/playerlib.o $(CXX) $^ -o $@ $(LDFLAGS) PLAYER1 ?= my-player diff --git a/players/playerlib.cc b/players/playerlib.cc index dedde0e..52d54ac 100644 --- a/players/playerlib.cc +++ b/players/playerlib.cc @@ -3,13 +3,15 @@ #include "playerlib.h" -char getEnemyChar(char ownc) -{ - char enemyc; - switch(ownc){ - case "O": enemyc="X"; break; - case "X": enemyc="O"; - } - return enemyc; -} - +char +getEnemyChar(char c) { + char enemyc; + switch(c) + { + case 'X': + enemyc='O'; break; + case 'O': + enemyc='X'; break; + } + return enemyc; +} \ No newline at end of file diff --git a/players/playerlib.h b/players/playerlib.h index eb5a0c1..bf0f857 100644 --- a/players/playerlib.h +++ b/players/playerlib.h @@ -1,8 +1,7 @@ #ifndef PLAYERLIB_H #define PLAYERLIB_H -char enemyc = 0; //returns the character used for the enemy's stones -char getEnemyChar(char); +extern char getEnemyChar(char); #endif diff --git a/players/random-player.cc b/players/random-player.cc index c5af134..ec6ebd5 100644 --- a/players/random-player.cc +++ b/players/random-player.cc @@ -45,10 +45,8 @@ int main(void) // sind durch einen Punkt (.) gekennzeichnet. // 2. TODO: Strategie hier einfügen. Resultat in turn_row und turn_col speichern. - if(!enemyc) - enemyc = getEnemyChar(state_buffer[0]); - printf("%s",enemyc); - + + printf("%c\n",getEnemyChar(state_buffer[0])); // 3. Return result //send_move(turn_row, turn_col);