shithub: duke3d

Download patch

ref: 872254bc614d91642e89405f12a098dba0e14f85
parent: 23da30843473d7ec2a0c8d26c007a2de8606134b
author: unknown <fabien@fabien-PC.(none)>
date: Sat Feb 9 10:53:33 EST 2013 

Made fork from xDuke v17.9 official.


--- a/Engine/Engine.vcxproj
+++ b/Engine/Engine.vcxproj
@@ -78,7 +78,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\SDL-1.2.9\include;src\enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\SDL-1.2.9\include;src\enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>nDBGRECORD; nDEBUG; PLATFORM_WIN32; UDP_NETWORKING; WIN32; _LIB; _CRT_SECURE_NO_DEPRECATE; _CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
--- a/Engine/src/engine.c
+++ b/Engine/src/engine.c
@@ -7683,6 +7683,8 @@
     int32_t stx, i, x, y, charxsiz;
     uint8_t  *fontptr, *letptr, *ptr;
 
+	printf("******* %s\n",name);
+
     stx = xpos;
 
     if (fontsize) {
--- a/Game/Game.vcxproj
+++ b/Game/Game.vcxproj
@@ -61,7 +61,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\SDL-1.2.9\include;..\..\SDL_mixer-1.2.6;..\Engine\src;.\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\SDL-1.2.9\include;..\SDL_mixer-1.2.6;..\Engine\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>nDBGRECORD; CHECK_XDUKE_REV; nDEBUG; WIN32; _CONSOLE; PLATFORM_WIN32; _CRT_SECURE_NO_DEPRECATE; _CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -78,10 +78,10 @@
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>dxguid.lib;sdl.lib;sdl_mixer.lib;winmm.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(SolutionName).exe</OutputFile>
+      <OutputFile>$(OutDir)Duke3D.exe</OutputFile>
       <Version>19.4</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\Directx_dec_2005\;..\..\SDL-1.2.9\VisualC\SDL\Release;..\..\SDL_mixer-1.2.6\VisualC\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\Directx_dec_2005\;..\SDL-1.2.9\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
--- a/Game/src/duke3d.h
+++ b/Game/src/duke3d.h
@@ -98,10 +98,11 @@
 #define	XDUKE_ID  2
 #define JONOF_ID  3
 
+//Chocolate DukeNukem3D is a fork of xDuke v17.9
+
 #define DUKE_ID			XDUKE_ID
-#define	XDUKE_REV_X		19
-#define XDUKE_REV_DOT_Y	7   // rev is: vXDUKE_REV_X.XDUKE_REV_DOT_Y
-#define XDUKE_SUBVERSION 1
+#define	CHOCOLATE_DUKE_REV_X		1
+#define CHOCOLATE_DUKE_REV_DOT_Y	0   // rev is: CHOCOLATE_DUKE_REV_X.CHOCOLATE_DUKE_REV_DOT_Y
 
 #define MAX_KNOWN_GRP 4
 
--- a/Game/src/game.c
+++ b/Game/src/game.c
@@ -642,7 +642,7 @@
 				{
 					// Old rancid was using either BYTEVERSION_27 or BYTEVERSION_117
 					Error(EXIT_SUCCESS,	"STOP: Your opponent is using an obsolete version\n"
-										"Please ask him to update to xDuke v%d.%d!\n", XDUKE_REV_X, XDUKE_REV_DOT_Y);
+										"Please ask him to update to xDuke v%d.%d!\n", CHOCOLATE_DUKE_REV_X, CHOCOLATE_DUKE_REV_DOT_Y);
 				}
 				break;
 
@@ -7814,8 +7814,8 @@
 #ifdef CHECK_XDUKE_REV // must not be under "if(numplayers > 1)" so it runs in any case
 	ud.rev[myconnectindex][0] = true; // always true. Used to check who we validated
 	ud.rev[myconnectindex][1] = DUKE_ID;
-	ud.rev[myconnectindex][2] = XDUKE_REV_X;
-	ud.rev[myconnectindex][3] = XDUKE_REV_DOT_Y;
+	ud.rev[myconnectindex][2] = CHOCOLATE_DUKE_REV_X;
+	ud.rev[myconnectindex][3] = CHOCOLATE_DUKE_REV_DOT_Y;
 #endif
 
 	memcpy(ud.groupefil_crc32[myconnectindex],groupefil_crc32, sizeof(groupefil_crc32));
