git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@11 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2007-08-12 14:39:24 +00:00
parent e4ab3b7749
commit 47b59aa70d
7 changed files with 52 additions and 26 deletions

View File

@ -14,6 +14,9 @@
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker>
<Add library="SDL" />
</Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin/Release/GrafX" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release/GrafX" prefix_auto="1" extension_auto="1" />
@ -25,6 +28,7 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add library="SDL" />
</Linker> </Linker>
</Target> </Target>
<Target title="Bazar"> <Target title="Bazar">

View File

@ -331,7 +331,7 @@
"sdlscreen.h" "sdlscreen.h"
"global.h" "global.h"
1176573750 source:/home/pulkomandy/Projects/GFX2_SRC/svn/aide.c 1183985670 source:/home/pulkomandy/Projects/GFX2_SRC/svn/aide.c
<stdio.h> <stdio.h>
"const.h" "const.h"
"struct.h" "struct.h"
@ -360,7 +360,7 @@
1176549546 /home/pulkomandy/Projects/GFX2_SRC/svn/moteur.h 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" "const.h"
"struct.h" "struct.h"
"global.h" "global.h"
@ -398,7 +398,7 @@
945641428 /home/pulkomandy/Projects/GFX2_SRC/svn/operatio.h 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" "global.h"
"graph.h" "graph.h"
@ -517,7 +517,7 @@
944346298 /home/pulkomandy/Projects/GFX2_SRC/svn/op_c.h 944346298 /home/pulkomandy/Projects/GFX2_SRC/svn/op_c.h
"struct.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" "const.h"
"struct.h" "struct.h"
"global.h" "global.h"
@ -615,7 +615,7 @@
"const.h" "const.h"
"global.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" "global.h"
"graph.h" "graph.h"

View File

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Debug" /> <ActiveTarget name="Debug" />
<File name="Anciens fichiers/divers.asm" open="1" top="0" tabpos="4"> <File name="Anciens fichiers/divers.asm" open="1" top="0" tabpos="1">
<Cursor position="35193" topLine="1614" /> <Cursor position="50476" topLine="2446" />
</File> </File>
<File name="aide.c" open="0" top="0" tabpos="3"> <File name="aide.c" open="0" top="0" tabpos="3">
<Cursor position="4763" topLine="127" /> <Cursor position="6155" topLine="193" />
</File> </File>
<File name="boutons.c" open="1" top="0" tabpos="2"> <File name="boutons.c" open="0" top="0" tabpos="2">
<Cursor position="91952" topLine="2740" /> <Cursor position="91930" topLine="2737" />
</File> </File>
<File name="boutons.h" open="1" top="0" tabpos="7"> <File name="boutons.h" open="0" top="0" tabpos="7">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="divers.c" open="1" top="0" tabpos="1"> <File name="divers.c" open="1" top="1" tabpos="2">
<Cursor position="1961" topLine="37" /> <Cursor position="2028" topLine="44" />
</File> </File>
<File name="divers.h" open="1" top="1" tabpos="3"> <File name="divers.h" open="0" top="0" tabpos="3">
<Cursor position="1275" topLine="0" /> <Cursor position="1275" topLine="0" />
</File> </File>
<File name="global.h" open="0" top="0" tabpos="1"> <File name="global.h" open="0" top="0" tabpos="1">
<Cursor position="2951" topLine="101" /> <Cursor position="2115" topLine="42" />
</File> </File>
<File name="readline.h" open="1" top="0" tabpos="5"> <File name="readline.h" open="0" top="0" tabpos="5">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="sdlscreen.h" open="0" top="0" tabpos="2"> <File name="sdlscreen.h" open="0" top="0" tabpos="2">
<Cursor position="2273" topLine="0" /> <Cursor position="2273" topLine="0" />
</File> </File>
<File name="shade.c" open="1" top="0" tabpos="6"> <File name="shade.c" open="0" top="0" tabpos="6">
<Cursor position="31123" topLine="924" /> <Cursor position="759" topLine="7" />
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

2
aide.c
View File

@ -200,7 +200,7 @@ void Bouton_Stats(void)
char Buffer[37]; char Buffer[37];
dword Utilisation_couleur[256]; dword Utilisation_couleur[256];
long Taille; long Taille;
struct statfs* Informations_Disque; struct statfs* Informations_Disque = NULL;
Ouvrir_fenetre(310,174,"Statistics"); Ouvrir_fenetre(310,174,"Statistics");

View File

@ -2286,7 +2286,7 @@ byte Bouton_Load_ou_Save(byte Load, byte Image)
short Bouton_clicke; short Bouton_clicke;
struct Fenetre_Bouton_scroller * Scroller_de_fichiers; struct Fenetre_Bouton_scroller * Scroller_de_fichiers;
short Temp; short Temp;
unsigned Bidon; // Sert … appeler _dos_setdrive unsigned Bidon=0; // Sert … appeler _dos_setdrive
word Drives_Debut_Y; word Drives_Debut_Y;
byte Charger_ou_sauver_l_image=0; byte Charger_ou_sauver_l_image=0;
char Nom_drive[3]=" "; char Nom_drive[3]=" ";
@ -2947,7 +2947,7 @@ void Load_picture(byte Image)
byte Format_fichier_initial; byte Format_fichier_initial;
byte Ne_pas_restaurer; byte Ne_pas_restaurer;
byte Utiliser_palette_brosse; byte Utiliser_palette_brosse;
struct Composantes * Palette_initiale; struct Composantes * Palette_initiale=NULL;
byte Ancienne_forme_curseur; byte Ancienne_forme_curseur;
short Principal_Largeur_image_initiale=Principal_Largeur_image; short Principal_Largeur_image_initiale=Principal_Largeur_image;
short Principal_Hauteur_image_initiale=Principal_Hauteur_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) void Bouton_Colorize_Afficher_la_selection(int Numero)
{ {
short Pos_Y; // Ligne o— afficher les flŠches de slection short Pos_Y=0; // Ligne o— afficher les flŠches de slection
// On commence par effacer les anciennes slections: // On commence par effacer les anciennes slections:
// Partie gauche // Partie gauche
@ -4830,8 +4830,8 @@ void Bouton_Trame_Menu(void)
short Indice; short Indice;
short Pos_X; short Pos_X;
short Pos_Y; short Pos_Y;
short Old_Pos_X; short Old_Pos_X=0;
short Old_Pos_Y; short Old_Pos_Y=0;
short Orig_X; short Orig_X;
short Orig_Y; short Orig_Y;
static byte Octet_insere=0; static byte Octet_insere=0;

View File

@ -91,3 +91,25 @@ void Get_input(void)
SDL_PollEvent(Evenement_SDL); 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;
}

View File

@ -40,8 +40,8 @@ void Shade_Blocs_degrades(void)
word Curseur=0; word Curseur=0;
word Nb_shades=0; word Nb_shades=0;
short Shade_traite,Ancien_shade_traite; short Shade_traite,Ancien_shade_traite;
word Taille_shade; word Taille_shade=0;
word Debut_shade; word Debut_shade=0;
short Pos_X,Pos_Y; short Pos_X,Pos_Y;
short Taille_X,Taille_Y; short Taille_X,Taille_Y;
short Debut_X,Debut_Y,Fin_X,Fin_Y; short Debut_X,Debut_Y,Fin_X,Fin_Y;