diff --git a/doomsday/build/win32/vs8/jdoom.vcproj b/doomsday/build/win32/vs8/jdoom.vcproj
index 09bd414bc4..2ca1556967 100644
--- a/doomsday/build/win32/vs8/jdoom.vcproj
+++ b/doomsday/build/win32/vs8/jdoom.vcproj
@@ -70,7 +70,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doomsday/build/win32/vs8/jdoom64.vcproj b/doomsday/build/win32/vs8/jdoom64.vcproj
index 4fc2058d92..576d976dc8 100644
--- a/doomsday/build/win32/vs8/jdoom64.vcproj
+++ b/doomsday/build/win32/vs8/jdoom64.vcproj
@@ -70,7 +70,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doomsday/build/win32/vs8/jheretic.vcproj b/doomsday/build/win32/vs8/jheretic.vcproj
index 3ab56f0898..ee901d7f9d 100644
--- a/doomsday/build/win32/vs8/jheretic.vcproj
+++ b/doomsday/build/win32/vs8/jheretic.vcproj
@@ -4,7 +4,7 @@
Version="9.00"
Name="jHeretic"
ProjectGUID="{7D03FB13-8674-4473-BD32-83C43188B2D2}"
- RootNamespace="JHeretic"
+ RootNamespace="jHeretic"
TargetFrameworkVersion="131072"
>
@@ -18,7 +18,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doomsday/build/win32/vs8/jhexen.vcproj b/doomsday/build/win32/vs8/jhexen.vcproj
index 8918c3a94c..9375bf2d2e 100644
--- a/doomsday/build/win32/vs8/jhexen.vcproj
+++ b/doomsday/build/win32/vs8/jhexen.vcproj
@@ -4,7 +4,7 @@
Version="9.00"
Name="jHexen"
ProjectGUID="{060CA7D4-CEF4-4F36-8950-55A3E5C46C4C}"
- RootNamespace="JHexen"
+ RootNamespace="jHexen"
TargetFrameworkVersion="131072"
>
@@ -18,7 +18,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doomsday/build/win32/vs8/wolftc.vcproj b/doomsday/build/win32/vs8/wolftc.vcproj
index 43fd82a2b7..5e7cb7f567 100644
--- a/doomsday/build/win32/vs8/wolftc.vcproj
+++ b/doomsday/build/win32/vs8/wolftc.vcproj
@@ -70,7 +70,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doomsday/engine/api/dd_share.h b/doomsday/engine/api/dd_share.h
index 2f4114fd39..95f0378048 100644
--- a/doomsday/engine/api/dd_share.h
+++ b/doomsday/engine/api/dd_share.h
@@ -255,7 +255,8 @@ extern "C" {
DD_GAME_MODE, // 16 chars max (swdoom, doom1, udoom, tnt, heretic...)
DD_GAME_CONFIG, // String: dm/co-op, jumping, etc.
DD_DEF_FINALE,
- DD_GAME_NAME, // (eg jDoom, jHeretic...)
+ DD_GAME_NAME, // (e.g., jdoom, jheretic etc..., suitable for use with filepaths)
+ DD_GAME_NICENAME, // (e.g., jDoom, MyGame:Episode2 etc..., fancy name)
DD_GAME_DMUAPI_VER, // Version of the DMU API the game is using.
// Non-integer/special values for Set/Get
diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
index 976d34de72..c9cfaa3939 100644
--- a/doomsday/plugins/common/src/g_game.c
+++ b/doomsday/plugins/common/src/g_game.c
@@ -440,7 +440,7 @@ void G_CommonPreInit(void)
// Make sure game.dll isn't newer than Doomsday...
if(gi.version < DOOMSDAY_VERSION)
- Con_Error(GAMENAMETEXT " requires at least Doomsday " DOOMSDAY_VERSION_TEXT
+ Con_Error(GAME_NICENAME " requires at least Doomsday " DOOMSDAY_VERSION_TEXT
"!\n");
#ifdef TIC_DEBUG
rndDebugfile = fopen("rndtrace.txt", "wt");
diff --git a/doomsday/plugins/jdoom/include/version.h b/doomsday/plugins/jdoom/include/version.h
index 0e3dc37cb9..3eb4e7536e 100644
--- a/doomsday/plugins/jdoom/include/version.h
+++ b/doomsday/plugins/jdoom/include/version.h
@@ -34,8 +34,6 @@
# error "Using jDoom headers without __JDOOM__"
#endif
-// DOOM version
-
#ifndef JDOOM_VER_ID
# ifdef _DEBUG
# define JDOOM_VER_ID "+D Doomsday"
@@ -44,15 +42,15 @@
# endif
#endif
+// Used to derive filepaths.
#define GAMENAMETEXT "jdoom"
-// My my, the names of these #defines are really well chosen...
-#define VERSION_TEXT "1.15."DOOMSDAY_RELEASE_NAME
-#define VERSIONTEXT "Version "VERSION_TEXT" "__DATE__" ("JDOOM_VER_ID")"
+// Presented to the user in dialogs, messages etc.
+#define GAME_NICENAME "jDoom"
+#define GAME_DETAILS "jDoom is based on linuxdoom-1.10."
-// All the versions of Doom have different savegame IDs, but 500 will be
-// the savegame base from now on.
-#define SAVE_VERSION_BASE 500
-#define SAVE_VERSION (SAVE_VERSION_BASE + gameMode)
+#define GAME_VERSION_TEXT "1.15.0"
+#define GAME_VERSION_TEXTLONG "Version" GAME_VERSION_TEXT " " __DATE__ " (" JDOOM_VER_ID ")"
+#define GAME_VERSION_NUMBER 1,15,0,0 // For WIN32 version info.
#endif
diff --git a/doomsday/plugins/jdoom/res/jdoom.dll.manifest b/doomsday/plugins/jdoom/res/jdoom.dll.manifest
new file mode 100644
index 0000000000..a7be608a76
--- /dev/null
+++ b/doomsday/plugins/jdoom/res/jdoom.dll.manifest
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doomsday/plugins/jdoom/res/jdoom.ico b/doomsday/plugins/jdoom/res/jdoom.ico
new file mode 100644
index 0000000000..6357856265
Binary files /dev/null and b/doomsday/plugins/jdoom/res/jdoom.ico differ
diff --git a/doomsday/plugins/jdoom/res/jdoom.rc b/doomsday/plugins/jdoom/res/jdoom.rc
new file mode 100644
index 0000000000..8775d1774c
--- /dev/null
+++ b/doomsday/plugins/jdoom/res/jdoom.rc
@@ -0,0 +1,140 @@
+/**\file
+ *\section License
+ * License: GPL
+ * Online License Link: http://www.gnu.org/licenses/gpl.html
+ *
+ *\author Copyright © 2008 Daniel Swanson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * jdoom.rc: jDoom.dll resource script.
+ */
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+#include "windows.h"
+#include "../include/version.h"
+
+#undef APSTUDIO_READONLY_SYMBOLS
+
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+# ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+# endif //_WIN32
+
+# ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""windows.h""\r\n"
+ "#include ""../include/version.h""\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "#ifndef NO_MANIFEST\r\n"
+ " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""jdoom.dll.manifest""\r\n"
+ "#endif\r\n"
+ "\r\n"
+ "VS_VERSION_INFO VERSIONINFO\r\n"
+ "FILEVERSION GAME_VERSION_NUMBER\r\n"
+ "PRODUCTVERSION GAME_VERSION_NUMBER\r\n"
+ "# ifdef _DEBUG\r\n"
+ "FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
+ "# else\r\n"
+ "FILEFLAGSMASK 0\r\n"
+ "# endif\r\n"
+ "FILEOS VOS_NT_WINDOWS32\r\n"
+ "FILETYPE VFT_DLL\r\n"
+ "FILESUBTYPE VFT2_UNKNOWN\r\n"
+ "BEGIN\r\n"
+ " BLOCK ""StringFileInfo""\r\n"
+ " BEGIN\r\n"
+ " BLOCK ""040904b0""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""CompanyName"", ""\0""\r\n"
+ " VALUE ""FileDescription"", GAME_NICENAME "" (Doomsday Engine game plugin)\0""\r\n"
+ " VALUE ""FileVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " VALUE ""InternalName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""LegalCopyright"", ""Copyright © 2003-2008, Deng Team\0""\r\n"
+ " VALUE ""OriginalFilename"", ""jDoom.dll\0""\r\n"
+ " VALUE ""ProductName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""ProductVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " END\r\n"
+ " END\r\n"
+ "\r\n"
+ " BLOCK ""VarFileInfo""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""Translation"", 0x409, 1200\r\n"
+ " END\r\n"
+ "END\r\n"
+END
+# endif
+
+/**
+ * Icons:
+ * Icon with lowest ID value placed first to ensure application icon
+ * remains consistent on all systems.
+ */
+IDI_GAME_ICON ICON DISCARDABLE "jdoom.ico"
+
+#endif // English (U.S.) resources
+
+#ifndef APSTUDIO_INVOKED
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION GAME_VERSION_NUMBER
+PRODUCTVERSION GAME_VERSION_NUMBER
+# ifdef _DEBUG
+FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+# else
+FILEFLAGSMASK 0
+# endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "\0"
+ VALUE "FileDescription", GAME_NICENAME " (Doomsday Engine game plugin)\0"
+ VALUE "FileVersion", GAME_VERSION_TEXT "\0"
+ VALUE "InternalName", GAME_NICENAME "\0"
+ VALUE "LegalCopyright", "Copyright © 2003-2008, Deng Team\0"
+ VALUE "OriginalFilename", "jDoom.dll\0"
+ VALUE "ProductName", GAME_NICENAME "\0"
+ VALUE "ProductVersion", GAME_VERSION_TEXT "\0"
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+#endif
diff --git a/doomsday/plugins/jdoom/res/resource.h b/doomsday/plugins/jdoom/res/resource.h
new file mode 100644
index 0000000000..89d7fdcf6a
--- /dev/null
+++ b/doomsday/plugins/jdoom/res/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by jdoom.rc
+//
+#define IDI_GAME_ICON 101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/doomsday/plugins/jdoom/src/d_api.c b/doomsday/plugins/jdoom/src/d_api.c
index 0ea76062c1..93e926be5c 100644
--- a/doomsday/plugins/jdoom/src/d_api.c
+++ b/doomsday/plugins/jdoom/src/d_api.c
@@ -91,8 +91,11 @@ void* G_GetVariable(int id)
case DD_GAME_NAME:
return GAMENAMETEXT;
+ case DD_GAME_NICENAME:
+ return GAME_NICENAME;
+
case DD_GAME_ID:
- return GAMENAMETEXT " " VERSION_TEXT;
+ return GAMENAMETEXT " " GAME_VERSION_TEXT;
case DD_GAME_MODE:
return gameModeString;
@@ -101,10 +104,10 @@ void* G_GetVariable(int id)
return gameConfigString;
case DD_VERSION_SHORT:
- return VERSION_TEXT;
+ return GAME_VERSION_TEXT;
case DD_VERSION_LONG:
- return VERSIONTEXT "\n"GAMENAMETEXT" is based on linuxdoom-1.10.";
+ return GAME_VERSION_TEXTLONG "\n" GAME_DETAILS;
case DD_ACTION_LINK:
return actionlinks;
diff --git a/doomsday/plugins/jdoom/src/p_oldsvg.c b/doomsday/plugins/jdoom/src/p_oldsvg.c
index aad793699b..28d69861b0 100644
--- a/doomsday/plugins/jdoom/src/p_oldsvg.c
+++ b/doomsday/plugins/jdoom/src/p_oldsvg.c
@@ -47,6 +47,11 @@
// MACROS ------------------------------------------------------------------
#define PADSAVEP() savePtr += (4 - ((savePtr - saveBuffer) & 3)) & 3
+
+// All the versions of DOOM have different savegame IDs, but 500 will be the
+// savegame base from now on.
+#define SAVE_VERSION_BASE 500
+#define SAVE_VERSION (SAVE_VERSION_BASE + gameMode)
#define SAVESTRINGSIZE (24)
#define VERSIONSIZE (16)
diff --git a/doomsday/plugins/jdoom64/include/version.h b/doomsday/plugins/jdoom64/include/version.h
index f9d15fc84f..bafd387532 100644
--- a/doomsday/plugins/jdoom64/include/version.h
+++ b/doomsday/plugins/jdoom64/include/version.h
@@ -22,6 +22,10 @@
* Boston, MA 02110-1301 USA
*/
+/**
+ * version.h: Version numbering, naming etc.
+ */
+
#ifndef __JDOOM64_VERSION_H__
#define __JDOOM64_VERSION_H__
@@ -29,8 +33,6 @@
# error "Using jDoom64 headers without __JDOOM64__"
#endif
-// JDOOM64 version
-
#ifndef JDOOM64_VER_ID
# ifdef _DEBUG
# define JDOOM64_VER_ID "+D Doomsday"
@@ -39,15 +41,15 @@
# endif
#endif
-#define GAMENAMETEXT "jdoom64"
+// Used to derive filepaths.
+#define GAMENAMETEXT "jdoom64"
-// My my, the names of these #defines are really well chosen...
-#define VERSION_TEXT "1.15."DOOMSDAY_RELEASE_NAME
-#define VERSIONTEXT "Version "VERSION_TEXT" "__DATE__" ("JDOOM64_VER_ID")"
+// Presented to the user in dialogs, messages etc.
+#define GAME_NICENAME "jDoom64"
+#define GAME_DETAILS "jDoom64 is based on jDoom-1.15."
-// All the versions of Doom have different savegame IDs, but
-// 500 will be the savegame base from now on.
-#define SAVE_VERSION_BASE 500
-#define SAVE_VERSION (SAVE_VERSION_BASE + gameMode)
+#define GAME_VERSION_TEXT "0.8.1"
+#define GAME_VERSION_TEXTLONG "Version" GAME_VERSION_TEXT " " __DATE__ " (" JDOOM64_VER_ID ")"
+#define GAME_VERSION_NUMBER 0,8,1,0 // For WIN32 version info.
#endif
diff --git a/doomsday/plugins/jdoom64/res/jdoom64.dll.manifest b/doomsday/plugins/jdoom64/res/jdoom64.dll.manifest
new file mode 100644
index 0000000000..a7be608a76
--- /dev/null
+++ b/doomsday/plugins/jdoom64/res/jdoom64.dll.manifest
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doomsday/plugins/jdoom64/res/jdoom64.rc b/doomsday/plugins/jdoom64/res/jdoom64.rc
new file mode 100644
index 0000000000..110acfdef6
--- /dev/null
+++ b/doomsday/plugins/jdoom64/res/jdoom64.rc
@@ -0,0 +1,140 @@
+/**\file
+ *\section License
+ * License: GPL
+ * Online License Link: http://www.gnu.org/licenses/gpl.html
+ *
+ *\author Copyright © 2008 Daniel Swanson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * jdoom64.rc: jDoom64.dll resource script.
+ */
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+#include "windows.h"
+#include "../include/version.h"
+
+#undef APSTUDIO_READONLY_SYMBOLS
+
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+# ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+# endif //_WIN32
+
+# ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""windows.h""\r\n"
+ "#include ""../include/version.h""\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "#ifndef NO_MANIFEST\r\n"
+ " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""jdoom64.dll.manifest""\r\n"
+ "#endif\r\n"
+ "\r\n"
+ "VS_VERSION_INFO VERSIONINFO\r\n"
+ "FILEVERSION GAME_VERSION_NUMBER\r\n"
+ "PRODUCTVERSION GAME_VERSION_NUMBER\r\n"
+ "# ifdef _DEBUG\r\n"
+ "FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
+ "# else\r\n"
+ "FILEFLAGSMASK 0\r\n"
+ "# endif\r\n"
+ "FILEOS VOS_NT_WINDOWS32\r\n"
+ "FILETYPE VFT_DLL\r\n"
+ "FILESUBTYPE VFT2_UNKNOWN\r\n"
+ "BEGIN\r\n"
+ " BLOCK ""StringFileInfo""\r\n"
+ " BEGIN\r\n"
+ " BLOCK ""040904b0""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""CompanyName"", ""\0""\r\n"
+ " VALUE ""FileDescription"", GAME_NICENAME "" (Doomsday Engine game plugin)\0""\r\n"
+ " VALUE ""FileVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " VALUE ""InternalName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""LegalCopyright"", ""Copyright © 2003-2008, Deng Team\0""\r\n"
+ " VALUE ""OriginalFilename"", ""jDoom64.dll\0""\r\n"
+ " VALUE ""ProductName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""ProductVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " END\r\n"
+ " END\r\n"
+ "\r\n"
+ " BLOCK ""VarFileInfo""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""Translation"", 0x409, 1200\r\n"
+ " END\r\n"
+ "END\r\n"
+END
+# endif
+
+/**
+ * Icons:
+ * Icon with lowest ID value placed first to ensure application icon
+ * remains consistent on all systems.
+ */
+IDI_GAME_ICON ICON DISCARDABLE "jdoom64.ico"
+
+#endif // English (U.S.) resources
+
+#ifndef APSTUDIO_INVOKED
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION GAME_VERSION_NUMBER
+PRODUCTVERSION GAME_VERSION_NUMBER
+# ifdef _DEBUG
+FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+# else
+FILEFLAGSMASK 0
+# endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "\0"
+ VALUE "FileDescription", GAME_NICENAME " (Doomsday Engine game plugin)\0"
+ VALUE "FileVersion", GAME_VERSION_TEXT "\0"
+ VALUE "InternalName", GAME_NICENAME "\0"
+ VALUE "LegalCopyright", "Copyright © 2003-2008, Deng Team\0"
+ VALUE "OriginalFilename", "jDoom64.dll\0"
+ VALUE "ProductName", GAME_NICENAME "\0"
+ VALUE "ProductVersion", GAME_VERSION_TEXT "\0"
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+#endif
diff --git a/doomsday/plugins/jdoom64/res/resource.h b/doomsday/plugins/jdoom64/res/resource.h
new file mode 100644
index 0000000000..95eadbc342
--- /dev/null
+++ b/doomsday/plugins/jdoom64/res/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by jdoom64.rc
+//
+#define IDI_GAME_ICON 101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/doomsday/plugins/jdoom64/src/d_api.c b/doomsday/plugins/jdoom64/src/d_api.c
index 09bd1f9b91..63646e244c 100644
--- a/doomsday/plugins/jdoom64/src/d_api.c
+++ b/doomsday/plugins/jdoom64/src/d_api.c
@@ -75,7 +75,6 @@ int G_GetInteger(int id)
default:
break;
}
-
// ID not recognized, return NULL.
return 0;
}
@@ -92,8 +91,11 @@ void *G_GetVariable(int id)
case DD_GAME_NAME:
return GAMENAMETEXT;
+ case DD_GAME_NICENAME:
+ return GAME_NICENAME;
+
case DD_GAME_ID:
- return GAMENAMETEXT " " VERSION_TEXT;
+ return GAMENAMETEXT " " GAME_VERSION_TEXT;
case DD_GAME_MODE:
return gameModeString;
@@ -102,10 +104,10 @@ void *G_GetVariable(int id)
return gameConfigString;
case DD_VERSION_SHORT:
- return VERSION_TEXT;
+ return GAME_VERSION_TEXT;
case DD_VERSION_LONG:
- return VERSIONTEXT "\n"GAMENAMETEXT" is based on linuxdoom-1.10.";
+ return GAME_VERSION_TEXTLONG "\n" GAME_DETAILS;
case DD_ACTION_LINK:
return actionlinks;
diff --git a/doomsday/plugins/jheretic/include/version.h b/doomsday/plugins/jheretic/include/version.h
index ffb0b96374..a258f59f98 100644
--- a/doomsday/plugins/jheretic/include/version.h
+++ b/doomsday/plugins/jheretic/include/version.h
@@ -5,7 +5,7 @@
*
*\author Copyright © 2003-2008 Jaakko Keränen
*\author Copyright © 2006-2008 Daniel Swanson
- *\author Copyright © 2006 Jamie Jones
+ *\author Copyright © 2006 Jamie Jones
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
*/
/**
- * version.h:
+ * version.h: Version numbering, naming etc.
*/
#ifndef __JHERETIC_VERSION_H__
@@ -34,8 +34,6 @@
# error "Using jHeretic headers without __JHERETIC__"
#endif
-#define SAVE_VERSION 130 // Don't change this.
-
#ifndef JHERETIC_VER_ID
# ifdef _DEBUG
# define JHERETIC_VER_ID "+D Doomsday"
@@ -44,10 +42,15 @@
# endif
#endif
+// Used to derive filepaths.
#define GAMENAMETEXT "jheretic"
-#define VERSION 210
-#define VERSION_TEXT "1.4."DOOMSDAY_RELEASE_NAME
-#define VERSIONTEXT "Version "VERSION_TEXT" "__DATE__" ("JHERETIC_VER_ID")"
+// Presented to the user in dialogs, messages etc.
+#define GAME_NICENAME "jHeretic"
+#define GAME_DETAILS "jHeretic is based on Heretic v1.3 by Raven Software."
+
+#define GAME_VERSION_TEXT "1.4.0"
+#define GAME_VERSION_TEXTLONG "Version" GAME_VERSION_TEXT " " __DATE__ " (" JHERETIC_VER_ID ")"
+#define GAME_VERSION_NUMBER 1,4,0,0 // For WIN32 version info.
#endif
diff --git a/doomsday/plugins/jheretic/res/icon1.ico b/doomsday/plugins/jheretic/res/icon1.ico
deleted file mode 100644
index 9dab71bc0e..0000000000
Binary files a/doomsday/plugins/jheretic/res/icon1.ico and /dev/null differ
diff --git a/doomsday/plugins/jheretic/res/jheretic.dll.manifest b/doomsday/plugins/jheretic/res/jheretic.dll.manifest
new file mode 100644
index 0000000000..a7be608a76
--- /dev/null
+++ b/doomsday/plugins/jheretic/res/jheretic.dll.manifest
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doomsday/plugins/jheretic/res/heretic.ico b/doomsday/plugins/jheretic/res/jheretic.ico
similarity index 100%
rename from doomsday/plugins/jheretic/res/heretic.ico
rename to doomsday/plugins/jheretic/res/jheretic.ico
diff --git a/doomsday/plugins/jheretic/res/jheretic.rc b/doomsday/plugins/jheretic/res/jheretic.rc
new file mode 100644
index 0000000000..1123d2b093
--- /dev/null
+++ b/doomsday/plugins/jheretic/res/jheretic.rc
@@ -0,0 +1,140 @@
+/**\file
+ *\section License
+ * License: GPL
+ * Online License Link: http://www.gnu.org/licenses/gpl.html
+ *
+ *\author Copyright © 2008 Daniel Swanson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * jheretic.rc: jHeretic.dll resource script.
+ */
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+#include "windows.h"
+#include "../include/version.h"
+
+#undef APSTUDIO_READONLY_SYMBOLS
+
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+# ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+# endif //_WIN32
+
+# ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""windows.h""\r\n"
+ "#include ""../include/version.h""\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "#ifndef NO_MANIFEST\r\n"
+ " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""jheretic.dll.manifest""\r\n"
+ "#endif\r\n"
+ "\r\n"
+ "VS_VERSION_INFO VERSIONINFO\r\n"
+ "FILEVERSION GAME_VERSION_NUMBER\r\n"
+ "PRODUCTVERSION GAME_VERSION_NUMBER\r\n"
+ "# ifdef _DEBUG\r\n"
+ "FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
+ "# else\r\n"
+ "FILEFLAGSMASK 0\r\n"
+ "# endif\r\n"
+ "FILEOS VOS_NT_WINDOWS32\r\n"
+ "FILETYPE VFT_DLL\r\n"
+ "FILESUBTYPE VFT2_UNKNOWN\r\n"
+ "BEGIN\r\n"
+ " BLOCK ""StringFileInfo""\r\n"
+ " BEGIN\r\n"
+ " BLOCK ""040904b0""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""CompanyName"", ""\0""\r\n"
+ " VALUE ""FileDescription"", GAME_NICENAME "" (Doomsday Engine game plugin)\0""\r\n"
+ " VALUE ""FileVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " VALUE ""InternalName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""LegalCopyright"", ""Copyright © 2003-2008, Deng Team\0""\r\n"
+ " VALUE ""OriginalFilename"", ""jHeretic.dll\0""\r\n"
+ " VALUE ""ProductName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""ProductVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " END\r\n"
+ " END\r\n"
+ "\r\n"
+ " BLOCK ""VarFileInfo""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""Translation"", 0x409, 1200\r\n"
+ " END\r\n"
+ "END\r\n"
+END
+# endif
+
+/**
+ * Icons:
+ * Icon with lowest ID value placed first to ensure application icon
+ * remains consistent on all systems.
+ */
+IDI_GAME_ICON ICON DISCARDABLE "jheretic.ico"
+
+#endif // English (U.S.) resources
+
+#ifndef APSTUDIO_INVOKED
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION GAME_VERSION_NUMBER
+PRODUCTVERSION GAME_VERSION_NUMBER
+# ifdef _DEBUG
+FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+# else
+FILEFLAGSMASK 0
+# endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "\0"
+ VALUE "FileDescription", GAME_NICENAME " (Doomsday Engine game plugin)\0"
+ VALUE "FileVersion", GAME_VERSION_TEXT "\0"
+ VALUE "InternalName", GAME_NICENAME "\0"
+ VALUE "LegalCopyright", "Copyright © 2003-2008, Deng Team\0"
+ VALUE "OriginalFilename", "jHeretic.dll\0"
+ VALUE "ProductName", GAME_NICENAME "\0"
+ VALUE "ProductVersion", GAME_VERSION_TEXT "\0"
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+#endif
diff --git a/doomsday/plugins/jheretic/res/resource.h b/doomsday/plugins/jheretic/res/resource.h
new file mode 100644
index 0000000000..317e31ce97
--- /dev/null
+++ b/doomsday/plugins/jheretic/res/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by jheretic.rc
+//
+#define IDI_GAME_ICON 101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/doomsday/plugins/jheretic/src/h_api.c b/doomsday/plugins/jheretic/src/h_api.c
index 93ce5dc0d2..493a8234d4 100644
--- a/doomsday/plugins/jheretic/src/h_api.c
+++ b/doomsday/plugins/jheretic/src/h_api.c
@@ -91,8 +91,11 @@ void* G_GetVariable(int id)
case DD_GAME_NAME:
return GAMENAMETEXT;
+ case DD_GAME_NICENAME:
+ return GAME_NICENAME;
+
case DD_GAME_ID:
- return GAMENAMETEXT " " VERSION_TEXT;
+ return GAMENAMETEXT " " GAME_VERSION_TEXT;
case DD_GAME_MODE:
return gameModeString;
@@ -101,11 +104,10 @@ void* G_GetVariable(int id)
return gameConfigString;
case DD_VERSION_SHORT:
- return VERSION_TEXT;
+ return GAME_VERSION_TEXT;
case DD_VERSION_LONG:
- return VERSIONTEXT
- "\n"GAMENAMETEXT" is based on Heretic v1.3 by Raven Software.";
+ return GAME_VERSION_TEXTLONG "\n" GAME_DETAILS;
case DD_ACTION_LINK:
return actionlinks;
diff --git a/doomsday/plugins/jheretic/src/h_main.c b/doomsday/plugins/jheretic/src/h_main.c
index 414da5d5c9..70cc83f9eb 100644
--- a/doomsday/plugins/jheretic/src/h_main.c
+++ b/doomsday/plugins/jheretic/src/h_main.c
@@ -434,7 +434,10 @@ void G_PostInit(void)
// Print a game mode banner with rulers.
Con_FPrintf(CBLF_RULER | CBLF_WHITE | CBLF_CENTER,
- GAMENAMETEXT " " VERSIONTEXT "\n");
+ gameMode == shareware? "Heretic Shareware Startup\n" :
+ gameMode == registered? "Heretic Registered Startup\n" :
+ gameMode == extended? "Heretic: Shadow of the Serpent Riders Startup\n" :
+ "Public Heretic\n");
Con_FPrintf(CBLF_RULER, "");
// Game parameters.
diff --git a/doomsday/plugins/jheretic/src/p_oldsvg.c b/doomsday/plugins/jheretic/src/p_oldsvg.c
index c6a9540963..ec5defe201 100644
--- a/doomsday/plugins/jheretic/src/p_oldsvg.c
+++ b/doomsday/plugins/jheretic/src/p_oldsvg.c
@@ -46,6 +46,8 @@
// MACROS ------------------------------------------------------------------
+// Do NOT change this:
+#define SAVE_VERSION 130
#define VERSIONSIZE 16
#define SAVE_GAME_TERMINATOR 0x1d
diff --git a/doomsday/plugins/jhexen/include/version.h b/doomsday/plugins/jhexen/include/version.h
index 93594220e5..dc20546c75 100644
--- a/doomsday/plugins/jhexen/include/version.h
+++ b/doomsday/plugins/jhexen/include/version.h
@@ -5,7 +5,7 @@
*
*\author Copyright © 2004-2008 Jaakko Keränen
*\author Copyright © 2007-2008 Daniel Swanson
- *\author Copyright © 2006 Jamie Jones
+ *\author Copyright © 2006 Jamie Jones
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
*/
/**
- * version.h:
+ * version.h: Version numbering, naming etc.
*/
#ifndef __JHEXEN_VERSION_H__
@@ -34,20 +34,23 @@
# error "Using jHexen headers without __JHEXEN__"
#endif
-#ifndef VER_ID
-# define VER_ID "Doomsday"
+#ifndef JHEXEN_VER_ID
+# ifdef _DEBUG
+# define JHEXEN_VER_ID "+D Doomsday"
+# else
+# define JHEXEN_VER_ID "Doomsday"
+# endif
#endif
-#define GAMENAMETEXT "jhexen"
+// Used to derive filepaths.
+#define GAMENAMETEXT "jhexen"
-// Version numbering changes: 200 means JHexen v1.0.
-#define VERSION 200
-#define VERSION_TEXT "1.3."DOOMSDAY_RELEASE_NAME
+// Presented to the user in dialogs, messages etc.
+#define GAME_NICENAME "jHexen"
+#define GAME_DETAILS "jHexen is based on Hexen v1.1 by Raven Software."
-#ifdef RANGECHECK
-# define VERSIONTEXT "Version "VERSION_TEXT" +R "__DATE__" ("VER_ID")"
-#else
-# define VERSIONTEXT "Version "VERSION_TEXT" "__DATE__" ("VER_ID")"
-#endif
+#define GAME_VERSION_TEXT "1.3.0"
+#define GAME_VERSION_TEXTLONG "Version" GAME_VERSION_TEXT " " __DATE__ " (" JHEXEN_VER_ID ")"
+#define GAME_VERSION_NUMBER 1,3,0,0 // For WIN32 version info.
#endif
diff --git a/doomsday/plugins/jhexen/res/hexen.ico b/doomsday/plugins/jhexen/res/hexen.ico
deleted file mode 100644
index fb5eb95b85..0000000000
Binary files a/doomsday/plugins/jhexen/res/hexen.ico and /dev/null differ
diff --git a/doomsday/plugins/jhexen/res/jhexen.dll.manifest b/doomsday/plugins/jhexen/res/jhexen.dll.manifest
new file mode 100644
index 0000000000..a7be608a76
--- /dev/null
+++ b/doomsday/plugins/jhexen/res/jhexen.dll.manifest
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doomsday/plugins/jhexen/res/jhexen.rc b/doomsday/plugins/jhexen/res/jhexen.rc
new file mode 100644
index 0000000000..a78af5414a
--- /dev/null
+++ b/doomsday/plugins/jhexen/res/jhexen.rc
@@ -0,0 +1,140 @@
+/**\file
+ *\section License
+ * License: GPL
+ * Online License Link: http://www.gnu.org/licenses/gpl.html
+ *
+ *\author Copyright © 2008 Daniel Swanson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * jhexen.rc: jHexen.dll resource script.
+ */
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+#include "windows.h"
+#include "../include/version.h"
+
+#undef APSTUDIO_READONLY_SYMBOLS
+
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+# ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+# endif //_WIN32
+
+# ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""windows.h""\r\n"
+ "#include ""../include/version.h""\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "#ifndef NO_MANIFEST\r\n"
+ " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""jhexen.dll.manifest""\r\n"
+ "#endif\r\n"
+ "\r\n"
+ "VS_VERSION_INFO VERSIONINFO\r\n"
+ "FILEVERSION GAME_VERSION_NUMBER\r\n"
+ "PRODUCTVERSION GAME_VERSION_NUMBER\r\n"
+ "# ifdef _DEBUG\r\n"
+ "FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
+ "# else\r\n"
+ "FILEFLAGSMASK 0\r\n"
+ "# endif\r\n"
+ "FILEOS VOS_NT_WINDOWS32\r\n"
+ "FILETYPE VFT_DLL\r\n"
+ "FILESUBTYPE VFT2_UNKNOWN\r\n"
+ "BEGIN\r\n"
+ " BLOCK ""StringFileInfo""\r\n"
+ " BEGIN\r\n"
+ " BLOCK ""040904b0""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""CompanyName"", ""\0""\r\n"
+ " VALUE ""FileDescription"", GAME_NICENAME "" (Doomsday Engine game plugin)\0""\r\n"
+ " VALUE ""FileVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " VALUE ""InternalName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""LegalCopyright"", ""Copyright © 2003-2008, Deng Team\0""\r\n"
+ " VALUE ""OriginalFilename"", ""jHexen.dll\0""\r\n"
+ " VALUE ""ProductName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""ProductVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " END\r\n"
+ " END\r\n"
+ "\r\n"
+ " BLOCK ""VarFileInfo""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""Translation"", 0x409, 1200\r\n"
+ " END\r\n"
+ "END\r\n"
+END
+# endif
+
+/**
+ * Icons:
+ * Icon with lowest ID value placed first to ensure application icon
+ * remains consistent on all systems.
+ */
+IDI_GAME_ICON ICON DISCARDABLE "jhexen.ico"
+
+#endif // English (U.S.) resources
+
+#ifndef APSTUDIO_INVOKED
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION GAME_VERSION_NUMBER
+PRODUCTVERSION GAME_VERSION_NUMBER
+# ifdef _DEBUG
+FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+# else
+FILEFLAGSMASK 0
+# endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "\0"
+ VALUE "FileDescription", GAME_NICENAME " (Doomsday Engine game plugin)\0"
+ VALUE "FileVersion", GAME_VERSION_TEXT "\0"
+ VALUE "InternalName", GAME_NICENAME "\0"
+ VALUE "LegalCopyright", "Copyright © 2003-2008, Deng Team\0"
+ VALUE "OriginalFilename", "jHexen.dll\0"
+ VALUE "ProductName", GAME_NICENAME "\0"
+ VALUE "ProductVersion", GAME_VERSION_TEXT "\0"
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+#endif
diff --git a/doomsday/plugins/jhexen/res/resource.h b/doomsday/plugins/jhexen/res/resource.h
new file mode 100644
index 0000000000..058f744557
--- /dev/null
+++ b/doomsday/plugins/jhexen/res/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by jhexen.rc
+//
+#define IDI_GAME_ICON 101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/doomsday/plugins/jhexen/src/x_api.c b/doomsday/plugins/jhexen/src/x_api.c
index 6f633d84be..61c0cf5395 100644
--- a/doomsday/plugins/jhexen/src/x_api.c
+++ b/doomsday/plugins/jhexen/src/x_api.c
@@ -90,8 +90,11 @@ void *G_GetVariable(int id)
case DD_GAME_NAME:
return GAMENAMETEXT;
+ case DD_GAME_NICENAME:
+ return GAME_NICENAME;
+
case DD_GAME_ID:
- return GAMENAMETEXT " " VERSION_TEXT;
+ return GAMENAMETEXT " " GAME_VERSION_TEXT;
case DD_GAME_MODE:
return gameModeString;
@@ -100,11 +103,10 @@ void *G_GetVariable(int id)
return gameConfigString;
case DD_VERSION_SHORT:
- return VERSION_TEXT;
+ return GAME_VERSION_TEXT;
case DD_VERSION_LONG:
- return VERSIONTEXT
- "\n"GAMENAMETEXT" is based on Hexen v1.1 by Raven Software.";
+ return GAME_VERSION_TEXTLONG "\n" GAME_DETAILS;
case DD_ACTION_LINK:
return actionlinks;
diff --git a/doomsday/plugins/wolftc/include/version.h b/doomsday/plugins/wolftc/include/version.h
index e3656a0bbd..9c93d13983 100644
--- a/doomsday/plugins/wolftc/include/version.h
+++ b/doomsday/plugins/wolftc/include/version.h
@@ -4,7 +4,7 @@
* Online License Link: http://www.gnu.org/licenses/gpl.html
*
*\author Copyright © 2003-2008 Jaakko Keränen
- *\author Copyright © 2006 Daniel Swanson
+ *\author Copyright © 2006-2008 Daniel Swanson
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,19 +18,21 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
-#ifndef __JDOOM_VERSION_H__
-#define __JDOOM_VERSION_H__
+/**
+ * version.h: Version numbering, naming etc.
+ */
+
+#ifndef __WOLFTC_VERSION_H__
+#define __WOLFTC_VERSION_H__
#ifndef __WOLFTC__
# error "Using WolfTC headers without __WOLFTC__"
#endif
-// DOOM version
-
#ifndef WOLFTC_VER_ID
# ifdef _DEBUG
# define WOLFTC_VER_ID "+D Doomsday"
@@ -39,15 +41,15 @@
# endif
#endif
-#define GAMENAMETEXT "wolftc"
+// Used to derive filepaths.
+#define GAMENAMETEXT "wolftc"
-// My my, the names of these #defines are really well chosen...
-#define VERSION_TEXT "1.15."DOOMSDAY_RELEASE_NAME
-#define VERSIONTEXT "Version "VERSION_TEXT" "__DATE__" ("WOLFTC_VER_ID")"
+// Presented to the user in dialogs, messages etc.
+#define GAME_NICENAME "WolfTC"
+#define GAME_DETAILS "WolfTC is based on jDoom-1.15."
-// All the versions of Doom have different savegame IDs, but
-// 500 will be the savegame base from now on.
-#define SAVE_VERSION_BASE 500
-#define SAVE_VERSION (SAVE_VERSION_BASE + gamemode)
+#define GAME_VERSION_TEXT "0.6.0"
+#define GAME_VERSION_TEXTLONG "Version" GAME_VERSION_TEXT " " __DATE__ " (" WOLFTC_VER_ID ")"
+#define GAME_VERSION_NUMBER 0,6,0,0 // For WIN32 version info.
#endif
diff --git a/doomsday/plugins/wolftc/res/resource.h b/doomsday/plugins/wolftc/res/resource.h
new file mode 100644
index 0000000000..5c08ed54f6
--- /dev/null
+++ b/doomsday/plugins/wolftc/res/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by wolftc.rc
+//
+#define IDI_GAME_ICON 101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/doomsday/plugins/wolftc/res/wolftc.dll.manifest b/doomsday/plugins/wolftc/res/wolftc.dll.manifest
new file mode 100644
index 0000000000..a7be608a76
--- /dev/null
+++ b/doomsday/plugins/wolftc/res/wolftc.dll.manifest
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doomsday/plugins/wolftc/res/wolftc.ico b/doomsday/plugins/wolftc/res/wolftc.ico
new file mode 100644
index 0000000000..757d674ec2
Binary files /dev/null and b/doomsday/plugins/wolftc/res/wolftc.ico differ
diff --git a/doomsday/plugins/wolftc/res/wolftc.rc b/doomsday/plugins/wolftc/res/wolftc.rc
new file mode 100644
index 0000000000..2a11f11a79
--- /dev/null
+++ b/doomsday/plugins/wolftc/res/wolftc.rc
@@ -0,0 +1,140 @@
+/**\file
+ *\section License
+ * License: GPL
+ * Online License Link: http://www.gnu.org/licenses/gpl.html
+ *
+ *\author Copyright © 2008 Daniel Swanson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+/**
+ * wolftc.rc: WolfTC.dll resource script.
+ */
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+#include "windows.h"
+#include "../include/version.h"
+
+#undef APSTUDIO_READONLY_SYMBOLS
+
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+# ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+# endif //_WIN32
+
+# ifdef APSTUDIO_INVOKED
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""windows.h""\r\n"
+ "#include ""../include/version.h""\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "#ifndef NO_MANIFEST\r\n"
+ " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""wolftc.dll.manifest""\r\n"
+ "#endif\r\n"
+ "\r\n"
+ "VS_VERSION_INFO VERSIONINFO\r\n"
+ "FILEVERSION GAME_VERSION_NUMBER\r\n"
+ "PRODUCTVERSION GAME_VERSION_NUMBER\r\n"
+ "# ifdef _DEBUG\r\n"
+ "FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
+ "# else\r\n"
+ "FILEFLAGSMASK 0\r\n"
+ "# endif\r\n"
+ "FILEOS VOS_NT_WINDOWS32\r\n"
+ "FILETYPE VFT_DLL\r\n"
+ "FILESUBTYPE VFT2_UNKNOWN\r\n"
+ "BEGIN\r\n"
+ " BLOCK ""StringFileInfo""\r\n"
+ " BEGIN\r\n"
+ " BLOCK ""040904b0""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""CompanyName"", ""\0""\r\n"
+ " VALUE ""FileDescription"", GAME_NICENAME "" (Doomsday Engine game plugin)\0""\r\n"
+ " VALUE ""FileVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " VALUE ""InternalName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""LegalCopyright"", ""Copyright © 2003-2008, Deng Team\0""\r\n"
+ " VALUE ""OriginalFilename"", ""WolfTC.dll\0""\r\n"
+ " VALUE ""ProductName"", GAME_NICENAME ""\0""\r\n"
+ " VALUE ""ProductVersion"", GAME_VERSION_TEXT ""\0""\r\n"
+ " END\r\n"
+ " END\r\n"
+ "\r\n"
+ " BLOCK ""VarFileInfo""\r\n"
+ " BEGIN\r\n"
+ " VALUE ""Translation"", 0x409, 1200\r\n"
+ " END\r\n"
+ "END\r\n"
+END
+# endif
+
+/**
+ * Icons:
+ * Icon with lowest ID value placed first to ensure application icon
+ * remains consistent on all systems.
+ */
+IDI_GAME_ICON ICON DISCARDABLE "wolftc.ico"
+
+#endif // English (U.S.) resources
+
+#ifndef APSTUDIO_INVOKED
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION GAME_VERSION_NUMBER
+PRODUCTVERSION GAME_VERSION_NUMBER
+# ifdef _DEBUG
+FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+# else
+FILEFLAGSMASK 0
+# endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "\0"
+ VALUE "FileDescription", GAME_NICENAME " (Doomsday Engine game plugin)\0"
+ VALUE "FileVersion", GAME_VERSION_TEXT "\0"
+ VALUE "InternalName", GAME_NICENAME "\0"
+ VALUE "LegalCopyright", "Copyright © 2003-2008, Deng Team\0"
+ VALUE "OriginalFilename", "WolfTC.dll\0"
+ VALUE "ProductName", GAME_NICENAME "\0"
+ VALUE "ProductVersion", GAME_VERSION_TEXT "\0"
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+#endif
diff --git a/doomsday/plugins/wolftc/src/d_api.c b/doomsday/plugins/wolftc/src/d_api.c
index d6a0a37df2..cc73493579 100644
--- a/doomsday/plugins/wolftc/src/d_api.c
+++ b/doomsday/plugins/wolftc/src/d_api.c
@@ -91,8 +91,11 @@ void *G_GetVariable(int id)
case DD_GAME_NAME:
return GAMENAMETEXT;
+ case DD_GAME_NICENAME:
+ return GAME_NICENAME;
+
case DD_GAME_ID:
- return GAMENAMETEXT " " VERSION_TEXT;
+ return GAMENAMETEXT " " GAME_VERSION_TEXT;
case DD_GAME_MODE:
return gameModeString;
@@ -101,10 +104,10 @@ void *G_GetVariable(int id)
return gameConfigString;
case DD_VERSION_SHORT:
- return VERSION_TEXT;
+ return GAME_VERSION_TEXT;
case DD_VERSION_LONG:
- return VERSIONTEXT "\n"GAMENAMETEXT" is based on linuxdoom-1.10.";
+ return GAME_VERSION_TEXTLONG "\n" GAME_DETAILS;
case DD_ACTION_LINK:
return actionlinks;