Merge pull request #201 from OpenArena/revert-199-widescreen-fix

Revert "Widescreen fix"

CHANGELOG.md

@@ -29,7 +29,7 @@
   * `weapbest`: Selects the best weapon.
   * `tossrune`: Tosses the rune that's been carried on. (Akin to TWCTF/TWCTF II) Needs `g_runes 2` in order to work.
   * `ui_writemappools`: If the arena files are loaded, this command dumps the gamelists so they can be used by g_autonextmap (should be used to generate new gamelists for new versions).
-* Now it's possible to compile OAX on Mac (thanks Bishop-333!)
+* Now it's possible to compile OAX on Mac (thanks EddieBrrrock!)
 * AI enhancements (LOTS!) for holdable handling, grappling hook handling, Domination and Double Domination.
 * Elimination/eCTF/LMS: If all humans have been killed in a round, bots will be eliminated one by one.
 * Lots of fixes for Classic UI and backend of UI3.
@@ -64,7 +64,7 @@
   * `g_weaponArenaWeapon` controls, via specific strings, which weapon it's spawned with its ammo boxes. The weapon cannot be picked up via menu, only (for now) via console. The full string list can be locate [here](https://github.com/OpenArena/gamecode/pull/171).
 * Missionpack/UI3 backend refactors.
 * "You Have Been Mined" message outright displays the counter instead of delaying it.
-* Team status bar fix and cg_drawTeamOverlay fix by Bishop-333.
+* Team status bar fix and cg_drawTeamOverlay fix by EddieBrrrock.
 * New command: tossrune. Drops the currently held rune.
 * New cvar value: g_runes &2: Enables the "tossrune" command in the server. (By default, g_runes 1, the command is disabled).
 * Reimplementation of shuffle, ported from Aftershock.
@@ -87,12 +87,12 @@
 * AI enhancement: Holdable item (Teleporter/Medkit/Kamikaze/Invulnerability) handling improvements.
 * AI enhancement: Double Domination bot logic improved (team formations, voice orders, voice speech support)
 * Regression fix: Obelisk bases are now drawn outside Harvester/Overload.
-* Fix: Now it's possible to compile OAX on Mac (thanks Bishop-333!)
+* Fix: Now it's possible to compile OAX on Mac (thanks EddieBrrrock!)
 * Fix: Team Orders in Classic UI now shows proper team orders depending on the gametype.
 * AI enhancement: Domination support vastly improved with team formations, basic logic and team orders.
 * AI enhancement: Bots now properly decide if they should use the Grappling Hook or not.
 * Fix: Classic menu now accounts for "Hide Private".
-* Fix: Yourteamcapture.wav is now only played once when it's a personal capture instead of two before (thanks Bishop-333!)
+* Fix: Yourteamcapture.wav is now only played once when it's a personal capture instead of two before (thanks EddieBrrrock!)
 * Fix: cg_weaponBarStyle with value outside of range now displays default weapon bar. Previously it would hide the weapon bar.
 * Removal of #ifdefs which blocked legit AI logic that the main game could benefit from.
 * Fix: Fragment of CG_DrawInformation in cg_info.c was not accounting for TDM.

code/cgame/cg_main.c

@@ -450,7 +450,7 @@ static cvarTable_t cvarTable[] = {// bk001129
 	{ &cg_leiSuperGoreyAwesome, "cg_leiSuperGoreyAwesome", "0", CVAR_ARCHIVE}, // LEILEI 
 	{ &cg_leiDebug, "cg_leiDebug", "0", CVAR_CHEAT}, // LEILEI 
 	{ &cg_leiChibi, "cg_leiChibi", "0", CVAR_CHEAT}, // LEILEI 
-	{ &cg_leiWidescreen, "cg_leiWidescreen", "0", CVAR_ARCHIVE}, // LEILEI 
+	{ &cg_leiWidescreen, "cg_leiWidescreen", "1", CVAR_ARCHIVE}, // LEILEI 
 	{ &cg_deathcam, "cg_deathcam", "1", CVAR_ARCHIVE}, // LEILEI 
 	{ &cg_cameramode, "cg_cameramode", "0", CVAR_ARCHIVE}, // LEILEI 
 	{ &cg_cameraEyes, "cg_cameraEyes", "0", CVAR_ARCHIVE}, // LEILEI 
@@ -2432,7 +2432,7 @@ void CG_Init(int serverMessageNum, int serverCommandSequence, int clientNum) {
 	realVidHeight = cgs.glconfig.vidHeight;
 
 	// leilei - widescreen correction
-	if ( cg_leiWidescreen.integer ) {
+
 	{
 		float resbias;
 		float rex, rey;
@@ -2461,7 +2461,6 @@ void CG_Init(int serverMessageNum, int serverCommandSequence, int clientNum) {
 		// no wide screen
 		cgs.screenXBias = 0;
 	}
-	}