From 226e7ead5981cdc850e4ce79bfe63f79ee196849 Mon Sep 17 00:00:00 2001 From: ZTsukei Date: Mon, 20 Feb 2017 20:07:18 -0500 Subject: [PATCH] DevEXE version 1.1.00: Added some MD5 checks, increased md2 triagle limit, temporarily disabled magnet --- src/config.h.in | 14 ++++++++------ src/d_main.c | 8 ++++++-- src/d_player.h | 1 - src/doomdef.h | 16 ++++++++-------- src/hardware/hw_md2.h | 2 +- src/k_kart.c | 5 ++--- src/r_things.c | 4 ++-- 7 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index 5f06ec45..22a0dfa0 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -28,13 +28,15 @@ #else -/* Manually defined asset hashes for non-CMake builds - * Last updated 2015 / 05 / 03 +/* Manually defined asset hashes for non-CMake builds - Still used in SRB2kart. + * YYYY MM DD + * Last updated 2017 / 02 / 20 */ -#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7" -#define ASSET_HASH_ZONES_DTA "303838c6c534d9540288360fa49cca60" -#define ASSET_HASH_PLAYER_DTA "cfca0f1c73023cbbd8f844f45480f799" -#define ASSET_HASH_RINGS_DTA "85901ad4bf94637e5753d2ac2c03ea26" +#define ASSET_HASH_SRB2_SRB "c1b9577687f8a795104aef4600720ea7" +#define ASSET_HASH_GFX_DTA "ff653bb9c0dcb685fb7c1c5880bcaff1" +#define ASSET_HASH_CHARS_DTA "24c2641472bc187980eedc3c86691863" +#define ASSET_HASH_MAPS_DTA "13db5d4427f568f1c8f0599f2d14a7aa" + #ifdef USE_PATCH_DTA #define ASSET_HASH_PATCH_DTA "dbbf8bc6121618ee3be2d5b14650429b" #endif diff --git a/src/d_main.c b/src/d_main.c index e9549914..f44c3f6d 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -863,7 +863,6 @@ static void IdentifyVersion(void) D_AddFile(va(pandf,srb2waddir,"chars.kart")); D_AddFile(va(pandf,srb2waddir,"maps.kart")); D_AddFile(va(pandf,srb2waddir,"sounds.kart")); - //D_AddFile(va(pandf,srb2waddir,"k_SNSRainbowRoad.wad")); #if !defined (HAVE_SDL) || defined (HAVE_MIXER) { @@ -1151,7 +1150,12 @@ void D_SRB2Main(void) #ifndef DEVELOP // md5s last updated 12/14/14 // Check MD5s of autoloaded files - W_VerifyFileMD5(0, ASSET_HASH_SRB2_SRB); // srb2.srb/srb2.wad + W_VerifyFileMD5(0, ASSET_HASH_SRB2_SRB); // srb2.srb/srb2.wad + W_VerifyFileMD5(1, ASSET_HASH_GFX_DTA); // gfx.kart + W_VerifyFileMD5(2, ASSET_HASH_CHARS_DTA); // chars.kart + W_VerifyFileMD5(3, ASSET_HASH_MAPS_DTA); // maps.kart + // sounds.kart - since music is large, we'll ignore it for now. + #ifdef USE_PATCH_DTA W_VerifyFileMD5(4, ASSET_HASH_PATCH_DTA); // patch.dta #endif diff --git a/src/d_player.h b/src/d_player.h index b4e4dffc..2c75fd1d 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -255,7 +255,6 @@ typedef enum k_drift, // Drifting Left or Right, plus a bigger counter = sharper turn k_driftcharge, // Charge your drift so you can release a burst of speed k_driftboost, // Boost you get from drifting - //k_driftboosting, // Similar to k_boosting, determines if you're currently drift boosting k_boostcharge, // Charge-up for boosting at the start of the race, or when Lakitu drops you k_jmp, // In Mario Kart, letting go of the jump button stops the drift k_lakitu, // > 0 = Lakitu fishing, < 0 = Lakitu lap counter (was "player->airtime") // NOTE: Check for ->lakitu, replace with this diff --git a/src/doomdef.h b/src/doomdef.h index 91900bc0..54af04c9 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -140,19 +140,19 @@ extern FILE *logstream; #endif -#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 +//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 #ifdef DEVELOP -#define VERSION 100 // Game version -#define SUBVERSION 6 // more precise version number +#define VERSION 101 // Game version +#define SUBVERSION 0 // more precise version number #define VERSIONSTRING "Development EXE" -#define VERSIONSTRINGW "v1.0.06" +#define VERSIONSTRINGW "v1.1.00" // most interface strings are ignored in development mode. // we use comprevision and compbranch instead. #else -#define VERSION 100 // Game version -#define SUBVERSION 6 // more precise version number -#define VERSIONSTRING "v1.0.06" -#define VERSIONSTRINGW L"v1.0.06" +#define VERSION 101 // Game version +#define SUBVERSION 0 // more precise version number +#define VERSIONSTRING "DevEXE v1.1.00" +#define VERSIONSTRINGW L"v1.1.00" // Hey! If you change this, add 1 to the MODVERSION below! // Otherwise we can't force updates! #endif diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h index 5a7e6d2b..f46b60ac 100644 --- a/src/hardware/hw_md2.h +++ b/src/hardware/hw_md2.h @@ -23,7 +23,7 @@ #include "hw_glob.h" -#define MD2_MAX_TRIANGLES 8192 +#define MD2_MAX_TRIANGLES 16384 #define MD2_MAX_VERTICES 4096 #define MD2_MAX_TEXCOORDS 4096 #define MD2_MAX_FRAMES 512 diff --git a/src/k_kart.c b/src/k_kart.c index 8ca8c0dc..6c169c70 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -675,7 +675,8 @@ static void K_KartGetItemResult(player_t *player, fixed_t getitem, boolean retro switch (getitem) { case 1: // Magnet - player->kartstuff[k_magnet] = 1; + player->kartstuff[k_mushroom] = 1; // TEMPORARY COVER UNTIL OTHER ITEMS ARE WORKING + //player->kartstuff[k_magnet] = 1; break; case 2: // Boo player->kartstuff[k_boo] = 1; @@ -835,7 +836,6 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd) if (cv_megashroom.value) K_KartSetItemResult(ppos, 5); // Mega Mushroom if (cv_goldshroom.value) K_KartSetItemResult(ppos, 6); // Gold Mushroom if (cv_star.value) K_KartSetItemResult(ppos, 7); // Star - /* if (cv_triplebanana.value) K_KartSetItemResult(ppos, 8); // Triple Banana if (cv_fakeitem.value) K_KartSetItemResult(ppos, 9); // Fake Item if (cv_banana.value) K_KartSetItemResult(ppos, 10); // Banana @@ -847,7 +847,6 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd) if (cv_fireflower.value) K_KartSetItemResult(ppos, 16); // Fire Flower if (cv_tripleredshell.value) K_KartSetItemResult(ppos, 17); // Triple Red Shell if (cv_lightning.value && pingame > pexiting) K_KartSetItemResult(ppos, 18); // Lightning - */ // Award the player whatever power is rolled if (numchoices > 0) diff --git a/src/r_things.c b/src/r_things.c index 23f6a4a4..fb477c62 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -2311,8 +2311,8 @@ static void Sk_SetDefaultValue(skin_t *skin) skin->prefcolor = SKINCOLOR_GREEN; // SRB2kart - skin->kartspeed = 7; - skin->kartweight = 5; + skin->kartspeed = 6; + skin->kartweight = 4; // skin->normalspeed = 36<