diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-10-31 14:50:11 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 14:50:11 +1100 |
| commit | 83ceaf371748aa4b0fe6e54e8aaf879de01ce1d1 (patch) | |
| tree | 4f0faffc953c1017c01245878aeedec72bfa2607 /src/code/z_play.c | |
| parent | 0492c8e89af3806707e44a88379a3c8d9c503ca1 (diff) | |
z_kankyo Decompiled (3 non-matching) (#1451)
* z_Kankyo progress
* build OK
* progress
* more progress
* Kankyo WIP
* Add docs
* func_800FEAF4
* more docs
* func_800FEAF4
* improve Init
* Small cleanup
* kankyo data
* data cleanup
* Environment_DrawLensFlare
* Match Environment_UpdateSkybox
* Match Environment_DrawRainImpl
* Start on Environment_UpdateLights
* Match Environment_DrawSandstorm
* gRainDropDL
* Some light renamings
* Fix merge
* cleanup
* improve non-equivalents
* cleanup
* PR Review
* match Environment_UpdatePostmanEvents
* PR Review
* small improvement to Environment_UpdatePostmanEvents from anon
* more cleanup
* void
* bits
* fix comment
* improve Environment_UpdateLights
* Skybox Stars Docs
* PR Review
* fix merge
* macros
* Add comments
* PR Review
* gRandFloat
* bug
---------
Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'src/code/z_play.c')
| -rw-r--r-- | src/code/z_play.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/code/z_play.c b/src/code/z_play.c index 783b73de2..bec7f5f44 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -385,7 +385,7 @@ void Play_Destroy(GameState* thisx) { BombersNotebook_Destroy(&sBombersNotebook); this->state.gfxCtx->callback = NULL; - this->state.gfxCtx->callbackArg = 0; + this->state.gfxCtx->callbackArg = NULL; Play_DestroyMotionBlur(); if (R_PAUSE_BG_PRERENDER_STATE != PAUSE_BG_PRERENDER_OFF) { @@ -1332,7 +1332,7 @@ void Play_DrawMain(PlayState* this) { } if (1) { - Environment_FillScreen(gfxCtx, 0, 0, 0, this->bgCoverAlpha, 1); + Environment_FillScreen(gfxCtx, 0, 0, 0, this->bgCoverAlpha, FILL_SCREEN_OPA); } if (1) { @@ -1353,13 +1353,14 @@ void Play_DrawMain(PlayState* this) { if (1) { if (R_PLAY_FILL_SCREEN_ON) { Environment_FillScreen(gfxCtx, R_PLAY_FILL_SCREEN_R, R_PLAY_FILL_SCREEN_G, R_PLAY_FILL_SCREEN_B, - R_PLAY_FILL_SCREEN_ALPHA, 3); + R_PLAY_FILL_SCREEN_ALPHA, FILL_SCREEN_OPA | FILL_SCREEN_XLU); } switch (this->envCtx.fillScreen) { case 1: Environment_FillScreen(gfxCtx, this->envCtx.screenFillColor[0], this->envCtx.screenFillColor[1], - this->envCtx.screenFillColor[2], this->envCtx.screenFillColor[3], 3); + this->envCtx.screenFillColor[2], this->envCtx.screenFillColor[3], + FILL_SCREEN_OPA | FILL_SCREEN_XLU); break; default: @@ -1374,7 +1375,7 @@ void Play_DrawMain(PlayState* this) { } if (this->worldCoverAlpha != 0) { - Environment_FillScreen(gfxCtx, 0, 0, 0, this->worldCoverAlpha, 3); + Environment_FillScreen(gfxCtx, 0, 0, 0, this->worldCoverAlpha, FILL_SCREEN_OPA | FILL_SCREEN_XLU); } if (1) { |
