zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/versionstr-change' into versionstr-change

This commit is contained in:
Rachael Alexanderson 2017-02-19 16:33:55 -05:00
parent 11d6f46e2d c2eed19b51
commit 84ca9fd63c
5 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_mobj.cpp
View File

@ -3848,7 +3848,7 @@ void AActor::CheckPortalTransition(bool islinked)
DVector3 oldpos = Pos();
if (islinked && !moved) UnlinkFromWorld(&ctx);
SetXYZ(PosRelative(Sector->GetOppositePortalGroup(sector_t::ceiling)));
Prev = Pos() - oldpos;
Prev += Pos() - oldpos;
Sector = P_PointInSector(Pos());
PrevPortalGroup = Sector->PortalGroup;
moved = true;
@ -3865,7 +3865,7 @@ void AActor::CheckPortalTransition(bool islinked)
DVector3 oldpos = Pos();
if (islinked && !moved) UnlinkFromWorld(&ctx);
SetXYZ(PosRelative(Sector->GetOppositePortalGroup(sector_t::floor)));
Prev = Pos() - oldpos;
Prev += Pos() - oldpos;
Sector = P_PointInSector(Pos());
PrevPortalGroup = Sector->PortalGroup;
moved = true;

12
src/version.h
View File

@ -31,6 +31,8 @@
**
*/
#include "gitinfo.h"
#ifndef __VERSION_H__
#define __VERSION_H__
@ -41,12 +43,16 @@ const char *GetVersionString();
/** Lots of different version numbers **/
#ifdef GIT_DESCRIPTION
#define VERSIONSTR GIT_DESCRIPTION
#else
#define VERSIONSTR "1.3pre"
#endif
// The version as seen in the Windows resource
#define RC_FILEVERSION 1,2,9999,0
#define RC_PRODUCTVERSION 1,2,9999,0
#define RC_PRODUCTVERSION2 "1.3pre"
#define RC_FILEVERSION 1,3,9999,0
#define RC_PRODUCTVERSION 1,3,9999,0
#define RC_PRODUCTVERSION2 VERSIONSTR
// Version identifier for network games.
// Bump it every time you do a release unless you're certain you

14
wadsrc/static/zscript/menu/loadsavemenu.txt
View File

@ -426,6 +426,8 @@ class LoadSaveMenu : ListMenu
class SaveMenu : LoadSaveMenu
{
String mSaveName;
//=============================================================================
//
//
@ -464,7 +466,6 @@ class SaveMenu : LoadSaveMenu
override bool MenuEvent (int mkey, bool fromcontroller)
{
if (Super.MenuEvent(mkey, fromcontroller))
{
return true;
@ -483,8 +484,9 @@ class SaveMenu : LoadSaveMenu
}
else if (mkey == MKEY_Input)
{
// Do not start the save here, it would cause some serious execution ordering problems.
mEntering = false;
manager.DoSave(Selected, mInput.GetText());
mSaveName = mInput.GetText();
mInput = null;
}
else if (mkey == MKEY_Abort)
@ -525,6 +527,14 @@ class SaveMenu : LoadSaveMenu
}
override void Ticker()
{
if (mSaveName.Length() > 0)
{
manager.DoSave(Selected, mSaveName);
mSaveName = "";
}
}
}

2
wadsrc/static/zscript/menu/menu.txt
View File

@ -266,7 +266,7 @@ class Menu : Object native
virtual bool CheckFocus(MenuItemBase fc) { return false; }
virtual void ReleaseFocus() {}
virtual void ResetColor() {}
virtual bool MouseEvent(int type, int mx, int my) { return false; }
virtual bool MouseEvent(int type, int mx, int my) { return true; }
virtual void Ticker() {}
//=============================================================================

39
wadsrc/static/zscript/menu/textentermenu.txt
View File

@ -171,31 +171,28 @@ class TextEnterMenu : Menu
override bool MouseEvent(int type, int x, int y)
{
if (mMouseCapture || m_use_mouse == 1)
{
int cell_width = 18 * CleanXfac;
int cell_height = 12 * CleanYfac;
int screen_y = screen.GetHeight() - INPUTGRID_HEIGHT * cell_height;
int screen_x = (screen.GetWidth() - INPUTGRID_WIDTH * cell_width) / 2;
int cell_width = 18 * CleanXfac;
int cell_height = 12 * CleanYfac;
int screen_y = screen.GetHeight() - INPUTGRID_HEIGHT * cell_height;
int screen_x = (screen.GetWidth() - INPUTGRID_WIDTH * cell_width) / 2;
if (x >= screen_x && x < screen_x + INPUTGRID_WIDTH * cell_width && y >= screen_y)
if (x >= screen_x && x < screen_x + INPUTGRID_WIDTH * cell_width && y >= screen_y)
{
InputGridX = (x - screen_x) / cell_width;
InputGridY = (y - screen_y) / cell_height;
if (type == MOUSE_Release)
{
InputGridX = (x - screen_x) / cell_width;
InputGridY = (y - screen_y) / cell_height;
if (type == MOUSE_Release)
if (MenuEvent(MKEY_Enter, true))
{
if (MenuEvent(MKEY_Enter, true))
{
MenuSound("menu/choose");
if (m_use_mouse == 2) InputGridX = InputGridY = -1;
return true;
}
MenuSound("menu/choose");
if (m_use_mouse == 2) InputGridX = InputGridY = -1;
}
}
else
{
InputGridX = InputGridY = -1;
}
return true;
}
else
{
InputGridX = InputGridY = -1;
}
return Super.MouseEvent(type, x, y);
}
@ -262,8 +259,8 @@ class TextEnterMenu : Menu
if (mEnterString.Length() > 0)
{
Menu parent = mParentMenu;
Close();
parent.MenuEvent(MKEY_Input, false);
Close();
return true;
}
}