From d3f9244d6607daebc20a336ba7c937087a75929d Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 8 Jan 2016 01:32:53 +0000 Subject: [PATCH] Remove -CONversion command line parameter, because it has been supplanted by r5499's automatic identifier masking. git-svn-id: https://svn.eduke32.com/eduke32@5519 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 17 ------ polymer/eduke32/source/gamedef.c | 93 +------------------------------- polymer/eduke32/source/gamedef.h | 1 - 3 files changed, 1 insertion(+), 110 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index d9d5be852..2e4d3320f 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -10258,23 +10258,6 @@ static void G_CheckCommandLine(int32_t argc, const char **argv) i++; continue; } - if (!Bstrcasecmp(c+1, "conversion")) - { - if (argc > i+1) - { - uint32_t j = Batol(argv[i+1]); - if (j>=10000000 && j<=99999999) - { - g_scriptDateVersion = j; - initprintf("CON script date version: %d\n",j); - } - else - initprintf("CON script date version must be specified as YYYYMMDD, ignoring.\n"); - i++; - } - i++; - continue; - } if (!Bstrcasecmp(c+1,"nologo")) { g_noLogo = 1; diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 2a4e93613..3119ce5a6 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -40,80 +40,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define NUMALTKEYWORDS (int32_t)ARRAY_SIZE(altkeyw) int32_t g_scriptVersion = 13; // 13 = 1.3D-style CON files, 14 = 1.4/1.5 style CON files -uint32_t g_scriptDateVersion = 99999999; // YYYYMMDD -#if !defined LUNATIC -static uint32_t g_scriptLastKeyword; // = NUMKEYWORDS-1; - -#define NUMKEYWDATES (int32_t)ARRAY_SIZE(g_keywdate) -// { keyw, date } means that at the date, all keywords up to keyw inclusive are available -static struct { uint32_t keyw; uint32_t date; } g_keywdate[] = -{ - // beginning of eduke32 svn - { CON_CANSEE, 20060423 }, - { CON_CANSEESPR, 20060424 }, - // some stuff here not representable this way - { CON_FINDNEARSPRITEZVAR, 20060516 }, - { CON_EZSHOOT, 20060701 }, - { CON_EZSHOOTVAR, 20060822 }, - { CON_JUMP, 20060828 }, - { CON_QSTRLEN, 20060930 }, - { CON_QUAKE, 20070105 }, - { CON_SHOWVIEW, 20070208 }, - { CON_NEXTSPRITESECT, 20070819 }, - { CON_GETKEYNAME, 20071024 }, // keyw numbers have been - { CON_SPRITENOPAL, 20071220 }, // shuffled around here - { CON_HITRADIUSVAR, 20080216 }, - { CON_ROTATESPRITE16, 20080314 }, - { CON_SETARRAY, 20080401 }, - { CON_READARRAYFROMFILE, 20080405 }, - { CON_STARTTRACKVAR, 20080510 }, - { CON_QGETSYSSTR, 20080709 }, - { CON_GETTICKS, 20080711 }, - { CON_SETTSPR, 20080713 }, - { CON_CLEARMAPSTATE, 20080716 }, - { CON_SCRIPTSIZE, 20080720 }, - { CON_SETGAMENAME, 20080722 }, - { CON_CMENU, 20080725 }, - { CON_GETTIMEDATE, 20080809 }, - { CON_ACTIVATECHEAT, 20080810 }, - { CON_SETGAMEPALETTE, 20080816 }, - { CON_SETCFGNAME, 20080817 }, - { CON_IFVARVAREITHER, 20080907 }, - { CON_SAVENN, 20080915 }, - { CON_COPY, 20090219 }, - { CON_QSTRNCAT, 20090712 }, - { CON_STOPACTORSOUND, 20090715 }, - { CON_IFSERVER, 20100722 }, - { CON_CALCHYPOTENUSE, 20100927 }, - { CON_CLIPMOVENOSLIDE, 20101009 }, - { CON_INCLUDEDEFAULT, 20110615 }, - { CON_SETACTORSOUNDPITCH, 20111102 }, - { CON_ECHO, 20120304 }, - { CON_SHOWVIEWUNBIASED, 20120331 }, - { CON_ROTATESPRITEA, 20130324 }, - { CON_ACTIVATE, 20130522 }, - { CON_SCREENTEXT, 20130529 }, - { CON_DYNAMICSOUNDREMAP, 20130530 }, - { CON_SCREENSOUND, 20130628 }, - { CON_SETMUSICPOSITION, 20150116 }, - { CON_UNDEFINELEVEL, 20150208 }, - { CON_IFCUTSCENE, 20150210 }, - { CON_DEFINEVOLUMEFLAGS, 20150222 }, - { CON_RESETPLAYERFLAGS, 20150303 }, - { CON_APPENDEVENT, 20150325 }, - { CON_DEFSTATE, 20150923 }, - { CON_SHIFTVARVARL, 20160101 }, - { CON_SHIFTVARVARR, 20160101 }, - { CON_IFVARVARLE, 20160101 }, - { CON_IFVARVARGE, 20160101 }, - { CON_IFVARVARBOTH, 20160101 }, - { CON_WHILEVARL, 20160101 }, - { CON_WHILEVARVARL, 20160101 }, - { CON_KLABS, 20160101 }, - { CON_INV, 20160101 }, - -}; -#endif char g_szScriptFileName[BMAX_PATH] = "(none)"; // file we're currently compiling @@ -1331,24 +1257,7 @@ void C_InitHashes() hash_init(&h_tiledata); hash_init(&h_paldata); - g_scriptLastKeyword = NUMKEYWORDS-1; - // determine last CON keyword for backward compatibility with older mods - if (g_scriptDateVersion < g_keywdate[NUMKEYWDATES-1].date) - { - for (i=NUMKEYWDATES-1; i>=0; i--) - { - if (g_scriptDateVersion >= g_keywdate[i].date) - { - g_scriptLastKeyword = g_keywdate[i].keyw; - break; - } - } - - if (i<0) - g_scriptLastKeyword = g_keywdate[0].keyw-1; // may be slightly imprecise - } - - for (i=g_scriptLastKeyword; i>=0; i--) hash_add(&h_keywords,keyw[i],i,0); + for (i=0; i= 0; i++) hash_add(&h_sector,SectorLabels[i].name,i,0); for (i=0; WallLabels[i].lId >= 0; i++) hash_add(&h_wall,WallLabels[i].name,i,0); diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h index 865436050..30a86371e 100644 --- a/polymer/eduke32/source/gamedef.h +++ b/polymer/eduke32/source/gamedef.h @@ -91,7 +91,6 @@ extern char g_szScriptFileName[BMAX_PATH]; extern int32_t g_totalLines,g_lineNumber; extern int32_t g_numCompilerErrors,g_numCompilerWarnings,g_numQuoteRedefinitions; extern int32_t g_scriptVersion; -extern uint32_t g_scriptDateVersion; // YYYYMMDD extern char g_szBuf[1024]; extern const char *EventNames[]; // MAXEVENTS