]> Chaos Git - vn/vndc.git/commitdiff
As it turns out, I forgot to default over to false inside UDisplayable so everything...
authorchaoskagami <chaos.kagami@gmail.com>
Tue, 30 Sep 2014 04:08:45 +0000 (00:08 -0400)
committerchaoskagami <chaos.kagami@gmail.com>
Tue, 30 Sep 2014 04:08:45 +0000 (00:08 -0400)
bin/vndc.x86_64 [new file with mode: 0755]
external/zero/src/UDisplayable.cpp
vndc/include/gitrev.hpp
vndc/src/Data.cpp

diff --git a/bin/vndc.x86_64 b/bin/vndc.x86_64
new file mode 100755 (executable)
index 0000000..0081fd1
Binary files /dev/null and b/bin/vndc.x86_64 differ
index e50496d98350bcd3fde79e65d7fa9198b23faebc..3d82e1a5e9987a749e5f24b02c94401b7b446574 100644 (file)
@@ -17,6 +17,8 @@
                        frameIndex = -1;
 
                        Error = false;
+
+                       over = false;
        }
 
        // Creates a new Displayable.
                else {
                        this->bitmap = cx->GLTexImage(bitmap_tmp);
                }
+
+               this->dispMode = mode;
        }
 
        // From SDL_Surface.
                else {
                        this->bitmap = cx->GLTexImage(bitmap_tmp);
                }
+
+               this->dispMode = mode;
        }
 
        // Sets the position on screen.
index 2745b8b0fe030c95a6e7783c72b88a9d64a1a5cd..9390568c690bf0b2fe8fd5e44a9e6ea1642b7fa9 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef GIT_REV_HDR
 #define GIT_REV_HDR
-#define GIT_REV "2aefc48e99ae39a5427858ce44bfb625c51ac8db"
+#define GIT_REV "cff84267f8b34b544c8815e9789db8705d85c10c"
 
 #endif
index 8c8ca872565461b1a14e8408ccec0ed7e64ec73a..a79abe29703bfdaf6f6d84db07b99da0c823cb45 100644 (file)
@@ -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() {