Skip to content
Snippets Groups Projects
Commit 8181f260 authored by Jin Zijun's avatar Jin Zijun
Browse files

delete functions

parent 18b8e898
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
src/SDL/background.c
+ 64
− 69
View file @ 8181f260
......@@ -52,41 +52,36 @@ void Perudo_initBackground( perudo* background){
background->error=false;
background->left_button_released=true;
SDL_Window* window = NULL;
SDL_Surface* screen = NULL;
SDL_Surface* image = NULL;
if(SDL_Init(SDL_INIT_VIDEO) < 0){
printf("SDL2 can't open，SDL2_Error: %s \n", SDL_GetError());
}
else
{
window = SDL_CreateWindow(WINDOW_TITLE,
window = SDL_CreateWindow(WINDOW_TITLE,
SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED,
WINDOW_WIDTH,
WINDOW_HEIGHT,
SDL_WINDOW_SHOWN);
background->background_screen = SDL_GetWindowSurface(window);
screen = SDL_GetWindowSurface(window);
image = SDL_LoadBMP("../project/resources/images/screen.bmp");
image = SDL_LoadBMP("/home/user/project/resources/images/screen.bmp");
SDL_BlitSurface(image, NULL, screen, NULL);
SDL_BlitSurface(image, NULL, screen, NULL);
SDL_UpdateWindowSurface(window);
background->background_pos.x=0;
background->background_pos.y=0;
SDL_UpdateWindowSurface(window);
background->background_pos.x=0;
background->background_pos.y=0;
background->background_error_pos.x=156;
background->background_error_pos.y=278;
background->background_error_pos.x=156;
background->background_error_pos.y=278;
}
SDL_RenderPresent(screen);
pause();
SDL_FreeSurface(image);
SDL_DestroyWindow(window);
SDL_Quit();
}
......@@ -220,7 +215,7 @@ void Perudo_initDice(){
TTF_Init();
background->text_color=color;
background->font=TTF_OpenFont( "../project/resources/fonts/cour.ttf", 15 );
background->font=TTF_OpenFont( "/home/user/project/resources/fonts/cour.ttf", 15 );
background->background_error=NULL;
......@@ -230,6 +225,8 @@ void Perudo_initDice(){
background->textbox_image=SDL_CreateRGBSurface(0, PERUDO_TEXTBOX_WIDTH, PERUDO_TEXTBOX__HEIGHT, 32, 0, 0, 0, 0);
background->backgroundtext_color=SDL_MapRGB(background->textbox_image->format,58,152,240);
SDL_FillRect(background->textbox_image,NULL,background->backgroundtext_color);
SDL_UpdateWindowSurface(background->textbox_image);
SDL_FreeSurface(background->textbox_image);
background->infobox_pos.x=WINDOW_WIDTH - PERUDO_BACKGROUND_WIDTH;
background->infobox_pos.y=0;
......@@ -241,45 +238,46 @@ void Perudo_initDice(){
positionPlayer[0].x=200;
positionPlayer[0].y=270;
background->player[0] = SDL_LoadBMP( "../project/resources/images/player1-big.bmp");
background->player[0] = SDL_LoadBMP( "/home/user/project/resources/images/player1-big.bmp");
SDL_BlitSurface(background->player[0],NULL, background->background_screen ,&(background->positionPlayer[0]));
positionPlayer[1].x=50;
positionPlayer[1].y=130;
background->player[1] = SDL_LoadBMP( "../project/resources/images/player2-small.bmp");
background->player[1] = SDL_LoadBMP( "/home/user/project/resources/images/player2-small.bmp");
SDL_BlitSurface(background->player[1],NULL, background->background_screen ,&(background->positionPlayer[1]));
positionPlayer[2].x=50;
positionPlayer[2].y=20;
background->player[2] = SDL_LoadBMP( "../project/resources/images/player3 - small .bmp");
background->player[2] = SDL_LoadBMP( "/home/user/project/resources/images/player3 - small .bmp");
SDL_BlitSurface(background->player[2],NULL, background->background_screen ,&(background->positionPlayer[2]));
positionPlayer[3].x=250;
positionPlayer[3].y=20;
background->player[3] = SDL_LoadBMP( "../project/resources/images/player4-small.bmp");
background->player[3] = SDL_LoadBMP( "/home/user/project/resources/images/player4-small.bmp");
SDL_BlitSurface(background->player[3],NULL, background->background_screen ,&(background->positionPlayer[3]));
positionPlayer[4].x=450;
positionPlayer[4].y=20;
background->player[4] = SDL_LoadBMP( "../project/resources/images/player5-small.bmp");
background->player[4] = SDL_LoadBMP( "/home/user/project/resources/images/player5-small.bmp");
SDL_BlitSurface(background->player[4],NULL, background->background_screen ,&(background->positionPlayer[4]));
positionPlayer[5].x=450;
positionPlayer[5].y=130;
background->player[5] = SDL_LoadBMP( "../project/resources/images/player6-small.bmp");
background->player[5] = SDL_LoadBMP( "/home/user/project/resources/images/player6-small.bmp");
SDL_BlitSurface(background->player[5],NULL, background->background_screen ,&(background->positionPlayer[5]));
SDL_FreeSurface(background->player[MAX_PLAYERS]);
SDL_UpdateWindowSurface(window);
background->input_surf[dice1]=SDL_LoadBMP("../project/resources/images/1.bmp");
background->input_surf[dice2]=SDL_LoadBMP("../project/resources/images/2.bmp");
background->input_surf[dice3]=SDL_LoadBMP("../project/resources/images/3.bmp");
background->input_surf[dice4]=SDL_LoadBMP("../project/resources/images/4.bmp");
background->input_surf[dice5]=SDL_LoadBMP("../project/resources/images/5.bmp");
background->input_surf[dice6]=SDL_LoadBMP("../project/resources/images/6.bmp");
background->input_surf[save]=SDL_LoadBMP("../project/resources/images/save.bmp");
background->input_surf[dice1]=SDL_LoadBMP("/home/user/project/resources/images/1.bmp");
background->input_surf[dice2]=SDL_LoadBMP("/home/user/project/resources/images/2.bmp");
background->input_surf[dice3]=SDL_LoadBMP("/home/user/project/resources/images/3.bmp");
background->input_surf[dice4]=SDL_LoadBMP("/home/user/project/resources/images/4.bmp");
background->input_surf[dice5]=SDL_LoadBMP("/home/user/project/resources/images/5.bmp");
background->input_surf[dice6]=SDL_LoadBMP("/home/user/project/resources/images/6.bmp");
background->input_surf[save]=SDL_LoadBMP("/home/user/project/resources/images/save.bmp");
/*background->input_surf[paco]=SDL_LoadBMP("images/background_editor/");
background->input_surf[dudo]=SDL_LoadBMP("images/background_editor/");
background->input_surf[clear]=SDL_LoadBMP("images/background_editor/");*/
......@@ -308,36 +306,36 @@ void Perudo_initDice(){
background->input_pos[clear].y=;*/
background->number[No1]=SDL_LoadBMP("../project/resources/images/number/1.bmp");
background->number[No2]=SDL_LoadBMP("../project/resources/images/number/2-0.bmp");
background->number[No3]=SDL_LoadBMP("../project/resources/images/number/3.bmp");
background->number[No4]=SDL_LoadBMP("../project/resources/images/number/4.bmp");
background->number[No5]=SDL_LoadBMP("../project/resources/images/number/5.bmp");
background->number[No6]=SDL_LoadBMP("../project/resources/images/number/6.bmp");
background->number[No7]=SDL_LoadBMP("../project/resources/images/number/7.bmp");
background->number[No8]=SDL_LoadBMP("../project/resources/images/number/8.bmp");
background->number[No9]=SDL_LoadBMP("../project/resources/images/number/9.bmp");
background->number[No10]=SDL_LoadBMP("../project/resources/images/number/10.bmp");
background->number[No11]=SDL_LoadBMP("../project/resources/images/number/11.bmp");
background->number[No12]=SDL_LoadBMP("../project/resources/images/number/12.bmp");
background->number[No13]=SDL_LoadBMP("../project/resources/images/number/13.bmp");
background->number[No14]=SDL_LoadBMP("../project/resources/images/number/14.bmp");
background->number[No15]=SDL_LoadBMP("../project/resources/images/number/15.bmp");
background->number[No16]=SDL_LoadBMP("../project/resources/images/number/16.bmp");
background->number[No17]=SDL_LoadBMP("../project/resources/images/number/17.bmp");
background->number[No18]=SDL_LoadBMP("../project/resources/images/number/18.bmp");
background->number[No19]=SDL_LoadBMP("../project/resources/images/number/19.bmp");
background->number[No20]=SDL_LoadBMP("../project/resources/images/number/20.bmp");
background->number[No21]=SDL_LoadBMP("../project/resources/images/number/21.bmp");
background->number[No22]=SDL_LoadBMP("../project/resources/images/number/22.bmp");
background->number[No23]=SDL_LoadBMP("../project/resources/images/number/23.bmp");
background->number[No24]=SDL_LoadBMP("../project/resources/images/number/24.bmp");
background->number[No25]=SDL_LoadBMP("../project/resources/images/number/25.bmp");
background->number[No26]=SDL_LoadBMP("../project/resources/images/number/26.bmp");
background->number[No27]=SDL_LoadBMP("../project/resources/images/number/27.bmp");
background->number[No28]=SDL_LoadBMP("../project/resources/images/number/28.bmp");
background->number[No29]=SDL_LoadBMP("../project/resources/images/number/29.bmp");
background->number[No30]=SDL_LoadBMP("../project/resources/images/number/30.bmp");
background->number[No1]=SDL_LoadBMP("/home/user/project/resources/images/number/1.bmp");
background->number[No2]=SDL_LoadBMP("/home/user/project/resources/images/number/2-0.bmp");
background->number[No3]=SDL_LoadBMP("/home/user/project/resources/images/number/3.bmp");
background->number[No4]=SDL_LoadBMP("/home/user/project/resources/images/number/4.bmp");
background->number[No5]=SDL_LoadBMP("/home/user/project/resources/images/number/5.bmp");
background->number[No6]=SDL_LoadBMP("/home/user/project/resources/images/number/6.bmp");
background->number[No7]=SDL_LoadBMP("/home/user/project/resources/images/number/7.bmp");
background->number[No8]=SDL_LoadBMP("/home/user/project/resources/images/number/8.bmp");
background->number[No9]=SDL_LoadBMP("/home/user/project/resources/images/number/9.bmp");
background->number[No10]=SDL_LoadBMP("/home/user/project/resources/images/number/10.bmp");
background->number[No11]=SDL_LoadBMP("/home/user/project/resources/images/number/11.bmp");
background->number[No12]=SDL_LoadBMP("/home/user/project/resources/images/number/12.bmp");
background->number[No13]=SDL_LoadBMP("/home/user/project/resources/images/number/13.bmp");
background->number[No14]=SDL_LoadBMP("/home/user/project/resources/images/number/14.bmp");
background->number[No15]=SDL_LoadBMP("/home/user/project/resources/images/number/15.bmp");
background->number[No16]=SDL_LoadBMP("/home/user/project/resources/images/number/16.bmp");
background->number[No17]=SDL_LoadBMP("/home/user/project/resources/images/number/17.bmp");
background->number[No18]=SDL_LoadBMP("/home/user/project/resources/images/number/18.bmp");
background->number[No19]=SDL_LoadBMP("/home/user/project/resources/images/number/19.bmp");
background->number[No20]=SDL_LoadBMP("/home/user/project/resources/images/number/20.bmp");
background->number[No21]=SDL_LoadBMP("/home/user/project/resources/images/number/21.bmp");
background->number[No22]=SDL_LoadBMP("/home/user/project/resources/images/number/22.bmp");
background->number[No23]=SDL_LoadBMP("/home/user/project/resources/images/number/23.bmp");
background->number[No24]=SDL_LoadBMP("/home/user/project/resources/images/number/24.bmp");
background->number[No25]=SDL_LoadBMP("/home/user/project/resources/images/number/25.bmp");
background->number[No26]=SDL_LoadBMP("/home/user/project/resources/images/number/26.bmp");
background->number[No27]=SDL_LoadBMP("/home/user/project/resources/images/number/27.bmp");
background->number[No28]=SDL_LoadBMP("/home/user/project/resources/images/number/28.bmp");
background->number[No29]=SDL_LoadBMP("/home/user/project/resources/images/number/29.bmp");
background->number[No30]=SDL_LoadBMP("/home/user/project/resources/images/number/30.bmp");
background->posNum[No1].x=200;
......@@ -411,9 +409,6 @@ void Perudo_initDice(){
background->input_pos[i].y,background->input_surf[i]);
}
SDL_FreeSurface(background->player[MAX_PLAYERS]);
}
......
src/SDL/common.h
+ 3
− 1
View file @ 8181f260
......@@ -36,7 +36,9 @@
enum Boolean { false = 0, true };
typedef enum Boolean Boolean;
SDL_Surface *screen;
SDL_Surface *screen;
SDL_Window* window;
SDL_Surface* image;
Uint32 sqrt32( Uint32 x );
......
src/SDL/game.c
+ 22
− 14
View file @ 8181f260
......@@ -4,11 +4,11 @@
extern SDL_Surface* screen;
void RunGame() {
void RunGame(void) {
int menu_select = 0;
int (*tab_menu[NB_MENU]) (void);
int menu_principal(void);
menu_principal();
int menu__creerjoueur(void);
tab_menu[0] = menu_principal;
......@@ -23,11 +23,15 @@ void RunGame() {
}
void initialisation(void) {
SDL_Window* window = NULL;
SDL_Surface* screen = NULL;
SDL_Surface* PerudoIcon = NULL;
SDL_Surface* image = NULL;
void initialisation(void) {
if (SDL_Init( SDL_INIT_VIDEO ) < 0 )
{
printf( "Incapable d'initialiser SDL_VIDEO: %s\n", SDL_GetError() );
......@@ -37,18 +41,22 @@ void initialisation(void) {
{
fprintf(stderr, "Erreur d'initialisation de TTF_Init : %s\n", TTF_GetError());
exit(EXIT_FAILURE);
}
PerudoIcon = SDL_LoadBMP("../project/resources/images/Icon.bmp");
SDL_SetColorKey(PerudoIcon, SDL_TRUE,SDL_MapRGB(PerudoIcon->format,255,0,255));
SDL_SetWindowIcon(screen, PerudoIcon);
screen = SDL_CreateWindow(WINDOW_TITLE, 0,0,WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_SHOWN);
if ( !screen )
}else
{
printf( "Problème d'initialisation de la SDL_Surface: %s\n", SDL_GetError( ) );
Perudo_launch();
int menu_principal();
int menu_creerjoueur();
if ( !screen )
{
printf( "Problème d'initialisation de la SDL_Surface: %s\n", SDL_GetError( ) );
}
}
pause();
SDL_FreeSurface(image);
SDL_DestroyWindow(window);
SDL_Quit();
}
......
src/SDL/game.h
+ 1
− 1
View file @ 8181f260
......@@ -19,7 +19,7 @@
#define MENU_CREERJOUEUR 1
void RunGame();
void RunGame(void);
void initialisation(void);
void initialisePartie(perudo* background);
......
src/SDL/main.c
+ 1
− 6
View file @ 8181f260
......@@ -10,12 +10,7 @@
int main(int argc, char* args[])
{
initialisation();
RunGame();
CloseSDL();
return EXIT_SUCCESS;
return 0;
}
......
src/SDL/menu.c
+ 15
− 15
View file @ 8181f260
......@@ -2,6 +2,7 @@
#include "menu.h"
extern SDL_Surface *screen;
int menu_principal(void)
{
......@@ -9,11 +10,10 @@ int menu_principal(void)
SDL_Event event;
Menu menu;
SDL_Rect positionFond;
SDL_Surface *ecran;
init_imagesmenu(&menu);
init_menu(&menu,positionFond,ecran);
init_menu(&menu,positionFond,screen);
while( SDL_Button_IsClicked( menu.buttons[quit] ) == false )
{
......@@ -34,7 +34,7 @@ int menu_principal(void)
return 2;
}
display_menu(&menu,ecran);
display_menu(&menu,screen);
}
......@@ -42,21 +42,20 @@ int menu_principal(void)
SDL_FreeSurface( menu.surf[ i ] );
return 0;
}
void init_imagesmenu(Menu* menu)
{
menu->surf[ 0 ] = SDL_LoadBMP( "../project/resources/images/BEGIN.bmp");
menu->surf[ 1 ] = SDL_LoadBMP( "../project/resources/images/QUIT.bmp" );
menu->surf[ 2 ] = SDL_LoadBMP( "../project/resources/images/PLAY.bmp" );
menu->surf[ 3 ] = SDL_LoadBMP( "../project/resources/images/EXPLAIN.bmp" );
menu->surf[ 0 ] = SDL_LoadBMP( "/home/user/project/resources/images/BEGIN.bmp");
menu->surf[ 1 ] = SDL_LoadBMP( "/home/user/project/resources/images/QUIT.bmp" );
menu->surf[ 2 ] = SDL_LoadBMP( "/home/user/project/resources/images/PLAY.bmp" );
menu->surf[ 3 ] = SDL_LoadBMP( "/home/user/project/resources/images/EXPLAIN.bmp" );
}
void init_menu(Menu* menu,SDL_Rect positionFond,SDL_Surface *ecran)
void init_menu(Menu* menu,SDL_Rect positionFond,SDL_Surface *screen)
{
SDL_BlitSurface(menu->surf[ 0 ], NULL, ecran, &positionFond);
SDL_BlitSurface(menu->surf[ 0 ], NULL, screen, &positionFond);
SDL_Button_Initialize( &(menu->buttons[quit]), 300, 450, menu->surf[ 1 ] );
SDL_Button_Initialize( &(menu->buttons[playmenu]), 300, 200, menu->surf[ 2 ] );
SDL_Button_Initialize( &(menu->buttons[explain]), 300, 325, menu->surf[ 3 ] );
......@@ -71,14 +70,15 @@ void update_menu(Menu* menu, SDL_Event* event)
}
void display_menu(Menu* menu,SDL_Surface *ecran)
void display_menu(Menu* menu,SDL_Surface *screen)
{
SDL_Button_Display( menu->buttons[quit], ecran );
SDL_Button_Display( menu->buttons[playmenu], ecran );
SDL_Button_Display( menu->buttons[explain], ecran );
SDL_Button_Display( menu->buttons[quit], screen );
SDL_Button_Display( menu->buttons[playmenu], screen );
SDL_Button_Display( menu->buttons[explain], screen );
SDL_RenderPresent(screen);
SDL_RenderPresent( ecran );
}
src/SDL/menu.h
+ 2
− 2
View file @ 8181f260
......@@ -26,6 +26,6 @@ enum input{quit,playmenu,explain};
int menu_principal(void);
void init_imagesmenu(Menu* menu);
void init_menu(Menu* menu,SDL_Rect positionFond,SDL_Surface *ecran);
void init_menu(Menu* menu,SDL_Rect positionFond,SDL_Surface *screen);
void update_menu(Menu* menu, SDL_Event* event);
void display_menu(Menu* menu,SDL_Surface *ecran);
void display_menu(Menu* menu,SDL_Surface *screen);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment