Removed last bits of hardcoded versioning stuff; fixed CVAR_NO_RESET …

…flag being ignored; updated unified Load/Save menu style for various IWADs

branding.cfg

@@ -1,8 +1,8 @@
 /appname	"EDGE-Classic"
 /configfilename	"edge-classic.cfg"
 /debugfilename	"debug.txt"
+/edgeversion	"1.34"
 /homepage	"https://edge-classic.github.io"
 /logfilename	"edge-classic.log"
 /orgname	"EDGE Team"
-/versionstring	"1.33"
 /windowtitle	"EDGE-Classic"

edge_base/blasphemer/scripts/styles.ddf

@@ -84,23 +84,43 @@ TITLE.SCALE=1.1;
 TEXT.FONT="HERETIC_BIG"; //"DOOM";
 TEXT.SCALE=1.0;
 
-[LOAD_MENU]
+//Now both Load and Save menu use the same style entry
+//This one behaves different to other styles because as it's
+//considered a System menu, I experimented with new ways
+//of doing things.
+[LOAD_SAVE_MENU]
 BACKGROUND.COLOUR=#000000;
-BACKGROUND.TRANSLUCENCY=30%;
-SPECIAL=STRETCH_FULLSCREEN;
-TEXT.FONT="HERETIC";
-ALT.FONT="HERETIC";
-TITLE.FONT="HERETIC";
-HELP.FONT="HERETIC";
-
-[SAVE_MENU]
-BACKGROUND.COLOUR=#000000;
-BACKGROUND.TRANSLUCENCY=30%;
+BACKGROUND.TRANSLUCENCY=60%;
 SPECIAL=STRETCH_FULLSCREEN;
-TEXT.FONT="HERETIC";
-ALT.FONT="HERETIC";
-TITLE.FONT="HERETIC";
-HELP.FONT="HERETIC";
+ENTRY_SPACING=4;
+HEADER.FONT="EDGE3"; //"Load game"
+HEADER.SCALE=2.0;
+HEADER.COLOURMAP="TEXT_RED";
+// save name & slot block
+TEXT.FONT="EDGE3"; 
+TEXT.COLOURMAP="TEXT_GREY";
+TEXT.SCALE=1.9;
+TEXT.X_OFFSET=20;
+TEXT.Y_OFFSET=40;
+// save info text block
+HELP.FONT="EDGE3"; 
+HELP.COLOURMAP="TEXT_RED";
+HELP.SCALE=1.1;
+HELP.X_OFFSET=210;
+HELP.Y_OFFSET=40;
+// next page text block
+TITLE.FONT="EDGE3"; 
+TITLE.COLOURMAP="TEXT_RED";
+TITLE.SCALE=1.5;
+TITLE.X_OFFSET=20;
+TITLE.Y_OFFSET=160;
+ALT.FONT="EDGE3";  // when we edit the save name
+ALT.COLOURMAP="TEXT_WHITE";
+ALT.SCALE=1.85;
+// selected slot text
+SELECTED.FONT="EDGE3";
+SELECTED.COLOURMAP="TEXT_WHITE";
+SELECTED.SCALE=1.92;
 
 [DEFAULT]
 BACKGROUND.COLOUR=#000000;

edge_base/hacx/scripts/styles.ddf

@@ -21,6 +21,44 @@ TITLE.COLOURMAP="TEXT_GREY";
 HELP.FONT="EDGE3";
 HELP.COLOURMAP="TEXT_RED";
 
+//Now both Load and Save menu use the same style entry
+//This one behaves different to other styles because as it's
+//considered a System menu, I experimented with new ways
+//of doing things.
+[LOAD_SAVE_MENU]
+BACKGROUND.COLOUR=#000000;
+BACKGROUND.TRANSLUCENCY=70%;
+SPECIAL=STRETCH_FULLSCREEN;
+ENTRY_SPACING=4;
+HEADER.FONT="EDGE3"; //"Load game"
+HEADER.SCALE=2.0;
+HEADER.COLOURMAP="TEXT_BLUE";
+// save name & slot block
+TEXT.FONT="EDGE3"; 
+TEXT.COLOURMAP="TEXT_BLUE";
+TEXT.SCALE=1.9;
+TEXT.X_OFFSET=20;
+TEXT.Y_OFFSET=40;
+// save info text block
+HELP.FONT="EDGE3"; 
+HELP.COLOURMAP="TEXT_RED";
+HELP.SCALE=1.1;
+HELP.X_OFFSET=210;
+HELP.Y_OFFSET=40;
+// next page text block
+TITLE.FONT="EDGE3"; 
+TITLE.COLOURMAP="TEXT_GREY";
+TITLE.SCALE=1.5;
+TITLE.X_OFFSET=20;
+TITLE.Y_OFFSET=160;
+ALT.FONT="EDGE3";  // when we edit the save name
+ALT.COLOURMAP="TEXT_WHITE";
+ALT.SCALE=1.85;
+// selected slot text
+SELECTED.FONT="EDGE3";
+SELECTED.COLOURMAP="TEXT_WHITE";
+SELECTED.SCALE=1.92;
+
 [HOST_NETGAME]
 BACKGROUND.COLOUR=#000000;
 BACKGROUND.TRANSLUCENCY=75%;

edge_base/harmony/scripts/styles.ddf

@@ -10,7 +10,7 @@
 
 [OPTIONS]
 BACKGROUND.COLOUR=#000000;
-BACKGROUND.TRANSLUCENCY=75%;
+BACKGROUND.TRANSLUCENCY=70%;
 SPECIAL=STRETCH_FULLSCREEN;
 TEXT.FONT="EDGE3"; //items and header
 TEXT.SCALE=1.0;
@@ -24,9 +24,47 @@ TITLE.COLOURMAP="TEXT_HARMONY_LIGHT_BLUE";
 HELP.FONT="EDGE3"; //help tip at bottom of screen
 HELP.COLOURMAP="TEXT_HARMONY_PURPLE";
 
+//Now both Load and Save menu use the same style entry
+//This one behaves different to other styles because as it's
+//considered a System menu, I experimented with new ways
+//of doing things.
+[LOAD_SAVE_MENU]
+BACKGROUND.COLOUR=#000000;
+BACKGROUND.TRANSLUCENCY=70%;
+SPECIAL=STRETCH_FULLSCREEN;
+ENTRY_SPACING=4;
+HEADER.FONT="EDGE3"; //"Load game"
+HEADER.SCALE=2.0;
+HEADER.COLOURMAP="TEXT_HARMONY_BLUE";
+// save name & slot block
+TEXT.FONT="EDGE3"; 
+TEXT.COLOURMAP="TEXT_HARMONY_BLUE";
+TEXT.SCALE=1.9;
+TEXT.X_OFFSET=20;
+TEXT.Y_OFFSET=40;
+// save info text block
+HELP.FONT="EDGE3"; 
+HELP.COLOURMAP="TEXT_HARMONY_PURPLE";
+HELP.SCALE=1.1;
+HELP.X_OFFSET=210;
+HELP.Y_OFFSET=40;
+// next page text block
+TITLE.FONT="EDGE3"; 
+TITLE.COLOURMAP="TEXT_HARMONY_PURPLE";
+TITLE.SCALE=1.5;
+TITLE.X_OFFSET=20;
+TITLE.Y_OFFSET=160;
+ALT.FONT="EDGE3";  // when we edit the save name
+ALT.COLOURMAP="TEXT_HARMONY_LIGHT_BLUE";
+ALT.SCALE=1.85;
+// selected slot text
+SELECTED.FONT="EDGE3";
+SELECTED.COLOURMAP="TEXT_HARMONY_LIGHT_BLUE";
+SELECTED.SCALE=1.92;
+
 [HOST_NETGAME]
 BACKGROUND.COLOUR=#000000;
-BACKGROUND.TRANSLUCENCY=75%;
+BACKGROUND.TRANSLUCENCY=70%;
 SPECIAL=STRETCH_FULLSCREEN;
 HEADER.FONT="EDGE3"; //items
 HEADER.COLOURMAP="TEXT_HARMONY_BLUE";

edge_base/heretic/scripts/styles.ddf

@@ -79,23 +79,43 @@ ALT.FONT="HERETIC_BIG";
 TITLE.FONT="HERETIC_BIG";
 HELP.FONT="HERETIC_BIG";
 
-[LOAD_MENU]
+//Now both Load and Save menu use the same style entry
+//This one behaves different to other styles because as it's
+//considered a System menu, I experimented with new ways
+//of doing things.
+[LOAD_SAVE_MENU]
 BACKGROUND.COLOUR=#000000;
-BACKGROUND.TRANSLUCENCY=50%;
-SPECIAL=STRETCH_FULLSCREEN;
-TEXT.FONT="HERETIC";
-ALT.FONT="HERETIC";
-TITLE.FONT="HERETIC";
-HELP.FONT="HERETIC";
-
-[SAVE_MENU]
-BACKGROUND.COLOUR=#000000;
-BACKGROUND.TRANSLUCENCY=50%;
+BACKGROUND.TRANSLUCENCY=60%;
 SPECIAL=STRETCH_FULLSCREEN;
