added blackjack game

[NeonServV5.git] / src / modules / NeonFun.mod / cmd_neonfun_uno.c

diff --git a/src/modules/NeonFun.mod/cmd_neonfun_uno.c b/src/modules/NeonFun.mod/cmd_neonfun_uno.c
index 47df483cabcf043a431dbb1eeaf70de1a7888a5f..5742fa0076f61a1ab8d87e28e533c7ff973a23fd 100644 (file)
--- a/src/modules/NeonFun.mod/cmd_neonfun_uno.c
+++ b/src/modules/NeonFun.mod/cmd_neonfun_uno.c
@@ -1,4 +1,4 @@
-/* cmd_neonfun_uno.c - NeonServ v5.4
+/* cmd_neonfun_uno.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ CMD_BIND(neonfun_cmd_uno) {
             if(game->state == UNO_STATE_WAITING)
                 break;
             else {
-                reply(getTextBot(), user, "NF_UNO_ALREADY_RUNNING", chan->name);
+                reply(textclient, user, "NF_UNO_ALREADY_RUNNING", chan->name);
                 return;
             }
         }
@@ -37,7 +37,7 @@ CMD_BIND(neonfun_cmd_uno) {
         struct uno_player *player, *last_player = NULL;
         for(player = game->player; player; player = player->next) {
             if(player->chanuser == chanuser) {
-                reply(getTextBot(), user, "NF_UNO_ALREADY_JOINED");
+                reply(textclient, user, "NF_UNO_ALREADY_JOINED");
                 return;
             } else
                 last_player = player;
@@ -47,6 +47,7 @@ CMD_BIND(neonfun_cmd_uno) {
         player->chanuser = chanuser;
         player->count = 0;
         player->cards = NULL;
+        player->timeout = 0;
         player->prev = last_player;
         player->next = NULL;
         last_player->next = player;
@@ -55,7 +56,7 @@ CMD_BIND(neonfun_cmd_uno) {
     } else {
         game = malloc(sizeof(*game));
         game->channel = chan;
-        game->textbot = getTextBot();
+        game->textbot = textclient;
         game->state = UNO_STATE_WAITING;
         game->reverse_direction = 0;
         game->take_cards_pending = 0;
@@ -65,13 +66,13 @@ CMD_BIND(neonfun_cmd_uno) {
         player->chanuser = chanuser;
         player->count = 0;
         player->cards = NULL;
+        player->timeout = 0;
         player->prev = NULL;
         player->next = NULL;
         game->player = player;
         game->winner = NULL;
         game->active_player = NULL;
         game->players = 1;
-        game->active_player = 0;
         game->timer = timeq_add(30, module_id, uno_game_wait_timeout, game);
         game->next = uno_active_games;
         uno_active_games = game;