mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 02:30:46 +00:00
Merge branch 'master' of https://github.com/coelckers/Raze
This commit is contained in:
commit
b8ac5aea84
6 changed files with 19 additions and 23 deletions
|
@ -17,9 +17,7 @@ class CompositeSavegameWriter
|
|||
public:
|
||||
void Clear()
|
||||
{
|
||||
subfiles.Reset();
|
||||
subfilenames.Reset();
|
||||
isCompressed.Reset();
|
||||
subfiles.DeleteAndClear();
|
||||
}
|
||||
void SetFileName(const char* fn)
|
||||
{
|
||||
|
|
|
@ -717,7 +717,6 @@ class DTextEnterMenu : public DMenu
|
|||
|
||||
FString mEnterString;
|
||||
int mEnterSize;
|
||||
int mEnterPos;
|
||||
bool mInputGridOkay;
|
||||
int InputGridX;
|
||||
int InputGridY;
|
||||
|
|
|
@ -67,7 +67,7 @@ DTextEnterMenu::DTextEnterMenu(DMenu *parent, FFont *dpf, FString textbuffer, in
|
|||
: DMenu(parent)
|
||||
{
|
||||
mEnterString = textbuffer;
|
||||
mEnterPos = maxlen;
|
||||
mEnterSize = maxlen;
|
||||
mInputGridOkay = (showgrid && (m_showinputgrid == 0)) || (m_showinputgrid >= 1);
|
||||
if (mEnterString.Len() > 0)
|
||||
{
|
||||
|
@ -116,7 +116,7 @@ bool DTextEnterMenu::Responder(event_t *ev)
|
|||
char ch = (char)ev->data1;
|
||||
if ((ev->subtype == EV_GUI_KeyDown || ev->subtype == EV_GUI_KeyRepeat) && ch == '\b')
|
||||
{
|
||||
if (mEnterPos > 0)
|
||||
if (mEnterString.Len() > 0)
|
||||
{
|
||||
mEnterString.DeleteLastCharacter();
|
||||
}
|
||||
|
|
|
@ -979,6 +979,13 @@ void mysetbrightness(char nBrightness)
|
|||
g_visibility = 2048 - (nBrightness << 9);
|
||||
}
|
||||
|
||||
// Replicate original DOS EXE behaviour when pointer is null
|
||||
static const char *safeStrtok(char *s, const char *d)
|
||||
{
|
||||
const char *r = strtok(s, d);
|
||||
return r ? r : "";
|
||||
}
|
||||
|
||||
void CheckKeys()
|
||||
{
|
||||
if (buttonMap.ButtonDown(gamefunc_Enlarge_Screen))
|
||||
|
@ -1074,21 +1081,16 @@ void CheckKeys()
|
|||
|
||||
if (ch == asc_Enter)
|
||||
{
|
||||
char *pToken = strtok(sHollyStr, " ");
|
||||
const char *pToken = safeStrtok(sHollyStr, " ");
|
||||
|
||||
if (nStringLen == 0 || pToken == NULL) // bjd - added this check. watcom allows passing NULL to strcmp so the below checks will all fail OK on DOS but will cause a crash on Windows
|
||||
{
|
||||
bHolly = kFalse;
|
||||
StatusMessage(1, " ");
|
||||
}
|
||||
else if (!strcmp(pToken, "GOTO"))
|
||||
if (!strcmp(pToken, "GOTO"))
|
||||
{
|
||||
// move player to X, Y coordinates
|
||||
int nSprite = PlayerList[0].nSprite;
|
||||
|
||||
pToken = strtok(NULL, ",");
|
||||
pToken = safeStrtok(NULL, ",");
|
||||
sprite[nSprite].x = atoi(pToken);
|
||||
pToken = strtok(NULL, ",");
|
||||
pToken = safeStrtok(NULL, ",");
|
||||
sprite[nSprite].y = atoi(pToken);
|
||||
|
||||
setsprite(nSprite, &sprite[nSprite].pos);
|
||||
|
@ -1096,13 +1098,8 @@ void CheckKeys()
|
|||
}
|
||||
else if (!strcmp(pToken, "LEVEL"))
|
||||
{
|
||||
pToken = strtok(NULL, " ");
|
||||
if (pToken) {
|
||||
levelnew = atoi(pToken);
|
||||
}
|
||||
else {
|
||||
levelnew = 0; // replicate original DOS EXE behaviour when no level number is specified.
|
||||
}
|
||||
pToken = safeStrtok(NULL, " ");
|
||||
levelnew = atoi(pToken);
|
||||
}
|
||||
else if (!strcmp(pToken, "DOORS"))
|
||||
{
|
||||
|
@ -1126,7 +1123,7 @@ void CheckKeys()
|
|||
// i = nNetPlayerCount;
|
||||
if (!nNetPlayerCount)
|
||||
{
|
||||
pToken = strtok(NULL, " ");
|
||||
pToken = safeStrtok(NULL, " ");
|
||||
switch (atoi(pToken))
|
||||
{
|
||||
// TODO - enums?
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 129 KiB |
|
@ -2605,11 +2605,13 @@ static saveable_data saveable_ninja_data[] =
|
|||
SAVE_DATA(sg_NinjaGrabThroat),
|
||||
SAVE_DATA(s_NinjaDie),
|
||||
SAVE_DATA(s_NinjaDieSliced),
|
||||
SAVE_DATA(s_NinjaDieSlicedHack),
|
||||
SAVE_DATA(s_NinjaDead),
|
||||
SAVE_DATA(s_NinjaDeathJump),
|
||||
SAVE_DATA(s_NinjaDeathFall),
|
||||
SAVE_DATA(sg_NinjaDie),
|
||||
SAVE_DATA(sg_NinjaDieSliced),
|
||||
SAVE_DATA(sg_NinjaDieSlicedHack),
|
||||
SAVE_DATA(sg_NinjaDead),
|
||||
SAVE_DATA(sg_NinjaDeathJump),
|
||||
SAVE_DATA(sg_NinjaDeathFall),
|
||||
|
|
Loading…
Reference in a new issue