diff --git a/Example.GameLib/src/GameEnts.c b/Example.GameLib/src/GameEnts.c index 1fbab6d..706e37f 100644 --- a/Example.GameLib/src/GameEnts.c +++ b/Example.GameLib/src/GameEnts.c @@ -1,8 +1,8 @@ // Copyright (C) 2012 Valeriano Alfonso Rodriguez (Kableado) +#include #include #include -#include #include "GameLib.h" extern int gamelib_debug; @@ -40,7 +40,6 @@ void player_proc(Entity e, int ft) { float jumpVel = 50.0f; float airMovementFactor = 0.1f; - // Process elasticity float entityScale[2]; Entity_GetScale(e, entityScale); @@ -48,7 +47,6 @@ void player_proc(Entity e, int ft) { entityScale[1] += (1.0f - entityScale[1]) / 2.0f; Entity_SetScale(e, entityScale); - if (e->A > 0) { if (Input_GetKey(InputKey_Jump) == InputKey_Pressed || Input_GetKey(InputKey_Up) == InputKey_Pressed) { @@ -101,27 +99,29 @@ void player_proc(Entity e, int ft) { e->A = 0; } -void player_postproc(Entity e, int ft){ +void player_postproc(Entity e, int ft) { // Scroll View GameLib_MoveToPos(e->pos, 0.6f); - //GameLib_MoveToPos(e->pos, 1.0f); + // GameLib_MoveToPos(e->pos, 1.0f); } -int player_collision(Entity ent, Entity ent2, float t, vec2 n){ - if(n[1] < 0 && fabs(n[1]) > fabs(n[0])){ +int player_collision(Entity ent, Entity ent2, float t, vec2 n) { + if (n[1] < 0 && fabs(n[1]) > fabs(n[0])) { ent->A = 1; } - + if (fabs(n[0]) > fabs(n[1])) { float intensity = (fabs(ent->vel[0]) - 10.0f) / 40.0f; if (intensity > 0) { - Entity_SetScale(ent, (float[2]){1.0f - (0.3f * intensity), 1.0f + (0.3f * intensity)}); + Entity_SetScale(ent, (float[2]){1.0f - (0.3f * intensity), + 1.0f + (0.3f * intensity)}); } } else { float intensity = (fabs(ent->vel[1]) - 10.0f) / 40.0f; if (intensity > 0) { - Entity_SetScale(ent, (float[2]){1.0f + (0.3f * intensity), 1.0f - (0.3f * intensity)}); + Entity_SetScale(ent, (float[2]){1.0f + (0.3f * intensity), + 1.0f - (0.3f * intensity)}); } } return -1; diff --git a/Example.GameLib/src/GameEnts.h b/Example.GameLib/src/GameEnts.h index bd65ad6..bc00b98 100644 --- a/Example.GameLib/src/GameEnts.h +++ b/Example.GameLib/src/GameEnts.h @@ -3,7 +3,6 @@ #ifndef _GAMEENTS_H_ #define _GAMEENTS_H_ - #define Ent_Player 1 #define Ent_Platform 2 #define Ent_Block 3 diff --git a/Example.GameLib/src/GameMap.c b/Example.GameLib/src/GameMap.c index ad4b93d..ff8acd3 100644 --- a/Example.GameLib/src/GameMap.c +++ b/Example.GameLib/src/GameMap.c @@ -1,9 +1,9 @@ // Copyright (C) 2012 Valeriano Alfonso Rodriguez (Kableado) +#include #include #include #include -#include #include "GameLib.h" diff --git a/Example.GameLib/src/main.c b/Example.GameLib/src/main.c index 8a4bd33..8334166 100644 --- a/Example.GameLib/src/main.c +++ b/Example.GameLib/src/main.c @@ -3,9 +3,8 @@ #include #include #include -#include #include - +#include #include "GameLib.h" extern int gamelib_debug; diff --git a/src/Anim.c b/src/Anim.c index dce3818..a98ecd6 100644 --- a/src/Anim.c +++ b/src/Anim.c @@ -3,8 +3,8 @@ #include #include -#include "Draw.h" #include "Anim.h" +#include "Draw.h" //////////////////////////////////////////////// // Animation // @@ -187,7 +187,8 @@ void AnimPlay_Draw(AnimPlay *ani, int x, int y, float scale[2]) { return; } if (ani->imgPart) { - Draw_DrawImgPart(ani->imgPart, x, y, ani->w, ani->h, ani->i, ani->j, scale); + Draw_DrawImgPart(ani->imgPart, x, y, ani->w, ani->h, ani->i, ani->j, + scale); return; } } @@ -236,7 +237,7 @@ void AnimPlay_SetPause(AnimPlay *ani, int p) { ani->pause = p; } // // void AnimPlay_IncTime(AnimPlay *ani, int t) { - if (ani->anim){ + if (ani->anim) { if (!ani->pause) { ani->time_ms += t; } diff --git a/src/Audio.c b/src/Audio.c index 652cdef..fc2b030 100644 --- a/src/Audio.c +++ b/src/Audio.c @@ -4,13 +4,13 @@ #define _WIN32_WINNT 0x0501 #include #endif -#include -#include -#include #include -#include "Util.h" +#include +#include +#include #include "Audio.h" +#include "Util.h" static void Audio_MixerCallback(void *ud, Uint8 *stream, int l); diff --git a/src/Draw.c b/src/Draw.c index 84e37eb..cccb7d6 100644 --- a/src/Draw.c +++ b/src/Draw.c @@ -157,10 +157,10 @@ int Draw_Init(int width, int height, char *title, int pfps, int fps) { #ifdef WIN32 #ifndef ATTACH_PARENT_PROCESS -# define ATTACH_PARENT_PROCESS ((DWORD)-1) +#define ATTACH_PARENT_PROCESS ((DWORD)-1) #endif // Salida en la consola del padre - AttachConsole(ATTACH_PARENT_PROCESS ); + AttachConsole(ATTACH_PARENT_PROCESS); if (GetStdHandle(STD_OUTPUT_HANDLE) != 0) { fclose(stdin); fclose(stdout); diff --git a/src/Draw.h b/src/Draw.h index f4268a5..0a8e19e 100644 --- a/src/Draw.h +++ b/src/Draw.h @@ -95,13 +95,15 @@ void Draw_DrawImgResized(DrawImg img, int x, int y, float w, float h); // Draw_DrawImgPart // // Draws an image part. -void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, float scale[2]); +void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, + float scale[2]); ///////////////////////////// // Draw_DrawImgPartHoriz // // Draws an image part horizontally. -void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, float scale[2]); +void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, + float scale[2]); ///////////////////////////// // Draw_ImgParallax diff --git a/src/Entity.c b/src/Entity.c index 7e33dfd..b299c31 100644 --- a/src/Entity.c +++ b/src/Entity.c @@ -1,12 +1,12 @@ // Copyright (C) 2011-2014 Valeriano Alfonso Rodriguez (Kableado) +#include #include #include -#include -#include "Util.h" -#include "Draw.h" #include "Anim.h" +#include "Draw.h" +#include "Util.h" #include "Entity.h" @@ -331,8 +331,9 @@ void Entity_PostProcess(Entity e, int ft) { vec2_set(e->vel, 0, 0); } else { // Apply dynamic friction - vec2_scale(e->vel, e->vel, 1.0f - (e->backFric_dynamic + - (e->backFric_static / len))); + vec2_scale(e->vel, e->vel, + 1.0f - + (e->backFric_dynamic + (e->backFric_static / len))); } // Mark the update of the position. diff --git a/src/Entity.h b/src/Entity.h index f8cec45..7386160 100644 --- a/src/Entity.h +++ b/src/Entity.h @@ -3,9 +3,9 @@ #ifndef _ENTITY_H_ #define _ENTITY_H_ -#include "Util.h" -#include "Draw.h" #include "Anim.h" +#include "Draw.h" +#include "Util.h" //////////////////////////////////////////////// // Entity diff --git a/src/FontData.h b/src/FontData.h index ad3334d..30e961f 100644 --- a/src/FontData.h +++ b/src/FontData.h @@ -1,260 +1,260 @@ // Copyright (C) 2011 Valeriano Alfonso Rodriguez (Kableado) static unsigned char fontdata_8x8[2048] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0xfe,0xfe,0xfe,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x10,0x38,0x7c,0xfe,0x00,0x00, - 0x00,0x00,0xfe,0x7c,0x38,0x10,0x00,0x00, - 0x20,0x30,0x38,0x3c,0x38,0x30,0x20,0x00, - 0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x18,0x18,0x18,0x18,0x18,0x00,0x18,0x00, - 0x6c,0x6c,0x00,0x00,0x00,0x00,0x00,0x00, - 0x6c,0x6c,0xfe,0x6c,0xfe,0x6c,0x6c,0x00, - 0x18,0x3e,0x60,0x3c,0x06,0x7c,0x18,0x00, - 0x00,0xc6,0xcc,0x18,0x30,0x66,0xc6,0x00, - 0x38,0x6c,0x38,0x76,0xdc,0xcc,0x76,0x00, - 0x18,0x18,0x30,0x00,0x00,0x00,0x00,0x00, - 0x0c,0x18,0x30,0x30,0x30,0x18,0x0c,0x00, - 0x30,0x18,0x0c,0x0c,0x0c,0x18,0x30,0x00, - 0x00,0x6c,0x38,0xfe,0x38,0x6c,0x00,0x00, - 0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00, - 0x00,0x00,0x00,0x00,0x18,0x18,0x30,0x00, - 0x00,0x00,0x00,0x7e,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00, - 0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00, - 0x3c,0x66,0x6e,0x76,0x66,0x3c,0x00,0x00, - 0x18,0x38,0x78,0x18,0x18,0x18,0x00,0x00, - 0x3c,0x66,0x06,0x1c,0x30,0x7e,0x00,0x00, - 0x3c,0x66,0x0c,0x06,0x66,0x3c,0x00,0x00, - 0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x00,0x00, - 0x7e,0x60,0x7c,0x06,0x66,0x3c,0x00,0x00, - 0x1c,0x30,0x60,0x7c,0x66,0x3c,0x00,0x00, - 0x7e,0x06,0x06,0x0c,0x18,0x18,0x00,0x00, - 0x3c,0x66,0x3c,0x66,0x66,0x3c,0x00,0x00, - 0x3c,0x66,0x3e,0x06,0x0c,0x38,0x00,0x00, - 0x00,0x18,0x18,0x00,0x18,0x18,0x00,0x00, - 0x00,0x18,0x18,0x00,0x18,0x18,0x30,0x00, - 0x00,0x06,0x18,0x60,0x18,0x06,0x00,0x00, - 0x00,0x00,0x7e,0x00,0x7e,0x00,0x00,0x00, - 0x00,0x60,0x18,0x06,0x18,0x60,0x00,0x00, - 0x3c,0x66,0x06,0x0c,0x18,0x00,0x18,0x00, - 0x3c,0x66,0x5a,0x5a,0x5e,0x60,0x3c,0x00, - 0x3c,0x66,0x66,0x7e,0x66,0x66,0x00,0x00, - 0x7c,0x66,0x7c,0x66,0x66,0x7c,0x00,0x00, - 0x3c,0x60,0x60,0x60,0x60,0x3c,0x00,0x00, - 0x78,0x6c,0x66,0x66,0x6c,0x78,0x00,0x00, - 0x7e,0x60,0x78,0x60,0x60,0x7e,0x00,0x00, - 0x7e,0x60,0x78,0x60,0x60,0x60,0x00,0x00, - 0x3c,0x66,0x60,0x6e,0x66,0x3e,0x00,0x00, - 0x66,0x66,0x7e,0x66,0x66,0x66,0x00,0x00, - 0x3c,0x18,0x18,0x18,0x18,0x3c,0x00,0x00, - 0x06,0x06,0x06,0x06,0x66,0x3c,0x00,0x00, - 0xc6,0xcc,0xd8,0xf8,0xcc,0xc6,0x00,0x00, - 0x60,0x60,0x60,0x60,0x60,0x7c,0x00,0x00, - 0xc6,0xee,0xfe,0xd6,0xc6,0xc6,0x00,0x00, - 0xc6,0xe6,0xf6,0xde,0xce,0xc6,0x00,0x00, - 0x3c,0x66,0x66,0x66,0x66,0x3c,0x00,0x00, - 0xfc,0xc6,0xc6,0xfc,0xc0,0xc0,0x00,0x00, - 0x78,0xcc,0xcc,0xcc,0xdc,0x7e,0x00,0x00, - 0x7c,0x66,0x66,0x7c,0x6c,0x66,0x00,0x00, - 0x7c,0xc6,0x70,0x1c,0xc6,0x7c,0x00,0x00, - 0x7e,0x18,0x18,0x18,0x18,0x18,0x00,0x00, - 0x66,0x66,0x66,0x66,0x66,0x3c,0x00,0x00, - 0x66,0x66,0x66,0x66,0x3c,0x18,0x00,0x00, - 0xc6,0xc6,0xd6,0xfe,0xee,0xc6,0x00,0x00, - 0xc6,0x6c,0x38,0x38,0x6c,0xc6,0x00,0x00, - 0xc6,0x6c,0x38,0x30,0x30,0x30,0x00,0x00, - 0xfe,0x0c,0x18,0x30,0x60,0xfe,0x00,0x00, - 0x3c,0x30,0x30,0x30,0x30,0x30,0x3c,0x00, - 0xc0,0x60,0x30,0x18,0x0c,0x06,0x02,0x00, - 0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3c,0x00, - 0x18,0x3c,0x66,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00, - 0x18,0x18,0x0c,0x00,0x00,0x00,0x00,0x00, - 0x00,0x3c,0x06,0x3e,0x66,0x3e,0x00,0x00, - 0x60,0x60,0x7c,0x66,0x66,0x7c,0x00,0x00, - 0x00,0x3c,0x60,0x60,0x60,0x3c,0x00,0x00, - 0x06,0x06,0x3e,0x66,0x66,0x3e,0x00,0x00, - 0x00,0x3c,0x66,0x7e,0x60,0x3c,0x00,0x00, - 0x1c,0x30,0x7c,0x30,0x30,0x30,0x00,0x00, - 0x00,0x3e,0x66,0x66,0x3e,0x06,0x3c,0x00, - 0x60,0x60,0x7c,0x66,0x66,0x66,0x00,0x00, - 0x30,0x00,0x30,0x30,0x30,0x18,0x00,0x00, - 0x0c,0x00,0x0c,0x0c,0x0c,0x0c,0x78,0x00, - 0x60,0x66,0x6c,0x78,0x6c,0x66,0x00,0x00, - 0x18,0x18,0x18,0x18,0x18,0x0c,0x00,0x00, - 0x00,0xec,0xfe,0xd6,0xc6,0xc6,0x00,0x00, - 0x00,0x7c,0x66,0x66,0x66,0x66,0x00,0x00, - 0x00,0x3c,0x66,0x66,0x66,0x3c,0x00,0x00, - 0x00,0x7c,0x66,0x66,0x7c,0x60,0x60,0x00, - 0x00,0x3e,0x66,0x66,0x3e,0x06,0x06,0x00, - 0x00,0x7c,0x66,0x60,0x60,0x60,0x00,0x00, - 0x00,0x3c,0x60,0x3c,0x06,0x7c,0x00,0x00, - 0x30,0x30,0x7c,0x30,0x30,0x1c,0x00,0x00, - 0x00,0x66,0x66,0x66,0x66,0x3e,0x00,0x00, - 0x00,0x66,0x66,0x66,0x3c,0x18,0x00,0x00, - 0x00,0xc6,0xc6,0xd6,0xfe,0x6c,0x00,0x00, - 0x00,0xcc,0x78,0x30,0x78,0xcc,0x00,0x00, - 0x00,0x66,0x66,0x66,0x3c,0x18,0x30,0x00, - 0x00,0x7e,0x0c,0x18,0x30,0x7e,0x00,0x00, - 0x0c,0x18,0x18,0x30,0x18,0x18,0x0c,0x00, - 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00, - 0x30,0x18,0x18,0x0c,0x18,0x18,0x30,0x00, - 0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe, 0x00, 0x00, // + 0x00, 0x00, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, // + 0x20, 0x30, 0x38, 0x3c, 0x38, 0x30, 0x20, 0x00, // + 0x04, 0x0c, 0x1c, 0x3c, 0x1c, 0x0c, 0x04, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x00, // + 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x6c, 0x6c, 0xfe, 0x6c, 0xfe, 0x6c, 0x6c, 0x00, // + 0x18, 0x3e, 0x60, 0x3c, 0x06, 0x7c, 0x18, 0x00, // + 0x00, 0xc6, 0xcc, 0x18, 0x30, 0x66, 0xc6, 0x00, // + 0x38, 0x6c, 0x38, 0x76, 0xdc, 0xcc, 0x76, 0x00, // + 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x0c, 0x18, 0x30, 0x30, 0x30, 0x18, 0x0c, 0x00, // + 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, // + 0x00, 0x6c, 0x38, 0xfe, 0x38, 0x6c, 0x00, 0x00, // + 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, // + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, // + 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, // + 0x3c, 0x66, 0x6e, 0x76, 0x66, 0x3c, 0x00, 0x00, // + 0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 0x00, 0x00, // + 0x3c, 0x66, 0x06, 0x1c, 0x30, 0x7e, 0x00, 0x00, // + 0x3c, 0x66, 0x0c, 0x06, 0x66, 0x3c, 0x00, 0x00, // + 0x1c, 0x3c, 0x6c, 0xcc, 0xfe, 0x0c, 0x00, 0x00, // + 0x7e, 0x60, 0x7c, 0x06, 0x66, 0x3c, 0x00, 0x00, // + 0x1c, 0x30, 0x60, 0x7c, 0x66, 0x3c, 0x00, 0x00, // + 0x7e, 0x06, 0x06, 0x0c, 0x18, 0x18, 0x00, 0x00, // + 0x3c, 0x66, 0x3c, 0x66, 0x66, 0x3c, 0x00, 0x00, // + 0x3c, 0x66, 0x3e, 0x06, 0x0c, 0x38, 0x00, 0x00, // + 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, // + 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x30, 0x00, // + 0x00, 0x06, 0x18, 0x60, 0x18, 0x06, 0x00, 0x00, // + 0x00, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x00, 0x00, // + 0x00, 0x60, 0x18, 0x06, 0x18, 0x60, 0x00, 0x00, // + 0x3c, 0x66, 0x06, 0x0c, 0x18, 0x00, 0x18, 0x00, // + 0x3c, 0x66, 0x5a, 0x5a, 0x5e, 0x60, 0x3c, 0x00, // + 0x3c, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x00, 0x00, // + 0x7c, 0x66, 0x7c, 0x66, 0x66, 0x7c, 0x00, 0x00, // + 0x3c, 0x60, 0x60, 0x60, 0x60, 0x3c, 0x00, 0x00, // + 0x78, 0x6c, 0x66, 0x66, 0x6c, 0x78, 0x00, 0x00, // + 0x7e, 0x60, 0x78, 0x60, 0x60, 0x7e, 0x00, 0x00, // + 0x7e, 0x60, 0x78, 0x60, 0x60, 0x60, 0x00, 0x00, // + 0x3c, 0x66, 0x60, 0x6e, 0x66, 0x3e, 0x00, 0x00, // + 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x00, 0x00, // + 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, // + 0x06, 0x06, 0x06, 0x06, 0x66, 0x3c, 0x00, 0x00, // + 0xc6, 0xcc, 0xd8, 0xf8, 0xcc, 0xc6, 0x00, 0x00, // + 0x60, 0x60, 0x60, 0x60, 0x60, 0x7c, 0x00, 0x00, // + 0xc6, 0xee, 0xfe, 0xd6, 0xc6, 0xc6, 0x00, 0x00, // + 0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0x00, 0x00, // + 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, // + 0xfc, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0x00, 0x00, // + 0x78, 0xcc, 0xcc, 0xcc, 0xdc, 0x7e, 0x00, 0x00, // + 0x7c, 0x66, 0x66, 0x7c, 0x6c, 0x66, 0x00, 0x00, // + 0x7c, 0xc6, 0x70, 0x1c, 0xc6, 0x7c, 0x00, 0x00, // + 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, // + 0x66, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, // + 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, // + 0xc6, 0xc6, 0xd6, 0xfe, 0xee, 0xc6, 0x00, 0x00, // + 0xc6, 0x6c, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, // + 0xc6, 0x6c, 0x38, 0x30, 0x30, 0x30, 0x00, 0x00, // + 0xfe, 0x0c, 0x18, 0x30, 0x60, 0xfe, 0x00, 0x00, // + 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00, // + 0xc0, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x02, 0x00, // + 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c, 0x00, // + 0x18, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, // + 0x18, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 0x00, // + 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 0x00, // + 0x00, 0x3c, 0x60, 0x60, 0x60, 0x3c, 0x00, 0x00, // + 0x06, 0x06, 0x3e, 0x66, 0x66, 0x3e, 0x00, 0x00, // + 0x00, 0x3c, 0x66, 0x7e, 0x60, 0x3c, 0x00, 0x00, // + 0x1c, 0x30, 0x7c, 0x30, 0x30, 0x30, 0x00, 0x00, // + 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x3c, 0x00, // + 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x00, 0x00, // + 0x30, 0x00, 0x30, 0x30, 0x30, 0x18, 0x00, 0x00, // + 0x0c, 0x00, 0x0c, 0x0c, 0x0c, 0x0c, 0x78, 0x00, // + 0x60, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x00, 0x00, // + 0x18, 0x18, 0x18, 0x18, 0x18, 0x0c, 0x00, 0x00, // + 0x00, 0xec, 0xfe, 0xd6, 0xc6, 0xc6, 0x00, 0x00, // + 0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, // + 0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, // + 0x00, 0x7c, 0x66, 0x66, 0x7c, 0x60, 0x60, 0x00, // + 0x00, 0x3e, 0x66, 0x66, 0x3e, 0x06, 0x06, 0x00, // + 0x00, 0x7c, 0x66, 0x60, 0x60, 0x60, 0x00, 0x00, // + 0x00, 0x3c, 0x60, 0x3c, 0x06, 0x7c, 0x00, 0x00, // + 0x30, 0x30, 0x7c, 0x30, 0x30, 0x1c, 0x00, 0x00, // + 0x00, 0x66, 0x66, 0x66, 0x66, 0x3e, 0x00, 0x00, // + 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x00, 0x00, // + 0x00, 0xc6, 0xc6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, // + 0x00, 0xcc, 0x78, 0x30, 0x78, 0xcc, 0x00, 0x00, // + 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x30, 0x00, // + 0x00, 0x7e, 0x0c, 0x18, 0x30, 0x7e, 0x00, 0x00, // + 0x0c, 0x18, 0x18, 0x30, 0x18, 0x18, 0x0c, 0x00, // + 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, // + 0x30, 0x18, 0x18, 0x0c, 0x18, 0x18, 0x30, 0x00, // + 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // +}; diff --git a/src/GameLib.c b/src/GameLib.c index 2aacc1e..8aa107d 100644 --- a/src/GameLib.c +++ b/src/GameLib.c @@ -1,18 +1,18 @@ // Copyright (C) 2011 Valeriano Alfonso Rodriguez (Kableado) -#include -#include -#include -#include #include +#include +#include +#include +#include +#include "Anim.h" +#include "Audio.h" +#include "Draw.h" +#include "Entity.h" +#include "Input.h" #include "Time.h" #include "Util.h" -#include "Draw.h" -#include "Input.h" -#include "Audio.h" -#include "Anim.h" -#include "Entity.h" #include "GameLib.h" @@ -641,7 +641,8 @@ void GameLib_EntitySetLight(Entity e, float r, float g, float b, float rad) { // GameLib_ConvertScreenPositionToGamePosition // // -void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, float f) { +void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, + float f) { int game_pos[2]; game_pos[0] = _game_pos0[0] + f * (_game_pos1[0] - _game_pos0[0]); diff --git a/src/GameLib.h b/src/GameLib.h index a59bfee..8a437c4 100644 --- a/src/GameLib.h +++ b/src/GameLib.h @@ -3,13 +3,13 @@ #ifndef _GAMELIB_H_ #define _GAMELIB_H_ +#include "Anim.h" +#include "Audio.h" +#include "Draw.h" +#include "Entity.h" +#include "Input.h" #include "Time.h" #include "Util.h" -#include "Draw.h" -#include "Input.h" -#include "Audio.h" -#include "Anim.h" -#include "Entity.h" ///////////////////////////// // GameLib_Init @@ -112,7 +112,8 @@ void GameLib_EntitySetLight(Entity e, float r, float g, float b, float rad); // GameLib_ConvertScreenPositionToGamePosition // // -void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, float f); +void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, + float f); ///////////////////////////// // GameLib_AddParallaxBackground diff --git a/src/Input.c b/src/Input.c index 1d58cd3..8d9a36a 100644 --- a/src/Input.c +++ b/src/Input.c @@ -1,13 +1,13 @@ // Copyright (C) 2011 Valeriano Alfonso Rodriguez (Kableado) -#include #include +#include #ifdef EMSCRIPTEN #define SDL_GetKeyState SDL_GetKeyboardState #endif -#include "Util.h" #include "Input.h" +#include "Util.h" // Globals InputKeyStatus _keys[InputKey_Max]; diff --git a/src/Time.c b/src/Time.c index 0da8138..47ba739 100644 --- a/src/Time.c +++ b/src/Time.c @@ -1,10 +1,10 @@ // Copyright (C) 2011-2014 Valeriano Alfonso Rodriguez (Kableado) -#include #include -#include -#include +#include #include +#include +#include #include "Time.h" diff --git a/src/Util.c b/src/Util.c index 4ef33d4..94bfe12 100644 --- a/src/Util.c +++ b/src/Util.c @@ -1,10 +1,10 @@ // Copyright (C) 2011 Valeriano Alfonso Rodriguez (Kableado) +#include #include #include #include #include -#include #include "Util.h" diff --git a/src/Util.h b/src/Util.h index b20a6ae..c917c76 100644 --- a/src/Util.h +++ b/src/Util.h @@ -3,8 +3,8 @@ #ifndef _UTIL_H_ #define _UTIL_H_ -#include #include +#include ///////////////////////////// // SolveQuadratic