Skip to content

Commit

Permalink
Tentative new name
Browse files Browse the repository at this point in the history
  • Loading branch information
andrei-drexler committed Jan 8, 2022
1 parent 127f1b1 commit 17d32f4
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Quake/console.c
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ void Con_DrawConsole (int lines, qboolean drawinput)

//draw version number in bottom right
y += 8;
q_snprintf (ver, sizeof(ver), "QuakeSpasm " QUAKESPASM_VER_STRING);
q_snprintf (ver, sizeof(ver), CONSOLE_TITLE_STRING);
for (x = 0; x < (int)strlen(ver); x++)
Draw_Character ((con_linewidth - strlen(ver) + x + 2)<<3, y, ver[x] /*+ 128*/);
}
Expand Down
2 changes: 1 addition & 1 deletion Quake/gl_vidsdl.c
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ static qboolean VID_SetMode (int width, int height, int refreshrate, int bpp, qb
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, depthbits);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, stencilbits);

q_snprintf(caption, sizeof(caption), "QuakeSpasm " QUAKESPASM_VER_STRING);
q_snprintf(caption, sizeof(caption), WINDOW_TITLE_STRING);

/* Create the window if needed, hidden */
if (!draw_context)
Expand Down
1 change: 1 addition & 0 deletions Quake/host.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ void Host_Version_f (void)
{
Con_Printf ("Quake Version %1.2f\n", VERSION);
Con_Printf ("QuakeSpasm Version " QUAKESPASM_VER_STRING "\n");
Con_Printf ("Ironwail Version " IRONWAIL_VER_STRING "\n");
Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n");
}

Expand Down
12 changes: 11 additions & 1 deletion Quake/quakedef.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define QUAKESPASM_VERSION 0.94
#define QUAKESPASM_VER_PATCH 3 // helper to print a string like 0.94.3
#ifndef QUAKESPASM_VER_SUFFIX
#define QUAKESPASM_VER_SUFFIX "-gl4" // optional version suffix string literal like "-beta1"
#define QUAKESPASM_VER_SUFFIX // optional version suffix string literal like "-beta1"
#endif

#define IRONWAIL_VERSION 0.3
#define IRONWAIL_VER_PATCH 0
#ifndef IRONWAIL_VER_SUFFIX
#define IRONWAIL_VER_SUFFIX // optional version suffix string literal like "-beta1"
#endif

#define QS_STRINGIFY_(x) #x
#define QS_STRINGIFY(x) QS_STRINGIFY_(x)

// combined version string like "0.92.1-beta1"
#define QUAKESPASM_VER_STRING QS_STRINGIFY(QUAKESPASM_VERSION) "." QS_STRINGIFY(QUAKESPASM_VER_PATCH) QUAKESPASM_VER_SUFFIX
#define IRONWAIL_VER_STRING QS_STRINGIFY(IRONWAIL_VERSION) "." QS_STRINGIFY(IRONWAIL_VER_PATCH) IRONWAIL_VER_SUFFIX

#define CONSOLE_TITLE_STRING "Ironwail " IRONWAIL_VER_STRING
#define WINDOW_TITLE_STRING "IronWail Quake " IRONWAIL_VER_STRING

//define PARANOID // speed sapping error checking

Expand Down

0 comments on commit 17d32f4

Please sign in to comment.