From 8a97571cb4eeec2076f1dbeefb0ced98d3e6e8cf Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Fri, 22 Dec 2017 21:24:08 +0100 Subject: [PATCH] renamed ZZ to qpixel_pixel_outside --- basegraph.cpp | 6 +++--- textures.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basegraph.cpp b/basegraph.cpp index defc3f5b..7a419718 100644 --- a/basegraph.cpp +++ b/basegraph.cpp @@ -34,10 +34,10 @@ TTF_Font *font[256]; #if CAP_SDL SDL_Surface *s; -int ZZ; +int qpixel_pixel_outside; int& qpixel(SDL_Surface *surf, int x, int y) { - if(x<0 || y<0 || x >= surf->w || y >= surf->h) return ZZ; + if(x<0 || y<0 || x >= surf->w || y >= surf->h) return qpixel_pixel_outside; char *p = (char*) surf->pixels; p += y * surf->pitch; int *pi = (int*) (p); @@ -45,7 +45,7 @@ int& qpixel(SDL_Surface *surf, int x, int y) { } int qpixel3(SDL_Surface *surf, int x, int y) { - if(x<0 || y<0 || x >= surf->w || y >= surf->h) return ZZ; + if(x<0 || y<0 || x >= surf->w || y >= surf->h) return qpixel_pixel_outside; char *p = (char*) surf->pixels; p += y * surf->pitch; p += x; diff --git a/textures.cpp b/textures.cpp index 38ac9362..ea3fedb1 100644 --- a/textures.cpp +++ b/textures.cpp @@ -187,7 +187,7 @@ bool readtexture() { int base_x = tx/2 - origdim/2; int base_y = ty/2 - origdim/2; - ZZ = 0; // outside is black + qpixel_pixel_outside = 0; // outside is black vector half_expanded(twidth * ty); for(int y=0; y