summaryrefslogtreecommitdiff
path: root/src/code/z_view.c
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2021-04-29 14:39:46 -0400
committerGitHub <noreply@github.com>2021-04-29 14:39:46 -0400
commit98aef8988adbcb5960e8001e70141d0d1a9034bd (patch)
treea0443e402cb6fa06b0f964aad6d38bf185fb2a9b /src/code/z_view.c
parent0b8252cfe99651b3174ac8652ba133781e8e2105 (diff)
`assert` macro OK (#755)
* create assert macro and replace a bunch of __assert Signed-off-by: angie <angheloalf95@gmail.com> * Another bunch of assert Signed-off-by: angie <angheloalf95@gmail.com> * more assert Signed-off-by: angie <angheloalf95@gmail.com> * assert(false) Signed-off-by: angie <angheloalf95@gmail.com> * last assert used in matching code Signed-off-by: angie <angheloalf95@gmail.com> * the non-matchings Signed-off-by: angie <angheloalf95@gmail.com> * typo Signed-off-by: angie <angheloalf95@gmail.com> * format Signed-off-by: angie <angheloalf95@gmail.com> * change macro to uppercase Signed-off-by: angie <angheloalf95@gmail.com> * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Change ASSERT(false) to ASSERT(0) Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Diffstat (limited to 'src/code/z_view.c')
-rw-r--r--src/code/z_view.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 974191ac2..56ee4776a 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -157,18 +157,10 @@ void func_800AA550(View* view) {
lrx = view->viewport.rightX - varX;
lry = view->viewport.bottomY - varY;
- if (ulx < 0) {
- __assert("ulx >= 0", "../z_view.c", 454);
- }
- if (uly < 0) {
- __assert("uly >= 0", "../z_view.c", 455);
- }
- if (lrx > SCREEN_WIDTH) {
- __assert("lrx <= SCREEN_WD", "../z_view.c", 456);
- }
- if (lry > SCREEN_HEIGHT) {
- __assert("lry <= SCREEN_HT", "../z_view.c", 457);
- }
+ ASSERT(ulx >= 0, "ulx >= 0", "../z_view.c", 454);
+ ASSERT(uly >= 0, "uly >= 0", "../z_view.c", 455);
+ ASSERT(lrx <= SCREEN_WIDTH, "lrx <= SCREEN_WD", "../z_view.c", 456);
+ ASSERT(lry <= SCREEN_HEIGHT, "lry <= SCREEN_HT", "../z_view.c", 457);
OPEN_DISPS(gfxCtx, "../z_view.c", 459);