- added input code.

Not tested yet!

source/core/d_protocol.h

@@ -91,6 +91,7 @@ enum EDemoCommand
 	DEM_GENERICCHEAT,
 	DEM_GIVE,
 	DEM_CHANGEMAP,
+	DEM_SPELL,	//Witchaven
 
 	DEM_MAX
 };

source/core/packet.h

@@ -21,12 +21,15 @@ enum ESyncBits_ : uint32_t
     SB_CENTERVIEW = 1 << 14,
     SB_TURNAROUND = 1 << 15,
     SB_HOLSTER = 1 << 16,
+    SB_FLYSTOP = 1 << 16,         // WH only
     SB_OPEN = 1 << 17,
 
     SB_AIMMODE = 1 << 18,   
     SB_QUICK_KICK = 1 << 19,    // Duke only.
     SB_CROUCH_LOCK = 1 << 19,   // SW only.
-    SB_ESCAPE = 1 << 20,
+    SB_FLYDOWN = 1 << 19,       // WH only.
+    SB_ESCAPE = 1 << 20,          // Duke only
+    SB_SPELL = 1 << 20,         // WH only
 
     SB_AIM_UP = 1 << 21,
     SB_AIM_DOWN = 1 << 22,
@@ -39,6 +42,7 @@ enum ESyncBits_ : uint32_t
     SB_CROUCH = 1 << 29,
     SB_FIRE = 1 << 30,
     SB_ALTFIRE = 1u << 31,
+    SB_FLYUP = 1u << 31,      // WH only
 
     SB_WEAPONMASK_BITS = (15u * SB_FIRST_WEAPON_BIT), // Weapons take up 4 bits
     SB_ITEMUSE_BITS = (127u * SB_ITEM_BIT_1),

source/games/whaven/CMakeLists.txt

@@ -48,6 +48,7 @@ set( PCH_SOURCES
 		src/screenflash.cpp
 		src/precache.cpp
 		src/render.cpp
+		src/input.cpp
 	)
 
 add_game_library2( whaven )

source/games/whaven/src/input.cpp

@@ -0,0 +1,603 @@
+#include "ns.h"
+#include "wh.h"
+#include "gameinput.h"
+#include "inputstate.h"
+#include "menu.h"
+#include "gamestate.h"
+#include "mmulti.h"
+
+BEGIN_WH_NS 
+
+int ihaveflag;
+int justplayed;
+int lopoint;
+int walktoggle;
+int runningtime;
+int oldhoriz;
+
+
+static int osdcmd_third_person_view(CCmdFuncPtr parm)
+{
+	if (gamestate != GS_LEVEL) return CCMD_OK;
+	/*	if (gViewPos > VIEWPOS_0)
+		gViewPos = VIEWPOS_0;
+	else
+		gViewPos = VIEWPOS_1;
+		*/
+	return CCMD_OK;
+}
+
+static int osdcmd_coop_view(CCmdFuncPtr parm)
+{
+	if (gamestate != GS_LEVEL) return CCMD_OK;
+
+	if (numplayers > 1)
+	{
+		pyrn = connectpoint2[pyrn];
+		if (pyrn < 0) pyrn = connecthead;
+	}
+	return CCMD_OK;
+}
+
+static int osdcmd_cast_spell(CCmdFuncPtr parm)
+{
+	// There's no more space in the packet so this gets sent as a separate network message.
+	if (gamestate != GS_LEVEL) return CCMD_OK;
+	if (parm->numparms == 0) return CCMD_SHOWHELP;
+	uint8_t spellnum = (uint8_t)strtoll(parm->parms[0], nullptr, 10);
+	Net_WriteByte(DEM_SPELL);
+	Net_WriteByte(spellnum);
+
+	if (numplayers > 1)
+	{
+		pyrn = connectpoint2[pyrn];
+		if (pyrn < 0) pyrn = connecthead;
+	}
+	return CCMD_OK;
+}
+
+void cast_spell(int plr, uint8_t** stream, bool skip)
+{
+	int cheat = ReadByte(stream);
+	if (skip) return;
+	player[plr].spellnum = cheat;
+}
+
+
+int32_t registerosdcommands(void)
+{
+	//C_RegisterFunction("warptocoords", "warptocoords [x] [y] [z] [ang] (optional) [horiz] (optional): warps the player to the specified coordinates", osdcmd_warptocoords);
+	C_RegisterFunction("third_person_view", "Switch to third person view", osdcmd_third_person_view);
+	C_RegisterFunction("coop_view", "Switch player to view from in coop", osdcmd_coop_view);
+	C_RegisterFunction("cast_spell", "castspell <spellnum> Cast a spell", osdcmd_cast_spell);
+	//C_RegisterFunction("show_weapon", "Show opponents' weapons", osdcmd_show_weapon);
+	Net_SetCommandHandler(DEM_SPELL, cast_spell);
+	return 0;
+}
+
+
+/*
+	loc.bits = ctrlGetInputKey(GameKeys.Jump, false) ? CtrlJump : 0; = SB_JUMP
+	loc.bits |= ctrlGetInputKey(GameKeys.Crouch, false) ? CtrlCrouch : 0; = SB_CROUCH
+	loc.bits |= ctrlGetInputKey(GameKeys.Weapon_Fire, false) ? CtrlWeapon_Fire : 0; = SB_FIRE
+	loc.bits |= ctrlGetInputKey(WhKeys.Aim_Up, false) ? CtrlAim_Up : 0; = SB_AIM_UP
+	loc.bits |= ctrlGetInputKey(WhKeys.Aim_Down, false) ? CtrlAim_Down : 0; = SB_AIM_DOWN
+	loc.bits |= ctrlGetInputKey(WhKeys.Aim_Center, true) ? CtrlAim_Center : 0; = SB_CENTERVIEW
+	loc.bits |= ctrlGetInputKey(GameKeys.Run, false) ? CtrlRun : 0; = SB_RUN
+	if (ctrlGetInputKey(WhKeys.Inventory_Left, true)) loc.bits |= (6) << 16; = SB_INVPREV
+	if (ctrlGetInputKey(WhKeys.Inventory_Right, true)) loc.bits |= (7) << 16; = SB_INVNEXT
+	if (ctrlGetInputKey(GameKeys.Previous_Weapon, true)) loc.bits |= (11) << 8;  // WeaponSel_Prev
+	if (ctrlGetInputKey(GameKeys.Next_Weapon, true)) loc.bits |= (12) << 8; // WeaponSel_next
+	for (int i = 0; i < 10; i++) if (ctrlGetInputKey(whcfg.keymap[i + WhKeys.Weapon_1.getNum()], true)) loc.bits |= (i + 1) << 8; //1 << 12 // weaponsel
+	loc.bits |= whcfg.gMouseAim ? CtrlMouseAim : 0; ~SB_AIMMODE
+	loc.bits |= ctrlGetInputKey(GameKeys.Open, true) ? CtrlOpen : 0;	SB_OPEN
+	loc.bits |= ctrlGetInputKey(GameKeys.Turn_Around, true) ? CtrlTurnAround : 0; SB_TURNAROUND
+	loc.bits |= ctrlGetInputKey(WhKeys.Inventory_Use, true) ? CtrlInventory_Use : 0; SB_INVUSE
+	loc.bits |= ctrlGetInputKey(WhKeys.Fly_up, false) ? CtrlFlyup : 0; // SB_FLYUP
+	loc.bits |= ctrlGetInputKey(WhKeys.Fly_down, false) ? CtrlFlydown : 0; // SB_FLYDOWN
+	loc.bits |= ctrlGetInputKey(WhKeys.End_flying, true) ? CtrlEndflying : 0; // SB_FLYSTOP
+	if (ctrlGetInputKey(WhKeys.Health_potion, true))	loc.bits |= (1) << 16;  //  SB_ITEM_BIT_1
+	if (ctrlGetInputKey(WhKeys.Strength_potion, true))	loc.bits |= (2) << 16; // 1 << 17 // SB_ITEM_BIT_2
+	if (ctrlGetInputKey(WhKeys.Curepoison_potion, true))	loc.bits |= (3) << 16; SB_ITEM_BIT_3
+	if (ctrlGetInputKey(WhKeys.Fireresist_potion, true))	loc.bits |= (4) << 16; // 1 << 18 SB_ITEM_BIT_4
+	if (ctrlGetInputKey(WhKeys.Invisibility_potion, true))	loc.bits |= (5) << 16; SB_ITEM_BIT_5
+	loc.bits |= ctrlGetInputKey(WhKeys.Cast_spell, true) ? CtrlCastspell : 0; // SB_SPELL
+
+*/
+
+InputPacket localInput;
+int lPlayerXVel, lPlayerYVel;
+
+void GameInterface::clearlocalinputstate()
+{
+    localInput = {};
+	lPlayerXVel = lPlayerYVel = 0;
+}
+
+
+void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput)
+{
+    if (paused || M_Active())
+    {
+        localInput = {};
+        return;
+    }
+
+    if (packet != nullptr)
+    {
+        localInput = {};
+        ApplyGlobalInput(localInput, hidInput);
+        if (player[myconnectindex].dead) localInput.actions &= SB_OPEN;
+    }
+
+    double const scaleAdjust = InputScale();
+    InputPacket input{};
+
+    if (player[myconnectindex].dead)
+    {
+        lPlayerYVel = 0;
+        lPlayerXVel = 0;
+    }
+    else
+    {
+        processMovement(&input, &localInput, hidInput, scaleAdjust);
+    }
+
+	/*
+    if (!cl_syncinput)
+    {
+        auto plr = &player[myconnectindex];
+		PlayerAngle ang;
+        applylook(&ang, input.avel, &sPlayerInput[nLocalPlayer].actions, scaleAdjust, eyelevel[nLocalPlayer] > -14080);
+            sethorizon(&pPlayer->horizon.horiz, input.horz, &sPlayerInput[nLocalPlayer].actions, scaleAdjust);
+
+        pPlayer->angle.processhelpers(scaleAdjust);
+        pPlayer->horizon.processhelpers(scaleAdjust);
+        UpdatePlayerSpriteAngle(pPlayer);
+    }
+	*/
+
+    if (packet)
+    {
+        *packet = localInput;
+    }
+}
+
+ 
+void processinput(int num) {
+
+	int goalz, lohit = 0, loz = 0, tics, xvect, yvect;
+
+	int oldposx, oldposy;
+	int dist;
+	int feetoffground;
+	short onsprite = -1;
+
+	PLAYER& plr = player[num];
+
+	auto bits = plr.plInput.actions;
+
+	if ((bits & SB_JUMP) == 0)
+		plr.keytoggle = false;
+
+	boolean onground;
+
+	if (plr.health <= 0) {
+		playerdead(plr);
+		if (plr.dead) {
+			if (plr.horiz < 100 + (200 >> 1))
+				plr.horiz += (TICSPERFRAME << 1);
+		}
+		return;
+	}
+
+	xvect = yvect = 0;
+	tics = TICSPERFRAME;
+
+	plr.plInput.fvel += (tics * damage_vel) << 14;
+	plr.plInput.svel += (tics * damage_svel) << 14;
+	plr.plInput.avel += damage_angvel;
+
+
+	if (damage_vel != 0)
+		damage_vel = std::min(damage_vel + (tics << 3), 0);
+	if (damage_svel != 0)
+		damage_svel = std::max(damage_svel - (tics << 3), 0);
+	if (damage_angvel != 0)
+		damage_angvel = std::max(damage_angvel - (tics << 1), 0);
+
+	sprite[plr.spritenum].cstat ^= 1;
+	getzrange(plr.x, plr.y, plr.z, plr.sector, 128, CLIPMASK0);
+
+	loz = zr_florz;
+	lohit = zr_florhit;
+
+	sprite[plr.spritenum].cstat ^= 1;
+
+	if ((lohit & 0xc000) == 49152) {
+		if ((sprite[lohit & 4095].z - plr.z) <= (getPlayerHeight() << 8))
+			onsprite = (short)(lohit & 4095);
+	}
+	else
+		onsprite = -1;
+
+	feetoffground = (plr.sector != -1) ? (sector[plr.sector].floorz - plr.z) : 0;
+
+	if (abs(plr.plInput.svel) > gi->playerKeyMove() || abs(plr.plInput.fvel) > gi->playerKeyMove()) {
+		if (feetoffground > (32 << 8))
+			tics += tics >> 1;
+	}
+
+	plr.horiz = clamp(plr.horiz + plr.plInput.horz + 100, -(200 >> 1), 100 + (200 >> 1));
+
+	if ((bits & SB_AIM_DOWN) != 0) {
+		if (plr.horiz > 100 - (200 >> 1)) {
+			plr.horiz -= (TICSPERFRAME << 1);
+			autohoriz = 0;
+		}
+	}
+	else if ((bits & SB_AIM_UP) != 0) {
+		if (plr.horiz < 100 + (200 >> 1))
+			plr.horiz += (TICSPERFRAME << 1);
+		autohoriz = 0;
+	}
+
+	if ((bits & SB_FLYSTOP) != 0)
+		plr.orbactive[5] = -1;
+
+	if ((bits & SB_FIRE) != 0 && plr.hasshot == 0) { // Les 07/27/95
+		if (plr.currweaponfired == 0)
+			plrfireweapon(plr);
+	}
+
+	// cast
+	if ((bits & SB_SPELL) != 0 && plr.orbshot == 0 && plr.currweaponflip == 0 && plr.currweaponanim == 0) {
+		if (plr.orb[plr.currentorb] == 1 && plr.currweapon == 0) {
+			if (lvlspellcheck(plr)) {
+				plr.orbshot = 1;
+				activatedaorb(plr);
+			}
+		}
+		if (plr.currweapon != 0) {
+			autoweaponchange(plr, 0);
+		}
+	}
+
+	if ((bits & SB_INVUSE) != 0) {
+		if (plr.potion[plr.currentpotion] > 0) {
+			usapotion(plr);
+		}
+	}
+
+	if ((bits & SB_OPEN) != 0) {
+		if (netgame) {
+			//				   netdropflag();
+		}
+		else {
+			plruse(plr);
+		}
+	}
+
+	if ((bits & SB_TURNAROUND) != 0)
+	{
+		if (plr.turnAround == 0)
+			plr.turnAround = -1024;
+	}
+
+	if (plr.turnAround < 0)
+	{
+		plr.turnAround = (short)std::min(plr.turnAround + 64, 0);
+		plr.ang = BClampAngle(plr.ang + 64);
+	}
+
+	if (plr.sector != -1 && ((sector[plr.sector].floorpicnum != LAVA || sector[plr.sector].floorpicnum != SLIME
+		|| sector[plr.sector].floorpicnum != WATER || sector[plr.sector].floorpicnum != HEALTHWATER
+		|| sector[plr.sector].floorpicnum != ANILAVA || sector[plr.sector].floorpicnum != LAVA1
+		|| sector[plr.sector].floorpicnum != LAVA2) && feetoffground <= (32 << 8))) {
+		plr.plInput.fvel /= 3;
+		plr.plInput.svel /= 3;
+	}
+
+	if ((plr.sector != -1 && (sector[plr.sector].floorpicnum == LAVA || sector[plr.sector].floorpicnum == SLIME
+		|| sector[plr.sector].floorpicnum == WATER || sector[plr.sector].floorpicnum == HEALTHWATER
+		|| sector[plr.sector].floorpicnum == ANILAVA || sector[plr.sector].floorpicnum == LAVA1
+		|| sector[plr.sector].floorpicnum == LAVA2)) && plr.orbactive[5] < 0 // loz
+		&& plr.z >= sector[plr.sector].floorz - (plr.height << 8) - (8 << 8)) {
+		goalz = loz - (32 << 8);
+		switch (sector[plr.sector].floorpicnum) {
+		case ANILAVA:
+		case LAVA:
+		case LAVA1:
+		case LAVA2:
+			if (plr.treasure[TYELLOWSCEPTER] == 1) {
+				goalz = loz - (getPlayerHeight() << 8);
+				break;
+			}
+			else {
+				plr.plInput.fvel -= plr.plInput.fvel >> 3;
+				plr.plInput.svel -= plr.plInput.svel >> 3;
+			}
+
+			if (plr.invincibletime > 0 || plr.manatime > 0 || plr.godMode)
+				break;
+			else {
+				playsound(S_FIRELOOP1, 0, 0, -1, CHAN_LAVA);
+				addhealth(plr, -1);
+				startredflash(10);
+			}
+			break;
+		case WATER:
+			if (plr.treasure[TBLUESCEPTER] == 1) {
+				goalz = loz - (getPlayerHeight() << 8);
+			}
+			else {
+				plr.plInput.fvel -= plr.plInput.fvel >> 3;
+				plr.plInput.svel -= plr.plInput.svel >> 3;
+			}
+			break;
+		case HEALTHWATER:
+			if (plr.health < plr.maxhealth) {
+				addhealth(plr, 1);
+				startblueflash(5);
+			}
+			break;
+		}
+	}
+	else if (plr.orbactive[5] > 0) {
+		goalz = plr.z - (plr.height << 8);
+		plr.hvel = 0;
+	}
+	else
+		goalz = loz - (plr.height << 8);
+
+	if (plr.orbactive[5] < 0 && (bits & SB_JUMP) != 0 && !plr.keytoggle) {
+		if (plr.onsomething != 0) {
+			if (isWh2())
+				plr.hvel -= WH2JUMPVEL;
+			else plr.hvel -= JUMPVEL;
+
+			plr.onsomething = 0;
+			plr.keytoggle = true;
+		}
+	}
+
+	if ((bits & SB_CROUCH) != 0) {
+		if (plr.sector != -1 && goalz < ((sector[plr.sector].floorz) - (plr.height >> 3))) {
+			if (isWh2())
+				goalz += (48 << 8);
+			else
+				goalz += (24 << 8);
+		}
+	}
+
+	onground = plr.onsomething != 0;
+	int vel = (abs(plr.plInput.fvel) + abs(plr.plInput.svel)) >> 16;
+	if (vel < 16) vel = 0;
+	if ((bits & SB_FLYUP) != 0 || (bits & SB_JUMP) != 0)
+		dophysics(plr, goalz, 1, vel);
+	else if ((bits & SB_FLYDOWN) != 0 || (bits & SB_CROUCH) != 0)
+		dophysics(plr, goalz, -1, vel);
+	else
+		dophysics(plr, goalz, 0, vel);
+
+	if (!onground && plr.onsomething != 0) {
+		if (plr.fallz > 32768) {
+			if ((krand() % 2) != 0)
+				spritesound(S_PLRPAIN1 + (krand() % 2), &sprite[plr.spritenum]);
+			else
+				spritesound(S_PUSH1 + (krand() % 2), &sprite[plr.spritenum]);
+
+			addhealth(plr, -(plr.fallz >> 13));
+			plr.fallz = 0;// wango
+		}
+		else if (plr.fallz > 8192) {
+			spritesound(S_BREATH1 + (krand() % 2), &sprite[plr.spritenum]);
+		}
+	}
+
+	if (ihaveflag > 0) { // WHNET
+		plr.plInput.fvel -= plr.plInput.fvel >> 2;
+		plr.plInput.svel -= plr.plInput.svel >> 2;
+	}
+
+	if (plr.plInput.fvel != 0 || plr.plInput.svel != 0) {
+
+		xvect = plr.plInput.fvel;
+		yvect = plr.plInput.svel;
+
+		//			xvect = yvect = 0;
+		//			if (plr.pInput.fvel != 0) {
+		//				xvect = (int) (plr.pInput.fvel * tics * BCosAngle(plr.ang));
+		//				yvect = (int) (plr.pInput.fvel * tics * BSinAngle(plr.ang));
+		//			}
+		//			if (plr.pInput.svel != 0) {
+		//				xvect += (plr.pInput.svel * tics * BSinAngle(plr.ang));
+		//				yvect -= (plr.pInput.svel * tics * BCosAngle(plr.ang));
+		//			}
+
+		oldposx = plr.x;
+		oldposy = plr.y;
+
+		if (plr.noclip) {
+			plr.x += xvect >> 14;
+			plr.y += yvect >> 14;
+			short sect = plr.sector;
+			updatesector(plr.x, plr.y, &sect);
+			if (sect != -1)
+				plr.sector = sect;
+		}
+		else {
+			short sect = plr.sector;
+			clipmove(&plr.x, &plr.y, &plr.z, &sect, xvect, yvect, 128, 4 << 8, 4 << 8, CLIPMASK0);
+			if (sect != -1) plr.sector = sect;
+
+			sect = plr.sector;
+			pushmove(&plr.x, &plr.y, &plr.z, &sect, 128, 4 << 8, 4 << 8, CLIPMASK0);
+			if (sect != -1) plr.sector = sect;
+		}
+
+		// JSA BLORB
+
+		if (plr.sector != plr.oldsector) {
+				switch (sector[plr.sector].floorpicnum) {
+				case ANILAVA:
+				case LAVA:
+				case LAVA1:
+				case LAVA2:
+					break;
+				default:
+					soundEngine->StopSound(CHAN_LAVA);
+					break;
+				}
+			}
+			sectorsounds();
+		}
+
+		// walking on sprite
+		plr.horiz -= oldhoriz;
+
+		dist = ksqrt((plr.x - oldposx) * (plr.x - oldposx) + (plr.y - oldposy) * (plr.y - oldposy));
+
+		if (abs(plr.plInput.svel) > gi->playerKeyMove() || abs(plr.plInput.fvel) > gi->playerKeyMove()) {
+			dist >>= 2;
+
+		if (dist > 0 && feetoffground <= (plr.height << 8) || onsprite != -1) {
+			oldhoriz = ((dist * sintable[(lockclock << 5) & 2047]) >> 19) >> 2;
+			plr.horiz += oldhoriz;
+		}
+		else
+			oldhoriz = 0;
+
+		plr.horiz = clamp(plr.horiz, -(200 >> 1), 100 + (200 >> 1));
+
+		if (onsprite != -1 && dist > 50 && lopoint == 1 && justplayed == 0) {
+
+			switch (sprite[onsprite].picnum) {
+			case WALLARROW:
+			case OPENCHEST:
+			case GIFTBOX:
+				if (walktoggle != 0)
+					playsound(S_WOOD1, (plr.x + 3000), plr.y);
+				else
+					playsound(S_WOOD1, plr.x, (plr.y + 3000));
+				walktoggle ^= 1;
+				justplayed = 1;
+				break;
+			case WOODPLANK: // wood planks
+				if (walktoggle != 0)
+					playsound(S_SOFTCHAINWALK, (plr.x + 3000), plr.y);
+				else
+					playsound(S_SOFTCHAINWALK, plr.x, (plr.y + 3000));
+				walktoggle ^= 1;
+				justplayed = 1;
+
+				break;
+			case SQUAREGRATE: // square grating
+			case SQUAREGRATE + 1:
+				if (walktoggle != 0)
+					playsound(S_LOUDCHAINWALK, (plr.x + 3000), plr.y);
+				else
+					playsound(S_LOUDCHAINWALK, plr.x, (plr.y + 3000));
+				walktoggle ^= 1;
+				justplayed = 1;
+				break;
+			case SPACEPLANK: // spaced planks
+				if (walktoggle != 0)
+					playsound(S_SOFTCREAKWALK, (plr.x + 3000), plr.y);
+				else
+					playsound(S_SOFTCREAKWALK, plr.x, (plr.y + 3000));
+				walktoggle ^= 1;
+				justplayed = 1;
+				break;
+			case SPIDER:
+				// STOMP
+				spritesound(S_DEADSTEP, &sprite[onsprite]);
+				justplayed = 1;
+				newstatus(onsprite, DIE);
+				break;
+
+			case FREDDEAD:
+			case 1980:
+			case 1981:
+			case 1984:
+			case 1979:
+			case 1957:
+			case 1955:
+			case 1953:
+			case 1952:
+			case 1941:
+			case 1940:
+				spritesound(S_DEADSTEP, &sprite[plr.spritenum]);
+				justplayed = 1;
+
+				break;
+
+			default:
+				break;
+			}
+
+			if (sprite[onsprite].picnum == RAT)
+			{
+				spritesound(S_RATS1 + (krand() % 2), &sprite[onsprite]);
+				justplayed = 1;
+				deletesprite(onsprite);
+			}
+		}
+
+		if (lopoint == 0 && oldhoriz == -2 && justplayed == 0)
+			lopoint = 1;
+
+		if (lopoint == 1 && oldhoriz != -2 && justplayed == 1) {
+			lopoint = 0;
+			justplayed = 0;
+		}
+
+		vel = (abs(plr.plInput.fvel) + abs(plr.plInput.svel)) >> 16;
+		if (vel > 40 && dist > 10)
+			runningtime += TICSPERFRAME;
+		else
+			runningtime -= TICSPERFRAME;
+
+		if (runningtime < -360)
+			runningtime = 0;
+
+		if (runningtime > 360) {
+			SND_Sound(S_PLRPAIN1);
+			runningtime = 0;
+		}
+	}
+	if (plr.plInput.avel != 0) {
+		plr.ang += plr.plInput.avel * TICSPERFRAME / 16.0f;
+		plr.ang = BClampAngle(plr.ang);
+	}
+
+	//game.pInt.setsprinterpolate(plr.spritenum, sprite[plr.spritenum]);
+	setsprite(plr.spritenum, plr.x, plr.y, plr.z + (plr.height << 8));
+	sprite[plr.spritenum].ang = (short)plr.ang;
+
+	if (plr.sector >= 0 && getceilzofslope(plr.sector, plr.x, plr.y) > getflorzofslope(plr.sector, plr.x, plr.y) - (8 << 8))
+		addhealth(plr, -10);
+
+	if ((bits & SB_CENTERVIEW) != 0) {
+		autohoriz = 1;
+	}
+
+	if (autohoriz == 1)
+	{
+		if (plr.horiz < 100)
+			plr.horiz = std::min<float>(plr.horiz + (TICSPERFRAME << 2), 100);
+		if (plr.horiz > 100)
+			plr.horiz = std::max<float>(plr.horiz - (TICSPERFRAME << 2), 100);
+		if (plr.horiz == 100)
+			autohoriz = 0;
+	}
+	if (plr.currweaponfired != 1 && plr.currweaponfired != 6)
+		plr.hasshot = 0;
+	weaponchange(num);
+	bookprocess(num);
+	potionchange(num);
+}
+
+
+ END_WH_NS
+ 

