Corrected one typo

This commit is contained in:
Sylvain PILLOT 2022-02-28 18:37:35 +01:00
parent 323c89672f
commit 9486ed8911
1 changed files with 252 additions and 252 deletions

View File

@ -125,11 +125,11 @@ extern bopti_image_t bigboss;
extern bopti_image_t bigparch;
extern bopti_image_t bulletsbicolor;
extern bopti_image_t fragments;
extern bopti_image_t village;
extern bopti_image_t village;
extern bopti_image_t castletitle;
extern bopti_image_t theend;
extern bopti_image_t theend;
uint16_t palette[256];
uint16_t palette[256];
bool BlackFrag=false;
bool WhiteFrag=false;
@ -3527,11 +3527,11 @@ int computeLightModification( unsigned int currentCellX, unsigned int currentCel
void rayCast( unsigned int x1, unsigned int y1, unsigned int x2, unsigned int y2, unsigned char* Rs, unsigned char* Gs, unsigned char* Bs, unsigned char* As )
{
// Cette fonction est un algo type BRESENHAM qui lance un rayon depuis la lumière jusqu'à chaque pixel des murs
// Elle analyse la présence de blocs de glace de couleurs qui peuvent changer la couleur de la lumière du départ (Rs, Gs, Bs)
// Cette fonction est un algo type BRESENHAM qui lance un rayon depuis la lumière jusqu'à chaque pixel des murs
// Elle analyse la présence de blocs de glace de couleurs qui peuvent changer la couleur de la lumière du départ (Rs, Gs, Bs)
// Elle dessine le point sur le mur de la bonne couleur
// ATTENTION : toujours mettre x1 et y1 comme étant en premier et correspondant à la source de lumière !!!!
// ATTENTION : toujours mettre x1 et y1 comme étant en premier et correspondant à la source de lumière !!!!
char currentCellX = -1;
@ -5282,7 +5282,7 @@ int my_profile(int key, int duration, int count)
// key: Key being repeated
// duration: How long that key has been pressed
// count: How many times it's been repeated already
// Return value: how long to wait before next repeat (µs)
// Return value: how long to wait before next repeat (µs)
// Only allow KEY_LEFT and KEY_RIGHT
if(key != KEY_LEFT && key != KEY_RIGHT)
@ -5972,28 +5972,28 @@ static int get_inputs_story(void)
}
void drawStoryMenu( void )
{
doneStory = false;
selectStoryMenu = 1;
while (!doneStory)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dimage( 63, 41, &village);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_story();
}
{
doneStory = false;
selectStoryMenu = 1;
while (!doneStory)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dimage( 63, 41, &village);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_story();
}
doneStory = false;
selectStoryMenu = 1;
@ -6013,8 +6013,8 @@ void drawStoryMenu( void )
dprint( 54, 74, C_BLACK, "village came a Dark Sorcerer with the terrible");
dfont( &font_fantasy );
dprint( 55, 95, C_RGB(150,150,150), "ambition of stoling all lights and colors. Making" );
dprint( 54, 94, C_BLACK, "ambition of stoling all lights and colors. Making " );
dprint( 55, 95, C_RGB(150,150,150), "ambition of stealing all lights and colors. Making" );
dprint( 54, 94, C_BLACK, "ambition of stealing all lights and colors. Making " );
dfont( &font_fantasy );
dprint( 60, 115, C_RGB(150,150,150), "darkness and fear the only remaining things " );
@ -6023,11 +6023,11 @@ void drawStoryMenu( void )
dfont( &font_fantasy );
dprint( 60, 135, C_RGB(150,150,150), "here ..." );
dprint( 59, 134, C_BLACK, "here ..." );
dfont( &font_tiny );
dprint( 70, 166, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dfont( &font_tiny );
dprint( 70, 166, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 69, 165, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
@ -6047,154 +6047,154 @@ void drawStoryMenu( void )
dimage( 63, 41, &village);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_story();
}
*/
*/
int nbstep = 128;
int nbstep = 128;
memcpy( palette, village.data, 512 );
uint16_t paletteNB[256];
uint16_t paletteTemp[256];
uint16_t paletteStart[256][3];
uint16_t paletteEnd[256][3];
uint16_t paletteNow[256][3];
int16_t paletteDelta[256][3];
uint16_t paletteNB[256];
uint16_t paletteTemp[256];
uint16_t paletteStart[256][3];
uint16_t paletteEnd[256][3];
uint16_t paletteNow[256][3];
int16_t paletteDelta[256][3];
for( int k=0; k<255; k++)
{
unsigned char B=(unsigned char) ((palette[k] & 0b0000000000011111)<<3);
unsigned char G=(unsigned char) (((palette[k] & 0b0000011111100000) >> 5)<<2);
unsigned char R=(unsigned char) (((palette[k] & 0b1111100000000000) >> 11)<<3);
paletteStart[k][0] = R<<8;
paletteStart[k][1] = G<<8;
unsigned char R=(unsigned char) (((palette[k] & 0b1111100000000000) >> 11)<<3);
paletteStart[k][0] = R<<8;
paletteStart[k][1] = G<<8;
paletteStart[k][2] = B<<8;
uint16_t Moy = (0.299*R+0.587*G+0.114*B);
paletteEnd[k][0] = Moy<<8;
paletteEnd[k][1] = Moy<<8;
paletteEnd[k][2] = Moy<<8;
paletteDelta[k][0] = (paletteEnd[k][0] - paletteStart[k][0])/nbstep;
paletteDelta[k][1] = (paletteEnd[k][1] - paletteStart[k][1])/nbstep;
paletteDelta[k][2] = (paletteEnd[k][2] - paletteStart[k][2])/nbstep;
paletteEnd[k][0] = Moy<<8;
paletteEnd[k][1] = Moy<<8;
paletteEnd[k][2] = Moy<<8;
paletteDelta[k][0] = (paletteEnd[k][0] - paletteStart[k][0])/nbstep;
paletteDelta[k][1] = (paletteEnd[k][1] - paletteStart[k][1])/nbstep;
paletteDelta[k][2] = (paletteEnd[k][2] - paletteStart[k][2])/nbstep;
paletteNB[k] = (uint16_t) (((Moy>>3) << 11) | ((Moy>>2) << 5 ) | (Moy>>3));
}
//memcpy( village.data, paletteNB, 512 );
int framevillage = 0;
int framevillage = 0;
doneStory = false;
while (!doneStory)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
if (framevillage<=nbstep)
{
for( int k=0; k<255; k++)
{
paletteNow[k][0] = (paletteStart[k][0]+framevillage*paletteDelta[k][0])>>8;
paletteNow[k][1] = (paletteStart[k][1]+framevillage*paletteDelta[k][1])>>8;
paletteNow[k][2] = (paletteStart[k][2]+framevillage*paletteDelta[k][2])>>8;
paletteTemp[k] = (uint16_t) (((paletteNow[k][0]>>3) << 11) | ((paletteNow[k][1]>>2) << 5 ) | (paletteNow[k][2]>>3));
}
memcpy( village.data, paletteTemp, 512 );
}
else
{
memcpy( village.data, paletteNB, 512 );
}
framevillage++;
if (framevillage>=nbstep) framevillage=nbstep;
dimage( 63, 41, &village);
dimage( 0, 10, &bigparch);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
if (framevillage<=nbstep)
{
for( int k=0; k<255; k++)
{
paletteNow[k][0] = (paletteStart[k][0]+framevillage*paletteDelta[k][0])>>8;
paletteNow[k][1] = (paletteStart[k][1]+framevillage*paletteDelta[k][1])>>8;
paletteNow[k][2] = (paletteStart[k][2]+framevillage*paletteDelta[k][2])>>8;
paletteTemp[k] = (uint16_t) (((paletteNow[k][0]>>3) << 11) | ((paletteNow[k][1]>>2) << 5 ) | (paletteNow[k][2]>>3));
}
memcpy( village.data, paletteTemp, 512 );
}
else
{
memcpy( village.data, paletteNB, 512 );
}
framevillage++;
if (framevillage>=nbstep) framevillage=nbstep;
dimage( 63, 41, &village);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_story();
}
doneStory = false;
selectStoryMenu = 1;
while (!doneStory)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dfont( &font_fantasy );
dprint( 60, 55, C_RGB(150,150,150), "The Sorcerer returned to his Castle" );
dprint( 59, 54, C_BLACK, "The Sorcerer returned to his Castle" );
dfont( &font_fantasy );
dprint( 60, 75, C_RGB(150,150,150), "and ruled his Daughters to protect his loot..." );
dprint( 59, 74, C_BLACK, "and ruled his Daughters to protect his loot..." );
dfont( &font_fantasy );
dprint( 65, 95, C_RGB(150,150,150), "Guided only by courage, you entered the" );
dprint( 64, 94, C_BLACK, "Guided only by courage, you entered the" );
dfont( &font_fantasy );
dprint( 65, 115, C_RGB(150,150,150), "castle to defeat all dangers and help the" );
dprint( 64, 114, C_BLACK, "castle to defeat all dangers and help the" );
dfont( &font_fantasy );
dprint( 65, 135, C_RGB(150,150,150), "villagers ... Good luck my Friend !!!" );
dprint( 64, 134, C_BLACK, "villagers ... Good luck my Friend !!!" );
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_story();
}
doneStory = false;
selectStoryMenu = 1;
while (!doneStory)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dimage( 63, 41, &castletitle);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] Play");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] Play");
dupdate();
get_inputs_story();
}
doneStory = false;
selectStoryMenu = 1;
while (!doneStory)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dfont( &font_fantasy );
dprint( 60, 55, C_RGB(150,150,150), "The Sorcerer returned to his Castle" );
dprint( 59, 54, C_BLACK, "The Sorcerer returned to his Castle" );
dfont( &font_fantasy );
dprint( 60, 75, C_RGB(150,150,150), "and ruled his Daughters to protect his loot..." );
dprint( 59, 74, C_BLACK, "and ruled his Daughters to protect his loot..." );
dfont( &font_fantasy );
dprint( 65, 95, C_RGB(150,150,150), "Guided only by courage, you entered the" );
dprint( 64, 94, C_BLACK, "Guided only by courage, you entered the" );
dfont( &font_fantasy );
dprint( 65, 115, C_RGB(150,150,150), "castle to defeat all dangers and help the" );
dprint( 64, 114, C_BLACK, "castle to defeat all dangers and help the" );
dfont( &font_fantasy );
dprint( 65, 135, C_RGB(150,150,150), "villagers ... Good luck my Friend !!!" );
dprint( 64, 134, C_BLACK, "villagers ... Good luck my Friend !!!" );
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_story();
}
doneStory = false;
selectStoryMenu = 1;
while (!doneStory)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dimage( 63, 41, &castletitle);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] Play");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] Play");
dupdate();
get_inputs_story();
}
memcpy( village.data, palette, 512 );
}
@ -6612,114 +6612,114 @@ void drawEndMenu( void )
}
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_end();
}
doneEnd = false;
int framevillage = 0;
int nbstep = 128;
memcpy( palette, village.data, 512 );
uint16_t paletteNB[256];
uint16_t paletteTemp[256];
uint16_t paletteStart[256][3];
uint16_t paletteEnd[256][3];
uint16_t paletteNow[256][3];
int16_t paletteDelta[256][3];
for( int k=0; k<255; k++)
{
unsigned char B=(unsigned char) ((palette[k] & 0b0000000000011111)<<3);
unsigned char G=(unsigned char) (((palette[k] & 0b0000011111100000) >> 5)<<2);
unsigned char R=(unsigned char) (((palette[k] & 0b1111100000000000) >> 11)<<3);
paletteEnd[k][0] = R<<8;
paletteEnd[k][1] = G<<8;
paletteEnd[k][2] = B<<8;
uint16_t Moy = (0.299*R+0.587*G+0.114*B);
paletteStart[k][0] = Moy<<8;
paletteStart[k][1] = Moy<<8;
paletteStart[k][2] = Moy<<8;
paletteDelta[k][0] = (paletteEnd[k][0] - paletteStart[k][0])/nbstep;
paletteDelta[k][1] = (paletteEnd[k][1] - paletteStart[k][1])/nbstep;
paletteDelta[k][2] = (paletteEnd[k][2] - paletteStart[k][2])/nbstep;
paletteNB[k]= (uint16_t) (((Moy>>3) << 11) | ((Moy>>2) << 5 ) | (Moy>>3));
}
memcpy( village.data, paletteNB, 512 );
doneEnd = false;
while (!doneEnd)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
if (framevillage<=nbstep)
{
for( int k=0; k<255; k++)
{
paletteNow[k][0] = (paletteStart[k][0]+framevillage*paletteDelta[k][0])>>8;
paletteNow[k][1] = (paletteStart[k][1]+framevillage*paletteDelta[k][1])>>8;
paletteNow[k][2] = (paletteStart[k][2]+framevillage*paletteDelta[k][2])>>8;
paletteTemp[k] = (uint16_t) (((paletteNow[k][0]>>3) << 11) | ((paletteNow[k][1]>>2) << 5 ) | (paletteNow[k][2]>>3));
}
memcpy( village.data, paletteTemp, 512 );
}
else
{
memcpy( village.data, paletteNB, 512 );
}
framevillage++;
if (framevillage>=nbstep) framevillage=nbstep;
dimage( 63, 41, &village);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_end();
}
doneEnd = false;
while (!doneEnd)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dimage( 88, 42, &maintitle);
dimage( 108, 105, &theend);
dfont( &font_tiny );
dprint( 118, 170, C_RGB(150,150,150), "[EXE/EXIT] Back to Main Menu");
dprint( 117, 169, C_BLACK,"[EXE/EXIT] Back to Main Menu");
dupdate();
get_inputs_end();
}
doneEnd = false;
int framevillage = 0;
int nbstep = 128;
memcpy( palette, village.data, 512 );
uint16_t paletteNB[256];
uint16_t paletteTemp[256];
uint16_t paletteStart[256][3];
uint16_t paletteEnd[256][3];
uint16_t paletteNow[256][3];
int16_t paletteDelta[256][3];
for( int k=0; k<255; k++)
{
unsigned char B=(unsigned char) ((palette[k] & 0b0000000000011111)<<3);
unsigned char G=(unsigned char) (((palette[k] & 0b0000011111100000) >> 5)<<2);
unsigned char R=(unsigned char) (((palette[k] & 0b1111100000000000) >> 11)<<3);
paletteEnd[k][0] = R<<8;
paletteEnd[k][1] = G<<8;
paletteEnd[k][2] = B<<8;
uint16_t Moy = (0.299*R+0.587*G+0.114*B);
paletteStart[k][0] = Moy<<8;
paletteStart[k][1] = Moy<<8;
paletteStart[k][2] = Moy<<8;
paletteDelta[k][0] = (paletteEnd[k][0] - paletteStart[k][0])/nbstep;
paletteDelta[k][1] = (paletteEnd[k][1] - paletteStart[k][1])/nbstep;
paletteDelta[k][2] = (paletteEnd[k][2] - paletteStart[k][2])/nbstep;
paletteNB[k]= (uint16_t) (((Moy>>3) << 11) | ((Moy>>2) << 5 ) | (Moy>>3));
}
memcpy( village.data, paletteNB, 512 );
doneEnd = false;
while (!doneEnd)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
if (framevillage<=nbstep)
{
for( int k=0; k<255; k++)
{
paletteNow[k][0] = (paletteStart[k][0]+framevillage*paletteDelta[k][0])>>8;
paletteNow[k][1] = (paletteStart[k][1]+framevillage*paletteDelta[k][1])>>8;
paletteNow[k][2] = (paletteStart[k][2]+framevillage*paletteDelta[k][2])>>8;
paletteTemp[k] = (uint16_t) (((paletteNow[k][0]>>3) << 11) | ((paletteNow[k][1]>>2) << 5 ) | (paletteNow[k][2]>>3));
}
memcpy( village.data, paletteTemp, 512 );
}
else
{
memcpy( village.data, paletteNB, 512 );
}
framevillage++;
if (framevillage>=nbstep) framevillage=nbstep;
dimage( 63, 41, &village);
dfont( &font_tiny );
dprint( 60, 170, C_RGB(150,150,150), "[EXE/EXIT] >>>");
dprint( 59, 169, C_BLACK,"[EXE/EXIT] >>>");
dupdate();
get_inputs_end();
}
doneEnd = false;
while (!doneEnd)
{
dclear(C_RGB(0,0,0));
dimage( 0, 10, &bigparch);
dimage( 88, 42, &maintitle);
dimage( 108, 105, &theend);
dfont( &font_tiny );
dprint( 118, 170, C_RGB(150,150,150), "[EXE/EXIT] Back to Main Menu");
dprint( 117, 169, C_BLACK,"[EXE/EXIT] Back to Main Menu");
dupdate();
get_inputs_end();
}
}