delete DEH_WriteUndoline
it literally does nothing lol
This commit is contained in:
1 parent
1c8ca2b110
commit
41fc4c7cfd
3 files changed
-176
No files matched your search
-138
@@ -291,8 +291,6 @@ static void readPlayer(MYFILE *f, INT32 num)
|
||||
INT32 i;
|
||||
boolean slotfound = false;
|
||||
|
||||
DEH_WriteUndoline("PLAYERTEXT", description[num].notes, UNDO_ENDTEXT);
|
||||
|
||||
do
|
||||
{
|
||||
if (myfgets(s, MAXLINELEN, f))
|
||||
@@ -362,7 +360,6 @@ static void readPlayer(MYFILE *f, INT32 num)
|
||||
{
|
||||
if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
|
||||
goto done;
|
||||
DEH_WriteUndoline(word, &description[num].picname[0], UNDO_NONE);
|
||||
PlayerMenu[num].status = IT_CALL;
|
||||
strncpy(description[num].picname, word2, 8);
|
||||
}
|
||||
@@ -386,7 +383,6 @@ static void readPlayer(MYFILE *f, INT32 num)
|
||||
*/
|
||||
if (i != IT_DISABLED && !slotfound && (slotfound = findFreeSlot(&num)) == false)
|
||||
goto done;
|
||||
DEH_WriteUndoline(word, va("%d", PlayerMenu[num].status), UNDO_NONE);
|
||||
PlayerMenu[num].status = (INT16)i;
|
||||
}
|
||||
else if (fastcmp(word, "SKINNAME"))
|
||||
@@ -394,7 +390,6 @@ static void readPlayer(MYFILE *f, INT32 num)
|
||||
// Send to free slot.
|
||||
if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
|
||||
goto done;
|
||||
DEH_WriteUndoline(word, description[num].skinname, UNDO_NONE);
|
||||
PlayerMenu[num].status = IT_CALL;
|
||||
|
||||
strlcpy(description[num].skinname, word2, sizeof description[num].skinname);
|
||||
@@ -557,122 +552,98 @@ static void readthing(MYFILE *f, INT32 num)
|
||||
|
||||
if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].doomednum), UNDO_NONE);
|
||||
mobjinfo[num].doomednum = (INT32)atoi(word2);
|
||||
}
|
||||
else if (fastcmp(word, "SPAWNSTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].spawnstate), UNDO_NONE);
|
||||
mobjinfo[num].spawnstate = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "SPAWNHEALTH"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].spawnhealth), UNDO_NONE);
|
||||
mobjinfo[num].spawnhealth = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "SEESTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].seestate), UNDO_NONE);
|
||||
mobjinfo[num].seestate = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "SEESOUND"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].seesound), UNDO_NONE);
|
||||
mobjinfo[num].seesound = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "REACTIONTIME"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].reactiontime), UNDO_NONE);
|
||||
mobjinfo[num].reactiontime = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "ATTACKSOUND"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].attacksound), UNDO_NONE);
|
||||
mobjinfo[num].attacksound = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "PAINSTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].painstate), UNDO_NONE);
|
||||
mobjinfo[num].painstate = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "PAINCHANCE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].painchance), UNDO_NONE);
|
||||
mobjinfo[num].painchance = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "PAINSOUND"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].painsound), UNDO_NONE);
|
||||
mobjinfo[num].painsound = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "MELEESTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].meleestate), UNDO_NONE);
|
||||
mobjinfo[num].meleestate = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "MISSILESTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].missilestate), UNDO_NONE);
|
||||
mobjinfo[num].missilestate = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "DEATHSTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].deathstate), UNDO_NONE);
|
||||
mobjinfo[num].deathstate = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "DEATHSOUND"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].deathsound), UNDO_NONE);
|
||||
mobjinfo[num].deathsound = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "XDEATHSTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].xdeathstate), UNDO_NONE);
|
||||
mobjinfo[num].xdeathstate = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "SPEED"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].speed), UNDO_NONE);
|
||||
mobjinfo[num].speed = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "RADIUS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].radius), UNDO_NONE);
|
||||
mobjinfo[num].radius = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "HEIGHT"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].height), UNDO_NONE);
|
||||
mobjinfo[num].height = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "DISPOFFSET"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].dispoffset), UNDO_NONE);
|
||||
mobjinfo[num].dispoffset = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "MASS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].mass), UNDO_NONE);
|
||||
mobjinfo[num].mass = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "DAMAGE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].damage), UNDO_NONE);
|
||||
mobjinfo[num].damage = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "ACTIVESOUND"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].activesound), UNDO_NONE);
|
||||
mobjinfo[num].activesound = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "FLAGS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].flags), UNDO_NONE);
|
||||
mobjinfo[num].flags = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "RAISESTATE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", mobjinfo[num].raisestate), UNDO_NONE);
|
||||
mobjinfo[num].raisestate = get_number(word2);
|
||||
}
|
||||
else
|
||||
@@ -1110,8 +1081,6 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
|
||||
UINT16 usi;
|
||||
UINT8 picid;
|
||||
|
||||
DEH_WriteUndoline("SCENETEXT", cutscenes[num]->scene[scenenum].text, UNDO_ENDTEXT);
|
||||
|
||||
do
|
||||
{
|
||||
if (myfgets(s, MAXLINELEN, f))
|
||||
@@ -1188,7 +1157,6 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
|
||||
|
||||
if (fastcmp(word, "NUMBEROFPICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", cutscenes[num]->scene[scenenum].numpics), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].numpics = (UINT8)i;
|
||||
}
|
||||
else if (fastncmp(word, "PIC", 3))
|
||||
@@ -1203,27 +1171,22 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
|
||||
|
||||
if (fastcmp(word+4, "NAME"))
|
||||
{
|
||||
DEH_WriteUndoline(word, cutscenes[num]->scene[scenenum].picname[picid], UNDO_NONE);
|
||||
strncpy(cutscenes[num]->scene[scenenum].picname[picid], word2, 8);
|
||||
}
|
||||
else if (fastcmp(word+4, "HIRES"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", cutscenes[num]->scene[scenenum].pichires[picid]), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].pichires[picid] = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
|
||||
}
|
||||
else if (fastcmp(word+4, "DURATION"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].picduration[picid]), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].picduration[picid] = usi;
|
||||
}
|
||||
else if (fastcmp(word+4, "XCOORD"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].xcoord[picid]), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].xcoord[picid] = usi;
|
||||
}
|
||||
else if (fastcmp(word+4, "YCOORD"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].ycoord[picid]), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].ycoord[picid] = usi;
|
||||
}
|
||||
else
|
||||
@@ -1231,14 +1194,12 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
|
||||
}
|
||||
else if (fastcmp(word, "MUSIC"))
|
||||
{
|
||||
DEH_WriteUndoline(word, cutscenes[num]->scene[scenenum].musswitch, UNDO_NONE);
|
||||
strncpy(cutscenes[num]->scene[scenenum].musswitch, word2, 7);
|
||||
cutscenes[num]->scene[scenenum].musswitch[6] = 0;
|
||||
}
|
||||
#ifdef MUSICSLOT_COMPATIBILITY
|
||||
else if (fastcmp(word, "MUSICSLOT"))
|
||||
{
|
||||
DEH_WriteUndoline(word, cutscenes[num]->scene[scenenum].musswitch, UNDO_NONE);
|
||||
i = get_mus(word2, true);
|
||||
if (i && i <= 1035)
|
||||
snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
|
||||
@@ -1251,42 +1212,34 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
|
||||
#endif
|
||||
else if (fastcmp(word, "MUSICTRACK"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].musswitchflags), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
|
||||
}
|
||||
else if (fastcmp(word, "MUSICPOS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].musswitchposition), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].musswitchposition = (UINT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "MUSICLOOP"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].musicloop), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].musicloop = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
|
||||
}
|
||||
else if (fastcmp(word, "TEXTXPOS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].textxpos), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].textxpos = usi;
|
||||
}
|
||||
else if (fastcmp(word, "TEXTYPOS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].textypos), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].textypos = usi;
|
||||
}
|
||||
else if (fastcmp(word, "FADEINID"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].fadenum), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].fadeinid = (UINT8)i;
|
||||
}
|
||||
else if (fastcmp(word, "FADEOUTID"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].fadenum), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].fadeoutid = (UINT8)i;
|
||||
}
|
||||
else if (fastcmp(word, "FADECOLOR"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].fadenum), UNDO_NONE);
|
||||
cutscenes[num]->scene[scenenum].fadecolor = (UINT8)i;
|
||||
}
|
||||
else
|
||||
@@ -1346,8 +1299,6 @@ static void readcutscene(MYFILE *f, INT32 num)
|
||||
if (1 <= value && value <= 128)
|
||||
{
|
||||
readcutscenescene(f, num, value - 1);
|
||||
DEH_WriteUndoline(word, word2, UNDO_SPACE|UNDO_CUTLINE);
|
||||
DEH_WriteUndoline("NUMSCENES", va("%d", oldnumscenes), UNDO_SPACE);
|
||||
}
|
||||
else
|
||||
deh_warning("Scene number %d out of range (1 - 128)", value);
|
||||
@@ -1403,12 +1354,10 @@ static void readhuditem(MYFILE *f, INT32 num)
|
||||
|
||||
if (fastcmp(word, "X"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", hudinfo[num].x), UNDO_NONE);
|
||||
hudinfo[num].x = i;
|
||||
}
|
||||
else if (fastcmp(word, "Y"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", hudinfo[num].y), UNDO_NONE);
|
||||
hudinfo[num].y = i;
|
||||
}
|
||||
else
|
||||
@@ -1670,32 +1619,26 @@ static void readframe(MYFILE *f, INT32 num)
|
||||
|
||||
if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
|
||||
{
|
||||
DEH_WriteUndoline(word1, va("%u", states[num].sprite), UNDO_NONE);
|
||||
states[num].sprite = get_sprite(word2);
|
||||
}
|
||||
else if (fastcmp(word1, "SPRITESUBNUMBER") || fastcmp(word1, "SPRITEFRAME"))
|
||||
{
|
||||
DEH_WriteUndoline(word1, va("%d", states[num].frame), UNDO_NONE);
|
||||
states[num].frame = (INT32)get_number(word2); // So the FF_ flags get calculated
|
||||
}
|
||||
else if (fastcmp(word1, "DURATION"))
|
||||
{
|
||||
DEH_WriteUndoline(word1, va("%u", states[num].tics), UNDO_NONE);
|
||||
states[num].tics = (INT32)get_number(word2); // So TICRATE can be used
|
||||
}
|
||||
else if (fastcmp(word1, "NEXT"))
|
||||
{
|
||||
DEH_WriteUndoline(word1, va("%d", states[num].nextstate), UNDO_NONE);
|
||||
states[num].nextstate = get_state(word2);
|
||||
}
|
||||
else if (fastcmp(word1, "VAR1"))
|
||||
{
|
||||
DEH_WriteUndoline(word1, va("%d", states[num].var1), UNDO_NONE);
|
||||
states[num].var1 = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word1, "VAR2"))
|
||||
{
|
||||
DEH_WriteUndoline(word1, va("%d", states[num].var2), UNDO_NONE);
|
||||
states[num].var2 = (INT32)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word1, "ACTION"))
|
||||
@@ -1721,7 +1664,6 @@ static void readframe(MYFILE *f, INT32 num)
|
||||
{
|
||||
if (actionpointers[z].action.acv == states[num].action.acv)
|
||||
{
|
||||
DEH_WriteUndoline(word1, actionpointers[z].name, UNDO_NONE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1781,17 +1723,14 @@ static void readsound(MYFILE *f, INT32 num, const char *savesfxnames[])
|
||||
|
||||
if (fastcmp(word, "SINGULAR"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", S_sfx[num].singularity), UNDO_NONE);
|
||||
S_sfx[num].singularity = value;
|
||||
}
|
||||
else if (fastcmp(word, "PRIORITY"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", S_sfx[num].priority), UNDO_NONE);
|
||||
S_sfx[num].priority = value;
|
||||
}
|
||||
else if (fastcmp(word, "FLAGS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", S_sfx[num].pitch), UNDO_NONE);
|
||||
S_sfx[num].pitch = value;
|
||||
}
|
||||
else
|
||||
@@ -1851,16 +1790,6 @@ static void reademblemdata(MYFILE *f, INT32 num)
|
||||
INT32 value;
|
||||
|
||||
// Reset all data initially
|
||||
DEH_WriteUndoline("TYPE", va("%d", emblemlocations[num-1].type), UNDO_NONE);
|
||||
DEH_WriteUndoline("X", va("%d", emblemlocations[num-1].x), UNDO_NONE);
|
||||
DEH_WriteUndoline("Y", va("%d", emblemlocations[num-1].y), UNDO_NONE);
|
||||
DEH_WriteUndoline("Z", va("%d", emblemlocations[num-1].z), UNDO_NONE);
|
||||
DEH_WriteUndoline("MAPNUM", va("%d", emblemlocations[num-1].level), UNDO_NONE);
|
||||
DEH_WriteUndoline("VAR", va("%d", emblemlocations[num-1].var), UNDO_NONE);
|
||||
DEH_WriteUndoline("SPRITE", va("%d", emblemlocations[num-1].sprite), UNDO_NONE);
|
||||
DEH_WriteUndoline("COLOR", va("%d", emblemlocations[num-1].color), UNDO_NONE);
|
||||
DEH_WriteUndoline("HINT", extraemblems[num-1].hint, UNDO_NONE);
|
||||
|
||||
memset(&emblemlocations[num-1], 0, sizeof(emblem_t));
|
||||
|
||||
do
|
||||
@@ -1988,12 +1917,6 @@ static void readextraemblemdata(MYFILE *f, INT32 num)
|
||||
INT32 value;
|
||||
|
||||
// Reset all data initially
|
||||
DEH_WriteUndoline("NAME", extraemblems[num-1].name, UNDO_NONE);
|
||||
DEH_WriteUndoline("OBJECTIVE", extraemblems[num-1].description, UNDO_NONE);
|
||||
DEH_WriteUndoline("CONDITIONSET", va("%d", extraemblems[num-1].conditionset), UNDO_NONE);
|
||||
DEH_WriteUndoline("SPRITE", va("%d", extraemblems[num-1].sprite), UNDO_NONE);
|
||||
DEH_WriteUndoline("COLOR", va("%d", extraemblems[num-1].color), UNDO_NONE);
|
||||
|
||||
memset(&extraemblems[num-1], 0, sizeof(extraemblem_t));
|
||||
|
||||
do
|
||||
@@ -2072,15 +1995,6 @@ static void readunlockable(MYFILE *f, INT32 num)
|
||||
INT32 i;
|
||||
|
||||
// Same deal with unlockables, clear all first
|
||||
DEH_WriteUndoline("NAME", unlockables[num].name, UNDO_NONE);
|
||||
DEH_WriteUndoline("OBJECTIVE", unlockables[num].objective, UNDO_NONE);
|
||||
DEH_WriteUndoline("HEIGHT", va("%d", unlockables[num].height), UNDO_NONE);
|
||||
DEH_WriteUndoline("CONDITIONSET", va("%d", unlockables[num].conditionset), UNDO_NONE);
|
||||
DEH_WriteUndoline("TYPE", va("%d", unlockables[num].type), UNDO_NONE);
|
||||
DEH_WriteUndoline("NOCECHO", va("%d", unlockables[num].nocecho), UNDO_NONE);
|
||||
DEH_WriteUndoline("NOCHECKLIST", va("%d", unlockables[num].nochecklist), UNDO_NONE);
|
||||
DEH_WriteUndoline("VAR", va("%d", unlockables[num].variable), UNDO_NONE);
|
||||
|
||||
memset(&unlockables[num], 0, sizeof(unlockable_t));
|
||||
|
||||
do
|
||||
@@ -2459,13 +2373,11 @@ static void readpatch(MYFILE *f, const char *name, UINT16 wad)
|
||||
// X position of the patch in the texture.
|
||||
if (fastcmp(word, "X"))
|
||||
{
|
||||
//DEH_WriteUndoline(word, va("%d", patch->originx), UNDO_NONE);
|
||||
patch.originx = (INT16)value;
|
||||
}
|
||||
// Y position of the patch in the texture.
|
||||
else if (fastcmp(word, "Y"))
|
||||
{
|
||||
//DEH_WriteUndoline(word, va("%d", patch->originy), UNDO_NONE);
|
||||
patch.originy = (INT16)value;
|
||||
}
|
||||
else
|
||||
@@ -2534,7 +2446,6 @@ static void readmaincfg(MYFILE *f)
|
||||
else
|
||||
value = get_number(word2);
|
||||
|
||||
DEH_WriteUndoline(word, va("%d", spstage_start), UNDO_NONE);
|
||||
spstage_start = (INT16)value;
|
||||
}
|
||||
else if (fastcmp(word, "SSTAGE_START"))
|
||||
@@ -2548,79 +2459,64 @@ static void readmaincfg(MYFILE *f)
|
||||
else
|
||||
value = get_number(word2);
|
||||
|
||||
DEH_WriteUndoline(word, va("%d", sstage_start), UNDO_NONE);
|
||||
sstage_start = (INT16)value;
|
||||
sstage_end = (INT16)(sstage_start+6); // 7 special stages total
|
||||
}
|
||||
else if (fastcmp(word, "USENIGHTSSS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", useNightsSS), UNDO_NONE);
|
||||
useNightsSS = (value || word2[0] == 'T' || word2[0] == 'Y');
|
||||
}
|
||||
else if (fastcmp(word, "REDTEAM"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", skincolor_redteam), UNDO_NONE);
|
||||
skincolor_redteam = (UINT8)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "BLUETEAM"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", skincolor_blueteam), UNDO_NONE);
|
||||
skincolor_blueteam = (UINT8)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "REDRING"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", skincolor_redring), UNDO_NONE);
|
||||
skincolor_redring = (UINT8)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "BLUERING"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", skincolor_bluering), UNDO_NONE);
|
||||
skincolor_bluering = (UINT8)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "INVULNTICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", invulntics), UNDO_NONE);
|
||||
invulntics = (UINT16)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "SNEAKERTICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", sneakertics), UNDO_NONE);
|
||||
sneakertics = (UINT16)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "FLASHINGTICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", flashingtics), UNDO_NONE);
|
||||
flashingtics = (UINT16)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "TAILSFLYTICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", tailsflytics), UNDO_NONE);
|
||||
tailsflytics = (UINT16)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "UNDERWATERTICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", underwatertics), UNDO_NONE);
|
||||
underwatertics = (UINT16)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "SPACETIMETICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", spacetimetics), UNDO_NONE);
|
||||
spacetimetics = (UINT16)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "EXTRALIFETICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", extralifetics), UNDO_NONE);
|
||||
extralifetics = (UINT16)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "GAMEOVERTICS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", gameovertics), UNDO_NONE);
|
||||
gameovertics = get_number(word2);
|
||||
}
|
||||
|
||||
else if (fastcmp(word, "INTROTOPLAY"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", introtoplay), UNDO_NONE);
|
||||
introtoplay = (UINT8)get_number(word2);
|
||||
// range check, you morons.
|
||||
if (introtoplay > 128)
|
||||
@@ -2628,17 +2524,14 @@ static void readmaincfg(MYFILE *f)
|
||||
}
|
||||
else if (fastcmp(word, "LOOPTITLE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", looptitle), UNDO_NONE);
|
||||
looptitle = (value || word2[0] == 'T' || word2[0] == 'Y');
|
||||
}
|
||||
else if (fastcmp(word, "TITLESCROLLSPEED"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", titlescrollspeed), UNDO_NONE);
|
||||
titlescrollspeed = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "CREDITSCUTSCENE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", creditscutscene), UNDO_NONE);
|
||||
creditscutscene = (UINT8)get_number(word2);
|
||||
// range check, you morons.
|
||||
if (creditscutscene > 128)
|
||||
@@ -2646,27 +2539,22 @@ static void readmaincfg(MYFILE *f)
|
||||
}
|
||||
else if (fastcmp(word, "NUMDEMOS"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", numDemos), UNDO_NONE);
|
||||
numDemos = (UINT8)get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "DEMODELAYTIME"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", demoDelayTime), UNDO_NONE);
|
||||
demoDelayTime = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "DEMOIDLETIME"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%d", demoIdleTime), UNDO_NONE);
|
||||
demoIdleTime = get_number(word2);
|
||||
}
|
||||
else if (fastcmp(word, "USE1UPSOUND"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", use1upSound), UNDO_NONE);
|
||||
use1upSound = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
|
||||
}
|
||||
else if (fastcmp(word, "MAXXTRALIFE"))
|
||||
{
|
||||
DEH_WriteUndoline(word, va("%u", maxXtraLife), UNDO_NONE);
|
||||
maxXtraLife = (UINT8)get_number(word2);
|
||||
}
|
||||
|
||||
@@ -2680,7 +2568,6 @@ static void readmaincfg(MYFILE *f)
|
||||
I_Error("Maincfg: bad data file name '%s'\n", word2);
|
||||
|
||||
G_SaveGameData(false);
|
||||
DEH_WriteUndoline(word, gamedatafilename, UNDO_NONE);
|
||||
strlcpy(gamedatafilename, word2, sizeof (gamedatafilename));
|
||||
strlwr(gamedatafilename);
|
||||
savemoddata = true;
|
||||
@@ -2701,12 +2588,10 @@ static void readmaincfg(MYFILE *f)
|
||||
}
|
||||
else if (fastcmp(word, "RESETDATA"))
|
||||
{
|
||||
DEH_WriteUndoline(word, "0", UNDO_TODO); /// \todo
|
||||
P_ResetData(value);
|
||||
}
|
||||
else if (fastcmp(word, "CUSTOMVERSION"))
|
||||
{
|
||||
DEH_WriteUndoline(word, customversionstring, UNDO_NONE);
|
||||
strlcpy(customversionstring, word2, sizeof (customversionstring));
|
||||
}
|
||||
else
|
||||
@@ -2966,13 +2851,11 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
{
|
||||
G_SetGameModified(multiplayer, true);
|
||||
readmaincfg(f);
|
||||
DEH_WriteUndoline(word, "", UNDO_HEADER);
|
||||
continue;
|
||||
}
|
||||
else if (fastcmp(word, "WIPES"))
|
||||
{
|
||||
readwipes(f);
|
||||
DEH_WriteUndoline(word, "", UNDO_HEADER);
|
||||
// This is not a major mod.
|
||||
continue;
|
||||
}
|
||||
@@ -2993,7 +2876,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Character %d out of range (0 - 31)", i);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
// This is not a major mod.
|
||||
continue;
|
||||
}
|
||||
@@ -3007,7 +2889,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
{
|
||||
// Read patch from spec file.
|
||||
readpatch(f, word2, wad);
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
// This is not a major mod.
|
||||
}
|
||||
else if (fastcmp(word, "THING") || fastcmp(word, "MOBJ") || fastcmp(word, "OBJECT"))
|
||||
@@ -3025,13 +2906,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Thing %d out of range (0 - %d)", i, NUMMOBJTYPES-1);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
}
|
||||
/* else if (fastcmp(word, "ANIMTEX"))
|
||||
{
|
||||
readAnimTex(f, i);
|
||||
// This is not a major mod.
|
||||
}*/
|
||||
else if (fastcmp(word, "LEVEL"))
|
||||
{
|
||||
// Support using the actual map name,
|
||||
@@ -3052,7 +2927,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Level number %d out of range (1 - %d)", i, NUMMAPS);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
}
|
||||
else if (fastcmp(word, "CUTSCENE"))
|
||||
{
|
||||
@@ -3063,8 +2937,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Cutscene number %d out of range (1 - 128)", i);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
//G_SetGameModified(multiplayer, true); -- might have to reconsider in a future update
|
||||
}
|
||||
else if (fastcmp(word, "FRAME") || fastcmp(word, "STATE"))
|
||||
{
|
||||
@@ -3081,7 +2953,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Frame %d out of range (0 - %d)", i, NUMSTATES-1);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
}
|
||||
else if (fastcmp(word, "SOUND"))
|
||||
{
|
||||
@@ -3094,7 +2965,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Sound %d out of range (0 - %d)", i, NUMSFX-1);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
// This is not a major mod.
|
||||
}
|
||||
else if (fastcmp(word, "HUDITEM"))
|
||||
@@ -3108,7 +2978,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("HUD item number %d out of range (0 - %d)", i, NUMHUDITEMS-1);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
// This is not a major mod.
|
||||
}
|
||||
else if (fastcmp(word, "EMBLEM"))
|
||||
@@ -3129,7 +2998,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Emblem number %d out of range (1 - %d)", i, MAXEMBLEMS);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
}
|
||||
else if (fastcmp(word, "EXTRAEMBLEM"))
|
||||
{
|
||||
@@ -3149,7 +3017,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Extra emblem number %d out of range (1 - %d)", i, MAXEXTRAEMBLEMS);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
}
|
||||
else if (fastcmp(word, "UNLOCKABLE"))
|
||||
{
|
||||
@@ -3165,7 +3032,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Unlockable number %d out of range (1 - %d)", i, MAXUNLOCKABLES);
|
||||
ignorelines(f);
|
||||
}
|
||||
DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
}
|
||||
else if (fastcmp(word, "CONDITIONSET"))
|
||||
{
|
||||
@@ -3181,15 +3047,12 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
||||
deh_warning("Condition set number %d out of range (1 - %d)", i, MAXCONDITIONSETS);
|
||||
ignorelines(f);
|
||||
}
|
||||
// no undo support for this insanity yet
|
||||
//DEH_WriteUndoline(word, word2, UNDO_HEADER);
|
||||
}
|
||||
else if (fastcmp(word, "SRB2KART"))
|
||||
{
|
||||
INT32 ver = searchvalue(strtok(NULL, "\n"));
|
||||
if (ver != PATCHVERSION)
|
||||
deh_warning("Patch is for SRB2Kart version %d,\nonly version %d is supported", ver, PATCHVERSION);
|
||||
//DEH_WriteUndoline(word, va("%d", ver), UNDO_NONE);
|
||||
}
|
||||
else if (fastcmp(word, "SRB2"))
|
||||
{
|
||||
@@ -3268,7 +3131,6 @@ void DEH_LoadDehackedLumpPwad(UINT16 wad, UINT16 lump)
|
||||
f.curpos = f.data;
|
||||
f.data[f.size] = 0;
|
||||
DEH_LoadDehackedFile(&f, wad);
|
||||
DEH_WriteUndoline(va("# uload for wad: %u, lump: %u", wad, lump), NULL, UNDO_DONE);
|
||||
Z_Free(f.data);
|
||||
}
|
||||
|
||||
|
||||
@@ -27,8 +27,6 @@ typedef enum
|
||||
UNDO_DONE = 0,
|
||||
} undotype_f;
|
||||
|
||||
#define DEH_WriteUndoline(a,b,c)
|
||||
|
||||
void DEH_LoadDehackedLump(lumpnum_t lumpnum);
|
||||
void DEH_LoadDehackedLumpPwad(UINT16 wad, UINT16 lump);
|
||||
|
||||
|
||||
@@ -286,83 +286,47 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg)
|
||||
static void P_ClearSingleMapHeaderInfo(INT16 i)
|
||||
{
|
||||
const INT16 num = (INT16)(i-1);
|
||||
DEH_WriteUndoline("LEVELNAME", mapheaderinfo[num]->lvlttl, UNDO_NONE);
|
||||
mapheaderinfo[num]->lvlttl[0] = '\0';
|
||||
DEH_WriteUndoline("SUBTITLE", mapheaderinfo[num]->subttl, UNDO_NONE);
|
||||
mapheaderinfo[num]->subttl[0] = '\0';
|
||||
DEH_WriteUndoline("ZONETITLE", mapheaderinfo[num]->zonttl, UNDO_NONE); // SRB2kart
|
||||
mapheaderinfo[num]->zonttl[0] = '\0';
|
||||
DEH_WriteUndoline("ACT", mapheaderinfo[num]->actnum, UNDO_NONE); // SRB2kart
|
||||
mapheaderinfo[num]->actnum[0] = '\0';
|
||||
DEH_WriteUndoline("TYPEOFLEVEL", va("%d", mapheaderinfo[num]->typeoflevel), UNDO_NONE);
|
||||
mapheaderinfo[num]->typeoflevel = 0;
|
||||
DEH_WriteUndoline("NEXTLEVEL", va("%d", mapheaderinfo[num]->nextlevel), UNDO_NONE);
|
||||
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
|
||||
DEH_WriteUndoline("MUSIC", mapheaderinfo[num]->musname, UNDO_NONE);
|
||||
snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
|
||||
mapheaderinfo[num]->musname[6] = 0;
|
||||
DEH_WriteUndoline("MUSICTRACK", va("%d", mapheaderinfo[num]->mustrack), UNDO_NONE);
|
||||
mapheaderinfo[num]->mustrack = 0;
|
||||
DEH_WriteUndoline("MUSICPOS", va("%d", mapheaderinfo[num]->muspos), UNDO_NONE);
|
||||
mapheaderinfo[num]->muspos = 0;
|
||||
DEH_WriteUndoline("MUSICINTERFADEOUT", va("%d", mapheaderinfo[num]->musinterfadeout), UNDO_NONE);
|
||||
mapheaderinfo[num]->musinterfadeout = 0;
|
||||
DEH_WriteUndoline("MUSICINTER", mapheaderinfo[num]->musintername, UNDO_NONE);
|
||||
mapheaderinfo[num]->musintername[0] = '\0';
|
||||
DEH_WriteUndoline("FORCECHARACTER", va("%d", mapheaderinfo[num]->forcecharacter), UNDO_NONE);
|
||||
mapheaderinfo[num]->forcecharacter[0] = '\0';
|
||||
DEH_WriteUndoline("WEATHER", va("%d", mapheaderinfo[num]->weather), UNDO_NONE);
|
||||
mapheaderinfo[num]->weather = 0;
|
||||
DEH_WriteUndoline("SKYNUM", va("%d", mapheaderinfo[num]->skynum), UNDO_NONE);
|
||||
mapheaderinfo[num]->skynum = 1;
|
||||
DEH_WriteUndoline("SKYBOXSCALEX", va("%d", mapheaderinfo[num]->skybox_scalex), UNDO_NONE);
|
||||
mapheaderinfo[num]->skybox_scalex = 16;
|
||||
DEH_WriteUndoline("SKYBOXSCALEY", va("%d", mapheaderinfo[num]->skybox_scaley), UNDO_NONE);
|
||||
mapheaderinfo[num]->skybox_scaley = 16;
|
||||
DEH_WriteUndoline("SKYBOXSCALEZ", va("%d", mapheaderinfo[num]->skybox_scalez), UNDO_NONE);
|
||||
mapheaderinfo[num]->skybox_scalez = 16;
|
||||
DEH_WriteUndoline("INTERSCREEN", mapheaderinfo[num]->interscreen, UNDO_NONE);
|
||||
mapheaderinfo[num]->interscreen[0] = '#';
|
||||
DEH_WriteUndoline("RUNSOC", mapheaderinfo[num]->runsoc, UNDO_NONE);
|
||||
mapheaderinfo[num]->runsoc[0] = '#';
|
||||
DEH_WriteUndoline("SCRIPTNAME", mapheaderinfo[num]->scriptname, UNDO_NONE);
|
||||
mapheaderinfo[num]->scriptname[0] = '#';
|
||||
DEH_WriteUndoline("PRECUTSCENENUM", va("%d", mapheaderinfo[num]->precutscenenum), UNDO_NONE);
|
||||
mapheaderinfo[num]->precutscenenum = 0;
|
||||
DEH_WriteUndoline("CUTSCENENUM", va("%d", mapheaderinfo[num]->cutscenenum), UNDO_NONE);
|
||||
mapheaderinfo[num]->cutscenenum = 0;
|
||||
DEH_WriteUndoline("COUNTDOWN", va("%d", mapheaderinfo[num]->countdown), UNDO_NONE);
|
||||
mapheaderinfo[num]->countdown = 0;
|
||||
DEH_WriteUndoline("PALLETE", va("%u", mapheaderinfo[num]->palette), UNDO_NONE);
|
||||
mapheaderinfo[num]->palette = UINT16_MAX;
|
||||
DEH_WriteUndoline("ENCOREPAL", va("%u", mapheaderinfo[num]->encorepal), UNDO_NONE);
|
||||
mapheaderinfo[num]->encorepal = UINT16_MAX;
|
||||
DEH_WriteUndoline("NUMLAPS", va("%u", mapheaderinfo[num]->numlaps), UNDO_NONE);
|
||||
mapheaderinfo[num]->numlaps = NUMLAPS_DEFAULT;
|
||||
DEH_WriteUndoline("UNLOCKABLE", va("%s", mapheaderinfo[num]->unlockrequired), UNDO_NONE);
|
||||
mapheaderinfo[num]->unlockrequired = -1;
|
||||
DEH_WriteUndoline("LEVELSELECT", va("%d", mapheaderinfo[num]->levelselect), UNDO_NONE);
|
||||
mapheaderinfo[num]->levelselect = 0;
|
||||
DEH_WriteUndoline("BONUSTYPE", va("%d", mapheaderinfo[num]->bonustype), UNDO_NONE);
|
||||
mapheaderinfo[num]->bonustype = 0;
|
||||
DEH_WriteUndoline("SAVEOVERRIDE", va("%d", mapheaderinfo[num]->saveoverride), UNDO_NONE);
|
||||
mapheaderinfo[num]->saveoverride = SAVE_DEFAULT;
|
||||
DEH_WriteUndoline("LEVELFLAGS", va("%d", mapheaderinfo[num]->levelflags), UNDO_NONE);
|
||||
mapheaderinfo[num]->levelflags = 0;
|
||||
DEH_WriteUndoline("MENUFLAGS", va("%d", mapheaderinfo[num]->menuflags), UNDO_NONE);
|
||||
mapheaderinfo[num]->menuflags = (mainwads ? 0 : LF2_EXISTSHACK); // see p_setup.c - prevents replacing maps in addons with easier versions
|
||||
// TODO grades support for delfile (pfft yeah right)
|
||||
P_DeleteGrades(num);
|
||||
// SRB2Kart
|
||||
//DEH_WriteUndoline("AUTOMAP", va("%d", mapheaderinfo[num]->automap), UNDO_NONE);
|
||||
//mapheaderinfo[num]->automap = false;
|
||||
DEH_WriteUndoline("MOBJSCALE", va("%d", mapheaderinfo[num]->mobj_scale), UNDO_NONE);
|
||||
mapheaderinfo[num]->mobj_scale = FRACUNIT;
|
||||
// an even further impossibility, delfile custom opts support
|
||||
mapheaderinfo[num]->customopts = NULL;
|
||||
mapheaderinfo[num]->numCustomOptions = 0;
|
||||
|
||||
DEH_WriteUndoline(va("# uload for map %d", i), NULL, UNDO_DONE);
|
||||
}
|
||||
|
||||
/** Allocates a new map-header structure.
|
||||
|
||||
Reference in new issue
Block a user