source/games/whaven/src/main.cpp

@@ -278,7 +278,7 @@ void GameInterface::Startup()
 
 bool GameInterface::CanSave()
 {
-	return false;// !bRecord && !bPlayback && !paused && !bInDemo && nTotalPlayers == 1;
+	return !player[pyrn].dead && numplayers == 1;
 }
 
 

source/games/whaven/src/player.h

@@ -7,6 +7,7 @@ BEGIN_WH_NS
 struct PLAYER {
 	
 	InputPacket plInput;
+	int spellnum;
 	int x,y,z;
 	float ang;
     float horiz, jumphoriz;

source/games/whaven/src/potions.cpp

@@ -29,22 +29,31 @@ void potiontext(PLAYER& plr) {
 void potionchange(int snum)
 {
 	PLAYER& plr = player[snum];
-		
-	int key = ((plr.plInput.actions & (SB_ITEM_BIT_1 | SB_ITEM_BIT_2 | SB_ITEM_BIT_3)) / SB_ITEM_BIT_1) - 1;
-	if(key != -1 && key < 7)
+	if (!(plr.plInput.actions & (SB_INVPREV | SB_INVNEXT | SB_ITEM_BIT_1 | SB_ITEM_BIT_2 | SB_ITEM_BIT_3 | SB_ITEM_BIT_4 | SB_ITEM_BIT_5)))
+		return;
+
+	if (plr.plInput.actions & SB_INVPREV)
 	{
-		if(key == 5 || key == 6)
-		{
-			key = ( key == 5 ? -1 : 1 );
-			plr.currentpotion += key;
-			if(plr.currentpotion < 0)
-				plr.currentpotion = 4;
-			if(plr.currentpotion >= MAXPOTIONS)
-				plr.currentpotion = 0;
-		} else plr.currentpotion = key;
-		SND_Sound(S_BOTTLES);
-		potiontext(plr);
+		if (--plr.currentpotion < 0)
+			plr.currentpotion = MAXPOTIONS - 1;
 	}
+	if (plr.plInput.actions & SB_INVNEXT)
+	{
+		if (++plr.currentpotion >= MAXPOTIONS)
+			plr.currentpotion = 0;
+	}
+	if (plr.plInput.actions & SB_ITEM_BIT_1)
+		plr.currentpotion = 0;
+	if (plr.plInput.actions & SB_ITEM_BIT_2)
+		plr.currentpotion = 1;
+	if (plr.plInput.actions & SB_ITEM_BIT_3)
+		plr.currentpotion = 2;
+	if (plr.plInput.actions & SB_ITEM_BIT_4)
+		plr.currentpotion = 3;
+	if (plr.plInput.actions & SB_ITEM_BIT_5)
+		plr.currentpotion = 4;
+	SND_Sound(S_BOTTLES);
+		potiontext(plr);
 }
 	
 void usapotion(PLAYER& plr) {
@@ -90,6 +99,7 @@ void usapotion(PLAYER& plr) {
 		SND_Sound(S_DRINK);
 		plr.manatime=3200;
 		startwhiteflash(10);
+		soundEngine->StopSound(CHAN_LAVA);
 	break;
 	case 4: // invisi
 		SND_Sound(S_DRINK);

source/games/whaven/src/render.cpp

@@ -8,7 +8,8 @@
 BEGIN_WH_NS
 
 
-void drawscreen(int num, int dasmoothratio) {
+void drawscreen(int num, int dasmoothratio, bool sceneonly)
+{
 
 	PLAYER& plr = player[num];
 
@@ -81,7 +82,7 @@ void drawscreen(int num, int dasmoothratio) {
 	analyzesprites(plr, dasmoothratio);
 	renderDrawMasks();
 
-	if (automapMode != am_off)
+	if (automapMode != am_off && !sceneonly)
 	{
 		DrawOverheadMap(cposx, cposy, int(cang));
 	}
@@ -91,7 +92,7 @@ void GameInterface::Render()
 {
 	double const smoothRatio = playrunning() ? I_GetTimeFrac() * MaxSmoothRatio : MaxSmoothRatio;
 
-	drawscreen(pyrn, FloatToFixed(smoothRatio)); 
+	drawscreen(pyrn, FloatToFixed(smoothRatio), false); 
 	if (!paused && isWh2() && attacktheme && !Mus_IsPlaying())
 	{
 		startsong(krand() % 2);
@@ -99,4 +100,11 @@ void GameInterface::Render()
 	}
 }
 
+bool GameInterface::GenerateSavePic()
+{
+	drawscreen(pyrn, FRACUNIT, true);
+	return true;
+}
+
+
 END_WH_NS

source/games/whaven/src/spellbooks.cpp

@@ -140,7 +140,7 @@ void bookprocess(int snum) {
 	PLAYER& plr = player[snum];
 		
 	if (plr.currweaponanim == 0 && plr.currweaponflip == 0) {
-		int spell = ((plr.plInput.actions & (SB_ITEM_BIT_4 | SB_ITEM_BIT_5 | SB_ITEM_BIT_6 | SB_ITEM_BIT_7)) / SB_ITEM_BIT_4) - 1;
+		int spell = plr.spellnum;
 	
 		if(spell != -1 && spell < 10)
 		{

source/games/whaven/src/wh.h

@@ -138,15 +138,6 @@ struct PLOCATION {
 	float horiz;
 };
 
-extern int ihaveflag;
-extern int justplayed;
-extern int lopoint;
-extern int walktoggle;
-extern int runningtime;
-extern int oldhoriz;
-extern int gNameShowTime;
-
-
 extern int killcnt, kills;
 extern int treasurescnt, treasuresfound;
 extern int expgained;
@@ -442,6 +433,7 @@ enum
 	CHAN_ENCHANTED = 100,
 	CHAN_CART,
 	CHAN_BAT,
+	CHAN_LAVA,
 	CHAN_AMBIENT1,
 	CHAN_AMBIENT2,
 	CHAN_AMBIENT3,
@@ -519,8 +511,8 @@ struct GameInterface : public ::GameInterface
 {
 	const char* Name() override { return "Witchaven"; }
 	void app_init() override;
-	//void clearlocalinputstate() override;
-	//bool GenerateSavePic() override;
+	void clearlocalinputstate() override;
+	bool GenerateSavePic() override;
 	GameStats getStats() override;
 	void MenuOpened() override;
 	void MenuSound(EMenuSounds snd) override;
@@ -532,7 +524,7 @@ struct GameInterface : public ::GameInterface
 	FString GetCoordString() override;
 	//void ExitFromMenu() override;
 	//void DrawPlayerSprite(const DVector2& origin, bool onteam) override;
-	//void GetInput(InputPacket* packet, ControlInfo* const hidInput) override;
+	void GetInput(InputPacket* packet, ControlInfo* const hidInput) override;
 	void UpdateSounds() override;
 	void Startup() override;
 	void DrawBackground() override;
@@ -544,7 +536,7 @@ struct GameInterface : public ::GameInterface
 	void NewGame(MapRecord* map, int skill) override;
 	void LevelCompleted(MapRecord* map, int skill) override;
 	//bool DrawAutomapPlayer(int x, int y, int z, int a) override;
-	//int playerKeyMove() override { return 40; }
+	int playerKeyMove() override { return isWh2()? 20:15; }
 
 };