squash! Fixup from the short-hash merge to beta

taysta · Oct 28, 2023 · 8af90e1 · 8af90e1
1 parent b512316
commit 8af90e1
Showing 1 changed file with 2 additions and 25 deletions.
diff --git a/codemp/client/cl_console.cpp b/codemp/client/cl_console.cpp
@@ -995,33 +995,10 @@ void Con_DrawSolidConsole( float frac ) {
  re->SetColor( console_color );
  re->DrawStretchPic( 0, y, SCREEN_WIDTH, 2, 0, 0, 0, 0, cls.whiteShader );
 
-#if 0
- i = strlen( JK_VERSION );
-
- for (x=0 ; x<i ; x++) {
- SCR_DrawSmallChar( cls.glconfig.vidWidth - ( i - x + 1 ) * con.charWidth,
- (lines-(con.charHeight*2+con.charHeight/2)) + padding, JK_VERSION[x] );
- }
-#else
- i = strlen(version);
-
- for (x = 0; x < i; x++) {
- SCR_DrawSmallChar(cls.glconfig.vidWidth - (i - x + 1) * con.charWidth,
- (lines - (con.charHeight * 2 + con.charHeight / 2)) + padding, version[x]);
- }
-#endif
-
- // Draw time and date
- time(&rawtime);
- newtime = localtime(&rawtime);
- if (newtime->tm_hour >= 12) AM = qfalse;
- if (newtime->tm_hour > 12) newtime->tm_hour -= 12;
- if (newtime->tm_hour == 0) newtime->tm_hour = 12;
- Com_sprintf(ts, sizeof(ts), "%.19s %s ", asctime(newtime), AM ? "AM" : "PM" );
- i = strlen(ts);
+ i = strlen(JK_VERSION);
 
  for (x = 0; x<i; x++) {
- SCR_DrawSmallChar(cls.glconfig.vidWidth - (i - x) * con.charWidth, lines - (con.charHeight + con.charHeight / 2) + padding, ts[x]);
+ SCR_DrawSmallChar(cls.glconfig.vidWidth - (i - x) * con.charWidth, lines - (con.charHeight + con.charHeight / 2) + padding, JK_VERSION[x]);
  }
 
  // draw the text