fn/ts
fn/ts
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix against upstream Nuclide.

Browse source
This commit is contained in:
Marco Cawthorne 2022-06-01 17:41:25 -07:00
parent 60eaae7b2b
commit 9c558a8f5c
Signed by: eukara
GPG key ID: CE2032F0A2882A22
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/client/ui_eventgrabber.qc
View file

@ -18,7 +18,7 @@ class CUIEventGrabber:CUIWidget
{ {
//void(void) CUIEventGrabber; //void(void) CUIEventGrabber;
virtual void(void) Draw; virtual void(void) Draw;
virtual void(float, float, float, float) Input; virtual bool(float, float, float, float) Input;
}; };
@ -36,7 +36,7 @@ CUIEventGrabber::Draw(void)
} }
void bool
CUIEventGrabber::Input(float flEVType, float flKey, float flChar, float flDevID) CUIEventGrabber::Input(float flEVType, float flKey, float flChar, float flDevID)
{ {
// no need to do this. // no need to do this.
@ -68,7 +68,7 @@ CUIEventGrabber::Input(float flEVType, float flKey, float flChar, float flDevID)
break; break;
} }
return false;
} }

1
src/server/gamerules_multiplayer.qc
View file

@ -1106,6 +1106,7 @@ TSMultiplayerRules::PlayerSpawn(NSClientPlayer pp)
// ALSO - start the minimum spawn delay. // ALSO - start the minimum spawn delay.
pl.minimumRespawnTime = autocvar_respawntime; pl.minimumRespawnTime = autocvar_respawntime;
pl.health = 100;
} }

1
src/server/progs.src
View file

@ -27,6 +27,7 @@
#define QWSSQC #define QWSSQC
#define SERVER #define SERVER
#define TS #define TS
#define NO_LEGACY
// TS definitely has penetration, and so should this then. // TS definitely has penetration, and so should this then.
#define BULLETPENETRATION #define BULLETPENETRATION