zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved menus to ui side, moved AlterWeaponSprite to ui side, moved StaticEventHandler to play side (except ui virtuals)

Browse source
This commit is contained in:
ZZYZX 2017-03-03 23:15:18 +02:00
parent 421f78c771
commit f4a546aee6
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
wadsrc/static/zscript/events.txt
View file

@ -279,7 +279,7 @@ class ConsoleEvent : BaseEvent native
native readonly int Args[3]; native readonly int Args[3];
} }
class StaticEventHandler : Object native class StaticEventHandler : Object native play
{ {
// static event handlers CAN register other static event handlers. // static event handlers CAN register other static event handlers.
// unlike EventHandler.Create that will not create them. // unlike EventHandler.Create that will not create them.
@ -307,8 +307,8 @@ class StaticEventHandler : Object native
virtual native void WorldTick(WorldEvent e); virtual native void WorldTick(WorldEvent e);
// //
virtual native void RenderFrame(RenderEvent e); virtual native ui void RenderFrame(RenderEvent e);
virtual native void RenderOverlay(RenderEvent e); virtual native ui void RenderOverlay(RenderEvent e);
// //
virtual native void PlayerEntered(PlayerEvent e); virtual native void PlayerEntered(PlayerEvent e);
@ -317,7 +317,7 @@ class StaticEventHandler : Object native
virtual native void PlayerDisconnected(PlayerEvent e); virtual native void PlayerDisconnected(PlayerEvent e);
// //
virtual native bool UiProcess(UiEvent e); virtual native ui bool UiProcess(UiEvent e);
virtual native bool InputProcess(InputEvent e); virtual native bool InputProcess(InputEvent e);
// //

2
wadsrc/static/zscript/inventory/inventory.txt
View file

@ -746,7 +746,7 @@ class Inventory : Actor native
virtual bool Use (bool pickup) { return false; } virtual bool Use (bool pickup) { return false; }
virtual double GetSpeedFactor() { return 1; } virtual double GetSpeedFactor() { return 1; }
virtual bool GetNoTeleportFreeze() { return false; } virtual bool GetNoTeleportFreeze() { return false; }
virtual void AlterWeaponSprite(VisStyle vis, in out int changed) {} virtual ui void AlterWeaponSprite(VisStyle vis, in out int changed) {}
virtual void OwnerDied() {} virtual void OwnerDied() {}
virtual Color GetBlend () { return 0; } virtual Color GetBlend () { return 0; }

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

@ -48,7 +48,7 @@ struct JoystickConfig native
} }
class Menu : Object native class Menu : Object native ui
{ {
enum EMenuKey enum EMenuKey
{ {

2
wadsrc/static/zscript/menu/menuitembase.txt
View file

@ -4,7 +4,7 @@
// //
//============================================================================= //=============================================================================
class MenuItemBase : Object native class MenuItemBase : Object native ui
{ {
protected native int mXpos, mYpos; protected native int mXpos, mYpos;
protected native Name mAction; protected native Name mAction;