diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 87b9dbedc5f1a504cccd51008cf1375da7f8530c..380ec37658f96708dc2ef441df997b2abbf17905 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32)
# Core sources
target_sourcefile(c)
-target_sources(SRB2SDL2 PRIVATE comptime.c md5.c config.h)
+target_sources(SRB2SDL2 PRIVATE comptime.c md5.c config.h.in)
set(SRB2_ASM_SOURCES vid_copy.s)
@@ -62,7 +62,7 @@ if(${SRB2_CONFIG_HAVE_GME})
endif()
if(${GME_FOUND})
set(SRB2_HAVE_GME ON)
- target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_LIBGME)
+ target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_GME)
else()
message(WARNING "You have specified that GME is available but it was not found.")
endif()
diff --git a/src/Makefile b/src/Makefile
index 36a1d89f51279a5a2916b131c8c0792810488f2b..5d338e51015c97313e4e99752f66d3c74ec4f358 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,8 +2,8 @@
# the poly3 Makefile adapted over and over...
#
# Copyright 1998-2000 DooM Legacy Team.
-# Copyright 2020-2021 James R.
-# Copyright 2003-2021 Sonic Team Junior.
+# Copyright 2020-2022 James R.
+# Copyright 2003-2022 Sonic Team Junior.
#
# This program is free software distributed under the
# terms of the GNU General Public License, version 2.
@@ -379,7 +379,7 @@ ifdef Echo_name
@printf '%-20.20s\r' $$<
endif
endif
- $(.)$(cc) -MM -MF $$@ -MT $(objdir)/$$(*F).o $(2) $$<
+ $(.)$(cc) -MM -MF $$@ -MT $(objdir)/$$*.o $(2) $$<
endef
$(eval $(call _recipe,c))
diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk
index 9c8a0a227d8a74b6e780234068885a8ab8c3a85c..f458b044cf8c2f8d973b50e32a2f3500e6e6c7ef 100644
--- a/src/Makefile.d/detect.mk
+++ b/src/Makefile.d/detect.mk
@@ -71,13 +71,17 @@ latest_gcc_version:=10.2
# manually set. And don't bother if this is a clean only
# run.
ifeq (,$(call Wildvar,GCC% destructive))
-version:=$(shell $(CC) --version)
+
+# can't use $(CC) --version here since that uses argv[0] to display the name
+# also gcc outputs the information to stderr, so I had to do 2>&1
+# this program really doesn't like identifying itself
+version:=$(shell $(CC) -v 2>&1)
# check if this is in fact GCC
-ifneq (,$(or $(findstring gcc,$(version)),\
- $(findstring GCC,$(version))))
+ifneq (,$(findstring gcc version,$(version)))
-version:=$(shell $(CC) -dumpversion)
+# in stark contrast to the name, gcc will give me a nicely formatted version number for free
+version:=$(shell $(CC) -dumpfullversion)
# Turn version into words of major, minor
v:=$(subst ., ,$(version))
diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
index af5ce928f86476d977090bee5ffe315cc9032552..0dee4af3a24e0ed8fab1b807b06c415a35897375 100644
--- a/src/Makefile.d/features.mk
+++ b/src/Makefile.d/features.mk
@@ -39,7 +39,7 @@ $(eval $(call Configure,PNG,$(PNG_CONFIG) \
$(if $(PNG_STATIC),--static),,--ldflags))
endif
ifdef LINUX
-opts+=-D_LARGFILE64_SOURCE
+opts+=-D_LARGEFILE64_SOURCE
endif
opts+=-DHAVE_PNG
sources+=apng.c
diff --git a/src/Makefile.d/nix.mk b/src/Makefile.d/nix.mk
index f1645e1e49e4743f15b7215d0a87ec13626d8854..6642a6bcc202b9a62dbaf98668f37666baea57b3 100644
--- a/src/Makefile.d/nix.mk
+++ b/src/Makefile.d/nix.mk
@@ -5,7 +5,9 @@
EXENAME?=lsdl2srb2
opts+=-DUNIXCOMMON -DLUA_USE_POSIX
-libs+=-lm
+# Use -rdynamic so a backtrace log shows function names
+# instead of addresses
+libs+=-lm -rdynamic
ifndef nasm_format
nasm_format:=elf -DLINUX
diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk
index d7d0c3dd1ef59f5ca3d9b6b6d7e6191af9f671d8..f0b59658ee741e7d709b4d4037b1745a1e3bfefb 100644
--- a/src/Makefile.d/versions.mk
+++ b/src/Makefile.d/versions.mk
@@ -35,8 +35,6 @@ ifndef GCC295
WFLAGS+=-Wendif-labels
endif
ifdef GCC41
- WFLAGS+=-Wdeclaration-after-statement
- WFLAGS+=-Wno-error=declaration-after-statement
WFLAGS+=-Wshadow
endif
#WFLAGS+=-Wlarger-than-%len%
diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk
index 739e2220b73d23ee4ec1cd026ada4bf53a62a244..dbccc40656800be293918a64965696c044b63758 100644
--- a/src/Makefile.d/win32.mk
+++ b/src/Makefile.d/win32.mk
@@ -8,6 +8,11 @@ else
EXENAME?=srb2win64.exe
endif
+# disable dynamicbase if under msys2
+ifdef MSYSTEM
+libs+=-Wl,--disable-dynamicbase
+endif
+
sources+=win32/Srb2win.rc
opts+=-DSTDC_HEADERS
libs+=-ladvapi32 -lkernel32 -lmsvcrt -luser32
diff --git a/src/Sourcefile b/src/Sourcefile
index 178e60d871fcb00f759f8e752b768bb97d81bd6b..6a2c5fab30ba224d594d5bc7ee27f284ea61aeec 100755
--- a/src/Sourcefile
+++ b/src/Sourcefile
@@ -26,6 +26,7 @@ m_argv.c
m_bbox.c
m_cheat.c
m_cond.c
+m_easing.c
m_fixed.c
m_menu.c
m_misc.c
@@ -96,3 +97,4 @@ lua_polyobjlib.c
lua_blockmaplib.c
lua_hudlib.c
hashtable.c
+lua_inputlib.c
diff --git a/src/am_map.c b/src/am_map.c
index ef0ebb88cd33e3d865095015cfd8be09a8487388..65a57c09e2f0f85655f7ce50b7c2195e418018f1 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -458,7 +458,7 @@ boolean AM_Responder(event_t *ev)
{
if (!automapactive)
{
- if (ev->type == ev_keydown && ev->data1 == AM_TOGGLEKEY)
+ if (ev->type == ev_keydown && ev->key == AM_TOGGLEKEY)
{
//faB: prevent alt-tab in win32 version to activate automap just before
// minimizing the app; doesn't do any harm to the DOS version
@@ -473,7 +473,7 @@ boolean AM_Responder(event_t *ev)
else if (ev->type == ev_keydown)
{
rc = true;
- switch (ev->data1)
+ switch (ev->key)
{
case AM_PANRIGHTKEY: // pan right
if (!followplayer)
@@ -550,7 +550,7 @@ boolean AM_Responder(event_t *ev)
else if (ev->type == ev_keyup)
{
rc = false;
- switch (ev->data1)
+ switch (ev->key)
{
case AM_PANRIGHTKEY:
if (!followplayer)
diff --git a/src/am_map.h b/src/am_map.h
index 022a7208b3fdf5a94f38101f5f1daccb2ff802ed..89c4ad9fab22538aae10b051c579678b7d9b5b15 100644
--- a/src/am_map.h
+++ b/src/am_map.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/apng.c b/src/apng.c
index 36b205c60998099009c21ce6a49fe97a71d44faa..f4c08d979faef761ac3ceed6fed93489162eee68 100644
--- a/src/apng.c
+++ b/src/apng.c
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2021, James R.
+Copyright 2019-2022, James R.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/src/apng.h b/src/apng.h
index 893b523cbcacb8fd9f58a5be59b8dac3ef787596..6b934742486461951377998ae02e687cc0a1e1ac 100644
--- a/src/apng.h
+++ b/src/apng.h
@@ -1,5 +1,5 @@
/*
-Copyright 2019-2021, James R.
+Copyright 2019-2022, James R.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/src/asm_defs.inc b/src/asm_defs.inc
index 9074f20f86d53523bf19030f01fb9e4e63e6283d..a8c60f19ea9be18916ac626caf384ffc77a7436c 100644
--- a/src/asm_defs.inc
+++ b/src/asm_defs.inc
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/b_bot.c b/src/b_bot.c
index 5b41246279dc7f76a5f40e966aee56b36403f2d7..775a13e294cf31e8070a9f6fc51894f91317496c 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2007-2016 by John "JTE" Muniz.
-// Copyright (C) 2011-2021 by Sonic Team Junior.
+// Copyright (C) 2011-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -17,30 +17,45 @@
#include "p_local.h"
#include "b_bot.h"
#include "lua_hook.h"
+#include "i_system.h" // I_BaseTiccmd
-// If you want multiple bots, variables like this will
-// have to be stuffed in something accessible through player_t.
-static boolean lastForward = false;
-static boolean lastBlocked = false;
-static boolean blocked = false;
-
-static boolean jump_last = false;
-static boolean spin_last = false;
-static UINT8 anxiety = 0;
-static boolean panic = false;
-static UINT8 flymode = 0;
-static boolean spinmode = false;
-static boolean thinkfly = false;
-
-static inline void B_ResetAI(void)
+void B_UpdateBotleader(player_t *player)
{
- jump_last = false;
- spin_last = false;
- anxiety = 0;
- panic = false;
- flymode = 0;
- spinmode = false;
- thinkfly = false;
+ UINT32 i;
+ fixed_t dist;
+ fixed_t neardist = INT32_MAX;
+ player_t *nearplayer = NULL;
+ //Find new botleader
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (players[i].bot || players[i].playerstate != PST_LIVE || players[i].spectator || !players[i].mo)
+ continue;
+
+ if (!player->botleader)
+ {
+ player->botleader = &players[i]; // set default
+ return;
+ }
+
+ if (!player->mo)
+ return;
+
+ //Update best candidate based on nearest distance
+ dist = R_PointToDist2(player->mo->x, player->mo->y, players[i].mo->x, players[i].mo->y);
+ if (neardist > dist)
+ {
+ neardist = dist;
+ nearplayer = &players[i];
+ }
+ }
+ //Set botleader to best candidate (or null if none available)
+ player->botleader = nearplayer;
+}
+
+static inline void B_ResetAI(botmem_t *mem)
+{
+ mem->thinkstate = AI_FOLLOW;
+ mem->catchup_tics = 0;
}
static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
@@ -49,39 +64,47 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
player_t *player = sonic->player, *bot = tails->player;
ticcmd_t *pcmd = &player->cmd;
- boolean water = tails->eflags & MFE_UNDERWATER;
+ botmem_t *mem = &bot->botmem;
+ boolean water = (tails->eflags & MFE_UNDERWATER);
SINT8 flip = P_MobjFlip(tails);
boolean _2d = (tails->flags2 & MF2_TWOD) || twodlevel;
fixed_t scale = tails->scale;
+ boolean jump_last = (bot->lastbuttons & BT_JUMP);
+ boolean spin_last = (bot->lastbuttons & BT_SPIN);
fixed_t dist = P_AproxDistance(sonic->x - tails->x, sonic->y - tails->y);
fixed_t zdist = flip * (sonic->z - tails->z);
angle_t ang = sonic->angle;
fixed_t pmom = P_AproxDistance(sonic->momx, sonic->momy);
fixed_t bmom = P_AproxDistance(tails->momx, tails->momy);
- fixed_t followmax = 128 * 8 * scale; // Max follow distance before AI begins to enter "panic" state
+ fixed_t followmax = 128 * 8 * scale; // Max follow distance before AI begins to enter catchup state
fixed_t followthres = 92 * scale; // Distance that AI will try to reach
fixed_t followmin = 32 * scale;
fixed_t comfortheight = 96 * scale;
fixed_t touchdist = 24 * scale;
boolean stalled = (bmom < scale >> 1) && dist > followthres; // Helps to see if the AI is having trouble catching up
boolean samepos = (sonic->x == tails->x && sonic->y == tails->y);
-
+ boolean blocked = bot->blocked;
+
if (!samepos)
ang = R_PointToAngle2(tails->x, tails->y, sonic->x, sonic->y);
- // We can't follow Sonic if he's not around!
- if (!sonic || sonic->health <= 0)
+ // Lua can handle it!
+ if (LUA_HookBotAI(sonic, tails, cmd))
return;
- // Lua can handle it!
- if (LUAh_BotAI(sonic, tails, cmd))
+ // We can't follow Sonic if he's not around!
+ if (!sonic || sonic->health <= 0)
+ {
+ mem->thinkstate = AI_STANDBY;
return;
+ }
+ else if (mem->thinkstate == AI_STANDBY)
+ mem->thinkstate = AI_FOLLOW;
if (tails->player->powers[pw_carry] == CR_MACESPIN || tails->player->powers[pw_carry] == CR_GENERIC)
{
boolean isrelevant = (sonic->player->powers[pw_carry] == CR_MACESPIN || sonic->player->powers[pw_carry] == CR_GENERIC);
- dist = P_AproxDistance(tails->x-sonic->x, tails->y-sonic->y);
if (sonic->player->cmd.buttons & BT_JUMP && (sonic->player->pflags & PF_JUMPED) && isrelevant)
cmd->buttons |= BT_JUMP;
if (isrelevant)
@@ -103,56 +126,57 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
followmin = 0;
followthres = 16*scale;
followmax >>= 1;
- thinkfly = false;
+ if (mem->thinkstate == AI_THINKFLY)
+ mem->thinkstate = AI_FOLLOW;
}
- // Check anxiety
- if (spinmode)
+ // Update catchup_tics
+ if (mem->thinkstate == AI_SPINFOLLOW)
{
- anxiety = 0;
- panic = false;
+ mem->catchup_tics = 0;
}
else if (dist > followmax || zdist > comfortheight || stalled)
{
- anxiety = min(anxiety + 2, 70);
- if (anxiety >= 70)
- panic = true;
+ mem->catchup_tics = min(mem->catchup_tics + 2, 70);
+ if (mem->catchup_tics >= 70)
+ mem->thinkstate = AI_CATCHUP;
}
else
{
- anxiety = max(anxiety - 1, 0);
- panic = false;
+ mem->catchup_tics = max(mem->catchup_tics - 1, 0);
+ if (mem->thinkstate == AI_CATCHUP)
+ mem->thinkstate = AI_FOLLOW;
}
// Orientation
+ // cmd->angleturn won't be relative to player angle, since we're not going through G_BuildTiccmd.
if (bot->pflags & (PF_SPINNING|PF_STARTDASH))
{
- cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT
+ cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT
}
- else if (flymode == 2)
+ else if (mem->thinkstate == AI_FLYCARRY)
{
- cmd->angleturn = sonic->player->cmd.angleturn - (tails->angle >> 16);
+ cmd->angleturn = sonic->player->cmd.angleturn;
}
else
{
- cmd->angleturn = (ang - tails->angle) >> 16; // NOT FRACBITS DAMNIT
+ cmd->angleturn = (ang) >> 16; // NOT FRACBITS DAMNIT
}
// ********
// FLY MODE
- // spinmode check
- if (spinmode || player->exiting)
- thinkfly = false;
+ // exiting check
+ if (player->exiting && mem->thinkstate == AI_THINKFLY)
+ mem->thinkstate = AI_FOLLOW;
else
{
// Activate co-op flight
- if (thinkfly && player->pflags & PF_JUMPED)
+ if (mem->thinkstate == AI_THINKFLY && player->pflags & PF_JUMPED)
{
if (!jump_last)
{
jump = true;
- flymode = 1;
- thinkfly = false;
+ mem->thinkstate = AI_FLYSTANDBY;
bot->pflags |= PF_CANCARRY;
}
}
@@ -165,20 +189,19 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
&& P_IsObjectOnGround(sonic) && P_IsObjectOnGround(tails)
&& !(player->pflags & PF_STASIS)
&& bot->charability == CA_FLY)
- thinkfly = true;
- else
- thinkfly = false;
+ mem->thinkstate = AI_THINKFLY;
+ else if (mem->thinkstate == AI_THINKFLY)
+ mem->thinkstate = AI_FOLLOW;
// Set carried state
if (player->powers[pw_carry] == CR_PLAYER && sonic->tracer == tails)
{
- flymode = 2;
+ mem->thinkstate = AI_FLYCARRY;
}
// Ready for takeoff
- if (flymode == 1)
+ if (mem->thinkstate == AI_FLYSTANDBY)
{
- thinkfly = false;
if (zdist < -64*scale || (flip * tails->momz) > scale) // Make sure we're not too high up
spin = true;
else if (!jump_last)
@@ -186,10 +209,10 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
// Abort if the player moves away or spins
if (dist > followthres || player->dashspeed)
- flymode = 0;
+ mem->thinkstate = AI_FOLLOW;
}
// Read player inputs while carrying
- else if (flymode == 2)
+ else if (mem->thinkstate == AI_FLYCARRY)
{
cmd->forwardmove = pcmd->forwardmove;
cmd->sidemove = pcmd->sidemove;
@@ -203,19 +226,19 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
// End flymode
if (player->powers[pw_carry] != CR_PLAYER)
{
- flymode = 0;
+ mem->thinkstate = AI_FOLLOW;
}
}
}
- if (flymode && P_IsObjectOnGround(tails) && !(pcmd->buttons & BT_JUMP))
- flymode = 0;
+ if (P_IsObjectOnGround(tails) && !(pcmd->buttons & BT_JUMP) && (mem->thinkstate == AI_FLYSTANDBY || mem->thinkstate == AI_FLYCARRY))
+ mem->thinkstate = AI_FOLLOW;
// ********
// SPINNING
- if (panic || flymode || !(player->pflags & PF_SPINNING) || (player->pflags & PF_JUMPED))
- spinmode = false;
- else
+ if (!(player->pflags & (PF_SPINNING|PF_STARTDASH)) && mem->thinkstate == AI_SPINFOLLOW)
+ mem->thinkstate = AI_FOLLOW;
+ else if (mem->thinkstate == AI_FOLLOW || mem->thinkstate == AI_SPINFOLLOW)
{
if (!_2d)
{
@@ -224,21 +247,21 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
{
if (dist < followthres && dist > touchdist) // Do positioning
{
- cmd->angleturn = (ang - tails->angle) >> 16; // NOT FRACBITS DAMNIT
+ cmd->angleturn = (ang) >> 16; // NOT FRACBITS DAMNIT
cmd->forwardmove = 50;
- spinmode = true;
+ mem->thinkstate = AI_SPINFOLLOW;
}
else if (dist < touchdist)
{
if (!bmom && (!(bot->pflags & PF_SPINNING) || (bot->dashspeed && bot->pflags & PF_SPINNING)))
{
- cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT
+ cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT
spin = true;
}
- spinmode = true;
+ mem->thinkstate = AI_SPINFOLLOW;
}
else
- spinmode = false;
+ mem->thinkstate = AI_FOLLOW;
}
// Spin
else if (player->dashspeed == bot->dashspeed && player->pflags & PF_SPINNING)
@@ -246,12 +269,12 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
if (bot->pflags & PF_SPINNING || !spin_last)
{
spin = true;
- cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT
+ cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT
cmd->forwardmove = MAXPLMOVE;
- spinmode = true;
+ mem->thinkstate = AI_SPINFOLLOW;
}
else
- spinmode = false;
+ mem->thinkstate = AI_FOLLOW;
}
}
// 2D mode
@@ -261,17 +284,19 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
&& ((bot->pflags & PF_SPINNING) || !spin_last))
{
spin = true;
- spinmode = true;
+ mem->thinkstate = AI_SPINFOLLOW;
}
+ else
+ mem->thinkstate = AI_FOLLOW;
}
}
// ********
// FOLLOW
- if (!(flymode || spinmode))
+ if (mem->thinkstate == AI_FOLLOW || mem->thinkstate == AI_CATCHUP)
{
// Too far
- if (panic || dist > followthres)
+ if (mem->thinkstate == AI_CATCHUP || dist > followthres)
{
if (!_2d)
cmd->forwardmove = MAXPLMOVE;
@@ -281,7 +306,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
cmd->sidemove = -MAXPLMOVE;
}
// Within threshold
- else if (!panic && dist > followmin && abs(zdist) < 192*scale)
+ else if (dist > followmin && abs(zdist) < 192*scale)
{
if (!_2d)
cmd->forwardmove = FixedHypot(pcmd->forwardmove, pcmd->sidemove);
@@ -292,8 +317,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
else if (dist < followmin)
{
// Copy inputs
- cmd->angleturn = (sonic->angle - tails->angle) >> 16; // NOT FRACBITS DAMNIT
- bot->drawangle = ang;
+ cmd->angleturn = (sonic->angle) >> 16; // NOT FRACBITS DAMNIT
cmd->forwardmove = 8 * pcmd->forwardmove / 10;
cmd->sidemove = 8 * pcmd->sidemove / 10;
}
@@ -301,7 +325,7 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
// ********
// JUMP
- if (!(flymode || spinmode))
+ if (mem->thinkstate == AI_FOLLOW || mem->thinkstate == AI_CATCHUP || (mem->thinkstate == AI_SPINFOLLOW && player->pflags & PF_JUMPED))
{
// Flying catch-up
if (bot->pflags & PF_THOKKED)
@@ -319,35 +343,36 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
// Start jump
else if (!jump_last && !(bot->pflags & PF_JUMPED) //&& !(player->pflags & PF_SPINNING)
&& ((zdist > 32*scale && player->pflags & PF_JUMPED) // Following
- || (zdist > 64*scale && panic) // Vertical catch-up
- || (stalled && anxiety > 20 && bot->powers[pw_carry] == CR_NONE)
+ || (zdist > 64*scale && mem->thinkstate == AI_CATCHUP) // Vertical catch-up
+ || (stalled && mem->catchup_tics > 20 && bot->powers[pw_carry] == CR_NONE)
//|| (bmom < scale>>3 && dist > followthres && !(bot->powers[pw_carry])) // Stopped & not in carry state
|| (bot->pflags & PF_SPINNING && !(bot->pflags & PF_JUMPED)))) // Spinning
jump = true;
// Hold jump
- else if (bot->pflags & PF_JUMPED && jump_last && tails->momz*flip > 0 && (zdist > 0 || panic))
+ else if (bot->pflags & PF_JUMPED && jump_last && tails->momz*flip > 0 && (zdist > 0 || mem->thinkstate == AI_CATCHUP))
jump = true;
// Start flying
- else if (bot->pflags & PF_JUMPED && panic && !jump_last && bot->charability == CA_FLY)
+ else if (bot->pflags & PF_JUMPED && mem->thinkstate == AI_CATCHUP && !jump_last && bot->charability == CA_FLY)
jump = true;
}
// ********
// HISTORY
- jump_last = jump;
- spin_last = spin;
+ //jump_last = jump;
+ //spin_last = spin;
// Turn the virtual keypresses into ticcmd_t.
B_KeysToTiccmd(tails, cmd, forward, backward, left, right, false, false, jump, spin);
// Update our status
- lastForward = forward;
- lastBlocked = blocked;
- blocked = false;
+ mem->lastForward = forward;
+ mem->lastBlocked = blocked;
}
void B_BuildTiccmd(player_t *player, ticcmd_t *cmd)
{
+ G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver
+
// Can't build a ticcmd if we aren't spawned...
if (!player->mo)
return;
@@ -363,25 +388,28 @@ void B_BuildTiccmd(player_t *player, ticcmd_t *cmd)
CV_SetValue(&cv_analog[1], false);
// Let Lua scripts build ticcmds
- if (LUAh_BotTiccmd(player, cmd))
+ if (LUA_HookTiccmd(player, cmd, HOOK(BotTiccmd)))
return;
- // We don't have any main character AI, sorry. D:
- if (player-players == consoleplayer)
+ // Make sure we have a valid main character to follow
+ B_UpdateBotleader(player);
+ if (!player->botleader)
return;
- // Basic Tails AI
- B_BuildTailsTiccmd(players[consoleplayer].mo, player->mo, cmd);
+ // Single Player Tails AI
+ //B_BuildTailsTiccmd(players[consoleplayer].mo, player->mo, cmd);
+ B_BuildTailsTiccmd(player->botleader->mo, player->mo, cmd);
}
void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin)
{
+ player_t *player = mo->player;
// don't try to do stuff if your sonic is in a minecart or something
- if (players[consoleplayer].powers[pw_carry] && players[consoleplayer].powers[pw_carry] != CR_PLAYER)
+ if (player->botleader && player->botleader->powers[pw_carry] && player->botleader->powers[pw_carry] != CR_PLAYER)
return;
// Turn the virtual keypresses into ticcmd_t.
if (twodlevel || mo->flags2 & MF2_TWOD) {
- if (players[consoleplayer].climbing
+ if (player->botleader->climbing
|| mo->player->pflags & PF_GLIDING) {
// Don't mess with bot inputs during these unhandled movement conditions.
// The normal AI doesn't use abilities, so custom AI should be sending us exactly what it wants anyway.
@@ -420,10 +448,10 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
cmd->forwardmove += MAXPLMOVE<<FRACBITS>>16;
if (backward)
cmd->forwardmove -= MAXPLMOVE<<FRACBITS>>16;
- if (left)
+ if (left)
cmd->angleturn += 1280;
if (right)
- cmd->angleturn -= 1280;
+ cmd->angleturn -= 1280;
if (strafeleft)
cmd->sidemove -= MAXPLMOVE<<FRACBITS>>16;
if (straferight)
@@ -447,21 +475,26 @@ void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward
void B_MoveBlocked(player_t *player)
{
(void)player;
- blocked = true;
+ player->blocked = true;
}
boolean B_CheckRespawn(player_t *player)
{
- mobj_t *sonic = players[consoleplayer].mo;
+ mobj_t *sonic;
mobj_t *tails = player->mo;
+ //We don't have a main player to spawn to!
+ if (!player->botleader)
+ return false;
+
+ sonic = player->botleader->mo;
// We can't follow Sonic if he's not around!
if (!sonic || sonic->health <= 0)
return false;
// B_RespawnBot doesn't do anything if the condition above this isn't met
{
- UINT8 shouldForce = LUAh_BotRespawn(sonic, tails);
+ UINT8 shouldForce = LUA_Hook2Mobj(sonic, tails, MOBJ_HOOK(BotRespawn));
if (P_MobjWasRemoved(sonic) || P_MobjWasRemoved(tails))
return (shouldForce == 1); // mobj was removed
@@ -505,15 +538,19 @@ void B_RespawnBot(INT32 playernum)
{
player_t *player = &players[playernum];
fixed_t x,y,z;
- mobj_t *sonic = players[consoleplayer].mo;
+ mobj_t *sonic;
mobj_t *tails;
+ if (!player->botleader)
+ return;
+
+ sonic = player->botleader->mo;
if (!sonic || sonic->health <= 0)
return;
- B_ResetAI();
+ B_ResetAI(&player->botmem);
- player->bot = 1;
+ player->bot = BOT_2PAI;
P_SpawnPlayer(playernum);
tails = player->mo;
@@ -540,10 +577,6 @@ void B_RespawnBot(INT32 playernum)
player->powers[pw_spacetime] = sonic->player->powers[pw_spacetime];
player->powers[pw_gravityboots] = sonic->player->powers[pw_gravityboots];
player->powers[pw_nocontrol] = sonic->player->powers[pw_nocontrol];
- player->acceleration = sonic->player->acceleration;
- player->accelstart = sonic->player->accelstart;
- player->thrustfactor = sonic->player->thrustfactor;
- player->normalspeed = sonic->player->normalspeed;
player->pflags |= PF_AUTOBRAKE|(sonic->player->pflags & PF_DIRECTIONCHAR);
P_TeleportMove(tails, x, y, z);
@@ -561,26 +594,44 @@ void B_RespawnBot(INT32 playernum)
void B_HandleFlightIndicator(player_t *player)
{
mobj_t *tails = player->mo;
+ botmem_t *mem = &player->botmem;
+ boolean shouldExist;
if (!tails)
return;
- if (thinkfly && player->bot == 1 && tails->health)
+ shouldExist = (mem->thinkstate == AI_THINKFLY) && player->botleader
+ && player->bot == BOT_2PAI && player->playerstate == PST_LIVE;
+
+ // check whether the indicator doesn't exist
+ if (P_MobjWasRemoved(tails->hnext))
{
- if (!tails->hnext)
- {
- P_SetTarget(&tails->hnext, P_SpawnMobjFromMobj(tails, 0, 0, 0, MT_OVERLAY));
- if (tails->hnext)
- {
- P_SetTarget(&tails->hnext->target, tails);
- P_SetTarget(&tails->hnext->hprev, tails);
- P_SetMobjState(tails->hnext, S_FLIGHTINDICATOR);
- }
- }
+ // if it shouldn't exist, everything is fine
+ if (!shouldExist)
+ return;
+
+ // otherwise, spawn it
+ P_SetTarget(&tails->hnext, P_SpawnMobjFromMobj(tails, 0, 0, 0, MT_OVERLAY));
+ P_SetTarget(&tails->hnext->target, tails);
+ P_SetTarget(&tails->hnext->hprev, tails);
+ P_SetMobjState(tails->hnext, S_FLIGHTINDICATOR);
}
- else if (tails->hnext && tails->hnext->type == MT_OVERLAY && tails->hnext->state == states+S_FLIGHTINDICATOR)
+
+ // if the mobj isn't a flight indicator, let's not mess with it
+ if (tails->hnext->type != MT_OVERLAY || (tails->hnext->state != states+S_FLIGHTINDICATOR))
+ return;
+
+ // if it shouldn't exist, remove it
+ if (!shouldExist)
{
P_RemoveMobj(tails->hnext);
P_SetTarget(&tails->hnext, NULL);
+ return;
}
+
+ // otherwise, update its visibility
+ if (P_IsLocalPlayer(player->botleader))
+ tails->hnext->flags2 &= ~MF2_DONTDRAW;
+ else
+ tails->hnext->flags2 |= MF2_DONTDRAW;
}
diff --git a/src/b_bot.h b/src/b_bot.h
index 9f55637d14d8543f14f5dd2926e21fb9d36a955c..c29974c505bbb7c865665beadbd42306e3c61cbe 100644
--- a/src/b_bot.h
+++ b/src/b_bot.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2007-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -10,6 +10,7 @@
/// \file b_bot.h
/// \brief Basic bot handling
+void B_UpdateBotleader(player_t *player);
void B_BuildTiccmd(player_t *player, ticcmd_t *cmd);
void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin);
boolean B_CheckRespawn(player_t *player);
diff --git a/src/blua/lbaselib.c b/src/blua/lbaselib.c
index 644565c28847204daa8e312459ef75e3fb6cfe31..0fc222038dd97dbc4306018a88f87b69b612c167 100644
--- a/src/blua/lbaselib.c
+++ b/src/blua/lbaselib.c
@@ -274,7 +274,7 @@ static int luaB_dofile (lua_State *L) {
UINT16 lumpnum;
int n = lua_gettop(L);
- if (wadfiles[numwadfiles - 1]->type != RET_PK3)
+ if (!W_FileHasFolders(wadfiles[numwadfiles - 1]))
luaL_error(L, "dofile() only works with PK3 files");
snprintf(fullfilename, sizeof(fullfilename), "Lua/%s", filename);
diff --git a/src/byteptr.h b/src/byteptr.h
index 4c8414fae29c7d3498a9a085f607243d261c3af9..33c2c8a4b69fb0e986ad928981995c1ea58f7a95 100644
--- a/src/byteptr.h
+++ b/src/byteptr.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -150,26 +150,78 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
#undef DEALIGNED
-#define WRITESTRINGN(p,s,n) do { size_t tmp_i = 0; for (; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) WRITECHAR(p, s[tmp_i]); if (tmp_i < n) WRITECHAR(p, '\0');} while (0)
-#define WRITESTRING(p,s) do { size_t tmp_i = 0; for (; s[tmp_i] != '\0'; tmp_i++) WRITECHAR(p, s[tmp_i]); WRITECHAR(p, '\0');} while (0)
-#define WRITEMEM(p,s,n) do { memcpy(p, s, n); p += n; } while (0)
-
-#define SKIPSTRING(p) while (READCHAR(p) != '\0')
-
-#define READSTRINGN(p,s,n) ({ size_t tmp_i = 0; for (; tmp_i < n && (s[tmp_i] = READCHAR(p)) != '\0'; tmp_i++); s[tmp_i] = '\0';})
-#define READSTRING(p,s) ({ size_t tmp_i = 0; for (; (s[tmp_i] = READCHAR(p)) != '\0'; tmp_i++); s[tmp_i] = '\0';})
-#define READMEM(p,s,n) ({ memcpy(s, p, n); p += n; })
-
-#if 0 // old names
-#define WRITEBYTE(p,b) WRITEUINT8(p,b)
-#define WRITESHORT(p,b) WRITEINT16(p,b)
-#define WRITEUSHORT(p,b) WRITEUINT16(p,b)
-#define WRITELONG(p,b) WRITEINT32(p,b)
-#define WRITEULONG(p,b) WRITEUINT32(p,b)
-
-#define READBYTE(p) READUINT8(p)
-#define READSHORT(p) READINT16(p)
-#define READUSHORT(p) READUINT16(p)
-#define READLONG(p) READINT32(p)
-#define READULONG(p) READUINT32(p)
-#endif
+#define WRITESTRINGN(p, s, n) ({ \
+ size_t tmp_i; \
+ \
+ for (tmp_i = 0; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) \
+ WRITECHAR(p, s[tmp_i]); \
+ \
+ if (tmp_i < n) \
+ WRITECHAR(p, '\0'); \
+})
+
+#define WRITESTRINGL(p, s, n) ({ \
+ size_t tmp_i; \
+ \
+ for (tmp_i = 0; tmp_i < n - 1 && s[tmp_i] != '\0'; tmp_i++) \
+ WRITECHAR(p, s[tmp_i]); \
+ \
+ WRITECHAR(p, '\0'); \
+})
+
+#define WRITESTRING(p, s) ({ \
+ size_t tmp_i; \
+ \
+ for (tmp_i = 0; s[tmp_i] != '\0'; tmp_i++) \
+ WRITECHAR(p, s[tmp_i]); \
+ \
+ WRITECHAR(p, '\0'); \
+})
+
+#define WRITEMEM(p, s, n) ({ \
+ memcpy(p, s, n); \
+ p += n; \
+})
+
+#define SKIPSTRING(p) while (READCHAR(p) != '\0')
+
+#define SKIPSTRINGN(p, n) ({ \
+ size_t tmp_i = 0; \
+ \
+ while (tmp_i < n && READCHAR(p) != '\0') \
+ tmp_i++; \
+})
+
+#define SKIPSTRINGL(p, n) SKIPSTRINGN(p, n)
+
+#define READSTRINGN(p, s, n) ({ \
+ size_t tmp_i = 0; \
+ \
+ while (tmp_i < n && (s[tmp_i] = READCHAR(p)) != '\0') \
+ tmp_i++; \
+ \
+ s[tmp_i] = '\0'; \
+})
+
+#define READSTRINGL(p, s, n) ({ \
+ size_t tmp_i = 0; \
+ \
+ while (tmp_i < n - 1 && (s[tmp_i] = READCHAR(p)) != '\0') \
+ tmp_i++; \
+ \
+ s[tmp_i] = '\0'; \
+})
+
+#define READSTRING(p, s) ({ \
+ size_t tmp_i = 0; \
+ \
+ while ((s[tmp_i] = READCHAR(p)) != '\0') \
+ tmp_i++; \
+ \
+ s[tmp_i] = '\0'; \
+})
+
+#define READMEM(p, s, n) ({ \
+ memcpy(s, p, n); \
+ p += n; \
+})
diff --git a/src/command.c b/src/command.c
index 95b1fd67d84a31686a2943cc2702c0d6acb90607..50310f11255b57d30228a65cfe26b676c5c89497 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -650,7 +650,7 @@ static void COM_ExecuteString(char *ptext)
else
{ // Monster Iestyn: keep track of how many levels of recursion we're in
recursion++;
- COM_BufInsertText(a->value);
+ COM_BufInsertTextEx(a->value, com_flags);
recursion--;
}
return;
@@ -1738,6 +1738,8 @@ void CV_SaveVars(UINT8 **p, boolean in_demo)
static void CV_LoadVars(UINT8 **p,
consvar_t *(*got)(UINT8 **p, char **ret_value, boolean *ret_stealth))
{
+ const boolean store = (client || demoplayback);
+
consvar_t *cvar;
UINT16 count;
@@ -1751,7 +1753,7 @@ static void CV_LoadVars(UINT8 **p,
{
if (cvar->flags & CV_NETVAR)
{
- if (client && cvar->revert.v.string == NULL)
+ if (store && cvar->revert.v.string == NULL)
{
cvar->revert.v.const_munge = cvar->string;
cvar->revert.allocated = ( cvar->zstring != NULL );
@@ -2364,7 +2366,10 @@ static boolean CV_Command(void)
return false;
if (( com_flags & COM_SAFE ) && ( v->flags & CV_NOLUA ))
- return false;
+ {
+ CONS_Alert(CONS_WARNING, "Variable '%s' cannot be changed from Lua.\n", v->name);
+ return true;
+ }
// perform a variable print or set
if (COM_Argc() == 1)
diff --git a/src/command.h b/src/command.h
index 34fd15963262d6ec4e4416ac8cbb514301f72d6f..30d7e5bbe6af641b67c60acadf81bd1054b1c1e4 100644
--- a/src/command.h
+++ b/src/command.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/config.h.in b/src/config.h.in
index db794cccc82a59eb378f53f9adaa4d5d1bd3cb20..587a881c73bfb7fa7b55e38920501c0a49e7643c 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -35,10 +35,11 @@
* Last updated 2020 / 09 / 27 - v2.2.7 - patch.pk3
* Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3
* Last updated 2021 / 05 / 06 - v2.2.9 - patch.pk3 & zones.pk3
+ * Last updated 2022 / 03 / 06 - v2.2.10 - main assets
*/
-#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28"
-#define ASSET_HASH_ZONES_PK3 "f8f3e2b5deacf40f14e36686a07d44bb"
-#define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb"
+#define ASSET_HASH_SRB2_PK3 "ad911f29a28a18968ee5b2d11c2acb39"
+#define ASSET_HASH_ZONES_PK3 "86ae55cae4e0a93ceda868635706a093"
+#define ASSET_HASH_PLAYER_DTA "2e7aaae8a6b1b77d90ffe7606ceadb6c"
#ifdef USE_PATCH_DTA
#define ASSET_HASH_PATCH_PK3 "7d467a883f7887b3c311798ee2f56b6a"
#endif
diff --git a/src/console.c b/src/console.c
index 7ad3d55a44354973d9f4ac98b44cb0cb77599384..a092ee60d1cabfdbec34b44fb5c198ec908e5e1d 100644
--- a/src/console.c
+++ b/src/console.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -222,7 +222,7 @@ static void CONS_Bind_f(void)
for (key = 0; key < NUMINPUTS; key++)
if (bindtable[key])
{
- CONS_Printf("%s : \"%s\"\n", G_KeynumToString(key), bindtable[key]);
+ CONS_Printf("%s : \"%s\"\n", G_KeyNumToName(key), bindtable[key]);
na = 1;
}
if (!na)
@@ -230,7 +230,7 @@ static void CONS_Bind_f(void)
return;
}
- key = G_KeyStringtoNum(COM_Argv(1));
+ key = G_KeyNameToNum(COM_Argv(1));
if (key <= 0 || key >= NUMINPUTS)
{
CONS_Alert(CONS_NOTICE, M_GetText("Invalid key name\n"));
@@ -485,6 +485,19 @@ void CON_Init(void)
Unlock_state();
}
}
+
+void CON_StartRefresh(void)
+{
+ if (con_startup)
+ con_refresh = true;
+}
+
+void CON_StopRefresh(void)
+{
+ if (con_startup)
+ con_refresh = false;
+}
+
// Console input initialization
//
static void CON_InputInit(void)
@@ -914,12 +927,12 @@ boolean CON_Responder(event_t *ev)
// let go keyup events, don't eat them
if (ev->type != ev_keydown && ev->type != ev_console)
{
- if (ev->data1 == gamecontrol[gc_console][0] || ev->data1 == gamecontrol[gc_console][1])
+ if (ev->key == gamecontrol[GC_CONSOLE][0] || ev->key == gamecontrol[GC_CONSOLE][1])
consdown = false;
return false;
}
- key = ev->data1;
+ key = ev->key;
// check for console toggle key
if (ev->type != ev_console)
@@ -927,7 +940,7 @@ boolean CON_Responder(event_t *ev)
if (modeattacking || metalrecording || marathonmode)
return false;
- if (key == gamecontrol[gc_console][0] || key == gamecontrol[gc_console][1])
+ if (key == gamecontrol[GC_CONSOLE][0] || key == gamecontrol[GC_CONSOLE][1])
{
if (consdown) // ignore repeat
return true;
@@ -1764,8 +1777,8 @@ static void CON_DrawBackpic(void)
}
// Draw the patch.
- V_DrawCroppedPatch(x << FRACBITS, 0, FRACUNIT, V_NOSCALESTART, con_backpic,
- 0, ( BASEVIDHEIGHT - h ), BASEVIDWIDTH, h);
+ V_DrawCroppedPatch(x << FRACBITS, 0, FRACUNIT, FRACUNIT, V_NOSCALESTART, con_backpic, NULL,
+ 0, (BASEVIDHEIGHT - h) << FRACBITS, BASEVIDWIDTH << FRACBITS, h << FRACBITS);
// Unlock the cached patch.
W_UnlockCachedPatch(con_backpic);
diff --git a/src/console.h b/src/console.h
index ec686ae32d1a8336c8ec488f6be963374ba9f37e..beaea346853aeb87c0e82251143eef2d8eaed1c1 100644
--- a/src/console.h
+++ b/src/console.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -16,6 +16,9 @@
void CON_Init(void);
+void CON_StartRefresh(void);
+void CON_StopRefresh(void);
+
boolean CON_Responder(event_t *ev);
#ifdef HAVE_THREADS
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 3a324ebc97fb029b51f73dd56ad3d5ae4656507b..8497f750a6816de48265d67d01099fc7386c9ed0 100755
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -44,6 +44,7 @@
#include "lzf.h"
#include "lua_script.h"
#include "lua_hook.h"
+#include "lua_libs.h"
#include "md5.h"
#include "m_perfstats.h"
@@ -131,11 +132,14 @@ static boolean cl_redownloadinggamestate = false;
static UINT8 localtextcmd[MAXTEXTCMD];
static UINT8 localtextcmd2[MAXTEXTCMD]; // splitscreen
+// tic_t neededtic;
SINT8 servernode = 0; // the number of the server node
/// \brief do we accept new players?
/// \todo WORK!
boolean acceptnewnode = true;
+static boolean serverisfull = false; //lets us be aware if the server was full after we check files, but before downloading, so we can ask if the user still wants to download or not
+static tic_t firstconnectattempttime = 0;
// Net simulation stuff
savestate_t gameStateBuffer[MAXLOCALSAVESTATES]; //"gametic" Saved States
boolean gameStateBufferIsValid[MAXLOCALSAVESTATES]; //If states are valid to load?
@@ -538,18 +542,24 @@ static INT16 Consistancy(void);
typedef enum
{
CL_SEARCHING,
+ CL_CHECKFILES,
CL_DOWNLOADFILES,
CL_ASKJOIN,
+ CL_LOADFILES,
CL_WAITJOINRESPONSE,
CL_DOWNLOADSAVEGAME,
CL_CONNECTED,
- CL_ABORTED
+ CL_ABORTED,
+ CL_ASKFULLFILELIST,
+ CL_CONFIRMCONNECT
} cl_mode_t;
static void GetPackets(void);
static cl_mode_t cl_mode = CL_SEARCHING;
+static UINT16 cl_lastcheckedfilecount = 0; // used for full file list
+
#ifndef NONET
#define SNAKE_SPEED 5
@@ -691,14 +701,14 @@ static void Snake_Handle(void)
UINT16 i;
// Handle retry
- if (snake->gameover && (PLAYER1INPUTDOWN(gc_jump) || gamekeydown[KEY_ENTER]))
+ if (snake->gameover && (PLAYER1INPUTDOWN(GC_JUMP) || gamekeydown[KEY_ENTER]))
{
Snake_Initialise();
snake->pausepressed = true; // Avoid accidental pause on respawn
}
// Handle pause
- if (PLAYER1INPUTDOWN(gc_pause) || gamekeydown[KEY_ENTER])
+ if (PLAYER1INPUTDOWN(GC_PAUSE) || gamekeydown[KEY_ENTER])
{
if (!snake->pausepressed)
snake->paused = !snake->paused;
@@ -947,6 +957,8 @@ static void Snake_Draw(void)
INT16 i;
// Background
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
+
V_DrawFlatFill(
SNAKE_LEFT_X + SNAKE_BORDER_SIZE,
SNAKE_TOP_Y + SNAKE_BORDER_SIZE,
@@ -1048,6 +1060,13 @@ static void Snake_Draw(void)
);
}
+static void CL_DrawConnectionStatusBox(void)
+{
+ M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1);
+ if (cl_mode != CL_CONFIRMCONNECT)
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort");
+}
+
//
// CL_DrawConnectionStatus
//
@@ -1058,28 +1077,32 @@ static inline void CL_DrawConnectionStatus(void)
INT32 ccstime = I_GetTime();
// Draw background fade
- if (!menuactive) // menu already draws its own fade
- V_DrawFadeScreen(0xFF00, 16); // force default
+ V_DrawFadeScreen(0xFF00, 16); // force default
- // Draw the bottom box.
- M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1);
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort");
-
- if (cl_mode != CL_DOWNLOADFILES)
+ if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES)
{
INT32 i, animtime = ((ccstime / 4) & 15) + 16;
- UINT8 palstart = (cl_mode == CL_SEARCHING) ? 32 : 96;
- // 15 pal entries total.
+ UINT8 palstart;
const char *cltext;
+ // Draw the bottom box.
+ CL_DrawConnectionStatusBox();
+
+ if (cl_mode == CL_SEARCHING)
+ palstart = 32; // Red
+ else if (cl_mode == CL_CONFIRMCONNECT)
+ palstart = 48; // Orange
+ else
+ palstart = 96; // Green
+
if (!(cl_mode == CL_DOWNLOADSAVEGAME && lastfilenum != -1))
- for (i = 0; i < 16; ++i)
+ for (i = 0; i < 16; ++i) // 15 pal entries total.
V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-16, 16, 8, palstart + ((animtime - i) & 15));
switch (cl_mode)
{
case CL_DOWNLOADSAVEGAME:
- if (lastfilenum != -1)
+ if (fileneeded && lastfilenum != -1)
{
UINT32 currentsize = fileneeded[lastfilenum].currentsize;
UINT32 totalsize = fileneeded[lastfilenum].totalsize;
@@ -1103,9 +1126,22 @@ static inline void CL_DrawConnectionStatus(void)
else
cltext = M_GetText("Waiting to download game state...");
break;
+ case CL_ASKFULLFILELIST:
+ case CL_CHECKFILES:
+ cltext = M_GetText("Checking server addon list...");
+ break;
+ case CL_CONFIRMCONNECT:
+ cltext = "";
+ break;
+ case CL_LOADFILES:
+ cltext = M_GetText("Loading server addons...");
+ break;
case CL_ASKJOIN:
case CL_WAITJOINRESPONSE:
- cltext = M_GetText("Requesting to join...");
+ if (serverisfull)
+ cltext = M_GetText("Server full, waiting for a slot...");
+ else
+ cltext = M_GetText("Requesting to join...");
break;
default:
cltext = M_GetText("Connecting to server...");
@@ -1115,14 +1151,51 @@ static inline void CL_DrawConnectionStatus(void)
}
else
{
- if (lastfilenum != -1)
+ if (cl_mode == CL_LOADFILES)
+ {
+ INT32 totalfileslength;
+ INT32 loadcompletednum = 0;
+ INT32 i;
+
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort");
+
+ //ima just count files here
+ if (fileneeded)
+ {
+ for (i = 0; i < fileneedednum; i++)
+ if (fileneeded[i].status == FS_OPEN)
+ loadcompletednum++;
+ }
+
+ // Loading progress
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, "Loading server addons...");
+ totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256);
+ M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1);
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111);
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, totalfileslength, 8, 96);
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
+ va(" %2u/%2u Files",loadcompletednum,fileneedednum));
+ }
+ else if (lastfilenum != -1)
{
INT32 dldlength;
static char tempname[28];
- fileneeded_t *file = &fileneeded[lastfilenum];
- char *filename = file->filename;
+ fileneeded_t *file;
+ char *filename;
- Snake_Draw();
+ if (snake)
+ Snake_Draw();
+
+ // Draw the bottom box.
+ CL_DrawConnectionStatusBox();
+
+ if (fileneeded)
+ {
+ file = &fileneeded[lastfilenum];
+ filename = file->filename;
+ }
+ else
+ return;
Net_GetNetStat();
dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256);
@@ -1155,20 +1228,32 @@ static inline void CL_DrawConnectionStatus(void)
va("%3.1fK/s ", ((double)getbps)/1024));
}
else
+ {
+ if (snake)
+ Snake_Draw();
+
+ CL_DrawConnectionStatusBox();
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP,
M_GetText("Waiting to download files..."));
+ }
}
}
#endif
+static boolean CL_AskFileList(INT32 firstfile)
+{
+ netbuffer->packettype = PT_TELLFILESNEEDED;
+ netbuffer->u.filesneedednum = firstfile;
+
+ return HSendPacket(servernode, false, 0, sizeof (INT32));
+}
+
/** Sends a special packet to declare how many players in local
* Used only in arbitratrenetstart()
* Sends a PT_CLIENTJOIN packet to the server
*
* \return True if the packet was successfully sent
* \todo Improve the description...
- * Because to be honest, I have no idea what arbitratrenetstart is...
- * Is it even used...?
*
*/
static boolean CL_SendJoin(void)
@@ -1178,15 +1263,14 @@ static boolean CL_SendJoin(void)
CONS_Printf(M_GetText("Sending join request...\n"));
netbuffer->packettype = PT_CLIENTJOIN;
+ netbuffer->u.clientcfg.modversion = MODVERSION;
+ strncpy(netbuffer->u.clientcfg.application,
+ SRB2APPLICATION,
+ sizeof netbuffer->u.clientcfg.application);
+
if (splitscreen || botingame)
localplayers++;
netbuffer->u.clientcfg.localplayers = localplayers;
- netbuffer->u.clientcfg._255 = 255;
- netbuffer->u.clientcfg.packetversion = PACKETVERSION;
- netbuffer->u.clientcfg.version = VERSION;
- netbuffer->u.clientcfg.subversion = SUBVERSION;
- strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION,
- sizeof netbuffer->u.clientcfg.application);
CleanupPlayerName(consoleplayer, cv_playername.zstring);
if (splitscreen)
@@ -1229,6 +1313,21 @@ static INT32 FindRejoinerNum(SINT8 node)
return -1;
}
+static UINT8
+GetRefuseReason (INT32 node)
+{
+ if (!node || FindRejoinerNum(node) != -1)
+ return 0;
+ else if (bannednode && bannednode[node])
+ return REFUSE_BANNED;
+ else if (!cv_allownewplayer.value)
+ return REFUSE_JOINS_DISABLED;
+ else if (D_NumPlayers() >= cv_maxplayers.value)
+ return REFUSE_SLOTS_FULL;
+ else
+ return 0;
+}
+
static void SV_SendServerInfo(INT32 node, tic_t servertime)
{
UINT8 *p;
@@ -1247,20 +1346,13 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
netbuffer->u.serverinfo.maxplayer = (UINT8)cv_maxplayers.value;
- if (!node || FindRejoinerNum(node) != -1)
- netbuffer->u.serverinfo.refusereason = 0;
- else if (!cv_allownewplayer.value)
- netbuffer->u.serverinfo.refusereason = 1;
- else if (D_NumPlayers() >= cv_maxplayers.value)
- netbuffer->u.serverinfo.refusereason = 2;
- else
- netbuffer->u.serverinfo.refusereason = 0;
+ netbuffer->u.serverinfo.refusereason = GetRefuseReason(node);
strncpy(netbuffer->u.serverinfo.gametypename, Gametype_Names[gametype],
sizeof netbuffer->u.serverinfo.gametypename);
netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
- netbuffer->u.serverinfo.isdedicated = (UINT8)dedicated;
+ netbuffer->u.serverinfo.flags = (dedicated ? SV_DEDICATED : 0);
strncpy(netbuffer->u.serverinfo.servername, cv_servername.string,
MAXSERVERNAME);
strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), 7);
@@ -1295,7 +1387,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
if (mapheaderinfo[gamemap-1])
netbuffer->u.serverinfo.actnum = mapheaderinfo[gamemap-1]->actnum;
- p = PutFileNeeded();
+ p = PutFileNeeded(0);
HSendPacket(node, false, 0, p - ((UINT8 *)&netbuffer->u));
}
@@ -1372,9 +1464,6 @@ static boolean SV_SendServerConfig(INT32 node)
netbuffer->packettype = PT_SERVERCFG;
- netbuffer->u.servercfg.version = VERSION;
- netbuffer->u.servercfg.subversion = SUBVERSION;
-
netbuffer->u.servercfg.serverplayer = (UINT8)serverplayer;
netbuffer->u.servercfg.totalslotnum = (UINT8)(doomcom->numslots);
netbuffer->u.servercfg.gametic = (tic_t)LONG(gametic);
@@ -1549,6 +1638,8 @@ static void CL_LoadReceivedSavegame(boolean reloading)
size_t length, decompressedlen;
char tmpsave[256];
+ FreeFileNeeded();
+
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
length = FIL_ReadFile(tmpsave, &savebuffer);
@@ -1593,10 +1684,6 @@ static void CL_LoadReceivedSavegame(boolean reloading)
}
CONS_Printf("\"\n");
}
- else
- {
- CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
- }
// done
Z_Free(savebuffer);
@@ -1707,20 +1794,24 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
if (serverlistcount >= MAXSERVERLIST)
return; // list full
- if (info->_255 != 255)
- return;/* old packet format */
+ /* check it later if connecting to this one */
+ if (node != servernode)
+ {
+ if (info->_255 != 255)
+ return;/* old packet format */
- if (info->packetversion != PACKETVERSION)
- return;/* old new packet format */
+ if (info->packetversion != PACKETVERSION)
+ return;/* old new packet format */
- if (info->version != VERSION)
- return; // Not same version.
+ if (info->version != VERSION)
+ return; // Not same version.
- if (info->subversion != SUBVERSION)
- return; // Close, but no cigar.
+ if (info->subversion != SUBVERSION)
+ return; // Close, but no cigar.
- if (strcmp(info->application, SRB2APPLICATION))
- return;/* that's a different mod */
+ if (strcmp(info->application, SRB2APPLICATION))
+ return;/* that's a different mod */
+ }
i = serverlistcount++;
}
@@ -1869,6 +1960,224 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room)
#endif // ifndef NONET
+static void M_ConfirmConnect(event_t *ev)
+{
+#ifndef NONET
+ if (ev->type == ev_keydown)
+ {
+ if (ev->key == ' ' || ev->key == 'y' || ev->key == KEY_ENTER)
+ {
+ if (totalfilesrequestednum > 0)
+ {
+ if (CL_SendFileRequest())
+ {
+ cl_mode = CL_DOWNLOADFILES;
+ Snake_Initialise();
+ }
+ }
+ else
+ cl_mode = CL_LOADFILES;
+
+ M_ClearMenus(true);
+ }
+ else if (ev->key == 'n' || ev->key == KEY_ESCAPE)
+ {
+ cl_mode = CL_ABORTED;
+ M_ClearMenus(true);
+ }
+ }
+#else
+ (void)ev;
+#endif
+}
+
+static boolean CL_FinishedFileList(void)
+{
+ INT32 i;
+ char *downloadsize = NULL;
+ //CONS_Printf(M_GetText("Checking files...\n"));
+ i = CL_CheckFiles();
+ if (i == 4) // still checking ...
+ {
+ return true;
+ }
+ else if (i == 3) // too many files
+ {
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "You have too many WAD files loaded\n"
+ "to add ones the server is using.\n"
+ "Please restart SRB2 before connecting.\n\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+ else if (i == 2) // cannot join for some reason
+ {
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "You have the wrong addons loaded.\n\n"
+ "To play on this server, restart\n"
+ "the game and don't load any addons.\n"
+ "SRB2 will automatically add\n"
+ "everything you need when you join.\n\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+ else if (i == 1)
+ {
+ if (serverisfull)
+ {
+ M_StartMessage(M_GetText(
+ "This server is full!\n"
+ "\n"
+ "You may load server addons (if any), and wait for a slot.\n"
+ "\n"
+ "Press ENTER to continue\nor ESC to cancel.\n\n"
+ ), M_ConfirmConnect, MM_EVENTHANDLER);
+ cl_mode = CL_CONFIRMCONNECT;
+ curfadevalue = 0;
+ }
+ else
+ cl_mode = CL_LOADFILES;
+ }
+ else
+ {
+ // must download something
+ // can we, though?
+ if (!CL_CheckDownloadable()) // nope!
+ {
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "An error occured when trying to\n"
+ "download missing addons.\n"
+ "(This is almost always a problem\n"
+ "with the server, not your game.)\n\n"
+ "See the console or log file\n"
+ "for additional details.\n\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+
+#ifndef NONET
+ downloadcompletednum = 0;
+ downloadcompletedsize = 0;
+ totalfilesrequestednum = 0;
+ totalfilesrequestedsize = 0;
+
+ if (fileneeded == NULL)
+ I_Error("CL_FinishedFileList: fileneeded == NULL");
+
+ for (i = 0; i < fileneedednum; i++)
+ if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
+ {
+ totalfilesrequestednum++;
+ totalfilesrequestedsize += fileneeded[i].totalsize;
+ }
+
+ if (totalfilesrequestedsize>>20 >= 100)
+ downloadsize = Z_StrDup(va("%uM",totalfilesrequestedsize>>20));
+ else
+ downloadsize = Z_StrDup(va("%uK",totalfilesrequestedsize>>10));
+#endif
+
+ if (serverisfull)
+ M_StartMessage(va(M_GetText(
+ "This server is full!\n"
+ "Download of %s additional content\nis required to join.\n"
+ "\n"
+ "You may download, load server addons,\nand wait for a slot.\n"
+ "\n"
+ "Press ENTER to continue\nor ESC to cancel.\n"
+ ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+ else
+ M_StartMessage(va(M_GetText(
+ "Download of %s additional content\nis required to join.\n"
+ "\n"
+ "Press ENTER to continue\nor ESC to cancel.\n"
+ ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+
+ Z_Free(downloadsize);
+ cl_mode = CL_CONFIRMCONNECT;
+ curfadevalue = 0;
+ }
+ return true;
+}
+
+#ifndef NONET
+static const char * InvalidServerReason (serverinfo_pak *info)
+{
+#define EOT "\nPress ESC\n"
+
+ /* magic number for new packet format */
+ if (info->_255 != 255)
+ {
+ return
+ "Outdated server (version unknown).\n" EOT;
+ }
+
+ if (strncmp(info->application, SRB2APPLICATION, sizeof
+ info->application))
+ {
+ return va(
+ "%s cannot connect\n"
+ "to %s servers.\n" EOT,
+ SRB2APPLICATION,
+ info->application);
+ }
+
+ if (
+ info->packetversion != PACKETVERSION ||
+ info->version != VERSION ||
+ info->subversion != SUBVERSION
+ ){
+ return va(
+ "Incompatible %s versions.\n"
+ "(server version %d.%d.%d)\n" EOT,
+ SRB2APPLICATION,
+ info->version / 100,
+ info->version % 100,
+ info->subversion);
+ }
+
+ switch (info->refusereason)
+ {
+ case REFUSE_BANNED:
+ return
+ "You have been banned\n"
+ "from the server.\n" EOT;
+ case REFUSE_JOINS_DISABLED:
+ return
+ "The server is not accepting\n"
+ "joins for the moment.\n" EOT;
+ case REFUSE_SLOTS_FULL:
+ return va(
+ "Maximum players reached: %d\n" EOT,
+ info->maxplayer);
+ default:
+ if (info->refusereason)
+ {
+ return
+ "You can't join.\n"
+ "I don't know why,\n"
+ "but you can't join.\n" EOT;
+ }
+ }
+
+ return NULL;
+
+#undef EOT
+}
+#endif // ifndef NONET
+
/** Called by CL_ServerConnectionTicker
*
* \param asksent The last time we asked the server to join. We re-ask every second in case our request got lost in transmit.
@@ -1899,88 +2208,46 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
return true;
}
- // Quit here rather than downloading files and being refused later.
- if (serverlist[i].info.refusereason)
- {
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- if (serverlist[i].info.refusereason == 1)
- M_StartMessage(M_GetText("The server is not accepting\njoins for the moment.\n\nPress ESC\n"), NULL, MM_NOTHING);
- else if (serverlist[i].info.refusereason == 2)
- M_StartMessage(va(M_GetText("Maximum players reached: %d\n\nPress ESC\n"), serverlist[i].info.maxplayer), NULL, MM_NOTHING);
- else
- M_StartMessage(M_GetText("You can't join.\nI don't know why,\nbut you can't join.\n\nPress ESC\n"), NULL, MM_NOTHING);
- return false;
- }
-
if (client)
{
- D_ParseFileneeded(serverlist[i].info.fileneedednum,
- serverlist[i].info.fileneeded);
- CONS_Printf(M_GetText("Checking files...\n"));
- i = CL_CheckFiles();
- if (i == 3) // too many files
- {
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- M_StartMessage(M_GetText(
- "You have too many WAD files loaded\n"
- "to add ones the server is using.\n"
- "Please restart SRB2 before connecting.\n\n"
- "Press ESC\n"
- ), NULL, MM_NOTHING);
- return false;
- }
- else if (i == 2) // cannot join for some reason
- {
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- M_StartMessage(M_GetText(
- "You have the wrong addons loaded.\n\n"
- "To play on this server, restart\n"
- "the game and don't load any addons.\n"
- "SRB2 will automatically add\n"
- "everything you need when you join.\n\n"
- "Press ESC\n"
- ), NULL, MM_NOTHING);
- return false;
- }
- else if (i == 1)
- cl_mode = CL_ASKJOIN;
+ serverinfo_pak *info = &serverlist[i].info;
+
+ if (info->refusereason == REFUSE_SLOTS_FULL)
+ serverisfull = true;
else
{
- // must download something
- // can we, though?
- if (!CL_CheckDownloadable()) // nope!
+ const char *reason = InvalidServerReason(info);
+
+ // Quit here rather than downloading files
+ // and being refused later.
+ if (reason)
{
+ char *message = Z_StrDup(reason);
D_QuitNetGame();
CL_Reset();
D_StartTitle();
- M_StartMessage(M_GetText(
- "You cannot connect to this server\n"
- "because you cannot download the files\n"
- "that you are missing from the server.\n\n"
- "See the console or log file for\n"
- "more details.\n\n"
- "Press ESC\n"
- ), NULL, MM_NOTHING);
+ M_StartMessage(message, NULL, MM_NOTHING);
+ Z_Free(message);
return false;
}
- // no problem if can't send packet, we will retry later
- if (CL_SendFileRequest())
- {
- cl_mode = CL_DOWNLOADFILES;
-#ifndef NONET
- Snake_Initialise();
-#endif
- }
}
+
+ D_ParseFileneeded(info->fileneedednum, info->fileneeded, 0);
+
+ if (info->flags & SV_LOTSOFADDONS)
+ {
+ cl_mode = CL_ASKFULLFILELIST;
+ cl_lastcheckedfilecount = 0;
+ return true;
+ }
+
+ cl_mode = CL_CHECKFILES;
}
else
+ {
cl_mode = CL_ASKJOIN; // files need not be checked for the server.
+ *asksent = 0;
+ }
return true;
}
@@ -2026,6 +2293,22 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
return false;
break;
+ case CL_ASKFULLFILELIST:
+ if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved
+ cl_mode = CL_CHECKFILES;
+ else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent)
+ {
+ if (CL_AskFileList(fileneedednum))
+ {
+ cl_lastcheckedfilecount = fileneedednum;
+ *asksent = I_GetTime() + NEWTICRATE;
+ }
+ }
+ break;
+ case CL_CHECKFILES:
+ if (!CL_FinishedFileList())
+ return false;
+ break;
case CL_DOWNLOADFILES:
waitmore = false;
for (i = 0; i < fileneedednum; i++)
@@ -2046,21 +2329,51 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
}
#endif
- cl_mode = CL_ASKJOIN; // don't break case continue to cljoin request now
- /* FALLTHRU */
-
+ cl_mode = CL_LOADFILES;
+ break;
+ case CL_LOADFILES:
+ if (CL_LoadServerFiles())
+ {
+ FreeFileNeeded();
+ *asksent = 0; //This ensure the first join ask is right away
+ firstconnectattempttime = I_GetTime();
+ cl_mode = CL_ASKJOIN;
+ }
+ break;
case CL_ASKJOIN:
- CL_LoadServerFiles();
+ if (firstconnectattempttime + NEWTICRATE*300 < I_GetTime() && !server)
+ {
+ CONS_Printf(M_GetText("5 minute wait time exceeded.\n"));
+ CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "5 minute wait time exceeded.\n"
+ "You may retry connection.\n"
+ "\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
#ifndef NONET
// prepare structures to save the file
// WARNING: this can be useless in case of server not in GS_LEVEL
// but since the network layer doesn't provide ordered packets...
CL_PrepareDownloadSaveGame(tmpsave);
#endif
- if (CL_SendJoin())
+ if (I_GetTime() >= *asksent && CL_SendJoin())
+ {
+ *asksent = I_GetTime() + NEWTICRATE*3;
cl_mode = CL_WAITJOINRESPONSE;
+ }
+ break;
+ case CL_WAITJOINRESPONSE:
+ if (I_GetTime() >= *asksent)
+ {
+ cl_mode = CL_ASKJOIN;
+ }
break;
-
#ifndef NONET
case CL_DOWNLOADSAVEGAME:
// At this state, the first (and only) needed file is the gamestate
@@ -2074,8 +2387,8 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
break;
#endif
- case CL_WAITJOINRESPONSE:
case CL_CONNECTED:
+ case CL_CONFIRMCONNECT: //logic is handled by M_ConfirmConnect
default:
break;
@@ -2083,7 +2396,6 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
case CL_ABORTED:
cl_mode = CL_SEARCHING;
return false;
-
}
GetPackets();
@@ -2093,13 +2405,19 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
if (*oldtic != I_GetTime())
{
I_OsPolling();
- for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
- G_MapEventsToControls(&events[eventtail]);
- if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1])
+ if (cl_mode == CL_CONFIRMCONNECT)
+ D_ProcessEvents(); //needed for menu system to receive inputs
+ else
+ {
+ for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
+ G_MapEventsToControls(&events[eventtail]);
+ }
+
+ if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1] || cl_mode == CL_ABORTED)
{
CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
-// M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING);
+ M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING);
#ifndef NONET
if (snake)
@@ -2132,13 +2450,20 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
#ifndef NONET
if (client && cl_mode != CL_CONNECTED && cl_mode != CL_ABORTED)
{
- if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_DOWNLOADSAVEGAME)
+ if (!snake)
{
F_MenuPresTicker(true); // title sky
F_TitleScreenTicker(true);
F_TitleScreenDrawer();
}
CL_DrawConnectionStatus();
+#ifdef HAVE_THREADS
+ I_lock_mutex(&m_menu_mutex);
+#endif
+ M_Drawer(); //Needed for drawing messageboxes on the connection screen
+#ifdef HAVE_THREADS
+ I_unlock_mutex(m_menu_mutex);
+#endif
I_UpdateNoVsync(); // page flip or blit buffer
if (moviemode)
M_SaveFrame();
@@ -2200,8 +2525,10 @@ static void CL_ConnectToServer(void)
ClearAdminPlayers();
pnumnodes = 1;
oldtic = I_GetTime() - 1;
+
#ifndef NONET
asksent = (tic_t) - TICRATE;
+ firstconnectattempttime = I_GetTime();
i = SL_SearchServer(servernode);
@@ -2503,7 +2830,7 @@ void CL_ClearPlayer(INT32 playernum)
//
// Removes a player from the current game
//
-static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
+void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
{
// Sanity check: exceptional cases (i.e. c-fails) can cause multiple
// kick commands to be issued for the same player.
@@ -2576,14 +2903,14 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
}
}
- LUAh_PlayerQuit(&players[playernum], reason); // Lua hook for player quitting
+ LUA_HookPlayerQuit(&players[playernum], reason); // Lua hook for player quitting
// don't look through someone's view who isn't there
if (playernum == displayplayer)
{
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
+ LUA_HookViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -2639,11 +2966,18 @@ void CL_Reset(void)
doomcom->numslots = 1;
SV_StopServer();
SV_ResetServer();
- CV_RevertNetVars();
// make sure we don't leave any fileneeded gunk over from a failed join
+ FreeFileNeeded();
fileneedednum = 0;
- memset(fileneeded, 0, sizeof(fileneeded));
+
+#ifndef NONET
+ totalfilesrequestednum = 0;
+ totalfilesrequestedsize = 0;
+#endif
+ firstconnectattempttime = 0;
+ serverisfull = false;
+ connectiontimeout = (tic_t)cv_nettimeout.value; //reset this temporary hack
// D_StartTitle should get done now, but the calling function will handle it
}
@@ -2898,6 +3232,34 @@ static void Command_Kick(void)
else
CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
}
+
+static void Command_ResendGamestate(void)
+{
+ SINT8 playernum;
+
+ if (COM_Argc() == 1)
+ {
+ CONS_Printf(M_GetText("resendgamestate <playername/playernum>: resend the game state to a player\n"));
+ return;
+ }
+ else if (client)
+ {
+ CONS_Printf(M_GetText("Only the server can use this.\n"));
+ return;
+ }
+
+ playernum = nametonum(COM_Argv(1));
+ if (playernum == -1 || playernum == 0)
+ return;
+
+ // Send a PT_WILLRESENDGAMESTATE packet to the client so they know what's going on
+ netbuffer->packettype = PT_WILLRESENDGAMESTATE;
+ if (!HSendPacket(playernode[playernum], true, 0, 0))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("A problem occured, please try again.\n"));
+ return;
+ }
+}
#endif
static void Got_KickCmd(UINT8 **p, INT32 playernum)
@@ -2992,7 +3354,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
{
case KICK_MSG_GO_AWAY:
if (!players[pnum].quittime)
- HU_AddChatText(va("\x82*%s has been kicked (Go away)", player_names[pnum]), false);
+ HU_AddChatText(va("\x82*%s has been kicked (No reason given)", player_names[pnum]), false);
kickreason = KR_KICK;
break;
case KICK_MSG_PING_HIGH:
@@ -3000,7 +3362,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
kickreason = KR_PINGLIMIT;
break;
case KICK_MSG_CON_FAIL:
- HU_AddChatText(va("\x82*%s left the game (Synch Failure)", player_names[pnum]), false);
+ HU_AddChatText(va("\x82*%s left the game (Synch failure)", player_names[pnum]), false);
kickreason = KR_SYNCH;
if (M_CheckParm("-consisdump")) // Helps debugging some problems
@@ -3046,7 +3408,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
kickreason = KR_LEAVE;
break;
case KICK_MSG_BANNED:
- HU_AddChatText(va("\x82*%s has been banned (Don't come back)", player_names[pnum]), false);
+ HU_AddChatText(va("\x82*%s has been banned (No reason given)", player_names[pnum]), false);
kickreason = KR_BAN;
break;
case KICK_MSG_CUSTOM_KICK:
@@ -3063,7 +3425,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
if (pnum == consoleplayer)
{
- LUAh_GameQuit(false);
+ LUA_HookBool(false, HOOK(GameQuit));
#ifdef DUMPCONSISTENCY
if (msg == KICK_MSG_CON_FAIL) SV_SavedGame();
#endif
@@ -3108,34 +3470,6 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
#endif
}
-static void Command_ResendGamestate(void)
-{
- SINT8 playernum;
-
- if (COM_Argc() == 1)
- {
- CONS_Printf(M_GetText("resendgamestate <playername/playernum>: resend the game state to a player\n"));
- return;
- }
- else if (client)
- {
- CONS_Printf(M_GetText("Only the server can use this.\n"));
- return;
- }
-
- playernum = nametonum(COM_Argv(1));
- if (playernum == -1 || playernum == 0)
- return;
-
- // Send a PT_WILLRESENDGAMESTATE packet to the client so they know what's going on
- netbuffer->packettype = PT_WILLRESENDGAMESTATE;
- if (!HSendPacket(playernode[playernum], true, 0, 0))
- {
- CONS_Alert(CONS_ERROR, M_GetText("A problem occured, please try again.\n"));
- return;
- }
-}
-
static CV_PossibleValue_t netticbuffer_cons_t[] = {{0, "MIN"}, {3, "MAX"}, {0, NULL}};
consvar_t cv_netticbuffer = CVAR_INIT ("netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL);
@@ -3163,7 +3497,7 @@ consvar_t cv_maxsend = CVAR_INIT ("maxsend", "4096", CV_SAVE|CV_NETVAR, maxsend_
consvar_t cv_noticedownload = CVAR_INIT ("noticedownload", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
// Speed of file downloading (in packets per tic)
-static CV_PossibleValue_t downloadspeed_cons_t[] = {{0, "MIN"}, {32, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t downloadspeed_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}};
consvar_t cv_downloadspeed = CVAR_INIT ("downloadspeed", "16", CV_SAVE|CV_NETVAR, downloadspeed_cons_t, NULL);
static void Got_AddPlayer(UINT8 **p, INT32 playernum);
@@ -3297,6 +3631,8 @@ void SV_ResetServer(void)
// clear server_context
memset(server_context, '-', 8);
+ CV_RevertNetVars();
+
DEBFILE("\n-=-=-=-=-=-=-= Server Reset =-=-=-=-=-=-=-\n\n");
}
@@ -3322,6 +3658,9 @@ static inline void SV_GenContext(void)
//
void D_QuitNetGame(void)
{
+ mousegrabbedbylua = true;
+ I_UpdateMouseGrab();
+
if (!netgame || !netbuffer)
return;
@@ -3509,9 +3848,9 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
COM_BufAddText(va("sayto %d %s\n", newplayernum, motd));
if (!rejoined)
- LUAh_PlayerJoin(newplayernum);
+ LUA_HookInt(newplayernum, HOOK(PlayerJoin));
#ifdef HAVE_DISCORDRPC
- DRPC_UpdatePresence();
+ DRPC_UpdatePresence();
#endif
}
@@ -3689,6 +4028,78 @@ static size_t TotalTextCmdPerTic(tic_t tic)
return total;
}
+static const char *
+ConnectionRefused (SINT8 node, INT32 rejoinernum)
+{
+ clientconfig_pak *cc = &netbuffer->u.clientcfg;
+
+ boolean rejoining = (rejoinernum != -1);
+
+ if (!node)/* server connecting to itself */
+ return NULL;
+
+ if (
+ cc->modversion != MODVERSION ||
+ strncmp(cc->application, SRB2APPLICATION,
+ sizeof cc->application)
+ ){
+ return/* this is probably client's fault */
+ "Incompatible.";
+ }
+ else if (bannednode && bannednode[node])
+ {
+ return
+ "You have been banned\n"
+ "from the server.";
+ }
+ else if (cc->localplayers != 1)
+ {
+ return
+ "Wrong player count.";
+ }
+
+ if (!rejoining)
+ {
+ if (!cv_allownewplayer.value)
+ {
+ return
+ "The server is not accepting\n"
+ "joins for the moment.";
+ }
+ else if (D_NumPlayers() >= cv_maxplayers.value)
+ {
+ return va(
+ "Maximum players reached: %d",
+ cv_maxplayers.value);
+ }
+ }
+
+ if (luafiletransfers)
+ {
+ return
+ "The serveris broadcasting a file\n"
+ "requested by a Lua script.\n"
+ "Please wait a bit and then\n"
+ "try rejoining.";
+ }
+
+ if (netgame)
+ {
+ const tic_t th = 2 * cv_joindelay.value * TICRATE;
+
+ if (joindelay > th)
+ {
+ return va(
+ "Too many people are connecting.\n"
+ "Please wait %d seconds and then\n"
+ "try rejoining.",
+ (joindelay - th) / TICRATE);
+ }
+ }
+
+ return NULL;
+}
+
/** Called when a PT_CLIENTJOIN packet is received
*
* \param node The packet sender
@@ -3699,33 +4110,14 @@ static void HandleConnect(SINT8 node)
char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME + 1];
INT32 rejoinernum;
INT32 i;
+ const char *refuse;
rejoinernum = FindRejoinerNum(node);
- if (bannednode && bannednode[node])
- SV_SendRefuse(node, M_GetText("You have been banned\nfrom the server."));
- else if (netbuffer->u.clientcfg._255 != 255 ||
- netbuffer->u.clientcfg.packetversion != PACKETVERSION)
- SV_SendRefuse(node, "Incompatible packet formats.");
- else if (strncmp(netbuffer->u.clientcfg.application, SRB2APPLICATION,
- sizeof netbuffer->u.clientcfg.application))
- SV_SendRefuse(node, "Different SRB2 modifications\nare not compatible.");
- else if (netbuffer->u.clientcfg.version != VERSION
- || netbuffer->u.clientcfg.subversion != SUBVERSION)
- SV_SendRefuse(node, va(M_GetText("Different SRB2 versions cannot\nplay a netgame!\n(server version %d.%d.%d)"), VERSION/100, VERSION%100, SUBVERSION));
- else if (!cv_allownewplayer.value && node && rejoinernum == -1)
- SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment."));
- else if (D_NumPlayers() >= cv_maxplayers.value && rejoinernum == -1)
- SV_SendRefuse(node, va(M_GetText("Maximum players reached: %d"), cv_maxplayers.value));
- else if (netgame && netbuffer->u.clientcfg.localplayers > 1) // Hacked client?
- SV_SendRefuse(node, M_GetText("Too many players from\nthis node."));
- else if (netgame && !netbuffer->u.clientcfg.localplayers) // Stealth join?
- SV_SendRefuse(node, M_GetText("No players from\nthis node."));
- else if (luafiletransfers)
- SV_SendRefuse(node, M_GetText("The server is broadcasting a file\nrequested by a Lua script.\nPlease wait a bit and then\ntry rejoining."));
- else if (netgame && joindelay > 2 * (tic_t)cv_joindelay.value * TICRATE)
- SV_SendRefuse(node, va(M_GetText("Too many people are connecting.\nPlease wait %d seconds and then\ntry rejoining."),
- (joindelay - 2 * cv_joindelay.value * TICRATE) / TICRATE));
+ refuse = ConnectionRefused(node, rejoinernum);
+
+ if (refuse)
+ SV_SendRefuse(node, refuse);
else
{
#ifndef NONET
@@ -3792,7 +4184,7 @@ static void HandleConnect(SINT8 node)
static void HandleShutdown(SINT8 node)
{
(void)node;
- LUAh_GameQuit(false);
+ LUA_HookBool(false, HOOK(GameQuit));
D_QuitNetGame();
CL_Reset();
D_StartTitle();
@@ -3807,7 +4199,7 @@ static void HandleShutdown(SINT8 node)
static void HandleTimeout(SINT8 node)
{
(void)node;
- LUAh_GameQuit(false);
+ LUA_HookBool(false, HOOK(GameQuit));
D_QuitNetGame();
CL_Reset();
D_StartTitle();
@@ -3840,6 +4232,7 @@ static void HandleServerInfo(SINT8 node)
static void PT_WillResendGamestate(void)
{
+#ifndef NONET
char tmpsave[256];
if (server || cl_redownloadinggamestate)
@@ -3862,10 +4255,12 @@ static void PT_WillResendGamestate(void)
CL_PrepareDownloadSaveGame(tmpsave);
cl_redownloadinggamestate = true;
+#endif
}
static void PT_CanReceiveGamestate(SINT8 node)
{
+#ifndef NONET
if (client || sendingsavegame[node])
return;
@@ -3873,6 +4268,9 @@ static void PT_CanReceiveGamestate(SINT8 node)
SV_SendSaveGame(node, true); // Resend a complete game state
resendingsavegame[node] = true;
+#else
+ (void)node;
+#endif
}
/** Handles a packet received from a node that isn't in game
@@ -3899,31 +4297,40 @@ static void HandlePacketFromAwayNode(SINT8 node)
switch (netbuffer->packettype)
{
case PT_ASKINFOVIAMS:
-#if 0
+ Net_CloseConnection(node);
+ break;
+
+ case PT_TELLFILESNEEDED:
if (server && serverrunning)
{
- INT32 clientnode;
- if (ms_RoomId < 0) // ignore if we're not actually on the MS right now
- {
- Net_CloseConnection(node); // and yes, close connection
- return;
- }
- clientnode = I_NetMakeNode(netbuffer->u.msaskinfo.clientaddr);
- if (clientnode != -1)
- {
- SV_SendServerInfo(clientnode, (tic_t)LONG(netbuffer->u.msaskinfo.time));
- SV_SendPlayerInfo(clientnode); // Send extra info
- Net_CloseConnection(clientnode);
- // Don't close connection to MS...
- }
- else
- Net_CloseConnection(node); // ...unless the IP address is not valid
+ UINT8 *p;
+ INT32 firstfile = netbuffer->u.filesneedednum;
+
+ netbuffer->packettype = PT_MOREFILESNEEDED;
+ netbuffer->u.filesneededcfg.first = firstfile;
+ netbuffer->u.filesneededcfg.more = 0;
+
+ p = PutFileNeeded(firstfile);
+
+ HSendPacket(node, false, 0, p - ((UINT8 *)&netbuffer->u));
+ }
+ else // Shouldn't get this if you aren't the server...?
+ Net_CloseConnection(node);
+ break;
+
+ case PT_MOREFILESNEEDED:
+ if (server && serverrunning)
+ { // But wait I thought I'm the server?
+ Net_CloseConnection(node);
+ break;
+ }
+ SERVERONLY
+ if (cl_mode == CL_ASKFULLFILELIST && netbuffer->u.filesneededcfg.first == fileneedednum)
+ {
+ D_ParseFileneeded(netbuffer->u.filesneededcfg.num, netbuffer->u.filesneededcfg.files, netbuffer->u.filesneededcfg.first);
+ if (!netbuffer->u.filesneededcfg.more)
+ cl_lastcheckedfilecount = UINT16_MAX; // Got the whole file list
}
- else
- Net_CloseConnection(node); // you're not supposed to get it, so ignore it
-#else
- Net_CloseConnection(node);
-#endif
break;
case PT_ASKINFO:
@@ -3949,13 +4356,24 @@ static void HandlePacketFromAwayNode(SINT8 node)
if (!reason)
I_Error("Out of memory!\n");
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
+ if (strstr(reason, "Maximum players reached"))
+ {
+ serverisfull = true;
+ //Special timeout for when refusing due to player cap. The client will wait 3 seconds between join requests when waiting for a slot, so we need this to be much longer
+ //We set it back to the value of cv_nettimeout.value in CL_Reset
+ connectiontimeout = NEWTICRATE*7;
+ cl_mode = CL_ASKJOIN;
+ free(reason);
+ break;
+ }
M_StartMessage(va(M_GetText("Server refuses connection\n\nReason:\n%s"),
reason), NULL, MM_NOTHING);
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+
free(reason);
// Will be reset by caller. Signals refusal.
@@ -4167,8 +4585,10 @@ static void HandlePacketFromPlayer(SINT8 node)
// Check player consistancy during the level
if (realstart <= gametic && realstart + BACKUPTICS - 1 > gametic && gamestate == GS_LEVEL
&& consistancy[realstart%BACKUPTICS] != SHORT(netbuffer->u.clientpak.consistancy)
- && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime()
- && !SV_ResendingSavegameToAnyone())
+#ifndef NONET
+ && !SV_ResendingSavegameToAnyone()
+#endif
+ && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime())
{
if (cv_resynchattempts.value)
{
@@ -5110,12 +5530,12 @@ boolean FindMatchingTics(int *liveTicOut, int *gameTicOut);
void TryRunTics(tic_t realtics, tic_t entertic)
{
// the machine has lagged but it is not so bad
- if (realtics > TICRATE / 7) // FIXME: consistency failure!!
+ if (realtics > TICRATE/7) // FIXME: consistency failure!!
{
if (server)
realtics = 1;
else
- realtics = TICRATE / 7;
+ realtics = TICRATE/7;
}
if (singletics)
@@ -5256,9 +5676,13 @@ void TryRunTics(tic_t realtics, tic_t entertic)
// run the count * tics
while (neededtic > gametic)
{
+
+ boolean update_stats = !(paused || P_AutoPause());
+
DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic));
- ps_tictime = I_GetPreciseTime();
+ if (update_stats)
+ PS_START_TIMING(ps_tictime);
// we restore netcmds of players, localplayer will be overwritten anyways during sims
if ((liveTic % simInaccuracy == 0) && simInaccuracy > 1)
@@ -5278,7 +5702,11 @@ void TryRunTics(tic_t realtics, tic_t entertic)
simtic = gametic;
consistancy[gametic % BACKUPTICS] = Consistancy();
- ps_tictime = I_GetPreciseTime() - ps_tictime;
+ if (update_stats)
+ {
+ PS_STOP_TIMING(ps_tictime);
+ PS_UpdateTickStats();
+ }
if (canSimulate)
{
@@ -6033,9 +6461,11 @@ void NetUpdate(void)
if (client)
{
+#ifndef NONET
// If the client just finished redownloading the game state, load it
if (cl_redownloadinggamestate && fileneeded[0].status == FS_FOUND)
CL_ReloadReceivedSavegame();
+#endif
CL_SendClientCmd(); // Send tic cmd
hu_redownloadinggamestate = cl_redownloadinggamestate;
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 4e53a3aace50c3d3184c3078a4fb4b656d277b1c..8996f72538b0428eb917dc6921a3279d57b922eb 100755
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -22,11 +22,15 @@
#include "mserv.h"
/*
-The 'packet version' is used to distinguish packet formats.
-This version is independent of VERSION and SUBVERSION. Different
-applications may follow different packet versions.
+The 'packet version' is used to distinguish packet
+formats. This version is independent of VERSION and
+SUBVERSION. Different applications may follow different
+packet versions.
+
+If you change the struct or the meaning of a field
+therein, increment this number.
*/
-#define PACKETVERSION 3
+#define PACKETVERSION 4
// Network play related stuff.
// There is a data struct that stores network
@@ -105,6 +109,9 @@ typedef enum
PT_LOGIN, // Login attempt from the client.
+ PT_TELLFILESNEEDED, // Client, to server: "what other files do I need starting from this number?"
+ PT_MOREFILESNEEDED, // Server, to client: "you need these (+ more on top of those)"
+
PT_PING, // Packet sent to tell clients the other client's latency to server.
NUMPACKETTYPE
} packettype_t;
@@ -156,9 +163,6 @@ typedef struct
typedef struct
{
- UINT8 version; // Different versions don't work
- UINT8 subversion; // Contains build version
-
// Server launch stuffs
UINT8 serverplayer;
UINT8 totalslotnum; // "Slots": highest player number in use plus one.
@@ -212,16 +216,22 @@ typedef struct
typedef struct
{
- UINT8 _255;/* see serverinfo_pak */
- UINT8 packetversion;
+ UINT8 modversion;
char application[MAXAPPLICATION];
- UINT8 version; // Different versions don't work
- UINT8 subversion; // Contains build version
UINT8 localplayers;
UINT8 mode;
char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME];
} ATTRPACK clientconfig_pak;
+#define SV_DEDICATED 0x40 // server is dedicated
+#define SV_LOTSOFADDONS 0x20 // flag used to ask for full file list in d_netfil
+
+enum {
+ REFUSE_JOINS_DISABLED = 1,
+ REFUSE_SLOTS_FULL,
+ REFUSE_BANNED,
+};
+
#define MAXSERVERNAME 32
#define MAXFILENEEDED 915
// This packet is too large
@@ -239,11 +249,11 @@ typedef struct
UINT8 subversion;
UINT8 numberofplayer;
UINT8 maxplayer;
- UINT8 refusereason; // 0: joinable, 1: joins disabled, 2: full
+ UINT8 refusereason; // 0: joinable, REFUSE enum
char gametypename[24];
UINT8 modifiedgame;
UINT8 cheatsenabled;
- UINT8 isdedicated;
+ UINT8 flags;
UINT8 fileneedednum;
tic_t time;
tic_t leveltime;
@@ -297,6 +307,14 @@ typedef struct
UINT8 ctfteam;
} ATTRPACK plrconfig;
+typedef struct
+{
+ INT32 first;
+ UINT8 num;
+ UINT8 more;
+ UINT8 files[MAXFILENEEDED]; // is filled with writexxx (byteptr.h)
+} ATTRPACK filesneededconfig_pak;
+
//
// Network packet data
//
@@ -326,6 +344,8 @@ typedef struct
msaskinfo_pak msaskinfo; // 22 bytes
plrinfo playerinfo[MAXPLAYERS]; // 576 bytes(?)
plrconfig playerconfig[MAXPLAYERS]; // (up to) 528 bytes(?)
+ INT32 filesneedednum; // 4 bytes
+ filesneededconfig_pak filesneededcfg; // ??? bytes
UINT32 pingtable[MAXPLAYERS+1]; // 68 bytes
} u; // This is needed to pack diff packet types data together
} ATTRPACK doomdata_t;
@@ -440,6 +460,7 @@ void CL_Reset(void);
void CL_ClearPlayer(INT32 playernum);
void CL_QueryServerList(msg_server_t *list);
void CL_UpdateServerList(boolean internetsearch, INT32 room);
+void CL_RemovePlayer(INT32 playernum, kickreason_t reason);
// Is there a game running
boolean Playing(void);
diff --git a/src/d_event.h b/src/d_event.h
index 1fd2e3824251082d6c059fffef8ddbe76f67a15c..c0b9cef773b0453b3acc67d1eeafc6b8982bc7ad 100644
--- a/src/d_event.h
+++ b/src/d_event.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -33,9 +33,10 @@ typedef enum
typedef struct
{
evtype_t type;
- INT32 data1; // keys / mouse/joystick buttons
- INT32 data2; // mouse/joystick x move
- INT32 data3; // mouse/joystick y move
+ INT32 key; // keys/mouse/joystick buttons
+ INT32 x; // mouse/joystick x move
+ INT32 y; // mouse/joystick y move
+ boolean repeated; // key repeat
} event_t;
//
diff --git a/src/d_main.c b/src/d_main.c
index 589c033eab5c54e72d2e481da9eddb7ab601e54d..133db920aac326c82303e37a7d7193f9df7620d1 100755
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -15,7 +15,7 @@
/// plus functions to parse command line parameters, configure game
/// parameters, and call the startup functions.
-#if (defined(__unix__) && !defined(MSDOS)) || defined(__APPLE__) || defined(UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#include <sys/stat.h>
#include <sys/types.h>
#endif
@@ -58,15 +58,15 @@
#include "d_netfil.h"
#include "m_cheat.h"
#include "y_inter.h"
-#include "p_local.h" // chasecam
-#include "mserv.h" // ms_RoomId
-#include "m_misc.h" // screenshot functionality
+#include "p_local.h" // chasecam
+#include "mserv.h" // ms_RoomId
+#include "m_misc.h" // screenshot functionality
#include "deh_tables.h" // Dehacked list test
-#include "m_cond.h" // condition initialization
+#include "m_cond.h" // condition initialization
#include "fastcmp.h"
#include "keys.h"
-#include "filesrch.h" // refreshdirmenu, mainwadstally
-#include "g_input.h" // tutorial mode control scheming
+#include "filesrch.h" // refreshdirmenu
+#include "g_input.h" // tutorial mode control scheming
#include "m_perfstats.h"
#include "i_net.h" // for netvariabletime (srb2netplus)
#include "p_savenetrb.h"
@@ -102,11 +102,8 @@ int SUBVERSION;
// platform independant focus loss
UINT8 window_notinfocus = false;
-//
-// DEMO LOOP
-//
-static char *startupwadfiles[MAX_WADFILES];
-static char *startuppwads[MAX_WADFILES];
+static addfilelist_t startupwadfiles;
+static addfilelist_t startuppwads;
boolean devparm = false; // started game with -devparm
@@ -125,6 +122,9 @@ boolean midi_disabled = false;
boolean sound_disabled = false;
boolean digital_disabled = false;
+//
+// DEMO LOOP
+//
boolean advancedemo;
#ifdef DEBUGFILE
INT32 debugload = 0;
@@ -161,15 +161,15 @@ boolean dedicated = false;
void D_PostEvent(const event_t *ev)
{
events[eventhead] = *ev;
- eventhead = (eventhead + 1) & (MAXEVENTS - 1);
+ eventhead = (eventhead+1) & (MAXEVENTS-1);
}
// modifier keys
// Now handled in I_OsPolling
-UINT8 shiftdown = 0; // 0x1 left, 0x2 right
-UINT8 ctrldown = 0; // 0x1 left, 0x2 right
-UINT8 altdown = 0; // 0x1 left, 0x2 right
-boolean capslock = 0; // gee i wonder what this does.
+UINT8 shiftdown = 0; // 0x1 left, 0x2 right
+UINT8 ctrldown = 0; // 0x1 left, 0x2 right
+UINT8 altdown = 0; // 0x1 left, 0x2 right
+boolean capslock = 0; // gee i wonder what this does.
//
// D_ProcessEvents
@@ -181,10 +181,53 @@ void D_ProcessEvents(void)
boolean eaten;
- for (; eventtail != eventhead; eventtail = (eventtail + 1) & (MAXEVENTS - 1))
+ // Reset possibly stale mouse info
+ G_SetMouseDeltas(0, 0, 1);
+ G_SetMouseDeltas(0, 0, 2);
+ mouse.buttons &= ~(MB_SCROLLUP|MB_SCROLLDOWN);
+ mouse2.buttons &= ~(MB_SCROLLUP|MB_SCROLLDOWN);
+
+ for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
{
+ boolean hooked = false;
+
ev = &events[eventtail];
+ // Set mouse buttons early in case event is eaten later
+ if (ev->type == ev_keydown || ev->type == ev_keyup)
+ {
+ // Mouse buttons
+ if ((UINT32)(ev->key - KEY_MOUSE1) < MOUSEBUTTONS)
+ {
+ if (ev->type == ev_keydown)
+ mouse.buttons |= 1 << (ev->key - KEY_MOUSE1);
+ else
+ mouse.buttons &= ~(1 << (ev->key - KEY_MOUSE1));
+ }
+ else if ((UINT32)(ev->key - KEY_2MOUSE1) < MOUSEBUTTONS)
+ {
+ if (ev->type == ev_keydown)
+ mouse2.buttons |= 1 << (ev->key - KEY_2MOUSE1);
+ else
+ mouse2.buttons &= ~(1 << (ev->key - KEY_2MOUSE1));
+ }
+ // Scroll (has no keyup event)
+ else switch (ev->key) {
+ case KEY_MOUSEWHEELUP:
+ mouse.buttons |= MB_SCROLLUP;
+ break;
+ case KEY_MOUSEWHEELDOWN:
+ mouse.buttons |= MB_SCROLLDOWN;
+ break;
+ case KEY_2MOUSEWHEELUP:
+ mouse2.buttons |= MB_SCROLLUP;
+ break;
+ case KEY_2MOUSEWHEELDOWN:
+ mouse2.buttons |= MB_SCROLLDOWN;
+ break;
+ }
+ }
+
// Screenshots over everything so that they can be taken anywhere.
if (M_ScreenshotResponder(ev))
continue; // ate the event
@@ -195,6 +238,12 @@ void D_ProcessEvents(void)
continue;
}
+ if (!CON_Ready() && !menuactive) {
+ if (G_LuaResponder(ev))
+ continue;
+ hooked = true;
+ }
+
// Menu input
#ifdef HAVE_THREADS
I_lock_mutex(&m_menu_mutex);
@@ -209,7 +258,13 @@ void D_ProcessEvents(void)
if (eaten)
continue; // menu ate the event
- // console input
+ if (!hooked && !CON_Ready()) {
+ if (G_LuaResponder(ev))
+ continue;
+ hooked = true;
+ }
+
+ // console input
#ifdef HAVE_THREADS
I_lock_mutex(&con_mutex);
#endif
@@ -223,8 +278,16 @@ void D_ProcessEvents(void)
if (eaten)
continue; // ate the event
+ if (!hooked && !CON_Ready() && G_LuaResponder(ev))
+ continue;
+
G_Responder(ev);
}
+
+ if (mouse.rdx || mouse.rdy)
+ G_SetMouseDeltas(mouse.rdx, mouse.rdy, 1);
+ if (mouse2.rdx || mouse2.rdy)
+ G_SetMouseDeltas(mouse2.rdx, mouse2.rdy, 2);
}
//
@@ -310,8 +373,10 @@ static void D_Display(void)
{
// Fade to black first
if ((wipegamestate == (gamestate_t)FORCEWIPE ||
- (wipegamestate != (gamestate_t)FORCEWIPEOFF && !(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))) // fades to black on its own timing, always
- && wipetypepre != UINT8_MAX)
+ (wipegamestate != (gamestate_t)FORCEWIPEOFF
+ && !(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
+ ) // fades to black on its own timing, always
+ && wipetypepre != UINT8_MAX)
{
F_WipeStartScreen();
// Check for Mega Genesis fade
@@ -335,72 +400,71 @@ static void D_Display(void)
// do buffered drawing
switch (gamestate)
{
- case GS_TITLESCREEN:
- if (!titlemapinaction || !curbghide)
- {
- F_TitleScreenDrawer();
+ case GS_TITLESCREEN:
+ if (!titlemapinaction || !curbghide) {
+ F_TitleScreenDrawer();
+ break;
+ }
+ /* FALLTHRU */
+ case GS_LEVEL:
+ if (!gametic)
+ break;
+ HU_Erase();
+ AM_Drawer();
break;
- }
- /* FALLTHRU */
- case GS_LEVEL:
- if (!gametic)
+
+ case GS_INTERMISSION:
+ Y_IntermissionDrawer();
+ HU_Erase();
+ HU_Drawer();
+ break;
+
+ case GS_TIMEATTACK:
+ break;
+
+ case GS_INTRO:
+ F_IntroDrawer();
+ if (wipegamestate == (gamestate_t)-1)
+ wipe = true;
+ break;
+
+ case GS_ENDING:
+ F_EndingDrawer();
+ HU_Erase();
+ HU_Drawer();
+ break;
+
+ case GS_CUTSCENE:
+ F_CutsceneDrawer();
+ HU_Erase();
+ HU_Drawer();
+ break;
+
+ case GS_GAMEEND:
+ F_GameEndDrawer();
+ break;
+
+ case GS_EVALUATION:
+ F_GameEvaluationDrawer();
+ HU_Erase();
+ HU_Drawer();
+ break;
+
+ case GS_CONTINUING:
+ F_ContinueDrawer();
+ break;
+
+ case GS_CREDITS:
+ F_CreditDrawer();
+ HU_Erase();
+ HU_Drawer();
+ break;
+
+ case GS_WAITINGPLAYERS:
+ // The clientconnect drawer is independent...
+ case GS_DEDICATEDSERVER:
+ case GS_NULL:
break;
- HU_Erase();
- AM_Drawer();
- break;
-
- case GS_INTERMISSION:
- Y_IntermissionDrawer();
- HU_Erase();
- HU_Drawer();
- break;
-
- case GS_TIMEATTACK:
- break;
-
- case GS_INTRO:
- F_IntroDrawer();
- if (wipegamestate == (gamestate_t)-1)
- wipe = true;
- break;
-
- case GS_ENDING:
- F_EndingDrawer();
- HU_Erase();
- HU_Drawer();
- break;
-
- case GS_CUTSCENE:
- F_CutsceneDrawer();
- HU_Erase();
- HU_Drawer();
- break;
-
- case GS_GAMEEND:
- F_GameEndDrawer();
- break;
-
- case GS_EVALUATION:
- F_GameEvaluationDrawer();
- HU_Erase();
- HU_Drawer();
- break;
-
- case GS_CONTINUING:
- F_ContinueDrawer();
- break;
-
- case GS_CREDITS:
- F_CreditDrawer();
- HU_Erase();
- HU_Drawer();
- break;
-
- case GS_WAITINGPLAYERS:
- // The clientconnect drawer is independent...
- case GS_DEDICATEDSERVER:
- case GS_NULL:
- break;
}
// STUPID race condition...
@@ -418,39 +482,39 @@ static void D_Display(void)
if (!automapactive && !dedicated && cv_renderview.value)
{
- ps_rendercalltime = I_GetPreciseTime();
+ PS_START_TIMING(ps_rendercalltime);
if (players[displayplayer].mo || players[displayplayer].playerstate == PST_DEAD)
{
- topleft = screens[0] + viewwindowy * vid.width + viewwindowx;
+ topleft = screens[0] + viewwindowy*vid.width + viewwindowx;
objectsdrawn = 0;
-#ifdef HWRENDER
+ #ifdef HWRENDER
if (rendermode != render_soft)
HWR_RenderPlayerView(0, &players[displayplayer]);
else
-#endif
- if (rendermode != render_none)
+ #endif
+ if (rendermode != render_none)
R_RenderPlayerView(&players[displayplayer]);
}
// render the second screen
if (splitscreen && players[secondarydisplayplayer].mo)
{
-#ifdef HWRENDER
+ #ifdef HWRENDER
if (rendermode != render_soft)
HWR_RenderPlayerView(1, &players[secondarydisplayplayer]);
else
-#endif
- if (rendermode != render_none)
+ #endif
+ if (rendermode != render_none)
{
viewwindowy = vid.height / 2;
- M_Memcpy(ylookup, ylookup2, viewheight * sizeof(ylookup[0]));
+ M_Memcpy(ylookup, ylookup2, viewheight*sizeof (ylookup[0]));
- topleft = screens[0] + viewwindowy * vid.width + viewwindowx;
+ topleft = screens[0] + viewwindowy*vid.width + viewwindowx;
R_RenderPlayerView(&players[secondarydisplayplayer]);
viewwindowy = 0;
- M_Memcpy(ylookup, ylookup1, viewheight * sizeof(ylookup[0]));
+ M_Memcpy(ylookup, ylookup1, viewheight*sizeof (ylookup[0]));
}
}
@@ -465,21 +529,21 @@ static void D_Display(void)
if (postimgtype2)
V_DoPostProcessor(1, postimgtype2, postimgparam2);
}
- ps_rendercalltime = I_GetPreciseTime() - ps_rendercalltime;
+ PS_STOP_TIMING(ps_rendercalltime);
}
if (lastdraw)
{
if (rendermode == render_soft)
{
- VID_BlitLinearScreen(screens[0], screens[1], vid.width * vid.bpp, vid.height, vid.width * vid.bpp, vid.rowbytes);
+ VID_BlitLinearScreen(screens[0], screens[1], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
Y_ConsiderScreenBuffer();
usebuffer = true;
}
lastdraw = false;
}
- ps_uitime = I_GetPreciseTime();
+ PS_START_TIMING(ps_uitime);
if (gamestate == GS_LEVEL)
{
@@ -492,7 +556,7 @@ static void D_Display(void)
}
else
{
- ps_uitime = I_GetPreciseTime();
+ PS_START_TIMING(ps_uitime);
}
}
@@ -514,9 +578,9 @@ static void D_Display(void)
patch = W_CachePatchName("M_PAUSE", PU_PATCH);
V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - patch->width)/2, py, 0, patch);
#else
- INT32 y = ((automapactive) ? (32) : (BASEVIDHEIGHT / 2));
- M_DrawTextBox((BASEVIDWIDTH / 2) - (60), y - (16), 13, 2);
- V_DrawCenteredString(BASEVIDWIDTH / 2, y - (4), V_YELLOWMAP, "Game Paused");
+ INT32 y = ((automapactive) ? (32) : (BASEVIDHEIGHT/2));
+ M_DrawTextBox((BASEVIDWIDTH/2) - (60), y - (16), 13, 2);
+ V_DrawCenteredString(BASEVIDWIDTH/2, y - (4), V_YELLOWMAP, "Game Paused");
#endif
}
@@ -534,7 +598,7 @@ static void D_Display(void)
CON_Drawer();
- ps_uitime = I_GetPreciseTime() - ps_uitime;
+ PS_STOP_TIMING(ps_uitime);
//
// wipe update
@@ -606,7 +670,7 @@ static void D_Display(void)
s[sizeof s - 1] = '\0';
snprintf(s, sizeof s - 1, "get %d b/s", getbps);
- V_DrawRightAlignedString(BASEVIDWIDTH, BASEVIDHEIGHT - ST_HEIGHT - 40, V_YELLOWMAP, s);
+ V_DrawRightAlignedString(BASEVIDWIDTH, BASEVIDHEIGHT-ST_HEIGHT-40, V_YELLOWMAP, s);
snprintf(s, sizeof s - 1, "send %d b/s", sendbps);
V_DrawRightAlignedString(BASEVIDWIDTH, BASEVIDHEIGHT - ST_HEIGHT - 30, V_YELLOWMAP, s);
snprintf(s, sizeof s - 1, "GameMiss %.2f%%", gamelostpercent);
@@ -642,9 +706,9 @@ static void D_Display(void)
M_DrawPerfStats();
}
- ps_swaptime = I_GetPreciseTime();
+ PS_START_TIMING(ps_swaptime);
I_FinishUpdate(); // page flip or blit buffer
- ps_swaptime = I_GetPreciseTime() - ps_swaptime;
+ PS_STOP_TIMING(ps_swaptime);
}
}
@@ -684,11 +748,11 @@ void D_SRB2Loop(void)
// Check and print which version is executed.
// Use this as the border between setup and the main game loop being entered.
CONS_Printf(
- "===========================================================================\n"
- " We hope you enjoy this game as\n"
- " much as we did making it!\n"
- " ...wait. =P\n"
- "===========================================================================\n");
+ "===========================================================================\n"
+ " We hope you enjoy this game as\n"
+ " much as we did making it!\n"
+ " ...wait. =P\n"
+ "===========================================================================\n");
// hack to start on a nice clear console screen.
COM_ImmedExecute("cls;version");
@@ -750,7 +814,7 @@ void D_SRB2Loop(void)
{
rendergametic = gametic;
- rendertimeout = entertic + TICRATE / 17;
+ rendertimeout = entertic+TICRATE/17;
// Update display, next frame, with current state.
D_Display();
@@ -828,7 +892,7 @@ void D_StartTitle(void)
{
char mapname[6];
- strlcpy(mapname, G_BuildMapName(spstage_start), sizeof(mapname));
+ strlcpy(mapname, G_BuildMapName(spstage_start), sizeof (mapname));
strlwr(mapname);
mapname[5] = '\0';
@@ -889,40 +953,73 @@ void D_StartTitle(void)
CV_SetValue(&cv_mousemove, tutorialmousemove);
CV_SetValue(&cv_analog[0], tutorialanalog);
M_StartMessage("Do you want to \x82save the recommended \x82movement controls?\x80\n\nPress 'Y' or 'Enter' to confirm\nPress 'N' or any key to keep \nyour current controls",
- M_TutorialSaveControlResponse, MM_YESNO);
+ M_TutorialSaveControlResponse, MM_YESNO);
}
tutorialmode = false;
}
-//
-// D_AddFile
-//
-static void D_AddFile(char **list, const char *file)
+#define REALLOC_FILE_LIST \
+ if (list->files == NULL) \
+ { \
+ list->files = calloc(sizeof(list->files), 2); \
+ list->numfiles = 1; \
+ } \
+ else \
+ { \
+ index = list->numfiles; \
+ list->files = realloc(list->files, sizeof(list->files) * ((++list->numfiles) + 1)); \
+ if (list->files == NULL) \
+ I_Error("%s: No more free memory to add file %s", __FUNCTION__, file); \
+ }
+
+static void D_AddFile(addfilelist_t *list, const char *file)
{
- size_t pnumwadfiles;
char *newfile;
+ size_t index = 0;
- for (pnumwadfiles = 0; list[pnumwadfiles]; pnumwadfiles++)
- ;
+ REALLOC_FILE_LIST
newfile = malloc(strlen(file) + 1);
if (!newfile)
- {
- I_Error("No more free memory to AddFile %s", file);
- }
+ I_Error("D_AddFile: No more free memory to add file %s", file);
+
strcpy(newfile, file);
+ list->files[index] = newfile;
+}
+
+static void D_AddFolder(addfilelist_t *list, const char *file)
+{
+ char *newfile;
+ size_t index = 0;
+
+ REALLOC_FILE_LIST
- list[pnumwadfiles] = newfile;
+ newfile = malloc(strlen(file) + 2); // Path delimiter + NULL terminator
+ if (!newfile)
+ I_Error("D_AddFolder: No more free memory to add folder %s", file);
+
+ strcpy(newfile, file);
+ strcat(newfile, PATHSEP);
+
+ list->files[index] = newfile;
}
-static inline void D_CleanFile(char **list)
+#undef REALLOC_FILE_LIST
+
+static inline void D_CleanFile(addfilelist_t *list)
{
- size_t pnumwadfiles;
- for (pnumwadfiles = 0; list[pnumwadfiles]; pnumwadfiles++)
+ if (list->files)
{
- free(list[pnumwadfiles]);
- list[pnumwadfiles] = NULL;
+ size_t pnumwadfiles = 0;
+
+ for (; pnumwadfiles < list->numfiles; pnumwadfiles++)
+ free(list->files[pnumwadfiles]);
+
+ free(list->files);
+ list->files = NULL;
}
+
+ list->numfiles = 0;
}
///\brief Checks if a netgame URL is being handled, and changes working directory to the EXE's if so.
@@ -939,7 +1036,7 @@ static void ChangeDirForUrlHandler(void)
strlcpy(srb2path, myargv[0], sizeof(srb2path));
// Get just the directory, minus the EXE name
- for (i = strlen(srb2path) - 1; i > 0; i--)
+ for (i = strlen(srb2path)-1; i > 0; i--)
{
if (srb2path[i] == '/' || srb2path[i] == '\\')
{
@@ -950,7 +1047,7 @@ static void ChangeDirForUrlHandler(void)
CONS_Printf("%s\n", srb2path);
-#if defined(_WIN32)
+#if defined (_WIN32)
SetCurrentDirectoryA(srb2path);
#else
if (chdir(srb2path) == -1)
@@ -968,7 +1065,7 @@ static void IdentifyVersion(void)
char *srb2wad;
const char *srb2waddir = NULL;
-#if (defined(__unix__) && !defined(MSDOS)) || defined(UNIXCOMMON) || defined(HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
// change to the directory where 'srb2.pk3' is found
srb2waddir = I_LocateWad();
#endif
@@ -976,7 +1073,7 @@ static void IdentifyVersion(void)
// get the current directory (possible problem on NT with "." as current dir)
if (srb2waddir)
{
- strlcpy(srb2path, srb2waddir, sizeof(srb2path));
+ strlcpy(srb2path,srb2waddir,sizeof (srb2path));
}
else
{
@@ -988,13 +1085,13 @@ static void IdentifyVersion(void)
}
}
-#if defined(macintosh) && !defined(HAVE_SDL)
+#if defined (macintosh) && !defined (HAVE_SDL)
// cwd is always "/" when app is dbl-clicked
if (!stricmp(srb2waddir, "/"))
srb2waddir = I_GetWadDir();
#endif
// Commercial.
- srb2wad = malloc(strlen(srb2waddir) + 1 + 8 + 1);
+ srb2wad = malloc(strlen(srb2waddir)+1+8+1);
if (srb2wad == NULL)
I_Error("No more free memory to look in %s", srb2waddir);
else
@@ -1006,7 +1103,7 @@ static void IdentifyVersion(void)
// Load the IWAD
if (srb2wad != NULL && FIL_ReadFileOK(srb2wad))
- D_AddFile(startupwadfiles, srb2wad);
+ D_AddFile(&startupwadfiles, srb2wad);
else
I_Error("srb2.pk3 not found! Expected in %s, ss file: %s\n", srb2waddir, srb2wad);
@@ -1017,39 +1114,36 @@ static void IdentifyVersion(void)
// checking in D_SRB2Main
// Add the maps
- D_AddFile(startupwadfiles, va(pandf, srb2waddir, "zones.pk3"));
+ D_AddFile(&startupwadfiles, va(pandf,srb2waddir, "zones.pk3"));
// Add the players
- D_AddFile(startupwadfiles, va(pandf, srb2waddir, "player.dta"));
+ D_AddFile(&startupwadfiles, va(pandf,srb2waddir, "player.dta"));
#ifdef USE_PATCH_DTA
// Add our crappy patches to fix our bugs
- D_AddFile(startupwadfiles, va(pandf, srb2waddir, "patch.pk3"));
+ D_AddFile(&startupwadfiles, va(pandf,srb2waddir, "patch.pk3"));
#endif
-#if !defined(HAVE_SDL) || defined(HAVE_MIXER)
+#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
{
-#define MUSICTEST(str) \
- { \
- const char *musicpath = va(pandf, srb2waddir, str); \
- int ms = W_VerifyNMUSlumps(musicpath, false); \
- if (ms == 1) \
- D_AddFile(startupwadfiles, musicpath); \
- else if (ms == 0) \
- I_Error("File " str " has been modified with non-music/sound lumps"); \
- }
+#define MUSICTEST(str) \
+ {\
+ const char *musicpath = va(pandf,srb2waddir,str);\
+ int ms = W_VerifyNMUSlumps(musicpath, false); \
+ if (ms == 1) \
+ D_AddFile(&startupwadfiles, musicpath); \
+ else if (ms == 0) \
+ I_Error("File "str" has been modified with non-music/sound lumps"); \
+ }
MUSICTEST("music.dta")
- MUSICTEST("patch_music.pk3")
-#ifdef DEVELOP // remove when music_new.dta is merged into music.dta
- MUSICTEST("music_new.dta")
-#endif
+ //MUSICTEST("patch_music.pk3")
}
#endif
}
static void
-D_ConvertVersionNumbers(void)
+D_ConvertVersionNumbers (void)
{
/* leave at defaults (0) under DEVELOP */
#ifndef DEVELOP
@@ -1059,7 +1153,7 @@ D_ConvertVersionNumbers(void)
sscanf(SRB2VERSION, "%d.%d.%d", &major, &minor, &SUBVERSION);
/* this is stupid */
- VERSION = (major * 100) + minor;
+ VERSION = ( major * 100 ) + minor;
#endif
}
@@ -1078,17 +1172,17 @@ void D_SRB2Main(void)
// Print GPL notice for our console users (Linux)
CONS_Printf(
- "\n\nSonic Robo Blast 2\n"
- "Copyright (C) 1998-2021 by Sonic Team Junior\n\n"
- "This program comes with ABSOLUTELY NO WARRANTY.\n\n"
- "This is free software, and you are welcome to redistribute it\n"
- "and/or modify it under the terms of the GNU General Public License\n"
- "as published by the Free Software Foundation; either version 2 of\n"
- "the License, or (at your option) any later version.\n"
- "See the 'LICENSE.txt' file for details.\n\n"
- "Sonic the Hedgehog and related characters are trademarks of SEGA.\n"
- "We do not claim ownership of SEGA's intellectual property used\n"
- "in this program.\n\n");
+ "\n\nSonic Robo Blast 2\n"
+ "Copyright (C) 1998-2022 by Sonic Team Junior\n\n"
+ "This program comes with ABSOLUTELY NO WARRANTY.\n\n"
+ "This is free software, and you are welcome to redistribute it\n"
+ "and/or modify it under the terms of the GNU General Public License\n"
+ "as published by the Free Software Foundation; either version 2 of\n"
+ "the License, or (at your option) any later version.\n"
+ "See the 'LICENSE.txt' file for details.\n\n"
+ "Sonic the Hedgehog and related characters are trademarks of SEGA.\n"
+ "We do not claim ownership of SEGA's intellectual property used\n"
+ "in this program.\n\n");
// keep error messages until the final flush(stderr)
#if !defined(NOTERMIOS)
@@ -1125,7 +1219,7 @@ void D_SRB2Main(void)
#endif
// for dedicated server
-#if !defined(_WINDOWS) //already check in win_main.c
+#if !defined (_WINDOWS) //already check in win_main.c
dedicated = M_CheckParm("-dedicated") != 0;
#endif
@@ -1133,19 +1227,19 @@ void D_SRB2Main(void)
CONS_Printf(M_GetText("Development mode ON.\n"));
// default savegame
- strcpy(savegamename, SAVEGAMENAME "%u.ssg");
- strcpy(liveeventbackup, "live" SAVEGAMENAME ".bkp"); // intentionally not ending with .ssg
+ strcpy(savegamename, SAVEGAMENAME"%u.ssg");
+ strcpy(liveeventbackup, "live"SAVEGAMENAME".bkp"); // intentionally not ending with .ssg
{
const char *userhome = D_Home(); //Alam: path to home
if (!userhome)
{
-#if ((defined(__unix__) && !defined(MSDOS)) || defined(__APPLE__) || defined(UNIXCOMMON)) && !defined(__CYGWIN__)
+#if (defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)
I_Error("Please set $HOME to your home directory\n");
#else
if (dedicated)
- snprintf(configfile, sizeof configfile, "d" CONFIGFILENAME);
+ snprintf(configfile, sizeof configfile, "d"CONFIGFILENAME);
else
snprintf(configfile, sizeof configfile, CONFIGFILENAME);
#endif
@@ -1157,7 +1251,7 @@ void D_SRB2Main(void)
snprintf(srb2home, sizeof srb2home, "%s" PATHSEP DEFAULTDIR, userhome);
snprintf(downloaddir, sizeof downloaddir, "%s" PATHSEP "DOWNLOAD", srb2home);
if (dedicated)
- snprintf(configfile, sizeof configfile, "%s" PATHSEP "d" CONFIGFILENAME, srb2home);
+ snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, srb2home);
else
snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, srb2home);
@@ -1166,11 +1260,11 @@ void D_SRB2Main(void)
strcatbf(liveeventbackup, srb2home, PATHSEP);
snprintf(luafiledir, sizeof luafiledir, "%s" PATHSEP "luafiles", srb2home);
-#else // DEFAULTDIR
+#else // DEFAULTDIR
snprintf(srb2home, sizeof srb2home, "%s", userhome);
snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
if (dedicated)
- snprintf(configfile, sizeof configfile, "%s" PATHSEP "d" CONFIGFILENAME, userhome);
+ snprintf(configfile, sizeof configfile, "%s" PATHSEP "d"CONFIGFILENAME, userhome);
else
snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, userhome);
@@ -1208,21 +1302,25 @@ void D_SRB2Main(void)
// Do this up here so that WADs loaded through the command line can use ExecCfg
COM_Init();
- // add any files specified on the command line with -file wadfile
- // to the wad list
+ // Add any files specified on the command line with
+ // "-file <file>" or "-folder <folder>" to the add-on list
if (!((M_GetUrlProtocolArg() || M_CheckParm("-connect")) && !M_CheckParm("-server")))
{
- if (M_CheckParm("-file"))
- {
- // the parms after p are wadfile/lump names,
- // until end of parms or another - preceded parm
- while (M_IsNextParm())
- {
- const char *s = M_GetNextParm();
+ INT32 addontype = 0;
+ INT32 i;
- if (s) // Check for NULL?
- D_AddFile(startuppwads, s);
- }
+ for (i = 1; i < myargc; i++)
+ {
+ if (!strcasecmp(myargv[i], "-file"))
+ addontype = 1;
+ else if (!strcasecmp(myargv[i], "-folder"))
+ addontype = 2;
+ else if (myargv[i][0] == '-' || myargv[i][0] == '+')
+ addontype = 0;
+ else if (addontype == 1)
+ D_AddFile(&startuppwads, myargv[i]);
+ else if (addontype == 2)
+ D_AddFolder(&startuppwads, myargv[i]);
}
}
@@ -1261,14 +1359,14 @@ void D_SRB2Main(void)
// load wad, including the main wad file
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
- W_InitMultipleFiles(startupwadfiles);
- D_CleanFile(startupwadfiles);
+ W_InitMultipleFiles(&startupwadfiles);
+ D_CleanFile(&startupwadfiles);
#ifndef DEVELOP // md5s last updated 22/02/20 (ddmmyy)
// Check MD5s of autoloaded files
- W_VerifyFileMD5(0, ASSET_HASH_SRB2_PK3); // srb2.pk3
- W_VerifyFileMD5(1, ASSET_HASH_ZONES_PK3); // zones.pk3
+ W_VerifyFileMD5(0, ASSET_HASH_SRB2_PK3); // srb2.pk3
+ W_VerifyFileMD5(1, ASSET_HASH_ZONES_PK3); // zones.pk3
W_VerifyFileMD5(2, ASSET_HASH_PLAYER_DTA); // player.dta
#ifdef USE_PATCH_DTA
W_VerifyFileMD5(3, ASSET_HASH_PATCH_PK3); // patch.pk3
@@ -1277,8 +1375,6 @@ void D_SRB2Main(void)
// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
#endif //ifndef DEVELOP
- mainwadstally = packetsizetally; // technically not accurate atm, remember to port the two-stage -file process from kart in 2.2.x
-
cht_Init();
//---------------------------------------------------- READY SCREEN
@@ -1309,9 +1405,16 @@ void D_SRB2Main(void)
I_RegisterSysCommands();
- CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
- W_InitMultipleFiles(startuppwads);
- D_CleanFile(startuppwads);
+ CON_StopRefresh(); // Temporarily stop refreshing the screen for wad loading
+
+ if (startuppwads.numfiles)
+ {
+ CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
+ W_InitMultipleFiles(&startuppwads);
+ D_CleanFile(&startuppwads);
+ }
+
+ CON_StartRefresh(); // Restart the refresh!
CONS_Printf("HU_LoadGraphics()...\n");
HU_LoadGraphics();
@@ -1321,7 +1424,7 @@ void D_SRB2Main(void)
G_LoadGameData();
-#if (defined(__unix__) && !defined(MSDOS)) || defined(UNIXCOMMON) || defined(HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen
#endif
@@ -1341,7 +1444,7 @@ void D_SRB2Main(void)
{
const char *word = M_GetNextParm();
pstartmap = G_FindMapByNameOrCode(word, 0);
- if (!pstartmap)
+ if (! pstartmap)
I_Error("Cannot find a map remotely named '%s'\n", word);
else
{
@@ -1389,11 +1492,11 @@ void D_SRB2Main(void)
digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
}
}
- if (!(sound_disabled && digital_disabled
+ if (!( sound_disabled && digital_disabled
#ifndef NO_MIDI
- && midi_disabled
+ && midi_disabled
#endif
- ))
+ ))
{
CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
I_StartupSound();
@@ -1437,9 +1540,9 @@ void D_SRB2Main(void)
// user settings come before "+" parameters.
if (dedicated)
- COM_ImmedExecute(va("exec \"%s" PATHSEP "adedserv.cfg\"\n", srb2home));
+ COM_ImmedExecute(va("exec \"%s"PATHSEP"adedserv.cfg\"\n", srb2home));
else
- COM_ImmedExecute(va("exec \"%s" PATHSEP "autoexec.cfg\" -noerror\n", srb2home));
+ COM_ImmedExecute(va("exec \"%s"PATHSEP"autoexec.cfg\" -noerror\n", srb2home));
if (!autostart)
M_PushSpecialParameters(); // push all "+" parameters at the command buffer
@@ -1593,19 +1696,20 @@ const char *D_Home(void)
userhome = M_GetNextParm();
else
{
-#if !((defined(__unix__) && !defined(MSDOS)) || defined(__APPLE__) || defined(UNIXCOMMON)) && !defined(__APPLE__)
+#if !(defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON))
if (FIL_FileOK(CONFIGFILENAME))
usehome = false; // Let's NOT use home
else
#endif
userhome = I_GetEnv("HOME"); //Alam: my new HOME for srb2
}
-#ifdef _WIN32 //Alam: only Win32 have APPDATA and USERPROFILE
+#ifdef _WIN32 //Alam: only Win32 have APPDATA and USERPROFILE
if (!userhome && usehome) //Alam: Still not?
{
char *testhome = NULL;
testhome = I_GetEnv("APPDATA");
- if (testhome != NULL && (FIL_FileOK(va("%s" PATHSEP "%s" PATHSEP CONFIGFILENAME, testhome, DEFAULTDIR))))
+ if (testhome != NULL
+ && (FIL_FileOK(va("%s" PATHSEP "%s" PATHSEP CONFIGFILENAME, testhome, DEFAULTDIR))))
{
userhome = testhome;
}
@@ -1615,15 +1719,14 @@ const char *D_Home(void)
{
char *testhome = NULL;
testhome = I_GetEnv("USERPROFILE");
- if (testhome != NULL && (FIL_FileOK(va("%s" PATHSEP "%s" PATHSEP CONFIGFILENAME, testhome, DEFAULTDIR))))
+ if (testhome != NULL
+ && (FIL_FileOK(va("%s" PATHSEP "%s" PATHSEP CONFIGFILENAME, testhome, DEFAULTDIR))))
{
userhome = testhome;
}
}
-#endif // !__CYGWIN__
-#endif // _WIN32
- if (usehome)
- return userhome;
- else
- return NULL;
+#endif// !__CYGWIN__
+#endif// _WIN32
+ if (usehome) return userhome;
+ else return NULL;
}
diff --git a/src/d_main.h b/src/d_main.h
index 943da8418eb0c2eff38a90e4629e79a728426162..8189a9f2b39f277ba6d5c854551a8e9d21bd35c1 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -40,10 +40,6 @@ void D_SRB2Main(void);
// Called by IO functions when input is detected.
void D_PostEvent(const event_t *ev);
-#if defined (PC_DOS) && !defined (DOXYGEN)
-void D_PostEvent_end(void); // delimiter for locking memory
-#endif
-
void D_ProcessEvents(void);
const char *D_Home(void);
diff --git a/src/d_net.c b/src/d_net.c
index f1c7a5f85014862295deba91183b3e6822ef871b..55810a2972464027fb91a4b90a1ee2b47d1a9665 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -815,6 +815,8 @@ static const char *packettypename[NUMPACKETTYPE] =
"CLIENTJOIN",
"NODETIMEOUT",
"LOGIN",
+ "TELLFILESNEEDED",
+ "MOREFILESNEEDED",
"PING"
};
@@ -1145,8 +1147,9 @@ boolean HGetPacket(void)
if (netbuffer->checksum != NetbufferChecksum())
{
DEBFILE("Bad packet checksum\n");
- //Net_CloseConnection(nodejustjoined ? (doomcom->remotenode | FORCECLOSE) : doomcom->remotenode);
- Net_CloseConnection(doomcom->remotenode);
+ // Do not disconnect or anything, just ignore the packet.
+ // Bad checksums with UDP tend to happen very scarcely
+ // so they are not normally an issue.
continue;
}
diff --git a/src/d_net.h b/src/d_net.h
index dbc6d8ba5ab6288ad76e2003cf67fdd2d6aa43b1..5baa593a0573d53ebbe66aac193ce217fc5089f9 100644
--- a/src/d_net.h
+++ b/src/d_net.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 3b7da8763229a52058f1d27915b5f59d1bc81de5..1f9a2608a07810b1064f6868ba4ea7b495d6e92f 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -47,6 +47,7 @@
#include "m_cond.h"
#include "m_anigif.h"
#include "md5.h"
+#include "m_perfstats.h"
#ifdef NETGAME_DEVMODE
#define CV_RESTRICT CV_NETVAR
@@ -67,7 +68,9 @@ static void Got_WeaponPref(UINT8 **cp, INT32 playernum);
static void Got_Mapcmd(UINT8 **cp, INT32 playernum);
static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum);
static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum);
+static void Got_RequestAddfoldercmd(UINT8 **cp, INT32 playernum);
static void Got_Addfilecmd(UINT8 **cp, INT32 playernum);
+static void Got_Addfoldercmd(UINT8 **cp, INT32 playernum);
static void Got_Pause(UINT8 **cp, INT32 playernum);
static void Got_Suicide(UINT8 **cp, INT32 playernum);
static void Got_RandomSeed(UINT8 **cp, INT32 playernum);
@@ -124,6 +127,7 @@ static void Command_Map_f(void);
static void Command_ResetCamera_f(void);
static void Command_Addfile(void);
+static void Command_Addfolder(void);
static void Command_ListWADS_f(void);
static void Command_RunSOC(void);
static void Command_Pause(void);
@@ -177,7 +181,7 @@ void SendWeaponPref(void);
void SendWeaponPref2(void);
static CV_PossibleValue_t usemouse_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Force"}, {0, NULL}};
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
static CV_PossibleValue_t mouse2port_cons_t[] = {{0, "/dev/gpmdata"}, {1, "/dev/ttyS0"},
{2, "/dev/ttyS1"}, {3, "/dev/ttyS2"}, {4, "/dev/ttyS3"}, {0, NULL}};
#else
@@ -264,7 +268,7 @@ consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_CALL, NULL, I_J
consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
#endif
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL);
consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", CV_SAVE, NULL, NULL);
#else
@@ -293,7 +297,7 @@ consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL
consvar_t cv_soundtest = CVAR_INIT ("soundtest", "0", CV_CALL, NULL, SoundTest_OnChange);
-static CV_PossibleValue_t minitimelimit_cons_t[] = {{15, "MIN"}, {9999, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t minitimelimit_cons_t[] = {{1, "MIN"}, {9999, "MAX"}, {0, NULL}};
consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", CV_SAVE|CV_NETVAR|CV_CHEAT, minitimelimit_cons_t, NULL);
consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
@@ -429,7 +433,14 @@ consvar_t cv_autoupdatetimefudge = {"autoupdatetimefudge", "No", 0, CV_YesNo, NU
static CV_PossibleValue_t perfstats_cons_t[] = {
{0, "Off"}, {1, "Rendering"}, {2, "Logic"}, {3, "ThinkFrame"}, {0, NULL}};
-consvar_t cv_perfstats = CVAR_INIT ("perfstats", "Off", 0, perfstats_cons_t, NULL);
+consvar_t cv_perfstats = CVAR_INIT ("perfstats", "Off", CV_CALL, perfstats_cons_t, PS_PerfStats_OnChange);
+static CV_PossibleValue_t ps_samplesize_cons_t[] = {
+ {1, "MIN"}, {1000, "MAX"}, {0, NULL}};
+consvar_t cv_ps_samplesize = CVAR_INIT ("ps_samplesize", "1", CV_CALL, ps_samplesize_cons_t, PS_SampleSize_OnChange);
+static CV_PossibleValue_t ps_descriptor_cons_t[] = {
+ {1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}};
+consvar_t cv_ps_descriptor = CVAR_INIT ("ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL);
+
consvar_t cv_freedemocamera = CVAR_INIT("freedemocamera", "Off", CV_SAVE, CV_OnOff, NULL);
char timedemo_name[256];
@@ -456,16 +467,16 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
"MAP",
"EXITLEVEL",
"ADDFILE",
+ "ADDFOLDER",
"PAUSE",
"ADDPLAYER",
"TEAMCHANGE",
"CLEARSCORES",
- "LOGIN",
"VERIFIED",
"RANDOMSEED",
"RUNSOC",
"REQADDFILE",
- "DELFILE", // replace next time we add an XD
+ "REQADDFOLDER",
"SETMOTD",
"SUICIDE",
"LUACMD",
@@ -499,7 +510,9 @@ void D_RegisterServerCommands(void)
RegisterNetXCmd(XD_MAP, Got_Mapcmd);
RegisterNetXCmd(XD_EXITLEVEL, Got_ExitLevelcmd);
RegisterNetXCmd(XD_ADDFILE, Got_Addfilecmd);
+ RegisterNetXCmd(XD_ADDFOLDER, Got_Addfoldercmd);
RegisterNetXCmd(XD_REQADDFILE, Got_RequestAddfilecmd);
+ RegisterNetXCmd(XD_REQADDFOLDER, Got_RequestAddfoldercmd);
RegisterNetXCmd(XD_PAUSE, Got_Pause);
RegisterNetXCmd(XD_SUICIDE, Got_Suicide);
RegisterNetXCmd(XD_RUNSOC, Got_RunSOCcmd);
@@ -530,6 +543,7 @@ void D_RegisterServerCommands(void)
COM_AddCommand("showmap", Command_Showmap_f);
COM_AddCommand("mapmd5", Command_Mapmd5_f);
+ COM_AddCommand("addfolder", Command_Addfolder);
COM_AddCommand("addfile", Command_Addfile);
COM_AddCommand("listwad", Command_ListWADS_f);
@@ -954,7 +968,7 @@ void D_RegisterClientCommands(void)
// WARNING: the order is important when initialising mouse2
// we need the mouse2port
CV_RegisterVar(&cv_mouse2port);
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
CV_RegisterVar(&cv_mouse2opt);
#endif
CV_RegisterVar(&cv_controlperkey);
@@ -1027,6 +1041,8 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_soundtest);
CV_RegisterVar(&cv_perfstats);
+ CV_RegisterVar(&cv_ps_samplesize);
+ CV_RegisterVar(&cv_ps_descriptor);
// ingame object placing
COM_AddCommand("objectplace", Command_ObjectPlace_f);
@@ -1486,8 +1502,9 @@ static void SendNameAndColor(void)
cv_skin.value = R_SkinAvailable(cv_skin.string);
if ((cv_skin.value < 0) || !R_SkinUsable(consoleplayer, cv_skin.value))
{
- CV_StealthSet(&cv_skin, DEFAULTSKIN);
- cv_skin.value = 0;
+ INT32 defaultSkinNum = GetPlayerDefaultSkin(consoleplayer);
+ CV_StealthSet(&cv_skin, skins[defaultSkinNum].name);
+ cv_skin.value = defaultSkinNum;
}
// Finally write out the complete packet and send it off.
@@ -1648,7 +1665,8 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
if (server && (p != &players[consoleplayer] && p != &players[secondarydisplayplayer]))
{
boolean kick = false;
- INT32 s;
+ UINT32 unlockShift = 0;
+ UINT32 i;
// team colors
if (G_GametypeHasTeams())
@@ -1664,12 +1682,29 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
kick = true;
// availabilities
- for (s = 0; s < MAXSKINS; s++)
+ for (i = 0; i < MAXUNLOCKABLES; i++)
+ {
+ if (unlockables[i].type != SECRET_SKIN)
+ {
+ continue;
+ }
+
+ unlockShift++;
+ }
+
+ // If they set an invalid bit to true, then likely a modified client
+ if (unlockShift < 32) // 32 is the max the data type allows
{
- if (!skins[s].availability && (p->availabilities & (1 << s)))
+ UINT32 illegalMask = UINT32_MAX;
+
+ for (i = 0; i < unlockShift; i++)
+ {
+ illegalMask &= ~(1 << i);
+ }
+
+ if ((p->availabilities & illegalMask) != 0)
{
kick = true;
- break;
}
}
@@ -2278,7 +2313,7 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
}
mapnumber = M_MapNumber(mapname[3], mapname[4]);
- LUAh_MapChange(mapnumber);
+ LUA_HookInt(mapnumber, HOOK(MapChange));
G_InitNew(ultimatemode, mapname, resetplayer, skipprecutscene, FLS);
if (demoplayback && !timingdemo)
@@ -2867,7 +2902,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
}
// Don't switch team, just go away, please, go awaayyyy, aaauuauugghhhghgh
- if (!LUAh_TeamSwitch(&players[playernum], NetPacket.packet.newteam, players[playernum].spectator, NetPacket.packet.autobalance, NetPacket.packet.scrambled))
+ if (!LUA_HookTeamSwitch(&players[playernum], NetPacket.packet.newteam, players[playernum].spectator, NetPacket.packet.autobalance, NetPacket.packet.scrambled))
return;
//no status changes after hidetime
@@ -3028,7 +3063,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
if (displayplayer != consoleplayer) // You're already viewing yourself. No big deal.
- LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
+ LUA_HookViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -3382,7 +3417,7 @@ static void Command_RunSOC(void)
static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
{
char filename[256];
- filestatus_t ncs = FS_NOTFOUND;
+ filestatus_t ncs = FS_NOTCHECKED;
if (playernum != serverplayer && !IsPlayerAdmin(playernum))
{
@@ -3506,10 +3541,9 @@ static void Command_Addfile(void)
break;
++p;
- // check total packet size and no of files currently loaded
+ // check no of files currently loaded
// See W_LoadWadFile in w_wad.c
- if ((numwadfiles >= MAX_WADFILES)
- || ((packetsizetally + nameonlylength(fn) + 22) > MAXFILENEEDED*sizeof(UINT8)))
+ if (numwadfiles >= MAX_WADFILES)
{
CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
return;
@@ -3538,6 +3572,9 @@ static void Command_Addfile(void)
for (i = 0; i < numwadfiles; i++)
{
+ if (wadfiles[i]->type == RET_FOLDER)
+ continue;
+
if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
{
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn);
@@ -3557,10 +3594,142 @@ static void Command_Addfile(void)
}
}
+static void Command_Addfolder(void)
+{
+ size_t argc = COM_Argc(); // amount of arguments total
+ size_t curarg; // current argument index
+
+ const char *addedfolders[argc]; // list of filenames already processed
+ size_t numfoldersadded = 0; // the amount of filenames processed
+
+ if (argc < 2)
+ {
+ CONS_Printf(M_GetText("addfolder <path> [path2...] [...]: Load add-ons\n"));
+ return;
+ }
+
+ // start at one to skip command name
+ for (curarg = 1; curarg < argc; curarg++)
+ {
+ const char *fn, *p;
+ char *fullpath;
+ char buf[256];
+ char *buf_p = buf;
+ INT32 i, stat;
+ size_t ii;
+ boolean folderadded = false;
+
+ fn = COM_Argv(curarg);
+
+ // For the amount of filenames previously processed...
+ for (ii = 0; ii < numfoldersadded; ii++)
+ {
+ // If this is one of them, don't try to add it.
+ if (!strcmp(fn, addedfolders[ii]))
+ {
+ folderadded = true;
+ break;
+ }
+ }
+
+ // If we've added this one, skip to the next one.
+ if (folderadded)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Already processed %s, skipping\n"), fn);
+ continue;
+ }
+
+ // Disallow non-printing characters and semicolons.
+ for (i = 0; fn[i] != '\0'; i++)
+ if (!isprint(fn[i]) || fn[i] == ';')
+ return;
+
+ // Add file on your client directly if you aren't in a netgame.
+ if (!(netgame || multiplayer))
+ {
+ P_AddFolder(fn);
+ addedfolders[numfoldersadded++] = fn;
+ continue;
+ }
+
+ p = fn+strlen(fn);
+ while(--p >= fn)
+ if (*p == '\\' || *p == '/' || *p == ':')
+ break;
+ ++p;
+
+ // Don't add an empty path.
+ if (M_IsStringEmpty(fn))
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Folder name is empty, skipping\n"));
+ continue;
+ }
+
+ // check no of files currently loaded
+ // See W_LoadWadFile in w_wad.c
+ if (numwadfiles >= MAX_WADFILES)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
+ return;
+ }
+
+ // Check if the path is valid.
+ stat = W_IsPathToFolderValid(fn);
+
+ if (stat == 0)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Path %s is invalid, skipping\n"), fn);
+ continue;
+ }
+ else if (stat < 0)
+ {
+#ifndef AVOID_ERRNO
+ CONS_Alert(CONS_WARNING, M_GetText("Error accessing %s (%s), skipping\n"), fn, strerror(direrror));
+#else
+ CONS_Alert(CONS_WARNING, M_GetText("Error accessing %s, skipping\n"), fn);
+#endif
+ continue;
+ }
+
+ // Get the full path for this folder.
+ fullpath = W_GetFullFolderPath(fn);
+
+ if (fullpath == NULL)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Path %s is invalid, skipping\n"), fn);
+ continue;
+ }
+
+ // Check if the folder is already added.
+ for (i = 0; i < numwadfiles; i++)
+ {
+ if (wadfiles[i]->type != RET_FOLDER)
+ continue;
+
+ if (samepaths(wadfiles[i]->path, fullpath) > 0)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn);
+ continue;
+ }
+ }
+
+ Z_Free(fullpath);
+
+ addedfolders[numfoldersadded++] = fn;
+
+ WRITESTRINGN(buf_p,p,240);
+
+ if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file
+ SendNetXCmd(XD_REQADDFOLDER, buf, buf_p - buf);
+ else
+ SendNetXCmd(XD_ADDFOLDER, buf, buf_p - buf);
+ }
+}
+
static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
{
char filename[241];
- filestatus_t ncs = FS_NOTFOUND;
+ filestatus_t ncs = FS_NOTCHECKED;
UINT8 md5sum[16];
boolean kick = false;
boolean toomany = false;
@@ -3585,9 +3754,7 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
return;
}
- // See W_LoadWadFile in w_wad.c
- if ((numwadfiles >= MAX_WADFILES)
- || ((packetsizetally + nameonlylength(filename) + 22) > MAXFILENEEDED*sizeof(UINT8)))
+ if (numwadfiles >= MAX_WADFILES)
toomany = true;
else
ncs = findfile(filename,md5sum,true);
@@ -3617,10 +3784,66 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
COM_BufAddText(va("addfile %s\n", filename));
}
+static void Got_RequestAddfoldercmd(UINT8 **cp, INT32 playernum)
+{
+ char path[241];
+ filestatus_t ncs = FS_NOTCHECKED;
+ boolean kick = false;
+ boolean toomany = false;
+ INT32 i,j;
+
+ READSTRINGN(*cp, path, 240);
+
+ /// \todo Integrity checks.
+
+ // Only the server processes this message.
+ if (client)
+ return;
+
+ // Disallow non-printing characters and semicolons.
+ for (i = 0; path[i] != '\0'; i++)
+ if (!isprint(path[i]) || path[i] == ';')
+ kick = true;
+
+ if ((playernum != serverplayer && !IsPlayerAdmin(playernum)) || kick)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Illegal addfolder command received from %s\n"), player_names[playernum]);
+ SendKick(playernum, KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY);
+ return;
+ }
+
+ if (numwadfiles >= MAX_WADFILES)
+ toomany = true;
+ else
+ ncs = findfolder(path);
+
+ if (ncs != FS_FOUND || toomany)
+ {
+ char message[256];
+
+ if (toomany)
+ sprintf(message, M_GetText("Too many files loaded to add %s\n"), path);
+ else if (ncs == FS_NOTFOUND)
+ sprintf(message, M_GetText("The server doesn't have %s\n"), path);
+ else
+ sprintf(message, M_GetText("Unknown error finding folder (%s)\n"), path);
+
+ CONS_Printf("%s",message);
+
+ for (j = 0; j < MAXPLAYERS; j++)
+ if (adminplayers[j])
+ COM_BufAddText(va("sayto %d %s", adminplayers[j], message));
+
+ return;
+ }
+
+ COM_BufAddText(va("addfolder \"%s\"\n", path));
+}
+
static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
{
char filename[241];
- filestatus_t ncs = FS_NOTFOUND;
+ filestatus_t ncs = FS_NOTCHECKED;
UINT8 md5sum[16];
READSTRINGN(*cp, filename, 240);
@@ -3665,20 +3888,71 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
G_SetGameModified(true);
}
+static void Got_Addfoldercmd(UINT8 **cp, INT32 playernum)
+{
+ char path[241];
+ filestatus_t ncs = FS_NOTCHECKED;
+
+ READSTRINGN(*cp, path, 240);
+
+ /// \todo Integrity checks.
+
+ if (playernum != serverplayer)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Illegal addfolder command received from %s\n"), player_names[playernum]);
+ if (server)
+ SendKick(playernum, KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY);
+ return;
+ }
+
+ ncs = findfolder(path);
+
+ if (ncs != FS_FOUND || !P_AddFolder(path))
+ {
+ Command_ExitGame_f();
+ if (ncs == FS_FOUND)
+ {
+ CONS_Printf(M_GetText("The server tried to add %s,\nbut you have too many files added.\nRestart the game to clear loaded files\nand play on this server."), path);
+ M_StartMessage(va("The server added a folder \n(%s)\nbut you have too many files added.\nRestart the game to clear loaded files.\n\nPress ESC\n",path), NULL, MM_NOTHING);
+ }
+ else if (ncs == FS_NOTFOUND)
+ {
+ CONS_Printf(M_GetText("The server tried to add %s,\nbut you don't have this file.\nYou need to find it in order\nto play on this server."), path);
+ M_StartMessage(va("The server added a folder \n(%s)\nthat you do not have.\n\nPress ESC\n",path), NULL, MM_NOTHING);
+ }
+ else
+ {
+ CONS_Printf(M_GetText("Unknown error finding folder (%s) the server added.\n"), path);
+ M_StartMessage(va("Unknown error trying to load a folder\nthat the server added \n(%s).\n\nPress ESC\n",path), NULL, MM_NOTHING);
+ }
+ return;
+ }
+
+ G_SetGameModified(true);
+}
+
static void Command_ListWADS_f(void)
{
INT32 i = numwadfiles;
char *tempname;
- CONS_Printf(M_GetText("There are %d wads loaded:\n"),numwadfiles);
+
+#ifdef ENFORCE_WAD_LIMIT
+ CONS_Printf(M_GetText("There are %d/%d files loaded:\n"),numwadfiles,MAX_WADFILES);
+#else
+ CONS_Printf(M_GetText("There are %d files loaded:\n"),numwadfiles);
+#endif
+
for (i--; i >= 0; i--)
{
nameonly(tempname = va("%s", wadfiles[i]->filename));
if (!i)
CONS_Printf("\x82 IWAD\x80: %s\n", tempname);
- else if (i <= mainwads)
+ else if (i < mainwads)
CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname);
else if (!wadfiles[i]->important)
CONS_Printf("\x86 %.2d: %s\n", i, tempname);
+ else if (wadfiles[i]->type == RET_FOLDER)
+ CONS_Printf("\x82 * %.2d\x84: %s\n", i, tempname);
else
CONS_Printf(" %.2d: %s\n", i, tempname);
}
@@ -3791,7 +4065,7 @@ static void Command_Playintro_f(void)
*/
FUNCNORETURN static ATTRNORETURN void Command_Quit_f(void)
{
- LUAh_GameQuit(true);
+ LUA_HookBool(true, HOOK(GameQuit));
I_Quit();
}
@@ -4462,7 +4736,7 @@ void Command_ExitGame_f(void)
{
INT32 i;
- LUAh_GameQuit(false);
+ LUA_HookBool(false, HOOK(GameQuit));
D_QuitNetGame();
CL_Reset();
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index def02aa2980ae2d9f65372e9ed3f789b38fecae4..d9723b6ee70b4b4b6f03144681ed87710c01925f 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -47,7 +47,7 @@ extern consvar_t cv_joyscale2;
// splitscreen with second mouse
extern consvar_t cv_mouse2port;
extern consvar_t cv_usemouse2;
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
extern consvar_t cv_mouse2opt;
#endif
@@ -76,6 +76,7 @@ extern consvar_t cv_scrambleonchange;
extern consvar_t cv_netstat;
extern consvar_t cv_netsimstat;
+extern consvar_t cv_nettimeout;
extern consvar_t cv_countdowntime;
extern consvar_t cv_runscripts;
@@ -132,6 +133,8 @@ extern consvar_t cv_skipmapcheck;
extern consvar_t cv_sleep;
extern consvar_t cv_perfstats;
+extern consvar_t cv_ps_samplesize;
+extern consvar_t cv_ps_descriptor;
extern char timedemo_name[256];
extern boolean timedemo_csv;
@@ -150,16 +153,16 @@ typedef enum
XD_MAP, // 6
XD_EXITLEVEL, // 7
XD_ADDFILE, // 8
- XD_PAUSE, // 9
- XD_ADDPLAYER, // 10
- XD_TEAMCHANGE, // 11
- XD_CLEARSCORES, // 12
- // UNUSED 13 (Because I don't want to change these comments)
- XD_VERIFIED = 14,//14
+ XD_ADDFOLDER, // 9
+ XD_PAUSE, // 10
+ XD_ADDPLAYER, // 11
+ XD_TEAMCHANGE, // 12
+ XD_CLEARSCORES, // 13
+ XD_VERIFIED, // 14
XD_RANDOMSEED, // 15
XD_RUNSOC, // 16
XD_REQADDFILE, // 17
- XD_DELFILE, // 18 - replace next time we add an XD
+ XD_REQADDFOLDER,// 18
XD_SETMOTD, // 19
XD_SUICIDE, // 20
XD_DEMOTED, // 21
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 9618c80732fa95c4dad41fdc3848ff6c28b0785a..37fb7265f8abe714d90dab7c0882f55d73bc1cb0 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -15,7 +15,7 @@
#include <time.h>
-#if defined (_WIN32) || defined (__DJGPP__)
+#ifdef _WIN32
#include <io.h>
#include <direct.h>
#else
@@ -30,10 +30,6 @@
#elif defined (_WIN32)
#include <sys/utime.h>
#endif
-#ifdef __DJGPP__
-#include <dir.h>
-#include <utime.h>
-#endif
#include "doomdef.h"
#include "doomstat.h"
@@ -56,7 +52,7 @@
#include <errno.h>
// Prototypes
-static boolean AddFileToSendQueue(INT32 node, const char *filename, UINT8 fileid);
+static boolean AddFileToSendQueue(INT32 node, UINT8 fileid);
// Sender structure
typedef struct filetx_s
@@ -91,7 +87,7 @@ static filetran_t transfer[MAXNETNODES];
// Receiver structure
INT32 fileneedednum; // Number of files needed to join the server
-fileneeded_t fileneeded[MAX_WADFILES]; // List of needed files
+fileneeded_t *fileneeded; // List of needed files
static tic_t lasttimeackpacketsent = 0;
char downloaddir[512] = "DOWNLOAD";
@@ -109,6 +105,10 @@ static pauseddownload_t *pauseddownload = NULL;
#ifndef NONET
// for cl loading screen
INT32 lastfilenum = -1;
+INT32 downloadcompletednum = 0;
+UINT32 downloadcompletedsize = 0;
+INT32 totalfilesrequestednum = 0;
+UINT32 totalfilesrequestedsize = 0;
#endif
luafiletransfer_t *luafiletransfers = NULL;
@@ -117,29 +117,67 @@ boolean waitingforluafilecommand = false;
char luafiledir[256 + 16] = "luafiles";
+static UINT16 GetWadNumFromFileNeededId(UINT8 id)
+{
+ UINT16 wadnum;
+
+ for (wadnum = mainwads; wadnum < numwadfiles; wadnum++)
+ {
+ if (!wadfiles[wadnum]->important)
+ continue;
+ if (id == 0)
+ return wadnum;
+ id--;
+ }
+
+ return UINT16_MAX;
+}
+
/** Fills a serverinfo packet with information about wad files loaded.
*
* \todo Give this function a better name since it is in global scope.
- * Used to have size limiting built in - now handled via W_LoadWadFile in w_wad.c
+ * Used to have size limiting built in - now handled via W_InitFile in w_wad.c
*
*/
-UINT8 *PutFileNeeded(void)
+UINT8 *PutFileNeeded(UINT16 firstfile)
{
- size_t i, count = 0;
- UINT8 *p = netbuffer->u.serverinfo.fileneeded;
+ size_t i;
+ UINT8 count = 0;
+ UINT8 *p_start = netbuffer->packettype == PT_MOREFILESNEEDED ? netbuffer->u.filesneededcfg.files : netbuffer->u.serverinfo.fileneeded;
+ UINT8 *p = p_start;
char wadfilename[MAX_WADPATH] = "";
- UINT8 filestatus;
+ UINT8 filestatus, folder;
- for (i = 0; i < numwadfiles; i++)
+ for (i = mainwads; i < numwadfiles; i++) //mainwads, otherwise we start on the first mainwad
{
// If it has only music/sound lumps, don't put it in the list
if (!wadfiles[i]->important)
continue;
+ if (firstfile)
+ { // Skip files until we reach the first file.
+ firstfile--;
+ continue;
+ }
+
+ nameonly(strcpy(wadfilename, wadfiles[i]->filename));
+
+ // Look below at the WRITE macros to understand what these numbers mean.
+ if (p + 1 + 4 + min(strlen(wadfilename) + 1, MAX_WADPATH) + 16 > p_start + MAXFILENEEDED)
+ {
+ // Too many files to send all at once
+ if (netbuffer->packettype == PT_MOREFILESNEEDED)
+ netbuffer->u.filesneededcfg.more = 1;
+ else
+ netbuffer->u.serverinfo.flags |= SV_LOTSOFADDONS;
+ break;
+ }
+
filestatus = 1; // Importance - not really used any more, holds 1 by default for backwards compat with MS
+ folder = (wadfiles[i]->type == RET_FOLDER);
// Store in the upper four bits
- if (!cv_downloading.value)
+ if (!cv_downloading.value || folder) /// \todo Implement folder downloading.
filestatus += (2 << 4); // Won't send
else if ((wadfiles[i]->filesize <= (UINT32)cv_maxsend.value * 1024))
filestatus += (1 << 4); // Will send if requested
@@ -147,37 +185,60 @@ UINT8 *PutFileNeeded(void)
// filestatus += (0 << 4); -- Won't send, too big
WRITEUINT8(p, filestatus);
+ WRITEUINT8(p, folder);
count++;
WRITEUINT32(p, wadfiles[i]->filesize);
- nameonly(strcpy(wadfilename, wadfiles[i]->filename));
WRITESTRINGN(p, wadfilename, MAX_WADPATH);
WRITEMEM(p, wadfiles[i]->md5sum, 16);
}
- netbuffer->u.serverinfo.fileneedednum = (UINT8)count;
+
+ if (netbuffer->packettype == PT_MOREFILESNEEDED)
+ netbuffer->u.filesneededcfg.num = count;
+ else
+ netbuffer->u.serverinfo.fileneedednum = count;
return p;
}
+void AllocFileNeeded(INT32 size)
+{
+ if (fileneeded == NULL)
+ fileneeded = Z_Calloc(sizeof(fileneeded_t) * size, PU_STATIC, NULL);
+ else
+ fileneeded = Z_Realloc(fileneeded, sizeof(fileneeded_t) * size, PU_STATIC, NULL);
+}
+
+void FreeFileNeeded(void)
+{
+ Z_Free(fileneeded);
+ fileneeded = NULL;
+}
+
/** Parses the serverinfo packet and fills the fileneeded table on client
*
* \param fileneedednum_parm The number of files needed to join the server
* \param fileneededstr The memory block containing the list of needed files
*
*/
-void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr)
+void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 firstfile)
{
INT32 i;
UINT8 *p;
UINT8 filestatus;
- fileneedednum = fileneedednum_parm;
+ fileneedednum = firstfile + fileneedednum_parm;
p = (UINT8 *)fileneededstr;
- for (i = 0; i < fileneedednum; i++)
+
+ AllocFileNeeded(fileneedednum);
+
+ for (i = firstfile; i < fileneedednum; i++)
{
- fileneeded[i].status = FS_NOTFOUND; // We haven't even started looking for the file yet
+ fileneeded[i].type = FILENEEDED_WAD;
+ fileneeded[i].status = FS_NOTCHECKED; // We haven't even started looking for the file yet
fileneeded[i].justdownloaded = false;
filestatus = READUINT8(p); // The first byte is the file status
+ fileneeded[i].folder = READUINT8(p); // The second byte is the folder flag
fileneeded[i].willsend = (UINT8)(filestatus >> 4);
fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
fileneeded[i].file = NULL; // The file isn't open yet
@@ -192,7 +253,11 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave)
lastfilenum = -1;
#endif
+ FreeFileNeeded();
+ AllocFileNeeded(1);
+
fileneedednum = 1;
+ fileneeded[0].type = FILENEEDED_SAVEGAME;
fileneeded[0].status = FS_REQUESTED;
fileneeded[0].justdownloaded = false;
fileneeded[0].totalsize = UINT32_MAX;
@@ -323,14 +388,18 @@ boolean CL_SendFileRequest(void)
if ((fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD))
{
totalfreespaceneeded += fileneeded[i].totalsize;
- nameonly(fileneeded[i].filename);
+
WRITEUINT8(p, i); // fileid
- WRITESTRINGN(p, fileneeded[i].filename, MAX_WADPATH);
+
// put it in download dir
+ nameonly(fileneeded[i].filename);
strcatbf(fileneeded[i].filename, downloaddir, "/");
+
fileneeded[i].status = FS_REQUESTED;
}
+
WRITEUINT8(p, 0xFF);
+
I_GetDiskFreeSpace(&availablefreespace);
if (totalfreespaceneeded > availablefreespace)
I_Error("To play on this server you must download %s KB,\n"
@@ -346,21 +415,22 @@ boolean CL_SendFileRequest(void)
// returns false if a requested file was not found or cannot be sent
boolean PT_RequestFile(INT32 node)
{
- char wad[MAX_WADPATH+1];
UINT8 *p = netbuffer->u.textcmd;
UINT8 id;
+
while (p < netbuffer->u.textcmd + MAXTEXTCMD-1) // Don't allow hacked client to overflow
{
id = READUINT8(p);
if (id == 0xFF)
break;
- READSTRINGN(p, wad, MAX_WADPATH);
- if (!AddFileToSendQueue(node, wad, id))
+
+ if (!AddFileToSendQueue(node, id))
{
SV_AbortSendFiles(node);
return false; // don't read the rest of the files
}
}
+
return true; // no problems with any files
}
@@ -369,23 +439,16 @@ boolean PT_RequestFile(INT32 node)
* \return 0 if some files are missing
* 1 if all files exist
* 2 if some already loaded files are not requested or are in a different order
+ * 3 too many files, over WADLIMIT
+ * 4 still checking, continuing next tic
*
*/
INT32 CL_CheckFiles(void)
{
INT32 i, j;
char wadfilename[MAX_WADPATH];
- INT32 ret = 1;
- size_t packetsize = 0;
- size_t filestoget = 0;
-
-// if (M_CheckParm("-nofiles"))
-// return 1;
-
- // the first is the iwad (the main wad file)
- // we don't care if it's called srb2.pk3 or not.
- // Never download the IWAD, just assume it's there and identical
- fileneeded[0].status = FS_OPEN;
+ size_t filestoload = 0;
+ boolean downloadrequired = false;
// Modified game handling -- check for an identical file list
// must be identical in files loaded AND in order
@@ -393,7 +456,7 @@ INT32 CL_CheckFiles(void)
if (modifiedgame)
{
CONS_Debug(DBG_NETPLAY, "game is modified; only doing basic checks\n");
- for (i = 1, j = 1; i < fileneedednum || j < numwadfiles;)
+ for (i = 0, j = mainwads; i < fileneedednum || j < numwadfiles;)
{
if (j < numwadfiles && !wadfiles[j]->important)
{
@@ -420,15 +483,21 @@ INT32 CL_CheckFiles(void)
return 1;
}
- // See W_LoadWadFile in w_wad.c
- packetsize = packetsizetally;
-
- for (i = 1; i < fileneedednum; i++)
+ for (i = 0; i < fileneedednum; i++)
{
+ if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
+ downloadrequired = true;
+
+ if (fileneeded[i].status != FS_OPEN)
+ filestoload++;
+
+ if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
+ continue;
+
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
// Check in already loaded files
- for (j = 1; wadfiles[j]; j++)
+ for (j = mainwads; wadfiles[j]; j++)
{
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
if (!stricmp(wadfilename, fileneeded[i].filename) &&
@@ -436,45 +505,46 @@ INT32 CL_CheckFiles(void)
{
CONS_Debug(DBG_NETPLAY, "already loaded\n");
fileneeded[i].status = FS_OPEN;
- break;
+ return 4;
}
}
- if (fileneeded[i].status != FS_NOTFOUND)
- continue;
-
- packetsize += nameonlylength(fileneeded[i].filename) + 22;
-
- if ((numwadfiles+filestoget >= MAX_WADFILES)
- || (packetsize > MAXFILENEEDED*sizeof(UINT8)))
- return 3;
- filestoget++;
+ if (fileneeded[i].folder)
+ fileneeded[i].status = findfolder(fileneeded[i].filename);
+ else
+ fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true);
- fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true);
CONS_Debug(DBG_NETPLAY, "found %d\n", fileneeded[i].status);
- if (fileneeded[i].status != FS_FOUND)
- ret = 0;
+ return 4;
}
- return ret;
+
+ //now making it here means we've checked the entire list and no FS_NOTCHECKED files remain
+ if (numwadfiles+filestoload > MAX_WADFILES)
+ return 3;
+ else if (downloadrequired)
+ return 0; //some stuff is FS_NOTFOUND, needs download
+ else
+ return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
}
// Load it now
-void CL_LoadServerFiles(void)
+boolean CL_LoadServerFiles(void)
{
INT32 i;
-// if (M_CheckParm("-nofiles"))
-// return;
-
- for (i = 1; i < fileneedednum; i++)
+ for (i = 0; i < fileneedednum; i++)
{
if (fileneeded[i].status == FS_OPEN)
continue; // Already loaded
else if (fileneeded[i].status == FS_FOUND)
{
- P_AddWadFile(fileneeded[i].filename);
+ if (fileneeded[i].folder)
+ P_AddFolder(fileneeded[i].filename);
+ else
+ P_AddWadFile(fileneeded[i].filename);
G_SetGameModified(true);
fileneeded[i].status = FS_OPEN;
+ return false;
}
else if (fileneeded[i].status == FS_MD5SUMBAD)
I_Error("Wrong version of file %s", fileneeded[i].filename);
@@ -500,6 +570,7 @@ void CL_LoadServerFiles(void)
fileneeded[i].status, s);
}
}
+ return true;
}
void AddLuaFileTransfer(const char *filename, const char *mode)
@@ -681,7 +752,11 @@ void CL_PrepareDownloadLuaFile(void)
netbuffer->packettype = PT_ASKLUAFILE;
HSendPacket(servernode, true, 0, 0);
+ FreeFileNeeded();
+ AllocFileNeeded(1);
+
fileneedednum = 1;
+ fileneeded[0].type = FILENEEDED_LUAFILE;
fileneeded[0].status = FS_REQUESTED;
fileneeded[0].justdownloaded = false;
fileneeded[0].totalsize = UINT32_MAX;
@@ -708,15 +783,11 @@ static INT32 filestosend = 0;
* \sa AddLuaFileToSendQueue
*
*/
-static boolean AddFileToSendQueue(INT32 node, const char *filename, UINT8 fileid)
+static boolean AddFileToSendQueue(INT32 node, UINT8 fileid)
{
filetx_t **q; // A pointer to the "next" field of the last file in the list
filetx_t *p; // The new file request
- INT32 i;
- char wadfilename[MAX_WADPATH];
-
- if (cv_noticedownload.value)
- CONS_Printf("Sending file \"%s\" to node %d (%s)\n", filename, node, I_GetNodeAddress(node));
+ UINT16 wadnum;
// Find the last file in the list and set a pointer to its "next" field
q = &transfer[node].txlist;
@@ -736,51 +807,43 @@ static boolean AddFileToSendQueue(INT32 node, const char *filename, UINT8 fileid
if (!p->id.filename)
I_Error("AddFileToSendQueue: No more memory\n");
- // Set the file name and get rid of the path
- strlcpy(p->id.filename, filename, MAX_WADPATH);
- nameonly(p->id.filename);
-
- // Look for the requested file through all loaded files
- for (i = 0; wadfiles[i]; i++)
- {
- strlcpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH);
- nameonly(wadfilename);
- if (!stricmp(wadfilename, p->id.filename))
- {
- // Copy file name with full path
- strlcpy(p->id.filename, wadfiles[i]->filename, MAX_WADPATH);
- break;
- }
- }
+ // Find the wad the ID refers to
+ wadnum = GetWadNumFromFileNeededId(fileid);
// Handle non-loaded file requests
- if (!wadfiles[i])
+ if (wadnum == UINT16_MAX)
{
- DEBFILE(va("%s not found in wadfiles\n", filename));
+ DEBFILE(va("fileneeded %d not found in wadfiles\n", fileid));
// This formerly checked if (!findfile(p->id.filename, NULL, true))
// Not found
- // Don't inform client (probably someone who thought they could leak 2.2 ACZ)
- DEBFILE(va("Client %d request %s: not found\n", node, filename));
+ // Don't inform client
+ DEBFILE(va("Client %d request fileneeded %d: not found\n", node, fileid));
free(p->id.filename);
free(p);
*q = NULL;
return false; // cancel the rest of the requests
}
+ // Set the file name and get rid of the path
+ strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH);
+
// Handle huge file requests (i.e. bigger than cv_maxsend.value KB)
- if (wadfiles[i]->filesize > (UINT32)cv_maxsend.value * 1024)
+ if (wadfiles[wadnum]->filesize > (UINT32)cv_maxsend.value * 1024)
{
// Too big
// Don't inform client (client sucks, man)
- DEBFILE(va("Client %d request %s: file too big, not sending\n", node, filename));
+ DEBFILE(va("Client %d request %s: file too big, not sending\n", node, p->id.filename));
free(p->id.filename);
free(p);
*q = NULL;
return false; // cancel the rest of the requests
}
- DEBFILE(va("Sending file %s (id=%d) to %d\n", filename, fileid, node));
+ if (cv_noticedownload.value)
+ CONS_Printf("Sending file \"%s\" to node %d (%s)\n", p->id.filename, node, I_GetNodeAddress(node));
+
+ DEBFILE(va("Sending file %s (id=%d) to %d\n", p->id.filename, fileid, node));
p->ram = SF_FILE; // It's a file, we need to close it and free its name once we're done sending it
p->fileid = fileid;
p->next = NULL; // End of list
@@ -917,7 +980,6 @@ static void SV_EndFileSend(INT32 node)
filestosend--;
}
-#define PACKETPERTIC net_bandwidth/(TICRATE*software_MAXPACKETLENGTH)
#define FILEFRAGMENTSIZE (software_MAXPACKETLENGTH - (FILETXHEADER + BASEPACKETSIZE))
/** Handles file transmission
@@ -950,14 +1012,7 @@ void FileSendTicker(void)
if (!filestosend) // No file to send
return;
- if (cv_downloadspeed.value) // New behavior
- packetsent = cv_downloadspeed.value;
- else // Old behavior
- {
- packetsent = PACKETPERTIC;
- if (!packetsent)
- packetsent = 1;
- }
+ packetsent = cv_downloadspeed.value;
netbuffer->packettype = PT_FILEFRAGMENT;
@@ -1234,6 +1289,9 @@ void PT_FileFragment(void)
UINT16 boundedfragmentsize = doomcom->datalength - BASEPACKETSIZE - sizeof(netbuffer->u.filetxpak);
char *filename;
+ if (!file)
+ return;
+
filename = va("%s", file->filename);
nameonly(filename);
@@ -1345,6 +1403,7 @@ void PT_FileFragment(void)
// Tell the server we have received the file
netbuffer->packettype = PT_HASLUAFILE;
HSendPacket(servernode, true, 0, 0);
+ FreeFileNeeded();
}
}
}
@@ -1415,32 +1474,37 @@ void CloseNetFile(void)
SV_AbortSendFiles(i);
// Receiving a file?
- for (i = 0; i < MAX_WADFILES; i++)
- if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file)
- {
- fclose(fileneeded[i].file);
- free(fileneeded[i].ackpacket);
-
- if (!pauseddownload && i != 0) // 0 is either srb2.srb or the gamestate...
- {
- // Don't remove the file, save it for later in case we resume the download
- pauseddownload = malloc(sizeof(*pauseddownload));
- if (!pauseddownload)
- I_Error("CloseNetFile: No more memory\n");
-
- strcpy(pauseddownload->filename, fileneeded[i].filename);
- memcpy(pauseddownload->md5sum, fileneeded[i].md5sum, 16);
- pauseddownload->currentsize = fileneeded[i].currentsize;
- pauseddownload->receivedfragments = fileneeded[i].receivedfragments;
- pauseddownload->fragmentsize = fileneeded[i].fragmentsize;
- }
- else
+ if (fileneeded)
+ {
+ for (i = 0; i < fileneedednum; i++)
+ if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file)
{
- free(fileneeded[i].receivedfragments);
- // File is not complete delete it
- remove(fileneeded[i].filename);
+ fclose(fileneeded[i].file);
+ free(fileneeded[i].ackpacket);
+
+ if (!pauseddownload && (fileneeded[i].type == FILENEEDED_WAD || i != 0)) // 0 is the gamestate...
+ {
+ // Don't remove the file, save it for later in case we resume the download
+ pauseddownload = malloc(sizeof(*pauseddownload));
+ if (!pauseddownload)
+ I_Error("CloseNetFile: No more memory\n");
+
+ strcpy(pauseddownload->filename, fileneeded[i].filename);
+ memcpy(pauseddownload->md5sum, fileneeded[i].md5sum, 16);
+ pauseddownload->currentsize = fileneeded[i].currentsize;
+ pauseddownload->receivedfragments = fileneeded[i].receivedfragments;
+ pauseddownload->fragmentsize = fileneeded[i].fragmentsize;
+ }
+ else
+ {
+ // File is not complete, delete it.
+ free(fileneeded[i].receivedfragments);
+ remove(fileneeded[i].filename);
+ }
}
- }
+ }
+
+ FreeFileNeeded();
}
void Command_Downloads_f(void)
@@ -1575,3 +1639,26 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
return (badmd5 ? FS_MD5SUMBAD : FS_NOTFOUND); // md5 sum bad or file not found
}
+
+// Searches for a folder.
+// This can be used with a full path, or an incomplete path.
+// In the latter case, the function will try to find folders in
+// srb2home, srb2path, and the current directory.
+filestatus_t findfolder(const char *path)
+{
+ // Check the path by itself first.
+ if (concatpaths(path, NULL) == 1)
+ return FS_FOUND;
+
+#define checkpath(startpath) \
+ if (concatpaths(path, startpath) == 1) \
+ return FS_FOUND
+
+ checkpath(srb2home); // Then, look in srb2home.
+ checkpath(srb2path); // Now, look in srb2path.
+ checkpath("."); // Finally, look in the current directory.
+
+#undef checkpath
+
+ return FS_NOTFOUND;
+}
diff --git a/src/d_netfil.h b/src/d_netfil.h
index ddcbcfec385b64c45bef9438992be47e8bbaf047..f778a518ff2eee3076170885ac9bdded15cd9f8f 100644
--- a/src/d_netfil.h
+++ b/src/d_netfil.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -27,6 +27,7 @@ typedef enum
typedef enum
{
+ FS_NOTCHECKED,
FS_NOTFOUND,
FS_FOUND,
FS_REQUESTED,
@@ -35,12 +36,21 @@ typedef enum
FS_MD5SUMBAD
} filestatus_t;
+typedef enum
+{
+ FILENEEDED_WAD,
+ FILENEEDED_SAVEGAME,
+ FILENEEDED_LUAFILE
+} fileneededtype_t;
+
typedef struct
{
- UINT8 willsend; // Is the server willing to send it?
char filename[MAX_WADPATH];
UINT8 md5sum[16];
filestatus_t status; // The value returned by recsearch
+ UINT8 willsend; // Is the server willing to send it?
+ UINT8 folder; // File is a folder
+ fileneededtype_t type;
boolean justdownloaded; // To prevent late fragments from causing an I_Error
// Used only for download
@@ -54,20 +64,28 @@ typedef struct
UINT32 ackresendposition; // Used when resuming downloads
} fileneeded_t;
+#define FILENEEDEDSIZE 23
+
extern INT32 fileneedednum;
-extern fileneeded_t fileneeded[MAX_WADFILES];
+extern fileneeded_t *fileneeded;
extern char downloaddir[512];
#ifndef NONET
extern INT32 lastfilenum;
+extern INT32 downloadcompletednum;
+extern UINT32 downloadcompletedsize;
+extern INT32 totalfilesrequestednum;
+extern UINT32 totalfilesrequestedsize;
#endif
-UINT8 *PutFileNeeded(void);
-void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr);
+void AllocFileNeeded(INT32 size);
+void FreeFileNeeded(void);
+UINT8 *PutFileNeeded(UINT16 firstfile);
+void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 firstfile);
void CL_PrepareDownloadSaveGame(const char *tmpsave);
INT32 CL_CheckFiles(void);
-void CL_LoadServerFiles(void);
+boolean CL_LoadServerFiles(void);
void AddRamToSendQueue(INT32 node, void *data, size_t size, freemethod_t freemethod,
UINT8 fileid);
@@ -135,6 +153,9 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum,
boolean completepath);
filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum);
+// Searches for a folder
+filestatus_t findfolder(const char *path);
+
void nameonly(char *s);
size_t nameonlylength(const char *s);
diff --git a/src/d_player.h b/src/d_player.h
index 54ab342886ccaf6e0a8e2c4bf044444a6e487d8a..755926480ae9c2b2b90383659ec079230e48a881 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -313,9 +313,43 @@ typedef enum
RW_RAIL = 32
} ringweapons_t;
+//Bot types
+typedef enum
+{
+ BOT_NONE = 0,
+ BOT_2PAI,
+ BOT_2PHUMAN,
+ BOT_MPAI
+} bottype_t;
+
+//AI states
+typedef enum
+{
+ AI_STANDBY = 0,
+ AI_FOLLOW,
+ AI_CATCHUP,
+ AI_THINKFLY,
+ AI_FLYSTANDBY,
+ AI_FLYCARRY,
+ AI_SPINFOLLOW
+} aistatetype_t;
+
+
// ========================================================================
// PLAYER STRUCTURE
// ========================================================================
+
+//Bot memory struct
+typedef struct botmem_s
+{
+ boolean lastForward;
+ boolean lastBlocked;
+ boolean blocked;
+ UINT8 catchup_tics;
+ UINT8 thinkstate;
+} botmem_t;
+
+//Main struct
typedef struct player_s
{
mobj_t *mo;
@@ -525,8 +559,13 @@ typedef struct player_s
boolean spectator;
boolean outofcoop;
+ boolean removing;
UINT8 bot;
-
+ struct player_s *botleader;
+ UINT16 lastbuttons;
+ botmem_t botmem;
+ boolean blocked;
+
tic_t jointime; // Timer when player joins game to change skin/color
tic_t quittime; // Time elapsed since user disconnected, zero if connected
#ifdef HWRENDER
diff --git a/src/d_think.h b/src/d_think.h
index c3f91edc4392238c92499146ea6aefd869e7848b..90a58ab6875f53b28e6d5b5b0590f50c2790c9a6 100644
--- a/src/d_think.h
+++ b/src/d_think.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h
index 374585edf7ba4b1568cc785bbd93883a7683cce4..e632a74a8d33244f189d8a9668bf1166973a5fd1 100644
--- a/src/d_ticcmd.h
+++ b/src/d_ticcmd.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -21,6 +21,8 @@
#pragma interface
#endif
+#define MAXPREDICTTICS 12
+
// Button/action code definitions.
typedef enum
{
@@ -63,6 +65,7 @@ typedef struct
INT16 angleturn; // <<16 for angle delta - saved as 1 byte into demos
INT16 aiming; // vertical aiming, see G_BuildTicCmd
UINT16 buttons;
+ UINT8 latency; // Netgames: how many tics ago was this ticcmd generated from this player's end?
} ATTRPACK ticcmd_t;
#if defined(_MSC_VER)
diff --git a/src/deh_lua.c b/src/deh_lua.c
index 3af97999ccb8fbf71e8165e7a0ec1fb9e1b496c0..1f4d22dcae5a316e1504faf3d227957690fa8c0d 100644
--- a/src/deh_lua.c
+++ b/src/deh_lua.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -25,10 +25,6 @@
#include "deh_lua.h"
#include "deh_tables.h"
-#ifdef MUSICSLOT_COMPATIBILITY
-#include "deh_soc.h" // for get_mus
-#endif
-
// freeslot takes a name (string only!)
// and allocates it to the appropriate free slot.
// Returns the slot number allocated for it or nil if failed.
@@ -264,6 +260,11 @@ static inline int lib_getenum(lua_State *L)
lua_pushinteger(L, ((lua_Integer)1<<i));
return 1;
}
+ if (fastcmp(p, "REVERSESUPER"))
+ {
+ lua_pushinteger(L, (lua_Integer)MFE_REVERSESUPER);
+ return 1;
+ }
if (mathlib) return luaL_error(L, "mobjeflag '%s' could not be found.\n", word);
return 0;
}
@@ -430,29 +431,6 @@ static inline int lib_getenum(lua_State *L)
if (mathlib) return luaL_error(L, "sfx '%s' could not be found.\n", word);
return 0;
}
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (!mathlib && fastncmp("mus_",word,4)) {
- p = word+4;
- if ((i = get_mus(p, false)) == 0)
- return 0;
- lua_pushinteger(L, i);
- return 1;
- }
- else if (mathlib && fastncmp("MUS_",word,4)) { // SOCs are ALL CAPS!
- p = word+4;
- if ((i = get_mus(p, false)) == 0)
- return luaL_error(L, "music '%s' could not be found.\n", word);
- lua_pushinteger(L, i);
- return 1;
- }
- else if (mathlib && (fastncmp("O_",word,2) || fastncmp("D_",word,2))) {
- p = word+2;
- if ((i = get_mus(p, false)) == 0)
- return luaL_error(L, "music '%s' could not be found.\n", word);
- lua_pushinteger(L, i);
- return 1;
- }
-#endif
else if (!mathlib && fastncmp("pw_",word,3)) {
p = word+3;
for (i = 0; i < NUMPOWERS; i++)
diff --git a/src/deh_lua.h b/src/deh_lua.h
index 9df4028bdcf9619a14fe267d202aed2343125e2f..657e66b6ecf2fbeeac0392da978334a9aaeed055 100644
--- a/src/deh_lua.h
+++ b/src/deh_lua.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/deh_soc.c b/src/deh_soc.c
index fc764b41199c31dd1f002037ea4895f914e0ce14..9e3c2f2428ebe5c3eb13ab51401ca3c6b3a45520 100644
--- a/src/deh_soc.c
+++ b/src/deh_soc.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -127,6 +127,33 @@ static float searchfvalue(const char *s)
#endif
// These are for clearing all of various things
+void clear_emblems(void)
+{
+ INT32 i;
+
+ for (i = 0; i < MAXEMBLEMS; ++i)
+ {
+ Z_Free(emblemlocations[i].stringVar);
+ emblemlocations[i].stringVar = NULL;
+ }
+
+ memset(&emblemlocations, 0, sizeof(emblemlocations));
+ numemblems = 0;
+}
+
+void clear_unlockables(void)
+{
+ INT32 i;
+
+ for (i = 0; i < MAXUNLOCKABLES; ++i)
+ {
+ Z_Free(unlockables[i].stringVar);
+ unlockables[i].stringVar = NULL;
+ }
+
+ memset(&unlockables, 0, sizeof(unlockables));
+}
+
void clear_conditionsets(void)
{
UINT8 i;
@@ -229,7 +256,10 @@ void readPlayer(MYFILE *f, INT32 num)
SLOTFOUND
- for (i = 0; i < MAXLINELEN-3; i++)
+ // A friendly neighborhood alias for brevity's sake
+#define NOTE_SIZE sizeof(description[num].notes)
+
+ for (i = 0; i < (INT32)(MAXLINELEN-NOTE_SIZE-3); i++)
{
if (s[i] == '=')
{
@@ -239,8 +269,9 @@ void readPlayer(MYFILE *f, INT32 num)
}
if (playertext)
{
- strcpy(description[num].notes, playertext);
- strcat(description[num].notes, myhashfgets(playertext, sizeof (description[num].notes), f));
+ strlcpy(description[num].notes, playertext, NOTE_SIZE);
+ strlcat(description[num].notes,
+ myhashfgets(playertext, NOTE_SIZE, f), NOTE_SIZE);
}
else
strcpy(description[num].notes, "");
@@ -249,7 +280,7 @@ void readPlayer(MYFILE *f, INT32 num)
// It works down here, though.
{
INT32 numline = 0;
- for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++)
+ for (i = 0; (size_t)i < NOTE_SIZE-1; i++)
{
if (numline < 20 && description[num].notes[i] == '\n')
numline++;
@@ -260,6 +291,7 @@ void readPlayer(MYFILE *f, INT32 num)
}
description[num].notes[strlen(description[num].notes)-1] = '\0';
description[num].notes[i] = '\0';
+#undef NOTE_SIZE
continue;
}
@@ -1140,8 +1172,10 @@ void readgametype(MYFILE *f, char *gtname)
}
if (descr)
{
- strcpy(gtdescription, descr);
- strcat(gtdescription, myhashfgets(descr, sizeof (gtdescription), f));
+ strlcpy(gtdescription, descr, sizeof (gtdescription));
+ strlcat(gtdescription,
+ myhashfgets(descr, sizeof (gtdescription), f),
+ sizeof (gtdescription));
}
else
strcpy(gtdescription, "");
@@ -1574,19 +1608,8 @@ void readlevelheader(MYFILE *f, INT32 num)
sizeof(mapheaderinfo[num-1]->musname), va("Level header %d: music", num));
}
}
-#ifdef MUSICSLOT_COMPATIBILITY
else if (fastcmp(word, "MUSICSLOT"))
- {
- i = get_mus(word2, true);
- if (i && i <= 1035)
- snprintf(mapheaderinfo[num-1]->musname, 7, "%sM", G_BuildMapName(i));
- else if (i && i <= 1050)
- strncpy(mapheaderinfo[num-1]->musname, compat_special_music_slots[i - 1036], 7);
- else
- mapheaderinfo[num-1]->musname[0] = 0; // becomes empty string
- mapheaderinfo[num-1]->musname[6] = 0;
- }
-#endif
+ deh_warning("Level header %d: MusicSlot parameter is deprecated and will be removed.\nUse \"Music\" instead.", num);
else if (fastcmp(word, "MUSICTRACK"))
mapheaderinfo[num-1]->mustrack = ((UINT16)i - 1);
else if (fastcmp(word, "MUSICPOS"))
@@ -1964,19 +1987,6 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
strncpy(cutscenes[num]->scene[scenenum].musswitch, word2, 7);
cutscenes[num]->scene[scenenum].musswitch[6] = 0;
}
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastcmp(word, "MUSICSLOT"))
- {
- i = get_mus(word2, true);
- if (i && i <= 1035)
- snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
- else if (i && i <= 1050)
- strncpy(cutscenes[num]->scene[scenenum].musswitch, compat_special_music_slots[i - 1036], 7);
- else
- cutscenes[num]->scene[scenenum].musswitch[0] = 0; // becomes empty string
- cutscenes[num]->scene[scenenum].musswitch[6] = 0;
- }
-#endif
else if (fastcmp(word, "MUSICTRACK"))
{
cutscenes[num]->scene[scenenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
@@ -2239,19 +2249,6 @@ static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
strncpy(textprompts[num]->page[pagenum].musswitch, word2, 7);
textprompts[num]->page[pagenum].musswitch[6] = 0;
}
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastcmp(word, "MUSICSLOT"))
- {
- i = get_mus(word2, true);
- if (i && i <= 1035)
- snprintf(textprompts[num]->page[pagenum].musswitch, 7, "%sM", G_BuildMapName(i));
- else if (i && i <= 1050)
- strncpy(textprompts[num]->page[pagenum].musswitch, compat_special_music_slots[i - 1036], 7);
- else
- textprompts[num]->page[pagenum].musswitch[0] = 0; // becomes empty string
- textprompts[num]->page[pagenum].musswitch[6] = 0;
- }
-#endif
else if (fastcmp(word, "MUSICTRACK"))
{
textprompts[num]->page[pagenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
@@ -2577,20 +2574,6 @@ void readmenu(MYFILE *f, INT32 num)
menupres[num].musname[6] = 0;
titlechanged = true;
}
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastcmp(word, "MUSICSLOT"))
- {
- value = get_mus(word2, true);
- if (value && value <= 1035)
- snprintf(menupres[num].musname, 7, "%sM", G_BuildMapName(value));
- else if (value && value <= 1050)
- strncpy(menupres[num].musname, compat_special_music_slots[value - 1036], 7);
- else
- menupres[num].musname[0] = 0; // becomes empty string
- menupres[num].musname[6] = 0;
- titlechanged = true;
- }
-#endif
else if (fastcmp(word, "MUSICTRACK"))
{
menupres[num].mustrack = ((UINT16)value - 1);
@@ -2839,26 +2822,31 @@ void readsound(MYFILE *f, INT32 num)
if (s[0] == '\n')
break;
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
tmp = strchr(s, '#');
if (tmp)
*tmp = '\0';
if (s == tmp)
continue; // Skip comment lines, but don't break.
- word = strtok(s, " ");
- if (word)
- strupr(word);
+ // Set / reset word
+ word = s;
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
else
break;
+ strupr(word);
- word2 = strtok(NULL, " ");
- if (word2)
- value = atoi(word2);
- else
- {
- deh_warning("No value for token %s", word);
- continue;
- }
+ // Now get the part after
+ word2 = tmp += 2;
+ value = atoi(word2); // used for numerical settings
if (fastcmp(word, "SINGULAR"))
{
@@ -3017,7 +3005,12 @@ void reademblemdata(MYFILE *f, INT32 num)
else if (fastcmp(word, "COLOR"))
emblemlocations[num-1].color = get_number(word2);
else if (fastcmp(word, "VAR"))
+ {
+ Z_Free(emblemlocations[num-1].stringVar);
+ emblemlocations[num-1].stringVar = Z_StrDup(word2);
+
emblemlocations[num-1].var = get_number(word2);
+ }
else
deh_warning("Emblem %d: unknown word '%s'", num, word);
}
@@ -3219,11 +3212,16 @@ void readunlockable(MYFILE *f, INT32 num)
unlockables[num].type = SECRET_WARP;
else if (fastcmp(word2, "SOUNDTEST"))
unlockables[num].type = SECRET_SOUNDTEST;
+ else if (fastcmp(word2, "SKIN"))
+ unlockables[num].type = SECRET_SKIN;
else
unlockables[num].type = (INT16)i;
}
else if (fastcmp(word, "VAR"))
{
+ Z_Free(unlockables[num].stringVar);
+ unlockables[num].stringVar = Z_StrDup(word2);
+
// Support using the actual map name,
// i.e., Level AB, Level FZ, etc.
@@ -4178,46 +4176,6 @@ sfxenum_t get_sfx(const char *word)
return sfx_None;
}
-#ifdef MUSICSLOT_COMPATIBILITY
-UINT16 get_mus(const char *word, UINT8 dehacked_mode)
-{ // Returns the value of MUS_ enumerations
- UINT16 i;
- char lumptmp[4];
-
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
- return (UINT16)M_MapNumber(word[0], word[1]);
-
- if (fastncmp("MUS_",word,4))
- word += 4; // take off the MUS_
- else if (fastncmp("O_",word,2) || fastncmp("D_",word,2))
- word += 2; // take off the O_ or D_
-
- strncpy(lumptmp, word, 4);
- lumptmp[3] = 0;
- if (fasticmp("MAP",lumptmp))
- {
- word += 3;
- if (toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
- return (UINT16)M_MapNumber(word[0], word[1]);
- else if ((i = atoi(word)))
- return i;
-
- word -= 3;
- if (dehacked_mode)
- deh_warning("Couldn't find music named 'MUS_%s'",word);
- return 0;
- }
- for (i = 0; compat_special_music_slots[i][0]; ++i)
- if (fasticmp(word, compat_special_music_slots[i]))
- return i + 1036;
- if (dehacked_mode)
- deh_warning("Couldn't find music named 'MUS_%s'",word);
- return 0;
-}
-#endif
-
hudnum_t get_huditem(const char *word)
{ // Returns the value of HUD_ enumerations
hudnum_t i;
@@ -4448,13 +4406,6 @@ static fixed_t find_const(const char **rword)
free(word);
return r;
}
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastncmp("MUS_",word,4) || fastncmp("O_",word,2)) {
- r = get_mus(word, true);
- free(word);
- return r;
- }
-#endif
else if (fastncmp("PW_",word,3)) {
r = get_power(word);
free(word);
diff --git a/src/deh_soc.h b/src/deh_soc.h
index 4064deb3f25b1d46bce9f837795b7f5b535fec60..f972ec26ecbb7732098e131d427ebd34b5f621ef 100644
--- a/src/deh_soc.h
+++ b/src/deh_soc.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -43,7 +43,7 @@
#include "info.h"
#include "dehacked.h"
-#include "doomdef.h" // MUSICSLOT_COMPATIBILITY, HWRENDER
+#include "doomdef.h" // HWRENDER
// Crazy word-reading stuff
/// \todo Put these in a seperate file or something.
@@ -52,9 +52,6 @@ statenum_t get_state(const char *word);
spritenum_t get_sprite(const char *word);
playersprite_t get_sprite2(const char *word);
sfxenum_t get_sfx(const char *word);
-#ifdef MUSICSLOT_COMPATIBILITY
-UINT16 get_mus(const char *word, UINT8 dehacked_mode);
-#endif
hudnum_t get_huditem(const char *word);
menutype_t get_menutype(const char *word);
//INT16 get_gametype(const char *word);
@@ -84,6 +81,8 @@ void readskincolor(MYFILE *f, INT32 num);
void readthing(MYFILE *f, INT32 num);
void readfreeslots(MYFILE *f);
void readPlayer(MYFILE *f, INT32 num);
+void clear_emblems(void);
+void clear_unlockables(void);
void clear_levels(void);
void clear_conditionsets(void);
#endif
diff --git a/src/deh_tables.c b/src/deh_tables.c
index 427e17852135932f34c7fa84957a9ab8758d581a..40be6ea140c26890f1d959669c78a628116e78e3 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -22,6 +22,9 @@
#include "v_video.h" // video flags (for lua)
#include "i_sound.h" // musictype_t (for lua)
#include "g_state.h" // gamestate_t (for lua)
+#include "g_game.h" // Joystick axes (for lua)
+#include "i_joy.h"
+#include "g_input.h" // Game controls (for lua)
#include "deh_tables.h"
@@ -221,6 +224,8 @@ actionpointer_t actionpointers[] =
{{A_SetObjectFlags2}, "A_SETOBJECTFLAGS2"},
{{A_RandomState}, "A_RANDOMSTATE"},
{{A_RandomStateRange}, "A_RANDOMSTATERANGE"},
+ {{A_StateRangeByAngle}, "A_STATERANGEBYANGLE"},
+ {{A_StateRangeByParameter}, "A_STATERANGEBYPARAMETER"},
{{A_DualAction}, "A_DUALACTION"},
{{A_RemoteAction}, "A_REMOTEACTION"},
{{A_ToggleFlameJet}, "A_TOGGLEFLAMEJET"},
@@ -1748,6 +1753,56 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
// The letter
"S_LETTER",
+ // Tutorial Scenery
+ "S_TUTORIALLEAF1",
+ "S_TUTORIALLEAF2",
+ "S_TUTORIALLEAF3",
+ "S_TUTORIALLEAF4",
+ "S_TUTORIALLEAF5",
+ "S_TUTORIALLEAF6",
+ "S_TUTORIALLEAF7",
+ "S_TUTORIALLEAF8",
+ "S_TUTORIALLEAF9",
+ "S_TUTORIALLEAF10",
+ "S_TUTORIALLEAF11",
+ "S_TUTORIALLEAF12",
+ "S_TUTORIALLEAF13",
+ "S_TUTORIALLEAF14",
+ "S_TUTORIALLEAF15",
+ "S_TUTORIALLEAF16",
+ "S_TUTORIALFLOWER1",
+ "S_TUTORIALFLOWER2",
+ "S_TUTORIALFLOWER3",
+ "S_TUTORIALFLOWER4",
+ "S_TUTORIALFLOWER5",
+ "S_TUTORIALFLOWER6",
+ "S_TUTORIALFLOWER7",
+ "S_TUTORIALFLOWER8",
+ "S_TUTORIALFLOWER9",
+ "S_TUTORIALFLOWER10",
+ "S_TUTORIALFLOWER11",
+ "S_TUTORIALFLOWER12",
+ "S_TUTORIALFLOWER13",
+ "S_TUTORIALFLOWER14",
+ "S_TUTORIALFLOWER15",
+ "S_TUTORIALFLOWER16",
+ "S_TUTORIALFLOWERF1",
+ "S_TUTORIALFLOWERF2",
+ "S_TUTORIALFLOWERF3",
+ "S_TUTORIALFLOWERF4",
+ "S_TUTORIALFLOWERF5",
+ "S_TUTORIALFLOWERF6",
+ "S_TUTORIALFLOWERF7",
+ "S_TUTORIALFLOWERF8",
+ "S_TUTORIALFLOWERF9",
+ "S_TUTORIALFLOWERF10",
+ "S_TUTORIALFLOWERF11",
+ "S_TUTORIALFLOWERF12",
+ "S_TUTORIALFLOWERF13",
+ "S_TUTORIALFLOWERF14",
+ "S_TUTORIALFLOWERF15",
+ "S_TUTORIALFLOWERF16",
+
// GFZ flowers
"S_GFZFLOWERA",
"S_GFZFLOWERB",
@@ -3290,14 +3345,13 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_NIGHTOPIANHELPER9",
// Nightopian
- "S_PIAN0",
- "S_PIAN1",
- "S_PIAN2",
- "S_PIAN3",
- "S_PIAN4",
- "S_PIAN5",
- "S_PIAN6",
- "S_PIANSING",
+ "S_PIAN_LOOK1",
+ "S_PIAN_LOOK2",
+ "S_PIAN_LOOK3",
+ "S_PIAN_FLY1",
+ "S_PIAN_FLY2",
+ "S_PIAN_FLY3",
+ "S_PIAN_SING",
// Shleep
"S_SHLEEP1",
@@ -3760,6 +3814,12 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
// The letter
"MT_LETTER",
+ // Tutorial Scenery
+ "MT_TUTORIALPLANT",
+ "MT_TUTORIALLEAF",
+ "MT_TUTORIALFLOWER",
+ "MT_TUTORIALFLOWERF",
+
// Greenflower Scenery
"MT_GFZFLOWER1",
"MT_GFZFLOWER2",
@@ -4266,6 +4326,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
"MT_YELLOWBRICKDEBRIS",
"MT_NAMECHECK",
+ "MT_RAY",
};
const char *const MOBJFLAG_LIST[] = {
@@ -4351,6 +4412,8 @@ const char *const MOBJEFLAG_LIST[] = {
"SPRUNG", // Mobj was already sprung this tic
"APPLYPMOMZ", // Platform movement
"TRACERANGLE", // Compute and trigger on mobj angle relative to tracer
+ "FORCESUPER", // Forces an object to use super sprites with SPR_PLAY.
+ "FORCENOSUPER", // Forces an object to NOT use super sprites with SPR_PLAY.
NULL
};
@@ -4841,9 +4904,18 @@ struct int_const_s const INT_CONST[] = {
{"FF_RANDOMANIM",FF_RANDOMANIM},
{"FF_GLOBALANIM",FF_GLOBALANIM},
{"FF_FULLBRIGHT",FF_FULLBRIGHT},
+ {"FF_SEMIBRIGHT",FF_SEMIBRIGHT},
+ {"FF_FULLDARK",FF_FULLDARK},
{"FF_VERTICALFLIP",FF_VERTICALFLIP},
{"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP},
{"FF_PAPERSPRITE",FF_PAPERSPRITE},
+ {"FF_FLOORSPRITE",FF_FLOORSPRITE},
+ {"FF_BLENDMASK",FF_BLENDMASK},
+ {"FF_BLENDSHIFT",FF_BLENDSHIFT},
+ {"FF_ADD",FF_ADD},
+ {"FF_SUBTRACT",FF_SUBTRACT},
+ {"FF_REVERSESUBTRACT",FF_REVERSESUBTRACT},
+ {"FF_MODULATE",FF_MODULATE},
{"FF_TRANSMASK",FF_TRANSMASK},
{"FF_TRANSSHIFT",FF_TRANSSHIFT},
// new preshifted translucency (used in source)
@@ -4887,6 +4959,7 @@ struct int_const_s const INT_CONST[] = {
{"AST_REVERSESUBTRACT",AST_REVERSESUBTRACT},
{"AST_MODULATE",AST_MODULATE},
{"AST_OVERLAY",AST_OVERLAY},
+ {"AST_FOG",AST_FOG},
// Render flags
{"RF_HORIZONTALFLIP",RF_HORIZONTALFLIP},
@@ -4898,9 +4971,10 @@ struct int_const_s const INT_CONST[] = {
{"RF_OBJECTSLOPESPLAT",RF_OBJECTSLOPESPLAT},
{"RF_NOSPLATBILLBOARD",RF_NOSPLATBILLBOARD},
{"RF_NOSPLATROLLANGLE",RF_NOSPLATROLLANGLE},
- {"RF_BLENDMASK",RF_BLENDMASK},
+ {"RF_BRIGHTMASK",RF_BRIGHTMASK},
{"RF_FULLBRIGHT",RF_FULLBRIGHT},
{"RF_FULLDARK",RF_FULLDARK},
+ {"RF_SEMIBRIGHT",RF_SEMIBRIGHT},
{"RF_NOCOLORMAPS",RF_NOCOLORMAPS},
{"RF_SPRITETYPEMASK",RF_SPRITETYPEMASK},
{"RF_PAPERSPRITE",RF_PAPERSPRITE},
@@ -5086,6 +5160,7 @@ struct int_const_s const INT_CONST[] = {
{"PAL_MIXUP",PAL_MIXUP},
{"PAL_RECYCLE",PAL_RECYCLE},
{"PAL_NUKE",PAL_NUKE},
+ {"PAL_INVERT",PAL_INVERT},
// for P_DamageMobj
//// Damage types
{"DMG_WATER",DMG_WATER},
@@ -5170,6 +5245,12 @@ struct int_const_s const INT_CONST[] = {
{"GF_REDFLAG",GF_REDFLAG},
{"GF_BLUEFLAG",GF_BLUEFLAG},
+ // Bot types
+ {"BOT_NONE",BOT_NONE},
+ {"BOT_2PAI",BOT_2PAI},
+ {"BOT_2PHUMAN",BOT_2PHUMAN},
+ {"BOT_MPAI",BOT_MPAI},
+
// Customisable sounds for Skins, from sounds.h
{"SKSSPIN",SKSSPIN},
{"SKSPUTPUT",SKSPUTPUT},
@@ -5383,9 +5464,12 @@ struct int_const_s const INT_CONST[] = {
{"V_HUDTRANSHALF",V_HUDTRANSHALF},
{"V_HUDTRANS",V_HUDTRANS},
{"V_HUDTRANSDOUBLE",V_HUDTRANSDOUBLE},
- {"V_AUTOFADEOUT",V_AUTOFADEOUT},
- {"V_RETURN8",V_RETURN8},
- {"V_OFFSET",V_OFFSET},
+ {"V_BLENDSHIFT",V_BLENDSHIFT},
+ {"V_BLENDMASK",V_BLENDMASK},
+ {"V_ADD",V_ADD},
+ {"V_SUBTRACT",V_SUBTRACT},
+ {"V_REVERSESUBTRACT",V_REVERSESUBTRACT},
+ {"V_MODULATE",V_MODULATE},
{"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE},
{"V_FLIP",V_FLIP},
{"V_CENTERNAMETAG",V_CENTERNAMETAG},
@@ -5393,8 +5477,8 @@ struct int_const_s const INT_CONST[] = {
{"V_SNAPTOBOTTOM",V_SNAPTOBOTTOM},
{"V_SNAPTOLEFT",V_SNAPTOLEFT},
{"V_SNAPTORIGHT",V_SNAPTORIGHT},
- {"V_WRAPX",V_WRAPX},
- {"V_WRAPY",V_WRAPY},
+ {"V_AUTOFADEOUT",V_AUTOFADEOUT},
+ {"V_RETURN8",V_RETURN8},
{"V_NOSCALESTART",V_NOSCALESTART},
{"V_PERPLAYER",V_PERPLAYER},
@@ -5458,6 +5542,76 @@ struct int_const_s const INT_CONST[] = {
{"GS_DEDICATEDSERVER",GS_DEDICATEDSERVER},
{"GS_WAITINGPLAYERS",GS_WAITINGPLAYERS},
+ // Joystick axes
+ {"JA_NONE",JA_NONE},
+ {"JA_TURN",JA_TURN},
+ {"JA_MOVE",JA_MOVE},
+ {"JA_LOOK",JA_LOOK},
+ {"JA_STRAFE",JA_STRAFE},
+ {"JA_DIGITAL",JA_DIGITAL},
+ {"JA_JUMP",JA_JUMP},
+ {"JA_SPIN",JA_SPIN},
+ {"JA_FIRE",JA_FIRE},
+ {"JA_FIRENORMAL",JA_FIRENORMAL},
+ {"JOYAXISRANGE",JOYAXISRANGE},
+
+ // Game controls
+ {"GC_NULL",GC_NULL},
+ {"GC_FORWARD",GC_FORWARD},
+ {"GC_BACKWARD",GC_BACKWARD},
+ {"GC_STRAFELEFT",GC_STRAFELEFT},
+ {"GC_STRAFERIGHT",GC_STRAFERIGHT},
+ {"GC_TURNLEFT",GC_TURNLEFT},
+ {"GC_TURNRIGHT",GC_TURNRIGHT},
+ {"GC_WEAPONNEXT",GC_WEAPONNEXT},
+ {"GC_WEAPONPREV",GC_WEAPONPREV},
+ {"GC_WEPSLOT1",GC_WEPSLOT1},
+ {"GC_WEPSLOT2",GC_WEPSLOT2},
+ {"GC_WEPSLOT3",GC_WEPSLOT3},
+ {"GC_WEPSLOT4",GC_WEPSLOT4},
+ {"GC_WEPSLOT5",GC_WEPSLOT5},
+ {"GC_WEPSLOT6",GC_WEPSLOT6},
+ {"GC_WEPSLOT7",GC_WEPSLOT7},
+ {"GC_WEPSLOT8",GC_WEPSLOT8},
+ {"GC_WEPSLOT9",GC_WEPSLOT9},
+ {"GC_WEPSLOT10",GC_WEPSLOT10},
+ {"GC_FIRE",GC_FIRE},
+ {"GC_FIRENORMAL",GC_FIRENORMAL},
+ {"GC_TOSSFLAG",GC_TOSSFLAG},
+ {"GC_SPIN",GC_SPIN},
+ {"GC_CAMTOGGLE",GC_CAMTOGGLE},
+ {"GC_CAMRESET",GC_CAMRESET},
+ {"GC_LOOKUP",GC_LOOKUP},
+ {"GC_LOOKDOWN",GC_LOOKDOWN},
+ {"GC_CENTERVIEW",GC_CENTERVIEW},
+ {"GC_MOUSEAIMING",GC_MOUSEAIMING},
+ {"GC_TALKKEY",GC_TALKKEY},
+ {"GC_TEAMKEY",GC_TEAMKEY},
+ {"GC_SCORES",GC_SCORES},
+ {"GC_JUMP",GC_JUMP},
+ {"GC_CONSOLE",GC_CONSOLE},
+ {"GC_PAUSE",GC_PAUSE},
+ {"GC_SYSTEMMENU",GC_SYSTEMMENU},
+ {"GC_SCREENSHOT",GC_SCREENSHOT},
+ {"GC_RECORDGIF",GC_RECORDGIF},
+ {"GC_VIEWPOINT",GC_VIEWPOINT},
+ {"GC_CUSTOM1",GC_CUSTOM1},
+ {"GC_CUSTOM2",GC_CUSTOM2},
+ {"GC_CUSTOM3",GC_CUSTOM3},
+ {"NUM_GAMECONTROLS",NUM_GAMECONTROLS},
+
+ // Mouse buttons
+ {"MB_BUTTON1",MB_BUTTON1},
+ {"MB_BUTTON2",MB_BUTTON2},
+ {"MB_BUTTON3",MB_BUTTON3},
+ {"MB_BUTTON4",MB_BUTTON4},
+ {"MB_BUTTON5",MB_BUTTON5},
+ {"MB_BUTTON6",MB_BUTTON6},
+ {"MB_BUTTON7",MB_BUTTON7},
+ {"MB_BUTTON8",MB_BUTTON8},
+ {"MB_SCROLLUP",MB_SCROLLUP},
+ {"MB_SCROLLDOWN",MB_SCROLLDOWN},
+
{NULL,0}
};
diff --git a/src/deh_tables.h b/src/deh_tables.h
index 1f265cc9992da1c3d5c6e53781f6151710bc798f..972b08838ea417b210ab7f8b14de39768e5b7cf3 100644
--- a/src/deh_tables.h
+++ b/src/deh_tables.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/dehacked.c b/src/dehacked.c
index 7d8629567b330cb592937501badc1ee7e9a28c42..3f339e4778be72a2a2554723f378d2db27fb12f9 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -188,26 +188,11 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
dbg_line = -1; // start at -1 so the first line is 0.
while (!myfeof(f))
{
- char origpos[128];
- INT32 size = 0;
- char *traverse;
-
myfgets(s, MAXLINELEN, f);
memcpy(textline, s, MAXLINELEN);
if (s[0] == '\n' || s[0] == '#')
continue;
- traverse = s;
-
- while (traverse[0] != '\n')
- {
- traverse++;
- size++;
- }
-
- strncpy(origpos, s, size);
- origpos[size] = '\0';
-
if (NULL != (word = strtok(s, " "))) {
strupr(word);
if (word[strlen(word)-1] == '\n')
@@ -562,13 +547,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
}
if (clearall || fastcmp(word2, "UNLOCKABLES"))
- memset(&unlockables, 0, sizeof(unlockables));
+ clear_unlockables();
if (clearall || fastcmp(word2, "EMBLEMS"))
- {
- memset(&emblemlocations, 0, sizeof(emblemlocations));
- numemblems = 0;
- }
+ clear_emblems();
if (clearall || fastcmp(word2, "EXTRAEMBLEMS"))
{
diff --git a/src/dehacked.h b/src/dehacked.h
index 1b200e2466f58994bb4db317db2dd9908565d5e5..b4651c66ae11dc6d2d6ee622d529435405a71b9b 100644
--- a/src/dehacked.h
+++ b/src/dehacked.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/doomdata.h b/src/doomdata.h
index e317fec1b352e21ab571810d2911ffbf4c03f7f5..009af00fa4e200f183a059ec5bcb98a7a008c5aa 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/doomdef.h b/src/doomdef.h
index 46eac90308c6756a1584f186fd49cdfd83f00bf8..8f485accb5a597ecad903ca6bb60df5c7d816b5e 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -100,7 +100,7 @@
#include <sys/stat.h>
#include <ctype.h>
-#if defined (_WIN32) || defined (__DJGPP__)
+#ifdef _WIN32
#include <io.h>
#endif
@@ -112,7 +112,7 @@
//#define PARANOIA // do some tests that never fail but maybe
// turn this on by make etc.. DEBUGMODE = 1 or use the Debug profile in the VC++ projects
//#endif
-#if defined (_WIN32) || (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON) || defined (macintosh)
+#if defined (_WIN32) || defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) || defined (macintosh)
#define LOGMESSAGES // write message in log.txt
#endif
@@ -133,6 +133,7 @@ extern char logfilename[1024];
//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP
#define VERSIONSTRING "Development EXE"
+#define VERSIONSTRING_RC "Development EXE" "\0"
// most interface strings are ignored in development mode.
// we use comprevision and compbranch instead.
// VERSIONSTRING_RC is for the resource-definition script used by windows builds
@@ -160,7 +161,10 @@ extern char logfilename[1024];
// Does this version require an added patch file?
// Comment or uncomment this as necessary.
-#define USE_PATCH_DTA
+// #define USE_PATCH_DTA
+
+// Enforce a limit of loaded WAD files.
+//#define ENFORCE_WAD_LIMIT
// Use .kart extension addons
//#define USE_KART
@@ -426,7 +430,7 @@ enum {
};
// Name of local directory for config files and savegames
-#if (((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)) && !defined (__APPLE__)
+#if (defined (__unix__) || defined (UNIXCOMMON)) && !defined (__CYGWIN__) && !defined (__APPLE__)
#define DEFAULTDIR ".srb2"
#else
#define DEFAULTDIR "srb2"
@@ -615,10 +619,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Experimental tweaks to analog mode. (Needs a lot of work before it's ready for primetime.)
//#define REDSANALOG
-/// Backwards compatibility with musicslots.
-/// \note You should leave this enabled unless you're working with a future SRB2 version.
-#define MUSICSLOT_COMPATIBILITY
-
/// Experimental attempts at preventing MF_PAPERCOLLISION objects from getting stuck in walls.
//#define PAPER_COLLISIONCORRECTION
diff --git a/src/doomstat.h b/src/doomstat.h
index 79c6e71b311507ee6711622b871f4c2f6e3fbc36..3e6ad5c7228e85d9bb27cb6e76e8443c7d8921c0 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -337,9 +337,9 @@ typedef struct
fixed_t gravity; ///< Map-wide gravity.
// Title card.
- char ltzzpatch[8]; ///< Zig zag patch.
- char ltzztext[8]; ///< Zig zag text.
- char ltactdiamond[8]; ///< Act diamond.
+ char ltzzpatch[9]; ///< Zig zag patch.
+ char ltzztext[9]; ///< Zig zag text.
+ char ltactdiamond[9]; ///< Act diamond.
// Freed animals stuff.
UINT8 numFlickies; ///< Internal. For freed flicky support.
@@ -496,7 +496,7 @@ extern UINT32 lastcustomtol;
extern tic_t totalplaytime;
-extern UINT8 stagefailed;
+extern boolean stagefailed;
// Emeralds stored as bits to throw savegame hackers off.
extern UINT16 emeralds;
diff --git a/src/doomtype.h b/src/doomtype.h
index a094cbb089f5a21351227cdcba40f00efa843368..5ddd9ae44e189deca59be07b6fccf653f6489551 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -54,17 +54,6 @@ typedef long ssize_t;
#define PDWORD_PTR PDWORD
#endif
#endif
-#elif defined (__DJGPP__)
-#define UINT8 unsigned char
-#define SINT8 signed char
-
-#define UINT16 unsigned short int
-#define INT16 signed short int
-
-#define INT32 signed long
-#define UINT32 unsigned long
-#define INT64 signed long long
-#define UINT64 unsigned long long
#else
#define __STDC_LIMIT_MACROS
#include <stdint.h>
@@ -108,7 +97,7 @@ typedef long ssize_t;
#define strncasecmp strnicmp
#define strcasecmp strcmpi
#endif
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#undef stricmp
#define stricmp(x,y) strcasecmp(x,y)
#undef strnicmp
@@ -136,7 +125,7 @@ char *strcasestr(const char *in, const char *what);
#endif
#endif //macintosh
-#if defined (PC_DOS) || defined (_WIN32) || defined (__HAIKU__)
+#if defined (_WIN32) || defined (__HAIKU__)
#define HAVE_DOSSTR_FUNCS
#endif
@@ -367,6 +356,8 @@ typedef UINT32 tic_t;
#define UINT2RGBA(a) (UINT32)((a&0xff)<<24)|((a&0xff00)<<8)|((a&0xff0000)>>8)|(((UINT32)a&0xff000000)>>24)
#endif
+#define TOSTR(x) #x
+
/* preprocessor dumb and needs second macro to expand input */
#define WSTRING2(s) L ## s
#define WSTRING(s) WSTRING2 (s)
diff --git a/src/endian.h b/src/endian.h
index e78204e723a43715cd7182b6aaebf59e61ee4358..86297f0cb6b6e604edc2df2e29811d35e6077ea6 100644
--- a/src/endian.h
+++ b/src/endian.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/f_finale.c b/src/f_finale.c
index bfba7cf9614a23e9313b86df49d35f4ab7219216..b5715b863f8dcde6ee8d9f5cc621ab9ea7f72ccb 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -41,6 +41,7 @@
#include "console.h"
#include "lua_hud.h"
+#include "lua_hook.h"
// Stage of animation:
// 0 = text, 1 = art screen
@@ -1011,7 +1012,7 @@ void F_IntroTicker(void)
//
boolean F_IntroResponder(event_t *event)
{
- INT32 key = event->data1;
+ INT32 key = event->key;
// remap virtual keys (mouse & joystick buttons)
switch (key)
@@ -1063,7 +1064,7 @@ boolean F_IntroResponder(event_t *event)
// CREDITS
// =========
static const char *credits[] = {
- "\1Sonic Robo Blast II",
+ "\1Sonic Robo Blast 2",
"\1Credits",
"",
"\1Game Design",
@@ -1089,19 +1090,19 @@ static const char *credits[] = {
"\"Hannu_Hanhi\"", // For many OpenGL performance improvements!
"Kepa \"Nev3r\" Iceta",
"Thomas \"Shadow Hog\" Igoe",
- "\"james\"",
"Iestyn \"Monster Iestyn\" Jealous",
- "\"Jimita\"",
"\"Kaito Sinclaire\"",
"\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog
"Ronald \"Furyhunter\" Kinard", // The SDL2 port
"\"Lat'\"", // SRB2-CHAT, the chat window from Kart
+ "\"LZA\"",
"Matthew \"Shuffle\" Marsalko",
"Steven \"StroggOnMeth\" McGranahan",
"\"Morph\"", // For SRB2Morphed stuff
"Louis-Antoine \"LJ Sonic\" de Moulins", // de Rochefort doesn't quite fit on the screen sorry lol
"John \"JTE\" Muniz",
"Colin \"Sonict\" Pfaff",
+ "James \"james\" Robert Roman",
"Sean \"Sryder13\" Ryder",
"Ehab \"Wolfy\" Saeed",
"Tasos \"tatokis\" Sahanidis", // Corrected C FixedMul, making 64-bit builds netplay compatible
@@ -1166,9 +1167,8 @@ static const char *credits[] = {
"Alexander \"DrTapeworm\" Moench-Ford",
"Stefan \"Stuf\" Rimalia",
"Shane Mychal Sexton",
- "\"Spazzo\"",
- "David \"Big Wave Dave\" Spencer Sr.",
- "David \"Instant Sonic\" Spencer Jr.",
+ "Dave \"Big Wave Dave\" Spencer",
+ "David \"instantSonic\" Spencer",
"\"SSNTails\"",
"",
"\1Level Design",
@@ -1191,7 +1191,6 @@ static const char *credits[] = {
"\"Revan\"",
"Anna \"QueenDelta\" Sandlin",
"Wessel \"sphere\" Smit",
- "\"Spazzo\"",
"\"SSNTails\"",
"Rob Tisdell",
"\"Torgo\"",
@@ -1220,7 +1219,7 @@ static const char *credits[] = {
"Bill \"Tets\" Reed",
"",
"\1Special Thanks",
- "iD Software",
+ "id Software",
"Doom Legacy Project",
"FreeDoom Project", // Used some of the mancubus and rocket launcher sprites for Brak
"Kart Krew",
@@ -1399,7 +1398,7 @@ void F_CreditTicker(void)
boolean F_CreditResponder(event_t *event)
{
- INT32 key = event->data1;
+ INT32 key = event->key;
// remap virtual keys (mouse & joystick buttons)
switch (key)
@@ -3423,7 +3422,7 @@ void F_TitleScreenDrawer(void)
}
luahook:
- LUAh_TitleHUD();
+ LUA_HUDHOOK(title);
}
// separate animation timer for backgrounds, since we also count
@@ -3823,7 +3822,7 @@ void F_ContinueTicker(void)
boolean F_ContinueResponder(event_t *event)
{
- INT32 key = event->data1;
+ INT32 key = event->key;
if (keypressed)
return true;
diff --git a/src/f_finale.h b/src/f_finale.h
index 4aa2c3f05b121a17c4fcfe7c4163e4b1db274415..efdc9d4ada3f88ce4de8780c70ad41a34e0897b5 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/f_wipe.c b/src/f_wipe.c
index 7526aeca36f6bd94cd8179c79fc7be299d395e40..43b7180b754408faf39387ef259d54aae590bf9f 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -3,7 +3,7 @@
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/filesrch.c b/src/filesrch.c
index cb53d07be958fe1ab7ad42ffac3efc0ee768e44f..ec095518e824d540675750c1b70c56fad9065b96 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -13,6 +13,7 @@
/// FS_FOUND
#include <stdio.h>
+#include <errno.h>
#ifdef __GNUC__
#include <dirent.h>
#endif
@@ -29,10 +30,10 @@
#include "m_misc.h"
#include "z_zone.h"
#include "m_menu.h" // Addons_option_Onchange
+#include "w_wad.h"
#if defined (_WIN32) && defined (_MSC_VER)
-#include <errno.h>
#include <io.h>
#include <tchar.h>
@@ -337,8 +338,10 @@ size_t dir_on[menudepth];
UINT8 refreshdirmenu = 0;
char *refreshdirname = NULL;
-size_t packetsizetally = 0;
-size_t mainwadstally = 0;
+#define dirpathlen 1024
+#define maxdirdepth 48
+
+#define isuptree(dirent) ((dirent)[0]=='.' && ((dirent)[1]=='\0' || ((dirent)[1]=='.' && (dirent)[2]=='\0')))
filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, boolean completepath, int maxsearchdepth)
{
@@ -387,10 +390,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
continue;
}
- if (dent->d_name[0]=='.' &&
- (dent->d_name[1]=='\0' ||
- (dent->d_name[1]=='.' &&
- dent->d_name[2]=='\0')))
+ if (isuptree(dent->d_name))
{
// we don't want to scan uptree
continue;
@@ -445,6 +445,380 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
return retval;
}
+#ifndef AVOID_ERRNO
+int direrror = 0;
+#endif
+
+// Checks if the specified path is a directory.
+// Returns 1 if so, 0 if not, and -1 if an error occurred.
+// direrror is set if there was an error.
+INT32 pathisdirectory(const char *path)
+{
+ struct stat fsstat;
+
+ if (stat(path, &fsstat) < 0)
+ {
+#ifndef AVOID_ERRNO
+ direrror = errno;
+#endif
+ return -1;
+ }
+ else if (S_ISDIR(fsstat.st_mode))
+ return 1;
+
+ return 0;
+}
+
+// Concatenates two paths, and checks if it is a directory that can be opened.
+// Returns 1 if so, 0 if not, and -1 if an error occurred.
+INT32 concatpaths(const char *path, const char *startpath)
+{
+ char dirpath[dirpathlen];
+ DIR *dirhandle;
+ INT32 stat;
+
+ if (startpath)
+ {
+ char basepath[dirpathlen];
+
+ snprintf(basepath, sizeof basepath, "%s" PATHSEP, startpath);
+ snprintf(dirpath, sizeof dirpath, "%s%s", basepath, path);
+
+ // Base path and directory path are the same? Not valid.
+ stat = samepaths(basepath, dirpath);
+
+ if (stat == 1)
+ return 0;
+ else if (stat < 0)
+ return -1;
+ }
+ else
+ snprintf(dirpath, sizeof dirpath, "%s", path);
+
+ // Check if the path is a directory.
+ // Will return -1 if there was an error.
+ stat = pathisdirectory(dirpath);
+ if (stat == 0)
+ return 0;
+ else if (stat < 0)
+ {
+ // The path doesn't exist, so it can't be a directory.
+ if (direrror == ENOENT)
+ return 0;
+
+ return -1;
+ }
+
+ // Open the directory.
+ // Will return 0 if it couldn't be opened.
+ dirhandle = opendir(dirpath);
+ if (dirhandle == NULL)
+ return 0;
+ else
+ closedir(dirhandle);
+
+ return 1;
+}
+
+// Checks if two paths are the same. Returns 1 if so, and 0 if not.
+// Returns -1 if an error occurred with the first path,
+// and returns -2 if an error occurred with the second path.
+// direrror is set if there was an error.
+INT32 samepaths(const char *path1, const char *path2)
+{
+ struct stat stat1;
+ struct stat stat2;
+
+ if (stat(path1, &stat1) < 0)
+ {
+#ifndef AVOID_ERRNO
+ direrror = errno;
+#endif
+ return -1;
+ }
+ if (stat(path2, &stat2) < 0)
+ {
+#ifndef AVOID_ERRNO
+ direrror = errno;
+#endif
+ return -2;
+ }
+
+ if (stat1.st_dev == stat2.st_dev)
+ {
+#if !defined(_WIN32)
+ return (stat1.st_ino == stat2.st_ino);
+#else
+ // The above doesn't work on NTFS or FAT.
+ HANDLE file1 = CreateFileA(path1, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+ HANDLE file2 = CreateFileA(path2, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+ BY_HANDLE_FILE_INFORMATION file1info, file2info;
+
+ if (file1 == INVALID_HANDLE_VALUE)
+ {
+#ifndef AVOID_ERRNO
+ direrror = ENOENT;
+#endif
+ return -1;
+ }
+ else if (file2 == INVALID_HANDLE_VALUE)
+ {
+ CloseHandle(file1);
+#ifndef AVOID_ERRNO
+ direrror = ENOENT;
+#endif
+ return -2;
+ }
+
+ // I have no idea why GetFileInformationByHandle would fail.
+ // Microsoft's documentation doesn't tell me.
+ // I'll just use EIO...
+ if (!GetFileInformationByHandle(file1, &file1info))
+ {
+#ifndef AVOID_ERRNO
+ direrror = EIO;
+#endif
+ return -1;
+ }
+ else if (!GetFileInformationByHandle(file2, &file2info))
+ {
+ CloseHandle(file1);
+ CloseHandle(file2);
+#ifndef AVOID_ERRNO
+ direrror = EIO;
+#endif
+ return -2;
+ }
+
+ if (file1info.dwVolumeSerialNumber == file2info.dwVolumeSerialNumber
+ && file1info.nFileIndexLow == file2info.nFileIndexLow
+ && file1info.nFileIndexHigh == file2info.nFileIndexHigh)
+ {
+ CloseHandle(file1);
+ CloseHandle(file2);
+ return 1;
+ }
+
+ return 0;
+#endif
+ }
+
+ return 0;
+}
+
+//
+// Directory loading
+//
+
+static void initdirpath(char *dirpath, size_t *dirpathindex, int depthleft)
+{
+ dirpathindex[depthleft] = strlen(dirpath) + 1;
+
+ if (dirpath[dirpathindex[depthleft]-2] != PATHSEP[0])
+ {
+ dirpath[dirpathindex[depthleft]-1] = PATHSEP[0];
+ dirpath[dirpathindex[depthleft]] = 0;
+ }
+ else
+ dirpathindex[depthleft]--;
+}
+
+lumpinfo_t *getdirectoryfiles(const char *path, UINT16 *nlmp, UINT16 *nfolders)
+{
+ DIR **dirhandle;
+ struct dirent *dent;
+ struct stat fsstat;
+
+ int rootdir = (maxdirdepth - 1);
+ int depthleft = rootdir;
+
+ char dirpath[dirpathlen];
+ size_t *dirpathindex;
+
+ lumpinfo_t *lumpinfo, *lump_p;
+ UINT16 i = 0, numlumps = 0;
+
+ boolean failure = false;
+
+ dirhandle = (DIR **)malloc(maxdirdepth * sizeof (DIR*));
+ dirpathindex = (size_t *)malloc(maxdirdepth * sizeof(size_t));
+
+ // Open the root directory
+ strlcpy(dirpath, path, dirpathlen);
+ dirhandle[depthleft] = opendir(dirpath);
+
+ if (dirhandle[depthleft] == NULL)
+ {
+ free(dirhandle);
+ free(dirpathindex);
+ return NULL;
+ }
+
+ initdirpath(dirpath, dirpathindex, depthleft);
+ (*nfolders) = 0;
+
+ // Count files and directories
+ while (depthleft < maxdirdepth)
+ {
+ dirpath[dirpathindex[depthleft]] = 0;
+ dent = readdir(dirhandle[depthleft]);
+
+ if (!dent)
+ {
+ if (depthleft != rootdir) // Don't close the root directory
+ closedir(dirhandle[depthleft]);
+ depthleft++;
+ continue;
+ }
+ else if (isuptree(dent->d_name))
+ continue;
+
+ strcpy(&dirpath[dirpathindex[depthleft]], dent->d_name);
+
+ if (stat(dirpath, &fsstat) < 0)
+ ;
+ else if (S_ISDIR(fsstat.st_mode) && depthleft)
+ {
+ dirpathindex[--depthleft] = strlen(dirpath) + 1;
+ dirhandle[depthleft] = opendir(dirpath);
+
+ if (dirhandle[depthleft])
+ (*nfolders)++;
+ else
+ depthleft++;
+
+ dirpath[dirpathindex[depthleft]-1] = '/';
+ dirpath[dirpathindex[depthleft]] = 0;
+ }
+ else
+ numlumps++;
+
+ // Failure: Too many files.
+ if (numlumps == UINT16_MAX)
+ {
+ (*nlmp) = UINT16_MAX;
+ failure = true;
+ break;
+ }
+ }
+
+ // Failure: No files have been found.
+ if (!numlumps)
+ {
+ (*nlmp) = 0;
+ failure = true;
+ }
+
+ // Close any open directories and return if something went wrong.
+ if (failure)
+ {
+ free(dirpathindex);
+ free(dirhandle);
+ for (; depthleft < maxdirdepth; closedir(dirhandle[depthleft++]));
+ return NULL;
+ }
+
+ // Create the files and directories as lump entries
+ // It's possible to create lumps and count files at the same time,
+ // but I didn't want to have to reallocate memory for every lump.
+ rewinddir(dirhandle[rootdir]);
+ depthleft = rootdir;
+
+ strlcpy(dirpath, path, dirpathlen);
+ initdirpath(dirpath, dirpathindex, depthleft);
+
+ lump_p = lumpinfo = Z_Calloc(numlumps * sizeof(lumpinfo_t), PU_STATIC, NULL);
+
+ while (depthleft < maxdirdepth)
+ {
+ char *fullname, *trimname;
+
+ dirpath[dirpathindex[depthleft]] = 0;
+ dent = readdir(dirhandle[depthleft]);
+
+ if (!dent)
+ {
+ closedir(dirhandle[depthleft++]);
+ continue;
+ }
+ else if (isuptree(dent->d_name))
+ continue;
+
+ strcpy(&dirpath[dirpathindex[depthleft]], dent->d_name);
+
+ if (stat(dirpath, &fsstat) < 0)
+ continue;
+ else if (S_ISDIR(fsstat.st_mode) && depthleft)
+ {
+ dirpathindex[--depthleft] = strlen(dirpath) + 1;
+ dirhandle[depthleft] = opendir(dirpath);
+
+ if (dirhandle[depthleft])
+ {
+ dirpath[dirpathindex[depthleft]-1] = '/';
+ dirpath[dirpathindex[depthleft]] = 0;
+ }
+ else
+ depthleft++;
+
+ continue;
+ }
+
+ lump_p->diskpath = Z_StrDup(dirpath); // Path in the filesystem to the file
+ lump_p->compression = CM_NOCOMPRESSION; // Lump is uncompressed
+
+ // Remove the directory's path.
+ fullname = lump_p->diskpath;
+ if (strstr(fullname, path))
+ fullname += strlen(path) + 1;
+
+ // Get the 8-character long lump name.
+ trimname = strrchr(fullname, '/');
+ if (trimname)
+ trimname++;
+ else
+ trimname = fullname;
+
+ if (trimname[0])
+ {
+ char *dotpos = strrchr(trimname, '.');
+ if (dotpos == NULL)
+ dotpos = fullname + strlen(fullname);
+
+ strncpy(lump_p->name, trimname, min(8, dotpos - trimname));
+
+ // The name of the file, without the extension.
+ lump_p->longname = Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL);
+ strlcpy(lump_p->longname, trimname, dotpos - trimname + 1);
+ }
+ else
+ lump_p->longname = Z_Calloc(1, PU_STATIC, NULL);
+
+ // The complete name of the file, with its extension,
+ // excluding the path of the directory where it resides.
+ lump_p->fullname = Z_StrDup(fullname);
+
+ lump_p++;
+ i++;
+
+ if (i > numlumps || i == (UINT16_MAX-1))
+ {
+ for (; depthleft < maxdirdepth; closedir(dirhandle[depthleft++])); // Close any open directories.
+ break;
+ }
+ }
+
+ free(dirpathindex);
+ free(dirhandle);
+
+ (*nlmp) = numlumps;
+ return lumpinfo;
+}
+
+//
+// Addons menu
+//
+
char exttable[NUM_EXT_TABLE][7] = { // maximum extension length (currently 4) plus 3 (null terminator, stop, and length including previous two)
"\5.txt", "\5.cfg", // exec
"\5.wad",
@@ -453,8 +827,7 @@ char exttable[NUM_EXT_TABLE][7] = { // maximum extension length (currently 4) pl
#endif
"\5.pk3", "\5.soc", "\5.lua"}; // addfile
-char filenamebuf[MAX_WADFILES][MAX_WADPATH];
-
+static char (*filenamebuf)[MAX_WADPATH];
static boolean filemenucmp(char *haystack, char *needle)
{
@@ -640,10 +1013,7 @@ boolean preparefilemenu(boolean samedepth)
if (!dent)
break;
- else if (dent->d_name[0]=='.' &&
- (dent->d_name[1]=='\0' ||
- (dent->d_name[1]=='.' &&
- dent->d_name[2]=='\0')))
+ else if (isuptree(dent->d_name))
continue; // we don't want to scan uptree
strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name);
@@ -704,10 +1074,7 @@ boolean preparefilemenu(boolean samedepth)
if (!dent)
break;
- else if (dent->d_name[0]=='.' &&
- (dent->d_name[1]=='\0' ||
- (dent->d_name[1]=='.' &&
- dent->d_name[2]=='\0')))
+ else if (isuptree(dent->d_name))
continue; // we don't want to scan uptree
strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name);
@@ -732,6 +1099,10 @@ boolean preparefilemenu(boolean samedepth)
if (ext >= EXT_LOADSTART)
{
size_t i;
+
+ if (filenamebuf == NULL)
+ filenamebuf = calloc(sizeof(char) * MAX_WADPATH, numwadfiles);
+
for (i = 0; i < numwadfiles; i++)
{
if (!filenamebuf[i][0])
@@ -781,6 +1152,12 @@ boolean preparefilemenu(boolean samedepth)
}
}
+ if (filenamebuf)
+ {
+ free(filenamebuf);
+ filenamebuf = NULL;
+ }
+
closedir(dirhandle);
if ((menudepthleft != menudepth-1) // now for UP... entry
diff --git a/src/filesrch.h b/src/filesrch.h
index dfea8979e9c19d3a5a733e8303636762c9027d04..59ef5269b194f0918a14927a6fc1eaf003e1a40b 100644
--- a/src/filesrch.h
+++ b/src/filesrch.h
@@ -7,6 +7,7 @@
#include "doomdef.h"
#include "d_netfil.h"
#include "m_menu.h" // MAXSTRINGLENGTH
+#include "w_wad.h"
extern consvar_t cv_addons_option, cv_addons_folder, cv_addons_md5, cv_addons_showall, cv_addons_search_case, cv_addons_search_type;
@@ -28,6 +29,16 @@ extern consvar_t cv_addons_option, cv_addons_folder, cv_addons_md5, cv_addons_sh
filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum,
boolean completepath, int maxsearchdepth);
+INT32 pathisdirectory(const char *path);
+INT32 samepaths(const char *path1, const char *path2);
+INT32 concatpaths(const char *path, const char *startpath);
+
+#ifndef AVOID_ERRNO
+extern int direrror;
+#endif
+
+lumpinfo_t *getdirectoryfiles(const char *path, UINT16 *nlmp, UINT16 *nfolders);
+
#define menudepth 20
extern char menupath[1024];
@@ -42,9 +53,6 @@ extern size_t dir_on[menudepth];
extern UINT8 refreshdirmenu;
extern char *refreshdirname;
-extern size_t packetsizetally;
-extern size_t mainwadstally;
-
typedef enum
{
EXT_FOLDER = 0,
@@ -94,5 +102,4 @@ typedef enum
void closefilemenu(boolean validsize);
void searchfilemenu(char *tempname);
boolean preparefilemenu(boolean samedepth);
-
#endif // __FILESRCH_H__
diff --git a/src/g_demo.c b/src/g_demo.c
index ea71c9bd4c6cf621b8a256f9574c4919986833ff..e293ad9dc5e76a1af37e3b384763383e23326c70 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -94,7 +94,7 @@ demoghost *ghosts = NULL;
// DEMO RECORDING
//
-#define DEMOVERSION 0x000e
+#define DEMOVERSION 0x000f
#define DEMOHEADER "\xF0" "SRB2Replay" "\x0F"
#define DF_GHOST 0x01 // This demo contains ghost data too!
@@ -109,6 +109,7 @@ demoghost *ghosts = NULL;
#define ZT_ANGLE 0x04
#define ZT_BUTTONS 0x08
#define ZT_AIMING 0x10
+#define ZT_LATENCY 0x20
#define DEMOMARKER 0x80 // demoend
#define METALDEATH 0x44
#define METALSNICE 0x69
@@ -181,6 +182,8 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
oldcmd.buttons = (oldcmd.buttons & (BT_CAMLEFT|BT_CAMRIGHT)) | (READUINT16(demo_p) & ~(BT_CAMLEFT|BT_CAMRIGHT));
if (ziptic & ZT_AIMING)
oldcmd.aiming = READINT16(demo_p);
+ if (ziptic & ZT_LATENCY)
+ oldcmd.latency = READUINT8(demo_p);
G_CopyTiccmd(cmd, &oldcmd, 1);
players[playernum].angleturn = cmd->angleturn;
@@ -238,6 +241,13 @@ void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
ziptic |= ZT_AIMING;
}
+ if (cmd->latency != oldcmd.latency)
+ {
+ WRITEUINT8(demo_p,cmd->latency);
+ oldcmd.latency = cmd->latency;
+ ziptic |= ZT_LATENCY;
+ }
+
*ziptic_p = ziptic;
// attention here for the ticcmd size!
@@ -679,6 +689,8 @@ void G_GhostTicker(void)
g->p += 2;
if (ziptic & ZT_AIMING)
g->p += 2;
+ if (ziptic & ZT_LATENCY)
+ g->p++;
// Grab ghost data.
ziptic = READUINT8(g->p);
@@ -1017,7 +1029,11 @@ void G_ReadMetalTic(mobj_t *metal)
if (ziptic & GZT_ANGLE)
metal->angle = READUINT8(metal_p)<<24;
if (ziptic & GZT_FRAME)
+ {
oldmetal.frame = READUINT32(metal_p);
+ if (metalversion < 0x000f)
+ oldmetal.frame = G_ConvertOldFrameFlags(oldmetal.frame);
+ }
if (ziptic & GZT_SPR2)
oldmetal.sprite2 = READUINT8(metal_p);
@@ -1157,6 +1173,8 @@ void G_ReadMetalTic(mobj_t *metal)
follow->sprite2 = 0;
follow->sprite = READUINT16(metal_p);
follow->frame = READUINT32(metal_p); // NOT & FF_FRAMEMASK here, so 32 bits
+ if (metalversion < 0x000f)
+ follow->frame = G_ConvertOldFrameFlags(follow->frame);
follow->angle = metal->angle;
follow->color = (metalversion==0x000c) ? READUINT8(metal_p) : READUINT16(metal_p);
@@ -1668,7 +1686,9 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname)
switch(oldversion) // demoversion
{
case DEMOVERSION: // latest always supported
- case 0x000c: // all that changed between then and now was longer color name
+ case 0x000e: // The previous demoversions also supported
+ case 0x000d: // all that changed between then and now was longer color name
+ case 0x000c:
break;
// too old, cannot support.
default:
@@ -1811,6 +1831,7 @@ void G_DoPlayDemo(char *defdemoname)
switch(demoversion)
{
case 0x000d:
+ case 0x000e:
case DEMOVERSION: // latest always supported
cnamelen = MAXCOLORNAME;
break;
@@ -1956,7 +1977,7 @@ void G_DoPlayDemo(char *defdemoname)
// Set skin
SetPlayerSkin(0, skin);
- LUAh_MapChange(gamemap);
+ LUA_HookInt(gamemap, HOOK(MapChange));
displayplayer = consoleplayer = 0;
memset(playeringame,0,sizeof(playeringame));
playeringame[0] = true;
@@ -2011,7 +2032,7 @@ void G_AddGhost(char *defdemoname)
char name[17],skin[17],color[MAXCOLORNAME+1],*n,*pdemoname,md5[16];
UINT8 cnamelen;
demoghost *gh;
- UINT8 flags;
+ UINT8 flags, subversion;
UINT8 *buffer,*p;
mapthing_t *mthing;
UINT16 count, ghostversion;
@@ -2059,11 +2080,12 @@ void G_AddGhost(char *defdemoname)
return;
} p += 12; // DEMOHEADER
p++; // VERSION
- p++; // SUBVERSION
+ subversion = READUINT8(p); // SUBVERSION
ghostversion = READUINT16(p);
switch(ghostversion)
{
case 0x000d:
+ case 0x000e:
case DEMOVERSION: // latest always supported
cnamelen = MAXCOLORNAME;
break;
@@ -2158,9 +2180,19 @@ void G_AddGhost(char *defdemoname)
count = READUINT16(p);
while (count--)
{
- SKIPSTRING(p);
- SKIPSTRING(p);
- p++;
+ // In 2.2.7 netvar saving was updated
+ if (subversion < 7)
+ {
+ p += 2;
+ SKIPSTRING(p);
+ p++;
+ }
+ else
+ {
+ SKIPSTRING(p);
+ SKIPSTRING(p);
+ p++;
+ }
}
if (*p == DEMOMARKER)
@@ -2314,8 +2346,9 @@ void G_DoPlayMetal(void)
switch(metalversion)
{
case DEMOVERSION: // latest always supported
- case 0x000d: // There are checks wheter the momentum is from older demo versions or not
- case 0x000c: // all that changed between then and now was longer color name
+ case 0x000e: // There are checks wheter the momentum is from older demo versions or not
+ case 0x000d: // all that changed between then and now was longer color name
+ case 0x000c:
break;
// too old, cannot support.
default:
@@ -2410,12 +2443,13 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill)
{
WRITEUINT8(demo_p, (kill) ? METALDEATH : DEMOMARKER); // add the demo end (or metal death) marker
WriteDemoChecksum();
- saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuffer, demo_p - demobuffer); // finally output the file.
+ sprintf(demoname, "%sMS.LMP", G_BuildMapName(gamemap));
+ saved = FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer); // finally output the file.
}
free(demobuffer);
metalrecording = false;
if (saved)
- I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap));
+ I_Error("Saved to %s", demoname);
I_Error("Failed to save demo!");
}
@@ -2530,3 +2564,45 @@ boolean G_CheckDemoStatus(void)
return false;
}
+
+// 2.2.10 shifted some frame flags around, this function converts frame flags from older versions to their 2.2.10 equivalents.
+INT32 G_ConvertOldFrameFlags(INT32 frame)
+{
+ if (frame & 0x01000000) // was FF_ANIMATE, is now FF_VERTICALFLIP
+ {
+ frame &= ~0x01000000;
+ frame |= FF_ANIMATE;
+ }
+
+ if (frame & 0x02000000) // was FF_RANDOMANIM, is now FF_HORIZONTALFLIP
+ {
+ frame &= ~0x02000000;
+ frame |= FF_RANDOMANIM;
+ }
+
+ if (frame & 0x04000000) // was FF_GLOBALANIM, is now empty
+ {
+ frame &= ~0x04000000;
+ frame |= FF_GLOBALANIM;
+ }
+
+ if (frame & 0x00200000) // was FF_VERTICALFLIP, is now FF_FULLDARK
+ {
+ frame &= ~0x00200000;
+ frame |= FF_VERTICALFLIP;
+ }
+
+ if (frame & 0x00400000) // was FF_HORIZONTALFLIP, is now FF_PAPERSPRITE
+ {
+ frame &= ~0x00400000;
+ frame |= FF_HORIZONTALFLIP;
+ }
+
+ if (frame & 0x00800000) // was FF_PAPERSPRITE, is now FF_FLOORSPRITE
+ {
+ frame &= ~0x00800000;
+ frame |= FF_PAPERSPRITE;
+ }
+
+ return frame;
+}
diff --git a/src/g_demo.h b/src/g_demo.h
index 73cf273582ff1baeffcb2638ebe81654e6b8d70d..37664dc71fb7ce74a394b54b28f4b663f3a596d0 100644
--- a/src/g_demo.h
+++ b/src/g_demo.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -82,5 +82,6 @@ void G_StopMetalDemo(void);
ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill);
void G_StopDemo(void);
boolean G_CheckDemoStatus(void);
+INT32 G_ConvertOldFrameFlags(INT32 frame);
#endif // __G_DEMO__
diff --git a/src/g_game.c b/src/g_game.c
index 10d125fcd9ef15741d11fa2dd592ad7263c69e4b..6571ba3870df7d374667d2afd0e7744bf84c75f3 100755
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -45,6 +45,7 @@
#include "lua_hook.h"
#include "b_bot.h"
#include "m_cond.h" // condition sets
+#include "lua_script.h"
#include "lua_hud.h"
@@ -181,7 +182,7 @@ static boolean exitgame = false;
static boolean retrying = false;
static boolean retryingmodeattack = false;
-UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage.
+boolean stagefailed = false; // Used for GEMS BONUS? Also to see if you beat the stage.
UINT16 emeralds;
INT32 luabanks[NUM_LUABANKS];
@@ -357,8 +358,8 @@ consvar_t cv_analog[2] = {
CVAR_INIT ("sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange),
};
consvar_t cv_useranalog[2] = {
- CVAR_INIT ("configanalog", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange),
- CVAR_INIT ("configanalog2", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange),
+ CVAR_INIT ("configanalog", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange),
+ CVAR_INIT ("configanalog2", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange),
};
// deez New User eXperiences
@@ -373,8 +374,8 @@ consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", CV_SAVE|CV_CALL, CV_OnO
// hi here's some new controls
static CV_PossibleValue_t zerotoone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
consvar_t cv_cam_shiftfacing[2] = {
- CVAR_INIT ("cam_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacing[2] = {
CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
@@ -385,12 +386,12 @@ consvar_t cv_cam_turnfacingability[2] = {
CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacingspindash[2] = {
- CVAR_INIT ("cam_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacinginput[2] = {
- CVAR_INIT ("cam_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
- CVAR_INIT ("cam2_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
static CV_PossibleValue_t centertoggle_cons_t[] = {{0, "Hold"}, {1, "Toggle"}, {2, "Sticky Hold"}, {0, NULL}};
@@ -414,44 +415,28 @@ static CV_PossibleValue_t lockedassist_cons_t[] = {
{0, NULL}
};
consvar_t cv_cam_lockonboss[2] = {
- CVAR_INIT ("cam_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL),
- CVAR_INIT ("cam2_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL),
+ CVAR_INIT ("cam_lockaimassist", "Full", CV_SAVE, lockedassist_cons_t, NULL),
+ CVAR_INIT ("cam2_lockaimassist", "Full", CV_SAVE, lockedassist_cons_t, NULL),
};
-typedef enum
-{
- AXISNONE = 0,
- AXISTURN,
- AXISMOVE,
- AXISLOOK,
- AXISSTRAFE,
-
- AXISDIGITAL, // axes below this use digital deadzone
-
- AXISJUMP,
- AXISSPIN,
- AXISFIRE,
- AXISFIRENORMAL,
-} axis_input_e;
-
-consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
-consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
-consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
@@ -853,7 +838,7 @@ INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
return (INT16)((*aiming)>>16);
}
-static INT32 JoyAxis(axis_input_e axissel)
+INT32 JoyAxis(joyaxis_e axissel)
{
INT32 retaxis;
INT32 axisval;
@@ -862,28 +847,28 @@ static INT32 JoyAxis(axis_input_e axissel)
//find what axis to get
switch (axissel)
{
- case AXISTURN:
+ case JA_TURN:
axisval = cv_turnaxis.value;
break;
- case AXISMOVE:
+ case JA_MOVE:
axisval = cv_moveaxis.value;
break;
- case AXISLOOK:
+ case JA_LOOK:
axisval = cv_lookaxis.value;
break;
- case AXISSTRAFE:
+ case JA_STRAFE:
axisval = cv_sideaxis.value;
break;
- case AXISJUMP:
+ case JA_JUMP:
axisval = cv_jumpaxis.value;
break;
- case AXISSPIN:
+ case JA_SPIN:
axisval = cv_spinaxis.value;
break;
- case AXISFIRE:
+ case JA_FIRE:
axisval = cv_fireaxis.value;
break;
- case AXISFIRENORMAL:
+ case JA_FIRENORMAL:
axisval = cv_firenaxis.value;
break;
default:
@@ -915,7 +900,7 @@ static INT32 JoyAxis(axis_input_e axissel)
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
- if (!Joystick.bGamepadStyle && axissel > AXISDIGITAL)
+ if (!Joystick.bGamepadStyle && axissel >= JA_DIGITAL)
{
const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_digitaldeadzone.value) >> FRACBITS;
if (-jdeadzone < retaxis && retaxis < jdeadzone)
@@ -926,7 +911,7 @@ static INT32 JoyAxis(axis_input_e axissel)
return retaxis;
}
-static INT32 Joy2Axis(axis_input_e axissel)
+INT32 Joy2Axis(joyaxis_e axissel)
{
INT32 retaxis;
INT32 axisval;
@@ -935,28 +920,28 @@ static INT32 Joy2Axis(axis_input_e axissel)
//find what axis to get
switch (axissel)
{
- case AXISTURN:
+ case JA_TURN:
axisval = cv_turnaxis2.value;
break;
- case AXISMOVE:
+ case JA_MOVE:
axisval = cv_moveaxis2.value;
break;
- case AXISLOOK:
+ case JA_LOOK:
axisval = cv_lookaxis2.value;
break;
- case AXISSTRAFE:
+ case JA_STRAFE:
axisval = cv_sideaxis2.value;
break;
- case AXISJUMP:
+ case JA_JUMP:
axisval = cv_jumpaxis2.value;
break;
- case AXISSPIN:
+ case JA_SPIN:
axisval = cv_spinaxis2.value;
break;
- case AXISFIRE:
+ case JA_FIRE:
axisval = cv_fireaxis2.value;
break;
- case AXISFIRENORMAL:
+ case JA_FIRENORMAL:
axisval = cv_firenaxis2.value;
break;
default:
@@ -990,7 +975,7 @@ static INT32 Joy2Axis(axis_input_e axissel)
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
- if (!Joystick2.bGamepadStyle && axissel > AXISDIGITAL)
+ if (!Joystick2.bGamepadStyle && axissel >= JA_DIGITAL)
{
const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_digitaldeadzone2.value) >> FRACBITS;
if (-jdeadzone < retaxis && retaxis < jdeadzone)
@@ -1099,14 +1084,14 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
boolean turnleft, turnright, strafelkey, straferkey, movefkey, movebkey, mouseaiming, analogjoystickmove, gamepadjoystickmove, thisjoyaiming;
boolean strafeisturn; // Simple controls only
player_t *player = &players[ssplayer == 2 ? secondarydisplayplayer : consoleplayer];
- camera_t *thiscam = ((ssplayer == 1 || player->bot == 2) ? &camera : &camera2);
+ camera_t *thiscam = ((ssplayer == 1 || player->bot == BOT_2PHUMAN) ? &camera : &camera2);
angle_t *myangle = (ssplayer == 1 ? &localangle : &localangle2);
INT32 *myaiming = (ssplayer == 1 ? &localaiming : &localaiming2);
angle_t drawangleoffset = (player->powers[pw_carry] == CR_ROLLOUT) ? ANGLE_180 : 0;
INT32 chasecam, chasefreelook, alwaysfreelook, usejoystick, invertmouse, turnmultiplier, mousemove;
controlstyle_e controlstyle = G_ControlStyle(ssplayer);
- INT32 *mx; INT32 *my; INT32 *mly;
+ INT32 mdx, mdy, mldy;
static INT32 turnheld[2]; // for accelerative turning
static boolean keyboard_look[2]; // true if lookup/down using keyboard
@@ -1129,9 +1114,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
invertmouse = cv_invertmouse.value;
turnmultiplier = cv_cam_turnmultiplier.value;
mousemove = cv_mousemove.value;
- mx = &mousex;
- my = &mousey;
- mly = &mlooky;
+ mdx = mouse.dx;
+ mdy = -mouse.dy;
+ mldy = -mouse.mlookdy;
G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver
}
else
@@ -1143,12 +1128,15 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
invertmouse = cv_invertmouse2.value;
turnmultiplier = cv_cam2_turnmultiplier.value;
mousemove = cv_mousemove2.value;
- mx = &mouse2x;
- my = &mouse2y;
- mly = &mlook2y;
+ mdx = mouse2.dx;
+ mdy = -mouse2.dy;
+ mldy = -mouse2.mlookdy;
G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); // empty, or external driver
}
+ if (menuactive || CON_Ready() || chat_on)
+ mdx = mdy = mldy = 0;
+
strafeisturn = controlstyle == CS_SIMPLE && ticcmd_centerviewdown[forplayer] &&
((cv_cam_lockedinput[forplayer].value && !ticcmd_ztargetfocus[forplayer]) || (player->pflags & PF_STARTDASH)) &&
!player->climbing && player->powers[pw_carry] != CR_MINECART;
@@ -1164,15 +1152,13 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
return;
}
+ turnright = PLAYERINPUTDOWN(ssplayer, GC_TURNRIGHT);
+ turnleft = PLAYERINPUTDOWN(ssplayer, GC_TURNLEFT);
-
- turnright = PLAYERINPUTDOWN(ssplayer, gc_turnright);
- turnleft = PLAYERINPUTDOWN(ssplayer, gc_turnleft);
-
- straferkey = PLAYERINPUTDOWN(ssplayer, gc_straferight);
- strafelkey = PLAYERINPUTDOWN(ssplayer, gc_strafeleft);
- movefkey = PLAYERINPUTDOWN(ssplayer, gc_forward);
- movebkey = PLAYERINPUTDOWN(ssplayer, gc_backward);
+ straferkey = PLAYERINPUTDOWN(ssplayer, GC_STRAFERIGHT);
+ strafelkey = PLAYERINPUTDOWN(ssplayer, GC_STRAFELEFT);
+ movefkey = PLAYERINPUTDOWN(ssplayer, GC_FORWARD);
+ movebkey = PLAYERINPUTDOWN(ssplayer, GC_BACKWARD);
if (strafeisturn)
{
@@ -1181,7 +1167,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
straferkey = strafelkey = false;
}
- mouseaiming = (PLAYERINPUTDOWN(ssplayer, gc_mouseaiming)) ^
+ mouseaiming = (PLAYERINPUTDOWN(ssplayer, GC_MOUSEAIMING)) ^
((chasecam && !player->spectator) ? chasefreelook : alwaysfreelook);
analogjoystickmove = usejoystick && !Joystick.bGamepadStyle;
gamepadjoystickmove = usejoystick && Joystick.bGamepadStyle;
@@ -1193,10 +1179,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
*myaiming = 0;
joyaiming[forplayer] = thisjoyaiming;
- turnaxis = PlayerJoyAxis(ssplayer, AXISTURN);
+ turnaxis = PlayerJoyAxis(ssplayer, JA_TURN);
if (strafeisturn)
- turnaxis += PlayerJoyAxis(ssplayer, AXISSTRAFE);
- lookaxis = PlayerJoyAxis(ssplayer, AXISLOOK);
+ turnaxis += PlayerJoyAxis(ssplayer, JA_STRAFE);
+ lookaxis = PlayerJoyAxis(ssplayer, JA_LOOK);
lookjoystickvector.xaxis = turnaxis;
lookjoystickvector.yaxis = lookaxis;
G_HandleAxisDeadZone(forplayer, &lookjoystickvector);
@@ -1275,8 +1261,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
tta_factor[forplayer] = 0; // suspend turn to angle
}
- strafeaxis = strafeisturn ? 0 : PlayerJoyAxis(ssplayer, AXISSTRAFE);
- moveaxis = PlayerJoyAxis(ssplayer, AXISMOVE);
+ strafeaxis = strafeisturn ? 0 : PlayerJoyAxis(ssplayer, JA_STRAFE);
+ moveaxis = PlayerJoyAxis(ssplayer, JA_MOVE);
movejoystickvector.xaxis = strafeaxis;
movejoystickvector.yaxis = moveaxis;
G_HandleAxisDeadZone(forplayer, &movejoystickvector);
@@ -1297,11 +1283,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
// forward with key or button
if (movefkey || (gamepadjoystickmove && movejoystickvector.yaxis < 0)
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
- && (PLAYERINPUTDOWN(ssplayer, gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))))
+ && (PLAYERINPUTDOWN(ssplayer, GC_LOOKUP) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))))
forward = forwardmove[speed];
if (movebkey || (gamepadjoystickmove && movejoystickvector.yaxis > 0)
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
- && (PLAYERINPUTDOWN(ssplayer, gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))))
+ && (PLAYERINPUTDOWN(ssplayer, GC_LOOKDOWN) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))))
forward -= forwardmove[speed];
if (analogjoystickmove && movejoystickvector.yaxis != 0)
@@ -1314,9 +1300,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (strafelkey)
side -= sidemove[speed];
- if (PLAYERINPUTDOWN(ssplayer, gc_weaponnext))
+ if (PLAYERINPUTDOWN(ssplayer, GC_WEAPONNEXT))
cmd->buttons |= BT_WEAPONNEXT; // Next Weapon
- if (PLAYERINPUTDOWN(ssplayer, gc_weaponprev))
+ if (PLAYERINPUTDOWN(ssplayer, GC_WEAPONPREV))
cmd->buttons |= BT_WEAPONPREV; // Previous Weapon
#if NUM_WEAPONS > 10
@@ -1325,42 +1311,42 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
//use the four avaliable bits to determine the weapon.
cmd->buttons &= ~BT_WEAPONMASK;
for (i = 0; i < NUM_WEAPONS; ++i)
- if (PLAYERINPUTDOWN(ssplayer, gc_wepslot1 + i))
+ if (PLAYERINPUTDOWN(ssplayer, GC_WEPSLOT1 + i))
{
cmd->buttons |= (UINT16)(i + 1);
break;
}
// fire with any button/key
- axis = PlayerJoyAxis(ssplayer, AXISFIRE);
- if (PLAYERINPUTDOWN(ssplayer, gc_fire) || (usejoystick && axis > 0))
+ axis = PlayerJoyAxis(ssplayer, JA_FIRE);
+ if (PLAYERINPUTDOWN(ssplayer, GC_FIRE) || (usejoystick && axis > 0))
cmd->buttons |= BT_ATTACK;
// fire normal with any button/key
- axis = PlayerJoyAxis(ssplayer, AXISFIRENORMAL);
- if (PLAYERINPUTDOWN(ssplayer, gc_firenormal) || (usejoystick && axis > 0))
+ axis = PlayerJoyAxis(ssplayer, JA_FIRENORMAL);
+ if (PLAYERINPUTDOWN(ssplayer, GC_FIRENORMAL) || (usejoystick && axis > 0))
cmd->buttons |= BT_FIRENORMAL;
- if (PLAYERINPUTDOWN(ssplayer, gc_tossflag))
+ if (PLAYERINPUTDOWN(ssplayer, GC_TOSSFLAG))
cmd->buttons |= BT_TOSSFLAG;
// Lua scriptable buttons
- if (PLAYERINPUTDOWN(ssplayer, gc_custom1))
+ if (PLAYERINPUTDOWN(ssplayer, GC_CUSTOM1))
cmd->buttons |= BT_CUSTOM1;
- if (PLAYERINPUTDOWN(ssplayer, gc_custom2))
+ if (PLAYERINPUTDOWN(ssplayer, GC_CUSTOM2))
cmd->buttons |= BT_CUSTOM2;
- if (PLAYERINPUTDOWN(ssplayer, gc_custom3))
+ if (PLAYERINPUTDOWN(ssplayer, GC_CUSTOM3))
cmd->buttons |= BT_CUSTOM3;
// use with any button/key
- axis = PlayerJoyAxis(ssplayer, AXISSPIN);
- if (PLAYERINPUTDOWN(ssplayer, gc_spin) || (usejoystick && axis > 0))
+ axis = PlayerJoyAxis(ssplayer, JA_SPIN);
+ if (PLAYERINPUTDOWN(ssplayer, GC_SPIN) || (usejoystick && axis > 0))
cmd->buttons |= BT_SPIN;
// Centerview can be a toggle in simple mode!
{
static boolean last_centerviewdown[2], centerviewhold[2]; // detect taps for toggle behavior
- boolean down = PLAYERINPUTDOWN(ssplayer, gc_centerview);
+ boolean down = PLAYERINPUTDOWN(ssplayer, GC_CENTERVIEW);
if (!(controlstyle == CS_SIMPLE && cv_cam_centertoggle[forplayer].value))
centerviewdown = down;
@@ -1437,7 +1423,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
newtarget = P_SpawnMobj(ticcmd_ztargetfocus[forplayer]->x, ticcmd_ztargetfocus[forplayer]->y, ticcmd_ztargetfocus[forplayer]->z, MT_LOCKON); // positioning, flip handled in P_SceneryThinker
P_SetTarget(&newtarget->target, ticcmd_ztargetfocus[forplayer]);
- if (P_AproxDistance(
+ if (player->mo && P_AproxDistance(
player->mo->x - ticcmd_ztargetfocus[forplayer]->x,
player->mo->y - ticcmd_ztargetfocus[forplayer]->y
) > 50*player->mo->scale)
@@ -1459,7 +1445,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (ticcmd_centerviewdown[forplayer] && controlstyle == CS_SIMPLE)
controlstyle = CS_LEGACY;
- if (PLAYERINPUTDOWN(ssplayer, gc_camreset))
+ if (PLAYERINPUTDOWN(ssplayer, GC_CAMRESET))
{
if (thiscam->chase && !resetdown[forplayer])
P_ResetCamera(&players[ssplayer == 1 ? displayplayer : secondarydisplayplayer], thiscam);
@@ -1471,8 +1457,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
// jump button
- axis = PlayerJoyAxis(ssplayer, AXISJUMP);
- if (PLAYERINPUTDOWN(ssplayer, gc_jump) || (usejoystick && axis > 0))
+ axis = PlayerJoyAxis(ssplayer, JA_JUMP);
+ if (PLAYERINPUTDOWN(ssplayer, GC_JUMP) || (usejoystick && axis > 0))
cmd->buttons |= BT_JUMP;
// player aiming shit, ahhhh...
@@ -1490,7 +1476,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
keyboard_look[forplayer] = false;
// looking up/down
- *myaiming += (*mly<<19)*player_invert*screen_invert;
+ *myaiming += (mldy<<19)*player_invert*screen_invert;
}
if (analogjoystickmove && joyaiming[forplayer] && lookjoystickvector.yaxis != 0 && configlookaxis != 0)
@@ -1502,12 +1488,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (!(player->powers[pw_carry] == CR_NIGHTSMODE))
{
- if (PLAYERINPUTDOWN(ssplayer, gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))
+ if (PLAYERINPUTDOWN(ssplayer, GC_LOOKUP) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))
{
*myaiming += KB_LOOKSPEED * screen_invert;
keyboard_look[forplayer] = true;
}
- else if (PLAYERINPUTDOWN(ssplayer, gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))
+ else if (PLAYERINPUTDOWN(ssplayer, GC_LOOKDOWN) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))
{
*myaiming -= KB_LOOKSPEED * screen_invert;
keyboard_look[forplayer] = true;
@@ -1524,24 +1510,22 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
}
if (!mouseaiming && mousemove)
- forward += *my;
+ forward += mdy;
if ((!demoplayback && (player->pflags & PF_SLIDING))) // Analog for mouse
- side += *mx*2;
+ side += mdx*2;
else if (controlstyle == CS_LMAOGALOG)
{
- if (*mx)
+ if (mdx)
{
- if (*mx > 0)
+ if (mdx > 0)
cmd->buttons |= BT_CAMRIGHT;
else
cmd->buttons |= BT_CAMLEFT;
}
}
else
- cmd->angleturn = (INT16)(cmd->angleturn - (*mx*8));
-
- *mx = *my = *mly = 0;
+ cmd->angleturn = (INT16)(cmd->angleturn - (mdx*8));
if (forward > MAXPLMOVE)
forward = MAXPLMOVE;
@@ -1574,30 +1558,19 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
cmd->forwardmove = (SINT8)(cmd->forwardmove + forward);
cmd->sidemove = (SINT8)(cmd->sidemove + side);
- if (player->bot == 1) { // Tailsbot for P2
- if (!player->powers[pw_tailsfly] && (cmd->forwardmove || cmd->sidemove || cmd->buttons))
- {
- player->bot = 2; // A player-controlled bot. Returns to AI when it respawns.
- CV_SetValue(&cv_analog[1], true);
- }
- else
- {
- G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); // empty, or external driver
- B_BuildTiccmd(player, cmd);
- }
- B_HandleFlightIndicator(player);
+ // Note: Majority of botstuffs are handled in G_Ticker now.
+ if (player->bot == BOT_2PAI
+ && !player->powers[pw_tailsfly]
+ && (cmd->forwardmove || cmd->sidemove || cmd->buttons))
+ {
+ player->bot = BOT_2PHUMAN; // A player-controlled bot. Returns to AI when it respawns.
+ CV_SetValue(&cv_analog[1], true);
}
- else if (player->bot == 2)
- // Fix offset angle for P2-controlled Tailsbot when P2's controls are set to non-Legacy
- cmd->angleturn = (INT16)((localangle - *myangle) >> 16);
- //HACK
- //player angle correction because camera sucks
- if (!(player->climbing) && (player->powers[pw_carry] != CR_MINECART) && canSimulate && (neededtic < gametic))
- *myangle += (cmd->angleturn<<16) + player->mo->angle - *myangle;
- else
- *myangle += (cmd->angleturn<<16);
+ if (player->bot == BOT_2PHUMAN)
+ cmd->angleturn = (INT16)((localangle - *myangle) >> 16);
+ *myangle += (cmd->angleturn<<16);
if (controlstyle == CS_LMAOGALOG) {
angle_t angle;
@@ -1707,12 +1680,16 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
cmd->angleturn = orighookangle;
- LUAh_PlayerCmd(player, cmd);
+ LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd));
extra = cmd->angleturn - orighookangle;
cmd->angleturn = origangle + extra;
*myangle += extra << 16;
*myaiming += (cmd->aiming - origaiming) << 16;
+
+ // Send leveltime when this tic was generated to the server for control lag calculations.
+ // Only do this when in a level. Also do this after the hook, so that it can't overwrite this.
+ cmd->latency = (leveltime & 0xFF);
}
//Reset away view if a command is given.
@@ -1721,7 +1698,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
{
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
+ LUA_HookViewpointSwitch(player, &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -1744,6 +1721,7 @@ ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
dest[i].angleturn = SHORT(src[i].angleturn);
dest[i].aiming = (INT16)SHORT(src[i].aiming);
dest[i].buttons = (UINT16)SHORT(src[i].buttons);
+ dest[i].latency = src[i].latency;
}
return dest;
}
@@ -1893,8 +1871,8 @@ void G_DoLoadLevel(boolean resetplayer)
joyxmove[i] = joyymove[i] = 0;
joy2xmove[i] = joy2ymove[i] = 0;
}
- mousex = mousey = 0;
- mouse2x = mouse2y = 0;
+ G_SetMouseDeltas(0, 0, 1);
+ G_SetMouseDeltas(0, 0, 2);
// clear hud messages remains (usually from game startup)
CON_ClearHUD();
@@ -1998,7 +1976,7 @@ boolean G_Responder(event_t *ev)
if (gameaction == ga_nothing && !singledemo &&
((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN))
{
- if (ev->type == ev_keydown && ev->data1 != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE))
+ if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE))
{
M_StartControlPanel();
return true;
@@ -2074,7 +2052,7 @@ boolean G_Responder(event_t *ev)
// allow spy mode changes even during the demo
if (gamestate == GS_LEVEL && ev->type == ev_keydown
- && (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
+ && (ev->key == KEY_F12 || ev->key == gamecontrol[GC_VIEWPOINT][0] || ev->key == gamecontrol[GC_VIEWPOINT][1]))
{
// ViewpointSwitch Lua hook.
UINT8 canSwitchView = 0;
@@ -2094,7 +2072,7 @@ boolean G_Responder(event_t *ev)
continue;
// Call ViewpointSwitch hooks here.
- canSwitchView = LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], false);
+ canSwitchView = LUA_HookViewpointSwitch(&players[consoleplayer], &players[displayplayer], false);
if (canSwitchView == 1) // Set viewpoint to this player
break;
else if (canSwitchView == 2) // Skip this player
@@ -2147,13 +2125,13 @@ boolean G_Responder(event_t *ev)
switch (ev->type)
{
case ev_keydown:
- if (ev->data1 == gamecontrol[gc_pause][0]
- || ev->data1 == gamecontrol[gc_pause][1]
- || ev->data1 == KEY_PAUSE)
+ if (ev->key == gamecontrol[GC_PAUSE][0]
+ || ev->key == gamecontrol[GC_PAUSE][1]
+ || ev->key == KEY_PAUSE)
{
if (modeattacking && !demoplayback && (gamestate == GS_LEVEL))
{
- pausebreakkey = (ev->data1 == KEY_PAUSE);
+ pausebreakkey = (ev->key == KEY_PAUSE);
if (menuactive || pausedelay < 0 || leveltime < 2)
return true;
@@ -2178,8 +2156,8 @@ boolean G_Responder(event_t *ev)
}
}
}
- if (ev->data1 == gamecontrol[gc_camtoggle][0]
- || ev->data1 == gamecontrol[gc_camtoggle][1])
+ if (ev->key == gamecontrol[GC_CAMTOGGLE][0]
+ || ev->key == gamecontrol[GC_CAMTOGGLE][1])
{
if (!camtoggledelay)
{
@@ -2187,8 +2165,8 @@ boolean G_Responder(event_t *ev)
CV_SetValue(&cv_chasecam, cv_chasecam.value ? 0 : 1);
}
}
- if (ev->data1 == gamecontrolbis[gc_camtoggle][0]
- || ev->data1 == gamecontrolbis[gc_camtoggle][1])
+ if (ev->key == gamecontrolbis[GC_CAMTOGGLE][0]
+ || ev->key == gamecontrolbis[GC_CAMTOGGLE][1])
{
if (!camtoggledelay2)
{
@@ -2218,6 +2196,28 @@ boolean G_Responder(event_t *ev)
return false;
}
+//
+// G_LuaResponder
+// Let Lua handle key events.
+//
+boolean G_LuaResponder(event_t *ev)
+{
+ boolean cancelled = false;
+
+ if (ev->type == ev_keydown)
+ {
+ cancelled = LUA_HookKey(ev, HOOK(KeyDown));
+ LUA_InvalidateUserdata(ev);
+ }
+ else if (ev->type == ev_keyup)
+ {
+ cancelled = LUA_HookKey(ev, HOOK(KeyUp));
+ LUA_InvalidateUserdata(ev);
+ }
+
+ return cancelled;
+}
+
//
// G_Ticker
// Make ticcmd_ts for the players.
@@ -2227,6 +2227,23 @@ void G_Ticker(boolean run)
UINT32 i;
INT32 buf;
+ // Bot players queued for removal
+ for (i = MAXPLAYERS-1; i != UINT32_MAX; i--)
+ {
+ if (playeringame[i] && players[i].removing)
+ {
+ CL_RemovePlayer(i, i);
+ if (netgame)
+ {
+ char kickmsg[256];
+
+ strcpy(kickmsg, M_GetText("\x82*Bot %s has been removed"));
+ strcpy(kickmsg, va(kickmsg, player_names[i], i));
+ HU_AddChatText(kickmsg, false);
+ }
+ }
+ }
+
// see also SCR_DisplayMarathonInfo
if ((marathonmode & (MA_INIT|MA_INGAME)) == MA_INGAME && gamestate == GS_LEVEL)
marathontime++;
@@ -2307,27 +2324,44 @@ void G_Ticker(boolean run)
buf = gametic % BACKUPTICS;
+ // Generate ticcmds for bots FIRST, then copy received ticcmds for players.
+ // This emulates pre-2.2.10 behaviour where the bot referenced their leader's last copied ticcmd,
+ // which is desirable because P_PlayerThink can override inputs (e.g. while PF_STASIS is applied or in a waterslide),
+ // and the bot AI needs to respect that.
+#define ISHUMAN (players[i].bot == BOT_NONE || players[i].bot == BOT_2PHUMAN)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (playeringame[i])
+ if (playeringame[i] && !ISHUMAN) // Less work is required if we're building a bot ticcmd.
{
- INT16 received;
+ players[i].lastbuttons = players[i].cmd.buttons; // Save last frame's button readings
+ B_BuildTiccmd(&players[i], &players[i].cmd);
+
+ // Since bot TicCmd is pre-determined for both the client and server, the latency and packet checks are simplified.
+ players[i].cmd.latency = 0;
+ P_SetPlayerAngle(&players[i], players[i].cmd.angleturn << 16);
+ }
+ }
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (playeringame[i] && ISHUMAN)
+ {
+ players[i].lastbuttons = players[i].cmd.buttons; // Save last frame's button readings
G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1);
- received = (players[i].cmd.angleturn & TICCMD_RECEIVED);
+ // Use the leveltime sent in the player's ticcmd to determine control lag
+ players[i].cmd.latency = min(((leveltime & 0xFF) - players[i].cmd.latency) & 0xFF, MAXPREDICTTICS-1);
+ // Do angle adjustments.
players[i].angleturn += players[i].cmd.angleturn - players[i].oldrelangleturn;
players[i].oldrelangleturn = players[i].cmd.angleturn;
if (P_ControlStyle(&players[i]) == CS_LMAOGALOG)
P_ForceLocalAngle(&players[i], players[i].angleturn << 16);
else
- players[i].cmd.angleturn = players[i].angleturn;
-
- players[i].cmd.angleturn &= ~TICCMD_RECEIVED;
- players[i].cmd.angleturn |= received;
+ players[i].cmd.angleturn = (players[i].angleturn & ~TICCMD_RECEIVED) | (players[i].cmd.angleturn & TICCMD_RECEIVED);
}
}
+#undef ISHUMAN
// do main actions
switch (gamestate)
@@ -2515,6 +2549,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
tic_t quittime;
boolean spectator;
boolean outofcoop;
+ boolean removing;
INT16 bot;
SINT8 pity;
INT16 rings;
@@ -2531,6 +2566,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
quittime = players[player].quittime;
spectator = players[player].spectator;
outofcoop = players[player].outofcoop;
+ removing = players[player].removing;
pflags = (players[player].pflags & (PF_FLIPCAM|PF_ANALOGMODE|PF_DIRECTIONCHAR|PF_AUTOBRAKE|PF_TAGIT|PF_GAMETYPEOVER));
playerangleturn = players[player].angleturn;
oldrelangleturn = players[player].oldrelangleturn;
@@ -2607,6 +2643,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->quittime = quittime;
p->spectator = spectator;
p->outofcoop = outofcoop;
+ p->removing = removing;
p->angleturn = playerangleturn;
p->oldrelangleturn = oldrelangleturn;
@@ -2651,8 +2688,10 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->totalring = totalring;
p->mare = mare;
- if (bot)
- p->bot = 1; // reset to AI-controlled
+ if (bot == BOT_2PHUMAN)
+ p->bot = BOT_2PAI; // reset to AI-controlled
+ else
+ p->bot = bot;
p->pity = pity;
p->rings = rings;
p->spheres = spheres;
@@ -2769,7 +2808,7 @@ void G_SpawnPlayer(INT32 playernum)
P_SpawnPlayer(playernum);
G_MovePlayerToSpawnOrStarpost(playernum);
- LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :)
+ LUA_HookPlayer(&players[playernum], HOOK(PlayerSpawn)); // Lua hook for player spawning :)
}
void G_MovePlayerToSpawnOrStarpost(INT32 playernum)
@@ -2998,7 +3037,8 @@ void G_DoReborn(INT32 playernum)
// Make sure objectplace is OFF when you first start the level!
OP_ResetObjectplace();
- if (player->bot && playernum != consoleplayer)
+ // Tailsbot
+ if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN)
{ // Bots respawn next to their master.
mobj_t *oldmo = NULL;
@@ -3017,6 +3057,28 @@ void G_DoReborn(INT32 playernum)
return;
}
+ // Additional players (e.g. independent bots) in Single Player
+ if (playernum != consoleplayer && !(netgame || multiplayer))
+ {
+ mobj_t *oldmo = NULL;
+ // Do nothing if out of lives
+ if (player->lives <= 0)
+ return;
+
+ // Otherwise do respawn, starting by removing the player object
+ if (player->mo)
+ {
+ oldmo = player->mo;
+ P_RemoveMobj(player->mo);
+ }
+ // Do spawning
+ G_SpawnPlayer(playernum);
+ if (oldmo)
+ G_ChangePlayerReferences(oldmo, players[playernum].mo);
+
+ return; //Exit function to avoid proccing other SP related mechanics
+ }
+
if (countdowntimeup || (!(netgame || multiplayer) && (gametyperules & GTR_CAMPAIGN)))
resetlevel = true;
else if ((G_GametypeUsesCoopLives() || G_GametypeUsesCoopStarposts()) && (netgame || multiplayer) && !G_IsSpecialStage(gamemap))
@@ -3119,8 +3181,8 @@ void G_DoReborn(INT32 playernum)
joyxmove[i] = joyymove[i] = 0;
joy2xmove[i] = joy2ymove[i] = 0;
}
- mousex = mousey = 0;
- mouse2x = mouse2y = 0;
+ G_SetMouseDeltas(0, 0, 1);
+ G_SetMouseDeltas(0, 0, 2);
// clear hud messages remains (usually from game startup)
CON_ClearHUD();
@@ -3148,7 +3210,7 @@ void G_DoReborn(INT32 playernum)
}
else
{
- LUAh_MapChange(gamemap);
+ LUA_HookInt(gamemap, HOOK(MapChange));
titlecardforreload = true;
G_DoLoadLevel(true);
titlecardforreload = false;
@@ -3197,7 +3259,7 @@ void G_AddPlayer(INT32 playernum)
if (!playeringame[i])
continue;
- if (players[i].bot) // ignore dumb, stupid tails
+ if (players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // ignore dumb, stupid tails
continue;
countplayers++;
@@ -3767,7 +3829,7 @@ static void G_UpdateVisited(void)
// Update visitation flags?
if ((!modifiedgame || savemoddata) // Not modified
&& !multiplayer && !demoplayback && (gametype == GT_COOP) // SP/RA/NiGHTS mode
- && !(spec && stagefailed)) // Not failed the special stage
+ && !stagefailed) // Did not fail the stage
{
UINT8 earnedEmblems;
@@ -3864,6 +3926,9 @@ static void G_DoCompleted(void)
if (metalrecording)
G_StopMetalRecording(false);
+ G_SetGamestate(GS_NULL);
+ wipegamestate = GS_NULL;
+
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i])
G_PlayerFinishLevel(i); // take away cards and stuff
@@ -3952,12 +4017,13 @@ static void G_DoCompleted(void)
{
token--;
- for (i = 0; i < 7; i++)
- if (!(emeralds & (1<<i)))
- {
- nextmap = ((netgame || multiplayer) ? smpstage_start : sstage_start) + i - 1; // to special stage!
- break;
- }
+ if (!nextmapoverride)
+ for (i = 0; i < 7; i++)
+ if (!(emeralds & (1<<i)))
+ {
+ nextmap = ((netgame || multiplayer) ? smpstage_start : sstage_start) + i - 1; // to special stage!
+ break;
+ }
if (i == 7)
{
@@ -3988,7 +4054,7 @@ static void G_DoCompleted(void)
// If the current gametype has no intermission screen set, then don't start it.
Y_DetermineIntermissionType();
- if ((skipstats && !modeattacking) || (spec && modeattacking && stagefailed) || (intertype == int_none))
+ if ((skipstats && !modeattacking) || (modeattacking && stagefailed) || (intertype == int_none))
{
G_UpdateVisited();
G_HandleSaveLevel();
@@ -4020,8 +4086,15 @@ void G_AfterIntermission(void)
HU_ClearCEcho();
- if ((gametyperules & GTR_CUTSCENES) && mapheaderinfo[gamemap-1]->cutscenenum && !modeattacking && skipstats <= 1 && (gamecomplete || !(marathonmode & MA_NOCUTSCENES))) // Start a custom cutscene.
+ if ((gametyperules & GTR_CUTSCENES) && mapheaderinfo[gamemap-1]->cutscenenum
+ && !modeattacking
+ && skipstats <= 1
+ && (gamecomplete || !(marathonmode & MA_NOCUTSCENES))
+ && stagefailed == false)
+ {
+ // Start a custom cutscene.
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false);
+ }
else
{
if (nextmap < 1100-1)
@@ -4643,6 +4716,9 @@ void G_SaveGameOver(UINT32 slot, boolean modifylives)
UINT8 *end_p = savebuffer + length;
UINT8 *lives_p;
SINT8 pllives;
+#ifdef NEWSKINSAVES
+ INT16 backwardsCompat = 0;
+#endif
save_p = savebuffer;
// Version check
@@ -4661,9 +4737,23 @@ void G_SaveGameOver(UINT32 slot, boolean modifylives)
// P_UnArchivePlayer()
CHECKPOS
- (void)READUINT16(save_p);
+#ifdef NEWSKINSAVES
+ backwardsCompat = READUINT16(save_p);
CHECKPOS
+ if (backwardsCompat == NEWSKINSAVES) // New save, read skin names
+#endif
+ {
+ char ourSkinName[SKINNAMESIZE+1];
+ char botSkinName[SKINNAMESIZE+1];
+
+ READSTRINGN(save_p, ourSkinName, SKINNAMESIZE);
+ CHECKPOS
+
+ READSTRINGN(save_p, botSkinName, SKINNAMESIZE);
+ CHECKPOS
+ }
+
WRITEUINT8(save_p, numgameovers);
CHECKPOS
@@ -5239,4 +5329,3 @@ INT32 G_TicsToMilliseconds(tic_t tics)
{
return (INT32)((tics%TICRATE) * (1000.00f/TICRATE));
}
-
diff --git a/src/g_game.h b/src/g_game.h
index 98336ad44d66fc324edd090246d5a3e0cf3acf32..dca043f2e0fae899ec86ac55255f2613dfdde0eb 100755
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -85,6 +85,25 @@ typedef enum
} lockassist_e;
+typedef enum
+{
+ JA_NONE = 0,
+ JA_TURN,
+ JA_MOVE,
+ JA_LOOK,
+ JA_STRAFE,
+
+ JA_DIGITAL, // axes henceforth use digital deadzone
+
+ JA_JUMP = JA_DIGITAL,
+ JA_SPIN,
+ JA_FIRE,
+ JA_FIRENORMAL,
+} joyaxis_e;
+
+INT32 JoyAxis(joyaxis_e axissel);
+INT32 Joy2Axis(joyaxis_e axissel);
+
// mouseaiming (looking up/down with the mouse or keyboard)
#define KB_LOOKSPEED (1<<25)
#define MAXPLMOVE (50)
@@ -204,6 +223,7 @@ void G_EndGame(void); // moved from y_inter.c/h and renamed
void G_Ticker(boolean run);
boolean G_Responder(event_t *ev);
+boolean G_LuaResponder(event_t *ev);
void G_AddPlayer(INT32 playernum);
diff --git a/src/g_input.c b/src/g_input.c
index 357081e1dd5189f86d23a418778106325c85aa37..7bb2e799da1379b2ea06238aa273a0d6e1937608 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -31,10 +31,8 @@ consvar_t cv_mouseysens = CVAR_INIT ("mouseysens", "20", CV_SAVE, mousesens_cons
consvar_t cv_mouseysens2 = CVAR_INIT ("mouseysens2", "20", CV_SAVE, mousesens_cons_t, NULL);
consvar_t cv_controlperkey = CVAR_INIT ("controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL);
-INT32 mousex, mousey;
-INT32 mlooky; // like mousey but with a custom sensitivity for mlook
-
-INT32 mouse2x, mouse2y, mlook2y;
+mouse_t mouse;
+mouse_t mouse2;
// joystick values are repeated
INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET];
@@ -43,49 +41,49 @@ INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymo
UINT8 gamekeydown[NUMINPUTS];
// two key codes (or virtual key) per game control
-INT32 gamecontrol[num_gamecontrols][2];
-INT32 gamecontrolbis[num_gamecontrols][2]; // secondary splitscreen player
-INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; // default control storage, use 0 (gcs_custom) for memory retention
-INT32 gamecontrolbisdefault[num_gamecontrolschemes][num_gamecontrols][2];
+INT32 gamecontrol[NUM_GAMECONTROLS][2];
+INT32 gamecontrolbis[NUM_GAMECONTROLS][2]; // secondary splitscreen player
+INT32 gamecontroldefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2]; // default control storage, use 0 (gcs_custom) for memory retention
+INT32 gamecontrolbisdefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2];
// lists of GC codes for selective operation
const INT32 gcl_tutorial_check[num_gcl_tutorial_check] = {
- gc_forward, gc_backward, gc_strafeleft, gc_straferight,
- gc_turnleft, gc_turnright
+ GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT,
+ GC_TURNLEFT, GC_TURNRIGHT
};
const INT32 gcl_tutorial_used[num_gcl_tutorial_used] = {
- gc_forward, gc_backward, gc_strafeleft, gc_straferight,
- gc_turnleft, gc_turnright,
- gc_jump, gc_spin
+ GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT,
+ GC_TURNLEFT, GC_TURNRIGHT,
+ GC_JUMP, GC_SPIN
};
const INT32 gcl_tutorial_full[num_gcl_tutorial_full] = {
- gc_forward, gc_backward, gc_strafeleft, gc_straferight,
- gc_lookup, gc_lookdown, gc_turnleft, gc_turnright, gc_centerview,
- gc_jump, gc_spin,
- gc_fire, gc_firenormal
+ GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT,
+ GC_LOOKUP, GC_LOOKDOWN, GC_TURNLEFT, GC_TURNRIGHT, GC_CENTERVIEW,
+ GC_JUMP, GC_SPIN,
+ GC_FIRE, GC_FIRENORMAL
};
const INT32 gcl_movement[num_gcl_movement] = {
- gc_forward, gc_backward, gc_strafeleft, gc_straferight
+ GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT
};
const INT32 gcl_camera[num_gcl_camera] = {
- gc_turnleft, gc_turnright
+ GC_TURNLEFT, GC_TURNRIGHT
};
const INT32 gcl_movement_camera[num_gcl_movement_camera] = {
- gc_forward, gc_backward, gc_strafeleft, gc_straferight,
- gc_turnleft, gc_turnright
+ GC_FORWARD, GC_BACKWARD, GC_STRAFELEFT, GC_STRAFERIGHT,
+ GC_TURNLEFT, GC_TURNRIGHT
};
-const INT32 gcl_jump[num_gcl_jump] = { gc_jump };
+const INT32 gcl_jump[num_gcl_jump] = { GC_JUMP };
-const INT32 gcl_spin[num_gcl_spin] = { gc_spin };
+const INT32 gcl_spin[num_gcl_spin] = { GC_SPIN };
const INT32 gcl_jump_spin[num_gcl_jump_spin] = {
- gc_jump, gc_spin
+ GC_JUMP, GC_SPIN
};
typedef struct
@@ -117,58 +115,54 @@ void G_MapEventsToControls(event_t *ev)
switch (ev->type)
{
case ev_keydown:
- if (ev->data1 < NUMINPUTS)
- gamekeydown[ev->data1] = 1;
+ if (ev->key < NUMINPUTS)
+ gamekeydown[ev->key] = 1;
#ifdef PARANOIA
else
{
- CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->data1);
+ CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->key);
}
#endif
break;
case ev_keyup:
- if (ev->data1 < NUMINPUTS)
- gamekeydown[ev->data1] = 0;
+ if (ev->key < NUMINPUTS)
+ gamekeydown[ev->key] = 0;
#ifdef PARANOIA
else
{
- CONS_Debug(DBG_GAMELOGIC, "Bad upkey input %d\n",ev->data1);
+ CONS_Debug(DBG_GAMELOGIC, "Bad upkey input %d\n",ev->key);
}
#endif
break;
case ev_mouse: // buttons are virtual keys
- if (menuactive || CON_Ready() || chat_on)
- break;
- mousex = (INT32)(ev->data2*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f));
- mousey = (INT32)(ev->data3*((cv_mousesens.value*cv_mousesens.value)/110.0f + 0.1f));
- mlooky = (INT32)(ev->data3*((cv_mouseysens.value*cv_mousesens.value)/110.0f + 0.1f));
+ mouse.rdx = ev->x;
+ mouse.rdy = ev->y;
break;
case ev_joystick: // buttons are virtual keys
- i = ev->data1;
+ i = ev->key;
if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on)
break;
- if (ev->data2 != INT32_MAX) joyxmove[i] = ev->data2;
- if (ev->data3 != INT32_MAX) joyymove[i] = ev->data3;
+ if (ev->x != INT32_MAX) joyxmove[i] = ev->x;
+ if (ev->y != INT32_MAX) joyymove[i] = ev->y;
break;
case ev_joystick2: // buttons are virtual keys
- i = ev->data1;
+ i = ev->key;
if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on)
break;
- if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2;
- if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3;
+ if (ev->x != INT32_MAX) joy2xmove[i] = ev->x;
+ if (ev->y != INT32_MAX) joy2ymove[i] = ev->y;
break;
case ev_mouse2: // buttons are virtual keys
if (menuactive || CON_Ready() || chat_on)
break;
- mouse2x = (INT32)(ev->data2*((cv_mousesens2.value*cv_mousesens2.value)/110.0f + 0.1f));
- mouse2y = (INT32)(ev->data3*((cv_mousesens2.value*cv_mousesens2.value)/110.0f + 0.1f));
- mlook2y = (INT32)(ev->data3*((cv_mouseysens2.value*cv_mousesens2.value)/110.0f + 0.1f));
+ mouse2.rdx = ev->x;
+ mouse2.rdy = ev->y;
break;
default:
@@ -239,329 +233,329 @@ typedef struct
static keyname_t keynames[] =
{
- {KEY_SPACE, "SPACE"},
- {KEY_CAPSLOCK, "CAPS LOCK"},
- {KEY_ENTER, "ENTER"},
- {KEY_TAB, "TAB"},
- {KEY_ESCAPE, "ESCAPE"},
- {KEY_BACKSPACE, "BACKSPACE"},
+ {KEY_SPACE, "space"},
+ {KEY_CAPSLOCK, "caps lock"},
+ {KEY_ENTER, "enter"},
+ {KEY_TAB, "tab"},
+ {KEY_ESCAPE, "escape"},
+ {KEY_BACKSPACE, "backspace"},
- {KEY_NUMLOCK, "NUMLOCK"},
- {KEY_SCROLLLOCK, "SCROLLLOCK"},
+ {KEY_NUMLOCK, "numlock"},
+ {KEY_SCROLLLOCK, "scrolllock"},
// bill gates keys
- {KEY_LEFTWIN, "LEFTWIN"},
- {KEY_RIGHTWIN, "RIGHTWIN"},
- {KEY_MENU, "MENU"},
-
- {KEY_LSHIFT, "LSHIFT"},
- {KEY_RSHIFT, "RSHIFT"},
- {KEY_LSHIFT, "SHIFT"},
- {KEY_LCTRL, "LCTRL"},
- {KEY_RCTRL, "RCTRL"},
- {KEY_LCTRL, "CTRL"},
- {KEY_LALT, "LALT"},
- {KEY_RALT, "RALT"},
- {KEY_LALT, "ALT"},
+ {KEY_LEFTWIN, "leftwin"},
+ {KEY_RIGHTWIN, "rightwin"},
+ {KEY_MENU, "menu"},
+
+ {KEY_LSHIFT, "lshift"},
+ {KEY_RSHIFT, "rshift"},
+ {KEY_LSHIFT, "shift"},
+ {KEY_LCTRL, "lctrl"},
+ {KEY_RCTRL, "rctrl"},
+ {KEY_LCTRL, "ctrl"},
+ {KEY_LALT, "lalt"},
+ {KEY_RALT, "ralt"},
+ {KEY_LALT, "alt"},
// keypad keys
- {KEY_KPADSLASH, "KEYPAD /"},
- {KEY_KEYPAD7, "KEYPAD 7"},
- {KEY_KEYPAD8, "KEYPAD 8"},
- {KEY_KEYPAD9, "KEYPAD 9"},
- {KEY_MINUSPAD, "KEYPAD -"},
- {KEY_KEYPAD4, "KEYPAD 4"},
- {KEY_KEYPAD5, "KEYPAD 5"},
- {KEY_KEYPAD6, "KEYPAD 6"},
- {KEY_PLUSPAD, "KEYPAD +"},
- {KEY_KEYPAD1, "KEYPAD 1"},
- {KEY_KEYPAD2, "KEYPAD 2"},
- {KEY_KEYPAD3, "KEYPAD 3"},
- {KEY_KEYPAD0, "KEYPAD 0"},
- {KEY_KPADDEL, "KEYPAD ."},
+ {KEY_KPADSLASH, "keypad /"},
+ {KEY_KEYPAD7, "keypad 7"},
+ {KEY_KEYPAD8, "keypad 8"},
+ {KEY_KEYPAD9, "keypad 9"},
+ {KEY_MINUSPAD, "keypad -"},
+ {KEY_KEYPAD4, "keypad 4"},
+ {KEY_KEYPAD5, "keypad 5"},
+ {KEY_KEYPAD6, "keypad 6"},
+ {KEY_PLUSPAD, "keypad +"},
+ {KEY_KEYPAD1, "keypad 1"},
+ {KEY_KEYPAD2, "keypad 2"},
+ {KEY_KEYPAD3, "keypad 3"},
+ {KEY_KEYPAD0, "keypad 0"},
+ {KEY_KPADDEL, "keypad ."},
// extended keys (not keypad)
- {KEY_HOME, "HOME"},
- {KEY_UPARROW, "UP ARROW"},
- {KEY_PGUP, "PGUP"},
- {KEY_LEFTARROW, "LEFT ARROW"},
- {KEY_RIGHTARROW, "RIGHT ARROW"},
- {KEY_END, "END"},
- {KEY_DOWNARROW, "DOWN ARROW"},
- {KEY_PGDN, "PGDN"},
- {KEY_INS, "INS"},
- {KEY_DEL, "DEL"},
+ {KEY_HOME, "home"},
+ {KEY_UPARROW, "up arrow"},
+ {KEY_PGUP, "pgup"},
+ {KEY_LEFTARROW, "left arrow"},
+ {KEY_RIGHTARROW, "right arrow"},
+ {KEY_END, "end"},
+ {KEY_DOWNARROW, "down arrow"},
+ {KEY_PGDN, "pgdn"},
+ {KEY_INS, "ins"},
+ {KEY_DEL, "del"},
// other keys
- {KEY_F1, "F1"},
- {KEY_F2, "F2"},
- {KEY_F3, "F3"},
- {KEY_F4, "F4"},
- {KEY_F5, "F5"},
- {KEY_F6, "F6"},
- {KEY_F7, "F7"},
- {KEY_F8, "F8"},
- {KEY_F9, "F9"},
- {KEY_F10, "F10"},
- {KEY_F11, "F11"},
- {KEY_F12, "F12"},
+ {KEY_F1, "f1"},
+ {KEY_F2, "f2"},
+ {KEY_F3, "f3"},
+ {KEY_F4, "f4"},
+ {KEY_F5, "f5"},
+ {KEY_F6, "f6"},
+ {KEY_F7, "f7"},
+ {KEY_F8, "f8"},
+ {KEY_F9, "f9"},
+ {KEY_F10, "f10"},
+ {KEY_F11, "f11"},
+ {KEY_F12, "f12"},
// KEY_CONSOLE has an exception in the keyname code
{'`', "TILDE"},
- {KEY_PAUSE, "PAUSE/BREAK"},
+ {KEY_PAUSE, "pause/break"},
// virtual keys for mouse buttons and joystick buttons
- {KEY_MOUSE1+0,"MOUSE1"},
- {KEY_MOUSE1+1,"MOUSE2"},
- {KEY_MOUSE1+2,"MOUSE3"},
- {KEY_MOUSE1+3,"MOUSE4"},
- {KEY_MOUSE1+4,"MOUSE5"},
- {KEY_MOUSE1+5,"MOUSE6"},
- {KEY_MOUSE1+6,"MOUSE7"},
- {KEY_MOUSE1+7,"MOUSE8"},
- {KEY_2MOUSE1+0,"SEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
- {KEY_2MOUSE1+1,"SEC_MOUSE1"},
- {KEY_2MOUSE1+2,"SEC_MOUSE3"},
- {KEY_2MOUSE1+3,"SEC_MOUSE4"},
- {KEY_2MOUSE1+4,"SEC_MOUSE5"},
- {KEY_2MOUSE1+5,"SEC_MOUSE6"},
- {KEY_2MOUSE1+6,"SEC_MOUSE7"},
- {KEY_2MOUSE1+7,"SEC_MOUSE8"},
- {KEY_MOUSEWHEELUP, "Wheel 1 UP"},
- {KEY_MOUSEWHEELDOWN, "Wheel 1 Down"},
- {KEY_2MOUSEWHEELUP, "Wheel 2 UP"},
- {KEY_2MOUSEWHEELDOWN, "Wheel 2 Down"},
-
- {KEY_JOY1+0, "JOY1"},
- {KEY_JOY1+1, "JOY2"},
- {KEY_JOY1+2, "JOY3"},
- {KEY_JOY1+3, "JOY4"},
- {KEY_JOY1+4, "JOY5"},
- {KEY_JOY1+5, "JOY6"},
- {KEY_JOY1+6, "JOY7"},
- {KEY_JOY1+7, "JOY8"},
- {KEY_JOY1+8, "JOY9"},
+ {KEY_MOUSE1+0,"mouse1"},
+ {KEY_MOUSE1+1,"mouse2"},
+ {KEY_MOUSE1+2,"mouse3"},
+ {KEY_MOUSE1+3,"mouse4"},
+ {KEY_MOUSE1+4,"mouse5"},
+ {KEY_MOUSE1+5,"mouse6"},
+ {KEY_MOUSE1+6,"mouse7"},
+ {KEY_MOUSE1+7,"mouse8"},
+ {KEY_2MOUSE1+0,"sec_mouse2"}, // BP: sorry my mouse handler swap button 1 and 2
+ {KEY_2MOUSE1+1,"sec_mouse1"},
+ {KEY_2MOUSE1+2,"sec_mouse3"},
+ {KEY_2MOUSE1+3,"sec_mouse4"},
+ {KEY_2MOUSE1+4,"sec_mouse5"},
+ {KEY_2MOUSE1+5,"sec_mouse6"},
+ {KEY_2MOUSE1+6,"sec_mouse7"},
+ {KEY_2MOUSE1+7,"sec_mouse8"},
+ {KEY_MOUSEWHEELUP, "wheel 1 up"},
+ {KEY_MOUSEWHEELDOWN, "wheel 1 down"},
+ {KEY_2MOUSEWHEELUP, "wheel 2 up"},
+ {KEY_2MOUSEWHEELDOWN, "wheel 2 down"},
+
+ {KEY_JOY1+0, "joy1"},
+ {KEY_JOY1+1, "joy2"},
+ {KEY_JOY1+2, "joy3"},
+ {KEY_JOY1+3, "joy4"},
+ {KEY_JOY1+4, "joy5"},
+ {KEY_JOY1+5, "joy6"},
+ {KEY_JOY1+6, "joy7"},
+ {KEY_JOY1+7, "joy8"},
+ {KEY_JOY1+8, "joy9"},
#if !defined (NOMOREJOYBTN_1S)
// we use up to 32 buttons in DirectInput
- {KEY_JOY1+9, "JOY10"},
- {KEY_JOY1+10, "JOY11"},
- {KEY_JOY1+11, "JOY12"},
- {KEY_JOY1+12, "JOY13"},
- {KEY_JOY1+13, "JOY14"},
- {KEY_JOY1+14, "JOY15"},
- {KEY_JOY1+15, "JOY16"},
- {KEY_JOY1+16, "JOY17"},
- {KEY_JOY1+17, "JOY18"},
- {KEY_JOY1+18, "JOY19"},
- {KEY_JOY1+19, "JOY20"},
- {KEY_JOY1+20, "JOY21"},
- {KEY_JOY1+21, "JOY22"},
- {KEY_JOY1+22, "JOY23"},
- {KEY_JOY1+23, "JOY24"},
- {KEY_JOY1+24, "JOY25"},
- {KEY_JOY1+25, "JOY26"},
- {KEY_JOY1+26, "JOY27"},
- {KEY_JOY1+27, "JOY28"},
- {KEY_JOY1+28, "JOY29"},
- {KEY_JOY1+29, "JOY30"},
- {KEY_JOY1+30, "JOY31"},
- {KEY_JOY1+31, "JOY32"},
+ {KEY_JOY1+9, "joy10"},
+ {KEY_JOY1+10, "joy11"},
+ {KEY_JOY1+11, "joy12"},
+ {KEY_JOY1+12, "joy13"},
+ {KEY_JOY1+13, "joy14"},
+ {KEY_JOY1+14, "joy15"},
+ {KEY_JOY1+15, "joy16"},
+ {KEY_JOY1+16, "joy17"},
+ {KEY_JOY1+17, "joy18"},
+ {KEY_JOY1+18, "joy19"},
+ {KEY_JOY1+19, "joy20"},
+ {KEY_JOY1+20, "joy21"},
+ {KEY_JOY1+21, "joy22"},
+ {KEY_JOY1+22, "joy23"},
+ {KEY_JOY1+23, "joy24"},
+ {KEY_JOY1+24, "joy25"},
+ {KEY_JOY1+25, "joy26"},
+ {KEY_JOY1+26, "joy27"},
+ {KEY_JOY1+27, "joy28"},
+ {KEY_JOY1+28, "joy29"},
+ {KEY_JOY1+29, "joy30"},
+ {KEY_JOY1+30, "joy31"},
+ {KEY_JOY1+31, "joy32"},
#endif
// the DOS version uses Allegro's joystick support
- {KEY_HAT1+0, "HATUP"},
- {KEY_HAT1+1, "HATDOWN"},
- {KEY_HAT1+2, "HATLEFT"},
- {KEY_HAT1+3, "HATRIGHT"},
- {KEY_HAT1+4, "HATUP2"},
- {KEY_HAT1+5, "HATDOWN2"},
- {KEY_HAT1+6, "HATLEFT2"},
- {KEY_HAT1+7, "HATRIGHT2"},
- {KEY_HAT1+8, "HATUP3"},
- {KEY_HAT1+9, "HATDOWN3"},
- {KEY_HAT1+10, "HATLEFT3"},
- {KEY_HAT1+11, "HATRIGHT3"},
- {KEY_HAT1+12, "HATUP4"},
- {KEY_HAT1+13, "HATDOWN4"},
- {KEY_HAT1+14, "HATLEFT4"},
- {KEY_HAT1+15, "HATRIGHT4"},
-
- {KEY_DBLMOUSE1+0, "DBLMOUSE1"},
- {KEY_DBLMOUSE1+1, "DBLMOUSE2"},
- {KEY_DBLMOUSE1+2, "DBLMOUSE3"},
- {KEY_DBLMOUSE1+3, "DBLMOUSE4"},
- {KEY_DBLMOUSE1+4, "DBLMOUSE5"},
- {KEY_DBLMOUSE1+5, "DBLMOUSE6"},
- {KEY_DBLMOUSE1+6, "DBLMOUSE7"},
- {KEY_DBLMOUSE1+7, "DBLMOUSE8"},
- {KEY_DBL2MOUSE1+0, "DBLSEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
- {KEY_DBL2MOUSE1+1, "DBLSEC_MOUSE1"},
- {KEY_DBL2MOUSE1+2, "DBLSEC_MOUSE3"},
- {KEY_DBL2MOUSE1+3, "DBLSEC_MOUSE4"},
- {KEY_DBL2MOUSE1+4, "DBLSEC_MOUSE5"},
- {KEY_DBL2MOUSE1+5, "DBLSEC_MOUSE6"},
- {KEY_DBL2MOUSE1+6, "DBLSEC_MOUSE7"},
- {KEY_DBL2MOUSE1+7, "DBLSEC_MOUSE8"},
-
- {KEY_DBLJOY1+0, "DBLJOY1"},
- {KEY_DBLJOY1+1, "DBLJOY2"},
- {KEY_DBLJOY1+2, "DBLJOY3"},
- {KEY_DBLJOY1+3, "DBLJOY4"},
- {KEY_DBLJOY1+4, "DBLJOY5"},
- {KEY_DBLJOY1+5, "DBLJOY6"},
- {KEY_DBLJOY1+6, "DBLJOY7"},
- {KEY_DBLJOY1+7, "DBLJOY8"},
+ {KEY_HAT1+0, "hatup"},
+ {KEY_HAT1+1, "hatdown"},
+ {KEY_HAT1+2, "hatleft"},
+ {KEY_HAT1+3, "hatright"},
+ {KEY_HAT1+4, "hatup2"},
+ {KEY_HAT1+5, "hatdown2"},
+ {KEY_HAT1+6, "hatleft2"},
+ {KEY_HAT1+7, "hatright2"},
+ {KEY_HAT1+8, "hatup3"},
+ {KEY_HAT1+9, "hatdown3"},
+ {KEY_HAT1+10, "hatleft3"},
+ {KEY_HAT1+11, "hatright3"},
+ {KEY_HAT1+12, "hatup4"},
+ {KEY_HAT1+13, "hatdown4"},
+ {KEY_HAT1+14, "hatleft4"},
+ {KEY_HAT1+15, "hatright4"},
+
+ {KEY_DBLMOUSE1+0, "dblmouse1"},
+ {KEY_DBLMOUSE1+1, "dblmouse2"},
+ {KEY_DBLMOUSE1+2, "dblmouse3"},
+ {KEY_DBLMOUSE1+3, "dblmouse4"},
+ {KEY_DBLMOUSE1+4, "dblmouse5"},
+ {KEY_DBLMOUSE1+5, "dblmouse6"},
+ {KEY_DBLMOUSE1+6, "dblmouse7"},
+ {KEY_DBLMOUSE1+7, "dblmouse8"},
+ {KEY_DBL2MOUSE1+0, "dblsec_mouse2"}, // BP: sorry my mouse handler swap button 1 and 2
+ {KEY_DBL2MOUSE1+1, "dblsec_mouse1"},
+ {KEY_DBL2MOUSE1+2, "dblsec_mouse3"},
+ {KEY_DBL2MOUSE1+3, "dblsec_mouse4"},
+ {KEY_DBL2MOUSE1+4, "dblsec_mouse5"},
+ {KEY_DBL2MOUSE1+5, "dblsec_mouse6"},
+ {KEY_DBL2MOUSE1+6, "dblsec_mouse7"},
+ {KEY_DBL2MOUSE1+7, "dblsec_mouse8"},
+
+ {KEY_DBLJOY1+0, "dbljoy1"},
+ {KEY_DBLJOY1+1, "dbljoy2"},
+ {KEY_DBLJOY1+2, "dbljoy3"},
+ {KEY_DBLJOY1+3, "dbljoy4"},
+ {KEY_DBLJOY1+4, "dbljoy5"},
+ {KEY_DBLJOY1+5, "dbljoy6"},
+ {KEY_DBLJOY1+6, "dbljoy7"},
+ {KEY_DBLJOY1+7, "dbljoy8"},
#if !defined (NOMOREJOYBTN_1DBL)
- {KEY_DBLJOY1+8, "DBLJOY9"},
- {KEY_DBLJOY1+9, "DBLJOY10"},
- {KEY_DBLJOY1+10, "DBLJOY11"},
- {KEY_DBLJOY1+11, "DBLJOY12"},
- {KEY_DBLJOY1+12, "DBLJOY13"},
- {KEY_DBLJOY1+13, "DBLJOY14"},
- {KEY_DBLJOY1+14, "DBLJOY15"},
- {KEY_DBLJOY1+15, "DBLJOY16"},
- {KEY_DBLJOY1+16, "DBLJOY17"},
- {KEY_DBLJOY1+17, "DBLJOY18"},
- {KEY_DBLJOY1+18, "DBLJOY19"},
- {KEY_DBLJOY1+19, "DBLJOY20"},
- {KEY_DBLJOY1+20, "DBLJOY21"},
- {KEY_DBLJOY1+21, "DBLJOY22"},
- {KEY_DBLJOY1+22, "DBLJOY23"},
- {KEY_DBLJOY1+23, "DBLJOY24"},
- {KEY_DBLJOY1+24, "DBLJOY25"},
- {KEY_DBLJOY1+25, "DBLJOY26"},
- {KEY_DBLJOY1+26, "DBLJOY27"},
- {KEY_DBLJOY1+27, "DBLJOY28"},
- {KEY_DBLJOY1+28, "DBLJOY29"},
- {KEY_DBLJOY1+29, "DBLJOY30"},
- {KEY_DBLJOY1+30, "DBLJOY31"},
- {KEY_DBLJOY1+31, "DBLJOY32"},
+ {KEY_DBLJOY1+8, "dbljoy9"},
+ {KEY_DBLJOY1+9, "dbljoy10"},
+ {KEY_DBLJOY1+10, "dbljoy11"},
+ {KEY_DBLJOY1+11, "dbljoy12"},
+ {KEY_DBLJOY1+12, "dbljoy13"},
+ {KEY_DBLJOY1+13, "dbljoy14"},
+ {KEY_DBLJOY1+14, "dbljoy15"},
+ {KEY_DBLJOY1+15, "dbljoy16"},
+ {KEY_DBLJOY1+16, "dbljoy17"},
+ {KEY_DBLJOY1+17, "dbljoy18"},
+ {KEY_DBLJOY1+18, "dbljoy19"},
+ {KEY_DBLJOY1+19, "dbljoy20"},
+ {KEY_DBLJOY1+20, "dbljoy21"},
+ {KEY_DBLJOY1+21, "dbljoy22"},
+ {KEY_DBLJOY1+22, "dbljoy23"},
+ {KEY_DBLJOY1+23, "dbljoy24"},
+ {KEY_DBLJOY1+24, "dbljoy25"},
+ {KEY_DBLJOY1+25, "dbljoy26"},
+ {KEY_DBLJOY1+26, "dbljoy27"},
+ {KEY_DBLJOY1+27, "dbljoy28"},
+ {KEY_DBLJOY1+28, "dbljoy29"},
+ {KEY_DBLJOY1+29, "dbljoy30"},
+ {KEY_DBLJOY1+30, "dbljoy31"},
+ {KEY_DBLJOY1+31, "dbljoy32"},
#endif
- {KEY_DBLHAT1+0, "DBLHATUP"},
- {KEY_DBLHAT1+1, "DBLHATDOWN"},
- {KEY_DBLHAT1+2, "DBLHATLEFT"},
- {KEY_DBLHAT1+3, "DBLHATRIGHT"},
- {KEY_DBLHAT1+4, "DBLHATUP2"},
- {KEY_DBLHAT1+5, "DBLHATDOWN2"},
- {KEY_DBLHAT1+6, "DBLHATLEFT2"},
- {KEY_DBLHAT1+7, "DBLHATRIGHT2"},
- {KEY_DBLHAT1+8, "DBLHATUP3"},
- {KEY_DBLHAT1+9, "DBLHATDOWN3"},
- {KEY_DBLHAT1+10, "DBLHATLEFT3"},
- {KEY_DBLHAT1+11, "DBLHATRIGHT3"},
- {KEY_DBLHAT1+12, "DBLHATUP4"},
- {KEY_DBLHAT1+13, "DBLHATDOWN4"},
- {KEY_DBLHAT1+14, "DBLHATLEFT4"},
- {KEY_DBLHAT1+15, "DBLHATRIGHT4"},
-
- {KEY_2JOY1+0, "SEC_JOY1"},
- {KEY_2JOY1+1, "SEC_JOY2"},
- {KEY_2JOY1+2, "SEC_JOY3"},
- {KEY_2JOY1+3, "SEC_JOY4"},
- {KEY_2JOY1+4, "SEC_JOY5"},
- {KEY_2JOY1+5, "SEC_JOY6"},
- {KEY_2JOY1+6, "SEC_JOY7"},
- {KEY_2JOY1+7, "SEC_JOY8"},
+ {KEY_DBLHAT1+0, "dblhatup"},
+ {KEY_DBLHAT1+1, "dblhatdown"},
+ {KEY_DBLHAT1+2, "dblhatleft"},
+ {KEY_DBLHAT1+3, "dblhatright"},
+ {KEY_DBLHAT1+4, "dblhatup2"},
+ {KEY_DBLHAT1+5, "dblhatdown2"},
+ {KEY_DBLHAT1+6, "dblhatleft2"},
+ {KEY_DBLHAT1+7, "dblhatright2"},
+ {KEY_DBLHAT1+8, "dblhatup3"},
+ {KEY_DBLHAT1+9, "dblhatdown3"},
+ {KEY_DBLHAT1+10, "dblhatleft3"},
+ {KEY_DBLHAT1+11, "dblhatright3"},
+ {KEY_DBLHAT1+12, "dblhatup4"},
+ {KEY_DBLHAT1+13, "dblhatdown4"},
+ {KEY_DBLHAT1+14, "dblhatleft4"},
+ {KEY_DBLHAT1+15, "dblhatright4"},
+
+ {KEY_2JOY1+0, "sec_joy1"},
+ {KEY_2JOY1+1, "sec_joy2"},
+ {KEY_2JOY1+2, "sec_joy3"},
+ {KEY_2JOY1+3, "sec_joy4"},
+ {KEY_2JOY1+4, "sec_joy5"},
+ {KEY_2JOY1+5, "sec_joy6"},
+ {KEY_2JOY1+6, "sec_joy7"},
+ {KEY_2JOY1+7, "sec_joy8"},
#if !defined (NOMOREJOYBTN_2S)
// we use up to 32 buttons in DirectInput
- {KEY_2JOY1+8, "SEC_JOY9"},
- {KEY_2JOY1+9, "SEC_JOY10"},
- {KEY_2JOY1+10, "SEC_JOY11"},
- {KEY_2JOY1+11, "SEC_JOY12"},
- {KEY_2JOY1+12, "SEC_JOY13"},
- {KEY_2JOY1+13, "SEC_JOY14"},
- {KEY_2JOY1+14, "SEC_JOY15"},
- {KEY_2JOY1+15, "SEC_JOY16"},
- {KEY_2JOY1+16, "SEC_JOY17"},
- {KEY_2JOY1+17, "SEC_JOY18"},
- {KEY_2JOY1+18, "SEC_JOY19"},
- {KEY_2JOY1+19, "SEC_JOY20"},
- {KEY_2JOY1+20, "SEC_JOY21"},
- {KEY_2JOY1+21, "SEC_JOY22"},
- {KEY_2JOY1+22, "SEC_JOY23"},
- {KEY_2JOY1+23, "SEC_JOY24"},
- {KEY_2JOY1+24, "SEC_JOY25"},
- {KEY_2JOY1+25, "SEC_JOY26"},
- {KEY_2JOY1+26, "SEC_JOY27"},
- {KEY_2JOY1+27, "SEC_JOY28"},
- {KEY_2JOY1+28, "SEC_JOY29"},
- {KEY_2JOY1+29, "SEC_JOY30"},
- {KEY_2JOY1+30, "SEC_JOY31"},
- {KEY_2JOY1+31, "SEC_JOY32"},
+ {KEY_2JOY1+8, "sec_joy9"},
+ {KEY_2JOY1+9, "sec_joy10"},
+ {KEY_2JOY1+10, "sec_joy11"},
+ {KEY_2JOY1+11, "sec_joy12"},
+ {KEY_2JOY1+12, "sec_joy13"},
+ {KEY_2JOY1+13, "sec_joy14"},
+ {KEY_2JOY1+14, "sec_joy15"},
+ {KEY_2JOY1+15, "sec_joy16"},
+ {KEY_2JOY1+16, "sec_joy17"},
+ {KEY_2JOY1+17, "sec_joy18"},
+ {KEY_2JOY1+18, "sec_joy19"},
+ {KEY_2JOY1+19, "sec_joy20"},
+ {KEY_2JOY1+20, "sec_joy21"},
+ {KEY_2JOY1+21, "sec_joy22"},
+ {KEY_2JOY1+22, "sec_joy23"},
+ {KEY_2JOY1+23, "sec_joy24"},
+ {KEY_2JOY1+24, "sec_joy25"},
+ {KEY_2JOY1+25, "sec_joy26"},
+ {KEY_2JOY1+26, "sec_joy27"},
+ {KEY_2JOY1+27, "sec_joy28"},
+ {KEY_2JOY1+28, "sec_joy29"},
+ {KEY_2JOY1+29, "sec_joy30"},
+ {KEY_2JOY1+30, "sec_joy31"},
+ {KEY_2JOY1+31, "sec_joy32"},
#endif
// the DOS version uses Allegro's joystick support
- {KEY_2HAT1+0, "SEC_HATUP"},
- {KEY_2HAT1+1, "SEC_HATDOWN"},
- {KEY_2HAT1+2, "SEC_HATLEFT"},
- {KEY_2HAT1+3, "SEC_HATRIGHT"},
- {KEY_2HAT1+4, "SEC_HATUP2"},
- {KEY_2HAT1+5, "SEC_HATDOWN2"},
- {KEY_2HAT1+6, "SEC_HATLEFT2"},
- {KEY_2HAT1+7, "SEC_HATRIGHT2"},
- {KEY_2HAT1+8, "SEC_HATUP3"},
- {KEY_2HAT1+9, "SEC_HATDOWN3"},
- {KEY_2HAT1+10, "SEC_HATLEFT3"},
- {KEY_2HAT1+11, "SEC_HATRIGHT3"},
- {KEY_2HAT1+12, "SEC_HATUP4"},
- {KEY_2HAT1+13, "SEC_HATDOWN4"},
- {KEY_2HAT1+14, "SEC_HATLEFT4"},
- {KEY_2HAT1+15, "SEC_HATRIGHT4"},
-
- {KEY_DBL2JOY1+0, "DBLSEC_JOY1"},
- {KEY_DBL2JOY1+1, "DBLSEC_JOY2"},
- {KEY_DBL2JOY1+2, "DBLSEC_JOY3"},
- {KEY_DBL2JOY1+3, "DBLSEC_JOY4"},
- {KEY_DBL2JOY1+4, "DBLSEC_JOY5"},
- {KEY_DBL2JOY1+5, "DBLSEC_JOY6"},
- {KEY_DBL2JOY1+6, "DBLSEC_JOY7"},
- {KEY_DBL2JOY1+7, "DBLSEC_JOY8"},
+ {KEY_2HAT1+0, "sec_hatup"},
+ {KEY_2HAT1+1, "sec_hatdown"},
+ {KEY_2HAT1+2, "sec_hatleft"},
+ {KEY_2HAT1+3, "sec_hatright"},
+ {KEY_2HAT1+4, "sec_hatup2"},
+ {KEY_2HAT1+5, "sec_hatdown2"},
+ {KEY_2HAT1+6, "sec_hatleft2"},
+ {KEY_2HAT1+7, "sec_hatright2"},
+ {KEY_2HAT1+8, "sec_hatup3"},
+ {KEY_2HAT1+9, "sec_hatdown3"},
+ {KEY_2HAT1+10, "sec_hatleft3"},
+ {KEY_2HAT1+11, "sec_hatright3"},
+ {KEY_2HAT1+12, "sec_hatup4"},
+ {KEY_2HAT1+13, "sec_hatdown4"},
+ {KEY_2HAT1+14, "sec_hatleft4"},
+ {KEY_2HAT1+15, "sec_hatright4"},
+
+ {KEY_DBL2JOY1+0, "dblsec_joy1"},
+ {KEY_DBL2JOY1+1, "dblsec_joy2"},
+ {KEY_DBL2JOY1+2, "dblsec_joy3"},
+ {KEY_DBL2JOY1+3, "dblsec_joy4"},
+ {KEY_DBL2JOY1+4, "dblsec_joy5"},
+ {KEY_DBL2JOY1+5, "dblsec_joy6"},
+ {KEY_DBL2JOY1+6, "dblsec_joy7"},
+ {KEY_DBL2JOY1+7, "dblsec_joy8"},
#if !defined (NOMOREJOYBTN_2DBL)
- {KEY_DBL2JOY1+8, "DBLSEC_JOY9"},
- {KEY_DBL2JOY1+9, "DBLSEC_JOY10"},
- {KEY_DBL2JOY1+10, "DBLSEC_JOY11"},
- {KEY_DBL2JOY1+11, "DBLSEC_JOY12"},
- {KEY_DBL2JOY1+12, "DBLSEC_JOY13"},
- {KEY_DBL2JOY1+13, "DBLSEC_JOY14"},
- {KEY_DBL2JOY1+14, "DBLSEC_JOY15"},
- {KEY_DBL2JOY1+15, "DBLSEC_JOY16"},
- {KEY_DBL2JOY1+16, "DBLSEC_JOY17"},
- {KEY_DBL2JOY1+17, "DBLSEC_JOY18"},
- {KEY_DBL2JOY1+18, "DBLSEC_JOY19"},
- {KEY_DBL2JOY1+19, "DBLSEC_JOY20"},
- {KEY_DBL2JOY1+20, "DBLSEC_JOY21"},
- {KEY_DBL2JOY1+21, "DBLSEC_JOY22"},
- {KEY_DBL2JOY1+22, "DBLSEC_JOY23"},
- {KEY_DBL2JOY1+23, "DBLSEC_JOY24"},
- {KEY_DBL2JOY1+24, "DBLSEC_JOY25"},
- {KEY_DBL2JOY1+25, "DBLSEC_JOY26"},
- {KEY_DBL2JOY1+26, "DBLSEC_JOY27"},
- {KEY_DBL2JOY1+27, "DBLSEC_JOY28"},
- {KEY_DBL2JOY1+28, "DBLSEC_JOY29"},
- {KEY_DBL2JOY1+29, "DBLSEC_JOY30"},
- {KEY_DBL2JOY1+30, "DBLSEC_JOY31"},
- {KEY_DBL2JOY1+31, "DBLSEC_JOY32"},
+ {KEY_DBL2JOY1+8, "dblsec_joy9"},
+ {KEY_DBL2JOY1+9, "dblsec_joy10"},
+ {KEY_DBL2JOY1+10, "dblsec_joy11"},
+ {KEY_DBL2JOY1+11, "dblsec_joy12"},
+ {KEY_DBL2JOY1+12, "dblsec_joy13"},
+ {KEY_DBL2JOY1+13, "dblsec_joy14"},
+ {KEY_DBL2JOY1+14, "dblsec_joy15"},
+ {KEY_DBL2JOY1+15, "dblsec_joy16"},
+ {KEY_DBL2JOY1+16, "dblsec_joy17"},
+ {KEY_DBL2JOY1+17, "dblsec_joy18"},
+ {KEY_DBL2JOY1+18, "dblsec_joy19"},
+ {KEY_DBL2JOY1+19, "dblsec_joy20"},
+ {KEY_DBL2JOY1+20, "dblsec_joy21"},
+ {KEY_DBL2JOY1+21, "dblsec_joy22"},
+ {KEY_DBL2JOY1+22, "dblsec_joy23"},
+ {KEY_DBL2JOY1+23, "dblsec_joy24"},
+ {KEY_DBL2JOY1+24, "dblsec_joy25"},
+ {KEY_DBL2JOY1+25, "dblsec_joy26"},
+ {KEY_DBL2JOY1+26, "dblsec_joy27"},
+ {KEY_DBL2JOY1+27, "dblsec_joy28"},
+ {KEY_DBL2JOY1+28, "dblsec_joy29"},
+ {KEY_DBL2JOY1+29, "dblsec_joy30"},
+ {KEY_DBL2JOY1+30, "dblsec_joy31"},
+ {KEY_DBL2JOY1+31, "dblsec_joy32"},
#endif
- {KEY_DBL2HAT1+0, "DBLSEC_HATUP"},
- {KEY_DBL2HAT1+1, "DBLSEC_HATDOWN"},
- {KEY_DBL2HAT1+2, "DBLSEC_HATLEFT"},
- {KEY_DBL2HAT1+3, "DBLSEC_HATRIGHT"},
- {KEY_DBL2HAT1+4, "DBLSEC_HATUP2"},
- {KEY_DBL2HAT1+5, "DBLSEC_HATDOWN2"},
- {KEY_DBL2HAT1+6, "DBLSEC_HATLEFT2"},
- {KEY_DBL2HAT1+7, "DBLSEC_HATRIGHT2"},
- {KEY_DBL2HAT1+8, "DBLSEC_HATUP3"},
- {KEY_DBL2HAT1+9, "DBLSEC_HATDOWN3"},
- {KEY_DBL2HAT1+10, "DBLSEC_HATLEFT3"},
- {KEY_DBL2HAT1+11, "DBLSEC_HATRIGHT3"},
- {KEY_DBL2HAT1+12, "DBLSEC_HATUP4"},
- {KEY_DBL2HAT1+13, "DBLSEC_HATDOWN4"},
- {KEY_DBL2HAT1+14, "DBLSEC_HATLEFT4"},
- {KEY_DBL2HAT1+15, "DBLSEC_HATRIGHT4"},
+ {KEY_DBL2HAT1+0, "dblsec_hatup"},
+ {KEY_DBL2HAT1+1, "dblsec_hatdown"},
+ {KEY_DBL2HAT1+2, "dblsec_hatleft"},
+ {KEY_DBL2HAT1+3, "dblsec_hatright"},
+ {KEY_DBL2HAT1+4, "dblsec_hatup2"},
+ {KEY_DBL2HAT1+5, "dblsec_hatdown2"},
+ {KEY_DBL2HAT1+6, "dblsec_hatleft2"},
+ {KEY_DBL2HAT1+7, "dblsec_hatright2"},
+ {KEY_DBL2HAT1+8, "dblsec_hatup3"},
+ {KEY_DBL2HAT1+9, "dblsec_hatdown3"},
+ {KEY_DBL2HAT1+10, "dblsec_hatleft3"},
+ {KEY_DBL2HAT1+11, "dblsec_hatright3"},
+ {KEY_DBL2HAT1+12, "dblsec_hatup4"},
+ {KEY_DBL2HAT1+13, "dblsec_hatdown4"},
+ {KEY_DBL2HAT1+14, "dblsec_hatleft4"},
+ {KEY_DBL2HAT1+15, "dblsec_hatright4"},
};
-static const char *gamecontrolname[num_gamecontrols] =
+static const char *gamecontrolname[NUM_GAMECONTROLS] =
{
- "nothing", // a key/button mapped to gc_null has no effect
+ "nothing", // a key/button mapped to GC_NULL has no effect
"forward",
"backward",
"strafeleft",
@@ -619,7 +613,7 @@ void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control)
void G_ClearAllControlKeys(void)
{
INT32 i;
- for (i = 0; i < num_gamecontrols; i++)
+ for (i = 0; i < NUM_GAMECONTROLS; i++)
{
G_ClearControlKeys(gamecontrol, i);
G_ClearControlKeys(gamecontrolbis, i);
@@ -630,7 +624,7 @@ void G_ClearAllControlKeys(void)
// Returns the name of a key (or virtual key for mouse and joy)
// the input value being an keynum
//
-const char *G_KeynumToString(INT32 keynum)
+const char *G_KeyNumToName(INT32 keynum)
{
static char keynamestr[8];
@@ -654,7 +648,7 @@ const char *G_KeynumToString(INT32 keynum)
return keynamestr;
}
-INT32 G_KeyStringtoNum(const char *keystr)
+INT32 G_KeyNameToNum(const char *keystr)
{
UINT32 j;
@@ -682,92 +676,98 @@ void G_DefineDefaultControls(void)
INT32 i;
// FPS game controls (WASD)
- gamecontroldefault[gcs_fps][gc_forward ][0] = 'w';
- gamecontroldefault[gcs_fps][gc_backward ][0] = 's';
- gamecontroldefault[gcs_fps][gc_strafeleft ][0] = 'a';
- gamecontroldefault[gcs_fps][gc_straferight][0] = 'd';
- gamecontroldefault[gcs_fps][gc_lookup ][0] = KEY_UPARROW;
- gamecontroldefault[gcs_fps][gc_lookdown ][0] = KEY_DOWNARROW;
- gamecontroldefault[gcs_fps][gc_turnleft ][0] = KEY_LEFTARROW;
- gamecontroldefault[gcs_fps][gc_turnright ][0] = KEY_RIGHTARROW;
- gamecontroldefault[gcs_fps][gc_centerview ][0] = KEY_END;
- gamecontroldefault[gcs_fps][gc_jump ][0] = KEY_SPACE;
- gamecontroldefault[gcs_fps][gc_spin ][0] = KEY_LSHIFT;
- gamecontroldefault[gcs_fps][gc_fire ][0] = KEY_RCTRL;
- gamecontroldefault[gcs_fps][gc_fire ][1] = KEY_MOUSE1+0;
- gamecontroldefault[gcs_fps][gc_firenormal ][0] = 'c';
-
- // Platform game controls (arrow keys)
- gamecontroldefault[gcs_platform][gc_forward ][0] = KEY_UPARROW;
- gamecontroldefault[gcs_platform][gc_backward ][0] = KEY_DOWNARROW;
- gamecontroldefault[gcs_platform][gc_strafeleft ][0] = 'a';
- gamecontroldefault[gcs_platform][gc_straferight][0] = 'd';
- gamecontroldefault[gcs_platform][gc_lookup ][0] = KEY_PGUP;
- gamecontroldefault[gcs_platform][gc_lookdown ][0] = KEY_PGDN;
- gamecontroldefault[gcs_platform][gc_turnleft ][0] = KEY_LEFTARROW;
- gamecontroldefault[gcs_platform][gc_turnright ][0] = KEY_RIGHTARROW;
- gamecontroldefault[gcs_platform][gc_centerview ][0] = KEY_END;
- gamecontroldefault[gcs_platform][gc_jump ][0] = KEY_SPACE;
- gamecontroldefault[gcs_platform][gc_spin ][0] = KEY_LSHIFT;
- gamecontroldefault[gcs_platform][gc_fire ][0] = 's';
- gamecontroldefault[gcs_platform][gc_fire ][1] = KEY_MOUSE1+0;
- gamecontroldefault[gcs_platform][gc_firenormal ][0] = 'w';
+ gamecontroldefault[gcs_fps][GC_FORWARD ][0] = 'w';
+ gamecontroldefault[gcs_fps][GC_BACKWARD ][0] = 's';
+ gamecontroldefault[gcs_fps][GC_STRAFELEFT ][0] = 'a';
+ gamecontroldefault[gcs_fps][GC_STRAFERIGHT][0] = 'd';
+ gamecontroldefault[gcs_fps][GC_LOOKUP ][0] = KEY_UPARROW;
+ gamecontroldefault[gcs_fps][GC_LOOKDOWN ][0] = KEY_DOWNARROW;
+ gamecontroldefault[gcs_fps][GC_TURNLEFT ][0] = KEY_LEFTARROW;
+ gamecontroldefault[gcs_fps][GC_TURNRIGHT ][0] = KEY_RIGHTARROW;
+ gamecontroldefault[gcs_fps][GC_CENTERVIEW ][0] = KEY_LCTRL;
+ gamecontroldefault[gcs_fps][GC_JUMP ][0] = KEY_SPACE;
+ gamecontroldefault[gcs_fps][GC_SPIN ][0] = KEY_LSHIFT;
+ gamecontroldefault[gcs_fps][GC_FIRE ][0] = KEY_RCTRL;
+ gamecontroldefault[gcs_fps][GC_FIRE ][1] = KEY_MOUSE1+0;
+ gamecontroldefault[gcs_fps][GC_FIRENORMAL ][0] = KEY_RALT;
+ gamecontroldefault[gcs_fps][GC_FIRENORMAL ][1] = KEY_MOUSE1+1;
+ gamecontroldefault[gcs_fps][GC_CUSTOM1 ][0] = 'z';
+ gamecontroldefault[gcs_fps][GC_CUSTOM2 ][0] = 'x';
+ gamecontroldefault[gcs_fps][GC_CUSTOM3 ][0] = 'c';
+
+ // Platform game controls (arrow keys), currently unused
+ gamecontroldefault[gcs_platform][GC_FORWARD ][0] = KEY_UPARROW;
+ gamecontroldefault[gcs_platform][GC_BACKWARD ][0] = KEY_DOWNARROW;
+ gamecontroldefault[gcs_platform][GC_STRAFELEFT ][0] = 'a';
+ gamecontroldefault[gcs_platform][GC_STRAFERIGHT][0] = 'd';
+ gamecontroldefault[gcs_platform][GC_LOOKUP ][0] = KEY_PGUP;
+ gamecontroldefault[gcs_platform][GC_LOOKDOWN ][0] = KEY_PGDN;
+ gamecontroldefault[gcs_platform][GC_TURNLEFT ][0] = KEY_LEFTARROW;
+ gamecontroldefault[gcs_platform][GC_TURNRIGHT ][0] = KEY_RIGHTARROW;
+ gamecontroldefault[gcs_platform][GC_CENTERVIEW ][0] = KEY_END;
+ gamecontroldefault[gcs_platform][GC_JUMP ][0] = KEY_SPACE;
+ gamecontroldefault[gcs_platform][GC_SPIN ][0] = KEY_LSHIFT;
+ gamecontroldefault[gcs_platform][GC_FIRE ][0] = 's';
+ gamecontroldefault[gcs_platform][GC_FIRE ][1] = KEY_MOUSE1+0;
+ gamecontroldefault[gcs_platform][GC_FIRENORMAL ][0] = 'w';
for (i = 1; i < num_gamecontrolschemes; i++) // skip gcs_custom (0)
{
- gamecontroldefault[i][gc_weaponnext ][0] = KEY_MOUSEWHEELUP+0;
- gamecontroldefault[i][gc_weaponprev ][0] = KEY_MOUSEWHEELDOWN+0;
- gamecontroldefault[i][gc_wepslot1 ][0] = '1';
- gamecontroldefault[i][gc_wepslot2 ][0] = '2';
- gamecontroldefault[i][gc_wepslot3 ][0] = '3';
- gamecontroldefault[i][gc_wepslot4 ][0] = '4';
- gamecontroldefault[i][gc_wepslot5 ][0] = '5';
- gamecontroldefault[i][gc_wepslot6 ][0] = '6';
- gamecontroldefault[i][gc_wepslot7 ][0] = '7';
- gamecontroldefault[i][gc_wepslot8 ][0] = '8';
- gamecontroldefault[i][gc_wepslot9 ][0] = '9';
- gamecontroldefault[i][gc_wepslot10 ][0] = '0';
- gamecontroldefault[i][gc_tossflag ][0] = '\'';
- gamecontroldefault[i][gc_camtoggle ][0] = 'v';
- gamecontroldefault[i][gc_camreset ][0] = 'r';
- gamecontroldefault[i][gc_talkkey ][0] = 't';
- gamecontroldefault[i][gc_teamkey ][0] = 'y';
- gamecontroldefault[i][gc_scores ][0] = KEY_TAB;
- gamecontroldefault[i][gc_console ][0] = KEY_CONSOLE;
- gamecontroldefault[i][gc_pause ][0] = 'p';
- gamecontroldefault[i][gc_screenshot ][0] = KEY_F8;
- gamecontroldefault[i][gc_recordgif ][0] = KEY_F9;
- gamecontroldefault[i][gc_viewpoint ][0] = KEY_F12;
+ gamecontroldefault[i][GC_WEAPONNEXT ][0] = KEY_MOUSEWHEELUP+0;
+ gamecontroldefault[i][GC_WEAPONPREV ][0] = KEY_MOUSEWHEELDOWN+0;
+ gamecontroldefault[i][GC_WEPSLOT1 ][0] = '1';
+ gamecontroldefault[i][GC_WEPSLOT2 ][0] = '2';
+ gamecontroldefault[i][GC_WEPSLOT3 ][0] = '3';
+ gamecontroldefault[i][GC_WEPSLOT4 ][0] = '4';
+ gamecontroldefault[i][GC_WEPSLOT5 ][0] = '5';
+ gamecontroldefault[i][GC_WEPSLOT6 ][0] = '6';
+ gamecontroldefault[i][GC_WEPSLOT7 ][0] = '7';
+ gamecontroldefault[i][GC_WEPSLOT8 ][0] = '8';
+ gamecontroldefault[i][GC_WEPSLOT9 ][0] = '9';
+ gamecontroldefault[i][GC_WEPSLOT10 ][0] = '0';
+ gamecontroldefault[i][GC_TOSSFLAG ][0] = '\'';
+ gamecontroldefault[i][GC_CAMTOGGLE ][0] = 'v';
+ gamecontroldefault[i][GC_CAMRESET ][0] = 'r';
+ gamecontroldefault[i][GC_TALKKEY ][0] = 't';
+ gamecontroldefault[i][GC_TEAMKEY ][0] = 'y';
+ gamecontroldefault[i][GC_SCORES ][0] = KEY_TAB;
+ gamecontroldefault[i][GC_CONSOLE ][0] = KEY_CONSOLE;
+ gamecontroldefault[i][GC_PAUSE ][0] = 'p';
+ gamecontroldefault[i][GC_SCREENSHOT ][0] = KEY_F8;
+ gamecontroldefault[i][GC_RECORDGIF ][0] = KEY_F9;
+ gamecontroldefault[i][GC_VIEWPOINT ][0] = KEY_F12;
// Gamepad controls -- same for both schemes
- gamecontroldefault[i][gc_weaponnext ][1] = KEY_JOY1+1; // B
- gamecontroldefault[i][gc_weaponprev ][1] = KEY_JOY1+2; // X
- gamecontroldefault[i][gc_tossflag ][1] = KEY_JOY1+0; // A
- gamecontroldefault[i][gc_spin ][1] = KEY_JOY1+4; // LB
- gamecontroldefault[i][gc_camtoggle ][1] = KEY_HAT1+0; // D-Pad Up
- gamecontroldefault[i][gc_camreset ][1] = KEY_JOY1+3; // Y
- gamecontroldefault[i][gc_centerview ][1] = KEY_JOY1+9; // Right Stick
- gamecontroldefault[i][gc_talkkey ][1] = KEY_HAT1+2; // D-Pad Left
- gamecontroldefault[i][gc_scores ][1] = KEY_HAT1+3; // D-Pad Right
- gamecontroldefault[i][gc_jump ][1] = KEY_JOY1+5; // RB
- gamecontroldefault[i][gc_pause ][1] = KEY_JOY1+6; // Back
- gamecontroldefault[i][gc_screenshot ][1] = KEY_HAT1+1; // D-Pad Down
- gamecontroldefault[i][gc_systemmenu ][0] = KEY_JOY1+7; // Start
+ gamecontroldefault[i][GC_JUMP ][1] = KEY_JOY1+0; // A
+ gamecontroldefault[i][GC_SPIN ][1] = KEY_JOY1+2; // X
+ gamecontroldefault[i][GC_CUSTOM1 ][1] = KEY_JOY1+1; // B
+ gamecontroldefault[i][GC_CUSTOM2 ][1] = KEY_JOY1+3; // Y
+ gamecontroldefault[i][GC_CUSTOM3 ][1] = KEY_JOY1+8; // Left Stick
+ gamecontroldefault[i][GC_CENTERVIEW ][1] = KEY_JOY1+9; // Right Stick
+ gamecontroldefault[i][GC_WEAPONPREV ][1] = KEY_JOY1+4; // LB
+ gamecontroldefault[i][GC_WEAPONNEXT ][1] = KEY_JOY1+5; // RB
+ gamecontroldefault[i][GC_SCREENSHOT ][1] = KEY_JOY1+6; // Back
+ gamecontroldefault[i][GC_SYSTEMMENU ][0] = KEY_JOY1+7; // Start
+ gamecontroldefault[i][GC_CAMTOGGLE ][1] = KEY_HAT1+0; // D-Pad Up
+ gamecontroldefault[i][GC_VIEWPOINT ][1] = KEY_HAT1+1; // D-Pad Down
+ gamecontroldefault[i][GC_TOSSFLAG ][1] = KEY_HAT1+2; // D-Pad Left
+ gamecontroldefault[i][GC_SCORES ][1] = KEY_HAT1+3; // D-Pad Right
// Second player controls only have joypad defaults
- gamecontrolbisdefault[i][gc_weaponnext][0] = KEY_2JOY1+1; // B
- gamecontrolbisdefault[i][gc_weaponprev][0] = KEY_2JOY1+2; // X
- gamecontrolbisdefault[i][gc_tossflag ][0] = KEY_2JOY1+0; // A
- gamecontrolbisdefault[i][gc_spin ][0] = KEY_2JOY1+4; // LB
- gamecontrolbisdefault[i][gc_camreset ][0] = KEY_2JOY1+3; // Y
- gamecontrolbisdefault[i][gc_centerview][0] = KEY_2JOY1+9; // Right Stick
- gamecontrolbisdefault[i][gc_jump ][0] = KEY_2JOY1+5; // RB
- //gamecontrolbisdefault[i][gc_pause ][0] = KEY_2JOY1+6; // Back
- //gamecontrolbisdefault[i][gc_systemmenu][0] = KEY_2JOY1+7; // Start
- gamecontrolbisdefault[i][gc_camtoggle ][0] = KEY_2HAT1+0; // D-Pad Up
- gamecontrolbisdefault[i][gc_screenshot][0] = KEY_2HAT1+1; // D-Pad Down
- //gamecontrolbisdefault[i][gc_talkkey ][0] = KEY_2HAT1+2; // D-Pad Left
- //gamecontrolbisdefault[i][gc_scores ][0] = KEY_2HAT1+3; // D-Pad Right
+ gamecontrolbisdefault[i][GC_JUMP ][1] = KEY_2JOY1+0; // A
+ gamecontrolbisdefault[i][GC_SPIN ][1] = KEY_2JOY1+2; // X
+ gamecontrolbisdefault[i][GC_CUSTOM1 ][1] = KEY_2JOY1+1; // B
+ gamecontrolbisdefault[i][GC_CUSTOM2 ][1] = KEY_2JOY1+3; // Y
+ gamecontrolbisdefault[i][GC_CUSTOM3 ][1] = KEY_2JOY1+8; // Left Stick
+ gamecontrolbisdefault[i][GC_CENTERVIEW ][1] = KEY_2JOY1+9; // Right Stick
+ gamecontrolbisdefault[i][GC_WEAPONPREV ][1] = KEY_2JOY1+4; // LB
+ gamecontrolbisdefault[i][GC_WEAPONNEXT ][1] = KEY_2JOY1+5; // RB
+ gamecontrolbisdefault[i][GC_SCREENSHOT ][1] = KEY_2JOY1+6; // Back
+ //gamecontrolbisdefault[i][GC_SYSTEMMENU ][0] = KEY_2JOY1+7; // Start
+ gamecontrolbisdefault[i][GC_CAMTOGGLE ][1] = KEY_2HAT1+0; // D-Pad Up
+ gamecontrolbisdefault[i][GC_VIEWPOINT ][1] = KEY_2HAT1+1; // D-Pad Down
+ gamecontrolbisdefault[i][GC_TOSSFLAG ][1] = KEY_2HAT1+2; // D-Pad Left
+ //gamecontrolbisdefault[i][GC_SCORES ][1] = KEY_2HAT1+3; // D-Pad Right
}
}
@@ -779,7 +779,7 @@ INT32 G_GetControlScheme(INT32 (*fromcontrols)[2], const INT32 *gclist, INT32 gc
for (i = 1; i < num_gamecontrolschemes; i++) // skip gcs_custom (0)
{
skipscheme = false;
- for (j = 0; j < (gclist && gclen ? gclen : num_gamecontrols); j++)
+ for (j = 0; j < (gclist && gclen ? gclen : NUM_GAMECONTROLS); j++)
{
gc = (gclist && gclen) ? gclist[j] : j;
if (((fromcontrols[gc][0] && gamecontroldefault[i][gc][0]) ? fromcontrols[gc][0] != gamecontroldefault[i][gc][0] : true) &&
@@ -802,7 +802,7 @@ void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], const I
{
INT32 i, gc;
- for (i = 0; i < (gclist && gclen ? gclen : num_gamecontrols); i++)
+ for (i = 0; i < (gclist && gclen ? gclen : NUM_GAMECONTROLS); i++)
{
gc = (gclist && gclen) ? gclist[i] : i;
setupcontrols[gc][0] = fromcontrols[gc][0];
@@ -814,24 +814,24 @@ void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis
{
INT32 i;
- for (i = 1; i < num_gamecontrols; i++)
+ for (i = 1; i < NUM_GAMECONTROLS; i++)
{
fprintf(f, "setcontrol \"%s\" \"%s\"", gamecontrolname[i],
- G_KeynumToString(fromcontrols[i][0]));
+ G_KeyNumToName(fromcontrols[i][0]));
if (fromcontrols[i][1])
- fprintf(f, " \"%s\"\n", G_KeynumToString(fromcontrols[i][1]));
+ fprintf(f, " \"%s\"\n", G_KeyNumToName(fromcontrols[i][1]));
else
fprintf(f, "\n");
}
- for (i = 1; i < num_gamecontrols; i++)
+ for (i = 1; i < NUM_GAMECONTROLS; i++)
{
fprintf(f, "setcontrol2 \"%s\" \"%s\"", gamecontrolname[i],
- G_KeynumToString(fromcontrolsbis[i][0]));
+ G_KeyNumToName(fromcontrolsbis[i][0]));
if (fromcontrolsbis[i][1])
- fprintf(f, " \"%s\"\n", G_KeynumToString(fromcontrolsbis[i][1]));
+ fprintf(f, " \"%s\"\n", G_KeyNumToName(fromcontrolsbis[i][1]));
else
fprintf(f, "\n");
}
@@ -839,11 +839,11 @@ void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis
INT32 G_CheckDoubleUsage(INT32 keynum, boolean modify)
{
- INT32 result = gc_null;
+ INT32 result = GC_NULL;
if (cv_controlperkey.value == 1)
{
INT32 i;
- for (i = 0; i < num_gamecontrols; i++)
+ for (i = 0; i < NUM_GAMECONTROLS; i++)
{
if (gamecontrol[i][0] == keynum)
{
@@ -889,11 +889,11 @@ static INT32 G_FilterKeyByVersion(INT32 numctrl, INT32 keyidx, INT32 player, INT
return -1; // skip setting control
if (GETMAJOREXECVERSION(cv_execversion.value) < 27 && ( // v2.1.22
- numctrl == gc_weaponnext || numctrl == gc_weaponprev || numctrl == gc_tossflag ||
- numctrl == gc_spin || numctrl == gc_camreset || numctrl == gc_jump ||
- numctrl == gc_pause || numctrl == gc_systemmenu || numctrl == gc_camtoggle ||
- numctrl == gc_screenshot || numctrl == gc_talkkey || numctrl == gc_scores ||
- numctrl == gc_centerview
+ numctrl == GC_WEAPONNEXT || numctrl == GC_WEAPONPREV || numctrl == GC_TOSSFLAG ||
+ numctrl == GC_SPIN || numctrl == GC_CAMRESET || numctrl == GC_JUMP ||
+ numctrl == GC_PAUSE || numctrl == GC_SYSTEMMENU || numctrl == GC_CAMTOGGLE ||
+ numctrl == GC_SCREENSHOT || numctrl == GC_TALKKEY || numctrl == GC_SCORES ||
+ numctrl == GC_CENTERVIEW
))
{
INT32 keynum = 0, existingctrl = 0;
@@ -901,7 +901,7 @@ static INT32 G_FilterKeyByVersion(INT32 numctrl, INT32 keyidx, INT32 player, INT
boolean defaultoverride = false;
// get the default gamecontrol
- if (player == 0 && numctrl == gc_systemmenu)
+ if (player == 0 && numctrl == GC_SYSTEMMENU)
defaultkey = gamecontrol[numctrl][0];
else
defaultkey = (player == 1 ? gamecontrolbis[numctrl][0] : gamecontrol[numctrl][1]);
@@ -999,16 +999,16 @@ static void setcontrol(INT32 (*gc)[2])
// Update me for 2.3
namectrl = (stricmp(COM_Argv(1), "use")) ? COM_Argv(1) : "spin";
- for (numctrl = 0; numctrl < num_gamecontrols && stricmp(namectrl, gamecontrolname[numctrl]);
+ for (numctrl = 0; numctrl < NUM_GAMECONTROLS && stricmp(namectrl, gamecontrolname[numctrl]);
numctrl++)
;
- if (numctrl == num_gamecontrols)
+ if (numctrl == NUM_GAMECONTROLS)
{
CONS_Printf(M_GetText("Control '%s' unknown\n"), namectrl);
return;
}
- keynum1 = G_KeyStringtoNum(COM_Argv(2));
- keynum2 = G_KeyStringtoNum(COM_Argv(3));
+ keynum1 = G_KeyNameToNum(COM_Argv(2));
+ keynum2 = G_KeyNameToNum(COM_Argv(3));
keynum = G_FilterKeyByVersion(numctrl, 0, player, &keynum1, &keynum2, &nestedoverride);
if (keynum >= 0)
@@ -1073,3 +1073,17 @@ void Command_Setcontrol2_f(void)
setcontrol(gamecontrolbis);
}
+
+void G_SetMouseDeltas(INT32 dx, INT32 dy, UINT8 ssplayer)
+{
+ mouse_t *m = ssplayer == 1 ? &mouse : &mouse2;
+ consvar_t *cvsens, *cvysens;
+
+ cvsens = ssplayer == 1 ? &cv_mousesens : &cv_mousesens2;
+ cvysens = ssplayer == 1 ? &cv_mouseysens : &cv_mouseysens2;
+ m->rdx = dx;
+ m->rdy = dy;
+ m->dx = (INT32)(m->rdx*((cvsens->value*cvsens->value)/110.0f + 0.1f));
+ m->dy = (INT32)(m->rdy*((cvsens->value*cvsens->value)/110.0f + 0.1f));
+ m->mlookdy = (INT32)(m->rdy*((cvysens->value*cvsens->value)/110.0f + 0.1f));
+}
diff --git a/src/g_input.h b/src/g_input.h
index 609141825bc6df6699736130fd0941d959d8b929..bf6ad39b3d24e8c941f95330a7d0c07a6cf06d09 100644
--- a/src/g_input.h
+++ b/src/g_input.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -58,49 +58,49 @@ typedef enum
typedef enum
{
- gc_null = 0, // a key/button mapped to gc_null has no effect
- gc_forward,
- gc_backward,
- gc_strafeleft,
- gc_straferight,
- gc_turnleft,
- gc_turnright,
- gc_weaponnext,
- gc_weaponprev,
- gc_wepslot1,
- gc_wepslot2,
- gc_wepslot3,
- gc_wepslot4,
- gc_wepslot5,
- gc_wepslot6,
- gc_wepslot7,
- gc_wepslot8,
- gc_wepslot9,
- gc_wepslot10,
- gc_fire,
- gc_firenormal,
- gc_tossflag,
- gc_spin,
- gc_camtoggle,
- gc_camreset,
- gc_lookup,
- gc_lookdown,
- gc_centerview,
- gc_mouseaiming, // mouse aiming is momentary (toggleable in the menu)
- gc_talkkey,
- gc_teamkey,
- gc_scores,
- gc_jump,
- gc_console,
- gc_pause,
- gc_systemmenu,
- gc_screenshot,
- gc_recordgif,
- gc_viewpoint,
- gc_custom1, // Lua scriptable
- gc_custom2, // Lua scriptable
- gc_custom3, // Lua scriptable
- num_gamecontrols
+ GC_NULL = 0, // a key/button mapped to GC_NULL has no effect
+ GC_FORWARD,
+ GC_BACKWARD,
+ GC_STRAFELEFT,
+ GC_STRAFERIGHT,
+ GC_TURNLEFT,
+ GC_TURNRIGHT,
+ GC_WEAPONNEXT,
+ GC_WEAPONPREV,
+ GC_WEPSLOT1,
+ GC_WEPSLOT2,
+ GC_WEPSLOT3,
+ GC_WEPSLOT4,
+ GC_WEPSLOT5,
+ GC_WEPSLOT6,
+ GC_WEPSLOT7,
+ GC_WEPSLOT8,
+ GC_WEPSLOT9,
+ GC_WEPSLOT10,
+ GC_FIRE,
+ GC_FIRENORMAL,
+ GC_TOSSFLAG,
+ GC_SPIN,
+ GC_CAMTOGGLE,
+ GC_CAMRESET,
+ GC_LOOKUP,
+ GC_LOOKDOWN,
+ GC_CENTERVIEW,
+ GC_MOUSEAIMING, // mouse aiming is momentary (toggleable in the menu)
+ GC_TALKKEY,
+ GC_TEAMKEY,
+ GC_SCORES,
+ GC_JUMP,
+ GC_CONSOLE,
+ GC_PAUSE,
+ GC_SYSTEMMENU,
+ GC_SCREENSHOT,
+ GC_RECORDGIF,
+ GC_VIEWPOINT,
+ GC_CUSTOM1, // Lua scriptable
+ GC_CUSTOM2, // Lua scriptable
+ GC_CUSTOM3, // Lua scriptable
+ NUM_GAMECONTROLS
} gamecontrols_e;
typedef enum
@@ -116,9 +116,29 @@ extern consvar_t cv_mousesens, cv_mouseysens;
extern consvar_t cv_mousesens2, cv_mouseysens2;
extern consvar_t cv_controlperkey;
-extern INT32 mousex, mousey;
-extern INT32 mlooky; //mousey with mlookSensitivity
-extern INT32 mouse2x, mouse2y, mlook2y;
+typedef struct
+{
+ INT32 dx; // deltas with mousemove sensitivity
+ INT32 dy;
+ INT32 mlookdy; // dy with mouselook sensitivity
+ INT32 rdx; // deltas without sensitivity
+ INT32 rdy;
+ UINT16 buttons;
+} mouse_t;
+
+#define MB_BUTTON1 0x0001
+#define MB_BUTTON2 0x0002
+#define MB_BUTTON3 0x0004
+#define MB_BUTTON4 0x0008
+#define MB_BUTTON5 0x0010
+#define MB_BUTTON6 0x0020
+#define MB_BUTTON7 0x0040
+#define MB_BUTTON8 0x0080
+#define MB_SCROLLUP 0x0100
+#define MB_SCROLLDOWN 0x0200
+
+extern mouse_t mouse;
+extern mouse_t mouse2;
extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET];
@@ -126,10 +146,10 @@ extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET],
extern UINT8 gamekeydown[NUMINPUTS];
// two key codes (or virtual key) per game control
-extern INT32 gamecontrol[num_gamecontrols][2];
-extern INT32 gamecontrolbis[num_gamecontrols][2]; // secondary splitscreen player
-extern INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; // default control storage, use 0 (gcs_custom) for memory retention
-extern INT32 gamecontrolbisdefault[num_gamecontrolschemes][num_gamecontrols][2];
+extern INT32 gamecontrol[NUM_GAMECONTROLS][2];
+extern INT32 gamecontrolbis[NUM_GAMECONTROLS][2]; // secondary splitscreen player
+extern INT32 gamecontroldefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2]; // default control storage, use 0 (gcs_custom) for memory retention
+extern INT32 gamecontrolbisdefault[num_gamecontrolschemes][NUM_GAMECONTROLS][2];
#define PLAYER1INPUTDOWN(gc) (gamekeydown[gamecontrol[gc][0]] || gamekeydown[gamecontrol[gc][1]])
#define PLAYER2INPUTDOWN(gc) (gamekeydown[gamecontrolbis[gc][0]] || gamekeydown[gamecontrolbis[gc][1]])
#define PLAYERINPUTDOWN(p, gc) ((p) == 2 ? PLAYER2INPUTDOWN(gc) : PLAYER1INPUTDOWN(gc))
@@ -161,8 +181,8 @@ extern const INT32 gcl_jump_spin[num_gcl_jump_spin];
void G_MapEventsToControls(event_t *ev);
// returns the name of a key
-const char *G_KeynumToString(INT32 keynum);
-INT32 G_KeyStringtoNum(const char *keystr);
+const char *G_KeyNumToName(INT32 keynum);
+INT32 G_KeyNameToNum(const char *keystr);
// detach any keys associated to the given game control
void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control);
@@ -175,4 +195,7 @@ void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], const I
void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis)[2]);
INT32 G_CheckDoubleUsage(INT32 keynum, boolean modify);
+// sets the members of a mouse_t given position deltas
+void G_SetMouseDeltas(INT32 dx, INT32 dy, UINT8 ssplayer);
+
#endif
diff --git a/src/g_state.h b/src/g_state.h
index 589dc6361705747ad0da81fddf79cbf327849228..a6ac1970d96308ef08c70ae2a61b5e08c382726d 100644
--- a/src/g_state.h
+++ b/src/g_state.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c
index 0ac33d1361d2a4bf92070a9d944c1bfeab9cd980..f9c6542ae631b07a44356273aafafce3307fef92 100644
--- a/src/hardware/hw_batching.c
+++ b/src/hardware/hw_batching.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -245,13 +245,16 @@ void HWR_RenderBatches(void)
currently_batching = false;// no longer collecting batches
if (!polygonArraySize)
{
- ps_hw_numpolys = ps_hw_numcalls = ps_hw_numshaders = ps_hw_numtextures = ps_hw_numpolyflags = ps_hw_numcolors = 0;
+ ps_hw_numpolys.value.i = ps_hw_numcalls.value.i = ps_hw_numshaders.value.i
+ = ps_hw_numtextures.value.i = ps_hw_numpolyflags.value.i
+ = ps_hw_numcolors.value.i = 0;
return;// nothing to draw
}
// init stats vars
- ps_hw_numpolys = polygonArraySize;
- ps_hw_numcalls = ps_hw_numverts = 0;
- ps_hw_numshaders = ps_hw_numtextures = ps_hw_numpolyflags = ps_hw_numcolors = 1;
+ ps_hw_numpolys.value.i = polygonArraySize;
+ ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0;
+ ps_hw_numshaders.value.i = ps_hw_numtextures.value.i
+ = ps_hw_numpolyflags.value.i = ps_hw_numcolors.value.i = 1;
// init polygonIndexArray
for (i = 0; i < polygonArraySize; i++)
{
@@ -259,12 +262,12 @@ void HWR_RenderBatches(void)
}
// sort polygons
- ps_hw_batchsorttime = I_GetPreciseTime();
+ PS_START_TIMING(ps_hw_batchsorttime);
if (cv_glshaders.value && gl_shadersavailable)
qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygons);
else
qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygonsNoShaders);
- ps_hw_batchsorttime = I_GetPreciseTime() - ps_hw_batchsorttime;
+ PS_STOP_TIMING(ps_hw_batchsorttime);
// sort order
// 1. shader
// 2. texture
@@ -272,7 +275,7 @@ void HWR_RenderBatches(void)
// 4. colors + light level
// not sure about what order of the last 2 should be, or if it even matters
- ps_hw_batchdrawtime = I_GetPreciseTime();
+ PS_START_TIMING(ps_hw_batchdrawtime);
currentShader = polygonArray[polygonIndexArray[0]].shader;
currentTexture = polygonArray[polygonIndexArray[0]].texture;
@@ -408,8 +411,8 @@ void HWR_RenderBatches(void)
// execute draw call
HWD.pfnDrawIndexedTriangles(¤tSurfaceInfo, finalVertexArray, finalIndexWritePos, currentPolyFlags, finalVertexIndexArray);
// update stats
- ps_hw_numcalls++;
- ps_hw_numverts += finalIndexWritePos;
+ ps_hw_numcalls.value.i++;
+ ps_hw_numverts.value.i += finalIndexWritePos;
// reset write positions
finalVertexWritePos = 0;
finalIndexWritePos = 0;
@@ -426,7 +429,7 @@ void HWR_RenderBatches(void)
currentShader = nextShader;
changeShader = false;
- ps_hw_numshaders++;
+ ps_hw_numshaders.value.i++;
}
if (changeTexture)
{
@@ -435,21 +438,21 @@ void HWR_RenderBatches(void)
currentTexture = nextTexture;
changeTexture = false;
- ps_hw_numtextures++;
+ ps_hw_numtextures.value.i++;
}
if (changePolyFlags)
{
currentPolyFlags = nextPolyFlags;
changePolyFlags = false;
- ps_hw_numpolyflags++;
+ ps_hw_numpolyflags.value.i++;
}
if (changeSurfaceInfo)
{
currentSurfaceInfo = nextSurfaceInfo;
changeSurfaceInfo = false;
- ps_hw_numcolors++;
+ ps_hw_numcolors.value.i++;
}
// and that should be it?
}
@@ -457,7 +460,7 @@ void HWR_RenderBatches(void)
polygonArraySize = 0;
unsortedVertexArraySize = 0;
- ps_hw_batchdrawtime = I_GetPreciseTime() - ps_hw_batchdrawtime;
+ PS_STOP_TIMING(ps_hw_batchdrawtime);
}
diff --git a/src/hardware/hw_batching.h b/src/hardware/hw_batching.h
index 9ccc7de3df503a12211b41d871c2734af70b0bf6..df5c478a323397fb799ff295f98459abe8e6e0a5 100644
--- a/src/hardware/hw_batching.h
+++ b/src/hardware/hw_batching.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 317efd320e749fb4c60e2d5ab36a044d3543a699..fe0b65c5021c0a8ef7db1ae189ad37709f76d33d 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h
index 5aba6a2a9b14e27d98fa7f57c6847826c8e791eb..ceefe9abdd465913078173548da2e0c0bc279731 100644
--- a/src/hardware/hw_data.h
+++ b/src/hardware/hw_data.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h
index 8df9b8916b2e563d7c1eebb16511b222a636a312..fca9b80a3006340bb053997f8e68a51de89bdf6d 100644
--- a/src/hardware/hw_defs.h
+++ b/src/hardware/hw_defs.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index e83aff0d778989a36bf3367c51600228b8a14189..691e3cd3f0c70d76b0a015f3f3ee36196361a436 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -119,11 +119,6 @@ void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
flags = PF_Translucent|PF_NoDepthTest;
- if (option & V_WRAPX)
- flags |= PF_ForceWrapX;
- if (option & V_WRAPY)
- flags |= PF_ForceWrapY;
-
// clip it since it is used for bunny scroll in doom I
HWD.pfnDrawPolygon(NULL, v, 4, flags);
}
@@ -135,6 +130,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
float cx = FIXED_TO_FLOAT(x);
float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
+ UINT8 blendmode = ((option & V_BLENDMASK) >> V_BLENDSHIFT);
GLPatch_t *hwrPatch;
// 3--2
@@ -145,9 +141,6 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
UINT8 perplayershuffle = 0;
- if (alphalevel >= 10 && alphalevel < 13)
- return;
-
// make patch ready in hardware cache
if (!colormap)
HWR_GetPatch(gpatch);
@@ -191,15 +184,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
offsetx = (float)(gpatch->leftoffset) * fscalew;
// top offset
- // TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!?
+ // TODO: make some kind of vertical version of V_FLIP
offsety = (float)(gpatch->topoffset) * fscaleh;
- if ((option & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
- {
- offsetx *= dupx;
- offsety *= dupy;
- }
-
cx -= offsetx;
cy -= offsety;
}
@@ -317,7 +304,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
}
}
- if (pscale != FRACUNIT || (splitscreen && option & V_PERPLAYER))
+ if (pscale != FRACUNIT || vscale != FRACUNIT || (splitscreen && option & V_PERPLAYER))
{
fwidth = (float)(gpatch->width) * fscalew * dupx;
fheight = (float)(gpatch->height) * fscaleh * dupy;
@@ -359,21 +346,17 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
v[0].t = v[1].t = 0.0f;
v[2].t = v[3].t = hwrPatch->max_t;
- flags = PF_Translucent|PF_NoDepthTest;
-
- if (option & V_WRAPX)
- flags |= PF_ForceWrapX;
- if (option & V_WRAPY)
- flags |= PF_ForceWrapY;
-
// clip it since it is used for bunny scroll in doom I
+ flags = HWR_GetBlendModeFlag(blendmode+1)|PF_NoDepthTest;
+
if (alphalevel)
{
FSurfaceInfo Surf;
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
- if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency];
- else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency];
- else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency];
+
+ if (alphalevel == 10) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency]; // V_HUDTRANSHALF
+ else if (alphalevel == 11) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; // V_HUDTRANS
+ else if (alphalevel == 12) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; // V_HUDTRANSDOUBLE
else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];
flags |= PF_Modulated;
HWD.pfnDrawPolygon(&Surf, v, 4, flags);
@@ -382,26 +365,30 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
HWD.pfnDrawPolygon(NULL, v, 4, flags);
}
-void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
+void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
{
FOutVector v[4];
FBITFIELD flags;
float cx = FIXED_TO_FLOAT(x);
float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
+ UINT8 blendmode = ((option & V_BLENDMASK) >> V_BLENDSHIFT);
GLPatch_t *hwrPatch;
// 3--2
// | /|
// |/ |
// 0--1
- float dupx, dupy, fscale, fwidth, fheight;
+ float dupx, dupy, fscalew, fscaleh, fwidth, fheight;
- if (alphalevel >= 10 && alphalevel < 13)
- return;
+ UINT8 perplayershuffle = 0;
// make patch ready in hardware cache
- HWR_GetPatch(gpatch);
+ if (!colormap)
+ HWR_GetPatch(gpatch);
+ else
+ HWR_GetMappedPatch(gpatch, colormap);
+
hwrPatch = ((GLPatch_t *)gpatch->hardware);
dupx = (float)vid.dupx;
@@ -423,12 +410,80 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
}
dupx = dupy = (dupx < dupy ? dupx : dupy);
- fscale = FIXED_TO_FLOAT(pscale);
+ fscalew = fscaleh = FIXED_TO_FLOAT(pscale);
+ if (vscale != pscale)
+ fscaleh = FIXED_TO_FLOAT(vscale);
- // fuck it, no GL support for croppedpatch v_perplayer right now. it's not like it's accessible to Lua or anything, and we only use it for menus...
+ cx -= (float)(gpatch->leftoffset) * fscalew;
+ cy -= (float)(gpatch->topoffset) * fscaleh;
- cy -= (float)(gpatch->topoffset) * fscale;
- cx -= (float)(gpatch->leftoffset) * fscale;
+ if (splitscreen && (option & V_PERPLAYER))
+ {
+ float adjusty = ((option & V_NOSCALESTART) ? vid.height : BASEVIDHEIGHT)/2.0f;
+ fscaleh /= 2;
+ cy /= 2;
+#ifdef QUADS
+ if (splitscreen > 1) // 3 or 4 players
+ {
+ float adjustx = ((option & V_NOSCALESTART) ? vid.width : BASEVIDWIDTH)/2.0f;
+ fscalew /= 2;
+ cx /= 2;
+ if (stplyr == &players[displayplayer])
+ {
+ if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
+ perplayershuffle |= 1;
+ if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT)))
+ perplayershuffle |= 4;
+ option &= ~V_SNAPTOBOTTOM|V_SNAPTORIGHT;
+ }
+ else if (stplyr == &players[secondarydisplayplayer])
+ {
+ if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
+ perplayershuffle |= 1;
+ if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT)))
+ perplayershuffle |= 8;
+ cx += adjustx;
+ option &= ~V_SNAPTOBOTTOM|V_SNAPTOLEFT;
+ }
+ else if (stplyr == &players[thirddisplayplayer])
+ {
+ if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
+ perplayershuffle |= 2;
+ if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT)))
+ perplayershuffle |= 4;
+ cy += adjusty;
+ option &= ~V_SNAPTOTOP|V_SNAPTORIGHT;
+ }
+ else if (stplyr == &players[fourthdisplayplayer])
+ {
+ if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
+ perplayershuffle |= 2;
+ if (!(option & (V_SNAPTOLEFT|V_SNAPTORIGHT)))
+ perplayershuffle |= 8;
+ cx += adjustx;
+ cy += adjusty;
+ option &= ~V_SNAPTOTOP|V_SNAPTOLEFT;
+ }
+ }
+ else
+#endif
+ // 2 players
+ {
+ if (stplyr == &players[displayplayer])
+ {
+ if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
+ perplayershuffle = 1;
+ option &= ~V_SNAPTOBOTTOM;
+ }
+ else //if (stplyr == &players[secondarydisplayplayer])
+ {
+ if (!(option & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
+ perplayershuffle = 2;
+ cy += adjusty;
+ option &= ~V_SNAPTOTOP;
+ }
+ }
+ }
if (!(option & V_NOSCALESTART))
{
@@ -447,6 +502,10 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
else if (!(option & V_SNAPTOLEFT))
cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/2;
+ if (perplayershuffle & 4)
+ cx -= ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4;
+ else if (perplayershuffle & 8)
+ cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/4;
}
if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
{
@@ -454,23 +513,27 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
else if (!(option & V_SNAPTOTOP))
cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/2;
+ if (perplayershuffle & 1)
+ cy -= ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4;
+ else if (perplayershuffle & 2)
+ cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/4;
}
}
}
- fwidth = w;
- fheight = h;
+ fwidth = FIXED_TO_FLOAT(w);
+ fheight = FIXED_TO_FLOAT(h);
- if (sx + w > gpatch->width)
- fwidth = gpatch->width - sx;
+ if (sx + w > gpatch->width<<FRACBITS)
+ fwidth = FIXED_TO_FLOAT((gpatch->width<<FRACBITS) - sx);
- if (sy + h > gpatch->height)
- fheight = gpatch->height - sy;
+ if (sy + h > gpatch->height<<FRACBITS)
+ fheight = FIXED_TO_FLOAT((gpatch->height<<FRACBITS) - sy);
- if (pscale != FRACUNIT)
+ if (pscale != FRACUNIT || vscale != FRACUNIT || (splitscreen && option & V_PERPLAYER))
{
- fwidth *= fscale * dupx;
- fheight *= fscale * dupy;
+ fwidth *= fscalew * dupx;
+ fheight *= fscaleh * dupy;
}
else
{
@@ -495,34 +558,101 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
- v[0].s = v[3].s = ((sx)/(float)(gpatch->width))*hwrPatch->max_s;
- if (sx + w > gpatch->width)
+ v[0].s = v[3].s = (FIXED_TO_FLOAT(sx)/(float)(gpatch->width))*hwrPatch->max_s;
+ if (sx + w > gpatch->width<<FRACBITS)
v[2].s = v[1].s = hwrPatch->max_s;
else
- v[2].s = v[1].s = ((sx+w)/(float)(gpatch->width))*hwrPatch->max_s;
+ v[2].s = v[1].s = (FIXED_TO_FLOAT(sx+w)/(float)(gpatch->width))*hwrPatch->max_s;
- v[0].t = v[1].t = ((sy)/(float)(gpatch->height))*hwrPatch->max_t;
- if (sy + h > gpatch->height)
+ v[0].t = v[1].t = (FIXED_TO_FLOAT(sy)/(float)(gpatch->height))*hwrPatch->max_t;
+ if (sy + h > gpatch->height<<FRACBITS)
v[2].t = v[3].t = hwrPatch->max_t;
else
- v[2].t = v[3].t = ((sy+h)/(float)(gpatch->height))*hwrPatch->max_t;
+ v[2].t = v[3].t = (FIXED_TO_FLOAT(sy+h)/(float)(gpatch->height))*hwrPatch->max_t;
- flags = PF_Translucent|PF_NoDepthTest;
+ // Auto-crop at splitscreen borders!
+ if (splitscreen && (option & V_PERPLAYER))
+ {
+#define flerp(a,b,amount) (((a) * (1.0f - (amount))) + ((b) * (amount))) // Float lerp
- if (option & V_WRAPX)
- flags |= PF_ForceWrapX;
- if (option & V_WRAPY)
- flags |= PF_ForceWrapY;
+#ifdef QUADS
+ if (splitscreen > 1) // 3 or 4 players
+ {
+ #error Auto-cropping doesnt take quadscreen into account! Fix it!
+ // Hint: For player 1/2, copy player 1's code below. For player 3/4, copy player 2's code below
+ // For player 1/3 and 2/4, mangle the below code to apply horizontally instead of vertically
+ }
+ else
+#endif
+ // 2 players
+ {
+ if (stplyr == &players[displayplayer]) // Player 1's screen, crop at the bottom
+ {
+ if ((cy - fheight) < 0) // If the bottom is below the border
+ {
+ if (cy <= 0) // If the whole patch is beyond the border...
+ return; // ...crop away the entire patch, don't draw anything
+
+ if (fheight <= 0) // Don't divide by zero
+ return;
+
+ v[2].y = v[3].y = 0; // Clamp the polygon edge vertex position
+ // Now for the UV-map... Uh-oh, math time!
+
+ // On second thought, a basic linear interpolation suffices
+ //float full_height = fheight;
+ //float cropped_height = fheight - cy;
+ //float remaining_height = cy;
+ //float cropped_percentage = (fheight - cy) / fheight;
+ //float remaining_percentage = cy / fheight;
+ //v[2].t = v[3].t = lerp(v[2].t, v[0].t, cropped_percentage);
+ // By swapping v[2] and v[0], we can use remaining_percentage for less operations
+ //v[2].t = v[3].t = lerp(v[0].t, v[2].t, remaining_percentage);
+
+ v[2].t = v[3].t = flerp(v[0].t, v[2].t, cy/fheight);
+ }
+ }
+ else //if (stplyr == &players[secondarydisplayplayer]) // Player 2's screen, crop at the top
+ {
+ if (cy > 0) // If the top is above the border
+ {
+ if ((cy - fheight) >= 0) // If the whole patch is beyond the border...
+ return; // ...crop away the entire patch, don't draw anything
+
+ if (fheight <= 0) // Don't divide by zero
+ return;
+
+ v[0].y = v[1].y = 0; // Clamp the polygon edge vertex position
+ // Now for the UV-map... Uh-oh, math time!
+
+ // On second thought, a basic linear interpolation suffices
+ //float full_height = fheight;
+ //float cropped_height = cy;
+ //float remaining_height = fheight - cy;
+ //float cropped_percentage = cy / fheight;
+ //float remaining_percentage = (fheight - cy) / fheight;
+ //v[0].t = v[1].t = lerp(v[0].t, v[2].t, cropped_percentage);
+
+ v[0].t = v[1].t = flerp(v[0].t, v[2].t, cy/fheight);
+ }
+ }
+ }
+#undef flerp
+ }
// clip it since it is used for bunny scroll in doom I
+ flags = HWR_GetBlendModeFlag(blendmode+1)|PF_NoDepthTest;
+
if (alphalevel)
{
FSurfaceInfo Surf;
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
- if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency];
- else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency];
- else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency];
+
+ if (alphalevel == 10) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency]; // V_HUDTRANSHALF
+ else if (alphalevel == 11) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; // V_HUDTRANS
+ else if (alphalevel == 12) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; // V_HUDTRANSDOUBLE
else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];
+
flags |= PF_Modulated;
HWD.pfnDrawPolygon(&Surf, v, 4, flags);
}
diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h
index d4a586d418de9f3da9a16d432690608b99961c8f..718774773c1dead0dd452617fbb8a5065433fbe7 100644
--- a/src/hardware/hw_drv.h
+++ b/src/hardware/hw_drv.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index 37d77b467306b823cd36a9a1bdcb57500723cc2e..8b30a346832987304e307800eb222cf6d3ac0908 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index e83d9a6ec025143150754ab6910afed140b4fdcd..eb3c9bbbb04d8b4658063a705e65f50b3ac4242e 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_light.h b/src/hardware/hw_light.h
index 244cc921f567e63422868e64259b07f1cb5c0ac4..a0a9e93ad2ca4fa6693fbc6a4b1f0b41b7a64301 100644
--- a/src/hardware/hw_light.h
+++ b/src/hardware/hw_light.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index dd633d6fc428aa3f2b96fafa0721f294ea23b64e..92076e64407fdfe7b938141627414274bae3d3ca 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -147,22 +147,22 @@ static angle_t gl_aimingangle;
static void HWR_SetTransformAiming(FTransform *trans, player_t *player, boolean skybox);
// Render stats
-precise_t ps_hw_skyboxtime = 0;
-precise_t ps_hw_nodesorttime = 0;
-precise_t ps_hw_nodedrawtime = 0;
-precise_t ps_hw_spritesorttime = 0;
-precise_t ps_hw_spritedrawtime = 0;
+ps_metric_t ps_hw_skyboxtime = {0};
+ps_metric_t ps_hw_nodesorttime = {0};
+ps_metric_t ps_hw_nodedrawtime = {0};
+ps_metric_t ps_hw_spritesorttime = {0};
+ps_metric_t ps_hw_spritedrawtime = {0};
// Render stats for batching
-int ps_hw_numpolys = 0;
-int ps_hw_numverts = 0;
-int ps_hw_numcalls = 0;
-int ps_hw_numshaders = 0;
-int ps_hw_numtextures = 0;
-int ps_hw_numpolyflags = 0;
-int ps_hw_numcolors = 0;
-precise_t ps_hw_batchsorttime = 0;
-precise_t ps_hw_batchdrawtime = 0;
+ps_metric_t ps_hw_numpolys = {0};
+ps_metric_t ps_hw_numverts = {0};
+ps_metric_t ps_hw_numcalls = {0};
+ps_metric_t ps_hw_numshaders = {0};
+ps_metric_t ps_hw_numtextures = {0};
+ps_metric_t ps_hw_numpolyflags = {0};
+ps_metric_t ps_hw_numcolors = {0};
+ps_metric_t ps_hw_batchsorttime = {0};
+ps_metric_t ps_hw_batchdrawtime = {0};
boolean gl_init = false;
boolean gl_maploaded = false;
@@ -367,10 +367,10 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
float fflatwidth = 64.0f, fflatheight = 64.0f;
INT32 flatflag = 63;
boolean texflat = false;
- float scrollx = 0.0f, scrolly = 0.0f;
+ float scrollx = 0.0f, scrolly = 0.0f, anglef = 0.0f;
angle_t angle = 0;
FSurfaceInfo Surf;
- fixed_t tempxsow, tempytow;
+ float tempxsow, tempytow;
pslope_t *slope = NULL;
static FOutVector *planeVerts = NULL;
@@ -504,24 +504,15 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
}
}
-
if (angle) // Only needs to be done if there's an altered angle
{
+ tempxsow = flatxref;
+ tempytow = flatyref;
- angle = (InvAngle(angle))>>ANGLETOFINESHIFT;
+ anglef = ANG2RAD(InvAngle(angle));
- // This needs to be done so that it scrolls in a different direction after rotation like software
- /*tempxsow = FLOAT_TO_FIXED(scrollx);
- tempytow = FLOAT_TO_FIXED(scrolly);
- scrollx = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
- scrolly = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));*/
-
- // This needs to be done so everything aligns after rotation
- // It would be done so that rotation is done, THEN the translation, but I couldn't get it to rotate AND scroll like software does
- tempxsow = FLOAT_TO_FIXED(flatxref);
- tempytow = FLOAT_TO_FIXED(flatyref);
- flatxref = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
- flatyref = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));
+ flatxref = (tempxsow * cos(anglef)) - (tempytow * sin(anglef));
+ flatyref = (tempxsow * sin(anglef)) + (tempytow * cos(anglef));
}
#define SETUP3DVERT(vert, vx, vy) {\
@@ -540,10 +531,10 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
/* Need to rotate before translate */\
if (angle) /* Only needs to be done if there's an altered angle */\
{\
- tempxsow = FLOAT_TO_FIXED(vert->s);\
- tempytow = FLOAT_TO_FIXED(vert->t);\
- vert->s = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));\
- vert->t = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));\
+ tempxsow = vert->s;\
+ tempytow = vert->t;\
+ vert->s = (tempxsow * cos(anglef)) - (tempytow * sin(anglef));\
+ vert->t = (tempxsow * sin(anglef)) + (tempytow * cos(anglef));\
}\
\
vert->x = (vx);\
@@ -565,7 +556,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
HWR_Lighting(&Surf, lightlevel, planecolormap);
- if (PolyFlags & (PF_Translucent|PF_Fog))
+ if (PolyFlags & (PF_Translucent|PF_Fog|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
{
Surf.PolyColor.s.alpha = (UINT8)alpha;
PolyFlags |= PF_Modulated;
@@ -712,13 +703,12 @@ static void HWR_RenderSkyPlane(extrasubsector_t *xsub, fixed_t fixedheight)
#endif //doplanes
-FBITFIELD HWR_GetBlendModeFlag(INT32 ast)
+FBITFIELD HWR_GetBlendModeFlag(INT32 style)
{
- switch (ast)
+ switch (style)
{
- case AST_COPY:
- case AST_OVERLAY:
- return PF_Masked;
+ case AST_TRANSLUCENT:
+ return PF_Translucent;
case AST_ADD:
return PF_Additive;
case AST_SUBTRACT:
@@ -728,10 +718,8 @@ FBITFIELD HWR_GetBlendModeFlag(INT32 ast)
case AST_MODULATE:
return PF_Multiplicative;
default:
- return PF_Translucent;
+ return PF_Masked;
}
-
- return 0;
}
UINT8 HWR_GetTranstableAlpha(INT32 transtablenum)
@@ -757,7 +745,7 @@ UINT8 HWR_GetTranstableAlpha(INT32 transtablenum)
FBITFIELD HWR_SurfaceBlend(INT32 style, INT32 transtablenum, FSurfaceInfo *pSurf)
{
- if (!transtablenum || style == AST_COPY || style == AST_OVERLAY)
+ if (!transtablenum || style <= AST_COPY || style >= AST_OVERLAY)
{
pSurf->PolyColor.s.alpha = 0xff;
return PF_Masked;
@@ -992,8 +980,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
if (cutflag & FF_FOG)
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
- else if (cutflag & FF_TRANSLUCENT)
- HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap);
+ else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
+ HWR_AddTransparentWall(wallVerts, Surf, texnum, polyflags, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
@@ -1021,8 +1009,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
if (cutflag & FF_FOG)
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
- else if (cutflag & FF_TRANSLUCENT)
- HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap);
+ else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
+ HWR_AddTransparentWall(wallVerts, Surf, texnum, polyflags, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
}
@@ -1126,7 +1114,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
SLOPEPARAMS(gl_backsector->c_slope, worldhigh, worldhighslope, gl_backsector->ceilingheight)
SLOPEPARAMS(gl_backsector->f_slope, worldlow, worldlowslope, gl_backsector->floorheight)
-#undef SLOPEPARAMS
// hack to allow height changes in outdoor areas
// This is what gets rid of the upper textures if there should be sky
@@ -1277,6 +1264,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
}
+
gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
if (gl_midtexture)
{
@@ -1466,10 +1454,20 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
case 221:
case 253:
case 256:
- blendmode = PF_Translucent;
+ if (gl_linedef->blendmode && gl_linedef->blendmode != AST_FOG)
+ blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), &Surf);
+ else
+ blendmode = PF_Translucent;
break;
default:
- if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
+ if (gl_linedef->blendmode && gl_linedef->blendmode != AST_FOG)
+ {
+ if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
+ blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), &Surf);
+ else
+ blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
+ }
+ else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), &Surf);
else
blendmode = PF_Masked;
@@ -1494,11 +1492,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
if (gl_frontsector->numlights)
{
if (!(blendmode & PF_Masked))
- HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL, PF_Decal);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL, blendmode);
else
- {
- HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, PF_Decal);
- }
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, blendmode);
}
else if (!(blendmode & PF_Masked))
HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, blendmode, false, lightnum, colormap);
@@ -1615,14 +1611,18 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
ffloor_t * rover;
fixed_t highcut = 0, lowcut = 0;
+ fixed_t lowcutslope, highcutslope;
+
+ // Used for height comparisons and etc across FOFs and slopes
+ fixed_t high1, highslope1, low1, lowslope1;
INT32 texnum;
line_t * newline = NULL; // Multi-Property FOF
- ///TODO add slope support (fixing cutoffs, proper wall clipping) - maybe just disable highcut/lowcut if either sector or FOF has a slope
- /// to allow fun plane intersecting in OGL? But then people would abuse that and make software look bad. :C
- highcut = gl_frontsector->ceilingheight < gl_backsector->ceilingheight ? gl_frontsector->ceilingheight : gl_backsector->ceilingheight;
- lowcut = gl_frontsector->floorheight > gl_backsector->floorheight ? gl_frontsector->floorheight : gl_backsector->floorheight;
+ lowcut = max(worldbottom, worldlow);
+ highcut = min(worldtop, worldhigh);
+ lowcutslope = max(worldbottomslope, worldlowslope);
+ highcutslope = min(worldtopslope, worldhighslope);
if (gl_backsector->ffloors)
{
@@ -1644,7 +1644,11 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
continue;
if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES)
continue;
- if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
+
+ SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+ SLOPEPARAMS(*rover->b_slope, low1, lowslope1, *rover->bottomheight)
+
+ if ((high1 < lowcut && highslope1 < lowcutslope) || (low1 > highcut && lowslope1 > highcutslope))
continue;
texnum = R_GetTextureNum(sides[rover->master->sidenum[0]].midtexture);
@@ -1660,10 +1664,17 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
hS = P_GetFFloorTopZAt (rover, v2x, v2y);
l = P_GetFFloorBottomZAt(rover, v1x, v1y);
lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
- if (!(*rover->t_slope) && !gl_frontsector->c_slope && !gl_backsector->c_slope && h > highcut)
- h = hS = highcut;
- if (!(*rover->b_slope) && !gl_frontsector->f_slope && !gl_backsector->f_slope && l < lowcut)
- l = lS = lowcut;
+ // Adjust the heights so the FOF does not overlap with top and bottom textures.
+ if (h >= highcut && hS >= highcutslope)
+ {
+ h = highcut;
+ hS = highcutslope;
+ }
+ if (l <= lowcut && lS <= lowcutslope)
+ {
+ l = lowcut;
+ lS = lowcutslope;
+ }
//Hurdler: HW code starts here
//FIXME: check if peging is correct
// set top/bottom coords
@@ -1743,7 +1754,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
if (gl_frontsector->numlights)
- HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover, 0);
+ HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover, blendmode);
else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
}
@@ -1751,14 +1762,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
FBITFIELD blendmode = PF_Masked;
- if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256)
+ if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{
- blendmode = PF_Translucent;
+ blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent;
Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1;
}
if (gl_frontsector->numlights)
- HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover, 0);
+ HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover, blendmode);
else
{
if (blendmode != PF_Masked)
@@ -1790,7 +1801,11 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
continue;
if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES))
continue;
- if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
+
+ SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+ SLOPEPARAMS(*rover->b_slope, low1, lowslope1, *rover->bottomheight)
+
+ if ((high1 < lowcut && highslope1 < lowcutslope) || (low1 > highcut && lowslope1 > highcutslope))
continue;
texnum = R_GetTextureNum(sides[rover->master->sidenum[0]].midtexture);
@@ -1805,10 +1820,17 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
hS = P_GetFFloorTopZAt (rover, v2x, v2y);
l = P_GetFFloorBottomZAt(rover, v1x, v1y);
lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
- if (!(*rover->t_slope) && !gl_frontsector->c_slope && !gl_backsector->c_slope && h > highcut)
- h = hS = highcut;
- if (!(*rover->b_slope) && !gl_frontsector->f_slope && !gl_backsector->f_slope && l < lowcut)
- l = lS = lowcut;
+ // Adjust the heights so the FOF does not overlap with top and bottom textures.
+ if (h >= highcut && hS >= highcutslope)
+ {
+ h = highcut;
+ hS = highcutslope;
+ }
+ if (l <= lowcut && lS <= lowcutslope)
+ {
+ l = lowcut;
+ lS = lowcutslope;
+ }
//Hurdler: HW code starts here
//FIXME: check if peging is correct
// set top/bottom coords
@@ -1855,7 +1877,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
if (gl_backsector->numlights)
- HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover, 0);
+ HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover, blendmode);
else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
}
@@ -1863,14 +1885,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
FBITFIELD blendmode = PF_Masked;
- if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256)
+ if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{
- blendmode = PF_Translucent;
+ blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent;
Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1;
}
if (gl_backsector->numlights)
- HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover, 0);
+ HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover, blendmode);
else
{
if (blendmode != PF_Masked)
@@ -1882,6 +1904,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
}
}
}
+#undef SLOPEPARAMS
//Hurdler: end of 3d-floors test
}
@@ -2946,6 +2969,13 @@ static void HWR_AddPolyObjectPlanes(void)
}
}
+static FBITFIELD HWR_RippleBlend(sector_t *sector, ffloor_t *rover, boolean ceiling)
+{
+ (void)sector;
+ (void)ceiling;
+ return /*R_IsRipplePlane(sector, rover, ceiling)*/ (rover->flags & FF_RIPPLE) ? PF_Ripple : 0;
+}
+
// -----------------+
// HWR_Subsector : Determine floor/ceiling planes.
// : Add sprites of things in sector.
@@ -3136,7 +3166,7 @@ static void HWR_Subsector(size_t num)
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap);
}
- else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) // SoM: Flags are more efficient
+ else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
{
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
@@ -3145,14 +3175,15 @@ static void HWR_Subsector(size_t num)
false,
*rover->bottomheight,
*gl_frontsector->lightlist[light].lightlevel,
- rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent,
+ rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector,
+ HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent),
false, *gl_frontsector->lightlist[light].extra_colormap);
}
else
{
HWR_GetLevelFlat(&levelflats[*rover->bottompic]);
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic],
+ HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic],
rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap);
}
}
@@ -3181,7 +3212,7 @@ static void HWR_Subsector(size_t num)
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap);
}
- else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256)
+ else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
@@ -3190,14 +3221,15 @@ static void HWR_Subsector(size_t num)
true,
*rover->topheight,
*gl_frontsector->lightlist[light].lightlevel,
- rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent,
+ rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector,
+ HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent),
false, *gl_frontsector->lightlist[light].extra_colormap);
}
else
{
HWR_GetLevelFlat(&levelflats[*rover->toppic]);
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic],
+ HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic],
rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap);
}
}
@@ -3221,7 +3253,7 @@ static void HWR_Subsector(size_t num)
}
// for render stats
- ps_numpolyobjects += numpolys;
+ ps_numpolyobjects.value.i += numpolys;
// Sort polyobjects
R_SortPolyObjects(sub);
@@ -3329,7 +3361,7 @@ static void HWR_RenderBSPNode(INT32 bspnum)
// Decide which side the view point is on
INT32 side;
- ps_numbspcalls++;
+ ps_numbspcalls.value.i++;
// Found a subsector?
if (bspnum & NF_SUBSECTOR)
@@ -3839,6 +3871,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
else
occlusion = PF_Occlude;
+ INT32 blendmode;
+ if (spr->mobj->frame & FF_BLENDMASK)
+ blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+ else
+ blendmode = spr->mobj->blendmode;
+
if (!cv_translucency.value) // translucency disabled
{
Surf.PolyColor.s.alpha = 0xFF;
@@ -3848,12 +3886,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
else if (spr->mobj->flags2 & MF2_SHADOW)
{
Surf.PolyColor.s.alpha = 0x40;
- blend = HWR_GetBlendModeFlag(spr->mobj->blendmode);
+ blend = HWR_GetBlendModeFlag(blendmode);
}
else if (spr->mobj->frame & FF_TRANSMASK)
{
INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
- blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf);
+ blend = HWR_SurfaceBlend(blendmode, trans, &Surf);
}
else
{
@@ -3862,7 +3900,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF;
- blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion;
+ blend = HWR_GetBlendModeFlag(blendmode)|occlusion;
if (!occlusion) use_linkdraw_hack = true;
}
@@ -3902,6 +3940,9 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
}
}
+ if (R_ThingIsSemiBright(spr->mobj))
+ lightlevel = 128 + (lightlevel>>1);
+
for (i = 0; i < sector->numlights; i++)
{
if (endtop < endrealbot && top < realbot)
@@ -4255,6 +4296,9 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else if (!lightset)
lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel;
+ if (R_ThingIsSemiBright(spr->mobj))
+ lightlevel = 128 + (lightlevel>>1);
+
HWR_Lighting(&Surf, lightlevel, colormap);
}
@@ -4271,6 +4315,12 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else
occlusion = PF_Occlude;
+ INT32 blendmode;
+ if (spr->mobj->frame & FF_BLENDMASK)
+ blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+ else
+ blendmode = spr->mobj->blendmode;
+
if (!cv_translucency.value) // translucency disabled
{
Surf.PolyColor.s.alpha = 0xFF;
@@ -4280,12 +4330,12 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else if (spr->mobj->flags2 & MF2_SHADOW)
{
Surf.PolyColor.s.alpha = 0x40;
- blend = HWR_GetBlendModeFlag(spr->mobj->blendmode);
+ blend = HWR_GetBlendModeFlag(blendmode);
}
else if (spr->mobj->frame & FF_TRANSMASK)
{
INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
- blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf);
+ blend = HWR_SurfaceBlend(blendmode, trans, &Surf);
}
else
{
@@ -4294,7 +4344,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF;
- blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion;
+ blend = HWR_GetBlendModeFlag(blendmode)|occlusion;
if (!occlusion) use_linkdraw_hack = true;
}
@@ -4704,7 +4754,7 @@ static void HWR_CreateDrawNodes(void)
// that is already lying around. This should all be in some sort of linked list or lists.
sortindex = Z_Calloc(sizeof(size_t) * (numplanes + numpolyplanes + numwalls), PU_STATIC, NULL);
- ps_hw_nodesorttime = I_GetPreciseTime();
+ PS_START_TIMING(ps_hw_nodesorttime);
for (i = 0; i < numplanes; i++, p++)
{
@@ -4724,7 +4774,7 @@ static void HWR_CreateDrawNodes(void)
sortindex[p] = p;
}
- ps_numdrawnodes = p;
+ ps_numdrawnodes.value.i = p;
// p is the number of stuff to sort
@@ -4759,9 +4809,9 @@ static void HWR_CreateDrawNodes(void)
}
}
- ps_hw_nodesorttime = I_GetPreciseTime() - ps_hw_nodesorttime;
+ PS_STOP_TIMING(ps_hw_nodesorttime);
- ps_hw_nodedrawtime = I_GetPreciseTime();
+ PS_START_TIMING(ps_hw_nodedrawtime);
// Okay! Let's draw it all! Woo!
HWD.pfnSetTransform(&atransform);
@@ -4798,7 +4848,7 @@ static void HWR_CreateDrawNodes(void)
}
}
- ps_hw_nodedrawtime = I_GetPreciseTime() - ps_hw_nodedrawtime;
+ PS_STOP_TIMING(ps_hw_nodedrawtime);
numwalls = 0;
numplanes = 0;
@@ -4989,10 +5039,16 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (thing->spritexscale < 1 || thing->spriteyscale < 1)
return;
+ INT32 blendmode;
+ if (thing->frame & FF_BLENDMASK)
+ blendmode = ((thing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+ else
+ blendmode = thing->blendmode;
+
// Visibility check by the blend mode.
if (thing->frame & FF_TRANSMASK)
{
- if (!R_BlendLevelVisible(thing->blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT))
+ if (!R_BlendLevelVisible(blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT))
return;
}
@@ -5327,7 +5383,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
else if (vis->mobj->type == MT_METALSONIC_BATTLE)
vis->colormap = R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE);
else
- vis->colormap = R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE);
+ vis->colormap = R_GetTranslationColormap(TC_BOSS, vis->mobj->color, GTC_CACHE);
}
else if (thing->color)
{
@@ -6081,10 +6137,10 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
if (viewnumber == 0) // Only do it if it's the first screen being rendered
HWD.pfnClearBuffer(true, false, &ClearColor); // Clear the Color Buffer, stops HOMs. Also seems to fix the skybox issue on Intel GPUs.
- ps_hw_skyboxtime = I_GetPreciseTime();
+ PS_START_TIMING(ps_hw_skyboxtime);
if (skybox && drawsky) // If there's a skybox and we should be drawing the sky, draw the skybox
HWR_RenderSkyboxView(viewnumber, player); // This is drawn before everything else so it is placed behind
- ps_hw_skyboxtime = I_GetPreciseTime() - ps_hw_skyboxtime;
+ PS_STOP_TIMING(ps_hw_skyboxtime);
{
// do we really need to save player (is it not the same)?
@@ -6194,9 +6250,9 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
// Reset the shader state.
HWR_SetShaderState();
- ps_numbspcalls = 0;
- ps_numpolyobjects = 0;
- ps_bsptime = I_GetPreciseTime();
+ ps_numbspcalls.value.i = 0;
+ ps_numpolyobjects.value.i = 0;
+ PS_START_TIMING(ps_bsptime);
validcount++;
@@ -6234,7 +6290,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
}
#endif
- ps_bsptime = I_GetPreciseTime() - ps_bsptime;
+ PS_STOP_TIMING(ps_bsptime);
if (cv_glbatching.value)
HWR_RenderBatches();
@@ -6249,22 +6305,22 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
#endif
// Draw MD2 and sprites
- ps_numsprites = gl_visspritecount;
- ps_hw_spritesorttime = I_GetPreciseTime();
+ ps_numsprites.value.i = gl_visspritecount;
+ PS_START_TIMING(ps_hw_spritesorttime);
HWR_SortVisSprites();
- ps_hw_spritesorttime = I_GetPreciseTime() - ps_hw_spritesorttime;
- ps_hw_spritedrawtime = I_GetPreciseTime();
+ PS_STOP_TIMING(ps_hw_spritesorttime);
+ PS_START_TIMING(ps_hw_spritedrawtime);
HWR_DrawSprites();
- ps_hw_spritedrawtime = I_GetPreciseTime() - ps_hw_spritedrawtime;
+ PS_STOP_TIMING(ps_hw_spritedrawtime);
#ifdef NEWCORONAS
//Hurdler: they must be drawn before translucent planes, what about gl fog?
HWR_DrawCoronas();
#endif
- ps_numdrawnodes = 0;
- ps_hw_nodesorttime = 0;
- ps_hw_nodedrawtime = 0;
+ ps_numdrawnodes.value.i = 0;
+ ps_hw_nodesorttime.value.p = 0;
+ ps_hw_nodedrawtime.value.p = 0;
if (numplanes || numpolyplanes || numwalls) //Hurdler: render 3D water and transparent walls after everything
{
HWR_CreateDrawNodes();
@@ -6753,7 +6809,7 @@ void HWR_LoadAllCustomShaders(void)
// read every custom shader
for (i = 0; i < numwadfiles; i++)
- HWR_LoadCustomShadersFromFile(i, (wadfiles[i]->type == RET_PK3));
+ HWR_LoadCustomShadersFromFile(i, W_FileHasFolders(wadfiles[i]));
}
void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index ba6532c386ff9cf1cbed29d8ba491f221c8351ef..cd822c0c153bedece9dcd9c92665944b1e5504c8 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -20,6 +20,8 @@
#include "../d_player.h"
#include "../r_defs.h"
+#include "../m_perfstats.h"
+
// Startup & Shutdown the hardware mode renderer
void HWR_Startup(void);
void HWR_Switch(void);
@@ -39,7 +41,7 @@ void HWR_InitTextureMapping(void);
void HWR_SetViewSize(void);
void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option);
void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap);
-void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t scale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
+void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
void HWR_MakePatch(const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipmap, boolean makebitmap);
void HWR_CreatePlanePolygons(INT32 bspnum);
void HWR_CreateStaticLightmaps(INT32 bspnum);
@@ -69,7 +71,7 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
UINT8 HWR_FogBlockAlpha(INT32 light, extracolormap_t *colormap); // Let's see if this can work
UINT8 HWR_GetTranstableAlpha(INT32 transtablenum);
-FBITFIELD HWR_GetBlendModeFlag(INT32 ast);
+FBITFIELD HWR_GetBlendModeFlag(INT32 style);
FBITFIELD HWR_SurfaceBlend(INT32 style, INT32 transtablenum, FSurfaceInfo *pSurf);
FBITFIELD HWR_TranstableToAlpha(INT32 transtablenum, FSurfaceInfo *pSurf);
@@ -116,22 +118,22 @@ extern FTransform atransform;
// Render stats
-extern precise_t ps_hw_skyboxtime;
-extern precise_t ps_hw_nodesorttime;
-extern precise_t ps_hw_nodedrawtime;
-extern precise_t ps_hw_spritesorttime;
-extern precise_t ps_hw_spritedrawtime;
+extern ps_metric_t ps_hw_skyboxtime;
+extern ps_metric_t ps_hw_nodesorttime;
+extern ps_metric_t ps_hw_nodedrawtime;
+extern ps_metric_t ps_hw_spritesorttime;
+extern ps_metric_t ps_hw_spritedrawtime;
// Render stats for batching
-extern int ps_hw_numpolys;
-extern int ps_hw_numverts;
-extern int ps_hw_numcalls;
-extern int ps_hw_numshaders;
-extern int ps_hw_numtextures;
-extern int ps_hw_numpolyflags;
-extern int ps_hw_numcolors;
-extern precise_t ps_hw_batchsorttime;
-extern precise_t ps_hw_batchdrawtime;
+extern ps_metric_t ps_hw_numpolys;
+extern ps_metric_t ps_hw_numverts;
+extern ps_metric_t ps_hw_numcalls;
+extern ps_metric_t ps_hw_numshaders;
+extern ps_metric_t ps_hw_numtextures;
+extern ps_metric_t ps_hw_numpolyflags;
+extern ps_metric_t ps_hw_numcolors;
+extern ps_metric_t ps_hw_batchsorttime;
+extern ps_metric_t ps_hw_batchdrawtime;
extern boolean gl_init;
extern boolean gl_maploaded;
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 9c3aa9e58caea4dfb9c26d7067074d829b7302d8..d546e2f7fc6fa810c17f54638bc562ae28157275 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -777,24 +777,7 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
while (size--)
{
- if (skinnum == TC_BOSS)
- {
- // Turn everything below a certain threshold white
- if ((image->s.red == image->s.green) && (image->s.green == image->s.blue) && image->s.blue < 127)
- {
- // Lactozilla: Invert the colors
- cur->s.red = cur->s.green = cur->s.blue = (255 - image->s.blue);
- }
- else
- {
- cur->s.red = image->s.red;
- cur->s.green = image->s.green;
- cur->s.blue = image->s.blue;
- }
-
- cur->s.alpha = image->s.alpha;
- }
- else if (skinnum == TC_ALLWHITE)
+ if (skinnum == TC_ALLWHITE)
{
// Turn everything white
cur->s.red = cur->s.green = cur->s.blue = 255;
@@ -1065,6 +1048,15 @@ skippixel:
cur->s.alpha = image->s.alpha;
}
+ else if (skinnum == TC_BOSS)
+ {
+ // Turn everything below a certain threshold white
+ if ((image->s.red == image->s.green) && (image->s.green == image->s.blue) && image->s.blue < 127)
+ {
+ // Lactozilla: Invert the colors
+ cur->s.red = cur->s.green = cur->s.blue = (255 - image->s.blue);
+ }
+ }
}
}
@@ -1533,7 +1525,12 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
{
nextFrame = (spr->mobj->frame & FF_FRAMEMASK) + 1;
if (nextFrame >= mod)
- nextFrame = 0;
+ {
+ if (spr->mobj->state->frame & FF_SPR2ENDSTATE)
+ nextFrame--;
+ else
+ nextFrame = 0;
+ }
if (frame || !(spr->mobj->state->frame & FF_SPR2ENDSTATE))
nextFrame = md2->model->spr2frames[spr2].frames[nextFrame];
else
diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h
index 9249c034c2b1394f289681e1d33cc8726a9f161a..966ed016b898fdd9a698c0ec7a6dffa146da6353 100644
--- a/src/hardware/hw_md2.h
+++ b/src/hardware/hw_md2.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index 645a3bbaeca39338b1112e29d1920c9ef4ef9c6e..7ec7ee2702f4bdaadbef776a0b281b7c3506f6a9 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 1998-2021 by Sonic Team Junior.
+// Copyright (C) 1998-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -62,6 +62,9 @@ static FBITFIELD CurrentPolyFlags;
static FTextureInfo *TexCacheTail = NULL;
static FTextureInfo *TexCacheHead = NULL;
+static RGBA_t *textureBuffer = NULL;
+static size_t textureBufferSize = 0;
+
RGBA_t myPaletteData[256];
GLint screen_width = 0; // used by Draw2DLine()
GLint screen_height = 0;
@@ -131,7 +134,6 @@ static const GLfloat byte2float[256] = {
// -----------------+
// GL_DBG_Printf : Output debug messages to debug log if DEBUG_TO_FILE is defined,
// : else do nothing
-// Returns :
// -----------------+
#ifdef DEBUG_TO_FILE
@@ -159,8 +161,6 @@ FUNCPRINTF void GL_DBG_Printf(const char *format, ...)
// -----------------+
// GL_MSG_Warning : Raises a warning.
-// :
-// Returns :
// -----------------+
static void GL_MSG_Warning(const char *format, ...)
@@ -184,8 +184,6 @@ static void GL_MSG_Warning(const char *format, ...)
// -----------------+
// GL_MSG_Error : Raises an error.
-// :
-// Returns :
// -----------------+
static void GL_MSG_Error(const char *format, ...)
@@ -1345,6 +1343,10 @@ void Flush(void)
TexCacheTail = TexCacheHead = NULL; //Hurdler: well, TexCacheHead is already NULL
tex_downloaded = 0;
+
+ free(textureBuffer);
+ textureBuffer = NULL;
+ textureBufferSize = 0;
}
@@ -1378,7 +1380,6 @@ INT32 isExtAvailable(const char *extension, const GLubyte *start)
// -----------------+
// Init : Initialise the OpenGL interface API
-// Returns :
// -----------------+
EXPORT boolean HWRAPI(Init) (void)
{
@@ -1738,37 +1739,48 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
CurrentPolyFlags = PolyFlags;
}
+static void AllocTextureBuffer(GLMipmap_t *pTexInfo)
+{
+ size_t size = pTexInfo->width * pTexInfo->height;
+ if (size > textureBufferSize)
+ {
+ textureBuffer = realloc(textureBuffer, size * sizeof(RGBA_t));
+ if (textureBuffer == NULL)
+ I_Error("AllocTextureBuffer: out of memory allocating %s bytes", sizeu1(size * sizeof(RGBA_t)));
+ textureBufferSize = size;
+ }
+}
+
// -----------------+
-// UpdateTexture : Updates the texture data.
+// UpdateTexture : Updates texture data.
// -----------------+
EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
{
- // Download a mipmap
- boolean updatemipmap = true;
- static RGBA_t tex[2048*2048];
- const GLvoid *ptex = tex;
- INT32 w, h;
- GLuint texnum = 0;
+ // Upload a texture
+ GLuint num = pTexInfo->downloaded;
+ boolean update = true;
+
+ INT32 w = pTexInfo->width, h = pTexInfo->height;
+ INT32 i, j;
+
+ const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
+ const GLvoid *ptex = NULL;
+ RGBA_t *tex = NULL;
- if (!pTexInfo->downloaded)
+ // Generate a new texture name.
+ if (!num)
{
- pglGenTextures(1, &texnum);
- pTexInfo->downloaded = texnum;
- updatemipmap = false;
+ pglGenTextures(1, &num);
+ pTexInfo->downloaded = num;
+ update = false;
}
- else
- texnum = pTexInfo->downloaded;
-
- //GL_DBG_Printf ("DownloadMipmap %d %x\n",(INT32)texnum,pTexInfo->data);
- w = pTexInfo->width;
- h = pTexInfo->height;
+ //GL_DBG_Printf("UpdateTexture %d %x\n", (INT32)num, pImgData);
- if ((pTexInfo->format == GL_TEXFMT_P_8) ||
- (pTexInfo->format == GL_TEXFMT_AP_88))
+ if ((pTexInfo->format == GL_TEXFMT_P_8) || (pTexInfo->format == GL_TEXFMT_AP_88))
{
- const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
- INT32 i, j;
+ AllocTextureBuffer(pTexInfo);
+ ptex = tex = textureBuffer;
for (j = 0; j < h; j++)
{
@@ -1799,20 +1811,18 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
tex[w*j+i].s.alpha = *pImgData;
pImgData++;
}
-
}
}
}
else if (pTexInfo->format == GL_TEXFMT_RGBA)
{
- // corona test : passed as ARGB 8888, which is not in glide formats
- // Hurdler: not used for coronas anymore, just for dynamic lighting
- ptex = pTexInfo->data;
+ // Directly upload the texture data without any kind of conversion.
+ ptex = pImgData;
}
else if (pTexInfo->format == GL_TEXFMT_ALPHA_INTENSITY_88)
{
- const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
- INT32 i, j;
+ AllocTextureBuffer(pTexInfo);
+ ptex = tex = textureBuffer;
for (j = 0; j < h; j++)
{
@@ -1829,8 +1839,8 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
}
else if (pTexInfo->format == GL_TEXFMT_ALPHA_8) // Used for fade masks
{
- const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
- INT32 i, j;
+ AllocTextureBuffer(pTexInfo);
+ ptex = tex = textureBuffer;
for (j = 0; j < h; j++)
{
@@ -1845,11 +1855,10 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
}
}
else
- GL_MSG_Warning ("SetTexture(bad format) %ld\n", pTexInfo->format);
+ GL_MSG_Warning("UpdateTexture: bad format %d\n", pTexInfo->format);
- // the texture number was already generated by pglGenTextures
- pglBindTexture(GL_TEXTURE_2D, texnum);
- tex_downloaded = texnum;
+ pglBindTexture(GL_TEXTURE_2D, num);
+ tex_downloaded = num;
// disable texture filtering on any texture that has holes so there's no dumb borders or blending issues
if (pTexInfo->flags & TF_TRANSPARENT)
@@ -1878,7 +1887,7 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
}
else
{
- if (updatemipmap)
+ if (update)
pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
else
pglTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
@@ -1899,7 +1908,7 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
}
else
{
- if (updatemipmap)
+ if (update)
pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
else
pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
@@ -1919,7 +1928,7 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
}
else
{
- if (updatemipmap)
+ if (update)
pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
else
pglTexImage2D(GL_TEXTURE_2D, 0, textureformatGL, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
diff --git a/src/http-mserv.c b/src/http-mserv.c
index f9134ba5008b0ba5f27e0b6ae48feee7ec95feef..b0ef37fa169bf8857e70b4497fa769eafb652ddf 100644
--- a/src/http-mserv.c
+++ b/src/http-mserv.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by James R.
+// Copyright (C) 2020-2022 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 2c54571985cd88e7a42b9629e3c08b5a8c8202c2..69e5bf9068795b76f373523c8d9d152bc9b26352 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -76,7 +76,7 @@ patch_t *nto_font[NT_FONTSIZE];
static player_t *plr;
boolean chat_on; // entering a chat message?
-static char w_chat[HU_MAXMSGLEN];
+static char w_chat[HU_MAXMSGLEN + 1];
static size_t c_input = 0; // let's try to make the chat input less shitty.
static boolean headsupactive = false;
boolean hu_showscores; // draw rankings
@@ -461,7 +461,7 @@ void HU_AddChatText(const char *text, boolean playsound)
static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
{
- char buf[254];
+ char buf[2 + HU_MAXMSGLEN + 1];
size_t numwords, ix;
char *msg = &buf[2];
const size_t msgspace = sizeof buf - 2;
@@ -537,7 +537,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
}
buf[0] = target;
newmsg = msg+5+spc;
- strlcpy(msg, newmsg, 252);
+ strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
}
SendNetXCmd(XD_SAY, buf, strlen(msg) + 1 + msg-buf);
@@ -644,7 +644,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
target = READSINT8(*p);
flags = READUINT8(*p);
msg = (char *)*p;
- SKIPSTRING(*p);
+ SKIPSTRINGL(*p, HU_MAXMSGLEN + 1);
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
{
@@ -686,7 +686,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
// run the lua hook even if we were supposed to eat the msg, netgame consistency goes first.
- if (LUAh_PlayerMsg(playernum, target, flags, msg))
+ if (LUA_HookPlayerMsg(playernum, target, flags, msg))
return;
if (spam_eatmsg)
@@ -858,72 +858,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
#endif
}
-// Handles key input and string input
-//
-static inline boolean HU_keyInChatString(char *s, char ch)
-{
- size_t l;
-
- if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART])
- || ch == ' ') // Allow spaces, of course
- {
- l = strlen(s);
- if (l < HU_MAXMSGLEN - 1)
- {
- if (c_input >= strlen(s)) // don't do anything complicated
- {
- s[l++] = ch;
- s[l]=0;
- }
- else
- {
-
- // move everything past c_input for new characters:
- size_t m = HU_MAXMSGLEN-1;
- while (m>=c_input)
- {
- if (s[m])
- s[m+1] = (s[m]);
- if (m == 0) // prevent overflow
- break;
- m--;
- }
- s[c_input] = ch; // and replace this.
- }
- c_input++;
- return true;
- }
- return false;
- }
- else if (ch == KEY_BACKSPACE)
- {
- size_t i = c_input;
-
- if (c_input <= 0)
- return false;
-
- if (!s[i-1])
- return false;
-
- if (i >= strlen(s)-1)
- {
- s[strlen(s)-1] = 0;
- c_input--;
- return false;
- }
-
- for (; (i < HU_MAXMSGLEN); i++)
- {
- s[i-1] = s[i];
- }
- c_input--;
- }
- else if (ch != KEY_ENTER)
- return false; // did not eat key
-
- return true; // ate the key
-}
-
#endif
//
@@ -936,7 +870,7 @@ void HU_Ticker(void)
hu_tick++;
hu_tick &= 7; // currently only to blink chat input cursor
- if (PLAYER1INPUTDOWN(gc_scores))
+ if (PLAYER1INPUTDOWN(GC_SCORES))
hu_showscores = !chat_on;
else
hu_showscores = false;
@@ -945,151 +879,123 @@ void HU_Ticker(void)
#ifndef NONET
static boolean teamtalk = false;
+static boolean justscrolleddown;
+static boolean justscrolledup;
+static INT16 typelines = 1; // number of drawfill lines we need when drawing the chat. it's some weird hack and might be one frame off but I'm lazy to make another loop.
+// It's up here since it has to be reset when we open the chat.
-// Clear spaces so we don't end up with messages only made out of emptiness
-static boolean HU_clearChatSpaces(void)
+static boolean HU_chatboxContainsOnlySpaces(void)
{
- size_t i = 0; // Used to just check our message
- char c; // current character we're iterating.
- boolean nothingbutspaces = true;
+ size_t i;
- for (; i < strlen(w_chat); i++) // iterate through message and eradicate all spaces that don't belong.
- {
- c = w_chat[i];
- if (!c)
- break; // if there's nothing, it's safe to assume our message has ended, so let's not waste any more time here.
+ for (i = 0; w_chat[i]; i++)
+ if (w_chat[i] != ' ')
+ return false;
- if (c != ' ') // Isn't a space
- {
- nothingbutspaces = false;
- }
- }
- return nothingbutspaces;
+ return true;
}
-//
-//
-static void HU_queueChatChar(char c)
+static void HU_sendChatMessage(void)
{
- // send automaticly the message (no more chat char)
- if (c == KEY_ENTER)
+ char buf[2 + HU_MAXMSGLEN + 1];
+ char *msg = &buf[2];
+ size_t ci;
+ INT32 target = 0;
+
+ // if our message was nothing but spaces, don't send it.
+ if (HU_chatboxContainsOnlySpaces())
+ return;
+
+ // copy printable characters and terminating '\0' only.
+ for (ci = 2; w_chat[ci-2]; ci++)
{
- char buf[2+256];
- char *msg = &buf[2];
- size_t i = 0;
- size_t ci = 2;
- INT32 target = 0;
+ char c = w_chat[ci-2];
+ if (c >= ' ' && !(c & 0x80))
+ buf[ci] = c;
+ };
+ buf[ci] = '\0';
- if (HU_clearChatSpaces()) // Avoids being able to send empty messages, or something.
- return; // If this returns true, that means our message was NOTHING but spaces, so don't send it period.
+ memset(w_chat, '\0', sizeof(w_chat));
+ c_input = 0;
- do {
- c = w_chat[-2+ci++];
- if (!c || (c >= ' ' && !(c & 0x80))) // copy printable characters and terminating '\0' only.
- buf[ci-1]=c;
- } while (c);
+ // last minute mute check
+ if (CHAT_MUTE)
+ {
+ HU_AddChatText(va("%s>ERROR: The chat is muted. You can't say anything.", "\x85"), false);
+ return;
+ }
- for (;(i<HU_MAXMSGLEN);i++)
- w_chat[i] = 0; // reset this.
+ if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+ {
+ INT32 spc = 1; // used if playernum[1] is a space.
+ char playernum[3];
+ const char *newmsg;
- c_input = 0;
+ // what we're gonna do now is check if the player exists
+ // with that logic, characters 4 and 5 are our numbers:
- // last minute mute check
- if (CHAT_MUTE)
+ // teamtalk can't send PMs, just don't send it, else everyone would be able to see it, and no one wants to see your sex RP sicko.
+ if (teamtalk)
{
- HU_AddChatText(va("%s>ERROR: The chat is muted. You can't say anything.", "\x85"), false);
+ HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false);
return;
}
- if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+ strncpy(playernum, msg+3, 3);
+ // check for undesirable characters in our "number"
+ if (!(isdigit(playernum[0]) && isdigit(playernum[1])))
{
- INT32 spc = 1; // used if playernum[1] is a space.
- char playernum[3];
- const char *newmsg;
-
- // what we're gonna do now is check if the player exists
- // with that logic, characters 4 and 5 are our numbers:
-
- // teamtalk can't send PMs, just don't send it, else everyone would be able to see it, and no one wants to see your sex RP sicko.
- if (teamtalk)
- {
- HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false);
- return;
- }
-
- strncpy(playernum, msg+3, 3);
- // check for undesirable characters in our "number"
- if (((playernum[0] < '0') || (playernum[0] > '9')) || ((playernum[1] < '0') || (playernum[1] > '9')))
- {
- // check if playernum[1] is a space
- if (playernum[1] == ' ')
- spc = 0;
- // let it slide
- else
- {
- HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<player num> \'.", false);
- return;
- }
- }
- // I'm very bad at C, I swear I am, additional checks eww!
- if (spc != 0)
- {
- if (msg[5] != ' ')
- {
- HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<player num> \'.", false);
- return;
- }
- }
-
- target = atoi(playernum); // turn that into a number
- //CONS_Printf("%d\n", target);
-
- // check for target player, if it doesn't exist then we can't send the message!
- if (target < MAXPLAYERS && playeringame[target]) // player exists
- target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work!
+ // check if playernum[1] is a space
+ if (playernum[1] == ' ')
+ spc = 0;
+ // let it slide
else
{
- HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same
+ HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<player num> \'.", false);
return;
}
-
- // we need to get rid of the /pm<player num>
- newmsg = msg+5+spc;
- strlcpy(msg, newmsg, 255);
}
- if (ci > 3) // don't send target+flags+empty message.
+ // I'm very bad at C, I swear I am, additional checks eww!
+ if (spc != 0 && msg[5] != ' ')
{
- if (teamtalk)
- buf[0] = -1; // target
- else
- buf[0] = target;
+ HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<player num> \'.", false);
+ return;
+ }
- buf[1] = 0; // flags
- SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1);
+ target = atoi(playernum); // turn that into a number
+
+ // check for target player, if it doesn't exist then we can't send the message!
+ if (target < MAXPLAYERS && playeringame[target]) // player exists
+ target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work!
+ else
+ {
+ HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same
+ return;
}
- return;
+
+ // we need to get rid of the /pm<player num>
+ newmsg = msg+5+spc;
+ strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
+ }
+ if (ci > 2) // don't send target+flags+empty message.
+ {
+ buf[0] = teamtalk ? -1 : target; // target
+ buf[1] = 0; // flags
+ SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1);
}
}
+
#endif
void HU_clearChatChars(void)
{
- size_t i = 0;
- for (;i<HU_MAXMSGLEN;i++)
- w_chat[i] = 0; // reset this.
+ memset(w_chat, '\0', sizeof(w_chat));
chat_on = false;
c_input = 0;
I_UpdateMouseGrab();
}
-#ifndef NONET
-static boolean justscrolleddown;
-static boolean justscrolledup;
-static INT16 typelines = 1; // number of drawfill lines we need when drawing the chat. it's some weird hack and might be one frame off but I'm lazy to make another loop.
-// It's up here since it has to be reset when we open the chat.
-#endif
-
//
// Returns true if key eaten
//
@@ -1111,26 +1017,26 @@ boolean HU_Responder(event_t *ev)
// (Unless if you're sharing a keyboard, since you probably establish when you start chatting that you have dibs on it...)
// (Ahhh, the good ol days when I was a kid who couldn't afford an extra USB controller...)
- if (ev->data1 >= KEY_MOUSE1)
+ if (ev->key >= KEY_MOUSE1)
{
INT32 i;
- for (i = 0; i < num_gamecontrols; i++)
+ for (i = 0; i < NUM_GAMECONTROLS; i++)
{
- if (gamecontrol[i][0] == ev->data1 || gamecontrol[i][1] == ev->data1)
+ if (gamecontrol[i][0] == ev->key || gamecontrol[i][1] == ev->key)
break;
}
- if (i == num_gamecontrols)
+ if (i == NUM_GAMECONTROLS)
return false;
}*/ //We don't actually care about that unless we get splitscreen netgames. :V
#ifndef NONET
- c = (INT32)ev->data1;
+ c = (INT32)ev->key;
if (!chat_on)
{
// enter chat mode
- if ((ev->data1 == gamecontrol[gc_talkkey][0] || ev->data1 == gamecontrol[gc_talkkey][1])
+ if ((ev->key == gamecontrol[GC_TALKKEY][0] || ev->key == gamecontrol[GC_TALKKEY][1])
&& netgame && !OLD_MUTE) // check for old chat mute, still let the players open the chat incase they want to scroll otherwise.
{
chat_on = true;
@@ -1140,7 +1046,7 @@ boolean HU_Responder(event_t *ev)
typelines = 1;
return true;
}
- if ((ev->data1 == gamecontrol[gc_teamkey][0] || ev->data1 == gamecontrol[gc_teamkey][1])
+ if ((ev->key == gamecontrol[GC_TEAMKEY][0] || ev->key == gamecontrol[GC_TEAMKEY][1])
&& netgame && !OLD_MUTE)
{
chat_on = true;
@@ -1157,12 +1063,12 @@ boolean HU_Responder(event_t *ev)
// Ignore modifier keys
// Note that we do this here so users can still set
// their chat keys to one of these, if they so desire.
- if (ev->data1 == KEY_LSHIFT || ev->data1 == KEY_RSHIFT
- || ev->data1 == KEY_LCTRL || ev->data1 == KEY_RCTRL
- || ev->data1 == KEY_LALT || ev->data1 == KEY_RALT)
+ if (ev->key == KEY_LSHIFT || ev->key == KEY_RSHIFT
+ || ev->key == KEY_LCTRL || ev->key == KEY_RCTRL
+ || ev->key == KEY_LALT || ev->key == KEY_RALT)
return true;
- c = (INT32)ev->data1;
+ c = (INT32)ev->key;
// I know this looks very messy but this works. If it ain't broke, don't fix it!
// shift LETTERS to uppercase if we have capslock or are holding shift
@@ -1171,21 +1077,23 @@ boolean HU_Responder(event_t *ev)
if (shiftdown ^ capslock)
c = shiftxform[c];
}
- else // if we're holding shift we should still shift non letter symbols
+ else // if we're holding shift we should still shift non letter symbols
{
if (shiftdown)
c = shiftxform[c];
}
// pasting. pasting is cool. chat is a bit limited, though :(
- if (((c == 'v' || c == 'V') && ctrldown) && !CHAT_MUTE)
+ if ((c == 'v' || c == 'V') && ctrldown)
{
- const char *paste = I_ClipboardPaste();
+ const char *paste;
size_t chatlen;
size_t pastelen;
- // create a dummy string real quickly
+ if (CHAT_MUTE)
+ return true;
+ paste = I_ClipboardPaste();
if (paste == NULL)
return true;
@@ -1194,48 +1102,24 @@ boolean HU_Responder(event_t *ev)
if (chatlen+pastelen > HU_MAXMSGLEN)
return true; // we can't paste this!!
- if (c_input >= strlen(w_chat)) // add it at the end of the string.
- {
- memcpy(&w_chat[chatlen], paste, pastelen); // copy all of that.
- c_input += pastelen;
- /*size_t i = 0;
- for (;i<pastelen;i++)
- {
- HU_queueChatChar(paste[i]); // queue it so that it's actually sent. (this chat write thing is REALLY messy.)
- }*/
- return true;
- }
- else // otherwise, we need to shift everything and make space, etc etc
- {
- size_t i = HU_MAXMSGLEN-1;
- while (i >= c_input)
- {
- if (w_chat[i])
- w_chat[i+pastelen] = w_chat[i];
- if (i == 0) // prevent overflow
- break;
- i--;
- }
- memcpy(&w_chat[c_input], paste, pastelen); // copy all of that.
- c_input += pastelen;
- return true;
- }
- }
-
- if (!CHAT_MUTE && HU_keyInChatString(w_chat,c))
- {
- HU_queueChatChar(c);
+ memmove(&w_chat[c_input + pastelen], &w_chat[c_input], pastelen);
+ memcpy(&w_chat[c_input], paste, pastelen); // copy all of that.
+ c_input += pastelen;
+ return true;
}
- if (c == KEY_ENTER)
+ else if (c == KEY_ENTER)
{
+ if (!CHAT_MUTE)
+ HU_sendChatMessage();
+
chat_on = false;
c_input = 0; // reset input cursor
chat_scrollmedown = true; // you hit enter, so you might wanna autoscroll to see what you just sent. :)
I_UpdateMouseGrab();
}
else if (c == KEY_ESCAPE
- || ((c == gamecontrol[gc_talkkey][0] || c == gamecontrol[gc_talkkey][1]
- || c == gamecontrol[gc_teamkey][0] || c == gamecontrol[gc_teamkey][1])
+ || ((c == gamecontrol[GC_TALKKEY][0] || c == gamecontrol[GC_TALKKEY][1]
+ || c == gamecontrol[GC_TEAMKEY][0] || c == gamecontrol[GC_TEAMKEY][1])
&& c >= KEY_MOUSE1)) // If it's not a keyboard key, then the chat button is used as a toggle.
{
chat_on = false;
@@ -1268,6 +1152,32 @@ boolean HU_Responder(event_t *ev)
else
c_input++;
}
+ else if ((c >= HU_FONTSTART && c <= HU_FONTEND && hu_font[c-HU_FONTSTART])
+ || c == ' ') // Allow spaces, of course
+ {
+ if (CHAT_MUTE || strlen(w_chat) >= HU_MAXMSGLEN)
+ return true;
+
+ memmove(&w_chat[c_input + 1], &w_chat[c_input], strlen(w_chat) - c_input + 1);
+ w_chat[c_input] = c;
+ c_input++;
+ }
+ else if (c == KEY_BACKSPACE)
+ {
+ if (CHAT_MUTE || c_input <= 0)
+ return true;
+
+ memmove(&w_chat[c_input - 1], &w_chat[c_input], strlen(w_chat) - c_input + 1);
+ c_input--;
+ }
+ else if (c == KEY_DEL)
+ {
+ if (CHAT_MUTE || c_input >= strlen(w_chat))
+ return true;
+
+ memmove(&w_chat[c_input], &w_chat[c_input + 1], strlen(w_chat) - c_input);
+ }
+
return true;
}
#endif
@@ -1863,60 +1773,25 @@ static void HU_DrawChat_Old(void)
}
#endif
-// draw the Crosshair, at the exact center of the view.
-//
+// Draw crosshairs at the exact center of the view.
+// In splitscreen, crosshairs are stretched vertically to compensate for V_PERPLAYER squishing them.
// Crosshairs are pre-cached at HU_Init
-static inline void HU_DrawCrosshair(void)
-{
- INT32 i, y;
-
- i = cv_crosshair.value & 3;
- if (!i)
- return;
-
- if ((netgame || multiplayer) && players[displayplayer].spectator)
- return;
-
-#ifdef HWRENDER
- if (rendermode != render_soft)
- y = (INT32)gl_basewindowcentery;
- else
-#endif
- y = viewwindowy + (viewheight>>1);
-
- V_DrawScaledPatch(vid.width>>1, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]);
-}
-
-static inline void HU_DrawCrosshair2(void)
+static inline void HU_DrawCrosshairs(void)
{
- INT32 i, y;
+ INT32 cross1 = cv_crosshair.value & 3;
+ INT32 cross2 = cv_crosshair2.value & 3;
- i = cv_crosshair2.value & 3;
- if (!i)
+ if (automapactive || demoplayback)
return;
- if ((netgame || multiplayer) && players[secondarydisplayplayer].spectator)
- return;
-
-#ifdef HWRENDER
- if (rendermode != render_soft)
- y = (INT32)gl_basewindowcentery;
- else
-#endif
- y = viewwindowy + (viewheight>>1);
-
- if (splitscreen)
- {
-#ifdef HWRENDER
- if (rendermode != render_soft)
- y += (INT32)gl_viewheight;
- else
-#endif
- y += viewheight;
+ stplyr = ((stplyr == &players[displayplayer]) ? &players[secondarydisplayplayer] : &players[displayplayer]);
+ if (!players[displayplayer].spectator && (!camera.chase || ticcmd_ztargetfocus[0]) && cross1)
+ V_DrawStretchyFixedPatch((BASEVIDWIDTH/2)<<FRACBITS, (BASEVIDHEIGHT/2)<<FRACBITS, FRACUNIT, splitscreen ? 2*FRACUNIT : FRACUNIT, V_TRANSLUCENT|V_PERPLAYER, crosshair[cross1 - 1], NULL);
- V_DrawScaledPatch(vid.width>>1, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]);
- }
+ stplyr = ((stplyr == &players[displayplayer]) ? &players[secondarydisplayplayer] : &players[displayplayer]);
+ if (!players[secondarydisplayplayer].spectator && (!camera2.chase || ticcmd_ztargetfocus[1]) && cross2 && splitscreen)
+ V_DrawStretchyFixedPatch((BASEVIDWIDTH/2)<<FRACBITS, (BASEVIDHEIGHT/2)<<FRACBITS, FRACUNIT, 2*FRACUNIT, V_TRANSLUCENT|V_PERPLAYER, crosshair[cross2 - 1], NULL);
}
static void HU_DrawCEcho(void)
@@ -2104,25 +1979,15 @@ void HU_Drawer(void)
}
else
HU_DrawCoopOverlay();
- LUAh_ScoresHUD();
+ LUA_HUDHOOK(scores);
}
if (gamestate != GS_LEVEL)
return;
- // draw the crosshair, not when viewing demos nor with chasecam
+ // draw the crosshair
if (LUA_HudEnabled(hud_crosshair))
- {
- if (!automapactive && cv_crosshair.value && !demoplayback &&
- (!camera.chase || ticcmd_ztargetfocus[0])
- && !players[displayplayer].spectator)
- HU_DrawCrosshair();
-
- if (!automapactive && cv_crosshair2.value && !demoplayback &&
- (!camera2.chase || ticcmd_ztargetfocus[1])
- && !players[secondarydisplayplayer].spectator)
- HU_DrawCrosshair2();
- }
+ HU_DrawCrosshairs();
// draw desynch text
if (hu_redownloadinggamestate)
@@ -2472,7 +2337,7 @@ static void HU_Draw32TeamTabRankings(playersort_t *tab, INT32 whiteplayer)
if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
V_DrawString(x + 10, y,
((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? 0 : V_TRANSLUCENT)
+ | (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name);
if (gametyperules & GTR_TEAMFLAGS)
@@ -2733,12 +2598,12 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
if (circuitmap)
{
if (players[tab[i].num].exiting)
- V_DrawRightAlignedThinString(x+146, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
+ V_DrawRightAlignedThinString(x+100, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
else
- V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
+ V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
}
else
- V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
+ V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
}
else
V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
@@ -2786,7 +2651,7 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
V_DrawString(x + 10, y,
((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? 0 : V_TRANSLUCENT)
+ | (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name);
if (G_GametypeUsesLives()) //show lives
@@ -2846,13 +2711,13 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
if (players[tab[i].num].exiting)
V_DrawRightAlignedThinString(x+128, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
else
- V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count));
+ V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
}
else
- V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
+ V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
}
else
- V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count));
+ V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
y += 9;
if (i == 16)
@@ -3091,7 +2956,7 @@ static void HU_DrawRankings(void)
HU_DrawTeamTabRankings(tab, whiteplayer);
else if (scorelines <= 9 && !cv_compactscoreboard.value)
HU_DrawTabRankings(40, 32, tab, scorelines, whiteplayer);
- else if (scorelines <= 20 && !cv_compactscoreboard.value)
+ else if (scorelines <= 18 && !cv_compactscoreboard.value)
HU_DrawDualTabRankings(32, 32, tab, scorelines, whiteplayer);
else
HU_Draw32TabRankings(14, 28, tab, scorelines, whiteplayer);
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 9b7cee2d3053cb63138a08d32dcfb75565ee537e..11048637853e8a84cc19a9c547baa19556835418 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -62,7 +62,7 @@ typedef struct
//------------------------------------
// chat stuff
//------------------------------------
-#define HU_MAXMSGLEN 224
+#define HU_MAXMSGLEN 223
#define CHAT_BUFSIZE 64 // that's enough messages, right? We'll delete the older ones when that gets out of hand.
#ifdef NETSPLITSCREEN
#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
diff --git a/src/i_addrinfo.c b/src/i_addrinfo.c
index 79709899e50757a38474328258c8f898a1d89815..49aadf27d203e20b58a76b757c1097f69bbb9e2c 100644
--- a/src/i_addrinfo.c
+++ b/src/i_addrinfo.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2011-2021 by Sonic Team Junior.
+// Copyright (C) 2011-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -20,7 +20,7 @@
#else
#include <winsock.h>
#endif
-#elif !defined (__DJGPP__)
+#else
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netdb.h>
diff --git a/src/i_addrinfo.h b/src/i_addrinfo.h
index 397a1969d94c866a10e4030abb74df2d73e4e5b4..592e693f4c9d57b2aeba9b5a86f84f0167590a6b 100644
--- a/src/i_addrinfo.h
+++ b/src/i_addrinfo.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2011-2021 by Sonic Team Junior.
+// Copyright (C) 2011-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/i_joy.h b/src/i_joy.h
index 0c7c8dd3f45003909c956c536653bcdfb247f333..27584cea6ed818a8a01348e7a4d73e3510a64c91 100644
--- a/src/i_joy.h
+++ b/src/i_joy.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/i_net.h b/src/i_net.h
index dbc82db65cd94480277e03e23222741741524d48..62b7528d59f0bcf6877f55ab467687fc7a55dad5 100644
--- a/src/i_net.h
+++ b/src/i_net.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/i_sound.h b/src/i_sound.h
index e38a17626b95dac976295a27c53e5583ce4043fb..6358fbefb9edb99a956d808428486a04b08334df 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/i_system.h b/src/i_system.h
index c4197832ea6d274d9d4669de63cd07d16b4bebc9..013b67ea8a500d94ae9a07ed23cee6a5635bc0c6 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -65,7 +65,7 @@ void I_SetTime(tic_t tic, int fudge, boolean useAbsoluteFudge);
*/
precise_t I_GetPreciseTime(void);
-/** \brief Returns the difference between precise times as microseconds.
+/** \brief Converts a precise_t to microseconds and casts it to a 32 bit integer.
*/
int I_PreciseToMicros(precise_t);
@@ -329,4 +329,12 @@ const char *I_ClipboardPaste(void);
void I_RegisterSysCommands(void);
+/** \brief Return the position of the cursor relative to the top-left window corner.
+*/
+void I_GetCursorPosition(INT32 *x, INT32 *y);
+
+/** \brief Sets whether the mouse is grabbed
+*/
+void I_SetMouseGrab(boolean grab);
+
#endif
diff --git a/src/i_tcp.c b/src/i_tcp.c
index 7d512dd47c966a7488ca763cb1797327da928323..a87e540744e54eca9979be040996aef4da1d9559 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -64,7 +64,7 @@
#include <errno.h>
#include <time.h>
- #if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+ #if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#include <sys/time.h>
#endif // UNIXCOMMON
#endif
@@ -107,15 +107,6 @@
#endif
#endif // USE_WINSOCK
- #ifdef __DJGPP__
- #ifdef WATTCP // Alam_GBC: Wattcp may need this
- #include <tcp.h>
- #define strerror strerror_s
- #else // wattcp
- #include <lsck/lsck.h>
- #endif // libsocket
- #endif // djgpp
-
typedef union
{
struct sockaddr any;
@@ -150,32 +141,22 @@
#include "doomstat.h"
-// win32 or djgpp
-#if defined (USE_WINSOCK) || defined (__DJGPP__)
+// win32
+#ifdef USE_WINSOCK
// winsock stuff (in winsock a socket is not a file)
#define ioctl ioctlsocket
#define close closesocket
#endif
#include "i_addrinfo.h"
-
-#ifdef __DJGPP__
-
-#ifdef WATTCP
#define SELECTTEST
-#endif
-
-#else
-#define SELECTTEST
-#endif
-
#define DEFAULTPORT "5029"
#if defined (USE_WINSOCK) && !defined (NONET)
typedef SOCKET SOCKET_TYPE;
#define ERRSOCKET (SOCKET_ERROR)
#else
- #if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
+ #if defined (__unix__) || defined (__APPLE__) || defined (__HAIKU__)
typedef int SOCKET_TYPE;
#else
typedef unsigned long SOCKET_TYPE;
@@ -185,7 +166,7 @@
#ifndef NONET
// define socklen_t in DOS/Windows if it is not already defined
- #if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
+ #ifdef USE_WINSOCK1
typedef int socklen_t;
#endif
static SOCKET_TYPE mysockets[MAXNETNODES+1] = {ERRSOCKET};
@@ -208,19 +189,6 @@ static const char *serverport_name = DEFAULTPORT;
static const char *clientport_name;/* any port */
#ifndef NONET
-
-#ifdef WATTCP
-static void wattcp_outch(char s)
-{
- static char old = '\0';
- char pr[2] = {s,0};
- if (s == old && old == ' ') return;
- else old = s;
- if (s == '\r') CONS_Printf("\n");
- else if (s != '\n') CONS_Printf(pr);
-}
-#endif
-
#ifdef USE_WINSOCK
// stupid microsoft makes things complicated
static char *get_WSAErrorStr(int e)
@@ -771,11 +739,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
int opt;
socklen_t opts;
#ifdef FIONBIO
-#ifdef WATTCP
- char trueval = true;
-#else
unsigned long trueval = true;
-#endif
#endif
mysockaddr_t straddr;
struct sockaddr_in sin;
@@ -1145,61 +1109,7 @@ boolean I_InitTcpDriver(void)
CONS_Debug(DBG_NETPLAY, "WinSock description: %s\n",WSAData.szDescription);
CONS_Debug(DBG_NETPLAY, "WinSock System Status: %s\n",WSAData.szSystemStatus);
#endif
-#ifdef __DJGPP__
-#ifdef WATTCP // Alam_GBC: survive bootp, dhcp, rarp and wattcp/pktdrv from failing to load
- survive_eth = 1; // would be needed to not exit if pkt_eth_init() fails
- survive_bootp = 1; // ditto for BOOTP
- survive_dhcp = 1; // ditto for DHCP/RARP
- survive_rarp = 1;
- //_watt_do_exit = false;
- //_watt_handle_cbreak = false;
- //_watt_no_config = true;
- _outch = wattcp_outch;
- init_misc();
-//#ifdef DEBUGFILE
- dbug_init();
-//#endif
- switch (sock_init())
- {
- case 0:
- init_tcp_driver = true;
- break;
- case 3:
- CONS_Debug(DBG_NETPLAY, "No packet driver detected\n");
- break;
- case 4:
- CONS_Debug(DBG_NETPLAY, "Error while talking to packet driver\n");
- break;
- case 5:
- CONS_Debug(DBG_NETPLAY, "BOOTP failed\n");
- break;
- case 6:
- CONS_Debug(DBG_NETPLAY, "DHCP failed\n");
- break;
- case 7:
- CONS_Debug(DBG_NETPLAY, "RARP failed\n");
- break;
- case 8:
- CONS_Debug(DBG_NETPLAY, "TCP/IP failed\n");
- break;
- case 9:
- CONS_Debug(DBG_NETPLAY, "PPPoE login/discovery failed\n");
- break;
- default:
- CONS_Debug(DBG_NETPLAY, "Unknown error with TCP/IP stack\n");
- break;
- }
- hires_timer(0);
-#else // wattcp
- if (__lsck_init())
- init_tcp_driver = true;
- else
- CONS_Debug(DBG_NETPLAY, "No TCP/IP driver detected\n");
-#endif // libsocket
-#endif // __DJGPP__
-#ifndef __DJGPP__
init_tcp_driver = true;
-#endif
}
#endif
if (!tcp_was_up && init_tcp_driver)
@@ -1224,10 +1134,8 @@ static void SOCK_CloseSocket(void)
if (mysockets[i] != (SOCKET_TYPE)ERRSOCKET
&& FD_ISSET(mysockets[i], &masterset))
{
-#if !defined (__DJGPP__) || defined (WATTCP)
FD_CLR(mysockets[i], &masterset);
close(mysockets[i]);
-#endif
}
mysockets[i] = ERRSOCKET;
}
@@ -1244,14 +1152,6 @@ void I_ShutdownTcpDriver(void)
WS_addrinfocleanup();
WSACleanup();
#endif
-#ifdef __DJGPP__
-#ifdef WATTCP // wattcp
- //_outch = NULL;
- sock_exit();
-#else
- __lsck_uninit();
-#endif // libsocket
-#endif // __DJGPP__
CONS_Printf("shut down\n");
init_tcp_driver = false;
#endif
diff --git a/src/i_tcp.h b/src/i_tcp.h
index 7857344156448712b934b0989b242e2e6fc554da..b6e5b92351d211f31c36c188598d99643443ee94 100644
--- a/src/i_tcp.h
+++ b/src/i_tcp.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/i_threads.h b/src/i_threads.h
index bc752181f521c447d736368cb0c17b09ae998572..c7b71d26cfe09c0a018713e08d3f3a4163a2405c 100644
--- a/src/i_threads.h
+++ b/src/i_threads.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by James R.
+// Copyright (C) 2020-2022 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/i_video.h b/src/i_video.h
index 2d07fcf10700973e4f3aad0b15e9566101ef9ec3..638fcb6689f026722ffbb4e777111260ec54e97c 100644
--- a/src/i_video.h
+++ b/src/i_video.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/info.c b/src/info.c
index bb1279b6bf96403af46544985dc602c8354d46d7..3f0f5361f376eb8e74cbca1561f37741e7ad5d75 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -203,6 +203,10 @@ char sprnames[NUMSPRITES + 1][5] =
// The letter
"LETR",
+ // Tutorial Scenery
+ "TUPL",
+ "TUPF",
+
// Greenflower Scenery
"FWR1",
"FWR2", // GFZ Sunflower
@@ -2069,7 +2073,7 @@ state_t states[NUMSTATES] =
{SPR_TVFL, 2, 18, {A_GiveShield}, SH_FLAMEAURA, 0, S_NULL}, // S_FLAMEAURA_ICON2
{SPR_TVBB, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_BUBBLEWRAP_ICON2}, // S_BUBBLEWRAP_ICON1
- {SPR_TVBB, 2, 18, {A_GiveShield}, SH_BUBBLEWRAP, 0, S_NULL}, // S_BUBBLERWAP_ICON2
+ {SPR_TVBB, 2, 18, {A_GiveShield}, SH_BUBBLEWRAP, 0, S_NULL}, // S_BUBBLEWRAP_ICON2
{SPR_TVZP, FF_ANIMATE|2, 18, {NULL}, 3, 4, S_THUNDERCOIN_ICON2}, // S_THUNDERCOIN_ICON1
{SPR_TVZP, 2, 18, {A_GiveShield}, SH_THUNDERCOIN, 0, S_NULL}, // S_THUNDERCOIN_ICON2
@@ -2117,6 +2121,56 @@ state_t states[NUMSTATES] =
{SPR_LETR, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_LETTER
+ // Tutorial scenery
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF2}, // S_TUTORIALLEAF1
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF3}, // S_TUTORIALLEAF2
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF4}, // S_TUTORIALLEAF3
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF5}, // S_TUTORIALLEAF4
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF6}, // S_TUTORIALLEAF5
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF7}, // S_TUTORIALLEAF6
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF8}, // S_TUTORIALLEAF7
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF9}, // S_TUTORIALLEAF8
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALLEAF10}, // S_TUTORIALLEAF9
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALLEAF11}, // S_TUTORIALLEAF10
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALLEAF12}, // S_TUTORIALLEAF11
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALLEAF13}, // S_TUTORIALLEAF12
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALLEAF14}, // S_TUTORIALLEAF13
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALLEAF15}, // S_TUTORIALLEAF14
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALLEAF16}, // S_TUTORIALLEAF15
+ {SPR_TUPL, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALLEAF1}, // S_TUTORIALLEAF16
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER2}, // S_TUTORIALFLOWER1
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER3}, // S_TUTORIALFLOWER2
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER4}, // S_TUTORIALFLOWER3
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER5}, // S_TUTORIALFLOWER4
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER6}, // S_TUTORIALFLOWER5
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER7}, // S_TUTORIALFLOWER6
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER8}, // S_TUTORIALFLOWER7
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER9}, // S_TUTORIALFLOWER8
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWER10}, // S_TUTORIALFLOWER9
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWER11}, // S_TUTORIALFLOWER10
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWER12}, // S_TUTORIALFLOWER11
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWER13}, // S_TUTORIALFLOWER12
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWER14}, // S_TUTORIALFLOWER13
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWER15}, // S_TUTORIALFLOWER14
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWER16}, // S_TUTORIALFLOWER15
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_PAPERSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWER1}, // S_TUTORIALFLOWER16
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF2}, // S_TUTORIALFLOWERF1
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF3}, // S_TUTORIALFLOWERF2
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF4}, // S_TUTORIALFLOWERF3
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF5}, // S_TUTORIALFLOWERF4
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF6}, // S_TUTORIALFLOWERF5
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF7}, // S_TUTORIALFLOWERF6
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF8}, // S_TUTORIALFLOWERF7
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF9}, // S_TUTORIALFLOWERF8
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|7, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF10}, // S_TUTORIALFLOWERF9
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|6, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF11}, // S_TUTORIALFLOWERF10
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|5, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF12}, // S_TUTORIALFLOWERF11
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|4, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF13}, // S_TUTORIALFLOWERF12
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|3, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF14}, // S_TUTORIALFLOWERF13
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|2, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF15}, // S_TUTORIALFLOWERF14
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|1, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF16}, // S_TUTORIALFLOWERF15
+ {SPR_TUPF, FF_SEMIBRIGHT|FF_ADD|FF_FLOORSPRITE|0, 3, {NULL}, 0, 0, S_TUTORIALFLOWERF1}, // S_TUTORIALFLOWERF16
+
// GFZ flowers
{SPR_FWR1, FF_ANIMATE, -1, {NULL}, 7, 3, S_NULL}, // S_GFZFLOWERA
{SPR_FWR2, FF_ANIMATE, -1, {NULL}, 19, 3, S_NULL}, // S_GFZFLOWERB
@@ -2168,7 +2222,7 @@ state_t states[NUMSTATES] =
{SPR_GARG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BIGGARGOYLE
// DSZ Seaweed
- {SPR_SEWE, 0, -1, {NULL}, 0, 0, S_SEAWEED2}, // S_SEAWEED1
+ {SPR_SEWE, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 26, 3, S_SEAWEED1}, // S_SEAWEED1
{SPR_SEWE, 1, 5, {NULL}, 0, 0, S_SEAWEED3}, // S_SEAWEED2
{SPR_SEWE, 2, 5, {NULL}, 0, 0, S_SEAWEED4}, // S_SEAWEED3
{SPR_SEWE, 3, 5, {NULL}, 0, 0, S_SEAWEED5}, // S_SEAWEED4
@@ -3736,14 +3790,13 @@ state_t states[NUMSTATES] =
{SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER9
// Nightopian
- {SPR_NTPN, 0, 4, {A_Look}, 0, 0, S_PIAN0}, // S_PIAN0
- {SPR_NTPN, 0, 4, {A_JetgThink}, 0, 0, S_PIAN2}, // S_PIAN1
- {SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN3}, // S_PIAN2
- {SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN4}, // S_PIAN3
- {SPR_NTPN, 3, 4, {NULL}, 0, 0, S_PIAN5}, // S_PIAN4
- {SPR_NTPN, 2, 4, {NULL}, 0, 0, S_PIAN6}, // S_PIAN5
- {SPR_NTPN, 1, 4, {NULL}, 0, 0, S_PIAN1}, // S_PIAN6
- {SPR_NTPN, 5|FF_ANIMATE, 4, {NULL}, 1, 4, S_PIAN1}, // S_PIANSING
+ {SPR_NTPN, 0, 2, {A_Look}, 1, 1, S_PIAN_LOOK2}, // S_PIAN_LOOK1
+ {SPR_NTPN, 1, 2, {A_Look}, 1, 1, S_PIAN_LOOK3}, // S_PIAN_LOOK2
+ {SPR_NTPN, 2, 2, {A_Look}, 1, 1, S_PIAN_LOOK1}, // S_PIAN_LOOK3
+ {SPR_NTPN, 0, 2, {A_JetgThink}, 0, 0, S_PIAN_FLY2}, // S_PIAN_FLY1
+ {SPR_NTPN, 1, 2, {NULL}, 0, 0, S_PIAN_FLY3}, // S_PIAN_FLY2
+ {SPR_NTPN, 2, 2, {NULL}, 0, 0, S_PIAN_FLY1}, // S_PIAN_FLY3
+ {SPR_NTPN, 3|FF_ANIMATE, 24, {NULL}, 2, 2, S_PIAN_FLY1}, // S_PIAN_SING
// Shleep
{SPR_SHLP, 0, 15, {NULL}, 0, 0, S_SHLEEP2}, // S_SHLEEP1
@@ -5198,11 +5251,11 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // speed
24*FRACUNIT, // radius
34*FRACUNIT, // height
- 0, // display offset
- 100, // mass
+ 1, // display offset
+ DMG_FIRE, // mass
0, // damage
sfx_None, // activesound
- MF_NOGRAVITY|MF_NOBLOCKMAP|MF_FIRE|MF_PAIN, // flags
+ MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_FIRE|MF_PAIN, // flags
S_NULL // raisestate
},
@@ -5601,8 +5654,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE_FLEE1, // xdeathstate
sfx_s3kb4, // deathsound
4, // speed
- 24*FRACUNIT, // radius
- 76*FRACUNIT, // height
+ 36*FRACUNIT, // radius
+ 84*FRACUNIT, // height
0, // display offset
sfx_None, // mass
3, // damage
@@ -5736,8 +5789,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE2_FLEE1,// xdeathstate
sfx_s3kb4, // deathsound
2*FRACUNIT, // speed
- 24*FRACUNIT, // radius
- 76*FRACUNIT, // height
+ 36*FRACUNIT, // radius
+ 84*FRACUNIT, // height
0, // display offset
0, // mass
3, // damage
@@ -5844,7 +5897,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE3_FLEE1, // xdeathstate
sfx_s3kb4, // deathsound
8*FRACUNIT, // speed
- 32*FRACUNIT, // radius
+ 36*FRACUNIT, // radius
116*FRACUNIT, // height
0, // display offset
MT_FAKEMOBILE, // mass
@@ -5871,7 +5924,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_mswarp, // deathsound
8*FRACUNIT, // speed
- 32*FRACUNIT, // radius
+ 36*FRACUNIT, // radius
116*FRACUNIT, // height
0, // display offset
0, // mass
@@ -5925,8 +5978,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE4_FLEE1,// xdeathstate
sfx_s3kb4, // deathsound
0, // speed
- 24*FRACUNIT, // radius
- 76*FRACUNIT, // height
+ 36*FRACUNIT, // radius
+ 84*FRACUNIT, // height
0, // display offset
0, // mass
3, // damage
@@ -7974,7 +8027,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
- 4, // mass
+ DMG_SPIKE, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_SCENERY|MF_NOCLIPHEIGHT, // flags
@@ -8001,7 +8054,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
14*FRACUNIT, // height
0, // display offset
- 4, // mass
+ DMG_SPIKE, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY|MF_NOCLIPHEIGHT|MF_PAPERCOLLISION, // flags
@@ -9776,8 +9829,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_MINE_BOOM1, // deathstate
- S_MINE_BOOM1, // xdeathstate
+ S_XPLD1, // deathstate
+ S_XPLD1, // xdeathstate
sfx_cybdth, // deathsound
0, // speed
8*FRACUNIT, // radius
@@ -9979,6 +10032,114 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_TUTORIALPLANT
+ 799, // doomednum
+ S_NULL, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 32*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_TUTORIALLEAF
+ -1, // doomednum
+ S_TUTORIALLEAF1, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 32*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_TUTORIALFLOWER
+ -1, // doomednum
+ S_TUTORIALFLOWER1, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 32*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_TUTORIALFLOWERF
+ -1, // doomednum
+ S_TUTORIALFLOWERF1, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 32*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
{ // MT_GFZFLOWER1
800, // doomednum
S_GFZFLOWERA, // spawnstate
@@ -11430,7 +11591,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
17*FRACUNIT, // radius
34*FRACUNIT, // height
1, // display offset
- 0, // mass
+ DMG_SPIKE, // mass
1, // damage
sfx_s3kc9s, //sfx_mswing, -- activesound
MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags
@@ -11457,7 +11618,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
34*FRACUNIT, // radius
68*FRACUNIT, // height
1, // display offset
- 0, // mass
+ DMG_SPIKE, // mass
1, // damage
sfx_s3kc9s, //sfx_mswing, -- activesound
MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags
@@ -13401,7 +13562,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
30*FRACUNIT, // radius
48*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
0, // damage
sfx_None, // activesound
MF_SPECIAL|MF_PAIN|MF_NOGRAVITY|MF_FIRE, // flags
@@ -13481,7 +13642,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
32*FRACUNIT, // speed
30*FRACUNIT, // radius
60*FRACUNIT, // height
- 0, // display offset
+ -1, // display offset
100, // mass
0, // damage
sfx_None, // activesound
@@ -13806,7 +13967,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
- 0, // mass
+ 0, // mass
0, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_PAIN, // flags
@@ -20119,28 +20280,28 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_PIAN
1602, // doomednum
- S_PIAN0, // spawnstate
+ S_PIAN_LOOK1, // spawnstate
1000, // spawnhealth
- S_PIAN1, // seestate
+ S_PIAN_FLY1, // seestate
sfx_None, // seesound
0, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
200, // painchance
sfx_None, // painsound
- S_PIANSING, // meleestate
- S_NULL, // missilestate
+ S_NULL, // meleestate
+ S_PIAN_SING, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
FRACUNIT, // speed
16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ 40*FRACUNIT, // height
0, // display offset
16, // mass
0, // damage
sfx_None, // activesound
- MF_SLIDEME|MF_ENEMY|MF_SPECIAL|MF_SHOOTABLE|MF_NOGRAVITY, // flags
+ MF_SLIDEME|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
@@ -20380,7 +20541,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
18*FRACUNIT, // radius
28*FRACUNIT, // height
0, // display offset
- 0, // mass
+ DMG_SPIKE, // mass
0, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_PAIN, // flags
@@ -21685,6 +21846,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_NOSECTOR, // flags
S_NULL // raisestate
},
+
+ { // MT_RAY
+ -1, // doomednum
+ S_NULL, // spawnstate
+ 0, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 0, // radius
+ 0, // height
+ 0, // display offset
+ 0, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOSECTOR|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
};
skincolor_t skincolors[MAXSKINCOLORS] = {
@@ -21761,7 +21949,7 @@ skincolor_t skincolors[MAXSKINCOLORS] = {
{"Violet", {0xd0, 0xd1, 0xd2, 0xca, 0xcc, 0xb8, 0xb9, 0xb9, 0xba, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfe, 0xfe}, SKINCOLOR_MINT, 6, V_MAGENTAMAP, true}, // SKINCOLOR_VIOLET
{"Lilac", {0x00, 0xd0, 0xd1, 0xd2, 0xd3, 0xc1, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xfe, 0x1f}, SKINCOLOR_VAPOR, 4, V_ROSYMAP, true}, // SKINCOLOR_LILAC
{"Plum", {0xc8, 0xd3, 0xd5, 0xd6, 0xd7, 0xce, 0xcf, 0xb9, 0xb9, 0xba, 0xba, 0xa9, 0xa9, 0xa9, 0xfd, 0xfe}, SKINCOLOR_MINT, 7, V_ROSYMAP, true}, // SKINCOLOR_PLUM
- {"Raspberry", {0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xcd, 0xce, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfe, 0xfe}, SKINCOLOR_APPLE, 13, V_MAGENTAMAP, true}, // SKINCOLOR_RASPBERRY
+ {"Raspberry", {0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xcd, 0xce, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfe, 0xfe}, SKINCOLOR_APPLE, 13, V_ROSYMAP, true}, // SKINCOLOR_RASPBERRY
{"Rosy", {0xfc, 0xc8, 0xc8, 0xc9, 0xc9, 0xca, 0xca, 0xcb, 0xcb, 0xcc, 0xcc, 0xcd, 0xcd, 0xce, 0xce, 0xcf}, SKINCOLOR_AQUA, 1, V_ROSYMAP, true}, // SKINCOLOR_ROSY
// super
diff --git a/src/info.h b/src/info.h
index 031a08b4316a00d135cf45a45827ff117181373e..9aa26a97a922e8673652ce0096e9f2913cd0294f 100644
--- a/src/info.h
+++ b/src/info.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -177,6 +177,8 @@ enum actionnum
A_SETOBJECTFLAGS2,
A_RANDOMSTATE,
A_RANDOMSTATERANGE,
+ A_STATERANGEBYANGLE,
+ A_STATERANGEBYPARAMETER,
A_DUALACTION,
A_REMOTEACTION,
A_TOGGLEFLAMEJET,
@@ -443,6 +445,8 @@ void A_SetObjectFlags();
void A_SetObjectFlags2();
void A_RandomState();
void A_RandomStateRange();
+void A_StateRangeByAngle();
+void A_StateRangeByParameter();
void A_DualAction();
void A_RemoteAction();
void A_ToggleFlameJet();
@@ -737,6 +741,10 @@ typedef enum sprite
// The letter
SPR_LETR,
+ // Tutorial scenery
+ SPR_TUPL,
+ SPR_TUPF,
+
// Greenflower Scenery
SPR_FWR1,
SPR_FWR2, // GFZ Sunflower
@@ -2551,6 +2559,56 @@ typedef enum state
// The letter
S_LETTER,
+ // Tutorial scenery
+ S_TUTORIALLEAF1,
+ S_TUTORIALLEAF2,
+ S_TUTORIALLEAF3,
+ S_TUTORIALLEAF4,
+ S_TUTORIALLEAF5,
+ S_TUTORIALLEAF6,
+ S_TUTORIALLEAF7,
+ S_TUTORIALLEAF8,
+ S_TUTORIALLEAF9,
+ S_TUTORIALLEAF10,
+ S_TUTORIALLEAF11,
+ S_TUTORIALLEAF12,
+ S_TUTORIALLEAF13,
+ S_TUTORIALLEAF14,
+ S_TUTORIALLEAF15,
+ S_TUTORIALLEAF16,
+ S_TUTORIALFLOWER1,
+ S_TUTORIALFLOWER2,
+ S_TUTORIALFLOWER3,
+ S_TUTORIALFLOWER4,
+ S_TUTORIALFLOWER5,
+ S_TUTORIALFLOWER6,
+ S_TUTORIALFLOWER7,
+ S_TUTORIALFLOWER8,
+ S_TUTORIALFLOWER9,
+ S_TUTORIALFLOWER10,
+ S_TUTORIALFLOWER11,
+ S_TUTORIALFLOWER12,
+ S_TUTORIALFLOWER13,
+ S_TUTORIALFLOWER14,
+ S_TUTORIALFLOWER15,
+ S_TUTORIALFLOWER16,
+ S_TUTORIALFLOWERF1,
+ S_TUTORIALFLOWERF2,
+ S_TUTORIALFLOWERF3,
+ S_TUTORIALFLOWERF4,
+ S_TUTORIALFLOWERF5,
+ S_TUTORIALFLOWERF6,
+ S_TUTORIALFLOWERF7,
+ S_TUTORIALFLOWERF8,
+ S_TUTORIALFLOWERF9,
+ S_TUTORIALFLOWERF10,
+ S_TUTORIALFLOWERF11,
+ S_TUTORIALFLOWERF12,
+ S_TUTORIALFLOWERF13,
+ S_TUTORIALFLOWERF14,
+ S_TUTORIALFLOWERF15,
+ S_TUTORIALFLOWERF16,
+
// GFZ flowers
S_GFZFLOWERA,
S_GFZFLOWERB,
@@ -4093,14 +4151,13 @@ typedef enum state
S_NIGHTOPIANHELPER9,
// Nightopian
- S_PIAN0,
- S_PIAN1,
- S_PIAN2,
- S_PIAN3,
- S_PIAN4,
- S_PIAN5,
- S_PIAN6,
- S_PIANSING,
+ S_PIAN_LOOK1,
+ S_PIAN_LOOK2,
+ S_PIAN_LOOK3,
+ S_PIAN_FLY1,
+ S_PIAN_FLY2,
+ S_PIAN_FLY3,
+ S_PIAN_SING,
// Shleep
S_SHLEEP1,
@@ -4583,6 +4640,12 @@ typedef enum mobj_type
// The letter
MT_LETTER,
+ // Tutorial Scenery
+ MT_TUTORIALPLANT,
+ MT_TUTORIALLEAF,
+ MT_TUTORIALFLOWER,
+ MT_TUTORIALFLOWERF,
+
// Greenflower Scenery
MT_GFZFLOWER1,
MT_GFZFLOWER2,
@@ -5089,6 +5152,7 @@ typedef enum mobj_type
MT_YELLOWBRICKDEBRIS, // for CEZ3
MT_NAMECHECK,
+ MT_RAY, // General purpose mobj
MT_FIRSTFREESLOT,
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
diff --git a/src/keys.h b/src/keys.h
index b19259320e59574effaa3b48ba7a713ac7af0c86..df12c95aefa58ee65abec831e8eec1bdd5de6b85 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/libdivide.h b/src/libdivide.h
new file mode 100644
index 0000000000000000000000000000000000000000..1a589c7e5508957b0c4a8e15d37cd02c0402f349
--- /dev/null
+++ b/src/libdivide.h
@@ -0,0 +1,2111 @@
+// libdivide.h - Optimized integer division
+// https://libdivide.com
+//
+// Copyright (C) 2010 - 2019 ridiculous_fish, <libdivide@ridiculousfish.com>
+// Copyright (C) 2016 - 2019 Kim Walisch, <kim.walisch@gmail.com>
+//
+// libdivide is dual-licensed under the Boost or zlib licenses.
+// You may use libdivide under the terms of either of these.
+// See LICENSE.txt in the libdivide source code repository for more details.
+
+
+// NOTICE: This is an altered source version of libdivide.
+// Libdivide is used here under the terms of the zlib license.
+// Here is the zlib license text from https://github.com/ridiculousfish/libdivide/blob/master/LICENSE.txt
+/*
+ zlib License
+ ------------
+
+ Copyright (C) 2010 - 2019 ridiculous_fish, <libdivide@ridiculousfish.com>
+ Copyright (C) 2016 - 2019 Kim Walisch, <kim.walisch@gmail.com>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+// This version of libdivide has been modified for use with SRB2.
+// Changes made include:
+// - unused parts commented out (to avoid the need to fix C90 compilation issues with them)
+// - C90 compilation issues fixed with used parts
+// - use I_Error for errors
+
+#ifndef LIBDIVIDE_H
+#define LIBDIVIDE_H
+
+#define LIBDIVIDE_VERSION "3.0"
+#define LIBDIVIDE_VERSION_MAJOR 3
+#define LIBDIVIDE_VERSION_MINOR 0
+
+#include <stdint.h>
+
+#if defined(__cplusplus)
+ #include <cstdlib>
+ #include <cstdio>
+ #include <type_traits>
+#else
+ #include <stdlib.h>
+ #include <stdio.h>
+#endif
+
+#if defined(LIBDIVIDE_AVX512)
+ #include <immintrin.h>
+#elif defined(LIBDIVIDE_AVX2)
+ #include <immintrin.h>
+#elif defined(LIBDIVIDE_SSE2)
+ #include <emmintrin.h>
+#endif
+
+#if defined(_MSC_VER)
+ #include <intrin.h>
+ // disable warning C4146: unary minus operator applied
+ // to unsigned type, result still unsigned
+ #pragma warning(disable: 4146)
+ #define LIBDIVIDE_VC
+#endif
+
+#if !defined(__has_builtin)
+ #define __has_builtin(x) 0
+#endif
+
+#if defined(__SIZEOF_INT128__)
+ #define HAS_INT128_T
+ // clang-cl on Windows does not yet support 128-bit division
+ #if !(defined(__clang__) && defined(LIBDIVIDE_VC))
+ #define HAS_INT128_DIV
+ #endif
+#endif
+
+#if defined(__x86_64__) || defined(_M_X64)
+ #define LIBDIVIDE_X86_64
+#endif
+
+#if defined(__i386__)
+ #define LIBDIVIDE_i386
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+ #define LIBDIVIDE_GCC_STYLE_ASM
+#endif
+
+#if defined(__cplusplus) || defined(LIBDIVIDE_VC)
+ #define LIBDIVIDE_FUNCTION __FUNCTION__
+#else
+ #define LIBDIVIDE_FUNCTION __func__
+#endif
+
+#define LIBDIVIDE_ERROR(msg) \
+ I_Error("libdivide.h:%d: %s(): Error: %s\n", \
+ __LINE__, LIBDIVIDE_FUNCTION, msg);
+
+#if defined(LIBDIVIDE_ASSERTIONS_ON)
+ #define LIBDIVIDE_ASSERT(x) \
+ if (!(x)) { \
+ I_Error("libdivide.h:%d: %s(): Assertion failed: %s\n", \
+ __LINE__, LIBDIVIDE_FUNCTION, #x); \
+ }
+#else
+ #define LIBDIVIDE_ASSERT(x)
+#endif
+
+#ifdef __cplusplus
+namespace libdivide {
+#endif
+
+// pack divider structs to prevent compilers from padding.
+// This reduces memory usage by up to 43% when using a large
+// array of libdivide dividers and improves performance
+// by up to 10% because of reduced memory bandwidth.
+#pragma pack(push, 1)
+
+struct libdivide_u32_t {
+ uint32_t magic;
+ uint8_t more;
+};
+
+struct libdivide_s32_t {
+ int32_t magic;
+ uint8_t more;
+};
+
+struct libdivide_u64_t {
+ uint64_t magic;
+ uint8_t more;
+};
+
+struct libdivide_s64_t {
+ int64_t magic;
+ uint8_t more;
+};
+
+struct libdivide_u32_branchfree_t {
+ uint32_t magic;
+ uint8_t more;
+};
+
+struct libdivide_s32_branchfree_t {
+ int32_t magic;
+ uint8_t more;
+};
+
+struct libdivide_u64_branchfree_t {
+ uint64_t magic;
+ uint8_t more;
+};
+
+struct libdivide_s64_branchfree_t {
+ int64_t magic;
+ uint8_t more;
+};
+
+#pragma pack(pop)
+
+// Explanation of the "more" field:
+//
+// * Bits 0-5 is the shift value (for shift path or mult path).
+// * Bit 6 is the add indicator for mult path.
+// * Bit 7 is set if the divisor is negative. We use bit 7 as the negative
+// divisor indicator so that we can efficiently use sign extension to
+// create a bitmask with all bits set to 1 (if the divisor is negative)
+// or 0 (if the divisor is positive).
+//
+// u32: [0-4] shift value
+// [5] ignored
+// [6] add indicator
+// magic number of 0 indicates shift path
+//
+// s32: [0-4] shift value
+// [5] ignored
+// [6] add indicator
+// [7] indicates negative divisor
+// magic number of 0 indicates shift path
+//
+// u64: [0-5] shift value
+// [6] add indicator
+// magic number of 0 indicates shift path
+//
+// s64: [0-5] shift value
+// [6] add indicator
+// [7] indicates negative divisor
+// magic number of 0 indicates shift path
+//
+// In s32 and s64 branchfree modes, the magic number is negated according to
+// whether the divisor is negated. In branchfree strategy, it is not negated.
+
+enum {
+ LIBDIVIDE_32_SHIFT_MASK = 0x1F,
+ LIBDIVIDE_64_SHIFT_MASK = 0x3F,
+ LIBDIVIDE_ADD_MARKER = 0x40,
+ LIBDIVIDE_NEGATIVE_DIVISOR = 0x80
+};
+
+//static inline struct libdivide_s32_t libdivide_s32_gen(int32_t d);
+static inline struct libdivide_u32_t libdivide_u32_gen(uint32_t d);
+//static inline struct libdivide_s64_t libdivide_s64_gen(int64_t d);
+//static inline struct libdivide_u64_t libdivide_u64_gen(uint64_t d);
+
+/*static inline struct libdivide_s32_branchfree_t libdivide_s32_branchfree_gen(int32_t d);
+static inline struct libdivide_u32_branchfree_t libdivide_u32_branchfree_gen(uint32_t d);
+static inline struct libdivide_s64_branchfree_t libdivide_s64_branchfree_gen(int64_t d);
+static inline struct libdivide_u64_branchfree_t libdivide_u64_branchfree_gen(uint64_t d);*/
+
+//static inline int32_t libdivide_s32_do(int32_t numer, const struct libdivide_s32_t *denom);
+static inline uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom);
+//static inline int64_t libdivide_s64_do(int64_t numer, const struct libdivide_s64_t *denom);
+//static inline uint64_t libdivide_u64_do(uint64_t numer, const struct libdivide_u64_t *denom);
+
+/*static inline int32_t libdivide_s32_branchfree_do(int32_t numer, const struct libdivide_s32_branchfree_t *denom);
+static inline uint32_t libdivide_u32_branchfree_do(uint32_t numer, const struct libdivide_u32_branchfree_t *denom);
+static inline int64_t libdivide_s64_branchfree_do(int64_t numer, const struct libdivide_s64_branchfree_t *denom);
+static inline uint64_t libdivide_u64_branchfree_do(uint64_t numer, const struct libdivide_u64_branchfree_t *denom);*/
+
+/*static inline int32_t libdivide_s32_recover(const struct libdivide_s32_t *denom);
+static inline uint32_t libdivide_u32_recover(const struct libdivide_u32_t *denom);
+static inline int64_t libdivide_s64_recover(const struct libdivide_s64_t *denom);
+static inline uint64_t libdivide_u64_recover(const struct libdivide_u64_t *denom);*/
+
+/*static inline int32_t libdivide_s32_branchfree_recover(const struct libdivide_s32_branchfree_t *denom);
+static inline uint32_t libdivide_u32_branchfree_recover(const struct libdivide_u32_branchfree_t *denom);
+static inline int64_t libdivide_s64_branchfree_recover(const struct libdivide_s64_branchfree_t *denom);
+static inline uint64_t libdivide_u64_branchfree_recover(const struct libdivide_u64_branchfree_t *denom);*/
+
+//////// Internal Utility Functions
+
+static inline uint32_t libdivide_mullhi_u32(uint32_t x, uint32_t y) {
+ uint64_t xl = x, yl = y;
+ uint64_t rl = xl * yl;
+ return (uint32_t)(rl >> 32);
+}
+
+static inline int32_t libdivide_mullhi_s32(int32_t x, int32_t y) {
+ int64_t xl = x, yl = y;
+ int64_t rl = xl * yl;
+ // needs to be arithmetic shift
+ return (int32_t)(rl >> 32);
+}
+
+static inline uint64_t libdivide_mullhi_u64(uint64_t x, uint64_t y) {
+#if defined(LIBDIVIDE_VC) && \
+ defined(LIBDIVIDE_X86_64)
+ return __umulh(x, y);
+#elif defined(HAS_INT128_T)
+ __uint128_t xl = x, yl = y;
+ __uint128_t rl = xl * yl;
+ return (uint64_t)(rl >> 64);
+#else
+ // full 128 bits are x0 * y0 + (x0 * y1 << 32) + (x1 * y0 << 32) + (x1 * y1 << 64)
+ uint32_t mask = 0xFFFFFFFF;
+ uint32_t x0 = (uint32_t)(x & mask);
+ uint32_t x1 = (uint32_t)(x >> 32);
+ uint32_t y0 = (uint32_t)(y & mask);
+ uint32_t y1 = (uint32_t)(y >> 32);
+ uint32_t x0y0_hi = libdivide_mullhi_u32(x0, y0);
+ uint64_t x0y1 = x0 * (uint64_t)y1;
+ uint64_t x1y0 = x1 * (uint64_t)y0;
+ uint64_t x1y1 = x1 * (uint64_t)y1;
+ uint64_t temp = x1y0 + x0y0_hi;
+ uint64_t temp_lo = temp & mask;
+ uint64_t temp_hi = temp >> 32;
+
+ return x1y1 + temp_hi + ((temp_lo + x0y1) >> 32);
+#endif
+}
+
+static inline int64_t libdivide_mullhi_s64(int64_t x, int64_t y) {
+#if defined(LIBDIVIDE_VC) && \
+ defined(LIBDIVIDE_X86_64)
+ return __mulh(x, y);
+#elif defined(HAS_INT128_T)
+ __int128_t xl = x, yl = y;
+ __int128_t rl = xl * yl;
+ return (int64_t)(rl >> 64);
+#else
+ // full 128 bits are x0 * y0 + (x0 * y1 << 32) + (x1 * y0 << 32) + (x1 * y1 << 64)
+ uint32_t mask = 0xFFFFFFFF;
+ uint32_t x0 = (uint32_t)(x & mask);
+ uint32_t y0 = (uint32_t)(y & mask);
+ int32_t x1 = (int32_t)(x >> 32);
+ int32_t y1 = (int32_t)(y >> 32);
+ uint32_t x0y0_hi = libdivide_mullhi_u32(x0, y0);
+ int64_t t = x1 * (int64_t)y0 + x0y0_hi;
+ int64_t w1 = x0 * (int64_t)y1 + (t & mask);
+
+ return x1 * (int64_t)y1 + (t >> 32) + (w1 >> 32);
+#endif
+}
+
+static inline int32_t libdivide_count_leading_zeros32(uint32_t val) {
+#if defined(__GNUC__) || \
+ __has_builtin(__builtin_clz)
+ // Fast way to count leading zeros
+ return __builtin_clz(val);
+#elif defined(LIBDIVIDE_VC)
+ unsigned long result;
+ if (_BitScanReverse(&result, val)) {
+ return 31 - result;
+ }
+ return 0;
+#else
+ if (val == 0)
+ return 32;
+ int32_t result = 8;
+ uint32_t hi = 0xFFU << 24;
+ while ((val & hi) == 0) {
+ hi >>= 8;
+ result += 8;
+ }
+ while (val & hi) {
+ result -= 1;
+ hi <<= 1;
+ }
+ return result;
+#endif
+}
+
+static inline int32_t libdivide_count_leading_zeros64(uint64_t val) {
+#if defined(__GNUC__) || \
+ __has_builtin(__builtin_clzll)
+ // Fast way to count leading zeros
+ return __builtin_clzll(val);
+#elif defined(LIBDIVIDE_VC) && defined(_WIN64)
+ unsigned long result;
+ if (_BitScanReverse64(&result, val)) {
+ return 63 - result;
+ }
+ return 0;
+#else
+ uint32_t hi = val >> 32;
+ uint32_t lo = val & 0xFFFFFFFF;
+ if (hi != 0) return libdivide_count_leading_zeros32(hi);
+ return 32 + libdivide_count_leading_zeros32(lo);
+#endif
+}
+
+// libdivide_64_div_32_to_32: divides a 64-bit uint {u1, u0} by a 32-bit
+// uint {v}. The result must fit in 32 bits.
+// Returns the quotient directly and the remainder in *r
+static inline uint32_t libdivide_64_div_32_to_32(uint32_t u1, uint32_t u0, uint32_t v, uint32_t *r) {
+#if (defined(LIBDIVIDE_i386) || defined(LIBDIVIDE_X86_64)) && \
+ defined(LIBDIVIDE_GCC_STYLE_ASM)
+ uint32_t result;
+ __asm__("divl %[v]"
+ : "=a"(result), "=d"(*r)
+ : [v] "r"(v), "a"(u0), "d"(u1)
+ );
+ return result;
+#else
+ uint64_t n = ((uint64_t)u1 << 32) | u0;
+ uint32_t result = (uint32_t)(n / v);
+ *r = (uint32_t)(n - result * (uint64_t)v);
+ return result;
+#endif
+}
+
+// libdivide_128_div_64_to_64: divides a 128-bit uint {u1, u0} by a 64-bit
+// uint {v}. The result must fit in 64 bits.
+// Returns the quotient directly and the remainder in *r
+/*static uint64_t libdivide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v, uint64_t *r) {
+#if defined(LIBDIVIDE_X86_64) && \
+ defined(LIBDIVIDE_GCC_STYLE_ASM)
+ uint64_t result;
+ __asm__("divq %[v]"
+ : "=a"(result), "=d"(*r)
+ : [v] "r"(v), "a"(u0), "d"(u1)
+ );
+ return result;
+#elif defined(HAS_INT128_T) && \
+ defined(HAS_INT128_DIV)
+ __uint128_t n = ((__uint128_t)u1 << 64) | u0;
+ uint64_t result = (uint64_t)(n / v);
+ *r = (uint64_t)(n - result * (__uint128_t)v);
+ return result;
+#else
+ // Code taken from Hacker's Delight:
+ // http://www.hackersdelight.org/HDcode/divlu.c.
+ // License permits inclusion here per:
+ // http://www.hackersdelight.org/permissions.htm
+
+ const uint64_t b = (1ULL << 32); // Number base (32 bits)
+ uint64_t un1, un0; // Norm. dividend LSD's
+ uint64_t vn1, vn0; // Norm. divisor digits
+ uint64_t q1, q0; // Quotient digits
+ uint64_t un64, un21, un10; // Dividend digit pairs
+ uint64_t rhat; // A remainder
+ int32_t s; // Shift amount for norm
+
+ // If overflow, set rem. to an impossible value,
+ // and return the largest possible quotient
+ if (u1 >= v) {
+ *r = (uint64_t) -1;
+ return (uint64_t) -1;
+ }
+
+ // count leading zeros
+ s = libdivide_count_leading_zeros64(v);
+ if (s > 0) {
+ // Normalize divisor
+ v = v << s;
+ un64 = (u1 << s) | (u0 >> (64 - s));
+ un10 = u0 << s; // Shift dividend left
+ } else {
+ // Avoid undefined behavior of (u0 >> 64).
+ // The behavior is undefined if the right operand is
+ // negative, or greater than or equal to the length
+ // in bits of the promoted left operand.
+ un64 = u1;
+ un10 = u0;
+ }
+
+ // Break divisor up into two 32-bit digits
+ vn1 = v >> 32;
+ vn0 = v & 0xFFFFFFFF;
+
+ // Break right half of dividend into two digits
+ un1 = un10 >> 32;
+ un0 = un10 & 0xFFFFFFFF;
+
+ // Compute the first quotient digit, q1
+ q1 = un64 / vn1;
+ rhat = un64 - q1 * vn1;
+
+ while (q1 >= b || q1 * vn0 > b * rhat + un1) {
+ q1 = q1 - 1;
+ rhat = rhat + vn1;
+ if (rhat >= b)
+ break;
+ }
+
+ // Multiply and subtract
+ un21 = un64 * b + un1 - q1 * v;
+
+ // Compute the second quotient digit
+ q0 = un21 / vn1;
+ rhat = un21 - q0 * vn1;
+
+ while (q0 >= b || q0 * vn0 > b * rhat + un0) {
+ q0 = q0 - 1;
+ rhat = rhat + vn1;
+ if (rhat >= b)
+ break;
+ }
+
+ *r = (un21 * b + un0 - q0 * v) >> s;
+ return q1 * b + q0;
+#endif
+}*/
+
+// Bitshift a u128 in place, left (signed_shift > 0) or right (signed_shift < 0)
+static inline void libdivide_u128_shift(uint64_t *u1, uint64_t *u0, int32_t signed_shift) {
+ if (signed_shift > 0) {
+ uint32_t shift = signed_shift;
+ *u1 <<= shift;
+ *u1 |= *u0 >> (64 - shift);
+ *u0 <<= shift;
+ }
+ else if (signed_shift < 0) {
+ uint32_t shift = -signed_shift;
+ *u0 >>= shift;
+ *u0 |= *u1 << (64 - shift);
+ *u1 >>= shift;
+ }
+}
+
+// Computes a 128 / 128 -> 64 bit division, with a 128 bit remainder.
+/*static uint64_t libdivide_128_div_128_to_64(uint64_t u_hi, uint64_t u_lo, uint64_t v_hi, uint64_t v_lo, uint64_t *r_hi, uint64_t *r_lo) {
+#if defined(HAS_INT128_T) && \
+ defined(HAS_INT128_DIV)
+ __uint128_t ufull = u_hi;
+ __uint128_t vfull = v_hi;
+ ufull = (ufull << 64) | u_lo;
+ vfull = (vfull << 64) | v_lo;
+ uint64_t res = (uint64_t)(ufull / vfull);
+ __uint128_t remainder = ufull - (vfull * res);
+ *r_lo = (uint64_t)remainder;
+ *r_hi = (uint64_t)(remainder >> 64);
+ return res;
+#else
+ // Adapted from "Unsigned Doubleword Division" in Hacker's Delight
+ // We want to compute u / v
+ typedef struct { uint64_t hi; uint64_t lo; } u128_t;
+ u128_t u = {u_hi, u_lo};
+ u128_t v = {v_hi, v_lo};
+
+ if (v.hi == 0) {
+ // divisor v is a 64 bit value, so we just need one 128/64 division
+ // Note that we are simpler than Hacker's Delight here, because we know
+ // the quotient fits in 64 bits whereas Hacker's Delight demands a full
+ // 128 bit quotient
+ *r_hi = 0;
+ return libdivide_128_div_64_to_64(u.hi, u.lo, v.lo, r_lo);
+ }
+ // Here v >= 2**64
+ // We know that v.hi != 0, so count leading zeros is OK
+ // We have 0 <= n <= 63
+ uint32_t n = libdivide_count_leading_zeros64(v.hi);
+
+ // Normalize the divisor so its MSB is 1
+ u128_t v1t = v;
+ libdivide_u128_shift(&v1t.hi, &v1t.lo, n);
+ uint64_t v1 = v1t.hi; // i.e. v1 = v1t >> 64
+
+ // To ensure no overflow
+ u128_t u1 = u;
+ libdivide_u128_shift(&u1.hi, &u1.lo, -1);
+
+ // Get quotient from divide unsigned insn.
+ uint64_t rem_ignored;
+ uint64_t q1 = libdivide_128_div_64_to_64(u1.hi, u1.lo, v1, &rem_ignored);
+
+ // Undo normalization and division of u by 2.
+ u128_t q0 = {0, q1};
+ libdivide_u128_shift(&q0.hi, &q0.lo, n);
+ libdivide_u128_shift(&q0.hi, &q0.lo, -63);
+
+ // Make q0 correct or too small by 1
+ // Equivalent to `if (q0 != 0) q0 = q0 - 1;`
+ if (q0.hi != 0 || q0.lo != 0) {
+ q0.hi -= (q0.lo == 0); // borrow
+ q0.lo -= 1;
+ }
+
+ // Now q0 is correct.
+ // Compute q0 * v as q0v
+ // = (q0.hi << 64 + q0.lo) * (v.hi << 64 + v.lo)
+ // = (q0.hi * v.hi << 128) + (q0.hi * v.lo << 64) +
+ // (q0.lo * v.hi << 64) + q0.lo * v.lo)
+ // Each term is 128 bit
+ // High half of full product (upper 128 bits!) are dropped
+ u128_t q0v = {0, 0};
+ q0v.hi = q0.hi*v.lo + q0.lo*v.hi + libdivide_mullhi_u64(q0.lo, v.lo);
+ q0v.lo = q0.lo*v.lo;
+
+ // Compute u - q0v as u_q0v
+ // This is the remainder
+ u128_t u_q0v = u;
+ u_q0v.hi -= q0v.hi + (u.lo < q0v.lo); // second term is borrow
+ u_q0v.lo -= q0v.lo;
+
+ // Check if u_q0v >= v
+ // This checks if our remainder is larger than the divisor
+ if ((u_q0v.hi > v.hi) ||
+ (u_q0v.hi == v.hi && u_q0v.lo >= v.lo)) {
+ // Increment q0
+ q0.lo += 1;
+ q0.hi += (q0.lo == 0); // carry
+
+ // Subtract v from remainder
+ u_q0v.hi -= v.hi + (u_q0v.lo < v.lo);
+ u_q0v.lo -= v.lo;
+ }
+
+ *r_hi = u_q0v.hi;
+ *r_lo = u_q0v.lo;
+
+ LIBDIVIDE_ASSERT(q0.hi == 0);
+ return q0.lo;
+#endif
+}*/
+
+////////// UINT32
+
+static inline struct libdivide_u32_t libdivide_internal_u32_gen(uint32_t d, int branchfree) {
+ struct libdivide_u32_t result;
+ uint32_t floor_log_2_d;
+
+ if (d == 0) {
+ LIBDIVIDE_ERROR("divider must be != 0");
+ }
+
+ floor_log_2_d = 31 - libdivide_count_leading_zeros32(d);
+
+ // Power of 2
+ if ((d & (d - 1)) == 0) {
+ // We need to subtract 1 from the shift value in case of an unsigned
+ // branchfree divider because there is a hardcoded right shift by 1
+ // in its division algorithm. Because of this we also need to add back
+ // 1 in its recovery algorithm.
+ result.magic = 0;
+ result.more = (uint8_t)(floor_log_2_d - (branchfree != 0));
+ } else {
+ uint8_t more;
+ uint32_t rem, proposed_m;
+ uint32_t e;
+ proposed_m = libdivide_64_div_32_to_32(1U << floor_log_2_d, 0, d, &rem);
+
+ LIBDIVIDE_ASSERT(rem > 0 && rem < d);
+ e = d - rem;
+
+ // This power works if e < 2**floor_log_2_d.
+ if (!branchfree && (e < (1U << floor_log_2_d))) {
+ // This power works
+ more = floor_log_2_d;
+ } else {
+ // We have to use the general 33-bit algorithm. We need to compute
+ // (2**power) / d. However, we already have (2**(power-1))/d and
+ // its remainder. By doubling both, and then correcting the
+ // remainder, we can compute the larger division.
+ // don't care about overflow here - in fact, we expect it
+ const uint32_t twice_rem = rem + rem;
+ proposed_m += proposed_m;
+ if (twice_rem >= d || twice_rem < rem) proposed_m += 1;
+ more = floor_log_2_d | LIBDIVIDE_ADD_MARKER;
+ }
+ result.magic = 1 + proposed_m;
+ result.more = more;
+ // result.more's shift should in general be ceil_log_2_d. But if we
+ // used the smaller power, we subtract one from the shift because we're
+ // using the smaller power. If we're using the larger power, we
+ // subtract one from the shift because it's taken care of by the add
+ // indicator. So floor_log_2_d happens to be correct in both cases.
+ }
+ return result;
+}
+
+struct libdivide_u32_t libdivide_u32_gen(uint32_t d) {
+ return libdivide_internal_u32_gen(d, 0);
+}
+
+/*struct libdivide_u32_branchfree_t libdivide_u32_branchfree_gen(uint32_t d) {
+ if (d == 1) {
+ LIBDIVIDE_ERROR("branchfree divider must be != 1");
+ }
+ struct libdivide_u32_t tmp = libdivide_internal_u32_gen(d, 1);
+ struct libdivide_u32_branchfree_t ret = {tmp.magic, (uint8_t)(tmp.more & LIBDIVIDE_32_SHIFT_MASK)};
+ return ret;
+}*/
+
+uint32_t libdivide_u32_do(uint32_t numer, const struct libdivide_u32_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return numer >> more;
+ }
+ else {
+ uint32_t q = libdivide_mullhi_u32(denom->magic, numer);
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ uint32_t t = ((numer - q) >> 1) + q;
+ return t >> (more & LIBDIVIDE_32_SHIFT_MASK);
+ }
+ else {
+ // All upper bits are 0,
+ // don't need to mask them off.
+ return q >> more;
+ }
+ }
+}
+
+/*uint32_t libdivide_u32_branchfree_do(uint32_t numer, const struct libdivide_u32_branchfree_t *denom) {
+ uint32_t q = libdivide_mullhi_u32(denom->magic, numer);
+ uint32_t t = ((numer - q) >> 1) + q;
+ return t >> denom->more;
+}
+
+uint32_t libdivide_u32_recover(const struct libdivide_u32_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+
+ if (!denom->magic) {
+ return 1U << shift;
+ } else if (!(more & LIBDIVIDE_ADD_MARKER)) {
+ // We compute q = n/d = n*m / 2^(32 + shift)
+ // Therefore we have d = 2^(32 + shift) / m
+ // We need to ceil it.
+ // We know d is not a power of 2, so m is not a power of 2,
+ // so we can just add 1 to the floor
+ uint32_t hi_dividend = 1U << shift;
+ uint32_t rem_ignored;
+ return 1 + libdivide_64_div_32_to_32(hi_dividend, 0, denom->magic, &rem_ignored);
+ } else {
+ // Here we wish to compute d = 2^(32+shift+1)/(m+2^32).
+ // Notice (m + 2^32) is a 33 bit number. Use 64 bit division for now
+ // Also note that shift may be as high as 31, so shift + 1 will
+ // overflow. So we have to compute it as 2^(32+shift)/(m+2^32), and
+ // then double the quotient and remainder.
+ uint64_t half_n = 1ULL << (32 + shift);
+ uint64_t d = (1ULL << 32) | denom->magic;
+ // Note that the quotient is guaranteed <= 32 bits, but the remainder
+ // may need 33!
+ uint32_t half_q = (uint32_t)(half_n / d);
+ uint64_t rem = half_n % d;
+ // We computed 2^(32+shift)/(m+2^32)
+ // Need to double it, and then add 1 to the quotient if doubling th
+ // remainder would increase the quotient.
+ // Note that rem<<1 cannot overflow, since rem < d and d is 33 bits
+ uint32_t full_q = half_q + half_q + ((rem<<1) >= d);
+
+ // We rounded down in gen (hence +1)
+ return full_q + 1;
+ }
+}
+
+uint32_t libdivide_u32_branchfree_recover(const struct libdivide_u32_branchfree_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+
+ if (!denom->magic) {
+ return 1U << (shift + 1);
+ } else {
+ // Here we wish to compute d = 2^(32+shift+1)/(m+2^32).
+ // Notice (m + 2^32) is a 33 bit number. Use 64 bit division for now
+ // Also note that shift may be as high as 31, so shift + 1 will
+ // overflow. So we have to compute it as 2^(32+shift)/(m+2^32), and
+ // then double the quotient and remainder.
+ uint64_t half_n = 1ULL << (32 + shift);
+ uint64_t d = (1ULL << 32) | denom->magic;
+ // Note that the quotient is guaranteed <= 32 bits, but the remainder
+ // may need 33!
+ uint32_t half_q = (uint32_t)(half_n / d);
+ uint64_t rem = half_n % d;
+ // We computed 2^(32+shift)/(m+2^32)
+ // Need to double it, and then add 1 to the quotient if doubling th
+ // remainder would increase the quotient.
+ // Note that rem<<1 cannot overflow, since rem < d and d is 33 bits
+ uint32_t full_q = half_q + half_q + ((rem<<1) >= d);
+
+ // We rounded down in gen (hence +1)
+ return full_q + 1;
+ }
+}*/
+
+/////////// UINT64
+
+/*static inline struct libdivide_u64_t libdivide_internal_u64_gen(uint64_t d, int branchfree) {
+ if (d == 0) {
+ LIBDIVIDE_ERROR("divider must be != 0");
+ }
+
+ struct libdivide_u64_t result;
+ uint32_t floor_log_2_d = 63 - libdivide_count_leading_zeros64(d);
+
+ // Power of 2
+ if ((d & (d - 1)) == 0) {
+ // We need to subtract 1 from the shift value in case of an unsigned
+ // branchfree divider because there is a hardcoded right shift by 1
+ // in its division algorithm. Because of this we also need to add back
+ // 1 in its recovery algorithm.
+ result.magic = 0;
+ result.more = (uint8_t)(floor_log_2_d - (branchfree != 0));
+ } else {
+ uint64_t proposed_m, rem;
+ uint8_t more;
+ // (1 << (64 + floor_log_2_d)) / d
+ proposed_m = libdivide_128_div_64_to_64(1ULL << floor_log_2_d, 0, d, &rem);
+
+ LIBDIVIDE_ASSERT(rem > 0 && rem < d);
+ const uint64_t e = d - rem;
+
+ // This power works if e < 2**floor_log_2_d.
+ if (!branchfree && e < (1ULL << floor_log_2_d)) {
+ // This power works
+ more = floor_log_2_d;
+ } else {
+ // We have to use the general 65-bit algorithm. We need to compute
+ // (2**power) / d. However, we already have (2**(power-1))/d and
+ // its remainder. By doubling both, and then correcting the
+ // remainder, we can compute the larger division.
+ // don't care about overflow here - in fact, we expect it
+ proposed_m += proposed_m;
+ const uint64_t twice_rem = rem + rem;
+ if (twice_rem >= d || twice_rem < rem) proposed_m += 1;
+ more = floor_log_2_d | LIBDIVIDE_ADD_MARKER;
+ }
+ result.magic = 1 + proposed_m;
+ result.more = more;
+ // result.more's shift should in general be ceil_log_2_d. But if we
+ // used the smaller power, we subtract one from the shift because we're
+ // using the smaller power. If we're using the larger power, we
+ // subtract one from the shift because it's taken care of by the add
+ // indicator. So floor_log_2_d happens to be correct in both cases,
+ // which is why we do it outside of the if statement.
+ }
+ return result;
+}
+
+struct libdivide_u64_t libdivide_u64_gen(uint64_t d) {
+ return libdivide_internal_u64_gen(d, 0);
+}
+
+struct libdivide_u64_branchfree_t libdivide_u64_branchfree_gen(uint64_t d) {
+ if (d == 1) {
+ LIBDIVIDE_ERROR("branchfree divider must be != 1");
+ }
+ struct libdivide_u64_t tmp = libdivide_internal_u64_gen(d, 1);
+ struct libdivide_u64_branchfree_t ret = {tmp.magic, (uint8_t)(tmp.more & LIBDIVIDE_64_SHIFT_MASK)};
+ return ret;
+}
+
+uint64_t libdivide_u64_do(uint64_t numer, const struct libdivide_u64_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return numer >> more;
+ }
+ else {
+ uint64_t q = libdivide_mullhi_u64(denom->magic, numer);
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ uint64_t t = ((numer - q) >> 1) + q;
+ return t >> (more & LIBDIVIDE_64_SHIFT_MASK);
+ }
+ else {
+ // All upper bits are 0,
+ // don't need to mask them off.
+ return q >> more;
+ }
+ }
+}
+
+uint64_t libdivide_u64_branchfree_do(uint64_t numer, const struct libdivide_u64_branchfree_t *denom) {
+ uint64_t q = libdivide_mullhi_u64(denom->magic, numer);
+ uint64_t t = ((numer - q) >> 1) + q;
+ return t >> denom->more;
+}
+
+uint64_t libdivide_u64_recover(const struct libdivide_u64_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+
+ if (!denom->magic) {
+ return 1ULL << shift;
+ } else if (!(more & LIBDIVIDE_ADD_MARKER)) {
+ // We compute q = n/d = n*m / 2^(64 + shift)
+ // Therefore we have d = 2^(64 + shift) / m
+ // We need to ceil it.
+ // We know d is not a power of 2, so m is not a power of 2,
+ // so we can just add 1 to the floor
+ uint64_t hi_dividend = 1ULL << shift;
+ uint64_t rem_ignored;
+ return 1 + libdivide_128_div_64_to_64(hi_dividend, 0, denom->magic, &rem_ignored);
+ } else {
+ // Here we wish to compute d = 2^(64+shift+1)/(m+2^64).
+ // Notice (m + 2^64) is a 65 bit number. This gets hairy. See
+ // libdivide_u32_recover for more on what we do here.
+ // TODO: do something better than 128 bit math
+
+ // Full n is a (potentially) 129 bit value
+ // half_n is a 128 bit value
+ // Compute the hi half of half_n. Low half is 0.
+ uint64_t half_n_hi = 1ULL << shift, half_n_lo = 0;
+ // d is a 65 bit value. The high bit is always set to 1.
+ const uint64_t d_hi = 1, d_lo = denom->magic;
+ // Note that the quotient is guaranteed <= 64 bits,
+ // but the remainder may need 65!
+ uint64_t r_hi, r_lo;
+ uint64_t half_q = libdivide_128_div_128_to_64(half_n_hi, half_n_lo, d_hi, d_lo, &r_hi, &r_lo);
+ // We computed 2^(64+shift)/(m+2^64)
+ // Double the remainder ('dr') and check if that is larger than d
+ // Note that d is a 65 bit value, so r1 is small and so r1 + r1
+ // cannot overflow
+ uint64_t dr_lo = r_lo + r_lo;
+ uint64_t dr_hi = r_hi + r_hi + (dr_lo < r_lo); // last term is carry
+ int dr_exceeds_d = (dr_hi > d_hi) || (dr_hi == d_hi && dr_lo >= d_lo);
+ uint64_t full_q = half_q + half_q + (dr_exceeds_d ? 1 : 0);
+ return full_q + 1;
+ }
+}
+
+uint64_t libdivide_u64_branchfree_recover(const struct libdivide_u64_branchfree_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+
+ if (!denom->magic) {
+ return 1ULL << (shift + 1);
+ } else {
+ // Here we wish to compute d = 2^(64+shift+1)/(m+2^64).
+ // Notice (m + 2^64) is a 65 bit number. This gets hairy. See
+ // libdivide_u32_recover for more on what we do here.
+ // TODO: do something better than 128 bit math
+
+ // Full n is a (potentially) 129 bit value
+ // half_n is a 128 bit value
+ // Compute the hi half of half_n. Low half is 0.
+ uint64_t half_n_hi = 1ULL << shift, half_n_lo = 0;
+ // d is a 65 bit value. The high bit is always set to 1.
+ const uint64_t d_hi = 1, d_lo = denom->magic;
+ // Note that the quotient is guaranteed <= 64 bits,
+ // but the remainder may need 65!
+ uint64_t r_hi, r_lo;
+ uint64_t half_q = libdivide_128_div_128_to_64(half_n_hi, half_n_lo, d_hi, d_lo, &r_hi, &r_lo);
+ // We computed 2^(64+shift)/(m+2^64)
+ // Double the remainder ('dr') and check if that is larger than d
+ // Note that d is a 65 bit value, so r1 is small and so r1 + r1
+ // cannot overflow
+ uint64_t dr_lo = r_lo + r_lo;
+ uint64_t dr_hi = r_hi + r_hi + (dr_lo < r_lo); // last term is carry
+ int dr_exceeds_d = (dr_hi > d_hi) || (dr_hi == d_hi && dr_lo >= d_lo);
+ uint64_t full_q = half_q + half_q + (dr_exceeds_d ? 1 : 0);
+ return full_q + 1;
+ }
+}*/
+
+/////////// SINT32
+
+/*static inline struct libdivide_s32_t libdivide_internal_s32_gen(int32_t d, int branchfree) {
+ if (d == 0) {
+ LIBDIVIDE_ERROR("divider must be != 0");
+ }
+
+ struct libdivide_s32_t result;
+
+ // If d is a power of 2, or negative a power of 2, we have to use a shift.
+ // This is especially important because the magic algorithm fails for -1.
+ // To check if d is a power of 2 or its inverse, it suffices to check
+ // whether its absolute value has exactly one bit set. This works even for
+ // INT_MIN, because abs(INT_MIN) == INT_MIN, and INT_MIN has one bit set
+ // and is a power of 2.
+ uint32_t ud = (uint32_t)d;
+ uint32_t absD = (d < 0) ? -ud : ud;
+ uint32_t floor_log_2_d = 31 - libdivide_count_leading_zeros32(absD);
+ // check if exactly one bit is set,
+ // don't care if absD is 0 since that's divide by zero
+ if ((absD & (absD - 1)) == 0) {
+ // Branchfree and normal paths are exactly the same
+ result.magic = 0;
+ result.more = floor_log_2_d | (d < 0 ? LIBDIVIDE_NEGATIVE_DIVISOR : 0);
+ } else {
+ LIBDIVIDE_ASSERT(floor_log_2_d >= 1);
+
+ uint8_t more;
+ // the dividend here is 2**(floor_log_2_d + 31), so the low 32 bit word
+ // is 0 and the high word is floor_log_2_d - 1
+ uint32_t rem, proposed_m;
+ proposed_m = libdivide_64_div_32_to_32(1U << (floor_log_2_d - 1), 0, absD, &rem);
+ const uint32_t e = absD - rem;
+
+ // We are going to start with a power of floor_log_2_d - 1.
+ // This works if works if e < 2**floor_log_2_d.
+ if (!branchfree && e < (1U << floor_log_2_d)) {
+ // This power works
+ more = floor_log_2_d - 1;
+ } else {
+ // We need to go one higher. This should not make proposed_m
+ // overflow, but it will make it negative when interpreted as an
+ // int32_t.
+ proposed_m += proposed_m;
+ const uint32_t twice_rem = rem + rem;
+ if (twice_rem >= absD || twice_rem < rem) proposed_m += 1;
+ more = floor_log_2_d | LIBDIVIDE_ADD_MARKER;
+ }
+
+ proposed_m += 1;
+ int32_t magic = (int32_t)proposed_m;
+
+ // Mark if we are negative. Note we only negate the magic number in the
+ // branchfull case.
+ if (d < 0) {
+ more |= LIBDIVIDE_NEGATIVE_DIVISOR;
+ if (!branchfree) {
+ magic = -magic;
+ }
+ }
+
+ result.more = more;
+ result.magic = magic;
+ }
+ return result;
+}
+
+struct libdivide_s32_t libdivide_s32_gen(int32_t d) {
+ return libdivide_internal_s32_gen(d, 0);
+}
+
+struct libdivide_s32_branchfree_t libdivide_s32_branchfree_gen(int32_t d) {
+ struct libdivide_s32_t tmp = libdivide_internal_s32_gen(d, 1);
+ struct libdivide_s32_branchfree_t result = {tmp.magic, tmp.more};
+ return result;
+}
+
+int32_t libdivide_s32_do(int32_t numer, const struct libdivide_s32_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+
+ if (!denom->magic) {
+ uint32_t sign = (int8_t)more >> 7;
+ uint32_t mask = (1U << shift) - 1;
+ uint32_t uq = numer + ((numer >> 31) & mask);
+ int32_t q = (int32_t)uq;
+ q >>= shift;
+ q = (q ^ sign) - sign;
+ return q;
+ } else {
+ uint32_t uq = (uint32_t)libdivide_mullhi_s32(denom->magic, numer);
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift and then sign extend
+ int32_t sign = (int8_t)more >> 7;
+ // q += (more < 0 ? -numer : numer)
+ // cast required to avoid UB
+ uq += ((uint32_t)numer ^ sign) - sign;
+ }
+ int32_t q = (int32_t)uq;
+ q >>= shift;
+ q += (q < 0);
+ return q;
+ }
+}
+
+int32_t libdivide_s32_branchfree_do(int32_t numer, const struct libdivide_s32_branchfree_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ // must be arithmetic shift and then sign extend
+ int32_t sign = (int8_t)more >> 7;
+ int32_t magic = denom->magic;
+ int32_t q = libdivide_mullhi_s32(magic, numer);
+ q += numer;
+
+ // If q is non-negative, we have nothing to do
+ // If q is negative, we want to add either (2**shift)-1 if d is a power of
+ // 2, or (2**shift) if it is not a power of 2
+ uint32_t is_power_of_2 = (magic == 0);
+ uint32_t q_sign = (uint32_t)(q >> 31);
+ q += q_sign & ((1U << shift) - is_power_of_2);
+
+ // Now arithmetic right shift
+ q >>= shift;
+ // Negate if needed
+ q = (q ^ sign) - sign;
+
+ return q;
+}
+
+int32_t libdivide_s32_recover(const struct libdivide_s32_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ if (!denom->magic) {
+ uint32_t absD = 1U << shift;
+ if (more & LIBDIVIDE_NEGATIVE_DIVISOR) {
+ absD = -absD;
+ }
+ return (int32_t)absD;
+ } else {
+ // Unsigned math is much easier
+ // We negate the magic number only in the branchfull case, and we don't
+ // know which case we're in. However we have enough information to
+ // determine the correct sign of the magic number. The divisor was
+ // negative if LIBDIVIDE_NEGATIVE_DIVISOR is set. If ADD_MARKER is set,
+ // the magic number's sign is opposite that of the divisor.
+ // We want to compute the positive magic number.
+ int negative_divisor = (more & LIBDIVIDE_NEGATIVE_DIVISOR);
+ int magic_was_negated = (more & LIBDIVIDE_ADD_MARKER)
+ ? denom->magic > 0 : denom->magic < 0;
+
+ // Handle the power of 2 case (including branchfree)
+ if (denom->magic == 0) {
+ int32_t result = 1U << shift;
+ return negative_divisor ? -result : result;
+ }
+
+ uint32_t d = (uint32_t)(magic_was_negated ? -denom->magic : denom->magic);
+ uint64_t n = 1ULL << (32 + shift); // this shift cannot exceed 30
+ uint32_t q = (uint32_t)(n / d);
+ int32_t result = (int32_t)q;
+ result += 1;
+ return negative_divisor ? -result : result;
+ }
+}
+
+int32_t libdivide_s32_branchfree_recover(const struct libdivide_s32_branchfree_t *denom) {
+ return libdivide_s32_recover((const struct libdivide_s32_t *)denom);
+}*/
+
+///////////// SINT64
+
+/*static inline struct libdivide_s64_t libdivide_internal_s64_gen(int64_t d, int branchfree) {
+ if (d == 0) {
+ LIBDIVIDE_ERROR("divider must be != 0");
+ }
+
+ struct libdivide_s64_t result;
+
+ // If d is a power of 2, or negative a power of 2, we have to use a shift.
+ // This is especially important because the magic algorithm fails for -1.
+ // To check if d is a power of 2 or its inverse, it suffices to check
+ // whether its absolute value has exactly one bit set. This works even for
+ // INT_MIN, because abs(INT_MIN) == INT_MIN, and INT_MIN has one bit set
+ // and is a power of 2.
+ uint64_t ud = (uint64_t)d;
+ uint64_t absD = (d < 0) ? -ud : ud;
+ uint32_t floor_log_2_d = 63 - libdivide_count_leading_zeros64(absD);
+ // check if exactly one bit is set,
+ // don't care if absD is 0 since that's divide by zero
+ if ((absD & (absD - 1)) == 0) {
+ // Branchfree and non-branchfree cases are the same
+ result.magic = 0;
+ result.more = floor_log_2_d | (d < 0 ? LIBDIVIDE_NEGATIVE_DIVISOR : 0);
+ } else {
+ // the dividend here is 2**(floor_log_2_d + 63), so the low 64 bit word
+ // is 0 and the high word is floor_log_2_d - 1
+ uint8_t more;
+ uint64_t rem, proposed_m;
+ proposed_m = libdivide_128_div_64_to_64(1ULL << (floor_log_2_d - 1), 0, absD, &rem);
+ const uint64_t e = absD - rem;
+
+ // We are going to start with a power of floor_log_2_d - 1.
+ // This works if works if e < 2**floor_log_2_d.
+ if (!branchfree && e < (1ULL << floor_log_2_d)) {
+ // This power works
+ more = floor_log_2_d - 1;
+ } else {
+ // We need to go one higher. This should not make proposed_m
+ // overflow, but it will make it negative when interpreted as an
+ // int32_t.
+ proposed_m += proposed_m;
+ const uint64_t twice_rem = rem + rem;
+ if (twice_rem >= absD || twice_rem < rem) proposed_m += 1;
+ // note that we only set the LIBDIVIDE_NEGATIVE_DIVISOR bit if we
+ // also set ADD_MARKER this is an annoying optimization that
+ // enables algorithm #4 to avoid the mask. However we always set it
+ // in the branchfree case
+ more = floor_log_2_d | LIBDIVIDE_ADD_MARKER;
+ }
+ proposed_m += 1;
+ int64_t magic = (int64_t)proposed_m;
+
+ // Mark if we are negative
+ if (d < 0) {
+ more |= LIBDIVIDE_NEGATIVE_DIVISOR;
+ if (!branchfree) {
+ magic = -magic;
+ }
+ }
+
+ result.more = more;
+ result.magic = magic;
+ }
+ return result;
+}
+
+struct libdivide_s64_t libdivide_s64_gen(int64_t d) {
+ return libdivide_internal_s64_gen(d, 0);
+}
+
+struct libdivide_s64_branchfree_t libdivide_s64_branchfree_gen(int64_t d) {
+ struct libdivide_s64_t tmp = libdivide_internal_s64_gen(d, 1);
+ struct libdivide_s64_branchfree_t ret = {tmp.magic, tmp.more};
+ return ret;
+}
+
+int64_t libdivide_s64_do(int64_t numer, const struct libdivide_s64_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+
+ if (!denom->magic) { // shift path
+ uint64_t mask = (1ULL << shift) - 1;
+ uint64_t uq = numer + ((numer >> 63) & mask);
+ int64_t q = (int64_t)uq;
+ q >>= shift;
+ // must be arithmetic shift and then sign-extend
+ int64_t sign = (int8_t)more >> 7;
+ q = (q ^ sign) - sign;
+ return q;
+ } else {
+ uint64_t uq = (uint64_t)libdivide_mullhi_s64(denom->magic, numer);
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift and then sign extend
+ int64_t sign = (int8_t)more >> 7;
+ // q += (more < 0 ? -numer : numer)
+ // cast required to avoid UB
+ uq += ((uint64_t)numer ^ sign) - sign;
+ }
+ int64_t q = (int64_t)uq;
+ q >>= shift;
+ q += (q < 0);
+ return q;
+ }
+}
+
+int64_t libdivide_s64_branchfree_do(int64_t numer, const struct libdivide_s64_branchfree_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ // must be arithmetic shift and then sign extend
+ int64_t sign = (int8_t)more >> 7;
+ int64_t magic = denom->magic;
+ int64_t q = libdivide_mullhi_s64(magic, numer);
+ q += numer;
+
+ // If q is non-negative, we have nothing to do.
+ // If q is negative, we want to add either (2**shift)-1 if d is a power of
+ // 2, or (2**shift) if it is not a power of 2.
+ uint64_t is_power_of_2 = (magic == 0);
+ uint64_t q_sign = (uint64_t)(q >> 63);
+ q += q_sign & ((1ULL << shift) - is_power_of_2);
+
+ // Arithmetic right shift
+ q >>= shift;
+ // Negate if needed
+ q = (q ^ sign) - sign;
+
+ return q;
+}
+
+int64_t libdivide_s64_recover(const struct libdivide_s64_t *denom) {
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ if (denom->magic == 0) { // shift path
+ uint64_t absD = 1ULL << shift;
+ if (more & LIBDIVIDE_NEGATIVE_DIVISOR) {
+ absD = -absD;
+ }
+ return (int64_t)absD;
+ } else {
+ // Unsigned math is much easier
+ int negative_divisor = (more & LIBDIVIDE_NEGATIVE_DIVISOR);
+ int magic_was_negated = (more & LIBDIVIDE_ADD_MARKER)
+ ? denom->magic > 0 : denom->magic < 0;
+
+ uint64_t d = (uint64_t)(magic_was_negated ? -denom->magic : denom->magic);
+ uint64_t n_hi = 1ULL << shift, n_lo = 0;
+ uint64_t rem_ignored;
+ uint64_t q = libdivide_128_div_64_to_64(n_hi, n_lo, d, &rem_ignored);
+ int64_t result = (int64_t)(q + 1);
+ if (negative_divisor) {
+ result = -result;
+ }
+ return result;
+ }
+}
+
+int64_t libdivide_s64_branchfree_recover(const struct libdivide_s64_branchfree_t *denom) {
+ return libdivide_s64_recover((const struct libdivide_s64_t *)denom);
+}*/
+
+#if defined(LIBDIVIDE_AVX512)
+
+static inline __m512i libdivide_u32_do_vector(__m512i numers, const struct libdivide_u32_t *denom);
+static inline __m512i libdivide_s32_do_vector(__m512i numers, const struct libdivide_s32_t *denom);
+static inline __m512i libdivide_u64_do_vector(__m512i numers, const struct libdivide_u64_t *denom);
+static inline __m512i libdivide_s64_do_vector(__m512i numers, const struct libdivide_s64_t *denom);
+
+static inline __m512i libdivide_u32_branchfree_do_vector(__m512i numers, const struct libdivide_u32_branchfree_t *denom);
+static inline __m512i libdivide_s32_branchfree_do_vector(__m512i numers, const struct libdivide_s32_branchfree_t *denom);
+static inline __m512i libdivide_u64_branchfree_do_vector(__m512i numers, const struct libdivide_u64_branchfree_t *denom);
+static inline __m512i libdivide_s64_branchfree_do_vector(__m512i numers, const struct libdivide_s64_branchfree_t *denom);
+
+//////// Internal Utility Functions
+
+static inline __m512i libdivide_s64_signbits(__m512i v) {;
+ return _mm512_srai_epi64(v, 63);
+}
+
+static inline __m512i libdivide_s64_shift_right_vector(__m512i v, int amt) {
+ return _mm512_srai_epi64(v, amt);
+}
+
+// Here, b is assumed to contain one 32-bit value repeated.
+static inline __m512i libdivide_mullhi_u32_vector(__m512i a, __m512i b) {
+ __m512i hi_product_0Z2Z = _mm512_srli_epi64(_mm512_mul_epu32(a, b), 32);
+ __m512i a1X3X = _mm512_srli_epi64(a, 32);
+ __m512i mask = _mm512_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0);
+ __m512i hi_product_Z1Z3 = _mm512_and_si512(_mm512_mul_epu32(a1X3X, b), mask);
+ return _mm512_or_si512(hi_product_0Z2Z, hi_product_Z1Z3);
+}
+
+// b is one 32-bit value repeated.
+static inline __m512i libdivide_mullhi_s32_vector(__m512i a, __m512i b) {
+ __m512i hi_product_0Z2Z = _mm512_srli_epi64(_mm512_mul_epi32(a, b), 32);
+ __m512i a1X3X = _mm512_srli_epi64(a, 32);
+ __m512i mask = _mm512_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0);
+ __m512i hi_product_Z1Z3 = _mm512_and_si512(_mm512_mul_epi32(a1X3X, b), mask);
+ return _mm512_or_si512(hi_product_0Z2Z, hi_product_Z1Z3);
+}
+
+// Here, y is assumed to contain one 64-bit value repeated.
+// https://stackoverflow.com/a/28827013
+static inline __m512i libdivide_mullhi_u64_vector(__m512i x, __m512i y) {
+ __m512i lomask = _mm512_set1_epi64(0xffffffff);
+ __m512i xh = _mm512_shuffle_epi32(x, (_MM_PERM_ENUM) 0xB1);
+ __m512i yh = _mm512_shuffle_epi32(y, (_MM_PERM_ENUM) 0xB1);
+ __m512i w0 = _mm512_mul_epu32(x, y);
+ __m512i w1 = _mm512_mul_epu32(x, yh);
+ __m512i w2 = _mm512_mul_epu32(xh, y);
+ __m512i w3 = _mm512_mul_epu32(xh, yh);
+ __m512i w0h = _mm512_srli_epi64(w0, 32);
+ __m512i s1 = _mm512_add_epi64(w1, w0h);
+ __m512i s1l = _mm512_and_si512(s1, lomask);
+ __m512i s1h = _mm512_srli_epi64(s1, 32);
+ __m512i s2 = _mm512_add_epi64(w2, s1l);
+ __m512i s2h = _mm512_srli_epi64(s2, 32);
+ __m512i hi = _mm512_add_epi64(w3, s1h);
+ hi = _mm512_add_epi64(hi, s2h);
+
+ return hi;
+}
+
+// y is one 64-bit value repeated.
+static inline __m512i libdivide_mullhi_s64_vector(__m512i x, __m512i y) {
+ __m512i p = libdivide_mullhi_u64_vector(x, y);
+ __m512i t1 = _mm512_and_si512(libdivide_s64_signbits(x), y);
+ __m512i t2 = _mm512_and_si512(libdivide_s64_signbits(y), x);
+ p = _mm512_sub_epi64(p, t1);
+ p = _mm512_sub_epi64(p, t2);
+ return p;
+}
+
+////////// UINT32
+
+__m512i libdivide_u32_do_vector(__m512i numers, const struct libdivide_u32_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return _mm512_srli_epi32(numers, more);
+ }
+ else {
+ __m512i q = libdivide_mullhi_u32_vector(numers, _mm512_set1_epi32(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // uint32_t t = ((numer - q) >> 1) + q;
+ // return t >> denom->shift;
+ uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ __m512i t = _mm512_add_epi32(_mm512_srli_epi32(_mm512_sub_epi32(numers, q), 1), q);
+ return _mm512_srli_epi32(t, shift);
+ }
+ else {
+ return _mm512_srli_epi32(q, more);
+ }
+ }
+}
+
+__m512i libdivide_u32_branchfree_do_vector(__m512i numers, const struct libdivide_u32_branchfree_t *denom) {
+ __m512i q = libdivide_mullhi_u32_vector(numers, _mm512_set1_epi32(denom->magic));
+ __m512i t = _mm512_add_epi32(_mm512_srli_epi32(_mm512_sub_epi32(numers, q), 1), q);
+ return _mm512_srli_epi32(t, denom->more);
+}
+
+////////// UINT64
+
+__m512i libdivide_u64_do_vector(__m512i numers, const struct libdivide_u64_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return _mm512_srli_epi64(numers, more);
+ }
+ else {
+ __m512i q = libdivide_mullhi_u64_vector(numers, _mm512_set1_epi64(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // uint32_t t = ((numer - q) >> 1) + q;
+ // return t >> denom->shift;
+ uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ __m512i t = _mm512_add_epi64(_mm512_srli_epi64(_mm512_sub_epi64(numers, q), 1), q);
+ return _mm512_srli_epi64(t, shift);
+ }
+ else {
+ return _mm512_srli_epi64(q, more);
+ }
+ }
+}
+
+__m512i libdivide_u64_branchfree_do_vector(__m512i numers, const struct libdivide_u64_branchfree_t *denom) {
+ __m512i q = libdivide_mullhi_u64_vector(numers, _mm512_set1_epi64(denom->magic));
+ __m512i t = _mm512_add_epi64(_mm512_srli_epi64(_mm512_sub_epi64(numers, q), 1), q);
+ return _mm512_srli_epi64(t, denom->more);
+}
+
+////////// SINT32
+
+__m512i libdivide_s32_do_vector(__m512i numers, const struct libdivide_s32_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ uint32_t mask = (1U << shift) - 1;
+ __m512i roundToZeroTweak = _mm512_set1_epi32(mask);
+ // q = numer + ((numer >> 31) & roundToZeroTweak);
+ __m512i q = _mm512_add_epi32(numers, _mm512_and_si512(_mm512_srai_epi32(numers, 31), roundToZeroTweak));
+ q = _mm512_srai_epi32(q, shift);
+ __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
+ // q = (q ^ sign) - sign;
+ q = _mm512_sub_epi32(_mm512_xor_si512(q, sign), sign);
+ return q;
+ }
+ else {
+ __m512i q = libdivide_mullhi_s32_vector(numers, _mm512_set1_epi32(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift
+ __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
+ // q += ((numer ^ sign) - sign);
+ q = _mm512_add_epi32(q, _mm512_sub_epi32(_mm512_xor_si512(numers, sign), sign));
+ }
+ // q >>= shift
+ q = _mm512_srai_epi32(q, more & LIBDIVIDE_32_SHIFT_MASK);
+ q = _mm512_add_epi32(q, _mm512_srli_epi32(q, 31)); // q += (q < 0)
+ return q;
+ }
+}
+
+__m512i libdivide_s32_branchfree_do_vector(__m512i numers, const struct libdivide_s32_branchfree_t *denom) {
+ int32_t magic = denom->magic;
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ // must be arithmetic shift
+ __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
+ __m512i q = libdivide_mullhi_s32_vector(numers, _mm512_set1_epi32(magic));
+ q = _mm512_add_epi32(q, numers); // q += numers
+
+ // If q is non-negative, we have nothing to do
+ // If q is negative, we want to add either (2**shift)-1 if d is
+ // a power of 2, or (2**shift) if it is not a power of 2
+ uint32_t is_power_of_2 = (magic == 0);
+ __m512i q_sign = _mm512_srai_epi32(q, 31); // q_sign = q >> 31
+ __m512i mask = _mm512_set1_epi32((1U << shift) - is_power_of_2);
+ q = _mm512_add_epi32(q, _mm512_and_si512(q_sign, mask)); // q = q + (q_sign & mask)
+ q = _mm512_srai_epi32(q, shift); // q >>= shift
+ q = _mm512_sub_epi32(_mm512_xor_si512(q, sign), sign); // q = (q ^ sign) - sign
+ return q;
+}
+
+////////// SINT64
+
+__m512i libdivide_s64_do_vector(__m512i numers, const struct libdivide_s64_t *denom) {
+ uint8_t more = denom->more;
+ int64_t magic = denom->magic;
+ if (magic == 0) { // shift path
+ uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ uint64_t mask = (1ULL << shift) - 1;
+ __m512i roundToZeroTweak = _mm512_set1_epi64(mask);
+ // q = numer + ((numer >> 63) & roundToZeroTweak);
+ __m512i q = _mm512_add_epi64(numers, _mm512_and_si512(libdivide_s64_signbits(numers), roundToZeroTweak));
+ q = libdivide_s64_shift_right_vector(q, shift);
+ __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
+ // q = (q ^ sign) - sign;
+ q = _mm512_sub_epi64(_mm512_xor_si512(q, sign), sign);
+ return q;
+ }
+ else {
+ __m512i q = libdivide_mullhi_s64_vector(numers, _mm512_set1_epi64(magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift
+ __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
+ // q += ((numer ^ sign) - sign);
+ q = _mm512_add_epi64(q, _mm512_sub_epi64(_mm512_xor_si512(numers, sign), sign));
+ }
+ // q >>= denom->mult_path.shift
+ q = libdivide_s64_shift_right_vector(q, more & LIBDIVIDE_64_SHIFT_MASK);
+ q = _mm512_add_epi64(q, _mm512_srli_epi64(q, 63)); // q += (q < 0)
+ return q;
+ }
+}
+
+__m512i libdivide_s64_branchfree_do_vector(__m512i numers, const struct libdivide_s64_branchfree_t *denom) {
+ int64_t magic = denom->magic;
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ // must be arithmetic shift
+ __m512i sign = _mm512_set1_epi32((int8_t)more >> 7);
+
+ // libdivide_mullhi_s64(numers, magic);
+ __m512i q = libdivide_mullhi_s64_vector(numers, _mm512_set1_epi64(magic));
+ q = _mm512_add_epi64(q, numers); // q += numers
+
+ // If q is non-negative, we have nothing to do.
+ // If q is negative, we want to add either (2**shift)-1 if d is
+ // a power of 2, or (2**shift) if it is not a power of 2.
+ uint32_t is_power_of_2 = (magic == 0);
+ __m512i q_sign = libdivide_s64_signbits(q); // q_sign = q >> 63
+ __m512i mask = _mm512_set1_epi64((1ULL << shift) - is_power_of_2);
+ q = _mm512_add_epi64(q, _mm512_and_si512(q_sign, mask)); // q = q + (q_sign & mask)
+ q = libdivide_s64_shift_right_vector(q, shift); // q >>= shift
+ q = _mm512_sub_epi64(_mm512_xor_si512(q, sign), sign); // q = (q ^ sign) - sign
+ return q;
+}
+
+#elif defined(LIBDIVIDE_AVX2)
+
+static inline __m256i libdivide_u32_do_vector(__m256i numers, const struct libdivide_u32_t *denom);
+static inline __m256i libdivide_s32_do_vector(__m256i numers, const struct libdivide_s32_t *denom);
+static inline __m256i libdivide_u64_do_vector(__m256i numers, const struct libdivide_u64_t *denom);
+static inline __m256i libdivide_s64_do_vector(__m256i numers, const struct libdivide_s64_t *denom);
+
+static inline __m256i libdivide_u32_branchfree_do_vector(__m256i numers, const struct libdivide_u32_branchfree_t *denom);
+static inline __m256i libdivide_s32_branchfree_do_vector(__m256i numers, const struct libdivide_s32_branchfree_t *denom);
+static inline __m256i libdivide_u64_branchfree_do_vector(__m256i numers, const struct libdivide_u64_branchfree_t *denom);
+static inline __m256i libdivide_s64_branchfree_do_vector(__m256i numers, const struct libdivide_s64_branchfree_t *denom);
+
+//////// Internal Utility Functions
+
+// Implementation of _mm256_srai_epi64(v, 63) (from AVX512).
+static inline __m256i libdivide_s64_signbits(__m256i v) {
+ __m256i hiBitsDuped = _mm256_shuffle_epi32(v, _MM_SHUFFLE(3, 3, 1, 1));
+ __m256i signBits = _mm256_srai_epi32(hiBitsDuped, 31);
+ return signBits;
+}
+
+// Implementation of _mm256_srai_epi64 (from AVX512).
+static inline __m256i libdivide_s64_shift_right_vector(__m256i v, int amt) {
+ const int b = 64 - amt;
+ __m256i m = _mm256_set1_epi64x(1ULL << (b - 1));
+ __m256i x = _mm256_srli_epi64(v, amt);
+ __m256i result = _mm256_sub_epi64(_mm256_xor_si256(x, m), m);
+ return result;
+}
+
+// Here, b is assumed to contain one 32-bit value repeated.
+static inline __m256i libdivide_mullhi_u32_vector(__m256i a, __m256i b) {
+ __m256i hi_product_0Z2Z = _mm256_srli_epi64(_mm256_mul_epu32(a, b), 32);
+ __m256i a1X3X = _mm256_srli_epi64(a, 32);
+ __m256i mask = _mm256_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0);
+ __m256i hi_product_Z1Z3 = _mm256_and_si256(_mm256_mul_epu32(a1X3X, b), mask);
+ return _mm256_or_si256(hi_product_0Z2Z, hi_product_Z1Z3);
+}
+
+// b is one 32-bit value repeated.
+static inline __m256i libdivide_mullhi_s32_vector(__m256i a, __m256i b) {
+ __m256i hi_product_0Z2Z = _mm256_srli_epi64(_mm256_mul_epi32(a, b), 32);
+ __m256i a1X3X = _mm256_srli_epi64(a, 32);
+ __m256i mask = _mm256_set_epi32(-1, 0, -1, 0, -1, 0, -1, 0);
+ __m256i hi_product_Z1Z3 = _mm256_and_si256(_mm256_mul_epi32(a1X3X, b), mask);
+ return _mm256_or_si256(hi_product_0Z2Z, hi_product_Z1Z3);
+}
+
+// Here, y is assumed to contain one 64-bit value repeated.
+// https://stackoverflow.com/a/28827013
+static inline __m256i libdivide_mullhi_u64_vector(__m256i x, __m256i y) {
+ __m256i lomask = _mm256_set1_epi64x(0xffffffff);
+ __m256i xh = _mm256_shuffle_epi32(x, 0xB1); // x0l, x0h, x1l, x1h
+ __m256i yh = _mm256_shuffle_epi32(y, 0xB1); // y0l, y0h, y1l, y1h
+ __m256i w0 = _mm256_mul_epu32(x, y); // x0l*y0l, x1l*y1l
+ __m256i w1 = _mm256_mul_epu32(x, yh); // x0l*y0h, x1l*y1h
+ __m256i w2 = _mm256_mul_epu32(xh, y); // x0h*y0l, x1h*y0l
+ __m256i w3 = _mm256_mul_epu32(xh, yh); // x0h*y0h, x1h*y1h
+ __m256i w0h = _mm256_srli_epi64(w0, 32);
+ __m256i s1 = _mm256_add_epi64(w1, w0h);
+ __m256i s1l = _mm256_and_si256(s1, lomask);
+ __m256i s1h = _mm256_srli_epi64(s1, 32);
+ __m256i s2 = _mm256_add_epi64(w2, s1l);
+ __m256i s2h = _mm256_srli_epi64(s2, 32);
+ __m256i hi = _mm256_add_epi64(w3, s1h);
+ hi = _mm256_add_epi64(hi, s2h);
+
+ return hi;
+}
+
+// y is one 64-bit value repeated.
+static inline __m256i libdivide_mullhi_s64_vector(__m256i x, __m256i y) {
+ __m256i p = libdivide_mullhi_u64_vector(x, y);
+ __m256i t1 = _mm256_and_si256(libdivide_s64_signbits(x), y);
+ __m256i t2 = _mm256_and_si256(libdivide_s64_signbits(y), x);
+ p = _mm256_sub_epi64(p, t1);
+ p = _mm256_sub_epi64(p, t2);
+ return p;
+}
+
+////////// UINT32
+
+__m256i libdivide_u32_do_vector(__m256i numers, const struct libdivide_u32_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return _mm256_srli_epi32(numers, more);
+ }
+ else {
+ __m256i q = libdivide_mullhi_u32_vector(numers, _mm256_set1_epi32(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // uint32_t t = ((numer - q) >> 1) + q;
+ // return t >> denom->shift;
+ uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ __m256i t = _mm256_add_epi32(_mm256_srli_epi32(_mm256_sub_epi32(numers, q), 1), q);
+ return _mm256_srli_epi32(t, shift);
+ }
+ else {
+ return _mm256_srli_epi32(q, more);
+ }
+ }
+}
+
+__m256i libdivide_u32_branchfree_do_vector(__m256i numers, const struct libdivide_u32_branchfree_t *denom) {
+ __m256i q = libdivide_mullhi_u32_vector(numers, _mm256_set1_epi32(denom->magic));
+ __m256i t = _mm256_add_epi32(_mm256_srli_epi32(_mm256_sub_epi32(numers, q), 1), q);
+ return _mm256_srli_epi32(t, denom->more);
+}
+
+////////// UINT64
+
+__m256i libdivide_u64_do_vector(__m256i numers, const struct libdivide_u64_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return _mm256_srli_epi64(numers, more);
+ }
+ else {
+ __m256i q = libdivide_mullhi_u64_vector(numers, _mm256_set1_epi64x(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // uint32_t t = ((numer - q) >> 1) + q;
+ // return t >> denom->shift;
+ uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ __m256i t = _mm256_add_epi64(_mm256_srli_epi64(_mm256_sub_epi64(numers, q), 1), q);
+ return _mm256_srli_epi64(t, shift);
+ }
+ else {
+ return _mm256_srli_epi64(q, more);
+ }
+ }
+}
+
+__m256i libdivide_u64_branchfree_do_vector(__m256i numers, const struct libdivide_u64_branchfree_t *denom) {
+ __m256i q = libdivide_mullhi_u64_vector(numers, _mm256_set1_epi64x(denom->magic));
+ __m256i t = _mm256_add_epi64(_mm256_srli_epi64(_mm256_sub_epi64(numers, q), 1), q);
+ return _mm256_srli_epi64(t, denom->more);
+}
+
+////////// SINT32
+
+__m256i libdivide_s32_do_vector(__m256i numers, const struct libdivide_s32_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ uint32_t mask = (1U << shift) - 1;
+ __m256i roundToZeroTweak = _mm256_set1_epi32(mask);
+ // q = numer + ((numer >> 31) & roundToZeroTweak);
+ __m256i q = _mm256_add_epi32(numers, _mm256_and_si256(_mm256_srai_epi32(numers, 31), roundToZeroTweak));
+ q = _mm256_srai_epi32(q, shift);
+ __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
+ // q = (q ^ sign) - sign;
+ q = _mm256_sub_epi32(_mm256_xor_si256(q, sign), sign);
+ return q;
+ }
+ else {
+ __m256i q = libdivide_mullhi_s32_vector(numers, _mm256_set1_epi32(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift
+ __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
+ // q += ((numer ^ sign) - sign);
+ q = _mm256_add_epi32(q, _mm256_sub_epi32(_mm256_xor_si256(numers, sign), sign));
+ }
+ // q >>= shift
+ q = _mm256_srai_epi32(q, more & LIBDIVIDE_32_SHIFT_MASK);
+ q = _mm256_add_epi32(q, _mm256_srli_epi32(q, 31)); // q += (q < 0)
+ return q;
+ }
+}
+
+__m256i libdivide_s32_branchfree_do_vector(__m256i numers, const struct libdivide_s32_branchfree_t *denom) {
+ int32_t magic = denom->magic;
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ // must be arithmetic shift
+ __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
+ __m256i q = libdivide_mullhi_s32_vector(numers, _mm256_set1_epi32(magic));
+ q = _mm256_add_epi32(q, numers); // q += numers
+
+ // If q is non-negative, we have nothing to do
+ // If q is negative, we want to add either (2**shift)-1 if d is
+ // a power of 2, or (2**shift) if it is not a power of 2
+ uint32_t is_power_of_2 = (magic == 0);
+ __m256i q_sign = _mm256_srai_epi32(q, 31); // q_sign = q >> 31
+ __m256i mask = _mm256_set1_epi32((1U << shift) - is_power_of_2);
+ q = _mm256_add_epi32(q, _mm256_and_si256(q_sign, mask)); // q = q + (q_sign & mask)
+ q = _mm256_srai_epi32(q, shift); // q >>= shift
+ q = _mm256_sub_epi32(_mm256_xor_si256(q, sign), sign); // q = (q ^ sign) - sign
+ return q;
+}
+
+////////// SINT64
+
+__m256i libdivide_s64_do_vector(__m256i numers, const struct libdivide_s64_t *denom) {
+ uint8_t more = denom->more;
+ int64_t magic = denom->magic;
+ if (magic == 0) { // shift path
+ uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ uint64_t mask = (1ULL << shift) - 1;
+ __m256i roundToZeroTweak = _mm256_set1_epi64x(mask);
+ // q = numer + ((numer >> 63) & roundToZeroTweak);
+ __m256i q = _mm256_add_epi64(numers, _mm256_and_si256(libdivide_s64_signbits(numers), roundToZeroTweak));
+ q = libdivide_s64_shift_right_vector(q, shift);
+ __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
+ // q = (q ^ sign) - sign;
+ q = _mm256_sub_epi64(_mm256_xor_si256(q, sign), sign);
+ return q;
+ }
+ else {
+ __m256i q = libdivide_mullhi_s64_vector(numers, _mm256_set1_epi64x(magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift
+ __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
+ // q += ((numer ^ sign) - sign);
+ q = _mm256_add_epi64(q, _mm256_sub_epi64(_mm256_xor_si256(numers, sign), sign));
+ }
+ // q >>= denom->mult_path.shift
+ q = libdivide_s64_shift_right_vector(q, more & LIBDIVIDE_64_SHIFT_MASK);
+ q = _mm256_add_epi64(q, _mm256_srli_epi64(q, 63)); // q += (q < 0)
+ return q;
+ }
+}
+
+__m256i libdivide_s64_branchfree_do_vector(__m256i numers, const struct libdivide_s64_branchfree_t *denom) {
+ int64_t magic = denom->magic;
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ // must be arithmetic shift
+ __m256i sign = _mm256_set1_epi32((int8_t)more >> 7);
+
+ // libdivide_mullhi_s64(numers, magic);
+ __m256i q = libdivide_mullhi_s64_vector(numers, _mm256_set1_epi64x(magic));
+ q = _mm256_add_epi64(q, numers); // q += numers
+
+ // If q is non-negative, we have nothing to do.
+ // If q is negative, we want to add either (2**shift)-1 if d is
+ // a power of 2, or (2**shift) if it is not a power of 2.
+ uint32_t is_power_of_2 = (magic == 0);
+ __m256i q_sign = libdivide_s64_signbits(q); // q_sign = q >> 63
+ __m256i mask = _mm256_set1_epi64x((1ULL << shift) - is_power_of_2);
+ q = _mm256_add_epi64(q, _mm256_and_si256(q_sign, mask)); // q = q + (q_sign & mask)
+ q = libdivide_s64_shift_right_vector(q, shift); // q >>= shift
+ q = _mm256_sub_epi64(_mm256_xor_si256(q, sign), sign); // q = (q ^ sign) - sign
+ return q;
+}
+
+#elif defined(LIBDIVIDE_SSE2)
+
+static inline __m128i libdivide_u32_do_vector(__m128i numers, const struct libdivide_u32_t *denom);
+static inline __m128i libdivide_s32_do_vector(__m128i numers, const struct libdivide_s32_t *denom);
+static inline __m128i libdivide_u64_do_vector(__m128i numers, const struct libdivide_u64_t *denom);
+static inline __m128i libdivide_s64_do_vector(__m128i numers, const struct libdivide_s64_t *denom);
+
+static inline __m128i libdivide_u32_branchfree_do_vector(__m128i numers, const struct libdivide_u32_branchfree_t *denom);
+static inline __m128i libdivide_s32_branchfree_do_vector(__m128i numers, const struct libdivide_s32_branchfree_t *denom);
+static inline __m128i libdivide_u64_branchfree_do_vector(__m128i numers, const struct libdivide_u64_branchfree_t *denom);
+static inline __m128i libdivide_s64_branchfree_do_vector(__m128i numers, const struct libdivide_s64_branchfree_t *denom);
+
+//////// Internal Utility Functions
+
+// Implementation of _mm_srai_epi64(v, 63) (from AVX512).
+static inline __m128i libdivide_s64_signbits(__m128i v) {
+ __m128i hiBitsDuped = _mm_shuffle_epi32(v, _MM_SHUFFLE(3, 3, 1, 1));
+ __m128i signBits = _mm_srai_epi32(hiBitsDuped, 31);
+ return signBits;
+}
+
+// Implementation of _mm_srai_epi64 (from AVX512).
+static inline __m128i libdivide_s64_shift_right_vector(__m128i v, int amt) {
+ const int b = 64 - amt;
+ __m128i m = _mm_set1_epi64x(1ULL << (b - 1));
+ __m128i x = _mm_srli_epi64(v, amt);
+ __m128i result = _mm_sub_epi64(_mm_xor_si128(x, m), m);
+ return result;
+}
+
+// Here, b is assumed to contain one 32-bit value repeated.
+static inline __m128i libdivide_mullhi_u32_vector(__m128i a, __m128i b) {
+ __m128i hi_product_0Z2Z = _mm_srli_epi64(_mm_mul_epu32(a, b), 32);
+ __m128i a1X3X = _mm_srli_epi64(a, 32);
+ __m128i mask = _mm_set_epi32(-1, 0, -1, 0);
+ __m128i hi_product_Z1Z3 = _mm_and_si128(_mm_mul_epu32(a1X3X, b), mask);
+ return _mm_or_si128(hi_product_0Z2Z, hi_product_Z1Z3);
+}
+
+// SSE2 does not have a signed multiplication instruction, but we can convert
+// unsigned to signed pretty efficiently. Again, b is just a 32 bit value
+// repeated four times.
+static inline __m128i libdivide_mullhi_s32_vector(__m128i a, __m128i b) {
+ __m128i p = libdivide_mullhi_u32_vector(a, b);
+ // t1 = (a >> 31) & y, arithmetic shift
+ __m128i t1 = _mm_and_si128(_mm_srai_epi32(a, 31), b);
+ __m128i t2 = _mm_and_si128(_mm_srai_epi32(b, 31), a);
+ p = _mm_sub_epi32(p, t1);
+ p = _mm_sub_epi32(p, t2);
+ return p;
+}
+
+// Here, y is assumed to contain one 64-bit value repeated.
+// https://stackoverflow.com/a/28827013
+static inline __m128i libdivide_mullhi_u64_vector(__m128i x, __m128i y) {
+ __m128i lomask = _mm_set1_epi64x(0xffffffff);
+ __m128i xh = _mm_shuffle_epi32(x, 0xB1); // x0l, x0h, x1l, x1h
+ __m128i yh = _mm_shuffle_epi32(y, 0xB1); // y0l, y0h, y1l, y1h
+ __m128i w0 = _mm_mul_epu32(x, y); // x0l*y0l, x1l*y1l
+ __m128i w1 = _mm_mul_epu32(x, yh); // x0l*y0h, x1l*y1h
+ __m128i w2 = _mm_mul_epu32(xh, y); // x0h*y0l, x1h*y0l
+ __m128i w3 = _mm_mul_epu32(xh, yh); // x0h*y0h, x1h*y1h
+ __m128i w0h = _mm_srli_epi64(w0, 32);
+ __m128i s1 = _mm_add_epi64(w1, w0h);
+ __m128i s1l = _mm_and_si128(s1, lomask);
+ __m128i s1h = _mm_srli_epi64(s1, 32);
+ __m128i s2 = _mm_add_epi64(w2, s1l);
+ __m128i s2h = _mm_srli_epi64(s2, 32);
+ __m128i hi = _mm_add_epi64(w3, s1h);
+ hi = _mm_add_epi64(hi, s2h);
+
+ return hi;
+}
+
+// y is one 64-bit value repeated.
+static inline __m128i libdivide_mullhi_s64_vector(__m128i x, __m128i y) {
+ __m128i p = libdivide_mullhi_u64_vector(x, y);
+ __m128i t1 = _mm_and_si128(libdivide_s64_signbits(x), y);
+ __m128i t2 = _mm_and_si128(libdivide_s64_signbits(y), x);
+ p = _mm_sub_epi64(p, t1);
+ p = _mm_sub_epi64(p, t2);
+ return p;
+}
+
+////////// UINT32
+
+__m128i libdivide_u32_do_vector(__m128i numers, const struct libdivide_u32_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return _mm_srli_epi32(numers, more);
+ }
+ else {
+ __m128i q = libdivide_mullhi_u32_vector(numers, _mm_set1_epi32(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // uint32_t t = ((numer - q) >> 1) + q;
+ // return t >> denom->shift;
+ uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ __m128i t = _mm_add_epi32(_mm_srli_epi32(_mm_sub_epi32(numers, q), 1), q);
+ return _mm_srli_epi32(t, shift);
+ }
+ else {
+ return _mm_srli_epi32(q, more);
+ }
+ }
+}
+
+__m128i libdivide_u32_branchfree_do_vector(__m128i numers, const struct libdivide_u32_branchfree_t *denom) {
+ __m128i q = libdivide_mullhi_u32_vector(numers, _mm_set1_epi32(denom->magic));
+ __m128i t = _mm_add_epi32(_mm_srli_epi32(_mm_sub_epi32(numers, q), 1), q);
+ return _mm_srli_epi32(t, denom->more);
+}
+
+////////// UINT64
+
+__m128i libdivide_u64_do_vector(__m128i numers, const struct libdivide_u64_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ return _mm_srli_epi64(numers, more);
+ }
+ else {
+ __m128i q = libdivide_mullhi_u64_vector(numers, _mm_set1_epi64x(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // uint32_t t = ((numer - q) >> 1) + q;
+ // return t >> denom->shift;
+ uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ __m128i t = _mm_add_epi64(_mm_srli_epi64(_mm_sub_epi64(numers, q), 1), q);
+ return _mm_srli_epi64(t, shift);
+ }
+ else {
+ return _mm_srli_epi64(q, more);
+ }
+ }
+}
+
+__m128i libdivide_u64_branchfree_do_vector(__m128i numers, const struct libdivide_u64_branchfree_t *denom) {
+ __m128i q = libdivide_mullhi_u64_vector(numers, _mm_set1_epi64x(denom->magic));
+ __m128i t = _mm_add_epi64(_mm_srli_epi64(_mm_sub_epi64(numers, q), 1), q);
+ return _mm_srli_epi64(t, denom->more);
+}
+
+////////// SINT32
+
+__m128i libdivide_s32_do_vector(__m128i numers, const struct libdivide_s32_t *denom) {
+ uint8_t more = denom->more;
+ if (!denom->magic) {
+ uint32_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ uint32_t mask = (1U << shift) - 1;
+ __m128i roundToZeroTweak = _mm_set1_epi32(mask);
+ // q = numer + ((numer >> 31) & roundToZeroTweak);
+ __m128i q = _mm_add_epi32(numers, _mm_and_si128(_mm_srai_epi32(numers, 31), roundToZeroTweak));
+ q = _mm_srai_epi32(q, shift);
+ __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
+ // q = (q ^ sign) - sign;
+ q = _mm_sub_epi32(_mm_xor_si128(q, sign), sign);
+ return q;
+ }
+ else {
+ __m128i q = libdivide_mullhi_s32_vector(numers, _mm_set1_epi32(denom->magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift
+ __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
+ // q += ((numer ^ sign) - sign);
+ q = _mm_add_epi32(q, _mm_sub_epi32(_mm_xor_si128(numers, sign), sign));
+ }
+ // q >>= shift
+ q = _mm_srai_epi32(q, more & LIBDIVIDE_32_SHIFT_MASK);
+ q = _mm_add_epi32(q, _mm_srli_epi32(q, 31)); // q += (q < 0)
+ return q;
+ }
+}
+
+__m128i libdivide_s32_branchfree_do_vector(__m128i numers, const struct libdivide_s32_branchfree_t *denom) {
+ int32_t magic = denom->magic;
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_32_SHIFT_MASK;
+ // must be arithmetic shift
+ __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
+ __m128i q = libdivide_mullhi_s32_vector(numers, _mm_set1_epi32(magic));
+ q = _mm_add_epi32(q, numers); // q += numers
+
+ // If q is non-negative, we have nothing to do
+ // If q is negative, we want to add either (2**shift)-1 if d is
+ // a power of 2, or (2**shift) if it is not a power of 2
+ uint32_t is_power_of_2 = (magic == 0);
+ __m128i q_sign = _mm_srai_epi32(q, 31); // q_sign = q >> 31
+ __m128i mask = _mm_set1_epi32((1U << shift) - is_power_of_2);
+ q = _mm_add_epi32(q, _mm_and_si128(q_sign, mask)); // q = q + (q_sign & mask)
+ q = _mm_srai_epi32(q, shift); // q >>= shift
+ q = _mm_sub_epi32(_mm_xor_si128(q, sign), sign); // q = (q ^ sign) - sign
+ return q;
+}
+
+////////// SINT64
+
+__m128i libdivide_s64_do_vector(__m128i numers, const struct libdivide_s64_t *denom) {
+ uint8_t more = denom->more;
+ int64_t magic = denom->magic;
+ if (magic == 0) { // shift path
+ uint32_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ uint64_t mask = (1ULL << shift) - 1;
+ __m128i roundToZeroTweak = _mm_set1_epi64x(mask);
+ // q = numer + ((numer >> 63) & roundToZeroTweak);
+ __m128i q = _mm_add_epi64(numers, _mm_and_si128(libdivide_s64_signbits(numers), roundToZeroTweak));
+ q = libdivide_s64_shift_right_vector(q, shift);
+ __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
+ // q = (q ^ sign) - sign;
+ q = _mm_sub_epi64(_mm_xor_si128(q, sign), sign);
+ return q;
+ }
+ else {
+ __m128i q = libdivide_mullhi_s64_vector(numers, _mm_set1_epi64x(magic));
+ if (more & LIBDIVIDE_ADD_MARKER) {
+ // must be arithmetic shift
+ __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
+ // q += ((numer ^ sign) - sign);
+ q = _mm_add_epi64(q, _mm_sub_epi64(_mm_xor_si128(numers, sign), sign));
+ }
+ // q >>= denom->mult_path.shift
+ q = libdivide_s64_shift_right_vector(q, more & LIBDIVIDE_64_SHIFT_MASK);
+ q = _mm_add_epi64(q, _mm_srli_epi64(q, 63)); // q += (q < 0)
+ return q;
+ }
+}
+
+__m128i libdivide_s64_branchfree_do_vector(__m128i numers, const struct libdivide_s64_branchfree_t *denom) {
+ int64_t magic = denom->magic;
+ uint8_t more = denom->more;
+ uint8_t shift = more & LIBDIVIDE_64_SHIFT_MASK;
+ // must be arithmetic shift
+ __m128i sign = _mm_set1_epi32((int8_t)more >> 7);
+
+ // libdivide_mullhi_s64(numers, magic);
+ __m128i q = libdivide_mullhi_s64_vector(numers, _mm_set1_epi64x(magic));
+ q = _mm_add_epi64(q, numers); // q += numers
+
+ // If q is non-negative, we have nothing to do.
+ // If q is negative, we want to add either (2**shift)-1 if d is
+ // a power of 2, or (2**shift) if it is not a power of 2.
+ uint32_t is_power_of_2 = (magic == 0);
+ __m128i q_sign = libdivide_s64_signbits(q); // q_sign = q >> 63
+ __m128i mask = _mm_set1_epi64x((1ULL << shift) - is_power_of_2);
+ q = _mm_add_epi64(q, _mm_and_si128(q_sign, mask)); // q = q + (q_sign & mask)
+ q = libdivide_s64_shift_right_vector(q, shift); // q >>= shift
+ q = _mm_sub_epi64(_mm_xor_si128(q, sign), sign); // q = (q ^ sign) - sign
+ return q;
+}
+
+#endif
+
+/////////// C++ stuff
+
+#ifdef __cplusplus
+
+// The C++ divider class is templated on both an integer type
+// (like uint64_t) and an algorithm type.
+// * BRANCHFULL is the default algorithm type.
+// * BRANCHFREE is the branchfree algorithm type.
+enum {
+ BRANCHFULL,
+ BRANCHFREE
+};
+
+#if defined(LIBDIVIDE_AVX512)
+ #define LIBDIVIDE_VECTOR_TYPE __m512i
+#elif defined(LIBDIVIDE_AVX2)
+ #define LIBDIVIDE_VECTOR_TYPE __m256i
+#elif defined(LIBDIVIDE_SSE2)
+ #define LIBDIVIDE_VECTOR_TYPE __m128i
+#endif
+
+#if !defined(LIBDIVIDE_VECTOR_TYPE)
+ #define LIBDIVIDE_DIVIDE_VECTOR(ALGO)
+#else
+ #define LIBDIVIDE_DIVIDE_VECTOR(ALGO) \
+ LIBDIVIDE_VECTOR_TYPE divide(LIBDIVIDE_VECTOR_TYPE n) const { \
+ return libdivide_##ALGO##_do_vector(n, &denom); \
+ }
+#endif
+
+// The DISPATCHER_GEN() macro generates C++ methods (for the given integer
+// and algorithm types) that redirect to libdivide's C API.
+#define DISPATCHER_GEN(T, ALGO) \
+ libdivide_##ALGO##_t denom; \
+ dispatcher() { } \
+ dispatcher(T d) \
+ : denom(libdivide_##ALGO##_gen(d)) \
+ { } \
+ T divide(T n) const { \
+ return libdivide_##ALGO##_do(n, &denom); \
+ } \
+ LIBDIVIDE_DIVIDE_VECTOR(ALGO) \
+ T recover() const { \
+ return libdivide_##ALGO##_recover(&denom); \
+ }
+
+// The dispatcher selects a specific division algorithm for a given
+// type and ALGO using partial template specialization.
+template<bool IS_INTEGRAL, bool IS_SIGNED, int SIZEOF, int ALGO> struct dispatcher { };
+
+template<> struct dispatcher<true, true, sizeof(int32_t), BRANCHFULL> { DISPATCHER_GEN(int32_t, s32) };
+template<> struct dispatcher<true, true, sizeof(int32_t), BRANCHFREE> { DISPATCHER_GEN(int32_t, s32_branchfree) };
+template<> struct dispatcher<true, false, sizeof(uint32_t), BRANCHFULL> { DISPATCHER_GEN(uint32_t, u32) };
+template<> struct dispatcher<true, false, sizeof(uint32_t), BRANCHFREE> { DISPATCHER_GEN(uint32_t, u32_branchfree) };
+template<> struct dispatcher<true, true, sizeof(int64_t), BRANCHFULL> { DISPATCHER_GEN(int64_t, s64) };
+template<> struct dispatcher<true, true, sizeof(int64_t), BRANCHFREE> { DISPATCHER_GEN(int64_t, s64_branchfree) };
+template<> struct dispatcher<true, false, sizeof(uint64_t), BRANCHFULL> { DISPATCHER_GEN(uint64_t, u64) };
+template<> struct dispatcher<true, false, sizeof(uint64_t), BRANCHFREE> { DISPATCHER_GEN(uint64_t, u64_branchfree) };
+
+// This is the main divider class for use by the user (C++ API).
+// The actual division algorithm is selected using the dispatcher struct
+// based on the integer and algorithm template parameters.
+template<typename T, int ALGO = BRANCHFULL>
+class divider {
+public:
+ // We leave the default constructor empty so that creating
+ // an array of dividers and then initializing them
+ // later doesn't slow us down.
+ divider() { }
+
+ // Constructor that takes the divisor as a parameter
+ divider(T d) : div(d) { }
+
+ // Divides n by the divisor
+ T divide(T n) const {
+ return div.divide(n);
+ }
+
+ // Recovers the divisor, returns the value that was
+ // used to initialize this divider object.
+ T recover() const {
+ return div.recover();
+ }
+
+ bool operator==(const divider<T, ALGO>& other) const {
+ return div.denom.magic == other.denom.magic &&
+ div.denom.more == other.denom.more;
+ }
+
+ bool operator!=(const divider<T, ALGO>& other) const {
+ return !(*this == other);
+ }
+
+#if defined(LIBDIVIDE_VECTOR_TYPE)
+ // Treats the vector as packed integer values with the same type as
+ // the divider (e.g. s32, u32, s64, u64) and divides each of
+ // them by the divider, returning the packed quotients.
+ LIBDIVIDE_VECTOR_TYPE divide(LIBDIVIDE_VECTOR_TYPE n) const {
+ return div.divide(n);
+ }
+#endif
+
+private:
+ // Storage for the actual divisor
+ dispatcher<std::is_integral<T>::value,
+ std::is_signed<T>::value, sizeof(T), ALGO> div;
+};
+
+// Overload of operator / for scalar division
+template<typename T, int ALGO>
+T operator/(T n, const divider<T, ALGO>& div) {
+ return div.divide(n);
+}
+
+// Overload of operator /= for scalar division
+template<typename T, int ALGO>
+T& operator/=(T& n, const divider<T, ALGO>& div) {
+ n = div.divide(n);
+ return n;
+}
+
+#if defined(LIBDIVIDE_VECTOR_TYPE)
+ // Overload of operator / for vector division
+ template<typename T, int ALGO>
+ LIBDIVIDE_VECTOR_TYPE operator/(LIBDIVIDE_VECTOR_TYPE n, const divider<T, ALGO>& div) {
+ return div.divide(n);
+ }
+ // Overload of operator /= for vector division
+ template<typename T, int ALGO>
+ LIBDIVIDE_VECTOR_TYPE& operator/=(LIBDIVIDE_VECTOR_TYPE& n, const divider<T, ALGO>& div) {
+ n = div.divide(n);
+ return n;
+ }
+#endif
+
+// libdivdie::branchfree_divider<T>
+template <typename T>
+using branchfree_divider = divider<T, BRANCHFREE>;
+
+} // namespace libdivide
+
+#endif // __cplusplus
+
+#endif // LIBDIVIDE_H
diff --git a/src/locale/en.po b/src/locale/en.po
index 30ebe4368fe45ddfa5f5be5989f13a6c00e0fcaf..8dd08173d7869cd799490b473c2629bb35306e3f 100644
--- a/src/locale/en.po
+++ b/src/locale/en.po
@@ -466,7 +466,7 @@ msgid ""
msgstr ""
#: d_clisrv.c:1764
-msgid "has been kicked (Go away)\n"
+msgid "has been kicked (No reason given)\n"
msgstr ""
#: d_clisrv.c:1768
@@ -474,7 +474,7 @@ msgid "left the game (Broke ping limit)\n"
msgstr ""
#: d_clisrv.c:1772
-msgid "left the game (Consistency failure)\n"
+msgid "left the game (Synch failure)\n"
msgstr ""
#: d_clisrv.c:1778
@@ -501,7 +501,7 @@ msgid "left the game\n"
msgstr ""
#: d_clisrv.c:1798
-msgid "has been banned (Don't come back)\n"
+msgid "has been banned (No reason given)\n"
msgstr ""
#: d_clisrv.c:1802
diff --git a/src/locale/srb2.pot b/src/locale/srb2.pot
index 960c36dbe8e523d31c666faf2bc4beee3830c0df..cd2db750de93d1a2b3dda973a36fba5492700e1a 100644
--- a/src/locale/srb2.pot
+++ b/src/locale/srb2.pot
@@ -459,7 +459,7 @@ msgid ""
msgstr ""
#: d_clisrv.c:1889
-msgid "has been kicked (Go away)\n"
+msgid "has been kicked (No reason given)\n"
msgstr ""
#: d_clisrv.c:1893
@@ -467,7 +467,7 @@ msgid "left the game (Broke ping limit)\n"
msgstr ""
#: d_clisrv.c:1897
-msgid "left the game (Consistency failure)\n"
+msgid "left the game (Synch failure)\n"
msgstr ""
#: d_clisrv.c:1903
@@ -494,7 +494,7 @@ msgid "left the game\n"
msgstr ""
#: d_clisrv.c:1923
-msgid "has been banned (Don't come back)\n"
+msgid "has been banned (No reason given)\n"
msgstr ""
#: d_clisrv.c:1927
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index a0c99411be5ce15ae98bde6c3d10aa3663e2a79a..120ab671e92e1fafbfba8eaf520ee5133fdad691 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -28,6 +28,10 @@
#include "console.h"
#include "d_netcmd.h" // IsPlayerAdmin
#include "m_menu.h" // Player Setup menu color stuff
+#include "m_misc.h" // M_MapNumber
+#include "b_bot.h" // B_UpdateBotleader
+#include "d_clisrv.h" // CL_RemovePlayer
+#include "i_system.h" // I_GetPreciseTime, I_PreciseToMicros
#include "lua_script.h"
#include "lua_libs.h"
@@ -184,6 +188,8 @@ static const struct {
{META_MAPHEADER, "mapheader_t"},
{META_POLYOBJ, "polyobj_t"},
+ {META_POLYOBJVERTICES, "polyobj_t.vertices"},
+ {META_POLYOBJLINES, "polyobj_t.lines"},
{META_CVAR, "consvar_t"},
@@ -212,6 +218,9 @@ static const struct {
{META_ACTION, "action"},
{META_LUABANKS, "luabanks[]"},
+
+ {META_KEYEVENT, "keyevent_t"},
+ {META_MOUSE, "mouse_t"},
{NULL, NULL}
};
@@ -357,6 +366,23 @@ static int lib_pGetColorAfter(lua_State *L)
return 1;
}
+// M_MISC
+//////////////
+
+static int lib_mMapNumber(lua_State *L)
+{
+ const char *arg = luaL_checkstring(L, 1);
+ size_t len = strlen(arg);
+ if (len == 2 || len == 5) {
+ char first = arg[len-2];
+ char second = arg[len-1];
+ lua_pushinteger(L, M_MapNumber(first, second));
+ } else {
+ lua_pushinteger(L, 0);
+ }
+ return 1;
+}
+
// M_RANDOM
//////////////
@@ -426,7 +452,7 @@ static int lib_pAproxDistance(lua_State *L)
fixed_t dx = luaL_checkfixed(L, 1);
fixed_t dy = luaL_checkfixed(L, 2);
//HUDSAFE
- lua_pushfixed(L, R_PointToDist2(0, 0, dx, dy));
+ lua_pushfixed(L, P_AproxDistance(dx, dy));
return 1;
}
@@ -1044,48 +1070,56 @@ static int lib_pSceneryXYMovement(lua_State *L)
static int lib_pZMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
lua_pushboolean(L, P_ZMovement(actor));
P_CheckPosition(actor, actor->x, actor->y);
+ P_SetTarget(&tmthing, ptmthing);
return 1;
}
static int lib_pRingZMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
P_RingZMovement(actor);
P_CheckPosition(actor, actor->x, actor->y);
+ P_SetTarget(&tmthing, ptmthing);
return 0;
}
static int lib_pSceneryZMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
lua_pushboolean(L, P_SceneryZMovement(actor));
P_CheckPosition(actor, actor->x, actor->y);
+ P_SetTarget(&tmthing, ptmthing);
return 1;
}
static int lib_pPlayerZMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
P_PlayerZMovement(actor);
P_CheckPosition(actor, actor->x, actor->y);
+ P_SetTarget(&tmthing, ptmthing);
return 0;
}
@@ -1472,11 +1506,13 @@ static int lib_pSpawnSkidDust(lua_State *L)
static int lib_pMovePlayer(lua_State *L)
{
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!player)
return LUA_ErrInvalid(L, "player_t");
P_MovePlayer(player);
+ P_SetTarget(&tmthing, ptmthing);
return 0;
}
@@ -1853,6 +1889,37 @@ static int lib_pDoSpring(lua_State *L)
return 1;
}
+static int lib_pTryCameraMove(lua_State *L)
+{
+ camera_t *cam = *((camera_t **)luaL_checkudata(L, 1, META_CAMERA));
+ fixed_t x = luaL_checkfixed(L, 2);
+ fixed_t y = luaL_checkfixed(L, 3);
+
+ if (!cam)
+ return LUA_ErrInvalid(L, "camera_t");
+ lua_pushboolean(L, P_TryCameraMove(x, y, cam));
+ return 1;
+}
+
+static int lib_pTeleportCameraMove(lua_State *L)
+{
+ camera_t *cam = *((camera_t **)luaL_checkudata(L, 1, META_CAMERA));
+ fixed_t x = luaL_checkfixed(L, 2);
+ fixed_t y = luaL_checkfixed(L, 3);
+ fixed_t z = luaL_checkfixed(L, 4);
+
+ if (!cam)
+ return LUA_ErrInvalid(L, "camera_t");
+ cam->x = x;
+ cam->y = y;
+ cam->z = z;
+ P_CheckCameraPosition(x, y, cam);
+ cam->subsector = R_PointInSubsector(x, y);
+ cam->floorz = tmfloorz;
+ cam->ceilingz = tmceilingz;
+ return 0;
+}
+
// P_INTER
////////////
@@ -2508,6 +2575,17 @@ static int lib_pGetZAt(lua_State *L)
return 1;
}
+static int lib_pButteredSlope(lua_State *L)
+{
+ mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!mobj)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_ButteredSlope(mobj);
+ return 0;
+}
+
// R_DEFS
////////////
@@ -2822,46 +2900,13 @@ static int lib_sStopSoundByID(lua_State *L)
static int lib_sChangeMusic(lua_State *L)
{
-#ifdef MUSICSLOT_COMPATIBILITY
- const char *music_name;
- UINT32 music_num, position, prefadems, fadeinms;
- char music_compat_name[7];
-
- boolean looping;
- player_t *player = NULL;
- UINT16 music_flags = 0;
- //NOHUD
-
- if (lua_isnumber(L, 1))
- {
- music_num = (UINT32)luaL_checkinteger(L, 1);
- music_flags = (UINT16)(music_num & 0x0000FFFF);
- if (music_flags && music_flags <= 1035)
- snprintf(music_compat_name, 7, "%sM", G_BuildMapName((INT32)music_flags));
- else if (music_flags && music_flags <= 1050)
- strncpy(music_compat_name, compat_special_music_slots[music_flags - 1036], 7);
- else
- music_compat_name[0] = 0; // becomes empty string
- music_compat_name[6] = 0;
- music_name = (const char *)&music_compat_name;
- music_flags = 0;
- }
- else
- {
- music_num = 0;
- music_name = luaL_checkstring(L, 1);
- }
+ UINT32 position, prefadems, fadeinms;
- looping = (boolean)lua_opttrueboolean(L, 2);
-
-#else
const char *music_name = luaL_checkstring(L, 1);
boolean looping = (boolean)lua_opttrueboolean(L, 2);
player_t *player = NULL;
UINT16 music_flags = 0;
- //NOHUD
-#endif
if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
{
player = *((player_t **)luaL_checkudata(L, 3, META_PLAYER));
@@ -2869,13 +2914,7 @@ static int lib_sChangeMusic(lua_State *L)
return LUA_ErrInvalid(L, "player_t");
}
-#ifdef MUSICSLOT_COMPATIBILITY
- if (music_num)
- music_flags = (UINT16)((music_num & 0x7FFF0000) >> 16);
- else
-#endif
music_flags = (UINT16)luaL_optinteger(L, 4, 0);
-
position = (UINT32)luaL_optinteger(L, 5, 0);
prefadems = (UINT32)luaL_optinteger(L, 6, 0);
fadeinms = (UINT32)luaL_optinteger(L, 7, 0);
@@ -3172,33 +3211,7 @@ static int lib_sMusicExists(lua_State *L)
{
boolean checkMIDI = lua_opttrueboolean(L, 2);
boolean checkDigi = lua_opttrueboolean(L, 3);
-#ifdef MUSICSLOT_COMPATIBILITY
- const char *music_name;
- UINT32 music_num;
- char music_compat_name[7];
- UINT16 music_flags = 0;
- NOHUD
- if (lua_isnumber(L, 1))
- {
- music_num = (UINT32)luaL_checkinteger(L, 1);
- music_flags = (UINT16)(music_num & 0x0000FFFF);
- if (music_flags && music_flags <= 1035)
- snprintf(music_compat_name, 7, "%sM", G_BuildMapName((INT32)music_flags));
- else if (music_flags && music_flags <= 1050)
- strncpy(music_compat_name, compat_special_music_slots[music_flags - 1036], 7);
- else
- music_compat_name[0] = 0; // becomes empty string
- music_compat_name[6] = 0;
- music_name = (const char *)&music_compat_name;
- }
- else
- {
- music_num = 0;
- music_name = luaL_checkstring(L, 1);
- }
-#else
const char *music_name = luaL_checkstring(L, 1);
-#endif
NOHUD
lua_pushboolean(L, S_MusicExists(music_name, checkMIDI, checkDigi));
return 1;
@@ -3421,6 +3434,111 @@ static int lib_gAddGametype(lua_State *L)
return 0;
}
+// Bot adding function!
+// Partly lifted from Got_AddPlayer
+static int lib_gAddPlayer(lua_State *L)
+{
+ INT16 i, newplayernum, botcount = 1;
+ player_t *newplayer;
+ SINT8 skinnum = 0, bot;
+
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (!playeringame[i])
+ break;
+
+ if (players[i].bot)
+ botcount++; // How many of us are there already?
+ }
+ if (i >= MAXPLAYERS)
+ {
+ lua_pushnil(L);
+ return 1;
+ }
+
+
+ newplayernum = i;
+
+ CL_ClearPlayer(newplayernum);
+
+ playeringame[newplayernum] = true;
+ G_AddPlayer(newplayernum);
+ newplayer = &players[newplayernum];
+
+ newplayer->jointime = 0;
+ newplayer->quittime = 0;
+
+ // Set the bot name (defaults to Bot #)
+ strcpy(player_names[newplayernum], va("Bot %d", botcount));
+
+ // Read the skin argument (defaults to Sonic)
+ if (!lua_isnoneornil(L, 1))
+ {
+ skinnum = R_SkinAvailable(luaL_checkstring(L, 1));
+ skinnum = skinnum < 0 ? 0 : skinnum;
+ }
+
+ // Read the color (defaults to skin prefcolor)
+ if (!lua_isnoneornil(L, 2))
+ newplayer->skincolor = R_GetColorByName(luaL_checkstring(L, 2));
+ else
+ newplayer->skincolor = skins[newplayer->skin].prefcolor;
+
+ // Read the bot name, if given
+ if (!lua_isnoneornil(L, 3))
+ strlcpy(player_names[newplayernum], luaL_checkstring(L, 3), sizeof(*player_names));
+
+ bot = luaL_optinteger(L, 4, 3);
+ newplayer->bot = (bot >= BOT_NONE && bot <= BOT_MPAI) ? bot : BOT_MPAI;
+
+ // If our bot is a 2P type, we'll need to set its leader so it can spawn
+ if (newplayer->bot == BOT_2PAI || newplayer->bot == BOT_2PHUMAN)
+ B_UpdateBotleader(newplayer);
+
+ // Set the skin (can't do this until AFTER bot type is set!)
+ SetPlayerSkinByNum(newplayernum, skinnum);
+
+
+ if (netgame)
+ {
+ char joinmsg[256];
+
+ strcpy(joinmsg, M_GetText("\x82*Bot %s has joined the game (player %d)"));
+ strcpy(joinmsg, va(joinmsg, player_names[newplayernum], newplayernum));
+ HU_AddChatText(joinmsg, false);
+ }
+
+ LUA_PushUserdata(L, newplayer, META_PLAYER);
+ return 1;
+}
+
+
+// Bot removing function
+static int lib_gRemovePlayer(lua_State *L)
+{
+ UINT8 pnum = -1;
+ if (!lua_isnoneornil(L, 1))
+ pnum = luaL_checkinteger(L, 1);
+ else // No argument
+ return luaL_error(L, "argument #1 not given (expected number)");
+ if (pnum >= MAXPLAYERS) // Out of range
+ return luaL_error(L, "playernum %d out of range (0 - %d)", pnum, MAXPLAYERS-1);
+ if (playeringame[pnum]) // Found player
+ {
+ if (players[pnum].bot == BOT_NONE) // Can't remove clients.
+ return luaL_error(L, "G_RemovePlayer can only be used on players with a bot value other than BOT_NONE.");
+ else
+ {
+ players[pnum].removing = true;
+ lua_pushboolean(L, true);
+ return 1;
+ }
+ }
+ // Fell through. Invalid player
+ return LUA_ErrInvalid(L, "player_t");
+}
+
+
static int Lcheckmapnumber (lua_State *L, int idx, const char *fun)
{
if (ISINLEVEL)
@@ -3762,6 +3880,12 @@ static int lib_gTicsToMilliseconds(lua_State *L)
return 1;
}
+static int lib_getTimeMicros(lua_State *L)
+{
+ lua_pushinteger(L, I_PreciseToMicros(I_GetPreciseTime()));
+ return 1;
+}
+
static luaL_Reg lib[] = {
{"print", lib_print},
{"chatprint", lib_chatprint},
@@ -3778,6 +3902,9 @@ static luaL_Reg lib[] = {
{"M_GetColorAfter",lib_pGetColorAfter},
{"M_GetColorBefore",lib_pGetColorBefore},
+ // m_misc
+ {"M_MapNumber",lib_mMapNumber},
+
// m_random
{"P_RandomFixed",lib_pRandomFixed},
{"P_RandomByte",lib_pRandomByte},
@@ -3902,6 +4029,8 @@ static luaL_Reg lib[] = {
{"P_FloorzAtPos",lib_pFloorzAtPos},
{"P_CeilingzAtPos",lib_pCeilingzAtPos},
{"P_DoSpring",lib_pDoSpring},
+ {"P_TryCameraMove", lib_pTryCameraMove},
+ {"P_TeleportCameraMove", lib_pTeleportCameraMove},
// p_inter
{"P_RemoveShield",lib_pRemoveShield},
@@ -3948,6 +4077,7 @@ static luaL_Reg lib[] = {
// p_slopes
{"P_GetZAt",lib_pGetZAt},
+ {"P_ButteredSlope",lib_pButteredSlope},
// r_defs
{"R_PointToAngle",lib_rPointToAngle},
@@ -4003,6 +4133,8 @@ static luaL_Reg lib[] = {
// g_game
{"G_AddGametype", lib_gAddGametype},
+ {"G_AddPlayer", lib_gAddPlayer},
+ {"G_RemovePlayer", lib_gRemovePlayer},
{"G_BuildMapName",lib_gBuildMapName},
{"G_BuildMapTitle",lib_gBuildMapTitle},
{"G_FindMap",lib_gFindMap},
@@ -4028,6 +4160,8 @@ static luaL_Reg lib[] = {
{"G_TicsToCentiseconds",lib_gTicsToCentiseconds},
{"G_TicsToMilliseconds",lib_gTicsToMilliseconds},
+ {"getTimeMicros",lib_getTimeMicros},
+
{NULL, NULL}
};
diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c
index 9089d19b6a02c5126aeefde5e74aa1ec3ff8511e..8c63a9d6d2adaf3a15f0fda6cff79913aad0dc17 100644
--- a/src/lua_blockmaplib.c
+++ b/src/lua_blockmaplib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2016-2021 by Iestyn "Monster Iestyn" Jealous.
-// Copyright (C) 2016-2021 by Sonic Team Junior.
+// Copyright (C) 2016-2022 by Iestyn "Monster Iestyn" Jealous.
+// Copyright (C) 2016-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 414d9692a08fea3681a8ea0bdba654c022611440..c8e914e6de3e9299725ad26a26064c2c7d7fc04b 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -433,7 +433,7 @@ static int CVarSetFunction
consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
if (cvar->flags & CV_NOLUA)
- return luaL_error(L, "Variable %s cannot be set from Lua.", cvar->name);
+ return luaL_error(L, "Variable '%s' cannot be set from Lua.", cvar->name);
switch (lua_type(L, 2))
{
diff --git a/src/lua_hook.h b/src/lua_hook.h
index c22309eaaea94a43c054f44d4cf9f57e003567b5..fc6a5f4ee4e4c4aa92683126c8b939c5ee36d2c3 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -12,113 +12,139 @@
#include "r_defs.h"
#include "d_player.h"
+#include "s_sound.h"
+#include "d_event.h"
-enum hook {
- hook_NetVars=0,
- hook_MapChange,
- hook_MapLoad,
- hook_PlayerJoin,
- hook_PreThinkFrame,
- hook_ThinkFrame,
- hook_PostThinkFrame,
- hook_MobjSpawn,
- hook_MobjCollide,
- hook_MobjLineCollide,
- hook_MobjMoveCollide,
- hook_TouchSpecial,
- hook_MobjFuse,
- hook_MobjThinker,
- hook_BossThinker,
- hook_ShouldDamage,
- hook_MobjDamage,
- hook_MobjDeath,
- hook_BossDeath,
- hook_MobjRemoved,
- hook_JumpSpecial,
- hook_AbilitySpecial,
- hook_SpinSpecial,
- hook_JumpSpinSpecial,
- hook_BotTiccmd,
- hook_BotAI,
- hook_BotRespawn,
- hook_LinedefExecute,
- hook_PlayerMsg,
- hook_HurtMsg,
- hook_PlayerSpawn,
- hook_ShieldSpawn,
- hook_ShieldSpecial,
- hook_MobjMoveBlocked,
- hook_MapThingSpawn,
- hook_FollowMobj,
- hook_PlayerCanDamage,
- hook_PlayerQuit,
- hook_IntermissionThinker,
- hook_TeamSwitch,
- hook_ViewpointSwitch,
- hook_SeenPlayer,
- hook_PlayerThink,
- hook_ShouldJingleContinue,
- hook_GameQuit,
- hook_PlayerCmd,
- hook_MusicChange,
- hook_PlayerHeight,
- hook_PlayerCanEnterSpinGaps,
-
- hook_MAX // last hook
-};
-extern const char *const hookNames[];
+/*
+Do you know what an 'X Macro' is? Such a macro is called over each element of
+a list and expands the input. I use it for the hook lists because both an enum
+and array of hook names need to be kept in order. The X Macro handles this
+automatically.
+*/
+
+#define MOBJ_HOOK_LIST(X) \
+ X (MobjSpawn),/* P_SpawnMobj */\
+ X (MobjCollide),/* PIT_CheckThing */\
+ X (MobjLineCollide),/* ditto */\
+ X (MobjMoveCollide),/* tritto */\
+ X (TouchSpecial),/* P_TouchSpecialThing */\
+ X (MobjFuse),/* when mobj->fuse runs out */\
+ X (MobjThinker),/* P_MobjThinker, P_SceneryThinker */\
+ X (BossThinker),/* P_GenericBossThinker */\
+ X (ShouldDamage),/* P_DamageMobj (Should mobj take damage?) */\
+ X (MobjDamage),/* P_DamageMobj (Mobj actually takes damage!) */\
+ X (MobjDeath),/* P_KillMobj */\
+ X (BossDeath),/* A_BossDeath */\
+ X (MobjRemoved),/* P_RemoveMobj */\
+ X (BotRespawn),/* B_CheckRespawn */\
+ X (MobjMoveBlocked),/* P_XYMovement (when movement is blocked) */\
+ X (MapThingSpawn),/* P_SpawnMapThing */\
+ X (FollowMobj),/* P_PlayerAfterThink Smiles mobj-following */\
+
+#define HOOK_LIST(X) \
+ X (NetVars),/* add to archive table (netsave) */\
+ X (MapChange),/* (before map load) */\
+ X (MapLoad),\
+ X (PlayerJoin),/* Got_AddPlayer */\
+ X (PreThinkFrame)/* frame (before mobj and player thinkers) */,\
+ X (ThinkFrame),/* frame (after mobj and player thinkers) */\
+ X (PostThinkFrame),/* frame (at end of tick, ie after overlays, precipitation, specials) */\
+ X (JumpSpecial),/* P_DoJumpStuff (Any-jumping) */\
+ X (AbilitySpecial),/* P_DoJumpStuff (Double-jumping) */\
+ X (SpinSpecial),/* P_DoSpinAbility (Spin button effect) */\
+ X (JumpSpinSpecial),/* P_DoJumpStuff (Spin button effect (mid-air)) */\
+ X (BotTiccmd),/* B_BuildTiccmd */\
+ X (PlayerMsg),/* chat messages */\
+ X (HurtMsg),/* imhurttin */\
+ X (PlayerSpawn),/* G_SpawnPlayer */\
+ X (ShieldSpawn),/* P_SpawnShieldOrb */\
+ X (ShieldSpecial),/* shield abilities */\
+ X (PlayerCanDamage),/* P_PlayerCanDamage */\
+ X (PlayerQuit),\
+ X (IntermissionThinker),/* Y_Ticker */\
+ X (TeamSwitch),/* team switching in... uh... *what* speak, spit it the fuck out */\
+ X (ViewpointSwitch),/* spy mode (no trickstabs) */\
+ X (SeenPlayer),/* MT_NAMECHECK */\
+ X (PlayerThink),/* P_PlayerThink */\
+ X (GameQuit),\
+ X (PlayerCmd),/* building the player's ticcmd struct (Ported from SRB2Kart) */\
+ X (MusicChange),\
+ X (PlayerHeight),/* override player height */\
+ X (PlayerCanEnterSpinGaps),\
+ X (KeyDown),\
+ X (KeyUp),\
+
+#define STRING_HOOK_LIST(X) \
+ X (BotAI),/* B_BuildTailsTiccmd by skin name */\
+ X (LinedefExecute),\
+ X (ShouldJingleContinue),/* should jingle of the given music continue playing */\
+
+#define HUD_HOOK_LIST(X) \
+ X (game),\
+ X (scores),/* emblems/multiplayer list */\
+ X (title),/* titlescreen */\
+ X (titlecard),\
+ X (intermission),\
+
+/*
+I chose to access the hook enums through a macro as well. This could provide
+a hint to lookup the macro's definition instead of the enum's definition.
+(Since each enumeration is not defined in the source code, but by the list
+macros above, it is not greppable.) The name passed to the macro can also be
+grepped and found in the lists above.
+*/
+
+#define MOBJ_HOOK(name) mobjhook_ ## name
+#define HOOK(name) hook_ ## name
+#define HUD_HOOK(name) hudhook_ ## name
+#define STRING_HOOK(name) stringhook_ ## name
+
+#define ENUM(X) enum { X ## _LIST (X) X(MAX) }
+
+ENUM (MOBJ_HOOK);
+ENUM (HOOK);
+ENUM (HUD_HOOK);
+ENUM (STRING_HOOK);
+
+#undef ENUM
+
+/* dead simple, LUA_HOOK(GameQuit) */
+#define LUA_HOOK(type) LUA_HookVoid(HOOK(type))
+#define LUA_HUDHOOK(type) LUA_HookHUD(HUD_HOOK(type))
extern boolean hook_cmd_running;
-void LUAh_MapChange(INT16 mapnumber); // Hook for map change (before load)
-void LUAh_MapLoad(void); // Hook for map load
-void LUAh_PlayerJoin(int playernum); // Hook for Got_AddPlayer
-void LUAh_PreThinkFrame(void); // Hook for frame (before mobj and player thinkers)
-void LUAh_ThinkFrame(void); // Hook for frame (after mobj and player thinkers)
-void LUAh_PostThinkFrame(void); // Hook for frame (at end of tick, ie after overlays, precipitation, specials)
-boolean LUAh_MobjHook(mobj_t *mo, enum hook which);
-boolean LUAh_PlayerHook(player_t *plr, enum hook which);
-#define LUAh_MobjSpawn(mo) LUAh_MobjHook(mo, hook_MobjSpawn) // Hook for P_SpawnMobj by mobj type
-UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which);
-UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which);
-#define LUAh_MobjCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjCollide) // Hook for PIT_CheckThing by (thing) mobj type
-#define LUAh_MobjLineCollide(thing, line) LUAh_MobjLineCollideHook(thing, line, hook_MobjLineCollide) // Hook for PIT_CheckThing by (thing) mobj type
-#define LUAh_MobjMoveCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjMoveCollide) // Hook for PIT_CheckThing by (tmthing) mobj type
-boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher); // Hook for P_TouchSpecialThing by mobj type
-#define LUAh_MobjFuse(mo) LUAh_MobjHook(mo, hook_MobjFuse) // Hook for mobj->fuse == 0 by mobj type
-boolean LUAh_MobjThinker(mobj_t *mo); // Hook for P_MobjThinker or P_SceneryThinker by mobj type
-#define LUAh_BossThinker(mo) LUAh_MobjHook(mo, hook_BossThinker) // Hook for P_GenericBossThinker by mobj type
-UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype); // Hook for P_DamageMobj by mobj type (Should mobj take damage?)
-boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype); // Hook for P_DamageMobj by mobj type (Mobj actually takes damage!)
-boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype); // Hook for P_KillMobj by mobj type
-#define LUAh_BossDeath(mo) LUAh_MobjHook(mo, hook_BossDeath) // Hook for A_BossDeath by mobj type
-#define LUAh_MobjRemoved(mo) LUAh_MobjHook(mo, hook_MobjRemoved) // Hook for P_RemoveMobj by mobj type
-#define LUAh_JumpSpecial(player) LUAh_PlayerHook(player, hook_JumpSpecial) // Hook for P_DoJumpStuff (Any-jumping)
-#define LUAh_AbilitySpecial(player) LUAh_PlayerHook(player, hook_AbilitySpecial) // Hook for P_DoJumpStuff (Double-jumping)
-#define LUAh_SpinSpecial(player) LUAh_PlayerHook(player, hook_SpinSpecial) // Hook for P_DoSpinAbility (Spin button effect)
-#define LUAh_JumpSpinSpecial(player) LUAh_PlayerHook(player, hook_JumpSpinSpecial) // Hook for P_DoJumpStuff (Spin button effect (mid-air))
-boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd); // Hook for B_BuildTiccmd
-boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd); // Hook for B_BuildTailsTiccmd by skin name
-boolean LUAh_BotRespawn(mobj_t *sonic, mobj_t *tails); // Hook for B_CheckRespawn
-boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector); // Hook for linedef executors
-boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg); // Hook for chat messages
-boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 damagetype); // Hook for hurt messages
-#define LUAh_PlayerSpawn(player) LUAh_PlayerHook(player, hook_PlayerSpawn) // Hook for G_SpawnPlayer
-#define LUAh_ShieldSpawn(player) LUAh_PlayerHook(player, hook_ShieldSpawn) // Hook for P_SpawnShieldOrb
-#define LUAh_ShieldSpecial(player) LUAh_PlayerHook(player, hook_ShieldSpecial) // Hook for shield abilities
-#define LUAh_MobjMoveBlocked(mo) LUAh_MobjHook(mo, hook_MobjMoveBlocked) // Hook for P_XYMovement (when movement is blocked)
-boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing); // Hook for P_SpawnMapThing by mobj type
-boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj); // Hook for P_PlayerAfterThink Smiles mobj-following
-UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj); // Hook for P_PlayerCanDamage
-void LUAh_PlayerQuit(player_t *plr, kickreason_t reason); // Hook for player quitting
-void LUAh_IntermissionThinker(void); // Hook for Y_Ticker
-boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble); // Hook for team switching in... uh....
-UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced); // Hook for spy mode
-boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend); // Hook for MT_NAMECHECK
-#define LUAh_PlayerThink(player) LUAh_PlayerHook(player, hook_PlayerThink) // Hook for P_PlayerThink
-boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname); // Hook for whether a jingle of the given music should continue playing
-void LUAh_GameQuit(boolean quitting); // Hook for game quitting
-boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd); // Hook for building player's ticcmd struct (Ported from SRB2Kart)
-boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping, UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms); // Hook for music changes
-fixed_t LUAh_PlayerHeight(player_t *player);
-UINT8 LUAh_PlayerCanEnterSpinGaps(player_t *player);
+void LUA_HookVoid(int hook);
+void LUA_HookHUD(int hook);
+
+int LUA_HookMobj(mobj_t *, int hook);
+int LUA_Hook2Mobj(mobj_t *, mobj_t *, int hook);
+void LUA_HookInt(INT32 integer, int hook);
+void LUA_HookBool(boolean value, int hook);
+int LUA_HookPlayer(player_t *, int hook);
+int LUA_HookTiccmd(player_t *, ticcmd_t *, int hook);
+int LUA_HookKey(event_t *event, int hook); // Hooks for key events
+
+void LUA_HookThinkFrame(void);
+int LUA_HookMobjLineCollide(mobj_t *, line_t *);
+int LUA_HookTouchSpecial(mobj_t *special, mobj_t *toucher);
+int LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype);
+int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype);
+int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype);
+int LUA_HookMobjMoveBlocked(mobj_t *, mobj_t *, line_t *);
+int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd);
+void LUA_HookLinedefExecute(line_t *, mobj_t *, sector_t *);
+int LUA_HookPlayerMsg(int source, int target, int flags, char *msg);
+int LUA_HookHurtMsg(player_t *, mobj_t *inflictor, mobj_t *source, UINT8 damagetype);
+int LUA_HookMapThingSpawn(mobj_t *, mapthing_t *);
+int LUA_HookFollowMobj(player_t *, mobj_t *);
+int LUA_HookPlayerCanDamage(player_t *, mobj_t *);
+void LUA_HookPlayerQuit(player_t *, kickreason_t);
+int LUA_HookTeamSwitch(player_t *, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble);
+int LUA_HookViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced);
+int LUA_HookSeenPlayer(player_t *player, player_t *seenfriend);
+int LUA_HookShouldJingleContinue(player_t *, const char *musname);
+int LUA_HookPlayerCmd(player_t *, ticcmd_t *);
+int LUA_HookMusicChange(const char *oldname, struct MusicChange *);
+fixed_t LUA_HookPlayerHeight(player_t *player);
+int LUA_HookPlayerCanEnterSpinGaps(player_t *player);
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 3715aae049b6c85201813ea7f43a07526163be9c..48980f4a4c1f809b8bf296d48c0332ea682e5234 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -27,2037 +27,1150 @@
#include "d_netcmd.h" // for cv_perfstats
#include "i_system.h" // I_GetPreciseTime
-static UINT8 hooksAvailable[(hook_MAX/8)+1];
-
-const char *const hookNames[hook_MAX+1] = {
- "NetVars",
- "MapChange",
- "MapLoad",
- "PlayerJoin",
- "PreThinkFrame",
- "ThinkFrame",
- "PostThinkFrame",
- "MobjSpawn",
- "MobjCollide",
- "MobjLineCollide",
- "MobjMoveCollide",
- "TouchSpecial",
- "MobjFuse",
- "MobjThinker",
- "BossThinker",
- "ShouldDamage",
- "MobjDamage",
- "MobjDeath",
- "BossDeath",
- "MobjRemoved",
- "JumpSpecial",
- "AbilitySpecial",
- "SpinSpecial",
- "JumpSpinSpecial",
- "BotTiccmd",
- "BotAI",
- "BotRespawn",
- "LinedefExecute",
- "PlayerMsg",
- "HurtMsg",
- "PlayerSpawn",
- "ShieldSpawn",
- "ShieldSpecial",
- "MobjMoveBlocked",
- "MapThingSpawn",
- "FollowMobj",
- "PlayerCanDamage",
- "PlayerQuit",
- "IntermissionThinker",
- "TeamSwitch",
- "ViewpointSwitch",
- "SeenPlayer",
- "PlayerThink",
- "ShouldJingleContinue",
- "GameQuit",
- "PlayerCmd",
- "MusicChange",
- "PlayerHeight",
- "PlayerCanEnterSpinGaps",
- NULL
-};
+/* =========================================================================
+ ABSTRACTION
+ ========================================================================= */
-// Hook metadata
-struct hook_s
-{
- struct hook_s *next;
- enum hook type;
- UINT16 id;
- union {
- mobjtype_t mt;
- char *str;
- } s;
- boolean error;
-};
-typedef struct hook_s* hook_p;
+#define LIST(id, M) \
+ static const char * const id [] = { M (TOSTR) NULL }
-#define FMT_HOOKID "hook_%d"
+LIST (mobjHookNames, MOBJ_HOOK_LIST);
+LIST (hookNames, HOOK_LIST);
+LIST (hudHookNames, HUD_HOOK_LIST);
+LIST (stringHookNames, STRING_HOOK_LIST);
-// For each mobj type, a linked list to its thinker and collision hooks.
-// That way, we don't have to iterate through all the hooks.
-// We could do that with all other mobj hooks, but it would probably just be
-// a waste of memory since they are only called occasionally. Probably...
-static hook_p mobjthinkerhooks[NUMMOBJTYPES];
-static hook_p mobjcollidehooks[NUMMOBJTYPES];
+#undef LIST
-// For each mobj type, a linked list for other mobj hooks
-static hook_p mobjhooks[NUMMOBJTYPES];
+typedef struct {
+ int numHooks;
+ int *ids;
+} hook_t;
-// A linked list for player hooks
-static hook_p playerhooks;
+typedef struct {
+ int numGeneric;
+ int ref;
+} stringhook_t;
-// A linked list for linedef executor hooks
-static hook_p linedefexecutorhooks;
+static hook_t hookIds[HOOK(MAX)];
+static hook_t hudHookIds[HUD_HOOK(MAX)];
+static hook_t mobjHookIds[NUMMOBJTYPES][MOBJ_HOOK(MAX)];
-// For other hooks, a unique linked list
-hook_p roothook;
+// Lua tables are used to lookup string hook ids.
+static stringhook_t stringHooks[STRING_HOOK(MAX)];
-static void PushHook(lua_State *L, hook_p hookp)
-{
- lua_pushfstring(L, FMT_HOOKID, hookp->id);
- lua_gettable(L, LUA_REGISTRYINDEX);
-}
+// This will be indexed by hook id, the value of which fetches the registry.
+static int * hookRefs;
+static int nextid;
-// Takes hook, function, and additional arguments (mobj type to act on, etc.)
-static int lib_addHook(lua_State *L)
-{
- static struct hook_s hook = {NULL, 0, 0, {0}, false};
- static UINT32 nextid;
- hook_p hookp, *lastp;
+// After a hook errors once, don't print the error again.
+static UINT8 * hooksErrored;
- hook.type = luaL_checkoption(L, 1, NULL, hookNames);
- lua_remove(L, 1);
+static int errorRef;
- luaL_checktype(L, 1, LUA_TFUNCTION);
+static boolean mobj_hook_available(int hook_type, mobjtype_t mobj_type)
+{
+ return
+ (
+ mobjHookIds [MT_NULL] [hook_type].numHooks > 0 ||
+ mobjHookIds[mobj_type][hook_type].numHooks > 0
+ );
+}
- if (!lua_lumploading)
- return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
+static int hook_in_list
+(
+ const char * const name,
+ const char * const * const list
+){
+ int type;
- switch(hook.type)
+ for (type = 0; list[type] != NULL; ++type)
{
- // Take a mobjtype enum which this hook is specifically for.
- case hook_MobjSpawn:
- case hook_MobjCollide:
- case hook_MobjLineCollide:
- case hook_MobjMoveCollide:
- case hook_TouchSpecial:
- case hook_MobjFuse:
- case hook_MobjThinker:
- case hook_BossThinker:
- case hook_ShouldDamage:
- case hook_MobjDamage:
- case hook_MobjDeath:
- case hook_BossDeath:
- case hook_MobjRemoved:
- case hook_HurtMsg:
- case hook_MobjMoveBlocked:
- case hook_MapThingSpawn:
- case hook_FollowMobj:
- hook.s.mt = MT_NULL;
- if (lua_isnumber(L, 2))
- hook.s.mt = lua_tonumber(L, 2);
- luaL_argcheck(L, hook.s.mt < NUMMOBJTYPES, 2, "invalid mobjtype_t");
- break;
- case hook_BotAI:
- case hook_ShouldJingleContinue:
- hook.s.str = NULL;
- if (lua_isstring(L, 2))
- { // lowercase copy
- hook.s.str = Z_StrDup(lua_tostring(L, 2));
- strlwr(hook.s.str);
- }
- break;
- case hook_LinedefExecute: // Linedef executor functions
- hook.s.str = Z_StrDup(luaL_checkstring(L, 2));
- strupr(hook.s.str);
- break;
- default:
- break;
+ if (strcmp(name, list[type]) == 0)
+ break;
}
- lua_settop(L, 1); // lua stack contains only the function now.
- hooksAvailable[hook.type/8] |= 1<<(hook.type%8);
+ return type;
+}
- // set hook.id to the highest id + 1
- hook.id = nextid++;
+static void get_table(lua_State *L)
+{
+ lua_pushvalue(L, -1);
+ lua_rawget(L, -3);
- // Special cases for some hook types (see the comments above mobjthinkerhooks declaration)
- switch(hook.type)
+ if (lua_isnil(L, -1))
{
- case hook_MobjThinker:
- lastp = &mobjthinkerhooks[hook.s.mt];
- break;
- case hook_MobjCollide:
- case hook_MobjLineCollide:
- case hook_MobjMoveCollide:
- lastp = &mobjcollidehooks[hook.s.mt];
- break;
- case hook_MobjSpawn:
- case hook_TouchSpecial:
- case hook_MobjFuse:
- case hook_BossThinker:
- case hook_ShouldDamage:
- case hook_MobjDamage:
- case hook_MobjDeath:
- case hook_BossDeath:
- case hook_MobjRemoved:
- case hook_MobjMoveBlocked:
- case hook_MapThingSpawn:
- case hook_FollowMobj:
- lastp = &mobjhooks[hook.s.mt];
- break;
- case hook_JumpSpecial:
- case hook_AbilitySpecial:
- case hook_SpinSpecial:
- case hook_JumpSpinSpecial:
- case hook_PlayerSpawn:
- case hook_PlayerCanDamage:
- case hook_TeamSwitch:
- case hook_ViewpointSwitch:
- case hook_SeenPlayer:
- case hook_ShieldSpawn:
- case hook_ShieldSpecial:
- case hook_PlayerThink:
- case hook_PlayerHeight:
- case hook_PlayerCanEnterSpinGaps:
- lastp = &playerhooks;
- break;
- case hook_LinedefExecute:
- lastp = &linedefexecutorhooks;
- break;
- default:
- lastp = &roothook;
- break;
+ lua_pop(L, 1);
+ lua_createtable(L, 1, 0);
+ lua_pushvalue(L, -2);
+ lua_pushvalue(L, -2);
+ lua_rawset(L, -5);
}
- // iterate the hook metadata structs
- // set lastp to the last hook struct's "next" pointer.
- for (hookp = *lastp; hookp; hookp = hookp->next)
- lastp = &hookp->next;
- // allocate a permanent memory struct to stuff hook.
- hookp = ZZ_Alloc(sizeof(struct hook_s));
- memcpy(hookp, &hook, sizeof(struct hook_s));
- // tack it onto the end of the linked list.
- *lastp = hookp;
-
- // set the hook function in the registry.
- lua_pushfstring(L, FMT_HOOKID, hook.id);
- lua_pushvalue(L, 1);
- lua_settable(L, LUA_REGISTRYINDEX);
- return 0;
+ lua_remove(L, -2);
}
-int LUA_HookLib(lua_State *L)
+static void add_hook_to_table(lua_State *L, int n)
{
- memset(hooksAvailable,0,sizeof(UINT8[(hook_MAX/8)+1]));
- roothook = NULL;
- lua_register(L, "addHook", lib_addHook);
- return 0;
+ lua_pushnumber(L, nextid);
+ lua_rawseti(L, -2, n);
}
-boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
+static void add_string_hook(lua_State *L, int type)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
- return false;
+ stringhook_t * hook = &stringHooks[type];
- I_Assert(mo->type < NUMMOBJTYPES);
+ char * string = NULL;
- if (!(mobjhooks[MT_NULL] || mobjhooks[mo->type]))
- return false;
+ switch (type)
+ {
+ case STRING_HOOK(BotAI):
+ case STRING_HOOK(ShouldJingleContinue):
+ if (lua_isstring(L, 3))
+ { // lowercase copy
+ string = Z_StrDup(lua_tostring(L, 3));
+ strlwr(string);
+ }
+ break;
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ case STRING_HOOK(LinedefExecute):
+ string = Z_StrDup(luaL_checkstring(L, 3));
+ strupr(string);
+ break;
+ }
- // Look for all generic mobj hooks
- for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
+ if (hook->ref > 0)
+ lua_getref(L, hook->ref);
+ else
{
- if (hookp->type != which)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- LUA_PushUserdata(gL, mo, META_MOBJ);
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ lua_newtable(L);
+ lua_pushvalue(L, -1);
+ hook->ref = luaL_ref(L, LUA_REGISTRYINDEX);
}
- for (hookp = mobjhooks[mo->type]; hookp; hookp = hookp->next)
+ if (string)
{
- if (hookp->type != which)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- LUA_PushUserdata(gL, mo, META_MOBJ);
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ lua_pushstring(L, string);
+ get_table(L);
+ add_hook_to_table(L, 1 + lua_objlen(L, -1));
}
+ else
+ add_hook_to_table(L, ++hook->numGeneric);
+}
- lua_settop(gL, 0);
- return hooked;
+static void add_hook(hook_t *map)
+{
+ Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids,
+ PU_STATIC, &map->ids);
+ map->ids[map->numHooks++] = nextid;
}
-boolean LUAh_PlayerHook(player_t *plr, enum hook which)
+static void add_mobj_hook(lua_State *L, int hook_type)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
- return false;
+ mobjtype_t mobj_type = luaL_optnumber(L, 3, MT_NULL);
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ luaL_argcheck(L, mobj_type < NUMMOBJTYPES, 3, "invalid mobjtype_t");
+
+ add_hook(&mobjHookIds[mobj_type][hook_type]);
+}
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+static void add_hud_hook(lua_State *L, int idx)
+{
+ add_hook(&hudHookIds[luaL_checkoption(L,
+ idx, "game", hudHookNames)]);
+}
+
+static void add_hook_ref(lua_State *L, int idx)
+{
+ if (!(nextid & 7))
{
- if (hookp->type != which)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- LUA_PushUserdata(gL, plr, META_PLAYER);
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ Z_Realloc(hooksErrored,
+ BIT_ARRAY_SIZE (nextid + 1) * sizeof *hooksErrored,
+ PU_STATIC, &hooksErrored);
+ hooksErrored[nextid >> 3] = 0;
}
- lua_settop(gL, 0);
- return hooked;
+ Z_Realloc(hookRefs, (nextid + 1) * sizeof *hookRefs, PU_STATIC, &hookRefs);
+
+ // set the hook function in the registry.
+ lua_pushvalue(L, idx);
+ hookRefs[nextid++] = luaL_ref(L, LUA_REGISTRYINDEX);
}
-// Hook for map change (before load)
-void LUAh_MapChange(INT16 mapnumber)
+// Takes hook, function, and additional arguments (mobj type to act on, etc.)
+static int lib_addHook(lua_State *L)
{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_MapChange/8] & (1<<(hook_MapChange%8))))
- return;
+ const char * name;
+ int type;
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
- lua_pushinteger(gL, mapnumber);
+ if (!lua_lumploading)
+ return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
+
+ name = luaL_checkstring(L, 1);
+ luaL_checktype(L, 2, LUA_TFUNCTION);
- for (hookp = roothook; hookp; hookp = hookp->next)
+ /* this is a very special case */
+ if (( type = hook_in_list(name, stringHookNames) ) < STRING_HOOK(MAX))
{
- if (hookp->type != hook_MapChange)
- continue;
-
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 0, 1)) {
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- }
+ add_string_hook(L, type);
+ }
+ else if (( type = hook_in_list(name, mobjHookNames) ) < MOBJ_HOOK(MAX))
+ {
+ add_mobj_hook(L, type);
+ }
+ else if (( type = hook_in_list(name, hookNames) ) < HOOK(MAX))
+ {
+ add_hook(&hookIds[type]);
+ }
+ else if (strcmp(name, "HUD") == 0)
+ {
+ add_hud_hook(L, 3);
+ }
+ else
+ {
+ return luaL_argerror(L, 1, lua_pushfstring(L, "invalid hook " LUA_QS, name));
}
- lua_settop(gL, 0);
+ add_hook_ref(L, 2);/* the function */
+
+ return 0;
}
-// Hook for map load
-void LUAh_MapLoad(void)
+int LUA_HookLib(lua_State *L)
{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_MapLoad/8] & (1<<(hook_MapLoad%8))))
- return;
+ lua_pushcfunction(L, LUA_GetErrorMessage);
+ errorRef = luaL_ref(L, LUA_REGISTRYINDEX);
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
- lua_pushinteger(gL, gamemap);
+ lua_register(L, "addHook", lib_addHook);
- for (hookp = roothook; hookp; hookp = hookp->next)
- {
- if (hookp->type != hook_MapLoad)
- continue;
-
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 0, 1)) {
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- }
- }
+ return 0;
+}
- lua_settop(gL, 0);
+/* TODO: remove in next backwards incompatible release */
+int lib_hudadd(lua_State *L);/* yeah compiler */
+int lib_hudadd(lua_State *L)
+{
+ if (!lua_lumploading)
+ return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
+
+ luaL_checktype(L, 1, LUA_TFUNCTION);
+
+ add_hud_hook(L, 2);
+ add_hook_ref(L, 1);
+
+ return 0;
+}
+
+typedef struct Hook_State Hook_State;
+typedef void (*Hook_Callback)(Hook_State *);
+
+struct Hook_State {
+ INT32 status;/* return status to calling function */
+ void * userdata;
+ int hook_type;
+ mobjtype_t mobj_type;/* >0 if mobj hook */
+ const char * string;/* used to fetch table, ran first if set */
+ int top;/* index of last argument passed to hook */
+ int id;/* id to fetch ref */
+ int values;/* num arguments passed to hook */
+ int results;/* num values returned by hook */
+ Hook_Callback results_handler;/* callback when hook successfully returns */
+};
+
+enum {
+ EINDEX = 1,/* error handler */
+ SINDEX = 2,/* string itself is pushed in case of string hook */
+};
+
+static void push_error_handler(void)
+{
+ lua_getref(gL, errorRef);
}
-// Hook for Got_AddPlayer
-void LUAh_PlayerJoin(int playernum)
+/* repush hook string */
+static void push_string(void)
{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_PlayerJoin/8] & (1<<(hook_PlayerJoin%8))))
- return;
+ lua_pushvalue(gL, SINDEX);
+}
+
+static boolean begin_hook_values(Hook_State *hook)
+{
+ hook->top = lua_gettop(gL);
+ return true;
+}
+static void start_hook_stack(void)
+{
lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
- lua_pushinteger(gL, playernum);
+ push_error_handler();
+}
- for (hookp = roothook; hookp; hookp = hookp->next)
+static boolean init_hook_type
+(
+ Hook_State * hook,
+ int status,
+ int hook_type,
+ mobjtype_t mobj_type,
+ const char * string,
+ int nonzero
+){
+ hook->status = status;
+
+ if (nonzero)
{
- if (hookp->type != hook_PlayerJoin)
- continue;
-
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 0, 1)) {
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- }
+ start_hook_stack();
+ hook->hook_type = hook_type;
+ hook->mobj_type = mobj_type;
+ hook->string = string;
+ return begin_hook_values(hook);
}
-
- lua_settop(gL, 0);
+ else
+ return false;
}
-// Hook for frame (before mobj and player thinkers)
-void LUAh_PreThinkFrame(void)
-{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_PreThinkFrame/8] & (1<<(hook_PreThinkFrame%8))))
- return;
+static boolean prepare_hook
+(
+ Hook_State * hook,
+ int default_status,
+ int hook_type
+){
+ return init_hook_type(hook, default_status,
+ hook_type, 0, NULL,
+ hookIds[hook_type].numHooks);
+}
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+static boolean prepare_mobj_hook
+(
+ Hook_State * hook,
+ int default_status,
+ int hook_type,
+ mobjtype_t mobj_type
+){
+#ifdef PARANOIA
+ if (mobj_type == MT_NULL)
+ I_Error("MT_NULL has been passed to a mobj hook\n");
+#endif
+ return init_hook_type(hook, default_status,
+ hook_type, mobj_type, NULL,
+ mobj_hook_available(hook_type, mobj_type));
+}
- for (hookp = roothook; hookp; hookp = hookp->next)
+static boolean prepare_string_hook
+(
+ Hook_State * hook,
+ int default_status,
+ int hook_type,
+ const char * string
+){
+ if (init_hook_type(hook, default_status,
+ hook_type, 0, string,
+ stringHooks[hook_type].ref))
{
- if (hookp->type != hook_PreThinkFrame)
- continue;
-
- PushHook(gL, hookp);
- if (lua_pcall(gL, 0, 0, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- }
+ lua_pushstring(gL, string);
+ return begin_hook_values(hook);
}
+ else
+ return false;
+}
- lua_pop(gL, 1); // Pop error handler
+static void init_hook_call
+(
+ Hook_State * hook,
+ int results,
+ Hook_Callback results_handler
+){
+ const int top = lua_gettop(gL);
+ hook->values = (top - hook->top);
+ hook->top = top;
+ hook->results = results;
+ hook->results_handler = results_handler;
}
-// Hook for frame (after mobj and player thinkers)
-void LUAh_ThinkFrame(void)
+static void get_hook(Hook_State *hook, const int *ids, int n)
{
- hook_p hookp;
- // variables used by perf stats
- int hook_index = 0;
- precise_t time_taken = 0;
- if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
- return;
+ hook->id = ids[n];
+ lua_getref(gL, hookRefs[hook->id]);
+}
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+static void get_hook_from_table(Hook_State *hook, int n)
+{
+ lua_rawgeti(gL, -1, n);
+ hook->id = lua_tonumber(gL, -1);
+ lua_pop(gL, 1);
+ lua_getref(gL, hookRefs[hook->id]);
+}
- for (hookp = roothook; hookp; hookp = hookp->next)
+static int call_single_hook_no_copy(Hook_State *hook)
+{
+ if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
{
- if (hookp->type != hook_ThinkFrame)
- continue;
-
- if (cv_perfstats.value == 3)
- time_taken = I_GetPreciseTime();
- PushHook(gL, hookp);
- if (lua_pcall(gL, 0, 0, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
+ if (hook->results > 0)
+ {
+ (*hook->results_handler)(hook);
+ lua_pop(gL, hook->results);
}
- if (cv_perfstats.value == 3)
+ }
+ else
+ {
+ /* print the error message once */
+ if (cv_debug & DBG_LUA || !in_bit_array(hooksErrored, hook->id))
{
- lua_Debug ar;
- time_taken = I_GetPreciseTime() - time_taken;
- // we need the function, let's just retrieve it again
- PushHook(gL, hookp);
- lua_getinfo(gL, ">S", &ar);
- PS_SetThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
- hook_index++;
+ CONS_Alert(CONS_WARNING, "%s\n", lua_tostring(gL, -1));
+ set_bit_array(hooksErrored, hook->id);
}
+ lua_pop(gL, 1);
}
- lua_pop(gL, 1); // Pop error handler
+ return 1;
}
-// Hook for frame (at end of tick, ie after overlays, precipitation, specials)
-void LUAh_PostThinkFrame(void)
+static int call_single_hook(Hook_State *hook)
{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_PostThinkFrame/8] & (1<<(hook_PostThinkFrame%8))))
- return;
+ int i;
+
+ for (i = -(hook->values) + 1; i <= 0; ++i)
+ lua_pushvalue(gL, hook->top + i);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ return call_single_hook_no_copy(hook);
+}
+
+static int call_hook_table_for(Hook_State *hook, int n)
+{
+ int k;
- for (hookp = roothook; hookp; hookp = hookp->next)
+ for (k = 1; k <= n; ++k)
{
- if (hookp->type != hook_PostThinkFrame)
- continue;
-
- PushHook(gL, hookp);
- if (lua_pcall(gL, 0, 0, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- }
+ get_hook_from_table(hook, k);
+ call_single_hook(hook);
}
- lua_pop(gL, 1); // Pop error handler
+ return n;
}
-// Hook for mobj collisions
-UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
+static int call_hook_table(Hook_State *hook)
{
- hook_p hookp;
- UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no.
- if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
- return 0;
+ return call_hook_table_for(hook, lua_objlen(gL, -1));
+}
+
+static int call_mapped(Hook_State *hook, const hook_t *map)
+{
+ int k;
- I_Assert(thing1->type < NUMMOBJTYPES);
+ for (k = 0; k < map->numHooks; ++k)
+ {
+ get_hook(hook, map->ids, k);
+ call_single_hook(hook);
+ }
- if (!(mobjcollidehooks[MT_NULL] || mobjcollidehooks[thing1->type]))
- return 0;
+ return map->numHooks;
+}
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+static int call_string_hooks(Hook_State *hook)
+{
+ const stringhook_t *map = &stringHooks[hook->hook_type];
- // Look for all generic mobj collision hooks
- for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
- {
- if (hookp->type != which)
- continue;
+ int calls = 0;
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, thing1, META_MOBJ);
- LUA_PushUserdata(gL, thing2, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- { // if nil, leave shouldCollide = 0.
- if (lua_toboolean(gL, -1))
- shouldCollide = 1; // Force yes
- else
- shouldCollide = 2; // Force no
- }
- lua_pop(gL, 1);
- }
+ lua_getref(gL, map->ref);
- for (hookp = mobjcollidehooks[thing1->type]; hookp; hookp = hookp->next)
- {
- if (hookp->type != which)
- continue;
+ /* call generic string hooks first */
+ calls += call_hook_table_for(hook, map->numGeneric);
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, thing1, META_MOBJ);
- LUA_PushUserdata(gL, thing2, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- { // if nil, leave shouldCollide = 0.
- if (lua_toboolean(gL, -1))
- shouldCollide = 1; // Force yes
- else
- shouldCollide = 2; // Force no
- }
- lua_pop(gL, 1);
- }
+ push_string();
+ lua_rawget(gL, -2);
+ calls += call_hook_table(hook);
- lua_settop(gL, 0);
- return shouldCollide;
+ return calls;
}
-UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
+static int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
{
- hook_p hookp;
- UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no.
- if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
- return 0;
-
- I_Assert(thing->type < NUMMOBJTYPES);
+ return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
+}
- if (!(mobjcollidehooks[MT_NULL] || mobjcollidehooks[thing->type]))
- return 0;
+static int call_hooks
+(
+ Hook_State * hook,
+ int results,
+ Hook_Callback results_handler
+){
+ int calls = 0;
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ init_hook_call(hook, results, results_handler);
- // Look for all generic mobj collision hooks
- for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
+ if (hook->string)
{
- if (hookp->type != which)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, thing, META_MOBJ);
- LUA_PushUserdata(gL, line, META_LINE);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- { // if nil, leave shouldCollide = 0.
- if (lua_toboolean(gL, -1))
- shouldCollide = 1; // Force yes
- else
- shouldCollide = 2; // Force no
- }
- lua_pop(gL, 1);
+ calls += call_string_hooks(hook);
}
-
- for (hookp = mobjcollidehooks[thing->type]; hookp; hookp = hookp->next)
+ else if (hook->mobj_type > 0)
{
- if (hookp->type != which)
- continue;
+ /* call generic mobj hooks first */
+ calls += call_mobj_type_hooks(hook, MT_NULL);
+ calls += call_mobj_type_hooks(hook, hook->mobj_type);
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, thing, META_MOBJ);
- LUA_PushUserdata(gL, line, META_LINE);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- { // if nil, leave shouldCollide = 0.
- if (lua_toboolean(gL, -1))
- shouldCollide = 1; // Force yes
- else
- shouldCollide = 2; // Force no
- }
- lua_pop(gL, 1);
+ ps_lua_mobjhooks.value.i += calls;
}
+ else
+ calls += call_mapped(hook, &hookIds[hook->hook_type]);
lua_settop(gL, 0);
- return shouldCollide;
+
+ return calls;
}
-// Hook for mobj thinkers
-boolean LUAh_MobjThinker(mobj_t *mo)
-{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_MobjThinker/8] & (1<<(hook_MobjThinker%8))))
- return false;
+/* =========================================================================
+ COMMON RESULT HANDLERS
+ ========================================================================= */
- I_Assert(mo->type < NUMMOBJTYPES);
+#define res_none NULL
- if (!(mobjthinkerhooks[MT_NULL] || mobjthinkerhooks[mo->type]))
- return false;
+static void res_true(Hook_State *hook)
+{
+ if (lua_toboolean(gL, -1))
+ hook->status = true;
+}
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+static void res_false(Hook_State *hook)
+{
+ if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1))
+ hook->status = false;
+}
- // Look for all generic mobj thinker hooks
- for (hookp = mobjthinkerhooks[MT_NULL]; hookp; hookp = hookp->next)
+static void res_force(Hook_State *hook)
+{
+ if (!lua_isnil(gL, -1))
{
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- LUA_PushUserdata(gL, mo, META_MOBJ);
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ hook->status = 1; // Force yes
+ else
+ hook->status = 2; // Force no
}
+}
+
+/* =========================================================================
+ GENERALISED HOOKS
+ ========================================================================= */
- for (hookp = mobjthinkerhooks[mo->type]; hookp; hookp = hookp->next)
+int LUA_HookMobj(mobj_t *mobj, int hook_type)
+{
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, false, hook_type, mobj->type))
{
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- LUA_PushUserdata(gL, mo, META_MOBJ);
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, mobj, META_MOBJ);
+ call_hooks(&hook, 1, res_true);
}
-
- lua_settop(gL, 0);
- return hooked;
+ return hook.status;
}
-// Hook for P_TouchSpecialThing by mobj type
-boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
+int LUA_Hook2Mobj(mobj_t *t1, mobj_t *t2, int hook_type)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_TouchSpecial/8] & (1<<(hook_TouchSpecial%8))))
- return false;
-
- I_Assert(special->type < NUMMOBJTYPES);
-
- if (!(mobjhooks[MT_NULL] || mobjhooks[special->type]))
- return false;
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, 0, hook_type, t1->type))
+ {
+ LUA_PushUserdata(gL, t1, META_MOBJ);
+ LUA_PushUserdata(gL, t2, META_MOBJ);
+ call_hooks(&hook, 1, res_force);
+ }
+ return hook.status;
+}
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+void LUA_HookVoid(int type)
+{
+ Hook_State hook;
+ if (prepare_hook(&hook, 0, type))
+ call_hooks(&hook, 0, res_none);
+}
- // Look for all generic touch special hooks
- for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
+void LUA_HookInt(INT32 number, int hook_type)
+{
+ Hook_State hook;
+ if (prepare_hook(&hook, 0, hook_type))
{
- if (hookp->type != hook_TouchSpecial)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, special, META_MOBJ);
- LUA_PushUserdata(gL, toucher, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ lua_pushinteger(gL, number);
+ call_hooks(&hook, 0, res_none);
}
+}
- for (hookp = mobjhooks[special->type]; hookp; hookp = hookp->next)
+void LUA_HookBool(boolean value, int hook_type)
+{
+ Hook_State hook;
+ if (prepare_hook(&hook, 0, hook_type))
{
- if (hookp->type != hook_TouchSpecial)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, special, META_MOBJ);
- LUA_PushUserdata(gL, toucher, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ lua_pushboolean(gL, value);
+ call_hooks(&hook, 0, res_none);
}
+}
- lua_settop(gL, 0);
- return hooked;
+int LUA_HookPlayer(player_t *player, int hook_type)
+{
+ Hook_State hook;
+ if (prepare_hook(&hook, false, hook_type))
+ {
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ call_hooks(&hook, 1, res_true);
+ }
+ return hook.status;
}
-// Hook for P_DamageMobj by mobj type (Should mobj take damage?)
-UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
+int LUA_HookTiccmd(player_t *player, ticcmd_t *cmd, int hook_type)
{
- hook_p hookp;
- UINT8 shouldDamage = 0; // 0 = default, 1 = force yes, 2 = force no.
- if (!gL || !(hooksAvailable[hook_ShouldDamage/8] & (1<<(hook_ShouldDamage%8))))
- return 0;
+ Hook_State hook;
+ if (prepare_hook(&hook, false, hook_type))
+ {
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, cmd, META_TICCMD);
- I_Assert(target->type < NUMMOBJTYPES);
+ if (hook_type == HOOK(PlayerCmd))
+ hook_cmd_running = true;
- if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
- return 0;
+ call_hooks(&hook, 1, res_true);
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ if (hook_type == HOOK(PlayerCmd))
+ hook_cmd_running = false;
+ }
+ return hook.status;
+}
- // Look for all generic should damage hooks
- for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
+int LUA_HookKey(event_t *event, int hook_type)
+{
+ Hook_State hook;
+ if (prepare_hook(&hook, false, hook_type))
{
- if (hookp->type != hook_ShouldDamage)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, target, META_MOBJ);
- LUA_PushUserdata(gL, inflictor, META_MOBJ);
- LUA_PushUserdata(gL, source, META_MOBJ);
- lua_pushinteger(gL, damage);
- lua_pushinteger(gL, damagetype);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- {
- if (lua_toboolean(gL, -1))
- shouldDamage = 1; // Force yes
- else
- shouldDamage = 2; // Force no
- }
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, event, META_KEYEVENT);
+ call_hooks(&hook, 1, res_true);
}
+ return hook.status;
+}
- for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next)
+void LUA_HookHUD(int hook_type)
+{
+ const hook_t * map = &hudHookIds[hook_type];
+ Hook_State hook;
+ if (map->numHooks > 0)
{
- if (hookp->type != hook_ShouldDamage)
- continue;
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, target, META_MOBJ);
- LUA_PushUserdata(gL, inflictor, META_MOBJ);
- LUA_PushUserdata(gL, source, META_MOBJ);
- lua_pushinteger(gL, damage);
- lua_pushinteger(gL, damagetype);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- {
- if (lua_toboolean(gL, -1))
- shouldDamage = 1; // Force yes
- else
- shouldDamage = 2; // Force no
- }
- lua_pop(gL, 1);
- }
+ start_hook_stack();
+ begin_hook_values(&hook);
- lua_settop(gL, 0);
- return shouldDamage;
+ LUA_SetHudHook(hook_type);
+
+ hud_running = true; // local hook
+ init_hook_call(&hook, 0, res_none);
+ call_mapped(&hook, map);
+ hud_running = false;
+ }
}
-// Hook for P_DamageMobj by mobj type (Mobj actually takes damage!)
-boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
+/* =========================================================================
+ SPECIALIZED HOOKS
+ ========================================================================= */
+
+void LUA_HookThinkFrame(void)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_MobjDamage/8] & (1<<(hook_MobjDamage%8))))
- return false;
+ const int type = HOOK(ThinkFrame);
- I_Assert(target->type < NUMMOBJTYPES);
+ // variables used by perf stats
+ int hook_index = 0;
+ precise_t time_taken = 0;
- if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
- return false;
+ Hook_State hook;
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ const hook_t * map = &hookIds[type];
+ int k;
- // Look for all generic mobj damage hooks
- for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
+ if (prepare_hook(&hook, 0, type))
{
- if (hookp->type != hook_MobjDamage)
- continue;
+ init_hook_call(&hook, 0, res_none);
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
+ for (k = 0; k < map->numHooks; ++k)
{
- LUA_PushUserdata(gL, target, META_MOBJ);
- LUA_PushUserdata(gL, inflictor, META_MOBJ);
- LUA_PushUserdata(gL, source, META_MOBJ);
- lua_pushinteger(gL, damage);
- lua_pushinteger(gL, damagetype);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
+ get_hook(&hook, map->ids, k);
+
+ if (cv_perfstats.value == 3)
+ {
+ lua_pushvalue(gL, -1);/* need the function again */
+ time_taken = I_GetPreciseTime();
+ }
+
+ call_single_hook(&hook);
+
+ if (cv_perfstats.value == 3)
+ {
+ lua_Debug ar;
+ time_taken = I_GetPreciseTime() - time_taken;
+ lua_getinfo(gL, ">S", &ar);
+ PS_SetThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
+ hook_index++;
+ }
}
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+
+ lua_settop(gL, 0);
}
+}
- for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next)
+int LUA_HookMobjLineCollide(mobj_t *mobj, line_t *line)
+{
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, 0, MOBJ_HOOK(MobjLineCollide), mobj->type))
{
- if (hookp->type != hook_MobjDamage)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, target, META_MOBJ);
- LUA_PushUserdata(gL, inflictor, META_MOBJ);
- LUA_PushUserdata(gL, source, META_MOBJ);
- lua_pushinteger(gL, damage);
- lua_pushinteger(gL, damagetype);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, mobj, META_MOBJ);
+ LUA_PushUserdata(gL, line, META_LINE);
+ call_hooks(&hook, 1, res_force);
}
-
- lua_settop(gL, 0);
- return hooked;
+ return hook.status;
}
-// Hook for P_KillMobj by mobj type
-boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype)
+int LUA_HookTouchSpecial(mobj_t *special, mobj_t *toucher)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_MobjDeath/8] & (1<<(hook_MobjDeath%8))))
- return false;
-
- I_Assert(target->type < NUMMOBJTYPES);
-
- if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
- return false;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- // Look for all generic mobj death hooks
- for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(TouchSpecial), special->type))
{
- if (hookp->type != hook_MobjDeath)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, target, META_MOBJ);
- LUA_PushUserdata(gL, inflictor, META_MOBJ);
- LUA_PushUserdata(gL, source, META_MOBJ);
- lua_pushinteger(gL, damagetype);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, special, META_MOBJ);
+ LUA_PushUserdata(gL, toucher, META_MOBJ);
+ call_hooks(&hook, 1, res_true);
}
+ return hook.status;
+}
- for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next)
+static int damage_hook
+(
+ mobj_t *target,
+ mobj_t *inflictor,
+ mobj_t *source,
+ INT32 damage,
+ UINT8 damagetype,
+ int hook_type,
+ Hook_Callback results_handler
+){
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, 0, hook_type, target->type))
{
- if (hookp->type != hook_MobjDeath)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, target, META_MOBJ);
- LUA_PushUserdata(gL, inflictor, META_MOBJ);
- LUA_PushUserdata(gL, source, META_MOBJ);
- lua_pushinteger(gL, damagetype);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, target, META_MOBJ);
+ LUA_PushUserdata(gL, inflictor, META_MOBJ);
+ LUA_PushUserdata(gL, source, META_MOBJ);
+ if (hook_type != MOBJ_HOOK(MobjDeath))
+ lua_pushinteger(gL, damage);
+ lua_pushinteger(gL, damagetype);
+ call_hooks(&hook, 1, results_handler);
}
-
- lua_settop(gL, 0);
- return hooked;
+ return hook.status;
}
-// Hook for B_BuildTiccmd
-boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd)
+int LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_BotTiccmd/8] & (1<<(hook_BotTiccmd%8))))
- return false;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = roothook; hookp; hookp = hookp->next)
- {
- if (hookp->type != hook_BotTiccmd)
- continue;
-
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, bot, META_PLAYER);
- LUA_PushUserdata(gL, cmd, META_TICCMD);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
- }
-
- lua_settop(gL, 0);
- return hooked;
+ return damage_hook(target, inflictor, source, damage, damagetype,
+ MOBJ_HOOK(ShouldDamage), res_force);
}
-// Hook for B_BuildTailsTiccmd by skin name
-boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
+int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_BotAI/8] & (1<<(hook_BotAI%8))))
- return false;
+ return damage_hook(target, inflictor, source, damage, damagetype,
+ MOBJ_HOOK(MobjDamage), res_true);
+}
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype)
+{
+ return damage_hook(target, inflictor, source, 0, damagetype,
+ MOBJ_HOOK(MobjDeath), res_true);
+}
- for (hookp = roothook; hookp; hookp = hookp->next)
+int LUA_HookMobjMoveBlocked(mobj_t *t1, mobj_t *t2, line_t *line)
+{
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, 0, MOBJ_HOOK(MobjMoveBlocked), t1->type))
{
- if (hookp->type != hook_BotAI
- || (hookp->s.str && strcmp(hookp->s.str, ((skin_t*)tails->skin)->name)))
- continue;
-
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, sonic, META_MOBJ);
- LUA_PushUserdata(gL, tails, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 8, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
-
- // This turns forward, backward, left, right, jump, and spin into a proper ticcmd for tails.
- if (lua_istable(gL, 2+1)) {
- boolean forward=false, backward=false, left=false, right=false, strafeleft=false, straferight=false, jump=false, spin=false;
-#define CHECKFIELD(field) \
- lua_getfield(gL, 2+1, #field);\
- if (lua_toboolean(gL, -1))\
- field = true;\
- lua_pop(gL, 1);
-
- CHECKFIELD(forward)
- CHECKFIELD(backward)
- CHECKFIELD(left)
- CHECKFIELD(right)
- CHECKFIELD(strafeleft)
- CHECKFIELD(straferight)
- CHECKFIELD(jump)
- CHECKFIELD(spin)
-#undef CHECKFIELD
- B_KeysToTiccmd(tails, cmd, forward, backward, left, right, strafeleft, straferight, jump, spin);
- } else
- B_KeysToTiccmd(tails, cmd, lua_toboolean(gL, 2+1), lua_toboolean(gL, 2+2), lua_toboolean(gL, 2+3), lua_toboolean(gL, 2+4), lua_toboolean(gL, 2+5), lua_toboolean(gL, 2+6), lua_toboolean(gL, 2+7), lua_toboolean(gL, 2+8));
-
- lua_pop(gL, 8);
- hooked = true;
+ LUA_PushUserdata(gL, t1, META_MOBJ);
+ LUA_PushUserdata(gL, t2, META_MOBJ);
+ LUA_PushUserdata(gL, line, META_LINE);
+ call_hooks(&hook, 1, res_true);
}
-
- lua_settop(gL, 0);
- return hooked;
+ return hook.status;
}
-// Hook for B_CheckRespawn
-boolean LUAh_BotRespawn(mobj_t *sonic, mobj_t *tails)
-{
- hook_p hookp;
- UINT8 shouldRespawn = 0; // 0 = default, 1 = force yes, 2 = force no.
- if (!gL || !(hooksAvailable[hook_BotRespawn/8] & (1<<(hook_BotRespawn%8))))
- return false;
+typedef struct {
+ mobj_t * tails;
+ ticcmd_t * cmd;
+} BotAI_State;
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+static boolean checkbotkey(const char *field)
+{
+ return lua_toboolean(gL, -1) && strcmp(lua_tostring(gL, -2), field) == 0;
+}
- for (hookp = roothook; hookp; hookp = hookp->next)
- {
- if (hookp->type != hook_BotRespawn)
- continue;
+static void res_botai(Hook_State *hook)
+{
+ BotAI_State *botai = hook->userdata;
+
+ int k[8];
+
+ int fields = 0;
+
+ // This turns forward, backward, left, right, jump, and spin into a proper ticcmd for tails.
+ if (lua_istable(gL, -8)) {
+ lua_pushnil(gL); // key
+ while (lua_next(gL, -9)) {
+#define CHECK(n, f) (checkbotkey(f) ? (k[(n)-1] = 1) : 0)
+ if (
+ CHECK(1, "forward") || CHECK(2, "backward") ||
+ CHECK(3, "left") || CHECK(4, "right") ||
+ CHECK(5, "strafeleft") || CHECK(6, "straferight") ||
+ CHECK(7, "jump") || CHECK(8, "spin")
+ ){
+ if (8 <= ++fields)
+ {
+ lua_pop(gL, 2); // pop key and value
+ break;
+ }
+ }
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, sonic, META_MOBJ);
- LUA_PushUserdata(gL, tails, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
+ lua_pop(gL, 1); // pop value
+#undef CHECK
}
- if (!lua_isnil(gL, -1))
+ } else {
+ while (fields < 8)
{
- if (lua_toboolean(gL, -1))
- shouldRespawn = 1; // Force yes
- else
- shouldRespawn = 2; // Force no
+ k[fields] = lua_toboolean(gL, -8 + fields);
+ fields++;
}
- lua_pop(gL, 1);
}
- lua_settop(gL, 0);
- return shouldRespawn;
+ B_KeysToTiccmd(botai->tails, botai->cmd,
+ k[0],k[1],k[2],k[3],k[4],k[5],k[6],k[7]);
+
+ hook->status = true;
}
-// Hook for linedef executors
-boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
+int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_LinedefExecute/8] & (1<<(hook_LinedefExecute%8))))
- return 0;
+ const char *skin = ((skin_t *)tails->skin)->name;
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ Hook_State hook;
+ BotAI_State botai;
- for (hookp = linedefexecutorhooks; hookp; hookp = hookp->next)
+ if (prepare_string_hook(&hook, false, STRING_HOOK(BotAI), skin))
{
- if (strcmp(hookp->s.str, line->stringargs[0]))
- continue;
+ LUA_PushUserdata(gL, sonic, META_MOBJ);
+ LUA_PushUserdata(gL, tails, META_MOBJ);
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, line, META_LINE);
- LUA_PushUserdata(gL, mo, META_MOBJ);
- LUA_PushUserdata(gL, sector, META_SECTOR);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -4);
- lua_pushvalue(gL, -4);
- lua_pushvalue(gL, -4);
- if (lua_pcall(gL, 3, 0, 1)) {
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- }
- hooked = true;
+ botai.tails = tails;
+ botai.cmd = cmd;
+
+ hook.userdata = &botai;
+
+ call_hooks(&hook, 8, res_botai);
}
- lua_settop(gL, 0);
- return hooked;
+ return hook.status;
}
-
-boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg)
+void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_PlayerMsg/8] & (1<<(hook_PlayerMsg%8))))
- return false;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = roothook; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_string_hook
+ (&hook, 0, STRING_HOOK(LinedefExecute), line->stringargs[0]))
{
- if (hookp->type != hook_PlayerMsg)
- continue;
-
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
- if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c
- lua_pushinteger(gL, 3); // type
- lua_pushnil(gL); // target
- } else if (target == -1) { // sayteam
- lua_pushinteger(gL, 1); // type
- lua_pushnil(gL); // target
- } else if (target == 0) { // say
- lua_pushinteger(gL, 0); // type
- lua_pushnil(gL); // target
- } else { // sayto
- lua_pushinteger(gL, 2); // type
- LUA_PushUserdata(gL, &players[target-1], META_PLAYER); // target
- }
- lua_pushstring(gL, msg); // msg
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, line, META_LINE);
+ LUA_PushUserdata(gL, mo, META_MOBJ);
+ LUA_PushUserdata(gL, sector, META_SECTOR);
+ ps_lua_mobjhooks.value.i += call_hooks(&hook, 0, res_none);
}
-
- lua_settop(gL, 0);
- return hooked;
}
-
-// Hook for hurt messages
-boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 damagetype)
+int LUA_HookPlayerMsg(int source, int target, int flags, char *msg)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_HurtMsg/8] & (1<<(hook_HurtMsg%8))))
- return false;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = roothook; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, false, HOOK(PlayerMsg)))
{
- if (hookp->type != hook_HurtMsg
- || (hookp->s.mt && !(inflictor && hookp->s.mt == inflictor->type)))
- continue;
-
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- LUA_PushUserdata(gL, inflictor, META_MOBJ);
- LUA_PushUserdata(gL, source, META_MOBJ);
- lua_pushinteger(gL, damagetype);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
+ if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c
+ lua_pushinteger(gL, 3); // type
+ lua_pushnil(gL); // target
+ } else if (target == -1) { // sayteam
+ lua_pushinteger(gL, 1); // type
+ lua_pushnil(gL); // target
+ } else if (target == 0) { // say
+ lua_pushinteger(gL, 0); // type
+ lua_pushnil(gL); // target
+ } else { // sayto
+ lua_pushinteger(gL, 2); // type
+ LUA_PushUserdata(gL, &players[target-1], META_PLAYER); // target
+ }
+ lua_pushstring(gL, msg); // msg
+ call_hooks(&hook, 1, res_true);
}
-
- lua_settop(gL, 0);
- return hooked;
+ return hook.status;
}
-void LUAh_NetArchiveHook(lua_CFunction archFunc)
+int LUA_HookHurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8 damagetype)
{
- hook_p hookp;
- int errorhandlerindex;
- if (!gL || !(hooksAvailable[hook_NetVars/8] & (1<<(hook_NetVars%8))))
- return;
-
- // stack: tables
- I_Assert(lua_gettop(gL) > 0);
- I_Assert(lua_istable(gL, -1));
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
- errorhandlerindex = lua_gettop(gL);
-
- // tables becomes an upvalue of archFunc
- lua_pushvalue(gL, -2);
- lua_pushcclosure(gL, archFunc, 1);
- // stack: tables, archFunc
-
- for (hookp = roothook; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, false, HOOK(HurtMsg)))
{
- if (hookp->type != hook_NetVars)
- continue;
-
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2); // archFunc
- if (lua_pcall(gL, 1, 0, errorhandlerindex)) {
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- }
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, inflictor, META_MOBJ);
+ LUA_PushUserdata(gL, source, META_MOBJ);
+ lua_pushinteger(gL, damagetype);
+ call_hooks(&hook, 1, res_true);
}
-
- lua_pop(gL, 2); // Pop archFunc and error handler
- // stack: tables
+ return hook.status;
}
-boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
+void LUA_HookNetArchive(lua_CFunction archFunc)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_MapThingSpawn/8] & (1<<(hook_MapThingSpawn%8))))
- return false;
-
- if (!(mobjhooks[MT_NULL] || mobjhooks[mo->type]))
- return false;
+ const hook_t * map = &hookIds[HOOK(NetVars)];
+ Hook_State hook;
+ /* this is a remarkable case where the stack isn't reset */
+ if (map->numHooks > 0)
+ {
+ // stack: tables
+ I_Assert(lua_gettop(gL) > 0);
+ I_Assert(lua_istable(gL, -1));
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ push_error_handler();
+ lua_insert(gL, EINDEX);
- // Look for all generic mobj map thing spawn hooks
- for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
- {
- if (hookp->type != hook_MapThingSpawn)
- continue;
+ begin_hook_values(&hook);
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, mo, META_MOBJ);
- LUA_PushUserdata(gL, mthing, META_MAPTHING);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
- }
+ // tables becomes an upvalue of archFunc
+ lua_pushvalue(gL, -1);
+ lua_pushcclosure(gL, archFunc, 1);
+ // stack: tables, archFunc
- for (hookp = mobjhooks[mo->type]; hookp; hookp = hookp->next)
- {
- if (hookp->type != hook_MapThingSpawn)
- continue;
+ init_hook_call(&hook, 0, res_none);
+ call_mapped(&hook, map);
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, mo, META_MOBJ);
- LUA_PushUserdata(gL, mthing, META_MAPTHING);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ lua_pop(gL, 1); // pop archFunc
+ lua_remove(gL, EINDEX); // pop error handler
+ // stack: tables
}
-
- lua_settop(gL, 0);
- return hooked;
}
-// Hook for P_PlayerAfterThink Smiles mobj-following
-boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
+int LUA_HookMapThingSpawn(mobj_t *mobj, mapthing_t *mthing)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_FollowMobj/8] & (1<<(hook_FollowMobj%8))))
- return 0;
-
- if (!(mobjhooks[MT_NULL] || mobjhooks[mobj->type]))
- return 0;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- // Look for all generic mobj follow item hooks
- for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(MapThingSpawn), mobj->type))
{
- if (hookp->type != hook_FollowMobj)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- LUA_PushUserdata(gL, mobj, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, mobj, META_MOBJ);
+ LUA_PushUserdata(gL, mthing, META_MAPTHING);
+ call_hooks(&hook, 1, res_true);
}
+ return hook.status;
+}
- for (hookp = mobjhooks[mobj->type]; hookp; hookp = hookp->next)
+int LUA_HookFollowMobj(player_t *player, mobj_t *mobj)
+{
+ Hook_State hook;
+ if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(FollowMobj), mobj->type))
{
- if (hookp->type != hook_FollowMobj)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- LUA_PushUserdata(gL, mobj, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, mobj, META_MOBJ);
+ call_hooks(&hook, 1, res_true);
}
-
- lua_settop(gL, 0);
- return hooked;
+ return hook.status;
}
-// Hook for P_PlayerCanDamage
-UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj)
+int LUA_HookPlayerCanDamage(player_t *player, mobj_t *mobj)
{
- hook_p hookp;
- UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no.
- if (!gL || !(hooksAvailable[hook_PlayerCanDamage/8] & (1<<(hook_PlayerCanDamage%8))))
- return 0;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, 0, HOOK(PlayerCanDamage)))
{
- if (hookp->type != hook_PlayerCanDamage)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- LUA_PushUserdata(gL, mobj, META_MOBJ);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- { // if nil, leave shouldCollide = 0.
- if (lua_toboolean(gL, -1))
- shouldCollide = 1; // Force yes
- else
- shouldCollide = 2; // Force no
- }
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, mobj, META_MOBJ);
+ call_hooks(&hook, 1, res_force);
}
-
- lua_settop(gL, 0);
- return shouldCollide;
+ return hook.status;
}
-void LUAh_PlayerQuit(player_t *plr, kickreason_t reason)
+void LUA_HookPlayerQuit(player_t *plr, kickreason_t reason)
{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_PlayerQuit/8] & (1<<(hook_PlayerQuit%8))))
- return;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = roothook; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, 0, HOOK(PlayerQuit)))
{
- if (hookp->type != hook_PlayerQuit)
- continue;
-
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit
- lua_pushinteger(gL, reason); // Reason for quitting
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 0, 1)) {
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- }
+ LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit
+ lua_pushinteger(gL, reason); // Reason for quitting
+ call_hooks(&hook, 0, res_none);
}
-
- lua_settop(gL, 0);
}
-// Hook for Y_Ticker
-void LUAh_IntermissionThinker(void)
+int LUA_HookTeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble)
{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_IntermissionThinker/8] & (1<<(hook_IntermissionThinker%8))))
- return;
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = roothook; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, true, HOOK(TeamSwitch)))
{
- if (hookp->type != hook_IntermissionThinker)
- continue;
-
- PushHook(gL, hookp);
- if (lua_pcall(gL, 0, 0, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- }
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ lua_pushinteger(gL, newteam);
+ lua_pushboolean(gL, fromspectators);
+ lua_pushboolean(gL, tryingautobalance);
+ lua_pushboolean(gL, tryingscramble);
+ call_hooks(&hook, 1, res_false);
}
-
- lua_pop(gL, 1); // Pop error handler
+ return hook.status;
}
-// Hook for team switching
-// It's just an edit of LUAh_ViewpointSwitch.
-boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble)
+int LUA_HookViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced)
{
- hook_p hookp;
- boolean canSwitchTeam = true;
- if (!gL || !(hooksAvailable[hook_TeamSwitch/8] & (1<<(hook_TeamSwitch%8))))
- return true;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, 0, HOOK(ViewpointSwitch)))
{
- if (hookp->type != hook_TeamSwitch)
- continue;
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, newdisplayplayer, META_PLAYER);
+ lua_pushboolean(gL, forced);
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- lua_pushinteger(gL, newteam);
- lua_pushboolean(gL, fromspectators);
- lua_pushboolean(gL, tryingautobalance);
- lua_pushboolean(gL, tryingscramble);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- lua_pushvalue(gL, -6);
- if (lua_pcall(gL, 5, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1))
- canSwitchTeam = false; // Can't switch team
- lua_pop(gL, 1);
+ hud_running = true; // local hook
+ call_hooks(&hook, 1, res_force);
+ hud_running = false;
}
-
- lua_settop(gL, 0);
- return canSwitchTeam;
+ return hook.status;
}
-// Hook for spy mode
-UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced)
+int LUA_HookSeenPlayer(player_t *player, player_t *seenfriend)
{
- hook_p hookp;
- UINT8 canSwitchView = 0; // 0 = default, 1 = force yes, 2 = force no.
- if (!gL || !(hooksAvailable[hook_ViewpointSwitch/8] & (1<<(hook_ViewpointSwitch%8))))
- return 0;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- hud_running = true; // local hook
-
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, true, HOOK(SeenPlayer)))
{
- if (hookp->type != hook_ViewpointSwitch)
- continue;
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, seenfriend, META_PLAYER);
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- LUA_PushUserdata(gL, newdisplayplayer, META_PLAYER);
- lua_pushboolean(gL, forced);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -4);
- lua_pushvalue(gL, -4);
- lua_pushvalue(gL, -4);
- if (lua_pcall(gL, 3, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- { // if nil, leave canSwitchView = 0.
- if (lua_toboolean(gL, -1))
- canSwitchView = 1; // Force viewpoint switch
- else
- canSwitchView = 2; // Skip viewpoint switch
- }
- lua_pop(gL, 1);
+ hud_running = true; // local hook
+ call_hooks(&hook, 1, res_false);
+ hud_running = false;
}
-
- lua_settop(gL, 0);
-
- hud_running = false;
-
- return canSwitchView;
+ return hook.status;
}
-// Hook for MT_NAMECHECK
-boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
+int LUA_HookShouldJingleContinue(player_t *player, const char *musname)
{
- hook_p hookp;
- boolean hasSeenPlayer = true;
- if (!gL || !(hooksAvailable[hook_SeenPlayer/8] & (1<<(hook_SeenPlayer%8))))
- return true;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- hud_running = true; // local hook
-
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_string_hook
+ (&hook, false, STRING_HOOK(ShouldJingleContinue), musname))
{
- if (hookp->type != hook_SeenPlayer)
- continue;
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ push_string();
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- LUA_PushUserdata(gL, seenfriend, META_PLAYER);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1))
- hasSeenPlayer = false; // Hasn't seen player
- lua_pop(gL, 1);
+ hud_running = true; // local hook
+ call_hooks(&hook, 1, res_true);
+ hud_running = false;
}
-
- lua_settop(gL, 0);
-
- hud_running = false;
-
- return hasSeenPlayer;
+ return hook.status;
}
-boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname)
-{
- hook_p hookp;
- boolean keepplaying = false;
- if (!gL || !(hooksAvailable[hook_ShouldJingleContinue/8] & (1<<(hook_ShouldJingleContinue%8))))
- return true;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+boolean hook_cmd_running = false;
- hud_running = true; // local hook
+static void update_music_name(struct MusicChange *musicchange)
+{
+ size_t length;
+ const char * new = lua_tolstring(gL, -6, &length);
- for (hookp = roothook; hookp; hookp = hookp->next)
+ if (length < 7)
{
- if (hookp->type != hook_ShouldJingleContinue
- || (hookp->s.str && strcmp(hookp->s.str, musname)))
- continue;
-
- if (lua_gettop(gL) == 1)
- {
- LUA_PushUserdata(gL, player, META_PLAYER);
- lua_pushstring(gL, musname);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1) && lua_toboolean(gL, -1))
- keepplaying = true; // Keep playing this boolean
- lua_pop(gL, 1);
+ strcpy(musicchange->newname, new);
+ lua_pushvalue(gL, -6);/* may as well keep it for next call */
+ }
+ else
+ {
+ memcpy(musicchange->newname, new, 6);
+ musicchange->newname[6] = '\0';
+ lua_pushlstring(gL, new, 6);
}
- lua_settop(gL, 0);
-
- hud_running = false;
-
- return keepplaying;
+ lua_replace(gL, -7);
}
-// Hook for game quitting
-void LUAh_GameQuit(boolean quitting)
+static void res_musicchange(Hook_State *hook)
{
- hook_p hookp;
- if (!gL || !(hooksAvailable[hook_GameQuit/8] & (1<<(hook_GameQuit%8))))
- return;
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = roothook; hookp; hookp = hookp->next)
- {
- if (hookp->type != hook_GameQuit)
- continue;
-
- PushHook(gL, hookp);
- lua_pushboolean(gL, quitting);
- if (lua_pcall(gL, 1, 0, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- }
- }
-
- lua_pop(gL, 1); // Pop error handler
+ struct MusicChange *musicchange = hook->userdata;
+
+ // output 1: true, false, or string musicname override
+ if (lua_isstring(gL, -6))
+ update_music_name(musicchange);
+ else if (lua_isboolean(gL, -6) && lua_toboolean(gL, -6))
+ hook->status = true;
+
+ // output 2: mflags override
+ if (lua_isnumber(gL, -5))
+ *musicchange->mflags = lua_tonumber(gL, -5);
+ // output 3: looping override
+ if (lua_isboolean(gL, -4))
+ *musicchange->looping = lua_toboolean(gL, -4);
+ // output 4: position override
+ if (lua_isnumber(gL, -3))
+ *musicchange->position = lua_tonumber(gL, -3);
+ // output 5: prefadems override
+ if (lua_isnumber(gL, -2))
+ *musicchange->prefadems = lua_tonumber(gL, -2);
+ // output 6: fadeinms override
+ if (lua_isnumber(gL, -1))
+ *musicchange->fadeinms = lua_tonumber(gL, -1);
}
-// Hook for building player's ticcmd struct (Ported from SRB2Kart)
-boolean hook_cmd_running = false;
-boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd)
+int LUA_HookMusicChange(const char *oldname, struct MusicChange *param)
{
- hook_p hookp;
- boolean hooked = false;
- if (!gL || !(hooksAvailable[hook_PlayerCmd/8] & (1<<(hook_PlayerCmd%8))))
- return false;
+ const int type = HOOK(MusicChange);
+ const hook_t * map = &hookIds[type];
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
+ Hook_State hook;
- hook_cmd_running = true;
- for (hookp = roothook; hookp; hookp = hookp->next)
+ int k;
+
+ if (prepare_hook(&hook, false, type))
{
- if (hookp->type != hook_PlayerCmd)
- continue;
+ init_hook_call(&hook, 6, res_musicchange);
+ hook.values = 7;/* values pushed later */
+ hook.userdata = param;
+
+ lua_pushstring(gL, oldname);/* the only constant value */
+ lua_pushstring(gL, param->newname);/* semi constant */
- if (lua_gettop(gL) == 1)
+ for (k = 0; k < map->numHooks; ++k)
{
- LUA_PushUserdata(gL, player, META_PLAYER);
- LUA_PushUserdata(gL, cmd, META_TICCMD);
- }
- PushHook(gL, hookp);
- lua_pushvalue(gL, -3);
- lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
+ get_hook(&hook, map->ids, k);
+
+ lua_pushvalue(gL, -3);
+ lua_pushvalue(gL, -3);
+ lua_pushinteger(gL, *param->mflags);
+ lua_pushboolean(gL, *param->looping);
+ lua_pushinteger(gL, *param->position);
+ lua_pushinteger(gL, *param->prefadems);
+ lua_pushinteger(gL, *param->fadeinms);
+
+ call_single_hook_no_copy(&hook);
}
- if (lua_toboolean(gL, -1))
- hooked = true;
- lua_pop(gL, 1);
+
+ lua_settop(gL, 0);
}
- lua_settop(gL, 0);
- hook_cmd_running = false;
- return hooked;
+ return hook.status;
}
-// Hook for music changes
-boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping,
- UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms)
+static void res_playerheight(Hook_State *hook)
{
- hook_p hookp;
- boolean hooked = false;
-
- if (!gL || !(hooksAvailable[hook_MusicChange/8] & (1<<(hook_MusicChange%8))))
- return false;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = roothook; hookp; hookp = hookp->next)
- if (hookp->type == hook_MusicChange)
- {
- PushHook(gL, hookp);
- lua_pushstring(gL, oldname);
- lua_pushstring(gL, newname);
- lua_pushinteger(gL, *mflags);
- lua_pushboolean(gL, *looping);
- lua_pushinteger(gL, *position);
- lua_pushinteger(gL, *prefadems);
- lua_pushinteger(gL, *fadeinms);
- if (lua_pcall(gL, 7, 6, 1)) {
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL,-1));
- lua_pop(gL, 1);
- continue;
- }
-
- // output 1: true, false, or string musicname override
- if (lua_isboolean(gL, -6) && lua_toboolean(gL, -6))
- hooked = true;
- else if (lua_isstring(gL, -6))
- strncpy(newname, lua_tostring(gL, -6), 7);
- // output 2: mflags override
- if (lua_isnumber(gL, -5))
- *mflags = lua_tonumber(gL, -5);
- // output 3: looping override
- if (lua_isboolean(gL, -4))
- *looping = lua_toboolean(gL, -4);
- // output 4: position override
- if (lua_isnumber(gL, -3))
- *position = lua_tonumber(gL, -3);
- // output 5: prefadems override
- if (lua_isnumber(gL, -2))
- *prefadems = lua_tonumber(gL, -2);
- // output 6: fadeinms override
- if (lua_isnumber(gL, -1))
- *fadeinms = lua_tonumber(gL, -1);
-
- lua_pop(gL, 7); // Pop returned values and error handler
- }
-
- lua_settop(gL, 0);
- newname[6] = 0;
- return hooked;
+ if (!lua_isnil(gL, -1))
+ {
+ fixed_t returnedheight = lua_tonumber(gL, -1);
+ // 0 height has... strange results, but it's not problematic like negative heights are.
+ // when an object's height is set to a negative number directly with lua, it's forced to 0 instead.
+ // here, I think it's better to ignore negatives so that they don't replace any results of previous hooks!
+ if (returnedheight >= 0)
+ hook->status = returnedheight;
+ }
}
-// Hook for determining player height
-fixed_t LUAh_PlayerHeight(player_t *player)
+fixed_t LUA_HookPlayerHeight(player_t *player)
{
- hook_p hookp;
- fixed_t newheight = -1;
- if (!gL || !(hooksAvailable[hook_PlayerHeight/8] & (1<<(hook_PlayerHeight%8))))
- return newheight;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, -1, HOOK(PlayerHeight)))
{
- if (hookp->type != hook_PlayerHeight)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- LUA_PushUserdata(gL, player, META_PLAYER);
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- {
- fixed_t returnedheight = lua_tonumber(gL, -1);
- // 0 height has... strange results, but it's not problematic like negative heights are.
- // when an object's height is set to a negative number directly with lua, it's forced to 0 instead.
- // here, I think it's better to ignore negatives so that they don't replace any results of previous hooks!
- if (returnedheight >= 0)
- newheight = returnedheight;
- }
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ call_hooks(&hook, 1, res_playerheight);
}
-
- lua_settop(gL, 0);
- return newheight;
+ return hook.status;
}
-// Hook for determining whether players are allowed passage through spin gaps
-UINT8 LUAh_PlayerCanEnterSpinGaps(player_t *player)
+int LUA_HookPlayerCanEnterSpinGaps(player_t *player)
{
- hook_p hookp;
- UINT8 canEnter = 0; // 0 = default, 1 = force yes, 2 = force no.
- if (!gL || !(hooksAvailable[hook_PlayerCanEnterSpinGaps/8] & (1<<(hook_PlayerCanEnterSpinGaps%8))))
- return 0;
-
- lua_settop(gL, 0);
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+ Hook_State hook;
+ if (prepare_hook(&hook, 0, HOOK(PlayerCanEnterSpinGaps)))
{
- if (hookp->type != hook_PlayerCanEnterSpinGaps)
- continue;
-
- ps_lua_mobjhooks++;
- if (lua_gettop(gL) == 1)
- LUA_PushUserdata(gL, player, META_PLAYER);
- PushHook(gL, hookp);
- lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 1)) {
- if (!hookp->error || cv_debug & DBG_LUA)
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
- lua_pop(gL, 1);
- hookp->error = true;
- continue;
- }
- if (!lua_isnil(gL, -1))
- { // if nil, leave canEnter = 0.
- if (lua_toboolean(gL, -1))
- canEnter = 1; // Force yes
- else
- canEnter = 2; // Force no
- }
- lua_pop(gL, 1);
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ call_hooks(&hook, 1, res_force);
}
-
- lua_settop(gL, 0);
- return canEnter;
+ return hook.status;
}
diff --git a/src/lua_hud.h b/src/lua_hud.h
index a7b1a4cf58a6159fc9eacb811770dc9dd0761d62..ad2b51d3ef7d58b4df71ace0c18a9560962e947e 100644
--- a/src/lua_hud.h
+++ b/src/lua_hud.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2014-2016 by John "JTE" Muniz.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -37,7 +37,9 @@ enum hud {
hud_tabemblems,
// Intermission
hud_intermissiontally,
+ hud_intermissiontitletext,
hud_intermissionmessages,
+ hud_intermissionemeralds,
hud_MAX
};
@@ -45,8 +47,4 @@ extern boolean hud_running;
boolean LUA_HudEnabled(enum hud option);
-void LUAh_GameHUD(player_t *stplyr);
-void LUAh_ScoresHUD(void);
-void LUAh_TitleHUD(void);
-void LUAh_TitleCardHUD(player_t *stplayr);
-void LUAh_IntermissionHUD(void);
+void LUA_SetHudHook(int hook);
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index b0548c3212931e8ce4f377dddd5a7ff68f97551b..c7f2bbc28ec31d6266aa9eb435248663a4418232 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2014-2016 by John "JTE" Muniz.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -23,18 +23,18 @@
#include "v_video.h"
#include "w_wad.h"
#include "z_zone.h"
+#include "y_inter.h"
#include "lua_script.h"
#include "lua_libs.h"
#include "lua_hud.h"
+#include "lua_hook.h"
#define HUDONLY if (!hud_running) return luaL_error(L, "HUD rendering code should not be called outside of rendering hooks!");
boolean hud_running = false;
static UINT8 hud_enabled[(hud_MAX/8)+1];
-static UINT8 hudAvailable; // hud hooks field
-
// must match enum hud in lua_hud.h
static const char *const hud_disable_options[] = {
"stagetitle",
@@ -63,7 +63,9 @@ static const char *const hud_disable_options[] = {
"tabemblems",
"intermissiontally",
+ "intermissiontitletext",
"intermissionmessages",
+ "intermissionemeralds",
NULL};
enum hudinfo {
@@ -93,21 +95,6 @@ static const char *const patch_opt[] = {
"topoffset",
NULL};
-enum hudhook {
- hudhook_game = 0,
- hudhook_scores,
- hudhook_intermission,
- hudhook_title,
- hudhook_titlecard
-};
-static const char *const hudhook_opt[] = {
- "game",
- "scores",
- "intermission",
- "title",
- "titlecard",
- NULL};
-
// alignment types for v.drawString
enum align {
align_left = 0,
@@ -382,6 +369,74 @@ static int camera_get(lua_State *L)
return 1;
}
+static int camera_set(lua_State *L)
+{
+ camera_t *cam = *((camera_t **)luaL_checkudata(L, 1, META_CAMERA));
+ enum cameraf field = luaL_checkoption(L, 2, NULL, camera_opt);
+
+ I_Assert(cam != NULL);
+
+ switch(field)
+ {
+ case camera_subsector:
+ case camera_floorz:
+ case camera_ceilingz:
+ case camera_x:
+ case camera_y:
+ return luaL_error(L, LUA_QL("camera_t") " field " LUA_QS " should not be set directly. Use " LUA_QL("P_TryCameraMove") " or " LUA_QL("P_TeleportCameraMove") " instead.", camera_opt[field]);
+ case camera_chase: {
+ INT32 chase = luaL_checkboolean(L, 3);
+ if (cam == &camera)
+ CV_SetValue(&cv_chasecam, chase);
+ else if (cam == &camera2)
+ CV_SetValue(&cv_chasecam2, chase);
+ else // ??? this should never happen, but ok
+ cam->chase = chase;
+ break;
+ }
+ case camera_aiming:
+ cam->aiming = luaL_checkangle(L, 3);
+ break;
+ case camera_z:
+ cam->z = luaL_checkfixed(L, 3);
+ P_CheckCameraPosition(cam->x, cam->y, cam);
+ cam->floorz = tmfloorz;
+ cam->ceilingz = tmceilingz;
+ break;
+ case camera_angle:
+ cam->angle = luaL_checkangle(L, 3);
+ break;
+ case camera_radius:
+ cam->radius = luaL_checkfixed(L, 3);
+ if (cam->radius < 0)
+ cam->radius = 0;
+ P_CheckCameraPosition(cam->x, cam->y, cam);
+ cam->floorz = tmfloorz;
+ cam->ceilingz = tmceilingz;
+ break;
+ case camera_height:
+ cam->height = luaL_checkfixed(L, 3);
+ if (cam->height < 0)
+ cam->height = 0;
+ P_CheckCameraPosition(cam->x, cam->y, cam);
+ cam->floorz = tmfloorz;
+ cam->ceilingz = tmceilingz;
+ break;
+ case camera_momx:
+ cam->momx = luaL_checkfixed(L, 3);
+ break;
+ case camera_momy:
+ cam->momy = luaL_checkfixed(L, 3);
+ break;
+ case camera_momz:
+ cam->momz = luaL_checkfixed(L, 3);
+ break;
+ default:
+ return luaL_error(L, LUA_QL("camera_t") " has no field named " LUA_QS, camera_opt[field]);
+ }
+ return 0;
+}
+
//
// lib_draw
//
@@ -661,6 +716,45 @@ static int libd_drawStretched(lua_State *L)
return 0;
}
+static int libd_drawCropped(lua_State *L)
+{
+ fixed_t x, y, hscale, vscale, sx, sy, w, h;
+ INT32 flags;
+ patch_t *patch;
+ const UINT8 *colormap = NULL;
+
+ HUDONLY
+ x = luaL_checkinteger(L, 1);
+ y = luaL_checkinteger(L, 2);
+ hscale = luaL_checkinteger(L, 3);
+ if (hscale < 0)
+ return luaL_error(L, "negative horizontal scale");
+ vscale = luaL_checkinteger(L, 4);
+ if (vscale < 0)
+ return luaL_error(L, "negative vertical scale");
+ patch = *((patch_t **)luaL_checkudata(L, 5, META_PATCH));
+ flags = luaL_checkinteger(L, 6);
+ if (!lua_isnoneornil(L, 7))
+ colormap = *((UINT8 **)luaL_checkudata(L, 7, META_COLORMAP));
+ sx = luaL_checkinteger(L, 8);
+ if (sx < 0) // Don't crash. Now, we could do "x-=sx*FRACUNIT; sx=0;" here...
+ return luaL_error(L, "negative crop sx");
+ sy = luaL_checkinteger(L, 9);
+ if (sy < 0) // ...but it's more truthful to just deny it, as negative values would crash
+ return luaL_error(L, "negative crop sy");
+ w = luaL_checkinteger(L, 10);
+ if (w < 0) // Again, don't crash
+ return luaL_error(L, "negative crop w");
+ h = luaL_checkinteger(L, 11);
+ if (h < 0)
+ return luaL_error(L, "negative crop h");
+
+ flags &= ~V_PARAMMASK; // Don't let crashes happen.
+
+ V_DrawCroppedPatch(x, y, hscale, vscale, flags, patch, colormap, sx, sy, w, h);
+ return 0;
+}
+
static int libd_drawNum(lua_State *L)
{
INT32 x, y, flags, num;
@@ -857,6 +951,26 @@ static int libd_drawScaledNameTag(lua_State *L)
return 0;
}
+static int libd_drawLevelTitle(lua_State *L)
+{
+ INT32 x;
+ INT32 y;
+ const char *str;
+ INT32 flags;
+
+ HUDONLY
+
+ x = luaL_checkinteger(L, 1);
+ y = luaL_checkinteger(L, 2);
+ str = luaL_checkstring(L, 3);
+ flags = luaL_optinteger(L, 4, 0);
+
+ flags &= ~V_PARAMMASK; // Don't let crashes happen.
+
+ V_DrawLevelTitle(x, y, flags, str);
+ return 0;
+}
+
static int libd_stringWidth(lua_State *L)
{
const char *str = luaL_checkstring(L, 1);
@@ -886,6 +1000,20 @@ static int libd_nameTagWidth(lua_State *L)
return 1;
}
+static int libd_levelTitleWidth(lua_State *L)
+{
+ HUDONLY
+ lua_pushinteger(L, V_LevelNameWidth(luaL_checkstring(L, 1)));
+ return 1;
+}
+
+static int libd_levelTitleHeight(lua_State *L)
+{
+ HUDONLY
+ lua_pushinteger(L, V_LevelNameHeight(luaL_checkstring(L, 1)));
+ return 1;
+}
+
static int libd_getColormap(lua_State *L)
{
INT32 skinnum = TC_DEFAULT;
@@ -1085,16 +1213,20 @@ static luaL_Reg lib_draw[] = {
{"draw", libd_draw},
{"drawScaled", libd_drawScaled},
{"drawStretched", libd_drawStretched},
+ {"drawCropped", libd_drawCropped},
{"drawNum", libd_drawNum},
{"drawPaddedNum", libd_drawPaddedNum},
{"drawFill", libd_drawFill},
{"drawString", libd_drawString},
{"drawNameTag", libd_drawNameTag},
{"drawScaledNameTag", libd_drawScaledNameTag},
+ {"drawLevelTitle", libd_drawLevelTitle},
{"fadeScreen", libd_fadeScreen},
// misc
{"stringWidth", libd_stringWidth},
{"nameTagWidth", libd_nameTagWidth},
+ {"levelTitleWidth", libd_levelTitleWidth},
+ {"levelTitleHeight", libd_levelTitleHeight},
// m_random
{"RandomFixed",libd_RandomFixed},
{"RandomByte",libd_RandomByte},
@@ -1113,6 +1245,8 @@ static luaL_Reg lib_draw[] = {
{NULL, NULL}
};
+static int lib_draw_ref;
+
//
// lib_hud
//
@@ -1147,28 +1281,7 @@ static int lib_hudenabled(lua_State *L)
// add a HUD element for rendering
-static int lib_hudadd(lua_State *L)
-{
- enum hudhook field;
-
- luaL_checktype(L, 1, LUA_TFUNCTION);
- field = luaL_checkoption(L, 2, "game", hudhook_opt);
-
- if (!lua_lumploading)
- return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
-
- lua_getfield(L, LUA_REGISTRYINDEX, "HUD");
- I_Assert(lua_istable(L, -1));
- lua_rawgeti(L, -1, field+2); // HUD[2+]
- I_Assert(lua_istable(L, -1));
- lua_remove(L, -2);
-
- lua_pushvalue(L, 1);
- lua_rawseti(L, -2, (int)(lua_objlen(L, -2) + 1));
-
- hudAvailable |= 1<<field;
- return 0;
-}
+extern int lib_hudadd(lua_State *L);
static luaL_Reg lib_hud[] = {
{"enable", lib_hudenable},
@@ -1186,26 +1299,9 @@ int LUA_HudLib(lua_State *L)
{
memset(hud_enabled, 0xff, (hud_MAX/8)+1);
- lua_newtable(L); // HUD registry table
- lua_newtable(L);
- luaL_register(L, NULL, lib_draw);
- lua_rawseti(L, -2, 1); // HUD[1] = lib_draw
-
- lua_newtable(L);
- lua_rawseti(L, -2, 2); // HUD[2] = game rendering functions array
-
- lua_newtable(L);
- lua_rawseti(L, -2, 3); // HUD[3] = scores rendering functions array
-
- lua_newtable(L);
- lua_rawseti(L, -2, 4); // HUD[4] = intermission rendering functions array
-
- lua_newtable(L);
- lua_rawseti(L, -2, 5); // HUD[5] = title rendering functions array
-
- lua_newtable(L);
- lua_rawseti(L, -2, 6); // HUD[6] = title card rendering functions array
- lua_setfield(L, LUA_REGISTRYINDEX, "HUD");
+ lua_newtable(L);
+ luaL_register(L, NULL, lib_draw);
+ lib_draw_ref = luaL_ref(L, LUA_REGISTRYINDEX);
luaL_newmetatable(L, META_HUDINFO);
lua_pushcfunction(L, hudinfo_get);
@@ -1244,6 +1340,9 @@ int LUA_HudLib(lua_State *L)
luaL_newmetatable(L, META_CAMERA);
lua_pushcfunction(L, camera_get);
lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, camera_set);
+ lua_setfield(L, -2, "__newindex");
lua_pop(L,1);
luaL_register(L, "hud", lib_hud);
@@ -1257,156 +1356,29 @@ boolean LUA_HudEnabled(enum hud option)
return false;
}
-// Hook for HUD rendering
-void LUAh_GameHUD(player_t *stplayr)
-{
- if (!gL || !(hudAvailable & (1<<hudhook_game)))
- return;
-
- hud_running = true;
- lua_settop(gL, 0);
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
- I_Assert(lua_istable(gL, -1));
- lua_rawgeti(gL, -1, 2+hudhook_game); // HUD[2] = rendering funcs
- I_Assert(lua_istable(gL, -1));
-
- lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
- I_Assert(lua_istable(gL, -1));
- lua_remove(gL, -3); // pop HUD
- LUA_PushUserdata(gL, stplayr, META_PLAYER);
-
- if (splitscreen && stplayr == &players[secondarydisplayplayer])
- LUA_PushUserdata(gL, &camera2, META_CAMERA);
- else
- LUA_PushUserdata(gL, &camera, META_CAMERA);
-
- lua_pushnil(gL);
- while (lua_next(gL, -5) != 0) {
- lua_pushvalue(gL, -5); // graphics library (HUD[1])
- lua_pushvalue(gL, -5); // stplayr
- lua_pushvalue(gL, -5); // camera
- LUA_Call(gL, 3, 0, 1);
- }
- lua_settop(gL, 0);
- hud_running = false;
-}
-
-void LUAh_ScoresHUD(void)
-{
- if (!gL || !(hudAvailable & (1<<hudhook_scores)))
- return;
-
- hud_running = true;
- lua_settop(gL, 0);
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
- I_Assert(lua_istable(gL, -1));
- lua_rawgeti(gL, -1, 2+hudhook_scores); // HUD[3] = rendering funcs
- I_Assert(lua_istable(gL, -1));
-
- lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
- I_Assert(lua_istable(gL, -1));
- lua_remove(gL, -3); // pop HUD
- lua_pushnil(gL);
- while (lua_next(gL, -3) != 0) {
- lua_pushvalue(gL, -3); // graphics library (HUD[1])
- LUA_Call(gL, 1, 0, 1);
- }
- lua_settop(gL, 0);
- hud_running = false;
-}
-
-void LUAh_TitleHUD(void)
-{
- if (!gL || !(hudAvailable & (1<<hudhook_title)))
- return;
-
- hud_running = true;
- lua_settop(gL, 0);
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
- I_Assert(lua_istable(gL, -1));
- lua_rawgeti(gL, -1, 2+hudhook_title); // HUD[5] = rendering funcs
- I_Assert(lua_istable(gL, -1));
-
- lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
- I_Assert(lua_istable(gL, -1));
- lua_remove(gL, -3); // pop HUD
- lua_pushnil(gL);
- while (lua_next(gL, -3) != 0) {
- lua_pushvalue(gL, -3); // graphics library (HUD[1])
- LUA_Call(gL, 1, 0, 1);
- }
- lua_settop(gL, 0);
- hud_running = false;
-}
-
-void LUAh_TitleCardHUD(player_t *stplayr)
+void LUA_SetHudHook(int hook)
{
- if (!gL || !(hudAvailable & (1<<hudhook_titlecard)))
- return;
-
- hud_running = true;
- lua_settop(gL, 0);
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
- I_Assert(lua_istable(gL, -1));
- lua_rawgeti(gL, -1, 2+hudhook_titlecard); // HUD[6] = rendering funcs
- I_Assert(lua_istable(gL, -1));
-
- lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
- I_Assert(lua_istable(gL, -1));
- lua_remove(gL, -3); // pop HUD
-
- LUA_PushUserdata(gL, stplayr, META_PLAYER);
- lua_pushinteger(gL, lt_ticker);
- lua_pushinteger(gL, (lt_endtime + TICRATE));
- lua_pushnil(gL);
-
- while (lua_next(gL, -6) != 0) {
- lua_pushvalue(gL, -6); // graphics library (HUD[1])
- lua_pushvalue(gL, -6); // stplayr
- lua_pushvalue(gL, -6); // lt_ticker
- lua_pushvalue(gL, -6); // lt_endtime
- LUA_Call(gL, 4, 0, 1);
- }
+ lua_getref(gL, lib_draw_ref);
- lua_settop(gL, 0);
- hud_running = false;
-}
-
-void LUAh_IntermissionHUD(void)
-{
- if (!gL || !(hudAvailable & (1<<hudhook_intermission)))
- return;
-
- hud_running = true;
- lua_settop(gL, 0);
-
- lua_pushcfunction(gL, LUA_GetErrorMessage);
-
- lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
- I_Assert(lua_istable(gL, -1));
- lua_rawgeti(gL, -1, 2+hudhook_intermission); // HUD[4] = rendering funcs
- I_Assert(lua_istable(gL, -1));
-
- lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
- I_Assert(lua_istable(gL, -1));
- lua_remove(gL, -3); // pop HUD
- lua_pushnil(gL);
- while (lua_next(gL, -3) != 0) {
- lua_pushvalue(gL, -3); // graphics library (HUD[1])
- LUA_Call(gL, 1, 0, 1);
+ switch (hook)
+ {
+ case HUD_HOOK(game): {
+ camera_t *cam = (splitscreen && stplyr ==
+ &players[secondarydisplayplayer])
+ ? &camera2 : &camera;
+
+ LUA_PushUserdata(gL, stplyr, META_PLAYER);
+ LUA_PushUserdata(gL, cam, META_CAMERA);
+ } break;
+
+ case HUD_HOOK(titlecard):
+ LUA_PushUserdata(gL, stplyr, META_PLAYER);
+ lua_pushinteger(gL, lt_ticker);
+ lua_pushinteger(gL, (lt_endtime + TICRATE));
+ break;
+
+ case HUD_HOOK(intermission):
+ lua_pushboolean(gL, intertype == int_spec &&
+ stagefailed);
}
- lua_settop(gL, 0);
- hud_running = false;
}
diff --git a/src/lua_infolib.c b/src/lua_infolib.c
index af2d99a0c015cf05001ccaa31b3c54fffa09ea04..ac41de419ee31d37a3a655249694925778602afc 100644
--- a/src/lua_infolib.c
+++ b/src/lua_infolib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/lua_inputlib.c b/src/lua_inputlib.c
new file mode 100644
index 0000000000000000000000000000000000000000..1710b035522755526a1450cf53e00649fc2622ef
--- /dev/null
+++ b/src/lua_inputlib.c
@@ -0,0 +1,270 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2021-2022 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file lua_inputlib.c
+/// \brief input library for Lua scripting
+
+#include "doomdef.h"
+#include "fastcmp.h"
+#include "g_input.h"
+#include "g_game.h"
+#include "hu_stuff.h"
+#include "i_system.h"
+
+#include "lua_script.h"
+#include "lua_libs.h"
+
+boolean mousegrabbedbylua = true;
+
+///////////////
+// FUNCTIONS //
+///////////////
+
+static int lib_gameControlDown(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ if (i < 0 || i >= NUM_GAMECONTROLS)
+ return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1);
+ lua_pushinteger(L, PLAYER1INPUTDOWN(i));
+ return 1;
+}
+
+static int lib_gameControl2Down(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ if (i < 0 || i >= NUM_GAMECONTROLS)
+ return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1);
+ lua_pushinteger(L, PLAYER2INPUTDOWN(i));
+ return 1;
+}
+
+static int lib_gameControlToKeyNum(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ if (i < 0 || i >= NUM_GAMECONTROLS)
+ return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1);
+ lua_pushinteger(L, gamecontrol[i][0]);
+ lua_pushinteger(L, gamecontrol[i][1]);
+ return 2;
+}
+
+static int lib_gameControl2ToKeyNum(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ if (i < 0 || i >= NUM_GAMECONTROLS)
+ return luaL_error(L, "GC_* constant %d out of range (0 - %d)", i, NUM_GAMECONTROLS-1);
+ lua_pushinteger(L, gamecontrolbis[i][0]);
+ lua_pushinteger(L, gamecontrolbis[i][1]);
+ return 2;
+}
+
+static int lib_joyAxis(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ lua_pushinteger(L, JoyAxis(i));
+ return 1;
+}
+
+static int lib_joy2Axis(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ lua_pushinteger(L, Joy2Axis(i));
+ return 1;
+}
+
+static int lib_keyNumToName(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ lua_pushstring(L, G_KeyNumToName(i));
+ return 1;
+}
+
+static int lib_keyNameToNum(lua_State *L)
+{
+ const char *str = luaL_checkstring(L, 1);
+ lua_pushinteger(L, G_KeyNameToNum(str));
+ return 1;
+}
+
+static int lib_keyNumPrintable(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ lua_pushboolean(L, i >= 32 && i <= 127);
+ return 1;
+}
+
+static int lib_shiftKeyNum(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 1);
+ if (i >= 32 && i <= 127)
+ lua_pushinteger(L, shiftxform[i]);
+ return 1;
+}
+
+static int lib_getMouseGrab(lua_State *L)
+{
+ lua_pushboolean(L, mousegrabbedbylua);
+ return 1;
+}
+
+static int lib_setMouseGrab(lua_State *L)
+{
+ mousegrabbedbylua = luaL_checkboolean(L, 1);
+ I_UpdateMouseGrab();
+ return 0;
+}
+
+static int lib_getCursorPosition(lua_State *L)
+{
+ int x, y;
+ I_GetCursorPosition(&x, &y);
+ lua_pushinteger(L, x);
+ lua_pushinteger(L, y);
+ return 2;
+}
+
+static luaL_Reg lib[] = {
+ {"gameControlDown", lib_gameControlDown},
+ {"gameControl2Down", lib_gameControl2Down},
+ {"gameControlToKeyNum", lib_gameControlToKeyNum},
+ {"gameControl2ToKeyNum", lib_gameControl2ToKeyNum},
+ {"joyAxis", lib_joyAxis},
+ {"joy2Axis", lib_joy2Axis},
+ {"keyNumToName", lib_keyNumToName},
+ {"keyNameToNum", lib_keyNameToNum},
+ {"keyNumPrintable", lib_keyNumPrintable},
+ {"shiftKeyNum", lib_shiftKeyNum},
+ {"getMouseGrab", lib_getMouseGrab},
+ {"setMouseGrab", lib_setMouseGrab},
+ {"getCursorPosition", lib_getCursorPosition},
+ {NULL, NULL}
+};
+
+///////////////////
+// gamekeydown[] //
+///////////////////
+
+static int lib_getGameKeyDown(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 2);
+ if (i < 0 || i >= NUMINPUTS)
+ return luaL_error(L, "gamekeydown[] index %d out of range (0 - %d)", i, NUMINPUTS-1);
+ lua_pushboolean(L, gamekeydown[i]);
+ return 1;
+}
+
+static int lib_setGameKeyDown(lua_State *L)
+{
+ int i = luaL_checkinteger(L, 2);
+ boolean j = luaL_checkboolean(L, 3);
+ if (i < 0 || i >= NUMINPUTS)
+ return luaL_error(L, "gamekeydown[] index %d out of range (0 - %d)", i, NUMINPUTS-1);
+ gamekeydown[i] = j;
+ return 0;
+}
+
+static int lib_lenGameKeyDown(lua_State *L)
+{
+ lua_pushinteger(L, NUMINPUTS);
+ return 1;
+}
+
+///////////////
+// KEY EVENT //
+///////////////
+
+static int keyevent_get(lua_State *L)
+{
+ event_t *event = *((event_t **)luaL_checkudata(L, 1, META_KEYEVENT));
+ const char *field = luaL_checkstring(L, 2);
+
+ I_Assert(event != NULL);
+
+ if (fastcmp(field,"name"))
+ lua_pushstring(L, G_KeyNumToName(event->key));
+ else if (fastcmp(field,"num"))
+ lua_pushinteger(L, event->key);
+ else if (fastcmp(field,"repeated"))
+ lua_pushboolean(L, event->repeated);
+ else
+ return luaL_error(L, "keyevent_t has no field named %s", field);
+
+ return 1;
+}
+
+///////////
+// MOUSE //
+///////////
+
+static int mouse_get(lua_State *L)
+{
+ mouse_t *m = *((mouse_t **)luaL_checkudata(L, 1, META_MOUSE));
+ const char *field = luaL_checkstring(L, 2);
+
+ I_Assert(m != NULL);
+
+ if (fastcmp(field,"dx"))
+ lua_pushinteger(L, m->dx);
+ else if (fastcmp(field,"dy"))
+ lua_pushinteger(L, m->dy);
+ else if (fastcmp(field,"mlookdy"))
+ lua_pushinteger(L, m->mlookdy);
+ else if (fastcmp(field,"rdx"))
+ lua_pushinteger(L, m->rdx);
+ else if (fastcmp(field,"rdy"))
+ lua_pushinteger(L, m->rdy);
+ else if (fastcmp(field,"buttons"))
+ lua_pushinteger(L, m->buttons);
+ else
+ return luaL_error(L, "mouse_t has no field named %s", field);
+
+ return 1;
+}
+
+// #mouse -> 1 or 2
+static int mouse_num(lua_State *L)
+{
+ mouse_t *m = *((mouse_t **)luaL_checkudata(L, 1, META_MOUSE));
+
+ I_Assert(m != NULL);
+
+ lua_pushinteger(L, m == &mouse ? 1 : 2);
+ return 1;
+}
+
+int LUA_InputLib(lua_State *L)
+{
+ lua_newuserdata(L, 0);
+ lua_createtable(L, 0, 2);
+ lua_pushcfunction(L, lib_getGameKeyDown);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, lib_setGameKeyDown);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, lib_lenGameKeyDown);
+ lua_setfield(L, -2, "__len");
+ lua_setmetatable(L, -2);
+ lua_setglobal(L, "gamekeydown");
+
+ luaL_newmetatable(L, META_KEYEVENT);
+ lua_pushcfunction(L, keyevent_get);
+ lua_setfield(L, -2, "__index");
+ lua_pop(L, 1);
+
+ luaL_newmetatable(L, META_MOUSE);
+ lua_pushcfunction(L, mouse_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, mouse_num);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L, 1);
+
+ luaL_register(L, "input", lib);
+ return 0;
+}
diff --git a/src/lua_libs.h b/src/lua_libs.h
index 05061f118f29f6cdee74efb1db63bb2def90b44f..b4a891edb83d68f77075e8671cc13c76b1df0de3 100644
--- a/src/lua_libs.h
+++ b/src/lua_libs.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -12,6 +12,8 @@
extern lua_State *gL;
+extern boolean mousegrabbedbylua;
+
#define MUTABLE_TAGS
#define LREG_VALID "VALID_USERDATA"
@@ -88,6 +90,9 @@ extern lua_State *gL;
#define META_LUABANKS "LUABANKS[]*"
+#define META_KEYEVENT "KEYEVENT_T*"
+#define META_MOUSE "MOUSE_T*"
+
boolean luaL_checkboolean(lua_State *L, int narg);
int LUA_EnumLib(lua_State *L);
@@ -106,3 +111,4 @@ int LUA_TagLib(lua_State *L);
int LUA_PolyObjLib(lua_State *L);
int LUA_BlockmapLib(lua_State *L);
int LUA_HudLib(lua_State *L);
+int LUA_InputLib(lua_State *L);
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 9031c99f13a981fc6c235caea12a0fbfb9201e49..23a293d6b456b162e982a86c6976f3483b0c8d48 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -196,6 +196,7 @@ enum ffloor_e {
ffloor_next,
ffloor_prev,
ffloor_alpha,
+ ffloor_blend,
};
static const char *const ffloor_opt[] = {
@@ -214,6 +215,7 @@ static const char *const ffloor_opt[] = {
"next",
"prev",
"alpha",
+ "blend",
NULL};
#ifdef HAVE_LUA_SEGS
@@ -1807,6 +1809,9 @@ static int ffloor_get(lua_State *L)
case ffloor_alpha:
lua_pushinteger(L, ffloor->alpha);
return 1;
+ case ffloor_blend:
+ lua_pushinteger(L, ffloor->blend);
+ return 1;
}
return 0;
}
@@ -1885,6 +1890,9 @@ static int ffloor_set(lua_State *L)
case ffloor_alpha:
ffloor->alpha = (INT32)luaL_checkinteger(L, 3);
break;
+ case ffloor_blend:
+ ffloor->blend = (INT32)luaL_checkinteger(L, 3);
+ break;
}
return 0;
}
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index a1dca9e152491ade7ac3f0ece36e3d6651105e4c..c7501da6047fbf0828392cc6c92663d86dc58d38 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -16,6 +16,7 @@
#include "p_local.h"
#include "doomstat.h" // for ALL7EMERALDS
#include "r_main.h" // for R_PointToDist2
+#include "m_easing.h"
#include "lua_script.h"
#include "lua_libs.h"
@@ -87,6 +88,18 @@ static int lib_finetangent(lua_State *L)
return 1;
}
+static int lib_fixedasin(lua_State *L)
+{
+ lua_pushangle(L, -FixedAcos(luaL_checkfixed(L, 1)) + ANGLE_90);
+ return 1;
+}
+
+static int lib_fixedacos(lua_State *L)
+{
+ lua_pushangle(L, FixedAcos(luaL_checkfixed(L, 1)));
+ return 1;
+}
+
// Fixed math
////////////////
@@ -185,13 +198,15 @@ static int lib_coloropposite(lua_State *L)
return 2;
}
-static luaL_Reg lib[] = {
+static luaL_Reg lib_math[] = {
{"abs", lib_abs},
{"min", lib_min},
{"max", lib_max},
{"sin", lib_finesine},
{"cos", lib_finecosine},
{"tan", lib_finetangent},
+ {"asin", lib_fixedasin},
+ {"acos", lib_fixedacos},
{"FixedAngle", lib_fixedangle},
{"fixangle" , lib_fixedangle},
{"AngleFixed", lib_anglefixed},
@@ -223,9 +238,123 @@ static luaL_Reg lib[] = {
{NULL, NULL}
};
+//
+// Easing functions
+//
+
+#define EASINGFUNC(easetype) \
+{ \
+ fixed_t start = 0; \
+ fixed_t end = FRACUNIT; \
+ fixed_t t = luaL_checkfixed(L, 1); \
+ int n = lua_gettop(L); \
+ if (n == 2) \
+ end = luaL_checkfixed(L, 2); \
+ else if (n >= 3) \
+ { \
+ start = luaL_checkfixed(L, 2); \
+ end = luaL_checkfixed(L, 3); \
+ } \
+ lua_pushfixed(L, (Easing_ ## easetype)(t, start, end)); \
+ return 1; \
+} \
+
+static int lib_easelinear(lua_State *L) { EASINGFUNC(Linear) }
+
+static int lib_easeinsine(lua_State *L) { EASINGFUNC(InSine) }
+static int lib_easeoutsine(lua_State *L) { EASINGFUNC(OutSine) }
+static int lib_easeinoutsine(lua_State *L) { EASINGFUNC(InOutSine) }
+
+static int lib_easeinquad(lua_State *L) { EASINGFUNC(InQuad) }
+static int lib_easeoutquad(lua_State *L) { EASINGFUNC(OutQuad) }
+static int lib_easeinoutquad(lua_State *L) { EASINGFUNC(InOutQuad) }
+
+static int lib_easeincubic(lua_State *L) { EASINGFUNC(InCubic) }
+static int lib_easeoutcubic(lua_State *L) { EASINGFUNC(OutCubic) }
+static int lib_easeinoutcubic(lua_State *L) { EASINGFUNC(InOutCubic) }
+
+static int lib_easeinquart(lua_State *L) { EASINGFUNC(InQuart) }
+static int lib_easeoutquart(lua_State *L) { EASINGFUNC(OutQuart) }
+static int lib_easeinoutquart(lua_State *L) { EASINGFUNC(InOutQuart) }
+
+static int lib_easeinquint(lua_State *L) { EASINGFUNC(InQuint) }
+static int lib_easeoutquint(lua_State *L) { EASINGFUNC(OutQuint) }
+static int lib_easeinoutquint(lua_State *L) { EASINGFUNC(InOutQuint) }
+
+static int lib_easeinexpo(lua_State *L) { EASINGFUNC(InExpo) }
+static int lib_easeoutexpo(lua_State *L) { EASINGFUNC(OutExpo) }
+static int lib_easeinoutexpo(lua_State *L) { EASINGFUNC(InOutExpo) }
+
+#undef EASINGFUNC
+
+#define EASINGFUNC(easetype) \
+{ \
+ boolean useparam = false; \
+ fixed_t param = 0; \
+ fixed_t start = 0; \
+ fixed_t end = FRACUNIT; \
+ fixed_t t = luaL_checkfixed(L, 1); \
+ int n = lua_gettop(L); \
+ if (n == 2) \
+ end = luaL_checkfixed(L, 2); \
+ else if (n >= 3) \
+ { \
+ start = (fixed_t)luaL_optinteger(L, 2, start); \
+ end = (fixed_t)luaL_optinteger(L, 3, end); \
+ if ((n >= 4) && (useparam = (!lua_isnil(L, 4)))) \
+ param = luaL_checkfixed(L, 4); \
+ } \
+ if (useparam) \
+ lua_pushfixed(L, (Easing_ ## easetype ## Parameterized)(t, start, end, param)); \
+ else \
+ lua_pushfixed(L, (Easing_ ## easetype)(t, start, end)); \
+ return 1; \
+} \
+
+static int lib_easeinback(lua_State *L) { EASINGFUNC(InBack) }
+static int lib_easeoutback(lua_State *L) { EASINGFUNC(OutBack) }
+static int lib_easeinoutback(lua_State *L) { EASINGFUNC(InOutBack) }
+
+#undef EASINGFUNC
+
+static luaL_Reg lib_ease[] = {
+ {"linear", lib_easelinear},
+
+ {"insine", lib_easeinsine},
+ {"outsine", lib_easeoutsine},
+ {"inoutsine", lib_easeinoutsine},
+
+ {"inquad", lib_easeinquad},
+ {"outquad", lib_easeoutquad},
+ {"inoutquad", lib_easeinoutquad},
+
+ {"incubic", lib_easeincubic},
+ {"outcubic", lib_easeoutcubic},
+ {"inoutcubic", lib_easeinoutcubic},
+
+ {"inquart", lib_easeinquart},
+ {"outquart", lib_easeoutquart},
+ {"inoutquart", lib_easeinoutquart},
+
+ {"inquint", lib_easeinquint},
+ {"outquint", lib_easeoutquint},
+ {"inoutquint", lib_easeinoutquint},
+
+ {"inexpo", lib_easeinexpo},
+ {"outexpo", lib_easeoutexpo},
+ {"inoutexpo", lib_easeinoutexpo},
+
+ {"inback", lib_easeinback},
+ {"outback", lib_easeoutback},
+ {"inoutback", lib_easeinoutback},
+
+ {NULL, NULL}
+};
+
int LUA_MathLib(lua_State *L)
{
lua_pushvalue(L, LUA_GLOBALSINDEX);
- luaL_register(L, NULL, lib);
+ luaL_register(L, NULL, lib_math);
+ luaL_register(L, "ease", lib_ease);
return 0;
}
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 5d5f0e85bf9bc9b3e81f72eb30ad2e5dea1a62e7..953b390006c3419be9a63c2a925d112716568eb4 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -12,6 +12,7 @@
#include "doomdef.h"
#include "fastcmp.h"
+#include "r_data.h"
#include "r_skins.h"
#include "p_local.h"
#include "g_game.h"
@@ -654,8 +655,13 @@ static int mobj_set(lua_State *L)
break;
}
case mobj_blendmode:
- mo->blendmode = (INT32)luaL_checkinteger(L, 3);
+ {
+ INT32 blendmode = (INT32)luaL_checkinteger(L, 3);
+ if (blendmode < 0 || blendmode > AST_OVERLAY)
+ return luaL_error(L, "mobj.blendmode %d out of range (0 - %d).", blendmode, AST_OVERLAY);
+ mo->blendmode = blendmode;
break;
+ }
case mobj_bnext:
return NOSETPOS;
case mobj_bprev:
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 687cee2eb0dc194c190dec4827fb54a00618ceec..58cfab76cc8958674bddbbf5caebb8a1f6ca1f1d 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -370,6 +370,12 @@ static int player_get(lua_State *L)
lua_pushboolean(L, plr->outofcoop);
else if (fastcmp(field,"bot"))
lua_pushinteger(L, plr->bot);
+ else if (fastcmp(field,"botleader"))
+ LUA_PushUserdata(L, plr->botleader, META_PLAYER);
+ else if (fastcmp(field,"lastbuttons"))
+ lua_pushinteger(L, plr->lastbuttons);
+ else if (fastcmp(field,"blocked"))
+ lua_pushboolean(L, plr->blocked);
else if (fastcmp(field,"jointime"))
lua_pushinteger(L, plr->jointime);
else if (fastcmp(field,"quittime"))
@@ -719,6 +725,17 @@ static int player_set(lua_State *L)
plr->outofcoop = lua_toboolean(L, 3);
else if (fastcmp(field,"bot"))
return NOSET;
+ else if (fastcmp(field,"botleader"))
+ {
+ player_t *player = NULL;
+ if (!lua_isnil(L, 3))
+ player = *((player_t **)luaL_checkudata(L, 3, META_PLAYER));
+ plr->botleader = player;
+ }
+ else if (fastcmp(field,"lastbuttons"))
+ plr->lastbuttons = (UINT16)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"blocked"))
+ plr->blocked = (UINT8)luaL_checkinteger(L, 3);
else if (fastcmp(field,"jointime"))
plr->jointime = (tic_t)luaL_checkinteger(L, 3);
else if (fastcmp(field,"quittime"))
@@ -795,6 +812,7 @@ static int power_len(lua_State *L)
}
#define NOFIELD luaL_error(L, LUA_QL("ticcmd_t") " has no field named " LUA_QS, field)
+#define NOSET luaL_error(L, LUA_QL("ticcmd_t") " field " LUA_QS " should not be set directly.", field)
static int ticcmd_get(lua_State *L)
{
@@ -813,6 +831,8 @@ static int ticcmd_get(lua_State *L)
lua_pushinteger(L, cmd->aiming);
else if (fastcmp(field,"buttons"))
lua_pushinteger(L, cmd->buttons);
+ else if (fastcmp(field,"latency"))
+ lua_pushinteger(L, cmd->latency);
else
return NOFIELD;
@@ -839,6 +859,8 @@ static int ticcmd_set(lua_State *L)
cmd->aiming = (INT16)luaL_checkinteger(L, 3);
else if (fastcmp(field,"buttons"))
cmd->buttons = (UINT16)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"latency"))
+ return NOSET;
else
return NOFIELD;
@@ -846,6 +868,7 @@ static int ticcmd_set(lua_State *L)
}
#undef NOFIELD
+#undef NOSET
int LUA_PlayerLib(lua_State *L)
{
diff --git a/src/lua_polyobjlib.c b/src/lua_polyobjlib.c
index 5d76a912de0c06948dee8ecbb8039bfb356033ec..e254b0e4ab698b5f3d85f6db66648b91eac870b5 100644
--- a/src/lua_polyobjlib.c
+++ b/src/lua_polyobjlib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Iestyn "Monster Iestyn" Jealous.
-// Copyright (C) 2020-2021 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by Iestyn "Monster Iestyn" Jealous.
+// Copyright (C) 2020-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/lua_script.c b/src/lua_script.c
index 819ff696e33b9996b3590783e0ef67b6f5fc80d3..b3737bf5a8ed17f3abebecfaa91f7918b4cf8828 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -20,11 +20,12 @@
#include "r_state.h"
#include "r_sky.h"
#include "g_game.h"
+#include "g_input.h"
#include "f_finale.h"
#include "byteptr.h"
#include "p_saveg.h"
#include "p_local.h"
-#include "p_slopes.h" // for P_SlopeById
+#include "p_slopes.h" // for P_SlopeById and slopelist
#include "p_polyobj.h" // polyobj_t, PolyObjects
#ifdef LUA_ALLOW_BYTECODE
#include "d_netfil.h" // for LUA_DumpFile
@@ -59,6 +60,7 @@ static lua_CFunction liblist[] = {
LUA_PolyObjLib, // polyobj_t
LUA_BlockmapLib, // blockmap stuff
LUA_HudLib, // HUD stuff
+ LUA_InputLib, // inputs
NULL
};
@@ -186,6 +188,9 @@ int LUA_PushGlobals(lua_State *L, const char *word)
} else if (fastcmp(word,"modeattacking")) {
lua_pushboolean(L, modeattacking);
return 1;
+ } else if (fastcmp(word,"metalrecording")) {
+ lua_pushboolean(L, metalrecording);
+ return 1;
} else if (fastcmp(word,"splitscreen")) {
lua_pushboolean(L, splitscreen);
return 1;
@@ -382,6 +387,22 @@ int LUA_PushGlobals(lua_State *L, const char *word)
} else if (fastcmp(word, "gamestate")) {
lua_pushinteger(L, gamestate);
return 1;
+ } else if (fastcmp(word, "stagefailed")) {
+ lua_pushboolean(L, stagefailed);
+ } else if (fastcmp(word, "mouse")) {
+ LUA_PushUserdata(L, &mouse, META_MOUSE);
+ return 1;
+ } else if (fastcmp(word, "mouse2")) {
+ LUA_PushUserdata(L, &mouse2, META_MOUSE);
+ return 1;
+ } else if (fastcmp(word, "camera")) {
+ LUA_PushUserdata(L, &camera, META_CAMERA);
+ return 1;
+ } else if (fastcmp(word, "camera2")) {
+ if (!splitscreen)
+ return 0;
+ LUA_PushUserdata(L, &camera2, META_CAMERA);
+ return 1;
}
return 0;
}
@@ -431,6 +452,8 @@ int LUA_CheckGlobals(lua_State *L, const char *word)
}
else if (fastcmp(word, "mapmusflags"))
mapmusflags = (UINT16)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "stagefailed"))
+ stagefailed = luaL_checkboolean(L, 2);
else
return 0;
@@ -838,6 +861,8 @@ void LUA_InvalidateLevel(void)
{
LUA_InvalidateUserdata(&lines[i]);
LUA_InvalidateUserdata(&lines[i].tags);
+ LUA_InvalidateUserdata(lines[i].args);
+ LUA_InvalidateUserdata(lines[i].stringargs);
LUA_InvalidateUserdata(lines[i].sidenum);
}
for (i = 0; i < numsides; i++)
@@ -850,6 +875,13 @@ void LUA_InvalidateLevel(void)
LUA_InvalidateUserdata(&PolyObjects[i].vertices);
LUA_InvalidateUserdata(&PolyObjects[i].lines);
}
+ for (pslope_t *slope = slopelist; slope; slope = slope->next)
+ {
+ LUA_InvalidateUserdata(slope);
+ LUA_InvalidateUserdata(&slope->normal);
+ LUA_InvalidateUserdata(&slope->o);
+ LUA_InvalidateUserdata(&slope->d);
+ }
#ifdef HAVE_LUA_SEGS
for (i = 0; i < numsegs; i++)
LUA_InvalidateUserdata(&segs[i]);
@@ -872,6 +904,8 @@ void LUA_InvalidateMapthings(void)
{
LUA_InvalidateUserdata(&mapthings[i]);
LUA_InvalidateUserdata(&mapthings[i].tags);
+ LUA_InvalidateUserdata(mapthings[i].args);
+ LUA_InvalidateUserdata(mapthings[i].stringargs);
}
}
@@ -915,6 +949,7 @@ enum
ARCH_SLOPE,
ARCH_MAPHEADER,
ARCH_SKINCOLOR,
+ ARCH_MOUSE,
ARCH_TEND=0xFF,
};
@@ -942,6 +977,7 @@ static const struct {
{META_SLOPE, ARCH_SLOPE},
{META_MAPHEADER, ARCH_MAPHEADER},
{META_SKINCOLOR, ARCH_SKINCOLOR},
+ {META_MOUSE, ARCH_MOUSE},
{NULL, ARCH_NULL}
};
@@ -1249,7 +1285,6 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
}
break;
}
-
case ARCH_SKINCOLOR:
{
skincolor_t *info = *((skincolor_t **)lua_touserdata(gL, myindex));
@@ -1257,6 +1292,13 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
WRITEUINT16(save_p, info - skincolors);
break;
}
+ case ARCH_MOUSE:
+ {
+ mouse_t *m = *((mouse_t **)lua_touserdata(gL, myindex));
+ WRITEUINT8(save_p, ARCH_MOUSE);
+ WRITEUINT8(save_p, m == &mouse ? 1 : 2);
+ break;
+ }
default:
WRITEUINT8(save_p, ARCH_NULL);
return 2;
@@ -1352,21 +1394,13 @@ static void ArchiveTables(void)
// Write key
e = ArchiveValue(TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
- {
- lua_pushvalue(gL, -2);
- CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i);
- lua_pop(gL, 1);
- }
+ CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i);
// Write value
e = ArchiveValue(TABLESINDEX, -1);
if (e == 1)
n++; // the table contained a new table we'll have to archive. :(
else if (e == 2) // invalid value type
- {
- lua_pushvalue(gL, -2);
- CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -1));
- lua_pop(gL, 1);
- }
+ CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1));
lua_pop(gL, 1);
}
@@ -1508,6 +1542,9 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
case ARCH_SKINCOLOR:
LUA_PushUserdata(gL, &skincolors[READUINT16(save_p)], META_SKINCOLOR);
break;
+ case ARCH_MOUSE:
+ LUA_PushUserdata(gL, READUINT16(save_p) == 1 ? &mouse : &mouse2, META_MOUSE);
+ break;
case ARCH_TEND:
return 1;
}
@@ -1634,7 +1671,7 @@ void LUA_Archive(void)
WRITEUINT32(save_p, UINT32_MAX); // end of mobjs marker, replaces mobjnum.
- LUAh_NetArchiveHook(NetArchive); // call the NetArchive hook in archive mode
+ LUA_HookNetArchive(NetArchive); // call the NetArchive hook in archive mode
ArchiveTables();
if (gL)
@@ -1694,7 +1731,7 @@ void LUA_UnArchive(void)
// mobjnum = READUINT32(save_p); // read a mobjnum
// }
- LUAh_NetArchiveHook(NetUnArchive); // call the NetArchive hook in unarchive mode
+ LUA_HookNetArchive(NetUnArchive); // call the NetArchive hook in unarchive mode
UnArchiveTables();
if (gL)
diff --git a/src/lua_script.h b/src/lua_script.h
index a9c8762ad1996b9911c0b5a8f7b9b50a8997466a..e586b04a886d292ec65669d8f831123d0d6b57d1 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -59,7 +59,7 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
void LUA_CVarChanged(void *cvar); // lua_consolelib.c
int Lua_optoption(lua_State *L, int narg,
const char *def, const char *const lst[]);
-void LUAh_NetArchiveHook(lua_CFunction archFunc);
+void LUA_HookNetArchive(lua_CFunction archFunc);
void LUA_PushTaggableObjectArray
( lua_State *L,
diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index 3370f8f728996059a73e46a9db7ccf4d2b0fcc2c..9c7c4ad03e8ac8ee7e62e4b65828f0b493138f7f 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2014-2016 by John "JTE" Muniz.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -53,7 +53,6 @@ enum skin {
skin_contspeed,
skin_contangle,
skin_soundsid,
- skin_availability,
skin_sprites
};
static const char *const skin_opt[] = {
@@ -91,7 +90,6 @@ static const char *const skin_opt[] = {
"contspeed",
"contangle",
"soundsid",
- "availability",
"sprites",
NULL};
@@ -209,9 +207,6 @@ static int skin_get(lua_State *L)
case skin_soundsid:
LUA_PushUserdata(L, skin->soundsid, META_SOUNDSID);
break;
- case skin_availability:
- lua_pushinteger(L, skin->availability);
- break;
case skin_sprites:
LUA_PushUserdata(L, skin->sprites, META_SKINSPRITES);
break;
diff --git a/src/lua_taglib.c b/src/lua_taglib.c
index d0cf385a9d89217113d21161df820c5a838e2c01..b69416362e257aae6b281191c7cb373b56ab7429 100644
--- a/src/lua_taglib.c
+++ b/src/lua_taglib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by James R.
-// Copyright (C) 2020-2021 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by James R.
+// Copyright (C) 2020-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/lua_thinkerlib.c b/src/lua_thinkerlib.c
index 65bf8c313b14c942e77454f4890a81df62cdfcec..963fdbd5ad401053f90d0df1bee243460793b5cf 100644
--- a/src/lua_thinkerlib.c
+++ b/src/lua_thinkerlib.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by John "JTE" Muniz.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_aatree.c b/src/m_aatree.c
index b228ed63de0fd6d29d2cfe027a96f9c8eefd2e46..522e38a53ac4576233ad165f2bddd9c18b5faafc 100644
--- a/src/m_aatree.c
+++ b/src/m_aatree.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_aatree.h b/src/m_aatree.h
index 5a240394f77920845e53b023f314d223f27076b4..ed011644e0daa741eca8656d095bbbc222399ff4 100644
--- a/src/m_aatree.h
+++ b/src/m_aatree.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_anigif.c b/src/m_anigif.c
index fe04a5cb41fd42141295001d1860161a16c35f3d..b3a1d0fe22304faea9f7b9656bd9dcd4e7a872a9 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh.
// Copyright (C) 2013 by "Ninji".
-// Copyright (C) 2013-2021 by Sonic Team Junior.
+// Copyright (C) 2013-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_anigif.h b/src/m_anigif.h
index ca7563b1e9c6de3b537e287220cd83fc775d17ae..ad64dff7b78c5ca105ec8af0c7712947967722ee 100644
--- a/src/m_anigif.h
+++ b/src/m_anigif.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2013-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 2013-2021 by Sonic Team Junior.
+// Copyright (C) 2013-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_argv.c b/src/m_argv.c
index 453d6e45c1ff9e8ee53c6a44bfe2e774a0efdc6b..1444f0c38ab758c9b231ee25472196aece274276 100644
--- a/src/m_argv.c
+++ b/src/m_argv.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_argv.h b/src/m_argv.h
index f39db513ffdb0d371e06916a51bd964a2cbf821e..cdb6aa246abdf0f6069710b441dc8444b7574d48 100644
--- a/src/m_argv.h
+++ b/src/m_argv.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_bbox.c b/src/m_bbox.c
index e0505fd95a485a4f1fad9eb5e3b004fd22fa6fa2..7fde0c171d1260c7ab93f0c30778b982b889abd5 100644
--- a/src/m_bbox.c
+++ b/src/m_bbox.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_bbox.h b/src/m_bbox.h
index c56bd22c06714a7eb93c5cf533f3ea8ed7b342a4..588000faead6dd225473c8836635559a5b9d1205 100644
--- a/src/m_bbox.h
+++ b/src/m_bbox.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_cheat.c b/src/m_cheat.c
index c958bb4a4de31450276067e730c8c77442b0c800..82d0b9d5a59af96319b8f004809b5ec2ec0639fc 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -203,11 +203,11 @@ boolean cht_Responder(event_t *ev)
if (ev->type != ev_keydown)
return false;
- if (ev->data1 > 0xFF)
+ if (ev->key > 0xFF)
{
// map some fake (joy) inputs into keys
// map joy inputs into keys
- switch (ev->data1)
+ switch (ev->key)
{
case KEY_JOY1:
case KEY_JOY1 + 2:
@@ -231,7 +231,7 @@ boolean cht_Responder(event_t *ev)
}
}
else
- ch = (UINT8)ev->data1;
+ ch = (UINT8)ev->key;
ret += cht_CheckCheat(&cheat_ultimate, (char)ch);
ret += cht_CheckCheat(&cheat_ultimate_joy, (char)ch);
diff --git a/src/m_cheat.h b/src/m_cheat.h
index ee4ba5f557eafe7c98b85605c08394f5bd28144d..c22e262fbb4898e33d4a9581956e204486ad7675 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_cond.c b/src/m_cond.c
index a54238ab2b5f47790047a8fffb9d305177f03934..1406317c59b56bf5250420be2fbc8d5681fed4df 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -496,6 +496,64 @@ UINT8 M_GotHighEnoughRings(INT32 trings)
return false;
}
+// Gets the skin number for a SECRET_SKIN unlockable.
+INT32 M_UnlockableSkinNum(unlockable_t *unlock)
+{
+ if (unlock->type != SECRET_SKIN)
+ {
+ // This isn't a skin unlockable...
+ return -1;
+ }
+
+ if (unlock->stringVar && strcmp(unlock->stringVar, ""))
+ {
+ // Get the skin from the string.
+ INT32 skinnum = R_SkinAvailable(unlock->stringVar);
+ if (skinnum != -1)
+ {
+ return skinnum;
+ }
+ }
+
+ if (unlock->variable >= 0 && unlock->variable < numskins)
+ {
+ // Use the number directly.
+ return unlock->variable;
+ }
+
+ // Invalid skin unlockable.
+ return -1;
+}
+
+// Gets the skin number for a ET_SKIN emblem.
+INT32 M_EmblemSkinNum(emblem_t *emblem)
+{
+ if (emblem->type != ET_SKIN)
+ {
+ // This isn't a skin emblem...
+ return -1;
+ }
+
+ if (emblem->stringVar && strcmp(emblem->stringVar, ""))
+ {
+ // Get the skin from the string.
+ INT32 skinnum = R_SkinAvailable(emblem->stringVar);
+ if (skinnum != -1)
+ {
+ return skinnum;
+ }
+ }
+
+ if (emblem->var >= 0 && emblem->var < numskins)
+ {
+ // Use the number directly.
+ return emblem->var;
+ }
+
+ // Invalid skin emblem.
+ return -1;
+}
+
// ----------------
// Misc Emblem shit
// ----------------
diff --git a/src/m_cond.h b/src/m_cond.h
index 690b6fb2641f503f40271eba2e1765e6833cddfa..f36c8000922d1d364046469cfe27a9d5ce66f1db 100644
--- a/src/m_cond.h
+++ b/src/m_cond.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 2012-2021 by Sonic Team Junior.
+// Copyright (C) 2012-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -92,6 +92,7 @@ typedef struct
UINT8 sprite; ///< emblem sprite to use, 0 - 25
UINT16 color; ///< skincolor to use
INT32 var; ///< If needed, specifies information on the target amount to achieve (or target skin)
+ char *stringVar; ///< String version
char hint[110]; ///< Hint for emblem hints menu
UINT8 collected; ///< Do you have this emblem?
} emblem_t;
@@ -116,6 +117,7 @@ typedef struct
UINT8 showconditionset;
INT16 type;
INT16 variable;
+ char *stringVar;
UINT8 nocecho;
UINT8 nochecklist;
UINT8 unlocked;
@@ -132,6 +134,7 @@ typedef struct
#define SECRET_WARP 2 // Selectable warp
#define SECRET_SOUNDTEST 3 // Sound Test
#define SECRET_CREDITS 4 // Enables Credits
+#define SECRET_SKIN 5 // Unlocks a skin
// If you have more secrets than these variables allow in your game,
// you seriously need to get a life.
@@ -185,4 +188,7 @@ UINT8 M_GotHighEnoughScore(INT32 tscore);
UINT8 M_GotLowEnoughTime(INT32 tictime);
UINT8 M_GotHighEnoughRings(INT32 trings);
+INT32 M_UnlockableSkinNum(unlockable_t *unlock);
+INT32 M_EmblemSkinNum(emblem_t *emblem);
+
#define M_Achieved(a) ((a) >= MAXCONDITIONSETS || conditionSets[a].achieved)
diff --git a/src/m_dllist.h b/src/m_dllist.h
index 65303b4a339fb81ec9f7a2c9eb70f2b8cd55a20a..d8ca6648a8d0806e264b44c4e1bb2fce2077f380 100644
--- a/src/m_dllist.h
+++ b/src/m_dllist.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2005 by James Haley
-// Copyright (C) 2005-2021 by Sonic Team Junior.
+// Copyright (C) 2005-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_easing.c b/src/m_easing.c
new file mode 100644
index 0000000000000000000000000000000000000000..0f1cc1d026af55cfe5f28a5e3c585c84746ba838
--- /dev/null
+++ b/src/m_easing.c
@@ -0,0 +1,430 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020-2022 by Jaime "Lactozilla" Passos.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file m_easing.c
+/// \brief Easing functions
+/// Referenced from https://easings.net/
+
+#include "m_easing.h"
+#include "tables.h"
+#include "doomdef.h"
+
+/*
+ For the computation of the logarithm, we choose, by trial and error, from among
+ a sequence of particular factors those, that when multiplied with the function
+ argument, normalize it to unity. For every factor chosen, we add up the
+ corresponding logarithm value stored in a table. The sum then corresponds to
+ the logarithm of the function argument.
+
+ For the integer portion, we would want to choose
+ 2^i, i = 1, 2, 4, 8, ...
+ and for the factional part we choose
+ 1+2^-i, i = 1, 2, 3, 4, 5 ...
+
+ The algorithm for the exponential is closely related and quite literally the inverse
+ of the logarithm algorithm. From among the sequence of tabulated logarithms for our
+ chosen factors, we pick those that when subtracted from the function argument ultimately
+ reduce it to zero. Starting with unity, we multiply with all the factors whose logarithms
+ we have subtracted in the process. The resulting product corresponds to the result of the exponentiation.
+
+ Logarithms of values greater than unity can be computed by applying the algorithm to the reciprocal
+ of the function argument (with the negation of the result as appropriate), likewise exponentiation with
+ negative function arguments requires us negate the function argument and compute the reciprocal at the end.
+*/
+
+static fixed_t logtabdec[FRACBITS] =
+{
+ 0x95c1, 0x526a, 0x2b80, 0x1663,
+ 0xb5d, 0x5b9, 0x2e0, 0x170,
+ 0xb8, 0x5c, 0x2e, 0x17,
+ 0x0b, 0x06, 0x03, 0x01
+};
+
+static fixed_t fixlog2(fixed_t a)
+{
+ UINT32 x = a, y = 0;
+ INT32 t, i, shift = 8;
+
+ if (x > FRACUNIT)
+ x = FixedDiv(FRACUNIT, x);
+
+ // Integer part
+ // 1<<19 = 0x80000
+ // 1<<18 = 0x40000
+ // 1<<17 = 0x20000
+ // 1<<16 = 0x10000
+
+#define dologtab(i) \
+ t = (x << shift); \
+ if (t < FRACUNIT) \
+ { \
+ x = t; \
+ y += (1 << (19 - i)); \
+ } \
+ shift /= 2;
+
+ dologtab(0)
+ dologtab(1)
+ dologtab(2)
+ dologtab(3)
+
+#undef dologtab
+
+ // Decimal part
+ for (i = 0; i < FRACBITS; i++)
+ {
+ t = x + (x >> (i + 1));
+ if (t < FRACUNIT)
+ {
+ x = t;
+ y += logtabdec[i];
+ }
+ }
+
+ if (a <= FRACUNIT)
+ return -y;
+
+ return y;
+}
+
+// Notice how this is symmetric to fixlog2.
+static INT32 fixexp(fixed_t a)
+{
+ UINT32 x, y;
+ fixed_t t, i, shift = 8;
+
+ // Underflow prevention.
+ if (a <= -15 * FRACUNIT)
+ return 0;
+
+ x = (a < 0) ? (-a) : (a);
+ y = FRACUNIT;
+
+ // Integer part (see fixlog2)
+#define dologtab(i) \
+ t = x - (1 << (19 - i)); \
+ if (t >= 0) \
+ { \
+ x = t; \
+ y <<= shift; \
+ } \
+ shift /= 2;
+
+ dologtab(0)
+ dologtab(1)
+ dologtab(2)
+ dologtab(3)
+
+#undef dologtab
+
+ // Decimal part
+ for (i = 0; i < FRACBITS; i++)
+ {
+ t = (x - logtabdec[i]);
+ if (t >= 0)
+ {
+ x = t;
+ y += (y >> (i + 1));
+ }
+ }
+
+ if (a < 0)
+ return FixedDiv(FRACUNIT, y);
+
+ return y;
+}
+
+#define fixpow(x, y) fixexp(FixedMul((y), fixlog2(x)))
+#define fixintmul(x, y) FixedMul((x) * FRACUNIT, y)
+#define fixintdiv(x, y) FixedDiv(x, (y) * FRACUNIT)
+#define fixinterp(start, end, t) FixedMul((FRACUNIT - (t)), start) + FixedMul(t, end)
+
+// ==================
+// EASING FUNCTIONS
+// ==================
+
+#define EASINGFUNC(type) fixed_t Easing_ ## type (fixed_t t, fixed_t start, fixed_t end)
+
+//
+// Linear
+//
+
+EASINGFUNC(Linear)
+{
+ return fixinterp(start, end, t);
+}
+
+//
+// Sine
+//
+
+// This is equivalent to calculating (x * pi) and converting the result from radians into degrees.
+#define fixang(x) FixedMul((x), 180*FRACUNIT)
+
+EASINGFUNC(InSine)
+{
+ fixed_t c = fixang(t / 2);
+ fixed_t x = FRACUNIT - FINECOSINE(FixedAngle(c)>>ANGLETOFINESHIFT);
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(OutSine)
+{
+ fixed_t c = fixang(t / 2);
+ fixed_t x = FINESINE(FixedAngle(c)>>ANGLETOFINESHIFT);
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(InOutSine)
+{
+ fixed_t c = fixang(t);
+ fixed_t x = -(FINECOSINE(FixedAngle(c)>>ANGLETOFINESHIFT) - FRACUNIT) / 2;
+ return fixinterp(start, end, x);
+}
+
+#undef fixang
+
+//
+// Quad
+//
+
+EASINGFUNC(InQuad)
+{
+ return fixinterp(start, end, FixedMul(t, t));
+}
+
+EASINGFUNC(OutQuad)
+{
+ return fixinterp(start, end, FRACUNIT - FixedMul(FRACUNIT - t, FRACUNIT - t));
+}
+
+EASINGFUNC(InOutQuad)
+{
+ fixed_t x = t < (FRACUNIT/2)
+ ? fixintmul(2, FixedMul(t, t))
+ : FRACUNIT - fixpow(FixedMul(-2*FRACUNIT, t) + 2*FRACUNIT, 2*FRACUNIT) / 2;
+ return fixinterp(start, end, x);
+}
+
+//
+// Cubic
+//
+
+EASINGFUNC(InCubic)
+{
+ fixed_t x = FixedMul(t, FixedMul(t, t));
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(OutCubic)
+{
+ return fixinterp(start, end, FRACUNIT - fixpow(FRACUNIT - t, 3*FRACUNIT));
+}
+
+EASINGFUNC(InOutCubic)
+{
+ fixed_t x = t < (FRACUNIT/2)
+ ? fixintmul(4, FixedMul(t, FixedMul(t, t)))
+ : FRACUNIT - fixpow(fixintmul(-2, t) + 2*FRACUNIT, 3*FRACUNIT) / 2;
+ return fixinterp(start, end, x);
+}
+
+//
+// "Quart"
+//
+
+EASINGFUNC(InQuart)
+{
+ fixed_t x = FixedMul(FixedMul(t, t), FixedMul(t, t));
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(OutQuart)
+{
+ fixed_t x = FRACUNIT - fixpow(FRACUNIT - t, 4 * FRACUNIT);
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(InOutQuart)
+{
+ fixed_t x = t < (FRACUNIT/2)
+ ? fixintmul(8, FixedMul(FixedMul(t, t), FixedMul(t, t)))
+ : FRACUNIT - fixpow(fixintmul(-2, t) + 2*FRACUNIT, 4*FRACUNIT) / 2;
+ return fixinterp(start, end, x);
+}
+
+//
+// "Quint"
+//
+
+EASINGFUNC(InQuint)
+{
+ fixed_t x = FixedMul(t, FixedMul(FixedMul(t, t), FixedMul(t, t)));
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(OutQuint)
+{
+ fixed_t x = FRACUNIT - fixpow(FRACUNIT - t, 5 * FRACUNIT);
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(InOutQuint)
+{
+ fixed_t x = t < (FRACUNIT/2)
+ ? FixedMul(16*FRACUNIT, FixedMul(t, FixedMul(FixedMul(t, t), FixedMul(t, t))))
+ : FRACUNIT - fixpow(fixintmul(-2, t) + 2*FRACUNIT, 5*FRACUNIT) / 2;
+ return fixinterp(start, end, x);
+}
+
+//
+// Exponential
+//
+
+EASINGFUNC(InExpo)
+{
+ fixed_t x = (!t) ? 0 : fixpow(2*FRACUNIT, fixintmul(10, t) - 10*FRACUNIT);
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(OutExpo)
+{
+ fixed_t x = (t >= FRACUNIT) ? FRACUNIT
+ : FRACUNIT - fixpow(2*FRACUNIT, fixintmul(-10, t));
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(InOutExpo)
+{
+ fixed_t x;
+
+ if (!t)
+ x = 0;
+ else if (t >= FRACUNIT)
+ x = FRACUNIT;
+ else
+ {
+ if (t < FRACUNIT / 2)
+ {
+ x = fixpow(2*FRACUNIT, fixintmul(20, t) - 10*FRACUNIT);
+ x = fixintdiv(x, 2);
+ }
+ else
+ {
+ x = fixpow(2*FRACUNIT, fixintmul(-20, t) + 10*FRACUNIT);
+ x = fixintdiv((2*FRACUNIT) - x, 2);
+ }
+ }
+
+ return fixinterp(start, end, x);
+}
+
+//
+// "Back"
+//
+
+#define EASEBACKCONST1 111514 // 1.70158
+#define EASEBACKCONST2 99942 // 1.525
+
+static fixed_t EaseInBack(fixed_t t, fixed_t start, fixed_t end, fixed_t c1)
+{
+ const fixed_t c3 = c1 + FRACUNIT;
+ fixed_t x = FixedMul(FixedMul(t, t), FixedMul(c3, t) - c1);
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(InBack)
+{
+ return EaseInBack(t, start, end, EASEBACKCONST1);
+}
+
+static fixed_t EaseOutBack(fixed_t t, fixed_t start, fixed_t end, fixed_t c1)
+{
+ const fixed_t c3 = c1 + FRACUNIT;
+ fixed_t x;
+ t -= FRACUNIT;
+ x = FRACUNIT + FixedMul(FixedMul(t, t), FixedMul(c3, t) + c1);
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(OutBack)
+{
+ return EaseOutBack(t, start, end, EASEBACKCONST1);
+}
+
+static fixed_t EaseInOutBack(fixed_t t, fixed_t start, fixed_t end, fixed_t c2)
+{
+ fixed_t x, y;
+ const fixed_t f2 = 2*FRACUNIT;
+
+ if (t < FRACUNIT / 2)
+ {
+ x = fixpow(FixedMul(t, f2), f2);
+ y = FixedMul(c2 + FRACUNIT, FixedMul(t, f2));
+ x = FixedMul(x, y - c2);
+ }
+ else
+ {
+ x = fixpow(-(FixedMul(t, f2) - f2), f2);
+ y = FixedMul(c2 + FRACUNIT, FixedMul(t, f2) - f2);
+ x = FixedMul(x, y + c2);
+ x += f2;
+ }
+
+ x /= 2;
+
+ return fixinterp(start, end, x);
+}
+
+EASINGFUNC(InOutBack)
+{
+ return EaseInOutBack(t, start, end, EASEBACKCONST2);
+}
+
+#undef EASINGFUNC
+#define EASINGFUNC(type) fixed_t Easing_ ## type (fixed_t t, fixed_t start, fixed_t end, fixed_t param)
+
+EASINGFUNC(InBackParameterized)
+{
+ return EaseInBack(t, start, end, param);
+}
+
+EASINGFUNC(OutBackParameterized)
+{
+ return EaseOutBack(t, start, end, param);
+}
+
+EASINGFUNC(InOutBackParameterized)
+{
+ return EaseInOutBack(t, start, end, param);
+}
+
+#undef EASINGFUNC
+
+// Function list
+
+#define EASINGFUNC(type) Easing_ ## type
+#define COMMA ,
+
+easingfunc_t easing_funclist[EASE_MAX] =
+{
+ EASINGFUNCLIST(COMMA)
+};
+
+// Function names
+
+#undef EASINGFUNC
+#define EASINGFUNC(type) #type
+
+const char *easing_funcnames[EASE_MAX] =
+{
+ EASINGFUNCLIST(COMMA)
+};
+
+#undef COMMA
+#undef EASINGFUNC
diff --git a/src/m_easing.h b/src/m_easing.h
new file mode 100644
index 0000000000000000000000000000000000000000..229222a15778af2f8b0d6b5d4e975828dd2accff
--- /dev/null
+++ b/src/m_easing.h
@@ -0,0 +1,101 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020-2022 by Jaime "Lactozilla" Passos.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file m_easing.h
+/// \brief Easing functions
+
+#ifndef __M_EASING_H__
+#define __M_EASING_H__
+
+#include "doomtype.h"
+#include "m_fixed.h"
+
+typedef enum
+{
+ EASE_LINEAR = 0,
+
+ EASE_INSINE,
+ EASE_OUTSINE,
+ EASE_INOUTSINE,
+
+ EASE_INQUAD,
+ EASE_OUTQUAD,
+ EASE_INOUTQUAD,
+
+ EASE_INCUBIC,
+ EASE_OUTCUBIC,
+ EASE_INOUTCUBIC,
+
+ EASE_INQUART,
+ EASE_OUTQUART,
+ EASE_INOUTQUART,
+
+ EASE_INQUINT,
+ EASE_OUTQUINT,
+ EASE_INOUTQUINT,
+
+ EASE_INEXPO,
+ EASE_OUTEXPO,
+ EASE_INOUTEXPO,
+
+ EASE_INBACK,
+ EASE_OUTBACK,
+ EASE_INOUTBACK,
+
+ EASE_MAX,
+} easing_t;
+
+typedef fixed_t (*easingfunc_t)(fixed_t, fixed_t, fixed_t);
+
+extern easingfunc_t easing_funclist[EASE_MAX];
+extern const char *easing_funcnames[EASE_MAX];
+
+#define EASINGFUNCLIST(sep) \
+ EASINGFUNC(Linear) sep /* Easing_Linear */ \
+ \
+ EASINGFUNC(InSine) sep /* Easing_InSine */ \
+ EASINGFUNC(OutSine) sep /* Easing_OutSine */ \
+ EASINGFUNC(InOutSine) sep /* Easing_InOutSine */ \
+ \
+ EASINGFUNC(InQuad) sep /* Easing_InQuad */ \
+ EASINGFUNC(OutQuad) sep /* Easing_OutQuad */ \
+ EASINGFUNC(InOutQuad) sep /* Easing_InOutQuad */ \
+ \
+ EASINGFUNC(InCubic) sep /* Easing_InCubic */ \
+ EASINGFUNC(OutCubic) sep /* Easing_OutCubic */ \
+ EASINGFUNC(InOutCubic) sep /* Easing_InOutCubic */ \
+ \
+ EASINGFUNC(InQuart) sep /* Easing_InQuart */ \
+ EASINGFUNC(OutQuart) sep /* Easing_OutQuart */ \
+ EASINGFUNC(InOutQuart) sep /* Easing_InOutQuart */ \
+ \
+ EASINGFUNC(InQuint) sep /* Easing_InQuint */ \
+ EASINGFUNC(OutQuint) sep /* Easing_OutQuint */ \
+ EASINGFUNC(InOutQuint) sep /* Easing_InOutQuint */ \
+ \
+ EASINGFUNC(InExpo) sep /* Easing_InExpo */ \
+ EASINGFUNC(OutExpo) sep /* Easing_OutExpo */ \
+ EASINGFUNC(InOutExpo) sep /* Easing_InOutExpo */ \
+ \
+ EASINGFUNC(InBack) sep /* Easing_InBack */ \
+ EASINGFUNC(OutBack) sep /* Easing_OutBack */ \
+ EASINGFUNC(InOutBack) sep /* Easing_InOutBack */
+
+#define EASINGFUNC(type) fixed_t Easing_ ## type (fixed_t t, fixed_t start, fixed_t end);
+
+EASINGFUNCLIST()
+
+#undef EASINGFUNC
+#define EASINGFUNC(type) fixed_t Easing_ ## type (fixed_t t, fixed_t start, fixed_t end, fixed_t param);
+
+EASINGFUNC(InBackParameterized) /* Easing_InBackParameterized */
+EASINGFUNC(OutBackParameterized) /* Easing_OutBackParameterized */
+EASINGFUNC(InOutBackParameterized) /* Easing_InOutBackParameterized */
+
+#undef EASINGFUNC
+#endif
diff --git a/src/m_fixed.c b/src/m_fixed.c
index d40ccd98e35604a706dd7fa39f16234e1eb28f5a..70b7623da8d8ca14cf046e4279061c80a7ef6b25 100644
--- a/src/m_fixed.c
+++ b/src/m_fixed.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_fixed.h b/src/m_fixed.h
index 73adf52f6eb3a7ffd0e3e989db987643d34276a7..fe5efc5512e5bc23940056dc3056df04c771d10a 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -71,7 +71,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FloatToFixed(float f)
value [eax] \
modify exact [eax edx]
#elif defined (__GNUC__) && defined (__i386__) && !defined (NOASM)
- // DJGPP, i386 linux, cygwin or mingw
+ // i386 linux, cygwin or mingw
FUNCMATH FUNCINLINE static inline fixed_t FixedMul(fixed_t a, fixed_t b) // asm
{
fixed_t ret;
diff --git a/src/m_menu.c b/src/m_menu.c
index 7549d4bdcb0580fb15dcda79d6bda5af507932e0..b96918ff4b7811256fcab3affcca59d70f4374c7 100755
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3,7 +3,7 @@
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 2011-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -62,6 +62,8 @@
#include "i_joy.h" // for joystick menu controls
+#include "p_saveg.h" // Only for NEWSKINSAVES
+
// Condition Sets
#include "m_cond.h"
@@ -1140,55 +1142,55 @@ static menuitem_t OP_ChangeControlsMenu[] =
{
{IT_HEADER, NULL, "Movement", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0}, // padding
- {IT_CALL | IT_STRING2, NULL, "Move Forward", M_ChangeControl, gc_forward },
- {IT_CALL | IT_STRING2, NULL, "Move Backward", M_ChangeControl, gc_backward },
- {IT_CALL | IT_STRING2, NULL, "Move Left", M_ChangeControl, gc_strafeleft },
- {IT_CALL | IT_STRING2, NULL, "Move Right", M_ChangeControl, gc_straferight },
- {IT_CALL | IT_STRING2, NULL, "Jump", M_ChangeControl, gc_jump },
- {IT_CALL | IT_STRING2, NULL, "Spin", M_ChangeControl, gc_spin },
+ {IT_CALL | IT_STRING2, NULL, "Move Forward", M_ChangeControl, GC_FORWARD },
+ {IT_CALL | IT_STRING2, NULL, "Move Backward", M_ChangeControl, GC_BACKWARD },
+ {IT_CALL | IT_STRING2, NULL, "Move Left", M_ChangeControl, GC_STRAFELEFT },
+ {IT_CALL | IT_STRING2, NULL, "Move Right", M_ChangeControl, GC_STRAFERIGHT },
+ {IT_CALL | IT_STRING2, NULL, "Jump", M_ChangeControl, GC_JUMP },
+ {IT_CALL | IT_STRING2, NULL, "Spin", M_ChangeControl, GC_SPIN },
{IT_HEADER, NULL, "Camera", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0}, // padding
- {IT_CALL | IT_STRING2, NULL, "Look Up", M_ChangeControl, gc_lookup },
- {IT_CALL | IT_STRING2, NULL, "Look Down", M_ChangeControl, gc_lookdown },
- {IT_CALL | IT_STRING2, NULL, "Look Left", M_ChangeControl, gc_turnleft },
- {IT_CALL | IT_STRING2, NULL, "Look Right", M_ChangeControl, gc_turnright },
- {IT_CALL | IT_STRING2, NULL, "Center View", M_ChangeControl, gc_centerview },
- {IT_CALL | IT_STRING2, NULL, "Toggle Mouselook", M_ChangeControl, gc_mouseaiming },
- {IT_CALL | IT_STRING2, NULL, "Toggle Third-Person", M_ChangeControl, gc_camtoggle},
- {IT_CALL | IT_STRING2, NULL, "Reset Camera", M_ChangeControl, gc_camreset },
+ {IT_CALL | IT_STRING2, NULL, "Look Up", M_ChangeControl, GC_LOOKUP },
+ {IT_CALL | IT_STRING2, NULL, "Look Down", M_ChangeControl, GC_LOOKDOWN },
+ {IT_CALL | IT_STRING2, NULL, "Look Left", M_ChangeControl, GC_TURNLEFT },
+ {IT_CALL | IT_STRING2, NULL, "Look Right", M_ChangeControl, GC_TURNRIGHT },
+ {IT_CALL | IT_STRING2, NULL, "Center View", M_ChangeControl, GC_CENTERVIEW },
+ {IT_CALL | IT_STRING2, NULL, "Toggle Mouselook", M_ChangeControl, GC_MOUSEAIMING },
+ {IT_CALL | IT_STRING2, NULL, "Toggle Third-Person", M_ChangeControl, GC_CAMTOGGLE},
+ {IT_CALL | IT_STRING2, NULL, "Reset Camera", M_ChangeControl, GC_CAMRESET },
{IT_HEADER, NULL, "Meta", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0}, // padding
{IT_CALL | IT_STRING2, NULL, "Game Status",
- M_ChangeControl, gc_scores },
- {IT_CALL | IT_STRING2, NULL, "Pause / Run Retry", M_ChangeControl, gc_pause },
- {IT_CALL | IT_STRING2, NULL, "Screenshot", M_ChangeControl, gc_screenshot },
- {IT_CALL | IT_STRING2, NULL, "Toggle GIF Recording", M_ChangeControl, gc_recordgif },
- {IT_CALL | IT_STRING2, NULL, "Open/Close Menu (ESC)", M_ChangeControl, gc_systemmenu },
- {IT_CALL | IT_STRING2, NULL, "Change Viewpoint", M_ChangeControl, gc_viewpoint },
- {IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, gc_console },
+ M_ChangeControl, GC_SCORES },
+ {IT_CALL | IT_STRING2, NULL, "Pause / Run Retry", M_ChangeControl, GC_PAUSE },
+ {IT_CALL | IT_STRING2, NULL, "Screenshot", M_ChangeControl, GC_SCREENSHOT },
+ {IT_CALL | IT_STRING2, NULL, "Toggle GIF Recording", M_ChangeControl, GC_RECORDGIF },
+ {IT_CALL | IT_STRING2, NULL, "Open/Close Menu (ESC)", M_ChangeControl, GC_SYSTEMMENU },
+ {IT_CALL | IT_STRING2, NULL, "Change Viewpoint", M_ChangeControl, GC_VIEWPOINT },
+ {IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, GC_CONSOLE },
{IT_HEADER, NULL, "Multiplayer", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0}, // padding
- {IT_CALL | IT_STRING2, NULL, "Talk", M_ChangeControl, gc_talkkey },
- {IT_CALL | IT_STRING2, NULL, "Talk (Team only)", M_ChangeControl, gc_teamkey },
+ {IT_CALL | IT_STRING2, NULL, "Talk", M_ChangeControl, GC_TALKKEY },
+ {IT_CALL | IT_STRING2, NULL, "Talk (Team only)", M_ChangeControl, GC_TEAMKEY },
{IT_HEADER, NULL, "Ringslinger (Match, CTF, Tag, H&S)", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0}, // padding
- {IT_CALL | IT_STRING2, NULL, "Fire", M_ChangeControl, gc_fire },
- {IT_CALL | IT_STRING2, NULL, "Fire Normal", M_ChangeControl, gc_firenormal },
- {IT_CALL | IT_STRING2, NULL, "Toss Flag", M_ChangeControl, gc_tossflag },
- {IT_CALL | IT_STRING2, NULL, "Next Weapon", M_ChangeControl, gc_weaponnext },
- {IT_CALL | IT_STRING2, NULL, "Prev Weapon", M_ChangeControl, gc_weaponprev },
- {IT_CALL | IT_STRING2, NULL, "Normal / Infinity", M_ChangeControl, gc_wepslot1 },
- {IT_CALL | IT_STRING2, NULL, "Automatic", M_ChangeControl, gc_wepslot2 },
- {IT_CALL | IT_STRING2, NULL, "Bounce", M_ChangeControl, gc_wepslot3 },
- {IT_CALL | IT_STRING2, NULL, "Scatter", M_ChangeControl, gc_wepslot4 },
- {IT_CALL | IT_STRING2, NULL, "Grenade", M_ChangeControl, gc_wepslot5 },
- {IT_CALL | IT_STRING2, NULL, "Explosion", M_ChangeControl, gc_wepslot6 },
- {IT_CALL | IT_STRING2, NULL, "Rail", M_ChangeControl, gc_wepslot7 },
+ {IT_CALL | IT_STRING2, NULL, "Fire", M_ChangeControl, GC_FIRE },
+ {IT_CALL | IT_STRING2, NULL, "Fire Normal", M_ChangeControl, GC_FIRENORMAL },
+ {IT_CALL | IT_STRING2, NULL, "Toss Flag", M_ChangeControl, GC_TOSSFLAG },
+ {IT_CALL | IT_STRING2, NULL, "Next Weapon", M_ChangeControl, GC_WEAPONNEXT },
+ {IT_CALL | IT_STRING2, NULL, "Prev Weapon", M_ChangeControl, GC_WEAPONPREV },
+ {IT_CALL | IT_STRING2, NULL, "Normal / Infinity", M_ChangeControl, GC_WEPSLOT1 },
+ {IT_CALL | IT_STRING2, NULL, "Automatic", M_ChangeControl, GC_WEPSLOT2 },
+ {IT_CALL | IT_STRING2, NULL, "Bounce", M_ChangeControl, GC_WEPSLOT3 },
+ {IT_CALL | IT_STRING2, NULL, "Scatter", M_ChangeControl, GC_WEPSLOT4 },
+ {IT_CALL | IT_STRING2, NULL, "Grenade", M_ChangeControl, GC_WEPSLOT5 },
+ {IT_CALL | IT_STRING2, NULL, "Explosion", M_ChangeControl, GC_WEPSLOT6 },
+ {IT_CALL | IT_STRING2, NULL, "Rail", M_ChangeControl, GC_WEPSLOT7 },
{IT_HEADER, NULL, "Add-ons", NULL, 0},
{IT_SPACE, NULL, NULL, NULL, 0}, // padding
- {IT_CALL | IT_STRING2, NULL, "Custom Action 1", M_ChangeControl, gc_custom1 },
- {IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, gc_custom2 },
- {IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, gc_custom3 },
+ {IT_CALL | IT_STRING2, NULL, "Custom Action 1", M_ChangeControl, GC_CUSTOM1 },
+ {IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, GC_CUSTOM2 },
+ {IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, GC_CUSTOM3 },
};
static menuitem_t OP_Joystick1Menu[] =
@@ -1358,7 +1360,7 @@ static menuitem_t OP_Camera2ExtendedOptionsMenu[] =
enum
{
op_video_resolution = 1,
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
op_video_fullscreen,
#endif
op_video_vsync,
@@ -1370,7 +1372,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
{IT_HEADER, NULL, "Screen", NULL, 0},
{IT_STRING | IT_CALL, NULL, "Set Resolution...", M_VideoModeMenu, 6},
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 11},
#endif
{IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 16},
@@ -1489,7 +1491,7 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
#ifdef ALAM_LIGHTING
{IT_SUBMENU|IT_STRING, NULL, "Lighting...", &OP_OpenGLLightingDef, 144},
#endif
-#if defined (_WINDOWS) && (!((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)))
+#if defined (_WINDOWS) && (!(defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)))
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 154},
#endif
};
@@ -3327,7 +3329,7 @@ boolean M_Responder(event_t *ev)
if (gamestate == GS_TITLESCREEN && finalecount < TICRATE)
return false;
- if (CON_Ready())
+ if (CON_Ready() && gamestate != GS_WAITINGPLAYERS)
return false;
if (noFurtherInput)
@@ -3341,7 +3343,7 @@ boolean M_Responder(event_t *ev)
if (ev->type == ev_keydown)
{
keydown++;
- ch = ev->data1;
+ ch = ev->key;
// added 5-2-98 remap virtual keys (mouse & joystick buttons)
switch (ch)
@@ -3374,44 +3376,44 @@ boolean M_Responder(event_t *ev)
break;
}
}
- else if (ev->type == ev_joystick && ev->data1 == 0 && joywait < I_GetTime())
+ else if (ev->type == ev_joystick && ev->key == 0 && joywait < I_GetTime())
{
const INT32 jdeadzone = (JOYAXISRANGE * cv_digitaldeadzone.value) / FRACUNIT;
- if (ev->data3 != INT32_MAX)
+ if (ev->y != INT32_MAX)
{
- if (Joystick.bGamepadStyle || abs(ev->data3) > jdeadzone)
+ if (Joystick.bGamepadStyle || abs(ev->y) > jdeadzone)
{
- if (ev->data3 < 0 && pjoyy >= 0)
+ if (ev->y < 0 && pjoyy >= 0)
{
ch = KEY_UPARROW;
joywait = I_GetTime() + NEWTICRATE/7;
}
- else if (ev->data3 > 0 && pjoyy <= 0)
+ else if (ev->y > 0 && pjoyy <= 0)
{
ch = KEY_DOWNARROW;
joywait = I_GetTime() + NEWTICRATE/7;
}
- pjoyy = ev->data3;
+ pjoyy = ev->y;
}
else
pjoyy = 0;
}
- if (ev->data2 != INT32_MAX)
+ if (ev->x != INT32_MAX)
{
- if (Joystick.bGamepadStyle || abs(ev->data2) > jdeadzone)
+ if (Joystick.bGamepadStyle || abs(ev->x) > jdeadzone)
{
- if (ev->data2 < 0 && pjoyx >= 0)
+ if (ev->x < 0 && pjoyx >= 0)
{
ch = KEY_LEFTARROW;
joywait = I_GetTime() + NEWTICRATE/17;
}
- else if (ev->data2 > 0 && pjoyx <= 0)
+ else if (ev->x > 0 && pjoyx <= 0)
{
ch = KEY_RIGHTARROW;
joywait = I_GetTime() + NEWTICRATE/17;
}
- pjoyx = ev->data2;
+ pjoyx = ev->x;
}
else
pjoyx = 0;
@@ -3419,7 +3421,7 @@ boolean M_Responder(event_t *ev)
}
else if (ev->type == ev_mouse && mousewait < I_GetTime())
{
- pmousey += ev->data3;
+ pmousey -= ev->y;
if (pmousey < lasty-30)
{
ch = KEY_DOWNARROW;
@@ -3433,7 +3435,7 @@ boolean M_Responder(event_t *ev)
pmousey = lasty += 30;
}
- pmousex += ev->data2;
+ pmousex += ev->x;
if (pmousex < lastx - 30)
{
ch = KEY_LEFTARROW;
@@ -3451,11 +3453,11 @@ boolean M_Responder(event_t *ev)
keydown = 0;
}
else if (ev->type == ev_keydown) // Preserve event for other responders
- ch = ev->data1;
+ ch = ev->key;
if (ch == -1)
return false;
- else if (ch == gamecontrol[gc_systemmenu][0] || ch == gamecontrol[gc_systemmenu][1]) // allow remappable ESC key
+ else if (ch == gamecontrol[GC_SYSTEMMENU][0] || ch == gamecontrol[GC_SYSTEMMENU][1]) // allow remappable ESC key
ch = KEY_ESCAPE;
// F-Keys
@@ -4166,7 +4168,7 @@ static void M_DrawThermo(INT32 x, INT32 y, consvar_t *cv)
xx += p->width - p->leftoffset;
for (i = 0; i < 16; i++)
{
- V_DrawScaledPatch(xx, y, V_WRAPX, W_CachePatchNum(centerlump[i & 1], PU_PATCH));
+ V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(centerlump[i & 1], PU_PATCH));
xx += 8;
}
V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(rightlump, PU_PATCH));
@@ -4192,14 +4194,6 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop)
for (i = 1; i < SLIDER_RANGE; i++)
V_DrawScaledPatch (x+i*8, y, 0,p);
- if (ontop)
- {
- V_DrawCharacter(x - 6 - (skullAnimCounter/5), y,
- '\x1C' | V_YELLOWMAP, false);
- V_DrawCharacter(x+i*8 + 8 + (skullAnimCounter/5), y,
- '\x1D' | V_YELLOWMAP, false);
- }
-
p = W_CachePatchName("M_SLIDER", PU_PATCH);
V_DrawScaledPatch(x+i*8, y, 0, p);
@@ -4235,6 +4229,16 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop)
range = 100;
V_DrawMappedPatch(x + 2 + (SLIDER_RANGE*8*range)/100, y, 0, p, yellowmap);
+
+ if (ontop)
+ {
+ V_DrawCharacter(x - 6 - (skullAnimCounter/5), y,
+ '\x1C' | V_YELLOWMAP, false);
+ V_DrawCharacter(x + 80 + (skullAnimCounter/5), y,
+ '\x1D' | V_YELLOWMAP, false);
+ V_DrawCenteredString(x + 40, y, V_30TRANS,
+ (cv->flags & CV_FLOAT) ? va("%.2f", FIXED_TO_FLOAT(cv->value)) : va("%d", cv->value));
+ }
}
//
@@ -4262,7 +4266,7 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
p = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH);
for (n = 0; n < boxlines; n++)
{
- V_DrawScaledPatch(cx, cy, V_WRAPY, p);
+ V_DrawScaledPatch(cx, cy, 0, p);
cy += step;
}
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BL], PU_PATCH));
@@ -4274,8 +4278,8 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
cy = y;
while (width > 0)
{
- V_DrawScaledPatch(cx, cy, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH));
- V_DrawScaledPatch(cx, y + boff + boxlines*step, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH));
+ V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH));
+ V_DrawScaledPatch(cx, y + boff + boxlines*step, 0, W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH));
width--;
cx += step;
}
@@ -4287,7 +4291,7 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
p = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH);
for (n = 0; n < boxlines; n++)
{
- V_DrawScaledPatch(cx, cy, V_WRAPY, p);
+ V_DrawScaledPatch(cx, cy, 0, p);
cy += step;
}
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BR], PU_PATCH));
@@ -4315,7 +4319,7 @@ static void M_DrawStaticBox(fixed_t x, fixed_t y, INT32 flags, fixed_t w, fixed_
if (staticalong > pw) // simplified for base LSSTATIC
staticalong -= pw;
- V_DrawCroppedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT/2, flags, patch, staticalong, 0, sw, h*2); // FixedDiv(h, scale)); -- for scale FRACUNIT/2
+ V_DrawCroppedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT/2, FRACUNIT/2, flags, patch, NULL, staticalong<<FRACBITS, 0, sw<<FRACBITS, h*2<<FRACBITS); // FixedDiv(h, scale)); -- for scale FRACUNIT/2
staticalong += sw; //M_RandomRange(sw/2, 2*sw); -- turns out less randomisation looks better because immediately adjacent frames can't end up close to each other
@@ -4566,22 +4570,21 @@ static void M_DrawGenericMenu(void)
}
}
-const char *PlaystyleNames[4] = {"Strafe", "Standard", "Simple", "Old Analog??"};
+const char *PlaystyleNames[4] = {"\x86Strafe\x80", "Manual", "Automatic", "Old Analog??"};
const char *PlaystyleDesc[4] = {
- // Legacy
- "The play style used for\n"
- "old-school SRB2.\n"
+ // Strafe (or Legacy)
+ "A play style resembling\n"
+ "old-school SRB2 gameplay.\n"
"\n"
"This play style is identical\n"
- "to Standard, except that the\n"
+ "to Manual, except that the\n"
"player always looks in the\n"
"direction of the camera."
,
- // Standard
- "The default play style,\n"
- "designed for full control\n"
- "with a keyboard and mouse.\n"
+ // Manual (formerly Standard)
+ "A play style made for full control,\n"
+ "using a keyboard and mouse.\n"
"\n"
"The camera rotates only when\n"
"you tell it to. The player\n"
@@ -4593,8 +4596,8 @@ const char *PlaystyleDesc[4] = {
"open up the highest level of play!"
,
- // Simple
- "A play style designed for\n"
+ // Automatic (formerly Simple)
+ "The default play style, designed for\n"
"gamepads and hassle-free play.\n"
"\n"
"The camera rotates automatically\n"
@@ -4603,7 +4606,8 @@ const char *PlaystyleDesc[4] = {
"they're moving.\n"
"\n"
"Hold \x82" "Center View\x80 to lock the\n"
- "camera behind the player!\n"
+ "camera behind the player, or target\n"
+ "enemies, bosses and monitors!\n"
,
// Old Analog
@@ -4614,7 +4618,7 @@ const char *PlaystyleDesc[4] = {
"your config file and brought it back.\n"
"\n"
"That's absolutely valid, but I implore\n"
- "you to try the new Simple play style\n"
+ "you to try the new Automatic play style\n"
"instead!"
};
@@ -5507,34 +5511,75 @@ static boolean M_GametypeHasLevels(INT32 gt)
static INT32 M_CountRowsToShowOnPlatter(INT32 gt)
{
- INT32 mapnum = 0, prevmapnum = 0, col = 0, rows = 0;
+ INT32 col = 0, rows = 0;
+ INT32 mapIterate = 0;
+ INT32 headingIterate = 0;
+ boolean mapAddedAlready[NUMMAPS];
- while (mapnum < NUMMAPS)
+ memset(mapAddedAlready, 0, sizeof mapAddedAlready);
+
+ for (mapIterate = 0; mapIterate < NUMMAPS; mapIterate++)
{
- if (M_CanShowLevelOnPlatter(mapnum, gt))
+ boolean forceNewRow = true;
+
+ if (mapAddedAlready[mapIterate] == true)
{
- if (rows == 0)
+ // Already added under another heading
+ continue;
+ }
+
+ if (M_CanShowLevelOnPlatter(mapIterate, gt) == false)
+ {
+ // Don't show this one
+ continue;
+ }
+
+ for (headingIterate = mapIterate; headingIterate < NUMMAPS; headingIterate++)
+ {
+ boolean wide = false;
+
+ if (mapAddedAlready[headingIterate] == true)
+ {
+ // Already added under another heading
+ continue;
+ }
+
+ if (M_CanShowLevelOnPlatter(headingIterate, gt) == false)
+ {
+ // Don't show this one
+ continue;
+ }
+
+ if (!fastcmp(mapheaderinfo[mapIterate]->selectheading, mapheaderinfo[headingIterate]->selectheading))
+ {
+ // Headers don't match
+ continue;
+ }
+
+ wide = (mapheaderinfo[headingIterate]->menuflags & LF2_WIDEICON);
+
+ // preparing next position to drop mapnum into
+ if (col == 2 // no more space on the row?
+ || wide || forceNewRow)
+ {
+ col = 0;
rows++;
+ }
else
{
- if (col == 2
- || (mapheaderinfo[prevmapnum]->menuflags & LF2_WIDEICON)
- || (mapheaderinfo[mapnum]->menuflags & LF2_WIDEICON)
- || !(fastcmp(mapheaderinfo[mapnum]->selectheading, mapheaderinfo[prevmapnum]->selectheading)))
- {
- col = 0;
- rows++;
- }
- else
- col++;
+ col++;
}
- prevmapnum = mapnum;
+
+ // Done adding this one
+ mapAddedAlready[headingIterate] = true;
+ forceNewRow = wide;
}
- mapnum++;
}
if (levellistmode == LLM_CREATESERVER)
+ {
rows++;
+ }
return rows;
}
@@ -5564,7 +5609,10 @@ static void M_CacheLevelPlatter(void)
static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
{
INT32 numrows = M_CountRowsToShowOnPlatter(gt);
- INT32 mapnum = 0, prevmapnum = 0, col = 0, row = 0, startrow = 0;
+ INT32 col = 0, row = 0, startrow = 0;
+ INT32 mapIterate = 0; // First level of map loop -- find starting points for select headings
+ INT32 headingIterate = 0; // Second level of map loop -- finding maps that match mapIterate's heading.
+ boolean mapAddedAlready[NUMMAPS];
if (!numrows)
return false;
@@ -5581,6 +5629,8 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
// done here so lsrow and lscol can be set if cv_nextmap is on the platter
lsrow = lscol = lshli = lsoffs[0] = lsoffs[1] = 0;
+ memset(mapAddedAlready, 0, sizeof mapAddedAlready);
+
if (levellistmode == LLM_CREATESERVER)
{
sprintf(levelselect.rows[0].header, "Gametype");
@@ -5592,31 +5642,75 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
char_notes = NULL;
}
- while (mapnum < NUMMAPS)
+ for (mapIterate = 0; mapIterate < NUMMAPS; mapIterate++)
{
- if (M_CanShowLevelOnPlatter(mapnum, gt))
+ INT32 headerRow = -1;
+ boolean anyAvailable = false;
+ boolean forceNewRow = true;
+
+ if (mapAddedAlready[mapIterate] == true)
{
- const UINT8 actnum = mapheaderinfo[mapnum]->actnum;
- const boolean headingisname = (fastcmp(mapheaderinfo[mapnum]->selectheading, mapheaderinfo[mapnum]->lvlttl));
- const boolean wide = (mapheaderinfo[mapnum]->menuflags & LF2_WIDEICON);
+ // Already added under another heading
+ continue;
+ }
+
+ if (M_CanShowLevelOnPlatter(mapIterate, gt) == false)
+ {
+ // Don't show this one
+ continue;
+ }
+
+ for (headingIterate = mapIterate; headingIterate < NUMMAPS; headingIterate++)
+ {
+ UINT8 actnum = 0;
+ boolean headingisname = false;
+ boolean wide = false;
+
+ if (mapAddedAlready[headingIterate] == true)
+ {
+ // Already added under another heading
+ continue;
+ }
+
+ if (M_CanShowLevelOnPlatter(headingIterate, gt) == false)
+ {
+ // Don't show this one
+ continue;
+ }
+
+ if (!fastcmp(mapheaderinfo[mapIterate]->selectheading, mapheaderinfo[headingIterate]->selectheading))
+ {
+ // Headers don't match
+ continue;
+ }
+
+ actnum = mapheaderinfo[headingIterate]->actnum;
+ headingisname = (fastcmp(mapheaderinfo[headingIterate]->selectheading, mapheaderinfo[headingIterate]->lvlttl));
+ wide = (mapheaderinfo[headingIterate]->menuflags & LF2_WIDEICON);
// preparing next position to drop mapnum into
if (levelselect.rows[startrow].maplist[0])
{
if (col == 2 // no more space on the row?
- || wide
- || (mapheaderinfo[prevmapnum]->menuflags & LF2_WIDEICON)
- || !(fastcmp(mapheaderinfo[mapnum]->selectheading, mapheaderinfo[prevmapnum]->selectheading))) // a new heading is starting?
+ || wide || forceNewRow)
{
col = 0;
row++;
}
else
+ {
col++;
+ }
+ }
+
+ if (headerRow == -1)
+ {
+ // Set where the header row is meant to be
+ headerRow = row;
}
- levelselect.rows[row].maplist[col] = mapnum+1; // putting the map on the platter
- levelselect.rows[row].mapavailable[col] = M_LevelAvailableOnPlatter(mapnum);
+ levelselect.rows[row].maplist[col] = headingIterate+1; // putting the map on the platter
+ levelselect.rows[row].mapavailable[col] = M_LevelAvailableOnPlatter(headingIterate);
if ((lswide(row) = wide)) // intentionally assignment
{
@@ -5624,7 +5718,7 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
levelselect.rows[row].mapavailable[2] = levelselect.rows[row].mapavailable[1] = levelselect.rows[row].mapavailable[0];
}
- if (nextmappick && cv_nextmap.value == mapnum+1) // A little quality of life improvement.
+ if (nextmappick && cv_nextmap.value == headingIterate+1) // A little quality of life improvement.
{
lsrow = row;
lscol = col;
@@ -5633,6 +5727,8 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
// individual map name
if (levelselect.rows[row].mapavailable[col])
{
+ anyAvailable = true;
+
if (headingisname)
{
if (actnum)
@@ -5643,7 +5739,7 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
else if (wide)
{
// Yes, with LF2_WIDEICON it'll continue on over into the next 17+1 char block. That's alright; col is always zero, the string is contiguous, and the maximum length is lvlttl[22] + ' ' + ZONE + ' ' + INT32, which is about 39 or so - barely crossing into the third column.
- char* mapname = G_BuildMapTitle(mapnum+1);
+ char* mapname = G_BuildMapTitle(headingIterate+1);
strcpy(levelselect.rows[row].mapnames[col], (const char *)mapname);
Z_Free(mapname);
}
@@ -5652,9 +5748,9 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
char mapname[22+1+11]; // lvlttl[22] + ' ' + INT32
if (actnum)
- sprintf(mapname, "%s %d", mapheaderinfo[mapnum]->lvlttl, actnum);
+ sprintf(mapname, "%s %d", mapheaderinfo[headingIterate]->lvlttl, actnum);
else
- strcpy(mapname, mapheaderinfo[mapnum]->lvlttl);
+ strcpy(mapname, mapheaderinfo[headingIterate]->lvlttl);
if (strlen(mapname) >= 17)
strcpy(mapname+17-3, "...");
@@ -5663,27 +5759,36 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
}
}
else
- sprintf(levelselect.rows[row].mapnames[col], "???");
-
- // creating header text
- if (!col && ((row == startrow) || !(fastcmp(mapheaderinfo[mapnum]->selectheading, mapheaderinfo[levelselect.rows[row-1].maplist[0]-1]->selectheading))))
{
- if (!levelselect.rows[row].mapavailable[col])
- sprintf(levelselect.rows[row].header, "???");
- else
- {
- sprintf(levelselect.rows[row].header, "%s", mapheaderinfo[mapnum]->selectheading);
- if (!(mapheaderinfo[mapnum]->levelflags & LF_NOZONE) && headingisname)
- {
- sprintf(levelselect.rows[row].header + strlen(levelselect.rows[row].header), " ZONE");
- }
- }
+ sprintf(levelselect.rows[row].mapnames[col], "???");
}
- prevmapnum = mapnum;
+ // Done adding this one
+ mapAddedAlready[headingIterate] = true;
+ forceNewRow = wide;
}
- mapnum++;
+ if (headerRow == -1)
+ {
+ // Shouldn't happen
+ continue;
+ }
+
+ // creating header text
+ if (anyAvailable == false)
+ {
+ sprintf(levelselect.rows[headerRow].header, "???");
+ }
+ else
+ {
+ sprintf(levelselect.rows[headerRow].header, "%s", mapheaderinfo[mapIterate]->selectheading);
+
+ if (!(mapheaderinfo[mapIterate]->levelflags & LF_NOZONE)
+ && fastcmp(mapheaderinfo[mapIterate]->selectheading, mapheaderinfo[mapIterate]->lvlttl))
+ {
+ sprintf(levelselect.rows[headerRow].header + strlen(levelselect.rows[headerRow].header), " ZONE");
+ }
+ }
}
#ifdef SYMMETRICAL_PLATTER
@@ -6648,6 +6753,7 @@ static void M_Addons(INT32 choice)
M_SetupNextMenu(&MISC_AddonsDef);
}
+#ifdef ENFORCE_WAD_LIMIT
#define width 4
#define vpadding 27
#define h (BASEVIDHEIGHT-(2*vpadding))
@@ -6695,6 +6801,7 @@ static void M_DrawTemperature(INT32 x, fixed_t t)
#undef vpadding
#undef h
#undef NUMCOLOURS
+#endif
static char *M_AddonsHeaderPath(void)
{
@@ -6788,21 +6895,20 @@ static void M_DrawAddons(void)
V_DrawCenteredString(BASEVIDWIDTH/2, 5, 0, LOCATIONSTRING1);
// (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1)
+#ifdef ENFORCE_WAD_LIMIT
if (numwadfiles <= mainwads+1)
y = 0;
else if (numwadfiles >= MAX_WADFILES)
y = FRACUNIT;
else
{
- x = FixedDiv(((ssize_t)(numwadfiles) - (ssize_t)(mainwads+1))<<FRACBITS, ((ssize_t)MAX_WADFILES - (ssize_t)(mainwads+1))<<FRACBITS);
- y = FixedDiv((((ssize_t)packetsizetally-(ssize_t)mainwadstally)<<FRACBITS), ((((ssize_t)MAXFILENEEDED*sizeof(UINT8)-(ssize_t)mainwadstally)-(5+22))<<FRACBITS)); // 5+22 = (a.ext + checksum length) is minimum addition to packet size tally
- if (x > y)
- y = x;
+ y = FixedDiv(((ssize_t)(numwadfiles) - (ssize_t)(mainwads+1))<<FRACBITS, ((ssize_t)MAX_WADFILES - (ssize_t)(mainwads+1))<<FRACBITS);
if (y > FRACUNIT) // happens because of how we're shrinkin' it a little
y = FRACUNIT;
}
M_DrawTemperature(BASEVIDWIDTH - 19 - 5, y);
+#endif
// DRAW MENU
x = currentMenu->x;
@@ -7296,7 +7402,7 @@ void M_RefreshPauseMenu(void)
static void M_UltimateCheat(INT32 choice)
{
(void)choice;
- LUAh_GameQuit(true);
+ LUA_HookBool(true, HOOK(GameQuit));
I_Quit();
}
@@ -7443,13 +7549,20 @@ static void M_HandleChecklist(INT32 choice)
static void M_DrawChecklist(void)
{
- INT32 i = check_on, j = 0, y = currentMenu->y;
+ INT32 i = check_on, j = 0, y = currentMenu->y, emblems = numemblems+numextraemblems;
UINT32 condnum, previd, maxcond;
condition_t *cond;
// draw title (or big pic)
M_DrawMenuTitle();
+ // draw emblem counter
+ if (emblems > 0)
+ {
+ V_DrawString(42, 20, (emblems == M_CountEmblems()) ? V_GREENMAP : 0, va("%d/%d", M_CountEmblems(), emblems));
+ V_DrawSmallScaledPatch(28, 20, 0, W_CachePatchName("EMBLICON", PU_PATCH));
+ }
+
if (check_on)
V_DrawString(10, y-(skullAnimCounter/5), V_YELLOWMAP, "\x1A");
@@ -8908,6 +9021,12 @@ static void M_DrawLoad(void)
loadgameoffset = 0;
M_DrawLoadGameData();
+
+ if (modifiedgame && !savemoddata)
+ {
+ V_DrawCenteredThinString(BASEVIDWIDTH/2, 184, 0, "\x85WARNING: \x80The game is modified.");
+ V_DrawCenteredThinString(BASEVIDWIDTH/2, 192, 0, "Progress will not be saved.");
+ }
}
//
@@ -8939,7 +9058,7 @@ static void M_LoadSelect(INT32 choice)
#define VERSIONSIZE 16
#define BADSAVE { savegameinfo[slot].lives = -666; Z_Free(savebuffer); return; }
-#define CHECKPOS if (save_p >= end_p) BADSAVE
+#define CHECKPOS if (sav_p >= end_p) BADSAVE
// Reads the save file to list lives, level, player, etc.
// Tails 05-29-2003
static void M_ReadSavegameInfo(UINT32 slot)
@@ -8948,10 +9067,13 @@ static void M_ReadSavegameInfo(UINT32 slot)
char savename[255];
UINT8 *savebuffer;
UINT8 *end_p; // buffer end point, don't read past here
- UINT8 *save_p;
+ UINT8 *sav_p;
INT32 fake; // Dummy variable
char temp[sizeof(timeattackfolder)];
char vcheck[VERSIONSIZE];
+#ifdef NEWSKINSAVES
+ INT16 backwardsCompat = 0;
+#endif
sprintf(savename, savegamename, slot);
@@ -8967,19 +9089,19 @@ static void M_ReadSavegameInfo(UINT32 slot)
end_p = savebuffer + length;
// skip the description field
- save_p = savebuffer;
+ sav_p = savebuffer;
// Version check
memset(vcheck, 0, sizeof (vcheck));
sprintf(vcheck, "version %d", VERSION);
- if (strcmp((const char *)save_p, (const char *)vcheck)) BADSAVE
- save_p += VERSIONSIZE;
+ if (strcmp((const char *)sav_p, (const char *)vcheck)) BADSAVE
+ sav_p += VERSIONSIZE;
// dearchive all the modifications
// P_UnArchiveMisc()
CHECKPOS
- fake = READINT16(save_p);
+ fake = READINT16(sav_p);
if (((fake-1) & 8191) >= NUMMAPS) BADSAVE
@@ -8996,54 +9118,84 @@ static void M_ReadSavegameInfo(UINT32 slot)
savegameinfo[slot].gamemap = fake;
CHECKPOS
- savegameinfo[slot].numemeralds = READUINT16(save_p)-357; // emeralds
+ savegameinfo[slot].numemeralds = READUINT16(sav_p)-357; // emeralds
CHECKPOS
- READSTRINGN(save_p, temp, sizeof(temp)); // mod it belongs to
+ READSTRINGN(sav_p, temp, sizeof(temp)); // mod it belongs to
if (strcmp(temp, timeattackfolder)) BADSAVE
// P_UnArchivePlayer()
+#ifdef NEWSKINSAVES
CHECKPOS
- fake = READUINT16(save_p);
- savegameinfo[slot].skinnum = fake & ((1<<5) - 1);
- if (savegameinfo[slot].skinnum >= numskins
- || !R_SkinUsable(-1, savegameinfo[slot].skinnum))
- BADSAVE
- savegameinfo[slot].botskin = fake >> 5;
- if (savegameinfo[slot].botskin-1 >= numskins
- || !R_SkinUsable(-1, savegameinfo[slot].botskin-1))
- BADSAVE
+ backwardsCompat = READUINT16(sav_p);
+
+ if (backwardsCompat != NEWSKINSAVES)
+ {
+ // Backwards compat
+ savegameinfo[slot].skinnum = backwardsCompat & ((1<<5) - 1);
+
+ if (savegameinfo[slot].skinnum >= numskins
+ || !R_SkinUsable(-1, savegameinfo[slot].skinnum))
+ BADSAVE
+
+ savegameinfo[slot].botskin = backwardsCompat >> 5;
+ if (savegameinfo[slot].botskin-1 >= numskins
+ || !R_SkinUsable(-1, savegameinfo[slot].botskin-1))
+ BADSAVE
+ }
+ else
+#endif
+ {
+ char ourSkinName[SKINNAMESIZE+1];
+ char botSkinName[SKINNAMESIZE+1];
+
+ CHECKPOS
+ READSTRINGN(sav_p, ourSkinName, SKINNAMESIZE);
+ savegameinfo[slot].skinnum = R_SkinAvailable(ourSkinName);
+
+ if (savegameinfo[slot].skinnum >= numskins
+ || !R_SkinUsable(-1, savegameinfo[slot].skinnum))
+ BADSAVE
+
+ CHECKPOS
+ READSTRINGN(sav_p, botSkinName, SKINNAMESIZE);
+ savegameinfo[slot].botskin = (R_SkinAvailable(botSkinName) + 1);
+
+ if (savegameinfo[slot].botskin-1 >= numskins
+ || !R_SkinUsable(-1, savegameinfo[slot].botskin-1))
+ BADSAVE
+ }
CHECKPOS
- savegameinfo[slot].numgameovers = READUINT8(save_p); // numgameovers
+ savegameinfo[slot].numgameovers = READUINT8(sav_p); // numgameovers
CHECKPOS
- savegameinfo[slot].lives = READSINT8(save_p); // lives
+ savegameinfo[slot].lives = READSINT8(sav_p); // lives
CHECKPOS
- savegameinfo[slot].continuescore = READINT32(save_p); // score
+ savegameinfo[slot].continuescore = READINT32(sav_p); // score
CHECKPOS
- fake = READINT32(save_p); // continues
+ fake = READINT32(sav_p); // continues
if (useContinues)
savegameinfo[slot].continuescore = fake;
// File end marker check
CHECKPOS
- switch (READUINT8(save_p))
+ switch (READUINT8(sav_p))
{
case 0xb7:
{
UINT8 i, banksinuse;
CHECKPOS
- banksinuse = READUINT8(save_p);
+ banksinuse = READUINT8(sav_p);
CHECKPOS
if (banksinuse > NUM_LUABANKS)
BADSAVE
for (i = 0; i < banksinuse; i++)
{
- (void)READINT32(save_p);
+ (void)READINT32(sav_p);
CHECKPOS
}
- if (READUINT8(save_p) != 0x1d)
+ if (READUINT8(sav_p) != 0x1d)
BADSAVE
}
case 0x1d:
@@ -9176,7 +9328,7 @@ static void M_HandleLoadSave(INT32 choice)
break;
case KEY_ENTER:
- if (ultimate_selectable && saveSlotSelected == NOSAVESLOT)
+ if (ultimate_selectable && saveSlotSelected == NOSAVESLOT && !savemoddata && !modifiedgame)
{
loadgamescroll = 0;
S_StartSound(NULL, sfx_skid);
@@ -9269,7 +9421,7 @@ static void M_LoadGame(INT32 choice)
if (tutorialmap && cv_tutorialprompt.value)
{
- M_StartMessage("Do you want to \x82play a brief Tutorial\x80?\n\nWe highly recommend this because \nthe controls are slightly different \nfrom other games.\n\nPress 'Y' or 'Enter' to go\nPress 'N' or any key to skip\n",
+ M_StartMessage("Do you want to \x82play a brief Tutorial\x80?\n\nWe highly recommend this because \nthe controls are slightly different \nfrom other games.\n\nPress the\x82 Y\x80 key or the\x83 A button\x80 to go\nPress the\x82 N\x80 key or the\x83 Y button\x80 to skip\n",
M_FirstTimeResponse, MM_YESNO);
return;
}
@@ -9322,7 +9474,7 @@ static void M_CacheCharacterSelectEntry(INT32 i, INT32 skinnum)
static UINT8 M_SetupChoosePlayerDirect(INT32 choice)
{
- INT32 skinnum;
+ INT32 skinnum, botskinnum;
UINT8 i;
UINT8 firstvalid = 255, lastvalid = 255;
boolean allowed = false;
@@ -9354,6 +9506,13 @@ static UINT8 M_SetupChoosePlayerDirect(INT32 choice)
skinnum = description[i].skinnum[0];
if ((skinnum != -1) && (R_SkinUsable(-1, skinnum)))
{
+ botskinnum = description[i].skinnum[1];
+ if ((botskinnum != -1) && (!R_SkinUsable(-1, botskinnum)))
+ {
+ // Bot skin isn't unlocked
+ continue;
+ }
+
// Handling order.
if (firstvalid == 255)
firstvalid = i;
@@ -11788,9 +11947,7 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 2].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR;
- OP_ServerOptionsMenu[36].status = (netgame
- ? IT_GRAYEDOUT
- : (IT_STRING | IT_CVAR | IT_CV_STRING));
+ OP_ServerOptionsMenu[36].status = IT_STRING | IT_CVAR | IT_CV_STRING;
OP_ServerOptionsMenu[37].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[38].status = IT_STRING | IT_CVAR;
}
@@ -13042,13 +13199,13 @@ static void M_DrawControl(void)
else
{
if (keys[0] != KEY_NULL)
- strcat (tmp, G_KeynumToString (keys[0]));
+ strcat (tmp, G_KeyNumToName (keys[0]));
if (keys[0] != KEY_NULL && keys[1] != KEY_NULL)
strcat(tmp," or ");
if (keys[1] != KEY_NULL)
- strcat (tmp, G_KeynumToString (keys[1]));
+ strcat (tmp, G_KeyNumToName (keys[1]));
}
@@ -13075,7 +13232,7 @@ static void M_ChangecontrolResponse(event_t *ev)
{
INT32 control;
INT32 found;
- INT32 ch = ev->data1;
+ INT32 ch = ev->key;
// ESCAPE cancels; dummy out PAUSE
if (ch != KEY_ESCAPE && ch != KEY_PAUSE)
@@ -13094,7 +13251,7 @@ static void M_ChangecontrolResponse(event_t *ev)
// keypad arrows are converted for the menu in cursor arrows
// so use the event instead of ch
case ev_keydown:
- ch = ev->data1;
+ ch = ev->key;
break;
default:
@@ -13145,7 +13302,7 @@ static void M_ChangecontrolResponse(event_t *ev)
static char tmp[158];
menu_t *prev = currentMenu->prevMenu;
- if (controltochange == gc_pause)
+ if (controltochange == GC_PAUSE)
sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit cannot be used to retry runs \nduring Record Attack. \n\nHit another key for\n%s\nESC for Cancel"),
controltochangetext);
else
@@ -13210,6 +13367,7 @@ static void M_DrawPlaystyleMenu(void)
if (i == playstyle_currentchoice)
{
+ V_DrawFill(20, 40, 280, 150, 159);
V_DrawScaledPatch((i+1)*BASEVIDWIDTH/4 - 8, 10, 0, W_CachePatchName("M_CURSOR", PU_CACHE));
V_DrawString(30, 50, V_ALLOWLOWERCASE, PlaystyleDesc[i]);
}
@@ -13282,7 +13440,7 @@ static void M_VideoModeMenu(INT32 choice)
memset(modedescs, 0, sizeof(modedescs));
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
VID_PrepareModeList(); // FIXME: hack
#endif
vidm_nummodes = 0;
@@ -13725,7 +13883,7 @@ void M_QuitResponse(INT32 ch)
if (ch != 'y' && ch != KEY_ENTER)
return;
- LUAh_GameQuit(true);
+ LUA_HookBool(true, HOOK(GameQuit));
if (!(netgame || cv_debug))
{
S_ResetCaptions();
diff --git a/src/m_menu.h b/src/m_menu.h
index 05775cc531f06237660db119d668551f27e3be14..a4c65db29211dd25bea145a5cf21522f53e0babd 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -3,7 +3,7 @@
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 2011-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_misc.c b/src/m_misc.c
index 999ee096164e383b2c4203754fa613aecc5b30fb..d7d6d6bbb6e9d4931c545b985e386d303af54941 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -64,8 +64,6 @@ typedef off_t off64_t;
#define PRIdS "u"
#elif defined (_WIN32)
#define PRIdS "Iu"
-#elif defined (DJGPP)
-#define PRIdS "u"
#else
#define PRIdS "zu"
#endif
@@ -1633,14 +1631,14 @@ boolean M_ScreenshotResponder(event_t *ev)
if (dedicated || ev->type != ev_keydown)
return false;
- ch = ev->data1;
+ ch = ev->key;
if (ch >= KEY_MOUSE1 && menuactive) // If it's not a keyboard key, then don't allow it in the menus!
return false;
- if (ch == KEY_F8 || ch == gamecontrol[gc_screenshot][0] || ch == gamecontrol[gc_screenshot][1]) // remappable F8
+ if (ch == KEY_F8 || ch == gamecontrol[GC_SCREENSHOT][0] || ch == gamecontrol[GC_SCREENSHOT][1]) // remappable F8
M_ScreenShot();
- else if (ch == KEY_F9 || ch == gamecontrol[gc_recordgif][0] || ch == gamecontrol[gc_recordgif][1]) // remappable F9
+ else if (ch == KEY_F9 || ch == gamecontrol[GC_RECORDGIF][0] || ch == gamecontrol[GC_RECORDGIF][1]) // remappable F9
((moviemode) ? M_StopMovie : M_StartMovie)();
else
return false;
@@ -2690,3 +2688,22 @@ const char * M_Ftrim (double f)
return &dig[1];/* skip the 0 */
}
}
+
+// Returns true if the string is empty.
+boolean M_IsStringEmpty(const char *s)
+{
+ const char *ch = s;
+
+ if (s == NULL || s[0] == '\0')
+ return true;
+
+ for (;;ch++)
+ {
+ if (!(*ch))
+ break;
+ if (!isspace((*ch)))
+ return false;
+ }
+
+ return true;
+}
diff --git a/src/m_misc.h b/src/m_misc.h
index fc5430f013be79da18dd624701111dc3d24ed8d2..5b79c6c8c4d55473053563f722504257fe3ea157 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -117,6 +117,9 @@ trailing zeros, or "" if the fractional part is zero.
*/
const char * M_Ftrim (double);
+// Returns true if the string is empty.
+boolean M_IsStringEmpty(const char *s);
+
// counting bits, for weapon ammo code, usually
FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
diff --git a/src/m_perfstats.c b/src/m_perfstats.c
index 8a99312e6a3d987de4ef6ab7965e31cbdc220458..9fc41000d24548deb4a58f3b5071c3f6a9fa77e1 100644
--- a/src/m_perfstats.c
+++ b/src/m_perfstats.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -22,560 +22,805 @@
#include "hardware/hw_main.h"
#endif
-struct perfstatcol;
struct perfstatrow;
-typedef struct perfstatcol perfstatcol_t;
typedef struct perfstatrow perfstatrow_t;
-struct perfstatcol {
- INT32 lores_x;
- INT32 hires_x;
- INT32 color;
- perfstatrow_t * rows;
+struct perfstatrow {
+ const char * lores_label;
+ const char * hires_label;
+ ps_metric_t * metric;
+ UINT8 flags;
};
-struct perfstatrow {
- const char * lores_label;
- const char * hires_label;
- void * value;
+// perfstatrow_t flags
+
+#define PS_TIME 1 // metric measures time (uses precise_t instead of INT32)
+#define PS_LEVEL 2 // metric is valid only when a level is active
+#define PS_SW 4 // metric is valid only in software mode
+#define PS_HW 8 // metric is valid only in opengl mode
+#define PS_BATCHING 16 // metric is valid only when opengl batching is active
+#define PS_HIDE_ZERO 32 // hide metric if its value is zero
+
+static ps_metric_t ps_frametime = {0};
+
+ps_metric_t ps_tictime = {0};
+
+ps_metric_t ps_playerthink_time = {0};
+ps_metric_t ps_thinkertime = {0};
+
+ps_metric_t ps_thlist_times[NUM_THINKERLISTS];
+
+static ps_metric_t ps_thinkercount = {0};
+static ps_metric_t ps_polythcount = {0};
+static ps_metric_t ps_mainthcount = {0};
+static ps_metric_t ps_mobjcount = {0};
+static ps_metric_t ps_regularcount = {0};
+static ps_metric_t ps_scenerycount = {0};
+static ps_metric_t ps_nothinkcount = {0};
+static ps_metric_t ps_dynslopethcount = {0};
+static ps_metric_t ps_precipcount = {0};
+static ps_metric_t ps_removecount = {0};
+
+ps_metric_t ps_checkposition_calls = {0};
+
+ps_metric_t ps_lua_thinkframe_time = {0};
+ps_metric_t ps_lua_mobjhooks = {0};
+
+ps_metric_t ps_otherlogictime = {0};
+
+// Columns for perfstats pages.
+
+// Position on screen is determined separately in the drawing functions.
+
+// New columns must also be added to the drawing and update functions.
+// Drawing functions: PS_DrawRenderStats, PS_DrawGameLogicStats, etc.
+// Update functions:
+// - PS_UpdateFrameStats for frame-dependent values
+// - PS_UpdateTickStats for tick-dependent values
+
+// Rendering stats columns
+
+perfstatrow_t rendertime_rows[] = {
+ {"frmtime", "Frame time: ", &ps_frametime, PS_TIME},
+ {"drwtime", "3d rendering: ", &ps_rendercalltime, PS_TIME|PS_LEVEL},
+
+#ifdef HWRENDER
+ {" skybox ", " Skybox render: ", &ps_hw_skyboxtime, PS_TIME|PS_LEVEL|PS_HW},
+ {" bsptime", " RenderBSPNode: ", &ps_bsptime, PS_TIME|PS_LEVEL|PS_HW},
+ {" batsort", " Batch sort: ", &ps_hw_batchsorttime, PS_TIME|PS_LEVEL|PS_HW|PS_BATCHING},
+ {" batdraw", " Batch render: ", &ps_hw_batchdrawtime, PS_TIME|PS_LEVEL|PS_HW|PS_BATCHING},
+ {" sprsort", " Sprite sort: ", &ps_hw_spritesorttime, PS_TIME|PS_LEVEL|PS_HW},
+ {" sprdraw", " Sprite render: ", &ps_hw_spritedrawtime, PS_TIME|PS_LEVEL|PS_HW},
+ {" nodesrt", " Drwnode sort: ", &ps_hw_nodesorttime, PS_TIME|PS_LEVEL|PS_HW},
+ {" nodedrw", " Drwnode render:", &ps_hw_nodedrawtime, PS_TIME|PS_LEVEL|PS_HW},
+ {" other ", " Other: ", &ps_otherrendertime, PS_TIME|PS_LEVEL|PS_HW},
+#endif
+
+ {" bsptime", " RenderBSPNode: ", &ps_bsptime, PS_TIME|PS_LEVEL|PS_SW},
+ {" sprclip", " R_ClipSprites: ", &ps_sw_spritecliptime, PS_TIME|PS_LEVEL|PS_SW},
+ {" portals", " Portals+Skybox:", &ps_sw_portaltime, PS_TIME|PS_LEVEL|PS_SW},
+ {" planes ", " R_DrawPlanes: ", &ps_sw_planetime, PS_TIME|PS_LEVEL|PS_SW},
+ {" masked ", " R_DrawMasked: ", &ps_sw_maskedtime, PS_TIME|PS_LEVEL|PS_SW},
+ {" other ", " Other: ", &ps_otherrendertime, PS_TIME|PS_LEVEL|PS_SW},
+
+ {"ui ", "UI render: ", &ps_uitime, PS_TIME},
+ {"finupdt", "I_FinishUpdate:", &ps_swaptime, PS_TIME},
+ {0}
};
-static precise_t ps_frametime = 0;
+perfstatrow_t gamelogicbrief_row[] = {
+ {"logic ", "Game logic: ", &ps_tictime, PS_TIME},
+ {0}
+};
+
+perfstatrow_t commoncounter_rows[] = {
+ {"bspcall", "BSP calls: ", &ps_numbspcalls, 0},
+ {"sprites", "Sprites: ", &ps_numsprites, 0},
+ {"drwnode", "Drawnodes: ", &ps_numdrawnodes, 0},
+ {"plyobjs", "Polyobjects: ", &ps_numpolyobjects, 0},
+ {0}
+};
-precise_t ps_tictime = 0;
+#ifdef HWRENDER
+perfstatrow_t batchcount_rows[] = {
+ {"polygon", "Polygons: ", &ps_hw_numpolys, 0},
+ {"vertex ", "Vertices: ", &ps_hw_numverts, 0},
+ {0}
+};
+
+perfstatrow_t batchcalls_rows[] = {
+ {"drwcall", "Draw calls:", &ps_hw_numcalls, 0},
+ {"shaders", "Shaders: ", &ps_hw_numshaders, 0},
+ {"texture", "Textures: ", &ps_hw_numtextures, 0},
+ {"polyflg", "Polyflags: ", &ps_hw_numpolyflags, 0},
+ {"colors ", "Colors: ", &ps_hw_numcolors, 0},
+ {0}
+};
+#endif
-precise_t ps_playerthink_time = 0;
-precise_t ps_thinkertime = 0;
+// Game logic stats columns
+
+perfstatrow_t gamelogic_rows[] = {
+ {"logic ", "Game logic: ", &ps_tictime, PS_TIME},
+ {" plrthnk", " P_PlayerThink: ", &ps_playerthink_time, PS_TIME|PS_LEVEL},
+ {" thnkers", " P_RunThinkers: ", &ps_thinkertime, PS_TIME|PS_LEVEL},
+ {" plyobjs", " Polyobjects: ", &ps_thlist_times[THINK_POLYOBJ], PS_TIME|PS_LEVEL},
+ {" main ", " Main: ", &ps_thlist_times[THINK_MAIN], PS_TIME|PS_LEVEL},
+ {" mobjs ", " Mobjs: ", &ps_thlist_times[THINK_MOBJ], PS_TIME|PS_LEVEL},
+ {" dynslop", " Dynamic slopes: ", &ps_thlist_times[THINK_DYNSLOPE], PS_TIME|PS_LEVEL},
+ {" precip ", " Precipitation: ", &ps_thlist_times[THINK_PRECIP], PS_TIME|PS_LEVEL},
+ {" lthinkf", " LUAh_ThinkFrame:", &ps_lua_thinkframe_time, PS_TIME|PS_LEVEL},
+ {" other ", " Other: ", &ps_otherlogictime, PS_TIME|PS_LEVEL},
+ {0}
+};
-precise_t ps_thlist_times[NUM_THINKERLISTS];
+perfstatrow_t thinkercount_rows[] = {
+ {"thnkers", "Thinkers: ", &ps_thinkercount, PS_LEVEL},
+ {" plyobjs", " Polyobjects: ", &ps_polythcount, PS_LEVEL},
+ {" main ", " Main: ", &ps_mainthcount, PS_LEVEL},
+ {" mobjs ", " Mobjs: ", &ps_mobjcount, PS_LEVEL},
+ {" regular", " Regular: ", &ps_regularcount, PS_LEVEL},
+ {" scenery", " Scenery: ", &ps_scenerycount, PS_LEVEL},
+ {" nothink", " Nothink: ", &ps_nothinkcount, PS_HIDE_ZERO|PS_LEVEL},
+ {" dynslop", " Dynamic slopes: ", &ps_dynslopethcount, PS_LEVEL},
+ {" precip ", " Precipitation: ", &ps_precipcount, PS_LEVEL},
+ {" remove ", " Pending removal:", &ps_removecount, PS_LEVEL},
+ {0}
+};
-int ps_checkposition_calls = 0;
+perfstatrow_t misc_calls_rows[] = {
+ {"lmhook", "Lua mobj hooks: ", &ps_lua_mobjhooks, PS_LEVEL},
+ {"chkpos", "P_CheckPosition:", &ps_checkposition_calls, PS_LEVEL},
+ {0}
+};
-precise_t ps_lua_thinkframe_time = 0;
-int ps_lua_mobjhooks = 0;
+// Sample collection status for averaging.
+// Maximum of these two is shown to user if nonzero to tell that
+// the reported averages are not correct yet.
+int ps_frame_samples_left = 0;
+int ps_tick_samples_left = 0;
+// History writing positions for frame and tick based metrics
+int ps_frame_index = 0;
+int ps_tick_index = 0;
// dynamically allocated resizeable array for thinkframe hook stats
ps_hookinfo_t *thinkframe_hooks = NULL;
int thinkframe_hooks_length = 0;
int thinkframe_hooks_capacity = 16;
-static INT32 draw_row;
-
void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src)
{
if (!thinkframe_hooks)
{
// array needs to be initialized
- thinkframe_hooks = Z_Malloc(sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL);
+ thinkframe_hooks = Z_Calloc(sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL);
}
if (index >= thinkframe_hooks_capacity)
{
// array needs more space, realloc with double size
- thinkframe_hooks_capacity *= 2;
+ int new_capacity = thinkframe_hooks_capacity * 2;
thinkframe_hooks = Z_Realloc(thinkframe_hooks,
- sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL);
+ sizeof(ps_hookinfo_t) * new_capacity, PU_STATIC, NULL);
+ // initialize new memory with zeros so the pointers in the structs are null
+ memset(&thinkframe_hooks[thinkframe_hooks_capacity], 0,
+ sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity);
+ thinkframe_hooks_capacity = new_capacity;
}
- thinkframe_hooks[index].time_taken = time_taken;
+ thinkframe_hooks[index].time_taken.value.p = time_taken;
memcpy(thinkframe_hooks[index].short_src, short_src, LUA_IDSIZE * sizeof(char));
// since the values are set sequentially from begin to end, the last call should leave
// the correct value to this variable
thinkframe_hooks_length = index + 1;
}
-static void PS_SetFrameTime(void)
+static boolean PS_HighResolution(void)
{
- precise_t currenttime = I_GetPreciseTime();
- ps_frametime = currenttime - ps_prevframetime;
- ps_prevframetime = currenttime;
+ return (vid.width >= 640 && vid.height >= 400);
}
-static boolean M_HighResolution(void)
+static boolean PS_IsLevelActive(void)
{
- return (vid.width >= 640 && vid.height >= 400);
+ return gamestate == GS_LEVEL ||
+ (gamestate == GS_TITLESCREEN && titlemapinaction);
}
-enum {
- PERF_TIME,
- PERF_COUNT,
-};
+// Is the row valid in the current context?
+static boolean PS_IsRowValid(perfstatrow_t *row)
+{
+ return !((row->flags & PS_LEVEL && !PS_IsLevelActive())
+ || (row->flags & PS_SW && rendermode != render_soft)
+ || (row->flags & PS_HW && rendermode != render_opengl)
+#ifdef HWRENDER
+ || (row->flags & PS_BATCHING && !cv_glbatching.value)
+#endif
+ );
+}
-static void M_DrawPerfString(perfstatcol_t *col, int type)
+// Should the row be visible on the screen?
+static boolean PS_IsRowVisible(perfstatrow_t *row)
{
- const boolean hires = M_HighResolution();
+ boolean value_is_zero;
- INT32 draw_flags = V_MONOSPACE | col->color;
+ if (row->flags & PS_TIME)
+ value_is_zero = row->metric->value.p == 0;
+ else
+ value_is_zero = row->metric->value.i == 0;
- perfstatrow_t * row;
+ return !(!PS_IsRowValid(row) ||
+ (row->flags & PS_HIDE_ZERO && value_is_zero));
+}
+
+static INT32 PS_GetMetricAverage(ps_metric_t *metric, boolean time_metric)
+{
+ char* history_read_pos = metric->history; // char* used for pointer arithmetic
+ INT64 sum = 0;
+ int i;
+ int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32);
+
+ for (i = 0; i < cv_ps_samplesize.value; i++)
+ {
+ if (time_metric)
+ sum += I_PreciseToMicros(*((precise_t*)history_read_pos));
+ else
+ sum += *((INT32*)history_read_pos);
+ history_read_pos += value_size;
+ }
- int value;
+ return sum / cv_ps_samplesize.value;
+}
+
+static INT32 PS_GetMetricMinOrMax(ps_metric_t *metric, boolean time_metric, boolean get_max)
+{
+ char* history_read_pos = metric->history; // char* used for pointer arithmetic
+ INT32 found_value = get_max ? INT32_MIN : INT32_MAX;
+ int i;
+ int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32);
+
+ for (i = 0; i < cv_ps_samplesize.value; i++)
+ {
+ INT32 value;
+ if (time_metric)
+ value = I_PreciseToMicros(*((precise_t*)history_read_pos));
+ else
+ value = *((INT32*)history_read_pos);
+
+ if ((get_max && value > found_value) ||
+ (!get_max && value < found_value))
+ {
+ found_value = value;
+ }
+ history_read_pos += value_size;
+ }
+
+ return found_value;
+}
+
+// Calculates the standard deviation for metric.
+static INT32 PS_GetMetricSD(ps_metric_t *metric, boolean time_metric)
+{
+ char* history_read_pos = metric->history; // char* used for pointer arithmetic
+ INT64 sum = 0;
+ int i;
+ int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32);
+ INT32 avg = PS_GetMetricAverage(metric, time_metric);
+
+ for (i = 0; i < cv_ps_samplesize.value; i++)
+ {
+ INT64 value;
+ if (time_metric)
+ value = I_PreciseToMicros(*((precise_t*)history_read_pos));
+ else
+ value = *((INT32*)history_read_pos);
+
+ value -= avg;
+ sum += value * value;
+
+ history_read_pos += value_size;
+ }
+
+ return round(sqrt(sum / cv_ps_samplesize.value));
+}
+
+// Returns the value to show on screen for metric.
+static INT32 PS_GetMetricScreenValue(ps_metric_t *metric, boolean time_metric)
+{
+ if (cv_ps_samplesize.value > 1 && metric->history)
+ {
+ if (cv_ps_descriptor.value == 1)
+ return PS_GetMetricAverage(metric, time_metric);
+ else if (cv_ps_descriptor.value == 2)
+ return PS_GetMetricSD(metric, time_metric);
+ else if (cv_ps_descriptor.value == 3)
+ return PS_GetMetricMinOrMax(metric, time_metric, false);
+ else
+ return PS_GetMetricMinOrMax(metric, time_metric, true);
+ }
+ else
+ {
+ if (time_metric)
+ return I_PreciseToMicros(metric->value.p);
+ else
+ return metric->value.i;
+ }
+}
+
+static int PS_DrawPerfRows(int x, int y, int color, perfstatrow_t *rows)
+{
+ const boolean hires = PS_HighResolution();
+ INT32 draw_flags = V_MONOSPACE | color;
+ perfstatrow_t * row;
+ int draw_y = y;
if (hires)
draw_flags |= V_ALLOWLOWERCASE;
- for (row = col->rows; row->lores_label; ++row)
+ for (row = rows; row->lores_label; ++row)
{
- if (type == PERF_TIME)
- value = I_PreciseToMicros(*(precise_t *)row->value);
- else
- value = *(int *)row->value;
+ const char *label;
+ INT32 value;
+ char *final_str;
+
+ if (!PS_IsRowVisible(row))
+ continue;
+
+ label = hires ? row->hires_label : row->lores_label;
+ value = PS_GetMetricScreenValue(row->metric, !!(row->flags & PS_TIME));
+ final_str = va("%s %d", label, value);
if (hires)
{
- V_DrawSmallString(col->hires_x, draw_row, draw_flags,
- va("%s %d", row->hires_label, value));
-
- draw_row += 5;
+ V_DrawSmallString(x, draw_y, draw_flags, final_str);
+ draw_y += 5;
}
else
{
- V_DrawThinString(col->lores_x, draw_row, draw_flags,
- va("%s %d", row->lores_label, value));
-
- draw_row += 8;
+ V_DrawThinString(x, draw_y, draw_flags, final_str);
+ draw_y += 8;
}
}
+
+ return draw_y;
}
-static void M_DrawPerfTiming(perfstatcol_t *col)
+static void PS_UpdateMetricHistory(ps_metric_t *metric, boolean time_metric, boolean frame_metric, boolean set_user)
{
- M_DrawPerfString(col, PERF_TIME);
+ int index = frame_metric ? ps_frame_index : ps_tick_index;
+
+ if (!metric->history)
+ {
+ // allocate history table
+ int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32);
+ void** memory_user = set_user ? &metric->history : NULL;
+
+ metric->history = Z_Calloc(value_size * cv_ps_samplesize.value, PU_PERFSTATS,
+ memory_user);
+
+ // reset "samples left" counter since this history table needs to be filled
+ if (frame_metric)
+ ps_frame_samples_left = cv_ps_samplesize.value;
+ else
+ ps_tick_samples_left = cv_ps_samplesize.value;
+ }
+
+ if (time_metric)
+ {
+ precise_t *history = (precise_t*)metric->history;
+ history[index] = metric->value.p;
+ }
+ else
+ {
+ INT32 *history = (INT32*)metric->history;
+ history[index] = metric->value.i;
+ }
}
-static void M_DrawPerfCount(perfstatcol_t *col)
+static void PS_UpdateRowHistories(perfstatrow_t *rows, boolean frame_metric)
{
- M_DrawPerfString(col, PERF_COUNT);
+ perfstatrow_t *row;
+ for (row = rows; row->lores_label; row++)
+ {
+ if (PS_IsRowValid(row))
+ PS_UpdateMetricHistory(row->metric, !!(row->flags & PS_TIME), frame_metric, true);
+ }
}
-static void M_DrawRenderStats(void)
+// Update all metrics that are calculated on every frame.
+static void PS_UpdateFrameStats(void)
{
- const boolean hires = M_HighResolution();
-
- const int half_row = hires ? 5 : 4;
+ // update frame time
+ precise_t currenttime = I_GetPreciseTime();
+ ps_frametime.value.p = currenttime - ps_prevframetime;
+ ps_prevframetime = currenttime;
- precise_t extrarendertime;
-
- perfstatrow_t frametime_row[] = {
- {"frmtime", "Frame time: ", &ps_frametime},
- {0}
- };
-
- perfstatrow_t rendercalltime_row[] = {
- {"drwtime", "3d rendering: ", &ps_rendercalltime},
- {0}
- };
-
- perfstatrow_t opengltime_row[] = {
- {"skybox ", "Skybox render: ", &ps_hw_skyboxtime},
- {"bsptime", "RenderBSPNode: ", &ps_bsptime},
- {"nodesrt", "Drwnode sort: ", &ps_hw_nodesorttime},
- {"nodedrw", "Drwnode render:", &ps_hw_nodedrawtime},
- {"sprsort", "Sprite sort: ", &ps_hw_spritesorttime},
- {"sprdraw", "Sprite render: ", &ps_hw_spritedrawtime},
- {"other ", "Other: ", &extrarendertime},
- {0}
- };
-
- perfstatrow_t softwaretime_row[] = {
- {"bsptime", "RenderBSPNode: ", &ps_bsptime},
- {"sprclip", "R_ClipSprites: ", &ps_sw_spritecliptime},
- {"portals", "Portals+Skybox:", &ps_sw_portaltime},
- {"planes ", "R_DrawPlanes: ", &ps_sw_planetime},
- {"masked ", "R_DrawMasked: ", &ps_sw_maskedtime},
- {"other ", "Other: ", &extrarendertime},
- {0}
- };
-
- perfstatrow_t uiswaptime_row[] = {
- {"ui ", "UI render: ", &ps_uitime},
- {"finupdt", "I_FinishUpdate:", &ps_swaptime},
- {0}
- };
-
- perfstatrow_t tictime_row[] = {
- {"logic ", "Game logic: ", &ps_tictime},
- {0}
- };
-
- perfstatrow_t rendercalls_row[] = {
- {"bspcall", "BSP calls: ", &ps_numbspcalls},
- {"sprites", "Sprites: ", &ps_numsprites},
- {"drwnode", "Drawnodes: ", &ps_numdrawnodes},
- {"plyobjs", "Polyobjects: ", &ps_numpolyobjects},
- {0}
- };
-
- perfstatrow_t batchtime_row[] = {
- {"batsort", "Batch sort: ", &ps_hw_batchsorttime},
- {"batdraw", "Batch render:", &ps_hw_batchdrawtime},
- {0}
- };
-
- perfstatrow_t batchcount_row[] = {
- {"polygon", "Polygons: ", &ps_hw_numpolys},
- {"vertex ", "Vertices: ", &ps_hw_numverts},
- {0}
- };
-
- perfstatrow_t batchcalls_row[] = {
- {"drwcall", "Draw calls:", &ps_hw_numcalls},
- {"shaders", "Shaders: ", &ps_hw_numshaders},
- {"texture", "Textures: ", &ps_hw_numtextures},
- {"polyflg", "Polyflags: ", &ps_hw_numpolyflags},
- {"colors ", "Colors: ", &ps_hw_numcolors},
- {0}
- };
-
- perfstatcol_t frametime_col = {20, 20, V_YELLOWMAP, frametime_row};
- perfstatcol_t rendercalltime_col = {20, 20, V_YELLOWMAP, rendercalltime_row};
-
- perfstatcol_t opengltime_col = {24, 24, V_YELLOWMAP, opengltime_row};
- perfstatcol_t softwaretime_col = {24, 24, V_YELLOWMAP, softwaretime_row};
-
- perfstatcol_t uiswaptime_col = {20, 20, V_YELLOWMAP, uiswaptime_row};
- perfstatcol_t tictime_col = {20, 20, V_GRAYMAP, tictime_row};
-
- perfstatcol_t rendercalls_col = {90, 115, V_BLUEMAP, rendercalls_row};
-
- perfstatcol_t batchtime_col = {90, 115, V_REDMAP, batchtime_row};
-
- perfstatcol_t batchcount_col = {155, 200, V_PURPLEMAP, batchcount_row};
- perfstatcol_t batchcalls_col = {220, 200, V_PURPLEMAP, batchcalls_row};
-
-
- boolean rendering = (
- gamestate == GS_LEVEL ||
- (gamestate == GS_TITLESCREEN && titlemapinaction)
- );
-
- draw_row = 10;
- M_DrawPerfTiming(&frametime_col);
-
- if (rendering)
+ // update 3d rendering stats
+ if (PS_IsLevelActive())
{
- M_DrawPerfTiming(&rendercalltime_col);
-
// Remember to update this calculation when adding more 3d rendering stats!
- extrarendertime = ps_rendercalltime - ps_bsptime;
+ ps_otherrendertime.value.p = ps_rendercalltime.value.p - ps_bsptime.value.p;
#ifdef HWRENDER
if (rendermode == render_opengl)
{
- extrarendertime -=
- ps_hw_skyboxtime +
- ps_hw_nodesorttime +
- ps_hw_nodedrawtime +
- ps_hw_spritesorttime +
- ps_hw_spritedrawtime;
+ ps_otherrendertime.value.p -=
+ ps_hw_skyboxtime.value.p +
+ ps_hw_nodesorttime.value.p +
+ ps_hw_nodedrawtime.value.p +
+ ps_hw_spritesorttime.value.p +
+ ps_hw_spritedrawtime.value.p;
if (cv_glbatching.value)
{
- extrarendertime -=
- ps_hw_batchsorttime +
- ps_hw_batchdrawtime;
+ ps_otherrendertime.value.p -=
+ ps_hw_batchsorttime.value.p +
+ ps_hw_batchdrawtime.value.p;
}
-
- M_DrawPerfTiming(&opengltime_col);
}
else
#endif
{
- extrarendertime -=
- ps_sw_spritecliptime +
- ps_sw_portaltime +
- ps_sw_planetime +
- ps_sw_maskedtime;
-
- M_DrawPerfTiming(&softwaretime_col);
+ ps_otherrendertime.value.p -=
+ ps_sw_spritecliptime.value.p +
+ ps_sw_portaltime.value.p +
+ ps_sw_planetime.value.p +
+ ps_sw_maskedtime.value.p;
}
}
- M_DrawPerfTiming(&uiswaptime_col);
-
- draw_row += half_row;
- M_DrawPerfTiming(&tictime_col);
-
- if (rendering)
+ if (cv_ps_samplesize.value > 1)
{
- draw_row = 10;
- M_DrawPerfCount(&rendercalls_col);
+ PS_UpdateRowHistories(rendertime_rows, true);
+ if (PS_IsLevelActive())
+ PS_UpdateRowHistories(commoncounter_rows, true);
#ifdef HWRENDER
if (rendermode == render_opengl && cv_glbatching.value)
{
- draw_row += half_row;
- M_DrawPerfTiming(&batchtime_col);
-
- draw_row = 10;
- M_DrawPerfCount(&batchcount_col);
-
- if (hires)
- draw_row += half_row;
- else
- draw_row = 10;
-
- M_DrawPerfCount(&batchcalls_col);
+ PS_UpdateRowHistories(batchcount_rows, true);
+ PS_UpdateRowHistories(batchcalls_rows, true);
}
#endif
+
+ ps_frame_index++;
+ if (ps_frame_index >= cv_ps_samplesize.value)
+ ps_frame_index = 0;
+ if (ps_frame_samples_left)
+ ps_frame_samples_left--;
}
}
-static void M_DrawTickStats(void)
+// Update thinker counters by iterating the thinker lists.
+static void PS_CountThinkers(void)
{
- int i = 0;
+ int i;
thinker_t *thinker;
- int thinkercount = 0;
- int polythcount = 0;
- int mainthcount = 0;
- int mobjcount = 0;
- int nothinkcount = 0;
- int scenerycount = 0;
- int regularcount = 0;
- int dynslopethcount = 0;
- int precipcount = 0;
- int removecount = 0;
-
- precise_t extratime =
- ps_tictime -
- ps_playerthink_time -
- ps_thinkertime -
- ps_lua_thinkframe_time;
-
- perfstatrow_t tictime_row[] = {
- {"logic ", "Game logic: ", &ps_tictime},
- {0}
- };
-
- perfstatrow_t thinker_time_row[] = {
- {"plrthnk", "P_PlayerThink: ", &ps_playerthink_time},
- {"thnkers", "P_RunThinkers: ", &ps_thinkertime},
- {0}
- };
-
- perfstatrow_t detailed_thinker_time_row[] = {
- {"plyobjs", "Polyobjects: ", &ps_thlist_times[THINK_POLYOBJ]},
- {"main ", "Main: ", &ps_thlist_times[THINK_MAIN]},
- {"mobjs ", "Mobjs: ", &ps_thlist_times[THINK_MOBJ]},
- {"dynslop", "Dynamic slopes: ", &ps_thlist_times[THINK_DYNSLOPE]},
- {"precip ", "Precipitation: ", &ps_thlist_times[THINK_PRECIP]},
- {0}
- };
-
- perfstatrow_t extra_thinker_time_row[] = {
- {"lthinkf", "LUAh_ThinkFrame:", &ps_lua_thinkframe_time},
- {"other ", "Other: ", &extratime},
- {0}
- };
-
- perfstatrow_t thinkercount_row[] = {
- {"thnkers", "Thinkers: ", &thinkercount},
- {0}
- };
-
- perfstatrow_t detailed_thinkercount_row[] = {
- {"plyobjs", "Polyobjects: ", &polythcount},
- {"main ", "Main: ", &mainthcount},
- {"mobjs ", "Mobjs: ", &mobjcount},
- {0}
- };
-
- perfstatrow_t mobjthinkercount_row[] = {
- {"regular", "Regular: ", ®ularcount},
- {"scenery", "Scenery: ", &scenerycount},
- {0}
- };
-
- perfstatrow_t nothinkcount_row[] = {
- {"nothink", "Nothink: ", ¬hinkcount},
- {0}
- };
-
- perfstatrow_t detailed_thinkercount_row2[] = {
- {"dynslop", "Dynamic slopes: ", &dynslopethcount},
- {"precip ", "Precipitation: ", &precipcount},
- {"remove ", "Pending removal:", &removecount},
- {0}
- };
-
- perfstatrow_t misc_calls_row[] = {
- {"lmhook", "Lua mobj hooks: ", &ps_lua_mobjhooks},
- {"chkpos", "P_CheckPosition:", &ps_checkposition_calls},
- {0}
- };
-
- perfstatcol_t tictime_col = {20, 20, V_YELLOWMAP, tictime_row};
- perfstatcol_t thinker_time_col = {24, 24, V_YELLOWMAP, thinker_time_row};
- perfstatcol_t detailed_thinker_time_col = {28, 28, V_YELLOWMAP, detailed_thinker_time_row};
- perfstatcol_t extra_thinker_time_col = {24, 24, V_YELLOWMAP, extra_thinker_time_row};
-
- perfstatcol_t thinkercount_col = {90, 115, V_BLUEMAP, thinkercount_row};
- perfstatcol_t detailed_thinkercount_col = {94, 119, V_BLUEMAP, detailed_thinkercount_row};
- perfstatcol_t mobjthinkercount_col = {98, 123, V_BLUEMAP, mobjthinkercount_row};
- perfstatcol_t nothinkcount_col = {98, 123, V_BLUEMAP, nothinkcount_row};
- perfstatcol_t detailed_thinkercount_col2 = {94, 119, V_BLUEMAP, detailed_thinkercount_row2};
- perfstatcol_t misc_calls_col = {170, 216, V_PURPLEMAP, misc_calls_row};
+
+ ps_thinkercount.value.i = 0;
+ ps_polythcount.value.i = 0;
+ ps_mainthcount.value.i = 0;
+ ps_mobjcount.value.i = 0;
+ ps_regularcount.value.i = 0;
+ ps_scenerycount.value.i = 0;
+ ps_nothinkcount.value.i = 0;
+ ps_dynslopethcount.value.i = 0;
+ ps_precipcount.value.i = 0;
+ ps_removecount.value.i = 0;
for (i = 0; i < NUM_THINKERLISTS; i++)
{
for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next)
{
- thinkercount++;
+ ps_thinkercount.value.i++;
if (thinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- removecount++;
+ ps_removecount.value.i++;
else if (i == THINK_POLYOBJ)
- polythcount++;
+ ps_polythcount.value.i++;
else if (i == THINK_MAIN)
- mainthcount++;
+ ps_mainthcount.value.i++;
else if (i == THINK_MOBJ)
{
if (thinker->function.acp1 == (actionf_p1)P_MobjThinker)
{
mobj_t *mobj = (mobj_t*)thinker;
- mobjcount++;
+ ps_mobjcount.value.i++;
if (mobj->flags & MF_NOTHINK)
- nothinkcount++;
+ ps_nothinkcount.value.i++;
else if (mobj->flags & MF_SCENERY)
- scenerycount++;
+ ps_scenerycount.value.i++;
else
- regularcount++;
+ ps_regularcount.value.i++;
}
}
else if (i == THINK_DYNSLOPE)
- dynslopethcount++;
+ ps_dynslopethcount.value.i++;
else if (i == THINK_PRECIP)
- precipcount++;
+ ps_precipcount.value.i++;
}
}
+}
- draw_row = 10;
- M_DrawPerfTiming(&tictime_col);
- M_DrawPerfTiming(&thinker_time_col);
- M_DrawPerfTiming(&detailed_thinker_time_col);
- M_DrawPerfTiming(&extra_thinker_time_col);
-
- draw_row = 10;
- M_DrawPerfCount(&thinkercount_col);
- M_DrawPerfCount(&detailed_thinkercount_col);
- M_DrawPerfCount(&mobjthinkercount_col);
+// Update all metrics that are calculated on every tick.
+void PS_UpdateTickStats(void)
+{
+ if (cv_perfstats.value == 1 && cv_ps_samplesize.value > 1)
+ {
+ PS_UpdateRowHistories(gamelogicbrief_row, false);
+ }
+ if (cv_perfstats.value == 2)
+ {
+ if (PS_IsLevelActive())
+ {
+ ps_otherlogictime.value.p =
+ ps_tictime.value.p -
+ ps_playerthink_time.value.p -
+ ps_thinkertime.value.p -
+ ps_lua_thinkframe_time.value.p;
- if (nothinkcount)
- M_DrawPerfCount(¬hinkcount_col);
+ PS_CountThinkers();
+ }
- M_DrawPerfCount(&detailed_thinkercount_col2);
+ if (cv_ps_samplesize.value > 1)
+ {
+ PS_UpdateRowHistories(gamelogic_rows, false);
+ PS_UpdateRowHistories(thinkercount_rows, false);
+ PS_UpdateRowHistories(misc_calls_rows, false);
+ }
+ }
+ if (cv_perfstats.value == 3 && cv_ps_samplesize.value > 1 && PS_IsLevelActive())
+ {
+ int i;
+ for (i = 0; i < thinkframe_hooks_length; i++)
+ {
+ PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false, false);
+ }
+ }
+ if (cv_perfstats.value && cv_ps_samplesize.value > 1)
+ {
+ ps_tick_index++;
+ if (ps_tick_index >= cv_ps_samplesize.value)
+ ps_tick_index = 0;
+ if (ps_tick_samples_left)
+ ps_tick_samples_left--;
+ }
+}
- if (M_HighResolution())
+static void PS_DrawDescriptorHeader(void)
+{
+ if (cv_ps_samplesize.value > 1)
{
- V_DrawSmallString(212, 10, V_MONOSPACE | V_ALLOWLOWERCASE | V_PURPLEMAP, "Calls:");
+ const char* descriptor_names[] = {
+ "average",
+ "standard deviation",
+ "minimum",
+ "maximum"
+ };
+ const boolean hires = PS_HighResolution();
+ char* str;
+ INT32 flags = V_MONOSPACE | V_ALLOWLOWERCASE;
+ int samples_left = max(ps_frame_samples_left, ps_tick_samples_left);
+ int x, y;
+
+ if (cv_perfstats.value == 3)
+ {
+ x = 2;
+ y = 0;
+ }
+ else
+ {
+ x = 20;
+ y = hires ? 5 : 2;
+ }
+
+ if (samples_left)
+ {
+ str = va("Samples needed for correct results: %d", samples_left);
+ flags |= V_REDMAP;
+ }
+ else
+ {
+ str = va("Showing the %s of %d samples.",
+ descriptor_names[cv_ps_descriptor.value - 1], cv_ps_samplesize.value);
+ flags |= V_GREENMAP;
+ }
- draw_row = 15;
+ if (hires)
+ V_DrawSmallString(x, y, flags, str);
+ else
+ V_DrawThinString(x, y, flags, str);
}
- else
+}
+
+static void PS_DrawRenderStats(void)
+{
+ const boolean hires = PS_HighResolution();
+ const int half_row = hires ? 5 : 4;
+ int x, y;
+
+ PS_DrawDescriptorHeader();
+
+ y = PS_DrawPerfRows(20, 10, V_YELLOWMAP, rendertime_rows);
+
+ PS_DrawPerfRows(20, y + half_row, V_GRAYMAP, gamelogicbrief_row);
+
+ if (PS_IsLevelActive())
{
- draw_row = 10;
+ x = hires ? 115 : 90;
+ PS_DrawPerfRows(x, 10, V_BLUEMAP, commoncounter_rows);
+
+#ifdef HWRENDER
+ if (rendermode == render_opengl && cv_glbatching.value)
+ {
+ x = hires ? 200 : 155;
+ y = PS_DrawPerfRows(x, 10, V_PURPLEMAP, batchcount_rows);
+
+ x = hires ? 200 : 220;
+ y = hires ? y + half_row : 10;
+ PS_DrawPerfRows(x, y, V_PURPLEMAP, batchcalls_rows);
+ }
+#endif
}
+}
+
+static void PS_DrawGameLogicStats(void)
+{
+ const boolean hires = PS_HighResolution();
+ int x, y;
+
+ PS_DrawDescriptorHeader();
- M_DrawPerfCount(&misc_calls_col);
+ PS_DrawPerfRows(20, 10, V_YELLOWMAP, gamelogic_rows);
+
+ x = hires ? 115 : 90;
+ PS_DrawPerfRows(x, 10, V_BLUEMAP, thinkercount_rows);
+
+ if (hires)
+ V_DrawSmallString(212, 10, V_MONOSPACE | V_ALLOWLOWERCASE | V_PURPLEMAP, "Calls:");
+
+ x = hires ? 216 : 170;
+ y = hires ? 15 : 10;
+ PS_DrawPerfRows(x, y, V_PURPLEMAP, misc_calls_rows);
}
-void M_DrawPerfStats(void)
+static void PS_DrawThinkFrameStats(void)
{
char s[100];
+ int i;
+ // text writing position
+ int x = 2;
+ int y = 4;
+ UINT32 text_color;
+ char tempbuffer[LUA_IDSIZE];
+ char last_mod_name[LUA_IDSIZE];
+ last_mod_name[0] = '\0';
+
+ PS_DrawDescriptorHeader();
+
+ for (i = 0; i < thinkframe_hooks_length; i++)
+ {
- PS_SetFrameTime();
+#define NEXT_ROW() \
+y += 4; \
+if (y > 192) \
+{ \
+ y = 4; \
+ x += 106; \
+ if (x > 214) \
+ break; \
+}
+
+ char* str = thinkframe_hooks[i].short_src;
+ char* tempstr = tempbuffer;
+ int len = (int)strlen(str);
+ char* str_ptr;
+ if (strcmp(".lua", str + len - 4) == 0)
+ {
+ str[len-4] = '\0'; // remove .lua at end
+ len -= 4;
+ }
+ // we locate the wad/pk3 name in the string and compare it to
+ // what we found on the previous iteration.
+ // if the name has changed, print it out on the screen
+ strcpy(tempstr, str);
+ str_ptr = strrchr(tempstr, '|');
+ if (str_ptr)
+ {
+ *str_ptr = '\0';
+ str = str_ptr + 1; // this is the name of the hook without the mod file name
+ str_ptr = strrchr(tempstr, PATHSEP[0]);
+ if (str_ptr)
+ tempstr = str_ptr + 1;
+ // tempstr should now point to the mod name, (wad/pk3) possibly truncated
+ if (strcmp(tempstr, last_mod_name) != 0)
+ {
+ strcpy(last_mod_name, tempstr);
+ len = (int)strlen(tempstr);
+ if (len > 25)
+ tempstr += len - 25;
+ snprintf(s, sizeof s - 1, "%s", tempstr);
+ V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s);
+ NEXT_ROW()
+ }
+ text_color = V_YELLOWMAP;
+ }
+ else
+ {
+ // probably a standalone lua file
+ // cut off the folder if it's there
+ str_ptr = strrchr(tempstr, PATHSEP[0]);
+ if (str_ptr)
+ str = str_ptr + 1;
+ text_color = 0; // white
+ }
+ len = (int)strlen(str);
+ if (len > 20)
+ str += len - 20;
+ snprintf(s, sizeof s - 1, "%20s: %d", str,
+ PS_GetMetricScreenValue(&thinkframe_hooks[i].time_taken, true));
+ V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | text_color, s);
+ NEXT_ROW()
+#undef NEXT_ROW
+
+ }
+}
+
+void M_DrawPerfStats(void)
+{
if (cv_perfstats.value == 1) // rendering
{
- M_DrawRenderStats();
+ PS_UpdateFrameStats();
+ PS_DrawRenderStats();
}
else if (cv_perfstats.value == 2) // logic
{
- M_DrawTickStats();
+ // PS_UpdateTickStats is called in TryRunTics, since otherwise it would miss
+ // tics when frame skips happen
+ PS_DrawGameLogicStats();
}
else if (cv_perfstats.value == 3) // lua thinkframe
{
- if (!(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
+ if (!PS_IsLevelActive())
return;
- if (vid.width < 640 || vid.height < 400) // low resolution
+ if (!PS_HighResolution())
{
- // it's not gonna fit very well..
- V_DrawThinString(30, 30, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "Not available for resolutions below 640x400");
+ // Low resolutions can't really use V_DrawSmallString that is used by thinkframe stats.
+ // A low-res version using V_DrawThinString could be implemented,
+ // but it would have much less space for information.
+ V_DrawThinString(80, 92, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "Perfstats 3 is not available");
+ V_DrawThinString(80, 100, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "for resolutions below 640x400.");
}
- else // high resolution
+ else
{
- int i;
- // text writing position
- int x = 2;
- int y = 4;
- UINT32 text_color;
- char tempbuffer[LUA_IDSIZE];
- char last_mod_name[LUA_IDSIZE];
- last_mod_name[0] = '\0';
- for (i = 0; i < thinkframe_hooks_length; i++)
- {
- char* str = thinkframe_hooks[i].short_src;
- char* tempstr = tempbuffer;
- int len = (int)strlen(str);
- char* str_ptr;
- if (strcmp(".lua", str + len - 4) == 0)
- {
- str[len-4] = '\0'; // remove .lua at end
- len -= 4;
- }
- // we locate the wad/pk3 name in the string and compare it to
- // what we found on the previous iteration.
- // if the name has changed, print it out on the screen
- strcpy(tempstr, str);
- str_ptr = strrchr(tempstr, '|');
- if (str_ptr)
- {
- *str_ptr = '\0';
- str = str_ptr + 1; // this is the name of the hook without the mod file name
- str_ptr = strrchr(tempstr, PATHSEP[0]);
- if (str_ptr)
- tempstr = str_ptr + 1;
- // tempstr should now point to the mod name, (wad/pk3) possibly truncated
- if (strcmp(tempstr, last_mod_name) != 0)
- {
- strcpy(last_mod_name, tempstr);
- len = (int)strlen(tempstr);
- if (len > 25)
- tempstr += len - 25;
- snprintf(s, sizeof s - 1, "%s", tempstr);
- V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s);
- y += 4; // repeated code!
- if (y > 192)
- {
- y = 4;
- x += 106;
- if (x > 214)
- break;
- }
- }
- text_color = V_YELLOWMAP;
- }
- else
- {
- // probably a standalone lua file
- // cut off the folder if it's there
- str_ptr = strrchr(tempstr, PATHSEP[0]);
- if (str_ptr)
- str = str_ptr + 1;
- text_color = 0; // white
- }
- len = (int)strlen(str);
- if (len > 20)
- str += len - 20;
- snprintf(s, sizeof s - 1, "%20s: %d", str, I_PreciseToMicros(thinkframe_hooks[i].time_taken));
- V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | text_color, s);
- y += 4; // repeated code!
- if (y > 192)
- {
- y = 4;
- x += 106;
- if (x > 214)
- break;
- }
- }
+ PS_DrawThinkFrameStats();
}
}
}
+
+// remove and unallocate history from all metrics
+static void PS_ClearHistory(void)
+{
+ int i;
+
+ Z_FreeTag(PU_PERFSTATS);
+ // thinkframe hook metric history pointers need to be cleared manually
+ for (i = 0; i < thinkframe_hooks_length; i++)
+ {
+ thinkframe_hooks[i].time_taken.history = NULL;
+ }
+
+ ps_frame_index = ps_tick_index = 0;
+ // PS_UpdateMetricHistory will set these correctly when it runs
+ ps_frame_samples_left = ps_tick_samples_left = 0;
+}
+
+void PS_PerfStats_OnChange(void)
+{
+ if (cv_perfstats.value && cv_ps_samplesize.value > 1)
+ PS_ClearHistory();
+}
+
+void PS_SampleSize_OnChange(void)
+{
+ if (cv_ps_samplesize.value > 1)
+ PS_ClearHistory();
+}
diff --git a/src/m_perfstats.h b/src/m_perfstats.h
index 71208fbc19f95d886e7cce17c1982ff61de0089f..f6a7c1f74032196229c73890da44861a0d7adac9 100644
--- a/src/m_perfstats.h
+++ b/src/m_perfstats.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -16,26 +16,45 @@
#include "lua_script.h"
#include "p_local.h"
-extern precise_t ps_tictime;
-
-extern precise_t ps_playerthink_time;
-extern precise_t ps_thinkertime;
-
-extern precise_t ps_thlist_times[];
-
-extern int ps_checkposition_calls;
-
-extern precise_t ps_lua_thinkframe_time;
-extern int ps_lua_mobjhooks;
+typedef struct
+{
+ union {
+ precise_t p;
+ INT32 i;
+ } value;
+ void *history;
+} ps_metric_t;
typedef struct
{
- precise_t time_taken;
+ ps_metric_t time_taken;
char short_src[LUA_IDSIZE];
} ps_hookinfo_t;
+#define PS_START_TIMING(metric) metric.value.p = I_GetPreciseTime()
+#define PS_STOP_TIMING(metric) metric.value.p = I_GetPreciseTime() - metric.value.p
+
+extern ps_metric_t ps_tictime;
+
+extern ps_metric_t ps_playerthink_time;
+extern ps_metric_t ps_thinkertime;
+
+extern ps_metric_t ps_thlist_times[];
+
+extern ps_metric_t ps_checkposition_calls;
+
+extern ps_metric_t ps_lua_thinkframe_time;
+extern ps_metric_t ps_lua_mobjhooks;
+
+extern ps_metric_t ps_otherlogictime;
+
void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src);
+void PS_UpdateTickStats(void);
+
void M_DrawPerfStats(void);
+void PS_PerfStats_OnChange(void);
+void PS_SampleSize_OnChange(void);
+
#endif
diff --git a/src/m_queue.c b/src/m_queue.c
index a337ca4ce9b283afad602a6d06376136bb010aad..2cc3f7cb819fb5e62ed336bf8e7fcaf7881b5f15 100644
--- a/src/m_queue.c
+++ b/src/m_queue.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2003 by James Haley
-// Copyright (C) 2003-2021 by Sonic Team Junior.
+// Copyright (C) 2003-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_queue.h b/src/m_queue.h
index cc64b8dd7917acdd136ddc7f832ef2737904e66f..071f9d8fa1b5db4a816eac16603d0535c318ca85 100644
--- a/src/m_queue.h
+++ b/src/m_queue.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2003 by James Haley
-// Copyright (C) 2003-2021 by Sonic Team Junior.
+// Copyright (C) 2003-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_random.c b/src/m_random.c
index 2e6213e1277ce027fc04cd6e7435dbaa8e49963d..1127955006ba9aa8ba6c7e4646bd772e4864a50b 100644
--- a/src/m_random.c
+++ b/src/m_random.c
@@ -3,7 +3,7 @@
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_random.h b/src/m_random.h
index df10b4bb371ed14394b897bc07bb9abe78c0f096..aa5ffb0bbbb82e9b793188af4442b8020a362396 100644
--- a/src/m_random.h
+++ b/src/m_random.h
@@ -3,7 +3,7 @@
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
// Copyright (C) 2012-2016 by Matthew "Kaito Sinclaire" Walsh.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/m_swap.h b/src/m_swap.h
index 9ed8fc15f5c84eb52ffb57f8be66a00d4ba64364..5fafb0ccde0f96322125c3d7f547a5e308736bd1 100644
--- a/src/m_swap.h
+++ b/src/m_swap.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/mserv.c b/src/mserv.c
index c385380340e468b202448bb8dc8a41318d47c6a2..db95d6266b97a6324d93e75af5641635595d70db 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -1,8 +1,8 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
-// Copyright (C) 2020-2021 by James R.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -102,6 +102,7 @@ void AddMServCommands(void)
CV_RegisterVar(&cv_servername);
#ifdef MASTERSERVER
COM_AddCommand("listserv", Command_Listserv_f);
+ COM_AddCommand("masterserver_update", Update_parameters); // allows people to updates manually in case you were delisted by accident
#endif
#endif
}
diff --git a/src/mserv.h b/src/mserv.h
index 7a3b3d8ec8461d9b4734353a23e37e587369be86..23b26fbc54670fff4d5e2673dcd742c8bf0e950c 100644
--- a/src/mserv.h
+++ b/src/mserv.h
@@ -1,8 +1,8 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
-// Copyright (C) 2020-2021 by James R.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_ceilng.c b/src/p_ceilng.c
index ac93e8e2ea99ff3ae42f30b5928759785f0a647f..50344ee0ccf9df0daf12f45321521cf6af0ed6e3 100644
--- a/src/p_ceilng.c
+++ b/src/p_ceilng.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -67,7 +67,8 @@ void T_MoveCeiling(ceiling_t *ceiling)
switch (ceiling->type)
{
case instantMoveCeilingByFrontSector:
- ceiling->sector->ceilingpic = ceiling->texture;
+ if (ceiling->texture > -1)
+ ceiling->sector->ceilingpic = ceiling->texture;
ceiling->sector->ceilingdata = NULL;
ceiling->sector->ceilspeed = 0;
P_RemoveThinker(&ceiling->thinker);
@@ -186,7 +187,8 @@ void T_MoveCeiling(ceiling_t *ceiling)
break;
case instantMoveCeilingByFrontSector:
- ceiling->sector->ceilingpic = ceiling->texture;
+ if (ceiling->texture > -1)
+ ceiling->sector->ceilingpic = ceiling->texture;
ceiling->sector->ceilingdata = NULL;
ceiling->sector->ceilspeed = 0;
P_RemoveThinker(&ceiling->thinker);
@@ -395,9 +397,8 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
sector_t *sec;
ceiling_t *ceiling;
mtag_t tag = Tag_FGet(&line->tags);
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
sec = §ors[secnum];
@@ -513,7 +514,10 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
ceiling->direction = -1;
ceiling->bottomheight = line->frontsector->ceilingheight;
}
- ceiling->texture = line->frontsector->ceilingpic;
+ if (line->flags & ML_NOCLIMB)
+ ceiling->texture = -1;
+ else
+ ceiling->texture = line->frontsector->ceilingpic;
break;
case moveCeilingByFrontTexture:
@@ -617,9 +621,8 @@ INT32 EV_DoCrush(line_t *line, ceiling_e type)
sector_t *sec;
ceiling_t *ceiling;
mtag_t tag = Tag_FGet(&line->tags);
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
sec = §ors[secnum];
diff --git a/src/p_enemy.c b/src/p_enemy.c
index ca88b783188dc9b7f84987110e8d37aa371d9ba8..26682ee326207d8c47c2c356592e612250174bea 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -25,6 +25,7 @@
#include "i_video.h"
#include "z_zone.h"
#include "lua_hook.h"
+#include "m_cond.h" // SECRET_SKIN
#ifdef HW3SOUND
#include "hardware/hw3sound.h"
@@ -199,6 +200,8 @@ void A_SetObjectFlags(mobj_t *actor);
void A_SetObjectFlags2(mobj_t *actor);
void A_RandomState(mobj_t *actor);
void A_RandomStateRange(mobj_t *actor);
+void A_StateRangeByAngle(mobj_t *actor);
+void A_StateRangeByParameter(mobj_t *actor);
void A_DualAction(mobj_t *actor);
void A_RemoteAction(mobj_t *actor);
void A_ToggleFlameJet(mobj_t *actor);
@@ -743,8 +746,8 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed
if (player->mo->health <= 0)
continue; // dead
- if (player->bot)
- continue; // ignore bots
+ if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN)
+ continue; // ignore followbots
if (player->quittime)
continue; // Ignore uncontrolled bodies
@@ -1708,7 +1711,7 @@ void A_HoodThink(mobj_t *actor)
dx = (actor->target->x - actor->x), dy = (actor->target->y - actor->y), dz = (actor->target->z - actor->z);
dm = P_AproxDistance(dx, dy);
// Target dangerously close to robohood, retreat then.
- if ((dm < 256<<FRACBITS) && (abs(dz) < 128<<FRACBITS))
+ if ((dm < 256<<FRACBITS) && (abs(dz) < 128<<FRACBITS) && !(actor->flags2 & MF2_AMBUSH))
{
S_StartSound(actor, actor->info->attacksound);
P_SetMobjState(actor, actor->info->raisestate);
@@ -2654,7 +2657,7 @@ void A_LobShot(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2 >> 16;
- mobj_t *shot, *hitspot;
+ mobj_t *shot;
angle_t an;
fixed_t z;
fixed_t dist;
@@ -2693,11 +2696,6 @@ void A_LobShot(mobj_t *actor)
P_SetScale(shot, actor->scale);
}
- // Keep track of where it's going to land
- hitspot = P_SpawnMobj(actor->target->x&(64*FRACUNIT-1), actor->target->y&(64*FRACUNIT-1), actor->target->subsector->sector->floorheight, MT_NULL);
- hitspot->tics = airtime;
- P_SetTarget(&shot->tracer, hitspot);
-
P_SetTarget(&shot->target, actor); // where it came from
shot->angle = an = actor->angle;
@@ -3333,20 +3331,18 @@ void A_SkullAttack(mobj_t *actor)
actor->angle += (P_RandomChance(FRACUNIT/2)) ? ANGLE_90 : -ANGLE_90;
else if (locvar1 == 3)
{
- statenum_t oldspawnstate = mobjinfo[MT_NULL].spawnstate;
- UINT32 oldflags = mobjinfo[MT_NULL].flags;
- fixed_t oldradius = mobjinfo[MT_NULL].radius;
- fixed_t oldheight = mobjinfo[MT_NULL].height;
- mobj_t *check;
+ statenum_t oldspawnstate = mobjinfo[MT_RAY].spawnstate;
+ UINT32 oldflags = mobjinfo[MT_RAY].flags;
+ fixed_t oldradius = mobjinfo[MT_RAY].radius;
+ fixed_t oldheight = mobjinfo[MT_RAY].height;
INT32 i, j;
static INT32 k;/* static for (at least) GCC 9.1 weirdness */
- boolean allow;
angle_t testang = 0;
- mobjinfo[MT_NULL].spawnstate = S_INVISIBLE;
- mobjinfo[MT_NULL].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP;
- mobjinfo[MT_NULL].radius = mobjinfo[actor->type].radius;
- mobjinfo[MT_NULL].height = mobjinfo[actor->type].height;
+ mobjinfo[MT_RAY].spawnstate = S_INVISIBLE;
+ mobjinfo[MT_RAY].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP;
+ mobjinfo[MT_RAY].radius = mobjinfo[actor->type].radius;
+ mobjinfo[MT_RAY].height = mobjinfo[actor->type].height;
if (P_RandomChance(FRACUNIT/2)) // port priority 1?
{
@@ -3359,15 +3355,12 @@ void A_SkullAttack(mobj_t *actor)
j = 9;
}
-#define dostuff(q) check = P_SpawnMobjFromMobj(actor, 0, 0, 0, MT_NULL);\
+#define dostuff(q) \
testang = actor->angle + ((i+(q))*ANG10);\
- allow = (P_TryMove(check,\
- P_ReturnThrustX(check, testang, dist + 2*actor->radius),\
- P_ReturnThrustY(check, testang, dist + 2*actor->radius),\
- true));\
- P_RemoveMobj(check);\
- if (allow)\
- break;
+ if (P_CheckMove(actor,\
+ P_ReturnThrustX(actor, testang, dist + 2*actor->radius),\
+ P_ReturnThrustY(actor, testang, dist + 2*actor->radius),\
+ true)) break;
if (P_RandomChance(FRACUNIT/2)) // port priority 2?
{
@@ -3393,10 +3386,10 @@ void A_SkullAttack(mobj_t *actor)
#undef dostuff
- mobjinfo[MT_NULL].spawnstate = oldspawnstate;
- mobjinfo[MT_NULL].flags = oldflags;
- mobjinfo[MT_NULL].radius = oldradius;
- mobjinfo[MT_NULL].height = oldheight;
+ mobjinfo[MT_RAY].spawnstate = oldspawnstate;
+ mobjinfo[MT_RAY].flags = oldflags;
+ mobjinfo[MT_RAY].radius = oldradius;
+ mobjinfo[MT_RAY].height = oldheight;
}
an = actor->angle >> ANGLETOFINESHIFT;
@@ -3517,9 +3510,7 @@ void A_Scream(mobj_t *actor)
if (LUA_CallAction(A_SCREAM, actor))
return;
- if (actor->tracer && (actor->tracer->type == MT_SHELL || actor->tracer->type == MT_FIREBALL))
- S_StartScreamSound(actor, sfx_mario2);
- else if (actor->info->deathsound)
+ if (actor->info->deathsound && !S_SoundPlaying(actor, sfx_mario2))
S_StartScreamSound(actor, actor->info->deathsound);
}
@@ -3590,7 +3581,7 @@ void A_1upThinker(mobj_t *actor)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i] || players[i].bot || players[i].spectator)
+ if (!playeringame[i] || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN || players[i].spectator)
continue;
if (!players[i].mo)
@@ -3961,7 +3952,7 @@ void A_BossDeath(mobj_t *mo)
}
bossjustdie:
- if (LUAh_BossDeath(mo))
+ if (LUA_HookMobj(mo, MOBJ_HOOK(BossDeath)))
return;
else if (P_MobjWasRemoved(mo))
return;
@@ -4190,7 +4181,6 @@ void A_CustomPower(mobj_t *actor)
player_t *player;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- boolean spawnshield = false;
if (LUA_CallAction(A_CUSTOMPOWER, actor))
return;
@@ -4209,15 +4199,10 @@ void A_CustomPower(mobj_t *actor)
player = actor->target->player;
- if (locvar1 == pw_shield && player->powers[pw_shield] != locvar2)
- spawnshield = true;
+ P_SetPower(player, locvar1, locvar2);
- player->powers[locvar1] = (UINT16)locvar2;
if (actor->info->seesound)
S_StartSound(player->mo, actor->info->seesound);
-
- if (spawnshield) //workaround for a bug
- P_SpawnShieldOrb(player);
}
// Function: A_GiveWeapon
@@ -5101,6 +5086,33 @@ void A_SignSpin(mobj_t *actor)
}
}
+static boolean SignSkinCheck(player_t *player, INT32 num)
+{
+ INT32 i;
+
+ if (player != NULL)
+ {
+ // Use player's availabilities
+ return R_SkinUsable(player - players, num);
+ }
+
+ // Player invalid, only show characters that are unlocked from the start.
+ for (i = 0; i < MAXUNLOCKABLES; i++)
+ {
+ if (unlockables[i].type == SECRET_SKIN)
+ {
+ INT32 lockedSkin = M_UnlockableSkinNum(&unlockables[i]);
+
+ if (lockedSkin == num)
+ {
+ return false;
+ }
+ }
+ }
+
+ return true;
+}
+
// Function: A_SignPlayer
//
// Description: Changes the state of a level end sign to reflect the player that hit it.
@@ -5161,23 +5173,21 @@ void A_SignPlayer(mobj_t *actor)
// I turned this function into a fucking mess. I'm so sorry. -Lach
if (locvar1 == -2) // random skin
{
-#define skincheck(num) (player ? !R_SkinUsable(player-players, num) : skins[num].availability > 0)
player_t *player = actor->target ? actor->target->player : NULL;
UINT8 skinnum;
UINT8 skincount = 0;
for (skinnum = 0; skinnum < numskins; skinnum++)
- if (!skincheck(skinnum))
+ if (SignSkinCheck(player, skinnum))
skincount++;
skinnum = P_RandomKey(skincount);
for (skincount = 0; skincount < numskins; skincount++)
{
if (skincount > skinnum)
break;
- if (skincheck(skincount))
+ if (!SignSkinCheck(player, skincount))
skinnum++;
}
skin = &skins[skinnum];
-#undef skincheck
}
else // specific skin
skin = &skins[locvar1];
@@ -5271,7 +5281,7 @@ void A_OverlayThink(mobj_t *actor)
actor->z = actor->target->z + actor->target->height - mobjinfo[actor->type].height - ((var2>>16) ? -1 : 1)*(var2&0xFFFF)*FRACUNIT;
else
actor->z = actor->target->z + ((var2>>16) ? -1 : 1)*(var2&0xFFFF)*FRACUNIT;
- actor->angle = actor->target->angle + actor->movedir;
+ actor->angle = (actor->target->player ? actor->target->player->drawangle : actor->target->angle) + actor->movedir;
actor->eflags = actor->target->eflags;
actor->momx = actor->target->momx;
@@ -6518,7 +6528,7 @@ void A_OldRingExplode(mobj_t *actor) {
{
const angle_t fa = (i*FINEANGLES/16) & FINEMASK;
- mo = P_SpawnMobj(actor->x, actor->y, actor->z, locvar1);
+ mo = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1);
P_SetTarget(&mo->target, actor->target); // Transfer target so player gets the points
mo->momx = FixedMul(FINECOSINE(fa),ns);
@@ -6544,7 +6554,7 @@ void A_OldRingExplode(mobj_t *actor) {
}
}
- mo = P_SpawnMobj(actor->x, actor->y, actor->z, locvar1);
+ mo = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1);
P_SetTarget(&mo->target, actor->target);
mo->momz = ns;
@@ -6559,7 +6569,7 @@ void A_OldRingExplode(mobj_t *actor) {
mo->color = skincolor_bluering;
}
- mo = P_SpawnMobj(actor->x, actor->y, actor->z, locvar1);
+ mo = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1);
P_SetTarget(&mo->target, actor->target);
mo->momz = -ns;
@@ -8246,7 +8256,7 @@ void A_Boss3ShockThink(mobj_t *actor)
fixed_t x0, y0, x1, y1;
// Break the link if movements are too different
- if (FixedHypot(snext->momx - actor->momx, snext->momy - actor->momy) > 12*actor->scale)
+ if (R_PointToDist2(0, 0, snext->momx - actor->momx, snext->momy - actor->momy) > 12*actor->scale)
{
P_SetTarget(&actor->hnext, NULL);
return;
@@ -8257,9 +8267,11 @@ void A_Boss3ShockThink(mobj_t *actor)
y0 = actor->y;
x1 = snext->x;
y1 = snext->y;
- if (FixedHypot(x1 - x0, y1 - y0) > 2*actor->radius)
+ if (R_PointToDist2(0, 0, x1 - x0, y1 - y0) > 2*actor->radius)
{
- snew = P_SpawnMobj((x0 + x1) >> 1, (y0 + y1) >> 1, (actor->z + snext->z) >> 1, actor->type);
+ snew = P_SpawnMobj((x0 >> 1) + (x1 >> 1),
+ (y0 >> 1) + (y1 >> 1),
+ (actor->z >> 1) + (snext->z >> 1), actor->type);
snew->momx = (actor->momx + snext->momx) >> 1;
snew->momy = (actor->momy + snext->momy) >> 1;
snew->momz = (actor->momz + snext->momz) >> 1; // is this really needed?
@@ -8267,6 +8279,10 @@ void A_Boss3ShockThink(mobj_t *actor)
P_SetTarget(&snew->target, actor->target);
snew->fuse = actor->fuse;
+ P_SetScale(snew, actor->scale);
+ snew->destscale = actor->destscale;
+ snew->scalespeed = actor->scalespeed;
+
P_SetTarget(&actor->hnext, snew);
P_SetTarget(&snew->hnext, snext);
}
@@ -9260,6 +9276,49 @@ void A_RandomStateRange(mobj_t *actor)
P_SetMobjState(actor, P_RandomRange(locvar1, locvar2));
}
+// Function: A_StateRangeByAngle
+//
+// Description: Chooses a state within the range supplied, depending on the actor's angle.
+//
+// var1 = Minimum state number to use.
+// var2 = Maximum state number to use. The difference will act as a modulo operator.
+//
+void A_StateRangeByAngle(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+
+ if (LUA_CallAction(A_STATERANGEBYANGLE, actor))
+ return;
+
+ if (locvar2 - locvar1 < 0)
+ return; // invalid range
+
+ P_SetMobjState(actor, locvar1 + (AngleFixed(actor->angle)>>FRACBITS % (1 + locvar2 - locvar1)));
+}
+
+// Function: A_StateRangeByParameter
+//
+// Description: Chooses a state within the range supplied, depending on the actor's parameter/extrainfo value.
+//
+// var1 = Minimum state number to use.
+// var2 = Maximum state number to use. The difference will act as a modulo operator.
+//
+void A_StateRangeByParameter(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+ UINT8 parameter = (actor->spawnpoint ? actor->spawnpoint->extrainfo : 0);
+
+ if (LUA_CallAction(A_STATERANGEBYPARAMETER, actor))
+ return;
+
+ if (locvar2 - locvar1 < 0)
+ return; // invalid range
+
+ P_SetMobjState(actor, locvar1 + (parameter % (1 + locvar2 - locvar1)));
+}
+
// Function: A_DualAction
//
// Description: Calls two actions. Be careful, if you reference the same state this action is called from, you can create an infinite loop.
@@ -9873,8 +9932,8 @@ void A_Custom3DRotate(mobj_t *actor)
const fixed_t radius = FixedMul(loc1lw*FRACUNIT, actor->scale);
const fixed_t hOff = FixedMul(loc1up*FRACUNIT, actor->scale);
- const fixed_t hspeed = FixedMul(loc2up*FRACUNIT/10, actor->scale);
- const fixed_t vspeed = FixedMul(loc2lw*FRACUNIT/10, actor->scale);
+ const fixed_t hspeed = loc2up*FRACUNIT/10; // Monster's note (29/05/21): DO NOT SCALE, this is an angular speed!
+ const fixed_t vspeed = loc2lw*FRACUNIT/10; // ditto
if (LUA_CallAction(A_CUSTOM3DROTATE, actor))
return;
@@ -14320,6 +14379,14 @@ void A_RolloutRock(mobj_t *actor)
if (LUA_CallAction(A_ROLLOUTROCK, actor))
return;
+ if (!actor->tracer || P_MobjWasRemoved(actor->tracer) || !actor->tracer->health)
+ actor->flags |= MF_PUSHABLE;
+ else
+ {
+ actor->flags2 = (actor->flags2 & ~MF2_OBJECTFLIP) | (actor->tracer->flags2 & MF2_OBJECTFLIP);
+ actor->eflags = (actor->eflags & ~MFE_VERTICALFLIP) | (actor->tracer->eflags & MFE_VERTICALFLIP);
+ }
+
actor->friction = FRACUNIT; // turns out riding on solids sucks, so let's just make it easier on ourselves
if (actor->eflags & MFE_JUSTHITFLOOR)
@@ -14358,7 +14425,8 @@ void A_RolloutRock(mobj_t *actor)
speed = P_AproxDistance(actor->momx, actor->momy); // recalculate speed for visual rolling
- if (speed < actor->scale >> 1) // stop moving if speed is insignificant
+ if (((actor->flags & MF_PUSHABLE) || !(actor->flags2 & MF2_STRONGBOX))
+ && speed < actor->scale) // stop moving if speed is insignificant
{
actor->momx = 0;
actor->momy = 0;
@@ -14378,9 +14446,6 @@ void A_RolloutRock(mobj_t *actor)
actor->frame = actor->reactiontime % maxframes; // set frame
- if (!actor->tracer || P_MobjWasRemoved(actor->tracer) || !actor->tracer->health)
- actor->flags |= MF_PUSHABLE;
-
if (!(actor->flags & MF_PUSHABLE) || (actor->movecount != 1)) // if being ridden or haven't moved, don't disappear
actor->fuse = actor->info->painchance;
else if (actor->fuse < 2*TICRATE)
diff --git a/src/p_floor.c b/src/p_floor.c
index d7e417f5c00d2f3c15a8141887f54c1fe93fb326..5536ee913acf2c958694e3c1d6bb451a50bcbfb8 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -635,7 +635,6 @@ void T_BounceCheese(bouncecheese_t *bouncer)
boolean remove;
INT32 i;
mtag_t tag = Tag_FGet(&bouncer->sourceline->tags);
- TAG_ITER_DECLARECOUNTER(0);
if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT
|| bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself!
@@ -650,7 +649,7 @@ void T_BounceCheese(bouncecheese_t *bouncer)
}
// You can use multiple target sectors, but at your own risk!!!
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
actionsector = §ors[i];
actionsector->moved = true;
@@ -775,7 +774,6 @@ void T_StartCrumble(crumble_t *crumble)
sector_t *sector;
INT32 i;
mtag_t tag = Tag_FGet(&crumble->sourceline->tags);
- TAG_ITER_DECLARECOUNTER(0);
// Once done, the no-return thinker just sits there,
// constantly 'returning'... kind of an oxymoron, isn't it?
@@ -804,7 +802,7 @@ void T_StartCrumble(crumble_t *crumble)
}
else if (++crumble->timer == 0) // Reposition back to original spot
{
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
sector = §ors[i];
@@ -840,7 +838,7 @@ void T_StartCrumble(crumble_t *crumble)
// Flash to indicate that the platform is about to return.
if (crumble->timer > -224 && (leveltime % ((abs(crumble->timer)/8) + 1) == 0))
{
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
sector = §ors[i];
@@ -932,7 +930,7 @@ void T_StartCrumble(crumble_t *crumble)
P_RemoveThinker(&crumble->thinker);
}
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
sector = §ors[i];
sector->moved = true;
@@ -948,7 +946,6 @@ void T_StartCrumble(crumble_t *crumble)
void T_MarioBlock(mariothink_t *block)
{
INT32 i;
- TAG_ITER_DECLARECOUNTER(0);
T_MovePlane
(
@@ -983,7 +980,7 @@ void T_MarioBlock(mariothink_t *block)
block->sector->ceilspeed = 0;
block->direction = 0;
}
- TAG_ITER_SECTORS(0, (INT16)block->tag, i)
+ TAG_ITER_SECTORS((INT16)block->tag, i)
P_RecalcPrecipInSector(§ors[i]);
}
@@ -1045,6 +1042,7 @@ static mobj_t *SearchMarioNode(msecnode_t *node)
case MT_THUNDERCOIN_ORB:
case MT_IVSP:
case MT_SUPERSPARK:
+ case MT_BOXSPARKLE:
case MT_RAIN:
case MT_SNOWFLAKE:
case MT_SPLISH:
@@ -1293,9 +1291,8 @@ void T_NoEnemiesSector(noenemies_t *nobaddies)
INT32 secnum = -1;
boolean FOFsector = false;
mtag_t tag = Tag_FGet(&nobaddies->sourceline->tags);
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
sec = §ors[secnum];
@@ -1306,14 +1303,13 @@ void T_NoEnemiesSector(noenemies_t *nobaddies)
{
INT32 targetsecnum = -1;
mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags);
- TAG_ITER_DECLARECOUNTER(1);
if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300)
continue;
FOFsector = true;
- TAG_ITER_SECTORS(1, tag2, targetsecnum)
+ TAG_ITER_SECTORS(tag2, targetsecnum)
{
if (T_SectorHasEnemies(§ors[targetsecnum]))
return;
@@ -1400,7 +1396,6 @@ void T_EachTimeThinker(eachtime_t *eachtime)
fixed_t bottomheight, topheight;
ffloor_t *rover;
mtag_t tag = Tag_FGet(&eachtime->sourceline->tags);
- TAG_ITER_DECLARECOUNTER(0);
for (i = 0; i < MAXPLAYERS; i++)
{
@@ -1410,7 +1405,7 @@ void T_EachTimeThinker(eachtime_t *eachtime)
eachtime->playersOnArea[i] = false;
}
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
sec = §ors[secnum];
@@ -1428,14 +1423,13 @@ void T_EachTimeThinker(eachtime_t *eachtime)
{
INT32 targetsecnum = -1;
mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags);
- TAG_ITER_DECLARECOUNTER(1);
if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300)
continue;
FOFsector = true;
- TAG_ITER_SECTORS(1, tag2, targetsecnum)
+ TAG_ITER_SECTORS(tag2, targetsecnum)
{
targetsec = §ors[targetsecnum];
@@ -1522,8 +1516,8 @@ void T_EachTimeThinker(eachtime_t *eachtime)
{
for (i = 0; i < MAXPLAYERS; i++)
{
- if (P_IsPlayerValid(i) && playersArea[i])
- continue;
+ if (P_IsPlayerValid(i) && !playersArea[i])
+ return;
}
}
@@ -1570,12 +1564,11 @@ void T_RaiseSector(raise_t *raise)
INT32 direction;
result_e res = 0;
mtag_t tag = raise->tag;
- TAG_ITER_DECLARECOUNTER(0);
if (raise->sector->crumblestate >= CRUMBLE_FALL || raise->sector->ceilingdata)
return;
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
sector = §ors[i];
@@ -1702,7 +1695,7 @@ void T_RaiseSector(raise_t *raise)
raise->sector->ceilspeed = 42;
raise->sector->floorspeed = speed*direction;
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
P_RecalcPrecipInSector(§ors[i]);
}
@@ -1820,9 +1813,8 @@ void EV_DoFloor(line_t *line, floor_e floortype)
sector_t *sec;
floormove_t *dofloor;
mtag_t tag = Tag_FGet(&line->tags);
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
sec = §ors[secnum];
@@ -2037,10 +2029,9 @@ void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
sector_t *sec;
elevator_t *elevator;
mtag_t tag = Tag_FGet(&line->tags);
- TAG_ITER_DECLARECOUNTER(0);
// act on all sectors with the same tag as the triggering linedef
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
sec = §ors[secnum];
@@ -2337,7 +2328,6 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
sector_t *foundsec;
INT32 i;
mtag_t tag = Tag_FGet(&rover->master->tags);
- TAG_ITER_DECLARECOUNTER(0);
// If floor is already activated, skip it
if (sec->floordata)
@@ -2380,7 +2370,7 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
crumble->sector->crumblestate = CRUMBLE_ACTIVATED;
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
foundsec = §ors[i];
diff --git a/src/p_inter.c b/src/p_inter.c
index 380040bc8e62ad97e0880ccdcdc645296db38716..582cdb0d091df4fc6b0ee9d5698babcff6acd9fb 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -151,7 +151,7 @@ boolean P_CanPickupItem(player_t *player, boolean weapon)
if (!player->mo || player->mo->health <= 0)
return false;
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
{
if (weapon)
return false;
@@ -178,7 +178,7 @@ void P_DoNightsScore(player_t *player)
return; // Don't do any fancy shit for failures.
dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
player = &players[consoleplayer];
if (G_IsSpecialStage(gamemap)) // Global link count? Maybe not a good idea...
@@ -365,7 +365,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->flags & (MF_ENEMY|MF_BOSS) && special->flags2 & MF2_FRET)
return;
- if (LUAh_TouchSpecial(special, toucher) || P_MobjWasRemoved(special))
+ if (LUA_HookTouchSpecial(special, toucher) || P_MobjWasRemoved(special))
return;
// 0 = none, 1 = elemental pierce, 2 = bubble bounce
@@ -630,7 +630,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// ***************************** //
// Special Stage Token
case MT_TOKEN:
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
P_AddPlayerScore(player, 1000);
@@ -670,7 +670,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// Emerald Hunt
case MT_EMERHUNT:
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
if (hunt1 == special)
@@ -701,7 +701,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
case MT_EMERALD5:
case MT_EMERALD6:
case MT_EMERALD7:
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
if (special->threshold)
@@ -738,12 +738,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// Secret emblem thingy
case MT_EMBLEM:
{
- if (demoplayback || player->bot)
+ if (demoplayback || (player->bot && player->bot != BOT_MPAI) || special->health <= 0 || special->health > MAXEMBLEMS)
return;
emblemlocations[special->health-1].collected = true;
M_UpdateUnlockablesAndExtraEmblems();
-
G_SaveGameData();
break;
}
@@ -751,7 +750,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
// CTF Flags
case MT_REDFLAG:
case MT_BLUEFLAG:
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
if (player->powers[pw_flashing] || player->tossdelay)
return;
@@ -826,7 +825,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
{
boolean spec = G_IsSpecialStage(gamemap);
boolean cangiveemmy = false;
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
if (player->exiting)
return;
@@ -1072,7 +1071,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
return;
case MT_EGGCAPSULE:
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
// make sure everything is as it should be, THEN take rings from players in special stages
@@ -1164,7 +1163,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
return;
case MT_NIGHTSSUPERLOOP:
- if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE))
+ if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
return;
if (!G_IsSpecialStage(gamemap))
player->powers[pw_nights_superloop] = (UINT16)special->info->speed;
@@ -1186,7 +1185,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
break;
case MT_NIGHTSDRILLREFILL:
- if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE))
+ if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
return;
if (!G_IsSpecialStage(gamemap))
player->drillmeter = special->info->speed;
@@ -1208,7 +1207,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
break;
case MT_NIGHTSHELPER:
- if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE))
+ if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
return;
if (!G_IsSpecialStage(gamemap))
{
@@ -1240,7 +1239,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
break;
case MT_NIGHTSEXTRATIME:
- if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE))
+ if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
return;
if (!G_IsSpecialStage(gamemap))
{
@@ -1272,7 +1271,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
break;
case MT_NIGHTSLINKFREEZE:
- if (player->bot || !(player->powers[pw_carry] == CR_NIGHTSMODE))
+ if ((player->bot && player->bot != BOT_MPAI) || !(player->powers[pw_carry] == CR_NIGHTSMODE))
return;
if (!G_IsSpecialStage(gamemap))
{
@@ -1332,7 +1331,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (playeringame[i] && players[i].powers[pw_carry] == CR_NIGHTSMODE)
players[i].drillmeter += TICRATE/2;
}
- else if (player->bot)
+ else if (player->bot && player->bot != BOT_MPAI)
players[consoleplayer].drillmeter += TICRATE/2;
else
player->drillmeter += TICRATE/2;
@@ -1385,7 +1384,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
thinker_t *th;
mobj_t *mo2;
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
// Initialize my junk
@@ -1423,7 +1422,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
return;
}
case MT_FIREFLOWER:
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
S_StartSound(toucher, sfx_mario3);
@@ -1685,7 +1684,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
return; // Only go in the mouth
// Eaten by player!
- if ((!player->bot) && (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1))
+ if ((!player->bot || player->bot == BOT_MPAI) && (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1))
{
player->powers[pw_underwater] = underwatertics + 1;
P_RestoreMusic(player);
@@ -1696,7 +1695,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (!player->climbing)
{
- if (player->bot && toucher->state-states != S_PLAY_GASP)
+ if (player->bot && player->bot != BOT_MPAI && toucher->state-states != S_PLAY_GASP)
S_StartSound(toucher, special->info->deathsound); // Force it to play a sound for bots
P_SetPlayerMobjState(toucher, S_PLAY_GASP);
P_ResetPlayer(player);
@@ -1704,7 +1703,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
toucher->momx = toucher->momy = toucher->momz = 0;
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
else
break;
@@ -1736,7 +1735,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
return;
case MT_MINECARTSPAWNER:
- if (!player->bot && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART && !(player->powers[pw_ignorelatch] & (1<<15)))
+ if (!player->bot && player->bot != BOT_MPAI && special->fuse <= TICRATE && player->powers[pw_carry] != CR_MINECART && !(player->powers[pw_ignorelatch] & (1<<15)))
{
mobj_t *mcart = P_SpawnMobj(special->x, special->y, special->z, MT_MINECART);
P_SetTarget(&mcart->target, toucher);
@@ -1789,7 +1788,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
}
return;
default: // SOC or script pickup
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
P_SetTarget(&special->target, toucher);
break;
@@ -1813,7 +1812,7 @@ void P_TouchStarPost(mobj_t *post, player_t *player, boolean snaptopost)
mobj_t *toucher = player->mo;
mobj_t *checkbase = snaptopost ? post : toucher;
- if (player->bot)
+ if (player->bot && player->bot != BOT_MPAI)
return;
// In circuit, player must have touched all previous starposts
if (circuitmap
@@ -1939,7 +1938,7 @@ static void P_HitDeathMessages(player_t *player, mobj_t *inflictor, mobj_t *sour
if (!netgame)
return; // Presumably it's obvious what's happening in splitscreen.
- if (LUAh_HurtMsg(player, inflictor, source, damagetype))
+ if (LUA_HookHurtMsg(player, inflictor, source, damagetype))
return;
deadtarget = (player->mo->health <= 0);
@@ -2391,7 +2390,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
mobj_t *mo;
if (inflictor && (inflictor->type == MT_SHELL || inflictor->type == MT_FIREBALL))
- P_SetTarget(&target->tracer, inflictor);
+ S_StartScreamSound(target, sfx_mario2);
if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap) && target->player && target->player->nightstime > 6)
target->player->nightstime = 6; // Just let P_Ticker take care of the rest.
@@ -2413,7 +2412,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL);
target->health = 0; // This makes it easy to check if something's dead elsewhere.
- if (LUAh_MobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target))
+ if (LUA_HookMobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target))
return;
// Let EVERYONE know what happened to a player! 01-29-2002 Tails
@@ -2555,7 +2554,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
if ((target->player->lives <= 1) && (netgame || multiplayer) && G_GametypeUsesCoopLives() && (cv_cooplives.value == 0))
;
- else if (!target->player->bot && !target->player->spectator && (target->player->lives != INFLIVES)
+ else if ((!target->player->bot || target->player->bot == BOT_MPAI) && !target->player->spectator && (target->player->lives != INFLIVES)
&& G_GametypeUsesLives())
{
if (!(target->player->pflags & PF_FINISHED))
@@ -3475,7 +3474,7 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
if (inflictor && inflictor->type == MT_LHRT)
return;
- if (player->powers[pw_shield] || player->bot) //If One-Hit Shield
+ if (player->powers[pw_shield] || (player->bot && player->bot != BOT_MPAI)) //If One-Hit Shield
{
P_RemoveShield(player);
S_StartSound(player->mo, sfx_shldls); // Ba-Dum! Shield loss.
@@ -3548,7 +3547,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
// Everything above here can't be forced.
if (!metalrecording)
{
- UINT8 shouldForce = LUAh_ShouldDamage(target, inflictor, source, damage, damagetype);
+ UINT8 shouldForce = LUA_HookShouldDamage(target, inflictor, source, damage, damagetype);
if (P_MobjWasRemoved(target))
return (shouldForce == 1); // mobj was removed
if (shouldForce == 1)
@@ -3566,7 +3565,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
return false;
// Make sure that boxes cannot be popped by enemies, red rings, etc.
- if (target->flags & MF_MONITOR && ((!source || !source->player || source->player->bot)
+ if (target->flags & MF_MONITOR && ((!source || !source->player || (source->player->bot && source->player->bot != BOT_MPAI))
|| (inflictor && (inflictor->type == MT_REDRING || (inflictor->type >= MT_THROWNBOUNCE && inflictor->type <= MT_THROWNGRENADE)))))
return false;
}
@@ -3589,7 +3588,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (!force && target->flags2 & MF2_FRET) // Currently flashing from being hit
return false;
- if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype) || P_MobjWasRemoved(target))
+ if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype) || P_MobjWasRemoved(target))
return true;
if (target->health > 1)
@@ -3639,7 +3638,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|| (G_GametypeHasTeams() && player->ctfteam == source->player->ctfteam)))
return false; // Don't run eachother over in special stages and team games and such
}
- if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype))
+ if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype))
return true;
P_NiGHTSDamage(target, source); // -5s :(
return true;
@@ -3651,7 +3650,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
return true;
}
- if (!force && inflictor && inflictor->flags & MF_FIRE)
+ if (!force && inflictor && inflictor->flags & MF_FIRE && !(damagetype && damagetype != DMG_FIRE))
{
if (player->powers[pw_shield] & SH_PROTECTFIRE)
return false; // Invincible to fire objects
@@ -3693,15 +3692,15 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (force
|| (inflictor && inflictor->flags & MF_MISSILE && inflictor->flags2 & MF2_SUPERFIRE)) // Super Sonic is stunned!
{
- if (!LUAh_MobjDamage(target, inflictor, source, damage, damagetype))
+ if (!LUA_HookMobjDamage(target, inflictor, source, damage, damagetype))
P_SuperDamage(player, inflictor, source, damage);
return true;
}
return false;
}
- else if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype))
+ else if (LUA_HookMobjDamage(target, inflictor, source, damage, damagetype))
return true;
- else if (player->powers[pw_shield] || (player->bot && !ultimatemode)) //If One-Hit Shield
+ else if (player->powers[pw_shield] || (player->bot && player->bot != BOT_MPAI && !ultimatemode)) //If One-Hit Shield
{
P_ShieldDamage(player, inflictor, source, damage, damagetype);
damage = 0;
diff --git a/src/p_lights.c b/src/p_lights.c
index 937808ef1e1f95f588b86652498f547328616948..d7bbea90cea852f48820663e3e8da9b3935509d5 100644
--- a/src/p_lights.c
+++ b/src/p_lights.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -374,10 +374,9 @@ void P_FadeLightBySector(sector_t *sector, INT32 destvalue, INT32 speed, boolean
void P_FadeLight(INT16 tag, INT32 destvalue, INT32 speed, boolean ticbased, boolean force)
{
INT32 i;
- TAG_ITER_DECLARECOUNTER(0);
// search all sectors for ones with tag
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
if (!force && ticbased // always let speed fader execute
&& sectors[i].lightingdata
diff --git a/src/p_local.h b/src/p_local.h
index d61e9317e659d8b7dc9f1bfc1cd46195b6a867c5..0e7b8327d3934ed661871949de9ebee257898a11 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -155,6 +155,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff);
void P_SetObjectMomZ(mobj_t *mo, fixed_t value, boolean relative);
void P_RestoreMusic(player_t *player);
+void P_SetPower(player_t *player, powertype_t power, UINT16 value);
void P_SpawnShieldOrb(player_t *player);
void P_SwitchShield(player_t *player, UINT16 shieldtype);
mobj_t *P_SpawnGhostMobj(mobj_t *mobj);
@@ -350,6 +351,7 @@ void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration);
#define PAL_MIXUP 2
#define PAL_RECYCLE 3
#define PAL_NUKE 4
+#define PAL_INVERT 5
//
// P_ENEMY
@@ -410,6 +412,7 @@ void P_SetUnderlayPosition(mobj_t *thing);
boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y);
boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam);
+boolean P_CheckMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff);
boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff);
boolean P_Move(mobj_t *actor, fixed_t speed);
boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z);
diff --git a/src/p_map.c b/src/p_map.c
index 19b999c433f09cd5f50cb34871f4937bcd875a87..8cd0223d0957147e6edb08083eb0f326a035cab2 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -419,16 +419,23 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
}
else if (object->player->dashmode >= DASHMODE_THRESHOLD)
P_SetPlayerMobjState(object, S_PLAY_DASH);
- else if (P_IsObjectOnGround(object) && horizspeed >= FixedMul(object->player->runspeed, object->scale))
- P_SetPlayerMobjState(object, S_PLAY_RUN);
+ else if (P_IsObjectOnGround(object))
+ P_SetPlayerMobjState(object, (horizspeed >= FixedMul(object->player->runspeed, object->scale)) ? S_PLAY_RUN : S_PLAY_WALK);
else
- P_SetPlayerMobjState(object, S_PLAY_WALK);
+ P_SetPlayerMobjState(object, (object->momz > 0) ? S_PLAY_SPRING : S_PLAY_FALL);
}
else if (P_MobjFlip(object)*vertispeed > 0)
P_SetPlayerMobjState(object, S_PLAY_SPRING);
else
P_SetPlayerMobjState(object, S_PLAY_FALL);
}
+ else if (horizspeed
+ && object->tracer
+ && object->tracer->player
+ && object->tracer->player->powers[pw_carry] != CR_NONE
+ && object->tracer->tracer == object
+ && (!demoplayback || P_ControlStyle(object->tracer->player) == CS_LMAOGALOG))
+ P_SetPlayerAngle(object->tracer->player, spring->angle);
object->standingslope = NULL; // And again.
@@ -511,6 +518,7 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
if (spring->state != &states[S_STEAM1]) // Only when it bursts
break;
+ object->eflags |= MFE_SPRUNG;
object->momz = flipval*FixedMul(speed, FixedSqrt(FixedMul(spring->scale, object->scale))); // scale the speed with both objects' scales, just like with springs!
if (p)
@@ -746,7 +754,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // underneath
// REX HAS SEEN YOU
- if (!LUAh_SeenPlayer(tmthing->target->player, thing->player))
+ if (!LUA_HookSeenPlayer(tmthing->target->player, thing->player))
return false;
seenplayer = thing->player;
@@ -935,7 +943,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
}
{
- UINT8 shouldCollide = LUAh_MobjCollide(thing, tmthing); // checks hook for thing's type
+ UINT8 shouldCollide = LUA_Hook2Mobj(thing, tmthing, MOBJ_HOOK(MobjCollide)); // checks hook for thing's type
if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
return true; // one of them was removed???
if (shouldCollide == 1)
@@ -943,7 +951,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
else if (shouldCollide == 2)
return true; // force no collide
- shouldCollide = LUAh_MobjMoveCollide(tmthing, thing); // checks hook for tmthing's type
+ shouldCollide = LUA_Hook2Mobj(tmthing, thing, MOBJ_HOOK(MobjMoveCollide)); // checks hook for tmthing's type
if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
return true; // one of them was removed???
if (shouldCollide == 1)
@@ -1144,11 +1152,11 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // underneath
if (tmthing->eflags & MFE_VERTICALFLIP)
- thing->z = tmthing->z - thing->height - FixedMul(FRACUNIT, tmthing->scale);
+ P_TeleportMove(thing, thing->x, thing->y, tmthing->z - thing->height - FixedMul(FRACUNIT, tmthing->scale));
else
- thing->z = tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale);
+ P_TeleportMove(thing, thing->x, thing->y, tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale));
if (thing->flags & MF_SHOOTABLE)
- P_DamageMobj(thing, tmthing, tmthing, 1, 0);
+ P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
return true;
}
@@ -1927,7 +1935,7 @@ static boolean PIT_CheckLine(line_t *ld)
blockingline = ld;
{
- UINT8 shouldCollide = LUAh_MobjLineCollide(tmthing, blockingline); // checks hook for thing's type
+ UINT8 shouldCollide = LUA_HookMobjLineCollide(tmthing, blockingline); // checks hook for thing's type
if (P_MobjWasRemoved(tmthing))
return true; // one of them was removed???
if (shouldCollide == 1)
@@ -2021,7 +2029,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
subsector_t *newsubsec;
boolean blockval = true;
- ps_checkposition_calls++;
+ ps_checkposition_calls.value.i++;
I_Assert(thing != NULL);
#ifdef PARANOIA
@@ -2658,17 +2666,17 @@ boolean PIT_PushableMoved(mobj_t *thing)
return true;
}
-//
-// P_TryMove
-// Attempt to move to a new position.
-//
-boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
+static boolean
+increment_move
+( mobj_t * thing,
+ fixed_t x,
+ fixed_t y,
+ boolean allowdropoff)
{
fixed_t tryx = thing->x;
fixed_t tryy = thing->y;
fixed_t radius = thing->radius;
fixed_t thingtop;
- fixed_t startingonground = P_IsObjectOnGround(thing);
floatok = false;
if (radius < MAXRADIUS/2)
@@ -2719,6 +2727,16 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
&& P_MobjFlip(thing)*thing->momz > FixedMul(FRACUNIT, thing->scale))
maxstep = 0;
}
+ else if (thing->flags & MF_PUSHABLE)
+ {
+ // If using type Section1:13, double the maxstep.
+ if (GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 13)
+ maxstep <<= 1;
+
+ // If using type Section1:14, no maxstep.
+ if (GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14)
+ maxstep = 0;
+ }
if (thing->type == MT_SKIM)
maxstep = 0;
@@ -2796,7 +2814,38 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
}
} while (tryx != x || tryy != y);
+ return true;
+}
+
+//
+// P_CheckMove
+// Check if a P_TryMove would be successful.
+//
+boolean P_CheckMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
+{
+ boolean moveok;
+ mobj_t *hack = P_SpawnMobjFromMobj(thing, 0, 0, 0, MT_RAY);
+
+ hack->radius = thing->radius;
+ hack->height = thing->height;
+
+ moveok = increment_move(hack, x, y, allowdropoff);
+ P_RemoveMobj(hack);
+
+ return moveok;
+}
+
+//
+// P_TryMove
+// Attempt to move to a new position.
+//
+boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
+{
+ fixed_t startingonground = P_IsObjectOnGround(thing);
+
// The move is ok!
+ if (!increment_move(thing, x, y, allowdropoff))
+ return false;
// If it's a pushable object, check if anything is
// standing on top and move it, too.
diff --git a/src/p_maputl.c b/src/p_maputl.c
index efcebe7363741a3ff1bb3a851dfc7e8653e6f3c8..43a7e92a185f4ba88ef5a2767d774bb928252bca 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_maputl.h b/src/p_maputl.h
index cec344d03df8b810f4a952dabb69de2746dccacd..b7779d88a3d5a4f5f43441cbb4bad3072b2565d3 100644
--- a/src/p_maputl.h
+++ b/src/p_maputl.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_mobj.c b/src/p_mobj.c
index ec21f1e4eab69a89fd1d1ff80c3ca6a47653e120..76dab6c9da3346f781623406948eb2b046a2092f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -86,7 +86,7 @@ void P_AddCachedAction(mobj_t *mobj, INT32 statenum)
//
// P_SetupStateAnimation
//
-FUNCINLINE static ATTRINLINE void P_SetupStateAnimation(mobj_t *mobj, state_t *st)
+static void P_SetupStateAnimation(mobj_t *mobj, state_t *st)
{
INT32 animlength = (mobj->sprite == SPR_PLAY && mobj->skin)
? (INT32)(((skin_t *)mobj->skin)->sprites[mobj->sprite2].numframes) - 1
@@ -337,9 +337,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
mobj->tics = st->tics;
// Adjust the player's animation speed to match their velocity.
- if (state == S_PLAY_STND && player->powers[pw_super] && skins[player->skin].sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0) // if no super wait, don't wait at all
- mobj->tics = -1;
- else if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE))
+ if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE))
mobj->tics = 2;
else if (!(disableSpeedAdjust || player->charflags & SF_NOSPEEDADJUST))
{
@@ -408,8 +406,28 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
if (skin)
{
- spr2 = P_GetSkinSprite2(skin, (((player->powers[pw_super] && !(player->charflags & SF_NOSUPERSPRITES)) ? FF_SPR2SUPER : 0)|st->frame) & FF_FRAMEMASK, mobj->player);
+ UINT16 stateframe = st->frame;
+
+ // Add/Remove FF_SPR2SUPER based on certain conditions
+ if (player->charflags & SF_NOSUPERSPRITES)
+ stateframe = stateframe & ~FF_SPR2SUPER;
+ else if (player->powers[pw_super])
+ stateframe = stateframe | FF_SPR2SUPER;
+
+ if (stateframe & FF_SPR2SUPER)
+ {
+ if (mobj->eflags & MFE_FORCENOSUPER)
+ stateframe = stateframe & ~FF_SPR2SUPER;
+ }
+ else if (mobj->eflags & MFE_FORCESUPER)
+ stateframe = stateframe | FF_SPR2SUPER;
+
+ // Get the sprite2 and frame number
+ spr2 = P_GetSkinSprite2(skin, (stateframe & FF_FRAMEMASK), mobj->player);
numframes = skin->sprites[spr2].numframes;
+
+ if (state == S_PLAY_STND && (spr2 & FF_SPR2SUPER) && skin->sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0)
+ mobj->tics = -1; // If no super wait, don't wait at all
}
else
{
@@ -538,8 +556,23 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
if (skin)
{
- spr2 = P_GetSkinSprite2(skin, st->frame & FF_FRAMEMASK, mobj->player);
+ UINT16 stateframe = st->frame;
+
+ // Add/Remove FF_SPR2SUPER based on certain conditions
+ if (stateframe & FF_SPR2SUPER)
+ {
+ if (mobj->eflags & MFE_FORCENOSUPER)
+ stateframe = stateframe & ~FF_SPR2SUPER;
+ }
+ else if (mobj->eflags & MFE_FORCESUPER)
+ stateframe = stateframe | FF_SPR2SUPER;
+
+ // Get the sprite2 and frame number
+ spr2 = P_GetSkinSprite2(skin, (stateframe & FF_FRAMEMASK), NULL);
numframes = skin->sprites[spr2].numframes;
+
+ if (state == S_PLAY_STND && (spr2 & FF_SPR2SUPER) && skin->sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0)
+ mobj->tics = -1; // If no super wait, don't wait at all
}
else
{
@@ -1855,12 +1888,10 @@ void P_XYMovement(mobj_t *mo)
// blocked move
moved = false;
- if (player) {
- if (player->bot)
- B_MoveBlocked(player);
- }
+ if (player)
+ B_MoveBlocked(player);
- if (LUAh_MobjMoveBlocked(mo))
+ if (LUA_HookMobjMoveBlocked(mo, tmhitthing, blockingline))
{
if (P_MobjWasRemoved(mo))
return;
@@ -2507,7 +2538,7 @@ boolean P_ZMovement(mobj_t *mo)
{
P_KillMobj(mo, NULL, NULL, 0);
}
- return false;
+ return !P_MobjWasRemoved(mo); // allows explosion states to run
}
else
{
@@ -2565,6 +2596,10 @@ boolean P_ZMovement(mobj_t *mo)
}
P_CheckPosition(mo, mo->x, mo->y); // Sets mo->standingslope correctly
+
+ if (P_MobjWasRemoved(mo)) // mobjs can be removed by P_CheckPosition -- Monster Iestyn 31/07/21
+ return false;
+
if (((mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope) && (mo->type != MT_STEAM))
{
mo->standingslope = (mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope;
@@ -3250,8 +3285,8 @@ void P_MobjCheckWater(mobj_t *mobj)
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
continue;
- topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y);
- bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
+ topheight = P_GetSpecialTopZ(mobj, sectors + rover->secnum, sector);
+ bottomheight = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, sector);
if (mobj->eflags & MFE_VERTICALFLIP)
{
@@ -3302,11 +3337,9 @@ void P_MobjCheckWater(mobj_t *mobj)
boolean electric = !!(p->powers[pw_shield] & SH_PROTECTELECTRIC);
if (electric || ((p->powers[pw_shield] & SH_PROTECTFIRE) && !(p->powers[pw_shield] & SH_PROTECTWATER) && !(mobj->eflags & MFE_TOUCHLAVA)))
{ // Water removes electric and non-water fire shields...
- P_FlashPal(p,
- electric
- ? PAL_WHITE
- : PAL_NUKE,
- 1);
+ if (electric)
+ P_FlashPal(p, PAL_WHITE, 1);
+
p->powers[pw_shield] = p->powers[pw_shield] & SH_STACK;
}
}
@@ -4154,7 +4187,7 @@ boolean P_BossTargetPlayer(mobj_t *actor, boolean closest)
player = &players[actor->lastlook];
- if (player->pflags & PF_INVIS || player->bot || player->spectator)
+ if (player->pflags & PF_INVIS || player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN || player->spectator)
continue; // ignore notarget
if (!player->mo || P_MobjWasRemoved(player->mo))
@@ -4195,7 +4228,7 @@ boolean P_SupermanLook4Players(mobj_t *actor)
if (players[c].pflags & PF_INVIS)
continue; // ignore notarget
- if (!players[c].mo || players[c].bot)
+ if (!players[c].mo || players[c].bot == BOT_2PAI || players[c].bot == BOT_2PHUMAN)
continue;
if (players[c].mo->health <= 0)
@@ -4623,9 +4656,8 @@ static boolean P_Boss4MoveCage(mobj_t *mobj, fixed_t delta)
INT32 snum;
sector_t *sector;
boolean gotcage = false;
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, tag, snum)
+ TAG_ITER_SECTORS(tag, snum)
{
sector = §ors[snum];
sector->floorheight += delta;
@@ -4709,9 +4741,8 @@ static void P_Boss4DestroyCage(mobj_t *mobj)
size_t a;
sector_t *sector, *rsec;
ffloor_t *rover;
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, tag, snum)
+ TAG_ITER_SECTORS(tag, snum)
{
sector = §ors[snum];
@@ -6855,7 +6886,7 @@ void P_RunOverlays(void)
mo->eflags = (mo->eflags & ~MFE_VERTICALFLIP) | (mo->target->eflags & MFE_VERTICALFLIP);
mo->scale = mo->destscale = mo->target->scale;
- mo->angle = mo->target->angle + mo->movedir;
+ mo->angle = (mo->target->player ? mo->target->player->drawangle : mo->target->angle) + mo->movedir;
if (!(mo->state->frame & FF_ANIMATE))
zoffs = FixedMul(((signed)mo->state->var2)*FRACUNIT, mo->scale);
@@ -7044,6 +7075,8 @@ static void P_PyreFlyBurn(mobj_t *mobj, fixed_t hoffs, INT16 vrange, mobjtype_t
fixed_t zoffs = P_RandomRange(-vrange, vrange)*FRACUNIT;
mobj_t *particle = P_SpawnMobjFromMobj(mobj, xoffs, yoffs, zoffs, mobjtype);
particle->momz = momz;
+ particle->flags2 |= MF2_LINKDRAW;
+ P_SetTarget(&particle->tracer, mobj);
}
static void P_MobjScaleThink(mobj_t *mobj)
@@ -7326,7 +7359,7 @@ static void P_RosySceneryThink(mobj_t *mobj)
continue;
if (!players[i].mo)
continue;
- if (players[i].bot)
+ if (players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN)
continue;
if (!players[i].mo->health)
continue;
@@ -7528,7 +7561,7 @@ static void P_RosySceneryThink(mobj_t *mobj)
static void P_MobjSceneryThink(mobj_t *mobj)
{
- if (LUAh_MobjThinker(mobj))
+ if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker)))
return;
if (P_MobjWasRemoved(mobj))
return;
@@ -7723,7 +7756,8 @@ static void P_MobjSceneryThink(mobj_t *mobj)
break;
case MT_WATERDROP:
P_SceneryCheckWater(mobj);
- if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop)
+ if (((!(mobj->eflags & MFE_VERTICALFLIP) && (mobj->z <= mobj->floorz || mobj->z <= mobj->watertop))
+ || (mobj->eflags & MFE_VERTICALFLIP && mobj->z + mobj->height >= mobj->ceilingz))
&& mobj->health > 0)
{
mobj->health = 0;
@@ -7876,7 +7910,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
if (!mobj->fuse)
{
- if (!LUAh_MobjFuse(mobj))
+ if (!LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse)))
P_RemoveMobj(mobj);
return;
}
@@ -7918,6 +7952,9 @@ static void P_MobjSceneryThink(mobj_t *mobj)
P_SetScale(mobj, mobj->target->scale);
}
break;
+ case MT_TUTORIALFLOWER:
+ mobj->angle += FixedAngle(3*FRACUNIT);
+ break;
case MT_VWREF:
case MT_VWREB:
{
@@ -7935,7 +7972,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
mobj->fuse--;
if (!mobj->fuse)
{
- if (!LUAh_MobjFuse(mobj))
+ if (!LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse)))
P_RemoveMobj(mobj);
return;
}
@@ -7964,7 +8001,7 @@ static boolean P_MobjPushableThink(mobj_t *mobj)
static boolean P_MobjBossThink(mobj_t *mobj)
{
- if (LUAh_BossThinker(mobj))
+ if (LUA_HookMobj(mobj, MOBJ_HOOK(BossThinker)))
{
if (P_MobjWasRemoved(mobj))
return false;
@@ -9891,7 +9928,7 @@ static boolean P_FuseThink(mobj_t *mobj)
if (mobj->fuse)
return true;
- if (LUAh_MobjFuse(mobj) || P_MobjWasRemoved(mobj))
+ if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse)) || P_MobjWasRemoved(mobj))
;
else if (mobj->info->flags & MF_MONITOR)
{
@@ -10067,13 +10104,13 @@ void P_MobjThinker(mobj_t *mobj)
// Check for a Lua thinker first
if (!mobj->player)
{
- if (LUAh_MobjThinker(mobj) || P_MobjWasRemoved(mobj))
+ if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker)) || P_MobjWasRemoved(mobj))
return;
}
else if (!mobj->player->spectator)
{
// You cannot short-circuit the player thinker like you can other thinkers.
- LUAh_MobjThinker(mobj);
+ LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker));
if (P_MobjWasRemoved(mobj))
return;
}
@@ -10408,6 +10445,9 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing)
case MT_RING:
case MT_FLINGRING:
+ case MT_COIN:
+ case MT_FLINGCOIN:
+
case MT_BLUESPHERE:
case MT_FLINGBLUESPHERE:
case MT_BOMBSPHERE:
@@ -10449,7 +10489,24 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
const mobjinfo_t *info = &mobjinfo[type];
SINT8 sc = -1;
state_t *st;
- mobj_t *mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
+ mobj_t *mobj;
+
+ if (type == MT_NULL)
+ {
+#if 0
+#ifdef PARANOIA
+ I_Error("Tried to spawn MT_NULL\n");
+#endif
+ return NULL;
+#endif
+ // Hack: Some code assumes that P_SpawnMobj can never return NULL
+ // So replace MT_NULL with MT_RAY in the meantime
+ // Remove when dealt properly
+ CONS_Debug(DBG_GAMELOGIC, "Tried to spawn MT_NULL, using MT_RAY\n");
+ type = MT_RAY;
+ }
+
+ mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
// this is officially a mobj, declared as soon as possible.
mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
@@ -10542,7 +10599,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// DANGER! This can cause P_SpawnMobj to return NULL!
// Avoid using P_RemoveMobj on the newly created mobj in "MobjSpawn" Lua hooks!
- if (LUAh_MobjSpawn(mobj))
+ if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjSpawn)))
{
if (P_MobjWasRemoved(mobj))
return NULL;
@@ -10929,7 +10986,7 @@ void P_RemoveMobj(mobj_t *mobj)
return; // something already removing this mobj.
mobj->thinker.function.acp1 = (actionf_p1)P_RemoveThinkerDelayed; // shh. no recursing.
- LUAh_MobjRemoved(mobj);
+ LUA_HookMobj(mobj, MOBJ_HOOK(MobjRemoved));
mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker; // needed for P_UnsetThingPosition, etc. to work.
// Rings only, please!
@@ -11075,7 +11132,7 @@ void P_SpawnPrecipitation(void)
subsector_t *precipsector = NULL;
precipmobj_t *rainmo = NULL;
- if (dedicated || !(cv_drawdist_precip.value) || curWeather == PRECIP_NONE)
+ if (dedicated || !(cv_drawdist_precip.value) || curWeather == PRECIP_NONE || curWeather == PRECIP_STORM_NORAIN)
return;
// Use the blockmap to narrow down our placing patterns
@@ -11121,22 +11178,14 @@ void P_SpawnPrecipitation(void)
continue;
rainmo = P_SpawnRainMobj(x, y, height, MT_RAIN);
+ if (curWeather == PRECIP_BLANK)
+ rainmo->precipflags |= PCF_INVISIBLE;
}
// Randomly assign a height, now that floorz is set.
rainmo->z = M_RandomRange(rainmo->floorz>>FRACBITS, rainmo->ceilingz>>FRACBITS)<<FRACBITS;
}
- if (curWeather == PRECIP_BLANK)
- {
- curWeather = PRECIP_RAIN;
- P_SwitchWeather(PRECIP_BLANK);
- }
- else if (curWeather == PRECIP_STORM_NORAIN)
- {
- curWeather = PRECIP_RAIN;
- P_SwitchWeather(PRECIP_STORM_NORAIN);
- }
}
//
@@ -11984,6 +12033,7 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
INT32 j;
emblem_t* emblem = M_GetLevelEmblems(gamemap);
skincolornum_t emcolor;
+ boolean validEmblem = true;
while (emblem)
{
@@ -12008,8 +12058,19 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
emcolor = M_GetEmblemColor(&emblemlocations[j]); // workaround for compiler complaint about bad function casting
mobj->color = (UINT16)emcolor;
- if (emblemlocations[j].collected
- || (emblemlocations[j].type == ET_SKIN && emblemlocations[j].var != players[0].skin))
+ validEmblem = !emblemlocations[j].collected;
+
+ if (emblemlocations[j].type == ET_SKIN)
+ {
+ INT32 skinnum = M_EmblemSkinNum(&emblemlocations[j]);
+
+ if (players[0].skin != skinnum)
+ {
+ validEmblem = false;
+ }
+ }
+
+ if (validEmblem == false)
{
P_UnsetThingPosition(mobj);
mobj->flags |= MF_NOCLIP;
@@ -12582,7 +12643,7 @@ static boolean P_SetupBooster(mapthing_t* mthing, mobj_t* mobj, boolean strong)
static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
{
- boolean override = LUAh_MapThingSpawn(mobj, mthing);
+ boolean override = LUA_HookMapThingSpawn(mobj, mthing);
if (P_MobjWasRemoved(mobj))
return false;
@@ -12796,6 +12857,25 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
P_SpawnMobjFromMobj(mobj, -FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_270;
}
break;
+ case MT_TUTORIALPLANT:
+ {
+ INT32 i;
+ mobj_t *segment;
+ for (i = 0; i < 6; i++)
+ {
+ segment = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_TUTORIALLEAF);
+ segment->angle = mobj->angle + FixedAngle(i*60*FRACUNIT);
+ P_SetMobjState(segment, S_TUTORIALLEAF1 + mthing->extrainfo);
+ }
+ for (i = 0; i < 3; i++)
+ {
+ segment = P_SpawnMobjFromMobj(mobj, 0, 0, 112*FRACUNIT, MT_TUTORIALFLOWER);
+ segment->angle = mobj->angle + FixedAngle(i*120*FRACUNIT);
+ P_SetMobjState(segment, S_TUTORIALFLOWER1 + mthing->extrainfo);
+ }
+ P_SetMobjState(P_SpawnMobjFromMobj(mobj, 0, 0, 112*FRACUNIT, MT_TUTORIALFLOWERF), S_TUTORIALFLOWERF1 + mthing->extrainfo);
+ }
+ break;
case MT_CEZPOLE1:
case MT_CEZPOLE2:
{ // Spawn the banner
diff --git a/src/p_mobj.h b/src/p_mobj.h
index ddfe52da7432cbe66d0c4df02facb1a4d75ac5bf..404623e81d8f29d2be5ba56386a86c4b8ccfd6ae 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -218,33 +218,40 @@ typedef enum
typedef enum
{
// The mobj stands on solid floor (not on another mobj or in air)
- MFE_ONGROUND = 1,
+ MFE_ONGROUND = 1,
// The mobj just hit the floor while falling, this is cleared on next frame
// (instant damage in lava/slime sectors to prevent jump cheat..)
- MFE_JUSTHITFLOOR = 1<<1,
+ MFE_JUSTHITFLOOR = 1<<1,
// The mobj stands in a sector with water, and touches the surface
// this bit is set once and for all at the start of mobjthinker
- MFE_TOUCHWATER = 1<<2,
+ MFE_TOUCHWATER = 1<<2,
// The mobj stands in a sector with water, and his waist is BELOW the water surface
// (for player, allows swimming up/down)
- MFE_UNDERWATER = 1<<3,
+ MFE_UNDERWATER = 1<<3,
// used for ramp sectors
- MFE_JUSTSTEPPEDDOWN = 1<<4,
+ MFE_JUSTSTEPPEDDOWN = 1<<4,
// Vertically flip sprite/allow upside-down physics
- MFE_VERTICALFLIP = 1<<5,
+ MFE_VERTICALFLIP = 1<<5,
// Goo water
- MFE_GOOWATER = 1<<6,
+ MFE_GOOWATER = 1<<6,
// The mobj is touching a lava block
- MFE_TOUCHLAVA = 1<<7,
+ MFE_TOUCHLAVA = 1<<7,
// Mobj was already pushed this tic
- MFE_PUSHED = 1<<8,
+ MFE_PUSHED = 1<<8,
// Mobj was already sprung this tic
- MFE_SPRUNG = 1<<9,
+ MFE_SPRUNG = 1<<9,
// Platform movement
- MFE_APPLYPMOMZ = 1<<10,
+ MFE_APPLYPMOMZ = 1<<10,
// Compute and trigger on mobj angle relative to tracer
// See Linedef Exec 457 (Track mobj angle to point)
- MFE_TRACERANGLE = 1<<11,
+ MFE_TRACERANGLE = 1<<11,
+ // Forces an object to use super sprites with SPR_PLAY.
+ MFE_FORCESUPER = 1<<12,
+ // Forces an object to NOT use super sprites with SPR_PLAY.
+ MFE_FORCENOSUPER = 1<<13,
+ // Makes an object use super sprites where they wouldn't have otherwise and vice-versa
+ MFE_REVERSESUPER = MFE_FORCESUPER|MFE_FORCENOSUPER
+
// free: to and including 1<<15
} mobjeflag_t;
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index 4e5647c9176a283ad033a08384796e9f7d7e9706..e1aa535b2961c50820b1d508b427c3c3287eec75 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2006 by James Haley
-// Copyright (C) 2006-2021 by Sonic Team Junior.
+// Copyright (C) 2006-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_polyobj.h b/src/p_polyobj.h
index dd58d26a1ddef8829ae2cc5896183fb04128a7b5..651e05f8d4f8d7e748fb7eddefc9f31d5807b96d 100644
--- a/src/p_polyobj.h
+++ b/src/p_polyobj.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2006 by James Haley
-// Copyright (C) 2006-2021 by Sonic Team Junior.
+// Copyright (C) 2006-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_pspr.h b/src/p_pspr.h
index 4525ba14cc9f4844573a22e5df2f36418799efa2..4136c211823c4b7082891afecfe250e2034ff02c 100644
--- a/src/p_pspr.h
+++ b/src/p_pspr.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -41,9 +41,20 @@
/// \brief Frame flags - SPR2: Super sprite2
#define FF_SPR2SUPER 0x80
/// \brief Frame flags - SPR2: A change of state at the end of Sprite2 animation
-#define FF_SPR2ENDSTATE 0x1000
+#define FF_SPR2ENDSTATE 0x100
/// \brief Frame flags - SPR2: 50% of starting in middle of Sprite2 animation
-#define FF_SPR2MIDSTART 0x2000
+#define FF_SPR2MIDSTART 0x200
+
+/// \brief Frame flags: blend types
+#define FF_BLENDMASK 0x7000
+/// \brief shift for FF_BLENDMASK
+#define FF_BLENDSHIFT 12
+/// \brief preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT
+#define FF_ADD ((AST_ADD-1)<<FF_BLENDSHIFT)
+#define FF_SUBTRACT ((AST_SUBTRACT-1)<<FF_BLENDSHIFT)
+#define FF_REVERSESUBTRACT ((AST_REVERSESUBTRACT-1)<<FF_BLENDSHIFT)
+#define FF_MODULATE ((AST_MODULATE-1)<<FF_BLENDSHIFT)
+#define FF_OVERLAY ((AST_OVERLAY-1)<<FF_BLENDSHIFT)
/// \brief Frame flags: 0 = no trans(opaque), 1-15 = transl. table
#define FF_TRANSMASK 0xf0000
@@ -60,21 +71,31 @@
#define FF_TRANS80 (tr_trans80<<FF_TRANSSHIFT)
#define FF_TRANS90 (tr_trans90<<FF_TRANSSHIFT)
+/// \brief Frame flags: brightness mask
+#define FF_BRIGHTMASK 0x00300000
/// \brief Frame flags: frame always appears full bright
-#define FF_FULLBRIGHT 0x00100000
+#define FF_FULLBRIGHT 0x00100000
+/// \brief Frame flags: frame always appears full darkness
+#define FF_FULLDARK 0x00200000
+/// \brief Frame flags: frame appears between sector bright and full bright
+#define FF_SEMIBRIGHT (FF_FULLBRIGHT|FF_FULLDARK)
+
+/// \brief Frame flags: Thin, paper-like sprite (for collision equivalent, see MF_PAPERCOLLISION)
+#define FF_PAPERSPRITE 0x00400000
+/// \brief Frame flags: Splat!
+#define FF_FLOORSPRITE 0x00800000
+
/// \brief Frame flags: Flip sprite vertically (relative to what it should be for its gravity)
-#define FF_VERTICALFLIP 0x00200000
+#define FF_VERTICALFLIP 0x01000000
/// \brief Frame flags: Flip sprite horizontally
-#define FF_HORIZONTALFLIP 0x00400000
-/// \brief Frame flags: Thin, paper-like sprite (for collision equivalent, see MF_PAPERCOLLISION)
-#define FF_PAPERSPRITE 0x00800000
+#define FF_HORIZONTALFLIP 0x02000000
/// \brief Frame flags - Animate: Simple stateless animation
-#define FF_ANIMATE 0x01000000
-/// \brief Frame flags - Animate: Start at a random place in the animation (mutually exclusive with below)
-#define FF_RANDOMANIM 0x02000000
-/// \brief Frame flags - Animate: Sync animation to global timer (mutually exclusive with above)
-#define FF_GLOBALANIM 0x04000000
+#define FF_ANIMATE 0x10000000
+/// \brief Frame flags - Animate: Sync animation to global timer (mutually exclusive with below, currently takes priority)
+#define FF_GLOBALANIM 0x20000000
+/// \brief Frame flags - Animate: Start at a random place in the animation (mutually exclusive with above)
+#define FF_RANDOMANIM 0x40000000
/** \brief translucency tables
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 73035f963f0b28b0a2821095f295fab9230de9af..f069d3341a37070f2daab5b452b9eb5edc43e404 100755
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -68,12 +68,29 @@ typedef enum
static inline void P_ArchivePlayer(void)
{
const player_t *player = &players[consoleplayer];
- INT16 skininfo = player->skin + (botskin<<5);
SINT8 pllives = player->lives;
if (pllives < startinglivesbalance[numgameovers]) // Bump up to 3 lives if the player
pllives = startinglivesbalance[numgameovers]; // has less than that.
- WRITEUINT16(save_p, skininfo);
+#ifdef NEWSKINSAVES
+ // Write a specific value into the old skininfo location.
+ // If we read something other than this, it's an older save file that used skin numbers.
+ WRITEUINT16(save_p, NEWSKINSAVES);
+#endif
+
+ // Write skin names, so that loading skins in different orders
+ // doesn't change who the save file is for!
+ WRITESTRINGN(save_p, skins[player->skin].name, SKINNAMESIZE);
+
+ if (botskin != 0)
+ {
+ WRITESTRINGN(save_p, skins[botskin-1].name, SKINNAMESIZE);
+ }
+ else
+ {
+ WRITESTRINGN(save_p, "\0", SKINNAMESIZE);
+ }
+
WRITEUINT8(save_p, numgameovers);
WRITESINT8(save_p, pllives);
WRITEUINT32(save_p, player->score);
@@ -82,9 +99,27 @@ static inline void P_ArchivePlayer(void)
static inline void P_UnArchivePlayer(void)
{
- INT16 skininfo = READUINT16(save_p);
- savedata.skin = skininfo & ((1<<5) - 1);
- savedata.botskin = skininfo >> 5;
+#ifdef NEWSKINSAVES
+ INT16 backwardsCompat = READUINT16(save_p);
+
+ if (backwardsCompat != NEWSKINSAVES)
+ {
+ // This is an older save file, which used direct skin numbers.
+ savedata.skin = backwardsCompat & ((1<<5) - 1);
+ savedata.botskin = backwardsCompat >> 5;
+ }
+ else
+#endif
+ {
+ char ourSkinName[SKINNAMESIZE+1];
+ char botSkinName[SKINNAMESIZE+1];
+
+ READSTRINGN(save_p, ourSkinName, SKINNAMESIZE);
+ savedata.skin = R_SkinAvailable(ourSkinName);
+
+ READSTRINGN(save_p, botSkinName, SKINNAMESIZE);
+ savedata.botskin = R_SkinAvailable(botSkinName) + 1;
+ }
savedata.numgameovers = READUINT8(save_p);
savedata.lives = READSINT8(save_p);
@@ -162,6 +197,19 @@ static void P_NetArchivePlayers(void)
WRITEUINT32(save_p, players[i].dashmode);
WRITEUINT32(save_p, players[i].skidtime);
+ //////////
+ // Bots //
+ //////////
+ WRITEUINT8(save_p, players[i].bot);
+ WRITEUINT8(save_p, players[i].botmem.lastForward);
+ WRITEUINT8(save_p, players[i].botmem.lastBlocked);
+ WRITEUINT8(save_p, players[i].botmem.catchup_tics);
+ WRITEUINT8(save_p, players[i].botmem.thinkstate);
+ WRITEUINT8(save_p, players[i].removing);
+
+ WRITEUINT8(save_p, players[i].blocked);
+ WRITEUINT16(save_p, players[i].lastbuttons);
+
////////////////////////////
// Conveyor Belt Movement //
////////////////////////////
@@ -376,6 +424,20 @@ static void P_NetUnArchivePlayers(void)
players[i].dashmode = READUINT32(save_p); // counter for dashmode ability
players[i].skidtime = READUINT32(save_p); // Skid timer
+ //////////
+ // Bots //
+ //////////
+ players[i].bot = READUINT8(save_p);
+
+ players[i].botmem.lastForward = READUINT8(save_p);
+ players[i].botmem.lastBlocked = READUINT8(save_p);
+ players[i].botmem.catchup_tics = READUINT8(save_p);
+ players[i].botmem.thinkstate = READUINT8(save_p);
+ players[i].removing = READUINT8(save_p);
+
+ players[i].blocked = READUINT8(save_p);
+ players[i].lastbuttons = READUINT16(save_p);
+
////////////////////////////
// Conveyor Belt Movement //
////////////////////////////
@@ -1747,7 +1809,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
diff2 = 0;
// not the default but the most probable
- if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0)
+ if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0 || mobj->pmomz !=0)
diff |= MD_MOM;
if (mobj->radius != mobj->info->radius)
diff |= MD_RADIUS;
@@ -1922,6 +1984,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, mobj->momx);
WRITEFIXED(save_p, mobj->momy);
WRITEFIXED(save_p, mobj->momz);
+ WRITEFIXED(save_p, mobj->pmomz);
}
if (diff & MD_RADIUS)
WRITEFIXED(save_p, mobj->radius);
@@ -2922,6 +2985,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
mobj->momx = READFIXED(save_p);
mobj->momy = READFIXED(save_p);
mobj->momz = READFIXED(save_p);
+ mobj->pmomz = READFIXED(save_p);
} // otherwise they're zero, and the memset took care of it
if (diff & MD_RADIUS)
@@ -5364,7 +5428,10 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading)
tokenlist = READUINT32(save_p);
if (!P_LoadLevel(true, reloading))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
return false;
+ }
// get the time
leveltime = READUINT32(save_p);
@@ -5462,19 +5529,26 @@ static inline boolean P_UnArchiveLuabanksAndConsistency(void)
{
switch (READUINT8(save_p))
{
- case 0xb7:
+ case 0xb7: // luabanks marker
{
UINT8 i, banksinuse = READUINT8(save_p);
if (banksinuse > NUM_LUABANKS)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Too many banks in use)\n"));
return false;
+ }
for (i = 0; i < banksinuse; i++)
luabanks[i] = READINT32(save_p);
- if (READUINT8(save_p) != 0x1d)
+ if (READUINT8(save_p) != 0x1d) // consistency marker
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Failed consistency check)\n"));
return false;
+ }
}
- case 0x1d:
+ case 0x1d: // consistency marker
break;
- default:
+ default: // anything else is nonsense
+ CONS_Alert(CONS_ERROR, M_GetText("Failed consistency check (???)\n"));
return false;
}
diff --git a/src/p_saveg.h b/src/p_saveg.h
index 38808e6ab97e4112b683d97a010769745332f479..c2daa384038405d2ee1e7fe310a10675aa95c605 100755
--- a/src/p_saveg.h
+++ b/src/p_saveg.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -18,6 +18,8 @@
#pragma interface
#endif
+#define NEWSKINSAVES (INT16_MAX) // Purely for backwards compatibility, remove this for 2.3
+
// Persistent storage/archiving.
// These are the load / save game routines.
diff --git a/src/p_savenetrb.c b/src/p_savenetrb.c
index 4c194cbc47717ac4d4b645cd514edd96afb9ccea..3b2550c41503b358cad1ffb4e8ecdbfbf95f2094 100755
--- a/src/p_savenetrb.c
+++ b/src/p_savenetrb.c
@@ -232,6 +232,19 @@ static void P_NetUnArchivePlayers(void)
WRITEUINT32(save_p, players[i].dashmode);
WRITEUINT32(save_p, players[i].skidtime);
+ //////////
+ // Bots //
+ //////////
+ WRITEUINT8(save_p, players[i].bot);
+ WRITEUINT8(save_p, players[i].botmem.lastForward);
+ WRITEUINT8(save_p, players[i].botmem.lastBlocked);
+ WRITEUINT8(save_p, players[i].botmem.catchup_tics);
+ WRITEUINT8(save_p, players[i].botmem.thinkstate);
+ WRITEUINT8(save_p, players[i].removing);
+
+ WRITEUINT8(save_p, players[i].blocked);
+ WRITEUINT16(save_p, players[i].lastbuttons);
+
////////////////////////////
// Conveyor Belt Movement //
////////////////////////////
@@ -448,6 +461,20 @@ static void P_NetUnArchivePlayers(void)
players[i].dashmode = READUINT32(save_p); // counter for dashmode ability
players[i].skidtime = READUINT32(save_p); // Skid timer
+ //////////
+ // Bots //
+ //////////
+ players[i].bot = READUINT8(save_p);
+
+ players[i].botmem.lastForward = READUINT8(save_p);
+ players[i].botmem.lastBlocked = READUINT8(save_p);
+ players[i].botmem.catchup_tics = READUINT8(save_p);
+ players[i].botmem.thinkstate = READUINT8(save_p);
+ players[i].removing = READUINT8(save_p);
+
+ players[i].blocked = READUINT8(save_p);
+ players[i].lastbuttons = READUINT16(save_p);
+
////////////////////////////
// Conveyor Belt Movement //
////////////////////////////
@@ -5560,19 +5587,26 @@ static inline boolean P_UnArchiveLuabanksAndConsistency(void)
{
switch (READUINT8(save_p))
{
- case 0xb7:
+ case 0xb7: // luabanks marker
{
UINT8 i, banksinuse = READUINT8(save_p);
if (banksinuse > NUM_LUABANKS)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Too many banks in use)\n"));
return false;
+ }
for (i = 0; i < banksinuse; i++)
luabanks[i] = READINT32(save_p);
- if (READUINT8(save_p) != 0x1d)
+ if (READUINT8(save_p) != 0x1d) // consistency marker
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Failed consistency check)\n"));
return false;
+ }
}
- case 0x1d:
+ case 0x1d: // consistency marker
break;
- default:
+ default: // anything else is nonsense
+ CONS_Alert(CONS_ERROR, M_GetText("Failed consistency check (???)\n"));
return false;
}
diff --git a/src/p_setup.c b/src/p_setup.c
index 5ac4dc06b71cdd6d60db62188b6ac4b21fee8904..a2a9ec1b8bf5372c385167be3d52917498872321 100755
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -65,7 +65,7 @@
#include "md5.h" // map MD5
-// for LUAh_MapLoad
+// for MapLoad hook
#include "lua_script.h"
#include "lua_hook.h"
@@ -1350,8 +1350,11 @@ static void P_LoadSidedefs(UINT8 *data)
if (msd->toptexture[0] == '#')
{
char *col = msd->toptexture;
- sd->toptexture = sd->bottomtexture =
- ((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0') + 1;
+ sd->toptexture =
+ ((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0')+1;
+ if (col[4]) // extra num for blendmode
+ sd->toptexture += (col[4]-'0')*1000;
+ sd->bottomtexture = sd->toptexture;
sd->midtexture = R_TextureNumForName(msd->midtexture);
}
else
@@ -1501,6 +1504,22 @@ typedef struct textmap_colormap_s {
textmap_colormap_t textmap_colormap = { false, 0, 25, 0, 25, 0, 31, 0 };
+typedef enum
+{
+ PD_A = 1,
+ PD_B = 1<<1,
+ PD_C = 1<<2,
+ PD_D = 1<<3,
+} planedef_t;
+
+typedef struct textmap_plane_s {
+ UINT8 defined;
+ fixed_t a, b, c, d;
+} textmap_plane_t;
+
+textmap_plane_t textmap_planefloor = {0, 0, 0, 0, 0};
+textmap_plane_t textmap_planeceiling = {0, 0, 0, 0, 0};
+
static void ParseTextmapSectorParameter(UINT32 i, char *param, char *val)
{
if (fastcmp(param, "heightfloor"))
@@ -1539,6 +1558,46 @@ static void ParseTextmapSectorParameter(UINT32 i, char *param, char *val)
sectors[i].floorpic_angle = FixedAngle(FLOAT_TO_FIXED(atof(val)));
else if (fastcmp(param, "rotationceiling"))
sectors[i].ceilingpic_angle = FixedAngle(FLOAT_TO_FIXED(atof(val)));
+ else if (fastcmp(param, "floorplane_a"))
+ {
+ textmap_planefloor.defined |= PD_A;
+ textmap_planefloor.a = FLOAT_TO_FIXED(atof(val));
+ }
+ else if (fastcmp(param, "floorplane_b"))
+ {
+ textmap_planefloor.defined |= PD_B;
+ textmap_planefloor.b = FLOAT_TO_FIXED(atof(val));
+ }
+ else if (fastcmp(param, "floorplane_c"))
+ {
+ textmap_planefloor.defined |= PD_C;
+ textmap_planefloor.c = FLOAT_TO_FIXED(atof(val));
+ }
+ else if (fastcmp(param, "floorplane_d"))
+ {
+ textmap_planefloor.defined |= PD_D;
+ textmap_planefloor.d = FLOAT_TO_FIXED(atof(val));
+ }
+ else if (fastcmp(param, "ceilingplane_a"))
+ {
+ textmap_planeceiling.defined |= PD_A;
+ textmap_planeceiling.a = FLOAT_TO_FIXED(atof(val));
+ }
+ else if (fastcmp(param, "ceilingplane_b"))
+ {
+ textmap_planeceiling.defined |= PD_B;
+ textmap_planeceiling.b = FLOAT_TO_FIXED(atof(val));
+ }
+ else if (fastcmp(param, "ceilingplane_c"))
+ {
+ textmap_planeceiling.defined |= PD_C;
+ textmap_planeceiling.c = FLOAT_TO_FIXED(atof(val));
+ }
+ else if (fastcmp(param, "ceilingplane_d"))
+ {
+ textmap_planeceiling.defined |= PD_D;
+ textmap_planeceiling.d = FLOAT_TO_FIXED(atof(val));
+ }
else if (fastcmp(param, "lightcolor"))
{
textmap_colormap.used = true;
@@ -1642,6 +1701,21 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
lines[i].sidenum[1] = atol(val);
else if (fastcmp(param, "alpha"))
lines[i].alpha = FLOAT_TO_FIXED(atof(val));
+ else if (fastcmp(param, "blendmode") || fastcmp(param, "renderstyle"))
+ {
+ if (fastcmp(val, "translucent"))
+ lines[i].blendmode = AST_COPY;
+ else if (fastcmp(val, "add"))
+ lines[i].blendmode = AST_ADD;
+ else if (fastcmp(val, "subtract"))
+ lines[i].blendmode = AST_SUBTRACT;
+ else if (fastcmp(val, "reversesubtract"))
+ lines[i].blendmode = AST_REVERSESUBTRACT;
+ else if (fastcmp(val, "modulate"))
+ lines[i].blendmode = AST_MODULATE;
+ if (fastcmp(val, "fog"))
+ lines[i].blendmode = AST_FOG;
+ }
else if (fastcmp(param, "executordelay"))
lines[i].executordelay = atol(val);
@@ -1868,6 +1942,10 @@ static void P_LoadTextmap(void)
textmap_colormap.fadestart = 0;
textmap_colormap.fadeend = 31;
textmap_colormap.flags = 0;
+
+ textmap_planefloor.defined = 0;
+ textmap_planeceiling.defined = 0;
+
TextmapParse(sectorsPos[i], i, ParseTextmapSectorParameter);
P_InitializeSector(sc);
@@ -1877,6 +1955,19 @@ static void P_LoadTextmap(void)
INT32 fadergba = P_ColorToRGBA(textmap_colormap.fadecolor, textmap_colormap.fadealpha);
sc->extra_colormap = sc->spawn_extra_colormap = R_CreateColormap(rgba, fadergba, textmap_colormap.fadestart, textmap_colormap.fadeend, textmap_colormap.flags);
}
+
+ if (textmap_planefloor.defined == (PD_A|PD_B|PD_C|PD_D))
+ {
+ sc->f_slope = MakeViaEquationConstants(textmap_planefloor.a, textmap_planefloor.b, textmap_planefloor.c, textmap_planefloor.d);
+ sc->hasslope = true;
+ }
+
+ if (textmap_planeceiling.defined == (PD_A|PD_B|PD_C|PD_D))
+ {
+ sc->c_slope = MakeViaEquationConstants(textmap_planeceiling.a, textmap_planeceiling.b, textmap_planeceiling.c, textmap_planeceiling.d);
+ sc->hasslope = true;
+ }
+
TextmapFixFlatOffsets(sc);
}
@@ -2421,7 +2512,10 @@ static boolean P_LoadExtendedSubsectorsAndSegs(UINT8 **data, nodetype_t nodetype
P_InitializeSeg(seg);
seg->angle = R_PointToAngle2(v1->x, v1->y, v2->x, v2->y);
if (seg->linedef)
- segs[i].offset = FixedHypot(v1->x - seg->linedef->v1->x, v1->y - seg->linedef->v1->y);
+ {
+ vertex_t *v = (seg->side == 1) ? seg->linedef->v2 : seg->linedef->v1;
+ segs[i].offset = FixedHypot(v1->x - v->x, v1->y - v->y);
+ }
seg->length = P_SegLength(seg);
#ifdef HWRENDER
seg->flength = (rendermode == render_opengl) ? P_SegLengthFloat(seg) : 0;
@@ -2486,7 +2580,7 @@ static void P_LoadMapBSP(const virtres_t *virt)
if (numsubsectors <= 0)
I_Error("Level has no subsectors (did you forget to run it through a nodesbuilder?)");
if (numnodes <= 0)
- I_Error("Level has no nodes");
+ I_Error("Level has no nodes (does your map have at least 2 sectors?)");
if (numsegs <= 0)
I_Error("Level has no segs");
@@ -2950,6 +3044,82 @@ static void P_LinkMapData(void)
}
}
+// For maps in binary format, add multi-tags from linedef specials. This must be done
+// before any linedef specials have been processed.
+static void P_AddBinaryMapTagsFromLine(sector_t *sector, line_t *line)
+{
+ Tag_Add(§or->tags, Tag_FGet(&line->tags));
+ if (line->flags & ML_EFFECT6) {
+ if (sides[line->sidenum[0]].textureoffset)
+ Tag_Add(§or->tags, (INT32)sides[line->sidenum[0]].textureoffset / FRACUNIT);
+ if (sides[line->sidenum[0]].rowoffset)
+ Tag_Add(§or->tags, (INT32)sides[line->sidenum[0]].rowoffset / FRACUNIT);
+ }
+ if (line->flags & ML_TFERLINE) {
+ if (sides[line->sidenum[1]].textureoffset)
+ Tag_Add(§or->tags, (INT32)sides[line->sidenum[1]].textureoffset / FRACUNIT);
+ if (sides[line->sidenum[1]].rowoffset)
+ Tag_Add(§or->tags, (INT32)sides[line->sidenum[1]].rowoffset / FRACUNIT);
+ }
+}
+
+static void P_AddBinaryMapTags(void)
+{
+ size_t i;
+
+ for (i = 0; i < numlines; i++) {
+ // 97: Apply Tag to Front Sector
+ // 98: Apply Tag to Back Sector
+ // 99: Apply Tag to Front and Back Sectors
+ if (lines[i].special == 97 || lines[i].special == 99)
+ P_AddBinaryMapTagsFromLine(lines[i].frontsector, &lines[i]);
+ if (lines[i].special == 98 || lines[i].special == 99)
+ P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]);
+ }
+
+ // Run this loop after the 97-99 loop to ensure that 96 can search through all of the
+ // 97-99-applied tags.
+ for (i = 0; i < numlines; i++) {
+ size_t j;
+ mtag_t tag, target_tag;
+ mtag_t offset_tags[4];
+
+ // 96: Apply Tag to Tagged Sectors
+ if (lines[i].special != 96)
+ continue;
+
+ tag = Tag_FGet(&lines[i].frontsector->tags);
+ target_tag = Tag_FGet(&lines[i].tags);
+ memset(offset_tags, 0, sizeof(mtag_t)*4);
+ if (lines[i].flags & ML_EFFECT6) {
+ offset_tags[0] = (INT32)sides[lines[i].sidenum[0]].textureoffset / FRACUNIT;
+ offset_tags[1] = (INT32)sides[lines[i].sidenum[0]].rowoffset / FRACUNIT;
+ }
+ if (lines[i].flags & ML_TFERLINE) {
+ offset_tags[2] = (INT32)sides[lines[i].sidenum[1]].textureoffset / FRACUNIT;
+ offset_tags[3] = (INT32)sides[lines[i].sidenum[1]].rowoffset / FRACUNIT;
+ }
+
+ for (j = 0; j < numsectors; j++) {
+ boolean matches_target_tag = target_tag && Tag_Find(§ors[j].tags, target_tag);
+ size_t k;
+ for (k = 0; k < 4; k++) {
+ if (lines[i].flags & ML_EFFECT5) {
+ if (matches_target_tag || (offset_tags[k] && Tag_Find(§ors[j].tags, offset_tags[k]))) {
+ Tag_Add(§ors[j].tags, tag);
+ break;
+ }
+ } else if (matches_target_tag) {
+ if (k == 0)
+ Tag_Add(§ors[j].tags, tag);
+ if (offset_tags[k])
+ Tag_Add(§ors[j].tags, offset_tags[k]);
+ }
+ }
+ }
+ }
+}
+
//For maps in binary format, converts setup of specials to UDMF format.
static void P_ConvertBinaryMap(void)
{
@@ -2966,9 +3136,7 @@ static void P_ConvertBinaryMap(void)
INT32 check = -1;
INT32 paramline = -1;
- TAG_ITER_DECLARECOUNTER(0);
-
- TAG_ITER_LINES(0, tag, check)
+ TAG_ITER_LINES(tag, check)
{
if (lines[check].special == 22)
{
@@ -3087,6 +3255,12 @@ static void P_ConvertBinaryMap(void)
if (lines[i].flags & ML_NONET)
lines[i].args[2] |= TMSL_DYNAMIC;
+ if (lines[i].flags & ML_TFERLINE)
+ {
+ lines[i].args[4] |= backfloor ? TMSC_BACKTOFRONTFLOOR : (frontfloor ? TMSC_FRONTTOBACKFLOOR : 0);
+ lines[i].args[4] |= backceil ? TMSC_BACKTOFRONTCEILING : (frontceil ? TMSC_FRONTTOBACKCEILING : 0);
+ }
+
lines[i].special = 700;
break;
}
@@ -3141,21 +3315,60 @@ static void P_ConvertBinaryMap(void)
lines[i].args[1] = tag;
lines[i].special = 720;
break;
- case 900: //Translucent wall (10%)
- case 901: //Translucent wall (20%)
- case 902: //Translucent wall (30%)
- case 903: //Translucent wall (40%)
- case 904: //Translucent wall (50%)
- case 905: //Translucent wall (60%)
- case 906: //Translucent wall (70%)
- case 907: //Translucent wall (80%)
- case 908: //Translucent wall (90%)
- lines[i].alpha = ((909 - lines[i].special) << FRACBITS)/10;
+ case 723: //Copy back side floor slope
+ case 724: //Copy back side ceiling slope
+ case 725: //Copy back side floor and ceiling slope
+ if (lines[i].special != 724)
+ lines[i].args[2] = tag;
+ if (lines[i].special != 723)
+ lines[i].args[3] = tag;
+ lines[i].special = 720;
+ break;
+ case 730: //Copy front side floor slope to back side
+ case 731: //Copy front side ceiling slope to back side
+ case 732: //Copy front side floor and ceiling slope to back side
+ if (lines[i].special != 731)
+ lines[i].args[4] |= TMSC_FRONTTOBACKFLOOR;
+ if (lines[i].special != 730)
+ lines[i].args[4] |= TMSC_FRONTTOBACKCEILING;
+ lines[i].special = 720;
+ break;
+ case 733: //Copy back side floor slope to front side
+ case 734: //Copy back side ceiling slope to front side
+ case 735: //Copy back side floor and ceiling slope to front side
+ if (lines[i].special != 734)
+ lines[i].args[4] |= TMSC_BACKTOFRONTFLOOR;
+ if (lines[i].special != 733)
+ lines[i].args[4] |= TMSC_BACKTOFRONTCEILING;
+ lines[i].special = 720;
+ break;
+ case 909: //Fog wall
+ lines[i].blendmode = AST_FOG;
break;
default:
break;
}
+ // Set alpha for translucent walls
+ if (lines[i].special >= 900 && lines[i].special < 909)
+ lines[i].alpha = ((909 - lines[i].special) << FRACBITS)/10;
+
+ // Set alpha for additive/subtractive/reverse subtractive walls
+ if (lines[i].special >= 910 && lines[i].special <= 939)
+ lines[i].alpha = ((10 - lines[i].special % 10) << FRACBITS)/10;
+
+ if (lines[i].special >= 910 && lines[i].special <= 919) // additive
+ lines[i].blendmode = AST_ADD;
+
+ if (lines[i].special >= 920 && lines[i].special <= 929) // subtractive
+ lines[i].blendmode = AST_SUBTRACT;
+
+ if (lines[i].special >= 930 && lines[i].special <= 939) // reverse subtractive
+ lines[i].blendmode = AST_REVERSESUBTRACT;
+
+ if (lines[i].special == 940) // modulate
+ lines[i].blendmode = AST_MODULATE;
+
//Linedef executor delay
if (lines[i].special >= 400 && lines[i].special < 500)
{
@@ -3183,11 +3396,9 @@ static void P_ConvertBinaryMap(void)
INT32 firstline = -1;
mtag_t tag = mapthings[i].angle;
- TAG_ITER_DECLARECOUNTER(0);
-
Tag_FSet(&mapthings[i].tags, tag);
- TAG_ITER_LINES(0, tag, check)
+ TAG_ITER_LINES(tag, check)
{
if (lines[check].special == 20)
{
@@ -3287,6 +3498,9 @@ static boolean P_LoadMapFromFile(void)
P_LinkMapData();
+ if (!udmf)
+ P_AddBinaryMapTags();
+
Taglist_InitGlobalTables();
if (!udmf)
@@ -3394,8 +3608,10 @@ static void P_InitLevelSettings(void)
numstarposts = 0;
ssspheres = timeinmap = 0;
- // special stage
- stagefailed = true; // assume failed unless proven otherwise - P_GiveEmerald or emerald touchspecial
+ // Assume Special Stages were failed in unless proven otherwise - via P_GiveEmerald or emerald touchspecial
+ // Normal stages will default to be OK, until a Lua script / linedef executor says otherwise.
+ stagefailed = G_IsSpecialStage(gamemap);
+
// Reset temporary record data
memset(&ntemprecords, 0, sizeof(nightsdata_t));
@@ -4173,7 +4389,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
// internal game map
maplumpname = G_BuildMapName(gamemap);
- lastloadedmaplumpnum = W_CheckNumForName(maplumpname);
+ lastloadedmaplumpnum = W_CheckNumForMap(maplumpname);
if (lastloadedmaplumpnum == LUMPERROR)
I_Error("Map %s not found.\n", maplumpname);
@@ -4187,7 +4403,9 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
P_ResetWaypoints();
- P_MapStart();
+ P_MapStart(); // tmthing can be used starting from this point
+
+ P_InitSlopes();
if (!P_LoadMapFromFile())
return false;
@@ -4240,8 +4458,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
// clear special respawning que
iquehead = iquetail = 0;
- P_MapEnd();
-
// Remove the loading shit from the screen
if (rendermode != render_none && !(titlemapinaction || reloadinggamestate))
F_WipeColorFill(levelfadecol);
@@ -4261,6 +4477,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
P_RunCachedActions();
+ P_MapEnd(); // tmthing is no longer needed from this point onwards
+
// Took me 3 hours to figure out why my progression kept on getting overwritten with the titlemap...
if (!titlemapinaction)
{
@@ -4284,7 +4502,9 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1);
}
P_PreTicker(2);
- LUAh_MapLoad();
+ P_MapStart(); // just in case MapLoad modifies tmthing
+ LUA_HookInt(gamemap, HOOK(MapLoad));
+ P_MapEnd(); // just in case MapLoad modifies tmthing
}
// No render mode or reloading gamestate, stop here.
@@ -4398,10 +4618,9 @@ static lumpinfo_t* FindFolder(const char *folName, UINT16 *start, UINT16 *end, l
// Add a wadfile to the active wad files,
// replace sounds, musics, patches, textures, sprites and maps
//
-boolean P_AddWadFile(const char *wadfilename)
+static boolean P_LoadAddon(UINT16 wadnum, UINT16 numlumps)
{
size_t i, j, sreplaces = 0, mreplaces = 0, digmreplaces = 0;
- UINT16 numlumps, wadnum;
char *name;
lumpinfo_t *lumpinfo;
@@ -4422,18 +4641,10 @@ boolean P_AddWadFile(const char *wadfilename)
// UINT16 flaPos, flaNum = 0;
// UINT16 mapPos, mapNum = 0;
- // Init file.
- if ((numlumps = W_InitFile(wadfilename, false, false)) == INT16_MAX)
- {
- refreshdirmenu |= REFRESHDIR_NOTLOADED;
- return false;
- }
- else
- wadnum = (UINT16)(numwadfiles-1);
-
switch(wadfiles[wadnum]->type)
{
case RET_PK3:
+ case RET_FOLDER:
// Look for the lumps that act as resource delimitation markers.
lumpinfo = wadfiles[wadnum]->lumpinfo;
for (i = 0; i < numlumps; i++, lumpinfo++)
@@ -4540,8 +4751,8 @@ boolean P_AddWadFile(const char *wadfilename)
//
// look for skins
//
- R_AddSkins(wadnum); // faB: wadfile index in wadfiles[]
- R_PatchSkins(wadnum); // toast: PATCH PATCH
+ R_AddSkins(wadnum, false); // faB: wadfile index in wadfiles[]
+ R_PatchSkins(wadnum, false); // toast: PATCH PATCH
ST_ReloadSkinFaceGraphics();
//
@@ -4597,3 +4808,35 @@ boolean P_AddWadFile(const char *wadfilename)
return true;
}
+
+boolean P_AddWadFile(const char *wadfilename)
+{
+ UINT16 numlumps, wadnum;
+
+ // Init file.
+ if ((numlumps = W_InitFile(wadfilename, false, false)) == INT16_MAX)
+ {
+ refreshdirmenu |= REFRESHDIR_NOTLOADED;
+ return false;
+ }
+ else
+ wadnum = (UINT16)(numwadfiles-1);
+
+ return P_LoadAddon(wadnum, numlumps);
+}
+
+boolean P_AddFolder(const char *folderpath)
+{
+ UINT16 numlumps, wadnum;
+
+ // Init file.
+ if ((numlumps = W_InitFolder(folderpath, false, false)) == INT16_MAX)
+ {
+ refreshdirmenu |= REFRESHDIR_NOTLOADED;
+ return false;
+ }
+ else
+ wadnum = (UINT16)(numwadfiles-1);
+
+ return P_LoadAddon(wadnum, numlumps);
+}
diff --git a/src/p_setup.h b/src/p_setup.h
index 9fa70d516fe1ee7a17ed29a0829302b5a4966eeb..9cb44ed5979e04d10accc4d64403a736b1810b0c 100644
--- a/src/p_setup.h
+++ b/src/p_setup.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -103,6 +103,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate);
void HWR_LoadLevel(void);
#endif
boolean P_AddWadFile(const char *wadfilename);
+boolean P_AddFolder(const char *folderpath);
boolean P_RunSOC(const char *socfilename);
void P_LoadSoundsRange(UINT16 wadnum, UINT16 first, UINT16 num);
void P_LoadMusicsRange(UINT16 wadnum, UINT16 first, UINT16 num);
diff --git a/src/p_sight.c b/src/p_sight.c
index e4a37a718cad79397611cb36aace74ce5b06f442..1aa231a6c3db613e2bc573b312f0ba4c8d367853 100644
--- a/src/p_sight.c
+++ b/src/p_sight.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -307,7 +307,7 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
for (rover = front->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS)
- || !(rover->flags & FF_RENDERSIDES) || rover->flags & FF_TRANSLUCENT)
+ || !(rover->flags & FF_RENDERSIDES) || (rover->flags & (FF_TRANSLUCENT|FF_FOG)))
{
continue;
}
@@ -323,7 +323,7 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
for (rover = back->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS)
- || !(rover->flags & FF_RENDERSIDES) || rover->flags & FF_TRANSLUCENT)
+ || !(rover->flags & FF_RENDERSIDES) || (rover->flags & (FF_TRANSLUCENT|FF_FOG)))
{
continue;
}
@@ -452,7 +452,7 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
/// \todo Improve by checking fog density/translucency
/// and setting a sight limit.
if (!(rover->flags & FF_EXISTS)
- || !(rover->flags & FF_RENDERPLANES) || rover->flags & FF_TRANSLUCENT)
+ || !(rover->flags & FF_RENDERPLANES) || (rover->flags & (FF_TRANSLUCENT|FF_FOG)))
{
continue;
}
diff --git a/src/p_slopes.c b/src/p_slopes.c
index 05955c5d6ba90ae15323beaefde332add728f8da..ffbfef2d300f5c2645b54c7dc62fa8c9dc8668b5 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2004 by Stephen McGranahan
-// Copyright (C) 2015-2021 by Sonic Team Junior.
+// Copyright (C) 2015-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -90,6 +90,36 @@ static void ReconfigureViaVertexes (pslope_t *slope, const vector3_t v1, const v
}
}
+/// Setup slope via constants.
+static void ReconfigureViaConstants (pslope_t *slope, const fixed_t a, const fixed_t b, const fixed_t c, const fixed_t d)
+{
+ fixed_t m;
+ vector3_t *normal = &slope->normal;
+
+ // Set origin.
+ FV3_Load(&slope->o, 0, 0, c ? -FixedDiv(d, c) : 0);
+
+ // Get slope's normal.
+ FV3_Load(normal, a, b, c);
+ FV3_Normalize(normal);
+
+ // Invert normal if it's facing down.
+ if (normal->z < 0)
+ FV3_Negate(normal);
+
+ // Get direction vector
+ m = FixedHypot(normal->x, normal->y);
+ slope->d.x = -FixedDiv(normal->x, m);
+ slope->d.y = -FixedDiv(normal->y, m);
+
+ // Z delta
+ slope->zdelta = FixedDiv(m, normal->z);
+
+ // Get angles
+ slope->xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180;
+ slope->zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta));
+}
+
/// Recalculate dynamic slopes.
void T_DynamicSlopeLine (dynplanethink_t* th)
{
@@ -546,11 +576,10 @@ static boolean P_SetSlopeFromTag(sector_t *sec, INT32 tag, boolean ceiling)
{
INT32 i;
pslope_t **secslope = ceiling ? &sec->c_slope : &sec->f_slope;
- TAG_ITER_DECLARECOUNTER(0);
if (!tag || *secslope)
return false;
- TAG_ITER_SECTORS(0, tag, i)
+ TAG_ITER_SECTORS(tag, i)
{
pslope_t *srcslope = ceiling ? sectors[i].c_slope : sectors[i].f_slope;
if (srcslope)
@@ -632,13 +661,20 @@ pslope_t *P_SlopeById(UINT16 id)
return ret;
}
+/// Creates a new slope from equation constants.
+pslope_t *MakeViaEquationConstants(const fixed_t a, const fixed_t b, const fixed_t c, const fixed_t d)
+{
+ pslope_t* ret = Slope_Add(0);
+
+ ReconfigureViaConstants(ret, a, b, c, d);
+
+ return ret;
+}
+
/// Initializes and reads the slopes from the map data.
void P_SpawnSlopes(const boolean fromsave) {
size_t i;
- slopelist = NULL;
- slopecount = 0;
-
/// Generates vertex slopes.
SpawnVertexSlopes();
@@ -665,6 +701,9 @@ void P_SpawnSlopes(const boolean fromsave) {
for (i = 0; i < numlines; i++)
switch (lines[i].special)
{
+ case 700:
+ if (lines[i].flags & ML_TFERLINE) P_CopySectorSlope(&lines[i]);
+ break;
case 720:
P_CopySectorSlope(&lines[i]);
default:
@@ -672,6 +711,13 @@ void P_SpawnSlopes(const boolean fromsave) {
}
}
+/// Initializes slopes.
+void P_InitSlopes(void)
+{
+ slopelist = NULL;
+ slopecount = 0;
+}
+
// ============================================================================
//
// Various utilities related to slopes
@@ -774,13 +820,13 @@ void P_SlopeLaunch(mobj_t *mo)
mo->momx = slopemom.x;
mo->momy = slopemom.y;
mo->momz = slopemom.z/2;
+
+ if (mo->player)
+ mo->player->powers[pw_justlaunched] = 1;
}
//CONS_Printf("Launched off of slope.\n");
mo->standingslope = NULL;
-
- if (mo->player)
- mo->player->powers[pw_justlaunched] = 1;
}
//
diff --git a/src/p_slopes.h b/src/p_slopes.h
index ae040ae5698f1d3f29933dc412552573d1e63ab9..d1a053d28fb92d1a0767e566af8c39b86eeabb08 100644
--- a/src/p_slopes.h
+++ b/src/p_slopes.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2004 by Stephen McGranahan
-// Copyright (C) 2015-2021 by Sonic Team Junior.
+// Copyright (C) 2015-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -50,6 +50,7 @@ typedef enum
void P_LinkSlopeThinkers (void);
void P_CalculateSlopeNormal(pslope_t *slope);
+void P_InitSlopes(void);
void P_SpawnSlopes(const boolean fromsave);
//
@@ -86,6 +87,7 @@ fixed_t P_GetWallTransferMomZ(mobj_t *mo, pslope_t *slope);
void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope);
void P_ButteredSlope(mobj_t *mo);
+pslope_t *MakeViaEquationConstants(const fixed_t a, const fixed_t b, const fixed_t c, const fixed_t d);
/// Dynamic plane type enum for the thinker. Will have a different functionality depending on this.
typedef enum {
diff --git a/src/p_spec.c b/src/p_spec.c
index b583c9d169da21752c812f8d6ae149b734140cd7..ba815baf17845bf21d4452ea7dac5b2e2ff3901b 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -35,7 +35,7 @@
#include "v_video.h" // V_AUTOFADEOUT|V_ALLOWLOWERCASE
#include "m_misc.h"
#include "m_cond.h" //unlock triggers
-#include "lua_hook.h" // LUAh_LinedefExecute
+#include "lua_hook.h" // LUA_HookLinedefExecute
#include "f_finale.h" // control text prompt
#include "r_skins.h" // skins
@@ -1981,6 +1981,22 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
}
}
+static boolean is_rain_type (INT32 weathernum)
+{
+ switch (weathernum)
+ {
+ case PRECIP_SNOW:
+ case PRECIP_RAIN:
+ case PRECIP_STORM:
+ case PRECIP_STORM_NOSTRIKES:
+ case PRECIP_BLANK:
+ return true;
+
+ default:
+ return false;
+ }
+}
+
//
// P_SwitchWeather
//
@@ -1988,53 +2004,14 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
//
void P_SwitchWeather(INT32 weathernum)
{
- boolean purge = false;
- INT32 swap = 0;
+ boolean purge = true;
- switch (weathernum)
- {
- case PRECIP_NONE: // None
- if (curWeather == PRECIP_NONE)
- return; // Nothing to do.
- purge = true;
- break;
- case PRECIP_STORM: // Storm
- case PRECIP_STORM_NOSTRIKES: // Storm w/ no lightning
- case PRECIP_RAIN: // Rain
- if (curWeather == PRECIP_SNOW || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN)
- swap = PRECIP_RAIN;
- break;
- case PRECIP_SNOW: // Snow
- if (curWeather == PRECIP_SNOW)
- return; // Nothing to do.
- if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN)
- swap = PRECIP_SNOW; // Need to delete the other precips.
- break;
- case PRECIP_STORM_NORAIN: // Storm w/o rain
- if (curWeather == PRECIP_SNOW
- || curWeather == PRECIP_STORM
- || curWeather == PRECIP_STORM_NOSTRIKES
- || curWeather == PRECIP_RAIN
- || curWeather == PRECIP_BLANK)
- swap = PRECIP_STORM_NORAIN;
- else if (curWeather == PRECIP_STORM_NORAIN)
- return;
- break;
- case PRECIP_BLANK:
- if (curWeather == PRECIP_SNOW
- || curWeather == PRECIP_STORM
- || curWeather == PRECIP_STORM_NOSTRIKES
- || curWeather == PRECIP_RAIN)
- swap = PRECIP_BLANK;
- else if (curWeather == PRECIP_STORM_NORAIN)
- swap = PRECIP_BLANK;
- else if (curWeather == PRECIP_BLANK)
- return;
- break;
- default:
- CONS_Debug(DBG_GAMELOGIC, "P_SwitchWeather: Unknown weather type %d.\n", weathernum);
- break;
- }
+ if (weathernum == curWeather)
+ return;
+
+ if (is_rain_type(weathernum) &&
+ is_rain_type(curWeather))
+ purge = false;
if (purge)
{
@@ -2051,7 +2028,7 @@ void P_SwitchWeather(INT32 weathernum)
P_RemovePrecipMobj(precipmobj);
}
}
- else if (swap && !((swap == PRECIP_BLANK && curWeather == PRECIP_STORM_NORAIN) || (swap == PRECIP_STORM_NORAIN && curWeather == PRECIP_BLANK))) // Rather than respawn all that crap, reuse it!
+ else // Rather than respawn all that crap, reuse it!
{
thinker_t *think;
precipmobj_t *precipmobj;
@@ -2063,7 +2040,7 @@ void P_SwitchWeather(INT32 weathernum)
continue; // not a precipmobj thinker
precipmobj = (precipmobj_t *)think;
- if (swap == PRECIP_RAIN) // Snow To Rain
+ if (weathernum == PRECIP_RAIN || weathernum == PRECIP_STORM || weathernum == PRECIP_STORM_NOSTRIKES) // Snow To Rain
{
precipmobj->flags = mobjinfo[MT_RAIN].flags;
st = &states[mobjinfo[MT_RAIN].spawnstate];
@@ -2078,7 +2055,7 @@ void P_SwitchWeather(INT32 weathernum)
precipmobj->precipflags |= PCF_RAIN;
//think->function.acp1 = (actionf_p1)P_RainThinker;
}
- else if (swap == PRECIP_SNOW) // Rain To Snow
+ else if (weathernum == PRECIP_SNOW) // Rain To Snow
{
INT32 z;
@@ -2103,7 +2080,7 @@ void P_SwitchWeather(INT32 weathernum)
//think->function.acp1 = (actionf_p1)P_SnowThinker;
}
- else if (swap == PRECIP_BLANK || swap == PRECIP_STORM_NORAIN) // Remove precip, but keep it around for reuse.
+ else // Remove precip, but keep it around for reuse.
{
//think->function.acp1 = (actionf_p1)P_NullPrecipThinker;
@@ -2117,48 +2094,33 @@ void P_SwitchWeather(INT32 weathernum)
case PRECIP_SNOW: // snow
curWeather = PRECIP_SNOW;
- if (!swap)
+ if (purge)
P_SpawnPrecipitation();
break;
case PRECIP_RAIN: // rain
{
- boolean dontspawn = false;
-
- if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES)
- dontspawn = true;
-
curWeather = PRECIP_RAIN;
- if (!dontspawn && !swap)
+ if (purge)
P_SpawnPrecipitation();
break;
}
case PRECIP_STORM: // storm
{
- boolean dontspawn = false;
-
- if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES)
- dontspawn = true;
-
curWeather = PRECIP_STORM;
- if (!dontspawn && !swap)
+ if (purge)
P_SpawnPrecipitation();
break;
}
case PRECIP_STORM_NOSTRIKES: // storm w/o lightning
{
- boolean dontspawn = false;
-
- if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES)
- dontspawn = true;
-
curWeather = PRECIP_STORM_NOSTRIKES;
- if (!dontspawn && !swap)
+ if (purge)
P_SpawnPrecipitation();
break;
@@ -2166,14 +2128,11 @@ void P_SwitchWeather(INT32 weathernum)
case PRECIP_STORM_NORAIN: // storm w/o rain
curWeather = PRECIP_STORM_NORAIN;
- if (!swap)
- P_SpawnPrecipitation();
-
break;
- case PRECIP_BLANK:
+ case PRECIP_BLANK: //preloaded
curWeather = PRECIP_BLANK;
- if (!swap)
+ if (purge)
P_SpawnPrecipitation();
break;
@@ -2223,7 +2182,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
INT32 secnum = -1;
mobj_t *bot = NULL;
mtag_t tag = Tag_FGet(&line->tags);
- TAG_ITER_DECLARECOUNTER(0);
I_Assert(!mo || !P_MobjWasRemoved(mo)); // If mo is there, mo must be valid!
@@ -2251,7 +2209,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
newceilinglightsec = line->frontsector->ceilinglightsec;
// act on all sectors with the same tag as the triggering linedef
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
if (sectors[secnum].lightingdata)
{
@@ -2306,7 +2264,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 409: // Change tagged sectors' tag
// (formerly "Change calling sectors' tag", but behavior was changed)
{
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
Tag_SectorFSet(secnum,(INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS));
break;
}
@@ -2316,7 +2274,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 411: // Stop floor/ceiling movement in tagged sector(s)
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
if (sectors[secnum].floordata)
{
@@ -2501,7 +2459,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
// Additionally play the sound from tagged sectors' soundorgs
sector_t *sec;
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
sec = §ors[secnum];
S_StartSound(&sec->soundorg, sfxnum);
@@ -2616,7 +2574,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 416: // Spawn adjustable fire flicker
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2650,7 +2608,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 417: // Spawn adjustable glowing light
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2684,7 +2642,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 418: // Spawn adjustable strobe flash (unsynchronized)
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2718,7 +2676,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 419: // Spawn adjustable strobe flash (synchronized)
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2766,7 +2724,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 421: // Stop lighting effect in tagged sectors
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
if (sectors[secnum].lightingdata)
{
P_RemoveThinker(&((elevator_t *)sectors[secnum].lightingdata)->thinker);
@@ -2930,25 +2888,20 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 434: // Custom Power
if (mo && mo->player)
{
- mobj_t *dummy = P_SpawnMobj(mo->x, mo->y, mo->z, MT_NULL);
-
- var1 = sides[line->sidenum[0]].toptexture; //(line->dx>>FRACBITS)-1;
+ powertype_t power = sides[line->sidenum[0]].toptexture; //(line->dx>>FRACBITS)-1;
+ UINT16 value;
if (line->sidenum[1] != 0xffff && line->flags & ML_BLOCKMONSTERS) // read power from back sidedef
- var2 = sides[line->sidenum[1]].toptexture;
+ value = sides[line->sidenum[1]].toptexture;
else if (line->flags & ML_NOCLIMB) // 'Infinite'
- var2 = UINT16_MAX;
+ value = UINT16_MAX;
else
- var2 = sides[line->sidenum[0]].textureoffset>>FRACBITS;
+ value = sides[line->sidenum[0]].textureoffset>>FRACBITS;
- P_SetTarget(&dummy->target, mo);
- A_CustomPower(dummy);
+ P_SetPower(mo->player, power, value);
- if (bot) {
- P_SetTarget(&dummy->target, bot);
- A_CustomPower(dummy);
- }
- P_RemoveMobj(dummy);
+ if (bot)
+ P_SetPower(bot->player, power, value);
}
break;
@@ -2980,7 +2933,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
ffloor_t *rover; // FOF that we are going to crumble
boolean foundrover = false; // for debug, "Can't find a FOF" message
- TAG_ITER_SECTORS(0, sectag, secnum)
+ TAG_ITER_SECTORS(sectag, secnum)
{
sec = sectors + secnum;
@@ -3105,7 +3058,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (line->sidenum[1] != 0xffff)
state = (statenum_t)sides[line->sidenum[1]].toptexture;
- TAG_ITER_SECTORS(0, tag, secnum)
+ TAG_ITER_SECTORS(tag, secnum)
{
boolean tryagain;
sec = sectors + secnum;
@@ -3135,7 +3088,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 443: // Calls a named Lua function
if (line->stringargs[0])
- LUAh_LinedefExecute(line, mo, callsec);
+ LUA_HookLinedefExecute(line, mo, callsec);
else
CONS_Alert(CONS_WARNING, "Linedef %s is missing the hook name of the Lua function to call! (This should be given in arg0str)\n", sizeu1(line-lines));
break;
@@ -3165,7 +3118,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
boolean foundrover = false; // for debug, "Can't find a FOF" message
ffloortype_e oldflags; // store FOF's old flags
- TAG_ITER_SECTORS(0, sectag, secnum)
+ TAG_ITER_SECTORS(sectag, secnum)
{
sec = sectors + secnum;
@@ -3223,7 +3176,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (line->flags & ML_NOCLIMB) // don't respawn!
respawn = false;
- TAG_ITER_SECTORS(0, sectag, secnum)
+ TAG_ITER_SECTORS(sectag, secnum)
{
sec = sectors + secnum;
@@ -3279,7 +3232,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
source = sectors[sourcesec].extra_colormap;
}
}
- TAG_ITER_SECTORS(0, line->args[0], secnum)
+ TAG_ITER_SECTORS(line->args[0], secnum)
{
if (sectors[secnum].colormap_protected)
continue;
@@ -3414,7 +3367,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
ffloor_t *rover; // FOF that we are going to operate
boolean foundrover = false; // for debug, "Can't find a FOF" message
- TAG_ITER_SECTORS(0, sectag, secnum)
+ TAG_ITER_SECTORS(sectag, secnum)
{
sec = sectors + secnum;
@@ -3478,7 +3431,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
boolean foundrover = false; // for debug, "Can't find a FOF" message
size_t j = 0; // sec->ffloors is saved as ffloor #0, ss->ffloors->next is #1, etc
- TAG_ITER_SECTORS(0, sectag, secnum)
+ TAG_ITER_SECTORS(sectag, secnum)
{
sec = sectors + secnum;
@@ -3563,7 +3516,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
ffloor_t *rover; // FOF that we are going to operate
boolean foundrover = false; // for debug, "Can't find a FOF" message
- TAG_ITER_SECTORS(0, sectag, secnum)
+ TAG_ITER_SECTORS(sectag, secnum)
{
sec = sectors + secnum;
@@ -3614,7 +3567,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
}
- TAG_ITER_SECTORS(0, line->args[0], secnum)
+ TAG_ITER_SECTORS(line->args[0], secnum)
{
extracolormap_t *source_exc, *dest_exc, *exc;
@@ -3694,7 +3647,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
}
case 456: // Stop fade colormap
- TAG_ITER_SECTORS(0, line->args[0], secnum)
+ TAG_ITER_SECTORS(line->args[0], secnum)
P_ResetColormapFader(§ors[secnum]);
break;
@@ -3887,12 +3840,11 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 465: // Set linedef executor delay
{
INT32 linenum;
- TAG_ITER_DECLARECOUNTER(1);
if (!udmf)
break;
- TAG_ITER_LINES(1, line->args[0], linenum)
+ TAG_ITER_LINES(line->args[0], linenum)
{
if (line->args[2])
lines[linenum].executordelay += line->args[1];
@@ -3902,6 +3854,21 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
break;
+ case 466: // Set level failure state
+ {
+ if (line->flags & ML_NOCLIMB)
+ {
+ stagefailed = false;
+ CONS_Debug(DBG_GAMELOGIC, "Stage can be completed successfully!\n");
+ }
+ else
+ {
+ stagefailed = true;
+ CONS_Debug(DBG_GAMELOGIC, "Stage will end in failure...\n");
+ }
+ }
+ break;
+
case 480: // Polyobj_DoorSlide
case 481: // Polyobj_DoorSwing
PolyDoor(line);
@@ -5629,7 +5596,16 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
if (flags & FF_TRANSLUCENT)
{
if (sides[master->sidenum[0]].toptexture > 0)
- fflr->alpha = sides[master->sidenum[0]].toptexture; // for future reference, "#0" is 1, and "#255" is 256. Be warned
+ {
+ // for future reference, "#0" is 1, and "#255" is 256. Be warned
+ fflr->alpha = sides[master->sidenum[0]].toptexture;
+
+ if (fflr->alpha >= 1001) // fourth digit
+ {
+ fflr->blend = (fflr->alpha/1000)+1; // becomes an AST
+ fflr->alpha %= 1000;
+ }
+ }
else
fflr->alpha = 0x80;
}
@@ -5928,9 +5904,8 @@ void T_LaserFlash(laserthink_t *flash)
sector_t *sector;
sector_t *sourcesec = flash->sourceline->frontsector;
fixed_t top, bottom;
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, flash->tag, s)
+ TAG_ITER_SECTORS(flash->tag, s)
{
sector = §ors[s];
for (fflr = sector->ffloors; fflr; fflr = fflr->next)
@@ -6210,11 +6185,10 @@ void P_SpawnSpecials(boolean fromnetsave)
INT32 s;
size_t sec;
ffloortype_e ffloorflags;
- TAG_ITER_DECLARECOUNTER(0);
case 1: // Definable gravity per sector
sec = sides[*lines[i].sidenum].sector - sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
{
sectors[s].gravity = §ors[sec].floorheight; // This allows it to change in realtime!
@@ -6238,7 +6212,7 @@ void P_SpawnSpecials(boolean fromnetsave)
case 5: // Change camera info
sec = sides[*lines[i].sidenum].sector - sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_AddCameraScanner(§ors[sec], §ors[s], R_PointToAngle2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y));
break;
@@ -6265,7 +6239,7 @@ void P_SpawnSpecials(boolean fromnetsave)
P_ApplyFlatAlignment(lines + i, lines[i].frontsector, flatangle, xoffs, yoffs);
else
{
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_ApplyFlatAlignment(lines + i, sectors + s, flatangle, xoffs, yoffs);
}
}
@@ -6276,7 +6250,7 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 8: // Sector Parameters
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
{
if (lines[i].flags & ML_NOCLIMB)
{
@@ -6303,7 +6277,7 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 10: // Vertical culling plane for sprites and FOFs
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
break;
@@ -6364,19 +6338,19 @@ void P_SpawnSpecials(boolean fromnetsave)
case 63: // support for drawn heights coming from different sector
sec = sides[*lines[i].sidenum].sector-sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
sectors[s].heightsec = (INT32)sec;
break;
case 64: // Appearing/Disappearing FOF option
if (lines[i].flags & ML_BLOCKMONSTERS) { // Find FOFs by control sector tag
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
for (j = 0; (unsigned)j < sectors[s].linecount; j++)
if (sectors[s].lines[j]->special >= 100 && sectors[s].lines[j]->special < 300)
Add_MasterDisappearer(abs(lines[i].dx>>FRACBITS), abs(lines[i].dy>>FRACBITS), abs(sides[lines[i].sidenum[0]].sector->floorheight>>FRACBITS), (INT32)(sectors[s].lines[j]-lines), (INT32)i);
} else // Find FOFs by effect sector tag
{
- TAG_ITER_LINES(0, tag, s)
+ TAG_ITER_LINES(tag, s)
{
if ((size_t)s == i)
continue;
@@ -6387,15 +6361,15 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 66: // Displace floor by front sector
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_AddPlaneDisplaceThinker(pd_floor, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB));
break;
case 67: // Displace ceiling by front sector
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_AddPlaneDisplaceThinker(pd_ceiling, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB));
break;
case 68: // Displace both floor AND ceiling by front sector
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_AddPlaneDisplaceThinker(pd_both, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB));
break;
@@ -6991,46 +6965,46 @@ void P_SpawnSpecials(boolean fromnetsave)
case 600: // floor lighting independently (e.g. lava)
sec = sides[*lines[i].sidenum].sector-sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
sectors[s].floorlightsec = (INT32)sec;
break;
case 601: // ceiling lighting independently
sec = sides[*lines[i].sidenum].sector-sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
sectors[s].ceilinglightsec = (INT32)sec;
break;
case 602: // Adjustable pulsating light
sec = sides[*lines[i].sidenum].sector - sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_SpawnAdjustableGlowingLight(§ors[sec], §ors[s],
P_AproxDistance(lines[i].dx, lines[i].dy)>>FRACBITS);
break;
case 603: // Adjustable flickering light
sec = sides[*lines[i].sidenum].sector - sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_SpawnAdjustableFireFlicker(§ors[sec], §ors[s],
P_AproxDistance(lines[i].dx, lines[i].dy)>>FRACBITS);
break;
case 604: // Adjustable Blinking Light (unsynchronized)
sec = sides[*lines[i].sidenum].sector - sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_SpawnAdjustableStrobeFlash(§ors[sec], §ors[s],
abs(lines[i].dx)>>FRACBITS, abs(lines[i].dy)>>FRACBITS, false);
break;
case 605: // Adjustable Blinking Light (synchronized)
sec = sides[*lines[i].sidenum].sector - sectors;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_SpawnAdjustableStrobeFlash(§ors[sec], §ors[s],
abs(lines[i].dx)>>FRACBITS, abs(lines[i].dy)>>FRACBITS, true);
break;
case 606: // HACK! Copy colormaps. Just plain colormaps.
- TAG_ITER_SECTORS(0, lines[i].args[0], s)
+ TAG_ITER_SECTORS(lines[i].args[0], s)
{
extracolormap_t *exc;
@@ -7091,7 +7065,8 @@ void P_SpawnSpecials(boolean fromnetsave)
}
}
- P_RunLevelLoadExecutors();
+ if (!fromnetsave)
+ P_RunLevelLoadExecutors();
}
/** Adds 3Dfloors as appropriate based on a common control linedef.
@@ -7104,13 +7079,12 @@ void P_SpawnSpecials(boolean fromnetsave)
*/
static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinkerlist_t *secthinkers)
{
- TAG_ITER_DECLARECOUNTER(0);
INT32 s;
mtag_t tag = Tag_FGet(&lines[line].tags);
size_t sec = sides[*lines[line].sidenum].sector-sectors;
line_t* li = lines + line;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
P_AddFakeFloor(§ors[s], §ors[sec], li, ffloorflags, secthinkers);
}
@@ -7220,7 +7194,6 @@ void T_Scroll(scroll_t *s)
size_t i;
INT32 sect;
ffloor_t *rover;
- TAG_ITER_DECLARECOUNTER(0);
case sc_side: // scroll wall texture
if (!issimulation)
@@ -7266,7 +7239,7 @@ void T_Scroll(scroll_t *s)
if (!is3dblock)
continue;
- TAG_ITER_SECTORS(0, Tag_FGet(&line->tags), sect)
+ TAG_ITER_SECTORS(Tag_FGet(&line->tags), sect)
{
sector_t *psec;
psec = sectors + sect;
@@ -7341,7 +7314,7 @@ void T_Scroll(scroll_t *s)
if (!is3dblock)
continue;
- TAG_ITER_SECTORS(0, Tag_FGet(&line->tags), sect)
+ TAG_ITER_SECTORS(Tag_FGet(&line->tags), sect)
{
sector_t *psec;
psec = sectors + sect;
@@ -7481,11 +7454,10 @@ static void P_SpawnScrollers(void)
switch (special)
{
register INT32 s;
- TAG_ITER_DECLARECOUNTER(0);
case 513: // scroll effect ceiling
case 533: // scroll and carry objects on ceiling
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Scroller(sc_ceiling, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 533)
break;
@@ -7494,13 +7466,13 @@ static void P_SpawnScrollers(void)
case 523: // carry objects on ceiling
dx = FixedMul(dx, CARRYFACTOR);
dy = FixedMul(dy, CARRYFACTOR);
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Scroller(sc_carry_ceiling, dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
break;
case 510: // scroll effect floor
case 530: // scroll and carry objects on floor
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Scroller(sc_floor, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 530)
break;
@@ -7509,7 +7481,7 @@ static void P_SpawnScrollers(void)
case 520: // carry objects on floor
dx = FixedMul(dx, CARRYFACTOR);
dy = FixedMul(dy, CARRYFACTOR);
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Scroller(sc_carry, dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
break;
@@ -7517,7 +7489,7 @@ static void P_SpawnScrollers(void)
// (same direction and speed as scrolling floors)
case 502:
{
- TAG_ITER_LINES(0, tag, s)
+ TAG_ITER_LINES(tag, s)
if (s != (INT32)i)
{
if (l->flags & ML_EFFECT2) // use texture offsets instead
@@ -7619,9 +7591,8 @@ void T_Disappear(disappear_t *d)
ffloor_t *rover;
register INT32 s;
mtag_t afftag = Tag_FGet(&lines[d->affectee].tags);
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_SECTORS(0, afftag, s)
+ TAG_ITER_SECTORS(afftag, s)
{
for (rover = sectors[s].ffloors; rover; rover = rover->next)
{
@@ -8352,7 +8323,6 @@ static void P_SpawnFriction(void)
fixed_t strength; // frontside texture offset controls magnitude
fixed_t friction; // friction value to be applied during movement
INT32 movefactor; // applied to each player move to simulate inertia
- TAG_ITER_DECLARECOUNTER(0);
for (i = 0; i < numlines; i++, l++)
if (l->special == 540)
@@ -8378,7 +8348,7 @@ static void P_SpawnFriction(void)
else
movefactor = FRACUNIT;
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Friction(friction, movefactor, s, -1);
}
}
@@ -8467,6 +8437,9 @@ static inline boolean PIT_PushThing(mobj_t *thing)
if (thing->player && thing->player->powers[pw_carry] == CR_ROPEHANG)
return false;
+ if (!tmpusher->source)
+ return false;
+
// Allow this to affect pushable objects at some point?
if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || thing->player->powers[pw_carry] == CR_NIGHTSMODE))
{
@@ -8897,7 +8870,6 @@ static void P_SpawnPushers(void)
mtag_t tag;
register INT32 s;
mobj_t *thing;
- TAG_ITER_DECLARECOUNTER(0);
for (i = 0; i < numlines; i++, l++)
{
@@ -8905,15 +8877,15 @@ static void P_SpawnPushers(void)
switch (l->special)
{
case 541: // wind
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Pusher(p_wind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 544: // current
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Pusher(p_current, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 547: // push/pull
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
{
thing = P_GetPushThing(s);
if (thing) // No MT_P* means no effect
@@ -8921,19 +8893,19 @@ static void P_SpawnPushers(void)
}
break;
case 545: // current up
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Pusher(p_upcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 546: // current down
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Pusher(p_downcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 542: // wind up
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Pusher(p_upwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 543: // wind down
- TAG_ITER_SECTORS(0, tag, s)
+ TAG_ITER_SECTORS(tag, s)
Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
}
diff --git a/src/p_spec.h b/src/p_spec.h
index 3b8abfcf8a099ee3bcb4f442d016f83c315b065f..75954abe2f7b8964c2695c67655474b35daedb41 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_telept.c b/src/p_telept.c
index 6bac5ad208e54f795288925342adb1becb05e021..cbbd0ff6bcffc7b91db3a5d6c7323d55394a4b4c 100644
--- a/src/p_telept.c
+++ b/src/p_telept.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_tick.c b/src/p_tick.c
index 71a460ff303ee3be23f6ee5e5ed11d679a88dbf4..dc3ee19db80f216de3074c4cee17d96b42a109e5 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -323,7 +323,7 @@ static inline void P_RunThinkers(void)
size_t i;
for (i = 0; i < NUM_THINKERLISTS; i++)
{
- ps_thlist_times[i] = I_GetPreciseTime();
+ PS_START_TIMING(ps_thlist_times[i]);
for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = currentthinker->next)
{
#ifdef PARANOIA
@@ -335,7 +335,7 @@ static inline void P_RunThinkers(void)
continue; // don't move any weather precips (rain, snow) when we don't see any gametic rendered
currentthinker->function.acp1(currentthinker);
}
- ps_thlist_times[i] = I_GetPreciseTime() - ps_thlist_times[i];
+ PS_STOP_TIMING(ps_thlist_times[i]);
}
}
@@ -491,7 +491,7 @@ static inline void P_DoSpecialStageStuff(void)
continue;
// If in water, deplete timer 6x as fast.
- if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & SH_PROTECTWATER))
+ if (players[i].mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(players[i].powers[pw_shield] & ((players[i].mo->eflags & MFE_TOUCHLAVA) ? SH_PROTECTFIRE : SH_PROTECTWATER)))
players[i].nightstime -= 5;
if (--players[i].nightstime > 6)
{
@@ -657,16 +657,16 @@ void P_Ticker(boolean run)
}
}
- ps_lua_mobjhooks = 0;
- ps_checkposition_calls = 0;
+ ps_lua_mobjhooks.value.i = 0;
+ ps_checkposition_calls.value.i = 0;
- LUAh_PreThinkFrame();
+ LUA_HOOK(PreThinkFrame);
- ps_playerthink_time = I_GetPreciseTime();
+ PS_START_TIMING(ps_playerthink_time);
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerThink(&players[i]);
- ps_playerthink_time = I_GetPreciseTime() - ps_playerthink_time;
+ PS_STOP_TIMING(ps_playerthink_time);
}
// Keep track of how long they've been playing!
@@ -681,18 +681,18 @@ void P_Ticker(boolean run)
if (run)
{
- ps_thinkertime = I_GetPreciseTime();
+ PS_START_TIMING(ps_thinkertime);
P_RunThinkers();
- ps_thinkertime = I_GetPreciseTime() - ps_thinkertime;
+ PS_STOP_TIMING(ps_thinkertime);
// Run any "after all the other thinkers" stuff
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerAfterThink(&players[i]);
- ps_lua_thinkframe_time = I_GetPreciseTime();
- LUAh_ThinkFrame();
- ps_lua_thinkframe_time = I_GetPreciseTime() - ps_lua_thinkframe_time;
+ PS_START_TIMING(ps_lua_thinkframe_time);
+ LUA_HookThinkFrame();
+ PS_STOP_TIMING(ps_lua_thinkframe_time);
}
// Run shield positioning
@@ -764,7 +764,7 @@ void P_Ticker(boolean run)
if (modeattacking)
G_GhostTicker();
- LUAh_PostThinkFrame();
+ LUA_HOOK(PostThinkFrame);
}
P_MapEnd();
@@ -787,7 +787,7 @@ void P_PreTicker(INT32 frames)
{
P_MapStart();
- LUAh_PreThinkFrame();
+ LUA_HOOK(PreThinkFrame);
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
@@ -814,7 +814,7 @@ void P_PreTicker(INT32 frames)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerAfterThink(&players[i]);
- LUAh_ThinkFrame();
+ LUA_HookThinkFrame();
// Run shield positioning
P_RunShields();
@@ -823,7 +823,7 @@ void P_PreTicker(INT32 frames)
P_UpdateSpecials();
P_RespawnSpecials();
- LUAh_PostThinkFrame();
+ LUA_HOOK(PostThinkFrame);
P_MapEnd();
}
diff --git a/src/p_tick.h b/src/p_tick.h
index ae481c6a2aa10df64f680f33aca97b43b5b13bc6..d355bc6d756661e92f7dd2451732b6bbc6a66fbf 100644
--- a/src/p_tick.h
+++ b/src/p_tick.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/p_user.c b/src/p_user.c
index 1edca2074f57ce3b18f2e69c5bacdc3dadcb6b16..6054357eefff0b834da0a90c4b35c313073dc7f4 100755
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -777,7 +777,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
UINT8 oldmare, oldmarelap, oldmarebonuslap;
// Bots can't be NiGHTSerized, silly!1 :P
- if (player->bot)
+ if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN)
return;
if (player->powers[pw_carry] != CR_NIGHTSMODE)
@@ -969,6 +969,9 @@ pflags_t P_GetJumpFlags(player_t *player)
//
boolean P_PlayerInPain(player_t *player)
{
+ // If the player doesn't have a mobj, it can't be in pain.
+ if (!player->mo)
+ return false;
// no silly, sliding isn't pain
if (!(player->pflags & PF_SLIDING) && player->mo->state == &states[player->mo->info->painstate] && player->powers[pw_flashing])
return true;
@@ -1045,7 +1048,8 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor)
fallbackspeed = FixedMul(4*FRACUNIT, player->mo->scale);
}
- player->drawangle = ang + ANGLE_180;
+ if (player->pflags & PF_DIRECTIONCHAR)
+ player->drawangle = ang + ANGLE_180;
P_InstaThrust(player->mo, ang, fallbackspeed);
}
@@ -1111,7 +1115,7 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
return false;
{
- UINT8 shouldCollide = LUAh_PlayerCanDamage(player, thing);
+ UINT8 shouldCollide = LUA_HookPlayerCanDamage(player, thing);
if (P_MobjWasRemoved(thing))
return false; // removed???
if (shouldCollide == 1)
@@ -1189,8 +1193,8 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
if (!player)
return;
- if (player->bot)
- player = &players[consoleplayer];
+ if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader)
+ player = player->botleader;
if (!player->mo)
return;
@@ -1234,8 +1238,8 @@ void P_GivePlayerSpheres(player_t *player, INT32 num_spheres)
if (!player)
return;
- if (player->bot)
- player = &players[consoleplayer];
+ if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader)
+ player = player->botleader;
if (!player->mo)
return;
@@ -1261,8 +1265,8 @@ void P_GivePlayerLives(player_t *player, INT32 numlives)
if (!player)
return;
- if (player->bot)
- player = &players[consoleplayer];
+ if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader)
+ player = player->botleader;
if (gamestate == GS_LEVEL)
{
@@ -1367,8 +1371,8 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
{
UINT32 oldscore;
- if (player->bot)
- player = &players[consoleplayer];
+ if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader)
+ player = player->botleader;
// NiGHTS does it different!
if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->typeoflevel & TOL_NIGHTS)
@@ -1594,7 +1598,7 @@ boolean P_EvaluateMusicStatus(UINT16 status, const char *musname)
break;
case JT_OTHER: // Other state
- result = LUAh_ShouldJingleContinue(&players[i], musname);
+ result = LUA_HookShouldJingleContinue(&players[i], musname);
break;
case JT_NONE: // Null state
@@ -1860,7 +1864,7 @@ void P_SpawnShieldOrb(player_t *player)
I_Error("P_SpawnShieldOrb: player->mo is NULL!\n");
#endif
- if (LUAh_ShieldSpawn(player))
+ if (LUA_HookPlayer(player, HOOK(ShieldSpawn)))
return;
if (player->powers[pw_shield] & SH_FORCE)
@@ -2007,6 +2011,24 @@ void P_SwitchShield(player_t *player, UINT16 shieldtype)
}
}
+//
+// P_SetPower
+//
+// Sets a power and spawns a shield orb if required.
+//
+void P_SetPower(player_t *player, powertype_t power, UINT16 value)
+{
+ boolean spawnshield = false;
+
+ if (power == pw_shield && player->powers[pw_shield] != value)
+ spawnshield = true;
+
+ player->powers[power] = value;
+
+ if (spawnshield) //workaround for a bug
+ P_SpawnShieldOrb(player);
+}
+
//
// P_SpawnGhostMobj
//
@@ -2016,6 +2038,8 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
{
mobj_t *ghost = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_GHOST);
+ P_SetTarget(&ghost->target, mobj);
+
P_SetScale(ghost, mobj->scale);
ghost->destscale = mobj->scale;
@@ -2772,16 +2796,9 @@ static void P_CheckBouncySectors(player_t *player)
player->mo->momx = -FixedMul(player->mo->momx,bouncestrength);
player->mo->momy = -FixedMul(player->mo->momy,bouncestrength);
- if (player->pflags & PF_SPINNING)
- {
- player->pflags &= ~PF_SPINNING;
- player->pflags |= P_GetJumpFlags(player);
- player->pflags |= PF_THOKKED;
- }
}
else
{
- fixed_t newmom;
pslope_t *slope = (abs(oldz - topheight) < abs(oldz + player->mo->height - bottomheight)) ? *rover->t_slope : *rover->b_slope;
momentum.x = player->mo->momx;
@@ -2791,53 +2808,28 @@ static void P_CheckBouncySectors(player_t *player)
if (slope)
P_ReverseQuantizeMomentumToSlope(&momentum, slope);
- newmom = momentum.z = -FixedMul(momentum.z,bouncestrength)/2;
+ momentum.z = -FixedMul(momentum.z,bouncestrength)/2;
- if (abs(newmom) < (bouncestrength*2))
+ if (abs(momentum.z) < (bouncestrength*2))
goto bouncydone;
- if (!(rover->master->flags & ML_BOUNCY))
- {
- if (newmom > 0)
- {
- if (newmom < 8*FRACUNIT)
- newmom = 8*FRACUNIT;
- }
- else if (newmom < 0)
- {
- if (newmom > -8*FRACUNIT)
- newmom = -8*FRACUNIT;
- }
- }
-
- if (newmom > P_GetPlayerHeight(player)/2)
- newmom = P_GetPlayerHeight(player)/2;
- else if (newmom < -P_GetPlayerHeight(player)/2)
- newmom = -P_GetPlayerHeight(player)/2;
-
- momentum.z = newmom*2;
+ if (momentum.z > FixedMul(24*FRACUNIT, player->mo->scale)) //half of the default player height
+ momentum.z = FixedMul(24*FRACUNIT, player->mo->scale);
+ else if (momentum.z < -FixedMul(24*FRACUNIT, player->mo->scale))
+ momentum.z = -FixedMul(24*FRACUNIT, player->mo->scale);
if (slope)
P_QuantizeMomentumToSlope(&momentum, slope);
player->mo->momx = momentum.x;
player->mo->momy = momentum.y;
- player->mo->momz = momentum.z/2;
+ player->mo->momz = momentum.z;
if (player->pflags & PF_SPINNING)
{
- player->pflags &= ~PF_SPINNING;
- player->pflags |= P_GetJumpFlags(player);
player->pflags |= PF_THOKKED;
}
}
-
- if ((player->pflags & PF_SPINNING) && player->speed < FixedMul(1<<FRACBITS, player->mo->scale) && player->mo->momz)
- {
- player->pflags &= ~PF_SPINNING;
- player->pflags |= P_GetJumpFlags(player);
- }
-
goto bouncydone;
}
}
@@ -4589,7 +4581,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
if (cmd->buttons & BT_SPIN)
{
- if (LUAh_SpinSpecial(player))
+ if (LUA_HookPlayer(player, HOOK(SpinSpecial)))
return;
}
@@ -5061,7 +5053,7 @@ static boolean P_PlayerShieldThink(player_t *player, ticcmd_t *cmd, mobj_t *lock
}
}
}
- if ((!(player->charflags & SF_NOSHIELDABILITY)) && (cmd->buttons & BT_SPIN && !LUAh_ShieldSpecial(player))) // Spin button effects
+ if ((!(player->charflags & SF_NOSHIELDABILITY)) && (cmd->buttons & BT_SPIN && !LUA_HookPlayer(player, HOOK(ShieldSpecial)))) // Spin button effects
{
// Force stop
if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE)
@@ -5185,7 +5177,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
// and you don't have a shield, do it!
P_DoSuperTransformation(player, false);
}
- else if (!LUAh_JumpSpinSpecial(player))
+ else if (!LUA_HookPlayer(player, HOOK(JumpSpinSpecial)))
switch (player->charability)
{
case CA_THOK:
@@ -5258,7 +5250,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
if (cmd->buttons & BT_JUMP && !player->exiting && !P_PlayerInPain(player))
{
- if (LUAh_JumpSpecial(player))
+ if (LUA_HookPlayer(player, HOOK(JumpSpecial)))
;
// all situations below this require jump button not to be pressed already
else if (player->pflags & PF_JUMPDOWN)
@@ -5293,7 +5285,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
}*/
else if (player->pflags & PF_JUMPED)
{
- if (!LUAh_AbilitySpecial(player))
+ if (!LUA_HookPlayer(player, HOOK(AbilitySpecial)))
switch (player->charability)
{
case CA_THOK:
@@ -5307,7 +5299,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
fixed_t actionspd = player->actionspd;
if (player->charflags & SF_DASHMODE)
- actionspd = max(player->normalspeed, FixedDiv(player->speed, player->mo->scale));
+ actionspd = max(player->actionspd, FixedDiv(player->speed, player->mo->scale));
if (player->mo->eflags & MFE_UNDERWATER)
actionspd >>= 1;
@@ -5363,9 +5355,9 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
// disabled because it seemed to disorient people and Z-targeting exists now
/*if (!demoplayback)
{
- if (player == &players[consoleplayer] && cv_cam_turnfacingability[0].value > 0 && !(PLAYER1INPUTDOWN(gc_turnleft) || PLAYER1INPUTDOWN(gc_turnright)))
+ if (player == &players[consoleplayer] && cv_cam_turnfacingability[0].value > 0 && !(PLAYER1INPUTDOWN(GC_TURNLEFT) || PLAYER1INPUTDOWN(GC_TURNRIGHT)))
P_SetPlayerAngle(player, player->mo->angle);;
- else if (player == &players[secondarydisplayplayer] && cv_cam_turnfacingability[1].value > 0 && !(PLAYER2INPUTDOWN(gc_turnleft) || PLAYER2INPUTDOWN(gc_turnright)))
+ else if (player == &players[secondarydisplayplayer] && cv_cam_turnfacingability[1].value > 0 && !(PLAYER2INPUTDOWN(GC_TURNLEFT) || PLAYER2INPUTDOWN(GC_TURNRIGHT)))
P_SetPlayerAngle(player, player->mo->angle);
}*/
}
@@ -5384,7 +5376,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
player->powers[pw_tailsfly] = tailsflytics + 1; // Set the fly timer
player->pflags &= ~(PF_JUMPED|PF_NOJUMPDAMAGE|PF_SPINNING|PF_STARTDASH);
- if (player->bot == 1)
+ if (player->bot == BOT_2PAI)
player->pflags |= PF_THOKKED;
else
player->pflags |= (PF_THOKKED|PF_CANCARRY);
@@ -5486,7 +5478,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
}
else if (player->pflags & PF_THOKKED)
{
- if (!LUAh_AbilitySpecial(player))
+ if (!LUA_HookPlayer(player, HOOK(AbilitySpecial)))
switch (player->charability)
{
case CA_FLY:
@@ -5509,7 +5501,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
break;
}
}
- else if ((!(player->charflags & SF_NOSHIELDABILITY)) && ((player->powers[pw_shield] & SH_NOSTACK) == SH_WHIRLWIND && !player->powers[pw_super] && !LUAh_ShieldSpecial(player)))
+ else if ((!(player->charflags & SF_NOSHIELDABILITY)) && ((player->powers[pw_shield] & SH_NOSTACK) == SH_WHIRLWIND && !player->powers[pw_super] && !LUA_HookPlayer(player, HOOK(ShieldSpecial))))
P_DoJumpShield(player);
}
@@ -5630,16 +5622,10 @@ INT32 P_GetPlayerControlDirection(player_t *player)
{
ticcmd_t *cmd = &player->cmd;
angle_t controllerdirection, controlplayerdirection;
- camera_t *thiscam;
angle_t dangle;
fixed_t tempx = 0, tempy = 0;
angle_t tempangle, origtempangle;
- if (splitscreen && player == &players[secondarydisplayplayer])
- thiscam = &camera2;
- else
- thiscam = &camera;
-
if (!cmd->forwardmove && !cmd->sidemove)
return 0;
@@ -5655,17 +5641,15 @@ INT32 P_GetPlayerControlDirection(player_t *player)
origtempangle = tempangle = 0; // relative to the axis rather than the player!
controlplayerdirection = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
}
- else if ((P_ControlStyle(player) & CS_LMAOGALOG) && thiscam->chase)
+ else
{
if (player->awayviewtics)
origtempangle = tempangle = player->awayviewmobj->angle;
+ else if (P_ControlStyle(player) & CS_LMAOGALOG)
+ origtempangle = tempangle = (cmd->angleturn << 16);
else
- origtempangle = tempangle = thiscam->angle;
- controlplayerdirection = player->mo->angle;
- }
- else
- {
- origtempangle = tempangle = player->mo->angle;
+ origtempangle = tempangle = player->mo->angle;
+
controlplayerdirection = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
}
@@ -5971,22 +5955,6 @@ static void P_3dMovement(player_t *player)
acceleration = 96 + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * 40;
topspeed = normalspd;
}
- else if (player->bot)
- { // Bot steals player 1's stats
- normalspd = FixedMul(players[consoleplayer].normalspeed, player->mo->scale);
- thrustfactor = players[consoleplayer].thrustfactor;
- acceleration = players[consoleplayer].accelstart + (FixedDiv(player->speed, player->mo->scale)>>FRACBITS) * players[consoleplayer].acceleration;
-
- if (player->powers[pw_tailsfly])
- topspeed = normalspd/2;
- else if (player->mo->eflags & (MFE_UNDERWATER|MFE_GOOWATER))
- {
- topspeed = normalspd/2;
- acceleration = 2*acceleration/3;
- }
- else
- topspeed = normalspd;
- }
else
{
if (player->powers[pw_super] || player->powers[pw_sneakers])
@@ -6339,18 +6307,11 @@ static void P_NightsTransferPoints(player_t *player, fixed_t xspeed, fixed_t rad
if (player->exiting)
return;
+ if (!P_CheckMove(player->mo,
+ player->mo->x + player->mo->momx,
+ player->mo->y + player->mo->momy, true))
{
- boolean notallowed;
- mobj_t *hack = P_SpawnMobjFromMobj(player->mo, 0, 0, 0, MT_NULL);
- hack->flags = MF_NOGRAVITY;
- hack->radius = player->mo->radius;
- hack->height = player->mo->height;
- hack->z = player->mo->z;
- P_SetThingPosition(hack);
- notallowed = (!(P_TryMove(hack, player->mo->x+player->mo->momx, player->mo->y+player->mo->momy, true)));
- P_RemoveMobj(hack);
- if (notallowed)
- return;
+ return;
}
{
@@ -8659,7 +8620,7 @@ void P_MovePlayer(player_t *player)
{
boolean atspinheight = false;
fixed_t oldheight = player->mo->height;
- fixed_t luaheight = LUAh_PlayerHeight(player);
+ fixed_t luaheight = LUA_HookPlayerHeight(player);
if (luaheight != -1)
{
@@ -9025,8 +8986,11 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius)
if (mo->type == MT_MINUS && !(mo->flags & (MF_SPECIAL|MF_SHOOTABLE)))
mo->flags = (mo->flags & ~MF_NOCLIPTHING)|MF_SPECIAL|MF_SHOOTABLE;
- if (mo->type == MT_EGGGUARD && mo->tracer) //nuke Egg Guard's shield!
+ if (mo->type == MT_EGGGUARD && mo->tracer) // Egg Guard's shield needs to be removed if it has one!
+ {
P_KillMobj(mo->tracer, inflictor, source, DMG_NUKE);
+ P_KillMobj(mo, inflictor, source, DMG_NUKE);
+ }
if (mo->flags & MF_BOSS || mo->type == MT_PLAYER) //don't OHKO bosses nor players!
P_DamageMobj(mo, inflictor, source, 1, DMG_NUKE);
@@ -9513,11 +9477,11 @@ static void P_DeathThink(player_t *player)
if (player->deadtimer < INT32_MAX)
player->deadtimer++;
- if (player->bot) // don't allow bots to do any of the below, B_CheckRespawn does all they need for respawning already
+ if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) // don't allow followbots to do any of the below, B_CheckRespawn does all they need for respawning already
goto notrealplayer;
// continue logic
- if (!(netgame || multiplayer) && player->lives <= 0)
+ if (!(netgame || multiplayer) && player->lives <= 0 && player == &players[consoleplayer]) //Extra players in SP can't be allowed to continue or end game
{
if (player->deadtimer > (3*TICRATE) && (cmd->buttons & BT_SPIN || cmd->buttons & BT_JUMP) && (!continuesInSession || player->continues > 0))
G_UseContinue();
@@ -9680,7 +9644,7 @@ consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", 0, CV_OnOff, NULL);
consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange);
consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
-consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
+consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT, NULL, NULL);
@@ -9689,30 +9653,30 @@ consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", 0, CV_OnOff, NULL);
consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange);
consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
-consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
+consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE, CV_OnOff, NULL);
// [standard vs simple][p1 or p2]
consvar_t cv_cam_savedist[2][2] = {
{ // standard
- CVAR_INIT ("cam_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
},
{ // simple
- CVAR_INIT ("cam_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
}
};
consvar_t cv_cam_saveheight[2][2] = {
{ // standard
- CVAR_INIT ("cam_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_height", "40", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_height", "40", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
},
{ // simple
- CVAR_INIT ("cam_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
- CVAR_INIT ("cam2_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
+ CVAR_INIT ("cam_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
}
};
@@ -9897,17 +9861,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (P_CameraThinker(player, thiscam, resetcalled))
return true;
- if (tutorialmode)
- {
- // force defaults because we have a camera look section
- camspeed = (INT32)(atof(cv_cam_speed.defaultvalue) * FRACUNIT);
- camstill = (!stricmp(cv_cam_still.defaultvalue, "off")) ? false : true;
- camorbit = (!stricmp(cv_cam_orbit.defaultvalue, "off")) ? false : true;
- camrotate = atoi(cv_cam_rotate.defaultvalue);
- camdist = FixedMul((INT32)(atof(cv_cam_dist.defaultvalue) * FRACUNIT), mo->scale);
- camheight = FixedMul((INT32)(atof(cv_cam_height.defaultvalue) * FRACUNIT), mo->scale);
- }
- else if (thiscam == &camera)
+ if (thiscam == &camera)
{
camspeed = cv_cam_speed.value;
camstill = cv_cam_still.value;
@@ -10522,7 +10476,7 @@ boolean P_SpectatorJoinGame(player_t *player)
else
changeto = (P_RandomFixed() & 1) + 1;
- if (!LUAh_TeamSwitch(player, changeto, true, false, false))
+ if (!LUA_HookTeamSwitch(player, changeto, true, false, false))
return false;
if (player->mo)
@@ -10539,7 +10493,7 @@ boolean P_SpectatorJoinGame(player_t *player)
{
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
+ LUA_HookViewpointSwitch(player, &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -10557,7 +10511,7 @@ boolean P_SpectatorJoinGame(player_t *player)
// respawn in place and sit there for the rest of the round.
if (!((gametyperules & GTR_HIDEFROZEN) && leveltime > (hidetime * TICRATE)))
{
- if (!LUAh_TeamSwitch(player, 3, true, false, false))
+ if (!LUA_HookTeamSwitch(player, 3, true, false, false))
return false;
if (player->mo)
{
@@ -10584,7 +10538,7 @@ boolean P_SpectatorJoinGame(player_t *player)
{
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
+ LUA_HookViewpointSwitch(player, &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -11378,6 +11332,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
mobj_t *mo = player->mo;
angle_t angle = player->drawangle;
fixed_t dist;
+ fixed_t heightoffset = ((mo->eflags & MFE_VERTICALFLIP) ? mo->height - (P_GetPlayerHeight(player) >> 1) : (P_GetPlayerHeight(player) >> 1));
panim_t panim = player->panim;
tic_t dashmode = min(player->dashmode, DASHMODE_MAX);
boolean underwater = mo->eflags & MFE_UNDERWATER;
@@ -11411,7 +11366,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
offsetV = i*P_ReturnThrustY(fume, fume->movedir, radiusV);
x = mo->x + radiusX + FixedMul(offsetH, factorX);
y = mo->y + radiusY + FixedMul(offsetH, factorY);
- z = mo->z + (mo->height >> 1) + offsetV;
+ z = mo->z + heightoffset + offsetV;
P_SpawnMobj(x, y, z, MT_SMALLBUBBLE)->scale = mo->scale >> 1;
}
@@ -11474,7 +11429,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
P_UnsetThingPosition(fume);
fume->x = mo->x + P_ReturnThrustX(fume, angle, dist);
fume->y = mo->y + P_ReturnThrustY(fume, angle, dist);
- fume->z = mo->z + ((mo->height - fume->height) >> 1);
+ fume->z = mo->z + heightoffset - (fume->height >> 1);
P_SetThingPosition(fume);
// If dashmode is high enough, spawn a trail
@@ -11496,6 +11451,9 @@ void P_PlayerThink(player_t *player)
I_Error("p_playerthink: players[%s].mo == NULL", sizeu1(playeri));
#endif
+ // Reset terrain blocked status for this frame
+ player->blocked = false;
+
// todo: Figure out what is actually causing these problems in the first place...
if (player->mo->health <= 0 && player->playerstate == PST_LIVE) //you should be DEAD!
{
@@ -11503,16 +11461,18 @@ void P_PlayerThink(player_t *player)
player->playerstate = PST_DEAD;
}
- if (player->bot)
+ if (player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN)
{
if (player->playerstate == PST_LIVE || player->playerstate == PST_DEAD)
{
if (B_CheckRespawn(player))
player->playerstate = PST_REBORN;
+ else
+ B_HandleFlightIndicator(player);
}
if (player->playerstate == PST_REBORN)
{
- LUAh_PlayerThink(player);
+ LUA_HookPlayer(player, HOOK(PlayerThink));
return;
}
}
@@ -11614,7 +11574,7 @@ void P_PlayerThink(player_t *player)
if (player->playerstate == PST_DEAD)
{
- LUAh_PlayerThink(player);
+ LUA_HookPlayer(player, HOOK(PlayerThink));
return;
}
}
@@ -11735,7 +11695,7 @@ void P_PlayerThink(player_t *player)
{
player->mo->flags2 &= ~MF2_SHADOW;
P_DeathThink(player);
- LUAh_PlayerThink(player);
+ LUA_HookPlayer(player, HOOK(PlayerThink));
return;
}
@@ -11777,7 +11737,7 @@ void P_PlayerThink(player_t *player)
{
if (P_SpectatorJoinGame(player))
{
- LUAh_PlayerThink(player);
+ LUA_HookPlayer(player, HOOK(PlayerThink));
return; // player->mo was removed.
}
}
@@ -11882,7 +11842,7 @@ void P_PlayerThink(player_t *player)
if (!player->mo)
{
- LUAh_PlayerThink(player);
+ LUA_HookPlayer(player, HOOK(PlayerThink));
return; // P_MovePlayer removed player->mo.
}
@@ -12265,7 +12225,7 @@ void P_PlayerThink(player_t *player)
player->losstime--;
// Flash player after being hit.
- if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1))
+ if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1) && player->playerstate == PST_LIVE)
player->mo->flags2 |= MF2_DONTDRAW;
else
player->mo->flags2 &= ~MF2_DONTDRAW;
@@ -12336,7 +12296,7 @@ void P_PlayerThink(player_t *player)
}
#undef dashmode
- LUAh_PlayerThink(player);
+ LUA_HookPlayer(player, HOOK(PlayerThink));
/*
// Colormap verification
@@ -12620,7 +12580,7 @@ void P_PlayerAfterThink(player_t *player)
player->mo->momz = tails->momz;
}
- if (G_CoopGametype() && tails->player && tails->player->bot != 1)
+ if (G_CoopGametype() && tails->player && tails->player->bot != BOT_2PAI)
{
player->mo->angle = tails->angle;
@@ -12631,14 +12591,14 @@ void P_PlayerAfterThink(player_t *player)
if (P_AproxDistance(player->mo->x - tails->x, player->mo->y - tails->y) > player->mo->radius)
player->powers[pw_carry] = CR_NONE;
- if (player->powers[pw_carry] != CR_NONE)
+ if (player->powers[pw_carry] == CR_PLAYER)
{
if (player->mo->state-states != S_PLAY_RIDE)
P_SetPlayerMobjState(player->mo, S_PLAY_RIDE);
if (tails->player && (tails->skin && ((skin_t *)(tails->skin))->sprites[SPR2_SWIM].numframes) && (tails->eflags & MFE_UNDERWATER))
tails->player->powers[pw_tailsfly] = 0;
}
- else
+ else if (player->powers[pw_carry] == CR_NONE)
P_SetTarget(&player->mo->tracer, NULL);
if (player-players == consoleplayer && botingame)
@@ -12741,9 +12701,15 @@ void P_PlayerAfterThink(player_t *player)
if (player->cmd.forwardmove || player->cmd.sidemove)
{
- rock->movedir = (player->cmd.angleturn << FRACBITS) + R_PointToAngle2(0, 0, player->cmd.forwardmove << FRACBITS, -player->cmd.sidemove << FRACBITS);
+ rock->flags2 |= MF2_STRONGBOX; // signifies the rock should not slow to a halt
+ if (twodlevel || (mo->flags2 & MF2_TWOD))
+ rock->movedir = mo->angle;
+ else
+ rock->movedir = (player->cmd.angleturn << FRACBITS) + R_PointToAngle2(0, 0, player->cmd.forwardmove << FRACBITS, -player->cmd.sidemove << FRACBITS);
P_Thrust(rock, rock->movedir, rock->scale >> 1);
}
+ else
+ rock->flags2 &= ~MF2_STRONGBOX;
mo->momx = rock->momx;
mo->momy = rock->momy;
@@ -12759,7 +12725,7 @@ void P_PlayerAfterThink(player_t *player)
mo->tics = walktics;
}
- P_TeleportMove(player->mo, rock->x, rock->y, rock->z + rock->height);
+ P_TeleportMove(player->mo, rock->x, rock->y, rock->z + ((mo->eflags & MFE_VERTICALFLIP) ? -mo->height : rock->height));
break;
}
case CR_PTERABYTE: // being carried by a Pterabyte
@@ -12797,12 +12763,12 @@ void P_PlayerAfterThink(player_t *player)
if (!ptera->movefactor)
goto dropoff;
- if (ptera->cusval >= 50)
+ if (ptera->cusval >= 30)
{
player->powers[pw_carry] = CR_NONE;
P_SetTarget(&player->mo->tracer, NULL);
P_KillMobj(ptera, player->mo, player->mo, 0);
- player->mo->momz = 9*FRACUNIT;
+ P_SetObjectMomZ(player->mo, 12*FRACUNIT, false);
player->pflags |= PF_APPLYAUTOBRAKE|PF_JUMPED|PF_THOKKED;
P_SetMobjState(player->mo, S_PLAY_ROLL);
break;
@@ -12899,7 +12865,7 @@ void P_PlayerAfterThink(player_t *player)
if (player->followmobj)
{
- if (LUAh_FollowMobj(player, player->followmobj) || P_MobjWasRemoved(player->followmobj))
+ if (LUA_HookFollowMobj(player, player->followmobj) || P_MobjWasRemoved(player->followmobj))
{;}
else
{
@@ -12984,25 +12950,29 @@ boolean P_PlayerFullbright(player_t *player)
// returns true if the player can enter a sector that they could not if standing at their skin's full height
boolean P_PlayerCanEnterSpinGaps(player_t *player)
{
- UINT8 canEnter = LUAh_PlayerCanEnterSpinGaps(player);
+ UINT8 canEnter = LUA_HookPlayerCanEnterSpinGaps(player);
if (canEnter == 1)
return true;
else if (canEnter == 2)
return false;
- return ((player->pflags & (PF_SPINNING|PF_GLIDING)) // players who are spinning or gliding
+ return ((player->pflags & (PF_SPINNING|PF_SLIDING|PF_GLIDING)) // players who are spinning, sliding, or gliding
|| (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING) // players who are landing from a glide
+ || ((player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)
+ && player->dashmode >= DASHMODE_THRESHOLD && player->mo->state-states == S_PLAY_DASH) // machine players in dashmode
|| JUMPCURLED(player)); // players who are jumpcurled, but only if they would normally jump that way
}
// returns true if the player should use their skin's spinheight instead of their skin's height
boolean P_PlayerShouldUseSpinHeight(player_t *player)
{
- return ((player->pflags & (PF_SPINNING|PF_GLIDING))
+ return ((player->pflags & (PF_SPINNING|PF_SLIDING|PF_GLIDING))
|| (player->mo->state == &states[player->mo->info->painstate])
|| (player->panim == PA_ROLL)
|| ((player->powers[pw_tailsfly] || (player->charability == CA_FLY && player->mo->state-states == S_PLAY_FLY_TIRED))
&& !(player->charflags & SF_NOJUMPSPIN))
|| (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING)
+ || ((player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)
+ && player->dashmode >= DASHMODE_THRESHOLD && player->mo->state-states == S_PLAY_DASH)
|| JUMPCURLED(player));
}
diff --git a/src/r_bsp.c b/src/r_bsp.c
index 5acd4e70c5fa083eaf675055be9d623e15f014e3..c9f2698166aed732ac9c9d69834b1d305809466f 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -804,7 +804,7 @@ static void R_AddPolyObjects(subsector_t *sub)
}
// for render stats
- ps_numpolyobjects += numpolys;
+ ps_numpolyobjects.value.i += numpolys;
// sort polyobjects
R_SortPolyObjects(sub);
@@ -1239,7 +1239,7 @@ void R_RenderBSPNode(INT32 bspnum)
node_t *bsp;
INT32 side;
- ps_numbspcalls++;
+ ps_numbspcalls.value.i++;
while (!(bspnum & NF_SUBSECTOR)) // Found a subsector?
{
diff --git a/src/r_bsp.h b/src/r_bsp.h
index 40d24ffece796beb2fcdb1cd2cb5289ad30206ed..88757cf4bccfd6d2b16812c4a889aa19ea32f384 100644
--- a/src/r_bsp.h
+++ b/src/r_bsp.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_data.c b/src/r_data.c
index 2cfe9cb7ace3139d40a32a9d8dd0ba21afa9b794..51ed15dd6961f4e7b0cddd705fd8a9d032a3360d 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_data.h b/src/r_data.h
index 571fdc54f0a20e795f97704e6a2ef173bb6fdb82..63772e7b08380ed402b1faf7706642e0ca39dbfb 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -30,9 +30,6 @@ typedef struct
size_t numlumps;
} lumplist_t;
-// Possible alpha types for a patch.
-enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY};
-
UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
UINT8 ASTBlendPaletteIndexes(UINT8 background, UINT8 foreground, int style, UINT8 alpha);
diff --git a/src/r_defs.h b/src/r_defs.h
index 1be3a1b8cdce5f365acc957c7087ab7a7cc9c331..c6467a970e0a03cfe56c60d2c59a9afb57d8cc8c 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -184,6 +184,7 @@ typedef struct ffloor_s
INT32 lastlight;
INT32 alpha;
+ UINT8 blend; // blendmode
tic_t norender; // for culling
// these are saved for netgames, so do not let Lua touch these!
@@ -397,6 +398,7 @@ typedef struct line_s
// Visual appearance: sidedefs.
UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided
fixed_t alpha; // translucency
+ UINT8 blendmode; // blendmode
INT32 executordelay;
fixed_t bbox[4]; // bounding box for the extent of the linedef
@@ -713,6 +715,9 @@ typedef struct
#pragma pack()
#endif
+// Possible alpha types for a patch.
+enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY, AST_FOG};
+
typedef enum
{
RF_HORIZONTALFLIP = 0x0001, // Flip sprite horizontally
@@ -726,17 +731,19 @@ typedef enum
RF_NOSPLATBILLBOARD = 0x0040, // Don't billboard floor sprites (faces forward from the view angle)
RF_NOSPLATROLLANGLE = 0x0080, // Don't rotate floor sprites by the object's rollangle (uses rotated patches instead)
- RF_BLENDMASK = 0x0F00, // --Blending modes
- RF_FULLBRIGHT = 0x0100, // Sprite is drawn at full brightness
- RF_FULLDARK = 0x0200, // Sprite is drawn completely dark
- RF_NOCOLORMAPS = 0x0400, // Sprite is not drawn with colormaps
+ RF_BRIGHTMASK = 0x00000300, // --Bright modes
+ RF_FULLBRIGHT = 0x00000100, // Sprite is drawn at full brightness
+ RF_FULLDARK = 0x00000200, // Sprite is drawn completely dark
+ RF_SEMIBRIGHT = (RF_FULLBRIGHT | RF_FULLDARK), // between sector bright and full bright
+
+ RF_NOCOLORMAPS = 0x00000400, // Sprite is not drawn with colormaps
- RF_SPRITETYPEMASK = 0x7000, // ---Different sprite types
- RF_PAPERSPRITE = 0x1000, // Paper sprite
- RF_FLOORSPRITE = 0x2000, // Floor sprite
+ RF_SPRITETYPEMASK = 0x00003000, // --Different sprite types
+ RF_PAPERSPRITE = 0x00001000, // Paper sprite
+ RF_FLOORSPRITE = 0x00002000, // Floor sprite
- RF_SHADOWDRAW = 0x10000, // Stretches and skews the sprite like a shadow.
- RF_SHADOWEFFECTS = 0x20000, // Scales and becomes transparent like a shadow.
+ RF_SHADOWDRAW = 0x00004000, // Stretches and skews the sprite like a shadow.
+ RF_SHADOWEFFECTS = 0x00008000, // Scales and becomes transparent like a shadow.
RF_DROPSHADOW = (RF_SHADOWDRAW | RF_SHADOWEFFECTS | RF_FULLDARK),
} renderflags_t;
diff --git a/src/r_draw.c b/src/r_draw.c
index 9a835ee5840c7e087256109f87ffef9f01bcf22c..e12d7ebdd46027973fcaa45f6c0ad4eeacca6ceb 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -25,6 +25,7 @@
#include "w_wad.h"
#include "z_zone.h"
#include "console.h" // Until buffering gets finished
+#include "libdivide.h" // used by NPO2 tilted span functions
#ifdef HWRENDER
#include "hardware/hw_main.h"
@@ -247,6 +248,9 @@ static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
result.s.green = max(0, result.s.green - blendamt);
result.s.blue = max(0, result.s.blue - blendamt);
+ //probably incorrect, but does look better at lower opacity...
+ //result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
+
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
}
}
@@ -341,7 +345,7 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel)
{
size_t offs;
- if (style == AST_COPY || style == AST_OVERLAY)
+ if (style <= AST_COPY || style >= AST_OVERLAY)
return NULL;
offs = (ClipBlendLevel(style, alphalevel) << FF_TRANSSHIFT);
@@ -371,7 +375,7 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel)
boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel)
{
- if (blendmode == AST_COPY || blendmode == AST_SUBTRACT || blendmode == AST_MODULATE || blendmode == AST_OVERLAY)
+ if (blendmode <= AST_COPY || blendmode == AST_SUBTRACT || blendmode == AST_MODULATE || blendmode >= AST_OVERLAY)
return true;
return (alphalevel < BlendTab_Count[BlendTab_FromStyle[blendmode]]);
@@ -481,8 +485,12 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
// White!
if (skinnum == TC_BOSS)
{
+ UINT8 *originalColormap = R_GetTranslationColormap(TC_DEFAULT, (skincolornum_t)color, GTC_CACHE);
for (i = 0; i < 16; i++)
+ {
+ dest_colormap[DEFAULT_STARTTRANSCOLOR + i] = originalColormap[DEFAULT_STARTTRANSCOLOR + i];
dest_colormap[31-i] = i;
+ }
}
else if (skinnum == TC_METALSONIC)
{
diff --git a/src/r_draw.h b/src/r_draw.h
index caf43fd89d7ba5451eed376ef08591c71a25efa8..c96b29e3016dfc464c09197786c0eeba283d552d 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -170,6 +170,7 @@ void R_DrawViewBorder(void);
void R_DrawColumn_8(void);
void R_DrawShadeColumn_8(void);
void R_DrawTranslucentColumn_8(void);
+void R_DrawDropShadowColumn_8(void);
void R_DrawTranslatedColumn_8(void);
void R_DrawTranslatedTranslucentColumn_8(void);
void R_Draw2sMultiPatchColumn_8(void);
@@ -177,7 +178,7 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void);
void R_DrawFogColumn_8(void);
void R_DrawColumnShadowed_8(void);
-#define PLANELIGHTFLOAT (BASEVIDWIDTH * BASEVIDWIDTH / vid.width / (zeroheight - FIXED_TO_FLOAT(viewz)) / 21.0f * FIXED_TO_FLOAT(fovtan))
+#define PLANELIGHTFLOAT (BASEVIDWIDTH * BASEVIDWIDTH / vid.width / zeroheight / 21.0f * FIXED_TO_FLOAT(fovtan))
void R_DrawSpan_8(void);
void R_DrawTranslucentSpan_8(void);
diff --git a/src/r_draw16.c b/src/r_draw16.c
index 1a2fed77316b6fd80c6b91f5d1357e1b47eee99f..763fd1631e7ac57208c6901adc0cd57df4c71e16 100644
--- a/src/r_draw16.c
+++ b/src/r_draw16.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_draw8.c b/src/r_draw8.c
index 1f451115eba2108c59b6188232d5b88bd3aacb74..c9a9e957502ba09444fb9b9f3aca8f51540d1d01 100644
--- a/src/r_draw8.c
+++ b/src/r_draw8.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -416,6 +416,39 @@ void R_DrawTranslucentColumn_8(void)
}
}
+// Hack: A cut-down copy of R_DrawTranslucentColumn_8 that does not read texture
+// data since something about calculating the texture reading address for drop shadows is broken.
+// dc_texturemid and dc_iscale get wrong values for drop shadows, however those are not strictly
+// needed for the current design of the shadows, so this function bypasses the issue
+// by not using those variables at all.
+void R_DrawDropShadowColumn_8(void)
+{
+ register INT32 count;
+ register UINT8 *dest;
+
+ count = dc_yh - dc_yl + 1;
+
+ if (count <= 0) // Zero length, column does not exceed a pixel.
+ return;
+
+ dest = &topleft[dc_yl*vid.width + dc_x];
+
+ {
+#define DSCOLOR 31 // palette index for the color of the shadow
+ register const UINT8 *transmap_offset = dc_transmap + (dc_colormap[DSCOLOR] << 8);
+#undef DSCOLOR
+ while ((count -= 2) >= 0)
+ {
+ *dest = *(transmap_offset + (*dest));
+ dest += vid.width;
+ *dest = *(transmap_offset + (*dest));
+ dest += vid.width;
+ }
+ if (count & 1)
+ *dest = *(transmap_offset + (*dest));
+ }
+}
+
/** \brief The R_DrawTranslatedTranslucentColumn_8 function
Spiffy function. Not only does it colormap a sprite, but does translucency as well.
Uber-kudos to Cyan Helkaraxe
@@ -693,8 +726,8 @@ void R_DrawTiltedSpan_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
@@ -726,8 +759,8 @@ void R_DrawTiltedSpan_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
@@ -763,8 +796,8 @@ void R_DrawTiltedSpan_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
@@ -826,8 +859,8 @@ void R_DrawTiltedTranslucentSpan_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
@@ -858,8 +891,8 @@ void R_DrawTiltedTranslucentSpan_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
@@ -895,8 +928,8 @@ void R_DrawTiltedTranslucentSpan_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
@@ -960,8 +993,8 @@ void R_DrawTiltedTranslucentWaterSpan_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dsrc++);
@@ -992,8 +1025,8 @@ void R_DrawTiltedTranslucentWaterSpan_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
@@ -1029,8 +1062,8 @@ void R_DrawTiltedTranslucentWaterSpan_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
@@ -1091,8 +1124,8 @@ void R_DrawTiltedSplat_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
@@ -1127,8 +1160,8 @@ void R_DrawTiltedSplat_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
@@ -1168,8 +1201,8 @@ void R_DrawTiltedSplat_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
@@ -1227,8 +1260,9 @@ void R_DrawSplat_8 (void)
// need!
//
// <Callum> 4194303 = (2048x2048)-1 (2048x2048 is maximum flat size)
+ // Why decimal? 0x3FFFFF == 4194303... ~Golden
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[0] = colormap[val];
@@ -1236,7 +1270,7 @@ void R_DrawSplat_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[1] = colormap[val];
@@ -1244,7 +1278,7 @@ void R_DrawSplat_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[2] = colormap[val];
@@ -1252,7 +1286,7 @@ void R_DrawSplat_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[3] = colormap[val];
@@ -1260,7 +1294,7 @@ void R_DrawSplat_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[4] = colormap[val];
@@ -1268,7 +1302,7 @@ void R_DrawSplat_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[5] = colormap[val];
@@ -1276,7 +1310,7 @@ void R_DrawSplat_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[6] = colormap[val];
@@ -1284,7 +1318,7 @@ void R_DrawSplat_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
+ val &= 0x3FFFFF;
val = source[val];
if (val != TRANSPARENTPIXEL)
dest[7] = colormap[val];
@@ -1672,8 +1706,8 @@ void R_DrawTiltedFloorSprite_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
@@ -1712,8 +1746,8 @@ void R_DrawTiltedFloorSprite_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
@@ -1781,8 +1815,8 @@ void R_DrawTiltedTranslucentFloorSprite_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
@@ -1821,8 +1855,8 @@ void R_DrawTiltedTranslucentFloorSprite_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
diff --git a/src/r_draw8_npo2.c b/src/r_draw8_npo2.c
index 6bb2880b23a27496b7bad19e1b5e1cc2a7ff934c..49ec28dd8d0c7a8394c614ad3900ab88a5d0c7b9 100644
--- a/src/r_draw8_npo2.c
+++ b/src/r_draw8_npo2.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -106,6 +106,9 @@ void R_DrawTiltedSpan_NPO2_8(void)
double endz, endu, endv;
UINT32 stepu, stepv;
+ struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth);
+ struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight);
+
iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
// Lighting is simple. It's just linear interpolation from start to end
@@ -133,24 +136,25 @@ void R_DrawTiltedSpan_NPO2_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = colormap[source[((y * ds_flatwidth) + x)]];
}
@@ -181,25 +185,26 @@ void R_DrawTiltedSpan_NPO2_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = colormap[source[((y * ds_flatwidth) + x)]];
}
@@ -220,17 +225,18 @@ void R_DrawTiltedSpan_NPO2_8(void)
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = colormap[source[((y * ds_flatwidth) + x)]];
}
@@ -248,25 +254,26 @@ void R_DrawTiltedSpan_NPO2_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = colormap[source[((y * ds_flatwidth) + x)]];
}
@@ -299,6 +306,9 @@ void R_DrawTiltedTranslucentSpan_NPO2_8(void)
double endz, endu, endv;
UINT32 stepu, stepv;
+ struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth);
+ struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight);
+
iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
// Lighting is simple. It's just linear interpolation from start to end
@@ -326,23 +336,24 @@ void R_DrawTiltedTranslucentSpan_NPO2_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
}
@@ -373,25 +384,26 @@ void R_DrawTiltedTranslucentSpan_NPO2_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
}
@@ -412,17 +424,18 @@ void R_DrawTiltedTranslucentSpan_NPO2_8(void)
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
}
@@ -440,25 +453,26 @@ void R_DrawTiltedTranslucentSpan_NPO2_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
}
@@ -490,6 +504,9 @@ void R_DrawTiltedSplat_NPO2_8(void)
double endz, endu, endv;
UINT32 stepu, stepv;
+ struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth);
+ struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight);
+
iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
// Lighting is simple. It's just linear interpolation from start to end
@@ -517,24 +534,25 @@ void R_DrawTiltedSplat_NPO2_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
}
@@ -569,25 +587,26 @@ void R_DrawTiltedSplat_NPO2_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
}
@@ -610,17 +629,18 @@ void R_DrawTiltedSplat_NPO2_8(void)
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
}
@@ -640,26 +660,26 @@ void R_DrawTiltedSplat_NPO2_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
}
@@ -972,6 +992,9 @@ void R_DrawTiltedFloorSprite_NPO2_8(void)
double endz, endu, endv;
UINT32 stepu, stepv;
+ struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth);
+ struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight);
+
iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
@@ -1002,23 +1025,24 @@ void R_DrawTiltedFloorSprite_NPO2_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
// Lactozilla: Non-powers-of-two
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
if (val & 0xFF00)
@@ -1040,17 +1064,18 @@ void R_DrawTiltedFloorSprite_NPO2_8(void)
v = (INT64)(startv);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
if (val & 0xFF00)
@@ -1070,23 +1095,24 @@ void R_DrawTiltedFloorSprite_NPO2_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
// Lactozilla: Non-powers-of-two
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
if (val & 0xFF00)
@@ -1122,6 +1148,9 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void)
double endz, endu, endv;
UINT32 stepu, stepv;
+ struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth);
+ struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight);
+
iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
@@ -1152,23 +1181,24 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
// Lactozilla: Non-powers-of-two
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
if (val & 0xFF00)
@@ -1190,17 +1220,18 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void)
v = (INT64)(startv);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
if (val & 0xFF00)
@@ -1220,23 +1251,24 @@ void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
// Lactozilla: Non-powers-of-two
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
val = source[((y * ds_flatwidth) + x)];
if (val & 0xFF00)
@@ -1401,6 +1433,9 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
double endz, endu, endv;
UINT32 stepu, stepv;
+ struct libdivide_u32_t x_divider = libdivide_u32_gen(ds_flatwidth);
+ struct libdivide_u32_t y_divider = libdivide_u32_gen(ds_flatheight);
+
iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
// Lighting is simple. It's just linear interpolation from start to end
@@ -1429,23 +1464,24 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
do
{
double z = 1.f/iz;
- u = (INT64)(uz*z) + viewx;
- v = (INT64)(vz*z) + viewy;
+ u = (INT64)(uz*z);
+ v = (INT64)(vz*z);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dsrc++);
}
@@ -1476,25 +1512,26 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
endv = vz*endz;
stepu = (INT64)((endu - startu) * INVSPAN);
stepv = (INT64)((endv - startv) * INVSPAN);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (i = SPANSIZE-1; i >= 0; i--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dsrc++);
}
@@ -1515,17 +1552,18 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dsrc++);
}
@@ -1543,25 +1581,26 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
left = 1.f/left;
stepu = (INT64)((endu - startu) * left);
stepv = (INT64)((endv - startv) * left);
- u = (INT64)(startu) + viewx;
- v = (INT64)(startv) + viewy;
+ u = (INT64)(startu);
+ v = (INT64)(startv);
for (; width != 0; width--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
// Lactozilla: Non-powers-of-two
{
- fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
- fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+ fixed_t x = (((fixed_t)u) >> FRACBITS);
+ fixed_t y = (((fixed_t)v) >> FRACBITS);
// Carefully align all of my Friends.
if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ x += (libdivide_u32_do((UINT32)(-x-1), &x_divider) + 1) * ds_flatwidth;
+ else
+ x -= libdivide_u32_do((UINT32)x, &x_divider) * ds_flatwidth;
if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
-
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ y += (libdivide_u32_do((UINT32)(-y-1), &y_divider) + 1) * ds_flatheight;
+ else
+ y -= libdivide_u32_do((UINT32)y, &y_divider) * ds_flatheight;
*dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dsrc++);
}
diff --git a/src/r_local.h b/src/r_local.h
index ba78ea87dbae64b69864e8afcbd05915113e6af5..a5b590e5cea24dff0cb63952241ce8b8bd9975fb 100644
--- a/src/r_local.h
+++ b/src/r_local.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_main.c b/src/r_main.c
index cb0c10a57065fb5cc21b0da513ed400e0b33cd52..74b48d35e838280aebf06626eea53815734e6cdf 100755
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -101,21 +101,22 @@ extracolormap_t *extra_colormaps = NULL;
// Render stats
precise_t ps_prevframetime = 0;
-precise_t ps_rendercalltime = 0;
-precise_t ps_uitime = 0;
-precise_t ps_swaptime = 0;
+ps_metric_t ps_rendercalltime = {0};
+ps_metric_t ps_otherrendertime = {0};
+ps_metric_t ps_uitime = {0};
+ps_metric_t ps_swaptime = {0};
-precise_t ps_bsptime = 0;
+ps_metric_t ps_bsptime = {0};
-precise_t ps_sw_spritecliptime = 0;
-precise_t ps_sw_portaltime = 0;
-precise_t ps_sw_planetime = 0;
-precise_t ps_sw_maskedtime = 0;
+ps_metric_t ps_sw_spritecliptime = {0};
+ps_metric_t ps_sw_portaltime = {0};
+ps_metric_t ps_sw_planetime = {0};
+ps_metric_t ps_sw_maskedtime = {0};
-int ps_numbspcalls = 0;
-int ps_numsprites = 0;
-int ps_numdrawnodes = 0;
-int ps_numpolyobjects = 0;
+ps_metric_t ps_numbspcalls = {0};
+ps_metric_t ps_numsprites = {0};
+ps_metric_t ps_numdrawnodes = {0};
+ps_metric_t ps_numpolyobjects = {0};
static CV_PossibleValue_t drawdist_cons_t[] = {
{256, "256"}, {512, "512"}, {768, "768"},
@@ -955,7 +956,7 @@ void R_ExecuteSetViewSize(void)
j = viewheight*16;
for (i = 0; i < j; i++)
{
- dy = ((i - viewheight*8)<<FRACBITS) + FRACUNIT/2;
+ dy = (i - viewheight*8)<<FRACBITS;
dy = FixedMul(abs(dy), fovtan);
yslopetab[i] = FixedDiv(centerx*FRACUNIT, dy);
}
@@ -1449,7 +1450,7 @@ static void Mask_Post (maskcount_t* m)
void R_RenderPlayerView(player_t *player)
{
- UINT8 nummasks = 1;
+ INT32 nummasks = 1;
maskcount_t* masks = malloc(sizeof(maskcount_t));
if (cv_homremoval.value && player == &players[displayplayer]) // if this is display player 1
@@ -1496,11 +1497,11 @@ void R_RenderPlayerView(player_t *player)
mytotal = 0;
ProfZeroTimer();
#endif
- ps_numbspcalls = ps_numpolyobjects = ps_numdrawnodes = 0;
- ps_bsptime = I_GetPreciseTime();
+ ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0;
+ PS_START_TIMING(ps_bsptime);
R_RenderBSPNode((INT32)numnodes - 1);
- ps_bsptime = I_GetPreciseTime() - ps_bsptime;
- ps_numsprites = visspritecount;
+ PS_STOP_TIMING(ps_bsptime);
+ ps_numsprites.value.i = visspritecount;
#ifdef TIMING
RDMSR(0x10, &mycount);
mytotal += mycount; // 64bit add
@@ -1510,9 +1511,9 @@ void R_RenderPlayerView(player_t *player)
//profile stuff ---------------------------------------------------------
Mask_Post(&masks[nummasks - 1]);
- ps_sw_spritecliptime = I_GetPreciseTime();
+ PS_START_TIMING(ps_sw_spritecliptime);
R_ClipSprites(drawsegs, NULL);
- ps_sw_spritecliptime = I_GetPreciseTime() - ps_sw_spritecliptime;
+ PS_STOP_TIMING(ps_sw_spritecliptime);
// Add skybox portals caused by sky visplanes.
@@ -1520,7 +1521,7 @@ void R_RenderPlayerView(player_t *player)
Portal_AddSkyboxPortals();
// Portal rendering. Hijacks the BSP traversal.
- ps_sw_portaltime = I_GetPreciseTime();
+ PS_START_TIMING(ps_sw_portaltime);
if (portal_base)
{
portal_t *portal;
@@ -1560,17 +1561,17 @@ void R_RenderPlayerView(player_t *player)
Portal_Remove(portal);
}
}
- ps_sw_portaltime = I_GetPreciseTime() - ps_sw_portaltime;
+ PS_STOP_TIMING(ps_sw_portaltime);
- ps_sw_planetime = I_GetPreciseTime();
+ PS_START_TIMING(ps_sw_planetime);
R_DrawPlanes();
- ps_sw_planetime = I_GetPreciseTime() - ps_sw_planetime;
+ PS_STOP_TIMING(ps_sw_planetime);
// draw mid texture and sprite
// And now 3D floors/sides!
- ps_sw_maskedtime = I_GetPreciseTime();
+ PS_START_TIMING(ps_sw_maskedtime);
R_DrawMasked(masks, nummasks);
- ps_sw_maskedtime = I_GetPreciseTime() - ps_sw_maskedtime;
+ PS_STOP_TIMING(ps_sw_maskedtime);
free(masks);
}
diff --git a/src/r_main.h b/src/r_main.h
index f81447c456b8866cf9a0c1347c32a20ca7b7f057..c0edb31b30175295ecbf9fba247ef49a699953b9 100644
--- a/src/r_main.h
+++ b/src/r_main.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -17,6 +17,7 @@
#include "d_player.h"
#include "r_data.h"
#include "r_textures.h"
+#include "m_perfstats.h" // ps_metric_t
//
// POV related.
@@ -79,21 +80,22 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe
// Render stats
extern precise_t ps_prevframetime;// time when previous frame was rendered
-extern precise_t ps_rendercalltime;
-extern precise_t ps_uitime;
-extern precise_t ps_swaptime;
-
-extern precise_t ps_bsptime;
-
-extern precise_t ps_sw_spritecliptime;
-extern precise_t ps_sw_portaltime;
-extern precise_t ps_sw_planetime;
-extern precise_t ps_sw_maskedtime;
-
-extern int ps_numbspcalls;
-extern int ps_numsprites;
-extern int ps_numdrawnodes;
-extern int ps_numpolyobjects;
+extern ps_metric_t ps_rendercalltime;
+extern ps_metric_t ps_otherrendertime;
+extern ps_metric_t ps_uitime;
+extern ps_metric_t ps_swaptime;
+
+extern ps_metric_t ps_bsptime;
+
+extern ps_metric_t ps_sw_spritecliptime;
+extern ps_metric_t ps_sw_portaltime;
+extern ps_metric_t ps_sw_planetime;
+extern ps_metric_t ps_sw_maskedtime;
+
+extern ps_metric_t ps_numbspcalls;
+extern ps_metric_t ps_numsprites;
+extern ps_metric_t ps_numdrawnodes;
+extern ps_metric_t ps_numpolyobjects;
//
// REFRESH - the actual rendering functions.
diff --git a/src/r_patch.c b/src/r_patch.c
index 6827cd12c75d397fdaa771f3373c5d4812a83952..e771e5c94d4ed4a381ee7ddeb937a5e146ecef5f 100644
--- a/src/r_patch.c
+++ b/src/r_patch.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos.
+// Copyright (C) 2020-2022 by Jaime "Lactozilla" Passos.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_patch.h b/src/r_patch.h
index 96fbb0e28c11d3bbd91f84edc999a7d6d5223c70..26c28e1f9c4bbfb2a1b46b55e8fd737a0a0b3804 100644
--- a/src/r_patch.h
+++ b/src/r_patch.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos.
+// Copyright (C) 2020-2022 by Jaime "Lactozilla" Passos.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_patchrotation.c b/src/r_patchrotation.c
index a9b4a2b8fb701d45f7f21deefee1f75c768ee797..b24e065ba6cfb172ce926805e4557c11b693a00e 100644
--- a/src/r_patchrotation.c
+++ b/src/r_patchrotation.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos.
+// Copyright (C) 2020-2022 by Jaime "Lactozilla" Passos.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -230,7 +230,7 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
width = (maxx - minx);
height = (maxy - miny);
- if ((unsigned)(width * height) != size)
+ if ((unsigned)(width * height) > size)
{
UINT16 *src, *dest;
diff --git a/src/r_patchrotation.h b/src/r_patchrotation.h
index 689b7d411b63d0143804d789da0501fb1f0d1415..e6bee80edd77392f60a6880aeafb0f1984ee352d 100644
--- a/src/r_patchrotation.h
+++ b/src/r_patchrotation.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by Jaime "Lactozilla" Passos.
+// Copyright (C) 2020-2022 by Jaime "Lactozilla" Passos.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_picformats.c b/src/r_picformats.c
index 3bbbf82ec7d026b2f837f1dbfb187bfbb1682245..6aa4659b9ea7288272d0d779f007391955a5bba6 100644
--- a/src/r_picformats.c
+++ b/src/r_picformats.c
@@ -2,8 +2,8 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 2005-2009 by Andrey "entryway" Budko.
-// Copyright (C) 2018-2021 by Jaime "Lactozilla" Passos.
-// Copyright (C) 2019-2021 by Sonic Team Junior.
+// Copyright (C) 2018-2022 by Jaime "Lactozilla" Passos.
+// Copyright (C) 2019-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -540,9 +540,7 @@ void *Picture_GetPatchPixel(
{
fixed_t ofs;
column_t *column;
- UINT8 *s8 = NULL;
- UINT16 *s16 = NULL;
- UINT32 *s32 = NULL;
+ INT32 inbpp = Picture_FormatBPP(informat);
softwarepatch_t *doompatch = (softwarepatch_t *)patch;
boolean isdoompatch = Picture_IsDoomPatchFormat(informat);
INT16 width;
@@ -566,30 +564,36 @@ void *Picture_GetPatchPixel(
while (column->topdelta != 0xff)
{
+ UINT8 *s8 = NULL;
+ UINT16 *s16 = NULL;
+ UINT32 *s32 = NULL;
+
topdelta = column->topdelta;
if (topdelta <= prevdelta)
topdelta += prevdelta;
prevdelta = topdelta;
- s8 = (UINT8 *)(column) + 3;
- if (Picture_FormatBPP(informat) == PICDEPTH_32BPP)
- s32 = (UINT32 *)s8;
- else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP)
- s16 = (UINT16 *)s8;
- for (ofs = 0; ofs < column->length; ofs++)
+
+ ofs = (y - topdelta);
+
+ if (y >= topdelta && ofs < column->length)
{
- if ((topdelta + ofs) == y)
+ s8 = (UINT8 *)(column) + 3;
+ switch (inbpp)
{
- if (Picture_FormatBPP(informat) == PICDEPTH_32BPP)
+ case PICDEPTH_32BPP:
+ s32 = (UINT32 *)s8;
return &s32[ofs];
- else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP)
+ case PICDEPTH_16BPP:
+ s16 = (UINT16 *)s8;
return &s16[ofs];
- else // PICDEPTH_8BPP
+ default: // PICDEPTH_8BPP
return &s8[ofs];
}
}
- if (Picture_FormatBPP(informat) == PICDEPTH_32BPP)
+
+ if (inbpp == PICDEPTH_32BPP)
column = (column_t *)((UINT32 *)column + column->length);
- else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP)
+ else if (inbpp == PICDEPTH_16BPP)
column = (column_t *)((UINT16 *)column + column->length);
else
column = (column_t *)((UINT8 *)column + column->length);
@@ -897,9 +901,8 @@ static png_bytep *PNG_Read(
png_colorp palette;
int palette_size;
- png_bytep trans;
- int trans_num;
- png_color_16p trans_values;
+ png_bytep trans = NULL;
+ int num_trans = 0;
#ifdef PNG_SETJMP_SUPPORTED
#ifdef USE_FAR_KEYWORD
@@ -979,8 +982,8 @@ static png_bytep *PNG_Read(
for (i = 0; i < 256; i++)
{
- UINT32 rgb = R_PutRgbaRGBA(pal->red, pal->green, pal->blue, 0xFF);
- if (rgb != pMasterPalette[i].rgba)
+ byteColor_t *curpal = &(pMasterPalette[i].s);
+ if (pal->red != curpal->red || pal->green != curpal->green || pal->blue != curpal->blue)
{
usepal = false;
break;
@@ -994,14 +997,14 @@ static png_bytep *PNG_Read(
// color is present on the image, the palette flag is disabled.
if (usepal)
{
- png_get_tRNS(png_ptr, png_info_ptr, &trans, &trans_num, &trans_values);
+ png_uint_32 result = png_get_tRNS(png_ptr, png_info_ptr, &trans, &num_trans, NULL);
- if (trans && trans_num == 256)
+ if ((result & PNG_INFO_tRNS) && num_trans > 0 && trans != NULL)
{
INT32 i;
- for (i = 0; i < trans_num; i++)
+ for (i = 0; i < num_trans; i++)
{
- // libpng will transform this image into RGB even if
+ // libpng will transform this image into RGBA even if
// the transparent index does not exist in the image,
// and there is no way around that.
if (trans[i] < 0xFF)
diff --git a/src/r_picformats.h b/src/r_picformats.h
index b1bb35edd0bbbf71522bb418736caa2968ace940..573fb494628662c2d9eec7f634aee49dfecaf9b5 100644
--- a/src/r_picformats.h
+++ b/src/r_picformats.h
@@ -1,8 +1,8 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
-// Copyright (C) 2018-2021 by Jaime "Lactozilla" Passos.
-// Copyright (C) 2019-2021 by Sonic Team Junior.
+// Copyright (C) 2018-2022 by Jaime "Lactozilla" Passos.
+// Copyright (C) 2019-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -116,9 +116,9 @@ void *Picture_PNGConvert(
size_t insize, size_t *outsize,
pictureflags_t flags);
boolean Picture_PNGDimensions(UINT8 *png, INT32 *width, INT32 *height, INT16 *topoffset, INT16 *leftoffset, size_t size);
-#endif
#define PICTURE_PNG_USELOOKUP
+#endif
// SpriteInfo
extern spriteinfo_t spriteinfo[NUMSPRITES];
diff --git a/src/r_plane.c b/src/r_plane.c
index ea4dfa4e8a8c13d4aad4ed8260d6da37e8fea00a..e31d52be9a904b2410061939bc1c5f867452382f 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -31,13 +31,6 @@
#include "z_zone.h"
#include "p_tick.h"
-#ifdef TIMING
-#include "p5prof.h"
- INT64 mycount;
- INT64 mytotal = 0;
- UINT32 nombre = 100000;
-#endif
-
//
// opening
//
@@ -96,14 +89,13 @@ static fixed_t planeheight;
fixed_t yslopetab[MAXVIDHEIGHT*16];
fixed_t *yslope;
-fixed_t basexscale, baseyscale;
-
fixed_t cachedheight[MAXVIDHEIGHT];
fixed_t cacheddistance[MAXVIDHEIGHT];
fixed_t cachedxstep[MAXVIDHEIGHT];
fixed_t cachedystep[MAXVIDHEIGHT];
static fixed_t xoffs, yoffs;
+static floatv3_t ds_slope_origin, ds_slope_u, ds_slope_v;
//
// R_InitPlanes
@@ -120,28 +112,27 @@ void R_InitPlanes(void)
// Sets planeripple.xfrac and planeripple.yfrac, added to ds_xfrac and ds_yfrac, if the span is not tilted.
//
-struct
+static struct
{
INT32 offset;
fixed_t xfrac, yfrac;
boolean active;
} planeripple;
-static void R_CalculatePlaneRipple(visplane_t *plane, INT32 y, fixed_t plheight, boolean calcfrac)
+// ripples da water texture
+static fixed_t R_CalculateRippleOffset(INT32 y)
{
- fixed_t distance = FixedMul(plheight, yslope[y]);
+ fixed_t distance = FixedMul(planeheight, yslope[y]);
const INT32 yay = (planeripple.offset + (distance>>9)) & 8191;
+ return FixedDiv(FINESINE(yay), (1<<12) + (distance>>11));
+}
- // ripples da water texture
- ds_bgofs = FixedDiv(FINESINE(yay), (1<<12) + (distance>>11))>>FRACBITS;
-
- if (calcfrac)
- {
- angle_t angle = (plane->viewangle + plane->plangle)>>ANGLETOFINESHIFT;
- angle = (angle + 2048) & 8191; // 90 degrees
- planeripple.xfrac = FixedMul(FINECOSINE(angle), (ds_bgofs<<FRACBITS));
- planeripple.yfrac = FixedMul(FINESINE(angle), (ds_bgofs<<FRACBITS));
- }
+static void R_CalculatePlaneRipple(angle_t angle)
+{
+ angle >>= ANGLETOFINESHIFT;
+ angle = (angle + 2048) & 8191; // 90 degrees
+ planeripple.xfrac = FixedMul(FINECOSINE(angle), ds_bgofs);
+ planeripple.yfrac = FixedMul(FINESINE(angle), ds_bgofs);
}
static void R_UpdatePlaneRipple(void)
@@ -150,16 +141,7 @@ static void R_UpdatePlaneRipple(void)
planeripple.offset = (leveltime * 140);
}
-//
-// R_MapPlane
-//
-// Uses global vars:
-// planeheight
-// basexscale
-// baseyscale
-// centerx
-
-void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
+static void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
{
angle_t angle, planecos, planesin;
fixed_t distance = 0, span;
@@ -173,60 +155,52 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
if (x1 >= vid.width)
x1 = vid.width - 1;
- if (!currentplane->slope)
+ angle = (currentplane->viewangle + currentplane->plangle)>>ANGLETOFINESHIFT;
+ planecos = FINECOSINE(angle);
+ planesin = FINESINE(angle);
+
+ if (planeheight != cachedheight[y])
{
- angle = (currentplane->viewangle + currentplane->plangle)>>ANGLETOFINESHIFT;
- planecos = FINECOSINE(angle);
- planesin = FINESINE(angle);
+ cachedheight[y] = planeheight;
+ cacheddistance[y] = distance = FixedMul(planeheight, yslope[y]);
+ span = abs(centery - y);
- if (planeheight != cachedheight[y])
+ if (span) // Don't divide by zero
{
- cachedheight[y] = planeheight;
- cacheddistance[y] = distance = FixedMul(planeheight, yslope[y]);
- span = abs(centery - y);
-
- if (span) // don't divide by zero
- {
- ds_xstep = FixedMul(planesin, planeheight) / span;
- ds_ystep = FixedMul(planecos, planeheight) / span;
- }
- else
- {
- ds_xstep = FixedMul(distance, basexscale);
- ds_ystep = FixedMul(distance, baseyscale);
- }
-
- cachedxstep[y] = ds_xstep;
- cachedystep[y] = ds_ystep;
+ ds_xstep = FixedMul(planesin, planeheight) / span;
+ ds_ystep = FixedMul(planecos, planeheight) / span;
}
else
- {
- distance = cacheddistance[y];
- ds_xstep = cachedxstep[y];
- ds_ystep = cachedystep[y];
- }
+ ds_xstep = ds_ystep = FRACUNIT;
- ds_xfrac = xoffs + FixedMul(planecos, distance) + (x1 - centerx) * ds_xstep;
- ds_yfrac = yoffs - FixedMul(planesin, distance) + (x1 - centerx) * ds_ystep;
+ cachedxstep[y] = ds_xstep;
+ cachedystep[y] = ds_ystep;
+ }
+ else
+ {
+ distance = cacheddistance[y];
+ ds_xstep = cachedxstep[y];
+ ds_ystep = cachedystep[y];
}
+ // [RH] Instead of using the xtoviewangle array, I calculated the fractional values
+ // at the middle of the screen, then used the calculated ds_xstep and ds_ystep
+ // to step from those to the proper texture coordinate to start drawing at.
+ // That way, the texture coordinate is always calculated by its position
+ // on the screen and not by its position relative to the edge of the visplane.
+ ds_xfrac = xoffs + FixedMul(planecos, distance) + (x1 - centerx) * ds_xstep;
+ ds_yfrac = yoffs - FixedMul(planesin, distance) + (x1 - centerx) * ds_ystep;
+
// Water ripple effect
if (planeripple.active)
{
- // Needed for ds_bgofs
- R_CalculatePlaneRipple(currentplane, y, planeheight, (!currentplane->slope));
+ ds_bgofs = R_CalculateRippleOffset(y);
- if (currentplane->slope)
- {
- ds_sup = &ds_su[y];
- ds_svp = &ds_sv[y];
- ds_szp = &ds_sz[y];
- }
- else
- {
- ds_xfrac += planeripple.xfrac;
- ds_yfrac += planeripple.yfrac;
- }
+ R_CalculatePlaneRipple(currentplane->viewangle + currentplane->plangle);
+
+ ds_xfrac += planeripple.xfrac;
+ ds_yfrac += planeripple.yfrac;
+ ds_bgofs >>= FRACBITS;
if ((y + ds_bgofs) >= viewheight)
ds_bgofs = viewheight-y-1;
@@ -234,16 +208,11 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
ds_bgofs = -y;
}
- if (currentplane->slope)
- ds_colormap = colormaps;
- else
- {
- pindex = distance >> LIGHTZSHIFT;
- if (pindex >= MAXLIGHTZ)
- pindex = MAXLIGHTZ - 1;
- ds_colormap = planezlight[pindex];
- }
+ pindex = distance >> LIGHTZSHIFT;
+ if (pindex >= MAXLIGHTZ)
+ pindex = MAXLIGHTZ - 1;
+ ds_colormap = planezlight[pindex];
if (currentplane->extra_colormap)
ds_colormap = currentplane->extra_colormap->colormap + (ds_colormap - colormaps);
@@ -251,19 +220,46 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
ds_x1 = x1;
ds_x2 = x2;
- // profile drawer
-#ifdef TIMING
- ProfZeroTimer();
-#endif
-
spanfunc();
+}
-#ifdef TIMING
- RDMSR(0x10, &mycount);
- mytotal += mycount; // 64bit add
- if (!(nombre--))
- I_Error("spanfunc() CPU Spy reports: 0x%d %d\n", *((INT32 *)&mytotal+1), (INT32)mytotal);
+static void R_MapTiltedPlane(INT32 y, INT32 x1, INT32 x2)
+{
+#ifdef RANGECHECK
+ if (x2 < x1 || x1 < 0 || x2 >= viewwidth || y > viewheight)
+ I_Error("R_MapTiltedPlane: %d, %d at %d", x1, x2, y);
#endif
+
+ if (x1 >= vid.width)
+ x1 = vid.width - 1;
+
+ // Water ripple effect
+ if (planeripple.active)
+ {
+ ds_bgofs = R_CalculateRippleOffset(y);
+
+ ds_sup = &ds_su[y];
+ ds_svp = &ds_sv[y];
+ ds_szp = &ds_sz[y];
+
+ ds_bgofs >>= FRACBITS;
+
+ if ((y + ds_bgofs) >= viewheight)
+ ds_bgofs = viewheight-y-1;
+ if ((y + ds_bgofs) < 0)
+ ds_bgofs = -y;
+ }
+
+ if (currentplane->extra_colormap)
+ ds_colormap = currentplane->extra_colormap->colormap;
+ else
+ ds_colormap = colormaps;
+
+ ds_y = y;
+ ds_x1 = x1;
+ ds_x2 = x2;
+
+ spanfunc();
}
void R_ClearFFloorClips (void)
@@ -290,7 +286,6 @@ void R_ClearFFloorClips (void)
void R_ClearPlanes(void)
{
INT32 i, p;
- angle_t angle;
// opening / clipping determination
for (i = 0; i < viewwidth; i++)
@@ -316,13 +311,6 @@ void R_ClearPlanes(void)
// texture calculation
memset(cachedheight, 0, sizeof (cachedheight));
-
- // left to right mapping
- angle = (viewangle-ANGLE_90)>>ANGLETOFINESHIFT;
-
- // scale will be unit scale at SCREENWIDTH/2 distance
- basexscale = FixedDiv (FINECOSINE(angle),centerxfrac);
- baseyscale = -FixedDiv (FINESINE(angle),centerxfrac);
}
static visplane_t *new_visplane(unsigned hash)
@@ -330,7 +318,7 @@ static visplane_t *new_visplane(unsigned hash)
visplane_t *check = freetail;
if (!check)
{
- check = calloc(2, sizeof (*check));
+ check = malloc(sizeof (*check));
if (check == NULL) I_Error("%s: Out of memory", "new_visplane"); // FIXME: ugly
}
else
@@ -363,11 +351,11 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
if (plangle != 0)
{
// Add the view offset, rotated by the plane angle.
- fixed_t cosinecomponent = FINECOSINE(plangle>>ANGLETOFINESHIFT);
- fixed_t sinecomponent = FINESINE(plangle>>ANGLETOFINESHIFT);
- fixed_t oldxoff = xoff;
- xoff = FixedMul(xoff,cosinecomponent)+FixedMul(yoff,sinecomponent);
- yoff = -FixedMul(oldxoff,sinecomponent)+FixedMul(yoff,cosinecomponent);
+ float ang = ANG2RAD(plangle);
+ float x = FixedToFloat(xoff);
+ float y = FixedToFloat(yoff);
+ xoff = FloatToFixed(x * cos(ang) + y * sin(ang));
+ yoff = FloatToFixed(-x * sin(ang) + y * cos(ang));
}
}
@@ -375,9 +363,11 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
{
if (polyobj->angle != 0)
{
- angle_t fineshift = polyobj->angle >> ANGLETOFINESHIFT;
- xoff -= FixedMul(FINECOSINE(fineshift), polyobj->centerPt.x)+FixedMul(FINESINE(fineshift), polyobj->centerPt.y);
- yoff -= FixedMul(FINESINE(fineshift), polyobj->centerPt.x)-FixedMul(FINECOSINE(fineshift), polyobj->centerPt.y);
+ float ang = ANG2RAD(polyobj->angle);
+ float x = FixedToFloat(polyobj->centerPt.x);
+ float y = FixedToFloat(polyobj->centerPt.y);
+ xoff -= FloatToFixed(x * cos(ang) + y * sin(ang));
+ yoff -= FloatToFixed(x * sin(ang) - y * cos(ang));
}
else
{
@@ -525,56 +515,22 @@ visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop)
//
// R_ExpandPlane
//
-// This function basically expands the visplane or I_Errors.
+// This function basically expands the visplane.
// The reason for this is that when creating 3D floor planes, there is no
// need to create new ones with R_CheckPlane, because 3D floor planes
// are created by subsector and there is no way a subsector can graphically
// overlap.
void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop)
{
-// INT32 unionl, unionh;
-// INT32 x;
-
// Don't expand polyobject planes here - we do that on our own.
if (pl->polyobj)
return;
if (pl->minx > start) pl->minx = start;
if (pl->maxx < stop) pl->maxx = stop;
-/*
- if (start < pl->minx)
- {
- unionl = start;
- }
- else
- {
- unionl = pl->minx;
- }
-
- if (stop > pl->maxx)
- {
- unionh = stop;
- }
- else
- {
- unionh = pl->maxx;
- }
- for (x = start; x <= stop; x++)
- if (pl->top[x] != 0xffff || pl->bottom[x] != 0x0000)
- break;
-
- if (x <= stop)
- I_Error("R_ExpandPlane: planes in same subsector overlap?!\nminx: %d, maxx: %d, start: %d, stop: %d\n", pl->minx, pl->maxx, start, stop);
-
- pl->minx = unionl, pl->maxx = unionh;
-*/
-
}
-//
-// R_MakeSpans
-//
-void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2)
+static void R_MakeSpans(void (*mapfunc)(INT32, INT32, INT32), INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2)
{
// Alam: from r_splats's R_RasterizeFloorSplat
if (t1 >= vid.height) t1 = vid.height-1;
@@ -585,12 +541,12 @@ void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2)
while (t1 < t2 && t1 <= b1)
{
- R_MapPlane(t1, spanstart[t1], x - 1);
+ mapfunc(t1, spanstart[t1], x - 1);
t1++;
}
while (b1 > b2 && b1 >= t1)
{
- R_MapPlane(b1, spanstart[b1], x - 1);
+ mapfunc(b1, spanstart[b1], x - 1);
b1--;
}
@@ -662,69 +618,109 @@ static void R_DrawSkyPlane(visplane_t *pl)
}
}
-// Potentially override other stuff for now cus we're mean. :< But draw a slope plane!
-// I copied ZDoom's code and adapted it to SRB2... -Red
-void R_CalculateSlopeVectors(pslope_t *slope, fixed_t planeviewx, fixed_t planeviewy, fixed_t planeviewz, fixed_t planexscale, fixed_t planeyscale, fixed_t planexoffset, fixed_t planeyoffset, angle_t planeviewangle, angle_t planeangle, float fudge)
+// Returns the height of the sloped plane at (x, y) as a 32.16 fixed_t
+static INT64 R_GetSlopeZAt(const pslope_t *slope, fixed_t x, fixed_t y)
{
- floatv3_t p, m, n;
- float ang;
- float vx, vy, vz;
- float xscale = FIXED_TO_FLOAT(planexscale);
- float yscale = FIXED_TO_FLOAT(planeyscale);
- // compiler complains when P_GetSlopeZAt is used in FLOAT_TO_FIXED directly
- // use this as a temp var to store P_GetSlopeZAt's return value each time
- fixed_t temp;
+ INT64 x64 = ((INT64)x - (INT64)slope->o.x);
+ INT64 y64 = ((INT64)y - (INT64)slope->o.y);
+
+ x64 = (x64 * (INT64)slope->d.x) / FRACUNIT;
+ y64 = (y64 * (INT64)slope->d.y) / FRACUNIT;
+
+ return (INT64)slope->o.z + ((x64 + y64) * (INT64)slope->zdelta) / FRACUNIT;
+}
+
+// Sets the texture origin vector of the sloped plane.
+static void R_SetSlopePlaneOrigin(pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xoff, fixed_t yoff, fixed_t angle)
+{
+ floatv3_t *p = &ds_slope_origin;
- vx = FIXED_TO_FLOAT(planeviewx+planexoffset);
- vy = FIXED_TO_FLOAT(planeviewy-planeyoffset);
- vz = FIXED_TO_FLOAT(planeviewz);
+ INT64 vx = (INT64)xpos + (INT64)xoff;
+ INT64 vy = (INT64)ypos - (INT64)yoff;
- temp = P_GetSlopeZAt(slope, planeviewx, planeviewy);
- zeroheight = FIXED_TO_FLOAT(temp);
+ float vxf = vx / (float)FRACUNIT;
+ float vyf = vy / (float)FRACUNIT;
+ float ang = ANG2RAD(ANGLE_270 - angle);
// p is the texture origin in view space
// Don't add in the offsets at this stage, because doing so can result in
// errors if the flat is rotated.
- ang = ANG2RAD(ANGLE_270 - planeviewangle);
- p.x = vx * cos(ang) - vy * sin(ang);
- p.z = vx * sin(ang) + vy * cos(ang);
- temp = P_GetSlopeZAt(slope, -planexoffset, planeyoffset);
- p.y = FIXED_TO_FLOAT(temp) - vz;
+ p->x = vxf * cos(ang) - vyf * sin(ang);
+ p->z = vxf * sin(ang) + vyf * cos(ang);
+ p->y = (R_GetSlopeZAt(slope, -xoff, yoff) - zpos) / (float)FRACUNIT;
+}
+
+// This function calculates all of the vectors necessary for drawing a sloped plane.
+void R_SetSlopePlane(pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle)
+{
+ // Potentially override other stuff for now cus we're mean. :< But draw a slope plane!
+ // I copied ZDoom's code and adapted it to SRB2... -Red
+ floatv3_t *m = &ds_slope_v, *n = &ds_slope_u;
+ fixed_t height, temp;
+ float ang;
+
+ R_SetSlopePlaneOrigin(slope, xpos, ypos, zpos, xoff, yoff, angle);
+ height = P_GetSlopeZAt(slope, xpos, ypos);
+ zeroheight = FixedToFloat(height - zpos);
// m is the v direction vector in view space
- ang = ANG2RAD(ANGLE_180 - (planeviewangle + planeangle));
- m.x = yscale * cos(ang);
- m.z = yscale * sin(ang);
+ ang = ANG2RAD(ANGLE_180 - (angle + plangle));
+ m->x = cos(ang);
+ m->z = sin(ang);
// n is the u direction vector in view space
- n.x = xscale * sin(ang);
- n.z = -xscale * cos(ang);
+ n->x = sin(ang);
+ n->z = -cos(ang);
+
+ plangle >>= ANGLETOFINESHIFT;
+ temp = P_GetSlopeZAt(slope, xpos + FINESINE(plangle), ypos + FINECOSINE(plangle));
+ m->y = FixedToFloat(temp - height);
+ temp = P_GetSlopeZAt(slope, xpos + FINECOSINE(plangle), ypos - FINESINE(plangle));
+ n->y = FixedToFloat(temp - height);
+}
- ang = ANG2RAD(planeangle);
- temp = P_GetSlopeZAt(slope, planeviewx + FLOAT_TO_FIXED(yscale * sin(ang)), planeviewy + FLOAT_TO_FIXED(yscale * cos(ang)));
- m.y = FIXED_TO_FLOAT(temp) - zeroheight;
- temp = P_GetSlopeZAt(slope, planeviewx + FLOAT_TO_FIXED(xscale * cos(ang)), planeviewy - FLOAT_TO_FIXED(xscale * sin(ang)));
- n.y = FIXED_TO_FLOAT(temp) - zeroheight;
+// This function calculates all of the vectors necessary for drawing a sloped and scaled plane.
+void R_SetScaledSlopePlane(pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xs, fixed_t ys, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle)
+{
+ floatv3_t *m = &ds_slope_v, *n = &ds_slope_u;
+ fixed_t height, temp;
- if (ds_powersoftwo)
- {
- m.x /= fudge;
- m.y /= fudge;
- m.z /= fudge;
+ float xscale = FixedToFloat(xs);
+ float yscale = FixedToFloat(ys);
+ float ang;
- n.x *= fudge;
- n.y *= fudge;
- n.z *= fudge;
- }
+ R_SetSlopePlaneOrigin(slope, xpos, ypos, zpos, xoff, yoff, angle);
+ height = P_GetSlopeZAt(slope, xpos, ypos);
+ zeroheight = FixedToFloat(height - zpos);
+
+ // m is the v direction vector in view space
+ ang = ANG2RAD(ANGLE_180 - (angle + plangle));
+ m->x = yscale * cos(ang);
+ m->z = yscale * sin(ang);
+
+ // n is the u direction vector in view space
+ n->x = xscale * sin(ang);
+ n->z = -xscale * cos(ang);
+
+ ang = ANG2RAD(plangle);
+ temp = P_GetSlopeZAt(slope, xpos + FloatToFixed(yscale * sin(ang)), ypos + FloatToFixed(yscale * cos(ang)));
+ m->y = FixedToFloat(temp - height);
+ temp = P_GetSlopeZAt(slope, xpos + FloatToFixed(xscale * cos(ang)), ypos - FloatToFixed(xscale * sin(ang)));
+ n->y = FixedToFloat(temp - height);
+}
+
+void R_CalculateSlopeVectors(void)
+{
+ float sfmult = 65536.f;
// Eh. I tried making this stuff fixed-point and it exploded on me. Here's a macro for the only floating-point vector function I recall using.
#define CROSS(d, v1, v2) \
d->x = (v1.y * v2.z) - (v1.z * v2.y);\
d->y = (v1.z * v2.x) - (v1.x * v2.z);\
d->z = (v1.x * v2.y) - (v1.y * v2.x)
- CROSS(ds_sup, p, m);
- CROSS(ds_svp, p, n);
- CROSS(ds_szp, m, n);
+ CROSS(ds_sup, ds_slope_origin, ds_slope_v);
+ CROSS(ds_svp, ds_slope_origin, ds_slope_u);
+ CROSS(ds_szp, ds_slope_v, ds_slope_u);
#undef CROSS
ds_sup->z *= focallengthf;
@@ -732,27 +728,15 @@ d->z = (v1.x * v2.y) - (v1.y * v2.x)
ds_szp->z *= focallengthf;
// Premultiply the texture vectors with the scale factors
-#define SFMULT 65536.f
if (ds_powersoftwo)
- {
- ds_sup->x *= (SFMULT * (1<<nflatshiftup));
- ds_sup->y *= (SFMULT * (1<<nflatshiftup));
- ds_sup->z *= (SFMULT * (1<<nflatshiftup));
- ds_svp->x *= (SFMULT * (1<<nflatshiftup));
- ds_svp->y *= (SFMULT * (1<<nflatshiftup));
- ds_svp->z *= (SFMULT * (1<<nflatshiftup));
- }
- else
- {
- // Lactozilla: I'm essentially multiplying the vectors by FRACUNIT...
- ds_sup->x *= SFMULT;
- ds_sup->y *= SFMULT;
- ds_sup->z *= SFMULT;
- ds_svp->x *= SFMULT;
- ds_svp->y *= SFMULT;
- ds_svp->z *= SFMULT;
- }
-#undef SFMULT
+ sfmult *= (1 << nflatshiftup);
+
+ ds_sup->x *= sfmult;
+ ds_sup->y *= sfmult;
+ ds_sup->z *= sfmult;
+ ds_svp->x *= sfmult;
+ ds_svp->y *= sfmult;
+ ds_svp->z *= sfmult;
}
void R_SetTiltedSpan(INT32 span)
@@ -769,21 +753,50 @@ void R_SetTiltedSpan(INT32 span)
ds_szp = &ds_sz[span];
}
-static void R_SetSlopePlaneVectors(visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff, float fudge)
+static void R_SetSlopePlaneVectors(visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff)
{
R_SetTiltedSpan(y);
- R_CalculateSlopeVectors(pl->slope, pl->viewx, pl->viewy, pl->viewz, FRACUNIT, FRACUNIT, xoff, yoff, pl->viewangle, pl->plangle, fudge);
+ R_SetSlopePlane(pl->slope, pl->viewx, pl->viewy, pl->viewz, xoff, yoff, pl->viewangle, pl->plangle);
+ R_CalculateSlopeVectors();
+}
+
+static inline void R_AdjustSlopeCoordinates(vector3_t *origin)
+{
+ const fixed_t modmask = ((1 << (32-nflatshiftup)) - 1);
+
+ fixed_t ox = (origin->x & modmask);
+ fixed_t oy = -(origin->y & modmask);
+
+ xoffs &= modmask;
+ yoffs &= modmask;
+
+ xoffs -= (origin->x - ox);
+ yoffs += (origin->y + oy);
+}
+
+static inline void R_AdjustSlopeCoordinatesNPO2(vector3_t *origin)
+{
+ const fixed_t modmaskw = (ds_flatwidth << FRACBITS);
+ const fixed_t modmaskh = (ds_flatheight << FRACBITS);
+
+ fixed_t ox = (origin->x % modmaskw);
+ fixed_t oy = -(origin->y % modmaskh);
+
+ xoffs %= modmaskw;
+ yoffs %= modmaskh;
+
+ xoffs -= (origin->x - ox);
+ yoffs += (origin->y + oy);
}
void R_DrawSinglePlane(visplane_t *pl)
{
levelflat_t *levelflat;
INT32 light = 0;
- INT32 x;
- INT32 stop, angle;
+ INT32 x, stop;
ffloor_t *rover;
- int type;
- int spanfunctype = BASEDRAWFUNC;
+ INT32 type, spanfunctype = BASEDRAWFUNC;
+ void (*mapfunc)(INT32, INT32, INT32) = R_MapPlane;
if (!(pl->minx <= pl->maxx))
return;
@@ -842,28 +855,16 @@ void R_DrawSinglePlane(visplane_t *pl)
spanfunctype = (pl->ffloor->master->flags & ML_EFFECT6) ? SPANDRAWFUNC_TRANSSPLAT : SPANDRAWFUNC_TRANS;
// Hacked up support for alpha value in software mode Tails 09-24-2002
- if (pl->ffloor->alpha < 12)
- return; // Don't even draw it
- else if (pl->ffloor->alpha < 38)
- ds_transmap = R_GetTranslucencyTable(tr_trans90);
- else if (pl->ffloor->alpha < 64)
- ds_transmap = R_GetTranslucencyTable(tr_trans80);
- else if (pl->ffloor->alpha < 89)
- ds_transmap = R_GetTranslucencyTable(tr_trans70);
- else if (pl->ffloor->alpha < 115)
- ds_transmap = R_GetTranslucencyTable(tr_trans60);
- else if (pl->ffloor->alpha < 140)
- ds_transmap = R_GetTranslucencyTable(tr_trans50);
- else if (pl->ffloor->alpha < 166)
- ds_transmap = R_GetTranslucencyTable(tr_trans40);
- else if (pl->ffloor->alpha < 192)
- ds_transmap = R_GetTranslucencyTable(tr_trans30);
- else if (pl->ffloor->alpha < 217)
- ds_transmap = R_GetTranslucencyTable(tr_trans20);
- else if (pl->ffloor->alpha < 243)
- ds_transmap = R_GetTranslucencyTable(tr_trans10);
- else // Opaque, but allow transparent flat pixels
- spanfunctype = SPANDRAWFUNC_SPLAT;
+ // ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021
+ {
+ INT32 trans = (10*((256+12) - pl->ffloor->alpha))/255;
+ if (trans >= 10)
+ return; // Don't even draw it
+ if (pl->ffloor->blend) // additive, (reverse) subtractive, modulative
+ ds_transmap = R_GetBlendTable(pl->ffloor->blend, trans);
+ else if (!(ds_transmap = R_GetTranslucencyTable(trans)) || trans == 0)
+ spanfunctype = SPANDRAWFUNC_SPLAT; // Opaque, but allow transparent flat pixels
+ }
if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
light = (pl->lightlevel >> LIGHTSEGSHIFT);
@@ -935,15 +936,11 @@ void R_DrawSinglePlane(visplane_t *pl)
&& viewangle != pl->viewangle+pl->plangle)
{
memset(cachedheight, 0, sizeof (cachedheight));
- angle = (pl->viewangle+pl->plangle-ANGLE_90)>>ANGLETOFINESHIFT;
- basexscale = FixedDiv(FINECOSINE(angle),centerxfrac);
- baseyscale = -FixedDiv(FINESINE(angle),centerxfrac);
viewangle = pl->viewangle+pl->plangle;
}
xoffs = pl->xoffs;
yoffs = pl->yoffs;
- planeheight = abs(pl->height - pl->viewz);
if (light >= LIGHTLEVELS)
light = LIGHTLEVELS-1;
@@ -953,76 +950,31 @@ void R_DrawSinglePlane(visplane_t *pl)
if (pl->slope)
{
- float fudgecanyon = 0;
- angle_t hack = (pl->plangle & (ANGLE_90-1));
-
- yoffs *= 1;
+ mapfunc = R_MapTiltedPlane;
- if (ds_powersoftwo)
+ if (!pl->plangle)
{
- fixed_t temp;
- // Okay, look, don't ask me why this works, but without this setup there's a disgusting-looking misalignment with the textures. -Red
- fudgecanyon = ((1<<nflatshiftup)+1.0f)/(1<<nflatshiftup);
- if (hack)
- {
- /*
- Essentially: We can't & the components along the regular axes when the plane is rotated.
- This is because the distance on each regular axis in order to loop is different.
- We rotate them, & the components, add them together, & them again, and then rotate them back.
- These three seperate & operations are done per axis in order to prevent overflows.
- toast 10/04/17
- */
- const fixed_t cosinecomponent = FINECOSINE(hack>>ANGLETOFINESHIFT);
- const fixed_t sinecomponent = FINESINE(hack>>ANGLETOFINESHIFT);
-
- const fixed_t modmask = ((1 << (32-nflatshiftup)) - 1);
-
- fixed_t ox = (FixedMul(pl->slope->o.x,cosinecomponent) & modmask) - (FixedMul(pl->slope->o.y,sinecomponent) & modmask);
- fixed_t oy = (-FixedMul(pl->slope->o.x,sinecomponent) & modmask) - (FixedMul(pl->slope->o.y,cosinecomponent) & modmask);
-
- temp = ox & modmask;
- oy &= modmask;
- ox = FixedMul(temp,cosinecomponent)+FixedMul(oy,-sinecomponent); // negative sine for opposite direction
- oy = -FixedMul(temp,-sinecomponent)+FixedMul(oy,cosinecomponent);
-
- temp = xoffs;
- xoffs = (FixedMul(temp,cosinecomponent) & modmask) + (FixedMul(yoffs,sinecomponent) & modmask);
- yoffs = (-FixedMul(temp,sinecomponent) & modmask) + (FixedMul(yoffs,cosinecomponent) & modmask);
-
- temp = xoffs & modmask;
- yoffs &= modmask;
- xoffs = FixedMul(temp,cosinecomponent)+FixedMul(yoffs,-sinecomponent); // ditto
- yoffs = -FixedMul(temp,-sinecomponent)+FixedMul(yoffs,cosinecomponent);
-
- xoffs -= (pl->slope->o.x - ox);
- yoffs += (pl->slope->o.y + oy);
- }
+ if (ds_powersoftwo)
+ R_AdjustSlopeCoordinates(&pl->slope->o);
else
- {
- xoffs &= ((1 << (32-nflatshiftup))-1);
- yoffs &= ((1 << (32-nflatshiftup))-1);
- xoffs -= (pl->slope->o.x + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
- yoffs += (pl->slope->o.y + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
- }
-
- xoffs = (fixed_t)(xoffs*fudgecanyon);
- yoffs = (fixed_t)(yoffs/fudgecanyon);
+ R_AdjustSlopeCoordinatesNPO2(&pl->slope->o);
}
if (planeripple.active)
{
- fixed_t plheight = abs(P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
+ planeheight = abs(P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
R_PlaneBounds(pl);
for (x = pl->high; x < pl->low; x++)
{
- R_CalculatePlaneRipple(pl, x, plheight, true);
- R_SetSlopePlaneVectors(pl, x, (xoffs + planeripple.xfrac), (yoffs + planeripple.yfrac), fudgecanyon);
+ ds_bgofs = R_CalculateRippleOffset(x);
+ R_CalculatePlaneRipple(pl->viewangle + pl->plangle);
+ R_SetSlopePlaneVectors(pl, x, (xoffs + planeripple.xfrac), (yoffs + planeripple.yfrac));
}
}
else
- R_SetSlopePlaneVectors(pl, 0, xoffs, yoffs, fudgecanyon);
+ R_SetSlopePlaneVectors(pl, 0, xoffs, yoffs);
switch (spanfunctype)
{
@@ -1043,7 +995,10 @@ void R_DrawSinglePlane(visplane_t *pl)
planezlight = scalelight[light];
}
else
+ {
+ planeheight = abs(pl->height - pl->viewz);
planezlight = zlight[light];
+ }
// Use the correct span drawer depending on the powers-of-twoness
if (!ds_powersoftwo)
@@ -1064,19 +1019,8 @@ void R_DrawSinglePlane(visplane_t *pl)
stop = pl->maxx + 1;
- if (viewx != pl->viewx || viewy != pl->viewy)
- {
- viewx = pl->viewx;
- viewy = pl->viewy;
- }
- if (viewz != pl->viewz)
- viewz = pl->viewz;
-
for (x = pl->minx; x <= stop; x++)
- {
- R_MakeSpans(x, pl->top[x-1], pl->bottom[x-1],
- pl->top[x], pl->bottom[x]);
- }
+ R_MakeSpans(mapfunc, x, pl->top[x-1], pl->bottom[x-1], pl->top[x], pl->bottom[x]);
/*
QUINCUNX anti-aliasing technique (sort of)
@@ -1143,7 +1087,7 @@ using the palette colors.
stop = pl->maxx + 1;
for (x = pl->minx; x <= stop; x++)
- R_MakeSpans(x, pl->top[x-1], pl->bottom[x-1],
+ R_MakeSpans(mapfunc, x, pl->top[x-1], pl->bottom[x-1],
pl->top[x], pl->bottom[x]);
}
}
diff --git a/src/r_plane.h b/src/r_plane.h
index 748a7f007c6bf9ab882a467269a655037267a55b..09648feadc938bdb66e9d03403a401c543a50c96 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -69,7 +69,6 @@ extern fixed_t cachedheight[MAXVIDHEIGHT];
extern fixed_t cacheddistance[MAXVIDHEIGHT];
extern fixed_t cachedxstep[MAXVIDHEIGHT];
extern fixed_t cachedystep[MAXVIDHEIGHT];
-extern fixed_t basexscale, baseyscale;
extern fixed_t *yslope;
extern lighttable_t **planezlight;
@@ -78,8 +77,6 @@ void R_InitPlanes(void);
void R_ClearPlanes(void);
void R_ClearFFloorClips (void);
-void R_MapPlane(INT32 y, INT32 x1, INT32 x2);
-void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2);
void R_DrawPlanes(void);
visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel, fixed_t xoff, fixed_t yoff, angle_t plangle,
extracolormap_t *planecolormap, ffloor_t *ffloor, polyobj_t *polyobj, pslope_t *slope);
@@ -94,7 +91,9 @@ boolean R_CheckPowersOfTwo(void);
void R_DrawSinglePlane(visplane_t *pl);
// Calculates the slope vectors needed for tilted span drawing.
-void R_CalculateSlopeVectors(pslope_t *slope, fixed_t planeviewx, fixed_t planeviewy, fixed_t planeviewz, fixed_t planexscale, fixed_t planeyscale, fixed_t planexoffset, fixed_t planeyoffset, angle_t planeviewangle, angle_t planeangle, float fudge);
+void R_SetSlopePlane(pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle);
+void R_SetScaledSlopePlane(pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xs, fixed_t ys, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle);
+void R_CalculateSlopeVectors(void);
// Sets the slope vector pointers for the current tilted span.
void R_SetTiltedSpan(INT32 span);
diff --git a/src/r_portal.c b/src/r_portal.c
index 3026f4e4c0a99ea9cde1503eb90952e06b49a26b..4d413213373c1e98522862e9e0e241396a4627b4 100644
--- a/src/r_portal.c
+++ b/src/r_portal.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -132,6 +132,7 @@ static portal_t* Portal_Add (const INT16 x1, const INT16 x2)
void Portal_Remove (portal_t* portal)
{
+ portalcullsector = NULL;
portal_base = portal->next;
Z_Free(portal->ceilingclip);
Z_Free(portal->floorclip);
diff --git a/src/r_portal.h b/src/r_portal.h
index 0effd07b5b272e5f799dc04848c6f66ef8dbdede..687ee058f0f4cf9e5c0e4d4c8b6d705cf4c32834 100644
--- a/src/r_portal.h
+++ b/src/r_portal.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_segs.c b/src/r_segs.c
index c9f9bbfe6c105424e10bbcd61224918467794a87..41ffa4103aab482ceda2070afd595c5e2d6156d1 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -155,18 +155,25 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
if (!ldef->alpha)
return;
- if (ldef->alpha > 0 && ldef->alpha < FRACUNIT)
- {
- dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha));
- colfunc = colfuncs[COLDRAWFUNC_FUZZY];
-
- }
- else if (ldef->special == 909)
+ if (ldef->blendmode == AST_FOG)
{
colfunc = colfuncs[COLDRAWFUNC_FOG];
windowtop = frontsector->ceilingheight;
windowbottom = frontsector->floorheight;
}
+ else if (ldef->blendmode)
+ {
+ if (ldef->alpha == NUMTRANSMAPS || ldef->blendmode == AST_MODULATE)
+ dc_transmap = R_GetBlendTable(ldef->blendmode, 0);
+ else
+ dc_transmap = R_GetBlendTable(ldef->blendmode, R_GetLinedefTransTable(ldef->alpha));
+ colfunc = colfuncs[COLDRAWFUNC_FUZZY];
+ }
+ else if (ldef->alpha > 0 && ldef->alpha < FRACUNIT)
+ {
+ dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha));
+ colfunc = colfuncs[COLDRAWFUNC_FUZZY];
+ }
else
colfunc = colfuncs[BASEDRAWFUNC];
@@ -600,28 +607,16 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
boolean fuzzy = true;
// Hacked up support for alpha value in software mode Tails 09-24-2002
- if (pfloor->alpha < 12)
- return; // Don't even draw it
- else if (pfloor->alpha < 38)
- dc_transmap = R_GetTranslucencyTable(tr_trans90);
- else if (pfloor->alpha < 64)
- dc_transmap = R_GetTranslucencyTable(tr_trans80);
- else if (pfloor->alpha < 89)
- dc_transmap = R_GetTranslucencyTable(tr_trans70);
- else if (pfloor->alpha < 115)
- dc_transmap = R_GetTranslucencyTable(tr_trans60);
- else if (pfloor->alpha < 140)
- dc_transmap = R_GetTranslucencyTable(tr_trans50);
- else if (pfloor->alpha < 166)
- dc_transmap = R_GetTranslucencyTable(tr_trans40);
- else if (pfloor->alpha < 192)
- dc_transmap = R_GetTranslucencyTable(tr_trans30);
- else if (pfloor->alpha < 217)
- dc_transmap = R_GetTranslucencyTable(tr_trans20);
- else if (pfloor->alpha < 243)
- dc_transmap = R_GetTranslucencyTable(tr_trans10);
- else
- fuzzy = false; // Opaque
+ // ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021
+ {
+ INT32 trans = (10*((256+12) - pfloor->alpha))/255;
+ if (trans >= 10)
+ return; // Don't even draw it
+ if (pfloor->blend) // additive, (reverse) subtractive, modulative
+ dc_transmap = R_GetBlendTable(pfloor->blend, trans);
+ else if (!(dc_transmap = R_GetTranslucencyTable(trans)) || trans == 0)
+ fuzzy = false; // Opaque
+ }
if (fuzzy)
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
@@ -1477,10 +1472,18 @@ static void R_RenderSegLoop (void)
}
for (i = 0; i < numffloors; i++)
+ {
+ if (curline->polyseg && (ffloor[i].polyobj != curline->polyseg))
+ continue;
+
ffloor[i].f_frac += ffloor[i].f_step;
+ }
for (i = 0; i < numbackffloors; i++)
{
+ if (curline->polyseg && (ffloor[i].polyobj != curline->polyseg))
+ continue;
+
ffloor[i].f_clip[rw_x] = ffloor[i].c_clip[rw_x] = (INT16)((ffloor[i].b_frac >> HEIGHTBITS) & 0xFFFF);
ffloor[i].b_frac += ffloor[i].b_step;
}
diff --git a/src/r_segs.h b/src/r_segs.h
index da7d44ad4689f0c28da9e0554caba54e7b8aa0ba..4075cc0bba99fcbce78ad97f1e95826f84bbe1ad 100644
--- a/src/r_segs.h
+++ b/src/r_segs.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_skins.c b/src/r_skins.c
index 7b6c4517bb4fd96ee1d11f192641c9299e7b362a..cd53128d2297558c48ed7d79d026d081f0c1b8a1 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -148,8 +148,6 @@ static void Sk_SetDefaultValue(skin_t *skin)
skin->contspeed = 17;
skin->contangle = 0;
- skin->availability = 0;
-
for (i = 0; i < sfx_skinsoundslot0; i++)
if (S_sfx[i].skinsound != -1)
skin->soundsid[S_sfx[i].skinsound] = i;
@@ -176,14 +174,34 @@ void R_InitSkins(void)
UINT32 R_GetSkinAvailabilities(void)
{
- INT32 s;
UINT32 response = 0;
+ UINT32 unlockShift = 0;
+ INT32 i;
- for (s = 0; s < MAXSKINS; s++)
+ for (i = 0; i < MAXUNLOCKABLES; i++)
{
- if (skins[s].availability && unlockables[skins[s].availability - 1].unlocked)
- response |= (1 << s);
+ if (unlockables[i].type != SECRET_SKIN)
+ {
+ continue;
+ }
+
+ if (unlockShift >= 32)
+ {
+ // This crash is impossible to trigger as is,
+ // but it could happen if MAXUNLOCKABLES is ever made higher than 32,
+ // and someone makes a mod that has 33+ unlockable characters. :V
+ I_Error("Too many unlockable characters\n");
+ return 0;
+ }
+
+ if (unlockables[i].unlocked)
+ {
+ response |= (1 << unlockShift);
+ }
+
+ unlockShift++;
}
+
return response;
}
@@ -191,14 +209,83 @@ UINT32 R_GetSkinAvailabilities(void)
// warning don't use with an invalid skinnum other than -1 which always returns true
boolean R_SkinUsable(INT32 playernum, INT32 skinnum)
{
- return ((skinnum == -1) // Simplifies things elsewhere, since there's already plenty of checks for less-than-0...
- || (!skins[skinnum].availability)
- || (((netgame || multiplayer) && playernum != -1) ? (players[playernum].availabilities & (1 << skinnum)) : (unlockables[skins[skinnum].availability - 1].unlocked))
- || (modeattacking) // If you have someone else's run you might as well take a look
- || (Playing() && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum)) // Force 1.
- || (netgame && (cv_forceskin.value == skinnum)) // Force 2.
- || (metalrecording && skinnum == 5) // Force 3.
- );
+ INT32 unlockID = -1;
+ UINT32 unlockShift = 0;
+ INT32 i;
+
+ if (skinnum == -1)
+ {
+ // Simplifies things elsewhere, since there's already plenty of checks for less-than-0...
+ return true;
+ }
+
+ if (modeattacking)
+ {
+ // If you have someone else's run you might as well take a look
+ return true;
+ }
+
+ if (Playing() && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum))
+ {
+ // Force 1.
+ return true;
+ }
+
+ if (netgame && (cv_forceskin.value == skinnum))
+ {
+ // Force 2.
+ return true;
+ }
+
+ if (metalrecording && skinnum == 5)
+ {
+ // Force 3.
+ return true;
+ }
+ if (playernum != -1 && players[playernum].bot)
+ {
+ //Force 4.
+ return true;
+ }
+
+ // We will now check if this skin is supposed to be locked or not.
+
+ for (i = 0; i < MAXUNLOCKABLES; i++)
+ {
+ INT32 unlockSkin = -1;
+
+ if (unlockables[i].type != SECRET_SKIN)
+ {
+ continue;
+ }
+
+ unlockSkin = M_UnlockableSkinNum(&unlockables[i]);
+
+ if (unlockSkin == skinnum)
+ {
+ unlockID = i;
+ break;
+ }
+
+ unlockShift++;
+ }
+
+ if (unlockID == -1)
+ {
+ // This skin isn't locked at all, we're good.
+ return true;
+ }
+
+ if ((netgame || multiplayer) && playernum != -1)
+ {
+ // We want to check per-player unlockables.
+ return (players[playernum].availabilities & (1 << unlockShift));
+ }
+ else
+ {
+ // We want to check our global unlockables.
+ return (unlockables[unlockID].unlocked);
+ }
}
// returns true if the skin name is found (loaded from pwad)
@@ -216,6 +303,103 @@ INT32 R_SkinAvailable(const char *name)
return -1;
}
+// Auxillary function that actually sets the skin
+static void SetSkin(player_t *player, INT32 skinnum)
+{
+ skin_t *skin = &skins[skinnum];
+ UINT16 newcolor = 0;
+
+ player->skin = skinnum;
+
+ player->camerascale = skin->camerascale;
+ player->shieldscale = skin->shieldscale;
+
+ player->charability = (UINT8)skin->ability;
+ player->charability2 = (UINT8)skin->ability2;
+
+ player->charflags = (UINT32)skin->flags;
+
+ player->thokitem = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
+ player->spinitem = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
+ player->revitem = skin->revitem < 0 ? (mobjtype_t)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
+ player->followitem = skin->followitem;
+
+ if (((player->powers[pw_shield] & SH_NOSTACK) == SH_PINK) && (player->revitem == MT_LHRT || player->spinitem == MT_LHRT || player->thokitem == MT_LHRT)) // Healers can't keep their buff.
+ player->powers[pw_shield] &= SH_STACK;
+
+ player->actionspd = skin->actionspd;
+ player->mindash = skin->mindash;
+ player->maxdash = skin->maxdash;
+
+ player->normalspeed = skin->normalspeed;
+ player->runspeed = skin->runspeed;
+ player->thrustfactor = skin->thrustfactor;
+ player->accelstart = skin->accelstart;
+ player->acceleration = skin->acceleration;
+
+ player->jumpfactor = skin->jumpfactor;
+
+ player->height = skin->height;
+ player->spinheight = skin->spinheight;
+
+ if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
+ {
+ if (player == &players[consoleplayer])
+ CV_StealthSetValue(&cv_playercolor, skin->prefcolor);
+ else if (player == &players[secondarydisplayplayer])
+ CV_StealthSetValue(&cv_playercolor2, skin->prefcolor);
+ player->skincolor = newcolor = skin->prefcolor;
+ if (player->bot && botingame)
+ {
+ botskin = (UINT8)(skinnum + 1);
+ botcolor = skin->prefcolor;
+ }
+ }
+
+ if (player->followmobj)
+ {
+ P_RemoveMobj(player->followmobj);
+ P_SetTarget(&player->followmobj, NULL);
+ }
+
+ if (player->mo)
+ {
+ fixed_t radius = FixedMul(skin->radius, player->mo->scale);
+ if ((player->powers[pw_carry] == CR_NIGHTSMODE) && (skin->sprites[SPR2_NFLY].numframes == 0)) // If you don't have a sprite for flying horizontally, use the default NiGHTS skin.
+ {
+ skin = &skins[DEFAULTNIGHTSSKIN];
+ player->followitem = skin->followitem;
+ if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
+ newcolor = skin->prefcolor; // will be updated in thinker to flashing
+ }
+ player->mo->skin = skin;
+ if (newcolor)
+ player->mo->color = newcolor;
+ P_SetScale(player->mo, player->mo->scale);
+ player->mo->radius = radius;
+
+ P_SetPlayerMobjState(player->mo, player->mo->state-states); // Prevent visual errors when switching between skins with differing number of frames
+ }
+}
+
+// Gets the player to the first usuable skin in the game.
+// (If your mod locked them all, then you kinda stupid)
+INT32 GetPlayerDefaultSkin(INT32 playernum)
+{
+ INT32 i;
+
+ for (i = 0; i < numskins; i++)
+ {
+ if (R_SkinUsable(playernum, i))
+ {
+ return i;
+ }
+ }
+
+ I_Error("All characters are locked!");
+ return 0;
+}
+
// network code calls this when a 'skin change' is received
void SetPlayerSkin(INT32 playernum, const char *skinname)
{
@@ -224,16 +408,16 @@ void SetPlayerSkin(INT32 playernum, const char *skinname)
if ((i != -1) && R_SkinUsable(playernum, i))
{
- SetPlayerSkinByNum(playernum, i);
+ SetSkin(player, i);
return;
}
if (P_IsLocalPlayer(player))
CONS_Alert(CONS_WARNING, M_GetText("Skin '%s' not found.\n"), skinname);
- else if(server || IsPlayerAdmin(consoleplayer))
+ else if (server || IsPlayerAdmin(consoleplayer))
CONS_Alert(CONS_WARNING, M_GetText("Player %d (%s) skin '%s' not found\n"), playernum, player_names[playernum], skinname);
- SetPlayerSkinByNum(playernum, 0);
+ SetSkin(player, GetPlayerDefaultSkin(playernum));
}
// Same as SetPlayerSkin, but uses the skin #.
@@ -241,90 +425,19 @@ void SetPlayerSkin(INT32 playernum, const char *skinname)
void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
{
player_t *player = &players[playernum];
- skin_t *skin = &skins[skinnum];
- UINT16 newcolor = 0;
if (skinnum >= 0 && skinnum < numskins && R_SkinUsable(playernum, skinnum)) // Make sure it exists!
{
- player->skin = skinnum;
-
- player->camerascale = skin->camerascale;
- player->shieldscale = skin->shieldscale;
-
- player->charability = (UINT8)skin->ability;
- player->charability2 = (UINT8)skin->ability2;
-
- player->charflags = (UINT32)skin->flags;
-
- player->thokitem = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
- player->spinitem = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
- player->revitem = skin->revitem < 0 ? (mobjtype_t)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
- player->followitem = skin->followitem;
-
- if (((player->powers[pw_shield] & SH_NOSTACK) == SH_PINK) && (player->revitem == MT_LHRT || player->spinitem == MT_LHRT || player->thokitem == MT_LHRT)) // Healers can't keep their buff.
- player->powers[pw_shield] &= SH_STACK;
-
- player->actionspd = skin->actionspd;
- player->mindash = skin->mindash;
- player->maxdash = skin->maxdash;
-
- player->normalspeed = skin->normalspeed;
- player->runspeed = skin->runspeed;
- player->thrustfactor = skin->thrustfactor;
- player->accelstart = skin->accelstart;
- player->acceleration = skin->acceleration;
-
- player->jumpfactor = skin->jumpfactor;
-
- player->height = skin->height;
- player->spinheight = skin->spinheight;
-
- if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
- {
- if (playernum == consoleplayer)
- CV_StealthSetValue(&cv_playercolor, skin->prefcolor);
- else if (playernum == secondarydisplayplayer)
- CV_StealthSetValue(&cv_playercolor2, skin->prefcolor);
- player->skincolor = newcolor = skin->prefcolor;
- if (player->bot && botingame)
- {
- botskin = (UINT8)(skinnum + 1);
- botcolor = skin->prefcolor;
- }
- }
-
- if (player->followmobj)
- {
- P_RemoveMobj(player->followmobj);
- P_SetTarget(&player->followmobj, NULL);
- }
-
- if (player->mo)
- {
- fixed_t radius = FixedMul(skin->radius, player->mo->scale);
- if ((player->powers[pw_carry] == CR_NIGHTSMODE) && (skin->sprites[SPR2_NFLY].numframes == 0)) // If you don't have a sprite for flying horizontally, use the default NiGHTS skin.
- {
- skin = &skins[DEFAULTNIGHTSSKIN];
- player->followitem = skin->followitem;
- if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
- newcolor = skin->prefcolor; // will be updated in thinker to flashing
- }
- player->mo->skin = skin;
- if (newcolor)
- player->mo->color = newcolor;
- P_SetScale(player->mo, player->mo->scale);
- player->mo->radius = radius;
-
- P_SetPlayerMobjState(player->mo, player->mo->state-states); // Prevent visual errors when switching between skins with differing number of frames
- }
+ SetSkin(player, skinnum);
return;
}
if (P_IsLocalPlayer(player))
CONS_Alert(CONS_WARNING, M_GetText("Requested skin %d not found\n"), skinnum);
- else if(server || IsPlayerAdmin(consoleplayer))
+ else if (server || IsPlayerAdmin(consoleplayer))
CONS_Alert(CONS_WARNING, "Player %d (%s) skin %d not found\n", playernum, player_names[playernum], skinnum);
- SetPlayerSkinByNum(playernum, 0); // not found put the sonic skin
+
+ SetSkin(player, GetPlayerDefaultSkin(playernum));
}
//
@@ -558,7 +671,7 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value)
//
// Find skin sprites, sounds & optional status bar face, & add them
//
-void R_AddSkins(UINT16 wadnum)
+void R_AddSkins(UINT16 wadnum, boolean mainfile)
{
UINT16 lump, lastlump = 0;
char *buf;
@@ -673,12 +786,6 @@ void R_AddSkins(UINT16 wadnum)
if (!realname)
STRBUFCPY(skin->realname, skin->hudname);
}
- else if (!stricmp(stoken, "availability"))
- {
- skin->availability = atoi(value);
- if (skin->availability >= MAXUNLOCKABLES)
- skin->availability = 0;
- }
else if (!R_ProcessPatchableFields(skin, stoken, value))
CONS_Debug(DBG_SETUP, "R_AddSkins: Unknown keyword '%s' in S_SKIN lump #%d (WAD %s)\n", stoken, lump, wadfiles[wadnum]->filename);
@@ -693,7 +800,7 @@ next_token:
R_FlushTranslationColormapCache();
- if (!skin->availability) // Safe to print...
+ if (mainfile == false)
CONS_Printf(M_GetText("Added skin '%s'\n"), skin->name);
#ifdef SKINVALUES
skin_cons_t[numskins].value = numskins;
@@ -713,7 +820,7 @@ next_token:
//
// Patch skin sprites
//
-void R_PatchSkins(UINT16 wadnum)
+void R_PatchSkins(UINT16 wadnum, boolean mainfile)
{
UINT16 lump, lastlump = 0;
char *buf;
@@ -826,7 +933,7 @@ next_token:
R_FlushTranslationColormapCache();
- if (!skin->availability) // Safe to print...
+ if (mainfile == false)
CONS_Printf(M_GetText("Patched skin '%s'\n"), skin->name);
}
return;
diff --git a/src/r_skins.h b/src/r_skins.h
index 3f67bfdabbf04e2277fc20ecd6707c61e4054479..aeaa9f3e05a328ebd1e299190fe1179220191e33 100644
--- a/src/r_skins.h
+++ b/src/r_skins.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -80,8 +80,6 @@ typedef struct
// contains super versions too
spritedef_t sprites[NUMPLAYERSPRITES*2];
spriteinfo_t sprinfo[NUMPLAYERSPRITES*2];
-
- UINT8 availability; // lock?
} skin_t;
/// Externs
@@ -91,13 +89,14 @@ extern skin_t skins[MAXSKINS];
/// Function prototypes
void R_InitSkins(void);
+INT32 GetPlayerDefaultSkin(INT32 playernum);
void SetPlayerSkin(INT32 playernum,const char *skinname);
void SetPlayerSkinByNum(INT32 playernum,INT32 skinnum); // Tails 03-16-2002
boolean R_SkinUsable(INT32 playernum, INT32 skinnum);
UINT32 R_GetSkinAvailabilities(void);
INT32 R_SkinAvailable(const char *name);
-void R_PatchSkins(UINT16 wadnum);
-void R_AddSkins(UINT16 wadnum);
+void R_AddSkins(UINT16 wadnum, boolean mainfile);
+void R_PatchSkins(UINT16 wadnum, boolean mainfile);
UINT8 P_GetSkinSprite2(skin_t *skin, UINT8 spr2, player_t *player);
diff --git a/src/r_sky.c b/src/r_sky.c
index 041cccfc5546f679894a7d7ab2e6cc93c0d8c8c4..e21b7cbf16b53720dddf75a3d5b014ead890f56a 100644
--- a/src/r_sky.c
+++ b/src/r_sky.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_sky.h b/src/r_sky.h
index f4356dcfae3f4f6e47248bb7d6ef46e21495fa31..31c821d2204c14d37bede811d25e4d25916e8ea0 100644
--- a/src/r_sky.h
+++ b/src/r_sky.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_splats.c b/src/r_splats.c
index 72cac9fd937f6bc35e98a343bb4bf98c4a6a4b8a..0a84a3a336b6a7f7fad2bf80d025fa2163f18b02 100644
--- a/src/r_splats.c
+++ b/src/r_splats.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -155,7 +155,6 @@ void R_DrawFloorSplat(vissprite_t *spr)
fixed_t xscale, yscale;
fixed_t xoffset, yoffset;
fixed_t leftoffset, topoffset;
- pslope_t *slope = NULL;
INT32 i;
boolean hflip = (spr->xiscale < 0);
@@ -188,7 +187,7 @@ void R_DrawFloorSplat(vissprite_t *spr)
if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD)
splatangle = mobj->angle;
else
- splatangle = spr->viewangle;
+ splatangle = spr->viewpoint.angle;
if (!(spr->cut & SC_ISROTATED))
splatangle += mobj->rollangle;
@@ -218,7 +217,7 @@ void R_DrawFloorSplat(vissprite_t *spr)
splat.x = x;
splat.y = y;
splat.z = mobj->z;
- splat.tilted = false;
+ splat.slope = NULL;
// Set positions
@@ -238,9 +237,9 @@ void R_DrawFloorSplat(vissprite_t *spr)
splat.verts[3].x = w - xoffset;
splat.verts[3].y = -h + yoffset;
- angle = -splat.angle;
- ca = FINECOSINE(angle>>ANGLETOFINESHIFT);
- sa = FINESINE(angle>>ANGLETOFINESHIFT);
+ angle = -splat.angle>>ANGLETOFINESHIFT;
+ ca = FINECOSINE(angle);
+ sa = FINESINE(angle);
// Rotate
for (i = 0; i < 4; i++)
@@ -255,36 +254,10 @@ void R_DrawFloorSplat(vissprite_t *spr)
// The slope that was defined for the sprite.
if (renderflags & RF_SLOPESPLAT)
- slope = mobj->floorspriteslope;
+ splat.slope = mobj->floorspriteslope;
if (standingslope && (renderflags & RF_OBJECTSLOPESPLAT))
- slope = standingslope;
-
- // Set splat as tilted
- splat.tilted = (slope != NULL);
- }
-
- if (splat.tilted)
- {
- pslope_t *s = &splat.slope;
-
- s->o.x = slope->o.x;
- s->o.y = slope->o.y;
- s->o.z = slope->o.z;
-
- s->d.x = slope->d.x;
- s->d.y = slope->d.y;
-
- s->normal.x = slope->normal.x;
- s->normal.y = slope->normal.y;
- s->normal.z = slope->normal.z;
-
- s->zdelta = slope->zdelta;
- s->zangle = slope->zangle;
- s->xydirection = slope->xydirection;
-
- s->next = NULL;
- s->flags = 0;
+ splat.slope = standingslope;
}
// Translate
@@ -293,9 +266,9 @@ void R_DrawFloorSplat(vissprite_t *spr)
tr_x = rotated[i].x + x;
tr_y = rotated[i].y + y;
- if (slope)
+ if (splat.slope)
{
- rot_z = P_GetSlopeZAt(slope, tr_x, tr_y);
+ rot_z = P_GetSlopeZAt(splat.slope, tr_x, tr_y);
splat.verts[i].z = rot_z;
}
else
@@ -305,18 +278,23 @@ void R_DrawFloorSplat(vissprite_t *spr)
splat.verts[i].y = tr_y;
}
+ angle = spr->viewpoint.angle >> ANGLETOFINESHIFT;
+ ca = FINECOSINE(angle);
+ sa = FINESINE(angle);
+
+ // Project
for (i = 0; i < 4; i++)
{
v3d = &splat.verts[i];
// transform the origin point
- tr_x = v3d->x - viewx;
- tr_y = v3d->y - viewy;
+ tr_x = v3d->x - spr->viewpoint.x;
+ tr_y = v3d->y - spr->viewpoint.y;
// rotation around vertical y axis
- rot_x = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
- rot_y = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
- rot_z = v3d->z - viewz;
+ rot_x = FixedMul(tr_x, sa) - FixedMul(tr_y, ca);
+ rot_y = FixedMul(tr_x, ca) + FixedMul(tr_y, sa);
+ rot_z = v3d->z - spr->viewpoint.z;
if (rot_y < FRACUNIT)
return;
@@ -416,30 +394,32 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr
if (R_CheckPowersOfTwo())
R_CheckFlatLength(ds_flatwidth * ds_flatheight);
- if (pSplat->tilted)
+ if (pSplat->slope)
{
R_SetTiltedSpan(0);
- R_CalculateSlopeVectors(&pSplat->slope, viewx, viewy, viewz, pSplat->xscale, pSplat->yscale, -pSplat->verts[0].x, pSplat->verts[0].y, vis->viewangle, pSplat->angle, 1.0f);
+ R_SetScaledSlopePlane(pSplat->slope, vis->viewpoint.x, vis->viewpoint.y, vis->viewpoint.z, pSplat->xscale, pSplat->yscale, -pSplat->verts[0].x, pSplat->verts[0].y, vis->viewpoint.angle, pSplat->angle);
+ R_CalculateSlopeVectors();
spanfunctype = SPANDRAWFUNC_TILTEDSPRITE;
}
else
{
- planeheight = abs(pSplat->z - viewz);
+ planeheight = abs(pSplat->z - vis->viewpoint.z);
if (pSplat->angle)
{
+ memset(cachedheight, 0, sizeof(cachedheight));
+
// Add the view offset, rotated by the plane angle.
- fixed_t a = -pSplat->verts[0].x + viewx;
- fixed_t b = -pSplat->verts[0].y + viewy;
+ fixed_t a = -pSplat->verts[0].x + vis->viewpoint.x;
+ fixed_t b = -pSplat->verts[0].y + vis->viewpoint.y;
angle_t angle = (pSplat->angle >> ANGLETOFINESHIFT);
- offsetx = FixedMul(a, FINECOSINE(angle)) - FixedMul(b,FINESINE(angle));
- offsety = -FixedMul(a, FINESINE(angle)) - FixedMul(b,FINECOSINE(angle));
- memset(cachedheight, 0, sizeof(cachedheight));
+ offsetx = FixedMul(a, FINECOSINE(angle)) - FixedMul(b, FINESINE(angle));
+ offsety = -FixedMul(a, FINESINE(angle)) - FixedMul(b, FINECOSINE(angle));
}
else
{
- offsetx = viewx - pSplat->verts[0].x;
- offsety = pSplat->verts[0].y - viewy;
+ offsetx = vis->viewpoint.x - pSplat->verts[0].x;
+ offsety = pSplat->verts[0].y - vis->viewpoint.y;
}
}
@@ -460,7 +440,7 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr
{
ds_transmap = vis->transmap;
- if (pSplat->tilted)
+ if (pSplat->slope)
spanfunctype = SPANDRAWFUNC_TILTEDTRANSSPRITE;
else
spanfunctype = SPANDRAWFUNC_TRANSSPRITE;
@@ -502,7 +482,7 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr
continue;
for (i = x1; i <= x2; i++)
- cliptab[i] = (y >= mfloorclip[i]);
+ cliptab[i] = (y >= mfloorclip[i] || y <= mceilingclip[i]);
// clip left
while (cliptab[x1])
@@ -527,12 +507,12 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr
if (x2 < x1)
continue;
- if (!pSplat->tilted)
+ if (!pSplat->slope)
{
fixed_t xstep, ystep;
fixed_t distance, span;
- angle_t angle = (vis->viewangle + pSplat->angle)>>ANGLETOFINESHIFT;
+ angle_t angle = (vis->viewpoint.angle + pSplat->angle)>>ANGLETOFINESHIFT;
angle_t planecos = FINECOSINE(angle);
angle_t planesin = FINESINE(angle);
@@ -576,7 +556,7 @@ static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, visspr
rastertab[y].maxx = INT32_MIN;
}
- if (pSplat->angle && !pSplat->tilted)
+ if (pSplat->angle && !pSplat->slope)
memset(cachedheight, 0, sizeof(cachedheight));
}
diff --git a/src/r_splats.h b/src/r_splats.h
index cab3d63b66bf8f2bca5324dcd2f677253e7dee7d..ec6885e269249cb7090a771e90093b4d645d73a7 100644
--- a/src/r_splats.h
+++ b/src/r_splats.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -34,8 +34,7 @@ typedef struct floorsplat_s
INT32 width, height;
fixed_t scale, xscale, yscale;
angle_t angle;
- boolean tilted; // Uses the tilted drawer
- pslope_t slope;
+ pslope_t *slope;
vector3_t verts[4]; // (x,y,z) as viewed from above on map
fixed_t x, y, z; // position
diff --git a/src/r_state.h b/src/r_state.h
index 5a606ed8c9fa2804f5802d8834a1f7d85b963260..69989e7ac36a5540c6e99fc514d61948d1a92633 100644
--- a/src/r_state.h
+++ b/src/r_state.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_textures.c b/src/r_textures.c
index d5da69018cb39c81a1dcac1fe01736ee67abab65..ff5c49675cadcab464828e973a1ea7a8f7b63d77 100644
--- a/src/r_textures.c
+++ b/src/r_textures.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -727,7 +727,7 @@ Rloadflats (INT32 i, INT32 w)
texpatch_t *patch;
// Yes
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
@@ -749,7 +749,7 @@ Rloadflats (INT32 i, INT32 w)
size_t lumplength;
size_t flatsize = 0;
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
continue; // If it is then SKIP IT
@@ -839,7 +839,7 @@ Rloadtextures (INT32 i, INT32 w)
texpatch_t *patch;
// Get the lump numbers for the markers in the WAD, if they exist.
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
@@ -870,7 +870,7 @@ Rloadtextures (INT32 i, INT32 w)
size_t lumplength;
#endif
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
continue; // If it is then SKIP IT
@@ -959,7 +959,7 @@ void R_LoadTextures(void)
{
#ifdef WALLFLATS
// Count flats
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
@@ -973,7 +973,7 @@ void R_LoadTextures(void)
if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
// PK3s have subfolders, so we can't just make a simple sum
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
for (j = texstart; j < texend; j++)
{
@@ -997,7 +997,7 @@ void R_LoadTextures(void)
}
// Count single-patch textures
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
@@ -1012,7 +1012,7 @@ void R_LoadTextures(void)
continue;
// PK3s have subfolders, so we can't just make a simple sum
- if (wadfiles[w]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[w]))
{
for (j = texstart; j < texend; j++)
{
@@ -1553,6 +1553,7 @@ lumpnum_t R_GetFlatNumForName(const char *name)
continue;
break;
case RET_PK3:
+ case RET_FOLDER:
if ((start = W_CheckNumForFolderStartPK3("Flats/", i, 0)) == INT16_MAX)
continue;
if ((end = W_CheckNumForFolderEndPK3("Flats/", i, start)) == INT16_MAX)
diff --git a/src/r_textures.h b/src/r_textures.h
index dd286b6ac57c7082f57bece9445d9c1695958d13..d9c2ab49b875ba9fca5629f5bf102f821a4c1a78 100644
--- a/src/r_textures.h
+++ b/src/r_textures.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/r_things.c b/src/r_things.c
index 5c0e5fda95b2052e376f16279abae72ba29581f1..5d752b6f7c5a8df162555e5bc28f983bc628725a 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -443,6 +443,7 @@ void R_AddSpriteDefs(UINT16 wadnum)
end = W_CheckNumForNamePwad("SS_END",wadnum,start); //deutex compatib.
break;
case RET_PK3:
+ case RET_FOLDER:
start = W_CheckNumForFolderStartPK3("Sprites/", wadnum, 0);
end = W_CheckNumForFolderEndPK3("Sprites/", wadnum, start);
break;
@@ -547,8 +548,8 @@ void R_InitSprites(void)
R_InitSkins();
for (i = 0; i < numwadfiles; i++)
{
- R_AddSkins((UINT16)i);
- R_PatchSkins((UINT16)i);
+ R_AddSkins((UINT16)i, true);
+ R_PatchSkins((UINT16)i, true);
R_LoadSpriteInfoLumps(i, wadfiles[i]->numlumps);
}
ST_ReloadSkinFaceGraphics();
@@ -753,7 +754,7 @@ UINT8 *R_GetSpriteTranslation(vissprite_t *vis)
else if (vis->mobj->type == MT_METALSONIC_BATTLE)
return R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE);
else
- return R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE);
+ return R_GetTranslationColormap(TC_BOSS, vis->mobj->color, GTC_CACHE);
}
else if (vis->mobj->color)
{
@@ -836,6 +837,12 @@ static void R_DrawVisSprite(vissprite_t *vis)
else if (vis->mobj->sprite == SPR_PLAY) // Looks like a player, but doesn't have a color? Get rid of green sonic syndrome.
colfunc = colfuncs[COLDRAWFUNC_TRANS];
+ // Hack: Use a special column function for drop shadows that bypasses
+ // invalid memory access crashes caused by R_ProjectDropShadow putting wrong values
+ // in dc_texturemid and dc_iscale when the shadow is sloped.
+ if (vis->cut & SC_SHADOW)
+ colfunc = R_DrawDropShadowColumn_8;
+
if (vis->extra_colormap && !(vis->renderflags & RF_NOCOLORMAPS))
{
if (!dc_colormap)
@@ -1109,6 +1116,10 @@ static void R_SplitSprite(vissprite_t *sprite)
if (lindex >= MAXLIGHTSCALE)
lindex = MAXLIGHTSCALE-1;
+
+ if (newsprite->cut & SC_SEMIBRIGHT)
+ lindex = (MAXLIGHTSCALE/2) + (lindex >>1);
+
newsprite->colormap = spritelights[lindex];
}
}
@@ -1797,13 +1808,19 @@ static void R_ProjectSprite(mobj_t *thing)
return;
}
+ INT32 blendmode;
+ if (oldthing->frame & FF_BLENDMASK)
+ blendmode = ((oldthing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+ else
+ blendmode = oldthing->blendmode;
+
// Determine the translucency value.
if (oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility)
trans = tr_trans80; // because now the translucency is set through FF_TRANSMASK
else if (oldthing->frame & FF_TRANSMASK)
{
trans = (oldthing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT;
- if (!R_BlendLevelVisible(oldthing->blendmode, trans))
+ if (!R_BlendLevelVisible(blendmode, trans))
return;
}
else
@@ -1956,9 +1973,12 @@ static void R_ProjectSprite(mobj_t *thing)
vis->paperoffset = paperoffset;
vis->paperdistance = paperdistance;
vis->centerangle = centerangle;
- vis->viewangle = viewangle;
vis->shear.tan = sheartan;
vis->shear.offset = 0;
+ vis->viewpoint.x = viewx;
+ vis->viewpoint.y = viewy;
+ vis->viewpoint.z = viewz;
+ vis->viewpoint.angle = viewangle;
vis->mobj = thing; // Easy access! Tails 06-07-2002
@@ -2012,13 +2032,15 @@ static void R_ProjectSprite(mobj_t *thing)
vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1);
}
- if ((oldthing->blendmode != AST_COPY) && cv_translucency.value)
- vis->transmap = R_GetBlendTable(oldthing->blendmode, trans);
+ if ((blendmode != AST_COPY) && cv_translucency.value)
+ vis->transmap = R_GetBlendTable(blendmode, trans);
else
vis->transmap = NULL;
if (R_ThingIsFullBright(oldthing) || oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW)
vis->cut |= SC_FULLBRIGHT;
+ else if (R_ThingIsSemiBright(oldthing))
+ vis->cut |= SC_SEMIBRIGHT;
else if (R_ThingIsFullDark(oldthing))
vis->cut |= SC_FULLDARK;
@@ -2041,6 +2063,9 @@ static void R_ProjectSprite(mobj_t *thing)
if (lindex >= MAXLIGHTSCALE)
lindex = MAXLIGHTSCALE-1;
+ if (vis->cut & SC_SEMIBRIGHT)
+ lindex = (MAXLIGHTSCALE/2) + (lindex >> 1);
+
vis->colormap = spritelights[lindex];
}
@@ -2741,7 +2766,7 @@ static drawnode_t *R_CreateDrawNode(drawnode_t *link)
node->ffloor = NULL;
node->sprite = NULL;
- ps_numdrawnodes++;
+ ps_numdrawnodes.value.i++;
return node;
}
@@ -2982,13 +3007,25 @@ void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, drawseg_t* dsstart, p
if (portal)
{
- for (x = x1; x <= x2; x++)
+ INT32 start_index = max(portal->start, x1);
+ INT32 end_index = min(portal->start + portal->end - portal->start, x2);
+ for (x = x1; x < start_index; x++)
+ {
+ spr->clipbot[x] = -1;
+ spr->cliptop[x] = -1;
+ }
+ for (x = start_index; x <= end_index; x++)
{
if (spr->clipbot[x] > portal->floorclip[x - portal->start])
spr->clipbot[x] = portal->floorclip[x - portal->start];
if (spr->cliptop[x] < portal->ceilingclip[x - portal->start])
spr->cliptop[x] = portal->ceilingclip[x - portal->start];
}
+ for (x = end_index + 1; x <= x2; x++)
+ {
+ spr->clipbot[x] = -1;
+ spr->cliptop[x] = -1;
+ }
}
}
@@ -3069,17 +3106,22 @@ boolean R_ThingIsPaperSprite(mobj_t *thing)
boolean R_ThingIsFloorSprite(mobj_t *thing)
{
- return (thing->flags2 & MF2_SPLAT || thing->renderflags & RF_FLOORSPRITE);
+ return (thing->flags2 & MF2_SPLAT || thing->frame & FF_FLOORSPRITE || thing->renderflags & RF_FLOORSPRITE);
}
boolean R_ThingIsFullBright(mobj_t *thing)
{
- return (thing->frame & FF_FULLBRIGHT || thing->renderflags & RF_FULLBRIGHT);
+ return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT || (thing->renderflags & RF_BRIGHTMASK) == RF_FULLBRIGHT);
+}
+
+boolean R_ThingIsSemiBright(mobj_t *thing)
+{
+ return ((thing->frame & FF_BRIGHTMASK) == FF_SEMIBRIGHT || (thing->renderflags & RF_BRIGHTMASK) == RF_SEMIBRIGHT);
}
boolean R_ThingIsFullDark(mobj_t *thing)
{
- return (thing->renderflags & RF_FULLDARK);
+ return ((thing->frame & FF_BRIGHTMASK) == FF_FULLDARK || (thing->renderflags & RF_BRIGHTMASK) == RF_FULLDARK);
}
//
@@ -3144,10 +3186,10 @@ static void R_DrawMaskedList (drawnode_t* head)
}
}
-void R_DrawMasked(maskcount_t* masks, UINT8 nummasks)
+void R_DrawMasked(maskcount_t* masks, INT32 nummasks)
{
drawnode_t *heads; /**< Drawnode lists; as many as number of views/portals. */
- SINT8 i;
+ INT32 i;
heads = calloc(nummasks, sizeof(drawnode_t));
diff --git a/src/r_things.h b/src/r_things.h
index 9315b36e946c35020d88a78049e18a284d9a3790..857b03b24564be256e0fc8825b77e4ec6255e008 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -82,6 +82,7 @@ boolean R_ThingIsPaperSprite (mobj_t *thing);
boolean R_ThingIsFloorSprite (mobj_t *thing);
boolean R_ThingIsFullBright (mobj_t *thing);
+boolean R_ThingIsSemiBright (mobj_t *thing);
boolean R_ThingIsFullDark (mobj_t *thing);
// --------------
@@ -99,7 +100,7 @@ typedef struct
sector_t* viewsector;
} maskcount_t;
-void R_DrawMasked(maskcount_t* masks, UINT8 nummasks);
+void R_DrawMasked(maskcount_t* masks, INT32 nummasks);
// ----------
// VISSPRITES
@@ -123,13 +124,14 @@ typedef enum
SC_PRECIP = 1<<2,
SC_LINKDRAW = 1<<3,
SC_FULLBRIGHT = 1<<4,
- SC_FULLDARK = 1<<5,
- SC_VFLIP = 1<<6,
- SC_ISSCALED = 1<<7,
- SC_ISROTATED = 1<<8,
- SC_SHADOW = 1<<9,
- SC_SHEAR = 1<<10,
- SC_SPLAT = 1<<11,
+ SC_SEMIBRIGHT = 1<<5,
+ SC_FULLDARK = 1<<6,
+ SC_VFLIP = 1<<7,
+ SC_ISSCALED = 1<<8,
+ SC_ISROTATED = 1<<9,
+ SC_SHADOW = 1<<10,
+ SC_SHEAR = 1<<11,
+ SC_SPLAT = 1<<12,
// masks
SC_CUTMASK = SC_TOP|SC_BOTTOM,
SC_FLAGMASK = ~SC_CUTMASK
@@ -164,7 +166,12 @@ typedef struct vissprite_s
fixed_t xiscale; // negative if flipped
angle_t centerangle; // for paper sprites
- angle_t viewangle; // for floor sprites, the viewpoint's current angle
+
+ // for floor sprites
+ struct {
+ fixed_t x, y, z; // the viewpoint's current position
+ angle_t angle; // the viewpoint's current angle
+ } viewpoint;
struct {
fixed_t tan; // The amount to shear the sprite vertically per row
@@ -185,9 +192,10 @@ typedef struct vissprite_s
extracolormap_t *extra_colormap; // global colormaps
- // Precalculated top and bottom screen coords for the sprite.
fixed_t thingheight; // The actual height of the thing (for 3D floors)
sector_t *sector; // The sector containing the thing.
+
+ // Precalculated top and bottom screen coords for the sprite.
INT16 sz, szt;
spritecut_e cut;
diff --git a/src/s_sound.c b/src/s_sound.c
index 0050a92e2abff9d72dbc4b99469515cf4dda1e08..16386fd16d04eea9b6138e4335d43a1fde779998 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -74,9 +74,9 @@ consvar_t stereoreverse = CVAR_INIT ("stereoreverse", "Off", CV_SAVE, CV_OnOff,
static consvar_t precachesound = CVAR_INIT ("precachesound", "Off", CV_SAVE, CV_OnOff, NULL);
// actual general (maximum) sound & music volume, saved into the config
-consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "18", CV_SAVE, soundvolume_cons_t, NULL);
-consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL);
-consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
static void Captioning_OnChange(void)
{
@@ -1039,11 +1039,9 @@ void S_SetSfxVolume(INT32 volume)
void S_ClearSfx(void)
{
-#ifndef DJGPPDOS
size_t i;
for (i = 1; i < NUMSFX; i++)
I_FreeSfx(S_sfx + i);
-#endif
}
static void S_StopChannel(INT32 cnum)
@@ -1388,28 +1386,6 @@ void S_InitSfxChannels(INT32 sfxVolume)
/// Music
/// ------------------------
-#ifdef MUSICSLOT_COMPATIBILITY
-const char *compat_special_music_slots[16] =
-{
- "_title", // 1036 title screen
- "_intro", // 1037 intro
- "_clear", // 1038 level clear
- "_inv", // 1039 invincibility
- "_shoes", // 1040 super sneakers
- "_minv", // 1041 Mario invincibility
- "_drown", // 1042 drowning
- "_gover", // 1043 game over
- "_1up", // 1044 extra life
- "_conti", // 1045 continue screen
- "_super", // 1046 Super Sonic
- "_chsel", // 1047 character select
- "_creds", // 1048 credits
- "_inter", // 1049 Race Results
- "_stjr", // 1050 Sonic Team Jr. Presents
- ""
-};
-#endif
-
static char music_name[7]; // up to 6-character name
static void *music_data;
static UINT16 music_flags;
@@ -2296,6 +2272,16 @@ static void S_ChangeMusicToQueue(void)
void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
{
char newmusic[7];
+
+ struct MusicChange hook_param = {
+ newmusic,
+ &mflags,
+ &looping,
+ &position,
+ &prefadems,
+ &fadeinms
+ };
+
boolean currentmidi = (I_SongType() == MU_MID || I_SongType() == MU_MID_EX);
boolean midipref = cv_musicpref.value;
@@ -2303,7 +2289,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
return;
strncpy(newmusic, mmusic, 7);
- if (LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms))
+ if (LUA_HookMusicChange(music_name, &hook_param))
return;
newmusic[6] = 0;
@@ -2499,7 +2485,7 @@ void S_StartEx(boolean reset)
static void Command_Tunes_f(void)
{
const char *tunearg;
- UINT16 tunenum, track = 0;
+ UINT16 track = 0;
UINT32 position = 0;
const size_t argc = COM_Argc();
@@ -2515,7 +2501,6 @@ static void Command_Tunes_f(void)
}
tunearg = COM_Argv(1);
- tunenum = (UINT16)atoi(tunearg);
track = 0;
if (!strcasecmp(tunearg, "-show"))
@@ -2534,24 +2519,14 @@ static void Command_Tunes_f(void)
tunearg = mapheaderinfo[gamemap-1]->musname;
track = mapheaderinfo[gamemap-1]->mustrack;
}
- else if (!tunearg[2] && toupper(tunearg[0]) >= 'A' && toupper(tunearg[0]) <= 'Z')
- tunenum = (UINT16)M_MapNumber(tunearg[0], tunearg[1]);
- if (tunenum && tunenum >= 1036)
- {
- CONS_Alert(CONS_NOTICE, M_GetText("Valid music slots are 1 to 1035.\n"));
- return;
- }
- if (!tunenum && strlen(tunearg) > 6) // This is automatic -- just show the error just in case
+ if (strlen(tunearg) > 6) // This is automatic -- just show the error just in case
CONS_Alert(CONS_NOTICE, M_GetText("Music name too long - truncated to six characters.\n"));
if (argc > 2)
track = (UINT16)atoi(COM_Argv(2))-1;
- if (tunenum)
- snprintf(mapmusname, 7, "%sM", G_BuildMapName(tunenum));
- else
- strncpy(mapmusname, tunearg, 7);
+ strncpy(mapmusname, tunearg, 7);
if (argc > 4)
position = (UINT32)atoi(COM_Argv(4));
diff --git a/src/s_sound.h b/src/s_sound.h
index 79bab92836332e154b27d38d5dfdda8e2a485d6c..6fe7d25621233cd7352ee8a369d54159bf1efca4 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -277,6 +277,16 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst);
// Music Playback
//
+/* this is for the sake of the hook */
+struct MusicChange {
+ char * newname;
+ UINT16 * mflags;
+ boolean * looping;
+ UINT32 * position;
+ UINT32 * prefadems;
+ UINT32 * fadeinms;
+};
+
// Start music track, arbitrary, given its name, and set whether looping
// note: music flags 12 bits for tracknum (gme, other formats with more than one track)
// 13-15 aren't used yet
@@ -331,10 +341,4 @@ void S_StopSoundByNum(sfxenum_t sfxnum);
#define S_StartScreamSound S_StartSound
#endif
-#ifdef MUSICSLOT_COMPATIBILITY
-// For compatibility with code/scripts relying on older versions
-// This is a list of all the "special" slot names and their associated numbers
-extern const char *compat_special_music_slots[16];
-#endif
-
#endif
diff --git a/src/screen.c b/src/screen.c
index 770f1c8026aaf4fcb5dd9df97da55271f717b547..73af4313deab86ec5bdf4418f8428d6b035a4e70 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/screen.h b/src/screen.h
index 67880e2b964dc16a7693d754a6646bd031f14c04..37695316916ad839be0e8211a8531e8addf0180d 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj
index d46a4af2b0d89ea1dc93b0573e4ef1d6a32665b4..d79dde7662142d132271ed676bf5d1f2c5423f09 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj
+++ b/src/sdl/Srb2SDL-vc10.vcxproj
@@ -245,8 +245,10 @@
<ClInclude Include="..\i_sound.h" />
<ClInclude Include="..\i_system.h" />
<ClInclude Include="..\i_tcp.h" />
+ <ClInclude Include="..\i_threads.h" />
<ClInclude Include="..\i_video.h" />
<ClInclude Include="..\keys.h" />
+ <ClInclude Include="..\libdivide.h" />
<ClInclude Include="..\lua_hook.h" />
<ClInclude Include="..\lua_hud.h" />
<ClInclude Include="..\lua_libs.h" />
@@ -303,6 +305,7 @@
<ClInclude Include="..\st_stuff.h" />
<ClInclude Include="..\s_sound.h" />
<ClInclude Include="..\tables.h" />
+ <ClInclude Include="..\taglist.h" />
<ClInclude Include="..\v_video.h" />
<ClInclude Include="..\w_wad.h" />
<ClInclude Include="..\y_inter.h" />
@@ -406,6 +409,7 @@
<ClCompile Include="..\lua_hooklib.c" />
<ClCompile Include="..\lua_hudlib.c" />
<ClCompile Include="..\lua_infolib.c" />
+ <ClCompile Include="..\lua_inputlib.c" />
<ClCompile Include="..\lua_maplib.c" />
<ClCompile Include="..\lua_mathlib.c" />
<ClCompile Include="..\lua_mobjlib.c" />
@@ -413,6 +417,7 @@
<ClCompile Include="..\lua_polyobjlib.c" />
<ClCompile Include="..\lua_script.c" />
<ClCompile Include="..\lua_skinlib.c" />
+ <ClCompile Include="..\lua_taglib.c" />
<ClCompile Include="..\lua_thinkerlib.c" />
<ClCompile Include="..\lzf.c" />
<ClCompile Include="..\md5.c" />
@@ -473,10 +478,12 @@
<ClCompile Include="..\r_things.c" />
<ClCompile Include="..\screen.c" />
<ClCompile Include="..\sounds.c" />
+ <ClCompile Include="..\strcasestr.c" />
<ClCompile Include="..\string.c" />
<ClCompile Include="..\st_stuff.c" />
<ClCompile Include="..\s_sound.c" />
<ClCompile Include="..\tables.c" />
+ <ClCompile Include="..\taglist.c" />
<ClCompile Include="..\t_facon.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj.filters b/src/sdl/Srb2SDL-vc10.vcxproj.filters
index adae2f446dbde8267e375bb794eacc50bed9c663..4d2532ca4ef61adf61711cfc3affbc6b86e73f14 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj.filters
+++ b/src/sdl/Srb2SDL-vc10.vcxproj.filters
@@ -135,6 +135,16 @@
<ClInclude Include="..\dehacked.h">
<Filter>D_Doom</Filter>
</ClInclude>
+ <ClInclude Include="..\deh_lua.h">
+ <Filter>D_Doom</Filter>
+ </ClInclude>
+ <ClInclude Include="..\deh_soc.h">
+ <Filter>D_Doom</Filter>
+ </ClInclude>
+ <ClInclude Include="..\deh_tables.h">
+ <Filter>D_Doom</Filter>
+ </ClInclude>
+
<ClInclude Include="..\doomdata.h">
<Filter>D_Doom</Filter>
</ClInclude>
@@ -288,6 +298,9 @@
<ClInclude Include="..\i_tcp.h">
<Filter>I_Interface</Filter>
</ClInclude>
+ <ClInclude Include="..\i_threads.h">
+ <Filter>I_Interface</Filter>
+ </ClInclude>
<ClInclude Include="..\i_video.h">
<Filter>I_Interface</Filter>
</ClInclude>
@@ -402,6 +415,12 @@
<ClInclude Include="..\tables.h">
<Filter>P_Play</Filter>
</ClInclude>
+ <ClInclude Include="..\taglist.h">
+ <Filter>P_Play</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libdivide.h">
+ <Filter>R_Rend</Filter>
+ </ClInclude>
<ClInclude Include="..\r_bsp.h">
<Filter>R_Rend</Filter>
</ClInclude>
@@ -597,6 +616,16 @@
<ClCompile Include="..\dehacked.c">
<Filter>D_Doom</Filter>
</ClCompile>
+ <ClCompile Include="..\deh_lua.c">
+ <Filter>D_Doom</Filter>
+ </ClCompile>
+ <ClCompile Include="..\deh_soc.c">
+ <Filter>D_Doom</Filter>
+ </ClCompile>
+ <ClCompile Include="..\deh_tables.c">
+ <Filter>D_Doom</Filter>
+ </ClCompile>
+
<ClCompile Include="..\d_clisrv.c">
<Filter>D_Doom</Filter>
</ClCompile>
@@ -720,6 +749,9 @@
<ClCompile Include="..\lua_infolib.c">
<Filter>LUA</Filter>
</ClCompile>
+ <ClCompile Include="..\lua_inputlib.c">
+ <Filter>LUA</Filter>
+ </ClCompile>
<ClCompile Include="..\lua_maplib.c">
<Filter>LUA</Filter>
</ClCompile>
@@ -741,6 +773,9 @@
<ClCompile Include="..\lua_skinlib.c">
<Filter>LUA</Filter>
</ClCompile>
+ <ClCompile Include="..\lua_taglib.c">
+ <Filter>LUA</Filter>
+ </ClCompile>
<ClCompile Include="..\lua_thinkerlib.c">
<Filter>LUA</Filter>
</ClCompile>
@@ -786,6 +821,9 @@
<ClCompile Include="..\string.c">
<Filter>M_Misc</Filter>
</ClCompile>
+ <ClCompile Include="..\strcasestr.c">
+ <Filter>M_Misc</Filter>
+ </ClCompile>
<ClCompile Include="..\comptime.c">
<Filter>O_Other</Filter>
</ClCompile>
@@ -846,6 +884,9 @@
<ClCompile Include="..\tables.c">
<Filter>P_Play</Filter>
</ClCompile>
+ <ClCompile Include="..\taglist.c">
+ <Filter>P_Play</Filter>
+ </ClCompile>
<ClCompile Include="..\t_facon.c">
<Filter>P_Play</Filter>
</ClCompile>
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 972a171a278e06066370718addafb046972b5379..26823dc8c40372323ac86a6cfb4d3814f427d047 100755
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -5,7 +5,7 @@
//
// Copyright (C) 1993-1996 by id Software, Inc.
// Portions Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -102,7 +102,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
#endif
#endif
-#if (defined (__unix__) && !defined (_MSDOS)) || (defined (UNIXCOMMON) && !defined(__APPLE__))
+#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__))
#include <errno.h>
#include <sys/wait.h>
//#define NEWSIGNALHANDLER
@@ -358,9 +358,10 @@ static void I_ReportSignal(int num, int coredumped)
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
- "Process killed by signal",
- sigmsg, NULL);
+ if (!M_CheckParm("-dedicated"))
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
+ "Process killed by signal",
+ sigmsg, NULL);
}
#ifndef NEWSIGNALHANDLER
@@ -550,7 +551,7 @@ static void I_StartupConsole(void)
void I_GetConsoleEvents(void)
{
// we use this when sending back commands
- event_t ev = {0,0,0,0};
+ event_t ev = {0};
char key = 0;
ssize_t d;
@@ -572,7 +573,7 @@ void I_GetConsoleEvents(void)
tty_con.buffer[tty_con.cursor] = '\0';
tty_Back();
}
- ev.data1 = KEY_BACKSPACE;
+ ev.key = KEY_BACKSPACE;
}
else if (key < ' ') // check if this is a control char
{
@@ -580,19 +581,19 @@ void I_GetConsoleEvents(void)
{
tty_Clear();
tty_con.cursor = 0;
- ev.data1 = KEY_ENTER;
+ ev.key = KEY_ENTER;
}
else return;
}
else
{
// push regular character
- ev.data1 = tty_con.buffer[tty_con.cursor] = key;
+ ev.key = tty_con.buffer[tty_con.cursor] = key;
tty_con.cursor++;
// print the current line (this is differential)
d = write(STDOUT_FILENO, &key, 1);
}
- if (ev.data1) D_PostEvent(&ev);
+ if (ev.key) D_PostEvent(&ev);
//tty_FlushIn();
(void)d;
}
@@ -626,18 +627,18 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
{
case VK_ESCAPE:
case VK_TAB:
- event.data1 = KEY_NULL;
+ event.key = KEY_NULL;
break;
case VK_RETURN:
entering_con_command = false;
/* FALLTHRU */
default:
- //event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char
- event.data1 = evt.uChar.AsciiChar;
+ //event.key = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char
+ event.key = evt.uChar.AsciiChar;
}
if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t))
{
- if (event.data1 && event.data1 != KEY_LSHIFT && event.data1 != KEY_RSHIFT)
+ if (event.key && event.key != KEY_LSHIFT && event.key != KEY_RSHIFT)
{
#ifdef _UNICODE
WriteConsole(co, &evt.uChar.UnicodeChar, 1, &t, NULL);
@@ -652,7 +653,7 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
}
}
}
- if (event.data1) D_PostEvent(&event);
+ if (event.key) D_PostEvent(&event);
}
void I_GetConsoleEvents(void)
@@ -917,7 +918,7 @@ INT32 I_GetKey (void)
ev = &events[eventtail];
if (ev->type == ev_keydown || ev->type == ev_console)
{
- rc = ev->data1;
+ rc = ev->key;
continue;
}
}
@@ -977,22 +978,22 @@ void I_ShutdownJoystick(void)
INT32 i;
event_t event;
event.type=ev_keyup;
- event.data2 = 0;
- event.data3 = 0;
+ event.x = 0;
+ event.y = 0;
lastjoybuttons = lastjoyhats = 0;
// emulate the up of all joystick buttons
for (i=0;i<JOYBUTTONS;i++)
{
- event.data1=KEY_JOY1+i;
+ event.key=KEY_JOY1+i;
D_PostEvent(&event);
}
// emulate the up of all joystick hats
for (i=0;i<JOYHATS*4;i++)
{
- event.data1=KEY_HAT1+i;
+ event.key=KEY_HAT1+i;
D_PostEvent(&event);
}
@@ -1000,7 +1001,7 @@ void I_ShutdownJoystick(void)
event.type = ev_joystick;
for (i=0;i<JOYAXISSET; i++)
{
- event.data1 = i;
+ event.key = i;
D_PostEvent(&event);
}
@@ -1012,7 +1013,7 @@ void I_ShutdownJoystick(void)
void I_GetJoystickEvents(void)
{
- static event_t event = {0,0,0,0};
+ static event_t event = {0,0,0,0,false};
INT32 i = 0;
UINT64 joyhats = 0;
#if 0
@@ -1049,7 +1050,7 @@ void I_GetJoystickEvents(void)
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_JOY1 + i;
+ event.key = KEY_JOY1 + i;
D_PostEvent(&event);
}
}
@@ -1080,7 +1081,7 @@ void I_GetJoystickEvents(void)
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_HAT1 + i;
+ event.key = KEY_HAT1 + i;
D_PostEvent(&event);
}
}
@@ -1092,7 +1093,7 @@ void I_GetJoystickEvents(void)
for (i = JOYAXISSET - 1; i >= 0; i--)
{
- event.data1 = i;
+ event.key = i;
if (i*2 + 1 <= JoyInfo.axises)
axisx = SDL_JoystickGetAxis(JoyInfo.dev, i*2 + 0);
else axisx = 0;
@@ -1110,15 +1111,15 @@ void I_GetJoystickEvents(void)
{
// gamepad control type, on or off, live or die
if (axisx < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (axisx > (JOYAXISRANGE/2))
- event.data2 = 1;
- else event.data2 = 0;
+ event.x = 1;
+ else event.x = 0;
if (axisy < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (axisy > (JOYAXISRANGE/2))
- event.data3 = 1;
- else event.data3 = 0;
+ event.y = 1;
+ else event.y = 0;
}
else
{
@@ -1132,8 +1133,8 @@ void I_GetJoystickEvents(void)
#endif
// analog control style , just send the raw data
- event.data2 = axisx; // x axis
- event.data3 = axisy; // y axis
+ event.x = axisx; // x axis
+ event.y = axisy; // y axis
}
D_PostEvent(&event);
}
@@ -1247,22 +1248,22 @@ void I_ShutdownJoystick2(void)
INT32 i;
event_t event;
event.type = ev_keyup;
- event.data2 = 0;
- event.data3 = 0;
+ event.x = 0;
+ event.y = 0;
lastjoy2buttons = lastjoy2hats = 0;
// emulate the up of all joystick buttons
for (i = 0; i < JOYBUTTONS; i++)
{
- event.data1 = KEY_2JOY1 + i;
+ event.key = KEY_2JOY1 + i;
D_PostEvent(&event);
}
// emulate the up of all joystick hats
for (i = 0; i < JOYHATS*4; i++)
{
- event.data1 = KEY_2HAT1 + i;
+ event.key = KEY_2HAT1 + i;
D_PostEvent(&event);
}
@@ -1270,7 +1271,7 @@ void I_ShutdownJoystick2(void)
event.type = ev_joystick2;
for (i = 0; i < JOYAXISSET; i++)
{
- event.data1 = i;
+ event.key = i;
D_PostEvent(&event);
}
@@ -1282,7 +1283,7 @@ void I_ShutdownJoystick2(void)
void I_GetJoystick2Events(void)
{
- static event_t event = {0,0,0,0};
+ static event_t event = {0,0,0,0,false};
INT32 i = 0;
UINT64 joyhats = 0;
#if 0
@@ -1321,7 +1322,7 @@ void I_GetJoystick2Events(void)
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_2JOY1 + i;
+ event.key = KEY_2JOY1 + i;
D_PostEvent(&event);
}
}
@@ -1352,7 +1353,7 @@ void I_GetJoystick2Events(void)
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_2HAT1 + i;
+ event.key = KEY_2HAT1 + i;
D_PostEvent(&event);
}
}
@@ -1364,7 +1365,7 @@ void I_GetJoystick2Events(void)
for (i = JOYAXISSET - 1; i >= 0; i--)
{
- event.data1 = i;
+ event.key = i;
if (i*2 + 1 <= JoyInfo2.axises)
axisx = SDL_JoystickGetAxis(JoyInfo2.dev, i*2 + 0);
else axisx = 0;
@@ -1380,17 +1381,17 @@ void I_GetJoystick2Events(void)
{
// gamepad control type, on or off, live or die
if (axisx < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (axisx > (JOYAXISRANGE/2))
- event.data2 = 1;
+ event.x = 1;
else
- event.data2 = 0;
+ event.x = 0;
if (axisy < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (axisy > (JOYAXISRANGE/2))
- event.data3 = 1;
+ event.y = 1;
else
- event.data3 = 0;
+ event.y = 0;
}
else
{
@@ -1404,8 +1405,8 @@ void I_GetJoystick2Events(void)
#endif
// analog control style , just send the raw data
- event.data2 = axisx; // x axis
- event.data3 = axisy; // y axis
+ event.x = axisx; // x axis
+ event.y = axisy; // y axis
}
D_PostEvent(&event);
}
@@ -1804,7 +1805,7 @@ void I_GetMouseEvents(void)
if (!(button & (1<<j))) //keyup
{
event.type = ev_keyup;
- event.data1 = KEY_2MOUSE1+j;
+ event.key = KEY_2MOUSE1+j;
D_PostEvent(&event);
om2b ^= 1 << j;
}
@@ -1814,18 +1815,18 @@ void I_GetMouseEvents(void)
if (button & (1<<j))
{
event.type = ev_keydown;
- event.data1 = KEY_2MOUSE1+j;
+ event.key = KEY_2MOUSE1+j;
D_PostEvent(&event);
om2b ^= 1 << j;
}
}
}
- event.data2 = ((SINT8)mdata[1])+((SINT8)mdata[3]);
- event.data3 = ((SINT8)mdata[2])+((SINT8)mdata[4]);
- if (event.data2 && event.data3)
+ event.x = ((SINT8)mdata[1])+((SINT8)mdata[3]);
+ event.y = ((SINT8)mdata[2])+((SINT8)mdata[4]);
+ if (event.x && event.y)
{
event.type = ev_mouse2;
- event.data1 = 0;
+ event.key = 0;
D_PostEvent(&event);
}
}
@@ -1867,7 +1868,7 @@ static void I_ShutdownMouse2(void)
for (i = 0; i < MOUSEBUTTONS; i++)
{
event.type = ev_keyup;
- event.data1 = KEY_2MOUSE1+i;
+ event.key = KEY_2MOUSE1+i;
D_PostEvent(&event);
}
@@ -1958,7 +1959,7 @@ void I_GetMouseEvents(void)
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_2MOUSE1+i;
+ event.key = KEY_2MOUSE1+i;
D_PostEvent(&event);
}
}
@@ -1966,10 +1967,10 @@ void I_GetMouseEvents(void)
if (handlermouse2x != 0 || handlermouse2y != 0)
{
event.type = ev_mouse2;
- event.data1 = 0;
-// event.data1 = buttons; // not needed
- event.data2 = handlermouse2x << 1;
- event.data3 = -handlermouse2y << 1;
+ event.key = 0;
+// event.key = buttons; // not needed
+ event.x = handlermouse2x << 1;
+ event.y = handlermouse2y << 1;
handlermouse2x = 0;
handlermouse2y = 0;
@@ -2212,7 +2213,13 @@ precise_t I_GetPreciseTime(void)
int I_PreciseToMicros(precise_t d)
{
- return (int)(d / (timer_frequency / 1000000.0));
+ // d is going to be converted into a double. So remove the highest bits
+ // to avoid loss of precision in the lower bits, for the (probably rare) case
+ // that the higher bits are actually used.
+ d &= ((precise_t)1 << 53) - 1; // The mantissa of a double can handle 53 bits at most.
+ // The resulting double from the calculation is converted first to UINT64 to avoid overflow,
+ // which is undefined behaviour when converting floating point values to integers.
+ return (int)(UINT64)(d / (timer_frequency / 1000000.0));
}
//
@@ -2278,9 +2285,10 @@ static void newsignalhandler_Warn(const char *pr)
I_OutputMsg("%s\n", text);
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
- "Startup error",
- text, NULL);
+ if (!M_CheckParm("-dedicated"))
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
+ "Startup error",
+ text, NULL);
I_ShutdownConsole();
exit(-1);
@@ -2481,9 +2489,10 @@ void I_Error(const char *error, ...)
// Implement message box with SDL_ShowSimpleMessageBox,
// which should fail gracefully if it can't put a message box up
// on the target system
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
- "SRB2 "VERSIONSTRING" Recursive Error",
- buffer, NULL);
+ if (!M_CheckParm("-dedicated"))
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
+ "SRB2 "VERSIONSTRING" Recursive Error",
+ buffer, NULL);
W_Shutdown();
exit(-1); // recursive errors detected
@@ -2525,9 +2534,10 @@ void I_Error(const char *error, ...)
// Implement message box with SDL_ShowSimpleMessageBox,
// which should fail gracefully if it can't put a message box up
// on the target system
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
- "SRB2 "VERSIONSTRING" Error",
- buffer, NULL);
+ if (!M_CheckParm("-dedicated"))
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
+ "SRB2 "VERSIONSTRING" Error",
+ buffer, NULL);
// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
// initialized at the time, so calling it after SDL_Quit() is
// perfectly okay! In addition, we do this on purpose so the
diff --git a/src/sdl/i_threads.c b/src/sdl/i_threads.c
index f73d00bcfc2ee70eba47f432812ec8cb4db7ec39..a182ae197c82ec2c97d1bca3c40d1c06f1dd70d1 100644
--- a/src/sdl/i_threads.c
+++ b/src/sdl/i_threads.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2020-2021 by James R.
+// Copyright (C) 2020-2022 by James R.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index fed719fa87270291055150cd6cbfd7a269147ad3..66a5356a2b713988202b7704669a93d961d50454 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -4,7 +4,7 @@
//
// Copyright (C) 1993-1996 by id Software, Inc.
// Portions Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -73,6 +73,8 @@
#include "../console.h"
#include "../command.h"
#include "../r_main.h"
+#include "../lua_script.h"
+#include "../lua_libs.h"
#include "../lua_hook.h"
#include "sdlmain.h"
#ifdef HWRENDER
@@ -376,6 +378,8 @@ static boolean IgnoreMouse(void)
if (gamestate != GS_LEVEL && gamestate != GS_INTERMISSION &&
gamestate != GS_CONTINUING && gamestate != GS_CUTSCENE)
return true;
+ if (!mousegrabbedbylua)
+ return true;
return false;
}
@@ -409,6 +413,14 @@ void I_UpdateMouseGrab(void)
SDLdoGrabMouse();
}
+void I_SetMouseGrab(boolean grab)
+{
+ if (grab)
+ SDLdoGrabMouse();
+ else
+ SDLdoUngrabMouse();
+}
+
static void VID_Command_NumModes_f (void)
{
CONS_Printf(M_GetText("%d video mode(s) available(s)\n"), VID_NumModes());
@@ -654,8 +666,9 @@ static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
{
return;
}
- event.data1 = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode);
- if (event.data1) D_PostEvent(&event);
+ event.key = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode);
+ event.repeated = (evt.repeat != 0);
+ if (event.key) D_PostEvent(&event);
}
static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
@@ -677,8 +690,8 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
{
if (SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window)
{
- mousemovex += evt.xrel;
- mousemovey += -evt.yrel;
+ mousemovex += evt.xrel;
+ mousemovey += evt.yrel;
SDL_SetWindowGrab(window, SDL_TRUE);
}
firstmove = false;
@@ -733,15 +746,15 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
}
else return;
if (evt.button == SDL_BUTTON_MIDDLE)
- event.data1 = KEY_MOUSE1+2;
+ event.key = KEY_MOUSE1+2;
else if (evt.button == SDL_BUTTON_RIGHT)
- event.data1 = KEY_MOUSE1+1;
+ event.key = KEY_MOUSE1+1;
else if (evt.button == SDL_BUTTON_LEFT)
- event.data1 = KEY_MOUSE1;
+ event.key = KEY_MOUSE1;
else if (evt.button == SDL_BUTTON_X1)
- event.data1 = KEY_MOUSE1+3;
+ event.key = KEY_MOUSE1+3;
else if (evt.button == SDL_BUTTON_X2)
- event.data1 = KEY_MOUSE1+4;
+ event.key = KEY_MOUSE1+4;
if (event.type == ev_keyup || event.type == ev_keydown)
{
D_PostEvent(&event);
@@ -757,17 +770,17 @@ static void Impl_HandleMouseWheelEvent(SDL_MouseWheelEvent evt)
if (evt.y > 0)
{
- event.data1 = KEY_MOUSEWHEELUP;
+ event.key = KEY_MOUSEWHEELUP;
event.type = ev_keydown;
}
if (evt.y < 0)
{
- event.data1 = KEY_MOUSEWHEELDOWN;
+ event.key = KEY_MOUSEWHEELDOWN;
event.type = ev_keydown;
}
if (evt.y == 0)
{
- event.data1 = 0;
+ event.key = 0;
event.type = ev_keyup;
}
if (event.type == ev_keyup || event.type == ev_keydown)
@@ -786,7 +799,7 @@ static void Impl_HandleJoystickAxisEvent(SDL_JoyAxisEvent evt)
joyid[1] = SDL_JoystickInstanceID(JoyInfo2.dev);
evt.axis++;
- event.data1 = event.data2 = event.data3 = INT32_MAX;
+ event.key = event.x = event.y = INT32_MAX;
if (evt.which == joyid[0])
{
@@ -803,14 +816,14 @@ static void Impl_HandleJoystickAxisEvent(SDL_JoyAxisEvent evt)
//vaule
if (evt.axis%2)
{
- event.data1 = evt.axis / 2;
- event.data2 = SDLJoyAxis(evt.value, event.type);
+ event.key = evt.axis / 2;
+ event.x = SDLJoyAxis(evt.value, event.type);
}
else
{
evt.axis--;
- event.data1 = evt.axis / 2;
- event.data3 = SDLJoyAxis(evt.value, event.type);
+ event.key = evt.axis / 2;
+ event.y = SDLJoyAxis(evt.value, event.type);
}
D_PostEvent(&event);
}
@@ -830,11 +843,11 @@ static void Impl_HandleJoystickHatEvent(SDL_JoyHatEvent evt)
if (evt.which == joyid[0])
{
- event.data1 = KEY_HAT1 + (evt.hat*4);
+ event.key = KEY_HAT1 + (evt.hat*4);
}
else if (evt.which == joyid[1])
{
- event.data1 = KEY_2HAT1 + (evt.hat*4);
+ event.key = KEY_2HAT1 + (evt.hat*4);
}
else return;
@@ -853,11 +866,11 @@ static void Impl_HandleJoystickButtonEvent(SDL_JoyButtonEvent evt, Uint32 type)
if (evt.which == joyid[0])
{
- event.data1 = KEY_JOY1;
+ event.key = KEY_JOY1;
}
else if (evt.which == joyid[1])
{
- event.data1 = KEY_2JOY1;
+ event.key = KEY_2JOY1;
}
else return;
if (type == SDL_JOYBUTTONUP)
@@ -871,7 +884,7 @@ static void Impl_HandleJoystickButtonEvent(SDL_JoyButtonEvent evt, Uint32 type)
else return;
if (evt.button < JOYBUTTONS)
{
- event.data1 += evt.button;
+ event.key += evt.button;
}
else return;
@@ -1061,7 +1074,7 @@ void I_GetEvent(void)
M_SetupJoystickMenu(0);
break;
case SDL_QUIT:
- LUAh_GameQuit(true);
+ LUA_HookBool(true, HOOK(GameQuit));
I_Quit();
break;
}
@@ -1075,9 +1088,9 @@ void I_GetEvent(void)
SDL_GetWindowSize(window, &wwidth, &wheight);
//SDL_memset(&event, 0, sizeof(event_t));
event.type = ev_mouse;
- event.data1 = 0;
- event.data2 = (INT32)lround(mousemovex * ((float)wwidth / (float)realwidth));
- event.data3 = (INT32)lround(mousemovey * ((float)wheight / (float)realheight));
+ event.key = 0;
+ event.x = (INT32)lround(mousemovex * ((float)wwidth / (float)realwidth));
+ event.y = (INT32)lround(mousemovey * ((float)wheight / (float)realheight));
D_PostEvent(&event);
}
@@ -1947,3 +1960,8 @@ void I_ShutdownGraphics(void)
framebuffer = SDL_FALSE;
}
#endif
+
+void I_GetCursorPosition(INT32 *x, INT32 *y)
+{
+ SDL_GetMouseState(x, y);
+}
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 2f1a872669443c033d882940fafd43689518265e..748cd374b6a54f5b65bb0637853648582163b16c 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -9,7 +9,7 @@
/// \file
/// \brief SDL Mixer interface for sound
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
#ifdef HAVE_ZLIB
#ifndef _MSC_VER
#ifndef _LARGEFILE64_SOURCE
@@ -27,7 +27,7 @@
#include <zlib.h>
#endif // HAVE_ZLIB
-#endif // HAVE_LIBGME
+#endif // HAVE_GME
#include "../doomdef.h"
#include "../doomstat.h" // menuactive
@@ -73,11 +73,11 @@
#define MUS_MODPLUG MUS_MODPLUG_UNUSED
#endif
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
#include "gme/gme.h"
#define GME_TREBLE 5.0f
#define GME_BASS 1.0f
-#endif // HAVE_LIBGME
+#endif // HAVE_GME
static UINT16 BUFFERSIZE = 2048;
static UINT16 SAMPLERATE = 44100;
@@ -110,7 +110,7 @@ static INT32 fading_id;
static void (*fading_callback)(void);
static boolean fading_nocleanup;
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
static Music_Emu *gme;
static UINT16 current_track;
#endif
@@ -220,7 +220,7 @@ static void var_cleanup(void)
internal_volume = 100;
}
-#if defined (HAVE_LIBGME) && defined (HAVE_ZLIB)
+#if defined (HAVE_GME) && defined (HAVE_ZLIB)
static const char* get_zlib_error(int zErr)
{
switch (zErr)
@@ -318,7 +318,7 @@ void I_ShutdownSound(void)
SDL_QuitSubSystem(SDL_INIT_AUDIO);
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
gme_delete(gme);
#endif
@@ -453,7 +453,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
void *lump;
Mix_Chunk *chunk;
SDL_RWops *rw;
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
Music_Emu *emu;
gme_info_t *info;
#endif
@@ -473,7 +473,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
}
// Not a doom sound? Try something else.
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
// VGZ format
if (((UINT8 *)lump)[0] == 0x1F
&& ((UINT8 *)lump)[1] == 0x8B)
@@ -729,7 +729,7 @@ static UINT32 music_fade(UINT32 interval, void *param)
}
}
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
static void mix_gme(void *udata, Uint8 *stream, int len)
{
int i;
@@ -797,7 +797,7 @@ void I_ShutdownMusic(void)
musictype_t I_SongType(void)
{
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
return MU_GME;
else
@@ -828,7 +828,7 @@ musictype_t I_SongType(void)
boolean I_SongPlaying(void)
{
return (
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
(I_SongType() == MU_GME && gme) ||
#endif
#ifdef HAVE_OPENMPT
@@ -851,7 +851,7 @@ boolean I_SetSongSpeed(float speed)
{
if (speed > 250.0f)
speed = 250.0f; //limit speed up to 250x
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
SDL_LockAudio();
@@ -893,7 +893,7 @@ UINT32 I_GetSongLength(void)
{
INT32 length;
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
gme_info_t *info;
@@ -963,7 +963,7 @@ boolean I_SetSongLoopPoint(UINT32 looppoint)
UINT32 I_GetSongLoopPoint(void)
{
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
INT32 looppoint;
@@ -992,7 +992,7 @@ UINT32 I_GetSongLoopPoint(void)
boolean I_SetSongPosition(UINT32 position)
{
UINT32 length;
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
// this is unstable, so fail silently
@@ -1055,7 +1055,7 @@ boolean I_SetSongPosition(UINT32 position)
UINT32 I_GetSongPosition(void)
{
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
INT32 position = gme_tell(gme);
@@ -1124,7 +1124,7 @@ boolean I_LoadSong(char *data, size_t len)
SDL_RWops *rw;
if (music
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
|| gme
#endif
#ifdef HAVE_OPENMPT
@@ -1136,7 +1136,7 @@ boolean I_LoadSong(char *data, size_t len)
// always do this whether or not a music already exists
var_cleanup();
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if ((UINT8)data[0] == 0x1F
&& (UINT8)data[1] == 0x8B)
{
@@ -1271,7 +1271,7 @@ void I_UnloadSong(void)
{
I_StopSong();
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
gme_delete(gme);
@@ -1294,7 +1294,7 @@ void I_UnloadSong(void)
boolean I_PlaySong(boolean looping)
{
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
@@ -1360,7 +1360,7 @@ void I_StopSong(void)
if (!fading_nocleanup)
I_StopFadingSong();
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
if (gme)
{
Mix_HookMusic(NULL, NULL);
@@ -1433,7 +1433,7 @@ void I_SetMusicVolume(UINT8 volume)
boolean I_SetSongTrack(int track)
{
-#ifdef HAVE_LIBGME
+#ifdef HAVE_GME
// If the specified track is within the number of tracks playing, then change it
if (gme)
{
diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c
index c426e6792f6c8116c52615a27f997e63e9f2b275..67e98d4f5fe8c9bcbaebbe9558a1bc9b6a537c20 100644
--- a/src/sdl/ogl_sdl.c
+++ b/src/sdl/ogl_sdl.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -177,7 +177,9 @@ boolean OglSdlSurface(INT32 w, INT32 h)
// Also set the renderer variable back to software so the next launch won't
// repeat this error.
CV_StealthSet(&cv_renderer, "Software");
- I_Error("OpenGL Error: Failed to access the GPU. There may be an issue with your graphics drivers.");
+ I_Error("OpenGL Error: Failed to access the GPU. Possible reasons include:\n"
+ "- GPU vendor has dropped OpenGL support on your GPU and OS. (Old GPU?)\n"
+ "- GPU drivers are missing or broken. You may need to update your drivers.");
}
}
first_init = true;
diff --git a/src/sdl/ogl_sdl.h b/src/sdl/ogl_sdl.h
index 8f87f688e36a4b897268c1f0fb3f55747779b908..9744bc6f12b8b3ae4babe4e97c05c889ab2a2291 100644
--- a/src/sdl/ogl_sdl.h
+++ b/src/sdl/ogl_sdl.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 058b601c350072e93f41bae736a89f432d5d79cf..0de3788fe3f36db13dfe37e710abe0f95a2d84d8 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (C) 1993-1996 by id Software, Inc.
-// Copyright (C) 2014-2021 by Sonic Team Junior.
+// Copyright (C) 2014-2022 by Sonic Team Junior.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/src/sdl/sdlmain.h b/src/sdl/sdlmain.h
index a9676b5c2f1261bbc7aab49d0ada71e4cba50f91..6b6e79d9756e20b6fd4faa1072f6dd45bdce0cd1 100644
--- a/src/sdl/sdlmain.h
+++ b/src/sdl/sdlmain.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// Copyright (C) 2006-2021 by Sonic Team Junior.
+// Copyright (C) 2006-2022 by Sonic Team Junior.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/src/sounds.c b/src/sounds.c
index c911184d777aeb6ef874aff2fe379f96ef914744..13ea72a13fdab9e4bc3cad95b0333b3abab624a2 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/sounds.h b/src/sounds.h
index 0c187e000449fd442d12a03757150837a58c03eb..8e15420f87cd45f69427e76e8c1ee571b7e7b249 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 1f537b7d4a4a1b3d0320515f2393924cacdd708f..29135491f4a40b0c23c4ab604f5b43d9368483fc 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -43,6 +43,7 @@
#endif
#include "lua_hud.h"
+#include "lua_hook.h"
UINT16 objectsdrawn = 0;
@@ -1185,7 +1186,17 @@ static void ST_drawInput(void)
break;
case CS_SIMPLE:
- V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "SIMPLE");
+ V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "AUTOMATIC");
+ y -= 8;
+ break;
+
+ case CS_STANDARD:
+ V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "MANUAL");
+ y -= 8;
+ break;
+
+ case CS_LEGACY:
+ V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "STRAFE");
y -= 8;
break;
@@ -1377,7 +1388,7 @@ void ST_drawTitleCard(void)
zzticker = lt_ticker;
V_DrawMappedPatch(FixedInt(lt_zigzag), (-zzticker) % zigzag->height, V_SNAPTOTOP|V_SNAPTOLEFT, zigzag, colormap);
V_DrawMappedPatch(FixedInt(lt_zigzag), (zigzag->height-zzticker) % zigzag->height, V_SNAPTOTOP|V_SNAPTOLEFT, zigzag, colormap);
- V_DrawMappedPatch(FixedInt(lt_zigzag), (-zigzag->height+zzticker) % zztext->height, V_SNAPTOTOP|V_SNAPTOLEFT, zztext, colormap);
+ V_DrawMappedPatch(FixedInt(lt_zigzag), (-zztext->height+zzticker) % zztext->height, V_SNAPTOTOP|V_SNAPTOLEFT, zztext, colormap);
V_DrawMappedPatch(FixedInt(lt_zigzag), (zzticker) % zztext->height, V_SNAPTOTOP|V_SNAPTOLEFT, zztext, colormap);
}
@@ -1401,7 +1412,7 @@ void ST_drawTitleCard(void)
lt_lasttic = lt_ticker;
luahook:
- LUAh_TitleCardHUD(stplyr);
+ LUA_HUDHOOK(titlecard);
}
//
@@ -2046,9 +2057,8 @@ static void ST_drawNiGHTSHUD(void)
else
numbersize = 48/2;
- if ((oldspecialstage && leveltime & 2)
- && (stplyr->mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER))
- && !(stplyr->powers[pw_shield] & SH_PROTECTWATER))
+ if ((oldspecialstage && leveltime & 2) &&
+ (stplyr->mo->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER) && !(stplyr->powers[pw_shield] & ((stplyr->mo->eflags & MFE_TOUCHLAVA) ? SH_PROTECTFIRE : SH_PROTECTWATER))))
col = SKINCOLOR_ORANGE;
ST_DrawNightsOverlayNum((160 + numbersize)<<FRACBITS, 14<<FRACBITS, FRACUNIT, V_PERPLAYER|V_SNAPTOTOP, realnightstime, nightsnum, col);
@@ -2197,7 +2207,7 @@ static void ST_drawMatchHUD(void)
{
sprintf(penaltystr, "-%d", stplyr->ammoremoval);
V_DrawString(offset + 8 + stplyr->ammoremovalweapon * 20, y,
- V_REDMAP|V_SNAPTOBOTTOM, penaltystr);
+ V_REDMAP|V_SNAPTOBOTTOM|V_PERPLAYER, penaltystr);
}
}
@@ -2301,7 +2311,7 @@ static void ST_drawTextHUD(void)
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i] || players[i].spectator)
+ if (!playeringame[i] || players[i].spectator || players[i].bot)
continue;
if (players[i].lives <= 0)
continue;
@@ -2742,7 +2752,7 @@ static void ST_overlayDrawer(void)
ST_drawPowerupHUD(); // same as it ever was...
if (!(netgame || multiplayer) || !hu_showscores)
- LUAh_GameHUD(stplyr);
+ LUA_HUDHOOK(game);
// draw level title Tails
if (stagetitle && (!WipeInAction) && (!WipeStageTitle))
diff --git a/src/st_stuff.h b/src/st_stuff.h
index 4f705bb519048c96ac0b1f8e7a6f8d49d62244ad..753102015724ac9d672c41e17ad90768ffad8fe3 100644
--- a/src/st_stuff.h
+++ b/src/st_stuff.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/strcasestr.c b/src/strcasestr.c
index 1cbee286a433a722dcb0b95a25fa5dccf64485c9..6a686d6dc8eabdac832168b00e7addf521746774 100644
--- a/src/strcasestr.c
+++ b/src/strcasestr.c
@@ -2,7 +2,7 @@
strcasestr -- case insensitive substring searching function.
*/
/*
-Copyright 2019-2021 James R.
+Copyright 2019-2022 James R.
All rights reserved.
Redistribution and use in source forms, with or without modification, is
diff --git a/src/string.c b/src/string.c
index f32025612283c02e7da2522be5c94fe8596efc56..5534a3f0ceb83b41edbaa6e3517eeb38f304e38d 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2006 by Graue.
-// Copyright (C) 2006-2021 by Sonic Team Junior.
+// Copyright (C) 2006-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/tables.c b/src/tables.c
index 9263f42d327f679e10a9a3899acd81eee4171ddf..13949b6a78c337a9183a7fd857c04135899acc7e 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/tables.h b/src/tables.h
index baa3adf36de62eb88cb31dfed7e2dcd535205f50..c44c7d525b5d205197843ad083bb84d1fc257a68 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/taglist.c b/src/taglist.c
index 28fa48c25779cccf68089c1bd53deb2fbbc69d4e..6b50a51ab081b3604b0aef8f93b725a3e2ab3c35 100644
--- a/src/taglist.c
+++ b/src/taglist.c
@@ -1,8 +1,8 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
-// Copyright (C) 2020-2021 by Nev3r.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by Nev3r.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -27,11 +27,13 @@ taggroup_t* tags_sectors[MAXTAGS + 1];
taggroup_t* tags_lines[MAXTAGS + 1];
taggroup_t* tags_mapthings[MAXTAGS + 1];
-/// Adds a tag to a given element's taglist.
+/// Adds a tag to a given element's taglist. It will not add a duplicate.
/// \warning This does not rebuild the global taggroups, which are used for iteration.
void Tag_Add (taglist_t* list, const mtag_t tag)
{
- list->tags = Z_Realloc(list->tags, (list->count + 1) * sizeof(list->tags), PU_LEVEL, NULL);
+ if (Tag_Find(list, tag))
+ return;
+ list->tags = Z_Realloc(list->tags, (list->count + 1) * sizeof(mtag_t), PU_LEVEL, NULL);
list->tags[list->count++] = tag;
}
@@ -189,6 +191,38 @@ void Taggroup_Add (taggroup_t *garray[], const mtag_t tag, size_t id)
group->elements[i] = id;
}
+static void Taggroup_Add_Init(taggroup_t *garray[], const mtag_t tag, size_t id)
+{
+ taggroup_t *group;
+
+ if (tag == MTAG_GLOBAL)
+ return;
+
+ group = garray[(UINT16)tag];
+
+ if (! in_bit_array(tags_available, tag))
+ {
+ num_tags++;
+ set_bit_array(tags_available, tag);
+ }
+
+ // Create group if empty.
+ if (!group)
+ group = garray[(UINT16)tag] = Z_Calloc(sizeof(taggroup_t), PU_LEVEL, NULL);
+ else if (group->elements[group->count - 1] == id)
+ return; // Don't add duplicates
+
+ group->count++;
+
+ if (group->count > group->capacity)
+ {
+ group->capacity = 2 * group->count;
+ group->elements = Z_Realloc(group->elements, group->capacity * sizeof(size_t), PU_LEVEL, NULL);
+ }
+
+ group->elements[group->count - 1] = id;
+}
+
static size_t total_elements_with_tag (const mtag_t tag)
{
return
@@ -248,17 +282,17 @@ void Taggroup_Remove (taggroup_t *garray[], const mtag_t tag, size_t id)
static void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
{
- Taggroup_Add(tags_sectors, tag, itemid);
+ Taggroup_Add_Init(tags_sectors, tag, itemid);
}
static void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
{
- Taggroup_Add(tags_lines, tag, itemid);
+ Taggroup_Add_Init(tags_lines, tag, itemid);
}
static void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
{
- Taggroup_Add(tags_mapthings, tag, itemid);
+ Taggroup_Add_Init(tags_mapthings, tag, itemid);
}
/// After all taglists have been built for each element (sectors, lines, things),
diff --git a/src/taglist.h b/src/taglist.h
index 146d76131f3b985466b3049ddb3efe29f2a03a52..d326ef357855efeb3ea70729fcc7d1812a47391c 100644
--- a/src/taglist.h
+++ b/src/taglist.h
@@ -1,8 +1,8 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
-// Copyright (C) 2020-2021 by Nev3r.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
+// Copyright (C) 2020-2022 by Nev3r.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -41,6 +41,7 @@ typedef struct
{
size_t *elements;
size_t count;
+ size_t capacity;
} taggroup_t;
extern bitarray_t tags_available[];
@@ -71,25 +72,16 @@ INT32 Tag_Iterate_Things (const mtag_t tag, const size_t p);
INT32 Tag_FindLineSpecial(const INT16 special, const mtag_t tag);
INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start);
-// Use this macro to declare an iterator position variable.
-#define TAG_ITER_DECLARECOUNTER(level) size_t ICNT_##level
-
-#define TAG_ITER(level, fn, tag, return_varname) for(ICNT_##level = 0; (return_varname = fn(tag, ICNT_##level)) >= 0; ICNT_##level++)
+#define ICNAME2(id) ICNT_##id
+#define ICNAME(id) ICNAME2(id)
+#define TAG_ITER(fn, tag, return_varname) for(size_t ICNAME(__LINE__) = 0; (return_varname = fn(tag, ICNAME(__LINE__))) >= 0; ICNAME(__LINE__)++)
// Use these macros as wrappers for a taglist iteration.
-#define TAG_ITER_SECTORS(level, tag, return_varname) TAG_ITER(level, Tag_Iterate_Sectors, tag, return_varname)
-#define TAG_ITER_LINES(level, tag, return_varname) TAG_ITER(level, Tag_Iterate_Lines, tag, return_varname)
-#define TAG_ITER_THINGS(level, tag, return_varname) TAG_ITER(level, Tag_Iterate_Things, tag, return_varname)
+#define TAG_ITER_SECTORS(tag, return_varname) TAG_ITER(Tag_Iterate_Sectors, tag, return_varname)
+#define TAG_ITER_LINES(tag, return_varname) TAG_ITER(Tag_Iterate_Lines, tag, return_varname)
+#define TAG_ITER_THINGS(tag, return_varname) TAG_ITER(Tag_Iterate_Things, tag, return_varname)
/* ITERATION MACROS
-TAG_ITER_DECLARECOUNTER must be used before using the iterators.
-
-'level':
-For each nested iteration, an additional TAG_ITER_DECLARECOUNTER
-must be used with a different level number to avoid conflict with
-the outer iterations.
-Most cases don't have nested iterations and thus the level is just 0.
-
'tag':
Pretty much the elements' tag to iterate through.
@@ -99,17 +91,12 @@ Target variable's name to return the iteration results to.
EXAMPLE:
{
- TAG_ITER_DECLARECOUNTER(0);
- TAG_ITER_DECLARECOUNTER(1); // For the nested iteration.
-
size_t li;
- size_t sec;
-
INT32 tag1 = 4;
...
- TAG_ITER_LINES(0, tag1, li)
+ TAG_ITER_LINES(tag1, li)
{
line_t *line = lines + li;
@@ -117,11 +104,11 @@ EXAMPLE:
if (something)
{
+ size_t sec;
mtag_t tag2 = 8;
- // Nested iteration; just make sure the level is higher
- // and that it has its own counter declared in scope.
- TAG_ITER_SECTORS(1, tag2, sec)
+ // Nested iteration.
+ TAG_ITER_SECTORS(tag2, sec)
{
sector_t *sector = sectors + sec;
diff --git a/src/tmap.nas b/src/tmap.nas
index 5bf28359e6b75b1753e94eea8d0fa77b077978b8..f096c8141c14fd8b3d1e2138013a1963b62f0991 100644
--- a/src/tmap.nas
+++ b/src/tmap.nas
@@ -1,7 +1,7 @@
;; SONIC ROBO BLAST 2
;;-----------------------------------------------------------------------------
;; Copyright (C) 1998-2000 by DooM Legacy Team.
-;; Copyright (C) 1999-2021 by Sonic Team Junior.
+;; Copyright (C) 1999-2022 by Sonic Team Junior.
;;
;; This program is free software distributed under the
;; terms of the GNU General Public License, version 2.
diff --git a/src/tmap.s b/src/tmap.s
index 62dcf85dcc00ed350e3bf145e03eedb885e4ee6a..5bb2dea12739094aac7792f2fd6ec5681dabb04a 100644
--- a/src/tmap.s
+++ b/src/tmap.s
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/tmap_asm.s b/src/tmap_asm.s
index b5a0a51e91dd00f330b33d2cf0ca9cee60373323..8e307f42b71023b3a4cbd5a5687d6556113342c4 100644
--- a/src/tmap_asm.s
+++ b/src/tmap_asm.s
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/tmap_mmx.nas b/src/tmap_mmx.nas
index 8b6ef91a60aeff852abee8824eb8f49a6572df92..5312f3c7667edbdd0ee9c6866e99cab61f8813de 100644
--- a/src/tmap_mmx.nas
+++ b/src/tmap_mmx.nas
@@ -1,7 +1,7 @@
;; SONIC ROBO BLAST 2
;;-----------------------------------------------------------------------------
;; Copyright (C) 1998-2000 by DOSDOOM.
-;; Copyright (C) 2010-2021 by Sonic Team Junior.
+;; Copyright (C) 2010-2022 by Sonic Team Junior.
;;
;; This program is free software distributed under the
;; terms of the GNU General Public License, version 2.
diff --git a/src/tmap_vc.nas b/src/tmap_vc.nas
index b6ee26e6b8f22d481b419dac46227b010f78058f..44b2d2e7beb2495be9983cfc75cee4b62ce846ce 100644
--- a/src/tmap_vc.nas
+++ b/src/tmap_vc.nas
@@ -1,7 +1,7 @@
;; SONIC ROBO BLAST 2
;;-----------------------------------------------------------------------------
;; Copyright (C) 1998-2000 by DooM Legacy Team.
-;; Copyright (C) 1999-2021 by Sonic Team Junior.
+;; Copyright (C) 1999-2022 by Sonic Team Junior.
;;
;; This program is free software distributed under the
;; terms of the GNU General Public License, version 2.
diff --git a/src/v_video.c b/src/v_video.c
index 95b448ac060a837c51ba024ffabf4a151570e2ac..7b664a5a070dbc1f7d2defab072182562735d866 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -422,7 +422,7 @@ void V_SetPalette(INT32 palettenum)
#ifdef HWRENDER
if (rendermode == render_opengl)
HWR_SetPalette(&pLocalPalette[palettenum*256]);
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
else
#endif
#endif
@@ -436,7 +436,7 @@ void V_SetPaletteLump(const char *pal)
#ifdef HWRENDER
if (rendermode == render_opengl)
HWR_SetPalette(pLocalPalette);
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
else
#endif
#endif
@@ -459,7 +459,8 @@ void VID_BlitLinearScreen_ASM(const UINT8 *srcptr, UINT8 *destptr, INT32 width,
static void CV_constextsize_OnChange(void)
{
- con_recalc = true;
+ if (!con_refresh)
+ con_recalc = true;
}
@@ -514,7 +515,8 @@ static inline UINT8 transmappedpdraw(const UINT8 *dest, const UINT8 *source, fix
void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap)
{
UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t);
- UINT32 alphalevel = 0;
+ UINT32 alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT);
+ UINT32 blendmode = ((scrn & V_BLENDMASK) >> V_BLENDSHIFT);
fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
INT32 dupx, dupy;
@@ -541,21 +543,21 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
patchdrawfunc = standardpdraw;
v_translevel = NULL;
- if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT)))
+ if (alphalevel || blendmode)
{
- if (alphalevel == 13)
+ if (alphalevel == 10) // V_HUDTRANSHALF
alphalevel = hudminusalpha[st_translucency];
- else if (alphalevel == 14)
+ else if (alphalevel == 11) // V_HUDTRANS
alphalevel = 10 - st_translucency;
- else if (alphalevel == 15)
+ else if (alphalevel == 12) // V_HUDTRANSDOUBLE
alphalevel = hudplusalpha[st_translucency];
if (alphalevel >= 10)
return; // invis
- if (alphalevel)
+ if (alphalevel || blendmode)
{
- v_translevel = R_GetTranslucencyTable(alphalevel);
+ v_translevel = R_GetBlendTable(blendmode+1, alphalevel);
patchdrawfunc = translucentpdraw;
}
}
@@ -594,10 +596,6 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
colfrac = FixedDiv(FRACUNIT, fdup);
rowfrac = FixedDiv(FRACUNIT, vdup);
- // So it turns out offsets aren't scaled in V_NOSCALESTART unless V_OFFSET is applied ...poo, that's terrible
- // For now let's just at least give V_OFFSET the ability to support V_FLIP
- // I'll probably make a better fix for 2.2 where I don't have to worry about breaking existing support for stuff
- // -- Monster Iestyn 29/10/18
{
fixed_t offsetx = 0, offsety = 0;
@@ -608,15 +606,8 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
offsetx = FixedMul(patch->leftoffset<<FRACBITS, pscale);
// top offset
- // TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!?
offsety = FixedMul(patch->topoffset<<FRACBITS, vscale);
- if ((scrn & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
- {
- offsetx = FixedMul(offsetx, dupx<<FRACBITS);
- offsety = FixedMul(offsety, dupy<<FRACBITS);
- }
-
// Subtract the offsets from x/y positions
x -= offsetx;
y -= offsety;
@@ -812,13 +803,14 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
}
// Draws a patch cropped and scaled to arbitrary size.
-void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t *patch, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
+void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
{
UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t);
- UINT32 alphalevel = 0;
+ UINT32 alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT);
+ UINT32 blendmode = ((scrn & V_BLENDMASK) >> V_BLENDSHIFT);
// boolean flip = false;
- fixed_t col, ofs, colfrac, rowfrac, fdup;
+ fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
INT32 dupx, dupy;
const column_t *column;
UINT8 *desttop, *dest;
@@ -833,7 +825,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
//if (rendermode != render_soft && !con_startup) // Not this again
if (rendermode == render_opengl)
{
- HWR_DrawCroppedPatch(patch,x,y,pscale,scrn,sx,sy,w,h);
+ HWR_DrawCroppedPatch(patch,x,y,pscale,vscale,scrn,colormap,sx,sy,w,h);
return;
}
#endif
@@ -841,50 +833,75 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
patchdrawfunc = standardpdraw;
v_translevel = NULL;
- if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT)))
+ if (alphalevel || blendmode)
{
- if (alphalevel == 13)
+ if (alphalevel == 10) // V_HUDTRANSHALF
alphalevel = hudminusalpha[st_translucency];
- else if (alphalevel == 14)
+ else if (alphalevel == 11) // V_HUDTRANS
alphalevel = 10 - st_translucency;
- else if (alphalevel == 15)
+ else if (alphalevel == 12) // V_HUDTRANSDOUBLE
alphalevel = hudplusalpha[st_translucency];
if (alphalevel >= 10)
return; // invis
- if (alphalevel)
+ if (alphalevel || blendmode)
{
- v_translevel = R_GetTranslucencyTable(alphalevel);
+ v_translevel = R_GetBlendTable(blendmode+1, alphalevel);
patchdrawfunc = translucentpdraw;
}
}
+ v_colormap = NULL;
+ if (colormap)
+ {
+ v_colormap = colormap;
+ patchdrawfunc = (v_translevel) ? transmappedpdraw : mappedpdraw;
+ }
+
+ dupx = vid.dupx;
+ dupy = vid.dupy;
+ if (scrn & V_SCALEPATCHMASK) switch ((scrn & V_SCALEPATCHMASK) >> V_SCALEPATCHSHIFT)
+ {
+ case 1: // V_NOSCALEPATCH
+ dupx = dupy = 1;
+ break;
+ case 2: // V_SMALLSCALEPATCH
+ dupx = vid.smalldupx;
+ dupy = vid.smalldupy;
+ break;
+ case 3: // V_MEDSCALEPATCH
+ dupx = vid.meddupx;
+ dupy = vid.meddupy;
+ break;
+ default:
+ break;
+ }
+
// only use one dup, to avoid stretching (har har)
- dupx = dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
- fdup = FixedMul(dupx<<FRACBITS, pscale);
+ dupx = dupy = (dupx < dupy ? dupx : dupy);
+ fdup = vdup = FixedMul(dupx<<FRACBITS, pscale);
+ if (vscale != pscale)
+ vdup = FixedMul(dupx<<FRACBITS, vscale);
colfrac = FixedDiv(FRACUNIT, fdup);
- rowfrac = FixedDiv(FRACUNIT, fdup);
+ rowfrac = FixedDiv(FRACUNIT, vdup);
- y -= FixedMul(patch->topoffset<<FRACBITS, pscale);
x -= FixedMul(patch->leftoffset<<FRACBITS, pscale);
+ y -= FixedMul(patch->topoffset<<FRACBITS, vscale);
if (splitscreen && (scrn & V_PERPLAYER))
{
fixed_t adjusty = ((scrn & V_NOSCALESTART) ? vid.height : BASEVIDHEIGHT)<<(FRACBITS-1);
- fdup >>= 1;
+ vdup >>= 1;
rowfrac <<= 1;
y >>= 1;
- sy >>= 1;
- h >>= 1;
#ifdef QUADS
if (splitscreen > 1) // 3 or 4 players
{
fixed_t adjustx = ((scrn & V_NOSCALESTART) ? vid.height : BASEVIDHEIGHT)<<(FRACBITS-1));
+ fdup >>= 1;
colfrac <<= 1;
x >>= 1;
- sx >>= 1;
- w >>= 1;
if (stplyr == &players[displayplayer])
{
if (!(scrn & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
@@ -900,7 +917,6 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
if (!(scrn & (V_SNAPTOLEFT|V_SNAPTORIGHT)))
perplayershuffle |= 8;
x += adjustx;
- sx += adjustx;
scrn &= ~V_SNAPTOBOTTOM|V_SNAPTOLEFT;
}
else if (stplyr == &players[thirddisplayplayer])
@@ -910,7 +926,6 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
if (!(scrn & (V_SNAPTOLEFT|V_SNAPTORIGHT)))
perplayershuffle |= 4;
y += adjusty;
- sy += adjusty;
scrn &= ~V_SNAPTOTOP|V_SNAPTORIGHT;
}
else //if (stplyr == &players[fourthdisplayplayer])
@@ -920,9 +935,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
if (!(scrn & (V_SNAPTOLEFT|V_SNAPTORIGHT)))
perplayershuffle |= 8;
x += adjustx;
- sx += adjustx;
y += adjusty;
- sy += adjusty;
scrn &= ~V_SNAPTOTOP|V_SNAPTOLEFT;
}
}
@@ -941,7 +954,6 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
if (!(scrn & (V_SNAPTOTOP|V_SNAPTOBOTTOM)))
perplayershuffle |= 2;
y += adjusty;
- sy += adjusty;
scrn &= ~V_SNAPTOTOP;
}
}
@@ -954,7 +966,8 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
deststop = desttop + vid.rowbytes * vid.height;
- if (scrn & V_NOSCALESTART) {
+ if (scrn & V_NOSCALESTART)
+ {
x >>= FRACBITS;
y >>= FRACBITS;
desttop += (y*vid.width) + x;
@@ -1002,7 +1015,38 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
desttop += (y*vid.width) + x;
}
- for (col = sx<<FRACBITS; (col>>FRACBITS) < patch->width && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop++)
+ // Auto-crop at splitscreen borders!
+ if (splitscreen && (scrn & V_PERPLAYER))
+ {
+#ifdef QUADS
+ if (splitscreen > 1) // 3 or 4 players
+ {
+ #error Auto-cropping doesnt take quadscreen into account! Fix it!
+ // Hint: For player 1/2, copy player 1's code below. For player 3/4, copy player 2's code below
+ // For player 1/3 and 2/4, hijack the X wrap prevention lines? That's probably easiest
+ }
+ else
+#endif
+ // 2 players
+ {
+ if (stplyr == &players[displayplayer]) // Player 1's screen, crop at the bottom
+ {
+ // Just put a big old stop sign halfway through the screen
+ deststop -= vid.rowbytes * (vid.height>>1);
+ }
+ else //if (stplyr == &players[secondarydisplayplayer]) // Player 2's screen, crop at the top
+ {
+ if (y < (vid.height>>1)) // If the top is above the border
+ {
+ sy += ((vid.height>>1) - y) * rowfrac; // Start further down on the patch
+ h -= ((vid.height>>1) - y) * rowfrac; // Draw less downwards from the start
+ desttop += ((vid.height>>1) - y) * vid.width; // Start drawing at the border
+ }
+ }
+ }
+ }
+
+ for (col = sx; (col>>FRACBITS) < patch->width && (col - sx) < w; col += colfrac, ++x, desttop++)
{
INT32 topdelta, prevdelta = -1;
if (x < 0) // don't draw off the left of the screen (WRAP PREVENTION)
@@ -1019,15 +1063,15 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
prevdelta = topdelta;
source = (const UINT8 *)(column) + 3;
dest = desttop;
- if (topdelta-sy > 0)
+ if ((topdelta<<FRACBITS)-sy > 0)
{
- dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup))*vid.width;
+ dest += FixedInt(FixedMul((topdelta<<FRACBITS)-sy,vdup))*vid.width;
ofs = 0;
}
else
- ofs = (sy-topdelta)<<FRACBITS;
+ ofs = sy-(topdelta<<FRACBITS);
- for (; dest < deststop && (ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
+ for (; dest < deststop && (ofs>>FRACBITS) < column->length && ((ofs - sy) + (topdelta<<FRACBITS)) < h; ofs += rowfrac)
{
if (dest >= screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
*dest = patchdrawfunc(dest, source, ofs);
@@ -1362,11 +1406,11 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
if ((alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT)))
{
- if (alphalevel == 13)
+ if (alphalevel == 10) // V_HUDTRANSHALF
alphalevel = hudminusalpha[st_translucency];
- else if (alphalevel == 14)
+ else if (alphalevel == 11) // V_HUDTRANS
alphalevel = 10 - st_translucency;
- else if (alphalevel == 15)
+ else if (alphalevel == 12) // V_HUDTRANSDOUBLE
alphalevel = hudplusalpha[st_translucency];
if (alphalevel >= 10)
diff --git a/src/v_video.h b/src/v_video.h
index 7184e799e5ff981a48db6694019bb1b62b01b6f2..2831230a35d35bef057e37cc9436b3f9fec63414 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -122,17 +122,23 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
#define V_70TRANS 0x00070000
#define V_80TRANS 0x00080000 // used to be V_8020TRANS
#define V_90TRANS 0x00090000
-#define V_HUDTRANSHALF 0x000D0000
-#define V_HUDTRANS 0x000E0000 // draw the hud translucent
-#define V_HUDTRANSDOUBLE 0x000F0000
+#define V_HUDTRANSHALF 0x000A0000
+#define V_HUDTRANS 0x000B0000 // draw the hud translucent
+#define V_HUDTRANSDOUBLE 0x000C0000
// Macros follow
#define V_USERHUDTRANSHALF ((10-(cv_translucenthud.value/2))<<V_ALPHASHIFT)
#define V_USERHUDTRANS ((10-cv_translucenthud.value)<<V_ALPHASHIFT)
#define V_USERHUDTRANSDOUBLE ((10-min(cv_translucenthud.value*2, 10))<<V_ALPHASHIFT)
-#define V_AUTOFADEOUT 0x00100000 // used by CECHOs, automatic fade out when almost over
-#define V_RETURN8 0x00200000 // 8 pixel return instead of 12
-#define V_OFFSET 0x00400000 // account for offsets in patches
+// use bits 21-23 for blendmodes
+#define V_BLENDSHIFT 20
+#define V_BLENDMASK 0x00700000
+// preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT
+#define V_ADD ((AST_ADD-1)<<V_BLENDSHIFT) // Additive
+#define V_SUBTRACT ((AST_SUBTRACT-1)<<V_BLENDSHIFT) // Subtractive
+#define V_REVERSESUBTRACT ((AST_REVERSESUBTRACT-1)<<V_BLENDSHIFT) // Reverse subtractive
+#define V_MODULATE ((AST_MODULATE-1)<<V_BLENDSHIFT) // Modulate
+
#define V_ALLOWLOWERCASE 0x00800000 // (strings only) allow fonts that have lowercase letters to use them
#define V_FLIP 0x00800000 // (patches only) Horizontal flip
#define V_CENTERNAMETAG 0x00800000 // (nametag only) center nametag lines
@@ -142,8 +148,8 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
#define V_SNAPTOLEFT 0x04000000 // for centering
#define V_SNAPTORIGHT 0x08000000 // for centering
-#define V_WRAPX 0x10000000 // Don't clamp texture on X (for HW mode)
-#define V_WRAPY 0x20000000 // Don't clamp texture on Y (for HW mode)
+#define V_AUTOFADEOUT 0x10000000 // used by CECHOs, automatic fade out when almost over
+#define V_RETURN8 0x20000000 // 8 pixel return instead of 12
#define V_NOSCALESTART 0x40000000 // don't scale x, y, start coords
#define V_PERPLAYER 0x80000000 // automatically adjust coordinates/scaling for splitscreen mode
@@ -165,7 +171,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
#define V_DrawSciencePatch(x,y,s,p,sc) V_DrawFixedPatch(x,y,sc,s,p,NULL)
#define V_DrawFixedPatch(x,y,sc,s,p,c) V_DrawStretchyFixedPatch(x,y,sc,sc,s,p,c)
void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap);
-void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t *patch, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
+void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT16 skincolor);
diff --git a/src/version.h b/src/version.h
index 4470fbd6eaf02397d02f890daf0412822ea70cd1..7a12fbbbe4638b5552510e23c09b6ba00c706b36 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,6 +1,6 @@
-#define SRB2VERSION "2.2.9"/* this must be the first line, for cmake !! */
+#define SRB2VERSION "2.2.10"/* this must be the first line, for cmake !! */
-// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/showgroups.php ).
+// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/members/?key=ms_admin ).
// DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
// "18" is the default mod ID for version 2.2
#define MODID 18
@@ -9,7 +9,7 @@
// it's only for detection of the version the player is using so the MS can alert them of an update.
// Only set it higher, not lower, obviously.
// Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1".
-#define MODVERSION 50
+#define MODVERSION 51
-// Define this as a prerelease version suffix
-// #define BETAVERSION "RC1"
+// Define this as a prerelease version suffix (pre#, RC#)
+// #define BETAVERSION "pre1"
diff --git a/src/vid_copy.s b/src/vid_copy.s
index 6a37883565f57023f5687d8c31e2de56d72b288a..8e43e23c1786d51e615446fda767d2ba7a7a8f83 100644
--- a/src/vid_copy.s
+++ b/src/vid_copy.s
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/w_wad.c b/src/w_wad.c
index cbff5c67be89de92af1f858ea32d2b7dfb55c688..cf954a55ea3cebd9f46ad548ae23386a74f032c3 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -50,16 +50,17 @@
#include "filesrch.h"
-#include "i_video.h" // rendermode
+#include "d_main.h"
#include "d_netfil.h"
-#include "dehacked.h"
#include "d_clisrv.h"
+#include "dehacked.h"
#include "r_defs.h"
#include "r_data.h"
#include "r_textures.h"
#include "r_patch.h"
#include "r_picformats.h"
#include "i_system.h"
+#include "i_video.h" // rendermode
#include "md5.h"
#include "lua_script.h"
#ifdef SCANTHINGS
@@ -104,7 +105,7 @@ static UINT16 lumpnumcacheindex = 0;
// GLOBALS
//===========================================================================
UINT16 numwadfiles; // number of active wadfiles
-wadfile_t *wadfiles[MAX_WADFILES]; // 0 to numwadfiles-1 are valid
+wadfile_t **wadfiles; // 0 to numwadfiles-1 are valid
// W_Shutdown
// Closes all of the WAD files before quitting
@@ -117,10 +118,15 @@ void W_Shutdown(void)
{
wadfile_t *wad = wadfiles[numwadfiles];
- fclose(wad->handle);
+ if (wad->handle)
+ fclose(wad->handle);
Z_Free(wad->filename);
+ if (wad->path)
+ Z_Free(wad->path);
while (wad->numlumps--)
{
+ if (wad->lumpinfo[wad->numlumps].diskpath)
+ Z_Free(wad->lumpinfo[wad->numlumps].diskpath);
Z_Free(wad->lumpinfo[wad->numlumps].longname);
Z_Free(wad->lumpinfo[wad->numlumps].fullname);
}
@@ -128,6 +134,8 @@ void W_Shutdown(void)
Z_Free(wad->lumpinfo);
Z_Free(wad);
}
+
+ Z_Free(wadfiles);
}
//===========================================================================
@@ -421,6 +429,7 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
{
lump_p->position = LONG(fileinfo->filepos);
lump_p->size = lump_p->disksize = LONG(fileinfo->size);
+ lump_p->diskpath = NULL;
if (compressed) // wad is compressed, lump might be
{
UINT32 realsize = 0;
@@ -602,6 +611,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
lump_p->position = zentry.offset; // NOT ACCURATE YET: we still need to read the local entry to find our true position
lump_p->disksize = zentry.compsize;
+ lump_p->diskpath = NULL;
lump_p->size = zentry.size;
fullname = malloc(zentry.namelen + 1);
@@ -679,6 +689,114 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
return lumpinfo;
}
+static INT32 CheckPathsNotEqual(const char *path1, const char *path2)
+{
+ INT32 stat = samepaths(path1, path2);
+
+ if (stat == 1)
+ return 0;
+ else if (stat < 0)
+ return -1;
+
+ return 1;
+}
+
+// Returns 1 if the path is valid, 0 if not, and -1 if there was an error.
+INT32 W_IsPathToFolderValid(const char *path)
+{
+ INT32 stat;
+
+ // Remove path delimiters.
+ const char *p = path + (strlen(path) - 1);
+ while (*p == '\\' || *p == '/' || *p == ':')
+ {
+ p--;
+ if (p < path)
+ return 0;
+ }
+
+ // Check if the path is a directory.
+ stat = pathisdirectory(path);
+ if (stat == 0)
+ return 0;
+ else if (stat < 0)
+ {
+ // The path doesn't exist, so it can't be a directory.
+ if (direrror == ENOENT)
+ return 0;
+
+ return -1;
+ }
+
+ // Don't add your home, you sodding tic tac.
+ stat = CheckPathsNotEqual(path, srb2home);
+ if (stat != 1)
+ return stat;
+
+ // Do the same checks for SRB2's path, and the current directory.
+ stat = CheckPathsNotEqual(path, srb2path);
+ if (stat != 1)
+ return stat;
+
+ stat = CheckPathsNotEqual(path, ".");
+ if (stat != 1)
+ return stat;
+
+ return 1;
+}
+
+// Checks if the combination of the first path and the second path are valid.
+// If they are, the concatenated path is returned.
+static char *CheckConcatFolderPath(const char *startpath, const char *path)
+{
+ if (concatpaths(path, startpath) == 1)
+ {
+ char *fn;
+
+ if (startpath)
+ {
+ size_t len = strlen(startpath) + strlen(path) + strlen(PATHSEP) + 1;
+ fn = ZZ_Alloc(len);
+ snprintf(fn, len, "%s" PATHSEP "%s", startpath, path);
+ }
+ else
+ fn = Z_StrDup(path);
+
+ return fn;
+ }
+
+ return NULL;
+}
+
+// Looks for the first valid full path for a folder.
+// Returns NULL if the folder doesn't exist, or it isn't valid.
+char *W_GetFullFolderPath(const char *path)
+{
+ // Check the path by itself first.
+ char *fn = CheckConcatFolderPath(NULL, path);
+ if (fn)
+ return fn;
+
+#define checkpath(startpath) \
+ fn = CheckConcatFolderPath(startpath, path); \
+ if (fn) \
+ return fn
+
+ checkpath(srb2home); // Then, look in srb2home.
+ checkpath(srb2path); // Now, look in srb2path.
+ checkpath("."); // Finally, look in the current directory.
+
+#undef checkpath
+
+ return NULL;
+}
+
+// Loads files from a folder into a lumpinfo structure.
+static lumpinfo_t *ResGetLumpsFolder(const char *path, UINT16 *nlmp, UINT16 *nfolders)
+{
+ return getdirectoryfiles(path, nlmp, nfolders);
+}
+
static UINT16 W_InitFileError (const char *filename, boolean exitworthy)
{
if (exitworthy)
@@ -694,6 +812,19 @@ static UINT16 W_InitFileError (const char *filename, boolean exitworthy)
return INT16_MAX;
}
+static void W_ReadFileShaders(wadfile_t *wadfile)
+{
+#ifdef HWRENDER
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
+ {
+ HWR_LoadCustomShadersFromFile(numwadfiles - 1, W_FileHasFolders(wadfile));
+ HWR_CompileShaders();
+ }
+#else
+ (void)wadfile;
+#endif
+}
+
// Allocate a wadfile, setup the lumpinfo (directory) and
// lumpcache, add the wadfile to the current active wadfiles
//
@@ -715,7 +846,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
#ifndef NOMD5
size_t i;
#endif
- size_t packetsize;
UINT8 md5sum[16];
int important;
@@ -733,9 +863,8 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
refreshdirname = NULL;
//CONS_Debug(DBG_SETUP, "Loading %s\n", filename);
- //
- // check if limit of active wadfiles
- //
+
+ // Check if the game reached the limit of active wadfiles.
if (numwadfiles >= MAX_WADFILES)
{
CONS_Alert(CONS_ERROR, M_GetText("Maximum wad files reached\n"));
@@ -755,24 +884,7 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
return INT16_MAX;
}
- // Check if wad files will overflow fileneededbuffer. Only the filename part
- // is send in the packet; cf.
- // see PutFileNeeded in d_netfil.c
- if ((important = !important))
- {
- packetsize = packetsizetally + nameonlylength(filename) + 22;
-
- if (packetsize > MAXFILENEEDED*sizeof(UINT8))
- {
- CONS_Alert(CONS_ERROR, M_GetText("Maximum wad files reached\n"));
- refreshdirmenu |= REFRESHDIR_MAX;
- if (handle)
- fclose(handle);
- return W_InitFileError(filename, startup);
- }
-
- packetsizetally = packetsize;
- }
+ important = !important;
#ifndef NOMD5
//
@@ -784,11 +896,12 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
for (i = 0; i < numwadfiles; i++)
{
+ if (wadfiles[i]->type == RET_FOLDER)
+ continue;
+
if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
{
CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), filename);
- if (important)
- packetsizetally -= nameonlylength(filename) + 22;
if (handle)
fclose(handle);
return W_InitFileError(filename, false);
@@ -831,9 +944,11 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
//
wadfile = Z_Malloc(sizeof (*wadfile), PU_STATIC, NULL);
wadfile->filename = Z_StrDup(filename);
+ wadfile->path = NULL;
wadfile->type = type;
wadfile->handle = handle;
- wadfile->numlumps = (UINT16)numlumps;
+ wadfile->numlumps = numlumps;
+ wadfile->foldercount = 0;
wadfile->lumpinfo = lumpinfo;
wadfile->important = important;
fseek(handle, 0, SEEK_END);
@@ -853,17 +968,12 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
// add the wadfile
//
CONS_Printf(M_GetText("Added file %s (%u lumps)\n"), filename, numlumps);
+ wadfiles = Z_Realloc(wadfiles, sizeof(wadfile_t) * (numwadfiles + 1), PU_STATIC, NULL);
wadfiles[numwadfiles] = wadfile;
numwadfiles++; // must come BEFORE W_LoadDehackedLumps, so any addfile called by COM_BufInsertText called by Lua doesn't overwrite what we just loaded
-#ifdef HWRENDER
// Read shaders from file
- if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
- {
- HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3));
- HWR_CompileShaders();
- }
-#endif // HWRENDER
+ W_ReadFileShaders(wadfile);
// TODO: HACK ALERT - Load Lua & SOC stuff right here. I feel like this should be out of this place, but... Let's stick with this for now.
switch (wadfile->type)
@@ -889,6 +999,163 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
return wadfile->numlumps;
}
+//
+// Loads a folder as a WAD.
+//
+UINT16 W_InitFolder(const char *path, boolean mainfile, boolean startup)
+{
+ lumpinfo_t *lumpinfo = NULL;
+ wadfile_t *wadfile;
+ UINT16 numlumps = 0;
+ UINT16 foldercount;
+ size_t i;
+ char *fn, *fullpath;
+ const char *p;
+ int important;
+ INT32 stat;
+
+ if (!(refreshdirmenu & REFRESHDIR_ADDFILE))
+ refreshdirmenu = REFRESHDIR_NORMAL|REFRESHDIR_ADDFILE; // clean out cons_alerts that happened earlier
+
+ if (refreshdirname)
+ Z_Free(refreshdirname);
+ if (dirmenu)
+ refreshdirname = Z_StrDup(path);
+ else
+ refreshdirname = NULL;
+
+ if (numwadfiles >= MAX_WADFILES)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Maximum wad files reached\n"));
+ refreshdirmenu |= REFRESHDIR_MAX;
+ return W_InitFileError(path, startup);
+ }
+
+ important = 0; /// \todo Implement a W_VerifyFolder.
+
+ // Remove path delimiters.
+ p = path + (strlen(path) - 1);
+
+ while (*p == '\\' || *p == '/' || *p == ':')
+ {
+ p--;
+ if (p < path)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Path %s is invalid\n"), path);
+ return W_InitFileError(path, startup);
+ }
+ }
+ p++;
+
+ // Allocate the new path name.
+ i = (p - path) + 1;
+ fn = ZZ_Alloc(i);
+ strlcpy(fn, path, i);
+
+ // Don't add an empty path.
+ if (M_IsStringEmpty(fn))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Folder name is empty\n"));
+ Z_Free(fn);
+
+ if (startup)
+ return W_InitFileError("A folder", true);
+ else
+ return W_InitFileError("a folder", false);
+ }
+
+ // Check if the path is valid.
+ stat = W_IsPathToFolderValid(fn);
+
+ if (stat != 1)
+ {
+ if (stat == 0)
+ CONS_Alert(CONS_ERROR, M_GetText("Path %s is invalid\n"), fn);
+ else if (stat < 0)
+ {
+#ifndef AVOID_ERRNO
+ CONS_Alert(CONS_ERROR, M_GetText("Could not stat %s: %s\n"), fn, strerror(direrror));
+#else
+ CONS_Alert(CONS_ERROR, M_GetText("Could not stat %s\n"), fn);
+#endif
+ }
+
+ Z_Free(fn);
+ return W_InitFileError(path, startup);
+ }
+
+ // Get the full path for this folder.
+ fullpath = W_GetFullFolderPath(fn);
+ if (fullpath == NULL)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Path %s is invalid\n"), fn);
+ Z_Free(fn);
+ return W_InitFileError(path, startup);
+ }
+
+ // Check if the folder is already added.
+ for (i = 0; i < numwadfiles; i++)
+ {
+ if (wadfiles[i]->type != RET_FOLDER)
+ continue;
+
+ if (samepaths(wadfiles[i]->path, fullpath) > 0)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), path);
+ Z_Free(fn);
+ Z_Free(fullpath);
+ return W_InitFileError(path, false);
+ }
+ }
+
+ lumpinfo = ResGetLumpsFolder(fullpath, &numlumps, &foldercount);
+
+ if (lumpinfo == NULL)
+ {
+ if (!numlumps)
+ CONS_Alert(CONS_ERROR, M_GetText("Folder %s is empty\n"), path);
+ else if (numlumps == UINT16_MAX)
+ CONS_Alert(CONS_ERROR, M_GetText("Folder %s contains too many files\n"), path);
+ else
+ CONS_Alert(CONS_ERROR, M_GetText("Unknown error enumerating files from folder %s\n"), path);
+
+ Z_Free(fn);
+ Z_Free(fullpath);
+
+ return W_InitFileError(path, startup);
+ }
+
+ if (important && !mainfile)
+ G_SetGameModified(true);
+
+ wadfile = Z_Malloc(sizeof (*wadfile), PU_STATIC, NULL);
+ wadfile->filename = fn;
+ wadfile->path = fullpath;
+ wadfile->type = RET_FOLDER;
+ wadfile->handle = NULL;
+ wadfile->numlumps = numlumps;
+ wadfile->foldercount = foldercount;
+ wadfile->lumpinfo = lumpinfo;
+ wadfile->important = important;
+
+ // Irrelevant.
+ wadfile->filesize = 0;
+ memset(wadfile->md5sum, 0x00, 16);
+
+ Z_Calloc(numlumps * sizeof (*wadfile->lumpcache), PU_STATIC, &wadfile->lumpcache);
+ Z_Calloc(numlumps * sizeof (*wadfile->patchcache), PU_STATIC, &wadfile->patchcache);
+
+ CONS_Printf(M_GetText("Added folder %s (%u files, %u folders)\n"), fn, numlumps, foldercount);
+ wadfiles[numwadfiles] = wadfile;
+ numwadfiles++;
+
+ W_ReadFileShaders(wadfile);
+ W_LoadDehackedLumpsPK3(numwadfiles - 1, mainfile);
+ W_InvalidateLumpnumCache();
+
+ return wadfile->numlumps;
+}
+
/** Tries to load a series of files.
* All files are wads unless they have an extension of ".soc" or ".lua".
*
@@ -898,13 +1165,22 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
*
* \param filenames A null-terminated list of files to use.
*/
-void W_InitMultipleFiles(char **filenames)
+void W_InitMultipleFiles(addfilelist_t *list)
{
- // will be realloced as lumps are added
- for (; *filenames; filenames++)
+ size_t i = 0;
+
+ for (; i < list->numfiles; i++)
{
- //CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
- W_InitFile(*filenames, numwadfiles < mainwads, true);
+ const char *fn = list->files[i];
+ char pathsep = fn[strlen(fn) - 1];
+ boolean mainfile = (numwadfiles < mainwads);
+
+ //CONS_Debug(DBG_SETUP, "Loading %s\n", fn);
+
+ if (pathsep == '\\' || pathsep == '/')
+ W_InitFolder(fn, mainfile, true);
+ else
+ W_InitFile(fn, mainfile, true);
}
}
@@ -913,7 +1189,7 @@ void W_InitMultipleFiles(char **filenames)
*/
static boolean TestValidLump(UINT16 wad, UINT16 lump)
{
- I_Assert(wad < MAX_WADFILES);
+ I_Assert(wad < numwadfiles);
if (!wadfiles[wad]) // make sure the wad file exists
return false;
@@ -1178,7 +1454,7 @@ lumpnum_t W_CheckNumForMap(const char *name)
if (!strncmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
return (i<<16) + lumpNum;
}
- else if (wadfiles[i]->type == RET_PK3)
+ else if (W_FileHasFolders(wadfiles[i]))
{
lumpNum = W_CheckNumForFolderStartPK3("maps/", i, 0);
if (lumpNum != INT16_MAX)
@@ -1187,8 +1463,14 @@ lumpnum_t W_CheckNumForMap(const char *name)
continue;
// Now look for the specified map.
for (; lumpNum < end; lumpNum++)
- if (!strnicmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
- return (i<<16) + lumpNum;
+ {
+ if (!strnicmp(name, wadfiles[i]->lumpinfo[lumpNum].name, 8))
+ {
+ const char *extension = strrchr(wadfiles[i]->lumpinfo[lumpNum].fullname, '.');
+ if (!(extension && stricmp(extension, ".wad")))
+ return (i<<16) + lumpNum;
+ }
+ }
}
}
return LUMPERROR;
@@ -1276,9 +1558,46 @@ UINT8 W_LumpExists(const char *name)
size_t W_LumpLengthPwad(UINT16 wad, UINT16 lump)
{
+ lumpinfo_t *l;
+
if (!TestValidLump(wad, lump))
return 0;
- return wadfiles[wad]->lumpinfo[lump].size;
+
+ l = wadfiles[wad]->lumpinfo + lump;
+
+ // Open the external file for this lump, if the WAD is a folder.
+ if (wadfiles[wad]->type == RET_FOLDER)
+ {
+ // pathisdirectory calls stat, so if anything wrong has happened,
+ // this is the time to be aware of it.
+ INT32 stat = pathisdirectory(l->diskpath);
+
+ if (stat < 0)
+ {
+#ifndef AVOID_ERRNO
+ if (direrror == ENOENT)
+ I_Error("W_LumpLengthPwad: file %s doesn't exist", l->diskpath);
+ else
+ I_Error("W_LumpLengthPwad: could not stat %s: %s", l->diskpath, strerror(direrror));
+#else
+ I_Error("W_LumpLengthPwad: could not access %s", l->diskpath);
+#endif
+ }
+ else if (stat == 1) // Path is a folder.
+ return 0;
+ else
+ {
+ FILE *handle = fopen(l->diskpath, "rb");
+ if (handle == NULL)
+ I_Error("W_LumpLengthPwad: could not open file %s", l->diskpath);
+
+ fseek(handle, 0, SEEK_END);
+ l->size = l->disksize = ftell(handle);
+ fclose(handle);
+ }
+ }
+
+ return l->size;
}
/** Returns the buffer size needed to load the given lump.
@@ -1293,11 +1612,11 @@ size_t W_LumpLength(lumpnum_t lumpnum)
//
// W_IsLumpWad
-// Is the lump a WAD? (presumably in a PK3)
+// Is the lump a WAD? (presumably not in a WAD)
//
boolean W_IsLumpWad(lumpnum_t lumpnum)
{
- if (wadfiles[WADFILENUM(lumpnum)]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[WADFILENUM(lumpnum)]))
{
const char *lumpfullName = (wadfiles[WADFILENUM(lumpnum)]->lumpinfo + LUMPNUM(lumpnum))->fullname;
@@ -1306,23 +1625,23 @@ boolean W_IsLumpWad(lumpnum_t lumpnum)
return !strnicmp(lumpfullName + strlen(lumpfullName) - 4, ".wad", 4);
}
- return false; // WADs should never be inside non-PK3s as far as SRB2 is concerned
+ return false; // WADs should never be inside WADs as far as SRB2 is concerned
}
//
// W_IsLumpFolder
-// Is the lump a folder? (in a PK3 obviously)
+// Is the lump a folder? (not in a WAD obviously)
//
boolean W_IsLumpFolder(UINT16 wad, UINT16 lump)
{
- if (wadfiles[wad]->type == RET_PK3)
+ if (W_FileHasFolders(wadfiles[wad]))
{
const char *name = wadfiles[wad]->lumpinfo[lump].fullname;
return (name[strlen(name)-1] == '/'); // folders end in '/'
}
- return false; // non-PK3s don't have folders
+ return false; // WADs don't have folders
}
#ifdef HAVE_ZLIB
@@ -1365,17 +1684,55 @@ void zerr(int ret)
*/
size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, size_t offset)
{
- size_t lumpsize;
+ size_t lumpsize, bytesread;
lumpinfo_t *l;
- FILE *handle;
+ FILE *handle = NULL;
- if (!TestValidLump(wad,lump))
+ if (!TestValidLump(wad, lump))
return 0;
+ l = wadfiles[wad]->lumpinfo + lump;
+
+ // Open the external file for this lump, if the WAD is a folder.
+ if (wadfiles[wad]->type == RET_FOLDER)
+ {
+ // pathisdirectory calls stat, so if anything wrong has happened,
+ // this is the time to be aware of it.
+ INT32 stat = pathisdirectory(l->diskpath);
+
+ if (stat < 0)
+ {
+#ifndef AVOID_ERRNO
+ if (direrror == ENOENT)
+ I_Error("W_ReadLumpHeaderPwad: file %s doesn't exist", l->diskpath);
+ else
+ I_Error("W_ReadLumpHeaderPwad: could not stat %s: %s", l->diskpath, strerror(direrror));
+#else
+ I_Error("W_ReadLumpHeaderPwad: could not access %s", l->diskpath);
+#endif
+ }
+ else if (stat == 1) // Path is a folder.
+ return 0;
+ else
+ {
+ handle = fopen(l->diskpath, "rb");
+ if (handle == NULL)
+ I_Error("W_ReadLumpHeaderPwad: could not open file %s", l->diskpath);
+
+ // Find length of file
+ fseek(handle, 0, SEEK_END);
+ l->size = l->disksize = ftell(handle);
+ }
+ }
+
lumpsize = wadfiles[wad]->lumpinfo[lump].size;
// empty resource (usually markers like S_START, F_END ..)
if (!lumpsize || lumpsize<offset)
+ {
+ if (wadfiles[wad]->type == RET_FOLDER)
+ fclose(handle);
return 0;
+ }
// zero size means read all the lump
if (!size || size+offset > lumpsize)
@@ -1383,24 +1740,22 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
// Let's get the raw lump data.
// We setup the desired file handle to read the lump data.
- l = wadfiles[wad]->lumpinfo + lump;
- handle = wadfiles[wad]->handle;
+ if (wadfiles[wad]->type != RET_FOLDER)
+ handle = wadfiles[wad]->handle;
fseek(handle, (long)(l->position + offset), SEEK_SET);
// But let's not copy it yet. We support different compression formats on lumps, so we need to take that into account.
switch(wadfiles[wad]->lumpinfo[lump].compression)
{
case CM_NOCOMPRESSION: // If it's uncompressed, we directly write the data into our destination, and return the bytes read.
+ bytesread = fread(dest, 1, size, handle);
+ if (wadfiles[wad]->type == RET_FOLDER)
+ fclose(handle);
#ifdef NO_PNG_LUMPS
- {
- size_t bytesread = fread(dest, 1, size, handle);
- if (Picture_IsLumpPNG((UINT8 *)dest, bytesread))
- Picture_ThrowPNGError(l->fullname, wadfiles[wad]->filename);
- return bytesread;
- }
-#else
- return fread(dest, 1, size, handle);
+ if (Picture_IsLumpPNG((UINT8 *)dest, bytesread))
+ Picture_ThrowPNGError(l->fullname, wadfiles[wad]->filename);
#endif
+ return bytesread;
case CM_LZF: // Is it LZF compressed? Used by ZWADs.
{
#ifdef ZWAD
@@ -1838,7 +2193,7 @@ void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5)
#else
I_Error
#endif
- (M_GetText("File is old, is corrupt or has been modified: %s (found md5: %s, wanted: %s)\n"), wadfiles[wadfilenum]->filename, actualmd5text, matchmd5);
+ (M_GetText("File is old, is corrupt or has been modified:\n%s\nFound MD5: %s\nWanted MD5: %s\n"), wadfiles[wadfilenum]->filename, actualmd5text, matchmd5);
}
#endif
}
diff --git a/src/w_wad.h b/src/w_wad.h
index 1309677128da4005e4d4b4c37e0d256ede5c285e..f099b9fd2a243adcb2afd0c06fef3aab4e43d23d 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -69,6 +69,7 @@ typedef struct
char name[9]; // filelump_t name[] e.g. "LongEntr"
char *longname; // e.g. "LongEntryName"
char *fullname; // e.g. "Folder/Subfolder/LongEntryName.extension"
+ char *diskpath; // path to the file e.g. "/usr/games/srb2/Addon/Folder/Subfolder/LongEntryName.extension"
size_t size; // real (uncompressed) size
compmethod compression; // lump compression method
} lumpinfo_t;
@@ -96,9 +97,15 @@ virtlump_t* vres_Find(const virtres_t*, const char*);
// DYNAMIC WAD LOADING
// =========================================================================
+// Maximum of files that can be loaded
+// (there is a max of simultaneous open files anyway)
+#ifdef ENFORCE_WAD_LIMIT
+#define MAX_WADFILES 2048 // This cannot be any higher than UINT16_MAX.
+#else
+#define MAX_WADFILES UINT16_MAX
+#endif
+
#define MAX_WADPATH 512
-#define MAX_WADFILES 48 // maximum of wad files used at the same time
-// (there is a max of simultaneous open files anyway, and this should be plenty)
#define lumpcache_t void *
@@ -109,17 +116,19 @@ typedef enum restype
RET_SOC,
RET_LUA,
RET_PK3,
+ RET_FOLDER,
RET_UNKNOWN,
} restype_t;
typedef struct wadfile_s
{
- char *filename;
+ char *filename, *path;
restype_t type;
lumpinfo_t *lumpinfo;
lumpcache_t *lumpcache;
lumpcache_t *patchcache;
UINT16 numlumps; // this wad's number of resources
+ UINT16 foldercount; // folder count
FILE *handle;
UINT32 filesize; // for network
UINT8 md5sum[16];
@@ -127,11 +136,17 @@ typedef struct wadfile_s
boolean important; // also network - !W_VerifyNMUSlumps
} wadfile_t;
-#define WADFILENUM(lumpnum) (UINT16)((lumpnum)>>16) // wad flumpnum>>16) // wad file number in upper word
+#define WADFILENUM(lumpnum) (UINT16)((lumpnum)>>16) // wad file number in upper word
#define LUMPNUM(lumpnum) (UINT16)((lumpnum)&0xFFFF) // lump number for this pwad
extern UINT16 numwadfiles;
-extern wadfile_t *wadfiles[MAX_WADFILES];
+extern wadfile_t **wadfiles;
+
+typedef struct
+{
+ char **files;
+ size_t numfiles;
+} addfilelist_t;
// =========================================================================
@@ -141,9 +156,16 @@ void W_Shutdown(void);
FILE *W_OpenWadFile(const char **filename, boolean useerrors);
// Load and add a wadfile to the active wad files, returns numbers of lumps, INT16_MAX on error
UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup);
+// Adds a folder as a file
+UINT16 W_InitFolder(const char *path, boolean mainfile, boolean startup);
// W_InitMultipleFiles exits if a file was not found, but not if all is okay.
-void W_InitMultipleFiles(char **filenames);
+void W_InitMultipleFiles(addfilelist_t *list);
+
+#define W_FileHasFolders(wadfile) ((wadfile)->type == RET_PK3 || (wadfile)->type == RET_FOLDER)
+
+INT32 W_IsPathToFolderValid(const char *path);
+char *W_GetFullFolderPath(const char *path);
const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump);
const char *W_CheckNameForNum(lumpnum_t lumpnum);
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index 0a280448b48b13d4dc5c09cc674e4213f87a9995..83948ac81978a8e77de4f127ad1dc37e6da1274a 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -76,8 +76,8 @@ END
#include "../doomdef.h" // Needed for version string
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,9,0
- PRODUCTVERSION 2,2,9,0
+ FILEVERSION 2,2,10,0
+ PRODUCTVERSION 2,2,10,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -97,7 +97,7 @@ BEGIN
VALUE "FileDescription", "Sonic Robo Blast 2\0"
VALUE "FileVersion", VERSIONSTRING_RC
VALUE "InternalName", "srb2\0"
- VALUE "LegalCopyright", "Copyright 1998-2021 by Sonic Team Junior\0"
+ VALUE "LegalCopyright", "Copyright 1998-2022 by Sonic Team Junior\0"
VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0"
VALUE "OriginalFilename", "srb2win.exe\0"
VALUE "PrivateBuild", "\0"
@@ -128,4 +128,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index e1d90881ba4fac766c3720eb318c0a3b58cfbfe6..a5ebf32113f2723dbb5786c0eda8ae79a710d61b 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -188,11 +188,11 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
ev.type = ev_keydown;
handleKeyDoom:
- ev.data1 = 0;
+ ev.key = 0;
if (wParam == VK_PAUSE)
// intercept PAUSE key
{
- ev.data1 = KEY_PAUSE;
+ ev.key = KEY_PAUSE;
}
else if (!keyboard_started)
// post some keys during the game startup
@@ -201,14 +201,14 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
{
switch (wParam)
{
- case VK_ESCAPE: ev.data1 = KEY_ESCAPE; break;
- case VK_RETURN: ev.data1 = KEY_ENTER; break;
- case VK_SHIFT: ev.data1 = KEY_LSHIFT; break;
- default: ev.data1 = MapVirtualKey((DWORD)wParam,2); // convert in to char
+ case VK_ESCAPE: ev.key = KEY_ESCAPE; break;
+ case VK_RETURN: ev.key = KEY_ENTER; break;
+ case VK_SHIFT: ev.key = KEY_LSHIFT; break;
+ default: ev.key = MapVirtualKey((DWORD)wParam,2); // convert in to char
}
}
- if (ev.data1)
+ if (ev.key)
D_PostEvent (&ev);
return 0;
@@ -240,7 +240,7 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
if (nodinput)
{
ev.type = ev_keyup;
- ev.data1 = KEY_MOUSE1 + 3 + HIWORD(wParam);
+ ev.key = KEY_MOUSE1 + 3 + HIWORD(wParam);
D_PostEvent(&ev);
return TRUE;
}
@@ -249,7 +249,7 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
if (nodinput)
{
ev.type = ev_keydown;
- ev.data1 = KEY_MOUSE1 + 3 + HIWORD(wParam);
+ ev.key = KEY_MOUSE1 + 3 + HIWORD(wParam);
D_PostEvent(&ev);
return TRUE;
}
@@ -258,9 +258,9 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
//I_OutputMsg("MW_WHEEL dispatched.\n");
ev.type = ev_keydown;
if ((INT16)HIWORD(wParam) > 0)
- ev.data1 = KEY_MOUSEWHEELUP;
+ ev.key = KEY_MOUSEWHEELUP;
else
- ev.data1 = KEY_MOUSEWHEELDOWN;
+ ev.key = KEY_MOUSEWHEELDOWN;
D_PostEvent(&ev);
break;
@@ -271,7 +271,7 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
case WM_CLOSE:
PostQuitMessage(0); //to quit while in-game
- ev.data1 = KEY_ESCAPE; //to exit network synchronization
+ ev.key = KEY_ESCAPE; //to exit network synchronization
ev.type = ev_keydown;
D_PostEvent (&ev);
return 0;
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index da0d5b47ee3c26699b4d538575a22b8dc7420218..ff443935fa7f5a925e3539508b2fe5ce18244e09 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -322,20 +322,20 @@ static inline VOID I_GetConsoleEvents(VOID)
{
case VK_ESCAPE:
case VK_TAB:
- ev.data1 = KEY_NULL;
+ ev.key = KEY_NULL;
break;
case VK_SHIFT:
- ev.data1 = KEY_LSHIFT;
+ ev.key = KEY_LSHIFT;
break;
case VK_RETURN:
entering_con_command = false;
/* FALLTHRU */
default:
- ev.data1 = MapVirtualKey(input.Event.KeyEvent.wVirtualKeyCode,2); // convert in to char
+ ev.key = MapVirtualKey(input.Event.KeyEvent.wVirtualKeyCode,2); // convert in to char
}
if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t))
{
- if (ev.data1 && ev.data1 != KEY_LSHIFT && ev.data1 != KEY_RSHIFT)
+ if (ev.key && ev.key != KEY_LSHIFT && ev.key != KEY_RSHIFT)
{
#ifdef UNICODE
WriteConsole(co, &input.Event.KeyEvent.uChar.UnicodeChar, 1, &t, NULL);
@@ -356,13 +356,13 @@ static inline VOID I_GetConsoleEvents(VOID)
switch (input.Event.KeyEvent.wVirtualKeyCode)
{
case VK_SHIFT:
- ev.data1 = KEY_LSHIFT;
+ ev.key = KEY_LSHIFT;
break;
default:
break;
}
}
- if (ev.data1) D_PostEvent(&ev);
+ if (ev.key) D_PostEvent(&ev);
break;
case MOUSE_EVENT:
case WINDOW_BUFFER_SIZE_EVENT:
@@ -945,7 +945,7 @@ static void I_ShutdownMouse2(VOID)
for (i = 0; i < MOUSEBUTTONS; i++)
{
event.type = ev_keyup;
- event.data1 = KEY_2MOUSE1 + i;
+ event.key = KEY_2MOUSE1 + i;
D_PostEvent(&event);
}
@@ -1135,14 +1135,14 @@ VOID I_GetSysMouseEvents(INT mouse_state)
if ((mouse_state & (1 << i)) && !(old_mouse_state & (1 << i)))
{
event.type = ev_keydown;
- event.data1 = KEY_MOUSE1 + i;
+ event.key = KEY_MOUSE1 + i;
D_PostEvent(&event);
}
// check if button released
if (!(mouse_state & (1 << i)) && (old_mouse_state & (1 << i)))
{
event.type = ev_keyup;
- event.data1 = KEY_MOUSE1 + i;
+ event.key = KEY_MOUSE1 + i;
D_PostEvent(&event);
}
}
@@ -1156,9 +1156,9 @@ VOID I_GetSysMouseEvents(INT mouse_state)
if (xmickeys || ymickeys)
{
event.type = ev_mouse;
- event.data1 = 0;
- event.data2 = xmickeys;
- event.data3 = -ymickeys;
+ event.key = 0;
+ event.x = xmickeys;
+ event.y = -ymickeys;
D_PostEvent(&event);
SetCursorPos(center_x, center_y);
}
@@ -1240,7 +1240,7 @@ static void I_ShutdownMouse(void)
for (i = 0; i < MOUSEBUTTONS; i++)
{
event.type = ev_keyup;
- event.data1 = KEY_MOUSE1 + i;
+ event.key = KEY_MOUSE1 + i;
D_PostEvent(&event);
}
if (nodinput)
@@ -1281,7 +1281,7 @@ void I_GetMouseEvents(void)
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_2MOUSE1 + i;
+ event.key = KEY_2MOUSE1 + i;
D_PostEvent(&event);
}
}
@@ -1289,9 +1289,9 @@ void I_GetMouseEvents(void)
if (handlermouse2x || handlermouse2y)
{
event.type = ev_mouse2;
- event.data1 = 0;
- event.data2 = handlermouse2x<<1;
- event.data3 = -handlermouse2y<<1;
+ event.key = 0;
+ event.x = handlermouse2x<<1;
+ event.y = -handlermouse2y<<1;
handlermouse2x = 0;
handlermouse2y = 0;
@@ -1330,7 +1330,7 @@ getBufferedData:
else
event.type = ev_keyup; // Button up
- event.data1 = rgdod[d].dwOfs - DIMOFS_BUTTON0 + KEY_MOUSE1;
+ event.key = rgdod[d].dwOfs - DIMOFS_BUTTON0 + KEY_MOUSE1;
D_PostEvent(&event);
}
else if (rgdod[d].dwOfs == DIMOFS_X)
@@ -1342,9 +1342,9 @@ getBufferedData:
{
// z-axes the wheel
if ((int)rgdod[d].dwData > 0)
- event.data1 = KEY_MOUSEWHEELUP;
+ event.key = KEY_MOUSEWHEELUP;
else
- event.data1 = KEY_MOUSEWHEELDOWN;
+ event.key = KEY_MOUSEWHEELDOWN;
event.type = ev_keydown;
D_PostEvent(&event);
}
@@ -1354,9 +1354,9 @@ getBufferedData:
if (xmickeys || ymickeys)
{
event.type = ev_mouse;
- event.data1 = 0;
- event.data2 = xmickeys;
- event.data3 = -ymickeys;
+ event.key = 0;
+ event.x = xmickeys;
+ event.y = -ymickeys;
D_PostEvent(&event);
}
}
@@ -2395,14 +2395,14 @@ static VOID I_ShutdownJoystick(VOID)
// emulate the up of all joystick buttons
for (i = 0;i < JOYBUTTONS;i++)
{
- event.data1 = KEY_JOY1+i;
+ event.key = KEY_JOY1+i;
D_PostEvent(&event);
}
// emulate the up of all joystick hats
for (i = 0;i < JOYHATS*4;i++)
{
- event.data1 = KEY_HAT1+i;
+ event.key = KEY_HAT1+i;
D_PostEvent(&event);
}
@@ -2410,7 +2410,7 @@ static VOID I_ShutdownJoystick(VOID)
event.type = ev_joystick;
for (i = 0;i < JOYAXISSET; i++)
{
- event.data1 = i;
+ event.key = i;
D_PostEvent(&event);
}
@@ -2460,14 +2460,14 @@ static VOID I_ShutdownJoystick2(VOID)
// emulate the up of all joystick buttons
for (i = 0;i < JOYBUTTONS;i++)
{
- event.data1 = KEY_2JOY1+i;
+ event.key = KEY_2JOY1+i;
D_PostEvent(&event);
}
// emulate the up of all joystick hats
for (i = 0;i < JOYHATS*4;i++)
{
- event.data1 = KEY_2HAT1+i;
+ event.key = KEY_2HAT1+i;
D_PostEvent(&event);
}
@@ -2475,7 +2475,7 @@ static VOID I_ShutdownJoystick2(VOID)
event.type = ev_joystick2;
for (i = 0;i < JOYAXISSET; i++)
{
- event.data1 = i;
+ event.key = i;
D_PostEvent(&event);
}
@@ -2598,7 +2598,7 @@ acquire:
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_JOY1 + i;
+ event.key = KEY_JOY1 + i;
D_PostEvent(&event);
}
}
@@ -2618,7 +2618,7 @@ acquire:
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_HAT1 + i;
+ event.key = KEY_HAT1 + i;
D_PostEvent(&event);
}
}
@@ -2627,7 +2627,7 @@ acquire:
// send joystick axis positions
event.type = ev_joystick;
- event.data1 = event.data2 = event.data3 = 0;
+ event.key = event.x = event.y = 0;
if (Joystick.bGamepadStyle)
{
@@ -2635,29 +2635,29 @@ acquire:
if (JoyInfo.X)
{
if (js.lX < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.lX > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo.Y)
{
if (js.lY < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.lY > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo.X) event.data2 = js.lX; // x axis
- if (JoyInfo.Y) event.data3 = js.lY; // y axis
+ if (JoyInfo.X) event.x = js.lX; // x axis
+ if (JoyInfo.Y) event.y = js.lY; // y axis
}
D_PostEvent(&event);
#if JOYAXISSET > 1
- event.data1 = 1;
- event.data2 = event.data3 = 0;
+ event.key = 1;
+ event.x = event.y = 0;
if (Joystick.bGamepadStyle)
{
@@ -2665,30 +2665,30 @@ acquire:
if (JoyInfo.Z)
{
if (js.lZ < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.lZ > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo.Rx)
{
if (js.lRx < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.lRx > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo.Z) event.data2 = js.lZ; // z axis
- if (JoyInfo.Rx) event.data3 = js.lRx; // rx axis
+ if (JoyInfo.Z) event.x = js.lZ; // z axis
+ if (JoyInfo.Rx) event.y = js.lRx; // rx axis
}
D_PostEvent(&event);
#endif
#if JOYAXISSET > 2
- event.data1 = 2;
- event.data2 = event.data3 = 0;
+ event.key = 2;
+ event.x = event.y = 0;
if (Joystick.bGamepadStyle)
{
@@ -2696,53 +2696,53 @@ acquire:
if (JoyInfo.Rx)
{
if (js.lRy < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.lRy > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo.Rz)
{
if (js.lRz < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.lRz > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo.Ry) event.data2 = js.lRy; // ry axis
- if (JoyInfo.Rz) event.data3 = js.lRz; // rz axis
+ if (JoyInfo.Ry) event.x = js.lRy; // ry axis
+ if (JoyInfo.Rz) event.y = js.lRz; // rz axis
}
D_PostEvent(&event);
#endif
#if JOYAXISSET > 3
- event.data1 = 3;
- event.data2 = event.data3 = 0;
+ event.key = 3;
+ event.x = event.y = 0;
if (Joystick.bGamepadStyle)
{
// gamepad control type, on or off, live or die
if (JoyInfo.U)
{
if (js.rglSlider[0] < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.rglSlider[0] > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo.V)
{
if (js.rglSlider[1] < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.rglSlider[1] > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo.U) event.data2 = js.rglSlider[0]; // U axis
- if (JoyInfo.V) event.data3 = js.rglSlider[1]; // V axis
+ if (JoyInfo.U) event.x = js.rglSlider[0]; // U axis
+ if (JoyInfo.V) event.y = js.rglSlider[1]; // V axis
}
D_PostEvent(&event);
#endif
@@ -2842,7 +2842,7 @@ acquire:
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_2JOY1 + i;
+ event.key = KEY_2JOY1 + i;
D_PostEvent(&event);
}
}
@@ -2862,7 +2862,7 @@ acquire:
event.type = ev_keydown;
else
event.type = ev_keyup;
- event.data1 = KEY_2HAT1 + i;
+ event.key = KEY_2HAT1 + i;
D_PostEvent(&event);
}
}
@@ -2871,7 +2871,7 @@ acquire:
// send joystick axis positions
event.type = ev_joystick2;
- event.data1 = event.data2 = event.data3 = 0;
+ event.key = event.x = event.y = 0;
if (Joystick2.bGamepadStyle)
{
@@ -2879,29 +2879,29 @@ acquire:
if (JoyInfo2.X)
{
if (js.lX < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.lX > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo2.Y)
{
if (js.lY < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.lY > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo2.X) event.data2 = js.lX; // x axis
- if (JoyInfo2.Y) event.data3 = js.lY; // y axis
+ if (JoyInfo2.X) event.x = js.lX; // x axis
+ if (JoyInfo2.Y) event.y = js.lY; // y axis
}
D_PostEvent(&event);
#if JOYAXISSET > 1
- event.data1 = 1;
- event.data2 = event.data3 = 0;
+ event.key = 1;
+ event.x = event.y = 0;
if (Joystick2.bGamepadStyle)
{
@@ -2909,30 +2909,30 @@ acquire:
if (JoyInfo2.Z)
{
if (js.lZ < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.lZ > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo2.Rx)
{
if (js.lRx < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.lRx > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo2.Z) event.data2 = js.lZ; // z axis
- if (JoyInfo2.Rx) event.data3 = js.lRx; // rx axis
+ if (JoyInfo2.Z) event.x = js.lZ; // z axis
+ if (JoyInfo2.Rx) event.y = js.lRx; // rx axis
}
D_PostEvent(&event);
#endif
#if JOYAXISSET > 2
- event.data1 = 2;
- event.data2 = event.data3 = 0;
+ event.key = 2;
+ event.x = event.y = 0;
if (Joystick2.bGamepadStyle)
{
@@ -2940,53 +2940,53 @@ acquire:
if (JoyInfo2.Rx)
{
if (js.lRy < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.lRy > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo2.Rz)
{
if (js.lRz < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.lRz > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo2.Ry) event.data2 = js.lRy; // ry axis
- if (JoyInfo2.Rz) event.data3 = js.lRz; // rz axis
+ if (JoyInfo2.Ry) event.x = js.lRy; // ry axis
+ if (JoyInfo2.Rz) event.y = js.lRz; // rz axis
}
D_PostEvent(&event);
#endif
#if JOYAXISSET > 3
- event.data1 = 3;
- event.data2 = event.data3 = 0;
+ event.key = 3;
+ event.x = event.y = 0;
if (Joystick2.bGamepadStyle)
{
// gamepad control type, on or off, live or die
if (JoyInfo2.U)
{
if (js.rglSlider[0] < -(JOYAXISRANGE/2))
- event.data2 = -1;
+ event.x = -1;
else if (js.rglSlider[0] > JOYAXISRANGE/2)
- event.data2 = 1;
+ event.x = 1;
}
if (JoyInfo2.V)
{
if (js.rglSlider[1] < -(JOYAXISRANGE/2))
- event.data3 = -1;
+ event.y = -1;
else if (js.rglSlider[1] > JOYAXISRANGE/2)
- event.data3 = 1;
+ event.y = 1;
}
}
else
{
// analog control style, just send the raw data
- if (JoyInfo2.U) event.data2 = js.rglSlider[0]; // U axis
- if (JoyInfo2.V) event.data3 = js.rglSlider[1]; // V axis
+ if (JoyInfo2.U) event.x = js.rglSlider[0]; // U axis
+ if (JoyInfo2.V) event.y = js.rglSlider[1]; // V axis
}
D_PostEvent(&event);
#endif
@@ -3194,7 +3194,7 @@ INT32 I_GetKey(void)
ev = &events[eventtail];
eventtail = (eventtail+1) & (MAXEVENTS-1);
if (ev->type == ev_keydown || ev->type == ev_console)
- return ev->data1;
+ return ev->key;
else
return 0;
}
@@ -3308,7 +3308,7 @@ static VOID I_GetKeyboardEvents(VOID)
if (!appActive && RepeatKeyCode) // Stop when lost focus
{
event.type = ev_keyup;
- event.data1 = RepeatKeyCode;
+ event.key = RepeatKeyCode;
D_PostEvent(&event);
RepeatKeyCode = 0;
}
@@ -3363,9 +3363,9 @@ getBufferedData:
ch = rgdod[d].dwOfs & 0xFF;
if (ASCIINames[ch])
- event.data1 = ASCIINames[ch];
+ event.key = ASCIINames[ch];
else
- event.data1 = 0x80;
+ event.key = 0x80;
D_PostEvent(&event);
}
@@ -3378,7 +3378,7 @@ getBufferedData:
// delay is tripled for first repeating key
RepeatKeyTics = hacktics + (KEY_REPEAT_DELAY*3);
if (event.type == ev_keydown) // use the last event!
- RepeatKeyCode = event.data1;
+ RepeatKeyCode = event.key;
}
else
{
@@ -3386,7 +3386,7 @@ getBufferedData:
if (RepeatKeyCode && hacktics - RepeatKeyTics > KEY_REPEAT_DELAY)
{
event.type = ev_keydown;
- event.data1 = RepeatKeyCode;
+ event.key = RepeatKeyCode;
D_PostEvent(&event);
RepeatKeyTics = hacktics;
diff --git a/src/y_inter.c b/src/y_inter.c
index dc78a1983e846d9306de7cf5ce6812d0c979614a..34e58494f1b9b9cc1c04d068d2db43b1cccf2c7d 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2004-2021 by Sonic Team Junior.
+// Copyright (C) 2004-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -212,7 +212,7 @@ static void Y_IntermissionTokenDrawer(void)
calc = (lowy - y)*2;
if (calc > 0)
- V_DrawCroppedPatch(32<<FRACBITS, y<<FRACBITS, FRACUNIT/2, 0, tokenicon, 0, 0, tokenicon->width, calc);
+ V_DrawCroppedPatch(32<<FRACBITS, y<<FRACBITS, FRACUNIT/2, FRACUNIT/2, 0, tokenicon, NULL, 0, 0, tokenicon->width<<FRACBITS, calc<<FRACBITS);
}
@@ -239,12 +239,12 @@ void Y_LoadIntermissionData(void)
}
data.coop.ptotal = W_CachePatchName("YB_TOTAL", PU_PATCH);
- // get background patches
- bgpatch = W_CachePatchName("INTERSCR", PU_PATCH);
// grab an interscreen if appropriate
if (mapheaderinfo[gamemap-1]->interscreen[0] != '#')
interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH);
+ else // no interscreen? use default background
+ bgpatch = W_CachePatchName("INTERSCR", PU_PATCH);
break;
}
case int_spec:
@@ -255,12 +255,11 @@ void Y_LoadIntermissionData(void)
data.spec.pscore = W_CachePatchName("YB_SCORE", PU_PATCH);
data.spec.pcontinues = W_CachePatchName("YB_CONTI", PU_PATCH);
- // get background tile
- bgtile = W_CachePatchName("SPECTILE", PU_PATCH);
-
// grab an interscreen if appropriate
if (mapheaderinfo[gamemap-1]->interscreen[0] != '#')
interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH);
+ else // no interscreen? use default background
+ bgtile = W_CachePatchName("SPECTILE", PU_PATCH);
break;
}
case int_ctf:
@@ -430,7 +429,7 @@ void Y_IntermissionDrawer(void)
else if (bgtile)
V_DrawPatchFill(bgtile);
- LUAh_IntermissionHUD();
+ LUA_HUDHOOK(intermission);
if (!LUA_HudEnabled(hud_intermissiontally))
goto skiptallydrawer;
@@ -471,14 +470,17 @@ void Y_IntermissionDrawer(void)
}
}
- // draw the "got through act" lines and act number
- V_DrawLevelTitle(data.coop.passedx1, 49, 0, data.coop.passed1);
+ if (LUA_HudEnabled(hud_intermissiontitletext))
{
- INT32 h = V_LevelNameHeight(data.coop.passed2);
- V_DrawLevelTitle(data.coop.passedx2, 49+h+2, 0, data.coop.passed2);
+ // draw the "got through act" lines and act number
+ V_DrawLevelTitle(data.coop.passedx1, 49, 0, data.coop.passed1);
+ {
+ INT32 h = V_LevelNameHeight(data.coop.passed2);
+ V_DrawLevelTitle(data.coop.passedx2, 49+h+2, 0, data.coop.passed2);
- if (data.coop.actnum)
- V_DrawLevelActNum(244, 42+h, 0, data.coop.actnum);
+ if (data.coop.actnum)
+ V_DrawLevelActNum(244, 42+h, 0, data.coop.actnum);
+ }
}
bonusy = 150;
@@ -562,37 +564,44 @@ void Y_IntermissionDrawer(void)
if (drawsection == 1)
{
- const char *ringtext = "\x82" "50 rings, no shield";
- const char *tut1text = "\x82" "press " "\x80" "spin";
- const char *tut2text = "\x82" "mid-" "\x80" "jump";
- ttheight = 8;
- V_DrawLevelTitle(data.spec.passedx1 + xoffset1, ttheight, 0, data.spec.passed1);
- ttheight += V_LevelNameHeight(data.spec.passed3) + 2;
- V_DrawLevelTitle(data.spec.passedx3 + xoffset2, ttheight, 0, data.spec.passed3);
- ttheight += V_LevelNameHeight(data.spec.passed4) + 2;
- V_DrawLevelTitle(data.spec.passedx4 + xoffset3, ttheight, 0, data.spec.passed4);
-
- ttheight = 108;
- V_DrawLevelTitle(BASEVIDWIDTH/2 + xoffset4 - (V_LevelNameWidth(ringtext)/2), ttheight, 0, ringtext);
- ttheight += V_LevelNameHeight(tut1text) + 2;
- V_DrawLevelTitle(BASEVIDWIDTH/2 + xoffset5 - (V_LevelNameWidth(tut1text)/2), ttheight, 0, tut1text);
- ttheight += V_LevelNameHeight(tut2text) + 2;
- V_DrawLevelTitle(BASEVIDWIDTH/2 + xoffset6 - (V_LevelNameWidth(tut2text)/2), ttheight, 0, tut2text);
+ if (LUA_HudEnabled(hud_intermissiontitletext))
+ {
+ const char *ringtext = "\x82" "50 rings, no shield";
+ const char *tut1text = "\x82" "press " "\x80" "spin";
+ const char *tut2text = "\x82" "mid-" "\x80" "jump";
+ ttheight = 8;
+ V_DrawLevelTitle(data.spec.passedx1 + xoffset1, ttheight, 0, data.spec.passed1);
+ ttheight += V_LevelNameHeight(data.spec.passed3) + 2;
+ V_DrawLevelTitle(data.spec.passedx3 + xoffset2, ttheight, 0, data.spec.passed3);
+ ttheight += V_LevelNameHeight(data.spec.passed4) + 2;
+ V_DrawLevelTitle(data.spec.passedx4 + xoffset3, ttheight, 0, data.spec.passed4);
+
+ ttheight = 108;
+ V_DrawLevelTitle(BASEVIDWIDTH/2 + xoffset4 - (V_LevelNameWidth(ringtext)/2), ttheight, 0, ringtext);
+ ttheight += V_LevelNameHeight(tut1text) + 2;
+ V_DrawLevelTitle(BASEVIDWIDTH/2 + xoffset5 - (V_LevelNameWidth(tut1text)/2), ttheight, 0, tut1text);
+ ttheight += V_LevelNameHeight(tut2text) + 2;
+ V_DrawLevelTitle(BASEVIDWIDTH/2 + xoffset6 - (V_LevelNameWidth(tut2text)/2), ttheight, 0, tut2text);
+ }
}
else
{
INT32 yoffset = 0;
- if (data.spec.passed1[0] != '\0')
- {
- ttheight = 24;
- V_DrawLevelTitle(data.spec.passedx1 + xoffset1, ttheight, 0, data.spec.passed1);
- ttheight += V_LevelNameHeight(data.spec.passed2) + 2;
- V_DrawLevelTitle(data.spec.passedx2 + xoffset2, ttheight, 0, data.spec.passed2);
- }
- else
+
+ if (LUA_HudEnabled(hud_intermissiontitletext))
{
- ttheight = 24 + (V_LevelNameHeight(data.spec.passed2)/2) + 2;
- V_DrawLevelTitle(data.spec.passedx2 + xoffset1, ttheight, 0, data.spec.passed2);
+ if (data.spec.passed1[0] != '\0')
+ {
+ ttheight = 24;
+ V_DrawLevelTitle(data.spec.passedx1 + xoffset1, ttheight, 0, data.spec.passed1);
+ ttheight += V_LevelNameHeight(data.spec.passed2) + 2;
+ V_DrawLevelTitle(data.spec.passedx2 + xoffset2, ttheight, 0, data.spec.passed2);
+ }
+ else
+ {
+ ttheight = 24 + (V_LevelNameHeight(data.spec.passed2)/2) + 2;
+ V_DrawLevelTitle(data.spec.passedx2 + xoffset1, ttheight, 0, data.spec.passed2);
+ }
}
V_DrawScaledPatch(152 + xoffset3, 108, 0, data.spec.bonuspatches[0]);
@@ -638,6 +647,7 @@ void Y_IntermissionDrawer(void)
// draw the emeralds
//if (intertic & 1)
+ if (LUA_HudEnabled(hud_intermissionemeralds))
{
boolean drawthistic = !(ALL7EMERALDS(emeralds) && (intertic & 1));
INT32 emeraldx = 152 - 3*28;
@@ -1010,7 +1020,8 @@ void Y_Ticker(void)
if (paused || P_AutoPause())
return;
- LUAh_IntermissionThinker();
+ LUA_HookBool(intertype == int_spec && stagefailed,
+ HOOK(IntermissionThinker));
intertic++;
@@ -1330,24 +1341,40 @@ void Y_StartIntermission(void)
usetile = false;
// set up the "got through act" message according to skin name
- // too long so just show "YOU GOT THROUGH THE ACT"
- if (strlen(skins[players[consoleplayer].skin].realname) > 13)
- {
- strcpy(data.coop.passed1, "you got");
- strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "through act" : "through the act");
- }
- // long enough that "X GOT" won't fit so use "X PASSED THE ACT"
- else if (strlen(skins[players[consoleplayer].skin].realname) > 8)
+ if (stagefailed)
{
- strcpy(data.coop.passed1, skins[players[consoleplayer].skin].realname);
- strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "passed act" : "passed the act");
+ strcpy(data.coop.passed1, mapheaderinfo[gamemap-1]->lvlttl);
+
+ if (mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE)
+ {
+ data.spec.passed2[0] = '\0';
+ }
+ else
+ {
+ strcpy(data.coop.passed2, "Zone");
+ }
}
- // length is okay for normal use
else
{
- snprintf(data.coop.passed1, sizeof data.coop.passed1, "%s got",
- skins[players[consoleplayer].skin].realname);
- strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "through act" : "through the act");
+ // too long so just show "YOU GOT THROUGH THE ACT"
+ if (strlen(skins[players[consoleplayer].skin].realname) > 13)
+ {
+ strcpy(data.coop.passed1, "you got");
+ strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "through act" : "through the act");
+ }
+ // long enough that "X GOT" won't fit so use "X PASSED THE ACT"
+ else if (strlen(skins[players[consoleplayer].skin].realname) > 8)
+ {
+ strcpy(data.coop.passed1, skins[players[consoleplayer].skin].realname);
+ strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "passed act" : "passed the act");
+ }
+ // length is okay for normal use
+ else
+ {
+ snprintf(data.coop.passed1, sizeof data.coop.passed1, "%s got",
+ skins[players[consoleplayer].skin].realname);
+ strcpy(data.coop.passed2, (mapheaderinfo[gamemap-1]->actnum) ? "through act" : "through the act");
+ }
}
// set X positions
@@ -1364,6 +1391,13 @@ void Y_StartIntermission(void)
// The above value is not precalculated because it needs only be computed once
// at the start of intermission, and precalculating it would preclude mods
// changing the font to one of a slightly different width.
+
+ if ((stagefailed) && !(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
+ {
+ // Bit of a hack, offset so that the "Zone" text is right aligned like title cards.
+ data.coop.passedx2 = (data.coop.passedx1 + V_LevelNameWidth(data.coop.passed1)) - V_LevelNameWidth(data.coop.passed2);
+ }
+
break;
}
@@ -1784,21 +1818,30 @@ static void Y_SetTimeBonus(player_t *player, y_bonus_t *bstruct)
strncpy(bstruct->patch, "YB_TIME", sizeof(bstruct->patch));
bstruct->display = true;
- // calculate time bonus
- secs = player->realtime / TICRATE;
- if (secs < 30) /* :30 */ bonus = 50000;
- else if (secs < 60) /* 1:00 */ bonus = 10000;
- else if (secs < 90) /* 1:30 */ bonus = 5000;
- else if (secs < 120) /* 2:00 */ bonus = 4000;
- else if (secs < 180) /* 3:00 */ bonus = 3000;
- else if (secs < 240) /* 4:00 */ bonus = 2000;
- else if (secs < 300) /* 5:00 */ bonus = 1000;
- else if (secs < 360) /* 6:00 */ bonus = 500;
- else if (secs < 420) /* 7:00 */ bonus = 400;
- else if (secs < 480) /* 8:00 */ bonus = 300;
- else if (secs < 540) /* 9:00 */ bonus = 200;
- else if (secs < 600) /* 10:00 */ bonus = 100;
- else /* TIME TAKEN: TOO LONG */ bonus = 0;
+ if (stagefailed == true)
+ {
+ // Time Bonus would be very easy to cheese by failing immediately.
+ bonus = 0;
+ }
+ else
+ {
+ // calculate time bonus
+ secs = player->realtime / TICRATE;
+ if (secs < 30) /* :30 */ bonus = 50000;
+ else if (secs < 60) /* 1:00 */ bonus = 10000;
+ else if (secs < 90) /* 1:30 */ bonus = 5000;
+ else if (secs < 120) /* 2:00 */ bonus = 4000;
+ else if (secs < 180) /* 3:00 */ bonus = 3000;
+ else if (secs < 240) /* 4:00 */ bonus = 2000;
+ else if (secs < 300) /* 5:00 */ bonus = 1000;
+ else if (secs < 360) /* 6:00 */ bonus = 500;
+ else if (secs < 420) /* 7:00 */ bonus = 400;
+ else if (secs < 480) /* 8:00 */ bonus = 300;
+ else if (secs < 540) /* 9:00 */ bonus = 200;
+ else if (secs < 600) /* 10:00 */ bonus = 100;
+ else /* TIME TAKEN: TOO LONG */ bonus = 0;
+ }
+
bstruct->points = bonus;
}
@@ -1851,12 +1894,21 @@ static void Y_SetGuardBonus(player_t *player, y_bonus_t *bstruct)
strncpy(bstruct->patch, "YB_GUARD", sizeof(bstruct->patch));
bstruct->display = true;
- if (player->timeshit == 0) bonus = 10000;
- else if (player->timeshit == 1) bonus = 5000;
- else if (player->timeshit == 2) bonus = 1000;
- else if (player->timeshit == 3) bonus = 500;
- else if (player->timeshit == 4) bonus = 100;
- else bonus = 0;
+ if (stagefailed == true)
+ {
+ // "No-hit" runs would be very easy to cheese by failing immediately.
+ bonus = 0;
+ }
+ else
+ {
+ if (player->timeshit == 0) bonus = 10000;
+ else if (player->timeshit == 1) bonus = 5000;
+ else if (player->timeshit == 2) bonus = 1000;
+ else if (player->timeshit == 3) bonus = 500;
+ else if (player->timeshit == 4) bonus = 100;
+ else bonus = 0;
+ }
+
bstruct->points = bonus;
}
@@ -1971,7 +2023,7 @@ static void Y_AwardCoopBonuses(void)
for (i = 0; i < MAXPLAYERS; ++i)
{
- if (!playeringame[i] || players[i].lives < 1) // not active or game over
+ if (!playeringame[i] || players[i].lives < 1 || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // not active, game over or tails bot
bonusnum = 0; // all null
else
bonusnum = mapheaderinfo[prevmap]->bonustype + 1; // -1 is none
@@ -2021,7 +2073,7 @@ static void Y_AwardSpecialStageBonus(void)
{
oldscore = players[i].score;
- if (!playeringame[i] || players[i].lives < 1) // not active or game over
+ if (!playeringame[i] || players[i].lives < 1 || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // not active, game over or tails bot
{
Y_SetNullBonus(&players[i], &localbonuses[0]);
Y_SetNullBonus(&players[i], &localbonuses[1]);
diff --git a/src/y_inter.h b/src/y_inter.h
index 871142858ba1df05f0163b19a9cf9efeeafe560a..74183066e4541298d6ec8d5988829c9763a8e253 100644
--- a/src/y_inter.h
+++ b/src/y_inter.h
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2004-2021 by Sonic Team Junior.
+// Copyright (C) 2004-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/z_zone.c b/src/z_zone.c
index 34ff3d37ef3a025beaa925228d5c6a18c68f2228..b949730e35bbc2e6bd342753571e6e6a0f1759f9 100644
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2006 by Graue.
-// Copyright (C) 2006-2021 by Sonic Team Junior.
+// Copyright (C) 2006-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
diff --git a/src/z_zone.h b/src/z_zone.h
index be55bf9940ead1a1385f92ca50d296b0bd4fbdf1..d7e1ed52860389d886c3fb436c1b9474f9c584a1 100644
--- a/src/z_zone.h
+++ b/src/z_zone.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2021 by Sonic Team Junior.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -39,6 +39,7 @@ enum
// Tags < PU_LEVEL are not purged until freed explicitly.
PU_STATIC = 1, // static entire execution time
PU_LUA = 2, // static entire execution time -- used by lua so it doesn't get caught in loops forever
+ PU_PERFSTATS = 3, // static between changes to ps_samplesize cvar
PU_SOUND = 11, // static while playing
PU_MUSIC = 12, // static while playing