ggs_server changes(not finished)

Conflicts:
	src/ggs_server.erl

games/tic-tac-toe-js/js/TicTacToeClient.js

@@ -90,4 +90,4 @@ TicTacToeClient.prototype.updateBoard = function(gameBoardData) {
 			this.spots[k++].innerHTML = t;
 		}
 	}
-}
+}

games/tic-tac-toe/TODO

@@ -1,12 +1,6 @@
-- background image
-- subimages for game_area:s
-- subimages for game markers (X or 0)
-- rectangle collision on game_area:s
+- background
 - redraw background then all game_area:s
-- board_state: a hashtable where key is game_area_index
-               and value is either'x' 'o' or ' '
 
- board contains nr_of_squares = 9
  board contains array of squares with nr_of_squares elements
  board contains x, y, width and height
  board contains a frame

games/tic-tac-toe/tictactoeboard.py

@@ -4,6 +4,7 @@ from point import Point
 from pygame.image import load
 from pygame.rect import Rect
 from pygame import Surface
+from data import greatest_sequence
 
 #inherits Board.
 #Used for displaying the board on the screen and interact with it
@@ -47,4 +48,14 @@ class TicTacToeBoard(Board):
                     game_rectangle.state = 'o'
                 self.players_turn = (self.players_turn + 1) % 2
 
+       """
+    def turn(self, mouse_point):
+        if player.id != players_turn:
+            print "Other players turn"
             
+        else:
+            for game_rectangle in self.game_rectangles:
+                if (mouse_point.inside(game_rectangle) and
+                game_rectangle.state == ' '):
+                    server.turn(player.id, game_rectangle.index)
+          """

mnesia/gamedb.erl

@@ -1,26 +1,45 @@
-%Test Mnesia
+%%%%----------------------------------------------------
+%%% @author     Mattias Pettersson <mattiaspgames@gmail.com>
+%%% @copyright  2011 Mattias Pettersson
+%%% @doc        Database for runtime game variable storage.
+%%% @end
+
+ Test Mnesia
 -module(gamedb).
 -import(mnesia).
 -export([init/0,insert_player/1,example_player/0,read_player/1,test_player/0]).
 -include("gamedb.hrl").
 
+%%-----------------------------------------------------
+%% Creation
+%%-----------------------------------------------------
 init() ->
     mnesia:create_table(player, [{attributes, record_info(fields, player)}]).
 
+%%-----------------------------------------------------
+%% Test
+%%-----------------------------------------------------
 test_player() ->
     insert_player(example_player()),
     read_player(0001).
 
+example_player() ->
+    #player{id   = 0001,
+            name = "Tux"}.
+
+%%-----------------------------------------------------
+%% Insertions
+%%-----------------------------------------------------
 insert_player(Player) ->
     Fun = fun() ->
                   mnesia:write(Player) 
           end,
     mnesia:transaction(Fun).
 
-example_player() ->
-    #player{id   = 0001,
-            name = "Tux"}.
 
+%%-----------------------------------------------------
+%% Querries
+%%-----------------------------------------------------
 read_player(Player_Key) ->
     Fun = fun() -> 
                   [P] = mnesia:read(player, Player_Key),

src/ggs_server.erl

@@ -1,13 +1,15 @@
 %%%----------------------------------------------------
 %%% @author     Jonatan Pålsson <Jonatan.p@gmail.com>
 %%% @copyright  2010 Jonatan Pålsson
-%%% @doc        RPC over TCP server
 %%% @end
 %%%----------------------------------------------------
 
 -module(ggs_server).
 -behaviour(gen_server).
 
+% import
+-import(ggs_connection).
+
 %% API
 -export([start_link/1,
          start_link/0,
@@ -16,8 +18,7 @@
          ]).
 
 %% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, 
-         handle_info/2, terminate/2, code_change/3]).
+-export([terminate/2, code_change/3]).
 
 
 -define(SERVER, ?MODULE).
@@ -115,7 +116,6 @@ code_change(_OldVsn, State, _Extra) ->
 %%-----------------------------------------------------
 %% Internal functions
 %%-----------------------------------------------------
-
 do_JSCall(Socket, Data, State) ->
     JSVM = js_runner:boot(), 
     js_runner:define(JSVM, "function userCommand(cmd, par) {return cmd+' '+ par}"),
@@ -126,23 +126,23 @@ do_JSCall(Socket, Data, State) ->
             Ret = js_runner:call(JSVM, "userCommand", 
                 [list_to_binary(Command), 
                  list_to_binary(Parameter)]),
-            send(Socket, "RefID", "JS says: ", Ret),
+            connection:send(Socket, "RefID", "JS says: ", Ret),
             [];
         % Set the new state to the reference generated, and JSVM associated
         {hello} ->
             Client = getRef(),
-            send(Socket, Client, "__ok_hello"),
+            connection:send(Socket, Client, "__ok_hello"),
             {Client, JSVM};
         {echo, RefID, _, MSG} ->
-            send(Socket, RefID, "Your VM is ", getJSVM(RefID, State)),
+            connection:send(Socket, RefID, "Your VM is ", getJSVM(RefID, State)),
             [];
         {crash, Zero} ->
             10/Zero;
         {vms} ->
-            send(Socket, "RefID", State);
+            connection:send(Socket, "RefID", State);
         % Set the new state to []
         Other ->
-            send(Socket, "RefID", "__error"),
+            ggs_connection:send(Socket, "RefID", "__error"),
             []
     end,
     % Return the new state
@@ -159,9 +159,3 @@ getJSVM(RefID, State) ->
     VMs = State#state.client_vm_map,
     {value, {_,VM}} = lists:keysearch(RefID, 1, VMs),
     VM.
-
-send(Socket, RefID, String) ->
-    gen_tcp:send(Socket, io_lib:fwrite("~p ~p~n", [RefID,String])).
-
-send(Socket, RefID, String1, String2) ->
-    gen_tcp:send(Socket, io_lib:fwrite("~p ~p ~p~n", [RefID, String1, String2])).