diff options
| author | Damien Appert <dappert> | 2010-12-11 17:28:49 +0000 |
|---|---|---|
| committer | Damien Appert <dappert> | 2010-12-11 17:28:49 +0000 |
| commit | ffca80399f42709508ccaf53404f49dd1b29dd62 (patch) | |
| tree | 9d20dc676cdc857777cdd5fe55978496f981d144 | |
| parent | 14ea7720fb2317b41e30f9e66b1732b6dc610fb7 (diff) | |
| download | 2010-netlemmings-ffca80399f42709508ccaf53404f49dd1b29dd62.tar.gz 2010-netlemmings-ffca80399f42709508ccaf53404f49dd1b29dd62.tar.bz2 2010-netlemmings-ffca80399f42709508ccaf53404f49dd1b29dd62.zip | |
petite correction
git-svn-id: file:///var/svn/2010-netlemmings/trunk@193 077b3477-7977-48bd-8428-443f22f7bfda
| -rwxr-xr-x | scripts/compil.sh | 23 | ||||
| -rw-r--r-- | src/netlem.c | 2 |
2 files changed, 18 insertions, 7 deletions
diff --git a/scripts/compil.sh b/scripts/compil.sh index d0d9265..cc3ecce 100755 --- a/scripts/compil.sh +++ b/scripts/compil.sh @@ -1,18 +1,29 @@ #!/bin/bash -e -( cd ../src/parser && make ) -( cd ../bin && cmake ../ && make ) +BASEPATH="$(dirname $0)/.." +echo -e "\tI. Make of parser" +( cd "$BASEPATH/src/parser"&& make ) +echo -e "\tII. Cmake then make" +( cd "$BASEPATH/bin" && cmake ../ && make ) if [ $# -gt 0 ] then case $1 in - test) ctest -V;; + test) echo -e "\tIII. Test" ctest -V;; launch) - gnome-terminal -t SERVEUR -e "bash -c './server_on_piou.sh ; sleep 15'"& + echo -e "\tIV. Serveur execution" + cd "$BASEPATH/bin" + #gnome-terminal -t SERVEUR -e "bash -c './server_on_piou.sh ; sleep 15'"& + gnome-terminal -t SERVEUR --hide-menubar --geometry 48x15+10+0 -e "bash -c 'src/netlem_ds ; echo \"WAITING 15s\" ; sleep 15'"& + echo "WAITING FEW SECONDS" sleep 5; - gnome-terminal -t CLIENT1 -e "bash -c '../bin/src/netlem piou.prosoluce.fr; sleep 15'"& + echo -e "\tV. Client 1 execution" + gnome-terminal -t CLIENT1 --hide-menubar --geometry 48x15+10+310 -e "bash -c 'src/netlem localhost; echo \"WAITING 15s\" ; sleep 15'"& sleep 1; - gnome-terminal -t CLIENT2 -e "bash -c '../bin/src/netlem piou.prosoluce.fr; sleep 15'"& + echo -e "\tVI. Client 2 execution" + gnome-terminal -t CLIENT2 --hide-menubar --geometry 48x15+10+600 -e "bash -c 'src/netlem localhost; echo \"WAITING 15s\" ; sleep 15'"& ;; esac +else + echo "Compilation done, please enter an argument to test or launch the game" fi diff --git a/src/netlem.c b/src/netlem.c index b47a0eb..3d128c9 100644 --- a/src/netlem.c +++ b/src/netlem.c @@ -265,7 +265,7 @@ int init(gameConfig_t *conf, gameGraphics_t *gGraph) { SDL_WM_SetCaption(WIN_CAPTION, NULL); // We dont want to see the standard mouse cursor in our main window - SDL_ShowCursor(0); + //TODO: SDL_ShowCursor(0); // Memory allocation and initialization for all display layers gGraph->surfaces.terrain = createSurface(LEVEL_WIDTH, LEVEL_HEIGHT); |