From 47b59aa70d24d7385f388cbe8943af3e293c9d40 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 12 Aug 2007 14:39:24 +0000 Subject: [PATCH] Checkin git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@11 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- GrafX.cbp | 4 ++++ GrafX.depend | 10 +++++----- GrafX.layout | 26 +++++++++++++------------- aide.c | 2 +- boutons.c | 10 +++++----- divers.c | 22 ++++++++++++++++++++++ shade.c | 4 ++-- 7 files changed, 52 insertions(+), 26 deletions(-) diff --git a/GrafX.cbp b/GrafX.cbp index 154462db..a27b89ee 100644 --- a/GrafX.cbp +++ b/GrafX.cbp @@ -14,6 +14,9 @@ + + + diff --git a/GrafX.depend b/GrafX.depend index bcfb03ee..c7125075 100644 --- a/GrafX.depend +++ b/GrafX.depend @@ -331,7 +331,7 @@ "sdlscreen.h" "global.h" -1176573750 source:/home/pulkomandy/Projects/GFX2_SRC/svn/aide.c +1183985670 source:/home/pulkomandy/Projects/GFX2_SRC/svn/aide.c "const.h" "struct.h" @@ -360,7 +360,7 @@ 1176549546 /home/pulkomandy/Projects/GFX2_SRC/svn/moteur.h -1176580194 source:/home/pulkomandy/Projects/GFX2_SRC/svn/boutons.c +1183985670 source:/home/pulkomandy/Projects/GFX2_SRC/svn/boutons.c "const.h" "struct.h" "global.h" @@ -398,7 +398,7 @@ 945641428 /home/pulkomandy/Projects/GFX2_SRC/svn/operatio.h -1176579600 /home/pulkomandy/Projects/GFX2_SRC/svn/shade.c +1183985670 /home/pulkomandy/Projects/GFX2_SRC/svn/shade.c "global.h" "graph.h" @@ -517,7 +517,7 @@ 944346298 /home/pulkomandy/Projects/GFX2_SRC/svn/op_c.h "struct.h" -1176571151 source:/home/pulkomandy/Projects/GFX2_SRC/svn/main.c +1177169161 source:/home/pulkomandy/Projects/GFX2_SRC/svn/main.c "const.h" "struct.h" "global.h" @@ -615,7 +615,7 @@ "const.h" "global.h" -1176579600 source:/home/pulkomandy/Projects/GFX2_SRC/svn/shade.c +1183985670 source:/home/pulkomandy/Projects/GFX2_SRC/svn/shade.c "global.h" "graph.h" diff --git a/GrafX.layout b/GrafX.layout index 9db8a470..cf5592bb 100644 --- a/GrafX.layout +++ b/GrafX.layout @@ -1,34 +1,34 @@ - - + + - + - - + + - + - - + + - + - + - + - - + + diff --git a/aide.c b/aide.c index 3ecf4c8f..eef73e6b 100644 --- a/aide.c +++ b/aide.c @@ -200,7 +200,7 @@ void Bouton_Stats(void) char Buffer[37]; dword Utilisation_couleur[256]; long Taille; - struct statfs* Informations_Disque; + struct statfs* Informations_Disque = NULL; Ouvrir_fenetre(310,174,"Statistics"); diff --git a/boutons.c b/boutons.c index 28f21d4c..e16cb652 100644 --- a/boutons.c +++ b/boutons.c @@ -2286,7 +2286,7 @@ byte Bouton_Load_ou_Save(byte Load, byte Image) short Bouton_clicke; struct Fenetre_Bouton_scroller * Scroller_de_fichiers; short Temp; - unsigned Bidon; // Sert … appeler _dos_setdrive + unsigned Bidon=0; // Sert … appeler _dos_setdrive word Drives_Debut_Y; byte Charger_ou_sauver_l_image=0; char Nom_drive[3]=" "; @@ -2947,7 +2947,7 @@ void Load_picture(byte Image) byte Format_fichier_initial; byte Ne_pas_restaurer; byte Utiliser_palette_brosse; - struct Composantes * Palette_initiale; + struct Composantes * Palette_initiale=NULL; byte Ancienne_forme_curseur; short Principal_Largeur_image_initiale=Principal_Largeur_image; short Principal_Hauteur_image_initiale=Principal_Hauteur_image; @@ -4166,7 +4166,7 @@ void Bouton_Colorize_Mode(void) void Bouton_Colorize_Afficher_la_selection(int Numero) { - short Pos_Y; // Ligne o— afficher les flŠches de s‚lection + short Pos_Y=0; // Ligne o— afficher les flŠches de s‚lection // On commence par effacer les anciennes s‚lections: // Partie gauche @@ -4830,8 +4830,8 @@ void Bouton_Trame_Menu(void) short Indice; short Pos_X; short Pos_Y; - short Old_Pos_X; - short Old_Pos_Y; + short Old_Pos_X=0; + short Old_Pos_Y=0; short Orig_X; short Orig_Y; static byte Octet_insere=0; diff --git a/divers.c b/divers.c index b64d625b..d2405a26 100644 --- a/divers.c +++ b/divers.c @@ -91,3 +91,25 @@ void Get_input(void) SDL_PollEvent(Evenement_SDL); } + +void Initialiser_chrono(dword Delai) +{// Démarrer le chrono + + push ebp + mov ebp,esp + + arg Delai:dword + + mov eax,Delai + mov Chrono_delay,eax + + xor ah,ah + int 1Ah + mov word ptr[Chrono_cmp+0],dx + mov word ptr[Chrono_cmp+2],cx + + mov esp,ebp + pop ebp + + return; +} diff --git a/shade.c b/shade.c index 4d7b44d4..63094c43 100644 --- a/shade.c +++ b/shade.c @@ -40,8 +40,8 @@ void Shade_Blocs_degrades(void) word Curseur=0; word Nb_shades=0; short Shade_traite,Ancien_shade_traite; - word Taille_shade; - word Debut_shade; + word Taille_shade=0; + word Debut_shade=0; short Pos_X,Pos_Y; short Taille_X,Taille_Y; short Debut_X,Debut_Y,Fin_X,Fin_Y;