From 79aca7183032a543b30238c009c47dbb6148f4e6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 27 Dec 2008 15:10:35 +0000
Subject: [PATCH] Fixes issue #78 and some more makefile tuning (ziprelease
 names the archives according to the platform)

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@427 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Makefile |  3 ++-
 divers.c |  1 +
 moteur.c | 25 ++++++++++++++-----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index a5ca9bb6..1b4b86df 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ ifdef COMSPEC
   WINDRES = windres.exe
   OBJRES = $(OBJDIR)/winres.o
   CFGOBJRES = $(OBJDIR)/wincfgres.o
+  PLATFORM = win32 #no uname so we'll do that ourselve
 else
 
   PLATFORM = $(shell uname)
@@ -162,7 +163,7 @@ release : $(BIN) $(CFGBIN)
 # A release zip archive
 ziprelease: version $(BIN) $(BINCFG) release
 	tar cvzf src-svn`svnversion | sed 's/:/-/'`.tgz *.c *.h Makefile Makefile.dep gfx2.ico gfx2cfg.ico
-	zip grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-win32.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt SDL.dll fonts/8pxfont.png SDL_image.dll zlib1.dll libpng13.dll $(TTFLIBS) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz
+	zip grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-$(PLATFORM).zip $(BIN) $(CFGBIN) gfx2.dat gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt SDL.dll fonts/8pxfont.png SDL_image.dll zlib1.dll libpng13.dll $(TTFLIBS) doc/README-zlib1.txt doc/README-SDL.txt doc/README-SDL_image.txt doc/README-SDL_ttf.txt fonts/Tuffy.ttf src-svn`svnversion | sed 's/:/-/'`.tgz
 	$(DELCOMMAND) src-svn`svnversion | sed 's/:/-/'`.tgz
 	tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico gfx2.gif gfx2cfg.gif doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf
 
diff --git a/divers.c b/divers.c
index a1dfe3e9..204c4ff0 100644
--- a/divers.c
+++ b/divers.c
@@ -331,6 +331,7 @@ int Get_input(void)
 
     if (bl)
     {
+    DEBUG("warp",Operation_Taille_pile);
       SDL_WarpMouse(
         INPUT_Nouveau_Mouse_X*Pixel_width,
         INPUT_Nouveau_Mouse_Y*Pixel_height
diff --git a/moteur.c b/moteur.c
index d80c4992..e080e02f 100644
--- a/moteur.c
+++ b/moteur.c
@@ -961,7 +961,7 @@ void Gestion_principale(void)
           {
              Print_dans_menu("X:       Y:             ",0);
           }
-          Curseur_dans_menu_precedent = 1;
+          Curseur_dans_menu_precedent = 0;
        }
        else
        {
@@ -969,7 +969,7 @@ void Gestion_principale(void)
           {
              Print_dans_menu("X:       Y:       (    )",0);
           }
-          Curseur_dans_menu_precedent = 1;
+          Curseur_dans_menu_precedent = 0;
           //Num2str(Pipette_Couleur,Chaine,3);
           //Print_dans_menu(Chaine,20);
           //Print_general(170*Menu_Facteur_X,Menu_Ordonnee_Texte," ",0,Pipette_Couleur);
@@ -978,18 +978,21 @@ void Gestion_principale(void)
     }
     if(Curseur_dans_menu)
     {
-    	Curseur_dans_menu_precedent = 0;
+    	Curseur_dans_menu_precedent = 1;
+    }
+    else
+    {
+ 
+      Blink=Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Effacer_curseur;
+ 
+      if (Blink) Effacer_curseur();
+ 
+      Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Action();
+
+      if (Blink) Afficher_curseur();
     }
     Old_MX=Mouse_X;
     Old_MY=Mouse_Y;
- 
-    Blink=Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Effacer_curseur;
- 
-    if (Blink) Effacer_curseur();
- 
-    Operation[Operation_en_cours][Mouse_K][Operation_Taille_pile].Action();
-
-    if (Blink) Afficher_curseur();
   }
   while (!Sortir_du_programme);
 }