diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-29 21:22:07 +0100 |
|---|---|---|
| committer | Reiner Herrmann <reiner@reiner-h.de> | 2011-01-29 21:22:07 +0100 |
| commit | 691dd7aa973e9f3d92735b673cb836eb3378b435 (patch) | |
| tree | 3d8f8ebbfa650dd42e19bb18c9a972157b0fb61a | |
| parent | c7991f4c5dc41cb282d839179c043c4a028d135e (diff) | |
| parent | 930b41f48bf2a3a84b6256350452d90c584a3ab0 (diff) | |
fixed merge conflict
| -rw-r--r-- | src/card.c | 50 | ||||
| -rw-r--r-- | src/card.h | 50 | ||||
| -rw-r--r-- | src/card_stack.c | 50 | ||||
| -rw-r--r-- | src/card_stack.h | 50 | ||||
| -rw-r--r-- | src/client_game_states.c | 50 | ||||
| -rw-r--r-- | src/data_store.c | 50 | ||||
| -rw-r--r-- | src/data_store.h | 50 | ||||
| -rw-r--r-- | src/game.c | 50 | ||||
| -rw-r--r-- | src/game.h | 50 | ||||
| -rw-r--r-- | src/game_states.h | 50 | ||||
| -rw-r--r-- | src/hand.c | 50 | ||||
| -rw-r--r-- | src/hand.h | 50 | ||||
| -rw-r--r-- | src/main.c | 56 | ||||
| -rw-r--r-- | src/main_stack.c | 50 | ||||
| -rw-r--r-- | src/main_stack.h | 50 | ||||
| -rw-r--r-- | src/manual.c | 54 | ||||
| -rw-r--r-- | src/manual.h | 50 | ||||
| -rw-r--r-- | src/net/client.c | 50 | ||||
| -rw-r--r-- | src/net/client.h | 50 | ||||
| -rw-r--r-- | src/net/comm.c | 50 | ||||
| -rw-r--r-- | src/net/comm.h | 50 | ||||
| -rw-r--r-- | src/net/server.c | 50 | ||||
| -rw-r--r-- | src/net/server.h | 50 | ||||
| -rw-r--r-- | src/player.c | 50 | ||||
| -rw-r--r-- | src/player.h | 50 | ||||
| -rw-r--r-- | src/server_game_states.c | 50 | ||||
| -rw-r--r-- | src/table_stacks.c | 50 | ||||
| -rw-r--r-- | src/table_stacks.h | 50 | ||||
| -rw-r--r-- | src/ui.c | 50 | ||||
| -rw-r--r-- | src/ui.h | 50 |
30 files changed, 753 insertions, 757 deletions
@@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "card.h" #include <assert.h> @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_CARD_H #define OXEN_CARD_H diff --git a/src/card_stack.c b/src/card_stack.c index 3fcfd69..588f752 100644 --- a/src/card_stack.c +++ b/src/card_stack.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "card_stack.h" #include <assert.h> diff --git a/src/card_stack.h b/src/card_stack.h index 3f24e31..657dd56 100644 --- a/src/card_stack.h +++ b/src/card_stack.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_CARD_STACK_H #define OXEN_CARD_STACK_H diff --git a/src/client_game_states.c b/src/client_game_states.c index 4a29a7c..b327855 100644 --- a/src/client_game_states.c +++ b/src/client_game_states.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "game_states.h" #include "net/comm.h" diff --git a/src/data_store.c b/src/data_store.c index 8651970..634d135 100644 --- a/src/data_store.c +++ b/src/data_store.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include <stdlib.h> #include <string.h> diff --git a/src/data_store.h b/src/data_store.h index d67e9ce..1c0903c 100644 --- a/src/data_store.h +++ b/src/data_store.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_DATA_STORE_H #define OXEN_DATA_STORE_H @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "game.h" #include "card.h" @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_GAME_H #define OXEN_GAME_H diff --git a/src/game_states.h b/src/game_states.h index 845d66b..86a2f37 100644 --- a/src/game_states.h +++ b/src/game_states.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_GAME_STATES_H #define OXEN_GAME_STATES_H @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "hand.h" #include <stdlib.h> @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_HAND_H #define OXEN_HAND_H @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include <stdlib.h> #include <string.h> @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) bool servermode = false; data_store_t *ds = data_store(); - const char* accepted = "u:s:p:n:hlmv"; + const char* accepted = "u:s:p:n:hlm"; while((opt = getopt(argc, argv, accepted)) != -1) { switch(opt) @@ -106,10 +106,6 @@ int main(int argc, char *argv[]) case 'm': print_manual(); break; - case 'v': - print_version(); - exit(EXIT_SUCCESS); - break; case 'h': // help default: print_usage(); diff --git a/src/main_stack.c b/src/main_stack.c index 76bee04..0f503dc 100644 --- a/src/main_stack.c +++ b/src/main_stack.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "main_stack.h" #include <stdlib.h> diff --git a/src/main_stack.h b/src/main_stack.h index 770766a..5117cdb 100644 --- a/src/main_stack.h +++ b/src/main_stack.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_MAIN_STACK_H #define OXEN_MAIN_STACK_H diff --git a/src/manual.c b/src/manual.c index 04c4bf8..fc48c08 100644 --- a/src/manual.c +++ b/src/manual.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "manual.h" #include <stdio.h> @@ -42,7 +42,7 @@ static const char* manual_text = " Players can set their nickname with '-u name' or by setting the USER\n" " environment variable.\n\n" " HOW TO PLAY:\n\n" -" Oxen is inspired by the card game known as \"Take 6\" or \"6 nimmt!\".\n" +" Oxen is inspired by the card game known as \"Take 6!\" or \"6 nimmt!\".\n" " It consists of a main stack with cards numbered from 1 to 104 and of 4 open\n" " table stacks that grow every round, but must not get larger than 5 cards.\n\n" @@ -64,7 +64,7 @@ static const char* manual_text = " If a stack would contain 6 cards after placing a card on it, the player who\n" " chose the card has to replace the stack with his chosen card and add the\n" " number of diamonds of all the cards within the replaced stack to his score\n" -" (therefore the name \"Take 6\" or \"6 nimmt\").\n\n" +" (therefore the name \"Take 6!\" or \"6 nimmt!\").\n\n" " If a card can not be placed on any table stack (because its number is lower\n" " than the top cards numbers of all stacks), the player can create a new\n" diff --git a/src/manual.h b/src/manual.h index c92c86f..bb3b96a 100644 --- a/src/manual.h +++ b/src/manual.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_MANUAL_H #define OXEN_MANUAL_H diff --git a/src/net/client.c b/src/net/client.c index 4c169e9..a62616e 100644 --- a/src/net/client.c +++ b/src/net/client.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include <sys/types.h> #include <sys/socket.h> diff --git a/src/net/client.h b/src/net/client.h index ad7cabd..30f15a9 100644 --- a/src/net/client.h +++ b/src/net/client.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_CLIENT_H #define OXEN_CLIENT_H diff --git a/src/net/comm.c b/src/net/comm.c index fff661d..829fe31 100644 --- a/src/net/comm.c +++ b/src/net/comm.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include <sys/types.h> #include <sys/socket.h> diff --git a/src/net/comm.h b/src/net/comm.h index f8715ac..58dbaf8 100644 --- a/src/net/comm.h +++ b/src/net/comm.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_NET_H #define OXEN_NET_H diff --git a/src/net/server.c b/src/net/server.c index ad36852..a37c17c 100644 --- a/src/net/server.c +++ b/src/net/server.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include <sys/types.h> #include <sys/socket.h> diff --git a/src/net/server.h b/src/net/server.h index 578d31f..2869898 100644 --- a/src/net/server.h +++ b/src/net/server.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_SERVER_H #define OXEN_SERVER_H diff --git a/src/player.c b/src/player.c index 338942a..82148b3 100644 --- a/src/player.c +++ b/src/player.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "player.h" #include <stdlib.h> diff --git a/src/player.h b/src/player.h index abbfeff..fb3b0de 100644 --- a/src/player.h +++ b/src/player.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_PLAYER_H #define OXEN_PLAYER_H diff --git a/src/server_game_states.c b/src/server_game_states.c index 1b7a3ba..f3089fc 100644 --- a/src/server_game_states.c +++ b/src/server_game_states.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "game_states.h" #include <stdlib.h> diff --git a/src/table_stacks.c b/src/table_stacks.c index 12b7a9d..b9f2914 100644 --- a/src/table_stacks.c +++ b/src/table_stacks.c @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include <stdlib.h> #include <assert.h> diff --git a/src/table_stacks.h b/src/table_stacks.h index c177a3c..46ea7b7 100644 --- a/src/table_stacks.h +++ b/src/table_stacks.h @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_TABLE_STACKS_H #define OXEN_TABLE_STACKS_H @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #include "ui.h" #include <assert.h> @@ -1,28 +1,28 @@ -/***************************************************************************** - * ___ __ __ ___ _ __ * - * / _ \\ \/ // _ \ '_ \ * - * | (_) |> <| __/ | | | * - * \___//_/\_\\___|_| |_| * - * * - * The card game * - * * - * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * - * Mario Kilies <MarioKilies@GMX.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * * - *****************************************************************************/ +/************************************************************************** + * ___ __ __ ___ _ __ * + * / _ \\ \/ // _ \ '_ \ * + * | (_) |> <| __/ | | | * + * \___//_/\_\\___|_| |_| * + * * + * The card game * + * * + * Copyright (C) 2011, Reiner Herrmann <reiner@reiner-h.de> * + * Mario Kilies <MarioKilies@GMX.net> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see <http://www.gnu.org/licenses/>. * + * * + **************************************************************************/ #ifndef OXEN_UI_H #define OXEN_UI_H |