Browse Source

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.
pull/657/head
noshbar 6 years ago
parent
commit
1d548eaa4b
3 changed files with 8 additions and 6 deletions
  1. +1
    -1
      games/just_do/screens/screen_level06.c
  2. +1
    -1
      games/koala_seasons/screens/screen_gameplay.c
  3. +6
    -4
      games/transmission/screens/screen_ending.c

+ 1
- 1
games/just_do/screens/screen_level06.c View File

@ -132,7 +132,7 @@ void DrawLevel06Screen(void)
DrawRectangleRec(movingRecs[i], GRAY); 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) if (levelFinished)
{ {

+ 1
- 1
games/koala_seasons/screens/screen_gameplay.c View File

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

+ 6
- 4
games/transmission/screens/screen_ending.c View File

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

||||||
x
 
000:0
Loading…
Cancel
Save