mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 23:01:50 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
2a0fc16ce3
3 changed files with 13 additions and 3 deletions
|
@ -1280,8 +1280,8 @@ public:
|
|||
|
||||
// We can't use DTA_HUDRules since it forces a width and height.
|
||||
// Translation: No high res.
|
||||
bool xright = rx < 0;
|
||||
bool ybot = ry < 0;
|
||||
bool xright = *x < 0;
|
||||
bool ybot = *y < 0;
|
||||
|
||||
w = (forceWidth < 0 ? texture->GetScaledWidthDouble() : forceWidth);
|
||||
h = (forceHeight < 0 ? texture->GetScaledHeightDouble() : forceHeight);
|
||||
|
|
|
@ -286,7 +286,6 @@ DFrameBuffer *SDLVideo::CreateFrameBuffer (int width, int height, bool fullscree
|
|||
}
|
||||
|
||||
SDLFB *fb = new SDLFB (width, height, fullscreen);
|
||||
retry = 0;
|
||||
|
||||
// If we could not create the framebuffer, try again with slightly
|
||||
// different parameters in this order:
|
||||
|
@ -327,6 +326,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffer (int width, int height, bool fullscree
|
|||
++retry;
|
||||
fb = static_cast<SDLFB *>(CreateFrameBuffer (width, height, fullscreen, NULL));
|
||||
}
|
||||
retry = 0;
|
||||
|
||||
fb->SetFlash (flashColor, flashAmount);
|
||||
|
||||
|
|
|
@ -296,6 +296,16 @@ protected:
|
|||
static FNullStringData NullString;
|
||||
|
||||
friend struct FStringData;
|
||||
|
||||
private:
|
||||
// Prevent these from being called as current practices are to use Compare.
|
||||
// Without this FStrings will be accidentally compared against char* ptrs.
|
||||
bool operator == (const FString &illegal) const;
|
||||
bool operator != (const FString &illegal) const;
|
||||
bool operator < (const FString &illegal) const;
|
||||
bool operator > (const FString &illegal) const;
|
||||
bool operator <= (const FString &illegal) const;
|
||||
bool operator >= (const FString &illegal) const;
|
||||
};
|
||||
|
||||
namespace StringFormat
|
||||
|
|
Loading…
Reference in a new issue