From: chaoskagami Date: Tue, 30 Sep 2014 04:08:45 +0000 (-0400) Subject: As it turns out, I forgot to default over to false inside UDisplayable so everything... X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=61b5b4f73307b8915b9e20b767794ec080e327bc;p=vn%2Fvndc.git As it turns out, I forgot to default over to false inside UDisplayable so everything ended up in the overlay. lol, me. All basic code *should* be backend independent now. Besides SDL_ttf stuff, probably. --- diff --git a/bin/vndc.x86_64 b/bin/vndc.x86_64 new file mode 100755 index 0000000..0081fd1 Binary files /dev/null and b/bin/vndc.x86_64 differ diff --git a/external/zero/src/UDisplayable.cpp b/external/zero/src/UDisplayable.cpp index e50496d..3d82e1a 100644 --- a/external/zero/src/UDisplayable.cpp +++ b/external/zero/src/UDisplayable.cpp @@ -17,6 +17,8 @@ frameIndex = -1; Error = false; + + over = false; } // Creates a new Displayable. @@ -186,6 +188,8 @@ else { this->bitmap = cx->GLTexImage(bitmap_tmp); } + + this->dispMode = mode; } // From SDL_Surface. @@ -230,6 +234,8 @@ else { this->bitmap = cx->GLTexImage(bitmap_tmp); } + + this->dispMode = mode; } // Sets the position on screen. diff --git a/vndc/include/gitrev.hpp b/vndc/include/gitrev.hpp index 2745b8b..9390568 100644 --- a/vndc/include/gitrev.hpp +++ b/vndc/include/gitrev.hpp @@ -1,5 +1,5 @@ #ifndef GIT_REV_HDR #define GIT_REV_HDR -#define GIT_REV "2aefc48e99ae39a5427858ce44bfb625c51ac8db" +#define GIT_REV "cff84267f8b34b544c8815e9789db8705d85c10c" #endif diff --git a/vndc/src/Data.cpp b/vndc/src/Data.cpp index 8c8ca87..a79abe2 100644 --- a/vndc/src/Data.cpp +++ b/vndc/src/Data.cpp @@ -56,14 +56,14 @@ void Data_PreInit() { void Data_PostInit() { /* Generate the surface for use with cleartext. */ int width_dr = (GetData()->render_x2 - GetData()->render_x1 + 20); - int height_dr = (GetData()->render_y2 - GetData()->render_y1 + 20); + int height_dr = (GetData()->render_y2 - GetData()->render_y1 + 20 + 30); SDL_Surface* pass_sfc = SDL_CreateRGBSurface(0, width_dr, height_dr, 32, RED_MASK, GREEN_MASK, BLUE_MASK, ALPHA_MASK); SDL_FillRect(pass_sfc, NULL, SDL_MapRGBA(pass_sfc->format, 0, 0, 0, 100)); GetData()->text_box_base = new UDisplayable(GetData()->ctx, Normal, pass_sfc); GetData()->text_box_base->SetOverlay(true); - // GetData()->text_box_base->SetXY(GetData()->render_x1, GetData()->render_y1); + GetData()->text_box_base->SetXY(GetData()->render_x1 - 10, GetData()->render_y1 - 10); } DataContainer* GetData() {