3 minor sample game cleanups:

* changed bitwise & to logical &&
* removed redundant state check
* moved a strcpy inside a NULL check to prevent a crash.
  NOTE: nothing sensible will happen as a result, but no crash at least.
This commit is contained in:
noshbar 2018-10-10 22:05:13 +02:00
parent f238b9ea3c
commit 1d548eaa4b
3 changed files with 8 additions and 6 deletions

View File

@ -132,7 +132,7 @@ void DrawLevel06Screen(void)
DrawRectangleRec(movingRecs[i], GRAY);
}
if (!done & (mouseOverNum >= 0)) DrawRectangleLines(movingRecs[mouseOverNum].x - 5, movingRecs[mouseOverNum].y - 5, movingRecs[mouseOverNum].width + 10, movingRecs[mouseOverNum].height + 10, Fade(LIGHTGRAY, 0.8f));
if (!done && (mouseOverNum >= 0)) DrawRectangleLines(movingRecs[mouseOverNum].x - 5, movingRecs[mouseOverNum].y - 5, movingRecs[mouseOverNum].width + 10, movingRecs[mouseOverNum].height + 10, Fade(LIGHTGRAY, 0.8f));
if (levelFinished)
{

View File

@ -954,7 +954,7 @@ void UpdateGameplayScreen(void)
playerActive = false;
killer = 5;
}
else if (CheckCollisionRecs(bee, player) && (state == FINALFORM) && (state != KICK))
else if (CheckCollisionRecs(bee, player) && (state == FINALFORM))
{
isHitBee = true;
beeVelocity = 8;

View File

@ -110,10 +110,12 @@ void InitEndingScreen(void)
{
// WARNING: It fails if the last sentence word has a '.' after space
char *title = StringReplace(headline, messageWords[i].text, codingWords[messageWords[i].id]);
strcpy(headline, title); // Base headline updated
if (title != NULL) free(title);
if (title != NULL)
{
strcpy(headline, title); // Base headline updated
free(title);
}
}
}