Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorvald Natvig <slicer@users.sourceforge.net>2010-01-26 19:25:41 +0300
committerThorvald Natvig <slicer@users.sourceforge.net>2010-01-26 19:25:41 +0300
commit7f019a78207459ccc143fcc4ac3092bf99621458 (patch)
tree536d45a7321e78f7787dc9ec06051cf10b22cb8e /overlay
parent4568886f7bf00752d628850e40ff4cc0b9985c84 (diff)
Remove last parts of old SharedMemory
Diffstat (limited to 'overlay')
-rw-r--r--overlay/opengl.cpp4
-rw-r--r--overlay/overlay.h38
2 files changed, 0 insertions, 42 deletions
diff --git a/overlay/opengl.cpp b/overlay/opengl.cpp
index 72a0acf8c..032cafc63 100644
--- a/overlay/opengl.cpp
+++ b/overlay/opengl.cpp
@@ -131,9 +131,7 @@ static bool bChaining = false;
class Context : protected Pipe {
public:
HGLRC ctx;
- GLuint textures[NUM_TEXTS];
GLuint texture;
- unsigned int uiCounter[NUM_TEXTS];
Context(HDC hdc);
void draw(HDC hdc);
@@ -147,8 +145,6 @@ Context::Context(HDC hdc) {
ctx = owglCreateContext(hdc);
owglMakeCurrent(hdc, ctx);
- oglGenTextures(NUM_TEXTS, textures);
-
// Here we go. From the top. Where is glResetState?
oglDisable(GL_ALPHA_TEST);
oglDisable(GL_AUTO_NORMAL);
diff --git a/overlay/overlay.h b/overlay/overlay.h
index 20733cb64..6438a0641 100644
--- a/overlay/overlay.h
+++ b/overlay/overlay.h
@@ -33,44 +33,6 @@
#define OVERLAY_MAGIC_NUMBER 0x00000005
-#define TEXT_WIDTH 600
-#define TEXT_HEIGHT 60
-#define NUM_TEXTS 32
-
-#define TEXTURE_SIZE (TEXT_WIDTH*TEXT_HEIGHT*4)
-
-#define OVERLAY_VERSION_MAJ 1
-#define OVERLAY_VERSION_MIN 1
-#define OVERLAY_VERSION_PATCH 7
-#define OVERLAY_VERSION_SUB 0
-
-struct TextEntry {
- unsigned int color;
- wchar_t text[128];
- unsigned int uiCounter;
- short width;
- unsigned char texture[TEXTURE_SIZE];
-};
-
-struct SharedMem {
- unsigned char version[4];
- unsigned int lastAppAlive;
- bool bHooked;
- bool bDebug;
- bool bShow;
- bool bReset;
- float fX, fY;
- bool bTop, bBottom, bLeft, bRight;
- float fFontSize;
-
- unsigned int uiAudioTick;
- float fPos[3];
- float fFront[3];
- float fTop[3];
-
- struct TextEntry texts[NUM_TEXTS];
-};
-
struct OverlayMsgHeader {
unsigned int uiMagic;
int iLength;