Skip to content

Commit

Permalink
gl2d.c: normalise line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
WinterMute committed Jun 22, 2020
1 parent f74ef89 commit ba316d4
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions source/arm9/gl2d.c
Original file line number Diff line number Diff line change
Expand Up @@ -546,12 +546,12 @@ void glSprite( int x, int y, int flipmode, const glImage *spr )
int x2 = x + spr->width;
int y2 = y + spr->height;

int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u2 = spr->u_off + (( flipmode & GL_FLIP_H ) ? 0 : spr->width);
int v1 = spr->v_off + (( flipmode & GL_FLIP_V ) ? spr->height-1 : 0);
int v2 = spr->v_off + (( flipmode & GL_FLIP_V ) ? 0 : spr->height);




if ( spr->textureID != gCurrentTexture )
{
Expand Down Expand Up @@ -591,7 +591,7 @@ void glSpriteScale( int x, int y, s32 scale, int flipmode, const glImage *spr )
int x2 = spr->width;
int y2 = spr->height;

int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u2 = spr->u_off + (( flipmode & GL_FLIP_H ) ? 0 : spr->width-1);
int v1 = spr->v_off + (( flipmode & GL_FLIP_V ) ? spr->height-1 : 0);
int v2 = spr->v_off + (( flipmode & GL_FLIP_V ) ? 0 : spr->height-1);
Expand Down Expand Up @@ -643,7 +643,7 @@ void glSpriteScaleXY( int x, int y, s32 scaleX, s32 scaleY, int flipmode, const
int x2 = spr->width;
int y2 = spr->height;

int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u2 = spr->u_off + (( flipmode & GL_FLIP_H ) ? 0 : spr->width-1);
int v1 = spr->v_off + (( flipmode & GL_FLIP_V ) ? spr->height-1 : 0);
int v2 = spr->v_off + (( flipmode & GL_FLIP_V ) ? 0 : spr->height-1);
Expand Down Expand Up @@ -698,7 +698,7 @@ void glSpriteRotate( int x, int y, s32 angle, int flipmode, const glImage *spr )
int y2 = s_half_y;


int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u2 = spr->u_off + (( flipmode & GL_FLIP_H ) ? 0 : spr->width-1);
int v1 = spr->v_off + (( flipmode & GL_FLIP_V ) ? spr->height-1 : 0);
int v2 = spr->v_off + (( flipmode & GL_FLIP_V ) ? 0 : spr->height-1);
Expand Down Expand Up @@ -755,7 +755,7 @@ void glSpriteRotateScale( int x, int y, s32 angle, s32 scale, int flipmode, cons
int x2 = s_half_x;
int y2 = s_half_y;

int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u2 = spr->u_off + (( flipmode & GL_FLIP_H ) ? 0 : spr->width-1);
int v1 = spr->v_off + (( flipmode & GL_FLIP_V ) ? spr->height-1 : 0);
int v2 = spr->v_off + (( flipmode & GL_FLIP_V ) ? 0 : spr->height-1);
Expand Down Expand Up @@ -815,7 +815,7 @@ void glSpriteRotateScaleXY( int x, int y, s32 angle, s32 scaleX, s32 scaleY, int
int x2 = s_half_x;
int y2 = s_half_y;

int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u2 = spr->u_off + (( flipmode & GL_FLIP_H ) ? 0 : spr->width-1);
int v1 = spr->v_off + (( flipmode & GL_FLIP_V ) ? spr->height-1 : 0);
int v2 = spr->v_off + (( flipmode & GL_FLIP_V ) ? 0 : spr->height-1);
Expand Down Expand Up @@ -967,7 +967,7 @@ void glSpriteOnQuad( int x1, int y1,
)
{

int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u1 = spr->u_off + (( flipmode & GL_FLIP_H ) ? spr->width-1 : 0);
int u2 = spr->u_off + (( flipmode & GL_FLIP_H ) ? 0 : spr->width-1);
int v1 = spr->v_off + (( flipmode & GL_FLIP_V ) ? spr->height-1 : 0);
int v2 = spr->v_off + (( flipmode & GL_FLIP_V ) ? 0 : spr->height-1);
Expand Down

0 comments on commit ba316d4

Please sign in to comment.