Commit 76f0448f authored by Nicolas LIENART's avatar Nicolas LIENART

Game update

parent fa6bb945
@ITD 3
# This is a sample ITD file
# Comments can be placed on any line using '#" sign as the first char
carte level3.ppm
carte BIRI.ppm
energie 180
# A random comment
chemin 255 255 255
......
@ITD 1
# This is a sample ITD file
# Comments can be placed on any line using '#" sign as the first char
carte level1.ppm
carte OLIVIER.ppm
energie 20
# A random comment
chemin 255 255 255
......
@ITD 3
# This is a sample ITD file
# Comments can be placed on any line using '#" sign as the first char
carte level2.ppm
carte STEEVE.ppm
energie 180
# A random comment
chemin 255 255 255
......
......@@ -786,7 +786,7 @@ void display_drawFPS()
if (gameData->FPS != NULL) {
glPushMatrix();
glTranslatef(700, 20, 0);
glColor3f(1, 0, 1);
glColor3f(1, 1, 1);
glScalef(20*gameData->FPS->ratio,20,1);
sprite_displayFixedTextureText(gameData->FPS);
glPopMatrix();
......@@ -1046,7 +1046,7 @@ void display_printMoney()
sprite_displayFixedTexture(MONEY_TEX);
glPopMatrix();
glColor3f(1,0,0);
glColor3f(0,1,0);
glPushMatrix();
glTranslatef(15, 5, 0);
glScalef(15, 15, 1);
......@@ -1056,6 +1056,7 @@ void display_printMoney()
glPushMatrix();
glTranslatef(30, 0, 0);
glScalef(14*texture_texte->ratio, 14, 1);
glColor3f(1,1,1);
sprite_displayFixedTextureText(texture_texte);
glPopMatrix();
......@@ -1071,7 +1072,7 @@ void display_printMoney()
void display_top()
{
glColor3f(1,1,0);
glColor3f(.50,0.7,1);
display_setDrawingZone(gameData->topGUI);
display_drawZoneBasedOnGUI(gameData->topGUI);
display_drawButtonsBasedOnGUI(gameData->topGUI);
......
......@@ -114,7 +114,7 @@ void gui_init()
gameData->bodyGUI->dimensions = dimensions;
gameData->topGUI = gui_addChildren(HEADER, 0, 0, gameData->bodyGUI->dimensions->width, 40, gameData->bodyGUI, 0, FALSE);
gameData->topGUI = gui_addChildren(HEADER, 0, 0, gameData->bodyGUI->dimensions->width, 40, gameData->bodyGUI, WOODPLANKS_TEX, TRUE);
gui_addButton(gameData->topGUI, 600, 20, 45, 45, PAUSE_BTN, CLICKED, 0, FALSE, 0);
gameData->plateauGUI = gui_addChildren(PLATEAU, 0, 40, gameData->bodyGUI->dimensions->width, 600, gameData->bodyGUI, 0, FALSE);
......
......@@ -449,7 +449,7 @@ int itd_getEnergyValue(FILE* file)
int itd_checkForMapData(FILE* file)
{
int originalPosition = ftell(file);
char label[15];
char label[25];
if (fscanf(file, "%s", label)) {
RGBcolor* color = malloc(sizeof(RGBcolor));
......
......@@ -44,7 +44,7 @@ void sound_init()
son = Mix_LoadWAV("sound/beginLevel.wav");
gameData->sound[BEGINLEVEL] = son;
son = Mix_LoadWAV("sound/levelLose.wav");
son = Mix_LoadWAV("sound/levelLose.ogg");
gameData->sound[LOSELEVEL] = son;
son = Mix_LoadWAV("sound/levelWin.wav");
......
Markdown is supported
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