diff --git a/source/src/main.cpp b/source/src/main.cpp index 73437ae3..f81638ec 100644 --- a/source/src/main.cpp +++ b/source/src/main.cpp @@ -781,6 +781,7 @@ void resetgl() reloadfonts(); reloadtextures(); c2skeepalive(); + drawscope(true); // 2011feb05:ft: preload scope.png preload_playermodels(); c2skeepalive(); preload_hudguns(); diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index feab344c..0a589250 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -87,11 +87,11 @@ VARP(hideconsole, 0, 0, 1); VARP(hidespecthud, 0, 0, 1); VAR(showmap, 0, 0, 1); -void drawscope() +void drawscope(bool preload) { static Texture *scopetex = NULL; if(!scopetex) scopetex = textureload("packages/misc/scope.png", 3); - + if(preload) return; glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBindTexture(GL_TEXTURE_2D, scopetex->id); glColor3ub(255, 255, 255); @@ -682,16 +682,6 @@ void drawscores() glPopAttrib(); } -VARP(positiontype, 0, 0, 1); // integer (0) or float (1) return values? -void getposition() -{ - string poslist; - if(positiontype) formatstring(poslist)("%.2f %.2f %.2f", player1->o.x, player1->o.y, player1->o.z ); - else formatstring(poslist)("%d %d %d", player1->o.x*DNF, player1->o.y*DNF, player1->o.z*DNF ); - result(poslist); -} -COMMAND(getposition, ARG_NONE); - VARP(clockdisplay,0,0,2); VARP(dbgpos,0,0,1); void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwater)