mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 06:41:41 +00:00
- Changed Linux default for fullscreen to false.
- Removed CVAR_SERVERINFO flag from compatmode. Since it writes to compatflags, that should be enough. Having that flag set for both of them leads to problems with e.g. loading a savegame, where compatflags is restored, then compatmode is restored and it completely undoes whatever compatflags was restored to. - Fixed: Trying to start a map for some single file that isn't really a map caused a crash. SVN r1478 (trunk)
This commit is contained in:
parent
7dd75670f4
commit
8724b45e15
5 changed files with 22 additions and 10 deletions
|
@ -1,4 +1,14 @@
|
||||||
March 12, 2009
|
March 14, 2009
|
||||||
|
- Changed Linux default for fullscreen to false.
|
||||||
|
- Removed CVAR_SERVERINFO flag from compatmode. Since it writes to
|
||||||
|
compatflags, that should be enough. Having that flag set for both of
|
||||||
|
them leads to problems with e.g. loading a savegame, where compatflags is
|
||||||
|
restored, then compatmode is restored and it completely undoes whatever
|
||||||
|
compatflags was restored to.
|
||||||
|
- Fixed: Trying to start a map for some single file that isn't really a map
|
||||||
|
caused a crash.
|
||||||
|
|
||||||
|
March 12, 2009
|
||||||
- Fixed: After loading a savegame or unmorphing, a player's weapon slots
|
- Fixed: After loading a savegame or unmorphing, a player's weapon slots
|
||||||
were empty.
|
were empty.
|
||||||
|
|
||||||
|
|
|
@ -526,7 +526,7 @@ CUSTOM_CVAR (Int, compatflags, 0, CVAR_ARCHIVE|CVAR_SERVERINFO)
|
||||||
i_compatflags = GetCompatibility(self) | ii_compatflags;
|
i_compatflags = GetCompatibility(self) | ii_compatflags;
|
||||||
}
|
}
|
||||||
|
|
||||||
CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_SERVERINFO|CVAR_NOINITCALL)
|
CUSTOM_CVAR(Int, compatmode, 0, CVAR_ARCHIVE|CVAR_NOINITCALL)
|
||||||
{
|
{
|
||||||
int v;
|
int v;
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,9 @@ static FRandom pr_morphmonst ("MorphMonster");
|
||||||
//
|
//
|
||||||
// Returns true if the player gets turned into a chicken/pig.
|
// Returns true if the player gets turned into a chicken/pig.
|
||||||
//
|
//
|
||||||
|
// TODO: Allow morphed players to receive weapon sets (not just one weapon),
|
||||||
|
// since they have their own weapon slots now.
|
||||||
|
//
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
bool P_MorphPlayer (player_t *activator, player_t *p, const PClass *spawntype, int duration, int style, const PClass *enter_flash, const PClass *exit_flash)
|
bool P_MorphPlayer (player_t *activator, player_t *p, const PClass *spawntype, int duration, int style, const PClass *enter_flash, const PClass *exit_flash)
|
||||||
|
|
|
@ -255,7 +255,6 @@ MapData *P_OpenMapData(const char * mapname)
|
||||||
MapData * map = new MapData;
|
MapData * map = new MapData;
|
||||||
bool externalfile = !strnicmp(mapname, "file:", 5);
|
bool externalfile = !strnicmp(mapname, "file:", 5);
|
||||||
|
|
||||||
|
|
||||||
if (externalfile)
|
if (externalfile)
|
||||||
{
|
{
|
||||||
mapname += 5;
|
mapname += 5;
|
||||||
|
@ -284,8 +283,12 @@ MapData *P_OpenMapData(const char * mapname)
|
||||||
|
|
||||||
if (lump_name > lump_wad && lump_name > lump_map && lump_name != -1)
|
if (lump_name > lump_wad && lump_name > lump_map && lump_name != -1)
|
||||||
{
|
{
|
||||||
int lumpfile=Wads.GetLumpFile(lump_name);
|
int lumpfile = Wads.GetLumpFile(lump_name);
|
||||||
int nextfile=Wads.GetLumpFile(lump_name+1);
|
int nextfile = Wads.GetLumpFile(lump_name+1);
|
||||||
|
|
||||||
|
map->file = Wads.GetFileReader(lumpfile);
|
||||||
|
map->CloseOnDestruct = false;
|
||||||
|
map->lumpnum = lump_name;
|
||||||
|
|
||||||
if (lumpfile != nextfile)
|
if (lumpfile != nextfile)
|
||||||
{
|
{
|
||||||
|
@ -303,10 +306,6 @@ MapData *P_OpenMapData(const char * mapname)
|
||||||
|
|
||||||
// This case can only happen if the lump is inside a real WAD file.
|
// This case can only happen if the lump is inside a real WAD file.
|
||||||
// As such any special handling for other types of lumps is skipped.
|
// As such any special handling for other types of lumps is skipped.
|
||||||
map->file = Wads.GetFileReader(lumpfile);
|
|
||||||
map->CloseOnDestruct = false;
|
|
||||||
map->lumpnum = lump_name;
|
|
||||||
|
|
||||||
map->MapLumps[0].FilePos = Wads.GetLumpOffset(lump_name);
|
map->MapLumps[0].FilePos = Wads.GetLumpOffset(lump_name);
|
||||||
map->MapLumps[0].Size = Wads.LumpLength(lump_name);
|
map->MapLumps[0].Size = Wads.LumpLength(lump_name);
|
||||||
map->Encrypted = Wads.IsEncryptedFile(lump_name);
|
map->Encrypted = Wads.IsEncryptedFile(lump_name);
|
||||||
|
|
|
@ -162,7 +162,7 @@ void I_ClosestResolution (int *width, int *height, int bits)
|
||||||
|
|
||||||
extern int NewWidth, NewHeight, NewBits, DisplayBits;
|
extern int NewWidth, NewHeight, NewBits, DisplayBits;
|
||||||
|
|
||||||
CUSTOM_CVAR (Bool, fullscreen, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
CUSTOM_CVAR (Bool, fullscreen, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||||
{
|
{
|
||||||
NewWidth = screen->GetWidth();
|
NewWidth = screen->GetWidth();
|
||||||
NewHeight = screen->GetHeight();
|
NewHeight = screen->GetHeight();
|
||||||
|
|
Loading…
Reference in a new issue