@@ -7916,7 +7916,7 @@
 #ifdef CHECK_XDUKE_REV
 		// from command "case 131:"
 		for(l=0,i=connecthead;i>=0;i=connectpoint2[i])
-			if(((ud.rev[i][2]<<8)+ud.rev[i][3]) != ((XDUKE_REV_X<<8)+XDUKE_REV_DOT_Y))
+			if(((ud.rev[i][2]<<8)+ud.rev[i][3]) != ((CHOCOLATE_DUKE_REV_X<<8)+CHOCOLATE_DUKE_REV_DOT_Y))
 				l=1;
 			else
 				ud.rev[i][0] = true; // means we validated this guy
@@ -7925,7 +7925,7 @@
 		{
 			printf("\n*** One or more players do not have the same xDuke version:\n\n");
 			for(l=0,i=connecthead;i>=0;i=connectpoint2[i])
-				printf("Player [%-10s] is using xDuke v%d.%d\n", ud.user_name[i], 
+				printf("Player [%-10s] is using Chocolate DukeNukem3D v%d.%d\n", ud.user_name[i], 
 				ud.rev[i][2],ud.rev[i][3]);
 			Error(EXIT_SUCCESS, "");
 		}		
@@ -8127,10 +8127,8 @@
 	//		"using it as it may contain new unsuspected bugs. Only a select\n"
 	//		"group of known dukers who know what they are doing should be using\n"
 	//		"it. Please report new bugs at xd@m-klein.com or on DX forums. Thx!\n\n");
-	if(XDUKE_SUBVERSION)
-		printf("*** xDuke v%d.%d.%d ***\n\n", XDUKE_REV_X, XDUKE_REV_DOT_Y,XDUKE_SUBVERSION);
-	else
-		printf("*** xDuke v%d.%d ***\n\n", XDUKE_REV_X, XDUKE_REV_DOT_Y);
+	
+	printf("*** Chocolate DukeNukem3D v%d.%d ***\n\n", CHOCOLATE_DUKE_REV_X, CHOCOLATE_DUKE_REV_DOT_Y);
 
 	// FIX_00033: Fake multi and AI are now fully working
 	ud.multimode = 1;  // xduke: must be done before checkcommandline or that will prevent Fakeplayer and AI
@@ -10585,9 +10583,9 @@
 	time(&time4file);
 	tmHMS = localtime(&time4file);
 
-	sprintf(text, "xDuke(v%d.%d) %.4d.%.2d.%.2d %.2dh%.2dm%.2ds", 
-			XDUKE_REV_X,
-			XDUKE_REV_DOT_Y,
+	sprintf(text, "Chocolate DukeNukem3D(v%d.%d) %.4d.%.2d.%.2d %.2dh%.2dm%.2ds", 
+			CHOCOLATE_DUKE_REV_X,
+			CHOCOLATE_DUKE_REV_DOT_Y,
 			tmHMS->tm_year+1900,
 			tmHMS->tm_mon+1,
 			tmHMS->tm_mday,
--- a/Game/src/global.c
+++ b/Game/src/global.c
@@ -505,10 +505,14 @@
 
    SDL_Quit();
 
+   //FCS: http://duke3d.m-klein.com is obscolete :/ !
+   /*
    if(errorType==EXIT_FAILURE)
 	   printf("ERROR: Please copy that screen and visit http://duke3d.m-klein.com for report:\n");
 	else
 		printf("http://duke3d.m-klein.com\n");
+	*/
+
 
    va_start (argptr, error);
    vprintf(error, argptr);
--- a/Game/src/premap.c
+++ b/Game/src/premap.c
@@ -1542,7 +1542,7 @@
 			if(!ud.rev[i][0] && !ps[i].fakeplayer)
 				Error(EXIT_SUCCESS, "Your opponent [%s] is using an unknown version of xDuke."
 									"You are using v%d.%d\n",
-				ud.user_name[i], XDUKE_REV_X, XDUKE_REV_DOT_Y);
+				ud.user_name[i], CHOCOLATE_DUKE_REV_X, CHOCOLATE_DUKE_REV_DOT_Y);
 		}
 #endif