-TEXT.FONT="HERETIC";
-ALT.FONT="HERETIC";
-TITLE.FONT="HERETIC";
-HELP.FONT="HERETIC";
+ENTRY_SPACING=4;
+HEADER.FONT="EDGE3"; //"Load game"
+HEADER.SCALE=2.0;
+HEADER.COLOURMAP="TEXT_GREEN";
+// save name & slot block
+TEXT.FONT="EDGE3"; 
+TEXT.COLOURMAP="TEXT_GREY";
+TEXT.SCALE=1.9;
+TEXT.X_OFFSET=20;
+TEXT.Y_OFFSET=40;
+// save info text block
+HELP.FONT="EDGE3"; 
+HELP.COLOURMAP="TEXT_GREEN";
+HELP.SCALE=1.1;
+HELP.X_OFFSET=210;
+HELP.Y_OFFSET=40;
+// next page text block
+TITLE.FONT="EDGE3"; 
+TITLE.COLOURMAP="TEXT_YELLOW";
+TITLE.SCALE=1.5;
+TITLE.X_OFFSET=20;
+TITLE.Y_OFFSET=160;
+ALT.FONT="EDGE3";  // when we edit the save name
+ALT.COLOURMAP="TEXT_WHITE";
+ALT.SCALE=1.85;
+// selected slot text
+SELECTED.FONT="EDGE3";
+SELECTED.COLOURMAP="TEXT_WHITE";
+SELECTED.SCALE=1.92;
 
 [DEFAULT]
 BACKGROUND.COLOUR=#000000;

edge_base/rekkr/scripts/styles.ddf

@@ -55,30 +55,43 @@ Y_OFFSET=-1;
 ENTRY_SPACING = 2;
 CURSOR.IMAGE="M_SKULL3";
 
-[LOAD_MENU]
+//Now both Load and Save menu use the same style entry
+//This one behaves different to other styles because as it's
+//considered a System menu, I experimented with new ways
+//of doing things.
+[LOAD_SAVE_MENU]
 BACKGROUND.COLOUR=#000000;
 BACKGROUND.TRANSLUCENCY=60%;
 SPECIAL=STRETCH_FULLSCREEN;
-TEXT.FONT="DOOM";
-ALT.FONT="DOOM";
-ALT.COLOURMAP="TEXT_YELLOW";
-TITLE.FONT="DOOM";
-TITLE.COLOURMAP="TEXT_WHITE";
-HELP.FONT="DOOM";
-HELP.COLOURMAP="TEXT_GREEN";
-
-[SAVE_MENU]
-BACKGROUND.COLOUR=#000000;
-BACKGROUND.TRANSLUCENCY=60%;
-SPECIAL=STRETCH_FULLSCREEN;
-TEXT.FONT="DOOM";
-ALT.FONT="DOOM";
+ENTRY_SPACING=4;
+HEADER.FONT="EDGE3"; //"Load game"
+HEADER.SCALE=2.0;
+HEADER.COLOURMAP="TEXT_GREY";
+// save name & slot block
+TEXT.FONT="EDGE3"; 
+TEXT.COLOURMAP="TEXT_GREY";
+TEXT.SCALE=1.9;
+TEXT.X_OFFSET=20;
+TEXT.Y_OFFSET=40;
+// save info text block
+HELP.FONT="EDGE3"; 
+HELP.COLOURMAP="TEXT_YELLOW";
+HELP.SCALE=1.1;
+HELP.X_OFFSET=210;
+HELP.Y_OFFSET=40;
+// next page text block
+TITLE.FONT="EDGE3"; 
+TITLE.COLOURMAP="TEXT_YELLOW";
+TITLE.SCALE=1.5;
+TITLE.X_OFFSET=20;
+TITLE.Y_OFFSET=160;
+ALT.FONT="EDGE3";  // when we edit the save name
 ALT.COLOURMAP="TEXT_YELLOW";
-TITLE.FONT="DOOM";
-TITLE.COLOURMAP="TEXT_WHITE";
-HELP.FONT="DOOM";
-HELP.COLOURMAP="TEXT_GREEN";
-
+ALT.SCALE=1.85;
+// selected slot text
+SELECTED.FONT="EDGE3";
+SELECTED.COLOURMAP="TEXT_YELLOW";
+SELECTED.SCALE=1.92;
 
 [OPTIONS] //all the other option menus
 BACKGROUND.COLOUR=#000000;

edge_defs/version.txt

@@ -1 +1 @@
-1.33
+1.34

source_files/edge/con_main.cc

@@ -476,7 +476,7 @@ int CMD_Help(char **argv, int argc)
 
 int CMD_Version(char **argv, int argc)
 {
-	I_Printf("%s v%s\n", appname.c_str(), versionstring.c_str());
+	I_Printf("%s v%s\n", appname.c_str(), edgeversion.c_str());
 	return 0;
 }
 

source_files/edge/con_var.cc

@@ -215,7 +215,8 @@ void CON_ResetAllVars()
 {
 	for (cvar_c *var = all_cvars ; var != NULL ; var = var->next)
 	{
-		*var = var->def;
+		if (!(var->flags & CVAR_NO_RESET))
+			*var = var->def;
 	}
 }