Implemented temporary ccmd "setaxis" for tweaking the input device ax…

…is settings during development. Don't write empty commands to the console command history buffer. Fixed some compilation problems.
skyjake · Feb 18, 2007 · 4e0c2fd · 4e0c2fd
1 parent 9a498d3
commit 4e0c2fd
Show file tree

Hide file tree

Showing 5 changed files with 1,092 additions and 982 deletions.
diff --git a/doomsday/engine/portable/include/gl_texmanager.h b/doomsday/engine/portable/include/gl_texmanager.h
@@ -147,6 +147,13 @@ DGLuint         GL_LoadGraphics4(resourceclass_t resClass, const char *name,
                                  gfxmode_t mode, int useMipmap, 
                                  int minFilter, int magFilter, int wrapS, int wrapT, 
                                  int otherFlags);
+DGLuint         GL_UploadTexture(byte *data, int width, int height,
+                                 boolean flagAlphaChannel,
+                                 boolean flagGenerateMipmaps,
+                                 boolean flagRgbData,
+                                 boolean flagNoStretch,
+                                 int minFilter, int magFilter,
+                                 int wrapS, int wrapT, int otherFlags);
 DGLuint         GL_UploadTexture2(texturecontent_t *content);
 DGLuint         GL_GetTextureInfo(int index);
 DGLuint         GL_GetTextureInfo2(int index, boolean translate);

diff --git a/doomsday/engine/portable/src/con_busy.c b/doomsday/engine/portable/src/con_busy.c
@@ -39,6 +39,7 @@
 #include "de_graphics.h"
 #include "de_refresh.h"
 #include "de_ui.h"
+#include "de_misc.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -230,7 +231,8 @@ static void Con_BusyDeleteTextures(void)
  */
 void Con_AcquireScreenshotTexture(void)
 {
-    int oldMaxTexSize = glMaxTexSize;
+    int         oldMaxTexSize = glMaxTexSize;
+    byte       *frame;
 #ifdef _DEBUG
     timespan_t startTime;
 #endif
@@ -244,15 +246,15 @@ void Con_AcquireScreenshotTexture(void)
     startTime = Sys_GetRealSeconds();
 #endif
 
-    byte* frame = malloc(glScreenWidth * glScreenHeight * 3);
+    frame = M_Malloc(glScreenWidth * glScreenHeight * 3);
     gl.Grab(0, 0, glScreenWidth, glScreenHeight, DGL_RGB, frame);
     glMaxTexSize = 512; // A bit of a hack, but don't use too large a texture.
     texScreenshot = GL_UploadTexture(frame, glScreenWidth, glScreenHeight,
                                      false, false, true, false, 
                                      DGL_LINEAR, DGL_LINEAR, DGL_CLAMP, DGL_CLAMP,
                                      TXCF_NEVER_DEFER);
     glMaxTexSize = oldMaxTexSize;
-    free(frame);
+    M_Free(frame);
 
 #ifdef _DEBUG
     printf("Con_AcquireScreenshotTexture: Took %.2f seconds.\n", 
@@ -451,7 +453,7 @@ static void Con_BusyDrawConsoleOutput(void)
 static void Con_BusyDrawer(void)
 {
     DGLuint oldBinding = 0;
-    char buf[100];
+//    char buf[100];
 
     Con_DrawScreenshotBackground();