diff --git a/.circleci/config.yml b/.circleci/config.yml
index 61e508e4d713f193edc10668849548a039c39b58..8ecee2b19d8d372a0b2c4e22d88eab3907eb6597 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,8 +51,8 @@ jobs:
- /var/cache/apt/archives
- checkout
- run:
- name: Compile without network support and BLUA
- command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 NO_LUA=1
+ name: Compile without network support
+ command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1
- run:
name: wipe build
command: make -C src LINUX=1 cleandep
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abec11087e0ec11f24bb2228730ebd19af2ee2cf..1e46f5dc37fb5b650165ef49004b5f5177511483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
# Version change is fine.
project(SRB2
- VERSION 2.2.2
+ VERSION 2.2.4
LANGUAGES C)
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
diff --git a/appveyor.yml b/appveyor.yml
index a28935f6388649052389adbc70c88d2f853a7e75..5d599a516c4bcf78e67b4dc0b5e2f2505df1df48 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.2.{branch}-{build}
+version: 2.2.4.{branch}-{build}
os: MinGW
environment:
diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index ec030b32f276d5da59b4e8674043888a4ba80f09..a0d40cdf0003dcc9f8ed81b0812825a625f6048a 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -15,7 +15,7 @@
* Oogaland
* Rob
* Shadow Hog
- * Spherallic
+ * sphere
* SRB2-Playah
* SSNTails
* SteelT
@@ -738,12 +738,6 @@ linedeftypes
flags2text = "[1] Use control sector tag";
flags64text = "[6] No sound effect";
}
-
- 65
- {
- title = "Bridge Thinker <disabled>";
- prefix = "(65)";
- }
}
polyobject
@@ -756,21 +750,17 @@ linedeftypes
prefix = "(20)";
}
- 21
- {
- title = "Explicitly Include Line <disabled>";
- prefix = "(21)";
- }
-
22
{
title = "Parameters";
prefix = "(22)";
+ flags8text = "[3] Set translucency by X offset";
flags32text = "[5] Render outer sides only";
flags64text = "[6] Trigger linedef executor";
flags128text = "[7] Intangible";
flags256text = "[8] Stopped by pushables";
flags512text = "[9] Render flats";
+ flags8192text = "[13] Cut cyan flat pixels";
}
30
@@ -925,6 +915,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Render insides";
flags128text = "[7] Only block non-players";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "195F";
flags643dfloorflagsadd = "7C80";
@@ -984,6 +975,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Don't cast shadow";
flags128text = "[7] Render insides/block non-plr";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "200191F";
flags1283dfloorflagsadd = "7C80";
@@ -997,6 +989,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Don't cast shadow";
flags128text = "[7] Render insides/block non-plr";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "2001917";
flags1283dfloorflagsadd = "7C80";
@@ -1024,6 +1017,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Don't cast shadow";
flags128text = "[7] Render insides/block non-plr";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "400191F";
flags1283dfloorflagsadd = "7C80";
@@ -1037,6 +1031,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Don't cast shadow";
flags128text = "[7] Render insides/block non-plr";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "4001917";
flags1283dfloorflagsadd = "7C80";
@@ -1082,6 +1077,7 @@ linedeftypes
flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "9F39";
flags643dfloorflagsadd = "20000";
@@ -1110,6 +1106,7 @@ linedeftypes
flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "1F31";
flags643dfloorflagsadd = "20000";
@@ -1125,6 +1122,7 @@ linedeftypes
flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "209F39";
flags643dfloorflagsadd = "20000";
@@ -1139,6 +1137,7 @@ linedeftypes
flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "201F31";
flags643dfloorflagsadd = "20000";
@@ -1161,6 +1160,7 @@ linedeftypes
prefix = "(221)";
flags8text = "[3] Slope skew sides";
flags64text = "[6] Cast shadow";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "1B59";
flags643dfloorflagsremove = "40";
@@ -1284,6 +1284,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Spindash to move";
flags128text = "[7] Only block non-players";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "195F";
}
@@ -1323,6 +1324,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Spindash, no shadow";
flags128text = "[7] Only block non-players";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "2009D1F";
flags643dfloorflagsadd = "40";
@@ -1389,6 +1391,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Don't cast shadow";
flags128text = "[7] Only block non-players";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "210959F";
flags643dfloorflagsadd = "40";
@@ -1402,6 +1405,7 @@ linedeftypes
flags32text = "[5] Only block player";
flags64text = "[6] Don't cast shadow";
flags128text = "[7] Only block non-players";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "218959F";
flags643dfloorflagsadd = "40";
@@ -1540,6 +1544,7 @@ linedeftypes
flags8text = "[3] Slope skew sides";
flags512text = "[9] Shattered by pushables";
flags1024text = "[10] Trigger linedef executor";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "880101D";
}
@@ -1581,6 +1586,7 @@ linedeftypes
flags128text = "[7] Only block non-players";
flags512text = "[9] Shattered by pushables";
flags1024text = "[10] Trigger linedef executor";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "1080101F";
}
@@ -1602,6 +1608,7 @@ linedeftypes
prefix = "(258)";
flags8text = "[3] Slope skew sides";
flags32text = "[5] Don't damage bosses";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorflags = "959";
}
@@ -1615,6 +1622,7 @@ linedeftypes
flags128text = "[7] Only block non-players";
flags512text = "[9] Shattered by pushables";
flags1024text = "[10] Trigger linedef executor";
+ flags8192text = "[13] Cut cyan flat pixels";
3dfloor = true;
3dfloorcustom = true;
}
@@ -1914,6 +1922,27 @@ linedeftypes
prefix = "(333)";
}
+ 334
+ {
+ title = "Object Dye - Continuous";
+ flags64text = "[6] Disable for this color";
+ prefix = "(334)";
+ }
+
+ 335
+ {
+ title = "Object Dye - Each Time";
+ flags64text = "[6] Disable for this color";
+ prefix = "(335)";
+ }
+
+ 336
+ {
+ title = "Object Dye - Once";
+ flags64text = "[6] Disable for this color";
+ prefix = "(336)";
+ }
+
399
{
title = "Level Load";
@@ -2214,6 +2243,7 @@ linedeftypes
title = "Spawn Object";
prefix = "(461)";
flags8text = "[3] Set delay by backside sector";
+ flags32text = "[5] Use line angle for object";
flags64text = "[6] Spawn inside a range";
}
@@ -2223,6 +2253,19 @@ linedeftypes
prefix = "(462)";
flags8text = "[3] Set delay by backside sector";
}
+
+ 463
+ {
+ title = "Dye Object";
+ prefix = "(463)";
+ }
+
+ 464
+ {
+ title = "Trigger Egg Capsule";
+ prefix = "(464)";
+ flags64text = "[6] Don't end level";
+ }
}
linedefexecmisc
@@ -2573,45 +2616,63 @@ linedeftypes
500
{
- title = "Scroll Wall Front Side Left";
+ title = "Scroll Front Wall Left";
prefix = "(500)";
}
501
{
- title = "Scroll Wall Front Side Right";
+ title = "Scroll Front Wall Right";
prefix = "(501)";
}
502
{
- title = "Scroll Wall According to Linedef";
+ title = "Scroll Tagged Wall";
prefix = "(502)";
+ flags128text = "[7] Use texture offsets";
+ flags256text = "[8] Scroll back side";
}
503
{
- title = "Scroll Wall According to Linedef (Accelerative)";
+ title = "Scroll Tagged Wall (Accelerative)";
prefix = "(503)";
+ flags128text = "[7] Use texture offsets";
+ flags256text = "[8] Scroll back side";
}
504
{
- title = "Scroll Wall According to Linedef (Displacement)";
+ title = "Scroll Tagged Wall (Displacement)";
prefix = "(504)";
+ flags128text = "[7] Use texture offsets";
+ flags256text = "[8] Scroll back side";
}
505
{
- title = "Scroll Texture by Front Side Offsets";
+ title = "Scroll Front Wall by Front Side Offsets";
prefix = "(505)";
}
506
{
- title = "Scroll Texture by Back Side Offsets";
+ title = "Scroll Front Wall by Back Side Offsets";
prefix = "(506)";
}
+
+ 507
+ {
+ title = "Scroll Back Wall by Front Side Offsets";
+ prefix = "(507)";
+ }
+
+ 508
+ {
+ title = "Scroll Back Wall by Back Side Offsets";
+ prefix = "(508)";
+ }
}
planescroll
@@ -3709,6 +3770,7 @@ thingtypes
width = 8;
height = 16;
sprite = "internal:capsule";
+ angletext = "Tag";
}
292
{
@@ -3905,6 +3967,8 @@ thingtypes
{
title = "Emerald Hunt Location";
sprite = "SHRDA0";
+ flags8height = 24;
+ flags8text = "[8] Float";
}
321
{
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc4a6114ecf1187a9cd191cc21d77eec40c6e5f0..b0a593bb16d760950c71623f49e7349abd1df8ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,6 +16,7 @@ set(SRB2_CORE_SOURCES
f_finale.c
f_wipe.c
filesrch.c
+ g_demo.c
g_game.c
g_input.c
hu_stuff.c
@@ -71,6 +72,7 @@ set(SRB2_CORE_HEADERS
f_finale.h
fastcmp.h
filesrch.h
+ g_demo.h
g_game.h
g_input.h
g_state.h
@@ -216,8 +218,6 @@ source_group("Assembly" FILES ${SRB2_ASM_SOURCES} ${SRB2_NASM_SOURCES})
### Configuration
-set(SRB2_CONFIG_HAVE_BLUA ON CACHE BOOL
- "Enable Lua interpreter support")
set(SRB2_CONFIG_HAVE_PNG ON CACHE BOOL
"Enable PNG support. Depends on zlib, so will be disabled if you don't enable that too.")
set(SRB2_CONFIG_HAVE_ZLIB ON CACHE BOOL
@@ -241,92 +241,90 @@ if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only
"Use SRB2's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT).")
endif()
-if(${SRB2_CONFIG_HAVE_BLUA})
- add_definitions(-DHAVE_BLUA)
- set(SRB2_LUA_SOURCES
- lua_baselib.c
- lua_blockmaplib.c
- lua_consolelib.c
- lua_hooklib.c
- lua_hudlib.c
- lua_infolib.c
- lua_maplib.c
- lua_mathlib.c
- lua_mobjlib.c
- lua_playerlib.c
- lua_script.c
- lua_skinlib.c
- lua_thinkerlib.c
- )
- set(SRB2_LUA_HEADERS
- lua_hook.h
- lua_hud.h
- lua_libs.h
- lua_script.h
- )
+set(SRB2_LUA_SOURCES
+ lua_baselib.c
+ lua_blockmaplib.c
+ lua_consolelib.c
+ lua_hooklib.c
+ lua_hudlib.c
+ lua_infolib.c
+ lua_maplib.c
+ lua_mathlib.c
+ lua_mobjlib.c
+ lua_playerlib.c
+ lua_script.c
+ lua_skinlib.c
+ lua_thinkerlib.c
+)
+set(SRB2_LUA_HEADERS
+ lua_hook.h
+ lua_hud.h
+ lua_libs.h
+ lua_script.h
+)
- prepend_sources(SRB2_LUA_SOURCES)
- prepend_sources(SRB2_LUA_HEADERS)
-
- source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
-
- set(SRB2_BLUA_SOURCES
- blua/lapi.c
- blua/lauxlib.c
- blua/lbaselib.c
- blua/lcode.c
- blua/ldebug.c
- blua/ldo.c
- blua/ldump.c
- blua/lfunc.c
- blua/lgc.c
- blua/linit.c
- blua/llex.c
- blua/lmem.c
- blua/lobject.c
- blua/lopcodes.c
- blua/lparser.c
- blua/lstate.c
- blua/lstring.c
- blua/lstrlib.c
- blua/ltable.c
- blua/ltablib.c
- blua/ltm.c
- blua/lundump.c
- blua/lvm.c
- blua/lzio.c
- )
- set(SRB2_BLUA_HEADERS
- blua/lapi.h
- blua/lauxlib.h
- blua/lcode.h
- blua/ldebug.h
- blua/ldo.h
- blua/lfunc.h
- blua/lgc.h
- blua/llex.h
- blua/llimits.h
- blua/lmem.h
- blua/lobject.h
- blua/lopcodes.h
- blua/lparser.h
- blua/lstate.h
- blua/lstring.h
- blua/ltable.h
- blua/ltm.h
- blua/lua.h
- blua/luaconf.h
- blua/lualib.h
- blua/lundump.h
- blua/lvm.h
- blua/lzio.h
- )
+prepend_sources(SRB2_LUA_SOURCES)
+prepend_sources(SRB2_LUA_HEADERS)
+
+source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
+
+set(SRB2_BLUA_SOURCES
+ blua/lapi.c
+ blua/lauxlib.c
+ blua/lbaselib.c
+ blua/lcode.c
+ blua/ldebug.c
+ blua/ldo.c
+ blua/ldump.c
+ blua/lfunc.c
+ blua/lgc.c
+ blua/linit.c
+ blua/liolib.c
+ blua/llex.c
+ blua/lmem.c
+ blua/lobject.c
+ blua/lopcodes.c
+ blua/lparser.c
+ blua/lstate.c
+ blua/lstring.c
+ blua/lstrlib.c
+ blua/ltable.c
+ blua/ltablib.c
+ blua/ltm.c
+ blua/lundump.c
+ blua/lvm.c
+ blua/lzio.c
+)
+set(SRB2_BLUA_HEADERS
+ blua/lapi.h
+ blua/lauxlib.h
+ blua/lcode.h
+ blua/ldebug.h
+ blua/ldo.h
+ blua/lfunc.h
+ blua/lgc.h
+ blua/llex.h
+ blua/llimits.h
+ blua/lmem.h
+ blua/lobject.h
+ blua/lopcodes.h
+ blua/lparser.h
+ blua/lstate.h
+ blua/lstring.h
+ blua/ltable.h
+ blua/ltm.h
+ blua/lua.h
+ blua/luaconf.h
+ blua/lualib.h
+ blua/lundump.h
+ blua/lvm.h
+ blua/lzio.h
+)
- prepend_sources(SRB2_BLUA_SOURCES)
- prepend_sources(SRB2_BLUA_HEADERS)
+prepend_sources(SRB2_BLUA_SOURCES)
+prepend_sources(SRB2_BLUA_HEADERS)
- source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
-endif()
+source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
if(${SRB2_CONFIG_HAVE_GME})
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
diff --git a/src/Makefile b/src/Makefile
index 6c46671a2ebb1dab97d95844e059150b20a743a4..d2dd4757a4ff6114c2324675bf8884e5f4026a7e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -338,9 +338,7 @@ CFLAGS+=-DHAVE_MINIUPNPC
endif
endif
-ifndef NO_LUA
- include blua/Makefile.cfg
-endif
+include blua/Makefile.cfg
ifdef NOMD5
OPTS+=-DNOMD5
@@ -422,6 +420,7 @@ OBJS:=$(i_main_o) \
$(OBJDIR)/z_zone.o \
$(OBJDIR)/f_finale.o \
$(OBJDIR)/f_wipe.o \
+ $(OBJDIR)/g_demo.o \
$(OBJDIR)/g_game.o \
$(OBJDIR)/g_input.o \
$(OBJDIR)/am_map.o \
@@ -681,9 +680,7 @@ $(OBJDIR)/depend.dep:
ifndef NOHW
$(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
endif
-ifndef NO_LUA
$(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
-endif
@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
$(REMOVE) $(OBJDIR)/depend.ped
@echo "Created dependency file, depend.dep"
diff --git a/src/am_map.c b/src/am_map.c
index 234df1abd81cf5e619514c990de9c8c213a935ea..53a7480a5468d113226cdcbdde34d495f735e55d 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -920,10 +920,8 @@ static inline void AM_drawWalls(void)
{
size_t i;
static mline_t l;
-#ifdef ESLOPE
fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
fixed_t backf1 = 0, backf2 = 0, backc1 = 0, backc2 = 0; // back floor ceiling ends
-#endif
for (i = 0; i < numlines; i++)
{
@@ -931,13 +929,10 @@ static inline void AM_drawWalls(void)
l.a.y = lines[i].v1->y >> FRACTOMAPBITS;
l.b.x = lines[i].v2->x >> FRACTOMAPBITS;
l.b.y = lines[i].v2->y >> FRACTOMAPBITS;
-#ifdef ESLOPE
+
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, lines[i].v1->x, lines[i].v1->y); \
- end2 = P_GetZAt(slope, lines[i].v2->x, lines[i].v2->y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, lines[i].v1->x, lines[i].v1->y, normalheight); \
+ end2 = P_GetZAt(slope, lines[i].v2->x, lines[i].v2->y, normalheight);
SLOPEPARAMS(lines[i].frontsector->f_slope, frontf1, frontf2, lines[i].frontsector->floorheight)
SLOPEPARAMS(lines[i].frontsector->c_slope, frontc1, frontc2, lines[i].frontsector->ceilingheight)
@@ -946,7 +941,6 @@ static inline void AM_drawWalls(void)
SLOPEPARAMS(lines[i].backsector->c_slope, backc1, backc2, lines[i].backsector->ceilingheight)
}
#undef SLOPEPARAMS
-#endif
if (!lines[i].backsector) // 1-sided
{
@@ -955,19 +949,11 @@ static inline void AM_drawWalls(void)
else
AM_drawMline(&l, WALLCOLORS);
}
-#ifdef ESLOPE
else if ((backf1 == backc1 && backf2 == backc2) // Back is thok barrier
|| (frontf1 == frontc1 && frontf2 == frontc2)) // Front is thok barrier
{
if (backf1 == backc1 && backf2 == backc2
&& frontf1 == frontc1 && frontf2 == frontc2) // BOTH are thok barriers
-#else
- else if (lines[i].backsector->floorheight == lines[i].backsector->ceilingheight // Back is thok barrier
- || lines[i].frontsector->floorheight == lines[i].frontsector->ceilingheight) // Front is thok barrier
- {
- if (lines[i].backsector->floorheight == lines[i].backsector->ceilingheight
- && lines[i].frontsector->floorheight == lines[i].frontsector->ceilingheight) // BOTH are thok barriers
-#endif
{
if (lines[i].flags & ML_NOCLIMB)
AM_drawMline(&l, NOCLIMBTSWALLCOLORS);
@@ -985,20 +971,10 @@ static inline void AM_drawWalls(void)
else
{
if (lines[i].flags & ML_NOCLIMB) {
-#ifdef ESLOPE
if (backf1 != frontf1 || backf2 != frontf2) {
-#else
- if (lines[i].backsector->floorheight
- != lines[i].frontsector->floorheight) {
-#endif
AM_drawMline(&l, NOCLIMBFDWALLCOLORS); // floor level change
}
-#ifdef ESLOPE
else if (backc1 != frontc1 || backc2 != frontc2) {
-#else
- else if (lines[i].backsector->ceilingheight
- != lines[i].frontsector->ceilingheight) {
-#endif
AM_drawMline(&l, NOCLIMBCDWALLCOLORS); // ceiling level change
}
else
@@ -1006,20 +982,10 @@ static inline void AM_drawWalls(void)
}
else
{
-#ifdef ESLOPE
if (backf1 != frontf1 || backf2 != frontf2) {
-#else
- if (lines[i].backsector->floorheight
- != lines[i].frontsector->floorheight) {
-#endif
AM_drawMline(&l, FDWALLCOLORS); // floor level change
}
-#ifdef ESLOPE
else if (backc1 != frontc1 || backc2 != frontc2) {
-#else
- else if (lines[i].backsector->ceilingheight
- != lines[i].frontsector->ceilingheight) {
-#endif
AM_drawMline(&l, CDWALLCOLORS); // ceiling level change
}
else
diff --git a/src/b_bot.c b/src/b_bot.c
index 4f904b6728892688a192b16f670d8dfb00342d34..4397938c1ae42e90807493b8edbfac81225c12bd 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -74,11 +74,9 @@ static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
if (!sonic || sonic->health <= 0)
return;
-#ifdef HAVE_BLUA
// Lua can handle it!
if (LUAh_BotAI(sonic, tails, cmd))
return;
-#endif
if (tails->player->powers[pw_carry] == CR_MACESPIN || tails->player->powers[pw_carry] == CR_GENERIC)
{
@@ -364,11 +362,9 @@ void B_BuildTiccmd(player_t *player, ticcmd_t *cmd)
// Bot AI isn't programmed in analog.
CV_SetValue(&cv_analog[1], false);
-#ifdef HAVE_BLUA
// Let Lua scripts build ticcmds
if (LUAh_BotTiccmd(player, cmd))
return;
-#endif
// We don't have any main character AI, sorry. D:
if (player-players == consoleplayer)
@@ -463,6 +459,19 @@ boolean B_CheckRespawn(player_t *player)
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);
+
+ if (P_MobjWasRemoved(sonic) || P_MobjWasRemoved(tails))
+ return (shouldForce == 1); // mobj was removed
+
+ if (shouldForce == 1)
+ return true;
+ else if (shouldForce == 2)
+ return false;
+ }
+
// Check if Sonic is busy first.
// If he's doing any of these things, he probably doesn't want to see us.
if (sonic->player->pflags & (PF_GLIDING|PF_SLIDING|PF_BOUNCING)
diff --git a/src/blua/Makefile.cfg b/src/blua/Makefile.cfg
index 8d2e7371428db75ced4042be0f33167a594d65f3..12ea064b417fc60ad14fd1a3520d6b0280b6fce8 100644
--- a/src/blua/Makefile.cfg
+++ b/src/blua/Makefile.cfg
@@ -10,14 +10,13 @@ WFLAGS+=-Wno-logical-op
endif
endif
-OPTS+=-DHAVE_BLUA
-
OBJS:=$(OBJS) \
$(OBJDIR)/lapi.o \
$(OBJDIR)/lbaselib.o \
$(OBJDIR)/ldo.o \
$(OBJDIR)/lfunc.o \
$(OBJDIR)/linit.o \
+ $(OBJDIR)/liolib.o \
$(OBJDIR)/llex.o \
$(OBJDIR)/lmem.o \
$(OBJDIR)/lobject.o \
diff --git a/src/blua/linit.c b/src/blua/linit.c
index 52b02dbe7f917c3f48e09c262f61a22987ae359b..d17390b20a01dca0cff486c4c25cc5e31cd9570a 100644
--- a/src/blua/linit.c
+++ b/src/blua/linit.c
@@ -17,6 +17,7 @@
static const luaL_Reg lualibs[] = {
{"", luaopen_base},
{LUA_TABLIBNAME, luaopen_table},
+ {LUA_IOLIBNAME, luaopen_io},
{LUA_STRLIBNAME, luaopen_string},
{NULL, NULL}
};
diff --git a/src/blua/liolib.c b/src/blua/liolib.c
new file mode 100644
index 0000000000000000000000000000000000000000..b430521942aa3f4b129313a8681247096e44e9f9
--- /dev/null
+++ b/src/blua/liolib.c
@@ -0,0 +1,635 @@
+/*
+** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $
+** Standard I/O (and system) library
+** See Copyright Notice in lua.h
+*/
+
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define liolib_c
+#define LUA_LIB
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+#include "../i_system.h"
+#include "../g_game.h"
+#include "../d_netfil.h"
+#include "../lua_libs.h"
+#include "../byteptr.h"
+#include "../lua_script.h"
+#include "../m_misc.h"
+
+
+#define IO_INPUT 1
+#define IO_OUTPUT 2
+
+#define FILELIMIT (1024 * 1024) // Size limit for reading/writing files
+
+#define FMT_FILECALLBACKID "file_callback_%d"
+
+
+// Allow scripters to write files of these types to SRB2's folder
+static const char *whitelist[] = {
+ ".bmp",
+ ".cfg",
+ ".csv",
+ ".dat",
+ ".png",
+ ".sav2",
+ ".txt",
+};
+
+
+static int pushresult (lua_State *L, int i, const char *filename) {
+ int en = errno; /* calls to Lua API may change this value */
+ if (i) {
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+ else {
+ lua_pushnil(L);
+ if (filename)
+ lua_pushfstring(L, "%s: %s", filename, strerror(en));
+ else
+ lua_pushfstring(L, "%s", strerror(en));
+ lua_pushinteger(L, en);
+ return 3;
+ }
+}
+
+
+#define tofilep(L) ((FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+
+
+static int io_type (lua_State *L) {
+ void *ud;
+ luaL_checkany(L, 1);
+ ud = lua_touserdata(L, 1);
+ lua_getfield(L, LUA_REGISTRYINDEX, LUA_FILEHANDLE);
+ if (ud == NULL || !lua_getmetatable(L, 1) || !lua_rawequal(L, -2, -1))
+ lua_pushnil(L); /* not a file */
+ else if (*((FILE **)ud) == NULL)
+ lua_pushliteral(L, "closed file");
+ else
+ lua_pushliteral(L, "file");
+ return 1;
+}
+
+
+static FILE *tofile (lua_State *L) {
+ FILE **f = tofilep(L);
+ if (*f == NULL)
+ luaL_error(L, "attempt to use a closed file");
+ return *f;
+}
+
+
+
+/*
+** When creating file handles, always creates a `closed' file handle
+** before opening the actual file; so, if there is a memory error, the
+** file is not left opened.
+*/
+static FILE **newfile (lua_State *L) {
+ FILE **pf = (FILE **)lua_newuserdata(L, sizeof(FILE *));
+ *pf = NULL; /* file handle is currently `closed' */
+ luaL_getmetatable(L, LUA_FILEHANDLE);
+ lua_setmetatable(L, -2);
+ return pf;
+}
+
+
+/*
+** function to (not) close the standard files stdin, stdout, and stderr
+*/
+static int io_noclose (lua_State *L) {
+ lua_pushnil(L);
+ lua_pushliteral(L, "cannot close standard file");
+ return 2;
+}
+
+
+/*
+** function to close regular files
+*/
+static int io_fclose (lua_State *L) {
+ FILE **p = tofilep(L);
+ int ok = (fclose(*p) == 0);
+ *p = NULL;
+ return pushresult(L, ok, NULL);
+}
+
+
+static int aux_close (lua_State *L) {
+ lua_getfenv(L, 1);
+ lua_getfield(L, -1, "__close");
+ return (lua_tocfunction(L, -1))(L);
+}
+
+
+static int io_close (lua_State *L) {
+ if (lua_isnone(L, 1))
+ lua_rawgeti(L, LUA_ENVIRONINDEX, IO_OUTPUT);
+ tofile(L); /* make sure argument is a file */
+ return aux_close(L);
+}
+
+
+static int io_gc (lua_State *L) {
+ FILE *f = *tofilep(L);
+ /* ignore closed files */
+ if (f != NULL)
+ aux_close(L);
+ return 0;
+}
+
+
+static int io_tostring (lua_State *L) {
+ FILE *f = *tofilep(L);
+ if (f == NULL)
+ lua_pushliteral(L, "file (closed)");
+ else
+ lua_pushfstring(L, "file (%p)", f);
+ return 1;
+}
+
+
+// Create directories in the path
+void MakePathDirs(char *path)
+{
+ char *c;
+
+ for (c = path; *c; c++)
+ if (*c == '/' || *c == '\\')
+ {
+ char sep = *c;
+ *c = '\0';
+ I_mkdir(path, 0755);
+ *c = sep;
+ }
+}
+
+
+static int CheckFileName(lua_State *L, const char *filename)
+{
+ int length = strlen(filename);
+ boolean pass = false;
+ size_t i;
+
+ if (strchr(filename, '\\'))
+ {
+ luaL_error(L, "access denied to %s: \\ is not allowed, use / instead", filename);
+ return pushresult(L,0,filename);
+ }
+
+ for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
+ if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
+ {
+ pass = true;
+ break;
+ }
+ if (strstr(filename, "./")
+ || strstr(filename, "..") || strchr(filename, ':')
+ || filename[0] == '/'
+ || !pass)
+ {
+ luaL_error(L, "access denied to %s", filename);
+ return pushresult(L,0,filename);
+ }
+
+ return 0;
+}
+
+static int io_open (lua_State *L) {
+ const char *filename = luaL_checkstring(L, 1);
+ const char *mode = luaL_optstring(L, 2, "r");
+ int checkresult;
+
+ checkresult = CheckFileName(L, filename);
+ if (checkresult)
+ return checkresult;
+
+ luaL_checktype(L, 3, LUA_TFUNCTION);
+
+ if (!(strchr(mode, 'r') || strchr(mode, '+')))
+ luaL_error(L, "open() is only for reading, use openlocal() for writing");
+
+ AddLuaFileTransfer(filename, mode);
+
+ return 0;
+}
+
+
+static int io_openlocal (lua_State *L) {
+ FILE **pf;
+ const char *filename = luaL_checkstring(L, 1);
+ const char *mode = luaL_optstring(L, 2, "r");
+ char *realfilename;
+ luafiletransfer_t *filetransfer;
+ int checkresult;
+
+ checkresult = CheckFileName(L, filename);
+ if (checkresult)
+ return checkresult;
+
+ realfilename = va("%s" PATHSEP "%s", luafiledir, filename);
+
+ if (client && strnicmp(filename, "client/", strlen("client/")))
+ I_Error("Access denied to %s\n"
+ "Clients can only access files stored in luafiles/client/\n",
+ filename);
+
+ // Prevent access if the file is being downloaded
+ for (filetransfer = luafiletransfers; filetransfer; filetransfer = filetransfer->next)
+ if (!stricmp(filetransfer->filename, filename))
+ I_Error("Access denied to %s\n"
+ "Files can't be opened while being downloaded\n",
+ filename);
+
+ MakePathDirs(realfilename);
+
+ // Open and return the file
+ pf = newfile(L);
+ *pf = fopen(realfilename, mode);
+ return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
+}
+
+
+void Got_LuaFile(UINT8 **cp, INT32 playernum)
+{
+ FILE **pf = NULL;
+ UINT8 success = READUINT8(*cp); // The first (and only) byte indicates whether the file could be opened
+
+ if (playernum != serverplayer)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Illegal luafile command received from %s\n"), player_names[playernum]);
+ if (server)
+ SendKick(playernum, KICK_MSG_CON_FAIL);
+ return;
+ }
+
+ if (!luafiletransfers)
+ I_Error("No Lua file transfer\n");
+
+ // Retrieve the callback and push it on the stack
+ lua_pushfstring(gL, FMT_FILECALLBACKID, luafiletransfers->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+
+ // Push the first argument (file handle or nil) on the stack
+ if (success)
+ {
+ pf = newfile(gL); // Create and push the file handle
+ *pf = fopen(luafiletransfers->realfilename, luafiletransfers->mode); // Open the file
+ if (!*pf)
+ I_Error("Can't open file \"%s\"\n", luafiletransfers->realfilename); // The file SHOULD exist
+ }
+ else
+ lua_pushnil(gL);
+
+ // Push the second argument (file name) on the stack
+ lua_pushstring(gL, luafiletransfers->filename);
+
+ // Call the callback
+ LUA_Call(gL, 2);
+
+ if (success)
+ {
+ // Close the file
+ if (*pf)
+ {
+ fclose(*pf);
+ *pf = NULL;
+ }
+
+ if (client)
+ remove(luafiletransfers->realfilename);
+ }
+
+ RemoveLuaFileTransfer();
+
+ if (server && luafiletransfers)
+ {
+ if (FIL_FileOK(luafiletransfers->realfilename))
+ SV_PrepareSendLuaFileToNextNode();
+ else
+ {
+ // Send a net command with 0 as its first byte to indicate the file couldn't be opened
+ success = 0;
+ SendNetXCmd(XD_LUAFILE, &success, 1);
+ }
+ }
+}
+
+
+void StoreLuaFileCallback(INT32 id)
+{
+ lua_pushfstring(gL, FMT_FILECALLBACKID, id);
+ lua_pushvalue(gL, 3); // Parameter 3 is the callback
+ lua_settable(gL, LUA_REGISTRYINDEX); // registry[callbackid] = callback
+}
+
+
+void RemoveLuaFileCallback(INT32 id)
+{
+ lua_pushfstring(gL, FMT_FILECALLBACKID, id);
+ lua_pushnil(gL);
+ lua_settable(gL, LUA_REGISTRYINDEX); // registry[callbackid] = nil
+}
+
+
+static int io_tmpfile (lua_State *L) {
+ FILE **pf = newfile(L);
+ *pf = tmpfile();
+ return (*pf == NULL) ? pushresult(L, 0, NULL) : 1;
+}
+
+
+static int io_readline (lua_State *L);
+
+
+static void aux_lines (lua_State *L, int idx, int toclose) {
+ lua_pushvalue(L, idx);
+ lua_pushboolean(L, toclose); /* close/not close file when finished */
+ lua_pushcclosure(L, io_readline, 2);
+}
+
+
+static int f_lines (lua_State *L) {
+ tofile(L); /* check that it's a valid file handle */
+ aux_lines(L, 1, 0);
+ return 1;
+}
+
+
+/*
+** {======================================================
+** READ
+** =======================================================
+*/
+
+
+static int read_number (lua_State *L, FILE *f) {
+ lua_Number d;
+ if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
+ lua_pushnumber(L, d);
+ return 1;
+ }
+ else return 0; /* read fails */
+}
+
+
+static int test_eof (lua_State *L, FILE *f) {
+ int c = getc(f);
+ ungetc(c, f);
+ lua_pushlstring(L, NULL, 0);
+ return (c != EOF);
+}
+
+
+static int read_line (lua_State *L, FILE *f) {
+ luaL_Buffer b;
+ luaL_buffinit(L, &b);
+ for (;;) {
+ size_t l;
+ char *p = luaL_prepbuffer(&b);
+ if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) { /* eof? */
+ luaL_pushresult(&b); /* close buffer */
+ return (lua_objlen(L, -1) > 0); /* check whether read something */
+ }
+ l = strlen(p);
+ if (l == 0 || p[l-1] != '\n')
+ luaL_addsize(&b, l);
+ else {
+ luaL_addsize(&b, l - 1); /* do not include `eol' */
+ luaL_pushresult(&b); /* close buffer */
+ return 1; /* read at least an `eol' */
+ }
+ }
+}
+
+
+static int read_chars (lua_State *L, FILE *f, size_t n) {
+ size_t rlen; /* how much to read */
+ size_t nr; /* number of chars actually read */
+ luaL_Buffer b;
+ luaL_buffinit(L, &b);
+ rlen = LUAL_BUFFERSIZE; /* try to read that much each time */
+ do {
+ char *p = luaL_prepbuffer(&b);
+ if (rlen > n) rlen = n; /* cannot read more than asked */
+ nr = fread(p, sizeof(char), rlen, f);
+ luaL_addsize(&b, nr);
+ n -= nr; /* still have to read `n' chars */
+ } while (n > 0 && nr == rlen); /* until end of count or eof */
+ luaL_pushresult(&b); /* close buffer */
+ return (n == 0 || lua_objlen(L, -1) > 0);
+}
+
+
+static int g_read (lua_State *L, FILE *f, int first) {
+ int nargs = lua_gettop(L) - 1;
+ int success;
+ int n;
+ clearerr(f);
+ if (nargs == 0) { /* no arguments? */
+ success = read_line(L, f);
+ n = first+1; /* to return 1 result */
+ }
+ else { /* ensure stack space for all results and for auxlib's buffer */
+ luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
+ success = 1;
+ for (n = first; nargs-- && success; n++) {
+ if (lua_type(L, n) == LUA_TNUMBER) {
+ size_t l = (size_t)lua_tointeger(L, n);
+ success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
+ }
+ else {
+ const char *p = lua_tostring(L, n);
+ luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
+ switch (p[1]) {
+ case 'n': /* number */
+ success = read_number(L, f);
+ break;
+ case 'l': /* line */
+ success = read_line(L, f);
+ break;
+ case 'a': /* file */
+ read_chars(L, f, ~((size_t)0)); /* read MAX_SIZE_T chars */
+ success = 1; /* always success */
+ break;
+ default:
+ return luaL_argerror(L, n, "invalid format");
+ }
+ }
+ }
+ }
+ if (ferror(f))
+ return pushresult(L, 0, NULL);
+ if (!success) {
+ lua_pop(L, 1); /* remove last result */
+ lua_pushnil(L); /* push nil instead */
+ }
+ return n - first;
+}
+
+
+static int f_read (lua_State *L) {
+ return g_read(L, tofile(L), 2);
+}
+
+
+static int io_readline (lua_State *L) {
+ FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
+ int sucess;
+ if (f == NULL) /* file is already closed? */
+ luaL_error(L, "file is already closed");
+ sucess = read_line(L, f);
+ if (ferror(f))
+ return luaL_error(L, "%s", strerror(errno));
+ if (sucess) return 1;
+ else { /* EOF */
+ if (lua_toboolean(L, lua_upvalueindex(2))) { /* generator created file? */
+ lua_settop(L, 0);
+ lua_pushvalue(L, lua_upvalueindex(1));
+ aux_close(L); /* close it */
+ }
+ return 0;
+ }
+}
+
+/* }====================================================== */
+
+
+static int g_write (lua_State *L, FILE *f, int arg) {
+ int nargs = lua_gettop(L) - 1;
+ int status = 1;
+ for (; nargs--; arg++) {
+ if (lua_type(L, arg) == LUA_TNUMBER) {
+ /* optimization: could be done exactly as for strings */
+ status = status &&
+ fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
+ }
+ else {
+ size_t l;
+ const char *s = luaL_checklstring(L, arg, &l);
+ if (ftell(f) + l > FILELIMIT) {
+ luaL_error(L,"write limit bypassed in file. Changes have been discarded.");
+ break;
+ }
+ status = status && (fwrite(s, sizeof(char), l, f) == l);
+ }
+ }
+ return pushresult(L, status, NULL);
+}
+
+
+static int f_write (lua_State *L) {
+ return g_write(L, tofile(L), 2);
+}
+
+
+static int f_seek (lua_State *L) {
+ static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
+ static const char *const modenames[] = {"set", "cur", "end", NULL};
+ FILE *f = tofile(L);
+ int op = luaL_checkoption(L, 2, "cur", modenames);
+ long offset = luaL_optlong(L, 3, 0);
+ op = fseek(f, offset, mode[op]);
+ if (op)
+ return pushresult(L, 0, NULL); /* error */
+ else {
+ lua_pushinteger(L, ftell(f));
+ return 1;
+ }
+}
+
+
+static int f_setvbuf (lua_State *L) {
+ static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
+ static const char *const modenames[] = {"no", "full", "line", NULL};
+ FILE *f = tofile(L);
+ int op = luaL_checkoption(L, 2, NULL, modenames);
+ lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
+ int res = setvbuf(f, NULL, mode[op], sz);
+ return pushresult(L, res == 0, NULL);
+}
+
+
+static int f_flush (lua_State *L) {
+ return pushresult(L, fflush(tofile(L)) == 0, NULL);
+}
+
+
+static const luaL_Reg iolib[] = {
+ {"close", io_close},
+ {"open", io_open},
+ {"openlocal", io_openlocal},
+ {"tmpfile", io_tmpfile},
+ {"type", io_type},
+ {NULL, NULL}
+};
+
+
+static const luaL_Reg flib[] = {
+ {"close", io_close},
+ {"flush", f_flush},
+ {"lines", f_lines},
+ {"read", f_read},
+ {"seek", f_seek},
+ {"setvbuf", f_setvbuf},
+ {"write", f_write},
+ {"__gc", io_gc},
+ {"__tostring", io_tostring},
+ {NULL, NULL}
+};
+
+
+static void createmeta (lua_State *L) {
+ luaL_newmetatable(L, LUA_FILEHANDLE); /* create metatable for file handles */
+ lua_pushvalue(L, -1); /* push metatable */
+ lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */
+ luaL_register(L, NULL, flib); /* file methods */
+}
+
+
+static void createstdfile (lua_State *L, FILE *f, int k, const char *fname) {
+ *newfile(L) = f;
+ if (k > 0) {
+ lua_pushvalue(L, -1);
+ lua_rawseti(L, LUA_ENVIRONINDEX, k);
+ }
+ lua_pushvalue(L, -2); /* copy environment */
+ lua_setfenv(L, -2); /* set it */
+ lua_setfield(L, -3, fname);
+}
+
+
+static void newfenv (lua_State *L, lua_CFunction cls) {
+ lua_createtable(L, 0, 1);
+ lua_pushcfunction(L, cls);
+ lua_setfield(L, -2, "__close");
+}
+
+
+LUALIB_API int luaopen_io (lua_State *L) {
+ createmeta(L);
+ /* create (private) environment (with fields IO_INPUT, IO_OUTPUT, __close) */
+ newfenv(L, io_fclose);
+ lua_replace(L, LUA_ENVIRONINDEX);
+ /* open library */
+ luaL_register(L, LUA_IOLIBNAME, iolib);
+ /* create (and set) default files */
+ newfenv(L, io_noclose); /* close function for default files */
+ createstdfile(L, stdin, IO_INPUT, "stdin");
+ createstdfile(L, stdout, IO_OUTPUT, "stdout");
+ createstdfile(L, stderr, 0, "stderr");
+ lua_pop(L, 1); /* pop environment for default files */
+ return 1;
+}
+
diff --git a/src/blua/lualib.h b/src/blua/lualib.h
index 6ebe272877c0d627f9df1f294f00a853714afc56..4ea97edf3d22d585b57390b2db435b4ceec73330 100644
--- a/src/blua/lualib.h
+++ b/src/blua/lualib.h
@@ -21,6 +21,9 @@ LUALIB_API int (luaopen_base) (lua_State *L);
#define LUA_TABLIBNAME "table"
LUALIB_API int (luaopen_table) (lua_State *L);
+#define LUA_IOLIBNAME "io"
+LUALIB_API int (luaopen_io) (lua_State *L);
+
#define LUA_STRLIBNAME "string"
LUALIB_API int (luaopen_string) (lua_State *L);
diff --git a/src/command.c b/src/command.c
index abe6bcedf2bd8c4d36c39560e3a7e05f6909f55b..f5c02d877dadb087efce2d0ecfcb825ae66acdb2 100644
--- a/src/command.c
+++ b/src/command.c
@@ -481,13 +481,11 @@ void COM_AddCommand(const char *name, com_func_t func)
{
if (!stricmp(name, cmd->name)) //case insensitive now that we have lower and uppercase!
{
-#ifdef HAVE_BLUA
// don't I_Error for Lua commands
// Lua commands can replace game commands, and they have priority.
// BUT, if for some reason we screwed up and made two console commands with the same name,
// it's good to have this here so we find out.
if (cmd->function != COM_Lua_f)
-#endif
I_Error("Command %s already exists\n", name);
return;
@@ -501,7 +499,6 @@ void COM_AddCommand(const char *name, com_func_t func)
com_commands = cmd;
}
-#ifdef HAVE_BLUA
/** Adds a console command for Lua.
* No I_Errors allowed; return a negative code instead.
*
@@ -534,7 +531,6 @@ int COM_AddLuaCommand(const char *name)
com_commands = cmd;
return 0;
}
-#endif
/** Tests if a command exists.
*
@@ -1427,9 +1423,7 @@ finish:
}
var->flags |= CV_MODIFIED;
// raise 'on change' code
-#ifdef HAVE_BLUA
LUA_CVarChanged(var->name); // let consolelib know what cvar this is.
-#endif
if (var->flags & CV_CALL && !stealth)
var->func();
diff --git a/src/config.h.in b/src/config.h.in
index 4926f9a063ca706f36fcfd8398ce80820d312e39..3b25799657cdd10cec5e35f6e06775c6edf48b4a 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -28,12 +28,14 @@
/* Manually defined asset hashes for non-CMake builds
* Last updated 2020 / 02 / 15 - v2.2.1 - main assets
* Last updated 2020 / 02 / 22 - v2.2.2 - patch.pk3
+ * Last updated 2020 / 05 / 10 - v2.2.3 - player.dta & patch.pk3
+ * Last updated 2020 / 05 / 11 - v2.2.4 - patch.pk3
*/
#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28"
#define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead"
-#define ASSET_HASH_PLAYER_DTA "ad49e07b17cc662f1ad70c454910b4ae"
+#define ASSET_HASH_PLAYER_DTA "8a4507ddf9bc0682c09174400f26ad65"
#ifdef USE_PATCH_DTA
-#define ASSET_HASH_PATCH_PK3 "ee54330ecb743314c5f962af4db731ff"
+#define ASSET_HASH_PATCH_PK3 "bbbf6af3b20349612ee06e0b55979a76"
#endif
#endif
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 92602d68a92db9a8b9a6813f7da1fff29bcf62a8..a85508d119e0e40beed69bf67be14e71fe93841b 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -85,6 +85,10 @@ tic_t jointimeout = (10*TICRATE);
static boolean sendingsavegame[MAXNETNODES]; // Are we sending the savegame?
static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the server before getting a timeout?
+// Incremented by cv_joindelay when a client joins, decremented each tic.
+// If higher than cv_joindelay * 2 (3 joins in a short timespan), joins are temporarily disabled.
+static tic_t joindelay = 0;
+
UINT16 pingmeasurecount = 1;
UINT32 realpingtable[MAXPLAYERS]; //the base table of ping where an average will be sent to everyone.
UINT32 playerpingtable[MAXPLAYERS]; //table of player latency values.
@@ -191,24 +195,25 @@ static inline void *G_ScpyTiccmd(ticcmd_t* dest, void* src, const size_t n)
// of 512 bytes is like 0.1)
UINT16 software_MAXPACKETLENGTH;
-/** Guesses the value of a tic from its lowest byte and from maketic
+/** Guesses the full value of a tic from its lowest byte, for a specific node
*
* \param low The lowest byte of the tic value
+ * \param node The node to deduce the tic for
* \return The full tic value
*
*/
-tic_t ExpandTics(INT32 low)
+tic_t ExpandTics(INT32 low, INT32 node)
{
INT32 delta;
- delta = low - (maketic & UINT8_MAX);
+ delta = low - (nettics[node] & UINT8_MAX);
if (delta >= -64 && delta <= 64)
- return (maketic & ~UINT8_MAX) + low;
+ return (nettics[node] & ~UINT8_MAX) + low;
else if (delta > 64)
- return (maketic & ~UINT8_MAX) - 256 + low;
+ return (nettics[node] & ~UINT8_MAX) - 256 + low;
else //if (delta < -64)
- return (maketic & ~UINT8_MAX) + 256 + low;
+ return (nettics[node] & ~UINT8_MAX) + 256 + low;
}
// -----------------------------------------------------------------
@@ -1289,6 +1294,37 @@ static boolean CL_SendJoin(void)
return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
}
+static INT32 FindRejoinerNum(SINT8 node)
+{
+ char strippednodeaddress[64];
+ const char *nodeaddress;
+ char *port;
+ INT32 i;
+
+ // Make sure there is no dead dress before proceeding to the stripping
+ if (!I_GetNodeAddress)
+ return -1;
+ nodeaddress = I_GetNodeAddress(node);
+ if (!nodeaddress)
+ return -1;
+
+ // Strip the address of its port
+ strcpy(strippednodeaddress, nodeaddress);
+ port = strchr(strippednodeaddress, ':');
+ if (port)
+ *port = '\0';
+
+ // Check if any player matches the stripped address
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (playeringame[i] && playeraddress[i][0] && playernode[i] == UINT8_MAX
+ && !strcmp(playeraddress[i], strippednodeaddress))
+ return i;
+ }
+
+ return -1;
+}
+
static void SV_SendServerInfo(INT32 node, tic_t servertime)
{
UINT8 *p;
@@ -1306,6 +1342,16 @@ 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;
+
strncpy(netbuffer->u.serverinfo.gametypename, Gametype_Names[gametype],
sizeof netbuffer->u.serverinfo.gametypename);
netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
@@ -1450,7 +1496,7 @@ static boolean SV_SendServerConfig(INT32 node)
if (!playeringame[i])
continue;
netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
- netbuffer->u.servercfg.playercolor[i] = (UINT8)players[i].skincolor;
+ netbuffer->u.servercfg.playercolor[i] = (UINT16)players[i].skincolor;
netbuffer->u.servercfg.playeravailabilities[i] = (UINT32)LONG(players[i].availabilities);
}
@@ -1645,7 +1691,7 @@ static void CL_LoadReceivedSavegame(void)
// load a base level
if (P_LoadNetGame())
{
- const INT32 actnum = mapheaderinfo[gamemap-1]->actnum;
+ const UINT8 actnum = mapheaderinfo[gamemap-1]->actnum;
CONS_Printf(M_GetText("Map is now \"%s"), G_BuildMapName(gamemap));
if (strcmp(mapheaderinfo[gamemap-1]->lvlttl, ""))
{
@@ -1863,12 +1909,17 @@ static boolean CL_ServerConnectionSearchTicker(boolean viams, tic_t *asksent)
}
// Quit here rather than downloading files and being refused later.
- if (serverlist[i].info.numberofplayer >= serverlist[i].info.maxplayer)
+ if (serverlist[i].info.refusereason)
{
D_QuitNetGame();
CL_Reset();
D_StartTitle();
- M_StartMessage(va(M_GetText("Maximum players reached: %d\n\nPress ESC\n"), serverlist[i].info.maxplayer), NULL, MM_NOTHING);
+ 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;
}
@@ -2439,14 +2490,14 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
if (!playeringame[playernum])
return;
- if (server && !demoplayback)
+ if (server && !demoplayback && playernode[playernum] != UINT8_MAX)
{
INT32 node = playernode[playernum];
playerpernode[node]--;
if (playerpernode[node] <= 0)
{
- nodeingame[playernode[playernum]] = false;
- Net_CloseConnection(playernode[playernum]);
+ nodeingame[node] = false;
+ Net_CloseConnection(node);
ResetNode(node);
}
}
@@ -2501,20 +2552,14 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
}
}
-#ifdef HAVE_BLUA
LUAh_PlayerQuit(&players[playernum], reason); // Lua hook for player quitting
-#else
- (void)reason;
-#endif
// don't look through someone's view who isn't there
if (playernum == displayplayer)
{
-#ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], true);
-#endif
+ LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -2535,9 +2580,7 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
RemoveAdminPlayer(playernum); // don't stay admin after you're gone
}
-#ifdef HAVE_BLUA
LUA_InvalidatePlayer(&players[playernum]);
-#endif
if (G_TagGametype()) //Check if you still have a game. Location flexible. =P
P_CheckSurvivors();
@@ -2792,16 +2835,13 @@ static void Command_Kick(void)
if (pn == -1 || pn == 0)
return;
- if (server)
+ // Special case if we are trying to kick a player who is downloading the game state:
+ // trigger a timeout instead of kicking them, because a kick would only
+ // take effect after they have finished downloading
+ if (server && playernode[pn] != UINT8_MAX && sendingsavegame[playernode[pn]])
{
- // Special case if we are trying to kick a player who is downloading the game state:
- // trigger a timeout instead of kicking them, because a kick would only
- // take effect after they have finished downloading
- if (sendingsavegame[playernode[pn]])
- {
- Net_ConnectionTimeout(playernode[pn]);
- return;
- }
+ Net_ConnectionTimeout(playernode[pn]);
+ return;
}
WRITESINT8(p, pn);
@@ -2859,7 +2899,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
// Is playernum authorized to make this kick?
if (playernum != serverplayer && !IsPlayerAdmin(playernum)
- && !(playerpernode[playernode[playernum]] == 2
+ && !(playernode[playernum] != UINT8_MAX && playerpernode[playernode[playernum]] == 2
&& nodetoplayer2[playernode[playernum]] == pnum))
{
// We received a kick command from someone who isn't the
@@ -3018,7 +3058,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
}
else if (keepbody)
{
- if (server && !demoplayback)
+ if (server && !demoplayback && playernode[pnum] != UINT8_MAX)
{
INT32 node = playernode[pnum];
playerpernode[node]--;
@@ -3042,6 +3082,8 @@ consvar_t cv_allownewplayer = {"allowjoin", "On", CV_NETVAR, CV_OnOff, NULL, 0,
consvar_t cv_joinnextround = {"joinnextround", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}};
consvar_t cv_maxplayers = {"maxplayers", "8", CV_SAVE, maxplayers_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t joindelay_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, "Off"}, {0, NULL}};
+consvar_t cv_joindelay = {"joindelay", "10", CV_SAVE, joindelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t rejointimeout_cons_t[] = {{1, "MIN"}, {60 * FRACUNIT, "MAX"}, {0, "Off"}, {0, NULL}};
consvar_t cv_rejointimeout = {"rejointimeout", "Off", CV_SAVE|CV_FLOAT, rejointimeout_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -3129,14 +3171,14 @@ void SV_ResetServer(void)
neededtic = maketic;
tictoclear = maketic;
+ joindelay = 0;
+
for (i = 0; i < MAXNETNODES; i++)
ResetNode(i);
for (i = 0; i < MAXPLAYERS; i++)
{
-#ifdef HAVE_BLUA
LUA_InvalidatePlayer(&players[i]);
-#endif
playeringame[i] = false;
playernode[i] = UINT8_MAX;
memset(playeraddress[i], 0, sizeof(*playeraddress));
@@ -3197,6 +3239,8 @@ void D_QuitNetGame(void)
// abort send/receive of files
CloseNetFile();
+ RemoveAllLuaFileTransfers();
+ waitingforluafiletransfer = false;
if (server)
{
@@ -3230,37 +3274,6 @@ void D_QuitNetGame(void)
#endif
}
-static INT32 FindRejoinerNum(SINT8 node)
-{
- char strippednodeaddress[64];
- const char *nodeaddress;
- char *port;
- INT32 i;
-
- // Make sure there is no dead dress before proceeding to the stripping
- if (!I_GetNodeAddress)
- return -1;
- nodeaddress = I_GetNodeAddress(node);
- if (!nodeaddress)
- return -1;
-
- // Strip the address of its port
- strcpy(strippednodeaddress, nodeaddress);
- port = strchr(strippednodeaddress, ':');
- if (port)
- *port = '\0';
-
- // Check if any player matches the stripped address
- for (i = 0; i < MAXPLAYERS; i++)
- {
- if (playeringame[i] && playeraddress[i][0] && playernode[i] == UINT8_MAX
- && !strcmp(playeraddress[i], strippednodeaddress))
- return i;
- }
-
- return -1;
-}
-
// Adds a node to the game (player will follow at map change or at savegame....)
static inline void SV_AddNode(INT32 node)
{
@@ -3279,7 +3292,6 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
boolean splitscreenplayer;
boolean rejoined;
player_t *newplayer;
- char *port;
if (playernum != serverplayer && !IsPlayerAdmin(playernum))
{
@@ -3310,10 +3322,15 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
if (server && I_GetNodeAddress)
{
- strcpy(playeraddress[newplayernum], I_GetNodeAddress(node));
- port = strchr(playeraddress[newplayernum], ':');
- if (port)
- *port = '\0';
+ const char *address = I_GetNodeAddress(node);
+ char *port = NULL;
+ if (address) // MI: fix msvcrt.dll!_mbscat crash?
+ {
+ strcpy(playeraddress[newplayernum], address);
+ port = strchr(playeraddress[newplayernum], ':');
+ if (port)
+ *port = '\0';
+ }
}
}
@@ -3398,10 +3415,8 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
if (server && multiplayer && motd[0] != '\0')
COM_BufAddText(va("sayto %d %s\n", newplayernum, motd));
-#ifdef HAVE_BLUA
if (!rejoined)
LUAh_PlayerJoin(newplayernum);
-#endif
}
static boolean SV_AddWaitingPlayers(const char *name, const char *name2)
@@ -3591,7 +3606,7 @@ static void HandleConnect(SINT8 node)
rejoinernum = FindRejoinerNum(node);
if (bannednode && bannednode[node])
- SV_SendRefuse(node, M_GetText("You have been banned\nfrom the server"));
+ 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.");
@@ -3602,13 +3617,18 @@ static void HandleConnect(SINT8 node)
|| 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"));
+ 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));
else
{
#ifndef NONET
@@ -3666,6 +3686,7 @@ static void HandleConnect(SINT8 node)
DEBFILE("send savegame\n");
}
SV_AddWaitingPlayers(names[0], names[1]);
+ joindelay += cv_joindelay.value * TICRATE;
player_joining = true;
}
#else
@@ -3861,7 +3882,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
for (j = 0; j < MAXPLAYERS; j++)
{
if (netbuffer->u.servercfg.playerskins[j] == 0xFF
- && netbuffer->u.servercfg.playercolor[j] == 0xFF
+ && netbuffer->u.servercfg.playercolor[j] == 0xFFFF
&& netbuffer->u.servercfg.playeravailabilities[j] == 0xFFFFFFFF)
continue; // not in game
@@ -3983,8 +4004,8 @@ static void HandlePacketFromPlayer(SINT8 node)
// To save bytes, only the low byte of tic numbers are sent
// Use ExpandTics to figure out what the rest of the bytes are
- realstart = ExpandTics(netbuffer->u.clientpak.client_tic);
- realend = ExpandTics(netbuffer->u.clientpak.resendfrom);
+ realstart = ExpandTics(netbuffer->u.clientpak.client_tic, node);
+ realend = ExpandTics(netbuffer->u.clientpak.resendfrom, node);
if (netbuffer->packettype == PT_CLIENTMIS || netbuffer->packettype == PT_CLIENT2MIS
|| netbuffer->packettype == PT_NODEKEEPALIVEMIS
@@ -4195,6 +4216,18 @@ static void HandlePacketFromPlayer(SINT8 node)
Net_CloseConnection(node);
nodeingame[node] = false;
break;
+ case PT_ASKLUAFILE:
+ if (server && luafiletransfers && luafiletransfers->nodestatus[node] == LFTNS_ASKED)
+ {
+ char *name = va("%s" PATHSEP "%s", luafiledir, luafiletransfers->filename);
+ boolean textmode = !strchr(luafiletransfers->mode, 'b');
+ SV_SendLuaFile(node, name, textmode);
+ }
+ break;
+ case PT_HASLUAFILE:
+ if (server && luafiletransfers && luafiletransfers->nodestatus[node] == LFTNS_SENDING)
+ SV_HandleLuaFileSent(node);
+ break;
// -------------------------------------------- CLIENT RECEIVE ----------
case PT_RESYNCHEND:
// Only accept PT_RESYNCHEND from the server.
@@ -4224,15 +4257,15 @@ static void HandlePacketFromPlayer(SINT8 node)
break;
}
- realstart = ExpandTics(netbuffer->u.serverpak.starttic);
+ realstart = netbuffer->u.serverpak.starttic;
realend = realstart + netbuffer->u.serverpak.numtics;
if (!txtpak)
txtpak = (UINT8 *)&netbuffer->u.serverpak.cmds[netbuffer->u.serverpak.numslots
* netbuffer->u.serverpak.numtics];
- if (realend > gametic + BACKUPTICS)
- realend = gametic + BACKUPTICS;
+ if (realend > gametic + CLIENTBACKUPTICS)
+ realend = gametic + CLIENTBACKUPTICS;
cl_packetmissed = realstart > neededtic;
if (realstart <= neededtic && realend > neededtic)
@@ -4322,6 +4355,10 @@ static void HandlePacketFromPlayer(SINT8 node)
if (client)
Got_Filetxpak();
break;
+ case PT_SENDINGLUAFILE:
+ if (client)
+ CL_PrepareDownloadLuaFile();
+ break;
default:
DEBFILE(va("UNKNOWN PACKET TYPE RECEIVED %d from host %d\n",
netbuffer->packettype, node));
@@ -4571,11 +4608,11 @@ static void SV_SendTics(void)
for (n = 1; n < MAXNETNODES; n++)
if (nodeingame[n])
{
- lasttictosend = maketic;
-
// assert supposedtics[n]>=nettics[n]
realfirsttic = supposedtics[n];
- if (realfirsttic >= maketic)
+ lasttictosend = min(maketic, realfirsttic + CLIENTBACKUPTICS);
+
+ if (realfirsttic >= lasttictosend)
{
// well we have sent all tics we will so use extrabandwidth
// to resent packet that are supposed lost (this is necessary since lost
@@ -4584,7 +4621,7 @@ static void SV_SendTics(void)
DEBFILE(va("Nothing to send node %u mak=%u sup=%u net=%u \n",
n, maketic, supposedtics[n], nettics[n]));
realfirsttic = nettics[n];
- if (realfirsttic >= maketic || (I_GetTime() + n)&3)
+ if (realfirsttic >= lasttictosend || (I_GetTime() + n)&3)
// all tic are ok
continue;
DEBFILE(va("Sent %d anyway\n", realfirsttic));
@@ -4627,7 +4664,7 @@ static void SV_SendTics(void)
// Send the tics
netbuffer->packettype = PT_SERVERTICS;
- netbuffer->u.serverpak.starttic = (UINT8)realfirsttic;
+ netbuffer->u.serverpak.starttic = realfirsttic;
netbuffer->u.serverpak.numtics = (UINT8)(lasttictosend - realfirsttic);
netbuffer->u.serverpak.numslots = (UINT8)SHORT(doomcom->numslots);
bufpos = (UINT8 *)&netbuffer->u.serverpak.cmds;
@@ -4944,7 +4981,7 @@ void NetUpdate(void)
PingUpdate();
// update node latency values so we can take an average later.
for (i = 0; i < MAXPLAYERS; i++)
- if (playeringame[i])
+ if (playeringame[i] && playernode[i] != UINT8_MAX)
realpingtable[i] += G_TicsToMilliseconds(GetLag(playernode[i]));
pingmeasurecount++;
}
@@ -5018,12 +5055,21 @@ void NetUpdate(void)
hu_resynching = true;
}
}
+
Net_AckTicker();
+
// Handle timeouts to prevent definitive freezes from happenning
if (server)
+ {
for (i = 1; i < MAXNETNODES; i++)
if (nodeingame[i] && freezetimeout[i] < I_GetTime())
Net_ConnectionTimeout(i);
+
+ // In case the cvar value was lowered
+ if (joindelay)
+ joindelay = min(joindelay - 1, 3 * (tic_t)cv_joindelay.value * TICRATE);
+ }
+
nowtime /= NEWTICRATERATIO;
if (nowtime > resptime)
{
@@ -5031,6 +5077,7 @@ void NetUpdate(void)
M_Ticker();
CON_Ticker();
}
+
SV_FileSendTicker();
}
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 2ddebadbadbfbb651b1c3fde53d2b272e7d31786..aed1cddb1fd38654a7b93f97387fb3f2252a8ee1 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -24,7 +24,7 @@ The 'packet version' is used to distinguish packet formats.
This version is independent of VERSION and SUBVERSION. Different
applications may follow different packet versions.
*/
-#define PACKETVERSION 2
+#define PACKETVERSION 3
// Network play related stuff.
// There is a data struct that stores network
@@ -33,7 +33,8 @@ applications may follow different packet versions.
// be transmitted.
// Networking and tick handling related.
-#define BACKUPTICS 32
+#define BACKUPTICS 96
+#define CLIENTBACKUPTICS 32
#define MAXTEXTCMD 256
//
// Packet structure
@@ -64,6 +65,10 @@ typedef enum
PT_RESYNCHEND, // Player is now resynched and is being requested to remake the gametic
PT_RESYNCHGET, // Player got resynch packet
+ PT_SENDINGLUAFILE, // Server telling a client Lua needs to open a file
+ PT_ASKLUAFILE, // Client telling the server they don't have the file
+ PT_HASLUAFILE, // Client telling the server they have the file
+
// Add non-PT_CANFAIL packet types here to avoid breaking MS compatibility.
PT_CANFAIL, // This is kind of a priority. Anything bigger than CANFAIL
@@ -124,7 +129,7 @@ typedef struct
// this packet is too large
typedef struct
{
- UINT8 starttic;
+ tic_t starttic;
UINT8 numtics;
UINT8 numslots; // "Slots filled": Highest player number in use plus one.
ticcmd_t cmds[45]; // Normally [BACKUPTIC][MAXPLAYERS] but too large
@@ -184,7 +189,7 @@ typedef struct
SINT8 xtralife;
SINT8 pity;
- UINT8 skincolor;
+ UINT16 skincolor;
INT32 skin;
UINT32 availabilities;
// Just in case Lua does something like
@@ -304,7 +309,7 @@ typedef struct
// 0xFF == not in game; else player skin num
UINT8 playerskins[MAXPLAYERS];
- UINT8 playercolor[MAXPLAYERS];
+ UINT16 playercolor[MAXPLAYERS];
UINT32 playeravailabilities[MAXPLAYERS];
UINT8 gametype;
@@ -358,6 +363,7 @@ typedef struct
UINT8 subversion;
UINT8 numberofplayer;
UINT8 maxplayer;
+ UINT8 refusereason; // 0: joinable, 1: joins disabled, 2: full
char gametypename[24];
UINT8 modifiedgame;
UINT8 cheatsenabled;
@@ -409,7 +415,7 @@ typedef struct
{
char name[MAXPLAYERNAME+1];
UINT8 skin;
- UINT8 color;
+ UINT16 color;
UINT32 pflags;
UINT32 score;
UINT8 ctfteam;
@@ -510,12 +516,12 @@ extern UINT32 realpingtable[MAXPLAYERS];
extern UINT32 playerpingtable[MAXPLAYERS];
extern tic_t servermaxping;
-extern consvar_t cv_allownewplayer, cv_joinnextround, cv_maxplayers, cv_rejointimeout;
+extern consvar_t cv_allownewplayer, cv_joinnextround, cv_maxplayers, cv_joindelay, cv_rejointimeout;
extern consvar_t cv_resynchattempts, cv_blamecfail;
extern consvar_t cv_maxsend, cv_noticedownload, cv_downloadspeed;
// Used in d_net, the only dependence
-tic_t ExpandTics(INT32 low);
+tic_t ExpandTics(INT32 low, INT32 node);
void D_ClientServerInit(void);
// Initialise the other field
diff --git a/src/d_main.c b/src/d_main.c
index 5631cb939f87060036fe82335a0c3277503adc1c..fe06be2a4304609ee109f9298943336a0f3093b1 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -91,9 +91,7 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
#include "hardware/hw3sound.h"
#endif
-#ifdef HAVE_BLUA
#include "lua_script.h"
-#endif
// platform independant focus loss
UINT8 window_notinfocus = false;
@@ -127,6 +125,11 @@ boolean advancedemo;
INT32 debugload = 0;
#endif
+UINT16 numskincolors;
+menucolor_t *menucolorhead, *menucolortail;
+
+char savegamename[256];
+
char srb2home[256] = ".";
char srb2path[256] = ".";
boolean usehome = true;
@@ -312,7 +315,9 @@ static void D_Display(void)
F_WipeStartScreen();
// Check for Mega Genesis fade
wipestyleflags = WSF_FADEOUT;
- if (F_TryColormapFade(31))
+ if (wipegamestate == (gamestate_t)FORCEWIPE)
+ F_WipeColorFill(31);
+ else if (F_TryColormapFade(31))
wipetypepost = -1; // Don't run the fade below this one
F_WipeEndScreen();
F_RunWipe(wipetypepre, gamestate != GS_TIMEATTACK && gamestate != GS_TITLESCREEN);
@@ -800,9 +805,7 @@ void D_SRB2Loop(void)
HW3S_EndFrameUpdate();
#endif
-#ifdef HAVE_BLUA
LUA_Step();
-#endif
}
}
@@ -1049,6 +1052,7 @@ static void IdentifyVersion(void)
}
MUSICTEST("music.dta")
+ MUSICTEST("patch_music.pk3")
#ifdef DEVELOP // remove when music_new.dta is merged into music.dta
MUSICTEST("music_new.dta")
#endif
@@ -1215,7 +1219,8 @@ void D_SRB2Main(void)
// can't use sprintf since there is %u in savegamename
strcatbf(savegamename, srb2home, PATHSEP);
-#else
+ snprintf(luafiledir, sizeof luafiledir, "%s" PATHSEP "luafiles", srb2home);
+#else // DEFAULTDIR
snprintf(srb2home, sizeof srb2home, "%s", userhome);
snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
if (dedicated)
@@ -1225,7 +1230,9 @@ void D_SRB2Main(void)
// can't use sprintf since there is %u in savegamename
strcatbf(savegamename, userhome, PATHSEP);
-#endif
+
+ snprintf(luafiledir, sizeof luafiledir, "%s" PATHSEP "luafiles", userhome);
+#endif // DEFAULTDIR
}
configfile[sizeof configfile - 1] = '\0';
@@ -1241,6 +1248,10 @@ void D_SRB2Main(void)
if (M_CheckParm("-password") && M_IsNextParm())
D_SetPassword(M_GetNextParm());
+ // player setup menu colors must be initialized before
+ // any wad file is added, as they may contain colors themselves
+ M_InitPlayerSetupColors();
+
CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n");
Z_Init();
diff --git a/src/d_net.c b/src/d_net.c
index f7848f16e2c3ceb2f7f3f1a507c5ccfae6eb981b..8e62b8d25a43c6b5b8aeb40a73a1aee51329d30c 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -715,6 +715,8 @@ void Net_CloseConnection(INT32 node)
InitNode(&nodes[node]);
SV_AbortSendFiles(node);
+ if (server)
+ SV_AbortLuaFileTransfer(node);
I_NetFreeNodenum(node);
#endif
}
@@ -799,12 +801,17 @@ static const char *packettypename[NUMPACKETTYPE] =
"RESYNCHEND",
"RESYNCHGET",
+ "SENDINGLUAFILE",
+ "ASKLUAFILE",
+ "HASLUAFILE",
+
"FILEFRAGMENT",
"TEXTCMD",
"TEXTCMD2",
"CLIENTJOIN",
"NODETIMEOUT",
"RESYNCHING",
+ "LOGIN",
"PING"
};
@@ -831,7 +838,7 @@ static void DebugPrintpacket(const char *header)
size_t ntxtcmd = &((UINT8 *)netbuffer)[doomcom->datalength] - cmd;
fprintf(debugfile, " firsttic %u ply %d tics %d ntxtcmd %s\n ",
- (UINT32)ExpandTics(serverpak->starttic), serverpak->numslots, serverpak->numtics, sizeu1(ntxtcmd));
+ (UINT32)serverpak->starttic, serverpak->numslots, serverpak->numtics, sizeu1(ntxtcmd));
/// \todo Display more readable information about net commands
fprintfstringnewline((char *)cmd, ntxtcmd);
/*fprintfstring((char *)cmd, 3);
@@ -850,8 +857,8 @@ static void DebugPrintpacket(const char *header)
case PT_NODEKEEPALIVE:
case PT_NODEKEEPALIVEMIS:
fprintf(debugfile, " tic %4u resendfrom %u\n",
- (UINT32)ExpandTics(netbuffer->u.clientpak.client_tic),
- (UINT32)ExpandTics (netbuffer->u.clientpak.resendfrom));
+ (UINT32)ExpandTics(netbuffer->u.clientpak.client_tic, doomcom->remotenode),
+ (UINT32)ExpandTics (netbuffer->u.clientpak.resendfrom, doomcom->remotenode));
break;
case PT_TEXTCMD:
case PT_TEXTCMD2:
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index a55e702875ade5d54066f5cb987193854dc34dc1..84070135a165d1e54a7b884135275ba08a29957b 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -157,10 +157,8 @@ static void Command_Isgamemodified_f(void);
static void Command_Cheats_f(void);
#ifdef _DEBUG
static void Command_Togglemodified_f(void);
-#ifdef HAVE_BLUA
static void Command_Archivetest_f(void);
#endif
-#endif
// =========================================================================
// CLIENT VARIABLES
@@ -227,6 +225,7 @@ consvar_t cv_allowseenames = {"allowseenames", "Yes", CV_NETVAR, CV_YesNo, NULL,
consvar_t cv_playername = {"name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_playername2 = {"name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange, 0, NULL, NULL, 0, 0, NULL};
// player colors
+UINT16 lastgoodcolor = SKINCOLOR_BLUE, lastgoodcolor2 = SKINCOLOR_BLUE;
consvar_t cv_playercolor = {"color", "Blue", CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_playercolor2 = {"color2", "Orange", CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange, 0, NULL, NULL, 0, 0, NULL};
// player's skin, saved for commodity, when using a favorite skins wad..
@@ -415,10 +414,9 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
"DELFILE", // replace next time we add an XD
"SETMOTD",
"SUICIDE",
-#ifdef HAVE_BLUA
"LUACMD",
- "LUAVAR"
-#endif
+ "LUAVAR",
+ "LUAFILE"
};
// =========================================================================
@@ -451,9 +449,8 @@ void D_RegisterServerCommands(void)
RegisterNetXCmd(XD_PAUSE, Got_Pause);
RegisterNetXCmd(XD_SUICIDE, Got_Suicide);
RegisterNetXCmd(XD_RUNSOC, Got_RunSOCcmd);
-#ifdef HAVE_BLUA
RegisterNetXCmd(XD_LUACMD, Got_Luacmd);
-#endif
+ RegisterNetXCmd(XD_LUAFILE, Got_LuaFile);
// Remote Administration
COM_AddCommand("password", Command_Changepassword_f);
@@ -502,9 +499,7 @@ void D_RegisterServerCommands(void)
COM_AddCommand("cheats", Command_Cheats_f); // test
#ifdef _DEBUG
COM_AddCommand("togglemodified", Command_Togglemodified_f);
-#ifdef HAVE_BLUA
COM_AddCommand("archivetest", Command_Archivetest_f);
-#endif
#endif
// for master server connection
@@ -579,6 +574,7 @@ void D_RegisterServerCommands(void)
// d_clisrv
CV_RegisterVar(&cv_maxplayers);
+ CV_RegisterVar(&cv_joindelay);
CV_RegisterVar(&cv_rejointimeout);
CV_RegisterVar(&cv_resynchattempts);
CV_RegisterVar(&cv_maxsend);
@@ -624,7 +620,7 @@ void D_RegisterClientCommands(void)
for (i = 0; i < MAXSKINCOLORS; i++)
{
Color_cons_t[i].value = i;
- Color_cons_t[i].strvalue = Color_Names[i];
+ Color_cons_t[i].strvalue = skincolors[i].name;
}
Color_cons_t[MAXSKINCOLORS].value = 0;
Color_cons_t[MAXSKINCOLORS].strvalue = NULL;
@@ -913,7 +909,7 @@ void D_RegisterClientCommands(void)
#ifdef _DEBUG
COM_AddCommand("causecfail", Command_CauseCfail_f);
#endif
-#if defined(HAVE_BLUA) && defined(LUA_ALLOW_BYTECODE)
+#ifdef LUA_ALLOW_BYTECODE
COM_AddCommand("dumplua", Command_Dumplua_f);
#endif
}
@@ -1226,15 +1222,20 @@ static void SendNameAndColor(void)
CV_StealthSetValue(&cv_playercolor, skincolor_blueteam);
}
- // never allow the color "none"
- if (!cv_playercolor.value)
+ // don't allow inaccessible colors
+ if (!skincolors[cv_playercolor.value].accessible)
{
- if (players[consoleplayer].skincolor)
+ if (players[consoleplayer].skincolor && skincolors[players[consoleplayer].skincolor].accessible)
CV_StealthSetValue(&cv_playercolor, players[consoleplayer].skincolor);
- else if (skins[players[consoleplayer].skin].prefcolor)
- CV_StealthSetValue(&cv_playercolor, skins[players[consoleplayer].skin].prefcolor);
- else
+ else if (skincolors[atoi(cv_playercolor.defaultvalue)].accessible)
CV_StealthSet(&cv_playercolor, cv_playercolor.defaultvalue);
+ else if (skins[players[consoleplayer].skin].prefcolor && skincolors[skins[players[consoleplayer].skin].prefcolor].accessible)
+ CV_StealthSetValue(&cv_playercolor, skins[players[consoleplayer].skin].prefcolor);
+ else {
+ UINT16 i = 0;
+ while (i<numskincolors && !skincolors[i].accessible) i++;
+ CV_StealthSetValue(&cv_playercolor, (i != numskincolors) ? i : SKINCOLOR_BLUE);
+ }
}
if (!strcmp(cv_playername.string, player_names[consoleplayer])
@@ -1258,7 +1259,7 @@ static void SendNameAndColor(void)
players[consoleplayer].skincolor = cv_playercolor.value;
- if (players[consoleplayer].mo)
+ if (players[consoleplayer].mo && !players[consoleplayer].powers[pw_dye])
players[consoleplayer].mo->color = players[consoleplayer].skincolor;
if (metalrecording)
@@ -1281,10 +1282,10 @@ static void SendNameAndColor(void)
{
CV_StealthSetValue(&cv_playercolor, skins[cv_skin.value].prefcolor);
- players[consoleplayer].skincolor = cv_playercolor.value % MAXSKINCOLORS;
+ players[consoleplayer].skincolor = cv_playercolor.value % numskincolors;
if (players[consoleplayer].mo)
- players[consoleplayer].mo->color = (UINT8)players[consoleplayer].skincolor;
+ players[consoleplayer].mo->color = (UINT16)players[consoleplayer].skincolor;
}*/
}
else
@@ -1322,7 +1323,7 @@ static void SendNameAndColor(void)
// Finally write out the complete packet and send it off.
WRITESTRINGN(p, cv_playername.zstring, MAXPLAYERNAME);
WRITEUINT32(p, (UINT32)players[consoleplayer].availabilities);
- WRITEUINT8(p, (UINT8)cv_playercolor.value);
+ WRITEUINT16(p, (UINT16)cv_playercolor.value);
WRITEUINT8(p, (UINT8)cv_skin.value);
SendNetXCmd(XD_NAMEANDCOLOR, buf, p - buf);
}
@@ -1349,15 +1350,20 @@ static void SendNameAndColor2(void)
CV_StealthSetValue(&cv_playercolor2, skincolor_blueteam);
}
- // never allow the color "none"
- if (!cv_playercolor2.value)
+ // don't allow inaccessible colors
+ if (!skincolors[cv_playercolor2.value].accessible)
{
- if (players[secondplaya].skincolor)
+ if (players[secondplaya].skincolor && skincolors[players[secondplaya].skincolor].accessible)
CV_StealthSetValue(&cv_playercolor2, players[secondplaya].skincolor);
- else if (skins[players[secondplaya].skin].prefcolor)
+ else if (skincolors[atoi(cv_playercolor2.defaultvalue)].accessible)
+ CV_StealthSet(&cv_playercolor, cv_playercolor2.defaultvalue);
+ else if (skins[players[secondplaya].skin].prefcolor && skincolors[skins[players[secondplaya].skin].prefcolor].accessible)
CV_StealthSetValue(&cv_playercolor2, skins[players[secondplaya].skin].prefcolor);
- else
- CV_StealthSet(&cv_playercolor2, cv_playercolor2.defaultvalue);
+ else {
+ UINT16 i = 0;
+ while (i<numskincolors && !skincolors[i].accessible) i++;
+ CV_StealthSetValue(&cv_playercolor2, (i != numskincolors) ? i : SKINCOLOR_BLUE);
+ }
}
players[secondplaya].availabilities = R_GetSkinAvailabilities();
@@ -1370,8 +1376,9 @@ static void SendNameAndColor2(void)
if (botingame)
{
players[secondplaya].skincolor = botcolor;
- if (players[secondplaya].mo)
+ if (players[secondplaya].mo && !players[secondplaya].powers[pw_dye])
players[secondplaya].mo->color = players[secondplaya].skincolor;
+
SetPlayerSkinByNum(secondplaya, botskin-1);
return;
}
@@ -1384,7 +1391,7 @@ static void SendNameAndColor2(void)
// don't use secondarydisplayplayer: the second player must be 1
players[secondplaya].skincolor = cv_playercolor2.value;
- if (players[secondplaya].mo)
+ if (players[secondplaya].mo && !players[secondplaya].powers[pw_dye])
players[secondplaya].mo->color = players[secondplaya].skincolor;
if (cv_forceskin.value >= 0 && (netgame || multiplayer)) // Server wants everyone to use the same player
@@ -1409,7 +1416,7 @@ static void SendNameAndColor2(void)
{
CV_StealthSetValue(&cv_playercolor2, skins[players[secondplaya].skin].prefcolor);
- players[secondplaya].skincolor = cv_playercolor2.value % MAXSKINCOLORS;
+ players[secondplaya].skincolor = cv_playercolor2.value % numskincolors;
if (players[secondplaya].mo)
players[secondplaya].mo->color = players[secondplaya].skincolor;
@@ -1432,7 +1439,8 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
{
player_t *p = &players[playernum];
char name[MAXPLAYERNAME+1];
- UINT8 color, skin;
+ UINT16 color;
+ UINT8 skin;
#ifdef PARANOIA
if (playernum < 0 || playernum > MAXPLAYERS)
@@ -1451,7 +1459,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
READSTRINGN(*cp, name, MAXPLAYERNAME);
p->availabilities = READUINT32(*cp);
- color = READUINT8(*cp);
+ color = READUINT16(*cp);
skin = READUINT8(*cp);
// set name
@@ -1459,9 +1467,9 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
SetPlayerName(playernum, name);
// set color
- p->skincolor = color % MAXSKINCOLORS;
+ p->skincolor = color % numskincolors;
if (p->mo)
- p->mo->color = (UINT8)p->skincolor;
+ p->mo->color = (UINT16)p->skincolor;
// normal player colors
if (server && (p != &players[consoleplayer] && p != &players[secondarydisplayplayer]))
@@ -1478,8 +1486,8 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
kick = true;
}
- // don't allow color "none"
- if (!p->skincolor)
+ // don't allow inaccessible colors
+ if (skincolors[p->skincolor].accessible == false)
kick = true;
// availabilities
@@ -2027,9 +2035,7 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
UINT8 flags;
INT32 resetplayer = 1, lastgametype;
UINT8 skipprecutscene, FLS;
-#ifdef HAVE_BLUA
INT16 mapnumber;
-#endif
if (playernum != serverplayer && !IsPlayerAdmin(playernum))
{
@@ -2091,10 +2097,8 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
CV_StealthSetValue(&cv_playercolor, players[0].skincolor);
}
-#ifdef HAVE_BLUA
mapnumber = M_MapNumber(mapname[3], mapname[4]);
LUAh_MapChange(mapnumber);
-#endif
G_InitNew(ultimatemode, mapname, resetplayer, skipprecutscene, FLS);
if (demoplayback && !timingdemo)
@@ -2678,11 +2682,9 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
return;
}
-#ifdef HAVE_BLUA
// 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))
return;
-#endif
//no status changes after hidetime
if ((gametyperules & GTR_HIDEFROZEN) && (leveltime >= (hidetime * TICRATE)))
@@ -2839,12 +2841,10 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
//reset view if you are changed, or viewing someone who was changed.
if (playernum == consoleplayer || displayplayer == playernum)
{
-#ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
if (displayplayer != consoleplayer) // You're already viewing yourself. No big deal.
- LUAh_ViewpointSwitch(&players[playernum], &players[displayplayer], true);
-#endif
+ LUAh_ViewpointSwitch(&players[consoleplayer], &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -3342,10 +3342,6 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
boolean kick = false;
boolean toomany = false;
INT32 i,j;
- serverinfo_pak *dummycheck = NULL;
-
- // Shut the compiler up.
- (void)dummycheck;
READSTRINGN(*cp, filename, 240);
READMEM(*cp, md5sum, 16);
@@ -3753,11 +3749,11 @@ static void ExitMove_OnChange(void)
{
if (players[i].mo->target && players[i].mo->target->type == MT_SIGN)
P_SetTarget(&players[i].mo->target, NULL);
-
+
if (players[i].pflags & PF_FINISHED)
P_GiveFinishFlags(&players[i]);
}
-
+
CONS_Printf(M_GetText("Players can now move after completing the level.\n"));
}
else
@@ -4334,7 +4330,6 @@ static void Command_Togglemodified_f(void)
modifiedgame = !modifiedgame;
}
-#ifdef HAVE_BLUA
extern UINT8 *save_p;
static void Command_Archivetest_f(void)
{
@@ -4379,7 +4374,6 @@ static void Command_Archivetest_f(void)
CONS_Printf("Done. No crash.\n");
}
#endif
-#endif
/** Makes a change to ::cv_forceskin take effect immediately.
*
@@ -4491,25 +4485,30 @@ static void Skin2_OnChange(void)
*/
static void Color_OnChange(void)
{
- if (!Playing())
- return; // do whatever you want
-
- if (!(cv_debug || devparm) && !(multiplayer || netgame)) // In single player.
- {
- CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
- return;
- }
-
- if (!P_PlayerMoving(consoleplayer))
- {
- // Color change menu scrolling fix is no longer necessary
- SendNameAndColor();
+ if (!Playing()) {
+ if (!cv_playercolor.value || !skincolors[cv_playercolor.value].accessible)
+ CV_StealthSetValue(&cv_playercolor, lastgoodcolor);
}
else
{
- CV_StealthSetValue(&cv_playercolor,
- players[consoleplayer].skincolor);
+ if (!(cv_debug || devparm) && !(multiplayer || netgame)) // In single player.
+ {
+ CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
+ return;
+ }
+
+ if (!P_PlayerMoving(consoleplayer) && skincolors[players[consoleplayer].skincolor].accessible == true)
+ {
+ // Color change menu scrolling fix is no longer necessary
+ SendNameAndColor();
+ }
+ else
+ {
+ CV_StealthSetValue(&cv_playercolor,
+ players[consoleplayer].skincolor);
+ }
}
+ lastgoodcolor = cv_playercolor.value;
}
/** Sends a color change for the secondary splitscreen player, unless that
@@ -4520,18 +4519,24 @@ static void Color_OnChange(void)
static void Color2_OnChange(void)
{
if (!Playing() || !splitscreen)
- return; // do whatever you want
-
- if (!P_PlayerMoving(secondarydisplayplayer))
{
- // Color change menu scrolling fix is no longer necessary
- SendNameAndColor2();
+ if (!cv_playercolor2.value || !skincolors[cv_playercolor2.value].accessible)
+ CV_StealthSetValue(&cv_playercolor2, lastgoodcolor2);
}
else
{
- CV_StealthSetValue(&cv_playercolor2,
- players[secondarydisplayplayer].skincolor);
+ if (!P_PlayerMoving(secondarydisplayplayer) && skincolors[players[secondarydisplayplayer].skincolor].accessible == true)
+ {
+ // Color change menu scrolling fix is no longer necessary
+ SendNameAndColor2();
+ }
+ else
+ {
+ CV_StealthSetValue(&cv_playercolor2,
+ players[secondarydisplayplayer].skincolor);
+ }
}
+ lastgoodcolor2 = cv_playercolor2.value;
}
/** Displays the result of the chat being muted or unmuted.
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 2b0ddd1854ae58bc39eac7fe6bcc46a34bb9a4bf..897c28968e7a42662ad04b533942005fb70f91d2 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -142,10 +142,9 @@ typedef enum
XD_SETMOTD, // 19
XD_SUICIDE, // 20
XD_DEMOTED, // 21
-#ifdef HAVE_BLUA
XD_LUACMD, // 22
XD_LUAVAR, // 23
-#endif
+ XD_LUAFILE, // 24
MAXNETXCMD
} netxcmd_t;
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 3926ff14dabda91207dd90900cc000513211935f..6d3ac7f9d02705539bff9afd890d911d5088346e 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -69,6 +69,7 @@ typedef struct filetx_s
UINT32 size; // Size of the file
UINT8 fileid;
INT32 node; // Destination
+ boolean textmode; // For files requested by Lua without the "b" option
struct filetx_s *next; // Next file in the list
} filetx_t;
@@ -94,6 +95,11 @@ char downloaddir[512] = "DOWNLOAD";
INT32 lastfilenum = -1;
#endif
+luafiletransfer_t *luafiletransfers = NULL;
+boolean waitingforluafiletransfer = false;
+char luafiledir[256 + 16] = "luafiles";
+
+
/** Fills a serverinfo packet with information about wad files loaded.
*
* \todo Give this function a better name since it is in global scope.
@@ -159,6 +165,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr)
fileneeded[i].file = NULL; // The file isn't open yet
READSTRINGN(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
+ fileneeded[i].textmode = false;
}
}
@@ -170,6 +177,7 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave)
fileneeded[0].file = NULL;
memset(fileneeded[0].md5sum, 0, 16);
strcpy(fileneeded[0].filename, tmpsave);
+ fileneeded[0].textmode = false;
}
/** Checks the server to see if we CAN download all the files,
@@ -448,6 +456,162 @@ void CL_LoadServerFiles(void)
}
}
+void AddLuaFileTransfer(const char *filename, const char *mode)
+{
+ luafiletransfer_t **prevnext; // A pointer to the "next" field of the last transfer in the list
+ luafiletransfer_t *filetransfer;
+ static INT32 id;
+
+ //CONS_Printf("AddLuaFileTransfer \"%s\"\n", filename);
+
+ // Find the last transfer in the list and set a pointer to its "next" field
+ prevnext = &luafiletransfers;
+ while (*prevnext)
+ prevnext = &((*prevnext)->next);
+
+ // Allocate file transfer information and append it to the transfer list
+ filetransfer = malloc(sizeof(luafiletransfer_t));
+ if (!filetransfer)
+ I_Error("AddLuaFileTransfer: Out of memory\n");
+ *prevnext = filetransfer;
+ filetransfer->next = NULL;
+
+ // Allocate the file name
+ filetransfer->filename = strdup(filename);
+ if (!filetransfer->filename)
+ I_Error("AddLuaFileTransfer: Out of memory\n");
+
+ // Create and allocate the real file name
+ if (server)
+ filetransfer->realfilename = strdup(va("%s" PATHSEP "%s",
+ luafiledir, filename));
+ else
+ filetransfer->realfilename = strdup(va("%s" PATHSEP "client" PATHSEP "$$$%d%d.tmp",
+ luafiledir, rand(), rand()));
+ if (!filetransfer->realfilename)
+ I_Error("AddLuaFileTransfer: Out of memory\n");
+
+ strlcpy(filetransfer->mode, mode, sizeof(filetransfer->mode));
+
+ if (server)
+ {
+ INT32 i;
+
+ // Set status to "waiting" for everyone
+ for (i = 0; i < MAXNETNODES; i++)
+ filetransfer->nodestatus[i] = LFTNS_WAITING;
+
+ if (!luafiletransfers->next) // Only if there is no transfer already going on
+ {
+ if (FIL_ReadFileOK(filetransfer->realfilename))
+ SV_PrepareSendLuaFileToNextNode();
+ else
+ {
+ // Send a net command with 0 as its first byte to indicate the file couldn't be opened
+ UINT8 success = 0;
+ SendNetXCmd(XD_LUAFILE, &success, 1);
+ }
+ }
+ }
+
+ // Store the callback so it can be called once everyone has the file
+ filetransfer->id = id;
+ StoreLuaFileCallback(id);
+ id++;
+
+ if (waitingforluafiletransfer)
+ {
+ waitingforluafiletransfer = false;
+ CL_PrepareDownloadLuaFile();
+ }
+}
+
+void SV_PrepareSendLuaFileToNextNode(void)
+{
+ INT32 i;
+ UINT8 success = 1;
+
+ // Find a client to send the file to
+ for (i = 1; i < MAXNETNODES; i++)
+ if (nodeingame[i] && luafiletransfers->nodestatus[i] == LFTNS_WAITING) // Node waiting
+ {
+ // Tell the client we're about to send them the file
+ netbuffer->packettype = PT_SENDINGLUAFILE;
+ if (!HSendPacket(i, true, 0, 0))
+ I_Error("Failed to send a PT_SENDINGLUAFILE packet\n"); // !!! Todo: Handle failure a bit better lol
+
+ luafiletransfers->nodestatus[i] = LFTNS_ASKED;
+
+ return;
+ }
+
+ // No client found, everyone has the file
+ // Send a net command with 1 as its first byte to indicate the file could be opened
+ SendNetXCmd(XD_LUAFILE, &success, 1);
+}
+
+void SV_HandleLuaFileSent(UINT8 node)
+{
+ luafiletransfers->nodestatus[node] = LFTNS_SENT;
+ SV_PrepareSendLuaFileToNextNode();
+}
+
+void RemoveLuaFileTransfer(void)
+{
+ luafiletransfer_t *filetransfer = luafiletransfers;
+
+ RemoveLuaFileCallback(filetransfer->id);
+
+ luafiletransfers = filetransfer->next;
+
+ free(filetransfer->filename);
+ free(filetransfer->realfilename);
+ free(filetransfer);
+}
+
+void RemoveAllLuaFileTransfers(void)
+{
+ while (luafiletransfers)
+ RemoveLuaFileTransfer();
+}
+
+void SV_AbortLuaFileTransfer(INT32 node)
+{
+ if (luafiletransfers
+ && (luafiletransfers->nodestatus[node] == LFTNS_ASKED
+ || luafiletransfers->nodestatus[node] == LFTNS_SENDING))
+ {
+ luafiletransfers->nodestatus[node] = LFTNS_WAITING;
+ SV_PrepareSendLuaFileToNextNode();
+ }
+}
+
+void CL_PrepareDownloadLuaFile(void)
+{
+ // If there is no transfer in the list, this normally means the server
+ // called io.open before us, so we have to wait until we call it too
+ if (!luafiletransfers)
+ {
+ waitingforluafiletransfer = true;
+ return;
+ }
+
+ // Tell the server we are ready to receive the file
+ netbuffer->packettype = PT_ASKLUAFILE;
+ HSendPacket(servernode, true, 0, 0);
+
+ fileneedednum = 1;
+ fileneeded[0].status = FS_REQUESTED;
+ fileneeded[0].totalsize = UINT32_MAX;
+ fileneeded[0].file = NULL;
+ memset(fileneeded[0].md5sum, 0, 16);
+ strcpy(fileneeded[0].filename, luafiletransfers->realfilename);
+ fileneeded[0].textmode = !strchr(luafiletransfers->mode, 'b');
+
+ // Make sure all directories in the file path exist
+ MakePathDirs(fileneeded[0].filename);
+}
+
// Number of files to send
// Little optimization to quickly test if there is a file in the queue
static INT32 filestosend = 0;
@@ -458,6 +622,7 @@ static INT32 filestosend = 0;
* \param filename The file to send
* \param fileid ???
* \sa SV_SendRam
+ * \sa SV_SendLuaFile
*
*/
static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
@@ -548,6 +713,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
* \param freemethod How to free the block after it has been sent
* \param fileid ???
* \sa SV_SendFile
+ * \sa SV_SendLuaFile
*
*/
void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod, UINT8 fileid)
@@ -579,6 +745,55 @@ void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod, UI
filestosend++;
}
+/** Adds a file requested by Lua to the file list for a node
+ *
+ * \param node The node to send the file to
+ * \param filename The file to send
+ * \sa SV_SendFile
+ * \sa SV_SendRam
+ *
+ */
+boolean SV_SendLuaFile(INT32 node, const char *filename, boolean textmode)
+{
+ 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];
+
+ luafiletransfers->nodestatus[node] = LFTNS_SENDING;
+
+ // Find the last file in the list and set a pointer to its "next" field
+ q = &transfer[node].txlist;
+ while (*q)
+ q = &((*q)->next);
+
+ // Allocate a file request and append it to the file list
+ p = *q = (filetx_t *)malloc(sizeof (filetx_t));
+ if (!p)
+ I_Error("SV_SendLuaFile: No more memory\n");
+
+ // Initialise with zeros
+ memset(p, 0, sizeof (filetx_t));
+
+ // Allocate the file name
+ p->id.filename = (char *)malloc(MAX_WADPATH); // !!!
+ if (!p->id.filename)
+ I_Error("SV_SendLuaFile: 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);
+
+ // Open in text mode if required by the Lua script
+ p->textmode = textmode;
+
+ DEBFILE(va("Sending Lua file %s to %d\n", filename, 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->next = NULL; // End of list
+ filestosend++;
+ return true;
+}
+
/** Stops sending a file for a node, and removes the file request from the list,
* either because the file has been fully sent or because the node was disconnected
*
@@ -684,7 +899,7 @@ void SV_FileSendTicker(void)
long filesize;
transfer[i].currentfile =
- fopen(f->id.filename, "rb");
+ fopen(f->id.filename, f->textmode ? "r" : "rb");
if (!transfer[i].currentfile)
I_Error("File %s does not exist",
@@ -715,11 +930,20 @@ void SV_FileSendTicker(void)
size = f->size-transfer[i].position;
if (ram)
M_Memcpy(p->data, &f->id.ram[transfer[i].position], size);
- else if (fread(p->data, 1, size, transfer[i].currentfile) != size)
- I_Error("SV_FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->id.filename, transfer[i].position, M_FileError(transfer[i].currentfile));
+ else
+ {
+ size_t n = fread(p->data, 1, size, transfer[i].currentfile);
+ if (n != size) // Either an error or Windows turning CR-LF into LF
+ {
+ if (f->textmode && feof(transfer[i].currentfile))
+ size = n;
+ else if (fread(p->data, 1, size, transfer[i].currentfile) != size)
+ I_Error("SV_FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->id.filename, transfer[i].position, M_FileError(transfer[i].currentfile));
+ }
+ }
p->position = LONG(transfer[i].position);
// Put flag so receiver knows the total size
- if (transfer[i].position + size == f->size)
+ if (transfer[i].position + size == f->size || (f->textmode && feof(transfer[i].currentfile)))
p->position |= LONG(0x80000000);
p->fileid = f->fileid;
p->size = SHORT((UINT16)size);
@@ -728,7 +952,7 @@ void SV_FileSendTicker(void)
if (HSendPacket(i, true, 0, FILETXHEADER + size)) // Reliable SEND
{ // Success
transfer[i].position = (UINT32)(transfer[i].position + size);
- if (transfer[i].position == f->size) // Finish?
+ if (transfer[i].position == f->size || (f->textmode && feof(transfer[i].currentfile))) // Finish?
SV_EndFileSend(i);
}
else
@@ -772,7 +996,7 @@ void Got_Filetxpak(void)
{
if (file->file)
I_Error("Got_Filetxpak: already open file\n");
- file->file = fopen(filename, "wb");
+ file->file = fopen(filename, file->textmode ? "w" : "wb");
if (!file->file)
I_Error("Can't create file %s: %s", filename, strerror(errno));
CONS_Printf("\r%s...\n",filename);
@@ -793,7 +1017,7 @@ void Got_Filetxpak(void)
}
// We can receive packet in the wrong order, anyway all os support gaped file
fseek(file->file, pos, SEEK_SET);
- if (fwrite(netbuffer->u.filetxpak.data,size,1,file->file) != 1)
+ if (size && fwrite(netbuffer->u.filetxpak.data,size,1,file->file) != 1)
I_Error("Can't write to %s: %s\n",filename, M_FileError(file->file));
file->currentsize += size;
@@ -805,6 +1029,12 @@ void Got_Filetxpak(void)
file->status = FS_FOUND;
CONS_Printf(M_GetText("Downloading %s...(done)\n"),
filename);
+ if (luafiletransfers)
+ {
+ // Tell the server we have received the file
+ netbuffer->packettype = PT_HASLUAFILE;
+ HSendPacket(servernode, true, 0, 0);
+ }
}
}
else
diff --git a/src/d_netfil.h b/src/d_netfil.h
index 8214ccd4c7f20306477e8a6f475255480c502156..7d6efada03cde57a29791257a126363d0ffb6d8d 100644
--- a/src/d_netfil.h
+++ b/src/d_netfil.h
@@ -13,6 +13,7 @@
#ifndef __D_NETFIL__
#define __D_NETFIL__
+#include "d_net.h"
#include "w_wad.h"
typedef enum
@@ -43,6 +44,7 @@ typedef struct
UINT32 currentsize;
UINT32 totalsize;
filestatus_t status; // The value returned by recsearch
+ boolean textmode; // For files requested by Lua without the "b" option
} fileneeded_t;
extern INT32 fileneedednum;
@@ -70,6 +72,42 @@ boolean CL_CheckDownloadable(void);
boolean CL_SendRequestFile(void);
boolean Got_RequestFilePak(INT32 node);
+typedef enum
+{
+ LFTNS_WAITING, // This node is waiting for the server to send the file
+ LFTNS_ASKED, // The server has told the node they're ready to send the file
+ LFTNS_SENDING, // The server is sending the file to this node
+ LFTNS_SENT // The node already has the file
+} luafiletransfernodestatus_t;
+
+typedef struct luafiletransfer_s
+{
+ char *filename;
+ char *realfilename;
+ char mode[4]; // rb+/wb+/ab+ + null character
+ INT32 id; // Callback ID
+ luafiletransfernodestatus_t nodestatus[MAXNETNODES];
+ struct luafiletransfer_s *next;
+} luafiletransfer_t;
+
+extern luafiletransfer_t *luafiletransfers;
+extern boolean waitingforluafiletransfer;
+extern char luafiledir[256 + 16];
+
+void AddLuaFileTransfer(const char *filename, const char *mode);
+void SV_PrepareSendLuaFileToNextNode(void);
+boolean SV_SendLuaFile(INT32 node, const char *filename, boolean textmode);
+void SV_PrepareSendLuaFile(const char *filename);
+void SV_HandleLuaFileSent(UINT8 node);
+void RemoveLuaFileTransfer(void);
+void RemoveAllLuaFileTransfers(void);
+void SV_AbortLuaFileTransfer(INT32 node);
+void CL_PrepareDownloadLuaFile(void);
+void Got_LuaFile(UINT8 **cp, INT32 playernum);
+void StoreLuaFileCallback(INT32 id);
+void RemoveLuaFileCallback(INT32 id);
+void MakePathDirs(char *path);
+
void SV_AbortSendFiles(INT32 node);
void CloseNetFile(void);
diff --git a/src/d_player.h b/src/d_player.h
index 209ff766d6732715ad3cb1d5d27123310561ef21..0f10317084b046d713a5b96a3a2e9392af6fb892 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -48,6 +48,7 @@ typedef enum
SF_FASTEDGE = 1<<12, // Faster edge teeter?
SF_MULTIABILITY = 1<<13, // Revenge of Final Demo.
SF_NONIGHTSROTATION = 1<<14, // Disable sprite rotation for NiGHTS
+ SF_NONIGHTSSUPER = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
// free up to and including 1<<31
} skinflags_t;
@@ -238,7 +239,8 @@ typedef enum
CR_MACESPIN,
CR_MINECART,
CR_ROLLOUT,
- CR_PTERABYTE
+ CR_PTERABYTE,
+ CR_DUSTDEVIL
} carrytype_t; // pw_carry
// Player powers. (don't edit this comment)
@@ -278,6 +280,9 @@ typedef enum
pw_nights_linkfreeze,
pw_nocontrol, //for linedef exec 427
+
+ pw_dye, // for dyes
+
pw_justlaunched, // Launched off a slope this tic (0=none, 1=standard launch, 2=half-pipe launch)
NUMPOWERS
@@ -361,7 +366,7 @@ typedef struct player_s
UINT16 flashpal;
// Player skin colorshift, 0-15 for which color to draw player.
- UINT8 skincolor;
+ UINT16 skincolor;
INT32 skin;
UINT32 availabilities;
diff --git a/src/dehacked.c b/src/dehacked.c
index 71e2e2f549a0f68c506010a2327940d4c8da3c57..bd8a07b9019d09a3035e2d93f44dffa34e146386 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -40,9 +40,7 @@
#include "m_cond.h"
-#ifdef HAVE_BLUA
#include "v_video.h" // video flags (for lua)
-#endif
#ifdef HWRENDER
#include "hardware/hw_light.h"
@@ -58,10 +56,12 @@ int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
// The crazy word-reading stuff uses these.
static char *FREE_STATES[NUMSTATEFREESLOTS];
static char *FREE_MOBJS[NUMMOBJFREESLOTS];
+static char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
static UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
#define initfreeslots() {\
memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
memset(FREE_MOBJS,0,sizeof(char *) * NUMMOBJFREESLOTS);\
+memset(FREE_SKINCOLORS,0,sizeof(char *) * NUMCOLORFREESLOTS);\
memset(used_spr,0,sizeof(UINT8) * ((NUMSPRITEFREESLOTS / 8) + 1));\
}
@@ -77,10 +77,9 @@ static UINT16 get_mus(const char *word, UINT8 dehacked_mode);
#endif
static hudnum_t get_huditem(const char *word);
static menutype_t get_menutype(const char *word);
-#ifndef HAVE_BLUA
-static INT16 get_gametype(const char *word);
-static powertype_t get_power(const char *word);
-#endif
+//static INT16 get_gametype(const char *word);
+//static powertype_t get_power(const char *word);
+skincolornum_t get_skincolor(const char *word);
boolean deh_loaded = false;
static int dbg_line;
@@ -396,7 +395,7 @@ static void readPlayer(MYFILE *f, INT32 num)
// It works down here, though.
{
INT32 numline = 0;
- for (i = 0; i < MAXLINELEN-1; i++)
+ for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++)
{
if (numline < 20 && description[num].notes[i] == '\n')
numline++;
@@ -453,7 +452,7 @@ static void readPlayer(MYFILE *f, INT32 num)
else if (fastcmp(word, "OPPOSITECOLOR") || fastcmp(word, "OPPOSITECOLOUR"))
{
SLOTFOUND
- description[num].oppositecolor = (UINT8)get_number(word2);
+ description[num].oppositecolor = (UINT16)get_number(word2);
}
else if (fastcmp(word, "NAMETAG") || fastcmp(word, "TAGNAME"))
{
@@ -463,12 +462,12 @@ static void readPlayer(MYFILE *f, INT32 num)
else if (fastcmp(word, "TAGTEXTCOLOR") || fastcmp(word, "TAGTEXTCOLOUR"))
{
SLOTFOUND
- description[num].tagtextcolor = (UINT8)get_number(word2);
+ description[num].tagtextcolor = (UINT16)get_number(word2);
}
else if (fastcmp(word, "TAGOUTLINECOLOR") || fastcmp(word, "TAGOUTLINECOLOUR"))
{
SLOTFOUND
- description[num].tagoutlinecolor = (UINT8)get_number(word2);
+ description[num].tagoutlinecolor = (UINT16)get_number(word2);
}
else if (fastcmp(word, "STATUS"))
{
@@ -575,6 +574,16 @@ static void readfreeslots(MYFILE *f)
break;
}
}
+ else if (fastcmp(type, "SKINCOLOR"))
+ {
+ for (i = 0; i < NUMCOLORFREESLOTS; i++)
+ if (!FREE_SKINCOLORS[i]) {
+ FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_SKINCOLORS[i],word);
+ M_AddMenuColor(numskincolors++);
+ break;
+ }
+ }
else if (fastcmp(type, "SPR2"))
{
// Search if we already have an SPR2 by that name...
@@ -757,6 +766,84 @@ static void readthing(MYFILE *f, INT32 num)
Z_Free(s);
}
+static void readskincolor(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word, *word2, *word3;
+ char *tmp;
+
+ Color_cons_t[num].value = num;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ 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);
+ else
+ break;
+
+ word2 = strtok(NULL, " = ");
+ if (word2) {
+ word3 = Z_StrDup(word2);
+ strupr(word2);
+ } else
+ break;
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+ if (word3[strlen(word3)-1] == '\n')
+ word3[strlen(word3)-1] = '\0';
+
+ if (fastcmp(word, "NAME"))
+ {
+ deh_strlcpy(skincolors[num].name, word3,
+ sizeof (skincolors[num].name), va("Skincolor %d: name", num));
+ }
+ else if (fastcmp(word, "RAMP"))
+ {
+ UINT8 i;
+ tmp = strtok(word2,",");
+ for (i = 0; i < COLORRAMPSIZE; i++) {
+ skincolors[num].ramp[i] = (UINT8)get_number(tmp);
+ if ((tmp = strtok(NULL,",")) == NULL)
+ break;
+ }
+ }
+ else if (fastcmp(word, "INVCOLOR"))
+ {
+ skincolors[num].invcolor = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "INVSHADE"))
+ {
+ skincolors[num].invshade = get_number(word2)%COLORRAMPSIZE;
+ }
+ else if (fastcmp(word, "CHATCOLOR"))
+ {
+ skincolors[num].chatcolor = get_number(word2);
+ }
+ else if (fastcmp(word, "ACCESSIBLE"))
+ {
+ if (num > FIRSTSUPERCOLOR)
+ skincolors[num].accessible = (boolean)(atoi(word2) || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else
+ deh_warning("Skincolor %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
#ifdef HWRENDER
static void readlight(MYFILE *f, INT32 num)
{
@@ -1178,7 +1265,7 @@ static void readgametype(MYFILE *f, char *gtname)
// It works down here, though.
{
INT32 numline = 0;
- for (i = 0; i < MAXLINELEN-1; i++)
+ for (i = 0; (size_t)i < sizeof(gtdescription)-1; i++)
{
if (numline < 20 && gtdescription[i] == '\n')
numline++;
@@ -1250,7 +1337,7 @@ static void readgametype(MYFILE *f, char *gtname)
newgttol = (UINT32)i;
else
{
- UINT16 tol = 0;
+ UINT32 tol = 0;
tmp = strtok(word2,",");
do {
for (i = 0; TYPEOFLEVEL[i].name; i++)
@@ -1416,7 +1503,6 @@ static void readlevelheader(MYFILE *f, INT32 num)
// Lua custom options also go above, contents may be case sensitive.
if (fastncmp(word, "LUA.", 4))
{
-#ifdef HAVE_BLUA
UINT8 j;
customoption_t *modoption;
@@ -1450,9 +1536,6 @@ static void readlevelheader(MYFILE *f, INT32 num)
modoption->option[31] = '\0';
strncpy(modoption->value, word2, 255);
modoption->value[255] = '\0';
-#else
- // Silently ignore.
-#endif
continue;
}
@@ -1565,7 +1648,7 @@ static void readlevelheader(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "ACT"))
{
- if (i >= 0 && i < 20) // 0 for no act number, TTL1 through TTL19
+ if (i >= 0 && i <= 99) // 0 for no act number
mapheaderinfo[num-1]->actnum = (UINT8)i;
else
deh_warning("Level header %d: invalid act number %d", num, i);
@@ -1592,7 +1675,7 @@ static void readlevelheader(MYFILE *f, INT32 num)
mapheaderinfo[num-1]->typeoflevel = (UINT32)i;
else
{
- UINT16 tol = 0;
+ UINT32 tol = 0;
tmp = strtok(word2,",");
do {
for (i = 0; TYPEOFLEVEL[i].name; i++)
@@ -1871,6 +1954,12 @@ static void readlevelheader(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "STARTRINGS"))
mapheaderinfo[num-1]->startrings = (UINT16)i;
+ else if (fastcmp(word, "SPECIALSTAGETIME"))
+ mapheaderinfo[num-1]->sstimer = i;
+ else if (fastcmp(word, "SPECIALSTAGESPHERES"))
+ mapheaderinfo[num-1]->ssspheres = i;
+ else if (fastcmp(word, "GRAVITY"))
+ mapheaderinfo[num-1]->gravity = FLOAT_TO_FIXED(atof(word2));
else
deh_warning("Level header %d: unknown word '%s'", num, word);
}
@@ -2815,7 +2904,7 @@ static actionpointer_t actionpointers[] =
{{A_ThrownRing}, "A_THROWNRING"},
{{A_SetSolidSteam}, "A_SETSOLIDSTEAM"},
{{A_UnsetSolidSteam}, "A_UNSETSOLIDSTEAM"},
- {{A_SignSpin}, "S_SIGNSPIN"},
+ {{A_SignSpin}, "A_SIGNSPIN"},
{{A_SignPlayer}, "A_SIGNPLAYER"},
{{A_OverlayThink}, "A_OVERLAYTHINK"},
{{A_JetChase}, "A_JETCHASE"},
@@ -2917,6 +3006,7 @@ static actionpointer_t actionpointers[] =
{{A_SetRandomTics}, "A_SETRANDOMTICS"},
{{A_ChangeColorRelative}, "A_CHANGECOLORRELATIVE"},
{{A_ChangeColorAbsolute}, "A_CHANGECOLORABSOLUTE"},
+ {{A_Dye}, "A_DYE"},
{{A_MoveRelative}, "A_MOVERELATIVE"},
{{A_MoveAbsolute}, "A_MOVEABSOLUTE"},
{{A_Thrust}, "A_THRUST"},
@@ -3034,6 +3124,7 @@ static actionpointer_t actionpointers[] =
{{A_DragonbomberSpawn}, "A_DRAGONBOMERSPAWN"},
{{A_DragonWing}, "A_DRAGONWING"},
{{A_DragonSegment}, "A_DRAGONSEGMENT"},
+ {{A_ChangeHeight}, "A_CHANGEHEIGHT"},
{{NULL}, "NONE"},
// This NULL entry must be the last in the list
@@ -3124,22 +3215,20 @@ static void readframe(MYFILE *f, INT32 num)
}
z = 0;
-#ifdef HAVE_BLUA
found = LUA_SetLuaAction(&states[num], actiontocompare);
if (!found)
-#endif
- while (actionpointers[z].name)
- {
- if (fastcmp(actiontocompare, actionpointers[z].name))
+ while (actionpointers[z].name)
{
- states[num].action = actionpointers[z].action;
- states[num].action.acv = actionpointers[z].action.acv; // assign
- states[num].action.acp1 = actionpointers[z].action.acp1;
- found = true;
- break;
+ if (fastcmp(actiontocompare, actionpointers[z].name))
+ {
+ states[num].action = actionpointers[z].action;
+ states[num].action.acv = actionpointers[z].action.acv; // assign
+ states[num].action.acp1 = actionpointers[z].action.acp1;
+ found = true;
+ break;
+ }
+ z++;
}
- z++;
- }
if (!found)
deh_warning("Unknown action %s", actiontocompare);
@@ -3954,19 +4043,19 @@ static void readmaincfg(MYFILE *f)
}
else if (fastcmp(word, "REDTEAM"))
{
- skincolor_redteam = (UINT8)get_number(word2);
+ skincolor_redteam = (UINT16)get_number(word2);
}
else if (fastcmp(word, "BLUETEAM"))
{
- skincolor_blueteam = (UINT8)get_number(word2);
+ skincolor_blueteam = (UINT16)get_number(word2);
}
else if (fastcmp(word, "REDRING"))
{
- skincolor_redring = (UINT8)get_number(word2);
+ skincolor_redring = (UINT16)get_number(word2);
}
else if (fastcmp(word, "BLUERING"))
{
- skincolor_bluering = (UINT8)get_number(word2);
+ skincolor_bluering = (UINT16)get_number(word2);
}
else if (fastcmp(word, "INVULNTICS"))
{
@@ -4151,6 +4240,10 @@ static void readmaincfg(MYFILE *f)
{
maxXtraLife = (UINT8)get_number(word2);
}
+ else if (fastcmp(word, "USECONTINUES"))
+ {
+ useContinues = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
+ }
else if (fastcmp(word, "GAMEDATA"))
{
@@ -4554,6 +4647,18 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
ignorelines(f);
}
}
+ else if (fastcmp(word, "SKINCOLOR") || fastcmp(word, "COLOR"))
+ {
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_skincolor(word2); // find a skincolor by name
+ if (i < numskincolors && i >= (INT32)SKINCOLOR_FIRSTFREESLOT)
+ readskincolor(f, i);
+ else
+ {
+ deh_warning("Skincolor %d out of range (%d - %d)", i, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+ ignorelines(f);
+ }
+ }
else if (fastcmp(word, "SPRITE2"))
{
if (i == 0 && word2[0] != '0') // If word2 isn't a number
@@ -6230,6 +6335,14 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_ROCKET",
"S_LASER",
+ "S_LASER2",
+ "S_LASERFLASH",
+
+ "S_LASERFLAME1",
+ "S_LASERFLAME2",
+ "S_LASERFLAME3",
+ "S_LASERFLAME4",
+ "S_LASERFLAME5",
"S_TORPEDO",
@@ -8868,14 +8981,12 @@ static const char *const MOBJEFLAG_LIST[] = {
NULL
};
-#ifdef HAVE_BLUA
static const char *const MAPTHINGFLAG_LIST[4] = {
"EXTRA", // Extra flag for objects.
"OBJECTFLIP", // Reverse gravity flag for objects.
"OBJECTSPECIAL", // Special flag used with certain objects.
"AMBUSH" // Deaf monsters/do not react to sound.
};
-#endif
static const char *const PLAYERFLAG_LIST[] = {
@@ -8972,7 +9083,6 @@ static const char *const GAMETYPERULE_LIST[] = {
NULL
};
-#ifdef HAVE_BLUA
// Linedef flags
static const char *const ML_LIST[16] = {
"IMPASSIBLE",
@@ -8992,10 +9102,7 @@ static const char *const ML_LIST[16] = {
"BOUNCY",
"TFERLINE"
};
-#endif
-// This DOES differ from r_draw's Color_Names, unfortunately.
-// Also includes Super colors
static const char *COLOR_ENUMS[] = {
"NONE", // SKINCOLOR_NONE,
@@ -9165,7 +9272,11 @@ static const char *const POWERS_LIST[] = {
//for linedef exec 427
"NOCONTROL",
- "JUSTLAUNCHED",
+
+ //for dyes
+ "DYE",
+
+ "JUSTLAUNCHED"
};
static const char *const HUDITEMS_LIST[] = {
@@ -9229,6 +9340,7 @@ static const char *const MENUTYPES_LIST[] = {
"MP_CONNECT",
"MP_ROOM",
"MP_PLAYERSETUP", // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET
+ "MP_SERVER_OPTIONS",
// Options
"OP_MAIN",
@@ -9238,10 +9350,14 @@ static const char *const MENUTYPES_LIST[] = {
"OP_P1MOUSE",
"OP_P1JOYSTICK",
"OP_JOYSTICKSET", // OP_JoystickSetDef shared with P2
+ "OP_P1CAMERA",
"OP_P2CONTROLS",
"OP_P2MOUSE",
"OP_P2JOYSTICK",
+ "OP_P2CAMERA",
+
+ "OP_PLAYSTYLE",
"OP_VIDEO",
"OP_VIDEOMODE",
@@ -9289,11 +9405,7 @@ static const char *const MENUTYPES_LIST[] = {
struct {
const char *n;
// has to be able to hold both fixed_t and angle_t, so drastic measure!!
-#ifdef HAVE_BLUA
lua_Integer v;
-#else
- INT64 v;
-#endif
} const INT_CONST[] = {
// If a mod removes some variables here,
// please leave the names in-tact and just set
@@ -9424,7 +9536,8 @@ struct {
// SKINCOLOR_ doesn't include these..!
{"MAXSKINCOLORS",MAXSKINCOLORS},
- {"MAXTRANSLATIONS",MAXTRANSLATIONS},
+ {"FIRSTSUPERCOLOR",FIRSTSUPERCOLOR},
+ {"NUMSUPERCOLORS",NUMSUPERCOLORS},
// Precipitation
{"PRECIP_NONE",PRECIP_NONE},
@@ -9475,6 +9588,7 @@ struct {
{"CR_MINECART",CR_MINECART},
{"CR_ROLLOUT",CR_ROLLOUT},
{"CR_PTERABYTE",CR_PTERABYTE},
+ {"CR_DUSTDEVIL",CR_DUSTDEVIL},
// Ring weapons (ringweapons_t)
// Useful for A_GiveWeapon
@@ -9502,6 +9616,7 @@ struct {
{"SF_FASTEDGE",SF_FASTEDGE},
{"SF_MULTIABILITY",SF_MULTIABILITY},
{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
+ {"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
// Dashmode constants
{"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
@@ -9549,7 +9664,6 @@ struct {
{"ME_ULTIMATE",ME_ULTIMATE},
{"ME_PERFECT",ME_PERFECT},
-#ifdef HAVE_BLUA
// p_local.h constants
{"FLOATSPEED",FLOATSPEED},
{"MAXSTEPMOVE",MAXSTEPMOVE},
@@ -9684,11 +9798,11 @@ struct {
{"FF_CUTEXTRA",FF_CUTEXTRA}, ///< Cuts out hidden translucent pixels.
{"FF_CUTLEVEL",FF_CUTLEVEL}, ///< Cuts out all hidden pixels.
{"FF_CUTSPRITES",FF_CUTSPRITES}, ///< Final step in making 3D water.
- {"FF_BOTHPLANES",FF_BOTHPLANES}, ///< Renders both planes all the time.
+ {"FF_BOTHPLANES",FF_BOTHPLANES}, ///< Render inside and outside planes.
{"FF_EXTRA",FF_EXTRA}, ///< Gets cut by ::FF_CUTEXTRA.
{"FF_TRANSLUCENT",FF_TRANSLUCENT}, ///< See through!
{"FF_FOG",FF_FOG}, ///< Fog "brush."
- {"FF_INVERTPLANES",FF_INVERTPLANES}, ///< Reverse the plane visibility rules.
+ {"FF_INVERTPLANES",FF_INVERTPLANES}, ///< Only render inside planes.
{"FF_ALLSIDES",FF_ALLSIDES}, ///< Render inside and outside sides.
{"FF_INVERTSIDES",FF_INVERTSIDES}, ///< Only render inside sides.
{"FF_DOUBLESHADOW",FF_DOUBLESHADOW}, ///< Make two lightlist entries to reset light?
@@ -9714,11 +9828,10 @@ struct {
// Node flags
{"NF_SUBSECTOR",NF_SUBSECTOR}, // Indicate a leaf.
#endif
-#ifdef ESLOPE
+
// Slope flags
{"SL_NOPHYSICS",SL_NOPHYSICS},
{"SL_DYNAMIC",SL_DYNAMIC},
-#endif
// Angles
{"ANG1",ANG1},
@@ -9882,7 +9995,6 @@ struct {
{"TC_RAINBOW",TC_RAINBOW},
{"TC_BLINK",TC_BLINK},
{"TC_DASHMODE",TC_DASHMODE},
-#endif
{NULL,0}
};
@@ -9927,6 +10039,26 @@ static statenum_t get_state(const char *word)
return S_NULL;
}
+skincolornum_t get_skincolor(const char *word)
+{ // Returns the value of SKINCOLOR_ enumerations
+ skincolornum_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("SKINCOLOR_",word,10))
+ word += 10; // take off the SKINCOLOR_
+ for (i = 0; i < NUMCOLORFREESLOTS; i++) {
+ if (!FREE_SKINCOLORS[i])
+ break;
+ if (fastcmp(word, FREE_SKINCOLORS[i]))
+ return SKINCOLOR_FIRSTFREESLOT+i;
+ }
+ for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
+ if (fastcmp(word, COLOR_ENUMS[i]))
+ return i;
+ deh_warning("Couldn't find skincolor named 'SKINCOLOR_%s'",word);
+ return SKINCOLOR_GREEN;
+}
+
static spritenum_t get_sprite(const char *word)
{ // Returns the value of SPR_ enumerations
spritenum_t i;
@@ -10039,8 +10171,7 @@ static menutype_t get_menutype(const char *word)
return MN_NONE;
}
-#ifndef HAVE_BLUA
-static INT16 get_gametype(const char *word)
+/*static INT16 get_gametype(const char *word)
{ // Returns the value of GT_ enumerations
INT16 i;
if (*word >= '0' && *word <= '9')
@@ -10066,7 +10197,7 @@ static powertype_t get_power(const char *word)
return i;
deh_warning("Couldn't find power named 'pw_%s'",word);
return pw_invulnerability;
-}
+}*/
/// \todo Make ANY of this completely over-the-top math craziness obey the order of operations.
static fixed_t op_mul(fixed_t a, fixed_t b) { return a*b; }
@@ -10094,7 +10225,7 @@ struct {
};
// Returns the full word, cut at the first symbol or whitespace
-static char *read_word(const char *line)
+/*static char *read_word(const char *line)
{
// Part 1: You got the start of the word, now find the end.
const char *p;
@@ -10222,6 +10353,11 @@ static fixed_t find_const(const char **rword)
free(word);
return r;
}
+ else if (fastncmp("SKINCOLOR_",word,10)) {
+ r = get_skincolor(word);
+ free(word);
+ return r;
+ }
else if (fastncmp("MT_",word,3)) {
r = get_mobjtype(word);
free(word);
@@ -10254,7 +10390,7 @@ static fixed_t find_const(const char **rword)
free(word);
return r;
}
- else if (fastncmp("GT_",word,4)) {
+ else if (fastncmp("GT_",word,3)) {
r = get_gametype(word);
free(word);
return r;
@@ -10290,17 +10426,6 @@ static fixed_t find_const(const char **rword)
free(word);
return r;
}
- else if (fastncmp("SKINCOLOR_",word,10)) {
- char *p = word+10;
- for (i = 0; i < MAXTRANSLATIONS; i++)
- if (fastcmp(p, COLOR_ENUMS[i])) {
- free(word);
- return i;
- }
- const_warning("color",word);
- free(word);
- return 0;
- }
else if (fastncmp("GRADE_",word,6))
{
char *p = word+6;
@@ -10324,16 +10449,14 @@ static fixed_t find_const(const char **rword)
const_warning("constant",word);
free(word);
return 0;
-}
-#endif
+}*/
// Loops through every constant and operation in word and performs its calculations, returning the final value.
fixed_t get_number(const char *word)
{
-#ifdef HAVE_BLUA
return LUA_EvalMath(word);
-#else
- // DESPERATELY NEEDED: Order of operations support! :x
+
+ /*// DESPERATELY NEEDED: Order of operations support! :x
fixed_t i = find_const(&word);
INT32 o;
while(*word) {
@@ -10343,8 +10466,7 @@ fixed_t get_number(const char *word)
else
break;
}
- return i;
-#endif
+ return i;*/
}
void DEH_Check(void)
@@ -10364,12 +10486,11 @@ void DEH_Check(void)
if (dehpowers != NUMPOWERS)
I_Error("You forgot to update the Dehacked powers list, you dolt!\n(%d powers defined, versus %s in the Dehacked list)\n", NUMPOWERS, sizeu1(dehpowers));
- if (dehcolors != MAXTRANSLATIONS)
- I_Error("You forgot to update the Dehacked colors list, you dolt!\n(%d colors defined, versus %s in the Dehacked list)\n", MAXTRANSLATIONS, sizeu1(dehcolors));
+ if (dehcolors != SKINCOLOR_FIRSTFREESLOT)
+ I_Error("You forgot to update the Dehacked colors list, you dolt!\n(%d colors defined, versus %s in the Dehacked list)\n", SKINCOLOR_FIRSTFREESLOT, sizeu1(dehcolors));
#endif
}
-#ifdef HAVE_BLUA
#include "lua_script.h"
#include "lua_libs.h"
@@ -10474,6 +10595,22 @@ static inline int lib_freeslot(lua_State *L)
if (i == NUMMOBJFREESLOTS)
CONS_Alert(CONS_WARNING, "Ran out of free MobjType slots!\n");
}
+ else if (fastcmp(type, "SKINCOLOR"))
+ {
+ skincolornum_t i;
+ for (i = 0; i < NUMCOLORFREESLOTS; i++)
+ if (!FREE_SKINCOLORS[i]) {
+ CONS_Printf("Skincolor SKINCOLOR_%s allocated.\n",word);
+ FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_SKINCOLORS[i],word);
+ M_AddMenuColor(numskincolors++);
+ lua_pushinteger(L, i);
+ r++;
+ break;
+ }
+ if (i == NUMCOLORFREESLOTS)
+ CONS_Alert(CONS_WARNING, "Ran out of free skincolor slots!\n");
+ }
else if (fastcmp(type, "SPR2"))
{
// Search if we already have an SPR2 by that name...
@@ -10805,13 +10942,20 @@ static inline int lib_getenum(lua_State *L)
}
else if (fastncmp("SKINCOLOR_",word,10)) {
p = word+10;
- for (i = 0; i < MAXTRANSLATIONS; i++)
+ for (i = 0; i < NUMCOLORFREESLOTS; i++) {
+ if (!FREE_SKINCOLORS[i])
+ break;
+ if (fastcmp(p, FREE_SKINCOLORS[i])) {
+ lua_pushinteger(L, SKINCOLOR_FIRSTFREESLOT+i);
+ return 1;
+ }
+ }
+ for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
if (fastcmp(p, COLOR_ENUMS[i])) {
lua_pushinteger(L, i);
return 1;
}
- if (mathlib) return luaL_error(L, "skincolor '%s' could not be found.\n", word);
- return 0;
+ return luaL_error(L, "skincolor '%s' could not be found.\n", word);
}
else if (fastncmp("GRADE_",word,6))
{
@@ -10995,5 +11139,3 @@ void LUA_SetActionByName(void *state, const char *actiontocompare)
}
}
}
-
-#endif // HAVE_BLUA
diff --git a/src/dehacked.h b/src/dehacked.h
index 80c31f3de9e53d23175f2df2e2770175dc0409bc..54225f36e8c851b67e968b3b25167ac1acf61306 100644
--- a/src/dehacked.h
+++ b/src/dehacked.h
@@ -34,11 +34,9 @@ void DEH_Check(void);
fixed_t get_number(const char *word);
-#ifdef HAVE_BLUA
boolean LUA_SetLuaAction(void *state, const char *actiontocompare);
const char *LUA_GetActionName(void *action);
void LUA_SetActionByName(void *state, const char *actiontocompare);
-#endif
extern boolean deh_loaded;
diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index dae9ed16e3b426d195bf91c8ee62890fc42d7f48..9f6972fa67663065e65fb29973d99ee60711d1aa 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -61,6 +61,8 @@
#include "../console.h"
+#include "../m_menu.h"
+
#ifdef __GNUG__
#pragma implementation "../i_system.h"
#endif
@@ -555,6 +557,7 @@ void I_Error (const char *error, ...)
if (demorecording)
G_CheckDemoStatus();
D_QuitNetGame ();
+ M_FreePlayerSetupColors();
if (shutdowning)
{
@@ -622,6 +625,7 @@ void I_Quit (void)
if (demorecording)
G_CheckDemoStatus();
D_QuitNetGame ();
+ M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
diff --git a/src/doomdata.h b/src/doomdata.h
index c2ee50c2eec019342c125f667e0204ea4f1193d8..77ed56bc23e853f825159ccbc60b1c7d3f98e823 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -208,10 +208,6 @@ typedef struct
#define ZSHIFT 4
-extern const UINT8 Color_Index[MAXTRANSLATIONS-1][16];
-extern const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS];
-extern const UINT8 Color_Opposite[MAXSKINCOLORS - 1][2];
-
#define NUMMAPS 1035
#endif // __DOOMDATA__
diff --git a/src/doomdef.h b/src/doomdef.h
index 1d051c385f8adfbe9ffca87be1316bb6436e87a4..64bf217d34fea0e30935a3bd55cfc21b4aa23f35 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -143,9 +143,9 @@ extern char logfilename[1024];
// we use comprevision and compbranch instead.
#else
#define VERSION 202 // Game version
-#define SUBVERSION 2 // more precise version number
-#define VERSIONSTRING "v2.2.2"
-#define VERSIONSTRINGW L"v2.2.2"
+#define SUBVERSION 4 // more precise version number
+#define VERSIONSTRING "v2.2.4"
+#define VERSIONSTRINGW L"v2.2.4"
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
#endif
@@ -213,7 +213,7 @@ extern char logfilename[1024];
// 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 42
+#define MODVERSION 44
// To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically.
// Increment MINOREXECVERSION whenever a config change is needed that does not correspond
@@ -239,6 +239,20 @@ extern char logfilename[1024];
#define PLAYERSMASK (MAXPLAYERS-1)
#define MAXPLAYERNAME 21
+#define COLORRAMPSIZE 16
+#define MAXCOLORNAME 32
+#define NUMCOLORFREESLOTS 1024
+
+typedef struct skincolor_s
+{
+ char name[MAXCOLORNAME+1]; // Skincolor name
+ UINT8 ramp[COLORRAMPSIZE]; // Colormap ramp
+ UINT16 invcolor; // Signpost color
+ UINT8 invshade; // Signpost color shade
+ UINT16 chatcolor; // Chat color
+ boolean accessible; // Accessible by the color command + setup menu
+} skincolor_t;
+
typedef enum
{
SKINCOLOR_NONE = 0,
@@ -317,12 +331,10 @@ typedef enum
SKINCOLOR_RASPBERRY,
SKINCOLOR_ROSY,
- // SKINCOLOR_? - one left before we bump up against 0x39, which isn't a HARD limit anymore but would be excessive
-
- MAXSKINCOLORS,
+ FIRSTSUPERCOLOR,
// Super special awesome Super flashing colors!
- SKINCOLOR_SUPERSILVER1 = MAXSKINCOLORS,
+ SKINCOLOR_SUPERSILVER1 = FIRSTSUPERCOLOR,
SKINCOLOR_SUPERSILVER2,
SKINCOLOR_SUPERSILVER3,
SKINCOLOR_SUPERSILVER4,
@@ -376,9 +388,17 @@ typedef enum
SKINCOLOR_SUPERTAN4,
SKINCOLOR_SUPERTAN5,
- MAXTRANSLATIONS,
- NUMSUPERCOLORS = ((MAXTRANSLATIONS - MAXSKINCOLORS)/5)
-} skincolors_t;
+ SKINCOLOR_FIRSTFREESLOT,
+ SKINCOLOR_LASTFREESLOT = SKINCOLOR_FIRSTFREESLOT + NUMCOLORFREESLOTS - 1,
+
+ MAXSKINCOLORS,
+
+ NUMSUPERCOLORS = ((SKINCOLOR_FIRSTFREESLOT - FIRSTSUPERCOLOR)/5)
+} skincolornum_t;
+
+extern UINT16 numskincolors;
+
+extern skincolor_t skincolors[MAXSKINCOLORS];
// State updates, number of tics / second.
// NOTE: used to setup the timer rate, see I_StartupTimer().
@@ -458,7 +478,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...) FUNCDEBUG;
// Things that used to be in dstrings.h
#define SAVEGAMENAME "srb2sav"
-char savegamename[256];
+extern char savegamename[256];
// m_misc.h
#ifdef GETTEXT
@@ -565,15 +585,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
// None of these that are disabled in the normal build are guaranteed to work perfectly
// Compile them at your own risk!
-/// Kalaron/Eternity Engine slope code (SRB2CB ported)
-#define ESLOPE
-
-#ifdef ESLOPE
-/// Backwards compatibility with SRB2CB's slope linedef types.
-/// \note A simple shim that prints a warning.
-#define ESLOPE_TYPESHIM
-#endif
-
/// Allows the use of devmode in multiplayer. AKA "fishcake"
//#define NETGAME_DEVMODE
@@ -583,9 +594,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Dumps the contents of a network save game upon consistency failure for debugging.
//#define DUMPCONSISTENCY
-/// Polyobject fake flat code
-#define POLYOBJECTS_PLANES
-
/// See name of player in your crosshair
#define SEENAMES
diff --git a/src/doomstat.h b/src/doomstat.h
index b7388fd96255374e59fc0c1384b5dc6d4db9f252..fa346540cf6bb3606c53cc8c90ed048258cbe75d 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -145,7 +145,7 @@ extern INT32 tutorialanalog; // store cv_analog[0] user value
extern boolean looptitle;
// CTF colors.
-extern UINT8 skincolor_redteam, skincolor_blueteam, skincolor_redring, skincolor_bluering;
+extern UINT16 skincolor_redteam, skincolor_blueteam, skincolor_redring, skincolor_bluering;
extern tic_t countdowntimer;
extern boolean countdowntimeup;
@@ -319,6 +319,9 @@ typedef struct
char selectheading[22]; ///< Level select heading. Allows for controllable grouping.
UINT16 startrings; ///< Number of rings players start with.
+ INT32 sstimer; ///< Timer for special stages.
+ UINT32 ssspheres; ///< Sphere requirement in special stages.
+ fixed_t gravity; ///< Map-wide gravity.
// Title card.
char ltzzpatch[8]; ///< Zig zag patch.
@@ -493,7 +496,6 @@ extern UINT16 emeralds;
#define EMERALD7 64
#define ALL7EMERALDS(v) ((v & (EMERALD1|EMERALD2|EMERALD3|EMERALD4|EMERALD5|EMERALD6|EMERALD7)) == (EMERALD1|EMERALD2|EMERALD3|EMERALD4|EMERALD5|EMERALD6|EMERALD7))
-// yes, even in non HAVE_BLUA
#define NUM_LUABANKS 16 // please only make this number go up between versions, never down. you'll break saves otherwise. also, must fit in UINT8
extern INT32 luabanks[NUM_LUABANKS];
@@ -543,7 +545,7 @@ extern recorddata_t *mainrecords[NUMMAPS];
extern UINT8 mapvisited[NUMMAPS];
// Temporary holding place for nights data for the current map
-nightsdata_t ntemprecords;
+extern nightsdata_t ntemprecords;
extern UINT32 token; ///< Number of tokens collected in a level
extern UINT32 tokenlist; ///< List of tokens collected
@@ -576,6 +578,8 @@ extern UINT8 creditscutscene;
extern UINT8 use1upSound;
extern UINT8 maxXtraLife; // Max extra lives from rings
+extern UINT8 useContinues;
+#define continuesInSession (!multiplayer && (useContinues || ultimatemode || !(cursaveslot > 0)))
extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations
@@ -616,6 +620,19 @@ extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
extern mapthing_t *bluectfstarts[MAXPLAYERS]; // CTF
extern mapthing_t *redctfstarts[MAXPLAYERS]; // CTF
+#define WAYPOINTSEQUENCESIZE 256
+#define NUMWAYPOINTSEQUENCES 256
+extern mobj_t *waypoints[NUMWAYPOINTSEQUENCES][WAYPOINTSEQUENCESIZE];
+extern UINT16 numwaypoints[NUMWAYPOINTSEQUENCES];
+
+void P_AddWaypoint(UINT8 sequence, UINT8 id, mobj_t *waypoint);
+mobj_t *P_GetFirstWaypoint(UINT8 sequence);
+mobj_t *P_GetLastWaypoint(UINT8 sequence);
+mobj_t *P_GetPreviousWaypoint(mobj_t *current, boolean wrap);
+mobj_t *P_GetNextWaypoint(mobj_t *current, boolean wrap);
+mobj_t *P_GetClosestWaypoint(UINT8 sequence, mobj_t *mo);
+boolean P_IsDegeneratedWaypointSequence(UINT8 sequence);
+
// =====================================
// Internal parameters, used for engine.
// =====================================
diff --git a/src/f_finale.c b/src/f_finale.c
index c98d49842d2dac4a5749723b26e90975b004f338..8b5a69ae4a2390419856a9366240e5eb20674c6c 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -39,9 +39,7 @@
#include "fastcmp.h"
#include "console.h"
-#ifdef HAVE_BLUA
#include "lua_hud.h"
-#endif
// Stage of animation:
// 0 = text, 1 = art screen
@@ -2187,7 +2185,7 @@ void F_EndingDrawer(void)
for (i = 0; i < 7; ++i)
{
UINT8* colormap;
- skincolors_t col = SKINCOLOR_GREEN;
+ skincolornum_t col = SKINCOLOR_GREEN;
switch (i)
{
case 1:
@@ -2762,11 +2760,7 @@ void F_TitleScreenDrawer(void)
// rei|miru: use title pics?
hidepics = curhidepics;
if (hidepics)
-#ifdef HAVE_BLUA
goto luahook;
-#else
- return;
-#endif
switch(curttmode)
{
@@ -3488,10 +3482,8 @@ void F_TitleScreenDrawer(void)
break;
}
-#ifdef HAVE_BLUA
luahook:
LUAh_TitleHUD();
-#endif
}
// separate animation timer for backgrounds, since we also count
@@ -3626,7 +3618,7 @@ void F_StartContinue(void)
{
I_Assert(!netgame && !multiplayer);
- if (players[consoleplayer].continues <= 0)
+ if (continuesInSession && players[consoleplayer].continues <= 0)
{
Command_ExitGame_f();
return;
@@ -3733,7 +3725,9 @@ void F_ContinueDrawer(void)
}
// Draw the continue markers! Show continues.
- if (ncontinues > 10)
+ if (!continuesInSession)
+ ;
+ else if (ncontinues > 10)
{
if (!(continuetime & 1) || continuetime > 17)
V_DrawContinueIcon(x, 68, 0, players[consoleplayer].skin, players[consoleplayer].skincolor);
diff --git a/src/f_finale.h b/src/f_finale.h
index 63319d7d6f6b1c23541e267d0c986bdf2ca111e0..b3abf1778408a43e54fe310d28d5410f821f98da 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -162,7 +162,9 @@ extern wipestyleflags_t wipestyleflags;
// Even my function names are borderline
boolean F_ShouldColormapFade(void);
boolean F_TryColormapFade(UINT8 wipecolor);
+#ifndef NOWIPE
void F_DecideWipeStyle(void);
+#endif
#define FADECOLORMAPDIV 8
#define FADECOLORMAPROWS (256/FADECOLORMAPDIV)
diff --git a/src/f_wipe.c b/src/f_wipe.c
index 0fd6c1431c099877710e3e39ec74282cf7fb4b0e..01b45b0c2927e6fe6e1f054c156bd0e016a0ed48 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -33,9 +33,7 @@
#include "doomstat.h"
-#ifdef HAVE_BLUA
#include "lua_hud.h" // level title
-#endif
#ifdef HWRENDER
#include "hardware/hw_main.h"
@@ -466,6 +464,7 @@ void F_WipeEndScreen(void)
*/
boolean F_ShouldColormapFade(void)
{
+#ifndef NOWIPE
if ((wipestyleflags & (WSF_FADEIN|WSF_FADEOUT)) // only if one of those wipestyleflags are actually set
&& !(wipestyleflags & WSF_CROSSFADE)) // and if not crossfading
{
@@ -481,11 +480,13 @@ boolean F_ShouldColormapFade(void)
// Menus
|| gamestate == GS_TIMEATTACK);
}
+#endif
return false;
}
/** Decides what wipe style to use.
*/
+#ifndef NOWIPE
void F_DecideWipeStyle(void)
{
// Set default wipe style
@@ -495,6 +496,7 @@ void F_DecideWipeStyle(void)
if (F_ShouldColormapFade())
wipestyle = WIPESTYLE_COLORMAP;
}
+#endif
/** Attempt to run a colormap fade,
provided all the conditionals were properly met.
@@ -503,6 +505,7 @@ void F_DecideWipeStyle(void)
*/
boolean F_TryColormapFade(UINT8 wipecolor)
{
+#ifndef NOWIPE
if (F_ShouldColormapFade())
{
#ifdef HWRENDER
@@ -512,6 +515,7 @@ boolean F_TryColormapFade(UINT8 wipecolor)
return true;
}
else
+#endif
{
F_WipeColorFill(wipecolor);
return false;
@@ -610,6 +614,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
tic_t F_GetWipeLength(UINT8 wipetype)
{
#ifdef NOWIPE
+ (void)wipetype;
return 0;
#else
static char lumpname[10] = "FADEmmss";
@@ -636,6 +641,7 @@ tic_t F_GetWipeLength(UINT8 wipetype)
boolean F_WipeExists(UINT8 wipetype)
{
#ifdef NOWIPE
+ (void)wipetype;
return false;
#else
static char lumpname[10] = "FADEmm00";
diff --git a/src/filesrch.h b/src/filesrch.h
index 4186271b038d23aac0ad9a1f77a0a3b368914ada..dfea8979e9c19d3a5a733e8303636762c9027d04 100644
--- a/src/filesrch.h
+++ b/src/filesrch.h
@@ -60,7 +60,7 @@ typedef enum
#endif
EXT_PK3,
EXT_SOC,
- EXT_LUA, // allowed even if not HAVE_BLUA so that we can yell on load attempt
+ EXT_LUA,
NUM_EXT,
NUM_EXT_TABLE = NUM_EXT-EXT_START,
EXT_LOADED = 0x80
diff --git a/src/g_demo.c b/src/g_demo.c
new file mode 100644
index 0000000000000000000000000000000000000000..be3b9c1fdbd266e4e736ec43fc019e365390ddfc
--- /dev/null
+++ b/src/g_demo.c
@@ -0,0 +1,2526 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 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 g_demo.c
+/// \brief Demo recording and playback
+
+#include "doomdef.h"
+#include "console.h"
+#include "d_main.h"
+#include "d_player.h"
+#include "d_clisrv.h"
+#include "p_setup.h"
+#include "i_system.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "r_draw.h"
+#include "r_main.h"
+#include "g_game.h"
+#include "g_demo.h"
+#include "m_misc.h"
+#include "m_menu.h"
+#include "m_argv.h"
+#include "hu_stuff.h"
+#include "z_zone.h"
+#include "i_video.h"
+#include "byteptr.h"
+#include "i_joy.h"
+#include "r_local.h"
+#include "r_skins.h"
+#include "y_inter.h"
+#include "v_video.h"
+#include "lua_hook.h"
+#include "md5.h" // demo checksums
+
+boolean timingdemo; // if true, exit with report on completion
+boolean nodrawers; // for comparative timing purposes
+boolean noblit; // for comparative timing purposes
+tic_t demostarttime; // for comparative timing purposes
+
+static char demoname[64];
+boolean demorecording;
+boolean demoplayback;
+boolean titledemo; // Title Screen demo can be cancelled by any key
+static UINT8 *demobuffer = NULL;
+static UINT8 *demo_p, *demotime_p;
+static UINT8 *demoend;
+static UINT8 demoflags;
+static UINT16 demoversion;
+boolean singledemo; // quit after playing a demo from cmdline
+boolean demo_start; // don't start playing demo right away
+boolean demosynced = true; // console warning message
+
+boolean metalrecording; // recording as metal sonic
+mobj_t *metalplayback;
+static UINT8 *metalbuffer = NULL;
+static UINT8 *metal_p;
+static UINT16 metalversion;
+
+// extra data stuff (events registered this frame while recording)
+static struct {
+ UINT8 flags; // EZT flags
+
+ // EZT_COLOR
+ UINT16 color, lastcolor;
+
+ // EZT_SCALE
+ fixed_t scale, lastscale;
+
+ // EZT_HIT
+ UINT16 hits;
+ mobj_t **hitlist;
+} ghostext;
+
+// Your naming conventions are stupid and useless.
+// There is no conflict here.
+typedef struct demoghost {
+ UINT8 checksum[16];
+ UINT8 *buffer, *p, fadein;
+ UINT16 color;
+ UINT16 version;
+ mobj_t oldmo, *mo;
+ struct demoghost *next;
+} demoghost;
+demoghost *ghosts = NULL;
+
+//
+// DEMO RECORDING
+//
+
+#define DEMOVERSION 0x000d
+#define DEMOHEADER "\xF0" "SRB2Replay" "\x0F"
+
+#define DF_GHOST 0x01 // This demo contains ghost data too!
+#define DF_RECORDATTACK 0x02 // This demo is from record attack and contains its final completion time, score, and rings!
+#define DF_NIGHTSATTACK 0x04 // This demo is from NiGHTS attack and contains its time left, score, and mares!
+#define DF_ATTACKMASK 0x06 // This demo is from ??? attack and contains ???
+#define DF_ATTACKSHIFT 1
+
+// For demos
+#define ZT_FWD 0x01
+#define ZT_SIDE 0x02
+#define ZT_ANGLE 0x04
+#define ZT_BUTTONS 0x08
+#define ZT_AIMING 0x10
+#define DEMOMARKER 0x80 // demoend
+#define METALDEATH 0x44
+#define METALSNICE 0x69
+
+static ticcmd_t oldcmd;
+
+// For Metal Sonic and time attack ghosts
+#define GZT_XYZ 0x01
+#define GZT_MOMXY 0x02
+#define GZT_MOMZ 0x04
+#define GZT_ANGLE 0x08
+#define GZT_FRAME 0x10 // Animation frame
+#define GZT_SPR2 0x20 // Player animations
+#define GZT_EXTRA 0x40
+#define GZT_FOLLOW 0x80 // Followmobj
+
+// GZT_EXTRA flags
+#define EZT_THOK 0x01 // Spawned a thok object
+#define EZT_SPIN 0x02 // Because one type of thok object apparently wasn't enough
+#define EZT_REV 0x03 // And two types wasn't enough either yet
+#define EZT_THOKMASK 0x03
+#define EZT_COLOR 0x04 // Changed color (Super transformation, Mario fireflowers/invulnerability, etc.)
+#define EZT_FLIP 0x08 // Reversed gravity
+#define EZT_SCALE 0x10 // Changed size
+#define EZT_HIT 0x20 // Damaged a mobj
+#define EZT_SPRITE 0x40 // Changed sprite set completely out of PLAY (NiGHTS, SOCs, whatever)
+#define EZT_HEIGHT 0x80 // Changed height
+
+// GZT_FOLLOW flags
+#define FZT_SPAWNED 0x01 // just been spawned
+#define FZT_SKIN 0x02 // has skin
+#define FZT_LINKDRAW 0x04 // has linkdraw (combine with spawned only)
+#define FZT_COLORIZED 0x08 // colorized (ditto)
+#define FZT_SCALE 0x10 // different scale to object
+// spare FZT slots 0x20 to 0x80
+
+static mobj_t oldmetal, oldghost;
+
+void G_SaveMetal(UINT8 **buffer)
+{
+ I_Assert(buffer != NULL && *buffer != NULL);
+
+ WRITEUINT32(*buffer, metal_p - metalbuffer);
+}
+
+void G_LoadMetal(UINT8 **buffer)
+{
+ I_Assert(buffer != NULL && *buffer != NULL);
+
+ G_DoPlayMetal();
+ metal_p = metalbuffer + READUINT32(*buffer);
+}
+
+
+void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
+{
+ UINT8 ziptic;
+ (void)playernum;
+
+ if (!demo_p || !demo_start)
+ return;
+ ziptic = READUINT8(demo_p);
+
+ if (ziptic & ZT_FWD)
+ oldcmd.forwardmove = READSINT8(demo_p);
+ if (ziptic & ZT_SIDE)
+ oldcmd.sidemove = READSINT8(demo_p);
+ if (ziptic & ZT_ANGLE)
+ oldcmd.angleturn = READINT16(demo_p);
+ if (ziptic & ZT_BUTTONS)
+ oldcmd.buttons = (oldcmd.buttons & (BT_CAMLEFT|BT_CAMRIGHT)) | (READUINT16(demo_p) & ~(BT_CAMLEFT|BT_CAMRIGHT));
+ if (ziptic & ZT_AIMING)
+ oldcmd.aiming = READINT16(demo_p);
+
+ G_CopyTiccmd(cmd, &oldcmd, 1);
+
+ if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
+ {
+ // end of demo data stream
+ G_CheckDemoStatus();
+ return;
+ }
+}
+
+void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
+{
+ char ziptic = 0;
+ UINT8 *ziptic_p;
+ (void)playernum;
+
+ if (!demo_p)
+ return;
+ ziptic_p = demo_p++; // the ziptic, written at the end of this function
+
+ if (cmd->forwardmove != oldcmd.forwardmove)
+ {
+ WRITEUINT8(demo_p,cmd->forwardmove);
+ oldcmd.forwardmove = cmd->forwardmove;
+ ziptic |= ZT_FWD;
+ }
+
+ if (cmd->sidemove != oldcmd.sidemove)
+ {
+ WRITEUINT8(demo_p,cmd->sidemove);
+ oldcmd.sidemove = cmd->sidemove;
+ ziptic |= ZT_SIDE;
+ }
+
+ if (cmd->angleturn != oldcmd.angleturn)
+ {
+ WRITEINT16(demo_p,cmd->angleturn);
+ oldcmd.angleturn = cmd->angleturn;
+ ziptic |= ZT_ANGLE;
+ }
+
+ if (cmd->buttons != oldcmd.buttons)
+ {
+ WRITEUINT16(demo_p,cmd->buttons);
+ oldcmd.buttons = cmd->buttons;
+ ziptic |= ZT_BUTTONS;
+ }
+
+ if (cmd->aiming != oldcmd.aiming)
+ {
+ WRITEINT16(demo_p,cmd->aiming);
+ oldcmd.aiming = cmd->aiming;
+ ziptic |= ZT_AIMING;
+ }
+
+ *ziptic_p = ziptic;
+
+ // attention here for the ticcmd size!
+ // latest demos with mouse aiming byte in ticcmd
+ if (!(demoflags & DF_GHOST) && ziptic_p > demoend - 9)
+ {
+ G_CheckDemoStatus(); // no more space
+ return;
+ }
+}
+
+void G_GhostAddThok(void)
+{
+ if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
+ return;
+ ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_THOK;
+}
+
+void G_GhostAddSpin(void)
+{
+ if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
+ return;
+ ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_SPIN;
+}
+
+void G_GhostAddRev(void)
+{
+ if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
+ return;
+ ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_REV;
+}
+
+void G_GhostAddFlip(void)
+{
+ if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
+ return;
+ ghostext.flags |= EZT_FLIP;
+}
+
+void G_GhostAddColor(ghostcolor_t color)
+{
+ if (!demorecording || !(demoflags & DF_GHOST))
+ return;
+ if (ghostext.lastcolor == (UINT16)color)
+ {
+ ghostext.flags &= ~EZT_COLOR;
+ return;
+ }
+ ghostext.flags |= EZT_COLOR;
+ ghostext.color = (UINT16)color;
+}
+
+void G_GhostAddScale(fixed_t scale)
+{
+ if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
+ return;
+ if (ghostext.lastscale == scale)
+ {
+ ghostext.flags &= ~EZT_SCALE;
+ return;
+ }
+ ghostext.flags |= EZT_SCALE;
+ ghostext.scale = scale;
+}
+
+void G_GhostAddHit(mobj_t *victim)
+{
+ if (!demorecording || !(demoflags & DF_GHOST))
+ return;
+ ghostext.flags |= EZT_HIT;
+ ghostext.hits++;
+ ghostext.hitlist = Z_Realloc(ghostext.hitlist, ghostext.hits * sizeof(mobj_t *), PU_LEVEL, NULL);
+ ghostext.hitlist[ghostext.hits-1] = victim;
+}
+
+void G_WriteGhostTic(mobj_t *ghost)
+{
+ char ziptic = 0;
+ UINT8 *ziptic_p;
+ UINT32 i;
+ fixed_t height;
+
+ if (!demo_p)
+ return;
+ if (!(demoflags & DF_GHOST))
+ return; // No ghost data to write.
+
+ ziptic_p = demo_p++; // the ziptic, written at the end of this function
+
+ #define MAXMOM (0xFFFF<<8)
+
+ // GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
+ if (abs(ghost->x-oldghost.x) > MAXMOM
+ || abs(ghost->y-oldghost.y) > MAXMOM
+ || abs(ghost->z-oldghost.z) > MAXMOM)
+ {
+ oldghost.x = ghost->x;
+ oldghost.y = ghost->y;
+ oldghost.z = ghost->z;
+ ziptic |= GZT_XYZ;
+ WRITEFIXED(demo_p,oldghost.x);
+ WRITEFIXED(demo_p,oldghost.y);
+ WRITEFIXED(demo_p,oldghost.z);
+ }
+ else
+ {
+ // For moving normally:
+ // Store one full byte of movement, plus one byte of fractional movement.
+ INT16 momx = (INT16)((ghost->x-oldghost.x)>>8);
+ INT16 momy = (INT16)((ghost->y-oldghost.y)>>8);
+ if (momx != oldghost.momx
+ || momy != oldghost.momy)
+ {
+ oldghost.momx = momx;
+ oldghost.momy = momy;
+ ziptic |= GZT_MOMXY;
+ WRITEINT16(demo_p,momx);
+ WRITEINT16(demo_p,momy);
+ }
+ momx = (INT16)((ghost->z-oldghost.z)>>8);
+ if (momx != oldghost.momz)
+ {
+ oldghost.momz = momx;
+ ziptic |= GZT_MOMZ;
+ WRITEINT16(demo_p,momx);
+ }
+
+ // This SHOULD set oldghost.x/y/z to match ghost->x/y/z
+ // but it keeps the fractional loss of one byte,
+ // so it will hopefully be made up for in future tics.
+ oldghost.x += oldghost.momx<<8;
+ oldghost.y += oldghost.momy<<8;
+ oldghost.z += oldghost.momz<<8;
+ }
+
+ #undef MAXMOM
+
+ // Only store the 8 most relevant bits of angle
+ // because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
+ // and it does not affect this mode of movement at all anyway.
+ if (ghost->player && ghost->player->drawangle>>24 != oldghost.angle)
+ {
+ oldghost.angle = ghost->player->drawangle>>24;
+ ziptic |= GZT_ANGLE;
+ WRITEUINT8(demo_p,oldghost.angle);
+ }
+
+ // Store the sprite frame.
+ if ((ghost->frame & FF_FRAMEMASK) != oldghost.frame)
+ {
+ oldghost.frame = (ghost->frame & FF_FRAMEMASK);
+ ziptic |= GZT_FRAME;
+ WRITEUINT8(demo_p,oldghost.frame);
+ }
+
+ if (ghost->sprite == SPR_PLAY
+ && ghost->sprite2 != oldghost.sprite2)
+ {
+ oldghost.sprite2 = ghost->sprite2;
+ ziptic |= GZT_SPR2;
+ WRITEUINT8(demo_p,oldghost.sprite2);
+ }
+
+ // Check for sprite set changes
+ if (ghost->sprite != oldghost.sprite)
+ {
+ oldghost.sprite = ghost->sprite;
+ ghostext.flags |= EZT_SPRITE;
+ }
+
+ if ((height = FixedDiv(ghost->height, ghost->scale)) != oldghost.height)
+ {
+ oldghost.height = height;
+ ghostext.flags |= EZT_HEIGHT;
+ }
+
+ if (ghostext.flags)
+ {
+ ziptic |= GZT_EXTRA;
+
+ if (ghostext.color == ghostext.lastcolor)
+ ghostext.flags &= ~EZT_COLOR;
+ if (ghostext.scale == ghostext.lastscale)
+ ghostext.flags &= ~EZT_SCALE;
+
+ WRITEUINT8(demo_p,ghostext.flags);
+ if (ghostext.flags & EZT_COLOR)
+ {
+ WRITEUINT16(demo_p,ghostext.color);
+ ghostext.lastcolor = ghostext.color;
+ }
+ if (ghostext.flags & EZT_SCALE)
+ {
+ WRITEFIXED(demo_p,ghostext.scale);
+ ghostext.lastscale = ghostext.scale;
+ }
+ if (ghostext.flags & EZT_HIT)
+ {
+ WRITEUINT16(demo_p,ghostext.hits);
+ for (i = 0; i < ghostext.hits; i++)
+ {
+ mobj_t *mo = ghostext.hitlist[i];
+ //WRITEUINT32(demo_p,UINT32_MAX); // reserved for some method of determining exactly which mobj this is. (mobjnum doesn't work here.)
+ WRITEUINT32(demo_p,mo->type);
+ WRITEUINT16(demo_p,(UINT16)mo->health);
+ WRITEFIXED(demo_p,mo->x);
+ WRITEFIXED(demo_p,mo->y);
+ WRITEFIXED(demo_p,mo->z);
+ WRITEANGLE(demo_p,mo->angle);
+ }
+ Z_Free(ghostext.hitlist);
+ ghostext.hits = 0;
+ ghostext.hitlist = NULL;
+ }
+ if (ghostext.flags & EZT_SPRITE)
+ WRITEUINT16(demo_p,oldghost.sprite);
+ if (ghostext.flags & EZT_HEIGHT)
+ {
+ height >>= FRACBITS;
+ WRITEINT16(demo_p, height);
+ }
+ ghostext.flags = 0;
+ }
+
+ if (ghost->player && ghost->player->followmobj && !(ghost->player->followmobj->sprite == SPR_NULL || (ghost->player->followmobj->flags2 & MF2_DONTDRAW))) // bloats tails runs but what can ya do
+ {
+ INT16 temp;
+ UINT8 *followtic_p = demo_p++;
+ UINT8 followtic = 0;
+
+ ziptic |= GZT_FOLLOW;
+
+ if (ghost->player->followmobj->skin)
+ followtic |= FZT_SKIN;
+
+ if (!(oldghost.flags2 & MF2_AMBUSH))
+ {
+ followtic |= FZT_SPAWNED;
+ WRITEINT16(demo_p,ghost->player->followmobj->info->height>>FRACBITS);
+ if (ghost->player->followmobj->flags2 & MF2_LINKDRAW)
+ followtic |= FZT_LINKDRAW;
+ if (ghost->player->followmobj->colorized)
+ followtic |= FZT_COLORIZED;
+ if (followtic & FZT_SKIN)
+ WRITEUINT8(demo_p,(UINT8)(((skin_t *)(ghost->player->followmobj->skin))-skins));
+ oldghost.flags2 |= MF2_AMBUSH;
+ }
+
+ if (ghost->player->followmobj->scale != ghost->scale)
+ {
+ followtic |= FZT_SCALE;
+ WRITEFIXED(demo_p,ghost->player->followmobj->scale);
+ }
+
+ temp = (INT16)((ghost->player->followmobj->x-ghost->x)>>8);
+ WRITEINT16(demo_p,temp);
+ temp = (INT16)((ghost->player->followmobj->y-ghost->y)>>8);
+ WRITEINT16(demo_p,temp);
+ temp = (INT16)((ghost->player->followmobj->z-ghost->z)>>8);
+ WRITEINT16(demo_p,temp);
+ if (followtic & FZT_SKIN)
+ WRITEUINT8(demo_p,ghost->player->followmobj->sprite2);
+ WRITEUINT16(demo_p,ghost->player->followmobj->sprite);
+ WRITEUINT8(demo_p,(ghost->player->followmobj->frame & FF_FRAMEMASK));
+ WRITEUINT16(demo_p,ghost->player->followmobj->color);
+
+ *followtic_p = followtic;
+ }
+ else
+ oldghost.flags2 &= ~MF2_AMBUSH;
+
+ *ziptic_p = ziptic;
+
+ // attention here for the ticcmd size!
+ // latest demos with mouse aiming byte in ticcmd
+ if (demo_p >= demoend - (13 + 9 + 9))
+ {
+ G_CheckDemoStatus(); // no more space
+ return;
+ }
+}
+
+// Uses ghost data to do consistency checks on your position.
+// This fixes desynchronising demos when fighting eggman.
+void G_ConsGhostTic(void)
+{
+ UINT8 ziptic;
+ UINT16 px,py,pz,gx,gy,gz;
+ mobj_t *testmo;
+
+ if (!demo_p || !demo_start)
+ return;
+ if (!(demoflags & DF_GHOST))
+ return; // No ghost data to use.
+
+ testmo = players[0].mo;
+
+ // Grab ghost data.
+ ziptic = READUINT8(demo_p);
+ if (ziptic & GZT_XYZ)
+ {
+ oldghost.x = READFIXED(demo_p);
+ oldghost.y = READFIXED(demo_p);
+ oldghost.z = READFIXED(demo_p);
+ }
+ else
+ {
+ if (ziptic & GZT_MOMXY)
+ {
+ oldghost.momx = READINT16(demo_p)<<8;
+ oldghost.momy = READINT16(demo_p)<<8;
+ }
+ if (ziptic & GZT_MOMZ)
+ oldghost.momz = READINT16(demo_p)<<8;
+ oldghost.x += oldghost.momx;
+ oldghost.y += oldghost.momy;
+ oldghost.z += oldghost.momz;
+ }
+ if (ziptic & GZT_ANGLE)
+ demo_p++;
+ if (ziptic & GZT_FRAME)
+ demo_p++;
+ if (ziptic & GZT_SPR2)
+ demo_p++;
+
+ if (ziptic & GZT_EXTRA)
+ { // But wait, there's more!
+ UINT8 xziptic = READUINT8(demo_p);
+ if (xziptic & EZT_COLOR)
+ demo_p += (demoversion==0x000c) ? 1 : sizeof(UINT16);
+ if (xziptic & EZT_SCALE)
+ demo_p += sizeof(fixed_t);
+ if (xziptic & EZT_HIT)
+ { // Resync mob damage.
+ UINT16 i, count = READUINT16(demo_p);
+ thinker_t *th;
+ mobj_t *mobj;
+
+ UINT32 type;
+ UINT16 health;
+ fixed_t x;
+ fixed_t y;
+ fixed_t z;
+
+ for (i = 0; i < count; i++)
+ {
+ //demo_p += 4; // reserved.
+ type = READUINT32(demo_p);
+ health = READUINT16(demo_p);
+ x = READFIXED(demo_p);
+ y = READFIXED(demo_p);
+ z = READFIXED(demo_p);
+ demo_p += sizeof(angle_t); // angle, unnecessary for cons.
+
+ mobj = NULL;
+ for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
+ {
+ if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+ continue;
+ mobj = (mobj_t *)th;
+ if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z)
+ break;
+ }
+ if (th != &thlist[THINK_MOBJ] && mobj->health != health) // Wasn't damaged?! This is desync! Fix it!
+ {
+ if (demosynced)
+ CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
+ demosynced = false;
+ P_DamageMobj(mobj, players[0].mo, players[0].mo, 1, 0);
+ }
+ }
+ }
+ if (xziptic & EZT_SPRITE)
+ demo_p += sizeof(UINT16);
+ if (xziptic & EZT_HEIGHT)
+ demo_p += sizeof(INT16);
+ }
+
+ if (ziptic & GZT_FOLLOW)
+ { // Even more...
+ UINT8 followtic = READUINT8(demo_p);
+ if (followtic & FZT_SPAWNED)
+ {
+ demo_p += sizeof(INT16);
+ if (followtic & FZT_SKIN)
+ demo_p++;
+ }
+ if (followtic & FZT_SCALE)
+ demo_p += sizeof(fixed_t);
+ demo_p += sizeof(INT16);
+ demo_p += sizeof(INT16);
+ demo_p += sizeof(INT16);
+ if (followtic & FZT_SKIN)
+ demo_p++;
+ demo_p += sizeof(UINT16);
+ demo_p++;
+ demo_p += (demoversion==0x000c) ? 1 : sizeof(UINT16);
+ }
+
+ // Re-synchronise
+ px = testmo->x>>FRACBITS;
+ py = testmo->y>>FRACBITS;
+ pz = testmo->z>>FRACBITS;
+ gx = oldghost.x>>FRACBITS;
+ gy = oldghost.y>>FRACBITS;
+ gz = oldghost.z>>FRACBITS;
+
+ if (px != gx || py != gy || pz != gz)
+ {
+ if (demosynced)
+ CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
+ demosynced = false;
+
+ P_UnsetThingPosition(testmo);
+ testmo->x = oldghost.x;
+ testmo->y = oldghost.y;
+ P_SetThingPosition(testmo);
+ testmo->z = oldghost.z;
+ }
+
+ if (*demo_p == DEMOMARKER)
+ {
+ // end of demo data stream
+ G_CheckDemoStatus();
+ return;
+ }
+}
+
+void G_GhostTicker(void)
+{
+ demoghost *g,*p;
+ for(g = ghosts, p = NULL; g; g = g->next)
+ {
+ // Skip normal demo data.
+ UINT8 ziptic = READUINT8(g->p);
+ UINT8 xziptic = 0;
+ if (ziptic & ZT_FWD)
+ g->p++;
+ if (ziptic & ZT_SIDE)
+ g->p++;
+ if (ziptic & ZT_ANGLE)
+ g->p += 2;
+ if (ziptic & ZT_BUTTONS)
+ g->p += 2;
+ if (ziptic & ZT_AIMING)
+ g->p += 2;
+
+ // Grab ghost data.
+ ziptic = READUINT8(g->p);
+ if (ziptic & GZT_XYZ)
+ {
+ g->oldmo.x = READFIXED(g->p);
+ g->oldmo.y = READFIXED(g->p);
+ g->oldmo.z = READFIXED(g->p);
+ }
+ else
+ {
+ if (ziptic & GZT_MOMXY)
+ {
+ g->oldmo.momx = READINT16(g->p)<<8;
+ g->oldmo.momy = READINT16(g->p)<<8;
+ }
+ if (ziptic & GZT_MOMZ)
+ g->oldmo.momz = READINT16(g->p)<<8;
+ g->oldmo.x += g->oldmo.momx;
+ g->oldmo.y += g->oldmo.momy;
+ g->oldmo.z += g->oldmo.momz;
+ }
+ if (ziptic & GZT_ANGLE)
+ g->mo->angle = READUINT8(g->p)<<24;
+ if (ziptic & GZT_FRAME)
+ g->oldmo.frame = READUINT8(g->p);
+ if (ziptic & GZT_SPR2)
+ g->oldmo.sprite2 = READUINT8(g->p);
+
+ // Update ghost
+ P_UnsetThingPosition(g->mo);
+ g->mo->x = g->oldmo.x;
+ g->mo->y = g->oldmo.y;
+ g->mo->z = g->oldmo.z;
+ P_SetThingPosition(g->mo);
+ g->mo->frame = g->oldmo.frame | tr_trans30<<FF_TRANSSHIFT;
+ if (g->fadein)
+ {
+ g->mo->frame += (((--g->fadein)/6)<<FF_TRANSSHIFT); // this calc never exceeds 9 unless g->fadein is bad, and it's only set once, so...
+ g->mo->flags2 &= ~MF2_DONTDRAW;
+ }
+ g->mo->sprite2 = g->oldmo.sprite2;
+
+ if (ziptic & GZT_EXTRA)
+ { // But wait, there's more!
+ xziptic = READUINT8(g->p);
+ if (xziptic & EZT_COLOR)
+ {
+ g->color = (g->version==0x000c) ? READUINT8(g->p) : READUINT16(g->p);
+ switch(g->color)
+ {
+ default:
+ case GHC_RETURNSKIN:
+ g->mo->skin = g->oldmo.skin;
+ /* FALLTHRU */
+ case GHC_NORMAL: // Go back to skin color
+ g->mo->color = g->oldmo.color;
+ break;
+ // Handled below
+ case GHC_SUPER:
+ case GHC_INVINCIBLE:
+ break;
+ case GHC_FIREFLOWER: // Fireflower
+ g->mo->color = SKINCOLOR_WHITE;
+ break;
+ case GHC_NIGHTSSKIN: // not actually a colour
+ g->mo->skin = &skins[DEFAULTNIGHTSSKIN];
+ break;
+ }
+ }
+ if (xziptic & EZT_FLIP)
+ g->mo->eflags ^= MFE_VERTICALFLIP;
+ if (xziptic & EZT_SCALE)
+ {
+ g->mo->destscale = READFIXED(g->p);
+ if (g->mo->destscale != g->mo->scale)
+ P_SetScale(g->mo, g->mo->destscale);
+ }
+ if (xziptic & EZT_THOKMASK)
+ { // Let's only spawn ONE of these per frame, thanks.
+ mobj_t *mobj;
+ UINT32 type = MT_NULL;
+ if (g->mo->skin)
+ {
+ skin_t *skin = (skin_t *)g->mo->skin;
+ switch (xziptic & EZT_THOKMASK)
+ {
+ case EZT_THOK:
+ type = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
+ break;
+ case EZT_SPIN:
+ type = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
+ break;
+ case EZT_REV:
+ type = skin->revitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
+ break;
+ }
+ }
+ if (type != MT_NULL)
+ {
+ if (type == MT_GHOST)
+ {
+ mobj = P_SpawnGhostMobj(g->mo); // does a large portion of the work for us
+ mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|tr_trans60<<FF_TRANSSHIFT; // P_SpawnGhostMobj sets trans50, we want trans60
+ }
+ else
+ {
+ mobj = P_SpawnMobjFromMobj(g->mo, 0, 0, -FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
+ mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
+ mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
+ mobj->color = g->mo->color;
+ mobj->skin = g->mo->skin;
+ P_SetScale(mobj, (mobj->destscale = g->mo->scale));
+
+ if (type == MT_THOK) // spintrail-specific modification for MT_THOK
+ {
+ mobj->frame = FF_TRANS80;
+ mobj->fuse = mobj->tics;
+ }
+ mobj->tics = -1; // nope.
+ }
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z+mobj->height;
+ P_UnsetThingPosition(mobj);
+ mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
+ P_SetThingPosition(mobj);
+ if (!mobj->fuse)
+ mobj->fuse = 8;
+ P_SetTarget(&mobj->target, g->mo);
+ }
+ }
+ if (xziptic & EZT_HIT)
+ { // Spawn hit poofs for killing things!
+ UINT16 i, count = READUINT16(g->p), health;
+ UINT32 type;
+ fixed_t x,y,z;
+ angle_t angle;
+ mobj_t *poof;
+ for (i = 0; i < count; i++)
+ {
+ //g->p += 4; // reserved
+ type = READUINT32(g->p);
+ health = READUINT16(g->p);
+ x = READFIXED(g->p);
+ y = READFIXED(g->p);
+ z = READFIXED(g->p);
+ angle = READANGLE(g->p);
+ if (!(mobjinfo[type].flags & MF_SHOOTABLE)
+ || !(mobjinfo[type].flags & (MF_ENEMY|MF_MONITOR))
+ || health != 0 || i >= 4) // only spawn for the first 4 hits per frame, to prevent ghosts from splode-spamming too bad.
+ continue;
+ poof = P_SpawnMobj(x, y, z, MT_GHOST);
+ poof->angle = angle;
+ poof->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
+ poof->health = 0;
+ P_SetMobjStateNF(poof, S_XPLD1);
+ }
+ }
+ if (xziptic & EZT_SPRITE)
+ g->mo->sprite = READUINT16(g->p);
+ if (xziptic & EZT_HEIGHT)
+ {
+ fixed_t temp = READINT16(g->p)<<FRACBITS;
+ g->mo->height = FixedMul(temp, g->mo->scale);
+ }
+ }
+
+ // Tick ghost colors (Super and Mario Invincibility flashing)
+ switch(g->color)
+ {
+ case GHC_SUPER: // Super (P_DoSuperStuff)
+ if (g->mo->skin)
+ {
+ skin_t *skin = (skin_t *)g->mo->skin;
+ g->mo->color = skin->supercolor;
+ }
+ else
+ g->mo->color = SKINCOLOR_SUPERGOLD1;
+ g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4);
+ break;
+ case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer)
+ g->mo->color = (UINT16)(SKINCOLOR_RUBY + (leveltime % (FIRSTSUPERCOLOR - SKINCOLOR_RUBY))); // Passes through all saturated colours
+ break;
+ default:
+ break;
+ }
+
+#define follow g->mo->tracer
+ if (ziptic & GZT_FOLLOW)
+ { // Even more...
+ UINT8 followtic = READUINT8(g->p);
+ fixed_t temp;
+ if (followtic & FZT_SPAWNED)
+ {
+ if (follow)
+ P_RemoveMobj(follow);
+ P_SetTarget(&follow, P_SpawnMobjFromMobj(g->mo, 0, 0, 0, MT_GHOST));
+ P_SetTarget(&follow->tracer, g->mo);
+ follow->tics = -1;
+ temp = READINT16(g->p)<<FRACBITS;
+ follow->height = FixedMul(follow->scale, temp);
+
+ if (followtic & FZT_LINKDRAW)
+ follow->flags2 |= MF2_LINKDRAW;
+
+ if (followtic & FZT_COLORIZED)
+ follow->colorized = true;
+
+ if (followtic & FZT_SKIN)
+ follow->skin = &skins[READUINT8(g->p)];
+ }
+ if (follow)
+ {
+ if (followtic & FZT_SCALE)
+ follow->destscale = READFIXED(g->p);
+ else
+ follow->destscale = g->mo->destscale;
+ if (follow->destscale != follow->scale)
+ P_SetScale(follow, follow->destscale);
+
+ P_UnsetThingPosition(follow);
+ temp = READINT16(g->p)<<8;
+ follow->x = g->mo->x + temp;
+ temp = READINT16(g->p)<<8;
+ follow->y = g->mo->y + temp;
+ temp = READINT16(g->p)<<8;
+ follow->z = g->mo->z + temp;
+ P_SetThingPosition(follow);
+ if (followtic & FZT_SKIN)
+ follow->sprite2 = READUINT8(g->p);
+ else
+ follow->sprite2 = 0;
+ follow->sprite = READUINT16(g->p);
+ follow->frame = (READUINT8(g->p)) | (g->mo->frame & FF_TRANSMASK);
+ follow->angle = g->mo->angle;
+ follow->color = (g->version==0x000c) ? READUINT8(g->p) : READUINT16(g->p);
+
+ if (!(followtic & FZT_SPAWNED))
+ {
+ if (xziptic & EZT_FLIP)
+ {
+ follow->flags2 ^= MF2_OBJECTFLIP;
+ follow->eflags ^= MFE_VERTICALFLIP;
+ }
+ }
+ }
+ }
+ else if (follow)
+ {
+ P_RemoveMobj(follow);
+ P_SetTarget(&follow, NULL);
+ }
+ // Demo ends after ghost data.
+ if (*g->p == DEMOMARKER)
+ {
+ g->mo->momx = g->mo->momy = g->mo->momz = 0;
+#if 1 // freeze frame (maybe more useful for time attackers)
+ g->mo->colorized = true;
+ if (follow)
+ follow->colorized = true;
+#else // dissapearing act
+ g->mo->fuse = TICRATE;
+ if (follow)
+ follow->fuse = TICRATE;
+#endif
+ if (p)
+ p->next = g->next;
+ else
+ ghosts = g->next;
+ Z_Free(g);
+ continue;
+ }
+ p = g;
+#undef follow
+ }
+}
+
+void G_ReadMetalTic(mobj_t *metal)
+{
+ UINT8 ziptic;
+ UINT8 xziptic = 0;
+
+ if (!metal_p)
+ return;
+
+ if (!metal->health)
+ {
+ G_StopMetalDemo();
+ return;
+ }
+
+ switch (*metal_p)
+ {
+ case METALSNICE:
+ break;
+ case METALDEATH:
+ if (metal->tracer)
+ P_RemoveMobj(metal->tracer);
+ P_KillMobj(metal, NULL, NULL, 0);
+ /* FALLTHRU */
+ case DEMOMARKER:
+ default:
+ // end of demo data stream
+ G_StopMetalDemo();
+ return;
+ }
+ metal_p++;
+
+ ziptic = READUINT8(metal_p);
+
+ // Read changes from the tic
+ if (ziptic & GZT_XYZ)
+ {
+ // make sure the values are read in the right order
+ oldmetal.x = READFIXED(metal_p);
+ oldmetal.y = READFIXED(metal_p);
+ oldmetal.z = READFIXED(metal_p);
+ P_TeleportMove(metal, oldmetal.x, oldmetal.y, oldmetal.z);
+ oldmetal.x = metal->x;
+ oldmetal.y = metal->y;
+ oldmetal.z = metal->z;
+ }
+ else
+ {
+ if (ziptic & GZT_MOMXY)
+ {
+ oldmetal.momx = READINT16(metal_p)<<8;
+ oldmetal.momy = READINT16(metal_p)<<8;
+ }
+ if (ziptic & GZT_MOMZ)
+ oldmetal.momz = READINT16(metal_p)<<8;
+ oldmetal.x += oldmetal.momx;
+ oldmetal.y += oldmetal.momy;
+ oldmetal.z += oldmetal.momz;
+ }
+ if (ziptic & GZT_ANGLE)
+ metal->angle = READUINT8(metal_p)<<24;
+ if (ziptic & GZT_FRAME)
+ oldmetal.frame = READUINT32(metal_p);
+ if (ziptic & GZT_SPR2)
+ oldmetal.sprite2 = READUINT8(metal_p);
+
+ // Set movement, position, and angle
+ // oldmetal contains where you're supposed to be.
+ metal->momx = oldmetal.momx;
+ metal->momy = oldmetal.momy;
+ metal->momz = oldmetal.momz;
+ P_UnsetThingPosition(metal);
+ metal->x = oldmetal.x;
+ metal->y = oldmetal.y;
+ metal->z = oldmetal.z;
+ P_SetThingPosition(metal);
+ metal->frame = oldmetal.frame;
+ metal->sprite2 = oldmetal.sprite2;
+
+ if (ziptic & GZT_EXTRA)
+ { // But wait, there's more!
+ xziptic = READUINT8(metal_p);
+ if (xziptic & EZT_FLIP)
+ {
+ metal->eflags ^= MFE_VERTICALFLIP;
+ metal->flags2 ^= MF2_OBJECTFLIP;
+ }
+ if (xziptic & EZT_SCALE)
+ {
+ metal->destscale = READFIXED(metal_p);
+ if (metal->destscale != metal->scale)
+ P_SetScale(metal, metal->destscale);
+ }
+ if (xziptic & EZT_THOKMASK)
+ { // Let's only spawn ONE of these per frame, thanks.
+ mobj_t *mobj;
+ UINT32 type = MT_NULL;
+ if (metal->skin)
+ {
+ skin_t *skin = (skin_t *)metal->skin;
+ switch (xziptic & EZT_THOKMASK)
+ {
+ case EZT_THOK:
+ type = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
+ break;
+ case EZT_SPIN:
+ type = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
+ break;
+ case EZT_REV:
+ type = skin->revitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
+ break;
+ }
+ }
+ if (type != MT_NULL)
+ {
+ if (type == MT_GHOST)
+ {
+ mobj = P_SpawnGhostMobj(metal); // does a large portion of the work for us
+ }
+ else
+ {
+ mobj = P_SpawnMobjFromMobj(metal, 0, 0, -FixedDiv(FixedMul(metal->info->height, metal->scale) - metal->height,3*FRACUNIT), MT_THOK);
+ mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
+ mobj->frame = states[mobjinfo[type].spawnstate].frame;
+ mobj->angle = metal->angle;
+ mobj->color = metal->color;
+ mobj->skin = metal->skin;
+ P_SetScale(mobj, (mobj->destscale = metal->scale));
+
+ if (type == MT_THOK) // spintrail-specific modification for MT_THOK
+ {
+ mobj->frame = FF_TRANS70;
+ mobj->fuse = mobj->tics;
+ }
+ mobj->tics = -1; // nope.
+ }
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z+mobj->height;
+ P_UnsetThingPosition(mobj);
+ mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
+ P_SetThingPosition(mobj);
+ if (!mobj->fuse)
+ mobj->fuse = 8;
+ P_SetTarget(&mobj->target, metal);
+ }
+ }
+ if (xziptic & EZT_SPRITE)
+ metal->sprite = READUINT16(metal_p);
+ if (xziptic & EZT_HEIGHT)
+ {
+ fixed_t temp = READINT16(metal_p)<<FRACBITS;
+ metal->height = FixedMul(temp, metal->scale);
+ }
+ }
+
+#define follow metal->tracer
+ if (ziptic & GZT_FOLLOW)
+ { // Even more...
+ UINT8 followtic = READUINT8(metal_p);
+ fixed_t temp;
+ if (followtic & FZT_SPAWNED)
+ {
+ if (follow)
+ P_RemoveMobj(follow);
+ P_SetTarget(&follow, P_SpawnMobjFromMobj(metal, 0, 0, 0, MT_GHOST));
+ P_SetTarget(&follow->tracer, metal);
+ follow->tics = -1;
+ temp = READINT16(metal_p)<<FRACBITS;
+ follow->height = FixedMul(follow->scale, temp);
+
+ if (followtic & FZT_LINKDRAW)
+ follow->flags2 |= MF2_LINKDRAW;
+
+ if (followtic & FZT_COLORIZED)
+ follow->colorized = true;
+
+ if (followtic & FZT_SKIN)
+ follow->skin = &skins[READUINT8(metal_p)];
+ }
+ if (follow)
+ {
+ if (followtic & FZT_SCALE)
+ follow->destscale = READFIXED(metal_p);
+ else
+ follow->destscale = metal->destscale;
+ if (follow->destscale != follow->scale)
+ P_SetScale(follow, follow->destscale);
+
+ P_UnsetThingPosition(follow);
+ temp = READINT16(metal_p)<<8;
+ follow->x = metal->x + temp;
+ temp = READINT16(metal_p)<<8;
+ follow->y = metal->y + temp;
+ temp = READINT16(metal_p)<<8;
+ follow->z = metal->z + temp;
+ P_SetThingPosition(follow);
+ if (followtic & FZT_SKIN)
+ follow->sprite2 = READUINT8(metal_p);
+ else
+ follow->sprite2 = 0;
+ follow->sprite = READUINT16(metal_p);
+ follow->frame = READUINT32(metal_p); // NOT & FF_FRAMEMASK here, so 32 bits
+ follow->angle = metal->angle;
+ follow->color = (metalversion==0x000c) ? READUINT8(metal_p) : READUINT16(metal_p);
+
+ if (!(followtic & FZT_SPAWNED))
+ {
+ if (xziptic & EZT_FLIP)
+ {
+ follow->flags2 ^= MF2_OBJECTFLIP;
+ follow->eflags ^= MFE_VERTICALFLIP;
+ }
+ }
+ }
+ }
+ else if (follow)
+ {
+ P_RemoveMobj(follow);
+ P_SetTarget(&follow, NULL);
+ }
+#undef follow
+}
+
+void G_WriteMetalTic(mobj_t *metal)
+{
+ UINT8 ziptic = 0;
+ UINT8 *ziptic_p;
+ fixed_t height;
+
+ if (!demo_p) // demo_p will be NULL until the race start linedef executor is activated!
+ return;
+
+ WRITEUINT8(demo_p, METALSNICE);
+ ziptic_p = demo_p++; // the ziptic, written at the end of this function
+
+ #define MAXMOM (0xFFFF<<8)
+
+ // GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
+ if (abs(metal->x-oldmetal.x) > MAXMOM
+ || abs(metal->y-oldmetal.y) > MAXMOM
+ || abs(metal->z-oldmetal.z) > MAXMOM)
+ {
+ oldmetal.x = metal->x;
+ oldmetal.y = metal->y;
+ oldmetal.z = metal->z;
+ ziptic |= GZT_XYZ;
+ WRITEFIXED(demo_p,oldmetal.x);
+ WRITEFIXED(demo_p,oldmetal.y);
+ WRITEFIXED(demo_p,oldmetal.z);
+ }
+ else
+ {
+ // For moving normally:
+ // Store one full byte of movement, plus one byte of fractional movement.
+ INT16 momx = (INT16)((metal->x-oldmetal.x)>>8);
+ INT16 momy = (INT16)((metal->y-oldmetal.y)>>8);
+ if (momx != oldmetal.momx
+ || momy != oldmetal.momy)
+ {
+ oldmetal.momx = momx;
+ oldmetal.momy = momy;
+ ziptic |= GZT_MOMXY;
+ WRITEINT16(demo_p,momx);
+ WRITEINT16(demo_p,momy);
+ }
+ momx = (INT16)((metal->z-oldmetal.z)>>8);
+ if (momx != oldmetal.momz)
+ {
+ oldmetal.momz = momx;
+ ziptic |= GZT_MOMZ;
+ WRITEINT16(demo_p,momx);
+ }
+
+ // This SHOULD set oldmetal.x/y/z to match metal->x/y/z
+ // but it keeps the fractional loss of one byte,
+ // so it will hopefully be made up for in future tics.
+ oldmetal.x += oldmetal.momx<<8;
+ oldmetal.y += oldmetal.momy<<8;
+ oldmetal.z += oldmetal.momz<<8;
+ }
+
+ #undef MAXMOM
+
+ // Only store the 8 most relevant bits of angle
+ // because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
+ // and it does not affect movement at all anyway.
+ if (metal->player && metal->player->drawangle>>24 != oldmetal.angle)
+ {
+ oldmetal.angle = metal->player->drawangle>>24;
+ ziptic |= GZT_ANGLE;
+ WRITEUINT8(demo_p,oldmetal.angle);
+ }
+
+ // Store the sprite frame.
+ if ((metal->frame & FF_FRAMEMASK) != oldmetal.frame)
+ {
+ oldmetal.frame = metal->frame; // NOT & FF_FRAMEMASK here, so 32 bits
+ ziptic |= GZT_FRAME;
+ WRITEUINT32(demo_p,oldmetal.frame);
+ }
+
+ if (metal->sprite == SPR_PLAY
+ && metal->sprite2 != oldmetal.sprite2)
+ {
+ oldmetal.sprite2 = metal->sprite2;
+ ziptic |= GZT_SPR2;
+ WRITEUINT8(demo_p,oldmetal.sprite2);
+ }
+
+ // Check for sprite set changes
+ if (metal->sprite != oldmetal.sprite)
+ {
+ oldmetal.sprite = metal->sprite;
+ ghostext.flags |= EZT_SPRITE;
+ }
+
+ if ((height = FixedDiv(metal->height, metal->scale)) != oldmetal.height)
+ {
+ oldmetal.height = height;
+ ghostext.flags |= EZT_HEIGHT;
+ }
+
+ if (ghostext.flags & ~(EZT_COLOR|EZT_HIT)) // these two aren't handled by metal ever
+ {
+ ziptic |= GZT_EXTRA;
+
+ if (ghostext.scale == ghostext.lastscale)
+ ghostext.flags &= ~EZT_SCALE;
+
+ WRITEUINT8(demo_p,ghostext.flags);
+ if (ghostext.flags & EZT_SCALE)
+ {
+ WRITEFIXED(demo_p,ghostext.scale);
+ ghostext.lastscale = ghostext.scale;
+ }
+ if (ghostext.flags & EZT_SPRITE)
+ WRITEUINT16(demo_p,oldmetal.sprite);
+ if (ghostext.flags & EZT_HEIGHT)
+ {
+ height >>= FRACBITS;
+ WRITEINT16(demo_p, height);
+ }
+ ghostext.flags = 0;
+ }
+
+ if (metal->player && metal->player->followmobj && !(metal->player->followmobj->sprite == SPR_NULL || (metal->player->followmobj->flags2 & MF2_DONTDRAW)))
+ {
+ INT16 temp;
+ UINT8 *followtic_p = demo_p++;
+ UINT8 followtic = 0;
+
+ ziptic |= GZT_FOLLOW;
+
+ if (metal->player->followmobj->skin)
+ followtic |= FZT_SKIN;
+
+ if (!(oldmetal.flags2 & MF2_AMBUSH))
+ {
+ followtic |= FZT_SPAWNED;
+ WRITEINT16(demo_p,metal->player->followmobj->info->height>>FRACBITS);
+ if (metal->player->followmobj->flags2 & MF2_LINKDRAW)
+ followtic |= FZT_LINKDRAW;
+ if (metal->player->followmobj->colorized)
+ followtic |= FZT_COLORIZED;
+ if (followtic & FZT_SKIN)
+ WRITEUINT8(demo_p,(UINT8)(((skin_t *)(metal->player->followmobj->skin))-skins));
+ oldmetal.flags2 |= MF2_AMBUSH;
+ }
+
+ if (metal->player->followmobj->scale != metal->scale)
+ {
+ followtic |= FZT_SCALE;
+ WRITEFIXED(demo_p,metal->player->followmobj->scale);
+ }
+
+ temp = (INT16)((metal->player->followmobj->x-metal->x)>>8);
+ WRITEINT16(demo_p,temp);
+ temp = (INT16)((metal->player->followmobj->y-metal->y)>>8);
+ WRITEINT16(demo_p,temp);
+ temp = (INT16)((metal->player->followmobj->z-metal->z)>>8);
+ WRITEINT16(demo_p,temp);
+ if (followtic & FZT_SKIN)
+ WRITEUINT8(demo_p,metal->player->followmobj->sprite2);
+ WRITEUINT16(demo_p,metal->player->followmobj->sprite);
+ WRITEUINT32(demo_p,metal->player->followmobj->frame); // NOT & FF_FRAMEMASK here, so 32 bits
+ WRITEUINT16(demo_p,metal->player->followmobj->color);
+
+ *followtic_p = followtic;
+ }
+ else
+ oldmetal.flags2 &= ~MF2_AMBUSH;
+
+ *ziptic_p = ziptic;
+
+ // attention here for the ticcmd size!
+ // latest demos with mouse aiming byte in ticcmd
+ if (demo_p >= demoend - 32)
+ {
+ G_StopMetalRecording(false); // no more space
+ return;
+ }
+}
+
+//
+// G_RecordDemo
+//
+void G_RecordDemo(const char *name)
+{
+ INT32 maxsize;
+
+ strcpy(demoname, name);
+ strcat(demoname, ".lmp");
+ maxsize = 1024*1024;
+ if (M_CheckParm("-maxdemo") && M_IsNextParm())
+ maxsize = atoi(M_GetNextParm()) * 1024;
+// if (demobuffer)
+// free(demobuffer);
+ demo_p = NULL;
+ demobuffer = malloc(maxsize);
+ demoend = demobuffer + maxsize;
+
+ demorecording = true;
+}
+
+void G_RecordMetal(void)
+{
+ INT32 maxsize;
+ maxsize = 1024*1024;
+ if (M_CheckParm("-maxdemo") && M_IsNextParm())
+ maxsize = atoi(M_GetNextParm()) * 1024;
+ demo_p = NULL;
+ demobuffer = malloc(maxsize);
+ demoend = demobuffer + maxsize;
+ metalrecording = true;
+}
+
+void G_BeginRecording(void)
+{
+ UINT8 i;
+ char name[MAXCOLORNAME+1];
+ player_t *player = &players[consoleplayer];
+
+ if (demo_p)
+ return;
+ memset(name,0,sizeof(name));
+
+ demo_p = demobuffer;
+ demoflags = DF_GHOST|(modeattacking<<DF_ATTACKSHIFT);
+
+ // Setup header.
+ M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
+ WRITEUINT8(demo_p,VERSION);
+ WRITEUINT8(demo_p,SUBVERSION);
+ WRITEUINT16(demo_p,DEMOVERSION);
+
+ // demo checksum
+ demo_p += 16;
+
+ // game data
+ M_Memcpy(demo_p, "PLAY", 4); demo_p += 4;
+ WRITEINT16(demo_p,gamemap);
+ M_Memcpy(demo_p, mapmd5, 16); demo_p += 16;
+
+ WRITEUINT8(demo_p,demoflags);
+ switch ((demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
+ {
+ case ATTACKING_NONE: // 0
+ break;
+ case ATTACKING_RECORD: // 1
+ demotime_p = demo_p;
+ WRITEUINT32(demo_p,UINT32_MAX); // time
+ WRITEUINT32(demo_p,0); // score
+ WRITEUINT16(demo_p,0); // rings
+ break;
+ case ATTACKING_NIGHTS: // 2
+ demotime_p = demo_p;
+ WRITEUINT32(demo_p,UINT32_MAX); // time
+ WRITEUINT32(demo_p,0); // score
+ break;
+ default: // 3
+ break;
+ }
+
+ WRITEUINT32(demo_p,P_GetInitSeed());
+
+ // Name
+ for (i = 0; i < 16 && cv_playername.string[i]; i++)
+ name[i] = cv_playername.string[i];
+ for (; i < 16; i++)
+ name[i] = '\0';
+ M_Memcpy(demo_p,name,16);
+ demo_p += 16;
+
+ // Skin
+ for (i = 0; i < 16 && cv_skin.string[i]; i++)
+ name[i] = cv_skin.string[i];
+ for (; i < 16; i++)
+ name[i] = '\0';
+ M_Memcpy(demo_p,name,16);
+ demo_p += 16;
+
+ // Color
+ for (i = 0; i < MAXCOLORNAME && cv_playercolor.string[i]; i++)
+ name[i] = cv_playercolor.string[i];
+ for (; i < MAXCOLORNAME; i++)
+ name[i] = '\0';
+ M_Memcpy(demo_p,name,MAXCOLORNAME);
+ demo_p += MAXCOLORNAME;
+
+ // Stats
+ WRITEUINT8(demo_p,player->charability);
+ WRITEUINT8(demo_p,player->charability2);
+ WRITEUINT8(demo_p,player->actionspd>>FRACBITS);
+ WRITEUINT8(demo_p,player->mindash>>FRACBITS);
+ WRITEUINT8(demo_p,player->maxdash>>FRACBITS);
+ WRITEUINT8(demo_p,player->normalspeed>>FRACBITS);
+ WRITEUINT8(demo_p,player->runspeed>>FRACBITS);
+ WRITEUINT8(demo_p,player->thrustfactor);
+ WRITEUINT8(demo_p,player->accelstart);
+ WRITEUINT8(demo_p,player->acceleration);
+ WRITEUINT8(demo_p,player->height>>FRACBITS);
+ WRITEUINT8(demo_p,player->spinheight>>FRACBITS);
+ WRITEUINT8(demo_p,player->camerascale>>FRACBITS);
+ WRITEUINT8(demo_p,player->shieldscale>>FRACBITS);
+
+ // Trying to convert it back to % causes demo desync due to precision loss.
+ // Don't do it.
+ WRITEFIXED(demo_p, player->jumpfactor);
+
+ // And mobjtype_t is best with UINT32 too...
+ WRITEUINT32(demo_p, player->followitem);
+
+ // Save pflag data - see SendWeaponPref()
+ {
+ UINT8 buf = 0;
+ pflags_t pflags = 0;
+ if (cv_flipcam.value)
+ {
+ buf |= 0x01;
+ pflags |= PF_FLIPCAM;
+ }
+ if (cv_analog[0].value)
+ {
+ buf |= 0x02;
+ pflags |= PF_ANALOGMODE;
+ }
+ if (cv_directionchar[0].value)
+ {
+ buf |= 0x04;
+ pflags |= PF_DIRECTIONCHAR;
+ }
+ if (cv_autobrake.value)
+ {
+ buf |= 0x08;
+ pflags |= PF_AUTOBRAKE;
+ }
+ if (cv_usejoystick.value)
+ buf |= 0x10;
+ CV_SetValue(&cv_showinputjoy, !!(cv_usejoystick.value));
+
+ WRITEUINT8(demo_p,buf);
+ player->pflags = pflags;
+ }
+
+ // Save netvar data
+ CV_SaveNetVars(&demo_p);
+
+ memset(&oldcmd,0,sizeof(oldcmd));
+ memset(&oldghost,0,sizeof(oldghost));
+ memset(&ghostext,0,sizeof(ghostext));
+ ghostext.lastcolor = ghostext.color = GHC_NORMAL;
+ ghostext.lastscale = ghostext.scale = FRACUNIT;
+
+ if (player->mo)
+ {
+ oldghost.x = player->mo->x;
+ oldghost.y = player->mo->y;
+ oldghost.z = player->mo->z;
+ oldghost.angle = player->mo->angle>>24;
+
+ // preticker started us gravity flipped
+ if (player->mo->eflags & MFE_VERTICALFLIP)
+ ghostext.flags |= EZT_FLIP;
+ }
+}
+
+void G_BeginMetal(void)
+{
+ mobj_t *mo = players[consoleplayer].mo;
+
+#if 0
+ if (demo_p)
+ return;
+#endif
+
+ demo_p = demobuffer;
+
+ // Write header.
+ M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
+ WRITEUINT8(demo_p,VERSION);
+ WRITEUINT8(demo_p,SUBVERSION);
+ WRITEUINT16(demo_p,DEMOVERSION);
+
+ // demo checksum
+ demo_p += 16;
+
+ M_Memcpy(demo_p, "METL", 4); demo_p += 4;
+
+ memset(&ghostext,0,sizeof(ghostext));
+ ghostext.lastscale = ghostext.scale = FRACUNIT;
+
+ // Set up our memory.
+ memset(&oldmetal,0,sizeof(oldmetal));
+ oldmetal.x = mo->x;
+ oldmetal.y = mo->y;
+ oldmetal.z = mo->z;
+ oldmetal.angle = mo->angle>>24;
+}
+
+void G_SetDemoTime(UINT32 ptime, UINT32 pscore, UINT16 prings)
+{
+ if (!demorecording || !demotime_p)
+ return;
+ if (demoflags & DF_RECORDATTACK)
+ {
+ WRITEUINT32(demotime_p, ptime);
+ WRITEUINT32(demotime_p, pscore);
+ WRITEUINT16(demotime_p, prings);
+ demotime_p = NULL;
+ }
+ else if (demoflags & DF_NIGHTSATTACK)
+ {
+ WRITEUINT32(demotime_p, ptime);
+ WRITEUINT32(demotime_p, pscore);
+ demotime_p = NULL;
+ }
+}
+
+// Returns bitfield:
+// 1 == new demo has lower time
+// 2 == new demo has higher score
+// 4 == new demo has higher rings
+UINT8 G_CmpDemoTime(char *oldname, char *newname)
+{
+ UINT8 *buffer,*p;
+ UINT8 flags;
+ UINT32 oldtime, newtime, oldscore, newscore;
+ UINT16 oldrings, newrings, oldversion;
+ size_t bufsize ATTRUNUSED;
+ UINT8 c;
+ UINT16 s ATTRUNUSED;
+ UINT8 aflags = 0;
+
+ // load the new file
+ FIL_DefaultExtension(newname, ".lmp");
+ bufsize = FIL_ReadFile(newname, &buffer);
+ I_Assert(bufsize != 0);
+ p = buffer;
+
+ // read demo header
+ I_Assert(!memcmp(p, DEMOHEADER, 12));
+ p += 12; // DEMOHEADER
+ c = READUINT8(p); // VERSION
+ I_Assert(c == VERSION);
+ c = READUINT8(p); // SUBVERSION
+ I_Assert(c == SUBVERSION);
+ s = READUINT16(p);
+ I_Assert(s >= 0x000c);
+ p += 16; // demo checksum
+ I_Assert(!memcmp(p, "PLAY", 4));
+ p += 4; // PLAY
+ p += 2; // gamemap
+ p += 16; // map md5
+ flags = READUINT8(p); // demoflags
+
+ aflags = flags & (DF_RECORDATTACK|DF_NIGHTSATTACK);
+ I_Assert(aflags);
+ if (flags & DF_RECORDATTACK)
+ {
+ newtime = READUINT32(p);
+ newscore = READUINT32(p);
+ newrings = READUINT16(p);
+ }
+ else if (flags & DF_NIGHTSATTACK)
+ {
+ newtime = READUINT32(p);
+ newscore = READUINT32(p);
+ newrings = 0;
+ }
+ else // appease compiler
+ return 0;
+
+ Z_Free(buffer);
+
+ // load old file
+ FIL_DefaultExtension(oldname, ".lmp");
+ if (!FIL_ReadFile(oldname, &buffer))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), oldname);
+ return UINT8_MAX;
+ }
+ p = buffer;
+
+ // read demo header
+ if (memcmp(p, DEMOHEADER, 12))
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
+ Z_Free(buffer);
+ return UINT8_MAX;
+ } p += 12; // DEMOHEADER
+ p++; // VERSION
+ p++; // SUBVERSION
+ oldversion = READUINT16(p);
+ switch(oldversion) // demoversion
+ {
+ case DEMOVERSION: // latest always supported
+ case 0x000c: // all that changed between then and now was longer color name
+ break;
+ // too old, cannot support.
+ default:
+ CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
+ Z_Free(buffer);
+ return UINT8_MAX;
+ }
+ p += 16; // demo checksum
+ if (memcmp(p, "PLAY", 4))
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
+ Z_Free(buffer);
+ return UINT8_MAX;
+ } p += 4; // "PLAY"
+ if (oldversion <= 0x0008)
+ p++; // gamemap
+ else
+ p += 2; // gamemap
+ p += 16; // mapmd5
+ flags = READUINT8(p);
+ if (!(flags & aflags))
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("File '%s' not from same game mode. It will be overwritten.\n"), oldname);
+ Z_Free(buffer);
+ return UINT8_MAX;
+ }
+ if (flags & DF_RECORDATTACK)
+ {
+ oldtime = READUINT32(p);
+ oldscore = READUINT32(p);
+ oldrings = READUINT16(p);
+ }
+ else if (flags & DF_NIGHTSATTACK)
+ {
+ oldtime = READUINT32(p);
+ oldscore = READUINT32(p);
+ oldrings = 0;
+ }
+ else // appease compiler
+ return UINT8_MAX;
+
+ Z_Free(buffer);
+
+ c = 0;
+ if (newtime < oldtime
+ || (newtime == oldtime && (newscore > oldscore || newrings > oldrings)))
+ c |= 1; // Better time
+ if (newscore > oldscore
+ || (newscore == oldscore && newtime < oldtime))
+ c |= 1<<1; // Better score
+ if (newrings > oldrings
+ || (newrings == oldrings && newtime < oldtime))
+ c |= 1<<2; // Better rings
+ return c;
+}
+
+//
+// G_PlayDemo
+//
+void G_DeferedPlayDemo(const char *name)
+{
+ COM_BufAddText("playdemo \"");
+ COM_BufAddText(name);
+ COM_BufAddText("\"\n");
+}
+
+//
+// Start a demo from a .LMP file or from a wad resource
+//
+void G_DoPlayDemo(char *defdemoname)
+{
+ UINT8 i;
+ lumpnum_t l;
+ char skin[17],color[MAXCOLORNAME+1],*n,*pdemoname;
+ UINT8 version,subversion,charability,charability2,thrustfactor,accelstart,acceleration,cnamelen;
+ pflags_t pflags;
+ UINT32 randseed, followitem;
+ fixed_t camerascale,shieldscale,actionspd,mindash,maxdash,normalspeed,runspeed,jumpfactor,height,spinheight;
+ char msg[1024];
+
+ skin[16] = '\0';
+ color[MAXCOLORNAME] = '\0';
+
+ n = defdemoname+strlen(defdemoname);
+ while (*n != '/' && *n != '\\' && n != defdemoname)
+ n--;
+ if (n != defdemoname)
+ n++;
+ pdemoname = ZZ_Alloc(strlen(n)+1);
+ strcpy(pdemoname,n);
+
+ // Internal if no extension, external if one exists
+ if (FIL_CheckExtension(defdemoname))
+ {
+ //FIL_DefaultExtension(defdemoname, ".lmp");
+ if (!FIL_ReadFile(defdemoname, &demobuffer))
+ {
+ snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname);
+ CONS_Alert(CONS_ERROR, "%s", msg);
+ gameaction = ga_nothing;
+ M_StartMessage(msg, NULL, MM_NOTHING);
+ return;
+ }
+ demo_p = demobuffer;
+ }
+ // load demo resource from WAD
+ else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
+ {
+ snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
+ CONS_Alert(CONS_ERROR, "%s", msg);
+ gameaction = ga_nothing;
+ M_StartMessage(msg, NULL, MM_NOTHING);
+ return;
+ }
+ else // it's an internal demo
+ demobuffer = demo_p = W_CacheLumpNum(l, PU_STATIC);
+
+ // read demo header
+ gameaction = ga_nothing;
+ demoplayback = true;
+ if (memcmp(demo_p, DEMOHEADER, 12))
+ {
+ snprintf(msg, 1024, M_GetText("%s is not a SRB2 replay file.\n"), pdemoname);
+ CONS_Alert(CONS_ERROR, "%s", msg);
+ M_StartMessage(msg, NULL, MM_NOTHING);
+ Z_Free(pdemoname);
+ Z_Free(demobuffer);
+ demoplayback = false;
+ titledemo = false;
+ return;
+ }
+ demo_p += 12; // DEMOHEADER
+
+ version = READUINT8(demo_p);
+ subversion = READUINT8(demo_p);
+ demoversion = READUINT16(demo_p);
+ switch(demoversion)
+ {
+ case DEMOVERSION: // latest always supported
+ cnamelen = MAXCOLORNAME;
+ break;
+ // all that changed between then and now was longer color name
+ case 0x000c:
+ cnamelen = 16;
+ break;
+ // too old, cannot support.
+ default:
+ snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
+ CONS_Alert(CONS_ERROR, "%s", msg);
+ M_StartMessage(msg, NULL, MM_NOTHING);
+ Z_Free(pdemoname);
+ Z_Free(demobuffer);
+ demoplayback = false;
+ titledemo = false;
+ return;
+ }
+ demo_p += 16; // demo checksum
+ if (memcmp(demo_p, "PLAY", 4))
+ {
+ snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
+ CONS_Alert(CONS_ERROR, "%s", msg);
+ M_StartMessage(msg, NULL, MM_NOTHING);
+ Z_Free(pdemoname);
+ Z_Free(demobuffer);
+ demoplayback = false;
+ titledemo = false;
+ return;
+ }
+ demo_p += 4; // "PLAY"
+ gamemap = READINT16(demo_p);
+ demo_p += 16; // mapmd5
+
+ demoflags = READUINT8(demo_p);
+ modeattacking = (demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT;
+ CON_ToggleOff();
+
+ hu_demoscore = 0;
+ hu_demotime = UINT32_MAX;
+ hu_demorings = 0;
+
+ switch (modeattacking)
+ {
+ case ATTACKING_NONE: // 0
+ break;
+ case ATTACKING_RECORD: // 1
+ hu_demotime = READUINT32(demo_p);
+ hu_demoscore = READUINT32(demo_p);
+ hu_demorings = READUINT16(demo_p);
+ break;
+ case ATTACKING_NIGHTS: // 2
+ hu_demotime = READUINT32(demo_p);
+ hu_demoscore = READUINT32(demo_p);
+ break;
+ default: // 3
+ modeattacking = ATTACKING_NONE;
+ break;
+ }
+
+ // Random seed
+ randseed = READUINT32(demo_p);
+
+ // Player name
+ M_Memcpy(player_names[0],demo_p,16);
+ demo_p += 16;
+
+ // Skin
+ M_Memcpy(skin,demo_p,16);
+ demo_p += 16;
+
+ // Color
+ M_Memcpy(color,demo_p,cnamelen);
+ demo_p += cnamelen;
+
+ charability = READUINT8(demo_p);
+ charability2 = READUINT8(demo_p);
+ actionspd = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ mindash = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ maxdash = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ normalspeed = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ runspeed = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ thrustfactor = READUINT8(demo_p);
+ accelstart = READUINT8(demo_p);
+ acceleration = READUINT8(demo_p);
+ height = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ spinheight = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ camerascale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ shieldscale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ jumpfactor = READFIXED(demo_p);
+ followitem = READUINT32(demo_p);
+
+ // pflag data
+ {
+ UINT8 buf = READUINT8(demo_p);
+ pflags = 0;
+ if (buf & 0x01)
+ pflags |= PF_FLIPCAM;
+ if (buf & 0x02)
+ pflags |= PF_ANALOGMODE;
+ if (buf & 0x04)
+ pflags |= PF_DIRECTIONCHAR;
+ if (buf & 0x08)
+ pflags |= PF_AUTOBRAKE;
+ CV_SetValue(&cv_showinputjoy, !!(buf & 0x10));
+ }
+
+ // net var data
+ CV_LoadNetVars(&demo_p);
+
+ // Sigh ... it's an empty demo.
+ if (*demo_p == DEMOMARKER)
+ {
+ snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
+ CONS_Alert(CONS_ERROR, "%s", msg);
+ M_StartMessage(msg, NULL, MM_NOTHING);
+ Z_Free(pdemoname);
+ Z_Free(demobuffer);
+ demoplayback = false;
+ titledemo = false;
+ return;
+ }
+
+ Z_Free(pdemoname);
+
+ memset(&oldcmd,0,sizeof(oldcmd));
+ memset(&oldghost,0,sizeof(oldghost));
+
+ if (VERSION != version || SUBVERSION != subversion)
+ CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
+
+ // didn't start recording right away.
+ demo_start = false;
+
+ // Set skin
+ SetPlayerSkin(0, skin);
+
+#ifdef HAVE_BLUA
+ LUAh_MapChange(gamemap);
+#endif
+ displayplayer = consoleplayer = 0;
+ memset(playeringame,0,sizeof(playeringame));
+ playeringame[0] = true;
+ P_SetRandSeed(randseed);
+ G_InitNew(false, G_BuildMapName(gamemap), true, true, false);
+
+ // Set color
+ players[0].skincolor = skins[players[0].skin].prefcolor;
+ for (i = 0; i < numskincolors; i++)
+ if (!stricmp(skincolors[i].name,color))
+ {
+ players[0].skincolor = i;
+ break;
+ }
+ CV_StealthSetValue(&cv_playercolor, players[0].skincolor);
+ if (players[0].mo)
+ {
+ players[0].mo->color = players[0].skincolor;
+ oldghost.x = players[0].mo->x;
+ oldghost.y = players[0].mo->y;
+ oldghost.z = players[0].mo->z;
+ }
+
+ // Set saved attribute values
+ // No cheat checking here, because even if they ARE wrong...
+ // it would only break the replay if we clipped them.
+ players[0].camerascale = camerascale;
+ players[0].shieldscale = shieldscale;
+ players[0].charability = charability;
+ players[0].charability2 = charability2;
+ players[0].actionspd = actionspd;
+ players[0].mindash = mindash;
+ players[0].maxdash = maxdash;
+ players[0].normalspeed = normalspeed;
+ players[0].runspeed = runspeed;
+ players[0].thrustfactor = thrustfactor;
+ players[0].accelstart = accelstart;
+ players[0].acceleration = acceleration;
+ players[0].height = height;
+ players[0].spinheight = spinheight;
+ players[0].jumpfactor = jumpfactor;
+ players[0].followitem = followitem;
+ players[0].pflags = pflags;
+
+ demo_start = true;
+}
+
+void G_AddGhost(char *defdemoname)
+{
+ INT32 i;
+ lumpnum_t l;
+ char name[17],skin[17],color[MAXCOLORNAME+1],*n,*pdemoname,md5[16];
+ UINT8 cnamelen;
+ demoghost *gh;
+ UINT8 flags;
+ UINT8 *buffer,*p;
+ mapthing_t *mthing;
+ UINT16 count, ghostversion;
+
+ name[16] = '\0';
+ skin[16] = '\0';
+ color[16] = '\0';
+
+ n = defdemoname+strlen(defdemoname);
+ while (*n != '/' && *n != '\\' && n != defdemoname)
+ n--;
+ if (n != defdemoname)
+ n++;
+ pdemoname = ZZ_Alloc(strlen(n)+1);
+ strcpy(pdemoname,n);
+
+ // Internal if no extension, external if one exists
+ if (FIL_CheckExtension(defdemoname))
+ {
+ //FIL_DefaultExtension(defdemoname, ".lmp");
+ if (!FIL_ReadFileTag(defdemoname, &buffer, PU_LEVEL))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), defdemoname);
+ Z_Free(pdemoname);
+ return;
+ }
+ p = buffer;
+ }
+ // load demo resource from WAD
+ else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
+ Z_Free(pdemoname);
+ return;
+ }
+ else // it's an internal demo
+ buffer = p = W_CacheLumpNum(l, PU_LEVEL);
+
+ // read demo header
+ if (memcmp(p, DEMOHEADER, 12))
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Not a SRB2 replay.\n"), pdemoname);
+ Z_Free(pdemoname);
+ Z_Free(buffer);
+ return;
+ } p += 12; // DEMOHEADER
+ p++; // VERSION
+ p++; // SUBVERSION
+ ghostversion = READUINT16(p);
+ switch(ghostversion)
+ {
+ case DEMOVERSION: // latest always supported
+ cnamelen = MAXCOLORNAME;
+ break;
+ // all that changed between then and now was longer color name
+ case 0x000c:
+ cnamelen = 16;
+ break;
+ // too old, cannot support.
+ default:
+ CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo version incompatible.\n"), pdemoname);
+ Z_Free(pdemoname);
+ Z_Free(buffer);
+ return;
+ }
+ M_Memcpy(md5, p, 16); p += 16; // demo checksum
+ for (gh = ghosts; gh; gh = gh->next)
+ if (!memcmp(md5, gh->checksum, 16)) // another ghost in the game already has this checksum?
+ { // Don't add another one, then!
+ CONS_Debug(DBG_SETUP, "Rejecting duplicate ghost %s (MD5 was matched)\n", pdemoname);
+ Z_Free(pdemoname);
+ Z_Free(buffer);
+ return;
+ }
+ if (memcmp(p, "PLAY", 4))
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo format unacceptable.\n"), pdemoname);
+ Z_Free(pdemoname);
+ Z_Free(buffer);
+ return;
+ } p += 4; // "PLAY"
+ if (ghostversion <= 0x0008)
+ p++; // gamemap
+ else
+ p += 2; // gamemap
+ p += 16; // mapmd5 (possibly check for consistency?)
+ flags = READUINT8(p);
+ if (!(flags & DF_GHOST))
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: No ghost data in this demo.\n"), pdemoname);
+ Z_Free(pdemoname);
+ Z_Free(buffer);
+ return;
+ }
+ switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
+ {
+ case ATTACKING_NONE: // 0
+ break;
+ case ATTACKING_RECORD: // 1
+ p += 10; // demo time, score, and rings
+ break;
+ case ATTACKING_NIGHTS: // 2
+ p += 8; // demo time left, score
+ break;
+ default: // 3
+ break;
+ }
+
+ p += 4; // random seed
+
+ // Player name (TODO: Display this somehow if it doesn't match cv_playername!)
+ M_Memcpy(name, p,16);
+ p += 16;
+
+ // Skin
+ M_Memcpy(skin, p,16);
+ p += 16;
+
+ // Color
+ M_Memcpy(color, p,cnamelen);
+ p += cnamelen;
+
+ // Ghosts do not have a player structure to put this in.
+ p++; // charability
+ p++; // charability2
+ p++; // actionspd
+ p++; // mindash
+ p++; // maxdash
+ p++; // normalspeed
+ p++; // runspeed
+ p++; // thrustfactor
+ p++; // accelstart
+ p++; // acceleration
+ p++; // height
+ p++; // spinheight
+ p++; // camerascale
+ p++; // shieldscale
+ p += 4; // jumpfactor
+ p += 4; // followitem
+
+ p++; // pflag data
+
+ // net var data
+ count = READUINT16(p);
+ while (count--)
+ {
+ p += 2;
+ SKIPSTRING(p);
+ p++;
+ }
+
+ if (*p == DEMOMARKER)
+ {
+ CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Replay is empty.\n"), pdemoname);
+ Z_Free(pdemoname);
+ Z_Free(buffer);
+ return;
+ }
+
+ gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
+ gh->next = ghosts;
+ gh->buffer = buffer;
+ M_Memcpy(gh->checksum, md5, 16);
+ gh->p = p;
+
+ ghosts = gh;
+
+ gh->version = ghostversion;
+ mthing = playerstarts[0];
+ I_Assert(mthing);
+ { // A bit more complex than P_SpawnPlayer because ghosts aren't solid and won't just push themselves out of the ceiling.
+ fixed_t z,f,c;
+ fixed_t offset = mthing->z << FRACBITS;
+ gh->mo = P_SpawnMobj(mthing->x << FRACBITS, mthing->y << FRACBITS, 0, MT_GHOST);
+ gh->mo->angle = FixedAngle(mthing->angle << FRACBITS);
+ f = gh->mo->floorz;
+ c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height;
+ if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP))
+ {
+ z = c - offset;
+ if (z < f)
+ z = f;
+ }
+ else
+ {
+ z = f + offset;
+ if (z > c)
+ z = c;
+ }
+ gh->mo->z = z;
+ }
+
+ gh->oldmo.x = gh->mo->x;
+ gh->oldmo.y = gh->mo->y;
+ gh->oldmo.z = gh->mo->z;
+
+ // Set skin
+ gh->mo->skin = &skins[0];
+ for (i = 0; i < numskins; i++)
+ if (!stricmp(skins[i].name,skin))
+ {
+ gh->mo->skin = &skins[i];
+ break;
+ }
+ gh->oldmo.skin = gh->mo->skin;
+
+ // Set color
+ gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor;
+ for (i = 0; i < numskincolors; i++)
+ if (!stricmp(skincolors[i].name,color))
+ {
+ gh->mo->color = (UINT16)i;
+ break;
+ }
+ gh->oldmo.color = gh->mo->color;
+
+ gh->mo->state = states+S_PLAY_STND;
+ gh->mo->sprite = gh->mo->state->sprite;
+ gh->mo->sprite2 = (gh->mo->state->frame & FF_FRAMEMASK);
+ //gh->mo->frame = tr_trans30<<FF_TRANSSHIFT;
+ gh->mo->flags2 |= MF2_DONTDRAW;
+ gh->fadein = (9-3)*6; // fade from invisible to trans30 over as close to 35 tics as possible
+ gh->mo->tics = -1;
+
+ CONS_Printf(M_GetText("Added ghost %s from %s\n"), name, pdemoname);
+ Z_Free(pdemoname);
+}
+
+// Clean up all ghosts
+void G_FreeGhosts(void)
+{
+ while (ghosts)
+ {
+ demoghost *next = ghosts->next;
+ Z_Free(ghosts);
+ ghosts = next;
+ }
+ ghosts = NULL;
+}
+
+//
+// G_TimeDemo
+// NOTE: name is a full filename for external demos
+//
+static INT32 restorecv_vidwait;
+
+void G_TimeDemo(const char *name)
+{
+ nodrawers = M_CheckParm("-nodraw");
+ noblit = M_CheckParm("-noblit");
+ restorecv_vidwait = cv_vidwait.value;
+ if (cv_vidwait.value)
+ CV_Set(&cv_vidwait, "0");
+ timingdemo = true;
+ singletics = true;
+ framecount = 0;
+ demostarttime = I_GetTime();
+ G_DeferedPlayDemo(name);
+}
+
+void G_DoPlayMetal(void)
+{
+ lumpnum_t l;
+ mobj_t *mo = NULL;
+ thinker_t *th;
+
+ // it's an internal demo
+ if ((l = W_CheckNumForName(va("%sMS",G_BuildMapName(gamemap)))) == LUMPERROR)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("No bot recording for this map.\n"));
+ return;
+ }
+ else
+ metalbuffer = metal_p = W_CacheLumpNum(l, PU_STATIC);
+
+ // find metal sonic
+ for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
+ {
+ if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+ continue;
+
+ mo = (mobj_t *)th;
+ if (mo->type != MT_METALSONIC_RACE)
+ continue;
+
+ break;
+ }
+ if (th == &thlist[THINK_MOBJ])
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Failed to find bot entity.\n"));
+ Z_Free(metalbuffer);
+ return;
+ }
+
+ // read demo header
+ metal_p += 12; // DEMOHEADER
+ metal_p++; // VERSION
+ metal_p++; // SUBVERSION
+ metalversion = READUINT16(metal_p);
+ switch(metalversion)
+ {
+ case DEMOVERSION: // latest always supported
+ case 0x000c: // all that changed between then and now was longer color name
+ break;
+ // too old, cannot support.
+ default:
+ CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, format version incompatible.\n"));
+ Z_Free(metalbuffer);
+ return;
+ }
+ metal_p += 16; // demo checksum
+ if (memcmp(metal_p, "METL", 4))
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, wasn't recorded in Metal format.\n"));
+ Z_Free(metalbuffer);
+ return;
+ } metal_p += 4; // "METL"
+
+ // read initial tic
+ memset(&oldmetal,0,sizeof(oldmetal));
+ oldmetal.x = mo->x;
+ oldmetal.y = mo->y;
+ oldmetal.z = mo->z;
+ metalplayback = mo;
+}
+
+void G_DoneLevelLoad(void)
+{
+ CONS_Printf(M_GetText("Loaded level in %f sec\n"), (double)(I_GetTime() - demostarttime) / TICRATE);
+ framecount = 0;
+ demostarttime = I_GetTime();
+}
+
+/*
+===================
+=
+= G_CheckDemoStatus
+=
+= Called after a death or level completion to allow demos to be cleaned up
+= Returns true if a new demo loop action will take place
+===================
+*/
+
+// Writes the demo's checksum, or just random garbage if you can't do that for some reason.
+static void WriteDemoChecksum(void)
+{
+ UINT8 *p = demobuffer+16; // checksum position
+#ifdef NOMD5
+ UINT8 i;
+ for (i = 0; i < 16; i++, p++)
+ *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
+#else
+ md5_buffer((char *)p+16, demo_p - (p+16), p); // make a checksum of everything after the checksum in the file.
+#endif
+}
+
+// Stops recording a demo.
+static void G_StopDemoRecording(void)
+{
+ boolean saved = false;
+ WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
+ WriteDemoChecksum();
+ saved = FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer); // finally output the file.
+ free(demobuffer);
+ demorecording = false;
+
+ if (modeattacking != ATTACKING_RECORD)
+ {
+ if (saved)
+ CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);
+ else
+ CONS_Alert(CONS_WARNING, M_GetText("Demo %s not saved\n"), demoname);
+ }
+}
+
+// Stops metal sonic's demo. Separate from other functions because metal + replays can coexist
+void G_StopMetalDemo(void)
+{
+
+ // Metal Sonic finishing doesn't end the game, dammit.
+ Z_Free(metalbuffer);
+ metalbuffer = NULL;
+ metalplayback = NULL;
+ metal_p = NULL;
+}
+
+// Stops metal sonic recording.
+ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill)
+{
+ boolean saved = false;
+ if (demo_p)
+ {
+ 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.
+ }
+ free(demobuffer);
+ metalrecording = false;
+ if (saved)
+ I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap));
+ I_Error("Failed to save demo!");
+}
+
+// Stops timing a demo.
+static void G_StopTimingDemo(void)
+{
+ INT32 demotime;
+ double f1, f2;
+ demotime = I_GetTime() - demostarttime;
+ if (!demotime)
+ return;
+ G_StopDemo();
+ timingdemo = false;
+ f1 = (double)demotime;
+ f2 = (double)framecount*TICRATE;
+
+ CONS_Printf(M_GetText("timed %u gametics in %d realtics - %u frames\n%f seconds, %f avg fps\n"),
+ leveltime,demotime,(UINT32)framecount,f1/TICRATE,f2/f1);
+
+ // CSV-readable timedemo results, for external parsing
+ if (timedemo_csv)
+ {
+ FILE *f;
+ const char *csvpath = va("%s"PATHSEP"%s", srb2home, "timedemo.csv");
+ const char *header = "id,demoname,seconds,avgfps,leveltime,demotime,framecount,ticrate,rendermode,vidmode,vidwidth,vidheight,procbits\n";
+ const char *rowformat = "\"%s\",\"%s\",%f,%f,%u,%d,%u,%u,%u,%u,%u,%u,%u\n";
+ boolean headerrow = !FIL_FileExists(csvpath);
+ UINT8 procbits = 0;
+
+ // Bitness
+ if (sizeof(void*) == 4)
+ procbits = 32;
+ else if (sizeof(void*) == 8)
+ procbits = 64;
+
+ f = fopen(csvpath, "a+");
+
+ if (f)
+ {
+ if (headerrow)
+ fputs(header, f);
+ fprintf(f, rowformat,
+ timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
+ fclose(f);
+ CONS_Printf("Timedemo results saved to '%s'\n", csvpath);
+ }
+ else
+ {
+ // Just print the CSV output to console
+ CON_LogMessage(header);
+ CONS_Printf(rowformat,
+ timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
+ }
+ }
+
+ if (restorecv_vidwait != cv_vidwait.value)
+ CV_SetValue(&cv_vidwait, restorecv_vidwait);
+ D_AdvanceDemo();
+}
+
+// reset engine variable set for the demos
+// called from stopdemo command, map command, and g_checkdemoStatus.
+void G_StopDemo(void)
+{
+ Z_Free(demobuffer);
+ demobuffer = NULL;
+ demoplayback = false;
+ titledemo = false;
+ timingdemo = false;
+ singletics = false;
+
+ if (gamestate == GS_INTERMISSION)
+ Y_EndIntermission(); // cleanup
+
+ G_SetGamestate(GS_NULL);
+ wipegamestate = GS_NULL;
+ SV_StopServer();
+ SV_ResetServer();
+}
+
+boolean G_CheckDemoStatus(void)
+{
+ G_FreeGhosts();
+
+ // DO NOT end metal sonic demos here
+
+ if (timingdemo)
+ {
+ G_StopTimingDemo();
+ return true;
+ }
+
+ if (demoplayback)
+ {
+ if (singledemo)
+ I_Quit();
+ G_StopDemo();
+
+ if (modeattacking)
+ M_EndModeAttackRun();
+ else
+ D_AdvanceDemo();
+
+ return true;
+ }
+
+ if (demorecording)
+ {
+ G_StopDemoRecording();
+ return true;
+ }
+
+ return false;
+}
diff --git a/src/g_demo.h b/src/g_demo.h
new file mode 100644
index 0000000000000000000000000000000000000000..df25042c48030402622a71a611c8a7f2a53649e7
--- /dev/null
+++ b/src/g_demo.h
@@ -0,0 +1,86 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 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 g_demo.h
+/// \brief Demo recording and playback
+
+#ifndef __G_DEMO__
+#define __G_DEMO__
+
+#include "doomdef.h"
+#include "doomstat.h"
+#include "d_event.h"
+
+// ======================================
+// DEMO playback/recording related stuff.
+// ======================================
+
+// demoplaying back and demo recording
+extern boolean demoplayback, titledemo, demorecording, timingdemo;
+extern tic_t demostarttime;
+
+// Quit after playing a demo from cmdline.
+extern boolean singledemo;
+extern boolean demo_start;
+extern boolean demosynced;
+
+extern mobj_t *metalplayback;
+
+// Only called by startup code.
+void G_RecordDemo(const char *name);
+void G_RecordMetal(void);
+void G_BeginRecording(void);
+void G_BeginMetal(void);
+
+// Only called by shutdown code.
+void G_SetDemoTime(UINT32 ptime, UINT32 pscore, UINT16 prings);
+UINT8 G_CmpDemoTime(char *oldname, char *newname);
+
+typedef enum
+{
+ GHC_NORMAL = 0,
+ GHC_SUPER,
+ GHC_FIREFLOWER,
+ GHC_INVINCIBLE,
+ GHC_NIGHTSSKIN, // not actually a colour
+ GHC_RETURNSKIN // ditto
+} ghostcolor_t;
+
+// Record/playback tics
+void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
+void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
+void G_GhostAddThok(void);
+void G_GhostAddSpin(void);
+void G_GhostAddRev(void);
+void G_GhostAddColor(ghostcolor_t color);
+void G_GhostAddFlip(void);
+void G_GhostAddScale(fixed_t scale);
+void G_GhostAddHit(mobj_t *victim);
+void G_WriteGhostTic(mobj_t *ghost);
+void G_ConsGhostTic(void);
+void G_GhostTicker(void);
+void G_ReadMetalTic(mobj_t *metal);
+void G_WriteMetalTic(mobj_t *metal);
+void G_SaveMetal(UINT8 **buffer);
+void G_LoadMetal(UINT8 **buffer);
+
+void G_DeferedPlayDemo(const char *demo);
+void G_DoPlayDemo(char *defdemoname);
+void G_TimeDemo(const char *name);
+void G_AddGhost(char *defdemoname);
+void G_FreeGhosts(void);
+void G_DoPlayMetal(void);
+void G_DoneLevelLoad(void);
+void G_StopMetalDemo(void);
+ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill);
+void G_StopDemo(void);
+boolean G_CheckDemoStatus(void);
+
+#endif // __G_DEMO__
diff --git a/src/g_game.c b/src/g_game.c
index 58f7795b6cb863a4745c7c8ae68a145b7672eda8..d3cb9e7a1467b89c9bba0d9c8c08c8de50147695 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -27,6 +27,7 @@
#include "r_main.h"
#include "s_sound.h"
#include "g_game.h"
+#include "g_demo.h"
#include "m_cheat.h"
#include "m_misc.h"
#include "m_menu.h"
@@ -41,15 +42,11 @@
#include "r_skins.h"
#include "y_inter.h"
#include "v_video.h"
-#include "dehacked.h" // get_number (for ghost thok)
#include "lua_hook.h"
#include "b_bot.h"
#include "m_cond.h" // condition sets
-#include "md5.h" // demo checksums
-#ifdef HAVE_BLUA
#include "lua_hud.h"
-#endif
gameaction_t gameaction;
gamestate_t gamestate = GS_NULL;
@@ -57,7 +54,7 @@ UINT8 ultimatemode = false;
boolean botingame;
UINT8 botskin;
-UINT8 botcolor;
+UINT16 botcolor;
JoyType_t Joystick;
JoyType_t Joystick2;
@@ -105,11 +102,6 @@ UINT8 numDemos = 0;
UINT32 demoDelayTime = 15*TICRATE;
UINT32 demoIdleTime = 3*TICRATE;
-boolean timingdemo; // if true, exit with report on completion
-boolean nodrawers; // for comparative timing purposes
-boolean noblit; // for comparative timing purposes
-tic_t demostarttime; // for comparative timing purposes
-
boolean netgame; // only true if packets are broadcast
boolean multiplayer;
boolean playeringame[MAXPLAYERS];
@@ -143,10 +135,10 @@ INT32 tutorialanalog = 0; // store cv_analog[0] user value
boolean looptitle = false;
-UINT8 skincolor_redteam = SKINCOLOR_RED;
-UINT8 skincolor_blueteam = SKINCOLOR_BLUE;
-UINT8 skincolor_redring = SKINCOLOR_SALMON;
-UINT8 skincolor_bluering = SKINCOLOR_CORNFLOWER;
+UINT16 skincolor_redteam = SKINCOLOR_RED;
+UINT16 skincolor_blueteam = SKINCOLOR_BLUE;
+UINT16 skincolor_redring = SKINCOLOR_SALMON;
+UINT16 skincolor_bluering = SKINCOLOR_CORNFLOWER;
tic_t countdowntimer = 0;
boolean countdowntimeup = false;
@@ -177,7 +169,7 @@ static boolean retryingmodeattack = false;
UINT8 stagefailed; // Used for GEMS BONUS? Also to see if you beat the stage.
UINT16 emeralds;
-INT32 luabanks[NUM_LUABANKS]; // yes, even in non HAVE_BLUA
+INT32 luabanks[NUM_LUABANKS];
UINT32 token; // Number of tokens collected in a level
UINT32 tokenlist; // List of tokens collected
boolean gottoken; // Did you get a token? Used for end of act
@@ -227,6 +219,7 @@ UINT8 ammoremovaltics = 2*TICRATE;
UINT8 use1upSound = 0;
UINT8 maxXtraLife = 2; // Max extra lives from rings
+UINT8 useContinues = 0; // Set to 1 to enable continues outside of no-save scenarioes
UINT8 introtoplay;
UINT8 creditscutscene;
@@ -256,57 +249,12 @@ UINT32 timesBeaten;
UINT32 timesBeatenWithEmeralds;
UINT32 timesBeatenUltimate;
-static char demoname[64];
-boolean demorecording;
-boolean demoplayback;
-boolean titledemo; // Title Screen demo can be cancelled by any key
-static UINT8 *demobuffer = NULL;
-static UINT8 *demo_p, *demotime_p;
-static UINT8 *demoend;
-static UINT8 demoflags;
-static UINT16 demoversion;
-boolean singledemo; // quit after playing a demo from cmdline
-boolean demo_start; // don't start playing demo right away
-boolean demosynced = true; // console warning message
-
-boolean metalrecording; // recording as metal sonic
-mobj_t *metalplayback;
-static UINT8 *metalbuffer = NULL;
-static UINT8 *metal_p;
-static UINT16 metalversion;
-
typedef struct joystickvector2_s
{
INT32 xaxis;
INT32 yaxis;
} joystickvector2_t;
-// extra data stuff (events registered this frame while recording)
-static struct {
- UINT8 flags; // EZT flags
-
- // EZT_COLOR
- UINT8 color, lastcolor;
-
- // EZT_SCALE
- fixed_t scale, lastscale;
-
- // EZT_HIT
- UINT16 hits;
- mobj_t **hitlist;
-} ghostext;
-
-// Your naming conventions are stupid and useless.
-// There is no conflict here.
-typedef struct demoghost {
- UINT8 checksum[16];
- UINT8 *buffer, *p, color, fadein;
- UINT16 version;
- mobj_t oldmo, *mo;
- struct demoghost *next;
-} demoghost;
-demoghost *ghosts = NULL;
-
boolean precache = true; // if true, load all graphics at start
INT16 prevmap, nextmap;
@@ -1102,8 +1050,6 @@ static void G_HandleAxisDeadZone(UINT8 splitnum, joystickvector2_t *joystickvect
}
}
-
-
//
// G_BuildTiccmd
// Builds a ticcmd from all of the available inputs
@@ -1714,15 +1660,32 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (ssplayer == 1 && (cmd->forwardmove || cmd->sidemove || cmd->buttons)
&& displayplayer != consoleplayer)
{
-#ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(player, &players[displayplayer], true);
-#endif
+ LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
displayplayer = consoleplayer;
}
}
+ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
+{
+ return M_Memcpy(dest, src, n*sizeof(*src));
+}
+
+ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
+{
+ size_t i;
+ for (i = 0; i < n; i++)
+ {
+ dest[i].forwardmove = src[i].forwardmove;
+ dest[i].sidemove = src[i].sidemove;
+ dest[i].angleturn = SHORT(src[i].angleturn);
+ dest[i].aiming = (INT16)SHORT(src[i].aiming);
+ dest[i].buttons = (UINT16)SHORT(src[i].buttons);
+ }
+ return dest;
+}
+
// User has designated that they want
// analog ON, so tell the game to stop
// fudging with it.
@@ -1903,6 +1866,7 @@ void G_StartTitleCard(void)
//
void G_PreLevelTitleCard(void)
{
+#ifndef NOWIPE
tic_t starttime = I_GetTime();
tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO);
tic_t nowtime = starttime;
@@ -1925,6 +1889,7 @@ void G_PreLevelTitleCard(void)
}
if (!cv_showhud.value)
wipestyleflags = WSF_CROSSFADE;
+#endif
}
static boolean titlecardforreload = false;
@@ -2048,9 +2013,7 @@ boolean G_Responder(event_t *ev)
&& (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
{
// ViewpointSwitch Lua hook.
-#ifdef HAVE_BLUA
UINT8 canSwitchView = 0;
-#endif
if (splitscreen || !netgame)
displayplayer = consoleplayer;
@@ -2066,14 +2029,12 @@ boolean G_Responder(event_t *ev)
if (!playeringame[displayplayer])
continue;
-#ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here.
canSwitchView = LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], false);
if (canSwitchView == 1) // Set viewpoint to this player
break;
else if (canSwitchView == 2) // Skip this player
continue;
-#endif
if (players[displayplayer].spectator)
continue;
@@ -2422,7 +2383,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
INT16 totalring;
UINT8 laps;
UINT8 mare;
- UINT8 skincolor;
+ UINT16 skincolor;
INT32 skin;
UINT32 availabilities;
tic_t jointime;
@@ -2673,9 +2634,7 @@ void G_SpawnPlayer(INT32 playernum)
P_SpawnPlayer(playernum);
G_MovePlayerToSpawnOrStarpost(playernum);
-#ifdef HAVE_BLUA
LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :)
-#endif
}
void G_MovePlayerToSpawnOrStarpost(INT32 playernum)
@@ -3029,9 +2988,7 @@ void G_DoReborn(INT32 playernum)
}
else
{
-#ifdef HAVE_BLUA
LUAh_MapChange(gamemap);
-#endif
titlecardforreload = true;
G_DoLoadLevel(true);
titlecardforreload = false;
@@ -3591,7 +3548,7 @@ boolean G_CompetitionGametype(void)
* \return The typeoflevel flag to check for that gametype.
* \author Graue <graue@oceanbase.org>
*/
-INT16 G_TOLFlag(INT32 pgametype)
+UINT32 G_TOLFlag(INT32 pgametype)
{
if (!multiplayer)
return TOL_SP;
@@ -3722,7 +3679,7 @@ static void G_DoCompleted(void)
&& (nextmap >= 0 && nextmap < NUMMAPS))
{
register INT16 cm = nextmap;
- INT16 tolflag = G_TOLFlag(gametype);
+ UINT32 tolflag = G_TOLFlag(gametype);
UINT8 visitedmap[(NUMMAPS+7)/8];
memset(visitedmap, 0, sizeof (visitedmap));
@@ -3905,7 +3862,8 @@ static void G_DoContinued(void)
I_Assert(!netgame && !multiplayer);
I_Assert(pl->continues > 0);
- pl->continues--;
+ if (pl->continues)
+ pl->continues--;
// Reset score
pl->score = 0;
@@ -4519,12 +4477,12 @@ cleanup:
//
void G_DeferedInitNew(boolean pultmode, const char *mapname, INT32 pickedchar, boolean SSSG, boolean FLS)
{
- UINT8 color = skins[pickedchar].prefcolor;
+ UINT16 color = skins[pickedchar].prefcolor;
paused = false;
if (demoplayback)
COM_BufAddText("stopdemo\n");
- ghosts = NULL;
+ G_FreeGhosts(); // TODO: do we actually need to do this?
// this leave the actual game if needed
SV_StartSinglePlayerServer();
@@ -4673,7 +4631,7 @@ char *G_BuildMapTitle(INT32 mapnum)
{
size_t len = 1;
const char *zonetext = NULL;
- const INT32 actnum = mapheaderinfo[mapnum-1]->actnum;
+ const UINT8 actnum = mapheaderinfo[mapnum-1]->actnum;
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
if (!(mapheaderinfo[mapnum-1]->levelflags & LF_NOZONE))
@@ -4933,2432 +4891,6 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
return newmapnum;
}
-//
-// DEMO RECORDING
-//
-
-#define DEMOVERSION 0x000c
-#define DEMOHEADER "\xF0" "SRB2Replay" "\x0F"
-
-#define DF_GHOST 0x01 // This demo contains ghost data too!
-#define DF_RECORDATTACK 0x02 // This demo is from record attack and contains its final completion time, score, and rings!
-#define DF_NIGHTSATTACK 0x04 // This demo is from NiGHTS attack and contains its time left, score, and mares!
-#define DF_ATTACKMASK 0x06 // This demo is from ??? attack and contains ???
-#define DF_ATTACKSHIFT 1
-
-// For demos
-#define ZT_FWD 0x01
-#define ZT_SIDE 0x02
-#define ZT_ANGLE 0x04
-#define ZT_BUTTONS 0x08
-#define ZT_AIMING 0x10
-#define DEMOMARKER 0x80 // demoend
-#define METALDEATH 0x44
-#define METALSNICE 0x69
-
-static ticcmd_t oldcmd;
-
-// For Metal Sonic and time attack ghosts
-#define GZT_XYZ 0x01
-#define GZT_MOMXY 0x02
-#define GZT_MOMZ 0x04
-#define GZT_ANGLE 0x08
-#define GZT_FRAME 0x10 // Animation frame
-#define GZT_SPR2 0x20 // Player animations
-#define GZT_EXTRA 0x40
-#define GZT_FOLLOW 0x80 // Followmobj
-
-// GZT_EXTRA flags
-#define EZT_THOK 0x01 // Spawned a thok object
-#define EZT_SPIN 0x02 // Because one type of thok object apparently wasn't enough
-#define EZT_REV 0x03 // And two types wasn't enough either yet
-#define EZT_THOKMASK 0x03
-#define EZT_COLOR 0x04 // Changed color (Super transformation, Mario fireflowers/invulnerability, etc.)
-#define EZT_FLIP 0x08 // Reversed gravity
-#define EZT_SCALE 0x10 // Changed size
-#define EZT_HIT 0x20 // Damaged a mobj
-#define EZT_SPRITE 0x40 // Changed sprite set completely out of PLAY (NiGHTS, SOCs, whatever)
-#define EZT_HEIGHT 0x80 // Changed height
-
-// GZT_FOLLOW flags
-#define FZT_SPAWNED 0x01 // just been spawned
-#define FZT_SKIN 0x02 // has skin
-#define FZT_LINKDRAW 0x04 // has linkdraw (combine with spawned only)
-#define FZT_COLORIZED 0x08 // colorized (ditto)
-#define FZT_SCALE 0x10 // different scale to object
-// spare FZT slots 0x20 to 0x80
-
-static mobj_t oldmetal, oldghost;
-
-void G_SaveMetal(UINT8 **buffer)
-{
- I_Assert(buffer != NULL && *buffer != NULL);
-
- WRITEUINT32(*buffer, metal_p - metalbuffer);
-}
-
-void G_LoadMetal(UINT8 **buffer)
-{
- I_Assert(buffer != NULL && *buffer != NULL);
-
- G_DoPlayMetal();
- metal_p = metalbuffer + READUINT32(*buffer);
-}
-
-ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
-{
- return M_Memcpy(dest, src, n*sizeof(*src));
-}
-
-ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
-{
- size_t i;
- for (i = 0; i < n; i++)
- {
- dest[i].forwardmove = src[i].forwardmove;
- dest[i].sidemove = src[i].sidemove;
- dest[i].angleturn = SHORT(src[i].angleturn);
- dest[i].aiming = (INT16)SHORT(src[i].aiming);
- dest[i].buttons = (UINT16)SHORT(src[i].buttons);
- }
- return dest;
-}
-
-void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
-{
- UINT8 ziptic;
- (void)playernum;
-
- if (!demo_p || !demo_start)
- return;
- ziptic = READUINT8(demo_p);
-
- if (ziptic & ZT_FWD)
- oldcmd.forwardmove = READSINT8(demo_p);
- if (ziptic & ZT_SIDE)
- oldcmd.sidemove = READSINT8(demo_p);
- if (ziptic & ZT_ANGLE)
- oldcmd.angleturn = READINT16(demo_p);
- if (ziptic & ZT_BUTTONS)
- oldcmd.buttons = (oldcmd.buttons & (BT_CAMLEFT|BT_CAMRIGHT)) | (READUINT16(demo_p) & ~(BT_CAMLEFT|BT_CAMRIGHT));
- if (ziptic & ZT_AIMING)
- oldcmd.aiming = READINT16(demo_p);
-
- G_CopyTiccmd(cmd, &oldcmd, 1);
-
- if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
- {
- // end of demo data stream
- G_CheckDemoStatus();
- return;
- }
-}
-
-void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
-{
- char ziptic = 0;
- UINT8 *ziptic_p;
- (void)playernum;
-
- if (!demo_p)
- return;
- ziptic_p = demo_p++; // the ziptic, written at the end of this function
-
- if (cmd->forwardmove != oldcmd.forwardmove)
- {
- WRITEUINT8(demo_p,cmd->forwardmove);
- oldcmd.forwardmove = cmd->forwardmove;
- ziptic |= ZT_FWD;
- }
-
- if (cmd->sidemove != oldcmd.sidemove)
- {
- WRITEUINT8(demo_p,cmd->sidemove);
- oldcmd.sidemove = cmd->sidemove;
- ziptic |= ZT_SIDE;
- }
-
- if (cmd->angleturn != oldcmd.angleturn)
- {
- WRITEINT16(demo_p,cmd->angleturn);
- oldcmd.angleturn = cmd->angleturn;
- ziptic |= ZT_ANGLE;
- }
-
- if (cmd->buttons != oldcmd.buttons)
- {
- WRITEUINT16(demo_p,cmd->buttons);
- oldcmd.buttons = cmd->buttons;
- ziptic |= ZT_BUTTONS;
- }
-
- if (cmd->aiming != oldcmd.aiming)
- {
- WRITEINT16(demo_p,cmd->aiming);
- oldcmd.aiming = cmd->aiming;
- ziptic |= ZT_AIMING;
- }
-
- *ziptic_p = ziptic;
-
- // attention here for the ticcmd size!
- // latest demos with mouse aiming byte in ticcmd
- if (!(demoflags & DF_GHOST) && ziptic_p > demoend - 9)
- {
- G_CheckDemoStatus(); // no more space
- return;
- }
-}
-
-void G_GhostAddThok(void)
-{
- if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
- return;
- ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_THOK;
-}
-
-void G_GhostAddSpin(void)
-{
- if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
- return;
- ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_SPIN;
-}
-
-void G_GhostAddRev(void)
-{
- if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
- return;
- ghostext.flags = (ghostext.flags & ~EZT_THOKMASK) | EZT_REV;
-}
-
-void G_GhostAddFlip(void)
-{
- if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
- return;
- ghostext.flags |= EZT_FLIP;
-}
-
-void G_GhostAddColor(ghostcolor_t color)
-{
- if (!demorecording || !(demoflags & DF_GHOST))
- return;
- if (ghostext.lastcolor == (UINT8)color)
- {
- ghostext.flags &= ~EZT_COLOR;
- return;
- }
- ghostext.flags |= EZT_COLOR;
- ghostext.color = (UINT8)color;
-}
-
-void G_GhostAddScale(fixed_t scale)
-{
- if (!metalrecording && (!demorecording || !(demoflags & DF_GHOST)))
- return;
- if (ghostext.lastscale == scale)
- {
- ghostext.flags &= ~EZT_SCALE;
- return;
- }
- ghostext.flags |= EZT_SCALE;
- ghostext.scale = scale;
-}
-
-void G_GhostAddHit(mobj_t *victim)
-{
- if (!demorecording || !(demoflags & DF_GHOST))
- return;
- ghostext.flags |= EZT_HIT;
- ghostext.hits++;
- ghostext.hitlist = Z_Realloc(ghostext.hitlist, ghostext.hits * sizeof(mobj_t *), PU_LEVEL, NULL);
- ghostext.hitlist[ghostext.hits-1] = victim;
-}
-
-void G_WriteGhostTic(mobj_t *ghost)
-{
- char ziptic = 0;
- UINT8 *ziptic_p;
- UINT32 i;
- fixed_t height;
-
- if (!demo_p)
- return;
- if (!(demoflags & DF_GHOST))
- return; // No ghost data to write.
-
- ziptic_p = demo_p++; // the ziptic, written at the end of this function
-
- #define MAXMOM (0xFFFF<<8)
-
- // GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
- if (abs(ghost->x-oldghost.x) > MAXMOM
- || abs(ghost->y-oldghost.y) > MAXMOM
- || abs(ghost->z-oldghost.z) > MAXMOM)
- {
- oldghost.x = ghost->x;
- oldghost.y = ghost->y;
- oldghost.z = ghost->z;
- ziptic |= GZT_XYZ;
- WRITEFIXED(demo_p,oldghost.x);
- WRITEFIXED(demo_p,oldghost.y);
- WRITEFIXED(demo_p,oldghost.z);
- }
- else
- {
- // For moving normally:
- // Store one full byte of movement, plus one byte of fractional movement.
- INT16 momx = (INT16)((ghost->x-oldghost.x)>>8);
- INT16 momy = (INT16)((ghost->y-oldghost.y)>>8);
- if (momx != oldghost.momx
- || momy != oldghost.momy)
- {
- oldghost.momx = momx;
- oldghost.momy = momy;
- ziptic |= GZT_MOMXY;
- WRITEINT16(demo_p,momx);
- WRITEINT16(demo_p,momy);
- }
- momx = (INT16)((ghost->z-oldghost.z)>>8);
- if (momx != oldghost.momz)
- {
- oldghost.momz = momx;
- ziptic |= GZT_MOMZ;
- WRITEINT16(demo_p,momx);
- }
-
- // This SHOULD set oldghost.x/y/z to match ghost->x/y/z
- // but it keeps the fractional loss of one byte,
- // so it will hopefully be made up for in future tics.
- oldghost.x += oldghost.momx<<8;
- oldghost.y += oldghost.momy<<8;
- oldghost.z += oldghost.momz<<8;
- }
-
- #undef MAXMOM
-
- // Only store the 8 most relevant bits of angle
- // because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
- // and it does not affect this mode of movement at all anyway.
- if (ghost->player && ghost->player->drawangle>>24 != oldghost.angle)
- {
- oldghost.angle = ghost->player->drawangle>>24;
- ziptic |= GZT_ANGLE;
- WRITEUINT8(demo_p,oldghost.angle);
- }
-
- // Store the sprite frame.
- if ((ghost->frame & FF_FRAMEMASK) != oldghost.frame)
- {
- oldghost.frame = (ghost->frame & FF_FRAMEMASK);
- ziptic |= GZT_FRAME;
- WRITEUINT8(demo_p,oldghost.frame);
- }
-
- if (ghost->sprite == SPR_PLAY
- && ghost->sprite2 != oldghost.sprite2)
- {
- oldghost.sprite2 = ghost->sprite2;
- ziptic |= GZT_SPR2;
- WRITEUINT8(demo_p,oldghost.sprite2);
- }
-
- // Check for sprite set changes
- if (ghost->sprite != oldghost.sprite)
- {
- oldghost.sprite = ghost->sprite;
- ghostext.flags |= EZT_SPRITE;
- }
-
- if ((height = FixedDiv(ghost->height, ghost->scale)) != oldghost.height)
- {
- oldghost.height = height;
- ghostext.flags |= EZT_HEIGHT;
- }
-
- if (ghostext.flags)
- {
- ziptic |= GZT_EXTRA;
-
- if (ghostext.color == ghostext.lastcolor)
- ghostext.flags &= ~EZT_COLOR;
- if (ghostext.scale == ghostext.lastscale)
- ghostext.flags &= ~EZT_SCALE;
-
- WRITEUINT8(demo_p,ghostext.flags);
- if (ghostext.flags & EZT_COLOR)
- {
- WRITEUINT8(demo_p,ghostext.color);
- ghostext.lastcolor = ghostext.color;
- }
- if (ghostext.flags & EZT_SCALE)
- {
- WRITEFIXED(demo_p,ghostext.scale);
- ghostext.lastscale = ghostext.scale;
- }
- if (ghostext.flags & EZT_HIT)
- {
- WRITEUINT16(demo_p,ghostext.hits);
- for (i = 0; i < ghostext.hits; i++)
- {
- mobj_t *mo = ghostext.hitlist[i];
- //WRITEUINT32(demo_p,UINT32_MAX); // reserved for some method of determining exactly which mobj this is. (mobjnum doesn't work here.)
- WRITEUINT32(demo_p,mo->type);
- WRITEUINT16(demo_p,(UINT16)mo->health);
- WRITEFIXED(demo_p,mo->x);
- WRITEFIXED(demo_p,mo->y);
- WRITEFIXED(demo_p,mo->z);
- WRITEANGLE(demo_p,mo->angle);
- }
- Z_Free(ghostext.hitlist);
- ghostext.hits = 0;
- ghostext.hitlist = NULL;
- }
- if (ghostext.flags & EZT_SPRITE)
- WRITEUINT16(demo_p,oldghost.sprite);
- if (ghostext.flags & EZT_HEIGHT)
- {
- height >>= FRACBITS;
- WRITEINT16(demo_p, height);
- }
- ghostext.flags = 0;
- }
-
- if (ghost->player && ghost->player->followmobj && !(ghost->player->followmobj->sprite == SPR_NULL || (ghost->player->followmobj->flags2 & MF2_DONTDRAW))) // bloats tails runs but what can ya do
- {
- INT16 temp;
- UINT8 *followtic_p = demo_p++;
- UINT8 followtic = 0;
-
- ziptic |= GZT_FOLLOW;
-
- if (ghost->player->followmobj->skin)
- followtic |= FZT_SKIN;
-
- if (!(oldghost.flags2 & MF2_AMBUSH))
- {
- followtic |= FZT_SPAWNED;
- WRITEINT16(demo_p,ghost->player->followmobj->info->height>>FRACBITS);
- if (ghost->player->followmobj->flags2 & MF2_LINKDRAW)
- followtic |= FZT_LINKDRAW;
- if (ghost->player->followmobj->colorized)
- followtic |= FZT_COLORIZED;
- if (followtic & FZT_SKIN)
- WRITEUINT8(demo_p,(UINT8)(((skin_t *)(ghost->player->followmobj->skin))-skins));
- oldghost.flags2 |= MF2_AMBUSH;
- }
-
- if (ghost->player->followmobj->scale != ghost->scale)
- {
- followtic |= FZT_SCALE;
- WRITEFIXED(demo_p,ghost->player->followmobj->scale);
- }
-
- temp = (INT16)((ghost->player->followmobj->x-ghost->x)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((ghost->player->followmobj->y-ghost->y)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((ghost->player->followmobj->z-ghost->z)>>8);
- WRITEINT16(demo_p,temp);
- if (followtic & FZT_SKIN)
- WRITEUINT8(demo_p,ghost->player->followmobj->sprite2);
- WRITEUINT16(demo_p,ghost->player->followmobj->sprite);
- WRITEUINT8(demo_p,(ghost->player->followmobj->frame & FF_FRAMEMASK));
- WRITEUINT8(demo_p,ghost->player->followmobj->color);
-
- *followtic_p = followtic;
- }
- else
- oldghost.flags2 &= ~MF2_AMBUSH;
-
- *ziptic_p = ziptic;
-
- // attention here for the ticcmd size!
- // latest demos with mouse aiming byte in ticcmd
- if (demo_p >= demoend - (13 + 9 + 9))
- {
- G_CheckDemoStatus(); // no more space
- return;
- }
-}
-
-// Uses ghost data to do consistency checks on your position.
-// This fixes desynchronising demos when fighting eggman.
-void G_ConsGhostTic(void)
-{
- UINT8 ziptic;
- UINT16 px,py,pz,gx,gy,gz;
- mobj_t *testmo;
-
- if (!demo_p || !demo_start)
- return;
- if (!(demoflags & DF_GHOST))
- return; // No ghost data to use.
-
- testmo = players[0].mo;
-
- // Grab ghost data.
- ziptic = READUINT8(demo_p);
- if (ziptic & GZT_XYZ)
- {
- oldghost.x = READFIXED(demo_p);
- oldghost.y = READFIXED(demo_p);
- oldghost.z = READFIXED(demo_p);
- }
- else
- {
- if (ziptic & GZT_MOMXY)
- {
- oldghost.momx = READINT16(demo_p)<<8;
- oldghost.momy = READINT16(demo_p)<<8;
- }
- if (ziptic & GZT_MOMZ)
- oldghost.momz = READINT16(demo_p)<<8;
- oldghost.x += oldghost.momx;
- oldghost.y += oldghost.momy;
- oldghost.z += oldghost.momz;
- }
- if (ziptic & GZT_ANGLE)
- demo_p++;
- if (ziptic & GZT_FRAME)
- demo_p++;
- if (ziptic & GZT_SPR2)
- demo_p++;
-
- if (ziptic & GZT_EXTRA)
- { // But wait, there's more!
- UINT8 xziptic = READUINT8(demo_p);
- if (xziptic & EZT_COLOR)
- demo_p++;
- if (xziptic & EZT_SCALE)
- demo_p += sizeof(fixed_t);
- if (xziptic & EZT_HIT)
- { // Resync mob damage.
- UINT16 i, count = READUINT16(demo_p);
- thinker_t *th;
- mobj_t *mobj;
-
- UINT32 type;
- UINT16 health;
- fixed_t x;
- fixed_t y;
- fixed_t z;
-
- for (i = 0; i < count; i++)
- {
- //demo_p += 4; // reserved.
- type = READUINT32(demo_p);
- health = READUINT16(demo_p);
- x = READFIXED(demo_p);
- y = READFIXED(demo_p);
- z = READFIXED(demo_p);
- demo_p += sizeof(angle_t); // angle, unnecessary for cons.
-
- mobj = NULL;
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
- mobj = (mobj_t *)th;
- if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z)
- break;
- }
- if (th != &thlist[THINK_MOBJ] && mobj->health != health) // Wasn't damaged?! This is desync! Fix it!
- {
- if (demosynced)
- CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
- demosynced = false;
- P_DamageMobj(mobj, players[0].mo, players[0].mo, 1, 0);
- }
- }
- }
- if (xziptic & EZT_SPRITE)
- demo_p += sizeof(UINT16);
- if (xziptic & EZT_HEIGHT)
- demo_p += sizeof(INT16);
- }
-
- if (ziptic & GZT_FOLLOW)
- { // Even more...
- UINT8 followtic = READUINT8(demo_p);
- if (followtic & FZT_SPAWNED)
- {
- demo_p += sizeof(INT16);
- if (followtic & FZT_SKIN)
- demo_p++;
- }
- if (followtic & FZT_SCALE)
- demo_p += sizeof(fixed_t);
- demo_p += sizeof(INT16);
- demo_p += sizeof(INT16);
- demo_p += sizeof(INT16);
- if (followtic & FZT_SKIN)
- demo_p++;
- demo_p += sizeof(UINT16);
- demo_p++;
- demo_p++;
- }
-
- // Re-synchronise
- px = testmo->x>>FRACBITS;
- py = testmo->y>>FRACBITS;
- pz = testmo->z>>FRACBITS;
- gx = oldghost.x>>FRACBITS;
- gy = oldghost.y>>FRACBITS;
- gz = oldghost.z>>FRACBITS;
-
- if (px != gx || py != gy || pz != gz)
- {
- if (demosynced)
- CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
- demosynced = false;
-
- P_UnsetThingPosition(testmo);
- testmo->x = oldghost.x;
- testmo->y = oldghost.y;
- P_SetThingPosition(testmo);
- testmo->z = oldghost.z;
- }
-
- if (*demo_p == DEMOMARKER)
- {
- // end of demo data stream
- G_CheckDemoStatus();
- return;
- }
-}
-
-void G_GhostTicker(void)
-{
- demoghost *g,*p;
- for(g = ghosts, p = NULL; g; g = g->next)
- {
- // Skip normal demo data.
- UINT8 ziptic = READUINT8(g->p);
- UINT8 xziptic = 0;
- if (ziptic & ZT_FWD)
- g->p++;
- if (ziptic & ZT_SIDE)
- g->p++;
- if (ziptic & ZT_ANGLE)
- g->p += 2;
- if (ziptic & ZT_BUTTONS)
- g->p += 2;
- if (ziptic & ZT_AIMING)
- g->p += 2;
-
- // Grab ghost data.
- ziptic = READUINT8(g->p);
- if (ziptic & GZT_XYZ)
- {
- g->oldmo.x = READFIXED(g->p);
- g->oldmo.y = READFIXED(g->p);
- g->oldmo.z = READFIXED(g->p);
- }
- else
- {
- if (ziptic & GZT_MOMXY)
- {
- g->oldmo.momx = READINT16(g->p)<<8;
- g->oldmo.momy = READINT16(g->p)<<8;
- }
- if (ziptic & GZT_MOMZ)
- g->oldmo.momz = READINT16(g->p)<<8;
- g->oldmo.x += g->oldmo.momx;
- g->oldmo.y += g->oldmo.momy;
- g->oldmo.z += g->oldmo.momz;
- }
- if (ziptic & GZT_ANGLE)
- g->mo->angle = READUINT8(g->p)<<24;
- if (ziptic & GZT_FRAME)
- g->oldmo.frame = READUINT8(g->p);
- if (ziptic & GZT_SPR2)
- g->oldmo.sprite2 = READUINT8(g->p);
-
- // Update ghost
- P_UnsetThingPosition(g->mo);
- g->mo->x = g->oldmo.x;
- g->mo->y = g->oldmo.y;
- g->mo->z = g->oldmo.z;
- P_SetThingPosition(g->mo);
- g->mo->frame = g->oldmo.frame | tr_trans30<<FF_TRANSSHIFT;
- if (g->fadein)
- {
- g->mo->frame += (((--g->fadein)/6)<<FF_TRANSSHIFT); // this calc never exceeds 9 unless g->fadein is bad, and it's only set once, so...
- g->mo->flags2 &= ~MF2_DONTDRAW;
- }
- g->mo->sprite2 = g->oldmo.sprite2;
-
- if (ziptic & GZT_EXTRA)
- { // But wait, there's more!
- xziptic = READUINT8(g->p);
- if (xziptic & EZT_COLOR)
- {
- g->color = READUINT8(g->p);
- switch(g->color)
- {
- default:
- case GHC_RETURNSKIN:
- g->mo->skin = g->oldmo.skin;
- /* FALLTHRU */
- case GHC_NORMAL: // Go back to skin color
- g->mo->color = g->oldmo.color;
- break;
- // Handled below
- case GHC_SUPER:
- case GHC_INVINCIBLE:
- break;
- case GHC_FIREFLOWER: // Fireflower
- g->mo->color = SKINCOLOR_WHITE;
- break;
- case GHC_NIGHTSSKIN: // not actually a colour
- g->mo->skin = &skins[DEFAULTNIGHTSSKIN];
- break;
- }
- }
- if (xziptic & EZT_FLIP)
- g->mo->eflags ^= MFE_VERTICALFLIP;
- if (xziptic & EZT_SCALE)
- {
- g->mo->destscale = READFIXED(g->p);
- if (g->mo->destscale != g->mo->scale)
- P_SetScale(g->mo, g->mo->destscale);
- }
- if (xziptic & EZT_THOKMASK)
- { // Let's only spawn ONE of these per frame, thanks.
- mobj_t *mobj;
- INT32 type = -1;
- if (g->mo->skin)
- {
- skin_t *skin = (skin_t *)g->mo->skin;
- switch (xziptic & EZT_THOKMASK)
- {
- case EZT_THOK:
- type = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
- break;
- case EZT_SPIN:
- type = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
- break;
- case EZT_REV:
- type = skin->revitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
- break;
- }
- }
- if (type != MT_NULL)
- {
- if (type == MT_GHOST)
- {
- mobj = P_SpawnGhostMobj(g->mo); // does a large portion of the work for us
- mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|tr_trans60<<FF_TRANSSHIFT; // P_SpawnGhostMobj sets trans50, we want trans60
- }
- else
- {
- mobj = P_SpawnMobjFromMobj(g->mo, 0, 0, -FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
- mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
- mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
- mobj->color = g->mo->color;
- mobj->skin = g->mo->skin;
- P_SetScale(mobj, (mobj->destscale = g->mo->scale));
-
- if (type == MT_THOK) // spintrail-specific modification for MT_THOK
- {
- mobj->frame = FF_TRANS80;
- mobj->fuse = mobj->tics;
- }
- mobj->tics = -1; // nope.
- }
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_UnsetThingPosition(mobj);
- mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
- P_SetThingPosition(mobj);
- if (!mobj->fuse)
- mobj->fuse = 8;
- P_SetTarget(&mobj->target, g->mo);
- }
- }
- if (xziptic & EZT_HIT)
- { // Spawn hit poofs for killing things!
- UINT16 i, count = READUINT16(g->p), health;
- UINT32 type;
- fixed_t x,y,z;
- angle_t angle;
- mobj_t *poof;
- for (i = 0; i < count; i++)
- {
- //g->p += 4; // reserved
- type = READUINT32(g->p);
- health = READUINT16(g->p);
- x = READFIXED(g->p);
- y = READFIXED(g->p);
- z = READFIXED(g->p);
- angle = READANGLE(g->p);
- if (!(mobjinfo[type].flags & MF_SHOOTABLE)
- || !(mobjinfo[type].flags & (MF_ENEMY|MF_MONITOR))
- || health != 0 || i >= 4) // only spawn for the first 4 hits per frame, to prevent ghosts from splode-spamming too bad.
- continue;
- poof = P_SpawnMobj(x, y, z, MT_GHOST);
- poof->angle = angle;
- poof->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
- poof->health = 0;
- P_SetMobjStateNF(poof, S_XPLD1);
- }
- }
- if (xziptic & EZT_SPRITE)
- g->mo->sprite = READUINT16(g->p);
- if (xziptic & EZT_HEIGHT)
- {
- fixed_t temp = READINT16(g->p)<<FRACBITS;
- g->mo->height = FixedMul(temp, g->mo->scale);
- }
- }
-
- // Tick ghost colors (Super and Mario Invincibility flashing)
- switch(g->color)
- {
- case GHC_SUPER: // Super (P_DoSuperStuff)
- if (g->mo->skin)
- {
- skin_t *skin = (skin_t *)g->mo->skin;
- g->mo->color = skin->supercolor;
- }
- else
- g->mo->color = SKINCOLOR_SUPERGOLD1;
- g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4);
- break;
- case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer)
- g->mo->color = (UINT8)(SKINCOLOR_RUBY + (leveltime % (MAXSKINCOLORS - SKINCOLOR_RUBY))); // Passes through all saturated colours
- break;
- default:
- break;
- }
-
-#define follow g->mo->tracer
- if (ziptic & GZT_FOLLOW)
- { // Even more...
- UINT8 followtic = READUINT8(g->p);
- fixed_t temp;
- if (followtic & FZT_SPAWNED)
- {
- if (follow)
- P_RemoveMobj(follow);
- P_SetTarget(&follow, P_SpawnMobjFromMobj(g->mo, 0, 0, 0, MT_GHOST));
- P_SetTarget(&follow->tracer, g->mo);
- follow->tics = -1;
- temp = READINT16(g->p)<<FRACBITS;
- follow->height = FixedMul(follow->scale, temp);
-
- if (followtic & FZT_LINKDRAW)
- follow->flags2 |= MF2_LINKDRAW;
-
- if (followtic & FZT_COLORIZED)
- follow->colorized = true;
-
- if (followtic & FZT_SKIN)
- follow->skin = &skins[READUINT8(g->p)];
- }
- if (follow)
- {
- if (followtic & FZT_SCALE)
- follow->destscale = READFIXED(g->p);
- else
- follow->destscale = g->mo->destscale;
- if (follow->destscale != follow->scale)
- P_SetScale(follow, follow->destscale);
-
- P_UnsetThingPosition(follow);
- temp = READINT16(g->p)<<8;
- follow->x = g->mo->x + temp;
- temp = READINT16(g->p)<<8;
- follow->y = g->mo->y + temp;
- temp = READINT16(g->p)<<8;
- follow->z = g->mo->z + temp;
- P_SetThingPosition(follow);
- if (followtic & FZT_SKIN)
- follow->sprite2 = READUINT8(g->p);
- else
- follow->sprite2 = 0;
- follow->sprite = READUINT16(g->p);
- follow->frame = (READUINT8(g->p)) | (g->mo->frame & FF_TRANSMASK);
- follow->angle = g->mo->angle;
- follow->color = READUINT8(g->p);
-
- if (!(followtic & FZT_SPAWNED))
- {
- if (xziptic & EZT_FLIP)
- {
- follow->flags2 ^= MF2_OBJECTFLIP;
- follow->eflags ^= MFE_VERTICALFLIP;
- }
- }
- }
- }
- else if (follow)
- {
- P_RemoveMobj(follow);
- P_SetTarget(&follow, NULL);
- }
- // Demo ends after ghost data.
- if (*g->p == DEMOMARKER)
- {
- g->mo->momx = g->mo->momy = g->mo->momz = 0;
-#if 1 // freeze frame (maybe more useful for time attackers)
- g->mo->colorized = true;
- if (follow)
- follow->colorized = true;
-#else // dissapearing act
- g->mo->fuse = TICRATE;
- if (follow)
- follow->fuse = TICRATE;
-#endif
- if (p)
- p->next = g->next;
- else
- ghosts = g->next;
- Z_Free(g);
- continue;
- }
- p = g;
-#undef follow
- }
-}
-
-void G_ReadMetalTic(mobj_t *metal)
-{
- UINT8 ziptic;
- UINT8 xziptic = 0;
-
- if (!metal_p)
- return;
-
- if (!metal->health)
- {
- G_StopMetalDemo();
- return;
- }
-
- switch (*metal_p)
- {
- case METALSNICE:
- break;
- case METALDEATH:
- if (metal->tracer)
- P_RemoveMobj(metal->tracer);
- P_KillMobj(metal, NULL, NULL, 0);
- /* FALLTHRU */
- case DEMOMARKER:
- default:
- // end of demo data stream
- G_StopMetalDemo();
- return;
- }
- metal_p++;
-
- ziptic = READUINT8(metal_p);
-
- // Read changes from the tic
- if (ziptic & GZT_XYZ)
- {
- P_TeleportMove(metal, READFIXED(metal_p), READFIXED(metal_p), READFIXED(metal_p));
- oldmetal.x = metal->x;
- oldmetal.y = metal->y;
- oldmetal.z = metal->z;
- }
- else
- {
- if (ziptic & GZT_MOMXY)
- {
- oldmetal.momx = READINT16(metal_p)<<8;
- oldmetal.momy = READINT16(metal_p)<<8;
- }
- if (ziptic & GZT_MOMZ)
- oldmetal.momz = READINT16(metal_p)<<8;
- oldmetal.x += oldmetal.momx;
- oldmetal.y += oldmetal.momy;
- oldmetal.z += oldmetal.momz;
- }
- if (ziptic & GZT_ANGLE)
- metal->angle = READUINT8(metal_p)<<24;
- if (ziptic & GZT_FRAME)
- oldmetal.frame = READUINT32(metal_p);
- if (ziptic & GZT_SPR2)
- oldmetal.sprite2 = READUINT8(metal_p);
-
- // Set movement, position, and angle
- // oldmetal contains where you're supposed to be.
- metal->momx = oldmetal.momx;
- metal->momy = oldmetal.momy;
- metal->momz = oldmetal.momz;
- P_UnsetThingPosition(metal);
- metal->x = oldmetal.x;
- metal->y = oldmetal.y;
- metal->z = oldmetal.z;
- P_SetThingPosition(metal);
- metal->frame = oldmetal.frame;
- metal->sprite2 = oldmetal.sprite2;
-
- if (ziptic & GZT_EXTRA)
- { // But wait, there's more!
- xziptic = READUINT8(metal_p);
- if (xziptic & EZT_FLIP)
- {
- metal->eflags ^= MFE_VERTICALFLIP;
- metal->flags2 ^= MF2_OBJECTFLIP;
- }
- if (xziptic & EZT_SCALE)
- {
- metal->destscale = READFIXED(metal_p);
- if (metal->destscale != metal->scale)
- P_SetScale(metal, metal->destscale);
- }
- if (xziptic & EZT_THOKMASK)
- { // Let's only spawn ONE of these per frame, thanks.
- mobj_t *mobj;
- INT32 type = -1;
- if (metal->skin)
- {
- skin_t *skin = (skin_t *)metal->skin;
- switch (xziptic & EZT_THOKMASK)
- {
- case EZT_THOK:
- type = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
- break;
- case EZT_SPIN:
- type = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
- break;
- case EZT_REV:
- type = skin->revitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
- break;
- }
- }
- if (type != MT_NULL)
- {
- if (type == MT_GHOST)
- {
- mobj = P_SpawnGhostMobj(metal); // does a large portion of the work for us
- }
- else
- {
- mobj = P_SpawnMobjFromMobj(metal, 0, 0, -FixedDiv(FixedMul(metal->info->height, metal->scale) - metal->height,3*FRACUNIT), MT_THOK);
- mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
- mobj->frame = states[mobjinfo[type].spawnstate].frame;
- mobj->angle = metal->angle;
- mobj->color = metal->color;
- mobj->skin = metal->skin;
- P_SetScale(mobj, (mobj->destscale = metal->scale));
-
- if (type == MT_THOK) // spintrail-specific modification for MT_THOK
- {
- mobj->frame = FF_TRANS70;
- mobj->fuse = mobj->tics;
- }
- mobj->tics = -1; // nope.
- }
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_UnsetThingPosition(mobj);
- mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
- P_SetThingPosition(mobj);
- if (!mobj->fuse)
- mobj->fuse = 8;
- P_SetTarget(&mobj->target, metal);
- }
- }
- if (xziptic & EZT_SPRITE)
- metal->sprite = READUINT16(metal_p);
- if (xziptic & EZT_HEIGHT)
- {
- fixed_t temp = READINT16(metal_p)<<FRACBITS;
- metal->height = FixedMul(temp, metal->scale);
- }
- }
-
-#define follow metal->tracer
- if (ziptic & GZT_FOLLOW)
- { // Even more...
- UINT8 followtic = READUINT8(metal_p);
- fixed_t temp;
- if (followtic & FZT_SPAWNED)
- {
- if (follow)
- P_RemoveMobj(follow);
- P_SetTarget(&follow, P_SpawnMobjFromMobj(metal, 0, 0, 0, MT_GHOST));
- P_SetTarget(&follow->tracer, metal);
- follow->tics = -1;
- temp = READINT16(metal_p)<<FRACBITS;
- follow->height = FixedMul(follow->scale, temp);
-
- if (followtic & FZT_LINKDRAW)
- follow->flags2 |= MF2_LINKDRAW;
-
- if (followtic & FZT_COLORIZED)
- follow->colorized = true;
-
- if (followtic & FZT_SKIN)
- follow->skin = &skins[READUINT8(metal_p)];
- }
- if (follow)
- {
- if (followtic & FZT_SCALE)
- follow->destscale = READFIXED(metal_p);
- else
- follow->destscale = metal->destscale;
- if (follow->destscale != follow->scale)
- P_SetScale(follow, follow->destscale);
-
- P_UnsetThingPosition(follow);
- temp = READINT16(metal_p)<<8;
- follow->x = metal->x + temp;
- temp = READINT16(metal_p)<<8;
- follow->y = metal->y + temp;
- temp = READINT16(metal_p)<<8;
- follow->z = metal->z + temp;
- P_SetThingPosition(follow);
- if (followtic & FZT_SKIN)
- follow->sprite2 = READUINT8(metal_p);
- else
- follow->sprite2 = 0;
- follow->sprite = READUINT16(metal_p);
- follow->frame = READUINT32(metal_p); // NOT & FF_FRAMEMASK here, so 32 bits
- follow->angle = metal->angle;
- follow->color = READUINT8(metal_p);
-
- if (!(followtic & FZT_SPAWNED))
- {
- if (xziptic & EZT_FLIP)
- {
- follow->flags2 ^= MF2_OBJECTFLIP;
- follow->eflags ^= MFE_VERTICALFLIP;
- }
- }
- }
- }
- else if (follow)
- {
- P_RemoveMobj(follow);
- P_SetTarget(&follow, NULL);
- }
-#undef follow
-}
-
-void G_WriteMetalTic(mobj_t *metal)
-{
- UINT8 ziptic = 0;
- UINT8 *ziptic_p;
- fixed_t height;
-
- if (!demo_p) // demo_p will be NULL until the race start linedef executor is activated!
- return;
-
- WRITEUINT8(demo_p, METALSNICE);
- ziptic_p = demo_p++; // the ziptic, written at the end of this function
-
- #define MAXMOM (0xFFFF<<8)
-
- // GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
- if (abs(metal->x-oldmetal.x) > MAXMOM
- || abs(metal->y-oldmetal.y) > MAXMOM
- || abs(metal->z-oldmetal.z) > MAXMOM)
- {
- oldmetal.x = metal->x;
- oldmetal.y = metal->y;
- oldmetal.z = metal->z;
- ziptic |= GZT_XYZ;
- WRITEFIXED(demo_p,oldmetal.x);
- WRITEFIXED(demo_p,oldmetal.y);
- WRITEFIXED(demo_p,oldmetal.z);
- }
- else
- {
- // For moving normally:
- // Store one full byte of movement, plus one byte of fractional movement.
- INT16 momx = (INT16)((metal->x-oldmetal.x)>>8);
- INT16 momy = (INT16)((metal->y-oldmetal.y)>>8);
- if (momx != oldmetal.momx
- || momy != oldmetal.momy)
- {
- oldmetal.momx = momx;
- oldmetal.momy = momy;
- ziptic |= GZT_MOMXY;
- WRITEINT16(demo_p,momx);
- WRITEINT16(demo_p,momy);
- }
- momx = (INT16)((metal->z-oldmetal.z)>>8);
- if (momx != oldmetal.momz)
- {
- oldmetal.momz = momx;
- ziptic |= GZT_MOMZ;
- WRITEINT16(demo_p,momx);
- }
-
- // This SHOULD set oldmetal.x/y/z to match metal->x/y/z
- // but it keeps the fractional loss of one byte,
- // so it will hopefully be made up for in future tics.
- oldmetal.x += oldmetal.momx<<8;
- oldmetal.y += oldmetal.momy<<8;
- oldmetal.z += oldmetal.momz<<8;
- }
-
- #undef MAXMOM
-
- // Only store the 8 most relevant bits of angle
- // because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
- // and it does not affect movement at all anyway.
- if (metal->player && metal->player->drawangle>>24 != oldmetal.angle)
- {
- oldmetal.angle = metal->player->drawangle>>24;
- ziptic |= GZT_ANGLE;
- WRITEUINT8(demo_p,oldmetal.angle);
- }
-
- // Store the sprite frame.
- if ((metal->frame & FF_FRAMEMASK) != oldmetal.frame)
- {
- oldmetal.frame = metal->frame; // NOT & FF_FRAMEMASK here, so 32 bits
- ziptic |= GZT_FRAME;
- WRITEUINT32(demo_p,oldmetal.frame);
- }
-
- if (metal->sprite == SPR_PLAY
- && metal->sprite2 != oldmetal.sprite2)
- {
- oldmetal.sprite2 = metal->sprite2;
- ziptic |= GZT_SPR2;
- WRITEUINT8(demo_p,oldmetal.sprite2);
- }
-
- // Check for sprite set changes
- if (metal->sprite != oldmetal.sprite)
- {
- oldmetal.sprite = metal->sprite;
- ghostext.flags |= EZT_SPRITE;
- }
-
- if ((height = FixedDiv(metal->height, metal->scale)) != oldmetal.height)
- {
- oldmetal.height = height;
- ghostext.flags |= EZT_HEIGHT;
- }
-
- if (ghostext.flags & ~(EZT_COLOR|EZT_HIT)) // these two aren't handled by metal ever
- {
- ziptic |= GZT_EXTRA;
-
- if (ghostext.scale == ghostext.lastscale)
- ghostext.flags &= ~EZT_SCALE;
-
- WRITEUINT8(demo_p,ghostext.flags);
- if (ghostext.flags & EZT_SCALE)
- {
- WRITEFIXED(demo_p,ghostext.scale);
- ghostext.lastscale = ghostext.scale;
- }
- if (ghostext.flags & EZT_SPRITE)
- WRITEUINT16(demo_p,oldmetal.sprite);
- if (ghostext.flags & EZT_HEIGHT)
- {
- height >>= FRACBITS;
- WRITEINT16(demo_p, height);
- }
- ghostext.flags = 0;
- }
-
- if (metal->player && metal->player->followmobj && !(metal->player->followmobj->sprite == SPR_NULL || (metal->player->followmobj->flags2 & MF2_DONTDRAW)))
- {
- INT16 temp;
- UINT8 *followtic_p = demo_p++;
- UINT8 followtic = 0;
-
- ziptic |= GZT_FOLLOW;
-
- if (metal->player->followmobj->skin)
- followtic |= FZT_SKIN;
-
- if (!(oldmetal.flags2 & MF2_AMBUSH))
- {
- followtic |= FZT_SPAWNED;
- WRITEINT16(demo_p,metal->player->followmobj->info->height>>FRACBITS);
- if (metal->player->followmobj->flags2 & MF2_LINKDRAW)
- followtic |= FZT_LINKDRAW;
- if (metal->player->followmobj->colorized)
- followtic |= FZT_COLORIZED;
- if (followtic & FZT_SKIN)
- WRITEUINT8(demo_p,(UINT8)(((skin_t *)(metal->player->followmobj->skin))-skins));
- oldmetal.flags2 |= MF2_AMBUSH;
- }
-
- if (metal->player->followmobj->scale != metal->scale)
- {
- followtic |= FZT_SCALE;
- WRITEFIXED(demo_p,metal->player->followmobj->scale);
- }
-
- temp = (INT16)((metal->player->followmobj->x-metal->x)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((metal->player->followmobj->y-metal->y)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((metal->player->followmobj->z-metal->z)>>8);
- WRITEINT16(demo_p,temp);
- if (followtic & FZT_SKIN)
- WRITEUINT8(demo_p,metal->player->followmobj->sprite2);
- WRITEUINT16(demo_p,metal->player->followmobj->sprite);
- WRITEUINT32(demo_p,metal->player->followmobj->frame); // NOT & FF_FRAMEMASK here, so 32 bits
- WRITEUINT8(demo_p,metal->player->followmobj->color);
-
- *followtic_p = followtic;
- }
- else
- oldmetal.flags2 &= ~MF2_AMBUSH;
-
- *ziptic_p = ziptic;
-
- // attention here for the ticcmd size!
- // latest demos with mouse aiming byte in ticcmd
- if (demo_p >= demoend - 32)
- {
- G_StopMetalRecording(false); // no more space
- return;
- }
-}
-
-//
-// G_RecordDemo
-//
-void G_RecordDemo(const char *name)
-{
- INT32 maxsize;
-
- strcpy(demoname, name);
- strcat(demoname, ".lmp");
- maxsize = 1024*1024;
- if (M_CheckParm("-maxdemo") && M_IsNextParm())
- maxsize = atoi(M_GetNextParm()) * 1024;
-// if (demobuffer)
-// free(demobuffer);
- demo_p = NULL;
- demobuffer = malloc(maxsize);
- demoend = demobuffer + maxsize;
-
- demorecording = true;
-}
-
-void G_RecordMetal(void)
-{
- INT32 maxsize;
- maxsize = 1024*1024;
- if (M_CheckParm("-maxdemo") && M_IsNextParm())
- maxsize = atoi(M_GetNextParm()) * 1024;
- demo_p = NULL;
- demobuffer = malloc(maxsize);
- demoend = demobuffer + maxsize;
- metalrecording = true;
-}
-
-void G_BeginRecording(void)
-{
- UINT8 i;
- char name[16];
- player_t *player = &players[consoleplayer];
-
- if (demo_p)
- return;
- memset(name,0,sizeof(name));
-
- demo_p = demobuffer;
- demoflags = DF_GHOST|(modeattacking<<DF_ATTACKSHIFT);
-
- // Setup header.
- M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
- WRITEUINT8(demo_p,VERSION);
- WRITEUINT8(demo_p,SUBVERSION);
- WRITEUINT16(demo_p,DEMOVERSION);
-
- // demo checksum
- demo_p += 16;
-
- // game data
- M_Memcpy(demo_p, "PLAY", 4); demo_p += 4;
- WRITEINT16(demo_p,gamemap);
- M_Memcpy(demo_p, mapmd5, 16); demo_p += 16;
-
- WRITEUINT8(demo_p,demoflags);
- switch ((demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
- {
- case ATTACKING_NONE: // 0
- break;
- case ATTACKING_RECORD: // 1
- demotime_p = demo_p;
- WRITEUINT32(demo_p,UINT32_MAX); // time
- WRITEUINT32(demo_p,0); // score
- WRITEUINT16(demo_p,0); // rings
- break;
- case ATTACKING_NIGHTS: // 2
- demotime_p = demo_p;
- WRITEUINT32(demo_p,UINT32_MAX); // time
- WRITEUINT32(demo_p,0); // score
- break;
- default: // 3
- break;
- }
-
- WRITEUINT32(demo_p,P_GetInitSeed());
-
- // Name
- for (i = 0; i < 16 && cv_playername.string[i]; i++)
- name[i] = cv_playername.string[i];
- for (; i < 16; i++)
- name[i] = '\0';
- M_Memcpy(demo_p,name,16);
- demo_p += 16;
-
- // Skin
- for (i = 0; i < 16 && cv_skin.string[i]; i++)
- name[i] = cv_skin.string[i];
- for (; i < 16; i++)
- name[i] = '\0';
- M_Memcpy(demo_p,name,16);
- demo_p += 16;
-
- // Color
- for (i = 0; i < 16 && cv_playercolor.string[i]; i++)
- name[i] = cv_playercolor.string[i];
- for (; i < 16; i++)
- name[i] = '\0';
- M_Memcpy(demo_p,name,16);
- demo_p += 16;
-
- // Stats
- WRITEUINT8(demo_p,player->charability);
- WRITEUINT8(demo_p,player->charability2);
- WRITEUINT8(demo_p,player->actionspd>>FRACBITS);
- WRITEUINT8(demo_p,player->mindash>>FRACBITS);
- WRITEUINT8(demo_p,player->maxdash>>FRACBITS);
- WRITEUINT8(demo_p,player->normalspeed>>FRACBITS);
- WRITEUINT8(demo_p,player->runspeed>>FRACBITS);
- WRITEUINT8(demo_p,player->thrustfactor);
- WRITEUINT8(demo_p,player->accelstart);
- WRITEUINT8(demo_p,player->acceleration);
- WRITEUINT8(demo_p,player->height>>FRACBITS);
- WRITEUINT8(demo_p,player->spinheight>>FRACBITS);
- WRITEUINT8(demo_p,player->camerascale>>FRACBITS);
- WRITEUINT8(demo_p,player->shieldscale>>FRACBITS);
-
- // Trying to convert it back to % causes demo desync due to precision loss.
- // Don't do it.
- WRITEFIXED(demo_p, player->jumpfactor);
-
- // And mobjtype_t is best with UINT32 too...
- WRITEUINT32(demo_p, player->followitem);
-
- // Save pflag data - see SendWeaponPref()
- {
- UINT8 buf = 0;
- pflags_t pflags = 0;
- if (cv_flipcam.value)
- {
- buf |= 0x01;
- pflags |= PF_FLIPCAM;
- }
- if (cv_analog[0].value)
- {
- buf |= 0x02;
- pflags |= PF_ANALOGMODE;
- }
- if (cv_directionchar[0].value)
- {
- buf |= 0x04;
- pflags |= PF_DIRECTIONCHAR;
- }
- if (cv_autobrake.value)
- {
- buf |= 0x08;
- pflags |= PF_AUTOBRAKE;
- }
- if (cv_usejoystick.value)
- buf |= 0x10;
- CV_SetValue(&cv_showinputjoy, !!(cv_usejoystick.value));
-
- WRITEUINT8(demo_p,buf);
- player->pflags = pflags;
- }
-
- // Save netvar data
- CV_SaveNetVars(&demo_p);
-
- memset(&oldcmd,0,sizeof(oldcmd));
- memset(&oldghost,0,sizeof(oldghost));
- memset(&ghostext,0,sizeof(ghostext));
- ghostext.lastcolor = ghostext.color = GHC_NORMAL;
- ghostext.lastscale = ghostext.scale = FRACUNIT;
-
- if (player->mo)
- {
- oldghost.x = player->mo->x;
- oldghost.y = player->mo->y;
- oldghost.z = player->mo->z;
- oldghost.angle = player->mo->angle>>24;
-
- // preticker started us gravity flipped
- if (player->mo->eflags & MFE_VERTICALFLIP)
- ghostext.flags |= EZT_FLIP;
- }
-}
-
-void G_BeginMetal(void)
-{
- mobj_t *mo = players[consoleplayer].mo;
-
-#if 0
- if (demo_p)
- return;
-#endif
-
- demo_p = demobuffer;
-
- // Write header.
- M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
- WRITEUINT8(demo_p,VERSION);
- WRITEUINT8(demo_p,SUBVERSION);
- WRITEUINT16(demo_p,DEMOVERSION);
-
- // demo checksum
- demo_p += 16;
-
- M_Memcpy(demo_p, "METL", 4); demo_p += 4;
-
- memset(&ghostext,0,sizeof(ghostext));
- ghostext.lastscale = ghostext.scale = FRACUNIT;
-
- // Set up our memory.
- memset(&oldmetal,0,sizeof(oldmetal));
- oldmetal.x = mo->x;
- oldmetal.y = mo->y;
- oldmetal.z = mo->z;
- oldmetal.angle = mo->angle>>24;
-}
-
-void G_SetDemoTime(UINT32 ptime, UINT32 pscore, UINT16 prings)
-{
- if (!demorecording || !demotime_p)
- return;
- if (demoflags & DF_RECORDATTACK)
- {
- WRITEUINT32(demotime_p, ptime);
- WRITEUINT32(demotime_p, pscore);
- WRITEUINT16(demotime_p, prings);
- demotime_p = NULL;
- }
- else if (demoflags & DF_NIGHTSATTACK)
- {
- WRITEUINT32(demotime_p, ptime);
- WRITEUINT32(demotime_p, pscore);
- demotime_p = NULL;
- }
-}
-
-// Returns bitfield:
-// 1 == new demo has lower time
-// 2 == new demo has higher score
-// 4 == new demo has higher rings
-UINT8 G_CmpDemoTime(char *oldname, char *newname)
-{
- UINT8 *buffer,*p;
- UINT8 flags;
- UINT32 oldtime, newtime, oldscore, newscore;
- UINT16 oldrings, newrings, oldversion;
- size_t bufsize ATTRUNUSED;
- UINT8 c;
- UINT16 s ATTRUNUSED;
- UINT8 aflags = 0;
-
- // load the new file
- FIL_DefaultExtension(newname, ".lmp");
- bufsize = FIL_ReadFile(newname, &buffer);
- I_Assert(bufsize != 0);
- p = buffer;
-
- // read demo header
- I_Assert(!memcmp(p, DEMOHEADER, 12));
- p += 12; // DEMOHEADER
- c = READUINT8(p); // VERSION
- I_Assert(c == VERSION);
- c = READUINT8(p); // SUBVERSION
- I_Assert(c == SUBVERSION);
- s = READUINT16(p);
- I_Assert(s == DEMOVERSION);
- p += 16; // demo checksum
- I_Assert(!memcmp(p, "PLAY", 4));
- p += 4; // PLAY
- p += 2; // gamemap
- p += 16; // map md5
- flags = READUINT8(p); // demoflags
-
- aflags = flags & (DF_RECORDATTACK|DF_NIGHTSATTACK);
- I_Assert(aflags);
- if (flags & DF_RECORDATTACK)
- {
- newtime = READUINT32(p);
- newscore = READUINT32(p);
- newrings = READUINT16(p);
- }
- else if (flags & DF_NIGHTSATTACK)
- {
- newtime = READUINT32(p);
- newscore = READUINT32(p);
- newrings = 0;
- }
- else // appease compiler
- return 0;
-
- Z_Free(buffer);
-
- // load old file
- FIL_DefaultExtension(oldname, ".lmp");
- if (!FIL_ReadFile(oldname, &buffer))
- {
- CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), oldname);
- return UINT8_MAX;
- }
- p = buffer;
-
- // read demo header
- if (memcmp(p, DEMOHEADER, 12))
- {
- CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
- Z_Free(buffer);
- return UINT8_MAX;
- } p += 12; // DEMOHEADER
- p++; // VERSION
- p++; // SUBVERSION
- oldversion = READUINT16(p);
- switch(oldversion) // demoversion
- {
- case DEMOVERSION: // latest always supported
- break;
- // too old, cannot support.
- default:
- CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
- Z_Free(buffer);
- return UINT8_MAX;
- }
- p += 16; // demo checksum
- if (memcmp(p, "PLAY", 4))
- {
- CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
- Z_Free(buffer);
- return UINT8_MAX;
- } p += 4; // "PLAY"
- if (oldversion <= 0x0008)
- p++; // gamemap
- else
- p += 2; // gamemap
- p += 16; // mapmd5
- flags = READUINT8(p);
- if (!(flags & aflags))
- {
- CONS_Alert(CONS_NOTICE, M_GetText("File '%s' not from same game mode. It will be overwritten.\n"), oldname);
- Z_Free(buffer);
- return UINT8_MAX;
- }
- if (flags & DF_RECORDATTACK)
- {
- oldtime = READUINT32(p);
- oldscore = READUINT32(p);
- oldrings = READUINT16(p);
- }
- else if (flags & DF_NIGHTSATTACK)
- {
- oldtime = READUINT32(p);
- oldscore = READUINT32(p);
- oldrings = 0;
- }
- else // appease compiler
- return UINT8_MAX;
-
- Z_Free(buffer);
-
- c = 0;
- if (newtime < oldtime
- || (newtime == oldtime && (newscore > oldscore || newrings > oldrings)))
- c |= 1; // Better time
- if (newscore > oldscore
- || (newscore == oldscore && newtime < oldtime))
- c |= 1<<1; // Better score
- if (newrings > oldrings
- || (newrings == oldrings && newtime < oldtime))
- c |= 1<<2; // Better rings
- return c;
-}
-
-//
-// G_PlayDemo
-//
-void G_DeferedPlayDemo(const char *name)
-{
- COM_BufAddText("playdemo \"");
- COM_BufAddText(name);
- COM_BufAddText("\"\n");
-}
-
-//
-// Start a demo from a .LMP file or from a wad resource
-//
-void G_DoPlayDemo(char *defdemoname)
-{
- UINT8 i;
- lumpnum_t l;
- char skin[17],color[17],*n,*pdemoname;
- UINT8 version,subversion,charability,charability2,thrustfactor,accelstart,acceleration;
- pflags_t pflags;
- UINT32 randseed, followitem;
- fixed_t camerascale,shieldscale,actionspd,mindash,maxdash,normalspeed,runspeed,jumpfactor,height,spinheight;
- char msg[1024];
-
- skin[16] = '\0';
- color[16] = '\0';
-
- n = defdemoname+strlen(defdemoname);
- while (*n != '/' && *n != '\\' && n != defdemoname)
- n--;
- if (n != defdemoname)
- n++;
- pdemoname = ZZ_Alloc(strlen(n)+1);
- strcpy(pdemoname,n);
-
- // Internal if no extension, external if one exists
- if (FIL_CheckExtension(defdemoname))
- {
- //FIL_DefaultExtension(defdemoname, ".lmp");
- if (!FIL_ReadFile(defdemoname, &demobuffer))
- {
- snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname);
- CONS_Alert(CONS_ERROR, "%s", msg);
- gameaction = ga_nothing;
- M_StartMessage(msg, NULL, MM_NOTHING);
- return;
- }
- demo_p = demobuffer;
- }
- // load demo resource from WAD
- else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
- {
- snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
- CONS_Alert(CONS_ERROR, "%s", msg);
- gameaction = ga_nothing;
- M_StartMessage(msg, NULL, MM_NOTHING);
- return;
- }
- else // it's an internal demo
- demobuffer = demo_p = W_CacheLumpNum(l, PU_STATIC);
-
- // read demo header
- gameaction = ga_nothing;
- demoplayback = true;
- if (memcmp(demo_p, DEMOHEADER, 12))
- {
- snprintf(msg, 1024, M_GetText("%s is not a SRB2 replay file.\n"), pdemoname);
- CONS_Alert(CONS_ERROR, "%s", msg);
- M_StartMessage(msg, NULL, MM_NOTHING);
- Z_Free(pdemoname);
- Z_Free(demobuffer);
- demoplayback = false;
- titledemo = false;
- return;
- }
- demo_p += 12; // DEMOHEADER
-
- version = READUINT8(demo_p);
- subversion = READUINT8(demo_p);
- demoversion = READUINT16(demo_p);
- switch(demoversion)
- {
- case DEMOVERSION: // latest always supported
- break;
- // too old, cannot support.
- default:
- snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
- CONS_Alert(CONS_ERROR, "%s", msg);
- M_StartMessage(msg, NULL, MM_NOTHING);
- Z_Free(pdemoname);
- Z_Free(demobuffer);
- demoplayback = false;
- titledemo = false;
- return;
- }
- demo_p += 16; // demo checksum
- if (memcmp(demo_p, "PLAY", 4))
- {
- snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
- CONS_Alert(CONS_ERROR, "%s", msg);
- M_StartMessage(msg, NULL, MM_NOTHING);
- Z_Free(pdemoname);
- Z_Free(demobuffer);
- demoplayback = false;
- titledemo = false;
- return;
- }
- demo_p += 4; // "PLAY"
- gamemap = READINT16(demo_p);
- demo_p += 16; // mapmd5
-
- demoflags = READUINT8(demo_p);
- modeattacking = (demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT;
- CON_ToggleOff();
-
- hu_demoscore = 0;
- hu_demotime = UINT32_MAX;
- hu_demorings = 0;
-
- switch (modeattacking)
- {
- case ATTACKING_NONE: // 0
- break;
- case ATTACKING_RECORD: // 1
- hu_demotime = READUINT32(demo_p);
- hu_demoscore = READUINT32(demo_p);
- hu_demorings = READUINT16(demo_p);
- break;
- case ATTACKING_NIGHTS: // 2
- hu_demotime = READUINT32(demo_p);
- hu_demoscore = READUINT32(demo_p);
- break;
- default: // 3
- modeattacking = ATTACKING_NONE;
- break;
- }
-
- // Random seed
- randseed = READUINT32(demo_p);
-
- // Player name
- M_Memcpy(player_names[0],demo_p,16);
- demo_p += 16;
-
- // Skin
- M_Memcpy(skin,demo_p,16);
- demo_p += 16;
-
- // Color
- M_Memcpy(color,demo_p,16);
- demo_p += 16;
-
- charability = READUINT8(demo_p);
- charability2 = READUINT8(demo_p);
- actionspd = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- mindash = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- maxdash = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- normalspeed = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- runspeed = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- thrustfactor = READUINT8(demo_p);
- accelstart = READUINT8(demo_p);
- acceleration = READUINT8(demo_p);
- height = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- spinheight = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- camerascale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- shieldscale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- jumpfactor = READFIXED(demo_p);
- followitem = READUINT32(demo_p);
-
- // pflag data
- {
- UINT8 buf = READUINT8(demo_p);
- pflags = 0;
- if (buf & 0x01)
- pflags |= PF_FLIPCAM;
- if (buf & 0x02)
- pflags |= PF_ANALOGMODE;
- if (buf & 0x04)
- pflags |= PF_DIRECTIONCHAR;
- if (buf & 0x08)
- pflags |= PF_AUTOBRAKE;
- CV_SetValue(&cv_showinputjoy, !!(buf & 0x10));
- }
-
- // net var data
- CV_LoadNetVars(&demo_p);
-
- // Sigh ... it's an empty demo.
- if (*demo_p == DEMOMARKER)
- {
- snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
- CONS_Alert(CONS_ERROR, "%s", msg);
- M_StartMessage(msg, NULL, MM_NOTHING);
- Z_Free(pdemoname);
- Z_Free(demobuffer);
- demoplayback = false;
- titledemo = false;
- return;
- }
-
- Z_Free(pdemoname);
-
- memset(&oldcmd,0,sizeof(oldcmd));
- memset(&oldghost,0,sizeof(oldghost));
-
- if (VERSION != version || SUBVERSION != subversion)
- CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
-
- // didn't start recording right away.
- demo_start = false;
-
- // Set skin
- SetPlayerSkin(0, skin);
-
-#ifdef HAVE_BLUA
- LUAh_MapChange(gamemap);
-#endif
- displayplayer = consoleplayer = 0;
- memset(playeringame,0,sizeof(playeringame));
- playeringame[0] = true;
- P_SetRandSeed(randseed);
- G_InitNew(false, G_BuildMapName(gamemap), true, true, false);
-
- // Set color
- for (i = 0; i < MAXSKINCOLORS; i++)
- if (!stricmp(Color_Names[i],color))
- {
- players[0].skincolor = i;
- break;
- }
- CV_StealthSetValue(&cv_playercolor, players[0].skincolor);
- if (players[0].mo)
- {
- players[0].mo->color = players[0].skincolor;
- oldghost.x = players[0].mo->x;
- oldghost.y = players[0].mo->y;
- oldghost.z = players[0].mo->z;
- }
-
- // Set saved attribute values
- // No cheat checking here, because even if they ARE wrong...
- // it would only break the replay if we clipped them.
- players[0].camerascale = camerascale;
- players[0].shieldscale = shieldscale;
- players[0].charability = charability;
- players[0].charability2 = charability2;
- players[0].actionspd = actionspd;
- players[0].mindash = mindash;
- players[0].maxdash = maxdash;
- players[0].normalspeed = normalspeed;
- players[0].runspeed = runspeed;
- players[0].thrustfactor = thrustfactor;
- players[0].accelstart = accelstart;
- players[0].acceleration = acceleration;
- players[0].height = height;
- players[0].spinheight = spinheight;
- players[0].jumpfactor = jumpfactor;
- players[0].followitem = followitem;
- players[0].pflags = pflags;
-
- demo_start = true;
-}
-
-void G_AddGhost(char *defdemoname)
-{
- INT32 i;
- lumpnum_t l;
- char name[17],skin[17],color[17],*n,*pdemoname,md5[16];
- demoghost *gh;
- UINT8 flags;
- UINT8 *buffer,*p;
- mapthing_t *mthing;
- UINT16 count, ghostversion;
-
- name[16] = '\0';
- skin[16] = '\0';
- color[16] = '\0';
-
- n = defdemoname+strlen(defdemoname);
- while (*n != '/' && *n != '\\' && n != defdemoname)
- n--;
- if (n != defdemoname)
- n++;
- pdemoname = ZZ_Alloc(strlen(n)+1);
- strcpy(pdemoname,n);
-
- // Internal if no extension, external if one exists
- if (FIL_CheckExtension(defdemoname))
- {
- //FIL_DefaultExtension(defdemoname, ".lmp");
- if (!FIL_ReadFileTag(defdemoname, &buffer, PU_LEVEL))
- {
- CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), defdemoname);
- Z_Free(pdemoname);
- return;
- }
- p = buffer;
- }
- // load demo resource from WAD
- else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
- {
- CONS_Alert(CONS_ERROR, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
- Z_Free(pdemoname);
- return;
- }
- else // it's an internal demo
- buffer = p = W_CacheLumpNum(l, PU_LEVEL);
-
- // read demo header
- if (memcmp(p, DEMOHEADER, 12))
- {
- CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Not a SRB2 replay.\n"), pdemoname);
- Z_Free(pdemoname);
- Z_Free(buffer);
- return;
- } p += 12; // DEMOHEADER
- p++; // VERSION
- p++; // SUBVERSION
- ghostversion = READUINT16(p);
- switch(ghostversion)
- {
- case DEMOVERSION: // latest always supported
- break;
- // too old, cannot support.
- default:
- CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo version incompatible.\n"), pdemoname);
- Z_Free(pdemoname);
- Z_Free(buffer);
- return;
- }
- M_Memcpy(md5, p, 16); p += 16; // demo checksum
- for (gh = ghosts; gh; gh = gh->next)
- if (!memcmp(md5, gh->checksum, 16)) // another ghost in the game already has this checksum?
- { // Don't add another one, then!
- CONS_Debug(DBG_SETUP, "Rejecting duplicate ghost %s (MD5 was matched)\n", pdemoname);
- Z_Free(pdemoname);
- Z_Free(buffer);
- return;
- }
- if (memcmp(p, "PLAY", 4))
- {
- CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo format unacceptable.\n"), pdemoname);
- Z_Free(pdemoname);
- Z_Free(buffer);
- return;
- } p += 4; // "PLAY"
- if (ghostversion <= 0x0008)
- p++; // gamemap
- else
- p += 2; // gamemap
- p += 16; // mapmd5 (possibly check for consistency?)
- flags = READUINT8(p);
- if (!(flags & DF_GHOST))
- {
- CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: No ghost data in this demo.\n"), pdemoname);
- Z_Free(pdemoname);
- Z_Free(buffer);
- return;
- }
- switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
- {
- case ATTACKING_NONE: // 0
- break;
- case ATTACKING_RECORD: // 1
- p += 10; // demo time, score, and rings
- break;
- case ATTACKING_NIGHTS: // 2
- p += 8; // demo time left, score
- break;
- default: // 3
- break;
- }
-
- p += 4; // random seed
-
- // Player name (TODO: Display this somehow if it doesn't match cv_playername!)
- M_Memcpy(name, p,16);
- p += 16;
-
- // Skin
- M_Memcpy(skin, p,16);
- p += 16;
-
- // Color
- M_Memcpy(color, p,16);
- p += 16;
-
- // Ghosts do not have a player structure to put this in.
- p++; // charability
- p++; // charability2
- p++; // actionspd
- p++; // mindash
- p++; // maxdash
- p++; // normalspeed
- p++; // runspeed
- p++; // thrustfactor
- p++; // accelstart
- p++; // acceleration
- p++; // height
- p++; // spinheight
- p++; // camerascale
- p++; // shieldscale
- p += 4; // jumpfactor
- p += 4; // followitem
-
- p++; // pflag data
-
- // net var data
- count = READUINT16(p);
- while (count--)
- {
- p += 2;
- SKIPSTRING(p);
- p++;
- }
-
- if (*p == DEMOMARKER)
- {
- CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Replay is empty.\n"), pdemoname);
- Z_Free(pdemoname);
- Z_Free(buffer);
- return;
- }
-
- gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
- gh->next = ghosts;
- gh->buffer = buffer;
- M_Memcpy(gh->checksum, md5, 16);
- gh->p = p;
-
- ghosts = gh;
-
- gh->version = ghostversion;
- mthing = playerstarts[0];
- I_Assert(mthing);
- { // A bit more complex than P_SpawnPlayer because ghosts aren't solid and won't just push themselves out of the ceiling.
- fixed_t z,f,c;
- fixed_t offset = mthing->z << FRACBITS;
- gh->mo = P_SpawnMobj(mthing->x << FRACBITS, mthing->y << FRACBITS, 0, MT_GHOST);
- gh->mo->angle = FixedAngle(mthing->angle << FRACBITS);
- f = gh->mo->floorz;
- c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height;
- if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP))
- {
- z = c - offset;
- if (z < f)
- z = f;
- }
- else
- {
- z = f + offset;
- if (z > c)
- z = c;
- }
- gh->mo->z = z;
- }
-
- gh->oldmo.x = gh->mo->x;
- gh->oldmo.y = gh->mo->y;
- gh->oldmo.z = gh->mo->z;
-
- // Set skin
- gh->mo->skin = &skins[0];
- for (i = 0; i < numskins; i++)
- if (!stricmp(skins[i].name,skin))
- {
- gh->mo->skin = &skins[i];
- break;
- }
- gh->oldmo.skin = gh->mo->skin;
-
- // Set color
- gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor;
- for (i = 0; i < MAXSKINCOLORS; i++)
- if (!stricmp(Color_Names[i],color))
- {
- gh->mo->color = (UINT8)i;
- break;
- }
- gh->oldmo.color = gh->mo->color;
-
- gh->mo->state = states+S_PLAY_STND;
- gh->mo->sprite = gh->mo->state->sprite;
- gh->mo->sprite2 = (gh->mo->state->frame & FF_FRAMEMASK);
- //gh->mo->frame = tr_trans30<<FF_TRANSSHIFT;
- gh->mo->flags2 |= MF2_DONTDRAW;
- gh->fadein = (9-3)*6; // fade from invisible to trans30 over as close to 35 tics as possible
- gh->mo->tics = -1;
-
- CONS_Printf(M_GetText("Added ghost %s from %s\n"), name, pdemoname);
- Z_Free(pdemoname);
-}
-
-//
-// G_TimeDemo
-// NOTE: name is a full filename for external demos
-//
-static INT32 restorecv_vidwait;
-
-void G_TimeDemo(const char *name)
-{
- nodrawers = M_CheckParm("-nodraw");
- noblit = M_CheckParm("-noblit");
- restorecv_vidwait = cv_vidwait.value;
- if (cv_vidwait.value)
- CV_Set(&cv_vidwait, "0");
- timingdemo = true;
- singletics = true;
- framecount = 0;
- demostarttime = I_GetTime();
- G_DeferedPlayDemo(name);
-}
-
-void G_DoPlayMetal(void)
-{
- lumpnum_t l;
- mobj_t *mo = NULL;
- thinker_t *th;
-
- // it's an internal demo
- if ((l = W_CheckNumForName(va("%sMS",G_BuildMapName(gamemap)))) == LUMPERROR)
- {
- CONS_Alert(CONS_WARNING, M_GetText("No bot recording for this map.\n"));
- return;
- }
- else
- metalbuffer = metal_p = W_CacheLumpNum(l, PU_STATIC);
-
- // find metal sonic
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo = (mobj_t *)th;
- if (mo->type != MT_METALSONIC_RACE)
- continue;
-
- break;
- }
- if (th == &thlist[THINK_MOBJ])
- {
- CONS_Alert(CONS_ERROR, M_GetText("Failed to find bot entity.\n"));
- Z_Free(metalbuffer);
- return;
- }
-
- // read demo header
- metal_p += 12; // DEMOHEADER
- metal_p++; // VERSION
- metal_p++; // SUBVERSION
- metalversion = READUINT16(metal_p);
- switch(metalversion)
- {
- case DEMOVERSION: // latest always supported
- break;
- // too old, cannot support.
- default:
- CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, format version incompatible.\n"));
- Z_Free(metalbuffer);
- return;
- }
- metal_p += 16; // demo checksum
- if (memcmp(metal_p, "METL", 4))
- {
- CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, wasn't recorded in Metal format.\n"));
- Z_Free(metalbuffer);
- return;
- } metal_p += 4; // "METL"
-
- // read initial tic
- memset(&oldmetal,0,sizeof(oldmetal));
- oldmetal.x = mo->x;
- oldmetal.y = mo->y;
- oldmetal.z = mo->z;
- metalplayback = mo;
-}
-
-void G_DoneLevelLoad(void)
-{
- CONS_Printf(M_GetText("Loaded level in %f sec\n"), (double)(I_GetTime() - demostarttime) / TICRATE);
- framecount = 0;
- demostarttime = I_GetTime();
-}
-
-/*
-===================
-=
-= G_CheckDemoStatus
-=
-= Called after a death or level completion to allow demos to be cleaned up
-= Returns true if a new demo loop action will take place
-===================
-*/
-
-// Stops metal sonic's demo. Separate from other functions because metal + replays can coexist
-void G_StopMetalDemo(void)
-{
-
- // Metal Sonic finishing doesn't end the game, dammit.
- Z_Free(metalbuffer);
- metalbuffer = NULL;
- metalplayback = NULL;
- metal_p = NULL;
-}
-
-// Stops metal sonic recording.
-ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill)
-{
- boolean saved = false;
- if (demo_p)
- {
- UINT8 *p = demobuffer+16; // checksum position
- if (kill)
- WRITEUINT8(demo_p, METALDEATH); // add the metal death marker
- else
- WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
-#ifdef NOMD5
- {
- UINT8 i;
- for (i = 0; i < 16; i++, p++)
- *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
- }
-#else
- md5_buffer((char *)p+16, demo_p - (p+16), (void *)p); // make a checksum of everything after the checksum in the file.
-#endif
- saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), 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("Failed to save demo!");
-}
-
-// reset engine variable set for the demos
-// called from stopdemo command, map command, and g_checkdemoStatus.
-void G_StopDemo(void)
-{
- Z_Free(demobuffer);
- demobuffer = NULL;
- demoplayback = false;
- titledemo = false;
- timingdemo = false;
- singletics = false;
-
- if (gamestate == GS_INTERMISSION)
- Y_EndIntermission(); // cleanup
-
- G_SetGamestate(GS_NULL);
- wipegamestate = GS_NULL;
- SV_StopServer();
- SV_ResetServer();
-}
-
-boolean G_CheckDemoStatus(void)
-{
- boolean saved;
-
- while (ghosts)
- {
- demoghost *next = ghosts->next;
- Z_Free(ghosts);
- ghosts = next;
- }
- ghosts = NULL;
-
-
- // DO NOT end metal sonic demos here
-
- if (timingdemo)
- {
- INT32 demotime;
- double f1, f2;
- demotime = I_GetTime() - demostarttime;
- if (!demotime)
- return true;
- G_StopDemo();
- timingdemo = false;
- f1 = (double)demotime;
- f2 = (double)framecount*TICRATE;
-
- CONS_Printf(M_GetText("timed %u gametics in %d realtics - %u frames\n%f seconds, %f avg fps\n"),
- leveltime,demotime,(UINT32)framecount,f1/TICRATE,f2/f1);
-
- // CSV-readable timedemo results, for external parsing
- if (timedemo_csv)
- {
- FILE *f;
- const char *csvpath = va("%s"PATHSEP"%s", srb2home, "timedemo.csv");
- const char *header = "id,demoname,seconds,avgfps,leveltime,demotime,framecount,ticrate,rendermode,vidmode,vidwidth,vidheight,procbits\n";
- const char *rowformat = "\"%s\",\"%s\",%f,%f,%u,%d,%u,%u,%u,%u,%u,%u,%u\n";
- boolean headerrow = !FIL_FileExists(csvpath);
- UINT8 procbits = 0;
-
- // Bitness
- if (sizeof(void*) == 4)
- procbits = 32;
- else if (sizeof(void*) == 8)
- procbits = 64;
-
- f = fopen(csvpath, "a+");
-
- if (f)
- {
- if (headerrow)
- fputs(header, f);
- fprintf(f, rowformat,
- timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
- fclose(f);
- CONS_Printf("Timedemo results saved to '%s'\n", csvpath);
- }
- else
- {
- // Just print the CSV output to console
- CON_LogMessage(header);
- CONS_Printf(rowformat,
- timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
- }
- }
-
- if (restorecv_vidwait != cv_vidwait.value)
- CV_SetValue(&cv_vidwait, restorecv_vidwait);
- D_AdvanceDemo();
- return true;
- }
-
- if (demoplayback)
- {
- if (singledemo)
- I_Quit();
- G_StopDemo();
-
- if (modeattacking)
- M_EndModeAttackRun();
- else
- D_AdvanceDemo();
-
- return true;
- }
-
- if (demorecording)
- {
- UINT8 *p = demobuffer+16; // checksum position
-#ifdef NOMD5
- UINT8 i;
- WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
- for (i = 0; i < 16; i++, p++)
- *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
-#else
- WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
- md5_buffer((char *)p+16, demo_p - (p+16), p); // make a checksum of everything after the checksum in the file.
-#endif
- saved = FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer); // finally output the file.
- free(demobuffer);
- demorecording = false;
-
- if (modeattacking != ATTACKING_RECORD)
- {
- if (saved)
- CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);
- else
- CONS_Alert(CONS_WARNING, M_GetText("Demo %s not saved\n"), demoname);
- }
- return true;
- }
-
- return false;
-}
-
//
// G_SetGamestate
//
diff --git a/src/g_game.h b/src/g_game.h
index c4c40d84be5f172cbdc47911b6f9e83de8efc3b7..df0c9392e69c87cf3b139e29f97f34d950b28af2 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -17,6 +17,7 @@
#include "doomdef.h"
#include "doomstat.h"
#include "d_event.h"
+#include "g_demo.h"
extern char gamedatafilename[64];
extern char timeattackfolder[64];
@@ -31,21 +32,6 @@ extern char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
extern player_t players[MAXPLAYERS];
extern boolean playeringame[MAXPLAYERS];
-// ======================================
-// DEMO playback/recording related stuff.
-// ======================================
-
-// demoplaying back and demo recording
-extern boolean demoplayback, titledemo, demorecording, timingdemo;
-extern tic_t demostarttime;
-
-// Quit after playing a demo from cmdline.
-extern boolean singledemo;
-extern boolean demo_start;
-extern boolean demosynced;
-
-extern mobj_t *metalplayback;
-
// gametic at level start
extern tic_t levelstarttic;
@@ -173,7 +159,6 @@ void G_DoLoadLevel(boolean resetplayer);
void G_StartTitleCard(void);
void G_PreLevelTitleCard(void);
boolean G_IsTitleCardAvailable(void);
-void G_DeferedPlayDemo(const char *demo);
// Can be called by the startup code or M_Responder, calls P_SetupLevel.
void G_LoadGame(UINT32 slot, INT16 mapoverride);
@@ -184,54 +169,6 @@ void G_SaveGame(UINT32 slot);
void G_SaveGameOver(UINT32 slot, boolean modifylives);
-// Only called by startup code.
-void G_RecordDemo(const char *name);
-void G_RecordMetal(void);
-void G_BeginRecording(void);
-void G_BeginMetal(void);
-
-// Only called by shutdown code.
-void G_SetDemoTime(UINT32 ptime, UINT32 pscore, UINT16 prings);
-UINT8 G_CmpDemoTime(char *oldname, char *newname);
-
-typedef enum
-{
- GHC_NORMAL = 0,
- GHC_SUPER,
- GHC_FIREFLOWER,
- GHC_INVINCIBLE,
- GHC_NIGHTSSKIN, // not actually a colour
- GHC_RETURNSKIN // ditto
-} ghostcolor_t;
-
-// Record/playback tics
-void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
-void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
-void G_GhostAddThok(void);
-void G_GhostAddSpin(void);
-void G_GhostAddRev(void);
-void G_GhostAddColor(ghostcolor_t color);
-void G_GhostAddFlip(void);
-void G_GhostAddScale(fixed_t scale);
-void G_GhostAddHit(mobj_t *victim);
-void G_WriteGhostTic(mobj_t *ghost);
-void G_ConsGhostTic(void);
-void G_GhostTicker(void);
-void G_ReadMetalTic(mobj_t *metal);
-void G_WriteMetalTic(mobj_t *metal);
-void G_SaveMetal(UINT8 **buffer);
-void G_LoadMetal(UINT8 **buffer);
-
-void G_DoPlayDemo(char *defdemoname);
-void G_TimeDemo(const char *name);
-void G_AddGhost(char *defdemoname);
-void G_DoPlayMetal(void);
-void G_DoneLevelLoad(void);
-void G_StopMetalDemo(void);
-ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill);
-void G_StopDemo(void);
-boolean G_CheckDemoStatus(void);
-
extern UINT32 gametypedefaultrules[NUMGAMETYPES];
extern UINT32 gametypetol[NUMGAMETYPES];
extern INT16 gametyperankings[NUMGAMETYPES];
@@ -309,6 +246,6 @@ FUNCMATH INT32 G_TicsToCentiseconds(tic_t tics);
FUNCMATH INT32 G_TicsToMilliseconds(tic_t tics);
// Don't split up TOL handling
-INT16 G_TOLFlag(INT32 pgametype);
+UINT32 G_TOLFlag(INT32 pgametype);
#endif
diff --git a/src/g_state.h b/src/g_state.h
index 3320ebc47e91e8a78be0ea45a64fd0ba46db19bb..e364c5a35b62c323464783d518bf266b2abe4185 100644
--- a/src/g_state.h
+++ b/src/g_state.h
@@ -57,6 +57,7 @@ extern UINT8 ultimatemode; // was sk_insane
extern gameaction_t gameaction;
extern boolean botingame;
-extern UINT8 botskin, botcolor;
+extern UINT8 botskin;
+extern UINT16 botcolor;
#endif //__G_STATE__
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index 9cb062f8c46811e74ee1525baf70d6687bb9da83..6987e9d01c6adaab73016fa8becd403b2d9a3dd7 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -880,12 +880,10 @@ static void AdjustSegs(void)
float distv1,distv2,tmp;
nearv1 = nearv2 = MYMAX;
-#ifdef POLYOBJECTS
// Don't touch polyobject segs. We'll compensate
// for this when we go about drawing them.
if (lseg->polyseg)
continue;
-#endif
if (p) {
for (j = 0; j < p->numpts; j++)
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index c50969c4a1e9a228136a07b71db3307be65dbd47..b2139d5ee946f9508b296675f06f2579289a1527 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -292,6 +292,8 @@ light_t *t_lspr[NUMSPRITES] =
// Projectiles
&lspr[NOLIGHT], // SPR_MISL
+ &lspr[SMALLREDBALL_L], // SPR_LASR
+ &lspr[REDSHINE_L], // SPR_LASF
&lspr[NOLIGHT], // SPR_TORP
&lspr[NOLIGHT], // SPR_ENRG
&lspr[NOLIGHT], // SPR_MINE
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 07a00d7e7037e59eb2c6afed143ff670bc67a8a4..7186f732feb378f4cfc06311a2d2e6df27948673 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -36,9 +36,7 @@
#include "../m_cheat.h"
#include "../f_finale.h"
#include "../r_things.h" // R_GetShadowZ
-#ifdef ESLOPE
#include "../p_slopes.h"
-#endif
#include "hw_md2.h"
#ifdef NEWCLIP
@@ -348,9 +346,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
angle_t angle = 0;
FSurfaceInfo Surf;
fixed_t tempxsow, tempytow;
-#ifdef ESLOPE
pslope_t *slope = NULL;
-#endif
static FOutVector *planeVerts = NULL;
static UINT16 numAllocedPlaneVerts = 0;
@@ -359,7 +355,6 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
if (!xsub->planepoly)
return;
-#ifdef ESLOPE
// Get the slope pointer to simplify future code
if (FOFsector)
{
@@ -378,8 +373,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
// Set fixedheight to the slope's height from our viewpoint, if we have a slope
if (slope)
- fixedheight = P_GetZAt(slope, viewx, viewy);
-#endif
+ fixedheight = P_GetSlopeZAt(slope, viewx, viewy);
height = FIXED_TO_FLOAT(fixedheight);
@@ -527,7 +521,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
\
if (slope)\
{\
- fixedheight = P_GetZAt(slope, FLOAT_TO_FIXED((vx)), FLOAT_TO_FIXED((vy)));\
+ fixedheight = P_GetSlopeZAt(slope, FLOAT_TO_FIXED((vx)), FLOAT_TO_FIXED((vy)));\
vert->y = FIXED_TO_FLOAT(fixedheight);\
}\
}
@@ -535,10 +529,8 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
for (i = 0, v3d = planeVerts; i < nrPlaneVerts; i++,v3d++,pv++)
SETUP3DVERT(v3d, pv->x, pv->y);
-#ifdef ESLOPE
if (slope)
lightlevel = HWR_CalcSlopeLight(lightlevel, R_PointToAngle2(0, 0, slope->normal.x, slope->normal.y), abs(slope->zdelta));
-#endif
HWR_Lighting(&Surf, lightlevel, planecolormap);
@@ -849,15 +841,13 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
float pegt, pegb, pegmul;
float height = 0.0f, bheight = 0.0f;
-#ifdef ESLOPE
float endrealtop, endrealbot, endtop, endbot;
float endpegt, endpegb, endpegmul;
float endheight = 0.0f, endbheight = 0.0f;
- // compiler complains when P_GetZAt is used in FLOAT_TO_FIXED directly
- // use this as a temp var to store P_GetZAt's return value each time
+ // 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;
-#endif
fixed_t v1x = FLOAT_TO_FIXED(wallVerts[0].x);
fixed_t v1y = FLOAT_TO_FIXED(wallVerts[0].z); // not a typo
@@ -876,20 +866,15 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
pegb = wallVerts[0].t;
pegmul = (pegb - pegt) / (top - bot);
-#ifdef ESLOPE
endrealtop = endtop = wallVerts[2].y;
endrealbot = endbot = wallVerts[1].y;
endpegt = wallVerts[2].t;
endpegb = wallVerts[1].t;
endpegmul = (endpegb - endpegt) / (endtop - endbot);
-#endif
for (i = 0; i < sector->numlights; i++)
{
-#ifdef ESLOPE
- if (endtop < endrealbot)
-#endif
- if (top < realbot)
+ if (endtop < endrealbot && top < realbot)
return;
if (!(list[i].flags & FF_NOSHADE))
@@ -923,80 +908,40 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
else
solid = false;
-#ifdef ESLOPE
- if (list[i].slope)
- {
- temp = P_GetZAt(list[i].slope, v1x, v1y);
- height = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(list[i].slope, v2x, v2y);
- endheight = FIXED_TO_FLOAT(temp);
- }
- else
- height = endheight = FIXED_TO_FLOAT(list[i].height);
+ temp = P_GetLightZAt(&list[i], v1x, v1y);
+ height = FIXED_TO_FLOAT(temp);
+ temp = P_GetLightZAt(&list[i], v2x, v2y);
+ endheight = FIXED_TO_FLOAT(temp);
if (solid)
{
- if (*list[i].caster->b_slope)
- {
- temp = P_GetZAt(*list[i].caster->b_slope, v1x, v1y);
- bheight = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(*list[i].caster->b_slope, v2x, v2y);
- endbheight = FIXED_TO_FLOAT(temp);
- }
- else
- bheight = endbheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight);
+ temp = P_GetFFloorBottomZAt(list[i].caster, v1x, v1y);
+ bheight = FIXED_TO_FLOAT(temp);
+ temp = P_GetFFloorBottomZAt(list[i].caster, v2x, v2y);
+ endbheight = FIXED_TO_FLOAT(temp);
}
-#else
- height = FIXED_TO_FLOAT(list[i].height);
- if (solid)
- bheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight);
-#endif
-#ifdef ESLOPE
- if (endheight >= endtop)
-#endif
- if (height >= top)
+ if (endheight >= endtop && height >= top)
{
if (solid && top > bheight)
top = bheight;
-#ifdef ESLOPE
if (solid && endtop > endbheight)
endtop = endbheight;
-#endif
}
-#ifdef ESLOPE
if (i + 1 < sector->numlights)
{
- if (list[i+1].slope)
- {
- temp = P_GetZAt(list[i+1].slope, v1x, v1y);
- bheight = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(list[i+1].slope, v2x, v2y);
- endbheight = FIXED_TO_FLOAT(temp);
- }
- else
- bheight = endbheight = FIXED_TO_FLOAT(list[i+1].height);
+ temp = P_GetLightZAt(&list[i+1], v1x, v1y);
+ bheight = FIXED_TO_FLOAT(temp);
+ temp = P_GetLightZAt(&list[i+1], v2x, v2y);
+ endbheight = FIXED_TO_FLOAT(temp);
}
else
{
bheight = realbot;
endbheight = endrealbot;
}
-#else
- if (i + 1 < sector->numlights)
- {
- bheight = FIXED_TO_FLOAT(list[i+1].height);
- }
- else
- {
- bheight = realbot;
- }
-#endif
-#ifdef ESLOPE
- if (endbheight >= endtop)
-#endif
- if (bheight >= top)
+ if (endbheight >= endtop && bheight >= top)
continue;
//Found a break;
@@ -1005,15 +950,13 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
if (bot < realbot)
bot = realbot;
-#ifdef ESLOPE
endbot = endbheight;
if (endbot < endrealbot)
endbot = endrealbot;
-#endif
+
Surf->PolyColor.s.alpha = alpha;
-#ifdef ESLOPE
wallVerts[3].t = pegt + ((realtop - top) * pegmul);
wallVerts[2].t = endpegt + ((endrealtop - endtop) * endpegmul);
wallVerts[0].t = pegt + ((realtop - bot) * pegmul);
@@ -1024,14 +967,6 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
wallVerts[2].y = endtop;
wallVerts[0].y = bot;
wallVerts[1].y = endbot;
-#else
- wallVerts[3].t = wallVerts[2].t = pegt + ((realtop - top) * pegmul);
- wallVerts[0].t = wallVerts[1].t = pegt + ((realtop - bot) * pegmul);
-
- // set top/bottom coords
- wallVerts[2].y = wallVerts[3].y = top;
- wallVerts[0].y = wallVerts[1].y = bot;
-#endif
if (cutflag & FF_FOG)
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture, true, lightnum, colormap);
@@ -1041,22 +976,16 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
HWR_ProjectWall(wallVerts, Surf, PF_Masked, lightnum, colormap);
top = bot;
-#ifdef ESLOPE
endtop = endbot;
-#endif
}
bot = realbot;
-#ifdef ESLOPE
endbot = endrealbot;
- if (endtop <= endrealbot)
-#endif
- if (top <= realbot)
+ if (endtop <= endrealbot && top <= realbot)
return;
Surf->PolyColor.s.alpha = alpha;
-#ifdef ESLOPE
wallVerts[3].t = pegt + ((realtop - top) * pegmul);
wallVerts[2].t = endpegt + ((endrealtop - endtop) * endpegmul);
wallVerts[0].t = pegt + ((realtop - bot) * pegmul);
@@ -1067,14 +996,6 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
wallVerts[2].y = endtop;
wallVerts[0].y = bot;
wallVerts[1].y = endbot;
-#else
- wallVerts[3].t = wallVerts[2].t = pegt + ((realtop - top) * pegmul);
- wallVerts[0].t = wallVerts[1].t = pegt + ((realtop - bot) * pegmul);
-
- // set top/bottom coords
- wallVerts[2].y = wallVerts[3].y = top;
- wallVerts[0].y = wallVerts[1].y = bot;
-#endif
if (cutflag & FF_FOG)
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture, true, lightnum, colormap);
@@ -1115,19 +1036,15 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
fixed_t worldtop, worldbottom;
fixed_t worldhigh = 0, worldlow = 0;
-#ifdef ESLOPE
fixed_t worldtopslope, worldbottomslope;
fixed_t worldhighslope = 0, worldlowslope = 0;
fixed_t v1x, v1y, v2x, v2y;
-#endif
GLTexture_t *grTex = NULL;
float cliplow = 0.0f, cliphigh = 0.0f;
INT32 gr_midtexture;
fixed_t h, l; // 3D sides and 2s middle textures
-#ifdef ESLOPE
fixed_t hS, lS;
-#endif
FUINT lightnum = 0; // shut up compiler
extracolormap_t *colormap;
@@ -1141,27 +1058,17 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
ve.x = ((polyvertex_t *)gr_curline->pv2)->x;
ve.y = ((polyvertex_t *)gr_curline->pv2)->y;
-#ifdef ESLOPE
v1x = FLOAT_TO_FIXED(vs.x);
v1y = FLOAT_TO_FIXED(vs.y);
v2x = FLOAT_TO_FIXED(ve.x);
v2y = FLOAT_TO_FIXED(ve.y);
-#endif
-#ifdef ESLOPE
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, v1x, v1y); \
- end2 = P_GetZAt(slope, v2x, v2y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
+ end2 = P_GetZAt(slope, v2x, v2y, normalheight);
SLOPEPARAMS(gr_frontsector->c_slope, worldtop, worldtopslope, gr_frontsector->ceilingheight)
SLOPEPARAMS(gr_frontsector->f_slope, worldbottom, worldbottomslope, gr_frontsector->floorheight)
-#else
- worldtop = gr_frontsector->ceilingheight;
- worldbottom = gr_frontsector->floorheight;
-#endif
// remember vertices ordering
// 3--2
@@ -1195,14 +1102,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
boolean bothceilingssky = false; // turned on if both back and front ceilings are sky
boolean bothfloorssky = false; // likewise, but for floors
-#ifdef ESLOPE
SLOPEPARAMS(gr_backsector->c_slope, worldhigh, worldhighslope, gr_backsector->ceilingheight)
SLOPEPARAMS(gr_backsector->f_slope, worldlow, worldlowslope, gr_backsector->floorheight)
#undef SLOPEPARAMS
-#else
- worldhigh = gr_backsector->ceilingheight;
- worldlow = gr_backsector->floorheight;
-#endif
// hack to allow height changes in outdoor areas
// This is what gets rid of the upper textures if there should be sky
@@ -1225,12 +1127,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
gr_bottomtexture = R_GetTextureNum(gr_sidedef->bottomtexture);
// check TOP TEXTURE
- if ((
-#ifdef ESLOPE
- worldhighslope < worldtopslope ||
-#endif
- worldhigh < worldtop
- ) && gr_toptexture)
+ if ((worldhighslope < worldtopslope || worldhigh < worldtop) && gr_toptexture)
{
{
fixed_t texturevpegtop; // top
@@ -1240,15 +1137,10 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// PEGGING
if (gr_linedef->flags & ML_DONTPEGTOP)
texturevpegtop = 0;
-#ifdef ESLOPE
else if (gr_linedef->flags & ML_EFFECT1)
texturevpegtop = worldhigh + textureheight[gr_sidedef->toptexture] - worldtop;
else
texturevpegtop = gr_backsector->ceilingheight + textureheight[gr_sidedef->toptexture] - gr_frontsector->ceilingheight;
-#else
- else
- texturevpegtop = worldhigh + textureheight[gr_sidedef->toptexture] - worldtop;
-#endif
texturevpegtop += gr_sidedef->rowoffset;
@@ -1260,7 +1152,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
-#ifdef ESLOPE
// Adjust t value for sloped walls
if (!(gr_linedef->flags & ML_EFFECT1))
{
@@ -1283,19 +1174,13 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * grTex->scaleY;
wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * grTex->scaleY;
}
-#endif
}
// set top/bottom coords
-#ifdef ESLOPE
wallVerts[3].y = FIXED_TO_FLOAT(worldtop);
wallVerts[0].y = FIXED_TO_FLOAT(worldhigh);
wallVerts[2].y = FIXED_TO_FLOAT(worldtopslope);
wallVerts[1].y = FIXED_TO_FLOAT(worldhighslope);
-#else
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldtop);
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(worldhigh);
-#endif
if (gr_frontsector->numlights)
HWR_SplitWall(gr_frontsector, wallVerts, gr_toptexture, &Surf, FF_CUTLEVEL, NULL);
@@ -1307,9 +1192,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// check BOTTOM TEXTURE
if ((
-#ifdef ESLOPE
worldlowslope > worldbottomslope ||
-#endif
worldlow > worldbottom) && gr_bottomtexture) //only if VISIBLE!!!
{
{
@@ -1318,19 +1201,12 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
grTex = HWR_GetTexture(gr_bottomtexture);
// PEGGING
-#ifdef ESLOPE
if (!(gr_linedef->flags & ML_DONTPEGBOTTOM))
texturevpegbottom = 0;
else if (gr_linedef->flags & ML_EFFECT1)
texturevpegbottom = worldbottom - worldlow;
else
texturevpegbottom = gr_frontsector->floorheight - gr_backsector->floorheight;
-#else
- if (gr_linedef->flags & ML_DONTPEGBOTTOM)
- texturevpegbottom = worldbottom - worldlow;
- else
- texturevpegbottom = 0;
-#endif
texturevpegbottom += gr_sidedef->rowoffset;
@@ -1342,7 +1218,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
-#ifdef ESLOPE
// Adjust t value for sloped walls
if (!(gr_linedef->flags & ML_EFFECT1))
{
@@ -1365,19 +1240,13 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[0].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY;
wallVerts[1].t = (texturevpegbottom + worldlowslope - worldbottomslope) * grTex->scaleY;
}
-#endif
}
// set top/bottom coords
-#ifdef ESLOPE
wallVerts[3].y = FIXED_TO_FLOAT(worldlow);
wallVerts[0].y = FIXED_TO_FLOAT(worldbottom);
wallVerts[2].y = FIXED_TO_FLOAT(worldlowslope);
wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope);
-#else
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldlow);
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(worldbottom);
-#endif
if (gr_frontsector->numlights)
HWR_SplitWall(gr_frontsector, wallVerts, gr_bottomtexture, &Surf, FF_CUTLEVEL, NULL);
@@ -1435,7 +1304,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// heights of the polygon, and h & l, are the final (clipped)
// poly coords.
-#ifdef POLYOBJECTS
// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
// you must use the linedef's backsector to be correct
// From CB
@@ -1445,18 +1313,11 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
popenbottom = back->floorheight;
}
else
-#endif
{
-#ifdef ESLOPE
popentop = min(worldtop, worldhigh);
popenbottom = max(worldbottom, worldlow);
-#else
- popentop = min(front->ceilingheight, back->ceilingheight);
- popenbottom = max(front->floorheight, back->floorheight);
-#endif
}
-#ifdef ESLOPE
if (gr_linedef->flags & ML_EFFECT2)
{
if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
@@ -1471,9 +1332,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
}
}
else if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
-#else
- if (gr_linedef->flags & ML_DONTPEGBOTTOM)
-#endif
{
polybottom = popenbottom + gr_sidedef->rowoffset;
polytop = polybottom + textureheight[gr_midtexture]*repeats;
@@ -1484,7 +1342,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
polybottom = polytop - textureheight[gr_midtexture]*repeats;
}
// CB
-#ifdef POLYOBJECTS
// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
// you must use the linedef's backsector to be correct
if (gr_curline->polyseg)
@@ -1492,7 +1349,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
lowcut = polybottom;
highcut = polytop;
}
-#endif
else
{
// The cut-off values of a linedef can always be constant, since every line has an absoulute front and or back sector
@@ -1505,11 +1361,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
// PEGGING
-#ifdef ESLOPE
if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
-#else
- if (gr_linedef->flags & ML_DONTPEGBOTTOM)
-#endif
texturevpeg = textureheight[gr_sidedef->midtexture]*repeats - h + polybottom;
else
texturevpeg = polytop - h;
@@ -1528,7 +1380,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(h);
wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(l);
-#ifdef ESLOPE
// Correct to account for slopes
{
fixed_t midtextureslant;
@@ -1571,7 +1422,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].y = FIXED_TO_FLOAT(h);
wallVerts[1].y = FIXED_TO_FLOAT(l);
}
-#endif
// set alpha for transparent walls (new boom and legacy linedef types)
// ooops ! this do not work at all because render order we should render it in backtofront order
@@ -1628,7 +1478,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
break;
}
-#ifdef POLYOBJECTS
if (gr_curline->polyseg && gr_curline->polyseg->translucency > 0)
{
if (gr_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
@@ -1639,7 +1488,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
else
blendmode = HWR_TranstableToAlpha(gr_curline->polyseg->translucency, &Surf);
}
-#endif
if (gr_frontsector->numlights)
{
@@ -1665,12 +1513,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
if (gr_backsector->ceilingpic != skyflatnum) // don't cull if back sector is also sky
{
wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(INT32_MAX); // draw to top of map space
-#ifdef ESLOPE
wallVerts[0].y = FIXED_TO_FLOAT(worldtop);
wallVerts[1].y = FIXED_TO_FLOAT(worldtopslope);
-#else
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(worldtop);
-#endif
HWR_DrawSkyWall(wallVerts, &Surf);
}
}
@@ -1679,12 +1523,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
if (gr_backsector->floorpic != skyflatnum) // don't cull if back sector is also sky
{
-#ifdef ESLOPE
wallVerts[3].y = FIXED_TO_FLOAT(worldbottom);
wallVerts[2].y = FIXED_TO_FLOAT(worldbottomslope);
-#else
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldbottom);
-#endif
wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(INT32_MIN); // draw to bottom of map space
HWR_DrawSkyWall(wallVerts, &Surf);
}
@@ -1700,12 +1540,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
fixed_t texturevpeg;
// PEGGING
-#ifdef ESLOPE
if ((gr_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
texturevpeg = gr_frontsector->floorheight + textureheight[gr_sidedef->midtexture] - gr_frontsector->ceilingheight + gr_sidedef->rowoffset;
- else
-#endif
- if (gr_linedef->flags & ML_DONTPEGBOTTOM)
+ else if (gr_linedef->flags & ML_DONTPEGBOTTOM)
texturevpeg = worldbottom + textureheight[gr_sidedef->midtexture] - worldtop + gr_sidedef->rowoffset;
else
// top of texture at top
@@ -1718,7 +1555,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
-#ifdef ESLOPE
// Texture correction for slopes
if (gr_linedef->flags & ML_EFFECT2) {
wallVerts[3].t += (gr_frontsector->ceilingheight - worldtop) * grTex->scaleY;
@@ -1732,23 +1568,17 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[0].t = wallVerts[3].t - (worldbottom-worldtop) * grTex->scaleY;
wallVerts[1].t = wallVerts[2].t - (worldbottomslope-worldtopslope) * grTex->scaleY;
}
-#endif
}
-#ifdef ESLOPE
+
//Set textures properly on single sided walls that are sloped
wallVerts[3].y = FIXED_TO_FLOAT(worldtop);
wallVerts[0].y = FIXED_TO_FLOAT(worldbottom);
wallVerts[2].y = FIXED_TO_FLOAT(worldtopslope);
wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope);
-#else
- // set top/bottom coords
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldtop);
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(worldbottom);
-#endif
+ // I don't think that solid walls can use translucent linedef types...
if (gr_frontsector->numlights)
HWR_SplitWall(gr_frontsector, wallVerts, gr_midtexture, &Surf, FF_CUTLEVEL, NULL);
- // I don't think that solid walls can use translucent linedef types...
else
{
if (grTex->mipmap.flags & TF_TRANSPARENT)
@@ -1763,22 +1593,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
if (gr_frontsector->ceilingpic == skyflatnum) // It's a single-sided line with sky for its sector
{
wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(INT32_MAX); // draw to top of map space
-#ifdef ESLOPE
wallVerts[0].y = FIXED_TO_FLOAT(worldtop);
wallVerts[1].y = FIXED_TO_FLOAT(worldtopslope);
-#else
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(worldtop);
-#endif
HWR_DrawSkyWall(wallVerts, &Surf);
}
if (gr_frontsector->floorpic == skyflatnum)
{
-#ifdef ESLOPE
wallVerts[3].y = FIXED_TO_FLOAT(worldbottom);
wallVerts[2].y = FIXED_TO_FLOAT(worldbottomslope);
-#else
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(worldbottom);
-#endif
wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(INT32_MIN); // draw to bottom of map space
HWR_DrawSkyWall(wallVerts, &Surf);
}
@@ -1804,7 +1626,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
for (rover = gr_backsector->ffloors; rover; rover = rover->next)
{
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES) || (rover->flags & FF_INVERTSIDES))
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES))
+ continue;
+ if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES)
continue;
if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
continue;
@@ -1818,11 +1642,10 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
}
-#ifdef ESLOPE
- h = *rover->t_slope ? P_GetZAt(*rover->t_slope, v1x, v1y) : *rover->topheight;
- hS = *rover->t_slope ? P_GetZAt(*rover->t_slope, v2x, v2y) : *rover->topheight;
- l = *rover->b_slope ? P_GetZAt(*rover->b_slope, v1x, v1y) : *rover->bottomheight;
- lS = *rover->b_slope ? P_GetZAt(*rover->b_slope, v2x, v2y) : *rover->bottomheight;
+ h = P_GetFFloorTopZAt (rover, v1x, v1y);
+ hS = P_GetFFloorTopZAt (rover, v2x, v2y);
+ l = P_GetFFloorBottomZAt(rover, v1x, v1y);
+ lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
if (!(*rover->t_slope) && !gr_frontsector->c_slope && !gr_backsector->c_slope && h > highcut)
h = hS = highcut;
if (!(*rover->b_slope) && !gr_frontsector->f_slope && !gr_backsector->f_slope && l < lowcut)
@@ -1835,19 +1658,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].y = FIXED_TO_FLOAT(hS);
wallVerts[0].y = FIXED_TO_FLOAT(l);
wallVerts[1].y = FIXED_TO_FLOAT(lS);
-#else
- h = *rover->topheight;
- l = *rover->bottomheight;
- if (h > highcut)
- h = highcut;
- if (l < lowcut)
- l = lowcut;
- //Hurdler: HW code starts here
- //FIXME: check if peging is correct
- // set top/bottom coords
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(h);
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(l);
-#endif
if (rover->flags & FF_FOG)
{
wallVerts[3].t = wallVerts[2].t = 0;
@@ -1859,9 +1669,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
fixed_t texturevpeg;
boolean attachtobottom = false;
-#ifdef ESLOPE
boolean slopeskew = false; // skew FOF walls with slopes?
-#endif
// Wow, how was this missing from OpenGL for so long?
// ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software
@@ -1870,22 +1678,17 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
texturevpeg = sides[newline->sidenum[0]].rowoffset;
attachtobottom = !!(newline->flags & ML_DONTPEGBOTTOM);
-#ifdef ESLOPE
slopeskew = !!(newline->flags & ML_DONTPEGTOP);
-#endif
}
else
{
texturevpeg = sides[rover->master->sidenum[0]].rowoffset;
attachtobottom = !!(gr_linedef->flags & ML_DONTPEGBOTTOM);
-#ifdef ESLOPE
slopeskew = !!(rover->master->flags & ML_DONTPEGTOP);
-#endif
}
grTex = HWR_GetTexture(texnum);
-#ifdef ESLOPE
if (!slopeskew) // no skewing
{
if (attachtobottom)
@@ -1910,12 +1713,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].t = wallVerts[1].t - (hS - lS) * grTex->scaleY;
}
}
-#else
- if (attachtobottom)
- texturevpeg -= *rover->topheight - *rover->bottomheight;
- wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + texturevpeg) * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (*rover->topheight - l + texturevpeg) * grTex->scaleY;
-#endif
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
@@ -1963,7 +1760,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
for (rover = gr_frontsector->ffloors; rover; rover = rover->next)
{
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_ALLSIDES))
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES))
+ continue;
+ if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES))
continue;
if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
continue;
@@ -1976,11 +1775,10 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
newline = rover->master->frontsector->lines[0] + linenum;
texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
}
-#ifdef ESLOPE //backsides
- h = *rover->t_slope ? P_GetZAt(*rover->t_slope, v1x, v1y) : *rover->topheight;
- hS = *rover->t_slope ? P_GetZAt(*rover->t_slope, v2x, v2y) : *rover->topheight;
- l = *rover->b_slope ? P_GetZAt(*rover->b_slope, v1x, v1y) : *rover->bottomheight;
- lS = *rover->b_slope ? P_GetZAt(*rover->b_slope, v2x, v2y) : *rover->bottomheight;
+ h = P_GetFFloorTopZAt (rover, v1x, v1y);
+ hS = P_GetFFloorTopZAt (rover, v2x, v2y);
+ l = P_GetFFloorBottomZAt(rover, v1x, v1y);
+ lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
if (!(*rover->t_slope) && !gr_frontsector->c_slope && !gr_backsector->c_slope && h > highcut)
h = hS = highcut;
if (!(*rover->b_slope) && !gr_frontsector->f_slope && !gr_backsector->f_slope && l < lowcut)
@@ -1993,19 +1791,6 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].y = FIXED_TO_FLOAT(hS);
wallVerts[0].y = FIXED_TO_FLOAT(l);
wallVerts[1].y = FIXED_TO_FLOAT(lS);
-#else
- h = *rover->topheight;
- l = *rover->bottomheight;
- if (h > highcut)
- h = highcut;
- if (l < lowcut)
- l = lowcut;
- //Hurdler: HW code starts here
- //FIXME: check if peging is correct
- // set top/bottom coords
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(h);
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(l);
-#endif
if (rover->flags & FF_FOG)
{
wallVerts[3].t = wallVerts[2].t = 0;
@@ -2095,7 +1880,6 @@ static boolean CheckClip(seg_t * seg, sector_t * afrontsector, sector_t * abacks
// GZDoom method of sloped line clipping
-#ifdef ESLOPE
if (afrontsector->f_slope || afrontsector->c_slope || abacksector->f_slope || abacksector->c_slope)
{
fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
@@ -2104,25 +1888,21 @@ static boolean CheckClip(seg_t * seg, sector_t * afrontsector, sector_t * abacks
v2x = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->x);
v2y = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->y);
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, v1x, v1y); \
- end2 = P_GetZAt(slope, v2x, v2y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
+ end2 = P_GetZAt(slope, v2x, v2y, normalheight);
- SLOPEPARAMS(afrontsector->f_slope, frontf1, frontf2, afrontsector->floorheight)
+ SLOPEPARAMS(afrontsector->f_slope, frontf1, frontf2, afrontsector-> floorheight)
SLOPEPARAMS(afrontsector->c_slope, frontc1, frontc2, afrontsector->ceilingheight)
- SLOPEPARAMS( abacksector->f_slope, backf1, backf2, abacksector->floorheight)
- SLOPEPARAMS( abacksector->c_slope, backc1, backc2, abacksector->ceilingheight)
+ SLOPEPARAMS( abacksector->f_slope, backf1, backf2, abacksector-> floorheight)
+ SLOPEPARAMS( abacksector->c_slope, backc1, backc2, abacksector->ceilingheight)
#undef SLOPEPARAMS
}
else
-#endif
{
- frontf1 = frontf2 = afrontsector->floorheight;
+ frontf1 = frontf2 = afrontsector-> floorheight;
frontc1 = frontc2 = afrontsector->ceilingheight;
- backf1 = backf2 = abacksector->floorheight;
- backc1 = backc2 = abacksector->ceilingheight;
+ backf1 = backf2 = abacksector-> floorheight;
+ backc1 = backc2 = abacksector->ceilingheight;
}
// properly render skies (consider door "open" if both ceilings are sky)
// same for floors
@@ -2474,10 +2254,8 @@ static void HWR_AddLine(seg_t * line)
static sector_t tempsec;
fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
-#ifdef POLYOBJECTS
if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
return;
-#endif
gr_curline = line;
@@ -2604,13 +2382,10 @@ static void HWR_AddLine(seg_t * line)
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
- if (
-#ifdef POLYOBJECTS
- !line->polyseg &&
-#endif
- !line->sidedef->midtexture
- && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
- || (gr_frontsector->tag == gr_backsector->tag)))
+ if (!line->polyseg &&
+ !line->sidedef->midtexture
+ && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
+ || (gr_frontsector->tag == gr_backsector->tag)))
return; // line is empty, don't even bother
// treat like wide open window instead
HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
@@ -2646,35 +2421,28 @@ static void HWR_AddLine(seg_t * line)
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
- if (
-#ifdef POLYOBJECTS
- !line->polyseg &&
-#endif
- !line->sidedef->midtexture
- && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
- || (gr_frontsector->tag == gr_backsector->tag)))
+ if (!line->polyseg &&
+ !line->sidedef->midtexture
+ && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
+ || (gr_frontsector->tag == gr_backsector->tag)))
return; // line is empty, don't even bother
goto clippass; // treat like wide open window instead
}
-#ifdef ESLOPE
if (gr_frontsector->f_slope || gr_frontsector->c_slope || gr_backsector->f_slope || gr_backsector->c_slope)
{
fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, v1x, v1y); \
- end2 = P_GetZAt(slope, v2x, v2y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
+ end2 = P_GetZAt(slope, v2x, v2y, normalheight);
- SLOPEPARAMS(gr_frontsector->f_slope, frontf1, frontf2, gr_frontsector->floorheight)
+ SLOPEPARAMS(gr_frontsector->f_slope, frontf1, frontf2, gr_frontsector-> floorheight)
SLOPEPARAMS(gr_frontsector->c_slope, frontc1, frontc2, gr_frontsector->ceilingheight)
- SLOPEPARAMS( gr_backsector->f_slope, backf1, backf2, gr_backsector->floorheight)
- SLOPEPARAMS( gr_backsector->c_slope, backc1, backc2, gr_backsector->ceilingheight)
+ SLOPEPARAMS( gr_backsector->f_slope, backf1, backf2, gr_backsector-> floorheight)
+ SLOPEPARAMS( gr_backsector->c_slope, backc1, backc2, gr_backsector->ceilingheight)
#undef SLOPEPARAMS
// if both ceilings are skies, consider it always "open"
// same for floors
@@ -2703,7 +2471,6 @@ static void HWR_AddLine(seg_t * line)
goto clippass;
}
else
-#endif
{
// if both ceilings are skies, consider it always "open"
// same for floors
@@ -2846,8 +2613,6 @@ static boolean HWR_CheckBBox(fixed_t *bspcoord)
#endif
}
-#ifdef POLYOBJECTS
-
//
// HWR_AddPolyObjectSegs
//
@@ -2890,7 +2655,6 @@ static inline void HWR_AddPolyObjectSegs(void)
Z_Free(gr_fakeline);
}
-#ifdef POLYOBJECTS_PLANES
static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, fixed_t fixedheight,
FBITFIELD blendmode, UINT8 lightlevel, levelflat_t *levelflat, sector_t *FOFsector,
UINT8 alpha, extracolormap_t *planecolormap)
@@ -3143,8 +2907,6 @@ static void HWR_AddPolyObjectPlanes(void)
}
}
}
-#endif
-#endif
// -----------------+
// HWR_Subsector : Determine floor/ceiling planes.
@@ -3236,22 +2998,10 @@ static void HWR_Subsector(size_t num)
}
else
{
- cullFloorHeight = locFloorHeight = gr_frontsector->floorheight;
- cullCeilingHeight = locCeilingHeight = gr_frontsector->ceilingheight;
-
-#ifdef ESLOPE
- if (gr_frontsector->f_slope)
- {
- cullFloorHeight = P_GetZAt(gr_frontsector->f_slope, viewx, viewy);
- locFloorHeight = P_GetZAt(gr_frontsector->f_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
-
- if (gr_frontsector->c_slope)
- {
- cullCeilingHeight = P_GetZAt(gr_frontsector->c_slope, viewx, viewy);
- locCeilingHeight = P_GetZAt(gr_frontsector->c_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
-#endif
+ cullFloorHeight = P_GetSectorFloorZAt (gr_frontsector, viewx, viewy);
+ cullCeilingHeight = P_GetSectorCeilingZAt(gr_frontsector, viewx, viewy);
+ locFloorHeight = P_GetSectorFloorZAt (gr_frontsector, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
+ locCeilingHeight = P_GetSectorCeilingZAt(gr_frontsector, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
}
// ----- end special tricks -----
@@ -3343,15 +3093,8 @@ static void HWR_Subsector(size_t num)
fixed_t cullHeight, centerHeight;
// bottom plane
-#ifdef ESLOPE
- if (*rover->b_slope)
- {
- cullHeight = P_GetZAt(*rover->b_slope, viewx, viewy);
- centerHeight = P_GetZAt(*rover->b_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
- else
-#endif
- cullHeight = centerHeight = *rover->bottomheight;
+ cullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy);
+ centerHeight = P_GetFFloorBottomZAt(rover, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
continue;
@@ -3360,7 +3103,7 @@ static void HWR_Subsector(size_t num)
if (centerHeight <= locCeilingHeight &&
centerHeight >= locFloorHeight &&
- ((dup_viewz < cullHeight && !(rover->flags & FF_INVERTPLANES)) ||
+ ((dup_viewz < cullHeight && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) ||
(dup_viewz > cullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
if (rover->flags & FF_FOG)
@@ -3400,19 +3143,12 @@ static void HWR_Subsector(size_t num)
}
// top plane
-#ifdef ESLOPE
- if (*rover->t_slope)
- {
- cullHeight = P_GetZAt(*rover->t_slope, viewx, viewy);
- centerHeight = P_GetZAt(*rover->t_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
- else
-#endif
- cullHeight = centerHeight = *rover->topheight;
+ cullHeight = P_GetFFloorTopZAt(rover, viewx, viewy);
+ centerHeight = P_GetFFloorTopZAt(rover, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
if (centerHeight >= locFloorHeight &&
centerHeight <= locCeilingHeight &&
- ((dup_viewz > cullHeight && !(rover->flags & FF_INVERTPLANES)) ||
+ ((dup_viewz > cullHeight && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) ||
(dup_viewz < cullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
if (rover->flags & FF_FOG)
@@ -3455,7 +3191,6 @@ static void HWR_Subsector(size_t num)
#endif
#endif //doplanes
-#ifdef POLYOBJECTS
// Draw all the polyobjects in this subsector
if (sub->polyList)
{
@@ -3479,15 +3214,12 @@ static void HWR_Subsector(size_t num)
// Draw polyobject lines.
HWR_AddPolyObjectSegs();
-#ifdef POLYOBJECTS_PLANES
if (sub->validcount != validcount) // This validcount situation seems to let us know that the floors have already been drawn.
{
// Draw polyobject planes
HWR_AddPolyObjectPlanes();
}
-#endif
}
-#endif
// Hurder ici se passe les choses INT32�essantes!
// on vient de tracer le sol et le plafond
@@ -3510,14 +3242,8 @@ static void HWR_Subsector(size_t num)
while (count--)
{
- if (!line->glseg
-#ifdef POLYOBJECTS
- && !line->polyseg // ignore segs that belong to polyobjects
-#endif
- )
- {
+ if (!line->glseg && !line->polyseg) // ignore segs that belong to polyobjects
HWR_AddLine(line);
- }
line++;
}
}
@@ -3809,20 +3535,21 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
float fscale; float fx; float fy; float offset;
extracolormap_t *colormap = NULL;
UINT8 i;
+ SINT8 flip = P_MobjFlip(thing);
INT32 light;
fixed_t scalemul;
UINT16 alpha;
fixed_t floordiff;
- fixed_t floorz;
+ fixed_t groundz;
fixed_t slopez;
- pslope_t *floorslope;
+ pslope_t *groundslope;
- floorz = R_GetShadowZ(thing, &floorslope);
+ groundz = R_GetShadowZ(thing, &groundslope);
- //if (abs(floorz - gr_viewz) / tz > 4) return; // Prevent stretchy shadows and possible crashes
+ //if (abs(groundz - gr_viewz) / tz > 4) return; // Prevent stretchy shadows and possible crashes
- floordiff = abs(thing->z - floorz);
+ floordiff = abs((flip < 0 ? thing->height : 0) + thing->z - groundz);
alpha = floordiff / (4*FRACUNIT) + 75;
if (alpha >= 255) return;
@@ -3833,7 +3560,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
HWR_GetPatch(gpatch);
scalemul = FixedMul(FRACUNIT - floordiff/640, scale);
- scalemul = FixedMul(scalemul, (thing->radius*2) / gpatch->height);
+ scalemul = FixedMul(scalemul, (thing->radius*2) / SHORT(gpatch->height));
fscale = FIXED_TO_FLOAT(scalemul);
fx = FIXED_TO_FLOAT(thing->x);
@@ -3845,9 +3572,9 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
// 0--1
if (thing && fabsf(fscale - 1.0f) > 1.0E-36f)
- offset = (gpatch->height/2) * fscale;
+ offset = (SHORT(gpatch->height)/2) * fscale;
else
- offset = (float)(gpatch->height/2);
+ offset = (float)(SHORT(gpatch->height)/2);
shadowVerts[2].x = shadowVerts[3].x = fx + offset;
shadowVerts[1].x = shadowVerts[0].x = fx - offset;
@@ -3862,18 +3589,18 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
shadowVerts[i].z = fy + ((oldx - fx) * gr_viewsin) + ((oldy - fy) * gr_viewcos);
}
- if (floorslope)
+ if (groundslope)
{
for (i = 0; i < 4; i++)
{
- slopez = P_GetZAt(floorslope, FLOAT_TO_FIXED(shadowVerts[i].x), FLOAT_TO_FIXED(shadowVerts[i].z));
- shadowVerts[i].y = FIXED_TO_FLOAT(slopez) + 0.05f;
+ slopez = P_GetSlopeZAt(groundslope, FLOAT_TO_FIXED(shadowVerts[i].x), FLOAT_TO_FIXED(shadowVerts[i].z));
+ shadowVerts[i].y = FIXED_TO_FLOAT(slopez) + flip * 0.05f;
}
}
else
{
for (i = 0; i < 4; i++)
- shadowVerts[i].y = FIXED_TO_FLOAT(floorz) + 0.05f;
+ shadowVerts[i].y = FIXED_TO_FLOAT(groundz) + flip * 0.05f;
}
shadowVerts[0].s = shadowVerts[3].s = 0;
@@ -3884,7 +3611,8 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
if (thing->subsector->sector->numlights)
{
- light = R_GetPlaneLight(thing->subsector->sector, floorz, false); // Always use the light at the top instead of whatever I was doing before
+ light = R_GetPlaneLight(thing->subsector->sector, groundz, false); // Always use the light at the top instead of whatever I was doing before
+
if (*thing->subsector->sector->lightlist[light].extra_colormap)
colormap = *thing->subsector->sector->lightlist[light].extra_colormap;
}
@@ -3902,7 +3630,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
}
// This is expecting a pointer to an array containing 4 wallVerts for a sprite
-static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts)
+static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts, const boolean precip)
{
if (cv_grspritebillboarding.value
&& spr && spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE)
@@ -3910,7 +3638,7 @@ static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts
{
float basey = FIXED_TO_FLOAT(spr->mobj->z);
float lowy = wallVerts[0].y;
- if (P_MobjFlip(spr->mobj) == -1)
+ if (!precip && P_MobjFlip(spr->mobj) == -1) // precip doesn't have eflags so they can't flip
{
basey = FIXED_TO_FLOAT(spr->mobj->z + spr->mobj->height);
}
@@ -3955,13 +3683,11 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
float realheight, heightmult;
const sector_t *sector = spr->mobj->subsector->sector;
const lightlist_t *list = sector->lightlist;
-#ifdef ESLOPE
float endrealtop, endrealbot, endtop, endbot;
float endbheight;
float endrealheight;
fixed_t temp;
fixed_t v1x, v1y, v2x, v2y;
-#endif
this_scale = FIXED_TO_FLOAT(spr->mobj->scale);
@@ -4025,7 +3751,7 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
}
// Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, baseWallVerts);
+ HWR_RotateSpritePolyToAim(spr, baseWallVerts, false);
realtop = top = baseWallVerts[3].y;
realbot = bot = baseWallVerts[0].y;
@@ -4033,10 +3759,8 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
tbot = baseWallVerts[0].t;
tmult = (tbot - ttop) / (top - bot);
-#ifdef ESLOPE
endrealtop = endtop = baseWallVerts[2].y;
endrealbot = endbot = baseWallVerts[1].y;
-#endif
// copy the contents of baseWallVerts into the drawn wallVerts array
// baseWallVerts is used to know the final shape to easily get the vertex
@@ -4076,11 +3800,9 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
if (spr->mobj->frame & FF_FULLBRIGHT)
lightlevel = 255;
-#ifdef ESLOPE
for (i = 1; i < sector->numlights; i++)
{
- fixed_t h = sector->lightlist[i].slope ? P_GetZAt(sector->lightlist[i].slope, spr->mobj->x, spr->mobj->y)
- : sector->lightlist[i].height;
+ fixed_t h = P_GetLightZAt(§or->lightlist[i], spr->mobj->x, spr->mobj->y);
if (h <= temp)
{
if (!(spr->mobj->frame & FF_FULLBRIGHT))
@@ -4089,19 +3811,10 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
break;
}
}
-#else
- i = R_GetPlaneLight(sector, temp, false);
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
- lightlevel = *list[i].lightlevel > 255 ? 255 : *list[i].lightlevel;
- colormap = *list[i].extra_colormap;
-#endif
for (i = 0; i < sector->numlights; i++)
{
-#ifdef ESLOPE
- if (endtop < endrealbot)
-#endif
- if (top < realbot)
+ if (endtop < endrealbot && top < realbot)
return;
// even if we aren't changing colormap or lightlevel, we still need to continue drawing down the sprite
@@ -4112,39 +3825,20 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
colormap = *list[i].extra_colormap;
}
-#ifdef ESLOPE
if (i + 1 < sector->numlights)
{
- if (list[i+1].slope)
- {
- temp = P_GetZAt(list[i+1].slope, v1x, v1y);
- bheight = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(list[i+1].slope, v2x, v2y);
- endbheight = FIXED_TO_FLOAT(temp);
- }
- else
- bheight = endbheight = FIXED_TO_FLOAT(list[i+1].height);
+ temp = P_GetLightZAt(&list[i+1], v1x, v1y);
+ bheight = FIXED_TO_FLOAT(temp);
+ temp = P_GetLightZAt(&list[i+1], v2x, v2y);
+ endbheight = FIXED_TO_FLOAT(temp);
}
else
{
bheight = realbot;
endbheight = endrealbot;
}
-#else
- if (i + 1 < sector->numlights)
- {
- bheight = FIXED_TO_FLOAT(list[i+1].height);
- }
- else
- {
- bheight = realbot;
- }
-#endif
-#ifdef ESLOPE
- if (endbheight >= endtop)
-#endif
- if (bheight >= top)
+ if (endbheight >= endtop && bheight >= top)
continue;
bot = bheight;
@@ -4152,14 +3846,11 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
if (bot < realbot)
bot = realbot;
-#ifdef ESLOPE
endbot = endbheight;
if (endbot < endrealbot)
endbot = endrealbot;
-#endif
-#ifdef ESLOPE
wallVerts[3].t = ttop + ((realtop - top) * tmult);
wallVerts[2].t = ttop + ((endrealtop - endtop) * tmult);
wallVerts[0].t = ttop + ((realtop - bot) * tmult);
@@ -4193,32 +3884,6 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
wallVerts[1].x = baseWallVerts[2].x + (baseWallVerts[2].x - baseWallVerts[1].x) * heightmult;
wallVerts[1].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult;
}
-#else
- wallVerts[3].t = wallVerts[2].t = ttop + ((realtop - top) * tmult);
- wallVerts[0].t = wallVerts[1].t = ttop + ((realtop - bot) * tmult);
-
- wallVerts[2].y = wallVerts[3].y = top;
- wallVerts[0].y = wallVerts[1].y = bot;
-
- // The x and y only need to be adjusted in the case that it's not a papersprite
- if (cv_grspritebillboarding.value
- && spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE))
- {
- // Get the x and z of the vertices so billboarding draws correctly
- realheight = realbot - realtop;
- heightmult = (realtop - top) / realheight;
- wallVerts[3].x = baseWallVerts[3].x + (baseWallVerts[3].x - baseWallVerts[0].x) * heightmult;
- wallVerts[3].z = baseWallVerts[3].z + (baseWallVerts[3].z - baseWallVerts[0].z) * heightmult;
- wallVerts[2].x = baseWallVerts[2].x + (baseWallVerts[2].x - baseWallVerts[1].x) * heightmult;
- wallVerts[2].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult;
-
- heightmult = (realtop - bot) / realheight;
- wallVerts[0].x = baseWallVerts[3].x + (baseWallVerts[3].x - baseWallVerts[0].x) * heightmult;
- wallVerts[0].z = baseWallVerts[3].z + (baseWallVerts[3].z - baseWallVerts[0].z) * heightmult;
- wallVerts[1].x = baseWallVerts[2].x + (baseWallVerts[2].x - baseWallVerts[1].x) * heightmult;
- wallVerts[1].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult;
- }
-#endif
HWR_Lighting(&Surf, lightlevel, colormap);
@@ -4228,21 +3893,15 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
HWD.pfnDrawPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip);
top = bot;
-#ifdef ESLOPE
endtop = endbot;
-#endif
}
bot = realbot;
-#ifdef ESLOPE
endbot = endrealbot;
- if (endtop <= endrealbot)
-#endif
- if (top <= realbot)
+ if (endtop <= endrealbot && top <= realbot)
return;
// If we're ever down here, somehow the above loop hasn't draw all the light levels of sprite
-#ifdef ESLOPE
wallVerts[3].t = ttop + ((realtop - top) * tmult);
wallVerts[2].t = ttop + ((endrealtop - endtop) * tmult);
wallVerts[0].t = ttop + ((realtop - bot) * tmult);
@@ -4252,13 +3911,6 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
wallVerts[2].y = endtop;
wallVerts[0].y = bot;
wallVerts[1].y = endbot;
-#else
- wallVerts[3].t = wallVerts[2].t = ttop + ((realtop - top) * tmult);
- wallVerts[0].t = wallVerts[1].t = ttop + ((realtop - bot) * tmult);
-
- wallVerts[2].y = wallVerts[3].y = top;
- wallVerts[0].y = wallVerts[1].y = bot;
-#endif
HWR_Lighting(&Surf, lightlevel, colormap);
@@ -4368,7 +4020,7 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
}
// Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, wallVerts);
+ HWR_RotateSpritePolyToAim(spr, wallVerts, false);
// This needs to be AFTER the shadows so that the regular sprites aren't drawn completely black.
// sprite lighting by modulating the RGB components
@@ -4450,7 +4102,7 @@ static inline void HWR_DrawPrecipitationSprite(gr_vissprite_t *spr)
wallVerts[1].z = wallVerts[2].z = spr->z2;
// Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, wallVerts);
+ HWR_RotateSpritePolyToAim(spr, wallVerts, true);
wallVerts[0].s = wallVerts[3].s = 0;
wallVerts[2].s = wallVerts[1].s = gpatch->max_s;
@@ -5202,10 +4854,10 @@ static void HWR_ProjectSprite(mobj_t *thing)
rotsprite = sprframe->rotsprite.patch[rot][rollangle];
if (rotsprite != NULL)
{
- spr_width = rotsprite->width << FRACBITS;
- spr_height = rotsprite->height << FRACBITS;
- spr_offset = rotsprite->leftoffset << FRACBITS;
- spr_topoffset = rotsprite->topoffset << FRACBITS;
+ spr_width = SHORT(rotsprite->width) << FRACBITS;
+ spr_height = SHORT(rotsprite->height) << FRACBITS;
+ spr_offset = SHORT(rotsprite->leftoffset) << FRACBITS;
+ spr_topoffset = SHORT(rotsprite->topoffset) << FRACBITS;
// flip -> rotate, not rotate -> flip
flip = 0;
}
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 35932bcc0e04559981faa54f4e4865c1675c2328..76c7f89b4b61526447d0aa421467d2ccd7c0ed81 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -656,12 +656,12 @@ spritemodelfound:
#define SETBRIGHTNESS(brightness,r,g,b) \
brightness = (UINT8)(((1063*(UINT16)(r))/5000) + ((3576*(UINT16)(g))/5000) + ((361*(UINT16)(b))/5000))
-static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, GLMipmap_t *grmip, INT32 skinnum, skincolors_t color)
+static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, GLMipmap_t *grmip, INT32 skinnum, skincolornum_t color)
{
UINT16 w = gpatch->width, h = gpatch->height;
UINT32 size = w*h;
RGBA_t *image, *blendimage, *cur, blendcolor;
- UINT8 translation[16]; // First the color index
+ UINT16 translation[16]; // First the color index
UINT8 cutoff[16]; // Brightness cutoff before using the next color
UINT8 translen = 0;
UINT8 i;
@@ -697,16 +697,16 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
if (skinnum == TC_METALSONIC)
color = SKINCOLOR_COBALT;
- if (color != SKINCOLOR_NONE)
+ if (color != SKINCOLOR_NONE && color < numskincolors)
{
UINT8 numdupes = 1;
- translation[translen] = Color_Index[color-1][0];
+ translation[translen] = skincolors[color].ramp[0];
cutoff[translen] = 255;
for (i = 1; i < 16; i++)
{
- if (translation[translen] == Color_Index[color-1][i])
+ if (translation[translen] == skincolors[color].ramp[i])
{
numdupes++;
continue;
@@ -720,7 +720,7 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
numdupes = 1;
translen++;
- translation[translen] = (UINT8)Color_Index[color-1][i];
+ translation[translen] = (UINT16)skincolors[color].ramp[i];
}
translen++;
@@ -1030,7 +1030,7 @@ skippixel:
#undef SETBRIGHTNESS
-static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT32 skinnum, const UINT8 *colormap, skincolors_t color)
+static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT32 skinnum, const UINT8 *colormap, skincolornum_t color)
{
// mostly copied from HWR_GetMappedPatch, hence the similarities and comment
GLMipmap_t *grmip, *newmip;
@@ -1319,7 +1319,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
else
skinnum = TC_BOSS;
}
- else if ((skincolors_t)spr->mobj->color != SKINCOLOR_NONE)
+ else if ((skincolornum_t)spr->mobj->color != SKINCOLOR_NONE)
{
if (spr->mobj->colorized)
skinnum = TC_RAINBOW;
@@ -1339,7 +1339,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
}
// Translation or skin number found
- HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, skinnum, spr->colormap, (skincolors_t)spr->mobj->color);
+ HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, skinnum, spr->colormap, (skincolornum_t)spr->mobj->color);
}
else
{
diff --git a/src/hardware/hw_trick.c b/src/hardware/hw_trick.c
index 97d86b944890de2fae05d11bfd05ed607722b3d3..82d81b5b2520925835ed635faf392a0469239fb5 100644
--- a/src/hardware/hw_trick.c
+++ b/src/hardware/hw_trick.c
@@ -610,10 +610,8 @@ static boolean isCeilingFloating(sector_t *thisSector)
if (!adjSector) // assume floating sectors have surrounding sectors
return false;
-#ifdef ESLOPE
if (adjSector->c_slope) // Don't bother with slopes
return false;
-#endif
if (!refSector)
{
@@ -663,10 +661,8 @@ static boolean isFloorFloating(sector_t *thisSector)
if (!adjSector) // assume floating sectors have surrounding sectors
return false;
-#ifdef ESLOPE
if (adjSector->f_slope) // Don't bother with slopes
return false;
-#endif
if (!refSector)
{
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 98f3ca5a990fad5aed7367f9842f61b04372255e..6f2319a50cc4eb83e5aaccd77f7c9f2d81313b9c 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -47,10 +47,8 @@
#include "hardware/hw_main.h"
#endif
-#ifdef HAVE_BLUA
#include "lua_hud.h"
#include "lua_hook.h"
-#endif
// coords are scaled
#define HU_INPUTX 0
@@ -70,7 +68,7 @@ patch_t *nightsnum[10]; // 0-9
// Level title and credits fonts
patch_t *lt_font[LT_FONTSIZE];
patch_t *cred_font[CRED_FONTSIZE];
-patch_t *ttlnum[20]; // act numbers (0-19)
+patch_t *ttlnum[10]; // act numbers (0-9)
// Name tag fonts
patch_t *ntb_font[NT_FONTSIZE];
@@ -245,7 +243,7 @@ void HU_LoadGraphics(void)
tallinfin = (patch_t *)W_CachePatchName("STTINFIN", PU_HUDGFX);
// cache act numbers for level titles
- for (i = 0; i < 20; i++)
+ for (i = 0; i < 10; i++)
{
sprintf(buffer, "TTL%.2d", i);
ttlnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
@@ -688,10 +686,8 @@ 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.
-#ifdef HAVE_BLUA
if (LUAh_PlayerMsg(playernum, target, flags, msg))
return;
-#endif
if (spam_eatmsg)
return; // don't proceed if we were supposed to eat the message.
@@ -759,113 +755,40 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
}
else
{
- const UINT8 color = players[playernum].skincolor;
-
- cstart = "\x83";
-
- // Follow palette order at r_draw.c Color_Names
- switch (color)
- {
- default:
- case SKINCOLOR_WHITE:
- case SKINCOLOR_BONE:
- case SKINCOLOR_CLOUDY:
- case SKINCOLOR_GREY:
- case SKINCOLOR_SILVER:
- case SKINCOLOR_AETHER:
- case SKINCOLOR_SLATE:
- cstart = "\x80"; // white
- break;
- case SKINCOLOR_CARBON:
- case SKINCOLOR_JET:
- case SKINCOLOR_BLACK:
- cstart = "\x86"; // V_GRAYMAP
- break;
- case SKINCOLOR_PINK:
- case SKINCOLOR_RUBY:
- case SKINCOLOR_SALMON:
- case SKINCOLOR_RED:
- case SKINCOLOR_CRIMSON:
- case SKINCOLOR_FLAME:
- case SKINCOLOR_KETCHUP:
- cstart = "\x85"; // V_REDMAP
- break;
- case SKINCOLOR_YOGURT:
- case SKINCOLOR_BROWN:
- case SKINCOLOR_BRONZE:
- case SKINCOLOR_TAN:
- case SKINCOLOR_BEIGE:
- case SKINCOLOR_QUAIL:
- cstart = "\x8d"; // V_BROWNMAP
- break;
- case SKINCOLOR_MOSS:
- case SKINCOLOR_GREEN:
- case SKINCOLOR_FOREST:
- case SKINCOLOR_EMERALD:
- case SKINCOLOR_MINT:
- cstart = "\x83"; // V_GREENMAP
- break;
- case SKINCOLOR_AZURE:
- cstart = "\x8c"; // V_AZUREMAP
- break;
- case SKINCOLOR_LAVENDER:
- case SKINCOLOR_PASTEL:
- case SKINCOLOR_PURPLE:
- cstart = "\x89"; // V_PURPLEMAP
- break;
- case SKINCOLOR_PEACHY:
- case SKINCOLOR_LILAC:
- case SKINCOLOR_PLUM:
- case SKINCOLOR_ROSY:
- cstart = "\x8e"; // V_ROSYMAP
- break;
- case SKINCOLOR_SUNSET:
- case SKINCOLOR_COPPER:
- case SKINCOLOR_APRICOT:
- case SKINCOLOR_ORANGE:
- case SKINCOLOR_RUST:
- cstart = "\x87"; // V_ORANGEMAP
- break;
- case SKINCOLOR_GOLD:
- case SKINCOLOR_SANDY:
- case SKINCOLOR_YELLOW:
- case SKINCOLOR_OLIVE:
- cstart = "\x82"; // V_YELLOWMAP
- break;
- case SKINCOLOR_LIME:
- case SKINCOLOR_PERIDOT:
- case SKINCOLOR_APPLE:
- cstart = "\x8b"; // V_PERIDOTMAP
- break;
- case SKINCOLOR_SEAFOAM:
- case SKINCOLOR_AQUA:
- cstart = "\x8a"; // V_AQUAMAP
- break;
- case SKINCOLOR_TEAL:
- case SKINCOLOR_WAVE:
- case SKINCOLOR_CYAN:
- case SKINCOLOR_SKY:
- case SKINCOLOR_CERULEAN:
- case SKINCOLOR_ICY:
- case SKINCOLOR_SAPPHIRE:
- case SKINCOLOR_VAPOR:
- cstart = "\x88"; // V_SKYMAP
- break;
- case SKINCOLOR_CORNFLOWER:
- case SKINCOLOR_BLUE:
- case SKINCOLOR_COBALT:
- case SKINCOLOR_DUSK:
- case SKINCOLOR_BLUEBELL:
- cstart = "\x84"; // V_BLUEMAP
- break;
- case SKINCOLOR_BUBBLEGUM:
- case SKINCOLOR_MAGENTA:
- case SKINCOLOR_NEON:
- case SKINCOLOR_VIOLET:
- case SKINCOLOR_RASPBERRY:
- cstart = "\x81"; // V_MAGENTAMAP
- break;
- }
+ UINT16 chatcolor = skincolors[players[playernum].skincolor].chatcolor;
+
+ if (!chatcolor || chatcolor%0x1000 || chatcolor>V_INVERTMAP)
+ cstart = "\x80";
+ else if (chatcolor == V_MAGENTAMAP)
+ cstart = "\x81";
+ else if (chatcolor == V_YELLOWMAP)
+ cstart = "\x82";
+ else if (chatcolor == V_GREENMAP)
+ cstart = "\x83";
+ else if (chatcolor == V_BLUEMAP)
+ cstart = "\x84";
+ else if (chatcolor == V_REDMAP)
+ cstart = "\x85";
+ else if (chatcolor == V_GRAYMAP)
+ cstart = "\x86";
+ else if (chatcolor == V_ORANGEMAP)
+ cstart = "\x87";
+ else if (chatcolor == V_SKYMAP)
+ cstart = "\x88";
+ else if (chatcolor == V_PURPLEMAP)
+ cstart = "\x89";
+ else if (chatcolor == V_AQUAMAP)
+ cstart = "\x8a";
+ else if (chatcolor == V_PERIDOTMAP)
+ cstart = "\x8b";
+ else if (chatcolor == V_AZUREMAP)
+ cstart = "\x8c";
+ else if (chatcolor == V_BROWNMAP)
+ cstart = "\x8d";
+ else if (chatcolor == V_ROSYMAP)
+ cstart = "\x8e";
+ else if (chatcolor == V_INVERTMAP)
+ cstart = "\x8f";
}
prefix = cstart;
@@ -2177,18 +2100,14 @@ void HU_Drawer(void)
{
if (netgame || multiplayer)
{
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_rankings))
-#endif
- HU_DrawRankings();
+ HU_DrawRankings();
if (gametype == GT_COOP)
HU_DrawNetplayCoopOverlay();
}
else
HU_DrawCoopOverlay();
-#ifdef HAVE_BLUA
LUAh_ScoresHUD();
-#endif
}
if (gamestate != GS_LEVEL)
@@ -3171,29 +3090,20 @@ static void HU_DrawRankings(void)
static void HU_DrawCoopOverlay(void)
{
- if (token
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_tokens)
-#endif
- )
+ if (token && LUA_HudEnabled(hud_tokens))
{
V_DrawString(168, 176, 0, va("- %d", token));
V_DrawSmallScaledPatch(148, 172, 0, tokenicon);
}
-#ifdef HAVE_BLUA
- if (LUA_HudEnabled(hud_tabemblems))
-#endif
- if (!modifiedgame || savemoddata)
+ if (LUA_HudEnabled(hud_tabemblems) && (!modifiedgame || savemoddata))
{
V_DrawString(160, 144, 0, va("- %d/%d", M_CountEmblems(), numemblems+numextraemblems));
V_DrawScaledPatch(128, 144 - SHORT(emblemicon->height)/4, 0, emblemicon);
}
-#ifdef HAVE_BLUA
if (!LUA_HudEnabled(hud_coopemeralds))
return;
-#endif
if (emeralds & EMERALD1)
V_DrawScaledPatch((BASEVIDWIDTH/2)-8 , (BASEVIDHEIGHT/3)-32, 0, emeraldpics[0][0]);
@@ -3215,20 +3125,14 @@ static void HU_DrawNetplayCoopOverlay(void)
{
int i;
- if (token
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_tokens)
-#endif
- )
+ if (token && LUA_HudEnabled(hud_tokens))
{
V_DrawString(168, 10, 0, va("- %d", token));
V_DrawSmallScaledPatch(148, 6, 0, tokenicon);
}
-#ifdef HAVE_BLUA
if (!LUA_HudEnabled(hud_coopemeralds))
return;
-#endif
for (i = 0; i < 7; ++i)
{
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 9e3c667479906955a1063d478062fd06aa71cfd5..63d85f1b81a7637579a1b510a2d979f79368281c 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -85,7 +85,7 @@ extern patch_t *lt_font[LT_FONTSIZE];
extern patch_t *cred_font[CRED_FONTSIZE];
extern patch_t *ntb_font[NT_FONTSIZE];
extern patch_t *nto_font[NT_FONTSIZE];
-extern patch_t *ttlnum[20];
+extern patch_t *ttlnum[10];
extern patch_t *emeraldpics[3][8];
extern patch_t *rflagico;
extern patch_t *bflagico;
diff --git a/src/info.c b/src/info.c
index bd6ccb527a8ace37c59397091a8d0c868c668905..f0272fc79da8aa54131151664f5e41f278a85d5b 100644
--- a/src/info.c
+++ b/src/info.c
@@ -20,6 +20,7 @@
#include "m_misc.h"
#include "z_zone.h"
#include "d_player.h"
+#include "v_video.h" // V_*MAP constants
#include "lzf.h"
#ifdef HWRENDER
#include "hardware/hw_light.h"
@@ -187,6 +188,8 @@ char sprnames[NUMSPRITES + 1][5] =
// Projectiles
"MISL",
+ "LASR", // GFZ3 laser
+ "LASF", // GFZ3 laser flames
"TORP", // Torpedo
"ENRG", // Energy ball
"MINE", // Skim mine
@@ -2058,7 +2061,15 @@ state_t states[NUMSTATES] =
{SPR_MISL, FF_FULLBRIGHT, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_ROCKET}, // S_ROCKET
- {SPR_MISL, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_LASER
+ {SPR_LASR, FF_FULLBRIGHT|0, 2, {NULL}, 0, 0, S_NULL}, // S_LASER
+ {SPR_LASR, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_NULL}, // S_LASER2
+ {SPR_LASR, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_NULL}, // S_LASERFLASH
+
+ {SPR_LASF, FF_FULLBRIGHT|0, 2, {NULL}, 0, 0, S_LASERFLAME2}, // S_LASERFLAME1
+ {SPR_LASF, FF_FULLBRIGHT|1, 1, {A_ChangeHeight}, 156*FRACUNIT, 3, S_LASERFLAME3}, // S_LASERFLAME2
+ {SPR_LASF, FF_FULLBRIGHT|2, 0, {A_ChangeHeight}, 32*FRACUNIT, 3, S_LASERFLAME4}, // S_LASERFLAME3
+ {SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|2, 4, {NULL}, 1, 2, S_LASERFLAME5}, // S_LASERFLAME4
+ {SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|4, 28, {NULL}, 2, 2, S_NULL}, // S_LASERFLAME5
{SPR_TORP, 0, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_TORPEDO}, // S_TORPEDO
@@ -5665,28 +5676,28 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_EGGMOBILE_FIRE
-1, // doomednum
- S_SPINFIRE1, // spawnstate
+ S_LASERFLAME1, // spawnstate
1, // spawnhealth
S_NULL, // seestate
- sfx_None, // seesound
+ sfx_s3kc2s, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
0, // painchance
- sfx_None, // painsound
+ sfx_s3k8d, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 8*FRACUNIT, // radius
- 14*FRACUNIT, // height
+ 24*FRACUNIT, // radius
+ 84*FRACUNIT, // height
0, // display offset
DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
- MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_FIRE, // flags
+ MF_NOGRAVITY|MF_FIRE|MF_PAIN, // flags
S_NULL // raisestate
},
@@ -9637,8 +9648,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // painstate
0, // painchance
sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
+ S_LASERFLASH, // meleestate
+ S_LASER2, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
@@ -9649,7 +9660,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // mass
20, // damage
sfx_None, // activesound
- MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
+ MF_MISSILE|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
@@ -21606,8 +21617,140 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
#endif
};
+skincolor_t skincolors[MAXSKINCOLORS] = {
+ {"None", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, SKINCOLOR_NONE, 0, 0, false}, // SKINCOLOR_NONE
+
+ // Greyscale ranges
+ {"White", {0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11}, SKINCOLOR_BLACK, 5, 0, true}, // SKINCOLOR_WHITE
+ {"Bone", {0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x05, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11, 0x12}, SKINCOLOR_JET, 7, 0, true}, // SKINCOLOR_BONE
+ {"Cloudy", {0x02, 0x03, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14}, SKINCOLOR_CARBON, 7, 0, true}, // SKINCOLOR_CLOUDY
+ {"Grey", {0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}, SKINCOLOR_AETHER, 12, 0, true}, // SKINCOLOR_GREY
+ {"Silver", {0x02, 0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d, 0x1f}, SKINCOLOR_SLATE, 12, 0, true}, // SKINCOLOR_SILVER
+ {"Carbon", {0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16, 0x17, 0x17, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1c, 0x1d}, SKINCOLOR_CLOUDY, 7, V_GRAYMAP, true}, // SKINCOLOR_CARBON
+ {"Jet", {0x00, 0x05, 0x0a, 0x0f, 0x14, 0x19, 0x1a, 0x1b, 0x1c, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f}, SKINCOLOR_BONE, 7, V_GRAYMAP, true}, // SKINCOLOR_JET
+ {"Black", {0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1b, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f}, SKINCOLOR_WHITE, 7, V_GRAYMAP, true}, // SKINCOLOR_BLACK
+
+ // Desaturated
+ {"Aether", {0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x91, 0x91, 0x91, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xaf}, SKINCOLOR_GREY, 15, 0, true}, // SKINCOLOR_AETHER
+ {"Slate", {0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0xaa, 0xaa, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xad, 0xae, 0xaf}, SKINCOLOR_SILVER, 12, 0, true}, // SKINCOLOR_SLATE
+ {"Bluebell", {0x90, 0x91, 0x92, 0x93, 0x94, 0x94, 0x95, 0xac, 0xac, 0xad, 0xad, 0xa8, 0xa8, 0xa9, 0xfd, 0xfe}, SKINCOLOR_COPPER, 4, V_BLUEMAP, true}, // SKINCOLOR_BLUEBELL
+ {"Pink", {0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0xd3, 0xd3, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0x2b, 0x2c, 0x2e}, SKINCOLOR_AZURE, 9, V_REDMAP, true}, // SKINCOLOR_PINK
+ {"Yogurt", {0xd0, 0x30, 0xd8, 0xd9, 0xda, 0xdb, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe3, 0xe6, 0xe8, 0xe9}, SKINCOLOR_RUST, 7, V_BROWNMAP, true}, // SKINCOLOR_YOGURT
+ {"Brown", {0xdf, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef}, SKINCOLOR_TAN, 2, V_BROWNMAP, true}, // SKINCOLOR_BROWN
+ {"Bronze", {0xde, 0xe0, 0xe1, 0xe4, 0xe7, 0xe9, 0xeb, 0xec, 0xed, 0xed, 0xed, 0x19, 0x19, 0x1b, 0x1d, 0x1e}, SKINCOLOR_KETCHUP, 0, V_BROWNMAP, true}, // SKINCOLOR_BRONZE
+ {"Tan", {0x51, 0x51, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x56, 0x57, 0xf5, 0xf5, 0xf9, 0xf9, 0xed, 0xed}, SKINCOLOR_BROWN, 12, V_BROWNMAP, true}, // SKINCOLOR_TAN
+ {"Beige", {0x54, 0x55, 0x56, 0x56, 0xf2, 0xf3, 0xf3, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfb, 0xed, 0xed}, SKINCOLOR_MOSS, 5, V_BROWNMAP, true}, // SKINCOLOR_BEIGE
+ {"Moss", {0x58, 0x58, 0x59, 0x59, 0x5a, 0x5a, 0x5b, 0x5b, 0x5b, 0x5c, 0x5d, 0x5d, 0x5e, 0x5e, 0x5f, 0x5f}, SKINCOLOR_BEIGE, 13, V_GREENMAP, true}, // SKINCOLOR_MOSS
+ {"Azure", {0x90, 0x90, 0x91, 0x91, 0xaa, 0xaa, 0xab, 0xab, 0xab, 0xac, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf}, SKINCOLOR_PINK, 5, V_AZUREMAP, true}, // SKINCOLOR_AZURE
+ {"Lavender", {0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc2, 0xc3, 0xc3, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7}, SKINCOLOR_GOLD, 4, V_PURPLEMAP, true}, // SKINCOLOR_LAVENDER
+
+ // Viv's vivid colours (toast 21/07/17)
+ {"Ruby", {0xb0, 0xb0, 0xc9, 0xca, 0xcc, 0x26, 0x27, 0x28, 0x29, 0x2a, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfd}, SKINCOLOR_EMERALD, 10, V_REDMAP, true}, // SKINCOLOR_RUBY
+ {"Salmon", {0xd0, 0xd0, 0xd1, 0xd2, 0x20, 0x21, 0x24, 0x25, 0x26, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e}, SKINCOLOR_FOREST, 6, V_REDMAP, true}, // SKINCOLOR_SALMON
+ {"Red", {0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x47, 0x2e, 0x2f}, SKINCOLOR_GREEN, 10, V_REDMAP, true}, // SKINCOLOR_RED
+ {"Crimson", {0x27, 0x27, 0x28, 0x28, 0x29, 0x2a, 0x2b, 0x2b, 0x2c, 0x2d, 0x2e, 0x2e, 0x2e, 0x2f, 0x2f, 0x1f}, SKINCOLOR_ICY, 10, V_REDMAP, true}, // SKINCOLOR_CRIMSON
+ {"Flame", {0x31, 0x32, 0x33, 0x36, 0x22, 0x22, 0x25, 0x25, 0x25, 0xcd, 0xcf, 0xcf, 0xc5, 0xc5, 0xc7, 0xc7}, SKINCOLOR_PURPLE, 8, V_REDMAP, true}, // SKINCOLOR_FLAME
+ {"Ketchup", {0x48, 0x49, 0x40, 0x33, 0x34, 0x36, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2b, 0x2c, 0x47, 0x2e, 0x2f}, SKINCOLOR_BRONZE, 8, V_REDMAP, true}, // SKINCOLOR_KETCHUP
+ {"Peachy", {0xd0, 0x30, 0x31, 0x31, 0x32, 0x32, 0xdc, 0xdc, 0xdc, 0xd3, 0xd4, 0xd4, 0xcc, 0xcd, 0xce, 0xcf}, SKINCOLOR_TEAL, 7, V_ROSYMAP, true}, // SKINCOLOR_PEACHY
+ {"Quail", {0xd8, 0xd9, 0xdb, 0xdc, 0xde, 0xdf, 0xd5, 0xd5, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0x1d, 0x1f}, SKINCOLOR_WAVE, 5, V_BROWNMAP, true}, // SKINCOLOR_QUAIL
+ {"Sunset", {0x51, 0x52, 0x40, 0x40, 0x34, 0x36, 0xd5, 0xd5, 0xd6, 0xd7, 0xcf, 0xcf, 0xc6, 0xc6, 0xc7, 0xfe}, SKINCOLOR_SAPPHIRE, 5, V_ORANGEMAP, true}, // SKINCOLOR_SUNSET
+ {"Copper", {0x58, 0x54, 0x40, 0x34, 0x35, 0x38, 0x3a, 0x3c, 0x3d, 0x2a, 0x2b, 0x2c, 0x2c, 0xba, 0xba, 0xbb}, SKINCOLOR_BLUEBELL, 5, V_ORANGEMAP, true}, // SKINCOLOR_COPPER
+ {"Apricot", {0x00, 0xd8, 0xd9, 0xda, 0xdb, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e}, SKINCOLOR_CYAN, 4, V_ORANGEMAP, true}, // SKINCOLOR_APRICOT
+ {"Orange", {0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x2c}, SKINCOLOR_BLUE, 4, V_ORANGEMAP, true}, // SKINCOLOR_ORANGE
+ {"Rust", {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3c, 0x3d, 0x3d, 0x3d, 0x3f, 0x2c, 0x2d, 0x47, 0x2e, 0x2f, 0x2f}, SKINCOLOR_YOGURT, 8, V_ORANGEMAP, true}, // SKINCOLOR_RUST
+ {"Gold", {0x51, 0x51, 0x54, 0x54, 0x41, 0x42, 0x43, 0x43, 0x44, 0x45, 0x46, 0x3f, 0x2d, 0x2e, 0x2f, 0x2f}, SKINCOLOR_LAVENDER, 10, V_YELLOWMAP, true}, // SKINCOLOR_GOLD
+ {"Sandy", {0x53, 0x40, 0x41, 0x42, 0x43, 0xe6, 0xe9, 0xe9, 0xea, 0xec, 0xec, 0xc6, 0xc6, 0xc7, 0xc7, 0xfe}, SKINCOLOR_SKY, 8, V_YELLOWMAP, true}, // SKINCOLOR_SANDY
+ {"Yellow", {0x52, 0x53, 0x49, 0x49, 0x4a, 0x4a, 0x4b, 0x4b, 0x4b, 0x4c, 0x4d, 0x4d, 0x4e, 0x4e, 0x4f, 0xed}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, true}, // SKINCOLOR_YELLOW
+ {"Olive", {0x4b, 0x4b, 0x4c, 0x4c, 0x4d, 0x4e, 0xe7, 0xe7, 0xe9, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7, 0xfd}, SKINCOLOR_DUSK, 3, V_YELLOWMAP, true}, // SKINCOLOR_OLIVE
+ {"Lime", {0x50, 0x51, 0x52, 0x53, 0x48, 0xbc, 0xbd, 0xbe, 0xbe, 0xbf, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, SKINCOLOR_MAGENTA, 9, V_PERIDOTMAP, true}, // SKINCOLOR_LIME
+ {"Peridot", {0x58, 0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbe, 0xbe, 0xbe, 0xbf, 0x5e, 0x5e, 0x5f, 0x5f, 0x77, 0x77}, SKINCOLOR_COBALT, 2, V_PERIDOTMAP, true}, // SKINCOLOR_PERIDOT
+ {"Apple", {0x49, 0x49, 0xbc, 0xbd, 0xbe, 0xbe, 0xbe, 0x67, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6d}, SKINCOLOR_RASPBERRY, 13, V_PERIDOTMAP, true}, // SKINCOLOR_APPLE
+ {"Green", {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, SKINCOLOR_RED, 6, V_GREENMAP, true}, // SKINCOLOR_GREEN
+ {"Forest", {0x65, 0x66, 0x67, 0x68, 0x69, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6e, 0x6e, 0x6e, 0x6f}, SKINCOLOR_SALMON, 9, V_GREENMAP, true}, // SKINCOLOR_FOREST
+ {"Emerald", {0x70, 0x70, 0x71, 0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x75, 0x75, 0x76, 0x76, 0x77, 0x77}, SKINCOLOR_RUBY, 4, V_GREENMAP, true}, // SKINCOLOR_EMERALD
+ {"Mint", {0x00, 0x00, 0x58, 0x58, 0x59, 0x62, 0x62, 0x62, 0x64, 0x67, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a}, SKINCOLOR_VIOLET, 5, V_GREENMAP, true}, // SKINCOLOR_MINT
+ {"Seafoam", {0x01, 0x58, 0x59, 0x5a, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0xfd, 0xfd}, SKINCOLOR_PLUM, 6, V_AQUAMAP, true}, // SKINCOLOR_SEAFOAM
+ {"Aqua", {0x78, 0x79, 0x7a, 0x7a, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c, 0x7d, 0x7e, 0x7e, 0x7f, 0x7f, 0x76, 0x77}, SKINCOLOR_ROSY, 7, V_AQUAMAP, true}, // SKINCOLOR_AQUA
+ {"Teal", {0x78, 0x78, 0x8c, 0x8c, 0x8d, 0x8d, 0x8d, 0x8e, 0x8e, 0x8f, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0x8a}, SKINCOLOR_PEACHY, 7, V_SKYMAP, true}, // SKINCOLOR_TEAL
+ {"Wave", {0x00, 0x78, 0x78, 0x79, 0x8d, 0x87, 0x88, 0x89, 0x89, 0xae, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfd}, SKINCOLOR_QUAIL, 5, V_SKYMAP, true}, // SKINCOLOR_WAVE
+ {"Cyan", {0x80, 0x81, 0xff, 0xff, 0x83, 0x83, 0x8d, 0x8d, 0x8d, 0x8e, 0x7e, 0x7f, 0x76, 0x76, 0x77, 0x6e}, SKINCOLOR_APRICOT, 6, V_SKYMAP, true}, // SKINCOLOR_CYAN
+ {"Sky", {0x80, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x85, 0x85, 0x86, 0x87, 0x88, 0x89, 0x89, 0x8a, 0x8b}, SKINCOLOR_SANDY, 1, V_SKYMAP, true}, // SKINCOLOR_SKY
+ {"Cerulean", {0x85, 0x86, 0x87, 0x88, 0x88, 0x89, 0x89, 0x89, 0x8a, 0x8a, 0xfd, 0xfd, 0xfd, 0x1f, 0x1f, 0x1f}, SKINCOLOR_NEON, 4, V_SKYMAP, true}, // SKINCOLOR_CERULEAN
+ {"Icy", {0x00, 0x00, 0x00, 0x00, 0x80, 0x81, 0x83, 0x83, 0x86, 0x87, 0x95, 0x95, 0xad, 0xad, 0xae, 0xaf}, SKINCOLOR_CRIMSON, 0, V_SKYMAP, true}, // SKINCOLOR_ICY
+ {"Sapphire", {0x80, 0x83, 0x86, 0x87, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, SKINCOLOR_SUNSET, 5, V_SKYMAP, true}, // SKINCOLOR_SAPPHIRE
+ {"Cornflower", {0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x9a, 0x9c, 0x9d, 0x9d, 0x9e, 0x9e, 0x9e}, SKINCOLOR_YELLOW, 4, V_BLUEMAP, true}, // SKINCOLOR_CORNFLOWER
+ {"Blue", {0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, SKINCOLOR_ORANGE, 5, V_BLUEMAP, true}, // SKINCOLOR_BLUE
+ {"Cobalt", {0x93, 0x94, 0x95, 0x96, 0x98, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfd, 0xfe, 0xfe}, SKINCOLOR_PERIDOT, 5, V_BLUEMAP, true}, // SKINCOLOR_COBALT
+ {"Vapor", {0x80, 0x81, 0x83, 0x86, 0x94, 0x94, 0xa3, 0xa3, 0xa4, 0xa6, 0xa6, 0xa6, 0xa8, 0xa8, 0xa9, 0xa9}, SKINCOLOR_LILAC, 4, V_SKYMAP, true}, // SKINCOLOR_VAPOR
+ {"Dusk", {0x92, 0x93, 0x94, 0x94, 0xac, 0xad, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf, 0xa9, 0xa9, 0xfd, 0xfd}, SKINCOLOR_OLIVE, 0, V_BLUEMAP, true}, // SKINCOLOR_DUSK
+ {"Pastel", {0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, SKINCOLOR_BUBBLEGUM, 9, V_PURPLEMAP, true}, // SKINCOLOR_PASTEL
+ {"Purple", {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa5, 0xa6, 0xa7, 0xa7, 0xa8, 0xa8, 0xa9, 0xa9}, SKINCOLOR_FLAME, 7, V_PURPLEMAP, true}, // SKINCOLOR_PURPLE
+ {"Bubblegum", {0x00, 0xd0, 0xd0, 0xc8, 0xc8, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, SKINCOLOR_PASTEL, 8, V_MAGENTAMAP, true}, // SKINCOLOR_BUBBLEGUM
+ {"Magenta", {0xb3, 0xb3, 0xb4, 0xb5, 0xb6, 0xb6, 0xb7, 0xb7, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb}, SKINCOLOR_LIME, 6, V_MAGENTAMAP, true}, // SKINCOLOR_MAGENTA
+ {"Neon", {0xb3, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb, 0xc7, 0xc7, 0x1d, 0x1d, 0x1e}, SKINCOLOR_CERULEAN, 2, V_MAGENTAMAP, true}, // SKINCOLOR_NEON
+ {"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, 15, V_MAGENTAMAP, 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
+ {"Super Silver 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03}, SKINCOLOR_BLACK, 15, 0, false}, // SKINCOLOR_SUPERSILVER1
+ {"Super Silver 2", {0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07}, SKINCOLOR_BLACK, 6, 0, false}, // SKINCOLOR_SUPERSILVER2
+ {"Super Silver 3", {0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b}, SKINCOLOR_BLACK, 5, 0, false}, // SKINCOLOR_SUPERSILVER3
+ {"Super Silver 4", {0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11}, SKINCOLOR_BLACK, 5, V_GRAYMAP, false}, // SKINCOLOR_SUPERSILVER4
+ {"Super Silver 5", {0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13}, SKINCOLOR_BLACK, 5, V_GRAYMAP, false}, // SKINCOLOR_SUPERSILVER5
+
+ {"Super Red 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2}, SKINCOLOR_CYAN, 15, 0, false}, // SKINCOLOR_SUPERRED1
+ {"Super Red 2", {0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd0, 0xd1, 0xd1, 0xd1, 0xd2, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21}, SKINCOLOR_CYAN, 14, V_ROSYMAP, false}, // SKINCOLOR_SUPERRED2
+ {"Super Red 3", {0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23}, SKINCOLOR_CYAN, 13, V_REDMAP, false}, // SKINCOLOR_SUPERRED3
+ {"Super Red 4", {0x00, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24}, SKINCOLOR_CYAN, 11, V_REDMAP, false}, // SKINCOLOR_SUPERRED4
+ {"Super Red 5", {0xd0, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25}, SKINCOLOR_CYAN, 10, V_REDMAP, false}, // SKINCOLOR_SUPERRED5
+
+ {"Super Orange 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34}, SKINCOLOR_SAPPHIRE, 15, 0, false}, // SKINCOLOR_SUPERORANGE1
+ {"Super Orange 2", {0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34}, SKINCOLOR_SAPPHIRE, 12, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE2
+ {"Super Orange 3", {0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x35}, SKINCOLOR_SAPPHIRE, 9, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE3
+ {"Super Orange 4", {0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46}, SKINCOLOR_SAPPHIRE, 4, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE4
+ {"Super Orange 5", {0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46, 0x47}, SKINCOLOR_SAPPHIRE, 3, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE5
+
+ {"Super Gold 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x52, 0x53, 0x48}, SKINCOLOR_CORNFLOWER, 15, 0, false}, // SKINCOLOR_SUPERGOLD1
+ {"Super Gold 2", {0x00, 0x50, 0x51, 0x52, 0x53, 0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41}, SKINCOLOR_CORNFLOWER, 9, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD2
+ {"Super Gold 3", {0x51, 0x52, 0x53, 0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD3
+ {"Super Gold 4", {0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD4
+ {"Super Gold 5", {0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD5
+
+ {"Super Peridot 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc}, SKINCOLOR_COBALT, 15, 0, false}, // SKINCOLOR_SUPERPERIDOT1
+ {"Super Peridot 2", {0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe}, SKINCOLOR_COBALT, 4, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT2
+ {"Super Peridot 3", {0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf}, SKINCOLOR_COBALT, 3, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT3
+ {"Super Peridot 4", {0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f}, SKINCOLOR_COBALT, 3, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT4
+ {"Super Peridot 5", {0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f, 0x77}, SKINCOLOR_COBALT, 3, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT5
+
+ {"Super Sky 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x81, 0x82, 0x83, 0x84}, SKINCOLOR_RUST, 15, 0, false}, // SKINCOLOR_SUPERSKY1
+ {"Super Sky 2", {0x00, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86}, SKINCOLOR_RUST, 4, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY2
+ {"Super Sky 3", {0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87}, SKINCOLOR_RUST, 3, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY3
+ {"Super Sky 4", {0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a}, SKINCOLOR_RUST, 3, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY4
+ {"Super Sky 5", {0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a, 0x8b}, SKINCOLOR_RUST, 3, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY5
+
+ {"Super Purple 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa2}, SKINCOLOR_EMERALD, 15, 0, false}, // SKINCOLOR_SUPERPURPLE1
+ {"Super Purple 2", {0x00, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5}, SKINCOLOR_EMERALD, 4, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE2
+ {"Super Purple 3", {0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6}, SKINCOLOR_EMERALD, 0, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE3
+ {"Super Purple 4", {0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9}, SKINCOLOR_EMERALD, 0, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE4
+ {"Super Purple 5", {0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9, 0xfd}, SKINCOLOR_EMERALD, 0, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE5
+
+ {"Super Rust 1", {0x00, 0xd0, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x32, 0x33, 0x37, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x2e}, SKINCOLOR_CYAN, 14, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST1
+ {"Super Rust 2", {0x30, 0x31, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x38, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x47, 0x2e}, SKINCOLOR_CYAN, 10, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST2
+ {"Super Rust 3", {0x31, 0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x3a, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x2e, 0x2e}, SKINCOLOR_CYAN, 9, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST3
+ {"Super Rust 4", {0x48, 0x40, 0x41, 0x42, 0x43, 0x44, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x47, 0x2e, 0x2e, 0x2e}, SKINCOLOR_CYAN, 8, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST4
+ {"Super Rust 5", {0x41, 0x42, 0x43, 0x43, 0x44, 0x44, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xed, 0xee, 0xee, 0xef, 0xef}, SKINCOLOR_CYAN, 8, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST5
+
+ {"Super Tan 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52}, SKINCOLOR_BROWN, 14, 0, false}, // SKINCOLOR_SUPERTAN1
+ {"Super Tan 2", {0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5}, SKINCOLOR_BROWN, 13, V_BROWNMAP, false}, // SKINCOLOR_SUPERTAN2
+ {"Super Tan 3", {0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9}, SKINCOLOR_BROWN, 12, V_BROWNMAP, false}, // SKINCOLOR_SUPERTAN3
+ {"Super Tan 4", {0x51, 0x52, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed}, SKINCOLOR_BROWN, 11, V_BROWNMAP, false}, // SKINCOLOR_SUPERTAN4
+ {"Super Tan 5", {0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed, 0xee, 0xef, 0xef}, SKINCOLOR_BROWN, 10, V_BROWNMAP, false} // SKINCOLOR_SUPERTAN5
+};
-/** Patches the mobjinfo table and state table.
+/** Patches the mobjinfo, state, and skincolor tables.
* Free slots are emptied out and set to initial values.
*/
void P_PatchInfoTables(void)
@@ -21635,6 +21778,11 @@ void P_PatchInfoTables(void)
sprnames[i][0] = '\0'; // i == NUMSPRITES
memset(&states[S_FIRSTFREESLOT], 0, sizeof (state_t) * NUMSTATEFREESLOTS);
memset(&mobjinfo[MT_FIRSTFREESLOT], 0, sizeof (mobjinfo_t) * NUMMOBJFREESLOTS);
+ memset(&skincolors[SKINCOLOR_FIRSTFREESLOT], 0, sizeof (skincolor_t) * NUMCOLORFREESLOTS);
+ for (i = SKINCOLOR_FIRSTFREESLOT; i <= SKINCOLOR_LASTFREESLOT; i++) {
+ skincolors[i].accessible = false;
+ skincolors[i].name[0] = '\0';
+ }
for (i = MT_FIRSTFREESLOT; i <= MT_LASTFREESLOT; i++)
mobjinfo[i].doomednum = -1;
}
@@ -21643,7 +21791,8 @@ void P_PatchInfoTables(void)
static char *sprnamesbackup;
static state_t *statesbackup;
static mobjinfo_t *mobjinfobackup;
-static size_t sprnamesbackupsize, statesbackupsize, mobjinfobackupsize;
+static skincolor_t *skincolorsbackup;
+static size_t sprnamesbackupsize, statesbackupsize, mobjinfobackupsize, skincolorsbackupsize;
#endif
void P_BackupTables(void)
@@ -21653,6 +21802,7 @@ void P_BackupTables(void)
sprnamesbackup = Z_Malloc(sizeof(sprnames), PU_STATIC, NULL);
statesbackup = Z_Malloc(sizeof(states), PU_STATIC, NULL);
mobjinfobackup = Z_Malloc(sizeof(mobjinfo), PU_STATIC, NULL);
+ skincolorsbackup = Z_Malloc(sizeof(skincolors), PU_STATIC, NULL);
// Sprite names
sprnamesbackupsize = lzf_compress(sprnames, sizeof(sprnames), sprnamesbackup, sizeof(sprnames));
@@ -21674,6 +21824,13 @@ void P_BackupTables(void)
mobjinfobackup = Z_Realloc(mobjinfobackup, mobjinfobackupsize, PU_STATIC, NULL);
else
M_Memcpy(mobjinfobackup, mobjinfo, sizeof(mobjinfo));
+
+ //Skincolor info
+ skincolorsbackupsize = lzf_compress(skincolors, sizeof(skincolors), skincolorsbackup, sizeof(skincolors));
+ if (skincolorsbackupsize > 0)
+ skincolorsbackup = Z_Realloc(skincolorsbackup, skincolorsbackupsize, PU_STATIC, NULL);
+ else
+ M_Memcpy(skincolorsbackup, skincolors, sizeof(skincolors));
#endif
}
@@ -21706,5 +21863,13 @@ void P_ResetData(INT32 flags)
else
M_Memcpy(mobjinfo, mobjinfobackup, sizeof(mobjinfobackup));
}
+
+ if (flags & 8)
+ {
+ if (skincolorsbackupsize > 0)
+ lzf_decompress(skincolorsbackup, skincolorsbackupsize, skincolors, sizeof(skincolors));
+ else
+ M_Memcpy(skincolors, skincolorsbackup, sizeof(skincolorsbackup));
+ }
#endif
}
diff --git a/src/info.h b/src/info.h
index f8a7136740486df8cbed9af6a76bbc8b4996b378..79af9bbbb8ae444fa3e9aee46cc17ca922bf9d68 100644
--- a/src/info.h
+++ b/src/info.h
@@ -165,6 +165,7 @@ void A_SetTics();
void A_SetRandomTics();
void A_ChangeColorRelative();
void A_ChangeColorAbsolute();
+void A_Dye();
void A_MoveRelative();
void A_MoveAbsolute();
void A_Thrust();
@@ -283,6 +284,7 @@ void A_RolloutRock();
void A_DragonbomberSpawn();
void A_DragonWing();
void A_DragonSegment();
+void A_ChangeHeight();
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
#define NUMMOBJFREESLOTS 512
@@ -450,6 +452,8 @@ typedef enum sprite
// Projectiles
SPR_MISL,
+ SPR_LASR, // GFZ3 laser
+ SPR_LASF, // GFZ3 laser flames
SPR_TORP, // Torpedo
SPR_ENRG, // Energy ball
SPR_MINE, // Skim mine
@@ -2219,6 +2223,14 @@ typedef enum state
S_ROCKET,
S_LASER,
+ S_LASER2,
+ S_LASERFLASH,
+
+ S_LASERFLAME1,
+ S_LASERFLAME2,
+ S_LASERFLAME3,
+ S_LASERFLAME4,
+ S_LASERFLAME5,
S_TORPEDO,
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index d001408be805b952c18cf94482fc52ee73393850..d460f8cf715c9667d74ed3595050d0d518c2dd41 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -11,13 +11,10 @@
/// \brief basic functions for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "p_local.h"
#include "p_setup.h" // So we can have P_SetupLevelSky
-#ifdef ESLOPE
-#include "p_slopes.h" // P_GetZAt
-#endif
+#include "p_slopes.h" // P_GetSlopeZAt
#include "z_zone.h"
#include "r_main.h"
#include "r_draw.h"
@@ -30,6 +27,7 @@
#include "hu_stuff.h" // HU_AddChatText
#include "console.h"
#include "d_netcmd.h" // IsPlayerAdmin
+#include "m_menu.h" // Player Setup menu color stuff
#include "lua_script.h"
#include "lua_libs.h"
@@ -147,6 +145,8 @@ static const struct {
{META_STATE, "state_t"},
{META_MOBJINFO, "mobjinfo_t"},
{META_SFXINFO, "sfxinfo_t"},
+ {META_SKINCOLOR, "skincolor_t"},
+ {META_COLORRAMP, "skincolor_t.ramp"},
{META_SPRITEINFO, "spriteinfo_t"},
{META_PIVOTLIST, "spriteframepivot_t[]"},
{META_FRAMEPIVOT, "spriteframepivot_t"},
@@ -221,10 +221,16 @@ static const char *GetUserdataUType(lua_State *L)
// or players[0].powers -> "player_t.powers"
static int lib_userdataType(lua_State *L)
{
+ int type;
lua_settop(L, 1); // pop everything except arg 1 (in case somebody decided to add more)
- luaL_checktype(L, 1, LUA_TUSERDATA);
- lua_pushstring(L, GetUserdataUType(L));
- return 1;
+ type = lua_type(L, 1);
+ if (type == LUA_TLIGHTUSERDATA || type == LUA_TUSERDATA)
+ {
+ lua_pushstring(L, GetUserdataUType(L));
+ return 1;
+ }
+ else
+ return luaL_typerror(L, 1, "userdata");
}
static int lib_isPlayerAdmin(lua_State *L)
@@ -249,6 +255,43 @@ static int lib_reserveLuabanks(lua_State *L)
return 1;
}
+// M_MENU
+//////////////
+
+static int lib_pMoveColorBefore(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ UINT16 targ = (UINT16)luaL_checkinteger(L, 2);
+
+ NOHUD
+ M_MoveColorBefore(color, targ);
+ return 0;
+}
+
+static int lib_pMoveColorAfter(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ UINT16 targ = (UINT16)luaL_checkinteger(L, 2);
+
+ NOHUD
+ M_MoveColorAfter(color, targ);
+ return 0;
+}
+
+static int lib_pGetColorBefore(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ lua_pushinteger(L, M_GetColorBefore(color));
+ return 1;
+}
+
+static int lib_pGetColorAfter(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ lua_pushinteger(L, M_GetColorAfter(color));
+ return 1;
+}
+
// M_RANDOM
//////////////
@@ -1040,11 +1083,60 @@ static int lib_pSetObjectMomZ(lua_State *L)
return 0;
}
+static int lib_pPlayJingle(lua_State *L)
+{
+ player_t *player = NULL;
+ jingletype_t jingletype = luaL_checkinteger(L, 2);
+ //NOHUD
+ //INLEVEL
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (jingletype >= NUMJINGLES)
+ return luaL_error(L, "jingletype %d out of range (0 - %d)", jingletype, NUMJINGLES-1);
+ P_PlayJingle(player, jingletype);
+ return 0;
+}
+
+static int lib_pPlayJingleMusic(lua_State *L)
+{
+ player_t *player = NULL;
+ const char *musnamearg = luaL_checkstring(L, 2);
+ char musname[7], *p = musname;
+ UINT16 musflags = luaL_optinteger(L, 3, 0);
+ boolean looping = lua_opttrueboolean(L, 4);
+ jingletype_t jingletype = luaL_optinteger(L, 5, JT_OTHER);
+ //NOHUD
+ //INLEVEL
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (jingletype >= NUMJINGLES)
+ return luaL_error(L, "jingletype %d out of range (0 - %d)", jingletype, NUMJINGLES-1);
+
+ musname[6] = '\0';
+ strncpy(musname, musnamearg, 6);
+
+ while (*p) {
+ *p = tolower(*p);
+ ++p;
+ }
+
+ P_PlayJingleMusic(player, musname, musflags, looping, jingletype);
+ return 0;
+}
+
static int lib_pRestoreMusic(lua_State *L)
{
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
- NOHUD
- INLEVEL
+ //NOHUD
+ //INLEVEL
if (!player)
return LUA_ErrInvalid(L, "player_t");
if (P_IsLocalPlayer(player))
@@ -1674,11 +1766,15 @@ static int lib_pPlayVictorySound(lua_State *L)
static int lib_pPlayLivesJingle(lua_State *L)
{
- player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
- NOHUD
- INLEVEL
- if (!player)
- return LUA_ErrInvalid(L, "player_t");
+ player_t *player = NULL;
+ //NOHUD
+ //INLEVEL
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
P_PlayLivesJingle(player);
return 0;
}
@@ -2123,23 +2219,27 @@ static int lib_evStartCrumble(lua_State *L)
return 0;
}
-#ifdef ESLOPE
// P_SLOPES
////////////
static int lib_pGetZAt(lua_State *L)
{
- pslope_t *slope = *((pslope_t **)luaL_checkudata(L, 1, META_SLOPE));
fixed_t x = luaL_checkfixed(L, 2);
fixed_t y = luaL_checkfixed(L, 3);
//HUDSAFE
- if (!slope)
- return LUA_ErrInvalid(L, "pslope_t");
+ if (lua_isnil(L, 1))
+ {
+ fixed_t z = luaL_checkfixed(L, 4);
+ lua_pushfixed(L, P_GetZAt(NULL, x, y, z));
+ }
+ else
+ {
+ pslope_t *slope = *((pslope_t **)luaL_checkudata(L, 1, META_SLOPE));
+ lua_pushfixed(L, P_GetSlopeZAt(slope, x, y));
+ }
- lua_pushfixed(L, P_GetZAt(slope, x, y));
return 1;
}
-#endif
// R_DEFS
////////////
@@ -2328,10 +2428,10 @@ static int lib_rGetColorByName(lua_State *L)
// SKINCOLOR_GREEN > "Green" for example
static int lib_rGetNameByColor(lua_State *L)
{
- UINT8 colornum = (UINT8)luaL_checkinteger(L, 1);
- if (!colornum || colornum >= MAXSKINCOLORS)
- return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, MAXSKINCOLORS-1);
- lua_pushstring(L, Color_Names[colornum]);
+ UINT16 colornum = (UINT16)luaL_checkinteger(L, 1);
+ if (!colornum || colornum >= numskincolors)
+ return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, numskincolors-1);
+ lua_pushstring(L, skincolors[colornum].name);
return 1;
}
@@ -2342,7 +2442,7 @@ static int lib_sStartSound(lua_State *L)
const void *origin = NULL;
sfxenum_t sound_id = luaL_checkinteger(L, 2);
player_t *player = NULL;
- //NOHUD // kys @whoever did this.
+ //NOHUD
if (sound_id >= NUMSFX)
return luaL_error(L, "sfx %d out of range (0 - %d)", sound_id, NUMSFX-1);
if (!lua_isnil(L, 1))
@@ -2373,7 +2473,7 @@ static int lib_sStartSoundAtVolume(lua_State *L)
sfxenum_t sound_id = luaL_checkinteger(L, 2);
INT32 volume = (INT32)luaL_checkinteger(L, 3);
player_t *player = NULL;
- NOHUD
+ //NOHUD
if (!lua_isnil(L, 1))
{
@@ -2397,13 +2497,27 @@ static int lib_sStartSoundAtVolume(lua_State *L)
static int lib_sStopSound(lua_State *L)
{
void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
- NOHUD
+ //NOHUD
if (!origin)
return LUA_ErrInvalid(L, "mobj_t");
S_StopSound(origin);
return 0;
}
+static int lib_sStopSoundByID(lua_State *L)
+{
+ void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ sfxenum_t sound_id = luaL_checkinteger(L, 2);
+ //NOHUD
+ if (!origin)
+ return LUA_ErrInvalid(L, "mobj_t");
+ if (sound_id >= NUMSFX)
+ return luaL_error(L, "sfx %d out of range (0 - %d)", sound_id, NUMSFX-1);
+
+ S_StopSoundByID(origin, sound_id);
+ return 0;
+}
+
static int lib_sChangeMusic(lua_State *L)
{
#ifdef MUSICSLOT_COMPATIBILITY
@@ -2414,7 +2528,7 @@ static int lib_sChangeMusic(lua_State *L)
boolean looping;
player_t *player = NULL;
UINT16 music_flags = 0;
- NOHUD
+ //NOHUD
if (lua_isnumber(L, 1))
{
@@ -2443,7 +2557,7 @@ static int lib_sChangeMusic(lua_State *L)
boolean looping = (boolean)lua_opttrueboolean(L, 2);
player_t *player = NULL;
UINT16 music_flags = 0;
- NOHUD
+ //NOHUD
#endif
if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
@@ -2474,7 +2588,7 @@ static int lib_sSpeedMusic(lua_State *L)
fixed_t fixedspeed = luaL_checkfixed(L, 1);
float speed = FIXED_TO_FLOAT(fixedspeed);
player_t *player = NULL;
- NOHUD
+ //NOHUD
if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
{
player = *((player_t **)luaL_checkudata(L, 2, META_PLAYER));
@@ -2489,7 +2603,7 @@ static int lib_sSpeedMusic(lua_State *L)
static int lib_sStopMusic(lua_State *L)
{
player_t *player = NULL;
- NOHUD
+ //NOHUD
if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
{
player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
@@ -2505,7 +2619,7 @@ static int lib_sSetInternalMusicVolume(lua_State *L)
{
UINT32 volume = (UINT32)luaL_checkinteger(L, 1);
player_t *player = NULL;
- NOHUD
+ //NOHUD
if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
{
player = *((player_t **)luaL_checkudata(L, 2, META_PLAYER));
@@ -2525,7 +2639,7 @@ static int lib_sSetInternalMusicVolume(lua_State *L)
static int lib_sStopFadingMusic(lua_State *L)
{
player_t *player = NULL;
- NOHUD
+ //NOHUD
if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
{
player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
@@ -2548,7 +2662,7 @@ static int lib_sFadeMusic(lua_State *L)
UINT32 ms;
INT32 source_volume;
player_t *player = NULL;
- NOHUD
+ //NOHUD
if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
{
player = *((player_t **)luaL_checkudata(L, 3, META_PLAYER));
@@ -2576,8 +2690,6 @@ static int lib_sFadeMusic(lua_State *L)
ms = (UINT32)luaL_checkinteger(L, 3);
}
- NOHUD
-
if (!player || P_IsLocalPlayer(player))
lua_pushboolean(L, S_FadeMusicFromVolume(target_volume, source_volume, ms));
else
@@ -2589,7 +2701,7 @@ static int lib_sFadeOutStopMusic(lua_State *L)
{
UINT32 ms = (UINT32)luaL_checkinteger(L, 1);
player_t *player = NULL;
- NOHUD
+ //NOHUD
if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
{
player = *((player_t **)luaL_checkudata(L, 2, META_PLAYER));
@@ -2605,10 +2717,29 @@ static int lib_sFadeOutStopMusic(lua_State *L)
return 1;
}
+static int lib_sGetMusicLength(lua_State *L)
+{
+ lua_pushinteger(L, S_GetMusicLength());
+ return 1;
+}
+
+static int lib_sGetMusicPosition(lua_State *L)
+{
+ lua_pushinteger(L, S_GetMusicPosition());
+ return 1;
+}
+
+static int lib_sSetMusicPosition(lua_State *L)
+{
+ UINT32 pos = (UINT32)luaL_checkinteger(L, 1);
+ lua_pushboolean(L, S_SetMusicPosition(pos));
+ return 1;
+}
+
static int lib_sOriginPlaying(lua_State *L)
{
void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
- NOHUD
+ //NOHUD
INLEVEL
if (!origin)
return LUA_ErrInvalid(L, "mobj_t");
@@ -2619,7 +2750,7 @@ static int lib_sOriginPlaying(lua_State *L)
static int lib_sIdPlaying(lua_State *L)
{
sfxenum_t id = luaL_checkinteger(L, 1);
- NOHUD
+ //NOHUD
if (id >= NUMSFX)
return luaL_error(L, "sfx %d out of range (0 - %d)", id, NUMSFX-1);
lua_pushboolean(L, S_IdPlaying(id));
@@ -2630,7 +2761,7 @@ static int lib_sSoundPlaying(lua_State *L)
{
void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
sfxenum_t id = luaL_checkinteger(L, 2);
- NOHUD
+ //NOHUD
INLEVEL
if (!origin)
return LUA_ErrInvalid(L, "mobj_t");
@@ -2648,7 +2779,7 @@ static int lib_sStartMusicCaption(lua_State *L)
const char *caption = luaL_checkstring(L, 1);
UINT16 lifespan = (UINT16)luaL_checkinteger(L, 2);
//HUDSAFE
- INLEVEL
+ //INLEVEL
if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
{
@@ -2807,15 +2938,50 @@ static int lib_gAddGametype(lua_State *L)
return 0;
}
+static int Lcheckmapnumber (lua_State *L, int idx, const char *fun)
+{
+ if (ISINLEVEL)
+ return luaL_optinteger(L, idx, gamemap);
+ else
+ {
+ if (lua_isnoneornil(L, idx))
+ {
+ return luaL_error(L,
+ "%s can only be used without a parameter while in a level.",
+ fun
+ );
+ }
+ else
+ return luaL_checkinteger(L, idx);
+ }
+}
+
static int lib_gBuildMapName(lua_State *L)
{
- INT32 map = luaL_optinteger(L, 1, gamemap);
+ INT32 map = Lcheckmapnumber(L, 1, "G_BuildMapName");
//HUDSAFE
- INLEVEL
lua_pushstring(L, G_BuildMapName(map));
return 1;
}
+static int lib_gBuildMapTitle(lua_State *L)
+{
+ INT32 map = Lcheckmapnumber(L, 1, "G_BuildMapTitle");
+ char *name;
+ if (map < 1 || map > NUMMAPS)
+ {
+ return luaL_error(L,
+ "map number %d out of range (1 - %d)",
+ map,
+ NUMMAPS
+ );
+ }
+ name = G_BuildMapTitle(map);
+ lua_pushstring(L, name);
+ Z_Free(name);
+ return 1;
+}
+
static int lib_gDoReborn(lua_State *L)
{
INT32 playernum = luaL_checkinteger(L, 1);
@@ -3002,6 +3168,12 @@ static luaL_Reg lib[] = {
{"IsPlayerAdmin", lib_isPlayerAdmin},
{"reserveLuabanks", lib_reserveLuabanks},
+ // m_menu
+ {"M_MoveColorAfter",lib_pMoveColorAfter},
+ {"M_MoveColorBefore",lib_pMoveColorBefore},
+ {"M_GetColorAfter",lib_pGetColorAfter},
+ {"M_GetColorBefore",lib_pGetColorBefore},
+
// m_random
{"P_RandomFixed",lib_pRandomFixed},
{"P_RandomByte",lib_pRandomByte},
@@ -3069,6 +3241,8 @@ static luaL_Reg lib[] = {
{"P_InSpaceSector",lib_pInSpaceSector},
{"P_InQuicksand",lib_pInQuicksand},
{"P_SetObjectMomZ",lib_pSetObjectMomZ},
+ {"P_PlayJingle",lib_pPlayJingle},
+ {"P_PlayJingleMusic",lib_pPlayJingleMusic},
{"P_RestoreMusic",lib_pRestoreMusic},
{"P_SpawnShieldOrb",lib_pSpawnShieldOrb},
{"P_SpawnGhostMobj",lib_pSpawnGhostMobj},
@@ -3151,10 +3325,8 @@ static luaL_Reg lib[] = {
{"EV_CrumbleChain",lib_evCrumbleChain},
{"EV_StartCrumble",lib_evStartCrumble},
-#ifdef ESLOPE
// p_slopes
{"P_GetZAt",lib_pGetZAt},
-#endif
// r_defs
{"R_PointToAngle",lib_rPointToAngle},
@@ -3182,6 +3354,7 @@ static luaL_Reg lib[] = {
{"S_StartSound",lib_sStartSound},
{"S_StartSoundAtVolume",lib_sStartSoundAtVolume},
{"S_StopSound",lib_sStopSound},
+ {"S_StopSoundByID",lib_sStopSoundByID},
{"S_ChangeMusic",lib_sChangeMusic},
{"S_SpeedMusic",lib_sSpeedMusic},
{"S_StopMusic",lib_sStopMusic},
@@ -3189,6 +3362,9 @@ static luaL_Reg lib[] = {
{"S_StopFadingMusic",lib_sStopFadingMusic},
{"S_FadeMusic",lib_sFadeMusic},
{"S_FadeOutStopMusic",lib_sFadeOutStopMusic},
+ {"S_GetMusicLength",lib_sGetMusicLength},
+ {"S_GetMusicPosition",lib_sGetMusicPosition},
+ {"S_SetMusicPosition",lib_sSetMusicPosition},
{"S_OriginPlaying",lib_sOriginPlaying},
{"S_IdPlaying",lib_sIdPlaying},
{"S_SoundPlaying",lib_sSoundPlaying},
@@ -3197,6 +3373,7 @@ static luaL_Reg lib[] = {
// g_game
{"G_AddGametype", lib_gAddGametype},
{"G_BuildMapName",lib_gBuildMapName},
+ {"G_BuildMapTitle",lib_gBuildMapTitle},
{"G_DoReborn",lib_gDoReborn},
{"G_SetCustomExitVars",lib_gSetCustomExitVars},
{"G_EnoughPlayersFinished",lib_gEnoughPlayersFinished},
@@ -3237,5 +3414,3 @@ int LUA_BaseLib(lua_State *L)
luaL_register(L, NULL, lib);
return 0;
}
-
-#endif
diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c
index 78a9e75a1166bb11b90b7cd7509c3fb5d5a24039..5aae73284d985f34c16d11498aa35105fdba92ba 100644
--- a/src/lua_blockmaplib.c
+++ b/src/lua_blockmaplib.c
@@ -11,7 +11,6 @@
/// \brief blockmap library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "p_local.h"
#include "r_main.h" // validcount
#include "lua_script.h"
@@ -81,9 +80,7 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
{
INT32 offset;
const INT32 *list; // Big blockmap
-#ifdef POLYOBJECTS
polymaplink_t *plink; // haleyjd 02/22/06
-#endif
line_t *ld;
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
@@ -91,7 +88,6 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
offset = y*bmapwidth + x;
-#ifdef POLYOBJECTS
// haleyjd 02/22/06: consider polyobject lines
plink = polyblocklinks[offset];
@@ -134,7 +130,6 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
}
plink = (polymaplink_t *)(plink->link.next);
}
-#endif
offset = *(blockmap + offset); // offset = blockmap[y*bmapwidth+x];
@@ -264,5 +259,3 @@ int LUA_BlockmapLib(lua_State *L)
lua_register(L, "searchBlockmap", lib_searchBlockmap);
return 0;
}
-
-#endif
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 923722eb8d731673530e396764a6a8e9df79e752..4fe234deeecc88f6643d04bd0663a070b3fa85be 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -11,7 +11,6 @@
/// \brief console modifying/etc library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "p_local.h"
#include "g_game.h"
@@ -431,22 +430,8 @@ static int lib_cvRegisterVar(lua_State *L)
static int lib_cvFindVar(lua_State *L)
{
- consvar_t *cv;
- if (( cv = CV_FindVar(luaL_checkstring(L,1)) ))
- {
- lua_settop(L,1);/* We only want one argument in the stack. */
- lua_pushlightuserdata(L, cv);/* Now the second value on stack. */
- luaL_getmetatable(L, META_CVAR);
- /*
- The metatable is the last value on the stack, so this
- applies it to the second value, which is the cvar.
- */
- lua_setmetatable(L,2);
- lua_pushvalue(L,2);
- return 1;
- }
- else
- return 0;
+ LUA_PushLightUserdata(L, CV_FindVar(luaL_checkstring(L,1)), META_CVAR);
+ return 1;
}
// CONS_Printf for a single player
@@ -551,5 +536,3 @@ int LUA_ConsoleLib(lua_State *L)
luaL_register(L, NULL, lib);
return 0;
}
-
-#endif
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 265700e4f0933bfbbe98a0f30446e7c4847144ac..315c35cdf3e3b00c2c96759056a1db201b220a46 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -10,8 +10,6 @@
/// \file lua_hook.h
/// \brief hooks for Lua scripting
-#ifdef HAVE_BLUA
-
#include "r_defs.h"
#include "d_player.h"
@@ -42,6 +40,7 @@ enum hook {
hook_JumpSpinSpecial,
hook_BotTiccmd,
hook_BotAI,
+ hook_BotRespawn,
hook_LinedefExecute,
hook_PlayerMsg,
hook_HurtMsg,
@@ -58,6 +57,7 @@ enum hook {
hook_ViewpointSwitch,
hook_SeenPlayer,
hook_PlayerThink,
+ hook_ShouldJingleContinue,
hook_MAX // last hook
};
@@ -92,6 +92,7 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
#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
@@ -110,5 +111,4 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend); // Hook for MT_NAMECHECK
#endif
#define LUAh_PlayerThink(player) LUAh_PlayerHook(player, hook_PlayerThink) // Hook for P_PlayerThink
-
-#endif
+boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname); // Hook for whether a jingle of the given music should continue playing
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 92080e8eda16674593f9ea0f745c5370ce9b2e15..b3390eb95279a6bc27a586d035f8432e1fcdaf03 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -11,7 +11,6 @@
/// \brief hooks for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "doomstat.h"
#include "p_mobj.h"
#include "g_game.h"
@@ -53,6 +52,7 @@ const char *const hookNames[hook_MAX+1] = {
"JumpSpinSpecial",
"BotTiccmd",
"BotAI",
+ "BotRespawn",
"LinedefExecute",
"PlayerMsg",
"HurtMsg",
@@ -69,6 +69,7 @@ const char *const hookNames[hook_MAX+1] = {
"ViewpointSwitch",
"SeenPlayer",
"PlayerThink",
+ "ShouldJingleContinue",
NULL
};
@@ -80,8 +81,7 @@ struct hook_s
UINT16 id;
union {
mobjtype_t mt;
- char *skinname;
- char *funcname;
+ char *str;
} s;
boolean error;
};
@@ -108,6 +108,12 @@ static hook_p linedefexecutorhooks;
// For other hooks, a unique linked list
hook_p roothook;
+static void PushHook(lua_State *L, hook_p hookp)
+{
+ lua_pushfstring(L, FMT_HOOKID, hookp->id);
+ lua_gettable(L, LUA_REGISTRYINDEX);
+}
+
// Takes hook, function, and additional arguments (mobj type to act on, etc.)
static int lib_addHook(lua_State *L)
{
@@ -142,34 +148,24 @@ static int lib_addHook(lua_State *L)
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:
- hook.s.skinname = NULL;
+ case hook_ShouldJingleContinue:
+ hook.s.str = NULL;
if (lua_isstring(L, 2))
{ // lowercase copy
- const char *s = lua_tostring(L, 2);
- char *p = hook.s.skinname = ZZ_Alloc(strlen(s)+1);
- do {
- *p = tolower(*s);
- ++p;
- } while(*(++s));
- *p = 0;
+ hook.s.str = Z_StrDup(lua_tostring(L, 2));
+ strlwr(hook.s.str);
}
break;
case hook_LinedefExecute: // Linedef executor functions
- { // uppercase copy
- const char *s = luaL_checkstring(L, 2);
- char *p = hook.s.funcname = ZZ_Alloc(strlen(s)+1);
- do {
- *p = toupper(*s);
- ++p;
- } while(*(++s));
- *p = 0;
- }
+ hook.s.str = Z_StrDup(luaL_checkstring(L, 2));
+ strupr(hook.s.str);
break;
default:
break;
@@ -203,6 +199,7 @@ static int lib_addHook(lua_State *L)
case hook_MobjRemoved:
case hook_MobjMoveBlocked:
case hook_MapThingSpawn:
+ case hook_FollowMobj:
lastp = &mobjhooks[hook.s.mt];
break;
case hook_JumpSpecial:
@@ -210,7 +207,6 @@ static int lib_addHook(lua_State *L)
case hook_SpinSpecial:
case hook_JumpSpinSpecial:
case hook_PlayerSpawn:
- case hook_FollowMobj:
case hook_PlayerCanDamage:
case hook_TeamSwitch:
case hook_ViewpointSwitch:
@@ -263,6 +259,7 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
I_Assert(mo->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -270,12 +267,11 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ 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);
@@ -292,12 +288,11 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ 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);
@@ -321,18 +316,18 @@ boolean LUAh_PlayerHook(player_t *plr, enum hook which)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = playerhooks; hookp; hookp = hookp->next)
{
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, plr, META_PLAYER);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ 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);
@@ -356,6 +351,7 @@ void LUAh_MapChange(INT16 mapnumber)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_pushinteger(gL, mapnumber);
for (hookp = roothook; hookp; hookp = hookp->next)
@@ -363,10 +359,12 @@ void LUAh_MapChange(INT16 mapnumber)
if (hookp->type != hook_MapChange)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -380,6 +378,7 @@ void LUAh_MapLoad(void)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_pushinteger(gL, gamemap);
for (hookp = roothook; hookp; hookp = hookp->next)
@@ -387,10 +386,12 @@ void LUAh_MapLoad(void)
if (hookp->type != hook_MapLoad)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -404,6 +405,7 @@ void LUAh_PlayerJoin(int playernum)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_pushinteger(gL, playernum);
for (hookp = roothook; hookp; hookp = hookp->next)
@@ -411,10 +413,12 @@ void LUAh_PlayerJoin(int playernum)
if (hookp->type != hook_PlayerJoin)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -427,20 +431,23 @@ void LUAh_PreThinkFrame(void)
if (!gL || !(hooksAvailable[hook_PreThinkFrame/8] & (1<<(hook_PreThinkFrame%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PreThinkFrame)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ 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_pop(gL, 1); // Pop error handler
}
// Hook for frame (after mobj and player thinkers)
@@ -450,22 +457,24 @@ void LUAh_ThinkFrame(void)
if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_ThinkFrame)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ 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_pop(gL, 1); // Pop error handler
+}
// Hook for frame (at end of tick, ie after overlays, precipitation, specials)
void LUAh_PostThinkFrame(void)
@@ -474,20 +483,23 @@ void LUAh_PostThinkFrame(void)
if (!gL || !(hooksAvailable[hook_PostThinkFrame/8] & (1<<(hook_PostThinkFrame%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PostThinkFrame)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ 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_pop(gL, 1); // Pop error handler
}
// Hook for mobj collisions
@@ -501,6 +513,7 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
I_Assert(thing1->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj collision hooks
for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -508,16 +521,15 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing1, META_MOBJ);
LUA_PushUserdata(gL, thing2, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -539,16 +551,15 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing1, META_MOBJ);
LUA_PushUserdata(gL, thing2, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -579,6 +590,7 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
I_Assert(thing->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj collision hooks
for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -586,16 +598,15 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing, META_MOBJ);
LUA_PushUserdata(gL, line, META_LINE);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -617,16 +628,15 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
if (hookp->type != which)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing, META_MOBJ);
LUA_PushUserdata(gL, line, META_LINE);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -658,16 +668,16 @@ boolean LUAh_MobjThinker(mobj_t *mo)
I_Assert(mo->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj thinker hooks
for (hookp = mobjthinkerhooks[MT_NULL]; hookp; hookp = hookp->next)
{
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ 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);
@@ -681,12 +691,11 @@ boolean LUAh_MobjThinker(mobj_t *mo)
for (hookp = mobjthinkerhooks[mo->type]; hookp; hookp = hookp->next)
{
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2);
- if (lua_pcall(gL, 1, 1, 0)) {
+ 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);
@@ -713,6 +722,7 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
I_Assert(special->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic touch special hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -720,16 +730,15 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if (hookp->type != hook_TouchSpecial)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, special, META_MOBJ);
LUA_PushUserdata(gL, toucher, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -746,16 +755,15 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if (hookp->type != hook_TouchSpecial)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, special, META_MOBJ);
LUA_PushUserdata(gL, toucher, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -782,6 +790,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic should damage hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -789,7 +798,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_ShouldDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -797,14 +806,13 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -825,7 +833,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
{
if (hookp->type != hook_ShouldDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -833,14 +841,13 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -872,6 +879,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
I_Assert(target->type < NUMMOBJTYPES);
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj damage hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -879,7 +887,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_MobjDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -887,14 +895,13 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -911,7 +918,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_MobjDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
@@ -919,14 +926,13 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
lua_pushinteger(gL, damage);
lua_pushinteger(gL, damagetype);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -953,6 +959,7 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
I_Assert(target->type < NUMMOBJTYPES);
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)
@@ -960,20 +967,19 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
if (hookp->type != hook_MobjDeath)
continue;
- if (lua_gettop(gL) == 0)
+ 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);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -990,20 +996,19 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
if (hookp->type != hook_MobjDeath)
continue;
- if (lua_gettop(gL) == 0)
+ 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);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -1028,22 +1033,22 @@ boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd)
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) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, bot, META_PLAYER);
LUA_PushUserdata(gL, cmd, META_TICCMD);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -1068,23 +1073,23 @@ boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_BotAI
- || (hookp->s.skinname && strcmp(hookp->s.skinname, ((skin_t*)tails->skin)->name)))
+ || (hookp->s.str && strcmp(hookp->s.str, ((skin_t*)tails->skin)->name)))
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, sonic, META_MOBJ);
LUA_PushUserdata(gL, tails, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 8, 0)) {
+ 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);
@@ -1122,6 +1127,51 @@ boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
return hooked;
}
+// 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;
+
+ lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
+ for (hookp = roothook; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_BotRespawn)
+ 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, 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))
+ shouldRespawn = 1; // Force yes
+ else
+ shouldRespawn = 2; // Force no
+ }
+ lua_pop(gL, 1);
+ }
+
+ lua_settop(gL, 0);
+ return shouldRespawn;
+}
+
// Hook for linedef executors
boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
{
@@ -1131,24 +1181,27 @@ boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = linedefexecutorhooks; hookp; hookp = hookp->next)
{
- if (strcmp(hookp->s.funcname, line->text))
+ if (strcmp(hookp->s.str, line->text))
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, line, META_LINE);
LUA_PushUserdata(gL, mo, META_MOBJ);
LUA_PushUserdata(gL, sector, META_SECTOR);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
- LUA_Call(gL, 3);
+ if (lua_pcall(gL, 3, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
hooked = true;
}
@@ -1165,13 +1218,14 @@ boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PlayerMsg)
continue;
- if (lua_gettop(gL) == 0)
+ 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
@@ -1189,13 +1243,12 @@ boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg)
}
lua_pushstring(gL, msg); // msg
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -1221,6 +1274,7 @@ boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
@@ -1228,20 +1282,19 @@ boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8
|| (hookp->s.mt && !(inflictor && hookp->s.mt == inflictor->type)))
continue;
- if (lua_gettop(gL) == 0)
+ 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);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -1260,7 +1313,7 @@ boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source, UINT8
void LUAh_NetArchiveHook(lua_CFunction archFunc)
{
hook_p hookp;
-
+ int errorhandlerindex;
if (!gL || !(hooksAvailable[hook_NetVars/8] & (1<<(hook_NetVars%8))))
return;
@@ -1268,8 +1321,11 @@ void LUAh_NetArchiveHook(lua_CFunction archFunc)
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, -1);
+ lua_pushvalue(gL, -2);
lua_pushcclosure(gL, archFunc, 1);
// stack: tables, archFunc
@@ -1278,13 +1334,15 @@ void LUAh_NetArchiveHook(lua_CFunction archFunc)
if (hookp->type != hook_NetVars)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -2); // archFunc
- LUA_Call(gL, 1);
+ if (lua_pcall(gL, 1, 0, errorhandlerindex)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
- lua_pop(gL, 1); // pop archFunc
+ lua_pop(gL, 2); // Pop archFunc and error handler
// stack: tables
}
@@ -1296,6 +1354,7 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
return false;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj map thing spawn hooks
for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
@@ -1303,16 +1362,15 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
if (hookp->type != hook_MapThingSpawn)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, mo, META_MOBJ);
LUA_PushUserdata(gL, mthing, META_MAPTHING);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -1329,16 +1387,15 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
if (hookp->type != hook_MapThingSpawn)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, mo, META_MOBJ);
LUA_PushUserdata(gL, mthing, META_MAPTHING);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -1363,22 +1420,48 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
- for (hookp = playerhooks; hookp; hookp = hookp->next)
+ // Look for all generic mobj follow item hooks
+ for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
{
if (hookp->type != hook_FollowMobj)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, mobj, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
+ }
+
+ for (hookp = mobjhooks[mobj->type]; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_FollowMobj)
+ continue;
+
+ 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);
@@ -1403,22 +1486,22 @@ UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj)
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = playerhooks; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PlayerCanDamage)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, mobj, META_MOBJ);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -1446,22 +1529,25 @@ void LUAh_PlayerQuit(player_t *plr, kickreason_t reason)
return;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_PlayerQuit)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit
lua_pushinteger(gL, reason); // Reason for quitting
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- LUA_Call(gL, 2);
+ if (lua_pcall(gL, 2, 0, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ }
}
lua_settop(gL, 0);
@@ -1474,20 +1560,23 @@ void LUAh_IntermissionThinker(void)
if (!gL || !(hooksAvailable[hook_IntermissionThinker/8] & (1<<(hook_IntermissionThinker%8))))
return;
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
for (hookp = roothook; hookp; hookp = hookp->next)
{
if (hookp->type != hook_IntermissionThinker)
continue;
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
- if (lua_pcall(gL, 0, 0, 0)) {
+ 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_pop(gL, 1); // Pop error handler
}
// Hook for team switching
@@ -1500,13 +1589,14 @@ boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, b
return true;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
for (hookp = playerhooks; hookp; hookp = hookp->next)
{
if (hookp->type != hook_TeamSwitch)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
lua_pushinteger(gL, newteam);
@@ -1514,14 +1604,13 @@ boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, b
lua_pushboolean(gL, tryingautobalance);
lua_pushboolean(gL, tryingscramble);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ 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, 0)) {
+ 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);
@@ -1546,6 +1635,8 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
return 0;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
hud_running = true; // local hook
for (hookp = playerhooks; hookp; hookp = hookp->next)
@@ -1553,18 +1644,17 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
if (hookp->type != hook_ViewpointSwitch)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, newdisplayplayer, META_PLAYER);
lua_pushboolean(gL, forced);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
lua_pushvalue(gL, -4);
- if (lua_pcall(gL, 3, 1, 0)) {
+ 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);
@@ -1582,6 +1672,7 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
}
lua_settop(gL, 0);
+
hud_running = false;
return canSwitchView;
@@ -1597,6 +1688,8 @@ boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
return true;
lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
hud_running = true; // local hook
for (hookp = playerhooks; hookp; hookp = hookp->next)
@@ -1604,16 +1697,15 @@ boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
if (hookp->type != hook_SeenPlayer)
continue;
- if (lua_gettop(gL) == 0)
+ if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
LUA_PushUserdata(gL, seenfriend, META_PLAYER);
}
- lua_pushfstring(gL, FMT_HOOKID, hookp->id);
- lua_gettable(gL, LUA_REGISTRYINDEX);
+ PushHook(gL, hookp);
lua_pushvalue(gL, -3);
lua_pushvalue(gL, -3);
- if (lua_pcall(gL, 2, 1, 0)) {
+ 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);
@@ -1626,10 +1718,54 @@ boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
}
lua_settop(gL, 0);
+
hud_running = false;
return hasSeenPlayer;
}
#endif // SEENAMES
-#endif
+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);
+
+ hud_running = true; // local hook
+
+ for (hookp = roothook; hookp; hookp = hookp->next)
+ {
+ 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);
+ }
+
+ lua_settop(gL, 0);
+
+ hud_running = false;
+
+ return keepplaying;
+}
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 7d5f9325eae68a39681ae21b89eff2af8918f321..4aa70574b3802b62b22cbc4772fb11aa216cdd61 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -11,7 +11,6 @@
/// \brief custom HUD rendering library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "r_defs.h"
#include "r_local.h"
@@ -413,9 +412,9 @@ static int libd_cachePatch(lua_State *L)
HUDONLY
luapat = patchinfohead;
- lumpnum = W_CheckNumForName(luaL_checkstring(L, 1));
+ lumpnum = W_CheckNumForLongName(luaL_checkstring(L, 1));
if (lumpnum == LUMPERROR)
- lumpnum = W_GetNumForName("MISSING");
+ lumpnum = W_GetNumForLongName("MISSING");
for (i = 0; i < numluapatches; i++)
{
@@ -455,7 +454,7 @@ static int libd_cachePatch(lua_State *L)
numluapatches++;
#else
HUDONLY
- LUA_PushUserdata(L, W_CachePatchName(luaL_checkstring(L, 1), PU_PATCH), META_PATCH);
+ LUA_PushUserdata(L, W_CachePatchLongName(luaL_checkstring(L, 1), PU_PATCH), META_PATCH);
#endif
return 1;
}
@@ -879,8 +878,8 @@ static int libd_drawNameTag(lua_State *L)
INT32 y;
const char *str;
INT32 flags;
- UINT8 basecolor;
- UINT8 outlinecolor;
+ UINT16 basecolor;
+ UINT16 outlinecolor;
UINT8 *basecolormap = NULL;
UINT8 *outlinecolormap = NULL;
@@ -909,8 +908,8 @@ static int libd_drawScaledNameTag(lua_State *L)
const char *str;
INT32 flags;
fixed_t scale;
- UINT8 basecolor;
- UINT8 outlinecolor;
+ UINT16 basecolor;
+ UINT16 outlinecolor;
UINT8 *basecolormap = NULL;
UINT8 *outlinecolormap = NULL;
@@ -967,7 +966,7 @@ static int libd_nameTagWidth(lua_State *L)
static int libd_getColormap(lua_State *L)
{
INT32 skinnum = TC_DEFAULT;
- skincolors_t color = luaL_optinteger(L, 2, 0);
+ skincolornum_t color = luaL_optinteger(L, 2, 0);
UINT8* colormap = NULL;
HUDONLY
if (lua_isnoneornil(L, 1))
@@ -1466,5 +1465,3 @@ void LUAh_IntermissionHUD(void)
lua_pop(gL, -1);
hud_running = false;
}
-
-#endif
diff --git a/src/lua_infolib.c b/src/lua_infolib.c
index 6760b420341832ff678cec4b1385dd5bd30e53fa..81a215c5363c96655b41782f24bb67d30aad671f 100644
--- a/src/lua_infolib.c
+++ b/src/lua_infolib.c
@@ -11,7 +11,6 @@
/// \brief infotable editing library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "info.h"
#include "dehacked.h"
@@ -26,6 +25,9 @@
#include "lua_libs.h"
#include "lua_hud.h" // hud_running errors
+extern CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
+extern void R_FlushTranslationColormapCache(void);
+
boolean LUA_CallAction(const char *action, mobj_t *actor);
state_t *astate;
@@ -389,10 +391,7 @@ static int lib_setSpriteInfo(lua_State *L)
lua_Integer i = 0;
const char *str = NULL;
if (lua_isnumber(L, 2))
- {
i = lua_tointeger(L, 2);
- i++; // shift index in case of missing rotsprite support
- }
else
str = luaL_checkstring(L, 2);
@@ -1469,6 +1468,229 @@ static int lib_luabankslen(lua_State *L)
return 1;
}
+////////////////////
+// SKINCOLOR INFO //
+////////////////////
+
+// Arbitrary skincolors[] table index -> skincolor_t *
+static int lib_getSkinColor(lua_State *L)
+{
+ UINT32 i;
+ lua_remove(L, 1);
+
+ i = luaL_checkinteger(L, 1);
+ if (!i || i >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (1 - %d)", i, numskincolors-1);
+ LUA_PushUserdata(L, &skincolors[i], META_SKINCOLOR);
+ return 1;
+}
+
+//Set the entire c->ramp array
+static void setRamp(lua_State *L, skincolor_t* c) {
+ UINT32 i;
+ lua_pushnil(L);
+ for (i=0; i<COLORRAMPSIZE; i++) {
+ if (lua_objlen(L,-2)<COLORRAMPSIZE) {
+ luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' must be %d entries long; got %d.", COLORRAMPSIZE, lua_objlen(L,-2));
+ break;
+ }
+ if (lua_next(L, -2) != 0) {
+ c->ramp[i] = lua_isnumber(L,-1) ? (UINT8)luaL_checkinteger(L,-1) : 120;
+ lua_pop(L, 1);
+ } else
+ c->ramp[i] = 120;
+ }
+ lua_pop(L,1);
+}
+
+// Lua table full of data -> skincolors[]
+static int lib_setSkinColor(lua_State *L)
+{
+ UINT32 j;
+ skincolor_t *info;
+ UINT16 cnum; //skincolor num
+ lua_remove(L, 1); // don't care about skincolors[] userdata.
+ {
+ cnum = (UINT16)luaL_checkinteger(L, 1);
+ if (cnum < SKINCOLOR_FIRSTFREESLOT || cnum >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (%d - %d)", cnum, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+ info = &skincolors[cnum]; // get the skincolor to assign to.
+ }
+ luaL_checktype(L, 2, LUA_TTABLE); // check that we've been passed a table.
+ lua_remove(L, 1); // pop skincolor num, don't need it any more.
+ lua_settop(L, 1); // cut the stack here. the only thing left now is the table of data we're assigning to the skincolor.
+
+ if (hud_running)
+ return luaL_error(L, "Do not alter skincolors in HUD rendering code!");
+
+ // clear the skincolor to start with, in case of missing table elements
+ memset(info,0,sizeof(skincolor_t));
+
+ Color_cons_t[cnum].value = cnum;
+ lua_pushnil(L);
+ while (lua_next(L, 1)) {
+ lua_Integer i = 0;
+ const char *str = NULL;
+ if (lua_isnumber(L, 2))
+ i = lua_tointeger(L, 2);
+ else
+ str = luaL_checkstring(L, 2);
+
+ if (i == 1 || (str && fastcmp(str,"name"))) {
+ const char* n = luaL_checkstring(L, 3);
+ strlcpy(info->name, n, MAXCOLORNAME+1);
+ if (strlen(n) > MAXCOLORNAME)
+ CONS_Alert(CONS_WARNING, "skincolor_t field 'name' ('%s') longer than %d chars; shortened to %s.\n", n, MAXCOLORNAME, info->name);
+ } else if (i == 2 || (str && fastcmp(str,"ramp"))) {
+ if (!lua_istable(L, 3) && luaL_checkudata(L, 3, META_COLORRAMP) == NULL)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' must be a table or array.");
+ else if (lua_istable(L, 3))
+ setRamp(L, info);
+ else
+ for (j=0; j<COLORRAMPSIZE; j++)
+ info->ramp[j] = (*((UINT8 **)luaL_checkudata(L, 3, META_COLORRAMP)))[j];
+ R_FlushTranslationColormapCache();
+ } else if (i == 3 || (str && fastcmp(str,"invcolor")))
+ info->invcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (i == 4 || (str && fastcmp(str,"invshade")))
+ info->invshade = (UINT8)luaL_checkinteger(L, 3)%COLORRAMPSIZE;
+ else if (i == 5 || (str && fastcmp(str,"chatcolor")))
+ info->chatcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (i == 6 || (str && fastcmp(str,"accessible"))) {
+ boolean v = lua_isboolean(L,3) ? lua_toboolean(L, 3) : true;
+ if (cnum < FIRSTSUPERCOLOR && v != skincolors[cnum].accessible)
+ return luaL_error(L, "skincolors[] index %d is a standard color; accessibility changes are prohibited.", i);
+ else
+ info->accessible = v;
+ }
+ lua_pop(L, 1);
+ }
+ return 0;
+}
+
+// #skincolors -> numskincolors
+static int lib_skincolorslen(lua_State *L)
+{
+ lua_pushinteger(L, numskincolors);
+ return 1;
+}
+
+// skincolor_t *, field -> number
+static int skincolor_get(lua_State *L)
+{
+ skincolor_t *info = *((skincolor_t **)luaL_checkudata(L, 1, META_SKINCOLOR));
+ const char *field = luaL_checkstring(L, 2);
+
+ I_Assert(info != NULL);
+ I_Assert(info >= skincolors);
+
+ if (fastcmp(field,"name"))
+ lua_pushstring(L, info->name);
+ else if (fastcmp(field,"ramp"))
+ LUA_PushUserdata(L, info->ramp, META_COLORRAMP);
+ else if (fastcmp(field,"invcolor"))
+ lua_pushinteger(L, info->invcolor);
+ else if (fastcmp(field,"invshade"))
+ lua_pushinteger(L, info->invshade);
+ else if (fastcmp(field,"chatcolor"))
+ lua_pushinteger(L, info->chatcolor);
+ else if (fastcmp(field,"accessible"))
+ lua_pushboolean(L, info->accessible);
+ else
+ CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "skincolor_t", field);
+ return 1;
+}
+
+// skincolor_t *, field, number -> skincolors[]
+static int skincolor_set(lua_State *L)
+{
+ UINT32 i;
+ skincolor_t *info = *((skincolor_t **)luaL_checkudata(L, 1, META_SKINCOLOR));
+ const char *field = luaL_checkstring(L, 2);
+
+ I_Assert(info != NULL);
+ I_Assert(info >= skincolors);
+
+ if (info-skincolors < SKINCOLOR_FIRSTFREESLOT || info-skincolors >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (%d - %d)", info-skincolors, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+
+ if (fastcmp(field,"name")) {
+ const char* n = luaL_checkstring(L, 3);
+ if (strchr(n, ' ') != NULL)
+ CONS_Alert(CONS_WARNING, "skincolor_t field 'name' ('%s') contains spaces.\n", n);
+ strlcpy(info->name, n, MAXCOLORNAME+1);
+ if (strlen(n) > MAXCOLORNAME)
+ CONS_Alert(CONS_WARNING, "skincolor_t field 'name' ('%s') longer than %d chars; clipped to %s.\n", n, MAXCOLORNAME, info->name);
+ } else if (fastcmp(field,"ramp")) {
+ if (!lua_istable(L, 3) && luaL_checkudata(L, 3, META_COLORRAMP) == NULL)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' must be a table or array.");
+ else if (lua_istable(L, 3))
+ setRamp(L, info);
+ else
+ for (i=0; i<COLORRAMPSIZE; i++)
+ info->ramp[i] = (*((UINT8 **)luaL_checkudata(L, 3, META_COLORRAMP)))[i];
+ R_FlushTranslationColormapCache();
+ } else if (fastcmp(field,"invcolor"))
+ info->invcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"invshade"))
+ info->invshade = (UINT8)luaL_checkinteger(L, 3)%COLORRAMPSIZE;
+ else if (fastcmp(field,"chatcolor"))
+ info->chatcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"accessible"))
+ info->accessible = lua_isboolean(L,3);
+ else
+ CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "skincolor_t", field);
+ return 1;
+}
+
+// skincolor_t * -> SKINCOLOR_*
+static int skincolor_num(lua_State *L)
+{
+ skincolor_t *info = *((skincolor_t **)luaL_checkudata(L, 1, META_SKINCOLOR));
+
+ I_Assert(info != NULL);
+ I_Assert(info >= skincolors);
+
+ lua_pushinteger(L, info-skincolors);
+ return 1;
+}
+
+// ramp, n -> ramp[n]
+static int colorramp_get(lua_State *L)
+{
+ UINT8 *colorramp = *((UINT8 **)luaL_checkudata(L, 1, META_COLORRAMP));
+ UINT32 n = luaL_checkinteger(L, 2);
+ if (n >= COLORRAMPSIZE)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' index %d out of range (0 - %d)", n, COLORRAMPSIZE-1);
+ lua_pushinteger(L, colorramp[n]);
+ return 1;
+}
+
+// ramp, n, value -> ramp[n] = value
+static int colorramp_set(lua_State *L)
+{
+ UINT8 *colorramp = *((UINT8 **)luaL_checkudata(L, 1, META_COLORRAMP));
+ UINT16 cnum = (UINT16)(((uint8_t*)colorramp - (uint8_t*)(skincolors[0].ramp))/sizeof(skincolor_t));
+ UINT32 n = luaL_checkinteger(L, 2);
+ UINT8 i = (UINT8)luaL_checkinteger(L, 3);
+ if (cnum < SKINCOLOR_FIRSTFREESLOT || cnum >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (%d - %d)", cnum, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+ if (n >= COLORRAMPSIZE)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' index %d out of range (0 - %d)", n, COLORRAMPSIZE-1);
+ if (hud_running)
+ return luaL_error(L, "Do not alter skincolor_t in HUD rendering code!");
+ colorramp[n] = i;
+ R_FlushTranslationColormapCache();
+ return 0;
+}
+
+// #ramp -> COLORRAMPSIZE
+static int colorramp_len(lua_State *L)
+{
+ lua_pushinteger(L, COLORRAMPSIZE);
+ return 1;
+}
+
//////////////////////////////
//
// Now push all these functions into the Lua state!
@@ -1506,6 +1728,28 @@ int LUA_InfoLib(lua_State *L)
lua_setfield(L, -2, "__len");
lua_pop(L, 1);
+ luaL_newmetatable(L, META_SKINCOLOR);
+ lua_pushcfunction(L, skincolor_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, skincolor_set);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, skincolor_num);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L, 1);
+
+ luaL_newmetatable(L, META_COLORRAMP);
+ lua_pushcfunction(L, colorramp_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, colorramp_set);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, colorramp_len);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L,1);
+
luaL_newmetatable(L, META_SFXINFO);
lua_pushcfunction(L, sfxinfo_get);
lua_setfield(L, -2, "__index");
@@ -1609,6 +1853,19 @@ int LUA_InfoLib(lua_State *L)
lua_setmetatable(L, -2);
lua_setglobal(L, "mobjinfo");
+ lua_newuserdata(L, 0);
+ lua_createtable(L, 0, 2);
+ lua_pushcfunction(L, lib_getSkinColor);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, lib_setSkinColor);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, lib_skincolorslen);
+ lua_setfield(L, -2, "__len");
+ lua_setmetatable(L, -2);
+ lua_setglobal(L, "skincolors");
+
lua_newuserdata(L, 0);
lua_createtable(L, 0, 2);
lua_pushcfunction(L, lib_getSfxInfo);
@@ -1635,7 +1892,6 @@ int LUA_InfoLib(lua_State *L)
lua_pushcfunction(L, lib_spriteinfolen);
lua_setfield(L, -2, "__len");
lua_setmetatable(L, -2);
- lua_pushvalue(L, -1);
lua_setglobal(L, "spriteinfo");
luaL_newmetatable(L, META_LUABANKS);
@@ -1651,5 +1907,3 @@ int LUA_InfoLib(lua_State *L)
return 0;
}
-
-#endif
diff --git a/src/lua_libs.h b/src/lua_libs.h
index f217d4b2a4b6526a0c6db2a035781a9027232dcb..a78128e9f88bed6d1b2c99677fabc6f665ab753c 100644
--- a/src/lua_libs.h
+++ b/src/lua_libs.h
@@ -10,8 +10,6 @@
/// \file lua_libs.h
/// \brief libraries for Lua scripting
-#ifdef HAVE_BLUA
-
extern lua_State *gL;
#define LREG_VALID "VALID_USERDATA"
@@ -22,6 +20,8 @@ extern lua_State *gL;
#define META_STATE "STATE_T*"
#define META_MOBJINFO "MOBJINFO_T*"
#define META_SFXINFO "SFXINFO_T*"
+#define META_SKINCOLOR "SKINCOLOR_T*"
+#define META_COLORRAMP "SKINCOLOR_T*RAMP"
#define META_SPRITEINFO "SPRITEINFO_T*"
#define META_PIVOTLIST "SPRITEFRAMEPIVOT_T[]"
#define META_FRAMEPIVOT "SPRITEFRAMEPIVOT_T*"
@@ -45,11 +45,9 @@ extern lua_State *gL;
#define META_SEG "SEG_T*"
#define META_NODE "NODE_T*"
#endif
-#ifdef ESLOPE
#define META_SLOPE "PSLOPE_T*"
#define META_VECTOR2 "VECTOR2_T"
#define META_VECTOR3 "VECTOR3_T"
-#endif
#define META_MAPHEADER "MAPHEADER_T*"
#define META_CVAR "CONSVAR_T*"
@@ -88,5 +86,3 @@ int LUA_ThinkerLib(lua_State *L);
int LUA_MapLib(lua_State *L);
int LUA_BlockmapLib(lua_State *L);
int LUA_HudLib(lua_State *L);
-
-#endif
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 0344fd5bbf73a9c7b87b0a9921e9ad13f14ed862..ece42b8d3dec950b8c6a904eb6370715963f2cd7 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -11,14 +11,11 @@
/// \brief game map library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "r_state.h"
#include "p_local.h"
#include "p_setup.h"
#include "z_zone.h"
-#ifdef ESLOPE
#include "p_slopes.h"
-#endif
#include "r_main.h"
#include "lua_script.h"
@@ -42,13 +39,9 @@ enum sector_e {
sector_heightsec,
sector_camsec,
sector_lines,
-#ifdef ESLOPE
sector_ffloors,
sector_fslope,
sector_cslope
-#else
- sector_ffloors
-#endif
};
static const char *const sector_opt[] = {
@@ -65,10 +58,8 @@ static const char *const sector_opt[] = {
"camsec",
"lines",
"ffloors",
-#ifdef ESLOPE
"f_slope",
"c_slope",
-#endif
NULL};
enum subsector_e {
@@ -181,10 +172,8 @@ enum ffloor_e {
ffloor_toplightlevel,
ffloor_bottomheight,
ffloor_bottompic,
-#ifdef ESLOPE
ffloor_tslope,
ffloor_bslope,
-#endif
ffloor_sector,
ffloor_flags,
ffloor_master,
@@ -201,10 +190,8 @@ static const char *const ffloor_opt[] = {
"toplightlevel",
"bottomheight",
"bottompic",
-#ifdef ESLOPE
"t_slope",
"b_slope",
-#endif
"sector", // secnum pushed as control sector userdata
"flags",
"master", // control linedef
@@ -290,7 +277,6 @@ static const char *const bbox_opt[] = {
"right",
NULL};
-#ifdef ESLOPE
enum slope_e {
slope_valid = 0,
slope_o,
@@ -325,7 +311,6 @@ static const char *const vector_opt[] = {
"y",
"z",
NULL};
-#endif
static const char *const array_opt[] ={"iterate",NULL};
static const char *const valid_opt[] ={"valid",NULL};
@@ -571,14 +556,12 @@ static int sector_get(lua_State *L)
LUA_PushUserdata(L, sector->ffloors, META_FFLOOR);
lua_pushcclosure(L, sector_iterate, 2); // push lib_iterateFFloors and sector->ffloors as upvalues for the function
return 1;
-#ifdef ESLOPE
case sector_fslope: // f_slope
LUA_PushUserdata(L, sector->f_slope, META_SLOPE);
return 1;
case sector_cslope: // c_slope
LUA_PushUserdata(L, sector->c_slope, META_SLOPE);
return 1;
-#endif
}
return 0;
}
@@ -602,10 +585,8 @@ static int sector_set(lua_State *L)
case sector_camsec: // camsec
case sector_lines: // lines
case sector_ffloors: // ffloors
-#ifdef ESLOPE
case sector_fslope: // f_slope
case sector_cslope: // c_slope
-#endif
default:
return luaL_error(L, "sector_t field " LUA_QS " cannot be set.", sector_opt[field]);
case sector_floorheight: { // floorheight
@@ -1693,14 +1674,12 @@ static int ffloor_get(lua_State *L)
lua_pushlstring(L, levelflat->name, i);
return 1;
}
-#ifdef ESLOPE
case ffloor_tslope:
LUA_PushUserdata(L, *ffloor->t_slope, META_SLOPE);
return 1;
case ffloor_bslope:
LUA_PushUserdata(L, *ffloor->b_slope, META_SLOPE);
return 1;
-#endif
case ffloor_sector:
LUA_PushUserdata(L, §ors[ffloor->secnum], META_SECTOR);
return 1;
@@ -1740,10 +1719,8 @@ static int ffloor_set(lua_State *L)
switch(field)
{
case ffloor_valid: // valid
-#ifdef ESLOPE
case ffloor_tslope: // t_slope
case ffloor_bslope: // b_slope
-#endif
case ffloor_sector: // sector
case ffloor_master: // master
case ffloor_target: // target
@@ -1804,7 +1781,6 @@ static int ffloor_set(lua_State *L)
return 0;
}
-#ifdef ESLOPE
//////////////
// pslope_t //
//////////////
@@ -1977,7 +1953,6 @@ static int vector3_get(lua_State *L)
return 0;
}
-#endif
/////////////////////
// mapheaderinfo[] //
@@ -2107,6 +2082,12 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->menuflags);
else if (fastcmp(field,"startrings"))
lua_pushinteger(L, header->startrings);
+ else if (fastcmp(field, "sstimer"))
+ lua_pushinteger(L, header->sstimer);
+ else if (fastcmp(field, "ssspheres"))
+ lua_pushinteger(L, header->ssspheres);
+ else if (fastcmp(field, "gravity"))
+ lua_pushfixed(L, header->gravity);
// TODO add support for reading numGradedMares and grades
else {
// Read custom vars now
@@ -2226,7 +2207,6 @@ int LUA_MapLib(lua_State *L)
lua_setfield(L, -2, "__index");
lua_pop(L, 1);
-#ifdef ESLOPE
luaL_newmetatable(L, META_SLOPE);
lua_pushcfunction(L, slope_get);
lua_setfield(L, -2, "__index");
@@ -2244,7 +2224,6 @@ int LUA_MapLib(lua_State *L)
lua_pushcfunction(L, vector3_get);
lua_setfield(L, -2, "__index");
lua_pop(L, 1);
-#endif
luaL_newmetatable(L, META_MAPHEADER);
lua_pushcfunction(L, mapheaderinfo_get);
@@ -2337,5 +2316,3 @@ int LUA_MapLib(lua_State *L)
lua_setglobal(L, "mapheaderinfo");
return 0;
}
-
-#endif
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index d2a959dde4d3e779806853005e2b250f3667eb1a..7cbe7a6cc9bbc579d47ff6f6a03ab3f2ad6b5ef4 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -11,7 +11,6 @@
/// \brief basic math library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
//#include "fastcmp.h"
#include "tables.h"
#include "p_local.h"
@@ -114,7 +113,8 @@ static int lib_fixeddiv(lua_State *L)
static int lib_fixedrem(lua_State *L)
{
- lua_pushfixed(L, FixedRem(luaL_checkfixed(L, 1), luaL_checkfixed(L, 2)));
+ LUA_Deprecated(L, "FixedRem(a, b)", "a % b");
+ lua_pushfixed(L, luaL_checkfixed(L, 1) % luaL_checkfixed(L, 2));
return 1;
}
@@ -173,15 +173,14 @@ static int lib_all7emeralds(lua_State *L)
return 1;
}
-// Whee, special Lua-exclusive function for making use of Color_Opposite[]
// Returns both color and signpost shade numbers!
static int lib_coloropposite(lua_State *L)
{
- UINT8 colornum = (UINT8)luaL_checkinteger(L, 1);
- if (!colornum || colornum >= MAXSKINCOLORS)
- return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, MAXSKINCOLORS-1);
- lua_pushinteger(L, Color_Opposite[colornum-1][0]); // push color
- lua_pushinteger(L, Color_Opposite[colornum-1][1]); // push sign shade index, 0-15
+ UINT16 colornum = (UINT16)luaL_checkinteger(L, 1);
+ if (!colornum || colornum >= numskincolors)
+ return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, numskincolors-1);
+ lua_pushinteger(L, skincolors[colornum].invcolor); // push color
+ lua_pushinteger(L, skincolors[colornum].invshade); // push sign shade index, 0-15
return 2;
}
@@ -217,5 +216,3 @@ int LUA_MathLib(lua_State *L)
luaL_register(L, NULL, lib);
return 0;
}
-
-#endif
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 9e46344cf5472780cbebda2d73eba51b31406ae3..3ca3ca1d7c1293bfb9bc8ba3fddcedb56cc922a5 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -11,7 +11,6 @@
/// \brief mobj/thing library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "r_skins.h"
#include "p_local.h"
@@ -85,9 +84,7 @@ enum mobj_e {
mobj_extravalue2,
mobj_cusval,
mobj_cvmem,
-#ifdef ESLOPE
mobj_standingslope,
-#endif
mobj_colorized,
mobj_shadowscale
};
@@ -153,9 +150,7 @@ static const char *const mobj_opt[] = {
"extravalue2",
"cusval",
"cvmem",
-#ifdef ESLOPE
"standingslope",
-#endif
"colorized",
"shadowscale",
NULL};
@@ -384,11 +379,9 @@ static int mobj_get(lua_State *L)
case mobj_cvmem:
lua_pushinteger(L, mo->cvmem);
break;
-#ifdef ESLOPE
case mobj_standingslope:
LUA_PushUserdata(L, mo->standingslope, META_SLOPE);
break;
-#endif
case mobj_colorized:
lua_pushboolean(L, mo->colorized);
break;
@@ -581,9 +574,9 @@ static int mobj_set(lua_State *L)
}
case mobj_color:
{
- UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
- if (newcolor >= MAXTRANSLATIONS)
- return luaL_error(L, "mobj.color %d out of range (0 - %d).", newcolor, MAXTRANSLATIONS-1);
+ UINT16 newcolor = (UINT16)luaL_checkinteger(L,3);
+ if (newcolor >= numskincolors)
+ return luaL_error(L, "mobj.color %d out of range (0 - %d).", newcolor, numskincolors-1);
mo->color = newcolor;
break;
}
@@ -717,10 +710,8 @@ static int mobj_set(lua_State *L)
case mobj_cvmem:
mo->cvmem = luaL_checkinteger(L, 3);
break;
-#ifdef ESLOPE
case mobj_standingslope:
return NOSET;
-#endif
case mobj_colorized:
mo->colorized = luaL_checkboolean(L, 3);
break;
@@ -838,6 +829,15 @@ static int mapthing_set(lua_State *L)
return 0;
}
+static int mapthing_num(lua_State *L)
+{
+ mapthing_t *mt = *((mapthing_t **)luaL_checkudata(L, 1, META_MAPTHING));
+ if (!mt)
+ return luaL_error(L, "accessed mapthing_t doesn't exist anymore.");
+ lua_pushinteger(L, mt-mapthings);
+ return 1;
+}
+
static int lib_iterateMapthings(lua_State *L)
{
size_t i = 0;
@@ -902,6 +902,9 @@ int LUA_MobjLib(lua_State *L)
lua_pushcfunction(L, mapthing_set);
lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, mapthing_num);
+ lua_setfield(L, -2, "__len");
lua_pop(L,1);
lua_newuserdata(L, 0);
@@ -915,5 +918,3 @@ int LUA_MobjLib(lua_State *L)
lua_setglobal(L, "mapthings");
return 0;
}
-
-#endif
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index cfea2924e25d8bceaa8a192921e193aac13e8997..1ce9be525f50146735f3973bb5b36de246c5b383 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -11,7 +11,6 @@
/// \brief player object library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "p_mobj.h"
#include "d_player.h"
@@ -97,6 +96,10 @@ static int player_get(lua_State *L)
lua_pushboolean(L, true);
else if (fastcmp(field,"name"))
lua_pushstring(L, player_names[plr-players]);
+ else if (fastcmp(field,"realmo"))
+ LUA_PushUserdata(L, plr->mo, META_MOBJ);
+ // Kept for backward-compatibility
+ // Should be fixed to work like "realmo" later
else if (fastcmp(field,"mo"))
{
if (plr->spectator)
@@ -398,7 +401,7 @@ static int player_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter player_t in HUD rendering code!");
- if (fastcmp(field,"mo")) {
+ if (fastcmp(field,"mo") || fastcmp(field,"realmo")) {
mobj_t *newmo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
plr->mo->player = NULL; // remove player pointer from old mobj
(newmo->player = plr)->mo = newmo; // set player pointer for new mobj, and set new mobj as the player's mobj
@@ -458,9 +461,9 @@ static int player_set(lua_State *L)
plr->flashpal = (UINT16)luaL_checkinteger(L, 3);
else if (fastcmp(field,"skincolor"))
{
- UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
- if (newcolor >= MAXSKINCOLORS)
- return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, MAXSKINCOLORS-1);
+ UINT16 newcolor = (UINT16)luaL_checkinteger(L,3);
+ if (newcolor >= numskincolors)
+ return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, numskincolors-1);
plr->skincolor = newcolor;
}
else if (fastcmp(field,"score"))
@@ -874,5 +877,3 @@ int LUA_PlayerLib(lua_State *L)
lua_setglobal(L, "players");
return 0;
}
-
-#endif
diff --git a/src/lua_script.c b/src/lua_script.c
index e7ce35ff15617fc6185609cd37d8b8f3fcfb514a..06ea18b0ee9e574604a38cc524ed4da9c185ffd5 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -11,7 +11,6 @@
/// \brief Lua scripting basics
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "dehacked.h"
#include "z_zone.h"
@@ -24,9 +23,7 @@
#include "byteptr.h"
#include "p_saveg.h"
#include "p_local.h"
-#ifdef ESLOPE
#include "p_slopes.h" // for P_SlopeById
-#endif
#ifdef LUA_ALLOW_BYTECODE
#include "d_netfil.h" // for LUA_DumpFile
#endif
@@ -81,6 +78,58 @@ FUNCNORETURN static int LUA_Panic(lua_State *L)
#endif
}
+#define LEVELS1 12 // size of the first part of the stack
+#define LEVELS2 10 // size of the second part of the stack
+
+// Error handler used with pcall() when loading scripts or calling hooks
+// Takes a string with the original error message,
+// appends the traceback to it, and return the result
+int LUA_GetErrorMessage(lua_State *L)
+{
+ int level = 1;
+ int firstpart = 1; // still before eventual `...'
+ lua_Debug ar;
+
+ lua_pushliteral(L, "\nstack traceback:");
+ while (lua_getstack(L, level++, &ar))
+ {
+ if (level > LEVELS1 && firstpart)
+ {
+ // no more than `LEVELS2' more levels?
+ if (!lua_getstack(L, level + LEVELS2, &ar))
+ level--; // keep going
+ else
+ {
+ lua_pushliteral(L, "\n ..."); // too many levels
+ while (lua_getstack(L, level + LEVELS2, &ar)) // find last levels
+ level++;
+ }
+ firstpart = 0;
+ continue;
+ }
+ lua_pushliteral(L, "\n ");
+ lua_getinfo(L, "Snl", &ar);
+ lua_pushfstring(L, "%s:", ar.short_src);
+ if (ar.currentline > 0)
+ lua_pushfstring(L, "%d:", ar.currentline);
+ if (*ar.namewhat != '\0') // is there a name?
+ lua_pushfstring(L, " in function " LUA_QS, ar.name);
+ else
+ {
+ if (*ar.what == 'm') // main?
+ lua_pushfstring(L, " in main chunk");
+ else if (*ar.what == 'C' || *ar.what == 't')
+ lua_pushliteral(L, " ?"); // C function or tail call
+ else
+ lua_pushfstring(L, " in function <%s:%d>",
+ ar.short_src, ar.linedefined);
+ }
+ lua_concat(L, lua_gettop(L));
+ }
+ lua_concat(L, lua_gettop(L));
+ return 1;
+}
+
// Moved here from lib_getenum.
int LUA_PushGlobals(lua_State *L, const char *word)
{
@@ -413,11 +462,13 @@ static inline void LUA_LoadFile(MYFILE *f, char *name)
lua_lumploading = true; // turn on loading flag
- if (luaL_loadbuffer(gL, f->data, f->size, va("@%s",name)) || lua_pcall(gL, 0, 0, 0)) {
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+ if (luaL_loadbuffer(gL, f->data, f->size, va("@%s",name)) || lua_pcall(gL, 0, 0, lua_gettop(gL) - 1)) {
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL,-1));
lua_pop(gL,1);
}
lua_gc(gL, LUA_GCCOLLECT, 0);
+ lua_pop(gL, 1); // Pop error handler
lua_lumploading = false; // turn off again
}
@@ -444,9 +495,9 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
else // If it's not a .lua file, copy the lump name in too.
{
lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
- len += 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
+ len += 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
name = malloc(len+1);
- sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->name2);
+ sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
name[len] = '\0';
}
@@ -571,6 +622,27 @@ fixed_t LUA_EvalMath(const char *word)
return res;
}
+/*
+LUA_PushUserdata but no userdata is created.
+You can't invalidate it therefore.
+*/
+
+void LUA_PushLightUserdata (lua_State *L, void *data, const char *meta)
+{
+ if (data)
+ {
+ lua_pushlightuserdata(L, data);
+ luaL_getmetatable(L, meta);
+ /*
+ The metatable is the last value on the stack, so this
+ applies it to the second value, which is the userdata.
+ */
+ lua_setmetatable(L, -2);
+ }
+ else
+ lua_pushnil(L);
+}
+
// Takes a pointer, any pointer, and a metatable name
// Creates a userdata for that pointer with the given metatable
// Pushes it to the stack and stores it in the registry.
@@ -712,9 +784,13 @@ void LUA_InvalidatePlayer(player_t *player)
enum
{
ARCH_NULL=0,
- ARCH_BOOLEAN,
- ARCH_SIGNED,
- ARCH_STRING,
+ ARCH_TRUE,
+ ARCH_FALSE,
+ ARCH_INT8,
+ ARCH_INT16,
+ ARCH_INT32,
+ ARCH_SMALLSTRING,
+ ARCH_LARGESTRING,
ARCH_TABLE,
ARCH_MOBJINFO,
@@ -732,10 +808,9 @@ enum
ARCH_NODE,
#endif
ARCH_FFLOOR,
-#ifdef ESLOPE
ARCH_SLOPE,
-#endif
ARCH_MAPHEADER,
+ ARCH_SKINCOLOR,
ARCH_TEND=0xFF,
};
@@ -759,10 +834,9 @@ static const struct {
{META_NODE, ARCH_NODE},
#endif
{META_FFLOOR, ARCH_FFLOOR},
-#ifdef ESLOPE
{META_SLOPE, ARCH_SLOPE},
-#endif
{META_MAPHEADER, ARCH_MAPHEADER},
+ {META_SKINCOLOR, ARCH_SKINCOLOR},
{NULL, ARCH_NULL}
};
@@ -803,22 +877,33 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
WRITEUINT8(save_p, ARCH_NULL);
return 2;
case LUA_TBOOLEAN:
- WRITEUINT8(save_p, ARCH_BOOLEAN);
- WRITEUINT8(save_p, lua_toboolean(gL, myindex));
+ WRITEUINT8(save_p, lua_toboolean(gL, myindex) ? ARCH_TRUE : ARCH_FALSE);
break;
case LUA_TNUMBER:
{
lua_Integer number = lua_tointeger(gL, myindex);
- WRITEUINT8(save_p, ARCH_SIGNED);
- WRITEFIXED(save_p, number);
+ if (number >= INT8_MIN && number <= INT8_MAX)
+ {
+ WRITEUINT8(save_p, ARCH_INT8);
+ WRITESINT8(save_p, number);
+ }
+ else if (number >= INT16_MIN && number <= INT16_MAX)
+ {
+ WRITEUINT8(save_p, ARCH_INT16);
+ WRITEINT16(save_p, number);
+ }
+ else
+ {
+ WRITEUINT8(save_p, ARCH_INT32);
+ WRITEFIXED(save_p, number);
+ }
break;
}
case LUA_TSTRING:
{
- UINT16 len = (UINT16)lua_objlen(gL, myindex); // get length of string, including embedded zeros
+ UINT32 len = (UINT32)lua_objlen(gL, myindex); // get length of string, including embedded zeros
const char *s = lua_tostring(gL, myindex);
- UINT16 i = 0;
- WRITEUINT8(save_p, ARCH_STRING);
+ UINT32 i = 0;
// if you're wondering why we're writing a string to save_p this way,
// it turns out that Lua can have embedded zeros ('\0') in the strings,
// so we can't use WRITESTRING as that cuts off when it finds a '\0'.
@@ -826,7 +911,16 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
// fixing the awful crashes previously encountered for reading strings longer than 1024
// (yes I know that's kind of a stupid thing to care about, but it'd be evil to trim or ignore them?)
// -- Monster Iestyn 05/08/18
- WRITEUINT16(save_p, len); // save size of string
+ if (len < 255)
+ {
+ WRITEUINT8(save_p, ARCH_SMALLSTRING);
+ WRITEUINT8(save_p, len); // save size of string
+ }
+ else
+ {
+ WRITEUINT8(save_p, ARCH_LARGESTRING);
+ WRITEUINT32(save_p, len); // save size of string
+ }
while (i < len)
WRITECHAR(save_p, s[i++]); // write chars individually, including the embedded zeros
break;
@@ -996,16 +1090,8 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
if (!rover)
WRITEUINT8(save_p, ARCH_NULL);
else {
- ffloor_t *r2;
- UINT16 i = 0;
- // search for id
- for (r2 = rover->target->ffloors; r2; r2 = r2->next)
- {
- if (r2 == rover)
- break;
- i++;
- }
- if (!r2)
+ UINT16 i = P_GetFFloorID(rover);
+ if (i == UINT16_MAX) // invalid ID
WRITEUINT8(save_p, ARCH_NULL);
else
{
@@ -1016,7 +1102,6 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
}
break;
}
-#ifdef ESLOPE
case ARCH_SLOPE:
{
pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex));
@@ -1028,7 +1113,6 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
}
break;
}
-#endif
case ARCH_MAPHEADER:
{
mapheader_t *header = *((mapheader_t **)lua_touserdata(gL, myindex));
@@ -1040,6 +1124,14 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
}
break;
}
+
+ case ARCH_SKINCOLOR:
+ {
+ skincolor_t *info = *((skincolor_t **)lua_touserdata(gL, myindex));
+ WRITEUINT8(save_p, ARCH_SKINCOLOR);
+ WRITEUINT16(save_p, info - skincolors);
+ break;
+ }
default:
WRITEUINT8(save_p, ARCH_NULL);
return 2;
@@ -1166,21 +1258,36 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
case ARCH_NULL:
lua_pushnil(gL);
break;
- case ARCH_BOOLEAN:
- lua_pushboolean(gL, READUINT8(save_p));
+ case ARCH_TRUE:
+ lua_pushboolean(gL, true);
+ break;
+ case ARCH_FALSE:
+ lua_pushboolean(gL, false);
break;
- case ARCH_SIGNED:
+ case ARCH_INT8:
+ lua_pushinteger(gL, READSINT8(save_p));
+ break;
+ case ARCH_INT16:
+ lua_pushinteger(gL, READINT16(save_p));
+ break;
+ case ARCH_INT32:
lua_pushinteger(gL, READFIXED(save_p));
break;
- case ARCH_STRING:
+ case ARCH_SMALLSTRING:
+ case ARCH_LARGESTRING:
{
- UINT16 len = READUINT16(save_p); // length of string, including embedded zeros
+ UINT32 len;
char *value;
- UINT16 i = 0;
+ UINT32 i = 0;
+
// See my comments in the ArchiveValue function;
// it's much the same for reading strings as writing them!
// (i.e. we can't use READSTRING either)
// -- Monster Iestyn 05/08/18
+ if (type == ARCH_SMALLSTRING)
+ len = READUINT8(save_p); // length of string, including embedded zeros
+ else
+ len = READUINT32(save_p); // length of string, including embedded zeros
value = malloc(len); // make temp buffer of size len
// now read the actual string
while (i < len)
@@ -1250,14 +1357,15 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
LUA_PushUserdata(gL, rover, META_FFLOOR);
break;
}
-#ifdef ESLOPE
case ARCH_SLOPE:
LUA_PushUserdata(gL, P_SlopeById(READUINT16(save_p)), META_SLOPE);
break;
-#endif
case ARCH_MAPHEADER:
LUA_PushUserdata(gL, mapheaderinfo[READUINT16(save_p)], META_MAPHEADER);
break;
+ case ARCH_SKINCOLOR:
+ LUA_PushUserdata(gL, &skincolors[READUINT16(save_p)], META_SKINCOLOR);
+ break;
case ARCH_TEND:
return 1;
}
@@ -1423,5 +1531,3 @@ int Lua_optoption(lua_State *L, int narg,
return i;
return -1;
}
-
-#endif // HAVE_BLUA
diff --git a/src/lua_script.h b/src/lua_script.h
index 6caccd69b54d842be428e75004518877b6bb8c3e..9568503e13e33a94538254fc498e5580e24d6cb3 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -10,8 +10,6 @@
/// \file lua_script.h
/// \brief Lua scripting basics
-#ifdef HAVE_BLUA
-
#include "m_fixed.h"
#include "doomtype.h"
#include "d_player.h"
@@ -41,11 +39,13 @@ void LUA_ClearExtVars(void);
extern boolean lua_lumploading; // is LUA_LoadLump being called?
+int LUA_GetErrorMessage(lua_State *L);
void LUA_LoadLump(UINT16 wad, UINT16 lump);
#ifdef LUA_ALLOW_BYTECODE
void LUA_DumpFile(const char *filename);
#endif
fixed_t LUA_EvalMath(const char *word);
+void LUA_PushLightUserdata(lua_State *L, void *data, const char *meta);
void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
void LUA_InvalidateUserdata(void *data);
void LUA_InvalidateLevel(void);
@@ -100,7 +100,8 @@ void COM_Lua_f(void);
// uncomment if you want seg_t/node_t in Lua
// #define HAVE_LUA_SEGS
-#define INLEVEL if (gamestate != GS_LEVEL && !titlemapinaction)\
-return luaL_error(L, "This can only be used in a level!");
+#define ISINLEVEL \
+ (gamestate == GS_LEVEL || titlemapinaction)
-#endif
+#define INLEVEL if (! ISINLEVEL)\
+return luaL_error(L, "This can only be used in a level!");
diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index f26aed2f0fd82a8bb39d2a56cf36f1c58dc6df01..3e4ddb9f0806d4debc27867ddbec50eaae66ec1d 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -11,7 +11,6 @@
/// \brief player skin structure library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "fastcmp.h"
#include "r_skins.h"
#include "sounds.h"
@@ -358,5 +357,3 @@ int LUA_SkinLib(lua_State *L)
return 0;
}
-
-#endif
diff --git a/src/lua_thinkerlib.c b/src/lua_thinkerlib.c
index ddb5abf72a411ee3e5b918b1ecf444b7c661ca83..82baa64693472908fb22029a7838ee6f2228e7e3 100644
--- a/src/lua_thinkerlib.c
+++ b/src/lua_thinkerlib.c
@@ -11,7 +11,6 @@
/// \brief thinker library for Lua scripting
#include "doomdef.h"
-#ifdef HAVE_BLUA
#include "p_local.h"
#include "lua_script.h"
#include "lua_libs.h"
@@ -139,5 +138,3 @@ int LUA_ThinkerLib(lua_State *L)
lua_setglobal(L, "mobjs");
return 0;
}
-
-#endif
diff --git a/src/m_anigif.c b/src/m_anigif.c
index ce2ca20b9677302f08e140f65abc6c638fd7ce89..1b71a09bce278b59741db664f334faa5075e2aec 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -490,29 +490,28 @@ const UINT8 gifframe_gchead[4] = {0x21,0xF9,0x04,0x04}; // GCE, bytes, packed by
static UINT8 *gifframe_data = NULL;
static size_t gifframe_size = 8192;
+//
+// GIF_rgbconvert
+// converts an RGB frame to a frame with a palette.
+//
#ifdef HWRENDER
-static void hwrconvert(void)
+static void GIF_rgbconvert(UINT8 *linear, UINT8 *scr)
{
- UINT8 *linear = HWR_GetScreenshot();
- UINT8 *dest = screens[2];
UINT8 r, g, b;
- INT32 x, y;
- size_t i = 0;
+ size_t src = 0, dest = 0;
+ size_t size = (vid.width * vid.height * 3);
InitColorLUT(gif_framepalette);
- for (y = 0; y < vid.height; y++)
+ while (src < size)
{
- for (x = 0; x < vid.width; x++, i += 3)
- {
- r = (UINT8)linear[i];
- g = (UINT8)linear[i + 1];
- b = (UINT8)linear[i + 2];
- dest[(y * vid.width) + x] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
- }
+ r = (UINT8)linear[src];
+ g = (UINT8)linear[src + 1];
+ b = (UINT8)linear[src + 2];
+ scr[dest] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
+ src += (3 * scrbuf_downscaleamt);
+ dest += scrbuf_downscaleamt;
}
-
- free(linear);
}
#endif
@@ -556,7 +555,11 @@ static void GIF_framewrite(void)
I_ReadScreen(movie_screen);
#ifdef HWRENDER
else if (rendermode == render_opengl)
- hwrconvert();
+ {
+ UINT8 *linear = HWR_GetScreenshot();
+ GIF_rgbconvert(linear, movie_screen);
+ free(linear);
+ }
#endif
}
else
@@ -565,18 +568,20 @@ static void GIF_framewrite(void)
blitw = vid.width;
blith = vid.height;
- if (gif_frames == 0)
- {
- if (rendermode == render_soft)
- I_ReadScreen(movie_screen);
#ifdef HWRENDER
- else if (rendermode == render_opengl)
- {
- hwrconvert();
- VID_BlitLinearScreen(screens[2], screens[0], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
- }
-#endif
+ // Copy the current OpenGL frame into the base screen
+ if (rendermode == render_opengl)
+ {
+ UINT8 *linear = HWR_GetScreenshot();
+ GIF_rgbconvert(linear, screens[0]);
+ free(linear);
}
+#endif
+
+ // Copy the first frame into the movie screen
+ // OpenGL already does the same above.
+ if (gif_frames == 0 && rendermode == render_soft)
+ I_ReadScreen(movie_screen);
movie_screen = screens[0];
}
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 1431e88730336bac7a983e31d29eef6f56db89ec..3d188644b0226e16464fc5a603fee7c036ab6ab1 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -788,7 +788,7 @@ void Command_CauseCfail_f(void)
}
#endif
-#if defined(HAVE_BLUA) && defined(LUA_ALLOW_BYTECODE)
+#ifdef LUA_ALLOW_BYTECODE
void Command_Dumplua_f(void)
{
if (modifiedgame)
@@ -934,6 +934,12 @@ void Command_Setcontinues_f(void)
REQUIRE_NOULTIMATE;
REQUIRE_PANDORA;
+ if (!continuesInSession)
+ {
+ CONS_Printf(M_GetText("This session does not use continues.\n"));
+ return;
+ }
+
if (COM_Argc() > 1)
{
INT32 numcontinues = atoi(COM_Argv(1));
@@ -972,7 +978,7 @@ static mobjflag2_t op_oldflags2 = 0;
static UINT32 op_oldeflags = 0;
static fixed_t op_oldmomx = 0, op_oldmomy = 0, op_oldmomz = 0, op_oldheight = 0;
static statenum_t op_oldstate = 0;
-static UINT8 op_oldcolor = 0;
+static UINT16 op_oldcolor = 0;
//
// Static calculation / common output help
@@ -1025,13 +1031,9 @@ static boolean OP_HeightOkay(player_t *player, UINT8 ceiling)
if (ceiling)
{
-#ifdef ESLOPE
// Truncate position to match where mapthing would be when spawned
- // (this applies to every further P_GetZAt call as well)
- fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->ceilingheight;
-#else
- fixed_t cheight = sec->ceilingheight;
-#endif
+ // (this applies to every further P_GetSlopeZAt call as well)
+ fixed_t cheight = P_GetSectorCeilingZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
if (((cheight - player->mo->z - player->mo->height)>>FRACBITS) >= (1 << (16-ZSHIFT)))
{
@@ -1042,11 +1044,7 @@ static boolean OP_HeightOkay(player_t *player, UINT8 ceiling)
}
else
{
-#ifdef ESLOPE
- fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->floorheight;
-#else
- fixed_t fheight = sec->floorheight;
-#endif
+ fixed_t fheight = P_GetSectorFloorZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
if (((player->mo->z - fheight)>>FRACBITS) >= (1 << (16-ZSHIFT)))
{
CONS_Printf(M_GetText("Sorry, you're too %s to place this object (max: %d %s).\n"), M_GetText("high"),
@@ -1062,9 +1060,7 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
mapthing_t *mt = mapthings;
sector_t *sec = player->mo->subsector->sector;
-#ifdef HAVE_BLUA
LUA_InvalidateMapthings();
-#endif
mapthings = Z_Realloc(mapthings, ++nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
@@ -1095,20 +1091,12 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
mt->y = (INT16)(player->mo->y>>FRACBITS);
if (ceiling)
{
-#ifdef ESLOPE
- fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, mt->x << FRACBITS, mt->y << FRACBITS) : sec->ceilingheight;
-#else
- fixed_t cheight = sec->ceilingheight;
-#endif
+ fixed_t cheight = P_GetSectorCeilingZAt(sec, mt->x << FRACBITS, mt->y << FRACBITS);
mt->z = (UINT16)((cheight - player->mo->z - player->mo->height)>>FRACBITS);
}
else
{
-#ifdef ESLOPE
- fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, mt->x << FRACBITS, mt->y << FRACBITS) : sec->floorheight;
-#else
- fixed_t fheight = sec->floorheight;
-#endif
+ fixed_t fheight = P_GetSectorFloorZAt(sec, mt->x << FRACBITS, mt->y << FRACBITS);
mt->z = (UINT16)((player->mo->z - fheight)>>FRACBITS);
}
mt->angle = (INT16)(FixedInt(AngleFixed(player->mo->angle)));
@@ -1354,20 +1342,12 @@ void OP_ObjectplaceMovement(player_t *player)
if (!!(mobjinfo[op_currentthing].flags & MF_SPAWNCEILING) ^ !!(cv_opflags.value & MTF_OBJECTFLIP))
{
-#ifdef ESLOPE
- fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->ceilingheight;
-#else
- fixed_t cheight = sec->ceilingheight;
-#endif
+ fixed_t cheight = P_GetSectorCeilingZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
op_displayflags = (UINT16)((cheight - player->mo->z - mobjinfo[op_currentthing].height)>>FRACBITS);
}
else
{
-#ifdef ESLOPE
- fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->floorheight;
-#else
- fixed_t fheight = sec->floorheight;
-#endif
+ fixed_t fheight = P_GetSectorFloorZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
op_displayflags = (UINT16)((player->mo->z - fheight)>>FRACBITS);
}
op_displayflags <<= ZSHIFT;
diff --git a/src/m_cheat.h b/src/m_cheat.h
index 092e51756d1621bb639756f9cee118baa61bc282..ac2540408d481f0745a756929dbeea219ecbc9bd 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -68,7 +68,7 @@ void Command_Toggletwod_f(void);
#ifdef _DEBUG
void Command_CauseCfail_f(void);
#endif
-#if defined(HAVE_BLUA) && defined(LUA_ALLOW_BYTECODE)
+#ifdef LUA_ALLOW_BYTECODE
void Command_Dumplua_f(void);
#endif
diff --git a/src/m_cond.c b/src/m_cond.c
index 0abc7adf88c7ace2907b69ea4c8277a500549b99..36fcd7cf295aff241e7637d906381422121bd60a 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -523,9 +523,9 @@ emblem_t *M_GetLevelEmblems(INT32 mapnum)
return NULL;
}
-skincolors_t M_GetEmblemColor(emblem_t *em)
+skincolornum_t M_GetEmblemColor(emblem_t *em)
{
- if (!em || em->color >= MAXSKINCOLORS)
+ if (!em || em->color >= numskincolors)
return SKINCOLOR_NONE;
return em->color;
}
@@ -549,9 +549,9 @@ const char *M_GetEmblemPatch(emblem_t *em, boolean big)
return pnamebuf;
}
-skincolors_t M_GetExtraEmblemColor(extraemblem_t *em)
+skincolornum_t M_GetExtraEmblemColor(extraemblem_t *em)
{
- if (!em || em->color >= MAXSKINCOLORS)
+ if (!em || em->color >= numskincolors)
return SKINCOLOR_NONE;
return em->color;
}
diff --git a/src/m_cond.h b/src/m_cond.h
index d7b9704dd94bb4c5793302ff6204ae061d5007f0..9bb162ff317a34f40d69cc1ec37230e1d818af27 100644
--- a/src/m_cond.h
+++ b/src/m_cond.h
@@ -90,7 +90,7 @@ typedef struct
INT16 tag; ///< Tag of emblem mapthing
INT16 level; ///< Level on which this emblem can be found.
UINT8 sprite; ///< emblem sprite to use, 0 - 25
- UINT8 color; ///< skincolor to use
+ UINT16 color; ///< skincolor to use
INT32 var; ///< If needed, specifies information on the target amount to achieve (or target skin)
char hint[110]; ///< Hint for emblem hints menu
UINT8 collected; ///< Do you have this emblem?
@@ -102,7 +102,7 @@ typedef struct
UINT8 conditionset; ///< Condition set that awards this emblem.
UINT8 showconditionset; ///< Condition set that shows this emblem.
UINT8 sprite; ///< emblem sprite to use, 0 - 25
- UINT8 color; ///< skincolor to use
+ UINT16 color; ///< skincolor to use
UINT8 collected; ///< Do you have this emblem?
} extraemblem_t;
@@ -172,9 +172,9 @@ INT32 M_CountEmblems(void);
// Emblem shit
emblem_t *M_GetLevelEmblems(INT32 mapnum);
-skincolors_t M_GetEmblemColor(emblem_t *em);
+skincolornum_t M_GetEmblemColor(emblem_t *em);
const char *M_GetEmblemPatch(emblem_t *em, boolean big);
-skincolors_t M_GetExtraEmblemColor(extraemblem_t *em);
+skincolornum_t M_GetExtraEmblemColor(extraemblem_t *em);
const char *M_GetExtraEmblemPatch(extraemblem_t *em, boolean big);
// If you're looking to compare stats for unlocks or what not, use these
diff --git a/src/m_fixed.h b/src/m_fixed.h
index cc54c1aea257d5d0ef8180fe3ef15d25b392afb6..289ca442a03e7740a7e1844303a8d84c97f9aa22 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -204,18 +204,6 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedDiv(fixed_t a, fixed_t b)
return FixedDiv2(a, b);
}
-/** \brief The FixedRem function
-
- \param x fixed_t number
- \param y fixed_t number
-
- \return remainder of dividing x by y
-*/
-FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedRem(fixed_t x, fixed_t y)
-{
- return x % y;
-}
-
/** \brief The FixedSqrt function
\param x fixed_t number
diff --git a/src/m_menu.c b/src/m_menu.c
index 63846b5e110c972649ea29b350b122501ac7f903..e4cc189be8a4fff29b4a80f2c72c1e267c9839b1 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -879,7 +879,8 @@ static menuitem_t SP_NightsAttackLevelSelectMenu[] =
static menuitem_t SP_NightsAttackMenu[] =
{
{IT_STRING|IT_KEYHANDLER, NULL, "Level Select...", &M_HandleTimeAttackLevelSelect, 52},
- {IT_STRING|IT_CVAR, NULL, "Show Records For", &cv_dummymares, 62},
+ {IT_STRING|IT_CVAR, NULL, "Character", &cv_chooseskin, 62},
+ {IT_STRING|IT_CVAR, NULL, "Show Records For", &cv_dummymares, 72},
{IT_DISABLED, NULL, "Guest Option...", &SP_NightsGuestReplayDef, 100},
{IT_DISABLED, NULL, "Replay...", &SP_NightsReplayDef, 110},
@@ -890,6 +891,7 @@ static menuitem_t SP_NightsAttackMenu[] =
enum
{
nalevel,
+ nachar,
narecords,
naguest,
@@ -1574,7 +1576,7 @@ static menuitem_t OP_ServerOptionsMenu[] =
{IT_HEADER, NULL, "General", NULL, 0},
#ifndef NONET
{IT_STRING | IT_CVAR | IT_CV_STRING,
- NULL, "Server name", &cv_servername, 7},
+ NULL, "Server name", &cv_servername, 7},
{IT_STRING | IT_CVAR, NULL, "Max Players", &cv_maxplayers, 21},
{IT_STRING | IT_CVAR, NULL, "Allow Add-on Downloading", &cv_downloading, 26},
{IT_STRING | IT_CVAR, NULL, "Allow players to join", &cv_allownewplayer, 31},
@@ -1619,8 +1621,9 @@ static menuitem_t OP_ServerOptionsMenu[] =
#ifndef NONET
{IT_HEADER, NULL, "Advanced", NULL, 225},
- {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Master server", &cv_masterserver, 231},
- {IT_STRING | IT_CVAR, NULL, "Attempts to resynchronise", &cv_resynchattempts, 245},
+ {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Master server", &cv_masterserver, 231},
+ {IT_STRING | IT_CVAR, NULL, "Join delay", &cv_joindelay, 246},
+ {IT_STRING | IT_CVAR, NULL, "Attempts to resynchronise", &cv_resynchattempts, 251},
#endif
};
@@ -1692,7 +1695,7 @@ static INT32 highlightflags, recommendedflags, warningflags;
// Sky Room
menu_t SR_PandoraDef =
{
- MN_SR_MAIN + (MN_SR_PANDORA << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_PANDORA),
"M_PANDRA",
sizeof (SR_PandorasBox)/sizeof (menuitem_t),
&SPauseDef,
@@ -1706,12 +1709,12 @@ menu_t SR_PandoraDef =
menu_t SR_MainDef = DEFAULTMENUSTYLE(MN_SR_MAIN, "M_SECRET", SR_MainMenu, &MainDef, 60, 40);
menu_t SR_LevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SR_MAIN + (MN_SR_LEVELSELECT << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_LEVELSELECT),
NULL, SR_LevelSelectMenu);
menu_t SR_UnlockChecklistDef =
{
- MN_SR_MAIN + (MN_SR_UNLOCKCHECKLIST << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_UNLOCKCHECKLIST),
"M_SECRET",
1,
&SR_MainDef,
@@ -1724,7 +1727,7 @@ menu_t SR_UnlockChecklistDef =
menu_t SR_SoundTestDef =
{
- MN_SR_MAIN + (MN_SR_SOUNDTEST << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_SOUNDTEST),
NULL,
sizeof (SR_SoundTestMenu)/sizeof (menuitem_t),
&SR_MainDef,
@@ -1737,7 +1740,7 @@ menu_t SR_SoundTestDef =
menu_t SR_EmblemHintDef =
{
- MN_SR_MAIN + (MN_SR_EMBLEMHINT << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_EMBLEMHINT),
NULL,
sizeof (SR_EmblemHintMenu)/sizeof (menuitem_t),
&SPauseDef,
@@ -1764,7 +1767,7 @@ menu_t SP_MainDef = //CENTERMENUSTYLE(NULL, SP_MainMenu, &MainDef, 72);
menu_t SP_LoadDef =
{
- MN_SP_MAIN + (MN_SP_LOAD << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_LOAD),
"M_PICKG",
1,
&SP_MainDef,
@@ -1776,12 +1779,12 @@ menu_t SP_LoadDef =
};
menu_t SP_LevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SP_MAIN + (MN_SP_LOAD << 6) + (MN_SP_PLAYER << 12) + (MN_SP_LEVELSELECT << 18),
+ MTREE4(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER, MN_SP_LEVELSELECT),
NULL, SP_LevelSelectMenu);
menu_t SP_LevelStatsDef =
{
- MN_SP_MAIN + (MN_SP_LEVELSTATS << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_LEVELSTATS),
"M_STATS",
1,
&SP_MainDef,
@@ -1793,12 +1796,12 @@ menu_t SP_LevelStatsDef =
};
menu_t SP_TimeAttackLevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_TIMEATTACK_LEVELSELECT << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_TIMEATTACK_LEVELSELECT),
"M_ATTACK", SP_TimeAttackLevelSelectMenu);
static menu_t SP_TimeAttackDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_TIMEATTACK),
"M_ATTACK",
sizeof (SP_TimeAttackMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
@@ -1810,7 +1813,7 @@ static menu_t SP_TimeAttackDef =
};
static menu_t SP_ReplayDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_REPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_REPLAY),
"M_ATTACK",
sizeof(SP_ReplayMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
@@ -1822,7 +1825,7 @@ static menu_t SP_ReplayDef =
};
static menu_t SP_GuestReplayDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_GUESTREPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_GUESTREPLAY),
"M_ATTACK",
sizeof(SP_GuestReplayMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
@@ -1834,7 +1837,7 @@ static menu_t SP_GuestReplayDef =
};
static menu_t SP_GhostDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_GHOST << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_GHOST),
"M_ATTACK",
sizeof(SP_GhostMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
@@ -1846,12 +1849,12 @@ static menu_t SP_GhostDef =
};
menu_t SP_NightsAttackLevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_LEVELSELECT << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_LEVELSELECT),
"M_NIGHTS", SP_NightsAttackLevelSelectMenu);
static menu_t SP_NightsAttackDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_NIGHTSATTACK),
"M_NIGHTS",
sizeof (SP_NightsAttackMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
@@ -1863,7 +1866,7 @@ static menu_t SP_NightsAttackDef =
};
static menu_t SP_NightsReplayDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_REPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_REPLAY),
"M_NIGHTS",
sizeof(SP_NightsReplayMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
@@ -1875,7 +1878,7 @@ static menu_t SP_NightsReplayDef =
};
static menu_t SP_NightsGuestReplayDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_GUESTREPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_GUESTREPLAY),
"M_NIGHTS",
sizeof(SP_NightsGuestReplayMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
@@ -1887,7 +1890,7 @@ static menu_t SP_NightsGuestReplayDef =
};
static menu_t SP_NightsGhostDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_GHOST << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_GHOST),
"M_NIGHTS",
sizeof(SP_NightsGhostMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
@@ -1901,7 +1904,7 @@ static menu_t SP_NightsGhostDef =
menu_t SP_PlayerDef =
{
- MN_SP_MAIN + (MN_SP_LOAD << 6) + (MN_SP_PLAYER << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER),
"M_PICKP",
sizeof (SP_PlayerMenu)/sizeof (menuitem_t),
&SP_MainDef,
@@ -1916,7 +1919,7 @@ menu_t SP_PlayerDef =
menu_t MP_SplitServerDef =
{
- MN_MP_MAIN + (MN_MP_SPLITSCREEN << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_SPLITSCREEN),
"M_MULTI",
sizeof (MP_SplitServerMenu)/sizeof (menuitem_t),
#ifndef NONET
@@ -1948,7 +1951,7 @@ menu_t MP_MainDef =
menu_t MP_ServerDef =
{
- MN_MP_MAIN + (MN_MP_SERVER << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_SERVER),
"M_MULTI",
sizeof (MP_ServerMenu)/sizeof (menuitem_t),
&MP_MainDef,
@@ -1961,7 +1964,7 @@ menu_t MP_ServerDef =
menu_t MP_ConnectDef =
{
- MN_MP_MAIN + (MN_MP_CONNECT << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_CONNECT),
"M_MULTI",
sizeof (MP_ConnectMenu)/sizeof (menuitem_t),
&MP_MainDef,
@@ -1974,7 +1977,7 @@ menu_t MP_ConnectDef =
menu_t MP_RoomDef =
{
- MN_MP_MAIN + (MN_MP_ROOM << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_ROOM),
"M_MULTI",
sizeof (MP_RoomMenu)/sizeof (menuitem_t),
&MP_ConnectDef,
@@ -1989,9 +1992,9 @@ menu_t MP_RoomDef =
menu_t MP_PlayerSetupDef =
{
#ifdef NONET
- MN_MP_MAIN + (MN_MP_PLAYERSETUP << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_PLAYERSETUP),
#else
- MN_MP_MAIN + (MN_MP_SPLITSCREEN << 6) + (MN_MP_PLAYERSETUP << 12),
+ MTREE3(MN_MP_MAIN, MN_MP_SPLITSCREEN, MN_MP_PLAYERSETUP),
#endif
"M_SPLAYR",
sizeof (MP_PlayerSetupMenu)/sizeof (menuitem_t),
@@ -2007,12 +2010,13 @@ menu_t MP_PlayerSetupDef =
menu_t OP_MainDef = DEFAULTMENUSTYLE(
MN_OP_MAIN,
"M_OPTTTL", OP_MainMenu, &MainDef, 50, 30);
+
menu_t OP_ChangeControlsDef = CONTROLMENUSTYLE(
- MN_OP_MAIN + (MN_OP_CHANGECONTROLS << 12), // second level (<<6) set on runtime
+ MTREE3(MN_OP_MAIN, 0, MN_OP_CHANGECONTROLS), // second level set on runtime
OP_ChangeControlsMenu, &OP_MainDef);
menu_t OP_P1ControlsDef = {
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_P1CONTROLS),
"M_CONTRO",
sizeof(OP_P1ControlsMenu)/sizeof(menuitem_t),
&OP_MainDef,
@@ -2020,7 +2024,7 @@ menu_t OP_P1ControlsDef = {
M_DrawControlsDefMenu,
50, 30, 0, NULL};
menu_t OP_P2ControlsDef = {
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_P2CONTROLS),
"M_CONTRO",
sizeof(OP_P2ControlsMenu)/sizeof(menuitem_t),
&OP_MainDef,
@@ -2029,20 +2033,22 @@ menu_t OP_P2ControlsDef = {
50, 30, 0, NULL};
menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1MOUSE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_P1MOUSE),
"M_CONTRO", OP_MouseOptionsMenu, &OP_P1ControlsDef, 35, 30);
menu_t OP_Mouse2OptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2MOUSE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P2CONTROLS, MN_OP_P2MOUSE),
"M_CONTRO", OP_Mouse2OptionsMenu, &OP_P2ControlsDef, 35, 30);
+
menu_t OP_Joystick1Def = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1JOYSTICK << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_P1JOYSTICK),
"M_CONTRO", OP_Joystick1Menu, &OP_P1ControlsDef, 50, 30);
menu_t OP_Joystick2Def = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2JOYSTICK << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P2CONTROLS, MN_OP_P2JOYSTICK),
"M_CONTRO", OP_Joystick2Menu, &OP_P2ControlsDef, 50, 30);
+
menu_t OP_JoystickSetDef =
{
- MN_OP_MAIN + (MN_OP_JOYSTICKSET << MENUBITS*3), // second (<<6) and third level (<<12) set on runtime
+ MTREE4(MN_OP_MAIN, 0, 0, MN_OP_JOYSTICKSET), // second and third level set on runtime
"M_CONTRO",
sizeof (OP_JoystickSetMenu)/sizeof (menuitem_t),
&OP_Joystick1Def,
@@ -2054,7 +2060,7 @@ menu_t OP_JoystickSetDef =
};
menu_t OP_CameraOptionsDef = {
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1CAMERA << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_P1CAMERA),
"M_CONTRO",
sizeof (OP_CameraOptionsMenu)/sizeof (menuitem_t),
&OP_P1ControlsDef,
@@ -2065,7 +2071,7 @@ menu_t OP_CameraOptionsDef = {
NULL
};
menu_t OP_Camera2OptionsDef = {
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2CAMERA << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P2CONTROLS, MN_OP_P2CAMERA),
"M_CONTRO",
sizeof (OP_Camera2OptionsMenu)/sizeof (menuitem_t),
&OP_P2ControlsDef,
@@ -2079,7 +2085,7 @@ menu_t OP_Camera2OptionsDef = {
static menuitem_t OP_PlaystyleMenu[] = {{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandlePlaystyleMenu, 0}};
menu_t OP_PlaystyleDef = {
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_PLAYSTYLE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_PLAYSTYLE), ///@TODO the second level should be set in runtime
NULL,
1,
&OP_P1ControlsDef,
@@ -2105,7 +2111,7 @@ static void M_VideoOptions(INT32 choice)
menu_t OP_VideoOptionsDef =
{
- MN_OP_MAIN + (MN_OP_VIDEO << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_VIDEO),
"M_VIDEO",
sizeof (OP_VideoOptionsMenu)/sizeof (menuitem_t),
&OP_MainDef,
@@ -2117,7 +2123,7 @@ menu_t OP_VideoOptionsDef =
};
menu_t OP_VideoModeDef =
{
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_VIDEOMODE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_VIDEOMODE),
"M_VIDEO",
1,
&OP_VideoOptionsDef,
@@ -2129,7 +2135,7 @@ menu_t OP_VideoModeDef =
};
menu_t OP_ColorOptionsDef =
{
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_COLOR << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_COLOR),
"M_VIDEO",
sizeof (OP_ColorOptionsMenu)/sizeof (menuitem_t),
&OP_VideoOptionsDef,
@@ -2140,17 +2146,19 @@ menu_t OP_ColorOptionsDef =
NULL
};
menu_t OP_SoundOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_SOUND << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_SOUND),
"M_SOUND", OP_SoundOptionsMenu, &OP_MainDef, 30, 30);
-menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE(MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
+menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE(
+ MTREE2(MN_OP_MAIN, MN_OP_SOUND),
+ "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE(
- MN_OP_MAIN + (MN_OP_SERVER << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_SERVER),
"M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 30, 30);
menu_t OP_MonitorToggleDef =
{
- MN_OP_MAIN + (MN_OP_SERVER << 6) + (MN_OP_MONITORTOGGLE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_SOUND, MN_OP_MONITORTOGGLE),
"M_SERVER",
sizeof (OP_MonitorToggleMenu)/sizeof (menuitem_t),
&OP_ServerOptionsDef,
@@ -2171,22 +2179,22 @@ static void M_OpenGLOptionsMenu(void)
}
menu_t OP_OpenGLOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_OPENGL),
"M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30);
#ifdef ALAM_LIGHTING
menu_t OP_OpenGLLightingDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12) + (MN_OP_OPENGL_LIGHTING << 18),
+ MTREE4(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_OPENGL, MN_OP_OPENGL_LIGHTING),
"M_VIDEO", OP_OpenGLLightingMenu, &OP_OpenGLOptionsDef, 60, 40);
#endif // ALAM_LIGHTING
#endif // HWRENDER
menu_t OP_DataOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_DATA << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_DATA),
"M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30);
menu_t OP_ScreenshotOptionsDef =
{
- MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_SCREENSHOTS << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_DATA, MN_OP_SCREENSHOTS),
"M_SCREEN",
sizeof (OP_ScreenshotOptionsMenu)/sizeof (menuitem_t),
&OP_DataOptionsDef,
@@ -2198,11 +2206,11 @@ menu_t OP_ScreenshotOptionsDef =
};
menu_t OP_AddonsOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_ADDONS << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_DATA, MN_OP_ADDONS),
"M_ADDONS", OP_AddonsOptionsMenu, &OP_DataOptionsDef, 30, 30);
menu_t OP_EraseDataDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_ERASEDATA << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_DATA, MN_OP_ERASEDATA),
"M_DATA", OP_EraseDataMenu, &OP_DataOptionsDef, 60, 30);
// ==========================================================================
@@ -5160,7 +5168,7 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
{
if (M_CanShowLevelOnPlatter(mapnum, gt))
{
- const INT32 actnum = mapheaderinfo[mapnum]->actnum;
+ const UINT8 actnum = mapheaderinfo[mapnum]->actnum;
const boolean headingisname = (fastcmp(mapheaderinfo[mapnum]->selectheading, mapheaderinfo[mapnum]->lvlttl));
const boolean wide = (mapheaderinfo[mapnum]->menuflags & LF2_WIDEICON);
@@ -6658,12 +6666,6 @@ static void M_HandleAddons(INT32 choice)
M_AddonExec(KEY_ENTER);
break;
case EXT_LUA:
-#ifndef HAVE_BLUA
- S_StartSound(NULL, sfx_lose);
- M_StartMessage(va("%c%s\x80\nThis copy of SRB2 was compiled\nwithout support for .lua files.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
- break;
-#endif
- /* FALLTHRU */
case EXT_SOC:
case EXT_WAD:
#ifdef USE_KART
@@ -6714,6 +6716,7 @@ static void M_PandorasBox(INT32 choice)
else
CV_StealthSetValue(&cv_dummylives, max(players[consoleplayer].lives, 1));
CV_StealthSetValue(&cv_dummycontinues, players[consoleplayer].continues);
+ SR_PandorasBox[3].status = (continuesInSession) ? (IT_STRING | IT_CVAR) : (IT_GRAYEDOUT);
SR_PandorasBox[6].status = (players[consoleplayer].charflags & SF_SUPER) ? (IT_GRAYEDOUT) : (IT_STRING | IT_CALL);
SR_PandorasBox[7].status = (emeralds == ((EMERALD7)*2)-1) ? (IT_GRAYEDOUT) : (IT_STRING | IT_CALL);
M_SetupNextMenu(&SR_PandoraDef);
@@ -6730,7 +6733,7 @@ static boolean M_ExitPandorasBox(void)
}
if (cv_dummylives.value != players[consoleplayer].lives)
COM_ImmedExecute(va("setlives %d", cv_dummylives.value));
- if (cv_dummycontinues.value != players[consoleplayer].continues)
+ if (continuesInSession && cv_dummycontinues.value != players[consoleplayer].continues)
COM_ImmedExecute(va("setcontinues %d", cv_dummycontinues.value));
return true;
}
@@ -7522,7 +7525,7 @@ static void M_DrawSoundTest(void)
{
frame[1] = (2-st_time);
frame[2] = ((cv_soundtest.value - 1) % 9);
- frame[3] += (((cv_soundtest.value - 1) / 9) % (MAXSKINCOLORS - frame[3]));
+ frame[3] += (((cv_soundtest.value - 1) / 9) % (FIRSTSUPERCOLOR - frame[3]));
if (st_time < 2)
st_time++;
}
@@ -8190,13 +8193,13 @@ static void M_DrawLoadGameData(void)
{
if (charskin->prefoppositecolor)
{
- col = charskin->prefoppositecolor - 1;
- col = Color_Index[col][Color_Opposite[Color_Opposite[col][0] - 1][1]];
+ col = charskin->prefoppositecolor;
+ col = skincolors[col].ramp[skincolors[skincolors[col].invcolor].invshade];
}
else
{
- col = charskin->prefcolor - 1;
- col = Color_Index[Color_Opposite[col][0]-1][Color_Opposite[col][1]];
+ col = charskin->prefcolor;
+ col = skincolors[skincolors[col].invcolor].ramp[skincolors[col].invshade];
}
}
@@ -8250,9 +8253,19 @@ static void M_DrawLoadGameData(void)
V_DrawRightAlignedThinString(x + 79, y, V_YELLOWMAP, savegameinfo[savetodraw].levelname);
}
- if ((savegameinfo[savetodraw].lives == -42)
- || (savegameinfo[savetodraw].lives == -666))
+ if (savegameinfo[savetodraw].lives == -42)
+ {
+ if (!useContinues)
+ V_DrawRightAlignedThinString(x + 80, y+1+60+16, V_GRAYMAP, "00000000");
continue;
+ }
+
+ if (savegameinfo[savetodraw].lives == -666)
+ {
+ if (!useContinues)
+ V_DrawRightAlignedThinString(x + 80, y+1+60+16, V_REDMAP, "????????");
+ continue;
+ }
y += 64;
@@ -8269,7 +8282,7 @@ static void M_DrawLoadGameData(void)
y -= 4;
- // character heads, lives, and continues
+ // character heads, lives, and continues/score
{
spritedef_t *sprdef;
spriteframe_t *sprframe;
@@ -8320,10 +8333,14 @@ skipbot:
skipsign:
y += 16;
- tempx = x + 10;
- if (savegameinfo[savetodraw].lives != INFLIVES
- && savegameinfo[savetodraw].lives > 9)
- tempx -= 4;
+ tempx = x;
+ if (useContinues)
+ {
+ tempx += 10;
+ if (savegameinfo[savetodraw].lives != INFLIVES
+ && savegameinfo[savetodraw].lives > 9)
+ tempx -= 4;
+ }
if (!charskin) // shut up compiler
goto skiplife;
@@ -8353,22 +8370,45 @@ skiplife:
else
V_DrawString(tempx, y, 0, va("%d", savegameinfo[savetodraw].lives));
- tempx = x + 47;
- if (savegameinfo[savetodraw].continues > 9)
- tempx -= 4;
-
- // continues
- if (savegameinfo[savetodraw].continues > 0)
+ if (!useContinues)
{
- V_DrawSmallScaledPatch(tempx, y, 0, W_CachePatchName("CONTSAVE", PU_PATCH));
- V_DrawScaledPatch(tempx + 9, y + 2, 0, patch);
- V_DrawString(tempx + 16, y, 0, va("%d", savegameinfo[savetodraw].continues));
+ INT32 workingscorenum = savegameinfo[savetodraw].continuescore;
+ char workingscorestr[11] = " 000000000\0";
+ SINT8 j = 9;
+ // Change the above two lines if MAXSCORE ever changes from 8 digits long.
+ workingscorestr[0] = '\x86'; // done here instead of in initialiser 'cuz compiler complains
+ if (!workingscorenum)
+ j--; // just so ONE digit is not greyed out
+ else
+ {
+ while (workingscorenum)
+ {
+ workingscorestr[j--] = '0' + (workingscorenum % 10);
+ workingscorenum /= 10;
+ }
+ }
+ workingscorestr[j] = (savegameinfo[savetodraw].continuescore == MAXSCORE) ? '\x83' : '\x80';
+ V_DrawRightAlignedThinString(x + 80, y+1, 0, workingscorestr);
}
else
{
- V_DrawSmallScaledPatch(tempx, y, 0, W_CachePatchName("CONTNONE", PU_PATCH));
- V_DrawScaledPatch(tempx + 9, y + 2, 0, W_CachePatchName("STNONEX", PU_PATCH));
- V_DrawString(tempx + 16, y, V_GRAYMAP, "0");
+ tempx = x + 47;
+ if (savegameinfo[savetodraw].continuescore > 9)
+ tempx -= 4;
+
+ // continues
+ if (savegameinfo[savetodraw].continuescore > 0)
+ {
+ V_DrawSmallScaledPatch(tempx, y, 0, W_CachePatchName("CONTSAVE", PU_PATCH));
+ V_DrawScaledPatch(tempx + 9, y + 2, 0, patch);
+ V_DrawString(tempx + 16, y, 0, va("%d", savegameinfo[savetodraw].continuescore));
+ }
+ else
+ {
+ V_DrawSmallScaledPatch(tempx, y, 0, W_CachePatchName("CONTNONE", PU_PATCH));
+ V_DrawScaledPatch(tempx + 9, y + 2, 0, W_CachePatchName("STNONEX", PU_PATCH));
+ V_DrawString(tempx + 16, y, V_GRAYMAP, "0");
+ }
}
}
}
@@ -8501,9 +8541,11 @@ static void M_ReadSavegameInfo(UINT32 slot)
CHECKPOS
savegameinfo[slot].lives = READSINT8(save_p); // lives
CHECKPOS
- (void)READINT32(save_p); // Score
+ savegameinfo[slot].continuescore = READINT32(save_p); // score
CHECKPOS
- savegameinfo[slot].continues = READINT32(save_p); // continues
+ fake = READINT32(save_p); // continues
+ if (useContinues)
+ savegameinfo[slot].continuescore = fake;
// File end marker check
CHECKPOS
@@ -8885,16 +8927,11 @@ static void M_SetupChoosePlayer(INT32 choice)
/* the menus suck -James */
if (currentMenu == &SP_LoadDef)/* from save states */
{
- SP_PlayerDef.menuid =
- MN_SP_MAIN +
- ( MN_SP_LOAD << 6 ) +
- ( MN_SP_PLAYER << 12 );
+ SP_PlayerDef.menuid = MTREE3(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER);
}
else/* from Secret level select */
{
- SP_PlayerDef.menuid =
- MN_SR_MAIN +
- ( MN_SR_PLAYER << 6 );
+ SP_PlayerDef.menuid = MTREE2(MN_SR_MAIN, MN_SR_PLAYER);
}
SP_PlayerDef.prevMenu = currentMenu;
@@ -8998,7 +9035,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
skin_t *charskin = &skins[0];
INT32 skinnum = 0;
- UINT8 col;
+ UINT16 col;
UINT8 *colormap = NULL;
INT32 prev = -1, next = -1;
@@ -9037,10 +9074,10 @@ static void M_DrawSetupChoosePlayerMenu(void)
// Use the opposite of the character's skincolor
col = description[char_on].oppositecolor;
if (!col)
- col = Color_Opposite[charskin->prefcolor - 1][0];
+ col = skincolors[charskin->prefcolor].invcolor;
// Make the translation colormap
- colormap = R_GetTranslationColormap(TC_DEFAULT, col, 0);
+ colormap = R_GetTranslationColormap(TC_DEFAULT, col, GTC_CACHE);
// Don't render the title map
hidetitlemap = true;
@@ -9088,8 +9125,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
INT32 ox, oxsh = FixedInt(FixedMul(BASEVIDWIDTH*FRACUNIT, FixedDiv(char_scroll, 128*FRACUNIT))), txsh;
patch_t *curpatch = NULL, *prevpatch = NULL, *nextpatch = NULL;
const char *curtext = NULL, *prevtext = NULL, *nexttext = NULL;
- UINT8 curtextcolor = 0, prevtextcolor = 0, nexttextcolor = 0;
- UINT8 curoutlinecolor = 0, prevoutlinecolor = 0, nextoutlinecolor = 0;
+ UINT16 curtextcolor = 0, prevtextcolor = 0, nexttextcolor = 0;
+ UINT16 curoutlinecolor = 0, prevoutlinecolor = 0, nextoutlinecolor = 0;
// Name tag
curtext = description[char_on].displayname;
@@ -9100,7 +9137,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
if (!curtextcolor)
curtextcolor = charskin->prefcolor;
if (!curoutlinecolor)
- curoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+ curoutlinecolor = col = skincolors[charskin->prefcolor].invcolor;
txsh = oxsh;
ox = 8 + SHORT((description[char_on].charpic)->width)/2;
@@ -9116,8 +9153,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
{
V_DrawNameTag(
x, y, V_CENTERNAMETAG, FRACUNIT,
- R_GetTranslationColormap(TC_DEFAULT, curtextcolor, 0),
- R_GetTranslationColormap(TC_DEFAULT, curoutlinecolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, curtextcolor, GTC_CACHE),
+ R_GetTranslationColormap(TC_DEFAULT, curoutlinecolor, GTC_CACHE),
curtext
);
}
@@ -9139,7 +9176,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
if (!prevtextcolor)
prevtextcolor = charskin->prefcolor;
if (!prevoutlinecolor)
- prevoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+ prevoutlinecolor = col = skincolors[charskin->prefcolor].invcolor;
x = (ox - txsh) - w;
if (prevpatch)
@@ -9149,8 +9186,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
{
V_DrawNameTag(
x, y, V_CENTERNAMETAG, FRACUNIT,
- R_GetTranslationColormap(TC_DEFAULT, prevtextcolor, 0),
- R_GetTranslationColormap(TC_DEFAULT, prevoutlinecolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, prevtextcolor, GTC_CACHE),
+ R_GetTranslationColormap(TC_DEFAULT, prevoutlinecolor, GTC_CACHE),
prevtext
);
}
@@ -9169,7 +9206,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
if (!nexttextcolor)
nexttextcolor = charskin->prefcolor;
if (!nextoutlinecolor)
- nextoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+ nextoutlinecolor = col = skincolors[charskin->prefcolor].invcolor;
x = (ox - txsh) + w;
if (nextpatch)
@@ -9179,8 +9216,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
{
V_DrawNameTag(
x, y, V_CENTERNAMETAG, FRACUNIT,
- R_GetTranslationColormap(TC_DEFAULT, nexttextcolor, 0),
- R_GetTranslationColormap(TC_DEFAULT, nextoutlinecolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, nexttextcolor, GTC_CACHE),
+ R_GetTranslationColormap(TC_DEFAULT, nextoutlinecolor, GTC_CACHE),
nexttext
);
}
@@ -10404,7 +10441,7 @@ static void M_DrawConnectMenu(void)
for (i = 0; i < min(serverlistcount - serverlistpage * SERVERS_PER_PAGE, SERVERS_PER_PAGE); i++)
{
INT32 slindex = i + serverlistpage * SERVERS_PER_PAGE;
- UINT32 globalflags = ((serverlist[slindex].info.numberofplayer >= serverlist[slindex].info.maxplayer) ? V_TRANSLUCENT : 0)
+ UINT32 globalflags = (serverlist[slindex].info.refusereason ? V_TRANSLUCENT : 0)
|((itemOn == FIRSTSERVERLINE+i) ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE;
V_DrawString(currentMenu->x, S_LINEY(i), globalflags, serverlist[slindex].info.servername);
@@ -10768,7 +10805,8 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 3].status = IT_GRAYEDOUT; // Allow add-on downloading
OP_ServerOptionsMenu[ 4].status = IT_GRAYEDOUT; // Allow players to join
OP_ServerOptionsMenu[35].status = IT_GRAYEDOUT; // Master server
- OP_ServerOptionsMenu[36].status = IT_GRAYEDOUT; // Attempts to resynchronise
+ OP_ServerOptionsMenu[36].status = IT_GRAYEDOUT; // Minimum delay between joins
+ OP_ServerOptionsMenu[37].status = IT_GRAYEDOUT; // Attempts to resynchronise
}
else
{
@@ -10780,14 +10818,15 @@ static void M_ServerOptions(INT32 choice)
? IT_GRAYEDOUT
: (IT_STRING | IT_CVAR | IT_CV_STRING));
OP_ServerOptionsMenu[36].status = IT_STRING | IT_CVAR;
+ OP_ServerOptionsMenu[37].status = IT_STRING | IT_CVAR;
}
#endif
/* Disable fading because of different menu head. */
if (currentMenu == &OP_MainDef)/* from Options menu */
- OP_ServerOptionsDef.menuid = MN_OP_MAIN + ( MN_OP_SERVER << 6 );
+ OP_ServerOptionsDef.menuid = MTREE2(MN_OP_MAIN, MN_OP_SERVER);
else/* from Multiplayer menu */
- OP_ServerOptionsDef.menuid = MN_MP_MAIN + ( MN_MP_SERVER_OPTIONS << 6 );
+ OP_ServerOptionsDef.menuid = MTREE2(MN_MP_MAIN, MN_MP_SERVER_OPTIONS);
OP_ServerOptionsDef.prevMenu = currentMenu;
M_SetupNextMenu(&OP_ServerOptionsDef);
@@ -11017,15 +11056,15 @@ static UINT8 multi_spr2;
// this is set before entering the MultiPlayer setup menu,
// for either player 1 or 2
-static char setupm_name[MAXPLAYERNAME+1];
-static player_t *setupm_player;
-static consvar_t *setupm_cvskin;
-static consvar_t *setupm_cvcolor;
-static consvar_t *setupm_cvname;
-static consvar_t *setupm_cvdefaultskin;
-static consvar_t *setupm_cvdefaultcolor;
-static INT32 setupm_fakeskin;
-static INT32 setupm_fakecolor;
+static char setupm_name[MAXPLAYERNAME+1];
+static player_t *setupm_player;
+static consvar_t *setupm_cvskin;
+static consvar_t *setupm_cvcolor;
+static consvar_t *setupm_cvname;
+static consvar_t *setupm_cvdefaultskin;
+static consvar_t *setupm_cvdefaultcolor;
+static INT32 setupm_fakeskin;
+static menucolor_t *setupm_fakecolor;
static void M_DrawSetupMultiPlayerMenu(void)
{
@@ -11092,11 +11131,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
sprdef = &skins[setupm_fakeskin].sprites[multi_spr2];
- if (!setupm_fakecolor || !sprdef->numframes) // should never happen but hey, who knows
+ if (!setupm_fakecolor->color || !sprdef->numframes) // should never happen but hey, who knows
goto faildraw;
// ok, draw player sprite for sure now
- colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor, 0);
+ colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor->color, 0);
if (multi_frame >= sprdef->numframes)
multi_frame = 0;
@@ -11142,11 +11181,11 @@ colordraw:
// draw color string
V_DrawRightAlignedString(BASEVIDWIDTH - x, y,
((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0)|(itemOn == 2 ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE,
- Color_Names[setupm_fakecolor]);
+ skincolors[setupm_fakecolor->color].name);
if (itemOn == 2 && (MP_PlayerSetupMenu[2].status & IT_TYPE) != IT_SPACE)
{
- V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(Color_Names[setupm_fakecolor], V_ALLOWLOWERCASE) - (skullAnimCounter/5), y,
+ V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(skincolors[setupm_fakecolor->color].name, V_ALLOWLOWERCASE) - (skullAnimCounter/5), y,
'\x1C' | V_YELLOWMAP, false);
V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
'\x1D' | V_YELLOWMAP, false);
@@ -11156,25 +11195,39 @@ colordraw:
#define indexwidth 8
{
- const INT32 colwidth = (282-charw)/(2*indexwidth);
- INT32 i = -colwidth;
- INT16 col = setupm_fakecolor - colwidth;
- INT32 w = indexwidth;
+ const INT32 numcolors = (282-charw)/(2*indexwidth); // Number of colors per side
+ INT32 w = indexwidth; // Width of a singular color block
+ menucolor_t *mc = setupm_fakecolor->prev; // Last accessed color
UINT8 h;
+ INT16 i;
+
+ // Draw color in the middle
+ x += numcolors*w;
+ for (h = 0; h < 16; h++)
+ V_DrawFill(x, y+h, charw, 1, skincolors[setupm_fakecolor->color].ramp[h]);
+
+ //Draw colors from middle to left
+ for (i=0; i<numcolors; i++) {
+ x -= w;
+ // Find accessible color before this one
+ while (!skincolors[mc->color].accessible)
+ mc = mc->prev;
+ for (h = 0; h < 16; h++)
+ V_DrawFill(x, y+h, w, 1, skincolors[mc->color].ramp[h]);
+ mc = mc->prev;
+ }
- while (col < 1)
- col += MAXSKINCOLORS-1;
- while (i <= colwidth)
- {
- if (!(i++))
- w = charw;
- else
- w = indexwidth;
+ // Draw colors from middle to right
+ mc = setupm_fakecolor->next;
+ x += numcolors*w + charw;
+ for (i=0; i<numcolors; i++) {
+ // Find accessible color after this one
+ while (!skincolors[mc->color].accessible)
+ mc = mc->next;
for (h = 0; h < 16; h++)
- V_DrawFill(x, y+h, w, 1, Color_Index[col-1][h]);
- if (++col >= MAXSKINCOLORS)
- col -= MAXSKINCOLORS-1;
+ V_DrawFill(x, y+h, w, 1, skincolors[mc->color].ramp[h]);
x += w;
+ mc = mc->next;
}
}
#undef charw
@@ -11185,7 +11238,7 @@ colordraw:
V_DrawString(x, y,
((R_SkinAvailable(setupm_cvdefaultskin->string) != setupm_fakeskin
- || setupm_cvdefaultcolor->value != setupm_fakecolor)
+ || setupm_cvdefaultcolor->value != setupm_fakecolor->color)
? 0
: V_TRANSLUCENT)
| ((itemOn == 3) ? V_YELLOWMAP : 0),
@@ -11233,19 +11286,19 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
else if (itemOn == 2) // player color
{
S_StartSound(NULL,sfx_menu1); // Tails
- setupm_fakecolor--;
+ setupm_fakecolor = setupm_fakecolor->prev;
}
break;
case KEY_ENTER:
if (itemOn == 3
&& (R_SkinAvailable(setupm_cvdefaultskin->string) != setupm_fakeskin
- || setupm_cvdefaultcolor->value != setupm_fakecolor))
+ || setupm_cvdefaultcolor->value != setupm_fakecolor->color))
{
S_StartSound(NULL,sfx_strpst);
// you know what? always putting these in the buffer won't hurt anything.
COM_BufAddText (va("%s \"%s\"\n",setupm_cvdefaultskin->name,skins[setupm_fakeskin].name));
- COM_BufAddText (va("%s %d\n",setupm_cvdefaultcolor->name,setupm_fakecolor));
+ COM_BufAddText (va("%s %d\n",setupm_cvdefaultcolor->name,setupm_fakecolor->color));
break;
}
/* FALLTHRU */
@@ -11266,7 +11319,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
else if (itemOn == 2) // player color
{
S_StartSound(NULL,sfx_menu1); // Tails
- setupm_fakecolor++;
+ setupm_fakecolor = setupm_fakecolor->next;
}
break;
@@ -11282,11 +11335,13 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
}
else if (itemOn == 2)
{
- UINT8 col = skins[setupm_fakeskin].prefcolor;
- if (setupm_fakecolor != col)
+ UINT16 col = skins[setupm_fakeskin].prefcolor;
+ if ((setupm_fakecolor->color != col) && skincolors[col].accessible)
{
S_StartSound(NULL,sfx_menu1); // Tails
- setupm_fakecolor = col;
+ for (setupm_fakecolor=menucolorhead;;setupm_fakecolor=setupm_fakecolor->next)
+ if (setupm_fakecolor->color == col || setupm_fakecolor == menucolortail)
+ break;
}
}
break;
@@ -11314,10 +11369,14 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
}
// check color
- if (setupm_fakecolor < 1)
- setupm_fakecolor = MAXSKINCOLORS-1;
- if (setupm_fakecolor > MAXSKINCOLORS-1)
- setupm_fakecolor = 1;
+ if (itemOn == 2 && !skincolors[setupm_fakecolor->color].accessible) {
+ if (choice == KEY_LEFTARROW)
+ while (!skincolors[setupm_fakecolor->color].accessible)
+ setupm_fakecolor = setupm_fakecolor->prev;
+ else if (choice == KEY_RIGHTARROW || choice == KEY_ENTER)
+ while (!skincolors[setupm_fakecolor->color].accessible)
+ setupm_fakecolor = setupm_fakecolor->next;
+ }
if (exitmenu)
{
@@ -11349,7 +11408,10 @@ static void M_SetupMultiPlayer(INT32 choice)
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
- setupm_fakecolor = setupm_cvcolor->value;
+
+ for (setupm_fakecolor=menucolorhead;;setupm_fakecolor=setupm_fakecolor->next)
+ if (setupm_fakecolor->color == setupm_cvcolor->value || setupm_fakecolor == menucolortail)
+ break;
// disable skin changes if we can't actually change skins
if (!CanChangeSkin(consoleplayer))
@@ -11390,7 +11452,10 @@ static void M_SetupMultiPlayer2(INT32 choice)
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
- setupm_fakecolor = setupm_cvcolor->value;
+
+ for (setupm_fakecolor=menucolorhead;;setupm_fakecolor=setupm_fakecolor->next)
+ if (setupm_fakecolor->color == setupm_cvcolor->value || setupm_fakecolor == menucolortail)
+ break;
// disable skin changes if we can't actually change skins
if (splitscreen && !CanChangeSkin(secondarydisplayplayer))
@@ -11422,12 +11487,181 @@ static boolean M_QuitMultiPlayerMenu(void)
setupm_name[l] =0;
COM_BufAddText (va("%s \"%s\"\n",setupm_cvname->name,setupm_name));
}
- // you know what? always putting these in the buffer won't hurt anything.
COM_BufAddText (va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name));
- COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
+ // send color if changed
+ if (setupm_fakecolor->color != setupm_cvcolor->value)
+ COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor->color));
return true;
}
+void M_AddMenuColor(UINT16 color) {
+ menucolor_t *c;
+
+ if (color >= numskincolors) {
+ CONS_Printf("M_AddMenuColor: color %d does not exist.",color);
+ return;
+ }
+
+ c = (menucolor_t *)malloc(sizeof(menucolor_t));
+ c->color = color;
+ if (menucolorhead == NULL) {
+ c->next = c;
+ c->prev = c;
+ menucolorhead = c;
+ menucolortail = c;
+ } else {
+ c->next = menucolorhead;
+ c->prev = menucolortail;
+ menucolortail->next = c;
+ menucolorhead->prev = c;
+ menucolortail = c;
+ }
+}
+
+void M_MoveColorBefore(UINT16 color, UINT16 targ) {
+ menucolor_t *look, *c = NULL, *t = NULL;
+
+ if (color == targ)
+ return;
+ if (color >= numskincolors) {
+ CONS_Printf("M_MoveColorBefore: color %d does not exist.",color);
+ return;
+ }
+ if (targ >= numskincolors) {
+ CONS_Printf("M_MoveColorBefore: target color %d does not exist.",targ);
+ return;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ c = look;
+ else if (look->color == targ)
+ t = look;
+ if (c != NULL && t != NULL)
+ break;
+ if (look==menucolortail)
+ return;
+ }
+
+ if (c == t->prev)
+ return;
+
+ if (t==menucolorhead)
+ menucolorhead = c;
+ if (c==menucolortail)
+ menucolortail = c->prev;
+
+ c->prev->next = c->next;
+ c->next->prev = c->prev;
+
+ c->prev = t->prev;
+ c->next = t;
+ t->prev->next = c;
+ t->prev = c;
+}
+
+void M_MoveColorAfter(UINT16 color, UINT16 targ) {
+ menucolor_t *look, *c = NULL, *t = NULL;
+
+ if (color == targ)
+ return;
+ if (color >= numskincolors) {
+ CONS_Printf("M_MoveColorAfter: color %d does not exist.\n",color);
+ return;
+ }
+ if (targ >= numskincolors) {
+ CONS_Printf("M_MoveColorAfter: target color %d does not exist.\n",targ);
+ return;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ c = look;
+ else if (look->color == targ)
+ t = look;
+ if (c != NULL && t != NULL)
+ break;
+ if (look==menucolortail)
+ return;
+ }
+
+ if (t == c->prev)
+ return;
+
+ if (t==menucolortail)
+ menucolortail = c;
+ else if (c==menucolortail)
+ menucolortail = c->prev;
+
+ c->prev->next = c->next;
+ c->next->prev = c->prev;
+
+ c->next = t->next;
+ c->prev = t;
+ t->next->prev = c;
+ t->next = c;
+}
+
+UINT16 M_GetColorBefore(UINT16 color) {
+ menucolor_t *look;
+
+ if (color >= numskincolors) {
+ CONS_Printf("M_GetColorBefore: color %d does not exist.\n",color);
+ return 0;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ return look->prev->color;
+ if (look==menucolortail)
+ return 0;
+ }
+}
+
+UINT16 M_GetColorAfter(UINT16 color) {
+ menucolor_t *look;
+
+ if (color >= numskincolors) {
+ CONS_Printf("M_GetColorAfter: color %d does not exist.\n",color);
+ return 0;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ return look->next->color;
+ if (look==menucolortail)
+ return 0;
+ }
+}
+
+void M_InitPlayerSetupColors(void) {
+ UINT8 i;
+ numskincolors = SKINCOLOR_FIRSTFREESLOT;
+ menucolorhead = menucolortail = NULL;
+ for (i=0; i<numskincolors; i++)
+ M_AddMenuColor(i);
+}
+
+void M_FreePlayerSetupColors(void) {
+ menucolor_t *look = menucolorhead, *tmp;
+
+ if (menucolorhead==NULL)
+ return;
+
+ while (true) {
+ if (look != menucolortail) {
+ tmp = look;
+ look = look->next;
+ free(tmp);
+ } else {
+ free(look);
+ return;
+ }
+ }
+
+ menucolorhead = menucolortail = NULL;
+}
+
// =================
// DATA OPTIONS MENU
// =================
@@ -11704,8 +11938,8 @@ static void M_Setup1PControlsMenu(INT32 choice)
OP_ChangeControlsMenu[27+3].status = IT_CALL|IT_STRING2;
OP_ChangeControlsDef.prevMenu = &OP_P1ControlsDef;
- OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove first level (<< 6)
- OP_ChangeControlsDef.menuid |= MN_OP_P1CONTROLS << MENUBITS; // combine first level (<< 6)
+ OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove second level
+ OP_ChangeControlsDef.menuid |= MN_OP_P1CONTROLS << MENUBITS; // combine second level
M_SetupNextMenu(&OP_ChangeControlsDef);
}
@@ -11735,8 +11969,8 @@ static void M_Setup2PControlsMenu(INT32 choice)
OP_ChangeControlsMenu[27+3].status = IT_GRAYEDOUT2;
OP_ChangeControlsDef.prevMenu = &OP_P2ControlsDef;
- OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove first level (<< 6)
- OP_ChangeControlsDef.menuid |= MN_OP_P2CONTROLS << MENUBITS; // combine first level (<< 6)
+ OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove second level
+ OP_ChangeControlsDef.menuid |= MN_OP_P2CONTROLS << MENUBITS; // combine second level
M_SetupNextMenu(&OP_ChangeControlsDef);
}
diff --git a/src/m_menu.h b/src/m_menu.h
index b537911e379b1589bc0bc8abcaa731911b011306..73aff53e67df45fb246b8134a5cdb6823af444e6 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -31,6 +31,9 @@
#define MENUBITS 6
// Menu IDs sectioned by numeric places to signify hierarchy
+/**
+ * IF YOU MODIFY THIS, MODIFY MENUTYPES_LIST[] IN dehacked.c TO MATCH.
+ */
typedef enum
{
MN_NONE,
@@ -127,6 +130,9 @@ typedef enum
MN_SPECIAL,
NUMMENUTYPES,
} menutype_t; // up to 63; MN_SPECIAL = 53
+#define MTREE2(a,b) (a | (b<<MENUBITS))
+#define MTREE3(a,b,c) MTREE2(a, MTREE2(b,c))
+#define MTREE4(a,b,c,d) MTREE2(a, MTREE3(b,c,d))
typedef struct
{
@@ -347,11 +353,11 @@ typedef struct
// new character select
char displayname[SKINNAMESIZE+1];
SINT8 skinnum[2];
- UINT8 oppositecolor;
+ UINT16 oppositecolor;
char nametag[8];
patch_t *namepic;
- UINT8 tagtextcolor;
- UINT8 tagoutlinecolor;
+ UINT16 tagtextcolor;
+ UINT16 tagoutlinecolor;
} description_t;
// level select platter
@@ -395,7 +401,7 @@ typedef struct
UINT8 numemeralds;
UINT8 numgameovers;
INT32 lives;
- INT32 continues;
+ INT32 continuescore;
INT32 gamemap;
} saveinfo_t;
@@ -435,6 +441,23 @@ void Addons_option_Onchange(void);
// Moviemode menu updating
void Moviemode_option_Onchange(void);
+// Player Setup menu colors linked list
+typedef struct menucolor_s {
+ struct menucolor_s *next;
+ struct menucolor_s *prev;
+ UINT16 color;
+} menucolor_t;
+
+extern menucolor_t *menucolorhead, *menucolortail;
+
+void M_AddMenuColor(UINT16 color);
+void M_MoveColorBefore(UINT16 color, UINT16 targ);
+void M_MoveColorAfter(UINT16 color, UINT16 targ);
+UINT16 M_GetColorBefore(UINT16 color);
+UINT16 M_GetColorAfter(UINT16 color);
+void M_InitPlayerSetupColors(void);
+void M_FreePlayerSetupColors(void);
+
// These defines make it a little easier to make menus
#define DEFAULTMENUSTYLE(id, header, source, prev, x, y)\
{\
diff --git a/src/mserv.h b/src/mserv.h
index 6d91da64395be09b8b7eda1d87e9718767a49fdd..5f9b8da5f430f5cbc384ba3497de3845fcb5c8b6 100644
--- a/src/mserv.h
+++ b/src/mserv.h
@@ -68,7 +68,7 @@ extern consvar_t cv_masterserver, cv_servername;
// < 0 to not connect (usually -1) (offline mode)
// == 0 to show all rooms, not a valid hosting room
// anything else is whatever room the MS assigns to that number (online mode)
-INT16 ms_RoomId;
+extern INT16 ms_RoomId;
const char *GetMasterServerPort(void);
const char *GetMasterServerIP(void);
diff --git a/src/p_ceilng.c b/src/p_ceilng.c
index c65156b6f6b599b3966b6c85e6770a9f9a38cd57..3c3c507cd168e46a50ccdce3a503c8570c028797 100644
--- a/src/p_ceilng.c
+++ b/src/p_ceilng.c
@@ -47,8 +47,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
case 0: // IN STASIS
break;
case 1: // UP
- res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->topheight, false,
- 1, ceiling->direction);
+ res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->topheight, false, true, ceiling->direction);
if (ceiling->type == bounceCeiling)
{
@@ -159,8 +158,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
break;
case -1: // DOWN
- res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight,
- ceiling->crush, 1, ceiling->direction);
+ res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight, ceiling->crush, true, ceiling->direction);
if (ceiling->type == bounceCeiling)
{
@@ -314,11 +312,10 @@ void T_CrushCeiling(ceiling_t *ceiling)
if (ceiling->type == crushBothOnce)
{
// Move the floor
- T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight-(ceiling->topheight-ceiling->bottomheight), false, 0, -ceiling->direction);
+ T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight-(ceiling->topheight-ceiling->bottomheight), false, false, -ceiling->direction);
}
- res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->topheight,
- false, 1, ceiling->direction);
+ res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->topheight, false, true, ceiling->direction);
if (res == pastdest)
{
@@ -357,11 +354,10 @@ void T_CrushCeiling(ceiling_t *ceiling)
if (ceiling->type == crushBothOnce)
{
// Move the floor
- T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight, ceiling->crush, 0, -ceiling->direction);
+ T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight, ceiling->crush, false, -ceiling->direction);
}
- res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight,
- ceiling->crush, 1, ceiling->direction);
+ res = T_MovePlane(ceiling->sector, ceiling->speed, ceiling->bottomheight, ceiling->crush, true, ceiling->direction);
if (res == pastdest)
{
@@ -399,7 +395,7 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
sector_t *sec;
ceiling_t *ceiling;
- while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag,secnum)) >= 0)
{
sec = §ors[secnum];
@@ -619,7 +615,7 @@ INT32 EV_DoCrush(line_t *line, ceiling_e type)
sector_t *sec;
ceiling_t *ceiling;
- while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag,secnum)) >= 0)
{
sec = §ors[secnum];
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 14e5c4d3e5050a00e21ff6e7453ca76824a99e8f..75d32c50616da692ed88c94a7e736126823f4f77 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -30,9 +30,7 @@
#include "hardware/hw3sound.h"
#endif
-#ifdef HAVE_BLUA
boolean LUA_CallAction(const char *action, mobj_t *actor);
-#endif
player_t *stplyr;
INT32 var1;
@@ -191,6 +189,7 @@ void A_SetTics(mobj_t *actor);
void A_SetRandomTics(mobj_t *actor);
void A_ChangeColorRelative(mobj_t *actor);
void A_ChangeColorAbsolute(mobj_t *actor);
+void A_Dye(mobj_t *actor);
void A_MoveRelative(mobj_t *actor);
void A_MoveAbsolute(mobj_t *actor);
void A_Thrust(mobj_t *actor);
@@ -313,6 +312,7 @@ void A_RolloutRock(mobj_t *actor);
void A_DragonbomberSpawn(mobj_t *actor);
void A_DragonWing(mobj_t *actor);
void A_DragonSegment(mobj_t *actor);
+void A_ChangeHeight(mobj_t *actor);
//for p_enemy.c
@@ -981,10 +981,8 @@ void A_Look(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Look", actor))
return;
-#endif
if (!P_LookForPlayers(actor, locvar1 & 65535, false , FixedMul((locvar1 >> 16)*FRACUNIT, actor->scale)))
return;
@@ -1016,10 +1014,8 @@ void A_Chase(mobj_t *actor)
INT32 delta;
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Chase", actor))
return;
-#endif
I_Assert(actor != NULL);
I_Assert(!P_MobjWasRemoved(actor));
@@ -1109,10 +1105,8 @@ void A_FaceStabChase(mobj_t *actor)
{
INT32 delta;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FaceStabChase", actor))
return;
-#endif
if (actor->reactiontime)
actor->reactiontime--;
@@ -1233,10 +1227,8 @@ void A_FaceStabRev(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FaceStabRev", actor))
return;
-#endif
if (!actor->target)
{
@@ -1278,10 +1270,8 @@ void A_FaceStabHurl(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FaceStabHurl", actor))
return;
-#endif
if (actor->target)
{
@@ -1368,13 +1358,10 @@ void A_FaceStabHurl(mobj_t *actor)
//
void A_FaceStabMiss(mobj_t *actor)
{
- //INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FaceStabMiss", actor))
return;
-#endif
if (++actor->extravalue1 >= 3)
{
@@ -1408,10 +1395,8 @@ void A_StatueBurst(mobj_t *actor)
mobjtype_t chunktype = (mobjtype_t)actor->info->raisestate;
mobj_t *new;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_StatueBurst", actor))
return;
-#endif
if (!locvar1 || !(new = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1)))
return;
@@ -1460,10 +1445,9 @@ void A_StatueBurst(mobj_t *actor)
//
void A_JetJawRoam(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_JetJawRoam", actor))
return;
-#endif
+
if (actor->reactiontime)
{
actor->reactiontime--;
@@ -1489,10 +1473,9 @@ void A_JetJawRoam(mobj_t *actor)
void A_JetJawChomp(mobj_t *actor)
{
INT32 delta;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_JetJawChomp", actor))
return;
-#endif
// turn towards movement direction if not there yet
if (actor->movedir < NUMDIRS)
@@ -1538,10 +1521,9 @@ void A_PointyThink(mobj_t *actor)
boolean firsttime = true;
INT32 sign;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_PointyThink", actor))
return;
-#endif
+
actor->momx = actor->momy = actor->momz = 0;
// Find nearest player
@@ -1637,10 +1619,9 @@ void A_CheckBuddy(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_CheckBuddy", actor))
return;
-#endif
+
if (locvar1 && (!actor->tracer || actor->tracer->health <= 0))
P_RemoveMobj(actor);
else if (!locvar1 && (!actor->target || actor->target->health <= 0))
@@ -1680,11 +1661,9 @@ void A_HoodFire(mobj_t *actor)
{
mobj_t *arrow;
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_HoodFire", actor))
return;
-#endif
// Check target first.
if (!actor->target)
@@ -1714,10 +1693,9 @@ void A_HoodThink(mobj_t *actor)
{
fixed_t dx, dy, dz, dm;
boolean checksight;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_HoodThink", actor))
return;
-#endif
// Check target first.
if (!actor->target)
@@ -1783,10 +1761,8 @@ void A_HoodThink(mobj_t *actor)
//
void A_HoodFall(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_HoodFall", actor))
return;
-#endif
if (!P_IsObjectOnGround(actor))
return;
@@ -1805,10 +1781,8 @@ void A_HoodFall(mobj_t *actor)
//
void A_ArrowBonks(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_ArrowBonks", actor))
return;
-#endif
if (((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz)
|| (!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz))
@@ -1830,10 +1804,8 @@ void A_ArrowBonks(mobj_t *actor)
//
void A_SnailerThink(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SnailerThink", actor))
return;
-#endif
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
{
@@ -1905,10 +1877,8 @@ void A_SnailerThink(mobj_t *actor)
//
void A_SharpChase(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SharpChase", actor))
return;
-#endif
if (actor->reactiontime)
{
@@ -1963,10 +1933,8 @@ void A_SharpSpin(mobj_t *actor)
INT32 locvar2 = var2;
angle_t oldang = actor->angle;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SharpSpin", actor))
return;
-#endif
if (actor->threshold && actor->target)
{
@@ -1998,10 +1966,8 @@ void A_SharpSpin(mobj_t *actor)
//
void A_SharpDecel(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SharpDecel", actor))
return;
-#endif
if (actor->momx > 2 || actor->momy > 2)
{
@@ -2024,10 +1990,9 @@ void A_CrushstaceanWalk(mobj_t *actor)
INT32 locvar1 = (var1 ? var1 : (INT32)actor->info->speed);
INT32 locvar2 = (var2 ? var2 : (INT32)actor->info->spawnstate);
angle_t ang = actor->angle + ((actor->flags2 & MF2_AMBUSH) ? ANGLE_90 : ANGLE_270);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CrushstaceanWalk", actor))
return;
-#endif
actor->reactiontime--;
@@ -2053,12 +2018,10 @@ void A_CrushstaceanWalk(mobj_t *actor)
//
void A_CrushstaceanPunch(mobj_t *actor)
{
- //INT32 locvar1 = var1;
INT32 locvar2 = (var2 ? var2 : (INT32)actor->info->spawnstate);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CrushstaceanPunch", actor))
return;
-#endif
if (!actor->tracer)
return;
@@ -2088,10 +2051,9 @@ void A_CrushclawAim(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *crab = actor->tracer;
angle_t ang;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CrushclawAim", actor))
return;
-#endif
if (!crab)
{
@@ -2150,10 +2112,9 @@ void A_CrushclawLaunch(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
mobj_t *crab = actor->tracer;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CrushclawLaunch", actor))
return;
-#endif
if (!crab)
{
@@ -2283,10 +2244,8 @@ void A_CrushclawLaunch(mobj_t *actor)
//
void A_VultureVtol(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VultureVtol", actor))
return;
-#endif
if (!actor->target)
return;
@@ -2320,10 +2279,8 @@ void A_VultureVtol(mobj_t *actor)
//
void A_VultureCheck(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VultureCheck", actor))
return;
-#endif
if (actor->momx || actor->momy)
return;
@@ -2378,10 +2335,8 @@ void A_VultureHover(mobj_t *actor)
fixed_t memz = actor->z;
SINT8 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VultureHover", actor))
return;
-#endif
if (!actor->target || P_MobjWasRemoved(actor->target))
{
@@ -2442,10 +2397,8 @@ void A_VultureBlast(mobj_t *actor)
angle_t faa;
fixed_t faacos, faasin;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VultureBlast", actor))
return;
-#endif
S_StartSound(actor, actor->info->attacksound);
@@ -2483,10 +2436,8 @@ void A_VultureFly(mobj_t *actor)
mobj_t *dust;
fixed_t momm;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VultureFly", actor))
return;
-#endif
if (!actor->target || P_MobjWasRemoved(actor->target))
{
@@ -2577,10 +2528,9 @@ void A_SkimChase(mobj_t *actor)
{
INT32 delta;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SkimChase", actor))
return;
-#endif
+
if (actor->reactiontime)
actor->reactiontime--;
@@ -2664,10 +2614,9 @@ nomissile:
//
void A_FaceTarget(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FaceTarget", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -2683,10 +2632,9 @@ void A_FaceTarget(mobj_t *actor)
//
void A_FaceTracer(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FaceTracer", actor))
return;
-#endif
+
if (!actor->tracer)
return;
@@ -2713,10 +2661,9 @@ void A_LobShot(mobj_t *actor)
fixed_t vertical, horizontal;
fixed_t airtime = var2 & 65535;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_LobShot", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -2814,10 +2761,9 @@ void A_FireShot(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FireShot", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -2853,10 +2799,9 @@ void A_SuperFireShot(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SuperFireShot", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -2901,10 +2846,9 @@ void A_BossFireShot(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *missile;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BossFireShot", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -2986,10 +2930,8 @@ void A_Boss7FireMissiles(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss7FireMissiles", actor))
return;
-#endif
if (!actor->target)
{
@@ -3049,11 +2991,23 @@ void A_Boss1Laser(mobj_t *actor)
angle_t angle;
mobj_t *point;
tic_t dur;
+ static const UINT8 LASERCOLORS[] =
+ {
+ SKINCOLOR_SUPERRED3,
+ SKINCOLOR_SUPERRED4,
+ SKINCOLOR_SUPERRED5,
+ SKINCOLOR_FLAME,
+ SKINCOLOR_RED,
+ SKINCOLOR_RED,
+ SKINCOLOR_FLAME,
+ SKINCOLOR_SUPERRED5,
+ SKINCOLOR_SUPERRED4,
+ SKINCOLOR_SUPERRED3,
+ };
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss1Laser", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -3124,7 +3078,7 @@ void A_Boss1Laser(mobj_t *actor)
point = P_SpawnMobj(x, y, z, locvar1);
P_SetTarget(&point->target, actor);
point->angle = actor->angle;
- speed = point->radius*2;
+ speed = point->radius;
point->momz = FixedMul(FINECOSINE(angle>>ANGLETOFINESHIFT), speed);
point->momx = FixedMul(FINESINE(angle>>ANGLETOFINESHIFT), FixedMul(FINECOSINE(point->angle>>ANGLETOFINESHIFT), speed));
point->momy = FixedMul(FINESINE(angle>>ANGLETOFINESHIFT), FixedMul(FINESINE(point->angle>>ANGLETOFINESHIFT), speed));
@@ -3133,23 +3087,69 @@ void A_Boss1Laser(mobj_t *actor)
{
mobj_t *mo = P_SpawnMobj(point->x, point->y, point->z, point->type);
mo->angle = point->angle;
+ mo->color = LASERCOLORS[((UINT8)(i + 3*dur) >> 2) % sizeof(LASERCOLORS)]; // codeing
P_UnsetThingPosition(mo);
- mo->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY;
+ mo->flags = MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY;
P_SetThingPosition(mo);
+ if (dur & 1 && mo->info->missilestate)
+ {
+ P_SetMobjState(mo, mo->info->missilestate);
+ if (mo->info->meleestate)
+ {
+ mobj_t *mo2 = P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_PARTICLE);
+ mo2->flags2 |= MF2_LINKDRAW;
+ P_SetTarget(&mo2->tracer, actor);
+ P_SetMobjState(mo2, mo->info->meleestate);
+ }
+ }
+
+ if (dur == 1)
+ P_SpawnGhostMobj(mo);
+
x = point->x, y = point->y, z = point->z;
if (P_RailThinker(point))
break;
}
+ x += point->momx;
+ y += point->momy;
floorz = P_FloorzAtPos(x, y, z, mobjinfo[MT_EGGMOBILE_FIRE].height);
- if (z - floorz < mobjinfo[MT_EGGMOBILE_FIRE].height>>1)
+ if (z - floorz < mobjinfo[MT_EGGMOBILE_FIRE].height>>1 && dur & 1)
{
- point = P_SpawnMobj(x, y, floorz+1, MT_EGGMOBILE_FIRE);
+ point = P_SpawnMobj(x, y, floorz, MT_EGGMOBILE_FIRE);
+ point->angle = actor->angle;
+ point->destscale = actor->scale;
+ P_SetScale(point, point->destscale);
P_SetTarget(&point->target, actor);
- point->destscale = 3*FRACUNIT;
- point->scalespeed = FRACUNIT>>2;
- point->fuse = TICRATE;
+ P_MobjCheckWater(point);
+ if (point->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER))
+ {
+ for (i = 0; i < 2; i++)
+ {
+ UINT8 size = 3;
+ mobj_t *steam = P_SpawnMobj(x, y, point->watertop - size*mobjinfo[MT_DUST].height, MT_DUST);
+ P_SetScale(steam, size*actor->scale);
+ P_SetObjectMomZ(steam, FRACUNIT + 2*P_RandomFixed(), true);
+ P_InstaThrust(steam, FixedAngle(P_RandomKey(360)*FRACUNIT), 2*P_RandomFixed());
+ if (point->info->painsound)
+ S_StartSound(steam, point->info->painsound);
+ }
+ }
+ else
+ {
+ fixed_t distx = P_ReturnThrustX(point, point->angle, point->radius);
+ fixed_t disty = P_ReturnThrustY(point, point->angle, point->radius);
+ if (P_TryMove(point, point->x + distx, point->y + disty, false) // prevents the sprite from clipping into the wall or dangling off ledges
+ && P_TryMove(point, point->x - 2*distx, point->y - 2*disty, false)
+ && P_TryMove(point, point->x + distx, point->y + disty, false))
+ {
+ if (point->info->seesound)
+ S_StartSound(point, point->info->seesound);
+ }
+ else
+ P_RemoveMobj(point);
+ }
}
if (dur > 1)
@@ -3175,10 +3175,9 @@ void A_FocusTarget(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FocusTarget", actor))
return;
-#endif
if (actor->target)
{
@@ -3227,10 +3226,10 @@ void A_Boss4Reverse(mobj_t *actor)
{
sfxenum_t locvar1 = (sfxenum_t)var1;
sfxenum_t locvar2 = (sfxenum_t)var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss4Reverse", actor))
return;
-#endif
+
actor->reactiontime = 0;
if (actor->movedir < 3)
{
@@ -3262,10 +3261,10 @@ void A_Boss4Reverse(mobj_t *actor)
void A_Boss4SpeedUp(mobj_t *actor)
{
sfxenum_t locvar1 = (sfxenum_t)var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss4SpeedUp", actor))
return;
-#endif
+
S_StartSound(NULL, locvar1);
actor->reactiontime = 2;
}
@@ -3280,10 +3279,10 @@ void A_Boss4SpeedUp(mobj_t *actor)
void A_Boss4Raise(mobj_t *actor)
{
sfxenum_t locvar1 = (sfxenum_t)var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss4Raise", actor))
return;
-#endif
+
S_StartSound(NULL, locvar1);
actor->reactiontime = 1;
}
@@ -3312,10 +3311,9 @@ void A_SkullAttack(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SkullAttack", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -3431,10 +3429,9 @@ void A_BossZoom(mobj_t *actor)
angle_t an;
INT32 dist;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BossZoom", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -3472,10 +3469,9 @@ void A_BossScream(mobj_t *actor)
INT32 locvar2 = var2;
mobjtype_t explodetype;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BossScream", actor))
return;
-#endif
+
if (locvar1 & 1)
fa = (FixedAngle(P_RandomKey(360)*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
else
@@ -3518,10 +3514,9 @@ void A_BossScream(mobj_t *actor)
//
void A_Scream(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Scream", actor))
return;
-#endif
+
if (actor->tracer && (actor->tracer->type == MT_SHELL || actor->tracer->type == MT_FIREBALL))
S_StartScreamSound(actor, sfx_mario2);
else if (actor->info->deathsound)
@@ -3537,10 +3532,9 @@ void A_Scream(mobj_t *actor)
//
void A_Pain(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Pain", actor))
return;
-#endif
+
if (actor->info->painsound)
S_StartSound(actor, actor->info->painsound);
@@ -3559,10 +3553,9 @@ void A_Fall(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Fall", actor))
return;
-#endif
+
// actor is on ground, it can be walked over
actor->flags &= ~MF_SOLID;
@@ -3592,10 +3585,9 @@ void A_1upThinker(mobj_t *actor)
fixed_t temp;
INT32 closestplayer = -1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_1upThinker", actor))
return;
-#endif
+
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].bot || players[i].spectator)
@@ -3659,10 +3651,8 @@ void A_MonitorPop(mobj_t *actor)
mobjtype_t item = 0;
mobj_t *newmobj;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MonitorPop", actor))
return;
-#endif
// Spawn the "pop" explosion.
if (actor->info->deathsound)
@@ -3742,10 +3732,8 @@ void A_GoldMonitorPop(mobj_t *actor)
mobjtype_t item = 0;
mobj_t *newmobj;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_GoldMonitorPop", actor))
return;
-#endif
// Don't spawn the "pop" explosion, because the monitor isn't broken.
if (actor->info->deathsound)
@@ -3827,10 +3815,8 @@ void A_GoldMonitorPop(mobj_t *actor)
//
void A_GoldMonitorRestore(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_GoldMonitorRestore", actor))
return;
-#endif
actor->flags |= MF_MONITOR|MF_SHOOTABLE;
actor->health = 1; // Just in case.
@@ -3847,10 +3833,8 @@ void A_GoldMonitorSparkle(mobj_t *actor)
{
fixed_t i, ngangle, xofs, yofs;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_GoldMonitorSparkle", actor))
return;
-#endif
ngangle = FixedAngle(((leveltime * 21) % 360) << FRACBITS);
xofs = FINESINE((ngangle>>ANGLETOFINESHIFT) & FINEMASK) * (actor->radius>>FRACBITS);
@@ -3870,10 +3854,10 @@ void A_GoldMonitorSparkle(mobj_t *actor)
void A_Explode(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Explode", actor))
return;
-#endif
+
P_RadiusAttack(actor, actor->target, actor->info->damage, locvar1);
}
@@ -3890,10 +3874,9 @@ void A_BossDeath(mobj_t *mo)
mobj_t *mo2;
line_t junk;
INT32 i;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_BossDeath", mo))
return;
-#endif
if (mo->spawnpoint && mo->spawnpoint->extrainfo)
P_LinedefExecute(LE_BOSSDEAD+(mo->spawnpoint->extrainfo*LE_PARAMWIDTH), mo, NULL);
@@ -3973,12 +3956,10 @@ void A_BossDeath(mobj_t *mo)
}
bossjustdie:
-#ifdef HAVE_BLUA
if (LUAh_BossDeath(mo))
return;
else if (P_MobjWasRemoved(mo))
return;
-#endif
// Spawn your junk
switch (mo->type)
@@ -4202,10 +4183,9 @@ void A_CustomPower(mobj_t *actor)
INT32 locvar2 = var2;
boolean spawnshield = false;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_CustomPower", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4243,10 +4223,9 @@ void A_GiveWeapon(mobj_t *actor)
player_t *player;
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_GiveWeapon", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4277,10 +4256,9 @@ void A_RingBox(mobj_t *actor)
{
player_t *player;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_RingBox", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4305,10 +4283,9 @@ void A_Invincibility(mobj_t *actor)
{
player_t *player;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Invincibility", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4339,10 +4316,9 @@ void A_SuperSneakers(mobj_t *actor)
{
player_t *player;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SuperSneakers", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4375,10 +4351,9 @@ void A_AwardScore(mobj_t *actor)
{
player_t *player;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_AwardScore", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4403,10 +4378,9 @@ void A_ExtraLife(mobj_t *actor)
{
player_t *player;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_ExtraLife", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4442,10 +4416,9 @@ void A_GiveShield(mobj_t *actor)
player_t *player;
UINT16 locvar1 = var1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_GiveShield", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4469,10 +4442,9 @@ void A_GravityBox(mobj_t *actor)
{
player_t *player;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_GravityBox", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -4495,10 +4467,9 @@ void A_GravityBox(mobj_t *actor)
//
void A_ScoreRise(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_ScoreRise", actor))
return;
-#endif
+
// make logo rise!
P_SetObjectMomZ(actor, actor->info->speed, false);
}
@@ -4515,10 +4486,9 @@ void A_BunnyHop(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BunnyHop", actor))
return;
-#endif
+
if (((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz)
|| (!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz))
{
@@ -4539,10 +4509,10 @@ void A_BubbleSpawn(mobj_t *actor)
INT32 i, locvar1 = var1;
UINT8 prandom;
mobj_t *bubble = NULL;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_BubbleSpawn", actor))
return;
-#endif
+
if (!(actor->eflags & MFE_UNDERWATER))
{
// Don't draw or spawn bubbles above water
@@ -4592,10 +4562,10 @@ void A_FanBubbleSpawn(mobj_t *actor)
UINT8 prandom;
mobj_t *bubble = NULL;
fixed_t hz = actor->z + (4*actor->height)/5;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FanBubbleSpawn", actor))
return;
-#endif
+
if (!(actor->eflags & MFE_UNDERWATER))
return;
@@ -4639,10 +4609,9 @@ void A_BubbleRise(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BubbleRise", actor))
return;
-#endif
+
if (actor->type == MT_EXTRALARGEBUBBLE)
P_SetObjectMomZ(actor, FixedDiv(6*FRACUNIT,5*FRACUNIT), false); // make bubbles rise!
else
@@ -4676,10 +4645,9 @@ void A_BubbleRise(mobj_t *actor)
//
void A_BubbleCheck(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BubbleCheck", actor))
return;
-#endif
+
if (actor->eflags & MFE_UNDERWATER)
actor->flags2 &= ~MF2_DONTDRAW; // underwater so draw
else
@@ -4695,10 +4663,9 @@ void A_BubbleCheck(mobj_t *actor)
//
void A_AttractChase(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_AttractChase", actor))
return;
-#endif
+
if (actor->flags2 & MF2_NIGHTSPULL || !actor->health)
return;
@@ -4766,10 +4733,9 @@ void A_DropMine(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t z;
mobj_t *mine;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_DropMine", actor))
return;
-#endif
if (locvar2 & 65535)
{
@@ -4815,10 +4781,9 @@ void A_FishJump(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FishJump", actor))
return;
-#endif
if (locvar2)
{
@@ -4867,10 +4832,9 @@ void A_ThrownRing(mobj_t *actor)
INT32 stop;
player_t *player;
fixed_t dist;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ThrownRing", actor))
return;
-#endif
if (leveltime % (TICRATE/7) == 0)
{
@@ -5025,10 +4989,9 @@ void A_ThrownRing(mobj_t *actor)
//
void A_SetSolidSteam(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SetSolidSteam", actor))
return;
-#endif
+
actor->flags &= ~MF_NOCLIP;
actor->flags |= MF_SOLID;
if (!(actor->flags2 & MF2_AMBUSH))
@@ -5057,10 +5020,9 @@ void A_SetSolidSteam(mobj_t *actor)
//
void A_UnsetSolidSteam(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_UnsetSolidSteam", actor))
return;
-#endif
+
actor->flags &= ~MF_SOLID;
actor->flags |= MF_NOCLIP;
}
@@ -5078,10 +5040,8 @@ void A_SignSpin(mobj_t *actor)
INT16 i;
angle_t rotateangle = FixedAngle(locvar1 << FRACBITS);
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SignSpin", actor))
return;
-#endif
if (P_IsObjectOnGround(actor) && P_MobjFlip(actor) * actor->momz <= 0)
{
@@ -5146,15 +5106,13 @@ void A_SignPlayer(mobj_t *actor)
INT32 locvar2 = var2;
skin_t *skin = NULL;
mobj_t *ov;
- UINT8 facecolor, signcolor = (UINT8)locvar2;
+ UINT16 facecolor, signcolor = (UINT16)locvar2;
UINT32 signframe = states[actor->info->raisestate].frame;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SignPlayer", actor))
return;
-#endif
- if (actor->tracer == NULL || locvar1 < -3 || locvar1 >= numskins || signcolor >= MAXTRANSLATIONS)
+ if (actor->tracer == NULL || locvar1 < -3 || locvar1 >= numskins || signcolor >= numskincolors)
return;
// if no face overlay, spawn one
@@ -5185,7 +5143,7 @@ void A_SignPlayer(mobj_t *actor)
else if ((actor->target->player->skincolor == skin->prefcolor) && (skin->prefoppositecolor)) // Set it as the skin's preferred oppositecolor?
signcolor = skin->prefoppositecolor;
else if (actor->target->player->skincolor) // Set the sign to be an appropriate background color for this player's skincolor.
- signcolor = Color_Opposite[actor->target->player->skincolor - 1][0];
+ signcolor = skincolors[actor->target->player->skincolor].invcolor;
else
signcolor = SKINCOLOR_NONE;
}
@@ -5223,7 +5181,7 @@ void A_SignPlayer(mobj_t *actor)
else if (skin->prefoppositecolor)
signcolor = skin->prefoppositecolor;
else if (facecolor)
- signcolor = Color_Opposite[facecolor - 1][0];
+ signcolor = skincolors[facecolor].invcolor;
}
if (skin)
@@ -5254,19 +5212,8 @@ void A_SignPlayer(mobj_t *actor)
}
actor->tracer->color = signcolor;
- /*
- If you're here from the comment above Color_Opposite,
- the following line is the one which is dependent on the
- array being symmetrical. It gets the opposite of the
- opposite of your desired colour just so it can get the
- brightness frame for the End Sign. It's not a great
- design choice, but it's constant time array access and
- the idea that the colours should be OPPOSITES is kind
- of in the name. If you have a better idea, feel free
- to let me know. ~toast 2016/07/20
- */
- if (signcolor && signcolor < MAXSKINCOLORS)
- signframe += (15 - Color_Opposite[Color_Opposite[signcolor - 1][0] - 1][1]);
+ if (signcolor && signcolor < numskincolors)
+ signframe += (15 - skincolors[signcolor].invshade);
actor->tracer->frame = signframe;
}
@@ -5280,10 +5227,10 @@ void A_SignPlayer(mobj_t *actor)
void A_OverlayThink(mobj_t *actor)
{
fixed_t destx, desty;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_OverlayThink", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -5332,10 +5279,9 @@ void A_OverlayThink(mobj_t *actor)
void A_JetChase(mobj_t *actor)
{
fixed_t thefloor;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_JetChase", actor))
return;
-#endif
if (actor->flags2 & MF2_AMBUSH)
return;
@@ -5429,10 +5375,9 @@ void A_JetbThink(mobj_t *actor)
{
sector_t *nextsector;
fixed_t thefloor;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_JetbThink", actor))
return;
-#endif
if (actor->z >= actor->waterbottom && actor->watertop > actor->floorz
&& actor->z > actor->watertop - FixedMul(256*FRACUNIT, actor->scale))
@@ -5495,10 +5440,9 @@ void A_JetbThink(mobj_t *actor)
void A_JetgShoot(mobj_t *actor)
{
fixed_t dist;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_JetgShoot", actor))
return;
-#endif
if (!actor->target)
return;
@@ -5536,10 +5480,9 @@ void A_JetgShoot(mobj_t *actor)
void A_ShootBullet(mobj_t *actor)
{
fixed_t dist;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ShootBullet", actor))
return;
-#endif
if (!actor->target)
return;
@@ -5598,10 +5541,8 @@ void A_MinusDigging(mobj_t *actor)
fixed_t mz = (actor->eflags & MFE_VERTICALFLIP) ? actor->ceilingz : actor->floorz;
mobj_t *par;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MinusDigging", actor))
return;
-#endif
if (!actor->target)
{
@@ -5681,10 +5622,8 @@ void A_MinusPopup(mobj_t *actor)
angle_t ani = FixedAngle(FRACUNIT*360/num);
INT32 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MinusPopup", actor))
return;
-#endif
if (actor->eflags & MFE_VERTICALFLIP)
actor->momz = -10*FRACUNIT;
@@ -5718,10 +5657,8 @@ void A_MinusCheck(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MinusCheck", actor))
return;
-#endif
if (((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz) || (!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz))
{
@@ -5751,10 +5688,9 @@ void A_MinusCheck(mobj_t *actor)
//
void A_ChickenCheck(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_ChickenCheck", actor))
return;
-#endif
+
if ((!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz)
|| (actor->eflags & MFE_VERTICALFLIP && actor->z + actor->height >= actor->ceilingz))
{
@@ -5782,10 +5718,9 @@ void A_JetgThink(mobj_t *actor)
sector_t *nextsector;
fixed_t thefloor;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_JetgThink", actor))
return;
-#endif
if (actor->z >= actor->waterbottom && actor->watertop > actor->floorz
&& actor->z > actor->watertop - FixedMul(256*FRACUNIT, actor->scale))
@@ -5834,10 +5769,8 @@ void A_JetgThink(mobj_t *actor)
//
void A_MouseThink(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MouseThink", actor))
return;
-#endif
if (actor->reactiontime)
actor->reactiontime--;
@@ -5872,10 +5805,9 @@ void A_DetonChase(mobj_t *actor)
{
angle_t exact;
fixed_t xydist, dist;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_DetonChase", actor))
return;
-#endif
// modify tracer threshold
if (!actor->tracer || actor->tracer->health <= 0)
@@ -6020,10 +5952,9 @@ void A_CapeChase(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
angle_t angle;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CapeChase", actor))
return;
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_CapeChase called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -6081,10 +6012,9 @@ void A_RotateSpikeBall(mobj_t *actor)
{
INT32 locvar1 = var1;
const fixed_t radius = FixedMul(12*actor->info->speed, actor->scale);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RotateSpikeBall", actor))
return;
-#endif
if (!((!locvar1 && (actor->target)) || (locvar1 && (actor->tracer))))// This should NEVER happen.
{
@@ -6134,10 +6064,8 @@ void A_UnidusBall(mobj_t *actor)
INT32 locvar1 = var1;
boolean canthrow = false;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_UnidusBall", actor))
return;
-#endif
actor->angle += ANGLE_11hh;
@@ -6232,10 +6160,9 @@ void A_RockSpawn(mobj_t *actor)
line_t *line;
fixed_t dist;
fixed_t randomoomph;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RockSpawn", actor))
return;
-#endif
if (i == -1)
{
@@ -6286,10 +6213,9 @@ void A_SlingAppear(mobj_t *actor)
{
UINT8 mlength = 4;
mobj_t *spawnee, *hprev;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SlingAppear", actor))
return;
-#endif
P_UnsetThingPosition(actor);
actor->flags &= ~(MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_NOCLIPHEIGHT);
@@ -6337,10 +6263,9 @@ void A_SetFuse(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetFuse", actor))
return;
-#endif
if ((!actor->fuse || (locvar2 >> 16)) && (locvar2 >> 16) != 2) // set the actor's fuse value
actor->fuse = locvar1;
@@ -6367,10 +6292,9 @@ void A_CrawlaCommanderThink(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
boolean hovermode = (actor->health > 1 || actor->fuse);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CrawlaCommanderThink", actor))
return;
-#endif
if (actor->z >= actor->waterbottom && actor->watertop > actor->floorz
&& actor->z > actor->watertop - FixedMul(256*FRACUNIT, actor->scale))
@@ -6526,10 +6450,9 @@ void A_RingExplode(mobj_t *actor)
mobj_t *mo2;
thinker_t *th;
angle_t d;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RingExplode", actor))
return;
-#endif
for (d = 0; d < 16; d++)
P_SpawnParaloop(actor->x, actor->y, actor->z + actor->height, FixedMul(actor->info->painchance, actor->scale), 16, MT_NIGHTSPARKLE, S_NULL, d*(ANGLE_22h), true);
@@ -6571,12 +6494,10 @@ void A_OldRingExplode(mobj_t *actor) {
mobj_t *mo;
const fixed_t ns = FixedMul(20 * FRACUNIT, actor->scale);
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
boolean changecolor = (actor->target && actor->target->player);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_OldRingExplode", actor))
return;
-#endif
for (i = 0; i < 32; i++)
{
@@ -6650,12 +6571,9 @@ void A_MixUp(mobj_t *actor)
{
boolean teleported[MAXPLAYERS];
INT32 i, numplayers = 0, prandom = 0;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_MixUp", actor))
return;
-#else
- (void)actor;
-#endif
if (!multiplayer)
return;
@@ -6896,13 +6814,8 @@ void A_MixUp(mobj_t *actor)
P_SetThingPosition(players[i].mo);
-#ifdef ESLOPE
players[i].mo->floorz = P_GetFloorZ(players[i].mo, players[i].mo->subsector->sector, players[i].mo->x, players[i].mo->y, NULL);
players[i].mo->ceilingz = P_GetCeilingZ(players[i].mo, players[i].mo->subsector->sector, players[i].mo->x, players[i].mo->y, NULL);
-#else
- players[i].mo->floorz = players[i].mo->subsector->sector->floorheight;
- players[i].mo->ceilingz = players[i].mo->subsector->sector->ceilingheight;
-#endif
P_CheckPosition(players[i].mo, players[i].mo->x, players[i].mo->y);
}
@@ -6934,15 +6847,8 @@ void A_RecyclePowers(mobj_t *actor)
INT32 weapons[MAXPLAYERS];
INT32 weaponheld[MAXPLAYERS];
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_RecyclePowers", actor))
return;
-#endif
-
-#if !defined(WEIGHTEDRECYCLER) && !defined(HAVE_BLUA)
- // actor is used in all scenarios but this one, funny enough
- (void)actor;
-#endif
if (!multiplayer)
{
@@ -7069,10 +6975,9 @@ void A_RecyclePowers(mobj_t *actor)
void A_Boss1Chase(mobj_t *actor)
{
INT32 delta;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss1Chase", actor))
return;
-#endif
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
{
@@ -7193,10 +7098,9 @@ void A_Boss2Chase(mobj_t *actor)
fixed_t radius;
boolean reverse = false;
INT32 speedvar;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss2Chase", actor))
return;
-#endif
if (actor->health <= 0)
return;
@@ -7321,10 +7225,9 @@ void A_Boss2Chase(mobj_t *actor)
//
void A_Boss2Pogo(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss2Pogo", actor))
return;
-#endif
+
if (actor->z <= actor->floorz + FixedMul(8*FRACUNIT, actor->scale) && actor->momz <= 0)
{
if (actor->state != &states[actor->info->raisestate])
@@ -7369,10 +7272,10 @@ void A_Boss2Pogo(mobj_t *actor)
void A_Boss2TakeDamage(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss2TakeDamage", actor))
return;
-#endif
+
A_Pain(actor);
actor->reactiontime = 1; // turn around
if (locvar1 == 0) // old A_Invincibilerize behavior
@@ -7392,10 +7295,9 @@ void A_Boss7Chase(mobj_t *actor)
{
INT32 delta;
INT32 i;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss7Chase", actor))
return;
-#endif
if (actor->z != actor->floorz)
return;
@@ -7524,10 +7426,9 @@ void A_Boss7Chase(mobj_t *actor)
//
void A_GoopSplat(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_GoopSplat", actor))
return;
-#endif
+
P_UnsetThingPosition(actor);
if (sector_list)
{
@@ -7549,10 +7450,9 @@ void A_Boss2PogoSFX(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss2PogoSFX", actor))
return;
-#endif
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
{
@@ -7593,10 +7493,8 @@ void A_Boss2PogoTarget(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss2PogoTarget", actor))
return;
-#endif
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE) || (actor->target->player && actor->target->player->powers[pw_flashing])
|| P_AproxDistance(actor->x-actor->target->x, actor->y-actor->target->y) >= FixedMul(512*FRACUNIT, actor->scale))
@@ -7680,10 +7578,9 @@ void A_Boss2PogoTarget(mobj_t *actor)
//
void A_EggmanBox(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_EggmanBox", actor))
return;
-#endif
+
if (!actor->target || !actor->target->player)
{
CONS_Debug(DBG_GAMELOGIC, "Powerup has no target.\n");
@@ -7706,10 +7603,9 @@ void A_TurretFire(mobj_t *actor)
fixed_t dist;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_TurretFire", actor))
return;
-#endif
if (locvar2)
dist = FixedMul(locvar2*FRACUNIT, actor->scale);
@@ -7745,10 +7641,9 @@ void A_SuperTurretFire(mobj_t *actor)
fixed_t dist;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SuperTurretFire", actor))
return;
-#endif
if (locvar2)
dist = FixedMul(locvar2*FRACUNIT, actor->scale);
@@ -7782,10 +7677,9 @@ void A_SuperTurretFire(mobj_t *actor)
void A_TurretStop(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_TurretStop", actor))
return;
-#endif
actor->flags2 &= ~MF2_FIRING;
actor->flags2 &= ~MF2_SUPERFIRE;
@@ -7803,10 +7697,8 @@ void A_TurretStop(mobj_t *actor)
//
void A_SparkFollow(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SparkFollow", actor))
return;
-#endif
if ((!actor->target || (actor->target->health <= 0))
|| (actor->target->player && !actor->target->player->powers[pw_super]))
@@ -7840,10 +7732,10 @@ void A_BuzzFly(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_BuzzFly", actor))
return;
-#endif
+
if (actor->flags2 & MF2_AMBUSH)
return;
@@ -7939,10 +7831,9 @@ void A_BuzzFly(mobj_t *actor)
void A_GuardChase(mobj_t *actor)
{
INT32 delta;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_GuardChase", actor))
return;
-#endif
if (actor->reactiontime)
actor->reactiontime--;
@@ -8045,10 +7936,9 @@ void A_EggShield(mobj_t *actor)
fixed_t newx, newy;
fixed_t movex, movey;
angle_t angle;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_EggShield", actor))
return;
-#endif
if (!actor->target || !actor->target->health)
{
@@ -8129,10 +8019,9 @@ void A_EggShield(mobj_t *actor)
//
void A_SetReactionTime(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SetReactionTime", actor))
return;
-#endif
+
if (var1)
actor->reactiontime = var2;
else
@@ -8152,10 +8041,8 @@ void A_Boss1Spikeballs(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *ball;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss1Spikeballs", actor))
return;
-#endif
ball = P_SpawnMobj(actor->x, actor->y, actor->z, MT_EGGMOBILE_BALL);
P_SetTarget(&ball->target, actor);
@@ -8176,10 +8063,9 @@ void A_Boss1Spikeballs(mobj_t *actor)
//
void A_Boss3TakeDamage(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss3TakeDamage", actor))
return;
-#endif
+
actor->movecount = var1;
actor->movefactor = -512*FRACUNIT;
@@ -8197,10 +8083,8 @@ void A_Boss3TakeDamage(mobj_t *actor)
//
void A_Boss3Path(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss3Path", actor))
return;
-#endif
if (actor->tracer && actor->tracer->health && actor->tracer->movecount)
actor->movecount |= 1;
@@ -8326,10 +8210,8 @@ void A_Boss3Path(mobj_t *actor)
//
void A_Boss3ShockThink(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss3ShockThink", actor))
return;
-#endif
if (actor->momx || actor->momy)
actor->angle = R_PointToAngle2(0, 0, actor->momx, actor->momy) + ANGLE_90;
@@ -8380,10 +8262,9 @@ void A_LinedefExecute(mobj_t *actor)
INT32 tagnum;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_LinedefExecute", actor))
return;
-#endif
tagnum = locvar1;
// state numbers option is no more, custom states cannot be guaranteed to stay the same number anymore, now that they can be defined by names instead
@@ -8408,10 +8289,9 @@ void A_LinedefExecute(mobj_t *actor)
//
void A_PlaySeeSound(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_PlaySeeSound", actor))
return;
-#endif
+
if (actor->info->seesound)
S_StartScreamSound(actor, actor->info->seesound);
}
@@ -8425,10 +8305,9 @@ void A_PlaySeeSound(mobj_t *actor)
//
void A_PlayAttackSound(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_PlayAttackSound", actor))
return;
-#endif
+
if (actor->info->attacksound)
S_StartAttackSound(actor, actor->info->attacksound);
}
@@ -8442,10 +8321,9 @@ void A_PlayAttackSound(mobj_t *actor)
//
void A_PlayActiveSound(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_PlayActiveSound", actor))
return;
-#endif
+
if (actor->info->activesound)
S_StartSound(actor, actor->info->activesound);
}
@@ -8461,10 +8339,9 @@ void A_SmokeTrailer(mobj_t *actor)
{
mobj_t *th;
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SmokeTrailer", actor))
return;
-#endif
if (leveltime % 4)
return;
@@ -8503,10 +8380,9 @@ void A_SpawnObjectAbsolute(mobj_t *actor)
mobj_t *mo;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SpawnObjectAbsolute", actor))
return;
-#endif
x = (INT16)(locvar1>>16);
y = (INT16)(locvar1&65535);
@@ -8540,10 +8416,9 @@ void A_SpawnObjectRelative(mobj_t *actor)
mobj_t *mo;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SpawnObjectRelative", actor))
return;
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_SpawnObjectRelative called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -8585,10 +8460,9 @@ void A_ChangeAngleRelative(mobj_t *actor)
const fixed_t amax = locvar2*FRACUNIT;
//const angle_t amin = FixedAngle(locvar1*FRACUNIT);
//const angle_t amax = FixedAngle(locvar2*FRACUNIT);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ChangeAngleRelative", actor))
return;
-#endif
#ifdef PARANOIA
if (amin > amax)
@@ -8619,10 +8493,9 @@ void A_ChangeAngleAbsolute(mobj_t *actor)
const fixed_t amax = locvar2*FRACUNIT;
//const angle_t amin = FixedAngle(locvar1*FRACUNIT);
//const angle_t amax = FixedAngle(locvar2*FRACUNIT);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ChangeAngleAbsolute", actor))
return;
-#endif
#ifdef PARANOIA
if (amin > amax)
@@ -8650,10 +8523,8 @@ void A_RollAngle(mobj_t *actor)
INT32 locvar2 = var2;
const angle_t angle = FixedAngle(locvar1*FRACUNIT);
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_RollAngle", actor))
return;
-#endif
// relative (default)
if (!locvar2)
@@ -8676,10 +8547,9 @@ void A_ChangeRollAngleRelative(mobj_t *actor)
INT32 locvar2 = var2;
const fixed_t amin = locvar1*FRACUNIT;
const fixed_t amax = locvar2*FRACUNIT;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ChangeRollAngleRelative", actor))
return;
-#endif
#ifdef PARANOIA
if (amin > amax)
@@ -8702,10 +8572,9 @@ void A_ChangeRollAngleAbsolute(mobj_t *actor)
INT32 locvar2 = var2;
const fixed_t amin = locvar1*FRACUNIT;
const fixed_t amax = locvar2*FRACUNIT;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ChangeRollAngleAbsolute", actor))
return;
-#endif
#ifdef PARANOIA
if (amin > amax)
@@ -8728,10 +8597,9 @@ void A_PlaySound(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_PlaySound", actor))
return;
-#endif
if (leveltime < 2 && (locvar2 >> 16))
return;
@@ -8754,10 +8622,9 @@ void A_FindTarget(mobj_t *actor)
thinker_t *th;
mobj_t *mo2;
fixed_t dist1 = 0, dist2 = 0;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FindTarget", actor))
return;
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_FindTarget called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -8819,10 +8686,9 @@ void A_FindTracer(mobj_t *actor)
thinker_t *th;
mobj_t *mo2;
fixed_t dist1 = 0, dist2 = 0;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FindTracer", actor))
return;
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_FindTracer called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -8880,10 +8746,9 @@ void A_SetTics(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetTics", actor))
return;
-#endif
if (locvar1)
actor->tics = locvar1;
@@ -8902,10 +8767,9 @@ void A_SetRandomTics(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetRandomTics", actor))
return;
-#endif
actor->tics = P_RandomRange(locvar1, locvar2);
}
@@ -8921,19 +8785,18 @@ void A_ChangeColorRelative(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ChangeColorRelative", actor))
return;
-#endif
if (locvar1)
{
// Have you ever seen anything so hideous?
if (actor->target)
- actor->color = (UINT8)(actor->color + actor->target->color);
+ actor->color = (UINT16)(actor->color + actor->target->color);
}
else
- actor->color = (UINT8)(actor->color + locvar2);
+ actor->color = (UINT16)(actor->color + locvar2);
}
// Function: A_ChangeColorAbsolute
@@ -8947,10 +8810,9 @@ void A_ChangeColorAbsolute(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ChangeColorAbsolute", actor))
return;
-#endif
if (locvar1)
{
@@ -8958,7 +8820,41 @@ void A_ChangeColorAbsolute(mobj_t *actor)
actor->color = actor->target->color;
}
else
- actor->color = (UINT8)locvar2;
+ actor->color = (UINT16)locvar2;
+}
+
+// Function: A_Dye
+//
+// Description: Colorizes an object.
+//
+// var1 = if (var1 != 0), dye your target instead of yourself
+// var2 = color value to dye
+//
+void A_Dye(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+
+ mobj_t *target = ((locvar1 && actor->target) ? actor->target : actor);
+ UINT8 color = (UINT8)locvar2;
+ if (LUA_CallAction("A_Dye", actor))
+ return;
+ if (color >= numskincolors)
+ return;
+
+ if (!color)
+ target->colorized = false;
+ else
+ target->colorized = true;
+
+ // What if it's a player?
+ if (target->player)
+ {
+ target->player->powers[pw_dye] = color;
+ return;
+ }
+
+ target->color = color;
}
// Function: A_MoveRelative
@@ -8972,10 +8868,9 @@ void A_MoveRelative(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_MoveRelative", actor))
return;
-#endif
P_Thrust(actor, actor->angle+FixedAngle(locvar1*FRACUNIT), FixedMul(locvar2*FRACUNIT, actor->scale));
}
@@ -8991,10 +8886,9 @@ void A_MoveAbsolute(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_MoveAbsolute", actor))
return;
-#endif
P_InstaThrust(actor, FixedAngle(locvar1*FRACUNIT), FixedMul(locvar2*FRACUNIT, actor->scale));
}
@@ -9010,10 +8904,9 @@ void A_Thrust(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Thrust", actor))
return;
-#endif
if (!locvar1)
CONS_Debug(DBG_GAMELOGIC, "A_Thrust: Var1 not specified!\n");
@@ -9037,10 +8930,9 @@ void A_ZThrust(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ZThrust", actor))
return;
-#endif
if (!locvar1)
CONS_Debug(DBG_GAMELOGIC, "A_ZThrust: Var1 not specified!\n");
@@ -9072,10 +8964,9 @@ void A_SetTargetsTarget(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
mobj_t *oldtarg = NULL, *newtarg = NULL;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetTargetsTarget", actor))
return;
-#endif
// actor's target
if (locvar1) // or tracer
@@ -9117,10 +9008,9 @@ void A_SetObjectFlags(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
boolean unlinkthings = false;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetObjectFlags", actor))
return;
-#endif
if (locvar2 == 2)
locvar1 = actor->flags | locvar1;
@@ -9159,10 +9049,9 @@ void A_SetObjectFlags2(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetObjectFlags2", actor))
return;
-#endif
if (locvar2 == 2)
actor->flags2 |= locvar1;
@@ -9187,10 +9076,9 @@ void A_BossJetFume(mobj_t *actor)
{
mobj_t *filler;
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_BossJetFume", actor))
return;
-#endif
if (locvar1 == 0) // Boss1 jet fumes
{
@@ -9323,10 +9211,9 @@ void A_RandomState(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RandomState", actor))
return;
-#endif
P_SetMobjState(actor, P_RandomChance(FRACUNIT/2) ? locvar1 : locvar2);
}
@@ -9343,10 +9230,8 @@ void A_RandomStateRange(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_RandomStateRange", actor))
return;
-#endif
P_SetMobjState(actor, P_RandomRange(locvar1, locvar2));
}
@@ -9362,27 +9247,22 @@ void A_DualAction(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_DualAction", actor))
return;
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_DualAction called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
var1 = states[locvar1].var1;
var2 = states[locvar1].var2;
-#ifdef HAVE_BLUA
astate = &states[locvar1];
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_DualAction: Calling First Action (state %d)...\n", locvar1);
states[locvar1].action.acp1(actor);
var1 = states[locvar2].var1;
var2 = states[locvar2].var2;
-#ifdef HAVE_BLUA
astate = &states[locvar2];
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_DualAction: Calling Second Action (state %d)...\n", locvar2);
states[locvar2].action.acp1(actor);
@@ -9400,10 +9280,9 @@ void A_RemoteAction(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
mobj_t *originaltarget = actor->target; // Hold on to the target for later.
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RemoteAction", actor))
return;
-#endif
// If >=0, find the closest target.
if (locvar1 >= 0)
@@ -9465,9 +9344,7 @@ void A_RemoteAction(mobj_t *actor)
// Steal the var1 and var2 from "locvar2"
var1 = states[locvar2].var1;
var2 = states[locvar2].var2;
-#ifdef HAVE_BLUA
astate = &states[locvar2];
-#endif
CONS_Debug(DBG_GAMELOGIC, "A_RemoteAction: Calling action on %p\n"
"var1 is %d\nvar2 is %d\n", actor->target, var1, var2);
@@ -9486,10 +9363,9 @@ void A_RemoteAction(mobj_t *actor)
//
void A_ToggleFlameJet(mobj_t* actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_ToggleFlameJet", actor))
return;
-#endif
+
// threshold - off delay
// movecount - on timer
@@ -9533,10 +9409,9 @@ void A_OrbitNights(mobj_t* actor)
boolean ishelper = (var2 & 0x10000);
boolean donotrescale = (var2 & 0x40000);
INT32 xfactor = 32, yfactor = 32, zfactor = 20;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_OrbitNights", actor))
return;
-#endif
if (actor->flags & MF_GRENADEBOUNCE)
{
@@ -9607,10 +9482,10 @@ void A_GhostMe(mobj_t *actor)
{
INT32 locvar1 = var1;
mobj_t *ghost;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_GhostMe", actor))
return;
-#endif
+
ghost = P_SpawnGhostMobj(actor);
if (ghost && locvar1 > 0)
ghost->fuse = locvar1;
@@ -9630,10 +9505,9 @@ void A_SetObjectState(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
mobj_t *target;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetObjectState", actor))
return;
-#endif
if ((!locvar2 && !actor->target) || (locvar2 && !actor->tracer))
{
@@ -9676,10 +9550,8 @@ void A_SetObjectTypeState(mobj_t *actor)
mobj_t *mo2;
fixed_t dist = 0;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SetObjectTypeState", actor))
return;
-#endif
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
{
@@ -9719,10 +9591,9 @@ void A_KnockBack(mobj_t *actor)
{
INT32 locvar1 = var1;
mobj_t *target;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_KnockBack", actor))
return;
-#endif
if (!locvar1)
target = actor->target;
@@ -9755,10 +9626,9 @@ void A_PushAway(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *target; // target
angle_t an; // actor to target angle
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_PushAway", actor))
return;
-#endif
if ((!(locvar2 >> 16) && !actor->target) || ((locvar2 >> 16) && !actor->tracer))
return;
@@ -9790,10 +9660,9 @@ void A_RingDrain(mobj_t *actor)
{
INT32 locvar1 = var1;
player_t *player;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RingDrain", actor))
return;
-#endif
if (!actor->target || !actor->target->player)
{
@@ -9823,10 +9692,12 @@ void A_SplitShot(mobj_t *actor)
const UINT16 loc2up = (UINT16)(locvar2 >> 16);
const fixed_t offs = (fixed_t)(locvar1*FRACUNIT);
const fixed_t hoffs = (fixed_t)(loc2up*FRACUNIT);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SplitShot", actor))
return;
-#endif
+
+ if (!actor->target)
+ return;
A_FaceTarget(actor);
{
@@ -9858,10 +9729,10 @@ void A_MissileSplit(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_MissileSplit", actor))
return;
-#endif
+
if (actor->eflags & MFE_VERTICALFLIP)
P_SpawnAlteredDirectionMissile(actor, locvar1, actor->x, actor->y, actor->z+actor->height, locvar2);
else
@@ -9886,10 +9757,9 @@ void A_MultiShot(mobj_t *actor)
const UINT16 loc1up = (UINT16)(locvar1 >> 16);
INT32 count = 0;
fixed_t ad;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_MultiShot", actor))
return;
-#endif
if (actor->target)
A_FaceTarget(actor);
@@ -9948,10 +9818,9 @@ void A_InstaLoop(mobj_t *actor)
const angle_t fa = FixedAngleC(loc1lw*FRACUNIT*360, loc1up*FRACUNIT)>>ANGLETOFINESHIFT;
const fixed_t ac = FINECOSINE(fa);
const fixed_t as = FINESINE(fa);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_InstaLoop", actor))
return;
-#endif
P_InstaThrust(actor, actor->angle, FixedMul(ac, FixedMul(force, actor->scale)));
P_SetObjectMomZ(actor, FixedMul(as, force), false);
@@ -9982,10 +9851,9 @@ void A_Custom3DRotate(mobj_t *actor)
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);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Custom3DRotate", actor))
return;
-#endif
if (actor->target->health == 0)
{
@@ -10042,10 +9910,9 @@ void A_SearchForPlayers(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SearchForPlayers", actor))
return;
-#endif
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
{
@@ -10076,10 +9943,9 @@ void A_CheckRandom(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t chance = FRACUNIT;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_CheckRandom", actor))
return;
-#endif
+
if ((locvar1 & 0xFFFF) == 0)
return;
@@ -10103,10 +9969,9 @@ void A_CheckTargetRings(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckTargetRings", actor))
return;
-#endif
if (!(actor->target) || !(actor->target->player))
return;
@@ -10127,10 +9992,9 @@ void A_CheckRings(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
INT32 i, cntr = 0;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckRings", actor))
return;
-#endif
for (i = 0; i < MAXPLAYERS; i++)
cntr += players[i].rings;
@@ -10152,10 +10016,9 @@ void A_CheckTotalRings(mobj_t *actor)
INT32 locvar2 = var2;
INT32 i, cntr = 0;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckTotalRings", actor))
return;
-#endif
for (i = 0; i < MAXPLAYERS; i++)
cntr += players[i].totalring;
@@ -10175,10 +10038,9 @@ void A_CheckHealth(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckHealth", actor))
return;
-#endif
if (actor->health <= locvar1)
P_SetMobjState(actor, locvar2);
@@ -10198,10 +10060,9 @@ void A_CheckRange(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
fixed_t dist;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckRange", actor))
return;
-#endif
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
return;
@@ -10229,10 +10090,9 @@ void A_CheckHeight(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
fixed_t height;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckHeight", actor))
return;
-#endif
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
return;
@@ -10262,10 +10122,9 @@ void A_CheckTrueRange(mobj_t *actor)
fixed_t height; // vertical range
fixed_t dist; // horizontal range
fixed_t l; // true range
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckTrueRange", actor))
return;
-#endif
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
return;
@@ -10314,10 +10173,9 @@ void A_CheckThingCount(mobj_t *actor)
thinker_t *th;
mobj_t *mo2;
fixed_t dist = 0;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckThingCount", actor))
return;
-#endif
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
{
@@ -10361,10 +10219,8 @@ void A_CheckAmbush(mobj_t *actor)
angle_t atp; // actor to target angle
angle_t an; // angle between at and atp
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_CheckAmbush", actor))
return;
-#endif
if ((!locvar1 && !actor->target) || (locvar1 && !actor->tracer))
return;
@@ -10400,10 +10256,9 @@ void A_CheckCustomValue(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckCustomValue", actor))
return;
-#endif
if (actor->cusval >= locvar1)
P_SetMobjState(actor, locvar2);
@@ -10420,10 +10275,9 @@ void A_CheckCusValMemo(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckCusValMemo", actor))
return;
-#endif
if (actor->cvmem >= locvar1)
P_SetMobjState(actor, locvar2);
@@ -10446,10 +10300,9 @@ void A_SetCustomValue(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetCustomValue", actor))
return;
-#endif
if (cv_debug)
CONS_Printf("Init custom value is %d\n", actor->cusval);
@@ -10497,10 +10350,9 @@ void A_UseCusValMemo(mobj_t *actor)
INT32 temp = actor->cusval; // value being manipulated
INT32 tempM = actor->cvmem; // value used to manipulate temp with
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_UseCusValMemo", actor))
return;
-#endif
if (locvar1 == 1) // cvmem being changed using cusval
{
@@ -10561,10 +10413,9 @@ void A_RelayCustomValue(mobj_t *actor)
INT32 temp; // reference value - var1 lower 16 bits changes this
INT32 tempT; // target's value - changed to tracer if var1 upper 16 bits set, then modified to become final value
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RelayCustomValue", actor))
return;
-#endif
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
return;
@@ -10621,10 +10472,9 @@ void A_CusValAction(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CusValAction", actor))
return;
-#endif
if (locvar2 == 5)
{
@@ -10657,9 +10507,7 @@ void A_CusValAction(mobj_t *actor)
var2 = states[locvar1].var2;
}
-#ifdef HAVE_BLUA
astate = &states[locvar1];
-#endif
states[locvar1].action.acp1(actor);
}
@@ -10675,10 +10523,9 @@ void A_CusValAction(mobj_t *actor)
void A_ForceStop(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ForceStop", actor))
return;
-#endif
actor->momx = actor->momy = 0;
if (locvar1 == 0)
@@ -10696,12 +10543,8 @@ void A_ForceWin(mobj_t *actor)
{
INT32 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_ForceWin", actor))
return;
-#else
- (void)actor;
-#endif
for (i = 0; i < MAXPLAYERS; i++)
{
@@ -10733,10 +10576,9 @@ void A_ForceWin(mobj_t *actor)
void A_SpikeRetract(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SpikeRetract", actor))
return;
-#endif
if (actor->flags & MF_NOBLOCKMAP)
return;
@@ -10818,10 +10660,9 @@ void A_Repeat(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Repeat", actor))
return;
-#endif
if (locvar1 && (!actor->extravalue2 || actor->extravalue2 > locvar1))
actor->extravalue2 = locvar1;
@@ -10844,10 +10685,9 @@ void A_SetScale(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
mobj_t *target;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SetScale", actor))
return;
-#endif
if (locvar1 <= 0)
{
@@ -10888,10 +10728,10 @@ void A_RemoteDamage(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *target; // we MUST have a target
mobj_t *source = NULL; // on the other hand we don't necessarily need a source
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_RemoteDamage", actor))
return;
-#endif
+
if (locvar1 == 1)
target = actor->target;
else if (locvar1 == 2)
@@ -10941,10 +10781,9 @@ void A_HomingChase(mobj_t *actor)
mobj_t *dest;
fixed_t dist;
fixed_t speedmul;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_HomingChase", actor))
return;
-#endif
if (locvar2 == 1)
dest = actor->tracer;
@@ -10995,10 +10834,9 @@ void A_TrapShot(mobj_t *actor)
INT16 vertoff = (INT16)(locvar2 >> 16);
fixed_t x, y, z;
fixed_t speed;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_TrapShot", actor))
return;
-#endif
x = actor->x + P_ReturnThrustX(actor, actor->angle, FixedMul(frontoff*FRACUNIT, actor->scale));
y = actor->y + P_ReturnThrustY(actor, actor->angle, FixedMul(frontoff*FRACUNIT, actor->scale));
@@ -11062,10 +10900,8 @@ void A_VileTarget(mobj_t *actor)
mobjtype_t fogtype;
INT32 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VileTarget", actor))
return;
-#endif
if (!actor->target)
return;
@@ -11151,10 +10987,8 @@ void A_VileAttack(mobj_t *actor)
mobj_t *fire;
INT32 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VileAttack", actor))
return;
-#endif
if (!actor->target)
return;
@@ -11265,10 +11099,8 @@ void A_VileFire(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *dest;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_VileFire", actor))
return;
-#endif
dest = actor->tracer;
if (!dest)
@@ -11353,10 +11185,8 @@ void A_BrakChase(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BrakChase", actor))
return;
-#endif
// Set new tics NOW, in case the state changes while we're doing this and we try applying this to the painstate or something silly
if (actor->tics > 1 && locvar1 < actor->tics) // Not much point, otherwise
@@ -11475,10 +11305,9 @@ void A_BrakFireShot(mobj_t *actor)
fixed_t x, y, z;
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BrakFireShot", actor))
return;
-#endif
+
if (!actor->target)
return;
@@ -11539,10 +11368,8 @@ void A_BrakLobShot(mobj_t *actor)
INT32 locvar2 = var2 & 0x0000FFFF;
INT32 aimDirect = var2 & 0xFFFF0000;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_BrakLobShot", actor))
return;
-#endif
if (!actor->target)
return; // Don't even bother if we've got nothing to aim at.
@@ -11647,10 +11474,8 @@ void A_NapalmScatter(mobj_t *actor)
INT32 i; // for-loop cursor
mobj_t *mo; // each and every spawned napalm burst
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_NapalmScatter", actor))
return;
-#endif
// Some quick sanity-checking
if (typeOfShot >= NUMMOBJTYPES) // I'd add a <0 check, too, but 0x0000FFFF isn't negative in this case
@@ -11701,10 +11526,8 @@ void A_SpawnFreshCopy(mobj_t *actor)
{
mobj_t *newObject;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SpawnFreshCopy", actor))
return;
-#endif
newObject = P_SpawnMobjFromMobj(actor, 0, 0, 0, actor->type);
newObject->flags2 = actor->flags2 & MF2_AMBUSH;
@@ -11778,10 +11601,9 @@ void A_FlickySpawn(mobj_t *actor)
INT32 locvar2 = var2;
INT32 test = (var1 >> 16);
SINT8 moveforward = 0;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickySpawn", actor))
return;
-#endif
if (test & 1)
A_Scream(actor); // A shortcut for the truly lazy.
@@ -11847,10 +11669,9 @@ void A_FlickyCenter(mobj_t *actor)
UINT16 flickytype = (locvar1 & 0xFFFF);
UINT8 flickycolor = ((locvar1 >> 16) & 0xFF);
UINT8 flickyflags = ((locvar1 >> 20) & 0xF);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyCenter", actor))
return;
-#endif
if (!actor->tracer)
{
@@ -11969,10 +11790,8 @@ void A_FlickyAim(mobj_t *actor)
INT32 locvar2 = var2;
boolean flickyhitwall = false;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FlickyAim", actor))
return;
-#endif
if ((actor->momx == actor->momy && actor->momy == 0)
|| (actor->target && P_IsFlickyCenter(actor->target->type)
@@ -12070,10 +11889,10 @@ void A_FlickyFly(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyFly", actor))
return;
-#endif
+
P_InternalFlickyFly(actor, locvar1, locvar2,
FINECOSINE((((actor->fuse % 36) * ANG10) >> ANGLETOFINESHIFT) & FINEMASK)
);
@@ -12090,10 +11909,10 @@ void A_FlickySoar(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickySoar", actor))
return;
-#endif
+
P_InternalFlickyFly(actor, locvar1, locvar2,
2*(FRACUNIT/2 - abs(FINECOSINE((((actor->fuse % 144) * 5*ANG1/2) >> ANGLETOFINESHIFT) & FINEMASK)))
);
@@ -12114,10 +11933,10 @@ void A_FlickyCoast(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyCoast", actor))
return;
-#endif
+
if (actor->eflags & MFE_UNDERWATER)
{
actor->momx = (11*actor->momx)/12;
@@ -12161,10 +11980,10 @@ void A_FlickyHop(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyHop", actor))
return;
-#endif
+
P_InternalFlickyHop(actor, locvar1, locvar2, actor->angle);
}
@@ -12180,10 +11999,10 @@ void A_FlickyFlounder(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
angle_t hopangle;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyFlounder", actor))
return;
-#endif
+
locvar1 *= (P_RandomKey(2) + 1);
locvar2 *= (P_RandomKey(2) + 1);
hopangle = (actor->angle + (P_RandomKey(9) - 4)*ANG2);
@@ -12202,10 +12021,10 @@ void A_FlickyCheck(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyCheck", actor))
return;
-#endif
+
if (actor->target
&& P_IsFlickyCenter(actor->target->type)
&& (actor->target->flags & MF_GRENADEBOUNCE))
@@ -12239,10 +12058,10 @@ void A_FlickyHeightCheck(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyHeightCheck", actor))
return;
-#endif
+
if (actor->target
&& P_IsFlickyCenter(actor->target->type)
&& (actor->target->flags & MF_GRENADEBOUNCE))
@@ -12274,10 +12093,10 @@ void A_FlickyFlutter(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_FlickyFlutter", actor))
return;
-#endif
+
var1 = locvar1;
var2 = locvar2;
A_FlickyCheck(actor);
@@ -12305,13 +12124,9 @@ void A_FlameParticle(mobj_t *actor)
mobjtype_t type = (mobjtype_t)(mobjinfo[actor->type].painchance);
fixed_t rad, hei;
mobj_t *particle;
- //INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FlameParticle", actor))
return;
-#endif
if (!type)
return;
@@ -12337,12 +12152,9 @@ void A_FadeOverlay(mobj_t *actor)
{
mobj_t *fade;
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FadeOverlay", actor))
return;
-#endif
fade = P_SpawnGhostMobj(actor);
fade->frame = actor->frame;
@@ -12382,10 +12194,8 @@ void A_Boss5Jump(mobj_t *actor)
// INT32 locvar1 = var1;
// INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss5Jump", actor))
return;
-#endif
if (!actor->tracer)
return; // Don't even bother if we've got nothing to aim at.
@@ -12461,10 +12271,8 @@ void A_LightBeamReset(mobj_t *actor)
// INT32 locvar1 = var1;
// INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_LightBeamReset", actor))
return;
-#endif
actor->destscale = FRACUNIT + P_SignedRandom()*FRACUNIT/256;
P_SetScale(actor, actor->destscale);
@@ -12493,10 +12301,8 @@ void A_MineExplode(mobj_t *actor)
// INT32 locvar1 = var1;
// INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MineExplode", actor))
return;
-#endif
A_Scream(actor);
actor->flags = MF_NOGRAVITY|MF_NOCLIP;
@@ -12548,10 +12354,8 @@ void A_MineRange(mobj_t *actor)
INT32 locvar1 = var1;
// INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MineRange", actor))
return;
-#endif
if (!actor->target)
return;
@@ -12576,10 +12380,8 @@ void A_ConnectToGround(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_ConnectToGround", actor))
return;
-#endif
if (actor->subsector->sector->ffloors)
P_AdjustMobjFloorZ_FFloors(actor, actor->subsector->sector, 2);
@@ -12636,10 +12438,10 @@ void A_SpawnParticleRelative(mobj_t *actor)
mobj_t *mo;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_SpawnParticleRelative", actor))
return;
-#endif
+
CONS_Debug(DBG_GAMELOGIC, "A_SpawnParticleRelative called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -12674,10 +12476,9 @@ void A_MultiShotDist(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_MultiShotDist", actor))
return;
-#endif
{
UINT8 i;
@@ -12714,10 +12515,9 @@ void A_WhoCaresIfYourSonIsABee(mobj_t *actor)
fixed_t foffsetx;
fixed_t foffsety;
mobj_t *son;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_WhoCaresIfYourSonIsABee", actor))
return;
-#endif
A_FaceTarget(actor);
@@ -12749,11 +12549,9 @@ void A_WhoCaresIfYourSonIsABee(mobj_t *actor)
void A_ParentTriesToSleep(mobj_t *actor)
{
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ParentTriesToSleep", actor))
return;
-#endif
if (actor->extravalue1)
{
@@ -12780,12 +12578,8 @@ void A_ParentTriesToSleep(mobj_t *actor)
//
void A_CryingToMomma(mobj_t *actor)
{
- //INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_CryingToMomma", actor))
return;
-#endif
if (actor->tracer)
actor->tracer->extravalue1++;
@@ -12813,10 +12607,9 @@ void A_CheckFlags2(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_CheckFlags2", actor))
return;
-#endif
if (actor->flags2 & locvar1)
P_SetMobjState(actor, (statenum_t)locvar2);
@@ -12832,14 +12625,12 @@ void A_CheckFlags2(mobj_t *actor)
void A_Boss5FindWaypoint(mobj_t *actor)
{
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
boolean avoidcenter;
UINT32 i;
UINT8 extrainfo = (actor->spawnpoint ? actor->spawnpoint->extrainfo : 0);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5FindWaypoint", actor))
return;
-#endif
avoidcenter = !actor->tracer || (actor->health == actor->info->damage+1);
@@ -12901,8 +12692,8 @@ void A_Boss5FindWaypoint(mobj_t *actor)
else // locvar1 == 0
{
fixed_t hackoffset = P_MobjFlip(actor)*56*FRACUNIT;
- INT32 numwaypoints = 0;
- mobj_t **waypoints;
+ INT32 numfangwaypoints = 0;
+ mobj_t **fangwaypoints;
INT32 key;
actor->z += hackoffset;
@@ -12927,7 +12718,7 @@ void A_Boss5FindWaypoint(mobj_t *actor)
continue;
if (!P_CheckSight(actor, mapthings[i].mobj))
continue;
- numwaypoints++;
+ numfangwaypoints++;
}
// players also count as waypoints apparently
@@ -12949,11 +12740,11 @@ void A_Boss5FindWaypoint(mobj_t *actor)
continue;
if (!P_CheckSight(actor, players[i].mo))
continue;
- numwaypoints++;
+ numfangwaypoints++;
}
}
- if (!numwaypoints)
+ if (!numfangwaypoints)
{
// restore z position
actor->z -= hackoffset;
@@ -12961,8 +12752,8 @@ void A_Boss5FindWaypoint(mobj_t *actor)
}
// allocate the table and reset count to zero
- waypoints = Z_Calloc(sizeof(*waypoints)*numwaypoints, PU_STATIC, NULL);
- numwaypoints = 0;
+ fangwaypoints = Z_Calloc(sizeof(*waypoints)*numfangwaypoints, PU_STATIC, NULL);
+ numfangwaypoints = 0;
// now find them again and add them to the table!
for (i = 0; i < nummapthings; i++)
@@ -12987,7 +12778,7 @@ void A_Boss5FindWaypoint(mobj_t *actor)
}
if (!P_CheckSight(actor, mapthings[i].mobj))
continue;
- waypoints[numwaypoints++] = mapthings[i].mobj;
+ fangwaypoints[numfangwaypoints++] = mapthings[i].mobj;
}
if (actor->extravalue2 > 1)
@@ -13008,25 +12799,25 @@ void A_Boss5FindWaypoint(mobj_t *actor)
continue;
if (!P_CheckSight(actor, players[i].mo))
continue;
- waypoints[numwaypoints++] = players[i].mo;
+ fangwaypoints[numfangwaypoints++] = players[i].mo;
}
}
// restore z position
actor->z -= hackoffset;
- if (!numwaypoints)
+ if (!numfangwaypoints)
{
- Z_Free(waypoints); // free table
+ Z_Free(fangwaypoints); // free table
goto nowaypoints; // ???
}
- key = P_RandomKey(numwaypoints);
+ key = P_RandomKey(numfangwaypoints);
- P_SetTarget(&actor->tracer, waypoints[key]);
+ P_SetTarget(&actor->tracer, fangwaypoints[key]);
if (actor->tracer->type == MT_FANGWAYPOINT)
- actor->tracer->reactiontime = numwaypoints/4; // Monster Iestyn: is this how it should be? I count center waypoints as waypoints unlike the original Lua script
- Z_Free(waypoints); // free table
+ actor->tracer->reactiontime = numfangwaypoints/4; // Monster Iestyn: is this how it should be? I count center waypoints as waypoints unlike the original Lua script
+ Z_Free(fangwaypoints); // free table
}
// now face the tracer you just set!
@@ -13054,10 +12845,9 @@ void A_DoNPCSkid(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
fixed_t x, y, z;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_DoNPCSkid", actor))
return;
-#endif
x = actor->x;
y = actor->y;
@@ -13111,10 +12901,9 @@ void A_DoNPCPain(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t vspeed = 0;
fixed_t hspeed = FixedMul(4*FRACUNIT, actor->scale);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_DoNPCPain", actor))
return;
-#endif
actor->flags &= ~(MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT);
@@ -13160,11 +12949,9 @@ void A_DoNPCPain(mobj_t *actor)
void A_PrepareRepeat(mobj_t *actor)
{
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_PrepareRepeat", actor))
return;
-#endif
actor->extravalue2 = locvar1;
}
@@ -13183,10 +12970,9 @@ void A_Boss5ExtraRepeat(mobj_t *actor)
INT32 calc;
INT32 locspawn;
INT32 lochealth;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5ExtraRepeat", actor))
return;
-#endif
if (actor->extravalue2 > 0 && !(actor->flags2 & MF2_FRET))
return;
@@ -13217,10 +13003,9 @@ void A_Boss5ExtraRepeat(mobj_t *actor)
//
void A_Boss5Calm(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss5Calm", actor))
return;
-#endif
+
actor->flags |= MF_SHOOTABLE;
actor->flags2 &= ~MF2_FRET;
}
@@ -13236,10 +13021,9 @@ void A_Boss5CheckOnGround(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5CheckOnGround", actor))
return;
-#endif
if ((!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz)
|| (actor->eflags & MFE_VERTICALFLIP && actor->z + actor->height >= actor->ceilingz))
@@ -13268,10 +13052,9 @@ void A_Boss5CheckFalling(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5CheckFalling", actor))
return;
-#endif
if (actor->health && actor->extravalue2 > 1)
{
@@ -13298,10 +13081,9 @@ void A_Boss5PinchShot(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t zoffset;
mobj_t *missile;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5PinchShot", actor))
return;
-#endif
if (actor->health > actor->info->damage)
return;
@@ -13334,10 +13116,9 @@ void A_Boss5MakeItRain(mobj_t *actor)
INT32 locvar2 = var2;
INT32 offset = (48 + locvar2)<<16; // upper 16 bits, not fixed_t!
INT32 i;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5MakeItRain", actor))
return;
-#endif
actor->flags2 |= MF2_STRONGBOX;
@@ -13371,10 +13152,9 @@ void A_Boss5MakeJunk(mobj_t *actor)
mobj_t *broked = NULL;
angle_t ang;
INT32 i = ((locvar2 & 1) ? 8 : 1);
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5MakeJunk", actor))
return;
-#endif
if (locvar1 < 0 && (actor->flags2 & MF2_SLIDEPUSH)) // this entire action is a hack, don't judge me
{
@@ -13462,11 +13242,9 @@ void A_Boss5MakeJunk(mobj_t *actor)
void A_LookForBetter(mobj_t *actor)
{
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_LookForBetter", actor))
return;
-#endif
P_LookForPlayers(actor, (locvar1 & 65535), false, FixedMul((locvar1 >> 16)*FRACUNIT, actor->scale));
A_FaceTarget(actor);
@@ -13524,11 +13302,9 @@ static void P_DustRing(mobjtype_t mobjtype, UINT32 div, fixed_t x, fixed_t y, fi
void A_Boss5BombExplode(mobj_t *actor)
{
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_Boss5BombExplode", actor))
return;
-#endif
// The original Lua script did not use |= to add flags but just set these flags exactly apparently?
// (I may modify this later)
@@ -13585,8 +13361,9 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
P_ResetPlayer(player);
A_PlayActiveSound(dustdevil);
}
+ player->powers[pw_carry] = CR_DUSTDEVIL;
player->powers[pw_nocontrol] = 2;
- player->drawangle += ANG20;
+ P_SetTarget(&thing->tracer, dustdevil);
P_SetPlayerMobjState(thing, S_PLAY_PAIN);
if (dist > dragamount)
@@ -13606,7 +13383,9 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
P_ResetPlayer(player);
thing->z = dustdevil->z + dustdevil->height;
thrust = 20 * FRACUNIT;
+ player->powers[pw_carry] = CR_NONE;
player->powers[pw_nocontrol] = 0;
+ P_SetTarget(&thing->tracer, NULL);
S_StartSound(thing, sfx_wdjump);
P_SetPlayerMobjState(thing, S_PLAY_FALL);
}
@@ -13631,10 +13410,8 @@ void A_DustDevilThink(mobj_t *actor)
INT32 bx, by, xl, xh, yl, yh;
fixed_t radius = actor->radius;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_DustDevilThink", actor))
return;
-#endif
//Chained thinker for the spiralling dust column.
while (layer && !P_MobjWasRemoved(layer)) {
@@ -13771,15 +13548,12 @@ static boolean PIT_TNTExplode(mobj_t *nearby)
void A_TNTExplode(mobj_t *actor)
{
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
INT32 x, y;
INT32 xl, xh, yl, yh;
static mappoint_t epicenter = {0,0,0};
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_TNTExplode", actor))
return;
-#endif
if (actor->tracer)
{
@@ -13843,12 +13617,9 @@ void A_TNTExplode(mobj_t *actor)
void A_DebrisRandom(mobj_t *actor)
{
INT32 locvar1 = var1;
- //INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_DebrisRandom", actor))
return;
-#endif
actor->frame |= P_RandomRange(0, locvar1);
var1 = 0;
@@ -13888,10 +13659,8 @@ void A_TrainCameo(mobj_t *actor)
fixed_t span = locvar1*FRACUNIT;
fixed_t len = locvar2*FRACUNIT;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_TrainCameo", actor))
return;
-#endif
//Spawn sides.
P_TrainSeg(actor, x, y + span, z, ang, spr, 0);
@@ -13928,10 +13697,8 @@ void A_TrainCameo2(mobj_t *actor)
fixed_t span = locvar1*FRACUNIT;
fixed_t len = locvar2*FRACUNIT;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_TrainCameo2", actor))
return;
-#endif
//Spawn sides.
P_TrainSeg(actor, x, y + span, z, ang, spr, 0);
@@ -13956,10 +13723,8 @@ void A_CanarivoreGas(mobj_t *actor)
{
INT32 locvar1 = var1;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_CanarivoreGas", actor))
return;
-#endif
P_DustRing(locvar1, 4, actor->x, actor->y, actor->z + actor->height / 5, 18, 0, FRACUNIT/10, actor->scale);
P_DustRing(locvar1, 6, actor->x, actor->y, actor->z + actor->height / 5, 28, FRACUNIT, FRACUNIT/10, actor->scale);
@@ -13979,10 +13744,8 @@ void A_KillSegments(mobj_t *actor)
mobj_t *seg = actor->tracer;
INT32 fuse = locvar1 ? locvar1 : TICRATE/2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_KillSegments", actor))
return;
-#endif
while (seg)
{
@@ -14064,10 +13827,8 @@ void A_SnapperSpawn(mobj_t *actor)
INT32 i;
mobj_t *seg;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SnapperSpawn", actor))
return;
-#endif
// It spawns 1 head.
seg = P_SpawnMobjFromMobj(actor, 0, 0, 0, headtype);
@@ -14116,10 +13877,8 @@ void A_SnapperThinker(mobj_t *actor)
fixed_t dist;
boolean chasing;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SnapperThinker", actor))
return;
-#endif
// We make a check just in case there's no spawnpoint.
if (actor->spawnpoint)
@@ -14239,10 +13998,8 @@ void A_SaloonDoorSpawn(mobj_t *actor)
mobj_t *door;
mobjflag2_t ambush = (actor->flags2 & MF2_AMBUSH);
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SaloonDoorSpawn", actor))
return;
-#endif
if (!locvar1)
return;
@@ -14278,10 +14035,8 @@ void A_MinecartSparkThink(mobj_t *actor)
fixed_t dz, dm;
UINT8 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_MinecartSparkThink", actor))
return;
-#endif
if (actor->momz == 0 && P_IsObjectOnGround(actor))
actor->momz = P_RandomRange(2, 4)*FRACUNIT;
@@ -14313,10 +14068,9 @@ void A_ModuloToState(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
+
if (LUA_CallAction("A_ModuloToState", actor))
return;
-#endif
if ((modulothing % locvar1 == 0))
P_SetMobjState(actor, (locvar2));
@@ -14334,10 +14088,8 @@ void A_LavafallRocks(mobj_t *actor)
{
UINT8 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_LavafallRocks", actor))
return;
-#endif
// Don't spawn rocks unless a player is relatively close by.
for (i = 0; i < MAXPLAYERS; ++i)
@@ -14367,10 +14119,8 @@ void A_LavafallLava(mobj_t *actor)
mobj_t *lavafall;
UINT8 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_LavafallLava", actor))
return;
-#endif
if ((40 - actor->fuse) % (2*(actor->scale >> FRACBITS)))
return;
@@ -14397,10 +14147,8 @@ void A_LavafallLava(mobj_t *actor)
//
void A_FallingLavaCheck(mobj_t *actor)
{
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FallingLavaCheck", actor))
return;
-#endif
if (actor->eflags & MFE_TOUCHWATER || P_IsObjectOnGround(actor))
{
@@ -14424,10 +14172,8 @@ void A_FireShrink(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_FireShrink", actor))
return;
-#endif
actor->destscale = locvar1;
actor->scalespeed = FRACUNIT/locvar2;
@@ -14450,10 +14196,8 @@ void A_SpawnPterabytes(mobj_t *actor)
UINT8 amount = 1;
UINT8 i;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_SpawnPterabytes", actor))
return;
-#endif
if (actor->spawnpoint)
amount = actor->spawnpoint->extrainfo + 1;
@@ -14487,10 +14231,8 @@ void A_PterabyteHover(mobj_t *actor)
{
angle_t ang, fa;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_PterabyteHover", actor))
return;
-#endif
P_InstaThrust(actor, actor->angle, actor->info->speed);
actor->angle += ANG1;
@@ -14511,10 +14253,8 @@ void A_RolloutSpawn(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_RolloutSpawn", actor))
return;
-#endif
if (!(actor->target)
|| P_MobjWasRemoved(actor->target)
@@ -14549,10 +14289,8 @@ void A_RolloutRock(mobj_t *actor)
fixed_t speed = P_AproxDistance(actor->momx, actor->momy), topspeed = FixedMul(actor->info->speed, actor->scale);
boolean inwater = actor->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER);
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_RolloutRock", actor))
return;
-#endif
actor->friction = FRACUNIT; // turns out riding on solids sucks, so let's just make it easier on ourselves
@@ -14634,10 +14372,8 @@ void A_DragonbomberSpawn(mobj_t *actor)
UINT8 i;
mobj_t *mo = actor;
- #ifdef HAVE_BLUA
- if (LUA_CallAction("A_DragonbomberSpawn", actor))
- return;
- #endif
+ if (LUA_CallAction("A_DragonbomberSpawn", actor))
+ return;
for (i = 0; i < var1; i++) // spawn tail segments
{
@@ -14672,10 +14408,8 @@ void A_DragonWing(mobj_t *actor)
mobj_t *target = actor->target;
fixed_t x, y;
- #ifdef HAVE_BLUA
- if (LUA_CallAction("A_DragonWing", actor))
- return;
- #endif
+ if (LUA_CallAction("A_DragonWing", actor))
+ return;
if (target == NULL || !target->health)
{
@@ -14707,10 +14441,8 @@ void A_DragonSegment(mobj_t *actor)
fixed_t ydist;
fixed_t zdist;
- #ifdef HAVE_BLUA
- if (LUA_CallAction("A_DragonSegment", actor))
- return;
- #endif
+ if (LUA_CallAction("A_DragonSegment", actor))
+ return;
if (target == NULL || !target->health)
{
@@ -14730,3 +14462,43 @@ void A_DragonSegment(mobj_t *actor)
actor->angle = hangle;
P_TeleportMove(actor, target->x + xdist, target->y + ydist, target->z + zdist);
}
+
+// Function: A_ChangeHeight
+//
+// Description: Changes the actor's height by var1
+//
+// var1 = height
+// var2 =
+// &1: height is absolute
+// &2: scale with actor's scale
+//
+void A_ChangeHeight(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+ fixed_t height = locvar1;
+ boolean reverse;
+
+ if (LUA_CallAction("A_ChangeHeight", actor))
+ return;
+
+ reverse = (actor->eflags & MFE_VERTICALFLIP) || (actor->flags2 & MF2_OBJECTFLIP);
+
+ if (locvar2 & 2)
+ height = FixedMul(height, actor->scale);
+
+ P_UnsetThingPosition(actor);
+ if (locvar2 & 1)
+ {
+ if (reverse)
+ actor->z += actor->height - locvar1;
+ actor->height = locvar1;
+ }
+ else
+ {
+ if (reverse)
+ actor->z -= locvar1;
+ actor->height += locvar1;
+ }
+ P_SetThingPosition(actor);
+}
diff --git a/src/p_floor.c b/src/p_floor.c
index 9c5ab9057f07b831fa94f3936df50b348cf82ac8..a0f7edd9ca0e68617b1eede0441c5a14a2dbe549 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -15,9 +15,7 @@
#include "doomstat.h"
#include "m_random.h"
#include "p_local.h"
-#ifdef ESLOPE
#include "p_slopes.h"
-#endif
#include "r_state.h"
#include "s_sound.h"
#include "z_zone.h"
@@ -28,246 +26,129 @@
// FLOORS
// ==========================================================================
-//
-// Mini-P_IsObjectOnGroundIn for T_MovePlane hack
-//
-static inline boolean P_MobjReadyToMove(mobj_t *mo, sector_t *sec, boolean sectorisffloor, boolean sectorisquicksand)
-{
- if (sectorisquicksand)
- return (mo->z > sec->floorheight && mo->z < sec->ceilingheight);
- else if (!!(mo->flags & MF_SPAWNCEILING) ^ !!(mo->eflags & MFE_VERTICALFLIP))
- return ((sectorisffloor) ? (mo->z+mo->height != sec->floorheight) : (mo->z+mo->height != sec->ceilingheight));
- else
- return ((sectorisffloor) ? (mo->z != sec->ceilingheight) : (mo->z != sec->floorheight));
-}
-
//
// Move a plane (floor or ceiling) and check for crushing
//
result_e T_MovePlane(sector_t *sector, fixed_t speed, fixed_t dest, boolean crush,
- INT32 floorOrCeiling, INT32 direction)
+ boolean ceiling, INT32 direction)
{
- boolean flag;
fixed_t lastpos;
fixed_t destheight; // used to keep floors/ceilings from moving through each other
- // Stuff used for mobj hacks.
- INT32 secnum = -1;
- mobj_t *mo = NULL;
- sector_t *sec = NULL;
- ffloor_t *rover = NULL;
- boolean sectorisffloor = false;
- boolean sectorisquicksand = false;
-
sector->moved = true;
- switch (floorOrCeiling)
+ if (ceiling)
{
- case 0:
- // moving a floor
- switch (direction)
- {
- case -1:
- // Moving a floor down
- if (sector->floorheight - speed < dest)
- {
- lastpos = sector->floorheight;
- sector->floorheight = dest;
- flag = P_CheckSector(sector, crush);
- if (flag && sector->numattached)
- {
- sector->floorheight = lastpos;
- P_CheckSector(sector, crush);
- }
- return pastdest;
- }
- else
- {
- lastpos = sector->floorheight;
- sector->floorheight -= speed;
- flag = P_CheckSector(sector, crush);
- if (flag && sector->numattached)
- {
- sector->floorheight = lastpos;
- P_CheckSector(sector, crush);
- return crushed;
- }
- }
- break;
-
- case 1:
- // Moving a floor up
- // keep floor from moving through ceilings
- destheight = (dest < sector->ceilingheight) ? dest : sector->ceilingheight;
- if (sector->floorheight + speed > destheight)
+ lastpos = sector->ceilingheight;
+ // moving a ceiling
+ switch (direction)
+ {
+ case -1:
+ // moving a ceiling down
+ // keep ceiling from moving through floors
+ destheight = (dest > sector->floorheight) ? dest : sector->floorheight;
+ if (sector->ceilingheight - speed < destheight)
+ {
+ sector->ceilingheight = destheight;
+ if (P_CheckSector(sector, crush))
{
- lastpos = sector->floorheight;
- sector->floorheight = destheight;
- flag = P_CheckSector(sector, crush);
- if (flag)
- {
- sector->floorheight = lastpos;
- P_CheckSector(sector, crush);
- }
- return pastdest;
+ sector->ceilingheight = lastpos;
+ P_CheckSector(sector, crush);
}
- else
+ return pastdest;
+ }
+ else
+ {
+ // crushing is possible
+ sector->ceilingheight -= speed;
+ if (P_CheckSector(sector, crush))
{
- // crushing is possible
- lastpos = sector->floorheight;
- sector->floorheight += speed;
- flag = P_CheckSector(sector, crush);
- if (flag)
- {
- sector->floorheight = lastpos;
- P_CheckSector(sector, crush);
- return crushed;
- }
+ sector->ceilingheight = lastpos;
+ P_CheckSector(sector, crush);
+ return crushed;
}
- break;
- }
- break;
+ }
+ break;
- case 1:
- // moving a ceiling
- switch (direction)
- {
- case -1:
- // moving a ceiling down
- // keep ceiling from moving through floors
- destheight = (dest > sector->floorheight) ? dest : sector->floorheight;
- if (sector->ceilingheight - speed < destheight)
+ case 1:
+ // moving a ceiling up
+ if (sector->ceilingheight + speed > dest)
+ {
+ sector->ceilingheight = dest;
+ if (P_CheckSector(sector, crush) && sector->numattached)
{
- lastpos = sector->ceilingheight;
- sector->ceilingheight = destheight;
- flag = P_CheckSector(sector, crush);
-
- if (flag)
- {
- sector->ceilingheight = lastpos;
- P_CheckSector(sector, crush);
- }
- return pastdest;
+ sector->ceilingheight = lastpos;
+ P_CheckSector(sector, crush);
}
- else
+ return pastdest;
+ }
+ else
+ {
+ sector->ceilingheight += speed;
+ if (P_CheckSector(sector, crush) && sector->numattached)
{
- // crushing is possible
- lastpos = sector->ceilingheight;
- sector->ceilingheight -= speed;
- flag = P_CheckSector(sector, crush);
-
- if (flag)
- {
- sector->ceilingheight = lastpos;
- P_CheckSector(sector, crush);
- return crushed;
- }
+ sector->ceilingheight = lastpos;
+ P_CheckSector(sector, crush);
+ return crushed;
}
- break;
-
- case 1:
- // moving a ceiling up
- if (sector->ceilingheight + speed > dest)
+ }
+ break;
+ }
+ }
+ else
+ {
+ lastpos = sector->floorheight;
+ // moving a floor
+ switch (direction)
+ {
+ case -1:
+ // Moving a floor down
+ if (sector->floorheight - speed < dest)
+ {
+ sector->floorheight = dest;
+ if (P_CheckSector(sector, crush) && sector->numattached)
{
- lastpos = sector->ceilingheight;
- sector->ceilingheight = dest;
- flag = P_CheckSector(sector, crush);
- if (flag && sector->numattached)
- {
- sector->ceilingheight = lastpos;
- P_CheckSector(sector, crush);
- }
- return pastdest;
+ sector->floorheight = lastpos;
+ P_CheckSector(sector, crush);
}
- else
+ return pastdest;
+ }
+ else
+ {
+ sector->floorheight -= speed;
+ if (P_CheckSector(sector, crush) && sector->numattached)
{
- lastpos = sector->ceilingheight;
- sector->ceilingheight += speed;
- flag = P_CheckSector(sector, crush);
- if (flag && sector->numattached)
- {
- sector->ceilingheight = lastpos;
- P_CheckSector(sector, crush);
- return crushed;
- }
+ sector->floorheight = lastpos;
+ P_CheckSector(sector, crush);
+ return crushed;
}
- break;
- }
- break;
- }
-
- // Hack for buggy mobjs to move by gravity with moving planes.
- if (sector->tagline)
- sectorisffloor = true;
-
- // Optimization condition. If the sector is not an FOF, declare sec as the main sector outside of the loop.
- if (!sectorisffloor)
- sec = sector;
-
- // Optimization condition. Only run the logic if there is any Things in the sector.
- if (sectorisffloor || sec->thinglist)
- {
- // If this is an FOF being checked, check all the affected sectors for moving mobjs.
- while ((sectorisffloor ? (secnum = P_FindSectorFromLineTag(sector->tagline, secnum)) : (secnum = 1)) >= 0)
- {
- if (sectorisffloor)
- {
- // Get actual sector from the list of sectors.
- sec = §ors[secnum];
+ }
+ break;
- // Can't use P_InQuicksand because it will return the incorrect result
- // because of checking for heights.
- for (rover = sec->ffloors; rover; rover = rover->next)
+ case 1:
+ // Moving a floor up
+ // keep floor from moving through ceilings
+ destheight = (dest < sector->ceilingheight) ? dest : sector->ceilingheight;
+ if (sector->floorheight + speed > destheight)
{
- if (rover->target == sec && (rover->flags & FF_QUICKSAND))
+ sector->floorheight = destheight;
+ if (P_CheckSector(sector, crush))
{
- sectorisquicksand = true;
- break;
+ sector->floorheight = lastpos;
+ P_CheckSector(sector, crush);
}
+ return pastdest;
}
- }
-
- for (mo = sec->thinglist; mo; mo = mo->snext)
- {
- // The object should be ready to move as defined by this function.
- if (!P_MobjReadyToMove(mo, sec, sectorisffloor, sectorisquicksand))
- continue;
-
- // The object should not be moving at all.
- if (mo->momx || mo->momy || mo->momz)
- continue;
-
- // These objects will be affected by this condition.
- switch (mo->type)
+ else
{
- case MT_GOOP: // Egg Slimer's goop objects
- case MT_SPINFIRE: // Elemental Shield flame balls
- case MT_SPIKE: // Floor Spike
- // Is the object hang from the ceiling?
- // In that case, swap the planes used.
- // verticalflip inverts
- if (!!(mo->flags & MF_SPAWNCEILING) ^ !!(mo->eflags & MFE_VERTICALFLIP))
- {
- if (sectorisffloor && !sectorisquicksand)
- mo->z = mo->ceilingz - mo->height;
- else
- mo->z = mo->ceilingz = mo->subsector->sector->ceilingheight - mo->height;
- }
- else
- {
- if (sectorisffloor && !sectorisquicksand)
- mo->z = mo->floorz;
- else
- mo->z = mo->floorz = mo->subsector->sector->floorheight;
- }
- break;
- // Kill warnings...
- default:
- break;
+ // crushing is possible
+ sector->floorheight += speed;
+ if (P_CheckSector(sector, crush))
+ {
+ sector->floorheight = lastpos;
+ P_CheckSector(sector, crush);
+ return crushed;
+ }
}
- }
-
- // Break from loop if there is no FOFs to check.
- if (!sectorisffloor)
break;
}
}
@@ -292,7 +173,7 @@ void T_MoveFloor(floormove_t *movefloor)
res = T_MovePlane(movefloor->sector,
movefloor->speed,
movefloor->floordestheight,
- movefloor->crush, 0, movefloor->direction);
+ movefloor->crush, false, movefloor->direction);
if (movefloor->type == bounceFloor)
{
@@ -485,7 +366,7 @@ void T_MoveElevator(elevator_t *elevator)
elevator->speed,
elevator->ceilingdestheight,
elevator->distance,
- 1, // move floor
+ true, // move ceiling
elevator->direction
);
@@ -495,7 +376,7 @@ void T_MoveElevator(elevator_t *elevator)
elevator->speed,
elevator->floordestheight,
elevator->distance,
- 0, // move ceiling
+ false, // move floor
elevator->direction
);
@@ -547,7 +428,7 @@ void T_MoveElevator(elevator_t *elevator)
elevator->speed,
elevator->floordestheight,
elevator->distance,
- 0, // move ceiling
+ false, // move floor
elevator->direction
);
@@ -559,7 +440,7 @@ void T_MoveElevator(elevator_t *elevator)
elevator->speed,
elevator->ceilingdestheight,
elevator->distance,
- 1, // move floor
+ true, // move ceiling
elevator->direction
);
}
@@ -680,43 +561,18 @@ void T_MoveElevator(elevator_t *elevator)
//
// Useful for things like intermittent falling lava.
//
-void T_ContinuousFalling(levelspecthink_t *faller)
+void T_ContinuousFalling(continuousfall_t *faller)
{
-#define speed vars[0]
-#define direction vars[1]
-#define floorwasheight vars[2]
-#define ceilingwasheight vars[3]
-#define floordestheight vars[4]
-#define ceilingdestheight vars[5]
-
- if (faller->direction == -1)
- {
- faller->sector->ceilingheight -= faller->speed;
- faller->sector->floorheight -= faller->speed;
- }
- else
- {
- faller->sector->ceilingheight += faller->speed;
- faller->sector->floorheight += faller->speed;
- }
+ faller->sector->ceilingheight += faller->speed*faller->direction;
+ faller->sector->floorheight += faller->speed*faller->direction;
P_CheckSector(faller->sector, false);
- if (faller->direction == -1) // Down
+ if ((faller->direction == -1 && faller->sector->ceilingheight <= faller->destheight)
+ || (faller->direction == 1 && faller->sector->floorheight >= faller->destheight))
{
- if (faller->sector->ceilingheight <= faller->ceilingdestheight) // if destination height acheived
- {
- faller->sector->ceilingheight = faller->ceilingwasheight;
- faller->sector->floorheight = faller->floorwasheight;
- }
- }
- else // Up
- {
- if (faller->sector->floorheight >= faller->floordestheight) // if destination height acheived
- {
- faller->sector->ceilingheight = faller->ceilingwasheight;
- faller->sector->floorheight = faller->floorwasheight;
- }
+ faller->sector->ceilingheight = faller->ceilingstartheight;
+ faller->sector->floorheight = faller->floorstartheight;
}
P_CheckSector(faller->sector, false); // you might think this is irrelevant. you would be wrong
@@ -724,12 +580,6 @@ void T_ContinuousFalling(levelspecthink_t *faller)
faller->sector->floorspeed = faller->speed*faller->direction;
faller->sector->ceilspeed = 42;
faller->sector->moved = true;
-#undef speed
-#undef direction
-#undef floorwasheight
-#undef ceilingwasheight
-#undef floordestheight
-#undef ceilingdestheight
}
//
@@ -775,23 +625,20 @@ static fixed_t P_SectorCheckWater(sector_t *analyzesector,
//////////////////////////////////////////////////
// Bounces a floating cheese
-void T_BounceCheese(levelspecthink_t *bouncer)
+void T_BounceCheese(bouncecheese_t *bouncer)
{
-#define speed vars[0]
-#define distance vars[1]
-#define low vars[2]
-#define ceilingwasheight vars[3]
-#define floorwasheight vars[4]
+ fixed_t sectorheight;
fixed_t halfheight;
fixed_t waterheight;
fixed_t floorheight;
sector_t *actionsector;
INT32 i;
+ boolean remove;
- if (bouncer->sector->crumblestate == 4 || bouncer->sector->crumblestate == 1
- || bouncer->sector->crumblestate == 2) // Oops! Crumbler says to remove yourself!
+ if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT
+ || bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself!
{
- bouncer->sector->crumblestate = 1;
+ bouncer->sector->crumblestate = CRUMBLE_WAIT;
bouncer->sector->ceilingdata = NULL;
bouncer->sector->ceilspeed = 0;
bouncer->sector->floordata = NULL;
@@ -806,35 +653,39 @@ void T_BounceCheese(levelspecthink_t *bouncer)
actionsector = §ors[i];
actionsector->moved = true;
- halfheight = abs(bouncer->sector->ceilingheight - bouncer->sector->floorheight) >> 1;
+ sectorheight = abs(bouncer->sector->ceilingheight - bouncer->sector->floorheight);
+ halfheight = sectorheight/2;
waterheight = P_SectorCheckWater(actionsector, bouncer->sector); // sorts itself out if there's no suitable water in the sector
- floorheight = P_FloorzAtPos(actionsector->soundorg.x, actionsector->soundorg.y, bouncer->sector->floorheight, halfheight << 1);
+ floorheight = P_FloorzAtPos(actionsector->soundorg.x, actionsector->soundorg.y, bouncer->sector->floorheight, sectorheight);
+
+ remove = false;
// Water level is up to the ceiling.
if (waterheight > bouncer->sector->ceilingheight - halfheight && bouncer->sector->ceilingheight >= actionsector->ceilingheight) // Tails 01-08-2004
{
bouncer->sector->ceilingheight = actionsector->ceilingheight;
- bouncer->sector->floorheight = bouncer->sector->ceilingheight - (halfheight*2);
- T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
- T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
- P_RecalcPrecipInSector(actionsector);
- bouncer->sector->ceilingdata = NULL;
- bouncer->sector->floordata = NULL;
- bouncer->sector->floorspeed = 0;
- bouncer->sector->ceilspeed = 0;
- bouncer->sector->moved = true;
- P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
- return;
+ bouncer->sector->floorheight = actionsector->ceilingheight - sectorheight;
+ remove = true;
}
// Water level is too shallow.
else if (waterheight < bouncer->sector->floorheight + halfheight && bouncer->sector->floorheight <= floorheight)
{
- bouncer->sector->ceilingheight = floorheight + (halfheight << 1);
+ bouncer->sector->ceilingheight = floorheight + sectorheight;
bouncer->sector->floorheight = floorheight;
- T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
- T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
+ remove = true;
+ }
+ else
+ {
+ bouncer->ceilingwasheight = waterheight + halfheight;
+ bouncer->floorwasheight = waterheight - halfheight;
+ }
+
+ if (remove)
+ {
+ T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, false, true, -1); // update things on ceiling
+ T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, false, false, -1); // update things on floor
P_RecalcPrecipInSector(actionsector);
bouncer->sector->ceilingdata = NULL;
bouncer->sector->floordata = NULL;
@@ -844,43 +695,34 @@ void T_BounceCheese(levelspecthink_t *bouncer)
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
return;
}
+
+ if (bouncer->speed >= 0) // move floor first to fix height desync and any bizarre bugs following that
+ {
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
+ false, false, -1); // move floor
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->ceilingheight -
+ 70*FRACUNIT, false, true, -1); // move ceiling
+ }
else
{
- bouncer->ceilingwasheight = waterheight + halfheight;
- bouncer->floorwasheight = waterheight - halfheight;
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->ceilingheight -
+ 70*FRACUNIT, false, true, -1); // move ceiling
+ T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
+ false, false, -1); // move floor
}
- T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->ceilingheight -
- 70*FRACUNIT, 0, 1, -1); // move ceiling
- T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
- 0, 0, -1); // move floor
-
bouncer->sector->floorspeed = -bouncer->speed/2;
bouncer->sector->ceilspeed = 42;
- if (bouncer->sector->ceilingheight < bouncer->ceilingwasheight && bouncer->low == 0) // Down
- {
- if (abs(bouncer->speed) < 6*FRACUNIT)
- bouncer->speed -= bouncer->speed/3;
- else
- bouncer->speed -= bouncer->speed/2;
-
- bouncer->low = 1;
- if (abs(bouncer->speed) > 6*FRACUNIT)
- {
- mobj_t *mp = (void *)&actionsector->soundorg;
- actionsector->soundorg.z = bouncer->sector->floorheight;
- S_StartSound(mp, sfx_splash);
- }
- }
- else if (bouncer->sector->ceilingheight > bouncer->ceilingwasheight && bouncer->low) // Up
+ if ((bouncer->sector->ceilingheight < bouncer->ceilingwasheight && !bouncer->low) // Down
+ || (bouncer->sector->ceilingheight > bouncer->ceilingwasheight && bouncer->low)) // Up
{
if (abs(bouncer->speed) < 6*FRACUNIT)
bouncer->speed -= bouncer->speed/3;
else
bouncer->speed -= bouncer->speed/2;
- bouncer->low = 0;
+ bouncer->low = !bouncer->low;
if (abs(bouncer->speed) > 6*FRACUNIT)
{
mobj_t *mp = (void *)&actionsector->soundorg;
@@ -903,8 +745,8 @@ void T_BounceCheese(levelspecthink_t *bouncer)
{
bouncer->sector->floorheight = bouncer->floorwasheight;
bouncer->sector->ceilingheight = bouncer->ceilingwasheight;
- T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
- T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
+ T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, false, true, -1); // update things on ceiling
+ T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, false, false, -1); // update things on floor
bouncer->sector->ceilingdata = NULL;
bouncer->sector->floordata = NULL;
bouncer->sector->floorspeed = 0;
@@ -919,27 +761,13 @@ void T_BounceCheese(levelspecthink_t *bouncer)
if (actionsector)
P_RecalcPrecipInSector(actionsector);
}
-#undef speed
-#undef distance
-#undef low
-#undef ceilingwasheight
-#undef floorwasheight
}
//////////////////////////////////////////////////
// T_StartCrumble ////////////////////////////////
//////////////////////////////////////////////////
// Crumbling platform Tails 03-11-2002
-//
-// DEFINITION OF THE 'CRUMBLESTATE'S:
-//
-// 0 - No crumble thinker
-// 1 - Don't float on water because this is supposed to wait for a crumble
-// 2 - Crumble thinker activated, but hasn't fallen yet
-// 3 - Crumble thinker is falling
-// 4 - Crumble thinker is about to restore to original position
-//
-void T_StartCrumble(elevator_t *elevator)
+void T_StartCrumble(crumble_t *crumble)
{
ffloor_t *rover;
sector_t *sector;
@@ -947,84 +775,96 @@ void T_StartCrumble(elevator_t *elevator)
// Once done, the no-return thinker just sits there,
// constantly 'returning'... kind of an oxymoron, isn't it?
- if (((elevator->floordestheight == 1 && elevator->direction == -1)
- || (elevator->floordestheight == 0 && elevator->direction == 1))
- && elevator->type == elevateContinuous) // No return crumbler
+ if ((((crumble->flags & CF_REVERSE) && crumble->direction == -1)
+ || (!(crumble->flags & CF_REVERSE) && crumble->direction == 1))
+ && !(crumble->flags & CF_RETURN))
{
- elevator->sector->ceilspeed = 0;
- elevator->sector->floorspeed = 0;
+ crumble->sector->ceilspeed = 0;
+ crumble->sector->floorspeed = 0;
return;
}
- if (elevator->distance != 0)
+ if (crumble->timer != 0)
{
- if (elevator->distance > 0) // Count down the timer
+ if (crumble->timer > 0) // Count down the timer
{
- elevator->distance--;
- if (elevator->distance <= 0)
- elevator->distance = -15*TICRATE; // Timer until platform returns to original position.
+ if (--crumble->timer <= 0)
+ crumble->timer = -15*TICRATE; // Timer until platform returns to original position.
else
{
// Timer isn't up yet, so just keep waiting.
- elevator->sector->ceilspeed = 0;
- elevator->sector->floorspeed = 0;
+ crumble->sector->ceilspeed = 0;
+ crumble->sector->floorspeed = 0;
return;
}
}
- else if (++elevator->distance == 0) // Reposition back to original spot
+ else if (++crumble->timer == 0) // Reposition back to original spot
{
- for (i = -1; (i = P_FindSectorFromTag(elevator->sourceline->tag, i)) >= 0 ;)
+ for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
{
sector = §ors[i];
for (rover = sector->ffloors; rover; rover = rover->next)
{
- if (rover->flags & FF_CRUMBLE && rover->flags & FF_FLOATBOB
- && rover->master == elevator->sourceline)
- {
- rover->alpha = elevator->origspeed;
+ if (!(rover->flags & FF_CRUMBLE))
+ continue;
- if (rover->alpha == 0xff)
- rover->flags &= ~FF_TRANSLUCENT;
- }
+ if (!(rover->flags & FF_FLOATBOB))
+ continue;
+
+ if (rover->master != crumble->sourceline)
+ continue;
+
+ rover->alpha = crumble->origalpha;
+
+ if (rover->alpha == 0xff)
+ rover->flags &= ~FF_TRANSLUCENT;
}
}
// Up!
- if (elevator->floordestheight == 1)
- elevator->direction = -1;
+ if (crumble->flags & CF_REVERSE)
+ crumble->direction = -1;
else
- elevator->direction = 1;
+ crumble->direction = 1;
- elevator->sector->ceilspeed = 0;
- elevator->sector->floorspeed = 0;
+ crumble->sector->ceilspeed = 0;
+ crumble->sector->floorspeed = 0;
return;
}
// Flash to indicate that the platform is about to return.
- if (elevator->distance > -224 && (leveltime % ((abs(elevator->distance)/8) + 1) == 0))
+ if (crumble->timer > -224 && (leveltime % ((abs(crumble->timer)/8) + 1) == 0))
{
- for (i = -1; (i = P_FindSectorFromTag(elevator->sourceline->tag, i)) >= 0 ;)
+ for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
{
sector = §ors[i];
for (rover = sector->ffloors; rover; rover = rover->next)
{
- if (!(rover->flags & FF_NORETURN) && rover->flags & FF_CRUMBLE && rover->flags & FF_FLOATBOB
- && rover->master == elevator->sourceline)
+ if (rover->flags & FF_NORETURN)
+ continue;
+
+ if (!(rover->flags & FF_CRUMBLE))
+ continue;
+
+ if (!(rover->flags & FF_FLOATBOB))
+ continue;
+
+ if (rover->master != crumble->sourceline)
+ continue;
+
+ if (rover->alpha == crumble->origalpha)
+ {
+ rover->flags |= FF_TRANSLUCENT;
+ rover->alpha = 0x00;
+ }
+ else
{
- if (rover->alpha == elevator->origspeed)
- {
- rover->flags |= FF_TRANSLUCENT;
- rover->alpha = 0x00;
- }
- else
- {
- if (elevator->origspeed == 0xff)
- rover->flags &= ~FF_TRANSLUCENT;
-
- rover->alpha = elevator->origspeed;
- }
+ rover->alpha = crumble->origalpha;
+
+ if (rover->alpha == 0xff)
+ rover->flags &= ~FF_TRANSLUCENT;
}
}
}
@@ -1033,74 +873,62 @@ void T_StartCrumble(elevator_t *elevator)
// We're about to go back to the original position,
// so set this to let other thinkers know what is
// about to happen.
- if (elevator->distance < 0 && elevator->distance > -3)
- elevator->sector->crumblestate = 4; // makes T_BounceCheese remove itself
+ if (crumble->timer < 0 && crumble->timer > -3)
+ crumble->sector->crumblestate = CRUMBLE_RESTORE; // makes T_BounceCheese remove itself
}
- if ((elevator->floordestheight == 0 && elevator->direction == -1)
- || (elevator->floordestheight == 1 && elevator->direction == 1)) // Down
+ if ((!(crumble->flags & CF_REVERSE) && crumble->direction == -1)
+ || ((crumble->flags & CF_REVERSE) && crumble->direction == 1)) // Down
{
- elevator->sector->crumblestate = 3; // Allow floating now.
+ crumble->sector->crumblestate = CRUMBLE_FALL; // Allow floating now.
// Only fall like this if it isn't meant to float on water
- if (elevator->high != 42)
+ if (!(crumble->flags & CF_FLOATBOB))
{
- elevator->speed += gravity; // Gain more and more speed
+ crumble->speed += gravity; // Gain more and more speed
- if ((elevator->floordestheight == 0 && !(elevator->sector->ceilingheight < -16384*FRACUNIT))
- || (elevator->floordestheight == 1 && !(elevator->sector->ceilingheight > 16384*FRACUNIT)))
+ if ((!(crumble->flags & CF_REVERSE) && crumble->sector->ceilingheight >= -16384*FRACUNIT)
+ || ((crumble->flags & CF_REVERSE) && crumble->sector->ceilingheight <= 16384*FRACUNIT))
{
- fixed_t dest;
-
- if (elevator->floordestheight == 1)
- dest = elevator->sector->ceilingheight + (elevator->speed*2);
- else
- dest = elevator->sector->ceilingheight - (elevator->speed*2);
-
T_MovePlane //jff 4/7/98 reverse order of ceiling/floor
(
- elevator->sector,
- elevator->speed,
- dest,
- 0,
- 1, // move floor
- elevator->direction
+ crumble->sector,
+ crumble->speed,
+ crumble->sector->ceilingheight + crumble->direction*crumble->speed*2,
+ false,
+ true, // move ceiling
+ crumble->direction
);
- if (elevator->floordestheight == 1)
- dest = elevator->sector->floorheight + (elevator->speed*2);
- else
- dest = elevator->sector->floorheight - (elevator->speed*2);
-
- T_MovePlane
- (
- elevator->sector,
- elevator->speed,
- dest,
- 0,
- 0, // move ceiling
- elevator->direction
+ T_MovePlane
+ (
+ crumble->sector,
+ crumble->speed,
+ crumble->sector->floorheight + crumble->direction*crumble->speed*2,
+ false,
+ false, // move floor
+ crumble->direction
);
- elevator->sector->ceilspeed = 42;
- elevator->sector->floorspeed = elevator->speed*elevator->direction;
+ crumble->sector->ceilspeed = 42;
+ crumble->sector->floorspeed = crumble->speed*crumble->direction;
}
}
}
else // Up (restore to original position)
{
- elevator->sector->crumblestate = 1;
- elevator->sector->ceilingheight = elevator->ceilingwasheight;
- elevator->sector->floorheight = elevator->floorwasheight;
- elevator->sector->floordata = NULL;
- elevator->sector->ceilingdata = NULL;
- elevator->sector->ceilspeed = 0;
- elevator->sector->floorspeed = 0;
- elevator->sector->moved = true;
- P_RemoveThinker(&elevator->thinker);
+ crumble->sector->crumblestate = CRUMBLE_WAIT;
+ crumble->sector->ceilingheight = crumble->ceilingwasheight;
+ crumble->sector->floorheight = crumble->floorwasheight;
+ crumble->sector->floordata = NULL;
+ crumble->sector->ceilingdata = NULL;
+ crumble->sector->ceilspeed = 0;
+ crumble->sector->floorspeed = 0;
+ crumble->sector->moved = true;
+ P_RemoveThinker(&crumble->thinker);
}
- for (i = -1; (i = P_FindSectorFromTag(elevator->sourceline->tag, i)) >= 0 ;)
+ for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
{
sector = §ors[i];
sector->moved = true;
@@ -1113,24 +941,17 @@ void T_StartCrumble(elevator_t *elevator)
//////////////////////////////////////////////////
// Mario hits a block!
//
-void T_MarioBlock(levelspecthink_t *block)
+void T_MarioBlock(mariothink_t *block)
{
INT32 i;
-#define speed vars[1]
-#define direction vars[2]
-#define floorwasheight vars[3]
-#define ceilingwasheight vars[4]
-#define distance vars[5]
-#define low vars[6]
-
T_MovePlane
(
block->sector,
block->speed,
block->sector->ceilingheight + 70*FRACUNIT * block->direction,
- 0,
- 1, // move floor
+ false,
+ true, // move ceiling
block->direction
);
@@ -1139,17 +960,17 @@ void T_MarioBlock(levelspecthink_t *block)
block->sector,
block->speed,
block->sector->floorheight + 70*FRACUNIT * block->direction,
- 0,
- 0, // move ceiling
+ false,
+ false, // move floor
block->direction
);
- if (block->sector->ceilingheight >= block->ceilingwasheight + 32*FRACUNIT) // Go back down now..
- block->direction = -block->direction;
- else if (block->sector->ceilingheight <= block->ceilingwasheight)
+ if (block->sector->ceilingheight >= block->ceilingstartheight + 32*FRACUNIT) // Go back down now..
+ block->direction *= -1;
+ else if (block->sector->ceilingheight <= block->ceilingstartheight)
{
- block->sector->ceilingheight = block->ceilingwasheight;
- block->sector->floorheight = block->floorwasheight;
+ block->sector->ceilingheight = block->ceilingstartheight;
+ block->sector->floorheight = block->floorstartheight;
P_RemoveThinker(&block->thinker);
block->sector->floordata = NULL;
block->sector->ceilingdata = NULL;
@@ -1158,595 +979,41 @@ void T_MarioBlock(levelspecthink_t *block)
block->direction = 0;
}
- for (i = -1; (i = P_FindSectorFromTag((INT16)block->vars[0], i)) >= 0 ;)
+ for (i = -1; (i = P_FindSectorFromTag(block->tag, i)) >= 0 ;)
P_RecalcPrecipInSector(§ors[i]);
-
-#undef speed
-#undef direction
-#undef floorwasheight
-#undef ceilingwasheight
-#undef distance
-#undef low
-}
-
-void T_SpikeSector(levelspecthink_t *spikes)
-{
- mobj_t *thing;
- msecnode_t *node;
- boolean dothepain;
- sector_t *affectsec;
-
- node = spikes->sector->touching_thinglist; // things touching this sector
-
- for (; node; node = node->m_thinglist_next)
- {
- thing = node->m_thing;
- if (!thing->player)
- continue;
-
- dothepain = false;
- affectsec = §ors[spikes->vars[0]];
-
- if (affectsec == spikes->sector) // Applied to an actual sector
- {
- fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, affectsec);
- fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, affectsec);
-
- if (affectsec->flags & SF_FLIPSPECIAL_FLOOR)
- {
- if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0)
- continue;
-
- if (thing->z == affectfloor)
- dothepain = true;
- }
-
- if (affectsec->flags & SF_FLIPSPECIAL_CEILING)
- {
- if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0)
- continue;
-
- if (thing->z + thing->height == affectceil)
- dothepain = true;
- }
- }
- else
- {
- fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, spikes->sector);
- fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, spikes->sector);
- if (affectsec->flags & SF_FLIPSPECIAL_FLOOR)
- {
- if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0)
- continue;
-
- if (thing->z == affectceil)
- dothepain = true;
- }
-
- if (affectsec->flags & SF_FLIPSPECIAL_CEILING)
- {
- if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0)
- continue;
-
- if (thing->z + thing->height == affectfloor)
- dothepain = true;
- }
- }
-
- if (dothepain)
- {
- P_DamageMobj(thing, NULL, NULL, 1, DMG_SPIKE);
- break;
- }
- }
}
-void T_FloatSector(levelspecthink_t *floater)
+void T_FloatSector(floatthink_t *floater)
{
fixed_t cheeseheight;
+ fixed_t waterheight;
sector_t *actionsector;
INT32 secnum;
- cheeseheight = (floater->sector->ceilingheight + floater->sector->floorheight)>>1;
-
// Just find the first sector with the tag.
// Doesn't work with multiple sectors that have different floor/ceiling heights.
- secnum = P_FindSectorFromTag((INT16)floater->vars[0], -1);
-
- if (secnum > 0)
- actionsector = §ors[secnum];
- else
- actionsector = NULL;
-
- if (actionsector)
- {
- //boolean floatanyway = false; // Ignore the crumblestate setting.
- fixed_t waterheight = P_SectorCheckWater(actionsector, floater->sector); // find the highest suitable water block around
-
- if (waterheight == cheeseheight) // same height, no floating needed
- ;
- else if (floater->sector->floorheight == actionsector->floorheight && waterheight < cheeseheight) // too low
- ;
- else if (floater->sector->ceilingheight == actionsector->ceilingheight && waterheight > cheeseheight) // too high
- ;
- // we have something to float in! Or we're for some reason above the ground, let's fall anyway
- else if (floater->sector->crumblestate == 0 || floater->sector->crumblestate >= 3/* || floatanyway*/)
- EV_BounceSector(floater->sector, FRACUNIT, floater->sourceline);
-
- P_RecalcPrecipInSector(actionsector);
- }
-}
-
-//
-// T_BridgeThinker
-//
-// Kind of like T_RaiseSector,
-// but spreads out across
-// multiple FOFs at varying
-// intensity.
-//
-void T_BridgeThinker(levelspecthink_t *bridge)
-{
- msecnode_t *node;
- mobj_t *thing;
- sector_t *sector;
- sector_t *controlsec = NULL;
- INT32 i, k;
-
- INT16 j;
- boolean playeronme = false;
- fixed_t ceilingdestination = 0, floordestination = 0;
- result_e res = 0;
-
-#define ORIGFLOORHEIGHT (bridge->vars[0])
-#define ORIGCEILINGHEIGHT (bridge->vars[1])
-#define BASESPEED (bridge->vars[2])
-#define CURSPEED (bridge->vars[3])
-#define STARTTAG ((INT16)bridge->vars[4])
-#define ENDTAG ((INT16)bridge->vars[5])
-#define DIRECTION (bridge->vars[8])
-#define SAGAMT (8*FRACUNIT)
- fixed_t lowceilheight = ORIGCEILINGHEIGHT - SAGAMT;
- fixed_t lowfloorheight = ORIGFLOORHEIGHT - SAGAMT;
-#define LOWCEILINGHEIGHT (lowceilheight)
-#define LOWFLOORHEIGHT (lowfloorheight)
-#define STARTCONTROLTAG (ENDTAG + 1)
-#define ENDCONTROLTAG (ENDTAG + (ENDTAG - STARTTAG) + 1)
-
- // Is someone standing on it?
- for (j = STARTTAG; j <= ENDTAG; j++)
- {
- for (i = -1; (i = P_FindSectorFromTag(j, i)) >= 0 ;)
- {
- sector = §ors[i];
-
- // Nab the control sector that this sector belongs to.
- k = P_FindSectorFromTag((INT16)(j + (ENDTAG-STARTTAG) + 1), -1);
-
- if (k == -1)
- break;
-
- controlsec = §ors[k];
-
- // Is a player standing on me?
- for (node = sector->touching_thinglist; node; node = node->m_thinglist_next)
- {
- thing = node->m_thing;
-
- if (!thing->player)
- continue;
-
- if (!(thing->z == controlsec->ceilingheight))
- continue;
-
- playeronme = true;
- goto wegotit; // Just take the first one?
- }
- }
- }
-wegotit:
- if (playeronme)
- {
- // Lower controlsec like a regular T_RaiseSector
- // Set the heights of all the other control sectors to
- // be a gradient of this height toward the edges
- }
- else
- {
- // Raise controlsec like a regular T_RaiseSector
- // Set the heights of all the other control sectors to
- // be a gradient of this height toward the edges.
- }
-
- if (playeronme && controlsec)
- {
- INT32 dist;
-
- bridge->sector = controlsec;
- CURSPEED = BASESPEED;
-
- {
- // Translate tags to - 0 + range
- /*so you have a number in [min, max].
- let range = max - min, subtract min
- from your number to get [0, range].
- subtract range/2 to get [-range/2, range/2].
- take absolute value and get [0, range/2] where
- lower number = closer to midpoint. divide by
- range/2 to get [0, 1]. subtract that number
- from 1 to get [0, 1] with higher number = closer
- to midpoint. multiply this by max sag amount*/
-
- INT32 midpoint = STARTCONTROLTAG + ((ENDCONTROLTAG-STARTCONTROLTAG) + 1)/2;
-// INT32 tagstart = STARTTAG - midpoint;
-// INT32 tagend = ENDTAG - midpoint;
-
-// CONS_Debug(DBG_GAMELOGIC, "tagstart is %d, tagend is %d\n", tagstart, tagend);
-
- // Sag is adjusted by how close you are to the center
- dist = ((ENDCONTROLTAG - STARTCONTROLTAG))/2 - abs(bridge->sector->tag - midpoint);
-
-// CONS_Debug(DBG_GAMELOGIC, "Dist is %d\n", dist);
- LOWCEILINGHEIGHT -= (SAGAMT) * dist;
- LOWFLOORHEIGHT -= (SAGAMT) * dist;
- }
-
- // go down
- if (bridge->sector->ceilingheight <= LOWCEILINGHEIGHT)
- {
- bridge->sector->floorheight = LOWCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
- bridge->sector->ceilingheight = LOWCEILINGHEIGHT;
- bridge->sector->ceilspeed = 0;
- bridge->sector->floorspeed = 0;
- goto dorest;
- }
-
- DIRECTION = -1;
- ceilingdestination = LOWCEILINGHEIGHT;
- floordestination = LOWFLOORHEIGHT;
-
- if ((bridge->sector->ceilingheight - LOWCEILINGHEIGHT)
- < (ORIGCEILINGHEIGHT - bridge->sector->ceilingheight))
- {
- fixed_t origspeed = CURSPEED;
-
- // Slow down as you get closer to the bottom
- CURSPEED = FixedMul(CURSPEED,FixedDiv(bridge->sector->ceilingheight - LOWCEILINGHEIGHT, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
-
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
- else
- {
- fixed_t origspeed = CURSPEED;
- // Slow down as you get closer to the top
- CURSPEED = FixedMul(CURSPEED,FixedDiv(ORIGCEILINGHEIGHT - bridge->sector->ceilingheight, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
-
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
-
-// CONS_Debug(DBG_GAMELOGIC, "Curspeed is %d\n", CURSPEED>>FRACBITS);
-
- res = T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- ceilingdestination, // dest
- 0, // crush
- 1, // floor or ceiling (1 for ceiling)
- DIRECTION // direction
- );
-
- if (res == ok || res == pastdest)
- T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- floordestination, // dest
- 0, // crush
- 0, // floor or ceiling (0 for floor)
- DIRECTION // direction
- );
-
- bridge->sector->ceilspeed = 42;
- bridge->sector->floorspeed = CURSPEED*DIRECTION;
-
- dorest:
- // Adjust joined sector heights
- {
- sector_t *sourcesec = bridge->sector;
-
- INT32 divisor = sourcesec->tag - ENDTAG + 1;
- fixed_t heightdiff = ORIGCEILINGHEIGHT - sourcesec->ceilingheight;
- fixed_t interval;
- INT32 plusplusme = 0;
-
- if (divisor > 0)
- {
- interval = heightdiff/divisor;
-
-// CONS_Debug(DBG_GAMELOGIC, "interval is %d\n", interval>>FRACBITS);
-
- // TODO: Use T_MovePlane
-
- for (j = (INT16)(ENDTAG+1); j <= sourcesec->tag; j++, plusplusme++)
- {
- for (i = -1; (i = P_FindSectorFromTag(j, i)) >= 0 ;)
- {
- if (sectors[i].ceilingheight >= sourcesec->ceilingheight)
- {
- sectors[i].ceilingheight = ORIGCEILINGHEIGHT - (interval*plusplusme);
- sectors[i].floorheight = ORIGFLOORHEIGHT - (interval*plusplusme);
- }
- else // Do the regular rise
- {
- bridge->sector = §ors[i];
-
- CURSPEED = BASESPEED/2;
-
- // rise back up
- if (bridge->sector->ceilingheight >= ORIGCEILINGHEIGHT)
- {
- bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
- bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
- bridge->sector->ceilspeed = 0;
- bridge->sector->floorspeed = 0;
- continue;
- }
-
- DIRECTION = 1;
- ceilingdestination = ORIGCEILINGHEIGHT;
- floordestination = ORIGFLOORHEIGHT;
-
-// CONS_Debug(DBG_GAMELOGIC, "ceildest: %d, floordest: %d\n", ceilingdestination>>FRACBITS, floordestination>>FRACBITS);
-
- if ((bridge->sector->ceilingheight - LOWCEILINGHEIGHT)
- < (ORIGCEILINGHEIGHT - bridge->sector->ceilingheight))
- {
- fixed_t origspeed = CURSPEED;
-
- // Slow down as you get closer to the bottom
- CURSPEED = FixedMul(CURSPEED,FixedDiv(bridge->sector->ceilingheight - LOWCEILINGHEIGHT, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
-
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
- else
- {
- fixed_t origspeed = CURSPEED;
- // Slow down as you get closer to the top
- CURSPEED = FixedMul(CURSPEED,FixedDiv(ORIGCEILINGHEIGHT - bridge->sector->ceilingheight, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
-
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
-
- res = T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- ceilingdestination, // dest
- 0, // crush
- 1, // floor or ceiling (1 for ceiling)
- DIRECTION // direction
- );
-
- if (res == ok || res == pastdest)
- T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- floordestination, // dest
- 0, // crush
- 0, // floor or ceiling (0 for floor)
- DIRECTION // direction
- );
-
- bridge->sector->ceilspeed = 42;
- bridge->sector->floorspeed = CURSPEED*DIRECTION;
- }
- }
- }
- }
-
- // Now the other side
- divisor = ENDTAG + (ENDTAG-STARTTAG) + 1;
- divisor -= sourcesec->tag;
-
- if (divisor > 0)
- {
- interval = heightdiff/divisor;
- plusplusme = 0;
-
-// CONS_Debug(DBG_GAMELOGIC, "interval2 is %d\n", interval>>FRACBITS);
-
- for (j = (INT16)(sourcesec->tag+1); j <= ENDTAG + (ENDTAG-STARTTAG) + 1; j++, plusplusme++)
- {
- for (i = -1; (i = P_FindSectorFromTag(j, i)) >= 0 ;)
- {
- if (sectors[i].ceilingheight >= sourcesec->ceilingheight)
- {
- sectors[i].ceilingheight = sourcesec->ceilingheight + (interval*plusplusme);
- sectors[i].floorheight = sourcesec->floorheight + (interval*plusplusme);
- }
- else // Do the regular rise
- {
- bridge->sector = §ors[i];
-
- CURSPEED = BASESPEED/2;
-
- // rise back up
- if (bridge->sector->ceilingheight >= ORIGCEILINGHEIGHT)
- {
- bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
- bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
- bridge->sector->ceilspeed = 0;
- bridge->sector->floorspeed = 0;
- continue;
- }
-
- DIRECTION = 1;
- ceilingdestination = ORIGCEILINGHEIGHT;
- floordestination = ORIGFLOORHEIGHT;
-
-// CONS_Debug(DBG_GAMELOGIC, "ceildest: %d, floordest: %d\n", ceilingdestination>>FRACBITS, floordestination>>FRACBITS);
-
- if ((bridge->sector->ceilingheight - LOWCEILINGHEIGHT)
- < (ORIGCEILINGHEIGHT - bridge->sector->ceilingheight))
- {
- fixed_t origspeed = CURSPEED;
-
- // Slow down as you get closer to the bottom
- CURSPEED = FixedMul(CURSPEED,FixedDiv(bridge->sector->ceilingheight - LOWCEILINGHEIGHT, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
-
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
- else
- {
- fixed_t origspeed = CURSPEED;
- // Slow down as you get closer to the top
- CURSPEED = FixedMul(CURSPEED,FixedDiv(ORIGCEILINGHEIGHT - bridge->sector->ceilingheight, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
-
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
-
- res = T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- ceilingdestination, // dest
- 0, // crush
- 1, // floor or ceiling (1 for ceiling)
- DIRECTION // direction
- );
-
- if (res == ok || res == pastdest)
- T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- floordestination, // dest
- 0, // crush
- 0, // floor or ceiling (0 for floor)
- DIRECTION // direction
- );
-
- bridge->sector->ceilspeed = 42;
- bridge->sector->floorspeed = CURSPEED*DIRECTION;
- }
- }
- }
- }
- }
-
- // for (i = -1; (i = P_FindSectorFromTag(bridge->sourceline->tag, i)) >= 0 ;)
- // P_RecalcPrecipInSector(§ors[i]);
- }
- else
- {
- // Iterate control sectors
- for (j = (INT16)(ENDTAG+1); j <= (ENDTAG+(ENDTAG-STARTTAG)+1); j++)
- {
- for (i = -1; (i = P_FindSectorFromTag(j, i)) >= 0 ;)
- {
- bridge->sector = §ors[i];
-
- CURSPEED = BASESPEED/2;
-
- // rise back up
- if (bridge->sector->ceilingheight >= ORIGCEILINGHEIGHT)
- {
- bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
- bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
- bridge->sector->ceilspeed = 0;
- bridge->sector->floorspeed = 0;
- continue;
- }
-
- DIRECTION = 1;
- ceilingdestination = ORIGCEILINGHEIGHT;
- floordestination = ORIGFLOORHEIGHT;
-
-// CONS_Debug(DBG_GAMELOGIC, "ceildest: %d, floordest: %d\n", ceilingdestination>>FRACBITS, floordestination>>FRACBITS);
+ secnum = P_FindSectorFromTag(floater->tag, -1);
+ if (secnum <= 0)
+ return;
+ actionsector = §ors[secnum];
- if ((bridge->sector->ceilingheight - LOWCEILINGHEIGHT)
- < (ORIGCEILINGHEIGHT - bridge->sector->ceilingheight))
- {
- fixed_t origspeed = CURSPEED;
+ cheeseheight = (floater->sector->ceilingheight + floater->sector->floorheight)>>1;
- // Slow down as you get closer to the bottom
- CURSPEED = FixedMul(CURSPEED,FixedDiv(bridge->sector->ceilingheight - LOWCEILINGHEIGHT, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
+ //boolean floatanyway = false; // Ignore the crumblestate setting.
+ waterheight = P_SectorCheckWater(actionsector, floater->sector); // find the highest suitable water block around
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
- else
- {
- fixed_t origspeed = CURSPEED;
- // Slow down as you get closer to the top
- CURSPEED = FixedMul(CURSPEED,FixedDiv(ORIGCEILINGHEIGHT - bridge->sector->ceilingheight, (ORIGCEILINGHEIGHT - LOWCEILINGHEIGHT)>>5));
-
- if (CURSPEED <= origspeed/16)
- CURSPEED = origspeed/16;
- else if (CURSPEED > origspeed)
- CURSPEED = origspeed;
- }
+ if (waterheight == cheeseheight) // same height, no floating needed
+ return;
- res = T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- ceilingdestination, // dest
- 0, // crush
- 1, // floor or ceiling (1 for ceiling)
- DIRECTION // direction
- );
+ if (floater->sector->floorheight == actionsector->floorheight && waterheight < cheeseheight) // too low
+ return;
- if (res == ok || res == pastdest)
- T_MovePlane
- (
- bridge->sector, // sector
- CURSPEED, // speed
- floordestination, // dest
- 0, // crush
- 0, // floor or ceiling (0 for floor)
- DIRECTION // direction
- );
-
- bridge->sector->ceilspeed = 42;
- bridge->sector->floorspeed = CURSPEED*DIRECTION;
- }
- }
- // Update precip
- }
+ if (floater->sector->ceilingheight == actionsector->ceilingheight && waterheight > cheeseheight) // too high
+ return;
-#undef SAGAMT
-#undef LOWFLOORHEIGHT
-#undef LOWCEILINGHEIGHT
-#undef ORIGFLOORHEIGHT
-#undef ORIGCEILINGHEIGHT
-#undef BASESPEED
-#undef CURSPEED
-#undef STARTTAG
-#undef ENDTAG
-#undef DIRECTION
+ // we have something to float in! Or we're for some reason above the ground, let's fall anyway
+ if (floater->sector->crumblestate == CRUMBLE_NONE || floater->sector->crumblestate >= CRUMBLE_FALL/* || floatanyway*/)
+ EV_BounceSector(floater->sector, FRACUNIT, floater->sourceline);
}
static mobj_t *SearchMarioNode(msecnode_t *node)
@@ -1814,204 +1081,204 @@ static mobj_t *SearchMarioNode(msecnode_t *node)
return thing;
}
-void T_MarioBlockChecker(levelspecthink_t *block)
+void T_MarioBlockChecker(mariocheck_t *block)
{
line_t *masterline = block->sourceline;
- if (block->vars[2] == 1) // Don't update the textures when the block's being bumped upwards.
- return;
if (SearchMarioNode(block->sector->touching_thinglist))
{
sides[masterline->sidenum[0]].midtexture = sides[masterline->sidenum[0]].bottomtexture; // Update textures
if (masterline->backsector)
- {
block->sector->ceilingpic = block->sector->floorpic = masterline->backsector->ceilingpic; // Update flats to be backside's ceiling
- }
}
else
{
sides[masterline->sidenum[0]].midtexture = sides[masterline->sidenum[0]].toptexture;
if (masterline->backsector)
- {
block->sector->ceilingpic = block->sector->floorpic = masterline->backsector->floorpic; // Update flats to be backside's floor
- }
}
}
+static boolean P_IsPlayerValid(size_t playernum)
+{
+ if (!playeringame[playernum])
+ return false;
+
+ if (!players[playernum].mo)
+ return false;
+
+ if (players[playernum].mo->health <= 0)
+ return false;
+
+ if (players[playernum].spectator)
+ return false;
+
+ return true;
+}
+
// This is the Thwomp's 'brain'. It looks around for players nearby, and if
// it finds any, **SMASH**!!! Muahahhaa....
-void T_ThwompSector(levelspecthink_t *thwomp)
+void T_ThwompSector(thwomp_t *thwomp)
{
-#define speed vars[1]
-#define direction vars[2]
-#define distance vars[3]
-#define floorwasheight vars[4]
-#define ceilingwasheight vars[5]
fixed_t thwompx, thwompy;
sector_t *actionsector;
ffloor_t *rover = NULL;
INT32 secnum;
+ fixed_t speed;
// If you just crashed down, wait a second before coming back up.
- if (--thwomp->distance > 0)
- {
- sides[thwomp->sourceline->sidenum[0]].midtexture = sides[thwomp->sourceline->sidenum[0]].bottomtexture;
+ if (--thwomp->delay > 0)
return;
- }
// Just find the first sector with the tag.
// Doesn't work with multiple sectors that have different floor/ceiling heights.
- secnum = P_FindSectorFromTag((INT16)thwomp->vars[0], -1);
+ secnum = P_FindSectorFromTag(thwomp->tag, -1);
+
+ if (secnum <= 0)
+ return; // Bad bad bad!
- if (secnum > 0)
+ actionsector = §ors[secnum];
+
+ // Look for thwomp FOF
+ for (rover = actionsector->ffloors; rover; rover = rover->next)
{
- actionsector = §ors[secnum];
+ if (rover->master == thwomp->sourceline)
+ break;
+ }
+
+ if (!rover)
+ return; // Didn't find any FOFs, so bail out
- // Look for thwomp FFloor
- for (rover = actionsector->ffloors; rover; rover = rover->next)
+ thwompx = actionsector->soundorg.x;
+ thwompy = actionsector->soundorg.y;
+
+ if (thwomp->direction == 0) // Not going anywhere, so look for players.
+ {
+ if (rover->flags & FF_EXISTS)
{
- if (rover->master == thwomp->sourceline)
+ UINT8 i;
+ // scan the players to find victims!
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (!P_IsPlayerValid(i))
+ continue;
+
+ if (players[i].mo->z > thwomp->sector->ceilingheight)
+ continue;
+
+ if (P_AproxDistance(thwompx - players[i].mo->x, thwompy - players[i].mo->y) > 96*FRACUNIT)
+ continue;
+
+ thwomp->direction = -1;
break;
+ }
}
+
+ thwomp->sector->ceilspeed = 0;
+ thwomp->sector->floorspeed = 0;
}
else
- return; // Bad bad bad!
-
- thwompx = actionsector->soundorg.x;
- thwompy = actionsector->soundorg.y;
-
- if (thwomp->direction > 0) // Moving back up..
{
result_e res = 0;
- // Set the texture from the lower one (normal)
- sides[thwomp->sourceline->sidenum[0]].midtexture = sides[thwomp->sourceline->sidenum[0]].bottomtexture;
- /// \note this should only have to be done once, but is already done repeatedly, above
-
- if (thwomp->sourceline->flags & ML_EFFECT5)
- thwomp->speed = thwomp->sourceline->dx/8;
- else
- thwomp->speed = 2*FRACUNIT;
+ if (thwomp->direction > 0) //Moving back up..
+ {
+ // Set the texture from the lower one (normal)
+ sides[thwomp->sourceline->sidenum[0]].midtexture = sides[thwomp->sourceline->sidenum[0]].bottomtexture;
- res = T_MovePlane
- (
- thwomp->sector, // sector
- thwomp->speed, // speed
- thwomp->floorwasheight, // dest
- 0, // crush
- 0, // floor or ceiling (0 for floor)
- thwomp->direction // direction
- );
+ speed = thwomp->retractspeed;
- if (res == ok || res == pastdest)
- T_MovePlane
+ res = T_MovePlane
(
thwomp->sector, // sector
- thwomp->speed, // speed
- thwomp->ceilingwasheight, // dest
- 0, // crush
- 1, // floor or ceiling (1 for ceiling)
+ speed, // speed
+ thwomp->floorstartheight, // dest
+ false, // crush
+ false, // ceiling?
thwomp->direction // direction
);
- if (res == pastdest)
- thwomp->direction = 0; // stop moving
-
- thwomp->sector->ceilspeed = 42;
- thwomp->sector->floorspeed = thwomp->speed*thwomp->direction;
- }
- else if (thwomp->direction < 0) // Crashing down!
- {
- result_e res = 0;
-
- // Set the texture from the upper one (angry)
- sides[thwomp->sourceline->sidenum[0]].midtexture = sides[thwomp->sourceline->sidenum[0]].toptexture;
+ if (res == ok || res == pastdest)
+ T_MovePlane
+ (
+ thwomp->sector, // sector
+ speed, // speed
+ thwomp->ceilingstartheight, // dest
+ false, // crush
+ true, // ceiling?
+ thwomp->direction // direction
+ );
- if (thwomp->sourceline->flags & ML_EFFECT5)
- thwomp->speed = thwomp->sourceline->dy/8;
- else
- thwomp->speed = 10*FRACUNIT;
+ if (res == pastdest)
+ thwomp->direction = 0; // stop moving
+ }
+ else // Crashing down!
+ {
+ // Set the texture from the upper one (angry)
+ sides[thwomp->sourceline->sidenum[0]].midtexture = sides[thwomp->sourceline->sidenum[0]].toptexture;
- res = T_MovePlane
- (
- thwomp->sector, // sector
- thwomp->speed, // speed
- P_FloorzAtPos(thwompx, thwompy, thwomp->sector->floorheight,
- thwomp->sector->ceilingheight - thwomp->sector->floorheight), // dest
- 0, // crush
- 0, // floor or ceiling (0 for floor)
- thwomp->direction // direction
- );
+ speed = thwomp->crushspeed;
- if (res == ok || res == pastdest)
- T_MovePlane
+ res = T_MovePlane
(
thwomp->sector, // sector
- thwomp->speed, // speed
+ speed, // speed
P_FloorzAtPos(thwompx, thwompy, thwomp->sector->floorheight,
- thwomp->sector->ceilingheight
- - (thwomp->sector->floorheight + thwomp->speed))
- + (thwomp->sector->ceilingheight
- - (thwomp->sector->floorheight + thwomp->speed/2)), // dest
- 0, // crush
- 1, // floor or ceiling (1 for ceiling)
+ thwomp->sector->ceilingheight - thwomp->sector->floorheight), // dest
+ false, // crush
+ false, // ceiling?
thwomp->direction // direction
);
- if (res == pastdest)
- {
- mobj_t *mp = (void *)&actionsector->soundorg;
+ if (res == ok || res == pastdest)
+ T_MovePlane
+ (
+ thwomp->sector, // sector
+ speed, // speed
+ P_FloorzAtPos(thwompx, thwompy, thwomp->sector->floorheight,
+ thwomp->sector->ceilingheight
+ - (thwomp->sector->floorheight + speed))
+ + (thwomp->sector->ceilingheight
+ - (thwomp->sector->floorheight + speed/2)), // dest
+ false, // crush
+ true, // ceiling?
+ thwomp->direction // direction
+ );
- if (!rover || (rover->flags & FF_EXISTS))
+ if (res == pastdest)
{
- if (thwomp->sourceline->flags & ML_EFFECT4)
- S_StartSound(mp, sides[thwomp->sourceline->sidenum[0]].textureoffset>>FRACBITS);
- else
- S_StartSound(mp, sfx_thwomp);
- }
+ if (rover->flags & FF_EXISTS)
+ S_StartSound((void *)&actionsector->soundorg, thwomp->sound);
- thwomp->direction = 1; // start heading back up
- thwomp->distance = TICRATE; // but only after a small delay
+ thwomp->direction = 1; // start heading back up
+ thwomp->delay = TICRATE; // but only after a small delay
+ }
}
thwomp->sector->ceilspeed = 42;
- thwomp->sector->floorspeed = thwomp->speed*thwomp->direction;
+ thwomp->sector->floorspeed = speed*thwomp->direction;
}
- else // Not going anywhere, so look for players.
+
+ P_RecalcPrecipInSector(actionsector);
+}
+
+static boolean T_SectorHasEnemies(sector_t *sec)
+{
+ msecnode_t *node = sec->touching_thinglist; // things touching this sector
+ mobj_t *mo;
+ while (node)
{
- if (!rover || (rover->flags & FF_EXISTS))
- {
- UINT8 i;
- // scan the players to find victims!
- for (i = 0; i < MAXPLAYERS; i++)
- {
- if (!playeringame[i])
- continue;
- if (players[i].spectator)
- continue;
- if (!players[i].mo)
- continue;
- if (!players[i].mo->health)
- continue;
- if (players[i].mo->z > thwomp->sector->ceilingheight)
- continue;
- if (P_AproxDistance(thwompx - players[i].mo->x, thwompy - players[i].mo->y) > 96 * FRACUNIT)
- continue;
+ mo = node->m_thing;
- thwomp->direction = -1;
- break;
- }
- }
+ if ((mo->flags & (MF_ENEMY|MF_BOSS))
+ && mo->health > 0
+ && mo->z < sec->ceilingheight
+ && mo->z + mo->height > sec->floorheight)
+ return true;
- thwomp->sector->ceilspeed = 0;
- thwomp->sector->floorspeed = 0;
+ node = node->m_thinglist_next;
}
- P_RecalcPrecipInSector(actionsector);
-#undef speed
-#undef direction
-#undef distance
-#undef floorwasheight
-#undef ceilingwasheight
+ return false;
}
//
@@ -2020,18 +1287,14 @@ void T_ThwompSector(levelspecthink_t *thwomp)
// Runs a linedef exec when no more MF_ENEMY/MF_BOSS objects with health are in the area
// \sa P_AddNoEnemiesThinker
//
-void T_NoEnemiesSector(levelspecthink_t *nobaddies)
+void T_NoEnemiesSector(noenemies_t *nobaddies)
{
size_t i;
- fixed_t upperbound, lowerbound;
sector_t *sec = NULL;
- sector_t *targetsec = NULL;
INT32 secnum = -1;
- msecnode_t *node;
- mobj_t *thing;
boolean FOFsector = false;
- while ((secnum = P_FindSectorFromLineTag(nobaddies->sourceline, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(nobaddies->sourceline->tag, secnum)) >= 0)
{
sec = §ors[secnum];
@@ -2047,42 +1310,15 @@ void T_NoEnemiesSector(levelspecthink_t *nobaddies)
FOFsector = true;
- while ((targetsecnum = P_FindSectorFromLineTag(sec->lines[i], targetsecnum)) >= 0)
- {
- targetsec = §ors[targetsecnum];
-
- upperbound = targetsec->ceilingheight;
- lowerbound = targetsec->floorheight;
- node = targetsec->touching_thinglist; // things touching this sector
- while (node)
- {
- thing = node->m_thing;
-
- if ((thing->flags & (MF_ENEMY|MF_BOSS)) && thing->health > 0
- && thing->z < upperbound && thing->z+thing->height > lowerbound)
- return;
-
- node = node->m_thinglist_next;
- }
- }
- }
-
- if (!FOFsector)
- {
- upperbound = sec->ceilingheight;
- lowerbound = sec->floorheight;
- node = sec->touching_thinglist; // things touching this sector
- while (node)
+ while ((targetsecnum = P_FindSectorFromTag(sec->lines[i]->tag, targetsecnum)) >= 0)
{
- thing = node->m_thing;
-
- if ((thing->flags & (MF_ENEMY|MF_BOSS)) && thing->health > 0
- && thing->z < upperbound && thing->z+thing->height > lowerbound)
+ if (T_SectorHasEnemies(§ors[targetsecnum]))
return;
-
- node = node->m_thinglist_next;
}
}
+
+ if (!FOFsector && T_SectorHasEnemies(sec))
+ return;
}
CONS_Debug(DBG_GAMELOGIC, "Running no-more-enemies exec with tag of %d\n", nobaddies->sourceline->tag);
@@ -2119,30 +1355,23 @@ static boolean P_IsObjectOnRealGround(mobj_t *mo, sector_t *sec)
return false;
}
-//
-// P_HavePlayersEnteredArea
-//
-// Helper function for T_EachTimeThinker
-//
-static INT32 P_HavePlayersEnteredArea(boolean *curPlayers, boolean *oldPlayers, boolean inAndOut)
+static boolean P_IsMobjTouchingSector(mobj_t *mo, sector_t *sec)
{
- INT32 i;
+ msecnode_t *node;
- // Easy check... nothing has changed
- if (!memcmp(curPlayers, oldPlayers, sizeof(boolean)*MAXPLAYERS))
- return -1;
+ if (mo->subsector->sector == sec)
+ return true;
- // Otherwise, we have to check if any new players have entered
- for (i = 0; i < MAXPLAYERS; i++)
- {
- if (inAndOut && !curPlayers[i] && oldPlayers[i])
- return i;
+ if (!(sec->flags & SF_TRIGGERSPECIAL_TOUCH))
+ return false;
- if (curPlayers[i] && !oldPlayers[i])
- return i;
+ for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
+ {
+ if (node->m_sector == sec)
+ return true;
}
- return -1;
+ return false;
}
//
@@ -2153,47 +1382,30 @@ static INT32 P_HavePlayersEnteredArea(boolean *curPlayers, boolean *oldPlayers,
//
// \sa P_AddEachTimeThinker
//
-void T_EachTimeThinker(levelspecthink_t *eachtime)
+void T_EachTimeThinker(eachtime_t *eachtime)
{
size_t i, j;
sector_t *sec = NULL;
sector_t *targetsec = NULL;
- //sector_t *usesec = NULL;
INT32 secnum = -1;
- INT32 affectPlayer = 0;
boolean oldPlayersInArea[MAXPLAYERS];
- boolean playersInArea[MAXPLAYERS];
boolean oldPlayersOnArea[MAXPLAYERS];
- boolean playersOnArea[MAXPLAYERS];
boolean *oldPlayersArea;
boolean *playersArea;
boolean FOFsector = false;
- boolean inAndOut = false;
boolean floortouch = false;
fixed_t bottomheight, topheight;
- msecnode_t *node;
ffloor_t *rover;
for (i = 0; i < MAXPLAYERS; i++)
{
- if (i & 1)
- {
- oldPlayersInArea[i] = eachtime->vars[i/2] & 65535;
- oldPlayersOnArea[i] = eachtime->var2s[i/2] & 65535;
- eachtime->vars[i/2] = 0;
- eachtime->var2s[i/2] = 0;
- }
- else
- {
- oldPlayersInArea[i] = eachtime->vars[i/2] >> 16;
- oldPlayersOnArea[i] = eachtime->var2s[i/2] >> 16;
- }
-
- playersInArea[i] = false;
- playersOnArea[i] = false;
+ oldPlayersInArea[i] = eachtime->playersInArea[i];
+ oldPlayersOnArea[i] = eachtime->playersOnArea[i];
+ eachtime->playersInArea[i] = false;
+ eachtime->playersOnArea[i] = false;
}
- while ((secnum = P_FindSectorFromLineTag(eachtime->sourceline, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(eachtime->sourceline->tag, secnum)) >= 0)
{
sec = §ors[secnum];
@@ -2216,7 +1428,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
FOFsector = true;
- while ((targetsecnum = P_FindSectorFromLineTag(sec->lines[i], targetsecnum)) >= 0)
+ while ((targetsecnum = P_FindSectorFromTag(sec->lines[i]->tag, targetsecnum)) >= 0)
{
targetsec = §ors[targetsecnum];
@@ -2235,35 +1447,10 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
for (j = 0; j < MAXPLAYERS; j++)
{
- if (!playeringame[j])
- continue;
-
- if (!players[j].mo)
- continue;
-
- if (players[j].mo->health <= 0)
- continue;
-
- if ((netgame || multiplayer) && players[j].spectator)
+ if (!P_IsPlayerValid(j))
continue;
- if (players[j].mo->subsector->sector == targetsec)
- ;
- else if (sec->flags & SF_TRIGGERSPECIAL_TOUCH)
- {
- boolean insector = false;
- for (node = players[j].mo->touching_sectorlist; node; node = node->m_sectorlist_next)
- {
- if (node->m_sector == targetsec)
- {
- insector = true;
- break;
- }
- }
- if (!insector)
- continue;
- }
- else
+ if (!P_IsMobjTouchingSector(players[j].mo, targetsec))
continue;
topheight = P_GetSpecialTopZ(players[j].mo, sec, targetsec);
@@ -2275,24 +1462,10 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
if (players[j].mo->z + players[j].mo->height < bottomheight)
continue;
- if (floortouch == true && P_IsObjectOnGroundIn(players[j].mo, targetsec))
- {
- if (j & 1)
- eachtime->var2s[j/2] |= 1;
- else
- eachtime->var2s[j/2] |= 1 << 16;
-
- playersOnArea[j] = true;
- }
+ if (floortouch && P_IsObjectOnGroundIn(players[j].mo, targetsec))
+ eachtime->playersOnArea[j] = true;
else
- {
- if (j & 1)
- eachtime->vars[j/2] |= 1;
- else
- eachtime->vars[j/2] |= 1 << 16;
-
- playersInArea[j] = true;
- }
+ eachtime->playersInArea[j] = true;
}
}
}
@@ -2301,102 +1474,61 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
{
for (i = 0; i < MAXPLAYERS; i++)
{
- if (!playeringame[i])
- continue;
-
- if (!players[i].mo)
- continue;
-
- if (players[i].mo->health <= 0)
+ if (!P_IsPlayerValid(i))
continue;
- if ((netgame || multiplayer) && players[i].spectator)
- continue;
-
- if (players[i].mo->subsector->sector == sec)
- ;
- else if (sec->flags & SF_TRIGGERSPECIAL_TOUCH)
- {
- boolean insector = false;
- for (node = players[i].mo->touching_sectorlist; node; node = node->m_sectorlist_next)
- {
- if (node->m_sector == sec)
- {
- insector = true;
- break;
- }
- }
- if (!insector)
- continue;
- }
- else
+ if (!P_IsMobjTouchingSector(players[i].mo, sec))
continue;
if (!(players[i].mo->subsector->sector == sec
|| P_PlayerTouchingSectorSpecial(&players[i], 2, (GETSECSPECIAL(sec->special, 2))) == sec))
continue;
- if (floortouch == true && P_IsObjectOnRealGround(players[i].mo, sec))
- {
- if (i & 1)
- eachtime->var2s[i/2] |= 1;
- else
- eachtime->var2s[i/2] |= 1 << 16;
-
- playersOnArea[i] = true;
- }
+ if (floortouch && P_IsObjectOnRealGround(players[i].mo, sec))
+ eachtime->playersOnArea[i] = true;
else
- {
- if (i & 1)
- eachtime->vars[i/2] |= 1;
- else
- eachtime->vars[i/2] |= 1 << 16;
-
- playersInArea[i] = true;
- }
+ eachtime->playersInArea[i] = true;
}
}
}
- if ((eachtime->sourceline->flags & ML_BOUNCY) == ML_BOUNCY)
- inAndOut = true;
-
// Check if a new player entered.
// If not, check if a player hit the floor.
// If either condition is true, execute.
- if (floortouch == true)
+ if (floortouch)
{
- playersArea = playersOnArea;
+ playersArea = eachtime->playersOnArea;
oldPlayersArea = oldPlayersOnArea;
}
else
{
- playersArea = playersInArea;
+ playersArea = eachtime->playersInArea;
oldPlayersArea = oldPlayersInArea;
}
- while ((affectPlayer = P_HavePlayersEnteredArea(playersArea, oldPlayersArea, inAndOut)) != -1)
+ // Easy check... nothing has changed
+ if (!memcmp(playersArea, oldPlayersArea, sizeof(boolean)*MAXPLAYERS))
+ return;
+
+ // If sector has an "all players" trigger type, all players need to be in area
+ if (GETSECSPECIAL(sec->special, 2) == 2 || GETSECSPECIAL(sec->special, 2) == 3)
{
- if (GETSECSPECIAL(sec->special, 2) == 2 || GETSECSPECIAL(sec->special, 2) == 3)
+ for (i = 0; i < MAXPLAYERS; i++)
{
- for (i = 0; i < MAXPLAYERS; i++)
- {
- if (!playeringame[i])
- continue;
-
- if (!players[i].mo)
- continue;
-
- if (players[i].mo->health <= 0)
- continue;
+ if (P_IsPlayerValid(i) && playersArea[i])
+ continue;
+ }
+ }
- if ((netgame || multiplayer) && players[i].spectator)
- continue;
+ // Trigger for every player who has entered (and exited, if triggerOnExit)
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (playersArea[i] == oldPlayersArea[i])
+ continue;
- if (!playersArea[i])
- return;
- }
- }
+ // If player has just left, check if still valid
+ if (!playersArea[i] && (!eachtime->triggerOnExit || !P_IsPlayerValid(i)))
+ continue;
CONS_Debug(DBG_GAMELOGIC, "Trying to activate each time executor with tag %d\n", eachtime->sourceline->tag);
@@ -2404,12 +1536,10 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
// No more stupid hacks involving changing eachtime->sourceline's tag or special or whatever!
// This should now run ONLY the stuff for eachtime->sourceline itself, instead of all trigger linedefs sharing the same tag.
// Makes much more sense doing it this way, honestly.
- P_RunTriggerLinedef(eachtime->sourceline, players[affectPlayer].mo, sec);
+ P_RunTriggerLinedef(eachtime->sourceline, players[i].mo, sec);
if (!eachtime->sourceline->special) // this happens only for "Trigger on X calls" linedefs
P_RemoveThinker(&eachtime->thinker);
-
- oldPlayersArea[affectPlayer]=playersArea[affectPlayer];
}
}
@@ -2419,20 +1549,24 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
// Rises up to its topmost position when a
// player steps on it. Lowers otherwise.
//
-void T_RaiseSector(levelspecthink_t *raise)
+void T_RaiseSector(raise_t *raise)
{
msecnode_t *node;
mobj_t *thing;
sector_t *sector;
INT32 i;
boolean playeronme = false, active = false;
+ boolean moveUp;
fixed_t ceilingdestination, floordestination;
+ fixed_t speed, origspeed;
+ fixed_t distToNearestEndpoint;
+ INT32 direction;
result_e res = 0;
- if (raise->sector->crumblestate >= 3 || raise->sector->ceilingdata)
+ if (raise->sector->crumblestate >= CRUMBLE_FALL || raise->sector->ceilingdata)
return;
- for (i = -1; (i = P_FindSectorFromTag(raise->sourceline->tag, i)) >= 0 ;)
+ for (i = -1; (i = P_FindSectorFromTag(raise->tag, i)) >= 0 ;)
{
sector = §ors[i];
@@ -2449,7 +1583,7 @@ void T_RaiseSector(levelspecthink_t *raise)
continue;
// Option to require spindashing.
- if (raise->vars[1] && !(thing->player->pflags & PF_STARTDASH))
+ if (raise->flags & RF_SPINDASH && !(thing->player->pflags & PF_STARTDASH))
continue;
if (!(thing->z == P_GetSpecialTopZ(thing, raise->sector, sector)))
@@ -2460,43 +1594,43 @@ void T_RaiseSector(levelspecthink_t *raise)
}
}
- if (raise->vars[9]) // Dynamically Sinking Platform^tm
+ if (raise->flags & RF_DYNAMIC) // Dynamically Sinking Platform^tm
{
#define shaketime 10
- if (raise->vars[11] > shaketime) // State: moving
+ if (raise->shaketimer > shaketime) // State: moving
{
if (playeronme) // If player is standing on the platform, accelerate
{
- raise->vars[10] += (FRACUNIT >> 5);
+ raise->extraspeed += (FRACUNIT >> 5);
}
else // otherwise, decelerate until inflection
{
- raise->vars[10] -= FRACUNIT >> 3;
- if (raise->vars[10] <= 0) // inflection!
+ raise->extraspeed -= FRACUNIT >> 3;
+ if (raise->extraspeed <= 0) // inflection!
{
- raise->vars[10] = 0;
- raise->vars[11] = 0; // allow the shake to occur again (fucks over players attempting to jump-cheese)
+ raise->extraspeed = 0;
+ raise->shaketimer = 0; // allow the shake to occur again (fucks over players attempting to jump-cheese)
}
}
- active = raise->vars[10] > 0;
+ active = raise->extraspeed > 0;
}
else // State: shaking
{
- if (playeronme || raise->vars[11])
+ if (playeronme || raise->shaketimer)
{
active = true;
- if (++raise->vars[11] > shaketime)
+ if (++raise->shaketimer > shaketime)
{
if (playeronme)
- raise->vars[10] = FRACUNIT >> 5;
+ raise->extraspeed = FRACUNIT >> 5;
else
- raise->vars[10] = FRACUNIT << 1;
+ raise->extraspeed = FRACUNIT << 1;
}
else
{
- raise->vars[10] = ((shaketime/2) - raise->vars[11]) << FRACBITS;
- if (raise->vars[10] < -raise->vars[2]/2)
- raise->vars[10] = -raise->vars[2]/2;
+ raise->extraspeed = ((shaketime/2) - raise->shaketimer) << FRACBITS;
+ if (raise->extraspeed < -raise->basespeed/2)
+ raise->extraspeed = -raise->basespeed/2;
}
}
}
@@ -2505,127 +1639,61 @@ void T_RaiseSector(levelspecthink_t *raise)
else // Air bobbing platform (not a Dynamically Sinking Platform^tm)
active = playeronme;
- if (active)
- {
- raise->vars[3] = raise->vars[2];
-
- if (raise->vars[0] == 1)
- {
- if (raise->sector->ceilingheight <= raise->vars[7])
- {
- raise->sector->floorheight = raise->vars[7] - (raise->sector->ceilingheight - raise->sector->floorheight);
- raise->sector->ceilingheight = raise->vars[7];
- raise->sector->ceilspeed = 0;
- raise->sector->floorspeed = 0;
- return;
- }
-
- raise->vars[8] = -1;
- ceilingdestination = raise->vars[7];
- floordestination = raise->vars[6];
- }
- else // elevateUp
- {
- if (raise->sector->ceilingheight >= raise->vars[5])
- {
- raise->sector->floorheight = raise->vars[5] - (raise->sector->ceilingheight - raise->sector->floorheight);
- raise->sector->ceilingheight = raise->vars[5];
- raise->sector->ceilspeed = 0;
- raise->sector->floorspeed = 0;
- return;
- }
+ moveUp = active ^ (raise->flags & RF_REVERSE);
+ ceilingdestination = moveUp ? raise->ceilingtop : raise->ceilingbottom;
+ floordestination = ceilingdestination - (raise->sector->ceilingheight - raise->sector->floorheight);
- raise->vars[8] = 1;
- ceilingdestination = raise->vars[5];
- floordestination = raise->vars[4];
- }
- }
- else
+ if ((moveUp && raise->sector->ceilingheight >= ceilingdestination)
+ || (!moveUp && raise->sector->ceilingheight <= ceilingdestination))
{
- raise->vars[3] = raise->vars[2]/2;
-
- if (raise->vars[0] == 1)
- {
- if (raise->sector->ceilingheight >= raise->vars[5])
- {
- raise->sector->floorheight = raise->vars[5] - (raise->sector->ceilingheight - raise->sector->floorheight);
- raise->sector->ceilingheight = raise->vars[5];
- raise->sector->ceilspeed = 0;
- raise->sector->floorspeed = 0;
- return;
- }
- raise->vars[8] = 1;
- ceilingdestination = raise->vars[5];
- floordestination = raise->vars[4];
- }
- else // elevateUp
- {
- if (raise->sector->ceilingheight <= raise->vars[7])
- {
- raise->sector->floorheight = raise->vars[7] - (raise->sector->ceilingheight - raise->sector->floorheight);
- raise->sector->ceilingheight = raise->vars[7];
- raise->sector->ceilspeed = 0;
- raise->sector->floorspeed = 0;
- return;
- }
- raise->vars[8] = -1;
- ceilingdestination = raise->vars[7];
- floordestination = raise->vars[6];
- }
+ raise->sector->floorheight = floordestination;
+ raise->sector->ceilingheight = ceilingdestination;
+ raise->sector->ceilspeed = 0;
+ raise->sector->floorspeed = 0;
+ return;
}
+ direction = moveUp ? 1 : -1;
- if ((raise->sector->ceilingheight - raise->vars[7])
- < (raise->vars[5] - raise->sector->ceilingheight))
- {
- fixed_t origspeed = raise->vars[3];
+ origspeed = raise->basespeed;
+ if (!active)
+ origspeed /= 2;
- // Slow down as you get closer to the bottom
- raise->vars[3] = FixedMul(raise->vars[3],FixedDiv(raise->sector->ceilingheight - raise->vars[7], (raise->vars[5] - raise->vars[7])>>5));
+ // Speed up as you get closer to the middle, then slow down again
+ distToNearestEndpoint = min(raise->sector->ceilingheight - raise->ceilingbottom, raise->ceilingtop - raise->sector->ceilingheight);
+ speed = FixedMul(origspeed, FixedDiv(distToNearestEndpoint, (raise->ceilingtop - raise->ceilingbottom) >> 5));
- if (raise->vars[3] <= origspeed/16)
- raise->vars[3] = origspeed/16;
- else if (raise->vars[3] > origspeed)
- raise->vars[3] = origspeed;
- }
- else
- {
- fixed_t origspeed = raise->vars[3];
- // Slow down as you get closer to the top
- raise->vars[3] = FixedMul(raise->vars[3],FixedDiv(raise->vars[5] - raise->sector->ceilingheight, (raise->vars[5] - raise->vars[7])>>5));
-
- if (raise->vars[3] <= origspeed/16)
- raise->vars[3] = origspeed/16;
- else if (raise->vars[3] > origspeed)
- raise->vars[3] = origspeed;
- }
+ if (speed <= origspeed/16)
+ speed = origspeed/16;
+ else if (speed > origspeed)
+ speed = origspeed;
- raise->vars[3] += raise->vars[10];
+ speed += raise->extraspeed;
res = T_MovePlane
(
- raise->sector, // sector
- raise->vars[3], // speed
+ raise->sector, // sector
+ speed, // speed
ceilingdestination, // dest
- 0, // crush
- 1, // floor or ceiling (1 for ceiling)
- raise->vars[8] // direction
+ false, // crush
+ true, // ceiling?
+ direction // direction
);
if (res == ok || res == pastdest)
T_MovePlane
(
- raise->sector, // sector
- raise->vars[3], // speed
+ raise->sector, // sector
+ speed, // speed
floordestination, // dest
- 0, // crush
- 0, // floor or ceiling (0 for floor)
- raise->vars[8] // direction
+ false, // crush
+ false, // ceiling?
+ direction // direction
);
raise->sector->ceilspeed = 42;
- raise->sector->floorspeed = raise->vars[3]*raise->vars[8];
+ raise->sector->floorspeed = speed*direction;
- for (i = -1; (i = P_FindSectorFromTag(raise->sourceline->tag, i)) >= 0 ;)
+ for (i = -1; (i = P_FindSectorFromTag(raise->tag, i)) >= 0 ;)
P_RecalcPrecipInSector(§ors[i]);
}
@@ -2720,9 +1788,9 @@ void T_PlaneDisplace(planedisplace_t *pd)
}
if (pd->type == pd_floor || pd->type == pd_both)
- T_MovePlane(target, INT32_MAX/2, target->floorheight+diff, 0, 0, direction); // move floor
+ T_MovePlane(target, INT32_MAX/2, target->floorheight+diff, false, false, direction); // move floor
if (pd->type == pd_ceiling || pd->type == pd_both)
- T_MovePlane(target, INT32_MAX/2, target->ceilingheight+diff, 0, 1, direction); // move ceiling
+ T_MovePlane(target, INT32_MAX/2, target->ceilingheight+diff, false, true, direction); // move ceiling
pd->last_height = control->floorheight;
}
@@ -2736,14 +1804,14 @@ void T_PlaneDisplace(planedisplace_t *pd)
// (egg capsule button), P_PlayerInSpecialSector (buttons),
// and P_SpawnSpecials (continuous floor movers and instant lower).
//
-INT32 EV_DoFloor(line_t *line, floor_e floortype)
+void EV_DoFloor(line_t *line, floor_e floortype)
{
- INT32 rtn = 0, firstone = 1;
+ INT32 firstone = 1;
INT32 secnum = -1;
sector_t *sec;
floormove_t *dofloor;
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
sec = §ors[secnum];
@@ -2751,7 +1819,6 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
continue; // then don't add another one
// new floor thinker
- rtn = 1;
dofloor = Z_Calloc(sizeof (*dofloor), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &dofloor->thinker);
@@ -2941,8 +2008,6 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
firstone = 0;
}
-
- return rtn;
}
// SoM: Boom elevator support.
@@ -2955,15 +2020,14 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
//
// jff 2/22/98 new type to move floor and ceiling in parallel
//
-INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
+void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
{
INT32 secnum = -1;
- INT32 rtn = 0;
sector_t *sec;
elevator_t *elevator;
// act on all sectors with the same tag as the triggering linedef
- while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag,secnum)) >= 0)
{
sec = §ors[secnum];
@@ -2972,7 +2036,6 @@ INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
continue;
// create and initialize new elevator thinker
- rtn = 1;
elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &elevator->thinker);
sec->floordata = elevator;
@@ -3074,7 +2137,6 @@ INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
break;
}
}
- return rtn;
}
void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
@@ -3178,12 +2240,10 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
if (R_PointInSubsector(a, b)->sector == sec)
{
mobj_t *spawned = NULL;
-#ifdef ESLOPE
if (*rover->t_slope)
- topz = P_GetZAt(*rover->t_slope, a, b) - (spacing>>1);
+ topz = P_GetSlopeZAt(*rover->t_slope, a, b) - (spacing>>1);
if (*rover->b_slope)
- bottomz = P_GetZAt(*rover->b_slope, a, b);
-#endif
+ bottomz = P_GetSlopeZAt(*rover->b_slope, a, b);
for (c = topz; c > bottomz; c -= spacing)
{
@@ -3209,16 +2269,13 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
}
// Used for bobbing platforms on the water
-INT32 EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline)
+void EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline)
{
-#define speed vars[0]
-#define distance vars[1]
-#define low vars[2]
- levelspecthink_t *bouncer;
+ bouncecheese_t *bouncer;
// create and initialize new thinker
if (sec->ceilingdata) // One at a time, ma'am.
- return 0;
+ return;
bouncer = Z_Calloc(sizeof (*bouncer), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &bouncer->thinker);
@@ -3226,31 +2283,20 @@ INT32 EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline)
bouncer->thinker.function.acp1 = (actionf_p1)T_BounceCheese;
// set up the fields according to the type of elevator action
+ bouncer->sourceline = sourceline;
bouncer->sector = sec;
bouncer->speed = momz/2;
- bouncer->sourceline = sourceline;
bouncer->distance = FRACUNIT;
- bouncer->low = 1;
-
- return 1;
-#undef speed
-#undef distance
-#undef low
+ bouncer->low = true;
}
// For T_ContinuousFalling special
-INT32 EV_DoContinuousFall(sector_t *sec, sector_t *backsector, fixed_t spd, boolean backwards)
+void EV_DoContinuousFall(sector_t *sec, sector_t *backsector, fixed_t spd, boolean backwards)
{
-#define speed vars[0]
-#define direction vars[1]
-#define floorwasheight vars[2]
-#define ceilingwasheight vars[3]
-#define floordestheight vars[4]
-#define ceilingdestheight vars[5]
- levelspecthink_t *faller;
+ continuousfall_t *faller;
// workaround for when there is no back sector
- if (backsector == NULL)
+ if (!backsector)
backsector = sec;
// create and initialize new thinker
@@ -3262,36 +2308,18 @@ INT32 EV_DoContinuousFall(sector_t *sec, sector_t *backsector, fixed_t spd, bool
faller->sector = sec;
faller->speed = spd;
- faller->floorwasheight = sec->floorheight;
- faller->ceilingwasheight = sec->ceilingheight;
+ faller->floorstartheight = sec->floorheight;
+ faller->ceilingstartheight = sec->ceilingheight;
- if (backwards)
- {
- faller->ceilingdestheight = backsector->ceilingheight;
- faller->floordestheight = faller->ceilingdestheight;
- faller->direction = 1; // Up!
- }
- else
- {
- faller->floordestheight = backsector->floorheight;
- faller->ceilingdestheight = faller->floordestheight;
- faller->direction = -1;
- }
-
- return 1;
-#undef speed
-#undef direction
-#undef floorwasheight
-#undef ceilingwasheight
-#undef floordestheight
-#undef ceilingdestheight
+ faller->destheight = backwards ? backsector->ceilingheight : backsector->floorheight;
+ faller->direction = backwards ? 1 : -1;
}
// Some other 3dfloor special things Tails 03-11-2002 (Search p_mobj.c for description)
INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
player_t *player, fixed_t origalpha, boolean crumblereturn)
{
- elevator_t *elevator;
+ crumble_t *crumble;
sector_t *foundsec;
INT32 i;
@@ -3299,68 +2327,58 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
if (sec->floordata)
return 0;
- if (sec->crumblestate > 1)
+ if (sec->crumblestate >= CRUMBLE_ACTIVATED)
return 0;
- // create and initialize new elevator thinker
- elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
- P_AddThinker(THINK_MAIN, &elevator->thinker);
- elevator->thinker.function.acp1 = (actionf_p1)T_StartCrumble;
+ // create and initialize new crumble thinker
+ crumble = Z_Calloc(sizeof (*crumble), PU_LEVSPEC, NULL);
+ P_AddThinker(THINK_MAIN, &crumble->thinker);
+ crumble->thinker.function.acp1 = (actionf_p1)T_StartCrumble;
- // Does this crumbler return?
- if (crumblereturn)
- elevator->type = elevateBounce;
- else
- elevator->type = elevateContinuous;
-
- // set up the fields according to the type of elevator action
- elevator->sector = sec;
- elevator->speed = 0;
+ // set up the fields
+ crumble->sector = sec;
+ crumble->speed = 0;
if (player && player->mo && (player->mo->eflags & MFE_VERTICALFLIP))
{
- elevator->direction = 1; // Up
- elevator->floordestheight = 1;
+ crumble->direction = 1; // Up
+ crumble->flags |= CF_REVERSE;
}
else
- {
- elevator->direction = -1; // Down
- elevator->floordestheight = 0;
- }
+ crumble->direction = -1; // Down
- elevator->floorwasheight = elevator->sector->floorheight;
- elevator->ceilingwasheight = elevator->sector->ceilingheight;
- elevator->distance = TICRATE; // Used for delay time
- elevator->low = 0;
- elevator->player = player;
- elevator->origspeed = origalpha;
+ crumble->floorwasheight = crumble->sector->floorheight;
+ crumble->ceilingwasheight = crumble->sector->ceilingheight;
+ crumble->timer = TICRATE;
+ crumble->player = player;
+ crumble->origalpha = origalpha;
- elevator->sourceline = rover->master;
+ crumble->sourceline = rover->master;
- sec->floordata = elevator;
+ sec->floordata = crumble;
+ if (crumblereturn)
+ crumble->flags |= CF_RETURN;
if (floating)
- elevator->high = 42;
- else
- elevator->high = 0;
+ crumble->flags |= CF_FLOATBOB;
- elevator->sector->crumblestate = 2;
+ crumble->sector->crumblestate = CRUMBLE_ACTIVATED;
- for (i = -1; (i = P_FindSectorFromTag(elevator->sourceline->tag, i)) >= 0 ;)
+ for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
{
foundsec = §ors[i];
- P_SpawnMobj(foundsec->soundorg.x, foundsec->soundorg.y, elevator->direction == 1 ? elevator->sector->floorheight : elevator->sector->ceilingheight, MT_CRUMBLEOBJ);
+ P_SpawnMobj(foundsec->soundorg.x, foundsec->soundorg.y, crumble->direction == 1 ? crumble->sector->floorheight : crumble->sector->ceilingheight, MT_CRUMBLEOBJ);
}
return 1;
}
-INT32 EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
+void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
{
sector_t *roversec = rover->master->frontsector;
fixed_t topheight = *rover->topheight;
- levelspecthink_t *block;
+ mariothink_t *block;
mobj_t *thing;
fixed_t oldx = 0, oldy = 0, oldz = 0;
@@ -3368,7 +2386,7 @@ INT32 EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
I_Assert(puncher->player != NULL);
if (roversec->floordata || roversec->ceilingdata)
- return 0;
+ return;
if (!(rover->flags & FF_SOLID))
rover->flags |= (FF_SOLID|FF_RENDERALL|FF_CUTLEVEL);
@@ -3376,8 +2394,9 @@ INT32 EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
// Find an item to pop out!
thing = SearchMarioNode(roversec->touching_thinglist);
- // Found something!
- if (thing)
+ if (!thing)
+ S_StartSound(puncher, sfx_mario1); // "Thunk!" sound - puncher is "close enough".
+ else // Found something!
{
const boolean itsamonitor = (thing->flags & MF_MONITOR) == MF_MONITOR;
// create and initialize new elevator thinker
@@ -3390,13 +2409,11 @@ INT32 EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
// Set up the fields
block->sector = roversec;
- block->vars[0] = sector->tag; // actionsector
- block->vars[1] = 4*FRACUNIT; // speed
- block->vars[2] = 1; // Up // direction
- block->vars[3] = block->sector->floorheight; // floorwasheight
- block->vars[4] = block->sector->ceilingheight; // ceilingwasheight
- block->vars[5] = FRACUNIT; // distance
- block->vars[6] = 1; // low
+ block->speed = 4*FRACUNIT;
+ block->direction = 1;
+ block->floorstartheight = block->sector->floorheight;
+ block->ceilingstartheight = block->sector->ceilingheight;
+ block->tag = (INT16)sector->tag;
if (itsamonitor)
{
@@ -3437,8 +2454,4 @@ INT32 EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
P_SetThingPosition(thing);
}
}
- else
- S_StartSound(puncher, sfx_mario1); // "Thunk!" sound - puncher is "close enough".
-
- return 1;
}
diff --git a/src/p_inter.c b/src/p_inter.c
index a24f9bf0324b37a2a540a2ff5c7f52e673469e93..3d2c5e45e4f46017fe3284b5831da4d8aca04123 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -365,10 +365,8 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (special->flags & (MF_ENEMY|MF_BOSS) && special->flags2 & MF2_FRET)
return;
-#ifdef HAVE_BLUA
if (LUAh_TouchSpecial(special, toucher) || P_MobjWasRemoved(special))
return;
-#endif
// 0 = none, 1 = elemental pierce, 2 = bubble bounce
elementalpierce = (((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL || (player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP) && (player->pflags & PF_SHIELDABILITY)
@@ -635,7 +633,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (ALL7EMERALDS(emeralds)) // Got all 7
{
- if (!(netgame || multiplayer))
+ if (continuesInSession)
{
player->continues += 1;
player->gotcontinue = true;
@@ -645,7 +643,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
S_StartSound(toucher, sfx_chchng);
}
else
+ {
+ P_GiveCoopLives(player, 1, true); // if continues are disabled, a life is a reasonable substitute
S_StartSound(toucher, sfx_chchng);
+ }
}
else
{
@@ -1919,10 +1920,8 @@ 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.
-#ifdef HAVE_BLUA
if (LUAh_HurtMsg(player, inflictor, source, damagetype))
return;
-#endif
deadtarget = (player->mo->health <= 0);
@@ -2395,10 +2394,8 @@ 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.
-#ifdef HAVE_BLUA
if (LUAh_MobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target))
return;
-#endif
// Let EVERYONE know what happened to a player! 01-29-2002 Tails
if (target->player && !target->player->spectator)
@@ -3156,7 +3153,7 @@ static boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj_t *sou
return false;
// In COOP/RACE, you can't hurt other players unless cv_friendlyfire is on
- if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)) && (G_PlatformGametype()))
+ if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)) && (gametyperules & GTR_FRIENDLY))
{
if (gametype == GT_COOP && inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK)) // co-op only
{
@@ -3441,7 +3438,7 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
if (player->powers[pw_invulnerability] || player->powers[pw_flashing] || player->powers[pw_super])
return;
- if (!cv_friendlyfire.value)
+ if (!cv_friendlyfire.value && source && source->player)
{
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
{
@@ -3456,7 +3453,7 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
return;
}
- if (inflictor->type == MT_LHRT)
+ if (inflictor && inflictor->type == MT_LHRT)
return;
if (player->powers[pw_shield] || player->bot) //If One-Hit Shield
@@ -3511,11 +3508,7 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage, UINT8 damagetype)
{
player_t *player;
-#ifdef HAVE_BLUA
boolean force = false;
-#else
- static const boolean force = false;
-#endif
if (objectplacing)
return false;
@@ -3533,7 +3526,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
return false;
}
-#ifdef HAVE_BLUA
// Everything above here can't be forced.
if (!metalrecording)
{
@@ -3545,7 +3537,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
else if (shouldForce == 2)
return false;
}
-#endif
if (!force)
{
@@ -3579,10 +3570,8 @@ 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;
-#ifdef HAVE_BLUA
if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype) || P_MobjWasRemoved(target))
return true;
-#endif
if (target->health > 1)
target->flags2 |= MF2_FRET;
@@ -3631,10 +3620,8 @@ 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
}
-#ifdef HAVE_BLUA
if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype))
return true;
-#endif
P_NiGHTSDamage(target, source); // -5s :(
return true;
}
@@ -3687,18 +3674,14 @@ 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!
{
-#ifdef HAVE_BLUA
if (!LUAh_MobjDamage(target, inflictor, source, damage, damagetype))
-#endif
P_SuperDamage(player, inflictor, source, damage);
return true;
}
return false;
}
-#ifdef HAVE_BLUA
else if (LUAh_MobjDamage(target, inflictor, source, damage, damagetype))
return true;
-#endif
else if (player->powers[pw_shield] || (player->bot && !ultimatemode)) //If One-Hit Shield
{
P_ShieldDamage(player, inflictor, source, damage, damagetype);
diff --git a/src/p_local.h b/src/p_local.h
index 5e27379a76192f434618e204538b1711ad3ccdc0..becb045f70e976ac8457efb4aa1577d12efa1529 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -66,9 +66,7 @@ typedef enum
THINK_POLYOBJ,
THINK_MAIN,
THINK_MOBJ,
-#ifdef ESLOPE
THINK_DYNSLOPE,
-#endif
THINK_PRECIP,
NUM_THINKERLISTS
} thinklistnum_t; /**< Thinker lists. */
@@ -250,7 +248,7 @@ extern jingle_t jingleinfo[NUMJINGLES];
#define JINGLEPOSTFADE 1000
void P_PlayJingle(player_t *player, jingletype_t jingletype);
-boolean P_EvaluateMusicStatus(UINT16 status);
+boolean P_EvaluateMusicStatus(UINT16 status, const char *musname);
void P_PlayJingleMusic(player_t *player, const char *musname, UINT16 musflags, boolean looping, UINT16 status);
//
@@ -383,9 +381,7 @@ extern mobj_t *tmfloorthing, *tmhitthing, *tmthing;
extern camera_t *mapcampointer;
extern fixed_t tmx;
extern fixed_t tmy;
-#ifdef ESLOPE
extern pslope_t *tmfloorslope, *tmceilingslope;
-#endif
/* cphipps 2004/08/30 */
extern void P_MapStart(void);
diff --git a/src/p_map.c b/src/p_map.c
index 96668481897bec73f922295bc2c89c7fc3d2b194..b63ce84ba2a53f3ce23fbae730aad832b813c9f1 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -27,9 +27,7 @@
#include "r_splats.h"
-#ifdef ESLOPE
#include "p_slopes.h"
-#endif
#include "z_zone.h"
@@ -53,9 +51,7 @@ static fixed_t tmdropoffz, tmdrpoffceilz; // drop-off floor/ceiling heights
mobj_t *tmfloorthing; // the thing corresponding to tmfloorz or NULL if tmfloorz is from a sector
mobj_t *tmhitthing; // the solid thing you bumped into (for collisions)
ffloor_t *tmfloorrover, *tmceilingrover;
-#ifdef ESLOPE
pslope_t *tmfloorslope, *tmceilingslope;
-#endif
// keep track of the line that lowers the ceiling,
// so missiles don't explode against sky hack walls
@@ -262,9 +258,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (!vertispeed && !horizspeed)
return false;
-#ifdef ESLOPE
object->standingslope = NULL; // Okay, now we know it's not going to be relevant - no launching off at silly angles for you.
-#endif
if (spring->eflags & MFE_VERTICALFLIP)
vertispeed *= -1;
@@ -439,9 +433,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
P_SetPlayerMobjState(object, S_PLAY_FALL);
}
-#ifdef ESLOPE
object->standingslope = NULL; // And again.
-#endif
final = true;
@@ -491,9 +483,7 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
zdist = object->z - spring->z;
}
-#ifdef ESLOPE
object->standingslope = NULL; // No launching off at silly angles for you.
-#endif
switch (spring->type)
{
@@ -756,11 +746,9 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
-#ifdef HAVE_BLUA
// REX HAS SEEN YOU
if (!LUAh_SeenPlayer(tmthing->target->player, thing->player))
return false;
-#endif
seenplayer = thing->player;
return false;
@@ -948,7 +936,6 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // the line doesn't cross between either pair of opposite corners
}
-#ifdef HAVE_BLUA
{
UINT8 shouldCollide = LUAh_MobjCollide(thing, tmthing); // checks hook for thing's type
if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
@@ -957,9 +944,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
return false; // force collide
else if (shouldCollide == 2)
return true; // force no collide
- }
- {
- UINT8 shouldCollide = LUAh_MobjMoveCollide(tmthing, thing); // checks hook for tmthing's type
+
+ shouldCollide = LUAh_MobjMoveCollide(tmthing, thing); // checks hook for tmthing's type
if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
return true; // one of them was removed???
if (shouldCollide == 1)
@@ -967,7 +953,6 @@ static boolean PIT_CheckThing(mobj_t *thing)
else if (shouldCollide == 2)
return true; // force no collide
}
-#endif
if (tmthing->type == MT_LAVAFALL_LAVA && (thing->type == MT_RING || thing->type == MT_REDTEAMRING || thing->type == MT_BLUETEAMRING || thing->type == MT_FLINGRING))
{
@@ -1741,9 +1726,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
{
tmfloorz = thing->z + thing->height;
tmfloorrover = NULL;
-#ifdef ESLOPE
tmfloorslope = NULL;
-#endif
}
return true;
}
@@ -1762,18 +1745,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
tmfloorz = tmceilingz = topz; // block while in air
tmceilingrover = NULL;
-#ifdef ESLOPE
tmceilingslope = NULL;
-#endif
tmfloorthing = thing; // needed for side collision
}
else if (topz < tmceilingz && tmthing->z <= thing->z+thing->height)
{
tmceilingz = topz;
tmceilingrover = NULL;
-#ifdef ESLOPE
tmceilingslope = NULL;
-#endif
tmfloorthing = thing; // thing we may stand on
}
}
@@ -1788,9 +1767,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
{
tmceilingz = thing->z;
tmceilingrover = NULL;
-#ifdef ESLOPE
tmceilingslope = NULL;
-#endif
}
return true;
}
@@ -1809,18 +1786,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
tmfloorz = tmceilingz = topz; // block while in air
tmfloorrover = NULL;
-#ifdef ESLOPE
tmfloorslope = NULL;
-#endif
tmfloorthing = thing; // needed for side collision
}
else if (topz > tmfloorz && tmthing->z+tmthing->height >= thing->z)
{
tmfloorz = topz;
tmfloorrover = NULL;
-#ifdef ESLOPE
tmfloorslope = NULL;
-#endif
tmfloorthing = thing; // thing we may stand on
}
}
@@ -1946,7 +1919,6 @@ static boolean PIT_CheckLine(line_t *ld)
// this line is out of the if so upper and lower textures can be hit by a splat
blockingline = ld;
-#ifdef HAVE_BLUA
{
UINT8 shouldCollide = LUAh_MobjLineCollide(tmthing, blockingline); // checks hook for thing's type
if (P_MobjWasRemoved(tmthing))
@@ -1956,7 +1928,6 @@ static boolean PIT_CheckLine(line_t *ld)
else if (shouldCollide == 2)
return true; // force no collide
}
-#endif
if (!ld->backsector) // one sided line
{
@@ -1983,18 +1954,14 @@ static boolean PIT_CheckLine(line_t *ld)
tmceilingz = opentop;
ceilingline = ld;
tmceilingrover = openceilingrover;
-#ifdef ESLOPE
tmceilingslope = opentopslope;
-#endif
}
if (openbottom > tmfloorz)
{
tmfloorz = openbottom;
tmfloorrover = openfloorrover;
-#ifdef ESLOPE
tmfloorslope = openbottomslope;
-#endif
}
if (highceiling > tmdrpoffceilz)
@@ -2075,10 +2042,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
tmceilingz = P_GetCeilingZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->ceilingheight;
tmfloorrover = NULL;
tmceilingrover = NULL;
-#ifdef ESLOPE
tmfloorslope = newsubsec->sector->f_slope;
tmceilingslope = newsubsec->sector->c_slope;
-#endif
// Check list of fake floors and see if tmfloorz/tmceilingz need to be altered.
if (newsubsec->sector->ffloors)
@@ -2119,9 +2084,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
if (tmfloorz < topheight - sinklevel) {
tmfloorz = topheight - sinklevel;
tmfloorrover = rover;
-#ifdef ESLOPE
tmfloorslope = *rover->t_slope;
-#endif
}
}
else if (thing->eflags & MFE_VERTICALFLIP && thingtop <= bottomheight + sinklevel && thing->momz >= 0)
@@ -2129,9 +2092,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
if (tmceilingz > bottomheight + sinklevel) {
tmceilingz = bottomheight + sinklevel;
tmceilingrover = rover;
-#ifdef ESLOPE
tmceilingslope = *rover->b_slope;
-#endif
}
}
}
@@ -2154,9 +2115,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
if (tmfloorz < thing->z) {
tmfloorz = thing->z;
tmfloorrover = rover;
-#ifdef ESLOPE
tmfloorslope = NULL;
-#endif
}
}
// Quicksand blocks never change heights otherwise.
@@ -2173,9 +2132,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{
tmfloorz = tmdropoffz = topheight;
tmfloorrover = rover;
-#ifdef ESLOPE
tmfloorslope = *rover->t_slope;
-#endif
}
if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2)
&& !(rover->flags & FF_PLATFORM)
@@ -2183,9 +2140,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{
tmceilingz = tmdrpoffceilz = bottomheight;
tmceilingrover = rover;
-#ifdef ESLOPE
tmceilingslope = *rover->b_slope;
-#endif
}
}
}
@@ -2202,7 +2157,6 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
BMBOUNDFIX(xl, xh, yl, yh);
-#ifdef POLYOBJECTS
// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
{
validcount++;
@@ -2260,17 +2214,13 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
if (polytop > tmfloorz && abs(delta1) < abs(delta2)) {
tmfloorz = tmdropoffz = polytop;
-#ifdef ESLOPE
tmfloorslope = NULL;
-#endif
tmfloorrover = NULL;
}
if (polybottom < tmceilingz && abs(delta1) >= abs(delta2)) {
tmceilingz = tmdrpoffceilz = polybottom;
-#ifdef ESLOPE
tmceilingslope = NULL;
-#endif
tmceilingrover = NULL;
}
}
@@ -2278,7 +2228,6 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
}
}
}
-#endif
// tmfloorthing is set when tmfloorz comes from a thing's top
tmfloorthing = NULL;
@@ -2436,7 +2385,6 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
BMBOUNDFIX(xl, xh, yl, yh);
-#ifdef POLYOBJECTS
// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
{
validcount++;
@@ -2507,7 +2455,6 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
}
}
}
-#endif
// check lines
for (bx = xl; bx <= xh; bx++)
@@ -2671,10 +2618,8 @@ boolean PIT_PushableMoved(mobj_t *thing)
line_t *oldblockline = blockingline;
ffloor_t *oldflrrover = tmfloorrover;
ffloor_t *oldceilrover = tmceilingrover;
-#ifdef ESLOPE
pslope_t *oldfslope = tmfloorslope;
pslope_t *oldcslope = tmceilingslope;
-#endif
// Move the player
P_TryMove(thing, thing->x+stand->momx, thing->y+stand->momy, true);
@@ -2689,10 +2634,8 @@ boolean PIT_PushableMoved(mobj_t *thing)
blockingline = oldblockline;
tmfloorrover = oldflrrover;
tmceilingrover = oldceilrover;
-#ifdef ESLOPE
tmfloorslope = oldfslope;
tmceilingslope = oldcslope;
-#endif
thing->momz = stand->momz;
}
else
@@ -2714,9 +2657,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
fixed_t tryy = thing->y;
fixed_t radius = thing->radius;
fixed_t thingtop = thing->z + thing->height;
-#ifdef ESLOPE
fixed_t startingonground = P_IsObjectOnGround(thing);
-#endif
floatok = false;
if (radius < MAXRADIUS/2)
@@ -2802,14 +2743,12 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
thing->ceilingrover = tmceilingrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
-#ifdef ESLOPE
else if (tmceilingz < thingtop && thingtop - tmceilingz <= maxstep)
{
thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
thing->ceilingrover = tmceilingrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
-#endif
}
else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
{
@@ -2817,14 +2756,12 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
thing->floorrover = tmfloorrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
-#ifdef ESLOPE
else if (tmfloorz > thing->z && tmfloorz - thing->z <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
thing->floorrover = tmfloorrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
-#endif
}
if (thing->eflags & MFE_VERTICALFLIP)
@@ -2888,7 +2825,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
thing->floorrover = tmfloorrover;
thing->ceilingrover = tmceilingrover;
-#ifdef ESLOPE
if (!(thing->flags & MF_NOCLIPHEIGHT))
{
// Assign thing's standingslope if needed
@@ -2909,7 +2845,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
}
else // don't set standingslope if you're not going to clip against it
thing->standingslope = NULL;
-#endif
thing->x = x;
thing->y = y;
@@ -3267,109 +3202,83 @@ isblocking:
static boolean P_IsClimbingValid(player_t *player, angle_t angle)
{
fixed_t platx, platy;
- subsector_t *glidesector;
+ sector_t *glidesector;
fixed_t floorz, ceilingz;
+ mobj_t *mo = player->mo;
+ ffloor_t *rover;
- platx = P_ReturnThrustX(player->mo, angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
- platy = P_ReturnThrustY(player->mo, angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
+ platx = P_ReturnThrustX(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale));
+ platy = P_ReturnThrustY(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale));
- glidesector = R_PointInSubsector(player->mo->x + platx, player->mo->y + platy);
+ glidesector = R_PointInSubsector(mo->x + platx, mo->y + platy)->sector;
-#ifdef ESLOPE
- floorz = glidesector->sector->f_slope ? P_GetZAt(glidesector->sector->f_slope, player->mo->x, player->mo->y) : glidesector->sector->floorheight;
- ceilingz = glidesector->sector->c_slope ? P_GetZAt(glidesector->sector->c_slope, player->mo->x, player->mo->y) : glidesector->sector->ceilingheight;
-#else
- floorz = glidesector->sector->floorheight;
- ceilingz = glidesector->sector->ceilingheight;
-#endif
+ floorz = P_GetSectorFloorZAt (glidesector, mo->x, mo->y);
+ ceilingz = P_GetSectorCeilingZAt(glidesector, mo->x, mo->y);
- if (glidesector->sector != player->mo->subsector->sector)
+ if (glidesector != mo->subsector->sector)
{
boolean floorclimb = false;
fixed_t topheight, bottomheight;
- if (glidesector->sector->ffloors)
+ for (rover = glidesector->ffloors; rover; rover = rover->next)
{
- ffloor_t *rover;
- for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER))
- continue;
-
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
-#ifdef ESLOPE
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y);
-#endif
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER))
+ continue;
- floorclimb = true;
+ topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
- if (player->mo->eflags & MFE_VERTICALFLIP)
- {
- if ((topheight < player->mo->z + player->mo->height) && ((player->mo->z + player->mo->height + player->mo->momz) < topheight))
- {
- floorclimb = true;
- }
- if (topheight < player->mo->z) // Waaaay below the ledge.
- {
- floorclimb = false;
- }
- if (bottomheight > player->mo->z + player->mo->height - FixedMul(16*FRACUNIT,player->mo->scale))
- {
- floorclimb = false;
- }
- }
- else
- {
- if ((bottomheight > player->mo->z) && ((player->mo->z - player->mo->momz) > bottomheight))
- {
- floorclimb = true;
- }
- if (bottomheight > player->mo->z + player->mo->height) // Waaaay below the ledge.
- {
- floorclimb = false;
- }
- if (topheight < player->mo->z + FixedMul(16*FRACUNIT,player->mo->scale))
- {
- floorclimb = false;
- }
- }
+ floorclimb = true;
- if (floorclimb)
- break;
+ if (mo->eflags & MFE_VERTICALFLIP)
+ {
+ if ((topheight < mo->z + mo->height) && ((mo->z + mo->height + mo->momz) < topheight))
+ floorclimb = true;
+ if (topheight < mo->z) // Waaaay below the ledge.
+ floorclimb = false;
+ if (bottomheight > mo->z + mo->height - FixedMul(16*FRACUNIT,mo->scale))
+ floorclimb = false;
+ }
+ else
+ {
+ if ((bottomheight > mo->z) && ((mo->z - mo->momz) > bottomheight))
+ floorclimb = true;
+ if (bottomheight > mo->z + mo->height) // Waaaay below the ledge.
+ floorclimb = false;
+ if (topheight < mo->z + FixedMul(16*FRACUNIT,mo->scale))
+ floorclimb = false;
}
+
+ if (floorclimb)
+ break;
}
- if (player->mo->eflags & MFE_VERTICALFLIP)
+ if (mo->eflags & MFE_VERTICALFLIP)
{
- if ((floorz <= player->mo->z + player->mo->height)
- && ((player->mo->z + player->mo->height - player->mo->momz) <= floorz))
+ if ((floorz <= mo->z + mo->height)
+ && ((mo->z + mo->height - mo->momz) <= floorz))
floorclimb = true;
- if ((floorz > player->mo->z)
- && glidesector->sector->floorpic == skyflatnum)
+ if ((floorz > mo->z)
+ && glidesector->floorpic == skyflatnum)
return false;
- if ((player->mo->z + player->mo->height - FixedMul(16*FRACUNIT,player->mo->scale) > ceilingz)
- || (player->mo->z + player->mo->height <= floorz))
+ if ((mo->z + mo->height - FixedMul(16*FRACUNIT,mo->scale) > ceilingz)
+ || (mo->z + mo->height <= floorz))
floorclimb = true;
}
else
{
- if ((ceilingz >= player->mo->z)
- && ((player->mo->z - player->mo->momz) >= ceilingz))
+ if ((ceilingz >= mo->z)
+ && ((mo->z - mo->momz) >= ceilingz))
floorclimb = true;
- if ((ceilingz < player->mo->z+player->mo->height)
- && glidesector->sector->ceilingpic == skyflatnum)
+ if ((ceilingz < mo->z+mo->height)
+ && glidesector->ceilingpic == skyflatnum)
return false;
- if ((player->mo->z + FixedMul(16*FRACUNIT,player->mo->scale) < floorz)
- || (player->mo->z >= ceilingz))
+ if ((mo->z + FixedMul(16*FRACUNIT,mo->scale) < floorz)
+ || (mo->z >= ceilingz))
floorclimb = true;
}
@@ -3382,164 +3291,150 @@ static boolean P_IsClimbingValid(player_t *player, angle_t angle)
return false;
}
-//
-// PTR_SlideTraverse
-//
-static boolean PTR_SlideTraverse(intercept_t *in)
+static boolean PTR_LineIsBlocking(line_t *li)
{
- line_t *li;
-
- I_Assert(in->isaline);
-
- li = in->d.line;
-
// one-sided linedefs are always solid to sliding movement.
- // one-sided linedef
if (!li->backsector)
- {
- if (P_PointOnLineSide(slidemo->x, slidemo->y, li))
- return true; // don't hit the back side
- goto isblocking;
- }
+ return !P_PointOnLineSide(slidemo->x, slidemo->y, li);
if (!(slidemo->flags & MF_MISSILE))
{
if (li->flags & ML_IMPASSIBLE)
- goto isblocking;
+ return true;
if ((slidemo->flags & (MF_ENEMY|MF_BOSS)) && li->flags & ML_BLOCKMONSTERS)
- goto isblocking;
+ return true;
}
// set openrange, opentop, openbottom
P_LineOpening(li, slidemo);
if (openrange < slidemo->height)
- goto isblocking; // doesn't fit
+ return true; // doesn't fit
if (opentop - slidemo->z < slidemo->height)
- goto isblocking; // mobj is too high
+ return true; // mobj is too high
if (openbottom - slidemo->z > FixedMul(MAXSTEPMOVE, slidemo->scale))
- goto isblocking; // too big a step up
+ return true; // too big a step up
- // this line doesn't block movement
- return true;
+ return false;
+}
- // the line does block movement,
- // see if it is closer than best so far
-isblocking:
- if (li->polyobj && slidemo->player)
- {
- if ((li->polyobj->lines[0]->backsector->flags & SF_TRIGGERSPECIAL_TOUCH) && !(li->polyobj->flags & POF_NOSPECIALS))
- P_ProcessSpecialSector(slidemo->player, slidemo->subsector->sector, li->polyobj->lines[0]->backsector);
- }
+static void PTR_GlideClimbTraverse(line_t *li)
+{
+ line_t *checkline = li;
+ ffloor_t *rover;
+ fixed_t topheight, bottomheight;
+ boolean fofline = false;
+ sector_t *checksector = (li->backsector && !P_PointOnLineSide(slidemo->x, slidemo->y, li)) ? li->backsector : li->frontsector;
- if (slidemo->player && (slidemo->player->pflags & PF_GLIDING || slidemo->player->climbing)
- && slidemo->player->charability == CA_GLIDEANDCLIMB)
+ if (checksector->ffloors)
{
- line_t *checkline = li;
- sector_t *checksector;
- ffloor_t *rover;
- fixed_t topheight, bottomheight;
- boolean fofline = false;
- INT32 side = P_PointOnLineSide(slidemo->x, slidemo->y, li);
-
- if (!side && li->backsector)
- checksector = li->backsector;
- else
- checksector = li->frontsector;
-
- if (checksector->ffloors)
+ for (rover = checksector->ffloors; rover; rover = rover->next)
{
- for (rover = checksector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
- continue;
-
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
-#ifdef ESLOPE
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, slidemo->x, slidemo->y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, slidemo->x, slidemo->y);
-#endif
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
+ continue;
- if (topheight < slidemo->z)
- continue;
+ topheight = P_GetFFloorTopZAt (rover, slidemo->x, slidemo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, slidemo->x, slidemo->y);
- if (bottomheight > slidemo->z + slidemo->height)
- continue;
+ if (topheight < slidemo->z)
+ continue;
- // Got this far, so I guess it's climbable. // TODO: Climbing check, also, better method to do this?
- if (rover->master->flags & ML_TFERLINE)
- {
- size_t linenum = li-checksector->lines[0];
- checkline = rover->master->frontsector->lines[0] + linenum;
- fofline = true;
- }
+ if (bottomheight > slidemo->z + slidemo->height)
+ continue;
- break;
+ // Got this far, so I guess it's climbable. // TODO: Climbing check, also, better method to do this?
+ if (rover->master->flags & ML_TFERLINE)
+ {
+ size_t linenum = li-checksector->lines[0];
+ checkline = rover->master->frontsector->lines[0] + linenum;
+ fofline = true;
}
+
+ break;
}
+ }
- // see about climbing on the wall
- if (!(checkline->flags & ML_NOCLIMB) && checkline->special != HORIZONSPECIAL)
- {
- boolean canclimb;
- angle_t climbangle, climbline;
- INT32 whichside = P_PointOnLineSide(slidemo->x, slidemo->y, li);
+ // see about climbing on the wall
+ if (!(checkline->flags & ML_NOCLIMB) && checkline->special != HORIZONSPECIAL)
+ {
+ boolean canclimb;
+ angle_t climbangle, climbline;
+ INT32 whichside = P_PointOnLineSide(slidemo->x, slidemo->y, li);
- climbangle = climbline = R_PointToAngle2(li->v1->x, li->v1->y, li->v2->x, li->v2->y);
+ climbangle = climbline = R_PointToAngle2(li->v1->x, li->v1->y, li->v2->x, li->v2->y);
- if (whichside) // on second side?
- climbline += ANGLE_180;
+ if (whichside) // on second side?
+ climbline += ANGLE_180;
- climbangle += (ANGLE_90 * (whichside ? -1 : 1));
+ climbangle += (ANGLE_90 * (whichside ? -1 : 1));
- canclimb = (li->backsector ? P_IsClimbingValid(slidemo->player, climbangle) : true);
+ canclimb = (li->backsector ? P_IsClimbingValid(slidemo->player, climbangle) : true);
- if (((!slidemo->player->climbing && abs((signed)(slidemo->angle - ANGLE_90 - climbline)) < ANGLE_45)
+ if (((!slidemo->player->climbing && abs((signed)(slidemo->angle - ANGLE_90 - climbline)) < ANGLE_45)
|| (slidemo->player->climbing == 1 && abs((signed)(slidemo->angle - climbline)) < ANGLE_135))
&& canclimb)
+ {
+ slidemo->angle = climbangle;
+ /*if (!demoplayback || P_ControlStyle(slidemo->player) == CS_LMAOGALOG)
{
- slidemo->angle = climbangle;
- /*if (!demoplayback || P_ControlStyle(slidemo->player) == CS_LMAOGALOG)
- {
- if (slidemo->player == &players[consoleplayer])
- localangle = slidemo->angle;
- else if (slidemo->player == &players[secondarydisplayplayer])
- localangle2 = slidemo->angle;
- }*/
+ if (slidemo->player == &players[consoleplayer])
+ localangle = slidemo->angle;
+ else if (slidemo->player == &players[secondarydisplayplayer])
+ localangle2 = slidemo->angle;
+ }*/
- if (!slidemo->player->climbing)
- {
- S_StartSound(slidemo->player->mo, sfx_s3k4a);
- slidemo->player->climbing = 5;
- }
-
- slidemo->player->pflags &= ~(PF_GLIDING|PF_SPINNING|PF_JUMPED|PF_NOJUMPDAMAGE|PF_THOKKED);
- slidemo->player->glidetime = 0;
- slidemo->player->secondjump = 0;
+ if (!slidemo->player->climbing)
+ {
+ S_StartSound(slidemo->player->mo, sfx_s3k4a);
+ slidemo->player->climbing = 5;
+ }
- if (slidemo->player->climbing > 1)
- slidemo->momz = slidemo->momx = slidemo->momy = 0;
+ slidemo->player->pflags &= ~(PF_GLIDING|PF_SPINNING|PF_JUMPED|PF_NOJUMPDAMAGE|PF_THOKKED);
+ slidemo->player->glidetime = 0;
+ slidemo->player->secondjump = 0;
- if (fofline)
- whichside = 0;
+ if (slidemo->player->climbing > 1)
+ slidemo->momz = slidemo->momx = slidemo->momy = 0;
- if (!whichside)
- {
- slidemo->player->lastsidehit = checkline->sidenum[whichside];
- slidemo->player->lastlinehit = (INT16)(checkline - lines);
- }
+ if (fofline)
+ whichside = 0;
- P_Thrust(slidemo, slidemo->angle, FixedMul(5*FRACUNIT, slidemo->scale));
+ if (!whichside)
+ {
+ slidemo->player->lastsidehit = checkline->sidenum[whichside];
+ slidemo->player->lastlinehit = (INT16)(checkline - lines);
}
+
+ P_Thrust(slidemo, slidemo->angle, FixedMul(5*FRACUNIT, slidemo->scale));
}
}
+}
+
+static boolean PTR_SlideTraverse(intercept_t *in)
+{
+ line_t *li;
+
+ I_Assert(in->isaline);
+
+ li = in->d.line;
+
+ if (!PTR_LineIsBlocking(li))
+ return true;
+
+ // the line blocks movement,
+ // see if it is closer than best so far
+ if (li->polyobj && slidemo->player)
+ {
+ if ((li->polyobj->lines[0]->backsector->flags & SF_TRIGGERSPECIAL_TOUCH) && !(li->polyobj->flags & POF_NOSPECIALS))
+ P_ProcessSpecialSector(slidemo->player, slidemo->subsector->sector, li->polyobj->lines[0]->backsector);
+ }
+
+ if (slidemo->player && slidemo->player->charability == CA_GLIDEANDCLIMB
+ && (slidemo->player->pflags & PF_GLIDING || slidemo->player->climbing))
+ PTR_GlideClimbTraverse(li);
if (in->frac < bestslidefrac && (!slidemo->player || !slidemo->player->climbing))
{
@@ -3670,11 +3565,7 @@ static void P_CheckLavaWall(mobj_t *mo, sector_t *sec)
if (rover->master->flags & ML_BLOCKMONSTERS)
continue;
- topheight =
-#ifdef ESLOPE
- *rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) :
-#endif
- *rover->topheight;
+ topheight = P_GetFFloorTopZAt(rover, mo->x, mo->y);
if (mo->eflags & MFE_VERTICALFLIP)
{
@@ -3687,11 +3578,7 @@ static void P_CheckLavaWall(mobj_t *mo, sector_t *sec)
continue;
}
- bottomheight =
-#ifdef ESLOPE
- *rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) :
-#endif
- *rover->bottomheight;
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
if (mo->eflags & MFE_VERTICALFLIP)
{
@@ -4277,13 +4164,8 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
topheight = *rover->topheight;
bottomheight = *rover->bottomheight;
-
-/*#ifdef ESLOPE
- if (rover->t_slope)
- topheight = P_GetZAt(rover->t_slope, thing->x, thing->y);
- if (rover->b_slope)
- bottomheight = P_GetZAt(rover->b_slope, thing->x, thing->y);
-#endif*/
+ //topheight = P_GetFFloorTopZAt (rover, thing->x, thing->y);
+ //bottomheight = P_GetFFloorBottomZAt(rover, thing->x, thing->y);
delta1 = thing->z - (bottomheight + topheight)/2;
delta2 = thingtop - (bottomheight + topheight)/2;
@@ -4299,21 +4181,19 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
{
//If the thing was crushed by a crumbling FOF, reward the player who made it crumble!
thinker_t *think;
- elevator_t *crumbler;
+ crumble_t *crumbler;
for (think = thlist[THINK_MAIN].next; think != &thlist[THINK_MAIN]; think = think->next)
{
if (think->function.acp1 != (actionf_p1)T_StartCrumble)
continue;
- crumbler = (elevator_t *)think;
+ crumbler = (crumble_t *)think;
if (crumbler->player && crumbler->player->mo
&& crumbler->player->mo != thing
&& crumbler->actionsector == thing->subsector->sector
- && crumbler->sector == rover->master->frontsector
- && (crumbler->type == elevateBounce
- || crumbler->type == elevateContinuous))
+ && crumbler->sector == rover->master->frontsector)
{
killer = crumbler->player->mo;
}
@@ -5062,12 +4942,7 @@ void P_MapEnd(void)
fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
{
sector_t *sec = R_PointInSubsector(x, y)->sector;
- fixed_t floorz = sec->floorheight;
-
-#ifdef ESLOPE
- if (sec->f_slope)
- floorz = P_GetZAt(sec->f_slope, x, y);
-#endif
+ fixed_t floorz = P_GetSectorFloorZAt(sec, x, y);
// Intercept the stupid 'fall through 3dfloors' bug Tails 03-17-2002
if (sec->ffloors)
@@ -5084,15 +4959,8 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE)))
continue;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
-#ifdef ESLOPE
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, x, y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, x, y);
-#endif
+ topheight = P_GetFFloorTopZAt (rover, x, y);
+ bottomheight = P_GetFFloorBottomZAt(rover, x, y);
if (rover->flags & FF_QUICKSAND)
{
diff --git a/src/p_maputl.c b/src/p_maputl.c
index 69be5a70f70debfaff7f3cc0c1da64c000a6c867..c6e064d184a722ef2c6fb371ff7e5f9767f2afcd 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -277,9 +277,7 @@ fixed_t P_InterceptVector(divline_t *v2, divline_t *v1)
// OPTIMIZE: keep this precalculated
//
fixed_t opentop, openbottom, openrange, lowfloor, highceiling;
-#ifdef ESLOPE
pslope_t *opentopslope, *openbottomslope;
-#endif
ffloor_t *openfloorrover, *openceilingrover;
// P_CameraLineOpening
@@ -305,53 +303,33 @@ void P_CameraLineOpening(line_t *linedef)
// If you can see through it, why not move the camera through it too?
if (front->camsec >= 0)
{
- frontfloor = sectors[front->camsec].floorheight;
- frontceiling = sectors[front->camsec].ceilingheight;
-#ifdef ESLOPE
- if (sectors[front->camsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[front->camsec].f_slope, camera.x, camera.y);
- if (sectors[front->camsec].c_slope)
- frontceiling = P_GetZAt(sectors[front->camsec].c_slope, camera.x, camera.y);
-#endif
+ // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
+ frontfloor = P_GetSectorFloorZAt (§ors[front->camsec], camera.x, camera.y);
+ frontceiling = P_GetSectorCeilingZAt(§ors[front->camsec], camera.x, camera.y);
}
else if (front->heightsec >= 0)
{
- frontfloor = sectors[front->heightsec].floorheight;
- frontceiling = sectors[front->heightsec].ceilingheight;
-#ifdef ESLOPE
- if (sectors[front->heightsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[front->heightsec].f_slope, camera.x, camera.y);
- if (sectors[front->heightsec].c_slope)
- frontceiling = P_GetZAt(sectors[front->heightsec].c_slope, camera.x, camera.y);
-#endif
+ // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
+ frontfloor = P_GetSectorFloorZAt (§ors[front->heightsec], camera.x, camera.y);
+ frontceiling = P_GetSectorCeilingZAt(§ors[front->heightsec], camera.x, camera.y);
}
else
{
- frontfloor = P_CameraGetFloorZ(mapcampointer, front, tmx, tmy, linedef);
+ frontfloor = P_CameraGetFloorZ (mapcampointer, front, tmx, tmy, linedef);
frontceiling = P_CameraGetCeilingZ(mapcampointer, front, tmx, tmy, linedef);
}
if (back->camsec >= 0)
{
- backfloor = sectors[back->camsec].floorheight;
- backceiling = sectors[back->camsec].ceilingheight;
-#ifdef ESLOPE
- if (sectors[back->camsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[back->camsec].f_slope, camera.x, camera.y);
- if (sectors[back->camsec].c_slope)
- frontceiling = P_GetZAt(sectors[back->camsec].c_slope, camera.x, camera.y);
-#endif
+ // SRB2CBTODO: ESLOPE (sectors[back->heightsec].f_slope)
+ backfloor = P_GetSectorFloorZAt (§ors[back->camsec], camera.x, camera.y);
+ backceiling = P_GetSectorCeilingZAt(§ors[back->camsec], camera.x, camera.y);
}
else if (back->heightsec >= 0)
{
- backfloor = sectors[back->heightsec].floorheight;
- backceiling = sectors[back->heightsec].ceilingheight;
-#ifdef ESLOPE
- if (sectors[back->heightsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[back->heightsec].f_slope, camera.x, camera.y);
- if (sectors[back->heightsec].c_slope)
- frontceiling = P_GetZAt(sectors[back->heightsec].c_slope, camera.x, camera.y);
-#endif
+ // SRB2CBTODO: ESLOPE (sectors[back->heightsec].f_slope)
+ backfloor = P_GetSectorFloorZAt (§ors[back->heightsec], camera.x, camera.y);
+ backceiling = P_GetSectorCeilingZAt(§ors[back->heightsec], camera.x, camera.y);
}
else
{
@@ -461,7 +439,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
I_Assert(back != NULL);
openfloorrover = openceilingrover = NULL;
-#ifdef POLYOBJECTS
if (linedef->polyobj)
{
// set these defaults so that polyobjects don't interfere with collision above or below them
@@ -469,12 +446,9 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
openbottom = INT32_MIN;
highceiling = INT32_MIN;
lowfloor = INT32_MAX;
-#ifdef ESLOPE
opentopslope = openbottomslope = NULL;
-#endif
}
else
-#endif
{ // Set open and high/low values here
fixed_t frontheight, backheight;
@@ -485,17 +459,13 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
{
opentop = frontheight;
highceiling = backheight;
-#ifdef ESLOPE
opentopslope = front->c_slope;
-#endif
}
else
{
opentop = backheight;
highceiling = frontheight;
-#ifdef ESLOPE
opentopslope = back->c_slope;
-#endif
}
frontheight = P_GetFloorZ(mobj, front, tmx, tmy, linedef);
@@ -505,17 +475,13 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
{
openbottom = frontheight;
lowfloor = backheight;
-#ifdef ESLOPE
openbottomslope = front->f_slope;
-#endif
}
else
{
openbottom = backheight;
lowfloor = frontheight;
-#ifdef ESLOPE
openbottomslope = back->f_slope;
-#endif
}
}
@@ -537,7 +503,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
texheight = textures[texnum]->height << FRACBITS;
// Set texbottom and textop to the Z coordinates of the texture's boundaries
-#if 0 // #ifdef POLYOBJECTS
+#if 0
// don't remove this code unless solid midtextures
// on non-solid polyobjects should NEVER happen in the future
if (linedef->polyobj && (linedef->polyobj->flags & POF_TESTHEIGHT)) {
@@ -580,7 +546,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
}
}
}
-#ifdef POLYOBJECTS
if (linedef->polyobj)
{
// Treat polyobj's backsector like a 3D Floor
@@ -617,102 +582,95 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
// otherwise don't do anything special, pretend there's nothing else there
}
else
-#endif
- // Check for fake floors in the sector.
- if (front->ffloors || back->ffloors)
{
- ffloor_t *rover;
- fixed_t delta1, delta2;
-
- // Check for frontsector's fake floors
- for (rover = front->ffloors; rover; rover = rover->next)
+ // Check for fake floors in the sector.
+ if (front->ffloors || back->ffloors)
{
- fixed_t topheight, bottomheight;
- if (!(rover->flags & FF_EXISTS))
- continue;
+ ffloor_t *rover;
+ fixed_t delta1, delta2;
- if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
- ;
- else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
- || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
- continue;
+ // Check for frontsector's fake floors
+ for (rover = front->ffloors; rover; rover = rover->next)
+ {
+ fixed_t topheight, bottomheight;
+ if (!(rover->flags & FF_EXISTS))
+ continue;
- topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef);
- bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef);
+ if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
+ ;
+ else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
+ || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
+ continue;
- delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
- delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+ topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef);
+ bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef);
- if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
- {
- if (bottomheight < opentop) {
- opentop = bottomheight;
-#ifdef ESLOPE
- opentopslope = *rover->b_slope;
-#endif
- openceilingrover = rover;
+ delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
+ delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+
+ if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
+ {
+ if (bottomheight < opentop) {
+ opentop = bottomheight;
+ opentopslope = *rover->b_slope;
+ openceilingrover = rover;
+ }
+ else if (bottomheight < highceiling)
+ highceiling = bottomheight;
}
- else if (bottomheight < highceiling)
- highceiling = bottomheight;
- }
- if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
- {
- if (topheight > openbottom) {
- openbottom = topheight;
-#ifdef ESLOPE
- openbottomslope = *rover->t_slope;
-#endif
- openfloorrover = rover;
+ if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
+ {
+ if (topheight > openbottom) {
+ openbottom = topheight;
+ openbottomslope = *rover->t_slope;
+ openfloorrover = rover;
+ }
+ else if (topheight > lowfloor)
+ lowfloor = topheight;
}
- else if (topheight > lowfloor)
- lowfloor = topheight;
}
- }
- // Check for backsectors fake floors
- for (rover = back->ffloors; rover; rover = rover->next)
- {
- fixed_t topheight, bottomheight;
- if (!(rover->flags & FF_EXISTS))
- continue;
+ // Check for backsectors fake floors
+ for (rover = back->ffloors; rover; rover = rover->next)
+ {
+ fixed_t topheight, bottomheight;
+ if (!(rover->flags & FF_EXISTS))
+ continue;
- if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
- ;
- else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
- || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
- continue;
+ if (mobj->player && (P_CheckSolidLava(rover) || P_CanRunOnWater(mobj->player, rover)))
+ ;
+ else if (!((rover->flags & FF_BLOCKPLAYER && mobj->player)
+ || (rover->flags & FF_BLOCKOTHERS && !mobj->player)))
+ continue;
- topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef);
- bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef);
+ topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef);
+ bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef);
- delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
- delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+ delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
+ delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
- if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
- {
- if (bottomheight < opentop) {
- opentop = bottomheight;
-#ifdef ESLOPE
- opentopslope = *rover->b_slope;
-#endif
- openceilingrover = rover;
+ if (delta1 >= delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_PLATFORM) // thing is below FOF
+ {
+ if (bottomheight < opentop) {
+ opentop = bottomheight;
+ opentopslope = *rover->b_slope;
+ openceilingrover = rover;
+ }
+ else if (bottomheight < highceiling)
+ highceiling = bottomheight;
}
- else if (bottomheight < highceiling)
- highceiling = bottomheight;
- }
- if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
- {
- if (topheight > openbottom) {
- openbottom = topheight;
-#ifdef ESLOPE
- openbottomslope = *rover->t_slope;
-#endif
- openfloorrover = rover;
+ if (delta1 < delta2 && (rover->flags & FF_INTANGIBLEFLATS) != FF_REVERSEPLATFORM) // thing is above FOF
+ {
+ if (topheight > openbottom) {
+ openbottom = topheight;
+ openbottomslope = *rover->t_slope;
+ openfloorrover = rover;
+ }
+ else if (topheight > lowfloor)
+ lowfloor = topheight;
}
- else if (topheight > lowfloor)
- lowfloor = topheight;
}
}
}
@@ -962,9 +920,7 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
{
INT32 offset;
const INT32 *list; // Big blockmap
-#ifdef POLYOBJECTS
polymaplink_t *plink; // haleyjd 02/22/06
-#endif
line_t *ld;
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
@@ -972,7 +928,6 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
offset = y*bmapwidth + x;
-#ifdef POLYOBJECTS
// haleyjd 02/22/06: consider polyobject lines
plink = polyblocklinks[offset];
@@ -996,7 +951,6 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
}
plink = (polymaplink_t *)(plink->link.next);
}
-#endif
offset = *(blockmap + offset); // offset = blockmap[y*bmapwidth+x];
diff --git a/src/p_maputl.h b/src/p_maputl.h
index bb09c3ed1881f8a65b901f242aaa40632841473e..08b606833cd7895e11211de6eb94b4742f13125e 100644
--- a/src/p_maputl.h
+++ b/src/p_maputl.h
@@ -55,9 +55,7 @@ void P_CreatePrecipSecNodeList(precipmobj_t *thing, fixed_t x,fixed_t y);
boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y);
extern fixed_t opentop, openbottom, openrange, lowfloor, highceiling;
-#ifdef ESLOPE
extern pslope_t *opentopslope, *openbottomslope;
-#endif
extern ffloor_t *openfloorrover, *openceilingrover;
void P_LineOpening(line_t *plinedef, mobj_t *mobj);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 9194cf9f7e2dfbbf2b14e8e32f7f66348cfb2bb9..305e732778495cea6b7ac6af0978046b6a709747 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -31,9 +31,7 @@
#include "i_video.h"
#include "lua_hook.h"
#include "b_bot.h"
-#ifdef ESLOPE
#include "p_slopes.h"
-#endif
#include "f_finale.h"
#include "m_cond.h"
@@ -62,9 +60,7 @@ void P_RunCachedActions(void)
{
var1 = states[ac->statenum].var1;
var2 = states[ac->statenum].var2;
-#ifdef HAVE_BLUA
astate = &states[ac->statenum];
-#endif
if (ac->mobj && !P_MobjWasRemoved(ac->mobj)) // just in case...
states[ac->statenum].action.acp1(ac->mobj);
next = ac->next;
@@ -440,7 +436,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
mobj->sprite2 = spr2;
mobj->frame = frame|(st->frame&~FF_FRAMEMASK);
- if (mobj->color >= MAXSKINCOLORS && mobj->color < MAXTRANSLATIONS) // Super colours? Super bright!
+ if (mobj->color >= FIRSTSUPERCOLOR && mobj->color < numskincolors) // Super colours? Super bright!
mobj->frame |= FF_FULLBRIGHT;
}
// Regular sprites
@@ -459,9 +455,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
{
var1 = st->var1;
var2 = st->var2;
-#ifdef HAVE_BLUA
astate = st;
-#endif
st->action.acp1(mobj);
// woah. a player was removed by an action.
@@ -585,9 +579,7 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
{
var1 = st->var1;
var2 = st->var2;
-#ifdef HAVE_BLUA
astate = st;
-#endif
st->action.acp1(mobj);
if (P_MobjWasRemoved(mobj))
return false;
@@ -934,15 +926,8 @@ boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover)
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
return false;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
-#ifdef ESLOPE
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
-#endif
+ topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (mobj->z > topheight)
return false;
@@ -953,7 +938,6 @@ boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover)
return true;
}
-#ifdef ESLOPE
// P_GetFloorZ (and its ceiling counterpart)
// Gets the floor height (or ceiling height) of the mobj's contact point in sector, assuming object's center if moved to [x, y]
// If line is supplied, it's a divider line on the sector. Set it to NULL if you're not checking for collision with a line
@@ -974,12 +958,12 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
/*CONS_Printf("BEFORE: v1 = %f %f %f\n",
FIXED_TO_FLOAT(v1.x),
FIXED_TO_FLOAT(v1.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v1.x, v1.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v1.x, v1.y))
);
CONS_Printf(" v2 = %f %f %f\n",
FIXED_TO_FLOAT(v2.x),
FIXED_TO_FLOAT(v2.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v2.x, v2.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v2.x, v2.y))
);*/
if (abs(v1.x-x) > radius) {
@@ -1037,35 +1021,32 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
/*CONS_Printf("AFTER: v1 = %f %f %f\n",
FIXED_TO_FLOAT(v1.x),
FIXED_TO_FLOAT(v1.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v1.x, v1.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v1.x, v1.y))
);
CONS_Printf(" v2 = %f %f %f\n",
FIXED_TO_FLOAT(v2.x),
FIXED_TO_FLOAT(v2.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v2.x, v2.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v2.x, v2.y))
);*/
// Return the higher of the two points
if (actuallylowest)
return min(
- P_GetZAt(slope, v1.x, v1.y),
- P_GetZAt(slope, v2.x, v2.y)
+ P_GetSlopeZAt(slope, v1.x, v1.y),
+ P_GetSlopeZAt(slope, v2.x, v2.y)
);
else
return max(
- P_GetZAt(slope, v1.x, v1.y),
- P_GetZAt(slope, v2.x, v2.y)
+ P_GetSlopeZAt(slope, v1.x, v1.y),
+ P_GetSlopeZAt(slope, v2.x, v2.y)
);
}
-#endif
fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect)
{
-#ifdef ESLOPE
I_Assert(mobj != NULL);
-#endif
I_Assert(sector != NULL);
-#ifdef ESLOPE
+
if (sector->f_slope) {
fixed_t testx, testy;
pslope_t *slope = sector->f_slope;
@@ -1091,7 +1072,7 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1131,29 +1112,18 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the floor height
-#else
- (void)mobj;
- (void)boundsec;
- (void)x;
- (void)y;
- (void)line;
- (void)lowest;
- (void)perfect;
-#endif
return sector->floorheight;
}
fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect)
{
-#ifdef ESLOPE
I_Assert(mobj != NULL);
-#endif
I_Assert(sector != NULL);
-#ifdef ESLOPE
+
if (sector->c_slope) {
fixed_t testx, testy;
pslope_t *slope = sector->c_slope;
@@ -1179,7 +1149,7 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1219,30 +1189,19 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the ceiling height
-#else
- (void)mobj;
- (void)boundsec;
- (void)x;
- (void)y;
- (void)line;
- (void)lowest;
- (void)perfect;
-#endif
return sector->ceilingheight;
}
// Now do the same as all above, but for cameras because apparently cameras are special?
fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect)
{
-#ifdef ESLOPE
I_Assert(mobj != NULL);
-#endif
I_Assert(sector != NULL);
-#ifdef ESLOPE
+
if (sector->f_slope) {
fixed_t testx, testy;
pslope_t *slope = sector->f_slope;
@@ -1268,7 +1227,7 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1308,29 +1267,18 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the floor height
-#else
- (void)mobj;
- (void)boundsec;
- (void)x;
- (void)y;
- (void)line;
- (void)lowest;
- (void)perfect;
-#endif
return sector->floorheight;
}
fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect)
{
-#ifdef ESLOPE
I_Assert(mobj != NULL);
-#endif
I_Assert(sector != NULL);
-#ifdef ESLOPE
+
if (sector->c_slope) {
fixed_t testx, testy;
pslope_t *slope = sector->c_slope;
@@ -1356,7 +1304,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1396,19 +1344,10 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the ceiling height
-#else
- (void)mobj;
- (void)boundsec;
- (void)x;
- (void)y;
- (void)line;
- (void)lowest;
- (void)perfect;
-#endif
return sector->ceilingheight;
}
static void P_PlayerFlip(mobj_t *mo)
@@ -1680,10 +1619,7 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
else if (abs(player->rmomx) < FixedMul(STOPSPEED, mo->scale)
&& abs(player->rmomy) < FixedMul(STOPSPEED, mo->scale)
&& (!(player->cmd.forwardmove && !(twodlevel || mo->flags2 & MF2_TWOD)) && !player->cmd.sidemove && !(player->pflags & PF_SPINNING))
-#ifdef ESLOPE
- && !(player->mo->standingslope && (!(player->mo->standingslope->flags & SL_NOPHYSICS)) && (abs(player->mo->standingslope->zdelta) >= FRACUNIT/2))
-#endif
- )
+ && !(player->mo->standingslope && (!(player->mo->standingslope->flags & SL_NOPHYSICS)) && (abs(player->mo->standingslope->zdelta) >= FRACUNIT/2)))
{
// if in a walking frame, stop moving
if (player->panim == PA_WALK)
@@ -1733,70 +1669,74 @@ static void P_PushableCheckBustables(mobj_t *mo)
for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
{
+ ffloor_t *rover;
+ fixed_t topheight, bottomheight;
+
if (!node->m_sector)
break;
- if (node->m_sector->ffloors)
+ if (!node->m_sector->ffloors)
+ continue;
+
+ for (rover = node->m_sector->ffloors; rover; rover = rover->next)
{
- ffloor_t *rover;
- fixed_t topheight, bottomheight;
+ if (!(rover->flags & FF_EXISTS))
+ continue;
- for (rover = node->m_sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS)) continue;
+ if (!(rover->flags & FF_BUSTUP))
+ continue;
- if (!(rover->flags & FF_BUSTUP)) continue;
+ // Needs ML_EFFECT4 flag for pushables to break it
+ if (!(rover->master->flags & ML_EFFECT4))
+ continue;
- // Needs ML_EFFECT4 flag for pushables to break it
- if (!(rover->master->flags & ML_EFFECT4)) continue;
+ if (rover->master->frontsector->crumblestate != CRUMBLE_NONE)
+ continue;
- if (!rover->master->frontsector->crumblestate)
- {
- topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
- bottomheight = P_GetFOFBottomZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
- // Height checks
- if (rover->flags & FF_SHATTERBOTTOM)
- {
- if (mo->z+mo->momz + mo->height < bottomheight)
- continue;
+ topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
+ bottomheight = P_GetFOFBottomZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
- if (mo->z+mo->height > bottomheight)
- continue;
- }
- else if (rover->flags & FF_SPINBUST)
- {
- if (mo->z+mo->momz > topheight)
- continue;
+ // Height checks
+ if (rover->flags & FF_SHATTERBOTTOM)
+ {
+ if (mo->z + mo->momz + mo->height < bottomheight)
+ continue;
- if (mo->z+mo->height < bottomheight)
- continue;
- }
- else if (rover->flags & FF_SHATTER)
- {
- if (mo->z+mo->momz > topheight)
- continue;
+ if (mo->z + mo->height > bottomheight)
+ continue;
+ }
+ else if (rover->flags & FF_SPINBUST)
+ {
+ if (mo->z + mo->momz > topheight)
+ continue;
- if (mo->z+mo->momz + mo->height < bottomheight)
- continue;
- }
- else
- {
- if (mo->z >= topheight)
- continue;
+ if (mo->z + mo->height < bottomheight)
+ continue;
+ }
+ else if (rover->flags & FF_SHATTER)
+ {
+ if (mo->z + mo->momz > topheight)
+ continue;
- if (mo->z+mo->height < bottomheight)
- continue;
- }
+ if (mo->z + mo->momz + mo->height < bottomheight)
+ continue;
+ }
+ else
+ {
+ if (mo->z >= topheight)
+ continue;
+
+ if (mo->z + mo->height < bottomheight)
+ continue;
+ }
- EV_CrumbleChain(NULL, rover); // node->m_sector
+ EV_CrumbleChain(NULL, rover); // node->m_sector
- // Run a linedef executor??
- if (rover->master->flags & ML_EFFECT5)
- P_LinedefExecute((INT16)(P_AproxDistance(rover->master->dx, rover->master->dy)>>FRACBITS), mo, node->m_sector);
+ // Run a linedef executor??
+ if (rover->master->flags & ML_EFFECT5)
+ P_LinedefExecute((INT16)(P_AproxDistance(rover->master->dx, rover->master->dy)>>FRACBITS), mo, node->m_sector);
- goto bustupdone;
- }
- }
+ goto bustupdone;
}
}
bustupdone:
@@ -1830,11 +1770,9 @@ void P_XYMovement(mobj_t *mo)
fixed_t xmove, ymove;
fixed_t oldx, oldy; // reducing bobbing/momentum on ice when up against walls
boolean moved;
-#ifdef ESLOPE
pslope_t *oldslope = NULL;
- vector3_t slopemom;
+ vector3_t slopemom = {0,0,0};
fixed_t predictedz = 0;
-#endif
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo));
@@ -1864,7 +1802,6 @@ void P_XYMovement(mobj_t *mo)
oldx = mo->x;
oldy = mo->y;
-#ifdef ESLOPE
if (mo->flags & MF_NOCLIPHEIGHT)
mo->standingslope = NULL;
@@ -1889,7 +1826,6 @@ void P_XYMovement(mobj_t *mo)
}
} else if (P_IsObjectOnGround(mo) && !mo->momz)
predictedz = mo->z;
-#endif
// Pushables can break some blocks
if (CheckForBustableBlocks && ((mo->flags & MF_PUSHABLE) || ((mo->info->flags & MF_PUSHABLE) && mo->fuse)))
@@ -1906,15 +1842,12 @@ void P_XYMovement(mobj_t *mo)
B_MoveBlocked(player);
}
-#ifdef HAVE_BLUA
if (LUAh_MobjMoveBlocked(mo))
{
if (P_MobjWasRemoved(mo))
return;
}
- else
-#endif
- if (P_MobjWasRemoved(mo))
+ else if (P_MobjWasRemoved(mo))
return;
else if (mo->flags & MF_BOUNCE)
{
@@ -1965,7 +1898,6 @@ void P_XYMovement(mobj_t *mo)
}
else if (player || mo->flags & (MF_SLIDEME|MF_PUSHABLE))
{ // try to slide along it
-#ifdef ESLOPE
// Wall transfer part 1.
pslope_t *transferslope = NULL;
fixed_t transfermomz = 0;
@@ -1975,14 +1907,12 @@ void P_XYMovement(mobj_t *mo)
if (((transferslope->zangle < ANGLE_180) ? transferslope->zangle : InvAngle(transferslope->zangle)) >= ANGLE_45) // Prevent some weird stuff going on on shallow slopes.
transfermomz = P_GetWallTransferMomZ(mo, transferslope);
}
-#endif
P_SlideMove(mo);
if (player)
player->powers[pw_pushing] = 3;
xmove = ymove = 0;
-#ifdef ESLOPE
// Wall transfer part 2.
if (transfermomz && transferslope) // Are we "transferring onto the wall" (really just a disguised vertical launch)?
{
@@ -2005,7 +1935,6 @@ void P_XYMovement(mobj_t *mo)
}
}
}
-#endif
}
else if (mo->type == MT_SPINFIRE)
{
@@ -2061,7 +1990,6 @@ void P_XYMovement(mobj_t *mo)
if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;;
return;
-#ifdef ESLOPE
if (moved && oldslope && !(mo->flags & MF_NOCLIPHEIGHT)) { // Check to see if we ran off
if (oldslope != mo->standingslope) { // First, compare different slopes
@@ -2107,7 +2035,6 @@ void P_XYMovement(mobj_t *mo)
//CONS_Printf("Launched off of flat surface running into downward slope\n");
}
}
-#endif
// Check the gravity status.
P_CheckGravity(mo, false);
@@ -2158,11 +2085,9 @@ void P_XYMovement(mobj_t *mo)
if (player && player->powers[pw_carry] == CR_NIGHTSMODE)
return; // no friction for NiGHTS players
-#ifdef ESLOPE
if ((mo->type == MT_BIGTUMBLEWEED || mo->type == MT_LITTLETUMBLEWEED)
&& (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)) // Special exception for tumbleweeds on slopes
return;
-#endif
if (((!(mo->eflags & MFE_VERTICALFLIP) && mo->z > mo->floorz) || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height < mo->ceilingz))
&& !(player && player->pflags & PF_SLIDING))
@@ -2430,7 +2355,6 @@ static boolean P_ZMovement(mobj_t *mo)
mo->z += mo->momz;
onground = P_IsObjectOnGround(mo);
-#ifdef ESLOPE
if (mo->standingslope)
{
if (mo->flags & MF_NOCLIPHEIGHT)
@@ -2438,7 +2362,6 @@ static boolean P_ZMovement(mobj_t *mo)
else if (!onground)
P_SlopeLaunch(mo);
}
-#endif
switch (mo->type)
{
@@ -2640,7 +2563,6 @@ static boolean P_ZMovement(mobj_t *mo)
else
mo->z = mo->floorz;
-#ifdef ESLOPE
if (!(mo->flags & MF_MISSILE) && mo->standingslope) // You're still on the ground; why are we here?
{
mo->momz = 0;
@@ -2653,7 +2575,6 @@ static boolean P_ZMovement(mobj_t *mo)
mo->standingslope = (mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope;
P_ReverseQuantizeMomentumToSlope(&mom, mo->standingslope);
}
-#endif
// hit the floor
if (mo->type == MT_FIREBALL) // special case for the fireball
@@ -2753,13 +2674,11 @@ static boolean P_ZMovement(mobj_t *mo)
else
mom.y -= FixedMul(6*FRACUNIT, mo->scale);
}
-#ifdef ESLOPE
else if (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)
{
// Pop the object up a bit to encourage bounciness
//mom.z = P_MobjFlip(mo)*mo->scale;
}
-#endif
else
{
mom.x = mom.y = mom.z = 0;
@@ -2799,11 +2718,9 @@ static boolean P_ZMovement(mobj_t *mo)
else if (tmfloorthing)
mom.z = tmfloorthing->momz;
-#ifdef ESLOPE
if (mo->standingslope) { // MT_STEAM will never have a standingslope, see above.
P_QuantizeMomentumToSlope(&mom, mo->standingslope);
}
-#endif
mo->momx = mom.x;
mo->momy = mom.y;
@@ -2880,6 +2797,94 @@ static boolean P_ZMovement(mobj_t *mo)
return true;
}
+// Check for "Mario" blocks to hit and bounce them
+static void P_CheckMarioBlocks(mobj_t *mo)
+{
+ msecnode_t *node;
+
+ if (netgame && mo->player->spectator)
+ return;
+
+ for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
+ {
+ ffloor_t *rover;
+
+ if (!node->m_sector->ffloors)
+ continue;
+
+ for (rover = node->m_sector->ffloors; rover; rover = rover->next)
+ {
+ if (!(rover->flags & FF_EXISTS))
+ continue;
+
+ if (!(rover->flags & FF_MARIO))
+ continue;
+
+ if (mo->eflags & MFE_VERTICALFLIP)
+ continue; // if you were flipped, your head isn't actually hitting your ceilingz is it?
+
+ if (*rover->bottomheight != mo->ceilingz)
+ continue;
+
+ if (rover->flags & FF_SHATTERBOTTOM) // Brick block!
+ EV_CrumbleChain(node->m_sector, rover);
+ else // Question block!
+ EV_MarioBlock(rover, node->m_sector, mo);
+ }
+ }
+}
+
+// Check if we're on a polyobject that triggers a linedef executor.
+static boolean P_PlayerPolyObjectZMovement(mobj_t *mo)
+{
+ msecnode_t *node;
+ boolean stopmovecut = false;
+
+ for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
+ {
+ sector_t *sec = node->m_sector;
+ subsector_t *newsubsec;
+ size_t i;
+
+ for (i = 0; i < numsubsectors; i++)
+ {
+ polyobj_t *po;
+ sector_t *polysec;
+ newsubsec = &subsectors[i];
+
+ if (newsubsec->sector != sec)
+ continue;
+
+ for (po = newsubsec->polyList; po; po = (polyobj_t *)(po->link.next))
+ {
+ if (!(po->flags & POF_SOLID))
+ continue;
+
+ if (!P_MobjInsidePolyobj(po, mo))
+ continue;
+
+ polysec = po->lines[0]->backsector;
+
+ // Moving polyobjects should act like conveyors if the player lands on one. (I.E. none of the momentum cut thing below) -Red
+ if ((mo->z == polysec->ceilingheight || mo->z + mo->height == polysec->floorheight) && po->thinker)
+ stopmovecut = true;
+
+ if (!(po->flags & POF_LDEXEC))
+ continue;
+
+ if (mo->z != polysec->ceilingheight)
+ continue;
+
+ // We're landing on a PO, so check for a linedef executor.
+ // Trigger tags are 32000 + the PO's ID number.
+ P_LinedefExecute((INT16)(32000 + po->id), mo, NULL);
+ }
+ }
+ }
+
+ return stopmovecut;
+}
+
static void P_PlayerZMovement(mobj_t *mo)
{
boolean onground;
@@ -2925,7 +2930,6 @@ static void P_PlayerZMovement(mobj_t *mo)
|| mo->player->playerstate == PST_REBORN)
return;
-#ifdef ESLOPE
if (mo->standingslope)
{
if (mo->flags & MF_NOCLIPHEIGHT)
@@ -2933,7 +2937,6 @@ static void P_PlayerZMovement(mobj_t *mo)
else if (!onground)
P_SlopeLaunch(mo);
}
-#endif
// clip movement
if (onground && !(mo->flags & MF_NOCLIPHEIGHT))
@@ -2961,12 +2964,10 @@ static void P_PlayerZMovement(mobj_t *mo)
if (mo->player->panim == PA_PAIN)
P_SetPlayerMobjState(mo, S_PLAY_WALK);
-#ifdef ESLOPE
if (!mo->standingslope && (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope)) {
// Handle landing on slope during Z movement
P_HandleSlopeLanding(mo, (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope));
}
-#endif
if (P_MobjFlip(mo)*mo->momz < 0) // falling
{
@@ -2980,69 +2981,8 @@ static void P_PlayerZMovement(mobj_t *mo)
mo->eflags |= MFE_JUSTHITFLOOR; // Spin Attack
+ if (!P_PlayerPolyObjectZMovement(mo))
{
-#ifdef POLYOBJECTS
- // Check if we're on a polyobject
- // that triggers a linedef executor.
- msecnode_t *node;
- boolean stopmovecut = false;
-
- for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
- {
- sector_t *sec = node->m_sector;
- subsector_t *newsubsec;
- size_t i;
-
- for (i = 0; i < numsubsectors; i++)
- {
- newsubsec = &subsectors[i];
-
- if (newsubsec->sector != sec)
- continue;
-
- if (newsubsec->polyList)
- {
- polyobj_t *po = newsubsec->polyList;
- sector_t *polysec;
-
- while(po)
- {
- if (!P_MobjInsidePolyobj(po, mo) || !(po->flags & POF_SOLID))
- {
- po = (polyobj_t *)(po->link.next);
- continue;
- }
-
- // We're inside it! Yess...
- polysec = po->lines[0]->backsector;
-
- // Moving polyobjects should act like conveyors if the player lands on one. (I.E. none of the momentum cut thing below) -Red
- if ((mo->z == polysec->ceilingheight || mo->z+mo->height == polysec->floorheight) && po->thinker)
- stopmovecut = true;
-
- if (!(po->flags & POF_LDEXEC))
- {
- po = (polyobj_t *)(po->link.next);
- continue;
- }
-
- if (mo->z == polysec->ceilingheight)
- {
- // We're landing on a PO, so check for
- // a linedef executor.
- // Trigger tags are 32000 + the PO's ID number.
- P_LinedefExecute((INT16)(32000 + po->id), mo, NULL);
- }
-
- po = (polyobj_t *)(po->link.next);
- }
- }
- }
- }
-
- if (!stopmovecut)
-#endif
-
// Cut momentum in half when you hit the ground and
// aren't pressing any controls.
if (!(mo->player->cmd.forwardmove || mo->player->cmd.sidemove) && !mo->player->cmomx && !mo->player->cmomy && !(mo->player->pflags & PF_SPINNING))
@@ -3108,39 +3048,10 @@ nightsdone:
}
}
- // Check for "Mario" blocks to hit and bounce them
if (P_MobjFlip(mo)*mo->momz > 0)
{
- msecnode_t *node;
-
- if (CheckForMarioBlocks && !(netgame && mo->player->spectator)) // Only let the player punch
- {
- // Search the touching sectors, from side-to-side...
- for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
- {
- ffloor_t *rover;
- if (!node->m_sector->ffloors)
- continue;
-
- for (rover = node->m_sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS))
- continue;
-
- // Come on, it's time to go...
- if (rover->flags & FF_MARIO
- && !(mo->eflags & MFE_VERTICALFLIP) // if you were flipped, your head isn't actually hitting your ceilingz is it?
- && *rover->bottomheight == mo->ceilingz) // The player's head hit the bottom!
- {
- // DO THE MARIO!
- if (rover->flags & FF_SHATTERBOTTOM) // Brick block!
- EV_CrumbleChain(node->m_sector, rover);
- else // Question block!
- EV_MarioBlock(rover, node->m_sector, mo);
- }
- }
- } // Ugly ugly billions of braces! Argh!
- }
+ if (CheckForMarioBlocks)
+ P_CheckMarioBlocks(mo);
// hit the ceiling
if (mariomode)
@@ -3299,11 +3210,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
//
boolean P_CanRunOnWater(player_t *player, ffloor_t *rover)
{
- fixed_t topheight =
-#ifdef ESLOPE
- *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) :
-#endif
- *rover->topheight;
+ fixed_t topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
if (!player->powers[pw_carry] && !player->homing
&& ((player->powers[pw_super] || player->charflags & SF_RUNONWATER || player->dashmode >= DASHMODE_THRESHOLD) && player->mo->ceilingz-topheight >= player->mo->height)
@@ -3346,16 +3253,8 @@ void P_MobjCheckWater(mobj_t *mobj)
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
continue;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
-#ifdef ESLOPE
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
-
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
-#endif
+ topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (mobj->eflags & MFE_VERTICALFLIP)
{
@@ -3602,16 +3501,8 @@ static void P_SceneryCheckWater(mobj_t *mobj)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS)
continue;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
-#ifdef ESLOPE
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
-
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
-#endif
+ topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (topheight <= mobj->z
|| bottomheight > (mobj->z + (mobj->height>>1)))
@@ -3656,15 +3547,9 @@ static boolean P_CameraCheckHeat(camera_t *thiscam)
if (!(rover->flags & FF_EXISTS))
continue;
- if (halfheight >= (
-#ifdef ESLOPE
- *rover->t_slope ? P_GetZAt(*rover->t_slope, thiscam->x, thiscam->y) :
-#endif
- *rover->topheight) || halfheight <= (
-#ifdef ESLOPE
- *rover->b_slope ? P_GetZAt(*rover->b_slope, thiscam->x, thiscam->y) :
-#endif
- *rover->bottomheight))
+ if (halfheight >= P_GetFFloorTopZAt(rover, thiscam->x, thiscam->y))
+ continue;
+ if (halfheight <= P_GetFFloorBottomZAt(rover, thiscam->x, thiscam->y))
continue;
if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
@@ -3692,15 +3577,9 @@ static boolean P_CameraCheckWater(camera_t *thiscam)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS)
continue;
- if (halfheight >= (
-#ifdef ESLOPE
- *rover->t_slope ? P_GetZAt(*rover->t_slope, thiscam->x, thiscam->y) :
-#endif
- *rover->topheight) || halfheight <= (
-#ifdef ESLOPE
- *rover->b_slope ? P_GetZAt(*rover->b_slope, thiscam->x, thiscam->y) :
-#endif
- *rover->bottomheight))
+ if (halfheight >= P_GetFFloorTopZAt(rover, thiscam->x, thiscam->y))
+ continue;
+ if (halfheight <= P_GetFFloorBottomZAt(rover, thiscam->x, thiscam->y))
continue;
return true;
@@ -3876,22 +3755,121 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
return false;
}
-//
-// P_PlayerMobjThinker
-//
-static void P_PlayerMobjThinker(mobj_t *mobj)
+static void P_CheckCrumblingPlatforms(mobj_t *mobj)
+{
+ msecnode_t *node;
+
+ if (netgame && mobj->player->spectator)
+ return;
+
+ for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
+ {
+ ffloor_t *rover;
+
+ for (rover = node->m_sector->ffloors; rover; rover = rover->next)
+ {
+ if (!(rover->flags & FF_EXISTS))
+ continue;
+
+ if (!(rover->flags & FF_CRUMBLE))
+ continue;
+
+ if (mobj->eflags & MFE_VERTICALFLIP)
+ {
+ if (P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector) != mobj->z + mobj->height)
+ continue;
+ }
+ else
+ {
+ if (P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector) != mobj->z)
+ continue;
+ }
+
+ EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN));
+ }
+ }
+}
+
+static boolean P_MobjTouchesSectorWithWater(mobj_t *mobj)
+{
+ msecnode_t *node;
+
+ for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
+ {
+ ffloor_t *rover;
+
+ if (!node->m_sector->ffloors)
+ continue;
+
+ for (rover = node->m_sector->ffloors; rover; rover = rover->next)
+ {
+ if (!(rover->flags & FF_EXISTS))
+ continue;
+
+ if (!(rover->flags & FF_SWIMMABLE))
+ continue;
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+// Check for floating water platforms and bounce them
+static void P_CheckFloatbobPlatforms(mobj_t *mobj)
{
msecnode_t *node;
+ // Can't land on anything if you're not moving downwards
+ if (P_MobjFlip(mobj)*mobj->momz >= 0)
+ return;
+
+ if (!P_MobjTouchesSectorWithWater(mobj))
+ return;
+
+ for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
+ {
+ ffloor_t *rover;
+
+ if (!node->m_sector->ffloors)
+ continue;
+
+ for (rover = node->m_sector->ffloors; rover; rover = rover->next)
+ {
+ if (!(rover->flags & FF_EXISTS))
+ continue;
+
+ if (!(rover->flags & FF_FLOATBOB))
+ continue;
+
+
+ if (mobj->eflags & MFE_VERTICALFLIP)
+ {
+ if (abs(*rover->bottomheight - (mobj->z + mobj->height)) > abs(mobj->momz))
+ continue;
+ }
+ else
+ {
+ if (abs(*rover->topheight - mobj->z) > abs(mobj->momz))
+ continue;
+ }
+
+ // Initiate a 'bouncy' elevator function which slowly diminishes.
+ EV_BounceSector(rover->master->frontsector, -mobj->momz, rover->master);
+ }
+ }
+}
+
+static void P_PlayerMobjThinker(mobj_t *mobj)
+{
I_Assert(mobj != NULL);
I_Assert(mobj->player != NULL);
I_Assert(!P_MobjWasRemoved(mobj));
P_MobjCheckWater(mobj);
-#ifdef ESLOPE
P_ButteredSlope(mobj);
-#endif
// momentum movement
mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN;
@@ -3937,77 +3915,10 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
else
P_TryMove(mobj, mobj->x, mobj->y, true);
- if (!(netgame && mobj->player->spectator))
- {
- // Crumbling platforms
- for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
- {
- fixed_t topheight, bottomheight;
- ffloor_t *rover;
-
- for (rover = node->m_sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_CRUMBLE))
- continue;
+ P_CheckCrumblingPlatforms(mobj);
- topheight = P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector);
- bottomheight = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector);
-
- if ((topheight == mobj->z && !(mobj->eflags & MFE_VERTICALFLIP))
- || (bottomheight == mobj->z + mobj->height && mobj->eflags & MFE_VERTICALFLIP)) // You nut.
- EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN));
- }
- }
- }
-
- // Check for floating water platforms and bounce them
- if (CheckForFloatBob && P_MobjFlip(mobj)*mobj->momz < 0)
- {
- boolean thereiswater = false;
-
- for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
- {
- if (node->m_sector->ffloors)
- {
- ffloor_t *rover;
- // Get water boundaries first
- for (rover = node->m_sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS))
- continue;
-
- if (rover->flags & FF_SWIMMABLE) // Is there water?
- {
- thereiswater = true;
- break;
- }
- }
- }
- }
- if (thereiswater)
- {
- for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
- {
- if (node->m_sector->ffloors)
- {
- ffloor_t *rover;
- for (rover = node->m_sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_FLOATBOB))
- continue;
-
- if ((!(mobj->eflags & MFE_VERTICALFLIP) && abs(*rover->topheight-mobj->z) <= abs(mobj->momz)) // The player is landing on the cheese!
- || (mobj->eflags & MFE_VERTICALFLIP && abs(*rover->bottomheight-(mobj->z+mobj->height)) <= abs(mobj->momz)))
- {
- // Initiate a 'bouncy' elevator function
- // which slowly diminishes.
- EV_BounceSector(rover->master->frontsector, -mobj->momz, rover->master);
- }
- }
- }
- }
- } // Ugly ugly billions of braces! Argh!
- }
+ if (CheckForFloatBob)
+ P_CheckFloatbobPlatforms(mobj);
// always do the gravity bit now, that's simpler
// BUT CheckPosition only if wasn't done before.
@@ -4050,11 +3961,7 @@ static void CalculatePrecipFloor(precipmobj_t *mobj)
mobjsecsubsec = mobj->subsector->sector;
else
return;
- mobj->floorz =
-#ifdef ESLOPE
- mobjsecsubsec->f_slope ? P_GetZAt(mobjsecsubsec->f_slope, mobj->x, mobj->y) :
-#endif
- mobjsecsubsec->floorheight;
+ mobj->floorz = P_GetSectorFloorZAt(mobjsecsubsec, mobj->x, mobj->y);
if (mobjsecsubsec->ffloors)
{
ffloor_t *rover;
@@ -4069,13 +3976,7 @@ static void CalculatePrecipFloor(precipmobj_t *mobj)
if (!(rover->flags & FF_BLOCKOTHERS) && !(rover->flags & FF_SWIMMABLE))
continue;
-#ifdef ESLOPE
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
- else
-#endif
- topheight = *rover->topheight;
-
+ topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
if (topheight > mobj->floorz)
mobj->floorz = topheight;
}
@@ -7161,8 +7062,7 @@ static void P_MobjScaleThink(mobj_t *mobj)
fixed_t oldheight = mobj->height;
UINT8 correctionType = 0; // Don't correct Z position, just gain height
- if ((mobj->flags & MF_NOCLIPHEIGHT || (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz))
- && mobj->type != MT_EGGMOBILE_FIRE)
+ if (mobj->flags & MF_NOCLIPHEIGHT || (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz))
correctionType = 1; // Correct Z position by centering
else if (mobj->eflags & MFE_VERTICALFLIP)
correctionType = 2; // Correct Z position by moving down
@@ -7183,10 +7083,6 @@ static void P_MobjScaleThink(mobj_t *mobj)
/// \todo Lua hook for "reached destscale"?
switch (mobj->type)
{
- case MT_EGGMOBILE_FIRE:
- mobj->destscale = FRACUNIT;
- mobj->scalespeed = FRACUNIT>>4;
- break;
default:
break;
}
@@ -7643,12 +7539,10 @@ static void P_RosySceneryThink(mobj_t *mobj)
static void P_MobjSceneryThink(mobj_t *mobj)
{
-#ifdef HAVE_BLUA
if (LUAh_MobjThinker(mobj))
return;
if (P_MobjWasRemoved(mobj))
return;
-#endif
if ((mobj->flags2 & MF2_SHIELD) && !P_AddShield(mobj))
return;
@@ -7993,9 +7887,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
if (!mobj->fuse)
{
-#ifdef HAVE_BLUA
if (!LUAh_MobjFuse(mobj))
-#endif
P_RemoveMobj(mobj);
return;
}
@@ -8054,9 +7946,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
mobj->fuse--;
if (!mobj->fuse)
{
-#ifdef HAVE_BLUA
if (!LUAh_MobjFuse(mobj))
-#endif
P_RemoveMobj(mobj);
return;
}
@@ -8085,7 +7975,6 @@ static boolean P_MobjPushableThink(mobj_t *mobj)
static boolean P_MobjBossThink(mobj_t *mobj)
{
-#ifdef HAVE_BLUA
if (LUAh_BossThinker(mobj))
{
if (P_MobjWasRemoved(mobj))
@@ -8094,7 +7983,6 @@ static boolean P_MobjBossThink(mobj_t *mobj)
else if (P_MobjWasRemoved(mobj))
return false;
else
-#endif
switch (mobj->type)
{
case MT_EGGMOBILE:
@@ -8370,6 +8258,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
// See Linedef Exec 457 (Track mobj angle to point)
static void P_TracerAngleThink(mobj_t *mobj)
{
+ angle_t looking;
angle_t ang;
if (!mobj->tracer)
@@ -8384,7 +8273,12 @@ static void P_TracerAngleThink(mobj_t *mobj)
// mobj->cvval - Allowable failure delay
// mobj->cvmem - Failure timer
- ang = mobj->angle - R_PointToAngle2(mobj->x, mobj->y, mobj->tracer->x, mobj->tracer->y);
+ if (mobj->player)
+ looking = ( mobj->player->cmd.angleturn << 16 );/* fixes CS_LMAOGALOG */
+ else
+ looking = mobj->angle;
+
+ ang = looking - R_PointToAngle2(mobj->x, mobj->y, mobj->tracer->x, mobj->tracer->y);
// \todo account for distance between mobj and tracer
// Because closer mobjs can be facing beyond the angle tolerance
@@ -9393,8 +9287,11 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0
&& P_AproxDistance(P_AproxDistance(mobj->tracer->x - mobj->x, mobj->tracer->y - mobj->y), mobj->tracer->z - mobj->z) <= mobj->radius*16)
{
+ var1 = mobj->info->speed;
+ var2 = 1;
+
// Home in on the target.
- P_HomingAttack(mobj, mobj->tracer);
+ A_HomingChase(mobj);
if (mobj->z < mobj->floorz)
mobj->z = mobj->floorz;
@@ -9571,7 +9468,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
case MT_BOSSFLYPOINT:
return false;
case MT_NIGHTSCORE:
- mobj->color = (UINT8)(leveltime % SKINCOLOR_WHITE);
+ mobj->color = (UINT16)(leveltime % SKINCOLOR_WHITE);
break;
case MT_JETFUME1:
if (!P_JetFume1Think(mobj))
@@ -10004,113 +9901,110 @@ static boolean P_FuseThink(mobj_t *mobj)
if (mobj->fuse)
return true;
-#ifdef HAVE_BLUA
if (LUAh_MobjFuse(mobj) || P_MobjWasRemoved(mobj))
;
- else
-#endif
- if (mobj->info->flags & MF_MONITOR)
+ else if (mobj->info->flags & MF_MONITOR)
+ {
+ P_MonitorFuseThink(mobj);
+ return false;
+ }
+ else switch (mobj->type)
+ {
+ // gargoyle and snowman handled in P_PushableThinker, not here
+ case MT_THROWNGRENADE:
+ case MT_CYBRAKDEMON_NAPALM_BOMB_LARGE:
+ P_SetMobjState(mobj, mobj->info->deathstate);
+ break;
+ case MT_LHRT:
+ P_KillMobj(mobj, NULL, NULL, 0);
+ break;
+ case MT_BLUEFLAG:
+ case MT_REDFLAG:
+ P_FlagFuseThink(mobj);
+ P_RemoveMobj(mobj);
+ return false;
+ case MT_FANG:
+ if (mobj->flags2 & MF2_SLIDEPUSH)
{
- P_MonitorFuseThink(mobj);
+ var1 = 0;
+ var2 = 0;
+ A_BossDeath(mobj);
return false;
}
- else switch (mobj->type)
- {
- // gargoyle and snowman handled in P_PushableThinker, not here
- case MT_THROWNGRENADE:
- case MT_CYBRAKDEMON_NAPALM_BOMB_LARGE:
- P_SetMobjState(mobj, mobj->info->deathstate);
- break;
- case MT_LHRT:
- P_KillMobj(mobj, NULL, NULL, 0);
- break;
- case MT_BLUEFLAG:
- case MT_REDFLAG:
- P_FlagFuseThink(mobj);
- P_RemoveMobj(mobj);
+ P_SetMobjState(mobj, mobj->state->nextstate);
+ if (P_MobjWasRemoved(mobj))
return false;
- case MT_FANG:
- if (mobj->flags2 & MF2_SLIDEPUSH)
- {
- var1 = 0;
- var2 = 0;
- A_BossDeath(mobj);
- return false;
- }
- P_SetMobjState(mobj, mobj->state->nextstate);
- if (P_MobjWasRemoved(mobj))
- return false;
- break;
- case MT_METALSONIC_BATTLE:
- break; // don't remove
- case MT_SPIKE:
- P_SetMobjState(mobj, mobj->state->nextstate);
- mobj->fuse = mobj->info->speed;
- if (mobj->spawnpoint)
- mobj->fuse += mobj->spawnpoint->angle;
- break;
- case MT_WALLSPIKE:
- P_SetMobjState(mobj, mobj->state->nextstate);
- mobj->fuse = mobj->info->speed;
- if (mobj->spawnpoint)
- mobj->fuse += (mobj->spawnpoint->angle / 360);
+ break;
+ case MT_METALSONIC_BATTLE:
+ break; // don't remove
+ case MT_SPIKE:
+ P_SetMobjState(mobj, mobj->state->nextstate);
+ mobj->fuse = mobj->info->speed;
+ if (mobj->spawnpoint)
+ mobj->fuse += mobj->spawnpoint->angle;
+ break;
+ case MT_WALLSPIKE:
+ P_SetMobjState(mobj, mobj->state->nextstate);
+ mobj->fuse = mobj->info->speed;
+ if (mobj->spawnpoint)
+ mobj->fuse += (mobj->spawnpoint->angle / 360);
+ break;
+ case MT_NIGHTSCORE:
+ P_RemoveMobj(mobj);
+ return false;
+ case MT_LAVAFALL:
+ if (mobj->state - states == S_LAVAFALL_DORMANT)
+ {
+ mobj->fuse = 30;
+ P_SetMobjState(mobj, S_LAVAFALL_TELL);
+ S_StartSound(mobj, mobj->info->seesound);
+ }
+ else if (mobj->state - states == S_LAVAFALL_TELL)
+ {
+ mobj->fuse = 40;
+ P_SetMobjState(mobj, S_LAVAFALL_SHOOT);
+ S_StopSound(mobj);
+ S_StartSound(mobj, mobj->info->attacksound);
+ }
+ else
+ {
+ mobj->fuse = 30;
+ P_SetMobjState(mobj, S_LAVAFALL_DORMANT);
+ S_StopSound(mobj);
+ }
+ return false;
+ case MT_PYREFLY:
+ if (mobj->health <= 0)
break;
- case MT_NIGHTSCORE:
- P_RemoveMobj(mobj);
- return false;
- case MT_LAVAFALL:
- if (mobj->state - states == S_LAVAFALL_DORMANT)
- {
- mobj->fuse = 30;
- P_SetMobjState(mobj, S_LAVAFALL_TELL);
- S_StartSound(mobj, mobj->info->seesound);
- }
- else if (mobj->state - states == S_LAVAFALL_TELL)
- {
- mobj->fuse = 40;
- P_SetMobjState(mobj, S_LAVAFALL_SHOOT);
- S_StopSound(mobj);
- S_StartSound(mobj, mobj->info->attacksound);
- }
- else
- {
- mobj->fuse = 30;
- P_SetMobjState(mobj, S_LAVAFALL_DORMANT);
- S_StopSound(mobj);
- }
- return false;
- case MT_PYREFLY:
- if (mobj->health <= 0)
- break;
- mobj->extravalue2 = (mobj->extravalue2 + 1) % 3;
- if (mobj->extravalue2 == 0)
- {
- P_SetMobjState(mobj, mobj->info->spawnstate);
- mobj->fuse = 100;
- S_StopSound(mobj);
- S_StartSound(mobj, sfx_s3k8c);
- }
- else if (mobj->extravalue2 == 1)
- {
- mobj->fuse = 50;
- S_StartSound(mobj, sfx_s3ka3);
- }
- else
- {
- P_SetMobjState(mobj, mobj->info->meleestate);
- mobj->fuse = 100;
- S_StopSound(mobj);
- S_StartSound(mobj, sfx_s3kc2l);
- }
- return false;
- case MT_PLAYER:
- break; // don't remove
- default:
- P_SetMobjState(mobj, mobj->info->xdeathstate); // will remove the mobj if S_NULL.
- break;
- // Looking for monitors? They moved to a special condition above.
+ mobj->extravalue2 = (mobj->extravalue2 + 1) % 3;
+ if (mobj->extravalue2 == 0)
+ {
+ P_SetMobjState(mobj, mobj->info->spawnstate);
+ mobj->fuse = 100;
+ S_StopSound(mobj);
+ S_StartSound(mobj, sfx_s3k8c);
+ }
+ else if (mobj->extravalue2 == 1)
+ {
+ mobj->fuse = 50;
+ S_StartSound(mobj, sfx_s3ka3);
+ }
+ else
+ {
+ P_SetMobjState(mobj, mobj->info->meleestate);
+ mobj->fuse = 100;
+ S_StopSound(mobj);
+ S_StartSound(mobj, sfx_s3kc2l);
}
+ return false;
+ case MT_PLAYER:
+ break; // don't remove
+ default:
+ P_SetMobjState(mobj, mobj->info->xdeathstate); // will remove the mobj if S_NULL.
+ break;
+ // Looking for monitors? They moved to a special condition above.
+ }
return !P_MobjWasRemoved(mobj);
}
@@ -10179,7 +10073,6 @@ void P_MobjThinker(mobj_t *mobj)
return;
}
-#ifdef HAVE_BLUA
// Check for a Lua thinker first
if (!mobj->player)
{
@@ -10193,7 +10086,7 @@ void P_MobjThinker(mobj_t *mobj)
if (P_MobjWasRemoved(mobj))
return;
}
-#endif
+
// if it's pushable, or if it would be pushable other than temporary disablement, use the
// separate thinker
if (mobj->flags & MF_PUSHABLE || (mobj->info->flags & MF_PUSHABLE && mobj->fuse))
@@ -10262,7 +10155,7 @@ void P_MobjThinker(mobj_t *mobj)
mobj->eflags &= ~MFE_JUSTHITFLOOR;
}
-#ifdef ESLOPE // Sliding physics for slidey mobjs!
+ // Sliding physics for slidey mobjs!
if (mobj->type == MT_FLINGRING
|| mobj->type == MT_FLINGCOIN
|| mobj->type == MT_FLINGBLUESPHERE
@@ -10277,7 +10170,6 @@ void P_MobjThinker(mobj_t *mobj)
//if (mobj->standingslope) CONS_Printf("slope physics on mobj\n");
P_ButteredSlope(mobj);
}
-#endif
if (mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->health
&& P_CheckDeathPitCollide(mobj)) // extra pit check in case these didn't have momz
@@ -10611,16 +10503,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// Make sure scale matches destscale immediately when spawned
P_SetScale(mobj, mobj->destscale);
- mobj->floorz =
-#ifdef ESLOPE
- mobj->subsector->sector->f_slope ? P_GetZAt(mobj->subsector->sector->f_slope, x, y) :
-#endif
- mobj->subsector->sector->floorheight;
- mobj->ceilingz =
-#ifdef ESLOPE
- mobj->subsector->sector->c_slope ? P_GetZAt(mobj->subsector->sector->c_slope, x, y) :
-#endif
- mobj->subsector->sector->ceilingheight;
+ mobj->floorz = P_GetSectorFloorZAt (mobj->subsector->sector, x, y);
+ mobj->ceilingz = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y);
mobj->floorrover = NULL;
mobj->ceilingrover = NULL;
@@ -10656,7 +10540,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// Set shadowscale here, before spawn hook so that Lua can change it
mobj->shadowscale = P_DefaultMobjShadowScale(mobj);
-#ifdef HAVE_BLUA
// 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))
@@ -10667,7 +10550,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
else if (P_MobjWasRemoved(mobj))
return NULL;
else
-#endif
switch (mobj->type)
{
case MT_ALTVIEWMAN:
@@ -10793,7 +10675,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
break;
case MT_EGGROBO1:
mobj->movecount = P_RandomKey(13);
- mobj->color = SKINCOLOR_RUBY + P_RandomKey(MAXSKINCOLORS - SKINCOLOR_RUBY);
+ mobj->color = SKINCOLOR_RUBY + P_RandomKey(numskincolors - SKINCOLOR_RUBY);
break;
case MT_HIVEELEMENTAL:
mobj->extravalue1 = 5;
@@ -10937,9 +10819,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
{
var1 = st->var1;
var2 = st->var2;
-#ifdef HAVE_BLUA
astate = st;
-#endif
st->action.acp1(mobj);
// DANGER! This can cause P_SpawnMobj to return NULL!
// Avoid using MF_RUNSPAWNFUNC on mobjs whose spawn state expects target or tracer to already be set!
@@ -10977,16 +10857,8 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype
// set subsector and/or block links
P_SetPrecipitationThingPosition(mobj);
- mobj->floorz = starting_floorz =
-#ifdef ESLOPE
- mobj->subsector->sector->f_slope ? P_GetZAt(mobj->subsector->sector->f_slope, x, y) :
-#endif
- mobj->subsector->sector->floorheight;
- mobj->ceilingz =
-#ifdef ESLOPE
- mobj->subsector->sector->c_slope ? P_GetZAt(mobj->subsector->sector->c_slope, x, y) :
-#endif
- mobj->subsector->sector->ceilingheight;
+ mobj->floorz = starting_floorz = P_GetSectorFloorZAt (mobj->subsector->sector, x, y);
+ mobj->ceilingz = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y);
mobj->floorrover = NULL;
mobj->ceilingrover = NULL;
@@ -11037,16 +10909,12 @@ size_t iquehead, iquetail;
void P_RemoveMobj(mobj_t *mobj)
{
I_Assert(mobj != NULL);
-#ifdef HAVE_BLUA
if (P_MobjWasRemoved(mobj))
return; // something already removing this mobj.
mobj->thinker.function.acp1 = (actionf_p1)P_RemoveThinkerDelayed; // shh. no recursing.
LUAh_MobjRemoved(mobj);
mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker; // needed for P_UnsetThingPosition, etc. to work.
-#else
- I_Assert(!P_MobjWasRemoved(mobj));
-#endif
// Rings only, please!
if (mobj->spawnpoint &&
@@ -11625,16 +11493,8 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing)
// set Z height
sector = R_PointInSubsector(x, y)->sector;
- floor =
-#ifdef ESLOPE
- sector->f_slope ? P_GetZAt(sector->f_slope, x, y) :
-#endif
- sector->floorheight;
- ceiling =
-#ifdef ESLOPE
- sector->c_slope ? P_GetZAt(sector->c_slope, x, y) :
-#endif
- sector->ceilingheight;
+ floor = P_GetSectorFloorZAt (sector, x, y);
+ ceiling = P_GetSectorCeilingZAt(sector, x, y);
ceilingspawn = ceiling - mobjinfo[MT_PLAYER].height;
if (mthing)
@@ -11704,16 +11564,8 @@ void P_MovePlayerToStarpost(INT32 playernum)
P_SetThingPosition(mobj);
sector = R_PointInSubsector(mobj->x, mobj->y)->sector;
- floor =
-#ifdef ESLOPE
- sector->f_slope ? P_GetZAt(sector->f_slope, mobj->x, mobj->y) :
-#endif
- sector->floorheight;
- ceiling =
-#ifdef ESLOPE
- sector->c_slope ? P_GetZAt(sector->c_slope, mobj->x, mobj->y) :
-#endif
- sector->ceilingheight;
+ floor = P_GetSectorFloorZAt (sector, mobj->x, mobj->y);
+ ceiling = P_GetSectorCeilingZAt(sector, mobj->x, mobj->y);
z = p->starpostz << FRACBITS;
@@ -11752,7 +11604,7 @@ void P_MovePlayerToStarpost(INT32 playernum)
mapthing_t *huntemeralds[MAXHUNTEMERALDS];
INT32 numhuntemeralds;
-static fixed_t P_GetMobjSpawnHeight(const mobjtype_t mobjtype, const fixed_t x, const fixed_t y, const fixed_t offset, const boolean flip)
+fixed_t P_GetMobjSpawnHeight(const mobjtype_t mobjtype, const fixed_t x, const fixed_t y, const fixed_t offset, const boolean flip)
{
const subsector_t *ss = R_PointInSubsector(x, y);
@@ -11762,20 +11614,12 @@ static fixed_t P_GetMobjSpawnHeight(const mobjtype_t mobjtype, const fixed_t x,
// Establish height.
if (flip)
- return (
-#ifdef ESLOPE
- ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-#endif
- ss->sector->ceilingheight) - offset - mobjinfo[mobjtype].height;
+ return P_GetSectorCeilingZAt(ss->sector, x, y) - offset - mobjinfo[mobjtype].height;
else
- return (
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-#endif
- ss->sector->floorheight) + offset;
+ return P_GetSectorFloorZAt(ss->sector, x, y) + offset;
}
-static fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mthing, const fixed_t x, const fixed_t y)
+fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mthing, const fixed_t x, const fixed_t y)
{
fixed_t offset = mthing->z << FRACBITS;
boolean flip = (!!(mobjinfo[mobjtype].flags & MF_SPAWNCEILING) ^ !!(mthing->options & MTF_OBJECTFLIP));
@@ -11815,6 +11659,7 @@ static fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthin
// Ring-like items, may float additional units with MTF_AMBUSH.
case MT_SPIKEBALL:
+ case MT_EMERHUNT:
case MT_EMERALDSPAWN:
case MT_TOKEN:
case MT_EMBLEM:
@@ -12110,7 +11955,7 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
{
INT32 j;
emblem_t* emblem = M_GetLevelEmblems(gamemap);
- skincolors_t emcolor;
+ skincolornum_t emcolor;
while (emblem)
{
@@ -12133,7 +11978,7 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
mobj->health = j + 1;
emcolor = M_GetEmblemColor(&emblemlocations[j]); // workaround for compiler complaint about bad function casting
- mobj->color = (UINT8)emcolor;
+ mobj->color = (UINT16)emcolor;
if (emblemlocations[j].collected
|| (emblemlocations[j].type == ET_SKIN && emblemlocations[j].var != players[0].skin))
@@ -12710,7 +12555,6 @@ static boolean P_SetupBooster(mapthing_t* mthing, mobj_t* mobj, boolean strong)
static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
{
-#ifdef HAVE_BLUA
boolean override = LUAh_MapThingSpawn(mobj, mthing);
if (P_MobjWasRemoved(mobj))
@@ -12718,7 +12562,6 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
if (override)
return true;
-#endif
switch (mobj->type)
{
@@ -12774,7 +12617,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
break;
case MT_BALLOON:
if (mthing->angle > 0)
- mobj->color = ((mthing->angle - 1) % (MAXSKINCOLORS - 1)) + 1;
+ mobj->color = ((mthing->angle - 1) % (numskincolors - 1)) + 1;
break;
#define makesoftwarecorona(mo, h) \
corona = P_SpawnMobjFromMobj(mo, 0, 0, h<<FRACBITS, MT_PARTICLE);\
@@ -12874,9 +12717,14 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
mobj->threshold = min(mthing->extrainfo, 7);
break;
case MT_TUBEWAYPOINT:
- mobj->health = mthing->angle & 255;
- mobj->threshold = mthing->angle >> 8;
+ {
+ UINT8 sequence = mthing->angle >> 8;
+ UINT8 id = mthing->angle & 255;
+ mobj->health = id;
+ mobj->threshold = sequence;
+ P_AddWaypoint(sequence, id, mobj);
break;
+ }
case MT_IDEYAANCHOR:
mobj->health = mthing->extrainfo;
break;
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 63c91571bc082830e082693273054cd5d3686f17..dae8c8a86079726aa17ebf45f4283761960d26d0 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -312,7 +312,7 @@ typedef struct mobj_s
void *skin; // overrides 'sprite' when non-NULL (for player bodies to 'remember' the skin)
// Player and mobj sprites in multiplayer modes are modified
// using an internal color lookup table for re-indexing.
- UINT8 color; // This replaces MF_TRANSLATION. Use 0 for default (no translation).
+ UINT16 color; // This replaces MF_TRANSLATION. Use 0 for default (no translation).
// Interaction info, by BLOCKMAP.
// Links in blocks (if needed).
@@ -370,9 +370,7 @@ typedef struct mobj_s
INT32 cusval;
INT32 cvmem;
-#ifdef ESLOPE
struct pslope_s *standingslope; // The slope that the object is standing on (shouldn't need synced in savegames, right?)
-#endif
boolean colorized; // Whether the mobj uses the rainbow colormap
fixed_t shadowscale; // If this object casts a shadow, and the size relative to radius
@@ -453,6 +451,9 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing);
void P_MovePlayerToStarpost(INT32 playernum);
void P_AfterPlayerSpawn(INT32 playernum);
+fixed_t P_GetMobjSpawnHeight(const mobjtype_t mobjtype, const fixed_t x, const fixed_t y, const fixed_t offset, const boolean flip);
+fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mthing, const fixed_t x, const fixed_t y);
+
mobj_t *P_SpawnMapThing(mapthing_t *mthing);
void P_SpawnHoop(mapthing_t *mthing);
void P_SetBonusTime(mobj_t *mobj);
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index 7e1ff1f4948737385f8cdfdbdc1e4a39cc8012fb..3f578a302ef68ce475f5aca72ee26b2730a9f97d 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -28,12 +28,6 @@
#include "r_state.h"
#include "r_defs.h"
-
-#define POLYOBJECTS
-
-
-#ifdef POLYOBJECTS
-
/*
Theory behind Polyobjects:
@@ -146,11 +140,6 @@ FUNCINLINE static ATTRINLINE void Polyobj_vecSub2(vertex_t *dst, vertex_t *v1, v
dst->y = v1->y - v2->y;
}
-//
-// P_PointInsidePolyobj
-//
-// Returns TRUE if the XY point is inside the polyobject
-//
boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y)
{
size_t i;
@@ -164,11 +153,6 @@ boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y)
return true;
}
-//
-// P_MobjTouchingPolyobj
-//
-// Returns TRUE if the mobj is touching the edge of a polyobject
-//
boolean P_MobjTouchingPolyobj(polyobj_t *po, mobj_t *mo)
{
fixed_t mbbox[4];
@@ -188,11 +172,6 @@ boolean P_MobjTouchingPolyobj(polyobj_t *po, mobj_t *mo)
return false;
}
-//
-// P_MobjInsidePolyobj
-//
-// Returns TRUE if the mobj is inside the polyobject
-//
boolean P_MobjInsidePolyobj(polyobj_t *po, mobj_t *mo)
{
fixed_t mbbox[4];
@@ -212,11 +191,6 @@ boolean P_MobjInsidePolyobj(polyobj_t *po, mobj_t *mo)
return true;
}
-//
-// P_BBoxInsidePolyobj
-//
-// Returns TRUE if the bbox is inside the polyobject
-//
boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox)
{
size_t i;
@@ -230,55 +204,56 @@ boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox)
return true;
}
-//
-// Polyobj_GetInfo
-//
// Finds the 'polyobject settings' linedef for a polyobject
// the polyobject's id should be set as its tag
-//
-void Polyobj_GetInfo(INT16 poid, INT32 *poflags, INT32 *parentID, INT32 *potrans)
+static void Polyobj_GetInfo(polyobj_t *po)
{
- INT32 i = P_FindSpecialLineFromTag(POLYINFO_SPECIALNUM, poid, -1);
+ INT32 i = P_FindSpecialLineFromTag(POLYINFO_SPECIALNUM, po->id, -1);
+
+ po->flags = POF_SOLID|POF_TESTHEIGHT|POF_RENDERSIDES;
if (i == -1)
return; // no extra settings to apply, let's leave it
- if (parentID)
- *parentID = lines[i].frontsector->special;
+ po->parent = lines[i].frontsector->special;
+ if (po->parent == po->id) // do not allow a self-reference
+ po->parent = -1;
- if (potrans)
- *potrans = (lines[i].frontsector->floorheight>>FRACBITS) / 100;
+ po->translucency = (lines[i].flags & ML_DONTPEGTOP)
+ ? (sides[lines[i].sidenum[0]].textureoffset>>FRACBITS)
+ : ((lines[i].frontsector->floorheight>>FRACBITS) / 100);
+
+ po->translucency = max(min(po->translucency, NUMTRANSMAPS), 0);
if (lines[i].flags & ML_EFFECT1)
- *poflags |= POF_ONESIDE;
+ po->flags |= POF_ONESIDE;
if (lines[i].flags & ML_EFFECT2)
- *poflags &= ~POF_SOLID;
+ po->flags &= ~POF_SOLID;
if (lines[i].flags & ML_EFFECT3)
- *poflags |= POF_PUSHABLESTOP;
+ po->flags |= POF_PUSHABLESTOP;
if (lines[i].flags & ML_EFFECT4)
- *poflags |= POF_RENDERPLANES;
+ po->flags |= POF_RENDERPLANES;
/*if (lines[i].flags & ML_EFFECT5)
- *poflags &= ~POF_CLIPPLANES;*/
+ po->flags &= ~POF_CLIPPLANES;*/
+
+ if (lines[i].flags & ML_EFFECT6)
+ po->flags |= POF_SPLAT;
if (lines[i].flags & ML_NOCLIMB) // Has a linedef executor
- *poflags |= POF_LDEXEC;
+ po->flags |= POF_LDEXEC;
}
// Reallocating array maintenance
-//
-// Polyobj_addVertex
-//
// Adds a vertex to a polyobject's reallocating vertex arrays, provided
// that such a vertex isn't already in the array. Each vertex must only
// be translated once during polyobject movement. Keeping track of them
// this way results in much more clear and efficient code than what
// Hexen used.
-//
static void Polyobj_addVertex(polyobj_t *po, vertex_t *v)
{
size_t i;
@@ -314,14 +289,10 @@ static void Polyobj_addVertex(polyobj_t *po, vertex_t *v)
po->numVertices++;
}
-//
-// Polyobj_addLine
-//
// Adds a linedef to a polyobject's reallocating linedefs array, provided
// that such a linedef isn't already in the array. Each linedef must only
// be adjusted once during polyobject movement. Keeping track of them
// this way provides the same benefits as for vertices.
-//
static void Polyobj_addLine(polyobj_t *po, line_t *l)
{
size_t i;
@@ -346,14 +317,10 @@ static void Polyobj_addLine(polyobj_t *po, line_t *l)
po->lines[po->numLines++] = l;
}
-//
-// Polyobj_addSeg
-//
// Adds a single seg to a polyobject's reallocating seg pointer array.
// Most polyobjects will have between 4 and 16 segs, so the array size
// begins much smaller than usual. Calls Polyobj_addVertex and Polyobj_addLine
// to add those respective structures for this seg, as well.
-//
static void Polyobj_addSeg(polyobj_t *po, seg_t *seg)
{
if (po->segCount >= po->numSegsAlloc)
@@ -379,14 +346,10 @@ static void Polyobj_addSeg(polyobj_t *po, seg_t *seg)
// Seg-finding functions
-//
-// Polyobj_findSegs
-//
// This method adds segs to a polyobject by following segs from vertex to
// vertex. The process stops when the original starting point is reached
// or if a particular search ends unexpectedly (ie, the polyobject is not
// closed).
-//
static void Polyobj_findSegs(polyobj_t *po, seg_t *seg)
{
fixed_t startx, starty;
@@ -400,25 +363,29 @@ static void Polyobj_findSegs(polyobj_t *po, seg_t *seg)
// Find backfacings
for (s = 0; s < numsegs; s++)
{
+ size_t r;
+
if (segs[s].glseg)
continue;
- if (segs[s].linedef == seg->linedef
- && segs[s].side == 1)
- {
- size_t r;
- for (r = 0; r < po->segCount; r++)
- {
- if (po->segs[r] == &segs[s])
- break;
- }
- if (r != po->segCount)
- continue;
+ if (segs[s].linedef != seg->linedef)
+ continue;
- segs[s].dontrenderme = true;
+ if (segs[s].side != 1)
+ continue;
- Polyobj_addSeg(po, &segs[s]);
+ for (r = 0; r < po->segCount; r++)
+ {
+ if (po->segs[r] == &segs[s])
+ break;
}
+
+ if (r != po->segCount)
+ continue;
+
+ segs[s].dontrenderme = true;
+
+ Polyobj_addSeg(po, &segs[s]);
}
}
@@ -438,56 +405,60 @@ newseg:
// seg's ending vertex.
for (i = 0; i < numsegs; ++i)
{
+ size_t q;
+
if (segs[i].glseg)
continue;
if (segs[i].side != 0) // needs to be frontfacing
continue;
- if (segs[i].v1->x == seg->v2->x && segs[i].v1->y == seg->v2->y)
+ if (segs[i].v1->x != seg->v2->x)
+ continue;
+ if (segs[i].v1->y != seg->v2->y)
+ continue;
+
+ // Make sure you didn't already add this seg...
+ for (q = 0; q < po->segCount; q++)
{
- // Make sure you didn't already add this seg...
- size_t q;
- for (q = 0; q < po->segCount; q++)
- {
- if (po->segs[q] == &segs[i])
- break;
- }
+ if (po->segs[q] == &segs[i])
+ break;
+ }
- if (q != po->segCount)
- continue;
+ if (q != po->segCount)
+ continue;
- // add the new seg and recurse
- Polyobj_addSeg(po, &segs[i]);
- seg = &segs[i];
+ // add the new seg and recurse
+ Polyobj_addSeg(po, &segs[i]);
+ seg = &segs[i];
- if (!(po->flags & POF_ONESIDE))
+ if (!(po->flags & POF_ONESIDE))
+ {
+ // Find backfacings
+ for (q = 0; q < numsegs; q++)
{
- // Find backfacings
- for (q = 0; q < numsegs; q++)
- {
- if (segs[q].glseg)
- continue;
+ size_t r;
- if (segs[q].linedef == segs[i].linedef
- && segs[q].side == 1)
- {
- size_t r;
- for (r=0; r < po->segCount; r++)
- {
- if (po->segs[r] == &segs[q])
- break;
- }
-
- if (r != po->segCount)
- continue;
-
- segs[q].dontrenderme = true;
- Polyobj_addSeg(po, &segs[q]);
- }
+ if (segs[q].glseg)
+ continue;
+ if (segs[q].linedef != segs[i].linedef)
+ continue;
+ if (segs[q].side != 1)
+ continue;
+
+ for (r = 0; r < po->segCount; r++)
+ {
+ if (po->segs[r] == &segs[q])
+ break;
}
- }
- goto newseg;
+ if (r != po->segCount)
+ continue;
+
+ segs[q].dontrenderme = true;
+ Polyobj_addSeg(po, &segs[q]);
+ }
}
+
+ goto newseg;
}
// error: if we reach here, the seg search never found another seg to
@@ -496,91 +467,8 @@ newseg:
CONS_Debug(DBG_POLYOBJ, "Polyobject %d is not closed\n", po->id);
}
-/*
-// structure used to store segs during explicit search process
-typedef struct segitem_s
-{
- seg_t *seg;
- INT32 num;
-} segitem_t;
-
-//
-// Polyobj_segCompare
-//
-// Callback for qsort that compares two segitems.
-//
-static int Polyobj_segCompare(const void *s1, const void *s2)
-{
- const segitem_t *si1 = s1;
- const segitem_t *si2 = s2;
-
- return si2->num - si1->num;
-}
-
-//
-// Polyobj_findExplicit
-//
-// Searches for segs to put into a polyobject in an explicitly provided order.
-//
-static void Polyobj_findExplicit(polyobj_t *po)
-{
- // temporary dynamic seg array
- segitem_t *segitems = NULL;
- size_t numSegItems = 0;
- size_t numSegItemsAlloc = 0;
-
- size_t i;
-
- // first loop: save off all segs with polyobject's id number
- for (i = 0; i < numsegs; ++i)
- {
- INT32 polyID, parentID;
-
- if (segs[i].linedef->special != POLYOBJ_EXPLICIT_LINE)
- continue;
-
- Polyobj_GetInfo(segs[i].linedef->tag, &polyID, &parentID, NULL);
-
- if (polyID == po->id && parentID > 0)
- {
- if (numSegItems >= numSegItemsAlloc)
- {
- numSegItemsAlloc = numSegItemsAlloc ? numSegItemsAlloc*2 : 4;
- segitems = Z_Realloc(segitems, numSegItemsAlloc*sizeof(segitem_t), PU_STATIC, NULL);
- }
- segitems[numSegItems].seg = &segs[i];
- segitems[numSegItems].num = parentID;
- ++numSegItems;
- }
- }
-
- // make sure array isn't empty
- if (numSegItems == 0)
- {
- po->isBad = true;
- CONS_Debug(DBG_POLYOBJ, "Polyobject %d is empty\n", po->id);
- return;
- }
-
- // sort the array if necessary
- if (numSegItems >= 2)
- qsort(segitems, numSegItems, sizeof(segitem_t), Polyobj_segCompare);
-
- // second loop: put the sorted segs into the polyobject
- for (i = 0; i < numSegItems; ++i)
- Polyobj_addSeg(po, segitems[i].seg);
-
- // free the temporary array
- Z_Free(segitems);
-}*/
-
// Setup functions
-//
-// Polyobj_spawnPolyObj
-//
-// Sets up a Polyobject.
-//
static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
{
size_t i;
@@ -604,14 +492,12 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
po->thrust = FRACUNIT;
po->spawnflags = po->flags = 0;
- // 1. Search segs for "line start" special with tag matching this
- // polyobject's id number. If found, iterate through segs which
- // share common vertices and record them into the polyobject.
+ // Search segs for "line start" special with tag matching this
+ // polyobject's id number. If found, iterate through segs which
+ // share common vertices and record them into the polyobject.
for (i = 0; i < numsegs; ++i)
{
seg_t *seg = &segs[i];
- INT32 poflags = POF_SOLID|POF_TESTHEIGHT|POF_RENDERSIDES;
- INT32 parentID = 0, potrans = 0;
if (seg->glseg)
continue;
@@ -625,17 +511,13 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
if (seg->linedef->tag != po->id)
continue;
- Polyobj_GetInfo(po->id, &poflags, &parentID, &potrans); // apply extra settings if they exist!
+ Polyobj_GetInfo(po); // apply extra settings if they exist!
// save original flags and translucency to reference later for netgames!
- po->spawnflags = po->flags = poflags;
- po->spawntrans = po->translucency = potrans;
+ po->spawnflags = po->flags;
+ po->spawntrans = po->translucency;
Polyobj_findSegs(po, seg);
- po->parent = parentID;
- if (po->parent == po->id) // do not allow a self-reference
- po->parent = -1;
- // TODO: sound sequence is in args[2]
break;
}
@@ -645,29 +527,7 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
if (po->isBad)
return;
- /*
- // 2. If no such line existed in the first step, look for a seg with the
- // "explicit" special with tag matching this polyobject's id number. If
- // found, continue to search for all such lines, storing them in a
- // temporary list of segs which is then copied into the polyobject in
- // sorted order.
- if (po->segCount == 0)
- {
- UINT16 parent;
- Polyobj_findExplicit(po);
- // if an error occurred above, quit processing this object
- if (po->isBad)
- return;
-
- Polyobj_GetInfo(po->segs[0]->linedef->tag, NULL, NULL, &parent);
- po->parent = parent;
- if (po->parent == po->id) // do not allow a self-reference
- po->parent = -1;
- // TODO: sound sequence is in args[3]
- }*/
-
// make sure array isn't empty
- // since Polyobj_findExplicit is disabled currently, we have to do things here instead now!
if (po->segCount == 0)
{
po->isBad = true;
@@ -696,12 +556,8 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
static void Polyobj_attachToSubsec(polyobj_t *po);
-//
-// Polyobj_moveToSpawnSpot
-//
// Translates the polyobject's vertices with respect to the difference between
// the anchor and spawn spots. Updates linedef bounding boxes as well.
-//
static void Polyobj_moveToSpawnSpot(mapthing_t *anchor)
{
polyobj_t *po;
@@ -748,11 +604,7 @@ static void Polyobj_moveToSpawnSpot(mapthing_t *anchor)
Polyobj_attachToSubsec(po);
}
-//
-// Polyobj_attachToSubsec
-//
// Attaches a polyobject to its appropriate subsector.
-//
static void Polyobj_attachToSubsec(polyobj_t *po)
{
subsector_t *ss;
@@ -787,11 +639,7 @@ static void Polyobj_attachToSubsec(polyobj_t *po)
po->attached = true;
}
-//
-// Polyobj_removeFromSubsec
-//
// Removes a polyobject from the subsector to which it is attached.
-//
static void Polyobj_removeFromSubsec(polyobj_t *po)
{
if (po->attached)
@@ -803,11 +651,7 @@ static void Polyobj_removeFromSubsec(polyobj_t *po)
// Blockmap Functions
-//
-// Polyobj_getLink
-//
// Retrieves a polymaplink object from the free list or creates a new one.
-//
static polymaplink_t *Polyobj_getLink(void)
{
polymaplink_t *l;
@@ -826,11 +670,7 @@ static polymaplink_t *Polyobj_getLink(void)
return l;
}
-//
-// Polyobj_putLink
-//
// Puts a polymaplink object into the free list.
-//
static void Polyobj_putLink(polymaplink_t *l)
{
memset(l, 0, sizeof(*l));
@@ -838,14 +678,10 @@ static void Polyobj_putLink(polymaplink_t *l)
bmap_freelist = l;
}
-//
-// Polyobj_linkToBlockmap
-//
// Inserts a polyobject into the polyobject blockmap. Unlike, mobj_t's,
// polyobjects need to be linked into every blockmap cell which their
// bounding box intersects. This ensures the accurate level of clipping
// which is present with linedefs but absent from most mobj interactions.
-//
static void Polyobj_linkToBlockmap(polyobj_t *po)
{
fixed_t *blockbox = po->blockbox;
@@ -890,12 +726,8 @@ static void Polyobj_linkToBlockmap(polyobj_t *po)
po->linked = true;
}
-//
-// Polyobj_removeFromBlockmap
-//
// Unlinks a polyobject from all blockmap cells it intersects and returns
// its polymaplink objects to the free list.
-//
static void Polyobj_removeFromBlockmap(polyobj_t *po)
{
polymaplink_t *rover;
@@ -934,13 +766,9 @@ static void Polyobj_removeFromBlockmap(polyobj_t *po)
// Movement functions
-//
-// Polyobj_untouched
-//
// A version of Lee's routine from p_maputl.c that accepts an mobj pointer
// argument instead of using tmthing. Returns true if the line isn't contacted
// and false otherwise.
-//
static inline boolean Polyobj_untouched(line_t *ld, mobj_t *mo)
{
fixed_t x, y, ptmbbox[4];
@@ -953,13 +781,9 @@ static inline boolean Polyobj_untouched(line_t *ld, mobj_t *mo)
P_BoxOnLineSide(ptmbbox, ld) != -1;
}
-//
-// Polyobj_pushThing
-//
// Inflicts thrust and possibly damage on a thing which has been found to be
// blocking the motion of a polyobject. The default thrust amount is only one
// unit, but the motion of the polyobject can be used to change this.
-//
static void Polyobj_pushThing(polyobj_t *po, line_t *line, mobj_t *mo)
{
angle_t lineangle;
@@ -994,11 +818,7 @@ static void Polyobj_pushThing(polyobj_t *po, line_t *line, mobj_t *mo)
}
}
-//
-// Polyobj_slideThing
-//
// Moves an object resting on top of a polyobject by (x, y). Template function to make alteration easier.
-//
static void Polyobj_slideThing(mobj_t *mo, fixed_t dx, fixed_t dy)
{
if (mo->player) { // Finally this doesn't suck eggs -fickle
@@ -1046,11 +866,7 @@ static void Polyobj_slideThing(mobj_t *mo, fixed_t dx, fixed_t dy)
P_TryMove(mo, mo->x+dx, mo->y+dy, true);
}
-//
-// Polyobj_carryThings
-//
// Causes objects resting on top of the polyobject to 'ride' with its movement.
-//
static void Polyobj_carryThings(polyobj_t *po, fixed_t dx, fixed_t dy)
{
static INT32 pomovecount = 0;
@@ -1102,12 +918,8 @@ static void Polyobj_carryThings(polyobj_t *po, fixed_t dx, fixed_t dy)
}
}
-//
-// Polyobj_clipThings
-//
// Checks for things that are in the way of a polyobject line move.
// Returns true if something was hit.
-//
static INT32 Polyobj_clipThings(polyobj_t *po, line_t *line)
{
INT32 hitflags = 0;
@@ -1169,11 +981,8 @@ static INT32 Polyobj_clipThings(polyobj_t *po, line_t *line)
return hitflags;
}
-//
-// Polyobj_moveXY
-//
+
// Moves a polyobject on the x-y plane.
-//
static boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean checkmobjs)
{
size_t i;
@@ -1229,15 +1038,11 @@ static boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean check
return !(hitflags & 2);
}
-//
-// Polyobj_rotatePoint
-//
// Rotates a point and then translates it relative to point c.
// The formula for this can be found here:
// http://www.inversereality.org/tutorials/graphics%20programming/2dtransformations.html
// It is, of course, just a vector-matrix multiplication.
-//
-static inline void Polyobj_rotatePoint(vertex_t *v, const vertex_t *c, angle_t ang)
+static inline void Polyobj_rotatePoint(vertex_t *v, const vector2_t *c, angle_t ang)
{
vertex_t tmp = *v;
@@ -1248,12 +1053,8 @@ static inline void Polyobj_rotatePoint(vertex_t *v, const vertex_t *c, angle_t a
v->y += c->y;
}
-//
-// Polyobj_rotateLine
-//
// Taken from P_LoadLineDefs; simply updates the linedef's dx, dy, slopetype,
// and bounding box to be consistent with its vertices.
-//
static void Polyobj_rotateLine(line_t *ld)
{
vertex_t *v1, *v2;
@@ -1293,12 +1094,8 @@ static void Polyobj_rotateLine(line_t *ld)
}
}
-//
-// Polyobj_rotateThings
-//
// Causes objects resting on top of the rotating polyobject to 'ride' with its movement.
-//
-static void Polyobj_rotateThings(polyobj_t *po, vertex_t origin, angle_t delta, UINT8 turnthings)
+static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta, UINT8 turnthings)
{
static INT32 pomovecount = 10000;
INT32 x, y;
@@ -1373,16 +1170,12 @@ static void Polyobj_rotateThings(polyobj_t *po, vertex_t origin, angle_t delta,
}
}
-//
-// Polyobj_rotate
-//
// Rotates a polyobject around its start point.
-//
static boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean checkmobjs)
{
size_t i;
angle_t angle;
- vertex_t origin;
+ vector2_t origin;
INT32 hitflags = 0;
// don't move bad polyobjects
@@ -1451,12 +1244,8 @@ static boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, bo
// Global Functions
//
-//
-// Polyobj_GetForNum
-//
// Retrieves a polyobject by its numeric id using hashing.
// Returns NULL if no such polyobject exists.
-//
polyobj_t *Polyobj_GetForNum(INT32 id)
{
INT32 curidx = PolyObjects[id % numPolyObjects].first;
@@ -1467,12 +1256,9 @@ polyobj_t *Polyobj_GetForNum(INT32 id)
return curidx == numPolyObjects ? NULL : &PolyObjects[curidx];
}
-//
-// Polyobj_GetParent
-//
+
// Retrieves the parenting polyobject if one exists. Returns NULL
// otherwise.
-//
#if 0 //unused function
static polyobj_t *Polyobj_GetParent(polyobj_t *po)
{
@@ -1480,12 +1266,8 @@ static polyobj_t *Polyobj_GetParent(polyobj_t *po)
}
#endif
-//
-// Polyobj_GetChild
-//
// Iteratively retrieves the children POs of a parent,
// sorta like P_FindSectorSpecialFromTag.
-//
static polyobj_t *Polyobj_GetChild(polyobj_t *po, INT32 *start)
{
for (; *start < numPolyObjects; (*start)++)
@@ -1504,12 +1286,8 @@ typedef struct mobjqitem_s
mobj_t *mo;
} mobjqitem_t;
-//
-// Polyobj_InitLevel
-//
// Called at the beginning of each map after all other line and thing
// processing is finished.
-//
void Polyobj_InitLevel(void)
{
thinker_t *th;
@@ -1628,9 +1406,6 @@ void Polyobj_InitLevel(void)
M_QueueFree(&anchorqueue);
}
-//
-// Polyobj_MoveOnLoad
-//
// Called when a savegame is being loaded. Rotates and translates an
// existing polyobject to its position when the game was saved.
//
@@ -1655,11 +1430,7 @@ void Polyobj_MoveOnLoad(polyobj_t *po, angle_t angle, fixed_t x, fixed_t y)
// Thinker Functions
-//
-// T_PolyObjRotate
-//
// Thinker function for PolyObject rotation.
-//
void T_PolyObjRotate(polyrotate_t *th)
{
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
@@ -1720,11 +1491,7 @@ void T_PolyObjRotate(polyrotate_t *th)
}
}
-//
-// Polyobj_componentSpeed
-//
// Calculates the speed components from the desired resultant velocity.
-//
FUNCINLINE static ATTRINLINE void Polyobj_componentSpeed(INT32 resVel, INT32 angle,
fixed_t *xVel, fixed_t *yVel)
{
@@ -1805,22 +1572,39 @@ void T_PolyObjMove(polymove_t *th)
}
}
-//
-// T_PolyObjWaypoint
-//
-// Kinda like 'Zoom Tubes for PolyObjects'
-//
+static void T_MovePolyObj(polyobj_t *po, fixed_t distx, fixed_t disty, fixed_t distz)
+{
+ polyobj_t *child;
+ INT32 start;
+
+ Polyobj_moveXY(po, distx, disty, true);
+ // TODO: use T_MovePlane
+ po->lines[0]->backsector->floorheight += distz;
+ po->lines[0]->backsector->ceilingheight += distz;
+ // Sal: Remember to check your sectors!
+ // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
+ // updating objects in the front one too just added teleporting to ground bugs
+ P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
+ // Apply action to mirroring polyobjects as well
+ start = 0;
+ while ((child = Polyobj_GetChild(po, &start)))
+ {
+ if (child->isBad)
+ continue;
+
+ Polyobj_moveXY(child, distx, disty, true);
+ // TODO: use T_MovePlane
+ child->lines[0]->backsector->floorheight += distz;
+ child->lines[0]->backsector->ceilingheight += distz;
+ P_CheckSector(child->lines[0]->backsector, (boolean)(child->damage));
+ }
+}
+
void T_PolyObjWaypoint(polywaypoint_t *th)
{
- mobj_t *mo2;
mobj_t *target = NULL;
- mobj_t *waypoint = NULL;
- thinker_t *wp;
- fixed_t adjustx, adjusty, adjustz;
- fixed_t momx, momy, momz, dist;
- INT32 start;
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
- polyobj_t *oldpo = po;
+ fixed_t speed = th->speed;
if (!po)
#ifdef RANGECHECK
@@ -1834,31 +1618,10 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
#endif
// check for displacement due to override and reattach when possible
- if (po->thinker == NULL)
+ if (!po->thinker)
po->thinker = &th->thinker;
-/*
- // Find out target first.
- // We redo this each tic to make savegame compatibility easier.
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
- {
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold == th->sequence && mo2->health == th->pointnum)
- {
- target = mo2;
- break;
- }
- }
-*/
-
- target = th->target;
+ target = waypoints[th->sequence][th->pointnum];
if (!target)
{
@@ -1866,240 +1629,93 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
return;
}
- // Compensate for position offset
- adjustx = po->centerPt.x + th->diffx;
- adjusty = po->centerPt.y + th->diffy;
- adjustz = po->lines[0]->backsector->floorheight + (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2 + th->diffz;
-
- dist = P_AproxDistance(P_AproxDistance(target->x - adjustx, target->y - adjusty), target->z - adjustz);
+ // Move along the waypoint sequence until speed for the current tic is exhausted
+ while (speed > 0)
+ {
+ mobj_t *waypoint = NULL;
+ fixed_t pox, poy, poz;
+ fixed_t distx, disty, distz, dist;
- if (dist < 1)
- dist = 1;
+ // Current position of polyobject
+ pox = po->centerPt.x;
+ poy = po->centerPt.y;
+ poz = (po->lines[0]->backsector->floorheight + po->lines[0]->backsector->ceilingheight)/2;
- momx = FixedMul(FixedDiv(target->x - adjustx, dist), (th->speed));
- momy = FixedMul(FixedDiv(target->y - adjusty, dist), (th->speed));
- momz = FixedMul(FixedDiv(target->z - adjustz, dist), (th->speed));
+ // Calculate the distance between the polyobject and the waypoint
+ distx = target->x - pox;
+ disty = target->y - poy;
+ distz = target->z - poz;
+ dist = P_AproxDistance(P_AproxDistance(distx, disty), distz);
- // Calculate the distance between the polyobject and the waypoint
- // 'dist' already equals this.
+ if (dist < 1)
+ dist = 1;
- // Will the polyobject be FURTHER away if the momx/momy/momz is added to
- // its current coordinates, or closer? (shift down to fracunits to avoid approximation errors)
- if (dist>>FRACBITS <= P_AproxDistance(P_AproxDistance(target->x - adjustx - momx, target->y - adjusty - momy), target->z - adjustz - momz)>>FRACBITS)
- {
- // If further away, set XYZ of polyobject to waypoint location
- fixed_t amtx, amty, amtz;
- fixed_t diffz;
- amtx = (target->x - th->diffx) - po->centerPt.x;
- amty = (target->y - th->diffy) - po->centerPt.y;
- Polyobj_moveXY(po, amtx, amty, true);
- // TODO: use T_MovePlane
- amtz = (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2;
- diffz = po->lines[0]->backsector->floorheight - (target->z - amtz);
- po->lines[0]->backsector->floorheight = target->z - amtz;
- po->lines[0]->backsector->ceilingheight = target->z + amtz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
- // Apply action to mirroring polyobjects as well
- start = 0;
- while ((po = Polyobj_GetChild(oldpo, &start)))
+ // Will the polyobject overshoot its target?
+ if (speed < dist)
{
- if (po->isBad)
- continue;
+ // No. Move towards waypoint
+ fixed_t momx, momy, momz;
- Polyobj_moveXY(po, amtx, amty, true);
- // TODO: use T_MovePlane
- po->lines[0]->backsector->floorheight += diffz; // move up/down by same amount as the parent did
- po->lines[0]->backsector->ceilingheight += diffz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
+ momx = FixedMul(FixedDiv(target->x - pox, dist), speed);
+ momy = FixedMul(FixedDiv(target->y - poy, dist), speed);
+ momz = FixedMul(FixedDiv(target->z - poz, dist), speed);
+ T_MovePolyObj(po, momx, momy, momz);
+ return;
}
-
- po = oldpo;
-
- if (!th->stophere)
+ else
{
- CONS_Debug(DBG_POLYOBJ, "Looking for next waypoint...\n");
+ // Yes. Teleport to waypoint and look for the next one
+ T_MovePolyObj(po, distx, disty, distz);
- // Find next waypoint
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
+ if (!th->stophere)
{
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
+ CONS_Debug(DBG_POLYOBJ, "Looking for next waypoint...\n");
+ waypoint = (th->direction == -1) ? P_GetPreviousWaypoint(target, false) : P_GetNextWaypoint(target, false);
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1)
+ if (!waypoint && th->returnbehavior == PWR_WRAP) // If specified, wrap waypoints
{
- if (mo2->health == target->health - 1)
+ if (!th->continuous)
{
- waypoint = mo2;
- break;
+ th->returnbehavior = PWR_STOP;
+ th->stophere = true;
}
- }
- else
- {
- if (mo2->health == target->health + 1)
- {
- waypoint = mo2;
- break;
- }
- }
- }
- if (!waypoint && th->wrap) // If specified, wrap waypoints
- {
- if (!th->continuous)
- {
- th->wrap = 0;
- th->stophere = true;
+ waypoint = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence);
}
-
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
+ else if (!waypoint && th->returnbehavior == PWR_COMEBACK) // Come back to the start
{
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
+ th->direction = -th->direction;
- mo2 = (mobj_t *)wp;
+ if (!th->continuous)
+ th->returnbehavior = PWR_STOP;
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1)
- {
- if (waypoint == NULL)
- waypoint = mo2;
- else if (mo2->health > waypoint->health)
- waypoint = mo2;
- }
- else
- {
- if (mo2->health == 0)
- {
- waypoint = mo2;
- break;
- }
- }
+ waypoint = (th->direction == -1) ? P_GetPreviousWaypoint(target, false) : P_GetNextWaypoint(target, false);
}
}
- else if (!waypoint && th->comeback) // Come back to the start
- {
- th->direction = -th->direction;
-
- if (!th->continuous)
- th->comeback = false;
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
- {
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
+ if (waypoint)
+ {
+ CONS_Debug(DBG_POLYOBJ, "Found waypoint (sequence %d, number %d).\n", waypoint->threshold, waypoint->health);
- if (mo2->threshold != th->sequence)
- continue;
+ target = waypoint;
+ th->pointnum = target->health;
- if (th->direction == -1)
- {
- if (mo2->health == target->health - 1)
- {
- waypoint = mo2;
- break;
- }
- }
- else
- {
- if (mo2->health == target->health + 1)
- {
- waypoint = mo2;
- break;
- }
- }
- }
+ // Calculate remaining speed
+ speed -= dist;
}
- }
-
- if (waypoint)
- {
- CONS_Debug(DBG_POLYOBJ, "Found waypoint (sequence %d, number %d).\n", waypoint->threshold, waypoint->health);
-
- target = waypoint;
- th->pointnum = target->health;
- // Set the mobj as your target! -- Monster Iestyn 27/12/19
- P_SetTarget(&th->target, target);
-
- // calculate MOMX/MOMY/MOMZ for next waypoint
- // change slope
- dist = P_AproxDistance(P_AproxDistance(target->x - adjustx, target->y - adjusty), target->z - adjustz);
-
- if (dist < 1)
- dist = 1;
-
- momx = FixedMul(FixedDiv(target->x - adjustx, dist), (th->speed));
- momy = FixedMul(FixedDiv(target->y - adjusty, dist), (th->speed));
- momz = FixedMul(FixedDiv(target->z - adjustz, dist), (th->speed));
- }
- else
- {
- momx = momy = momz = 0;
-
- if (!th->stophere)
- CONS_Debug(DBG_POLYOBJ, "Next waypoint not found!\n");
+ else
+ {
+ if (!th->stophere)
+ CONS_Debug(DBG_POLYOBJ, "Next waypoint not found!\n");
- if (po->thinker == &th->thinker)
- po->thinker = NULL;
+ if (po->thinker == &th->thinker)
+ po->thinker = NULL;
- P_RemoveThinker(&th->thinker);
- return;
+ P_RemoveThinker(&th->thinker);
+ return;
+ }
}
}
- else
- {
- // momx/momy/momz already equals the right speed
- }
-
- // Move the polyobject
- Polyobj_moveXY(po, momx, momy, true);
- // TODO: use T_MovePlane
- po->lines[0]->backsector->floorheight += momz;
- po->lines[0]->backsector->ceilingheight += momz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
-
- // Apply action to mirroring polyobjects as well
- start = 0;
- while ((po = Polyobj_GetChild(oldpo, &start)))
- {
- if (po->isBad)
- continue;
-
- Polyobj_moveXY(po, momx, momy, true);
- // TODO: use T_MovePlane
- po->lines[0]->backsector->floorheight += momz;
- po->lines[0]->backsector->ceilingheight += momz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
- }
}
void T_PolyDoorSlide(polyslidedoor_t *th)
@@ -2303,7 +1919,7 @@ void T_PolyDoorSwing(polyswingdoor_t *th)
}
}
-// T_PolyObjDisplace: shift a polyobject based on a control sector's heights.
+// Shift a polyobject based on a control sector's heights.
void T_PolyObjDisplace(polydisplace_t *th)
{
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
@@ -2343,7 +1959,7 @@ void T_PolyObjDisplace(polydisplace_t *th)
th->oldHeights = newheights;
}
-// T_PolyObjRotDisplace: rotate a polyobject based on a control sector's heights.
+// Rotate a polyobject based on a control sector's heights.
void T_PolyObjRotDisplace(polyrotdisplace_t *th)
{
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
@@ -2389,7 +2005,7 @@ static inline INT32 Polyobj_AngSpeed(INT32 speed)
// Linedef Handlers
-INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
+boolean EV_DoPolyObjRotate(polyrotdata_t *prdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2399,16 +2015,16 @@ INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
if (!(po = Polyobj_GetForNum(prdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", prdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// check for override if this polyobj already has a thinker
if (po->thinker && !prdata->overRide)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polyrotate_t), PU_LEVSPEC, NULL);
@@ -2451,10 +2067,10 @@ INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
}
// action was successful
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
+boolean EV_DoPolyObjMove(polymovedata_t *pmdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2464,16 +2080,16 @@ INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
if (!(po = Polyobj_GetForNum(pmdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjMove: bad polyobj %d\n", pmdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// check for override if this polyobj already has a thinker
if (po->thinker && !pmdata->overRide)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polymove_t), PU_LEVSPEC, NULL);
@@ -2510,31 +2126,27 @@ INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
}
// action was successful
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
+boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
{
polyobj_t *po;
polywaypoint_t *th;
- mobj_t *mo2;
mobj_t *first = NULL;
- mobj_t *last = NULL;
- mobj_t *target = NULL;
- thinker_t *wp;
if (!(po = Polyobj_GetForNum(pwdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: bad polyobj %d\n", pwdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
if (po->thinker) // Don't crowd out another thinker.
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polywaypoint_t), PU_LEVSPEC, NULL);
@@ -2545,137 +2157,36 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
// set fields
th->polyObjNum = pwdata->polyObjNum;
th->speed = pwdata->speed;
- th->sequence = pwdata->sequence; // Used to specify sequence #
- if (pwdata->reverse)
- th->direction = -1;
- else
- th->direction = 1;
+ th->sequence = pwdata->sequence;
+ th->direction = (pwdata->flags & PWF_REVERSE) ? -1 : 1;
- th->comeback = pwdata->comeback;
- th->continuous = pwdata->continuous;
- th->wrap = pwdata->wrap;
+ th->returnbehavior = pwdata->returnbehavior;
+ if (pwdata->flags & PWF_LOOP)
+ th->continuous = true;
th->stophere = false;
// Find the first waypoint we need to use
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
- {
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1) // highest waypoint #
- {
- if (mo2->health == 0)
- last = mo2;
- else
- {
- if (first == NULL)
- first = mo2;
- else if (mo2->health > first->health)
- first = mo2;
- }
- }
- else // waypoint 0
- {
- if (mo2->health == 0)
- first = mo2;
- else
- {
- if (last == NULL)
- last = mo2;
- else if (mo2->health > last->health)
- last = mo2;
- }
- }
- }
+ first = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence);
if (!first)
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: Missing starting waypoint!\n");
po->thinker = NULL;
P_RemoveThinker(&th->thinker);
- return 0;
- }
-
- // Hotfix to not crash on single-waypoint sequences -Red
- if (!last)
- last = first;
-
- // Set diffx, diffy, diffz
- // Put these at 0 for now...might not be needed after all.
- th->diffx = 0;//first->x - po->centerPt.x;
- th->diffy = 0;//first->y - po->centerPt.y;
- th->diffz = 0;//first->z - (po->lines[0]->backsector->floorheight + (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2);
-
- if (last->x == po->centerPt.x
- && last->y == po->centerPt.y
- && last->z == (po->lines[0]->backsector->floorheight + (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2))
- {
- // Already at the destination point...
- if (!th->wrap)
- {
- po->thinker = NULL;
- P_RemoveThinker(&th->thinker);
- }
+ return false;
}
- // Find the actual target movement waypoint
- target = first;
- /*for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
+ // Sanity check: If all waypoints are in the same location,
+ // don't allow the movement to be continuous so we don't get stuck in an infinite loop.
+ if (th->continuous && P_IsDegeneratedWaypointSequence(th->sequence))
{
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1) // highest waypoint #
- {
- if (mo2->health == first->health - 1)
- {
- target = mo2;
- break;
- }
- }
- else // waypoint 0
- {
- if (mo2->health == first->health + 1)
- {
- target = mo2;
- break;
- }
- }
- }*/
-
- if (!target)
- {
- CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: Missing target waypoint!\n");
- po->thinker = NULL;
- P_RemoveThinker(&th->thinker);
- return 0;
+ CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: All waypoints are in the same location!\n");
+ th->continuous = false;
}
- // Set pointnum
- th->pointnum = target->health;
- th->target = NULL; // set to NULL first so the below doesn't go wrong
- // Set the mobj as your target! -- Monster Iestyn 27/12/19
- P_SetTarget(&th->target, target);
+ th->pointnum = first->health;
- // We don't deal with the mirror crap here, we'll
- // handle that in the T_Thinker function.
- return 1;
+ return true;
}
static void Polyobj_doSlideDoor(polyobj_t *po, polydoordata_t *doordata)
@@ -2767,20 +2278,20 @@ static void Polyobj_doSwingDoor(polyobj_t *po, polydoordata_t *doordata)
Polyobj_doSwingDoor(po, doordata);
}
-INT32 EV_DoPolyDoor(polydoordata_t *doordata)
+boolean EV_DoPolyDoor(polydoordata_t *doordata)
{
polyobj_t *po;
if (!(po = Polyobj_GetForNum(doordata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyDoor: bad polyobj %d\n", doordata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects;
// polyobject doors don't allow action overrides
if (po->isBad || po->thinker)
- return 0;
+ return false;
switch (doordata->doorType)
{
@@ -2792,13 +2303,13 @@ INT32 EV_DoPolyDoor(polydoordata_t *doordata)
break;
default:
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyDoor: unknown door type %d", doordata->doorType);
- return 0;
+ return false;
}
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
+boolean EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2808,12 +2319,12 @@ INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
if (!(po = Polyobj_GetForNum(prdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", prdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polydisplace_t), PU_LEVSPEC, NULL);
@@ -2841,10 +2352,10 @@ INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
}
// action was successful
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
+boolean EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2854,12 +2365,12 @@ INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
if (!(po = Polyobj_GetForNum(prdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", prdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polyrotdisplace_t), PU_LEVSPEC, NULL);
@@ -2887,7 +2398,7 @@ INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
}
// action was successful
- return 1;
+ return true;
}
void T_PolyObjFlag(polymove_t *th)
@@ -2936,7 +2447,7 @@ void T_PolyObjFlag(polymove_t *th)
Polyobj_attachToSubsec(po); // relink to subsector
}
-INT32 EV_DoPolyObjFlag(line_t *pfdata)
+boolean EV_DoPolyObjFlag(polyflagdata_t *pfdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2944,22 +2455,22 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
size_t i;
INT32 start;
- if (!(po = Polyobj_GetForNum(pfdata->tag)))
+ if (!(po = Polyobj_GetForNum(pfdata->polyObjNum)))
{
- CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: bad polyobj %d\n", pfdata->tag);
- return 0;
+ CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: bad polyobj %d\n", pfdata->polyObjNum);
+ return false;
}
// don't allow line actions to affect bad polyobjects,
// polyobject doors don't allow action overrides
if (po->isBad || po->thinker)
- return 0;
+ return false;
// Must have even # of vertices
if (po->numVertices & 1)
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: Polyobject has odd # of vertices!\n");
- return 0;
+ return false;
}
// create a new thinker
@@ -2969,11 +2480,11 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
po->thinker = &th->thinker;
// set fields
- th->polyObjNum = pfdata->tag;
+ th->polyObjNum = pfdata->polyObjNum;
th->distance = 0;
- th->speed = P_AproxDistance(pfdata->dx, pfdata->dy)>>FRACBITS;
- th->angle = R_PointToAngle2(pfdata->v1->x, pfdata->v1->y, pfdata->v2->x, pfdata->v2->y)>>ANGLETOFINESHIFT;
- th->momx = sides[pfdata->sidenum[0]].textureoffset>>FRACBITS;
+ th->speed = pfdata->speed;
+ th->angle = pfdata->angle;
+ th->momx = pfdata->momx;
// save current positions
for (i = 0; i < po->numVertices; ++i)
@@ -2985,12 +2496,12 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
start = 0;
while ((po = Polyobj_GetChild(oldpo, &start)))
{
- pfdata->tag = po->id;
+ pfdata->polyObjNum = po->id;
EV_DoPolyObjFlag(pfdata);
}
// action was successful
- return 1;
+ return true;
}
void T_PolyObjFade(polyfade_t *th)
@@ -3088,7 +2599,7 @@ void T_PolyObjFade(polyfade_t *th)
}
}
-INT32 EV_DoPolyObjFade(polyfadedata_t *pfdata)
+boolean EV_DoPolyObjFade(polyfadedata_t *pfdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -3098,16 +2609,16 @@ INT32 EV_DoPolyObjFade(polyfadedata_t *pfdata)
if (!(po = Polyobj_GetForNum(pfdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjFade: bad polyobj %d\n", pfdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// already equal, nothing to do
if (po->translucency == pfdata->destvalue)
- return 1;
+ return true;
if (po->thinker && po->thinker->function.acp1 == (actionf_p1)T_PolyObjFade)
P_RemoveThinker(po->thinker);
@@ -3149,9 +2660,7 @@ INT32 EV_DoPolyObjFade(polyfadedata_t *pfdata)
}
// action was successful
- return 1;
+ return true;
}
-#endif // ifdef POLYOBJECTS
-
// EOF
diff --git a/src/p_polyobj.h b/src/p_polyobj.h
index d56701d2d9666021629d5bcc632680de3460413d..c6ae716f44bab61e4e45ead48f07a22e4bbb4214 100644
--- a/src/p_polyobj.h
+++ b/src/p_polyobj.h
@@ -18,8 +18,6 @@
#include "p_mobj.h"
#include "r_defs.h"
-// haleyjd: temporary define
-#ifdef POLYOBJECTS
//
// Defines
//
@@ -31,7 +29,6 @@
#define POLYOBJ_SPAWNCRUSH_DOOMEDNUM 762 // todo: REMOVE
#define POLYOBJ_START_LINE 20
-#define POLYOBJ_EXPLICIT_LINE 21
#define POLYINFO_SPECIALNUM 22
typedef enum
@@ -41,7 +38,7 @@ typedef enum
POF_SOLID = 0x3, ///< Clips things.
POF_TESTHEIGHT = 0x4, ///< Test line collision with heights
POF_RENDERSIDES = 0x8, ///< Renders the sides.
- POF_RENDERTOP = 0x10, ///< Renders the top..
+ POF_RENDERTOP = 0x10, ///< Renders the top.
POF_RENDERBOTTOM = 0x20, ///< Renders the bottom.
POF_RENDERPLANES = 0x30, ///< Renders top and bottom.
POF_RENDERALL = 0x38, ///< Renders everything.
@@ -52,6 +49,7 @@ typedef enum
POF_LDEXEC = 0x400, ///< This PO triggers a linedef executor.
POF_ONESIDE = 0x800, ///< Only use the first side of the linedef.
POF_NOSPECIALS = 0x1000, ///< Don't apply sector specials.
+ POF_SPLAT = 0x2000, ///< Use splat flat renderer (treat cyan pixels as invisible).
} polyobjflags_e;
//
@@ -143,26 +141,26 @@ typedef struct polymove_s
UINT32 angle; // angle along which to move
} polymove_t;
+// PolyObject waypoint movement return behavior
+typedef enum
+{
+ PWR_STOP, // Stop after reaching last waypoint
+ PWR_WRAP, // Wrap back to first waypoint
+ PWR_COMEBACK, // Repeat sequence in reverse
+} polywaypointreturn_e;
+
typedef struct polywaypoint_s
{
thinker_t thinker; // must be first
- INT32 polyObjNum; // numeric id of polyobject
- INT32 speed; // resultant velocity
- INT32 sequence; // waypoint sequence #
- INT32 pointnum; // waypoint #
- INT32 direction; // 1 for normal, -1 for backwards
- UINT8 comeback; // reverses and comes back when the end is reached
- UINT8 wrap; // Wrap around waypoints
- UINT8 continuous; // continuously move - used with COMEBACK or WRAP
- UINT8 stophere; // Will stop after it reaches the next waypoint
-
- // Difference between location of PO and location of waypoint (offset)
- fixed_t diffx;
- fixed_t diffy;
- fixed_t diffz;
-
- mobj_t *target; // next waypoint mobj
+ INT32 polyObjNum; // numeric id of polyobject
+ INT32 speed; // resultant velocity
+ INT32 sequence; // waypoint sequence #
+ INT32 pointnum; // waypoint #
+ INT32 direction; // 1 for normal, -1 for backwards
+ UINT8 returnbehavior; // behavior after reaching the last waypoint
+ UINT8 continuous; // continuously move - used with PWR_WRAP or PWR_COMEBACK
+ UINT8 stophere; // Will stop after it reaches the next waypoint
} polywaypoint_t;
typedef struct polyslidedoor_s
@@ -257,15 +255,19 @@ typedef struct polymovedata_s
UINT8 overRide; // if true, will override any action on the object
} polymovedata_t;
+typedef enum
+{
+ PWF_REVERSE = 1, // Move through waypoints in reverse order
+ PWF_LOOP = 1<<1, // Loop movement (used with PWR_WRAP or PWR_COMEBACK)
+} polywaypointflags_e;
+
typedef struct polywaypointdata_s
{
- INT32 polyObjNum; // numeric id of polyobject to affect
- INT32 sequence; // waypoint sequence #
- fixed_t speed; // linear speed
- UINT8 reverse; // if true, will go in reverse waypoint order
- UINT8 comeback; // reverses and comes back when the end is reached
- UINT8 wrap; // Wrap around waypoints
- UINT8 continuous; // continuously move - used with COMEBACK or WRAP
+ INT32 polyObjNum; // numeric id of polyobject to affect
+ INT32 sequence; // waypoint sequence #
+ fixed_t speed; // linear speed
+ UINT8 returnbehavior; // behavior after reaching the last waypoint
+ UINT8 flags; // PWF_ flags
} polywaypointdata_t;
// polyobject door types
@@ -301,6 +303,14 @@ typedef struct polyrotdisplacedata_s
UINT8 turnobjs;
} polyrotdisplacedata_t;
+typedef struct polyflagdata_s
+{
+ INT32 polyObjNum;
+ INT32 speed;
+ UINT32 angle;
+ fixed_t momx;
+} polyflagdata_t;
+
typedef struct polyfadedata_s
{
INT32 polyObjNum;
@@ -322,7 +332,6 @@ boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y);
boolean P_MobjTouchingPolyobj(polyobj_t *po, mobj_t *mo);
boolean P_MobjInsidePolyobj(polyobj_t *po, mobj_t *mo);
boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox);
-void Polyobj_GetInfo(INT16 poid, INT32 *poflags, INT32 *parentID, INT32 *potrans);
// thinkers (needed in p_saveg.c)
void T_PolyObjRotate(polyrotate_t *);
@@ -335,14 +344,14 @@ void T_PolyObjRotDisplace (polyrotdisplace_t *);
void T_PolyObjFlag (polymove_t *);
void T_PolyObjFade (polyfade_t *);
-INT32 EV_DoPolyDoor(polydoordata_t *);
-INT32 EV_DoPolyObjMove(polymovedata_t *);
-INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *);
-INT32 EV_DoPolyObjRotate(polyrotdata_t *);
-INT32 EV_DoPolyObjDisplace(polydisplacedata_t *);
-INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *);
-INT32 EV_DoPolyObjFlag(struct line_s *);
-INT32 EV_DoPolyObjFade(polyfadedata_t *);
+boolean EV_DoPolyDoor(polydoordata_t *);
+boolean EV_DoPolyObjMove(polymovedata_t *);
+boolean EV_DoPolyObjWaypoint(polywaypointdata_t *);
+boolean EV_DoPolyObjRotate(polyrotdata_t *);
+boolean EV_DoPolyObjDisplace(polydisplacedata_t *);
+boolean EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *);
+boolean EV_DoPolyObjFlag(polyflagdata_t *);
+boolean EV_DoPolyObjFade(polyfadedata_t *);
//
@@ -353,8 +362,6 @@ extern polyobj_t *PolyObjects;
extern INT32 numPolyObjects;
extern polymaplink_t **polyblocklinks; // polyobject blockmap
-#endif // ifdef POLYOBJECTS
-
#endif
// EOF
diff --git a/src/p_saveg.c b/src/p_saveg.c
index e6c7d07fdf58da4d264b578fcc03ce056cb1b5a0..eafc285a30e7ff5478b141417ad9b354457aaff9 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -31,9 +31,7 @@
#include "r_sky.h"
#include "p_polyobj.h"
#include "lua_script.h"
-#ifdef ESLOPE
#include "p_slopes.h"
-#endif
savedata_t savedata;
UINT8 *save_p;
@@ -61,9 +59,6 @@ typedef enum
DRONE = 0x80,
} player_saveflags;
-//
-// P_ArchivePlayer
-//
static inline void P_ArchivePlayer(void)
{
const player_t *player = &players[consoleplayer];
@@ -79,9 +74,6 @@ static inline void P_ArchivePlayer(void)
WRITEINT32(save_p, player->continues);
}
-//
-// P_UnArchivePlayer
-//
static inline void P_UnArchivePlayer(void)
{
INT16 skininfo = READUINT16(save_p);
@@ -94,9 +86,6 @@ static inline void P_UnArchivePlayer(void)
savedata.continues = READINT32(save_p);
}
-//
-// P_NetArchivePlayers
-//
static void P_NetArchivePlayers(void)
{
INT32 i, j;
@@ -302,9 +291,6 @@ static void P_NetArchivePlayers(void)
}
}
-//
-// P_NetUnArchivePlayers
-//
static void P_NetUnArchivePlayers(void)
{
INT32 i, j;
@@ -731,6 +717,34 @@ static void P_NetUnArchiveColormaps(void)
net_colormaps = NULL;
}
+static void P_NetArchiveWaypoints(void)
+{
+ INT32 i, j;
+
+ for (i = 0; i < NUMWAYPOINTSEQUENCES; i++)
+ {
+ WRITEUINT16(save_p, numwaypoints[i]);
+ for (j = 0; j < numwaypoints[i]; j++)
+ WRITEUINT32(save_p, waypoints[i][j] ? waypoints[i][j]->mobjnum : 0);
+ }
+}
+
+static void P_NetUnArchiveWaypoints(void)
+{
+ INT32 i, j;
+ UINT32 mobjnum;
+
+ for (i = 0; i < NUMWAYPOINTSEQUENCES; i++)
+ {
+ numwaypoints[i] = READUINT16(save_p);
+ for (j = 0; j < numwaypoints[i]; j++)
+ {
+ mobjnum = READUINT32(save_p);
+ waypoints[i][j] = (mobjnum == 0) ? NULL : P_FindNewPosition(mobjnum);
+ }
+ }
+}
+
///
/// World Archiving
///
@@ -757,6 +771,7 @@ static void P_NetUnArchiveColormaps(void)
// diff3 flags
#define SD_TAGLIST 0x01
#define SD_COLORMAP 0x02
+#define SD_CRUMBLESTATE 0x04
#define LD_FLAG 0x01
#define LD_SPECIAL 0x02
@@ -773,29 +788,102 @@ static void P_NetUnArchiveColormaps(void)
#define LD_S2BOTTEX 0x04
#define LD_S2MIDTEX 0x08
-//
-// P_NetArchiveWorld
-//
-static void P_NetArchiveWorld(void)
+#define FD_FLAGS 0x01
+#define FD_ALPHA 0x02
+
+// Check if any of the sector's FOFs differ from how they spawned
+static boolean CheckFFloorDiff(const sector_t *ss)
{
- size_t i;
- INT32 statsec = 0, statline = 0;
- const line_t *li = lines;
- const line_t *spawnli = spawnlines;
- const side_t *si;
- const side_t *spawnsi;
- UINT8 *put;
+ ffloor_t *rover;
+
+ for (rover = ss->ffloors; rover; rover = rover->next)
+ {
+ if (rover->flags != rover->spawnflags
+ || rover->alpha != rover->spawnalpha)
+ {
+ return true; // we found an FOF that changed!
+ // don't bother checking for more, we do that later
+ }
+ }
+ return false;
+}
+
+// Special case: save the stats of all modified ffloors along with their ffloor "number"s
+// we don't bother with ffloors that haven't changed, that would just add to savegame even more than is really needed
+static void ArchiveFFloors(const sector_t *ss)
+{
+ size_t j = 0; // ss->ffloors is saved as ffloor #0, ss->ffloors->next is #1, etc
+ ffloor_t *rover;
+ UINT8 fflr_diff;
+ for (rover = ss->ffloors; rover; rover = rover->next)
+ {
+ fflr_diff = 0; // reset diff flags
+ if (rover->flags != rover->spawnflags)
+ fflr_diff |= FD_FLAGS;
+ if (rover->alpha != rover->spawnalpha)
+ fflr_diff |= FD_ALPHA;
+
+ if (fflr_diff)
+ {
+ WRITEUINT16(save_p, j); // save ffloor "number"
+ WRITEUINT8(save_p, fflr_diff);
+ if (fflr_diff & FD_FLAGS)
+ WRITEUINT32(save_p, rover->flags);
+ if (fflr_diff & FD_ALPHA)
+ WRITEINT16(save_p, rover->alpha);
+ }
+ j++;
+ }
+ WRITEUINT16(save_p, 0xffff);
+}
+
+static void UnArchiveFFloors(const sector_t *ss)
+{
+ UINT16 j = 0; // number of current ffloor in loop
+ UINT16 fflr_i; // saved ffloor "number" of next modified ffloor
+ UINT16 fflr_diff; // saved ffloor diff
+ ffloor_t *rover;
+ rover = ss->ffloors;
+ if (!rover) // it is assumed sectors[i].ffloors actually exists, but just in case...
+ I_Error("Sector does not have any ffloors!");
+
+ fflr_i = READUINT16(save_p); // get first modified ffloor's number ready
+ for (;;) // for some reason the usual for (rover = x; ...) thing doesn't work here?
+ {
+ if (fflr_i == 0xffff) // end of modified ffloors list, let's stop already
+ break;
+ // should NEVER need to be checked
+ //if (rover == NULL)
+ //break;
+ if (j != fflr_i) // this ffloor was not modified
+ {
+ j++;
+ rover = rover->next;
+ continue;
+ }
+
+ fflr_diff = READUINT8(save_p);
+
+ if (fflr_diff & FD_FLAGS)
+ rover->flags = READUINT32(save_p);
+ if (fflr_diff & FD_ALPHA)
+ rover->alpha = READINT16(save_p);
+
+ fflr_i = READUINT16(save_p); // get next ffloor "number" ready
+
+ j++;
+ rover = rover->next;
+ }
+}
+
+static void ArchiveSectors(void)
+{
+ size_t i;
const sector_t *ss = sectors;
const sector_t *spawnss = spawnsectors;
UINT8 diff, diff2, diff3;
- // initialize colormap vars because paranoia
- ClearNetColormaps();
-
- WRITEUINT32(save_p, ARCHIVEBLOCK_WORLD);
- put = save_p;
-
for (i = 0; i < numsectors; i++, ss++, spawnss++)
{
diff = diff2 = diff3 = 0;
@@ -836,21 +924,11 @@ static void P_NetArchiveWorld(void)
if (ss->extra_colormap != spawnss->extra_colormap)
diff3 |= SD_COLORMAP;
+ if (ss->crumblestate)
+ diff3 |= SD_CRUMBLESTATE;
- // Check if any of the sector's FOFs differ from how they spawned
- if (ss->ffloors)
- {
- ffloor_t *rover;
- for (rover = ss->ffloors; rover; rover = rover->next)
- {
- if (rover->flags != rover->spawnflags
- || rover->alpha != rover->spawnalpha)
- {
- diff |= SD_FFLOORS; // we found an FOF that changed!
- break; // don't bother checking for more, we do that later
- }
- }
- }
+ if (ss->ffloors && CheckFFloorDiff(ss))
+ diff |= SD_FFLOORS;
if (diff3)
diff2 |= SD_DIFF3;
@@ -860,87 +938,142 @@ static void P_NetArchiveWorld(void)
if (diff)
{
- statsec++;
-
- WRITEUINT16(put, i);
- WRITEUINT8(put, diff);
+ WRITEUINT16(save_p, i);
+ WRITEUINT8(save_p, diff);
if (diff & SD_DIFF2)
- WRITEUINT8(put, diff2);
+ WRITEUINT8(save_p, diff2);
if (diff2 & SD_DIFF3)
- WRITEUINT8(put, diff3);
+ WRITEUINT8(save_p, diff3);
if (diff & SD_FLOORHT)
- WRITEFIXED(put, ss->floorheight);
+ WRITEFIXED(save_p, ss->floorheight);
if (diff & SD_CEILHT)
- WRITEFIXED(put, ss->ceilingheight);
+ WRITEFIXED(save_p, ss->ceilingheight);
if (diff & SD_FLOORPIC)
- WRITEMEM(put, levelflats[ss->floorpic].name, 8);
+ WRITEMEM(save_p, levelflats[ss->floorpic].name, 8);
if (diff & SD_CEILPIC)
- WRITEMEM(put, levelflats[ss->ceilingpic].name, 8);
+ WRITEMEM(save_p, levelflats[ss->ceilingpic].name, 8);
if (diff & SD_LIGHT)
- WRITEINT16(put, ss->lightlevel);
+ WRITEINT16(save_p, ss->lightlevel);
if (diff & SD_SPECIAL)
- WRITEINT16(put, ss->special);
+ WRITEINT16(save_p, ss->special);
if (diff2 & SD_FXOFFS)
- WRITEFIXED(put, ss->floor_xoffs);
+ WRITEFIXED(save_p, ss->floor_xoffs);
if (diff2 & SD_FYOFFS)
- WRITEFIXED(put, ss->floor_yoffs);
+ WRITEFIXED(save_p, ss->floor_yoffs);
if (diff2 & SD_CXOFFS)
- WRITEFIXED(put, ss->ceiling_xoffs);
+ WRITEFIXED(save_p, ss->ceiling_xoffs);
if (diff2 & SD_CYOFFS)
- WRITEFIXED(put, ss->ceiling_yoffs);
+ WRITEFIXED(save_p, ss->ceiling_yoffs);
if (diff2 & SD_FLOORANG)
- WRITEANGLE(put, ss->floorpic_angle);
+ WRITEANGLE(save_p, ss->floorpic_angle);
if (diff2 & SD_CEILANG)
- WRITEANGLE(put, ss->ceilingpic_angle);
+ WRITEANGLE(save_p, ss->ceilingpic_angle);
if (diff2 & SD_TAG) // save only the tag
- WRITEINT16(put, ss->tag);
+ WRITEINT16(save_p, ss->tag);
if (diff3 & SD_TAGLIST) // save both firsttag and nexttag
{ // either of these could be changed even if tag isn't
- WRITEINT32(put, ss->firsttag);
- WRITEINT32(put, ss->nexttag);
+ WRITEINT32(save_p, ss->firsttag);
+ WRITEINT32(save_p, ss->nexttag);
}
if (diff3 & SD_COLORMAP)
- WRITEUINT32(put, CheckAddNetColormapToList(ss->extra_colormap));
+ WRITEUINT32(save_p, CheckAddNetColormapToList(ss->extra_colormap));
// returns existing index if already added, or appends to net_colormaps and returns new index
-
- // Special case: save the stats of all modified ffloors along with their ffloor "number"s
- // we don't bother with ffloors that haven't changed, that would just add to savegame even more than is really needed
+ if (diff3 & SD_CRUMBLESTATE)
+ WRITEINT32(save_p, ss->crumblestate);
if (diff & SD_FFLOORS)
- {
- size_t j = 0; // ss->ffloors is saved as ffloor #0, ss->ffloors->next is #1, etc
- ffloor_t *rover;
- UINT8 fflr_diff;
- for (rover = ss->ffloors; rover; rover = rover->next)
- {
- fflr_diff = 0; // reset diff flags
- if (rover->flags != rover->spawnflags)
- fflr_diff |= 1;
- if (rover->alpha != rover->spawnalpha)
- fflr_diff |= 2;
-
- if (fflr_diff)
- {
- WRITEUINT16(put, j); // save ffloor "number"
- WRITEUINT8(put, fflr_diff);
- if (fflr_diff & 1)
- WRITEUINT32(put, rover->flags);
- if (fflr_diff & 2)
- WRITEINT16(put, rover->alpha);
- }
- j++;
- }
- WRITEUINT16(put, 0xffff);
- }
+ ArchiveFFloors(ss);
+ }
+ }
+
+ WRITEUINT16(save_p, 0xffff);
+}
+
+static void UnArchiveSectors(void)
+{
+ UINT16 i;
+ UINT8 diff, diff2, diff3;
+ for (;;)
+ {
+ i = READUINT16(save_p);
+
+ if (i == 0xffff)
+ break;
+
+ if (i > numsectors)
+ I_Error("Invalid sector number %u from server (expected end at %s)", i, sizeu1(numsectors));
+
+ diff = READUINT8(save_p);
+ if (diff & SD_DIFF2)
+ diff2 = READUINT8(save_p);
+ else
+ diff2 = 0;
+ if (diff2 & SD_DIFF3)
+ diff3 = READUINT8(save_p);
+ else
+ diff3 = 0;
+
+ if (diff & SD_FLOORHT)
+ sectors[i].floorheight = READFIXED(save_p);
+ if (diff & SD_CEILHT)
+ sectors[i].ceilingheight = READFIXED(save_p);
+ if (diff & SD_FLOORPIC)
+ {
+ sectors[i].floorpic = P_AddLevelFlatRuntime((char *)save_p);
+ save_p += 8;
}
+ if (diff & SD_CEILPIC)
+ {
+ sectors[i].ceilingpic = P_AddLevelFlatRuntime((char *)save_p);
+ save_p += 8;
+ }
+ if (diff & SD_LIGHT)
+ sectors[i].lightlevel = READINT16(save_p);
+ if (diff & SD_SPECIAL)
+ sectors[i].special = READINT16(save_p);
+
+ if (diff2 & SD_FXOFFS)
+ sectors[i].floor_xoffs = READFIXED(save_p);
+ if (diff2 & SD_FYOFFS)
+ sectors[i].floor_yoffs = READFIXED(save_p);
+ if (diff2 & SD_CXOFFS)
+ sectors[i].ceiling_xoffs = READFIXED(save_p);
+ if (diff2 & SD_CYOFFS)
+ sectors[i].ceiling_yoffs = READFIXED(save_p);
+ if (diff2 & SD_FLOORANG)
+ sectors[i].floorpic_angle = READANGLE(save_p);
+ if (diff2 & SD_CEILANG)
+ sectors[i].ceilingpic_angle = READANGLE(save_p);
+ if (diff2 & SD_TAG)
+ sectors[i].tag = READINT16(save_p); // DON'T use P_ChangeSectorTag
+ if (diff3 & SD_TAGLIST)
+ {
+ sectors[i].firsttag = READINT32(save_p);
+ sectors[i].nexttag = READINT32(save_p);
+ }
+
+ if (diff3 & SD_COLORMAP)
+ sectors[i].extra_colormap = GetNetColormapFromList(READUINT32(save_p));
+ if (diff3 & SD_CRUMBLESTATE)
+ sectors[i].crumblestate = READINT32(save_p);
+
+ if (diff & SD_FFLOORS)
+ UnArchiveFFloors(§ors[i]);
}
+}
- WRITEUINT16(put, 0xffff);
+static void ArchiveLines(void)
+{
+ size_t i;
+ const line_t *li = lines;
+ const line_t *spawnli = spawnlines;
+ const side_t *si;
+ const side_t *spawnsi;
+ UINT8 diff, diff2; // no diff3
- // do lines
for (i = 0; i < numlines; i++, spawnli++, li++)
{
- diff = diff2 = diff3 = 0;
+ diff = diff2 = 0;
if (li->special != spawnli->special)
diff |= LD_SPECIAL;
@@ -980,223 +1113,126 @@ static void P_NetArchiveWorld(void)
if (diff)
{
- statline++;
- WRITEINT16(put, i);
- WRITEUINT8(put, diff);
+ WRITEINT16(save_p, i);
+ WRITEUINT8(save_p, diff);
if (diff & LD_DIFF2)
- WRITEUINT8(put, diff2);
+ WRITEUINT8(save_p, diff2);
if (diff & LD_FLAG)
- WRITEINT16(put, li->flags);
+ WRITEINT16(save_p, li->flags);
if (diff & LD_SPECIAL)
- WRITEINT16(put, li->special);
+ WRITEINT16(save_p, li->special);
if (diff & LD_CLLCOUNT)
- WRITEINT16(put, li->callcount);
+ WRITEINT16(save_p, li->callcount);
si = &sides[li->sidenum[0]];
if (diff & LD_S1TEXOFF)
- WRITEFIXED(put, si->textureoffset);
+ WRITEFIXED(save_p, si->textureoffset);
if (diff & LD_S1TOPTEX)
- WRITEINT32(put, si->toptexture);
+ WRITEINT32(save_p, si->toptexture);
if (diff & LD_S1BOTTEX)
- WRITEINT32(put, si->bottomtexture);
+ WRITEINT32(save_p, si->bottomtexture);
if (diff & LD_S1MIDTEX)
- WRITEINT32(put, si->midtexture);
+ WRITEINT32(save_p, si->midtexture);
si = &sides[li->sidenum[1]];
if (diff2 & LD_S2TEXOFF)
- WRITEFIXED(put, si->textureoffset);
+ WRITEFIXED(save_p, si->textureoffset);
if (diff2 & LD_S2TOPTEX)
- WRITEINT32(put, si->toptexture);
+ WRITEINT32(save_p, si->toptexture);
if (diff2 & LD_S2BOTTEX)
- WRITEINT32(put, si->bottomtexture);
+ WRITEINT32(save_p, si->bottomtexture);
if (diff2 & LD_S2MIDTEX)
- WRITEINT32(put, si->midtexture);
+ WRITEINT32(save_p, si->midtexture);
}
}
- WRITEUINT16(put, 0xffff);
- R_ClearTextureNumCache(false);
-
- save_p = put;
+ WRITEUINT16(save_p, 0xffff);
}
-//
-// P_NetUnArchiveWorld
-//
-static void P_NetUnArchiveWorld(void)
+static void UnArchiveLines(void)
{
UINT16 i;
line_t *li;
side_t *si;
- UINT8 *get;
- UINT8 diff, diff2, diff3;
-
- if (READUINT32(save_p) != ARCHIVEBLOCK_WORLD)
- I_Error("Bad $$$.sav at archive block World");
-
- // initialize colormap vars because paranoia
- ClearNetColormaps();
-
- // count the level's ffloors so that colormap loading can have an upper limit
- for (i = 0; i < numsectors; i++)
- {
- ffloor_t *rover;
- for (rover = sectors[i].ffloors; rover; rover = rover->next)
- num_ffloors++;
- }
-
- get = save_p;
-
- for (;;)
- {
- i = READUINT16(get);
-
- if (i == 0xffff)
- break;
-
- if (i > numsectors)
- I_Error("Invalid sector number %u from server (expected end at %s)", i, sizeu1(numsectors));
-
- diff = READUINT8(get);
- if (diff & SD_DIFF2)
- diff2 = READUINT8(get);
- else
- diff2 = 0;
- if (diff2 & SD_DIFF3)
- diff3 = READUINT8(get);
- else
- diff3 = 0;
-
- if (diff & SD_FLOORHT)
- sectors[i].floorheight = READFIXED(get);
- if (diff & SD_CEILHT)
- sectors[i].ceilingheight = READFIXED(get);
- if (diff & SD_FLOORPIC)
- {
- sectors[i].floorpic = P_AddLevelFlatRuntime((char *)get);
- get += 8;
- }
- if (diff & SD_CEILPIC)
- {
- sectors[i].ceilingpic = P_AddLevelFlatRuntime((char *)get);
- get += 8;
- }
- if (diff & SD_LIGHT)
- sectors[i].lightlevel = READINT16(get);
- if (diff & SD_SPECIAL)
- sectors[i].special = READINT16(get);
-
- if (diff2 & SD_FXOFFS)
- sectors[i].floor_xoffs = READFIXED(get);
- if (diff2 & SD_FYOFFS)
- sectors[i].floor_yoffs = READFIXED(get);
- if (diff2 & SD_CXOFFS)
- sectors[i].ceiling_xoffs = READFIXED(get);
- if (diff2 & SD_CYOFFS)
- sectors[i].ceiling_yoffs = READFIXED(get);
- if (diff2 & SD_FLOORANG)
- sectors[i].floorpic_angle = READANGLE(get);
- if (diff2 & SD_CEILANG)
- sectors[i].ceilingpic_angle = READANGLE(get);
- if (diff2 & SD_TAG)
- sectors[i].tag = READINT16(get); // DON'T use P_ChangeSectorTag
- if (diff3 & SD_TAGLIST)
- {
- sectors[i].firsttag = READINT32(get);
- sectors[i].nexttag = READINT32(get);
- }
-
- if (diff3 & SD_COLORMAP)
- sectors[i].extra_colormap = GetNetColormapFromList(READUINT32(get));
-
- if (diff & SD_FFLOORS)
- {
- UINT16 j = 0; // number of current ffloor in loop
- UINT16 fflr_i; // saved ffloor "number" of next modified ffloor
- UINT16 fflr_diff; // saved ffloor diff
- ffloor_t *rover;
-
- rover = sectors[i].ffloors;
- if (!rover) // it is assumed sectors[i].ffloors actually exists, but just in case...
- I_Error("Sector does not have any ffloors!");
-
- fflr_i = READUINT16(get); // get first modified ffloor's number ready
- for (;;) // for some reason the usual for (rover = x; ...) thing doesn't work here?
- {
- if (fflr_i == 0xffff) // end of modified ffloors list, let's stop already
- break;
- // should NEVER need to be checked
- //if (rover == NULL)
- //break;
- if (j != fflr_i) // this ffloor was not modified
- {
- j++;
- rover = rover->next;
- continue;
- }
-
- fflr_diff = READUINT8(get);
-
- if (fflr_diff & 1)
- rover->flags = READUINT32(get);
- if (fflr_diff & 2)
- rover->alpha = READINT16(get);
-
- fflr_i = READUINT16(get); // get next ffloor "number" ready
-
- j++;
- rover = rover->next;
- }
- }
- }
+ UINT8 diff, diff2; // no diff3
for (;;)
{
- i = READUINT16(get);
+ i = READUINT16(save_p);
if (i == 0xffff)
break;
if (i > numlines)
I_Error("Invalid line number %u from server", i);
- diff = READUINT8(get);
+ diff = READUINT8(save_p);
li = &lines[i];
if (diff & LD_DIFF2)
- diff2 = READUINT8(get);
+ diff2 = READUINT8(save_p);
else
diff2 = 0;
- diff3 = 0;
-
if (diff & LD_FLAG)
- li->flags = READINT16(get);
+ li->flags = READINT16(save_p);
if (diff & LD_SPECIAL)
- li->special = READINT16(get);
+ li->special = READINT16(save_p);
if (diff & LD_CLLCOUNT)
- li->callcount = READINT16(get);
+ li->callcount = READINT16(save_p);
si = &sides[li->sidenum[0]];
if (diff & LD_S1TEXOFF)
- si->textureoffset = READFIXED(get);
+ si->textureoffset = READFIXED(save_p);
if (diff & LD_S1TOPTEX)
- si->toptexture = READINT32(get);
+ si->toptexture = READINT32(save_p);
if (diff & LD_S1BOTTEX)
- si->bottomtexture = READINT32(get);
+ si->bottomtexture = READINT32(save_p);
if (diff & LD_S1MIDTEX)
- si->midtexture = READINT32(get);
+ si->midtexture = READINT32(save_p);
si = &sides[li->sidenum[1]];
if (diff2 & LD_S2TEXOFF)
- si->textureoffset = READFIXED(get);
+ si->textureoffset = READFIXED(save_p);
if (diff2 & LD_S2TOPTEX)
- si->toptexture = READINT32(get);
+ si->toptexture = READINT32(save_p);
if (diff2 & LD_S2BOTTEX)
- si->bottomtexture = READINT32(get);
+ si->bottomtexture = READINT32(save_p);
if (diff2 & LD_S2MIDTEX)
- si->midtexture = READINT32(get);
+ si->midtexture = READINT32(save_p);
+ }
+}
+
+static void P_NetArchiveWorld(void)
+{
+ // initialize colormap vars because paranoia
+ ClearNetColormaps();
+
+ WRITEUINT32(save_p, ARCHIVEBLOCK_WORLD);
+
+ ArchiveSectors();
+ ArchiveLines();
+ R_ClearTextureNumCache(false);
+}
+
+static void P_NetUnArchiveWorld(void)
+{
+ UINT16 i;
+
+ if (READUINT32(save_p) != ARCHIVEBLOCK_WORLD)
+ I_Error("Bad $$$.sav at archive block World");
+
+ // initialize colormap vars because paranoia
+ ClearNetColormaps();
+
+ // count the level's ffloors so that colormap loading can have an upper limit
+ for (i = 0; i < numsectors; i++)
+ {
+ ffloor_t *rover;
+ for (rover = sectors[i].ffloors; rover; rover = rover->next)
+ num_ffloors++;
}
- save_p = get;
+ UnArchiveSectors();
+ UnArchiveLines();
}
//
@@ -1252,9 +1288,7 @@ typedef enum
MD2_HPREV = 1<<8,
MD2_FLOORROVER = 1<<9,
MD2_CEILINGROVER = 1<<10,
-#ifdef ESLOPE
MD2_SLOPE = 1<<11,
-#endif
MD2_COLORIZED = 1<<12,
MD2_ROLLANGLE = 1<<13,
MD2_SHADOWSCALE = 1<<14,
@@ -1277,9 +1311,7 @@ typedef enum
tc_startcrumble,
tc_marioblock,
tc_marioblockchecker,
- tc_spikesector,
tc_floatsector,
- tc_bridgethinker,
tc_crushceiling,
tc_scroll,
tc_friction,
@@ -1294,11 +1326,8 @@ typedef enum
tc_fade,
tc_fadecolormap,
tc_planedisplace,
-#ifdef ESLOPE
tc_dynslopeline,
tc_dynslopevert,
-#endif // ESLOPE
-#ifdef POLYOBJECTS
tc_polyrotate, // haleyjd 03/26/06: polyobjects
tc_polymove,
tc_polywaypoint,
@@ -1308,7 +1337,6 @@ typedef enum
tc_polydisplace,
tc_polyrotdisplace,
tc_polyfade,
-#endif
tc_end
} specials_e;
@@ -1336,19 +1364,12 @@ static inline UINT32 SavePlayer(const player_t *player)
return 0xFFFFFFFF;
}
-#ifdef ESLOPE
static UINT32 SaveSlope(const pslope_t *slope)
{
if (slope) return (UINT32)(slope->id);
return 0xFFFFFFFF;
}
-#endif // ESLOPE
-//
-// SaveMobjThinker
-//
-// Saves a mobj_t thinker
-//
static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
{
const mobj_t *mobj = (const mobj_t *)th;
@@ -1471,10 +1492,8 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
diff2 |= MD2_FLOORROVER;
if (mobj->ceilingrover)
diff2 |= MD2_CEILINGROVER;
-#ifdef ESLOPE
if (mobj->standingslope)
diff2 |= MD2_SLOPE;
-#endif
if (mobj->colorized)
diff2 |= MD2_COLORIZED;
if (mobj->rollangle)
@@ -1502,42 +1521,14 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
if (diff2 & MD2_FLOORROVER)
{
- ffloor_t *rover;
- size_t i = 0;
- UINT32 roverindex = 0;
-
- for (rover = mobj->floorrover->target->ffloors; rover; rover = rover->next)
- {
- if (rover == mobj->floorrover)
- {
- roverindex = i;
- break;
- }
- i++;
- }
-
- WRITEUINT32(save_p, (UINT32)(mobj->floorrover->target - sectors));
- WRITEUINT32(save_p, rover ? roverindex : i); // store max index to denote invalid ffloor ref
+ WRITEUINT32(save_p, SaveSector(mobj->floorrover->target));
+ WRITEUINT16(save_p, P_GetFFloorID(mobj->floorrover));
}
if (diff2 & MD2_CEILINGROVER)
{
- ffloor_t *rover;
- size_t i = 0;
- UINT32 roverindex = 0;
-
- for (rover = mobj->ceilingrover->target->ffloors; rover; rover = rover->next)
- {
- if (rover == mobj->ceilingrover)
- {
- roverindex = i;
- break;
- }
- i++;
- }
-
- WRITEUINT32(save_p, (UINT32)(mobj->ceilingrover->target - sectors));
- WRITEUINT32(save_p, rover ? roverindex : i); // store max index to denote invalid ffloor ref
+ WRITEUINT32(save_p, SaveSector(mobj->ceilingrover->target));
+ WRITEUINT16(save_p, P_GetFFloorID(mobj->ceilingrover));
}
if (diff & MD_SPAWNPOINT)
@@ -1630,7 +1621,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
if (diff2 & MD2_SKIN)
WRITEUINT8(save_p, (UINT8)((skin_t *)mobj->skin - skins));
if (diff2 & MD2_COLOR)
- WRITEUINT8(save_p, mobj->color);
+ WRITEUINT16(save_p, mobj->color);
if (diff2 & MD2_EXTVAL1)
WRITEINT32(save_p, mobj->extravalue1);
if (diff2 & MD2_EXTVAL2)
@@ -1639,10 +1630,8 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEUINT32(save_p, mobj->hnext->mobjnum);
if (diff2 & MD2_HPREV)
WRITEUINT32(save_p, mobj->hprev->mobjnum);
-#ifdef ESLOPE
if (diff2 & MD2_SLOPE)
WRITEUINT16(save_p, mobj->standingslope->id);
-#endif
if (diff2 & MD2_COLORIZED)
WRITEUINT8(save_p, mobj->colorized);
if (diff2 & MD2_ROLLANGLE)
@@ -1653,30 +1642,111 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEUINT32(save_p, mobj->mobjnum);
}
-//
-// SaveSpecialLevelThinker
-//
-// Saves a levelspecthink_t thinker
-//
-static void SaveSpecialLevelThinker(const thinker_t *th, const UINT8 type)
+static void SaveNoEnemiesThinker(const thinker_t *th, const UINT8 type)
+{
+ const noenemies_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+}
+
+static void SaveBounceCheeseThinker(const thinker_t *th, const UINT8 type)
+{
+ const bouncecheese_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEFIXED(save_p, ht->speed);
+ WRITEFIXED(save_p, ht->distance);
+ WRITEFIXED(save_p, ht->floorwasheight);
+ WRITEFIXED(save_p, ht->ceilingwasheight);
+ WRITECHAR(save_p, ht->low);
+}
+
+static void SaveContinuousFallThinker(const thinker_t *th, const UINT8 type)
+{
+ const continuousfall_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEFIXED(save_p, ht->speed);
+ WRITEINT32(save_p, ht->direction);
+ WRITEFIXED(save_p, ht->floorstartheight);
+ WRITEFIXED(save_p, ht->ceilingstartheight);
+ WRITEFIXED(save_p, ht->destheight);
+}
+
+static void SaveMarioBlockThinker(const thinker_t *th, const UINT8 type)
+{
+ const mariothink_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEFIXED(save_p, ht->speed);
+ WRITEINT32(save_p, ht->direction);
+ WRITEFIXED(save_p, ht->floorstartheight);
+ WRITEFIXED(save_p, ht->ceilingstartheight);
+ WRITEINT16(save_p, ht->tag);
+}
+
+static void SaveMarioCheckThinker(const thinker_t *th, const UINT8 type)
+{
+ const mariocheck_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+}
+
+static void SaveThwompThinker(const thinker_t *th, const UINT8 type)
+{
+ const thwomp_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEFIXED(save_p, ht->crushspeed);
+ WRITEFIXED(save_p, ht->retractspeed);
+ WRITEINT32(save_p, ht->direction);
+ WRITEFIXED(save_p, ht->floorstartheight);
+ WRITEFIXED(save_p, ht->ceilingstartheight);
+ WRITEINT32(save_p, ht->delay);
+ WRITEINT16(save_p, ht->tag);
+ WRITEUINT16(save_p, ht->sound);
+}
+
+static void SaveFloatThinker(const thinker_t *th, const UINT8 type)
{
- const levelspecthink_t *ht = (const void *)th;
+ const floatthink_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEINT16(save_p, ht->tag);
+}
+
+static void SaveEachTimeThinker(const thinker_t *th, const UINT8 type)
+{
+ const eachtime_t *ht = (const void *)th;
size_t i;
WRITEUINT8(save_p, type);
- for (i = 0; i < 16; i++)
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ for (i = 0; i < MAXPLAYERS; i++)
{
- WRITEFIXED(save_p, ht->vars[i]); //var[16]
- WRITEFIXED(save_p, ht->var2s[i]); //var[16]
+ WRITECHAR(save_p, ht->playersInArea[i]);
+ WRITECHAR(save_p, ht->playersOnArea[i]);
}
- WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITECHAR(save_p, ht->triggerOnExit);
+}
+
+static void SaveRaiseThinker(const thinker_t *th, const UINT8 type)
+{
+ const raise_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEINT16(save_p, ht->tag);
WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEFIXED(save_p, ht->ceilingbottom);
+ WRITEFIXED(save_p, ht->ceilingtop);
+ WRITEFIXED(save_p, ht->basespeed);
+ WRITEFIXED(save_p, ht->extraspeed);
+ WRITEUINT8(save_p, ht->shaketimer);
+ WRITEUINT8(save_p, ht->flags);
}
-//
-// SaveCeilingThinker
-//
-// Saves a ceiling_t thinker
-//
static void SaveCeilingThinker(const thinker_t *th, const UINT8 type)
{
const ceiling_t *ht = (const void *)th;
@@ -1698,11 +1768,6 @@ static void SaveCeilingThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, ht->sourceline);
}
-//
-// SaveFloormoveThinker
-//
-// Saves a floormove_t thinker
-//
static void SaveFloormoveThinker(const thinker_t *th, const UINT8 type)
{
const floormove_t *ht = (const void *)th;
@@ -1719,11 +1784,6 @@ static void SaveFloormoveThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, ht->delaytimer);
}
-//
-// SaveLightflashThinker
-//
-// Saves a lightflash_t thinker
-//
static void SaveLightflashThinker(const thinker_t *th, const UINT8 type)
{
const lightflash_t *ht = (const void *)th;
@@ -1733,11 +1793,6 @@ static void SaveLightflashThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->minlight);
}
-//
-// SaveStrobeThinker
-//
-// Saves a strobe_t thinker
-//
static void SaveStrobeThinker(const thinker_t *th, const UINT8 type)
{
const strobe_t *ht = (const void *)th;
@@ -1750,11 +1805,6 @@ static void SaveStrobeThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->brighttime);
}
-//
-// SaveGlowThinker
-//
-// Saves a glow_t thinker
-//
static void SaveGlowThinker(const thinker_t *th, const UINT8 type)
{
const glow_t *ht = (const void *)th;
@@ -1765,11 +1815,7 @@ static void SaveGlowThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->direction);
WRITEINT32(save_p, ht->speed);
}
-//
-// SaveFireflickerThinker
-//
-// Saves a fireflicker_t thinker
-//
+
static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type)
{
const fireflicker_t *ht = (const void *)th;
@@ -1780,11 +1826,7 @@ static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->maxlight);
WRITEINT32(save_p, ht->minlight);
}
-//
-// SaveElevatorThinker
-//
-// Saves a elevator_t thinker
-//
+
static void SaveElevatorThinker(const thinker_t *th, const UINT8 type)
{
const elevator_t *ht = (const void *)th;
@@ -1804,15 +1846,26 @@ static void SaveElevatorThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, ht->delaytimer);
WRITEFIXED(save_p, ht->floorwasheight);
WRITEFIXED(save_p, ht->ceilingwasheight);
- WRITEUINT32(save_p, SavePlayer(ht->player)); // was dummy
WRITEUINT32(save_p, SaveLine(ht->sourceline));
}
-//
-// SaveScrollThinker
-//
-// Saves a scroll_t thinker
-//
+static void SaveCrumbleThinker(const thinker_t *th, const UINT8 type)
+{
+ const crumble_t *ht = (const void *)th;
+ WRITEUINT8(save_p, type);
+ WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITEUINT32(save_p, SaveSector(ht->sector));
+ WRITEUINT32(save_p, SaveSector(ht->actionsector));
+ WRITEUINT32(save_p, SavePlayer(ht->player)); // was dummy
+ WRITEINT32(save_p, ht->direction);
+ WRITEINT32(save_p, ht->origalpha);
+ WRITEINT32(save_p, ht->timer);
+ WRITEFIXED(save_p, ht->speed);
+ WRITEFIXED(save_p, ht->floorwasheight);
+ WRITEFIXED(save_p, ht->ceilingwasheight);
+ WRITEUINT8(save_p, ht->flags);
+}
+
static inline void SaveScrollThinker(const thinker_t *th, const UINT8 type)
{
const scroll_t *ht = (const void *)th;
@@ -1829,11 +1882,6 @@ static inline void SaveScrollThinker(const thinker_t *th, const UINT8 type)
WRITEUINT8(save_p, ht->type);
}
-//
-// SaveFrictionThinker
-//
-// Saves a friction_t thinker
-//
static inline void SaveFrictionThinker(const thinker_t *th, const UINT8 type)
{
const friction_t *ht = (const void *)th;
@@ -1845,11 +1893,6 @@ static inline void SaveFrictionThinker(const thinker_t *th, const UINT8 type)
WRITEUINT8(save_p, ht->roverfriction);
}
-//
-// SavePusherThinker
-//
-// Saves a pusher_t thinker
-//
static inline void SavePusherThinker(const thinker_t *th, const UINT8 type)
{
const pusher_t *ht = (const void *)th;
@@ -1869,25 +1912,15 @@ static inline void SavePusherThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->slider);
}
-//
-// SaveLaserThinker
-//
-// Saves a laserthink_t thinker
-//
static void SaveLaserThinker(const thinker_t *th, const UINT8 type)
{
const laserthink_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
- WRITEUINT32(save_p, SaveSector(ht->sector));
- WRITEUINT32(save_p, SaveSector(ht->sec));
+ WRITEINT16(save_p, ht->tag);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
+ WRITEUINT8(save_p, ht->nobosses);
}
-//
-// SaveLightlevelThinker
-//
-// Saves a lightlevel_t thinker
-//
static void SaveLightlevelThinker(const thinker_t *th, const UINT8 type)
{
const lightlevel_t *ht = (const void *)th;
@@ -1900,11 +1933,6 @@ static void SaveLightlevelThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->timer);
}
-//
-// SaveExecutorThinker
-//
-// Saves a executor_t thinker
-//
static void SaveExecutorThinker(const thinker_t *th, const UINT8 type)
{
const executor_t *ht = (const void *)th;
@@ -1915,11 +1943,6 @@ static void SaveExecutorThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->timer);
}
-//
-// SaveDisappearThinker
-//
-// Saves a disappear_t thinker
-//
static void SaveDisappearThinker(const thinker_t *th, const UINT8 type)
{
const disappear_t *ht = (const void *)th;
@@ -1933,11 +1956,6 @@ static void SaveDisappearThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->exists);
}
-//
-// SaveFadeThinker
-//
-// Saves a fade_t thinker
-//
static void SaveFadeThinker(const thinker_t *th, const UINT8 type)
{
const fade_t *ht = (const void *)th;
@@ -1961,11 +1979,6 @@ static void SaveFadeThinker(const thinker_t *th, const UINT8 type)
WRITEUINT8(save_p, ht->exactalpha);
}
-//
-// SaveFadeColormapThinker
-//
-// Saves a fadecolormap_t thinker
-//
static void SaveFadeColormapThinker(const thinker_t *th, const UINT8 type)
{
const fadecolormap_t *ht = (const void *)th;
@@ -1978,11 +1991,6 @@ static void SaveFadeColormapThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->timer);
}
-//
-// SavePlaneDisplaceThinker
-//
-// Saves a planedisplace_t thinker
-//
static void SavePlaneDisplaceThinker(const thinker_t *th, const UINT8 type)
{
const planedisplace_t *ht = (const void *)th;
@@ -1993,8 +2001,7 @@ static void SavePlaneDisplaceThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, ht->speed);
WRITEUINT8(save_p, ht->type);
}
-#ifdef ESLOPE
-/// Save a dynamic slope thinker.
+
static inline void SaveDynamicSlopeThinker(const thinker_t *th, const UINT8 type)
{
const dynplanethink_t* ht = (const void*)th;
@@ -2008,15 +2015,7 @@ static inline void SaveDynamicSlopeThinker(const thinker_t *th, const UINT8 type
WRITEMEM(save_p, ht->tags, sizeof(ht->tags));
WRITEMEM(save_p, ht->vex, sizeof(ht->vex));
}
-#endif // ESLOPE
-
-#ifdef POLYOBJECTS
-//
-// SavePolyrotateThinker
-//
-// Saves a polyrotate_t thinker
-//
static inline void SavePolyrotatetThinker(const thinker_t *th, const UINT8 type)
{
const polyrotate_t *ht = (const void *)th;
@@ -2024,13 +2023,9 @@ static inline void SavePolyrotatetThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->polyObjNum);
WRITEINT32(save_p, ht->speed);
WRITEINT32(save_p, ht->distance);
+ WRITEUINT8(save_p, ht->turnobjs);
}
-//
-// SavePolymoveThinker
-//
-// Saves a polymovet_t thinker
-//
static void SavePolymoveThinker(const thinker_t *th, const UINT8 type)
{
const polymove_t *ht = (const void *)th;
@@ -2041,13 +2036,8 @@ static void SavePolymoveThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, ht->momy);
WRITEINT32(save_p, ht->distance);
WRITEANGLE(save_p, ht->angle);
-}
-
-//
-// SavePolywaypointThinker
-//
-// Saves a polywaypoint_t thinker
-//
+}
+
static void SavePolywaypointThinker(const thinker_t *th, UINT8 type)
{
const polywaypoint_t *ht = (const void *)th;
@@ -2057,21 +2047,11 @@ static void SavePolywaypointThinker(const thinker_t *th, UINT8 type)
WRITEINT32(save_p, ht->sequence);
WRITEINT32(save_p, ht->pointnum);
WRITEINT32(save_p, ht->direction);
- WRITEUINT8(save_p, ht->comeback);
- WRITEUINT8(save_p, ht->wrap);
+ WRITEUINT8(save_p, ht->returnbehavior);
WRITEUINT8(save_p, ht->continuous);
WRITEUINT8(save_p, ht->stophere);
- WRITEFIXED(save_p, ht->diffx);
- WRITEFIXED(save_p, ht->diffy);
- WRITEFIXED(save_p, ht->diffz);
- WRITEUINT32(save_p, SaveMobjnum(ht->target));
}
-//
-// SavePolyslidedoorThinker
-//
-// Saves a polyslidedoor_t thinker
-//
static void SavePolyslidedoorThinker(const thinker_t *th, const UINT8 type)
{
const polyslidedoor_t *ht = (const void *)th;
@@ -2091,11 +2071,6 @@ static void SavePolyslidedoorThinker(const thinker_t *th, const UINT8 type)
WRITEUINT8(save_p, ht->closing);
}
-//
-// SavePolyswingdoorThinker
-//
-// Saves a polyswingdoor_t thinker
-//
static void SavePolyswingdoorThinker(const thinker_t *th, const UINT8 type)
{
const polyswingdoor_t *ht = (const void *)th;
@@ -2146,24 +2121,6 @@ static void SavePolyfadeThinker(const thinker_t *th, const UINT8 type)
WRITEINT32(save_p, ht->timer);
}
-#endif
-/*
-//
-// SaveWhatThinker
-//
-// Saves a what_t thinker
-//
-static inline void SaveWhatThinker(const thinker_t *th, const UINT8 type)
-{
- const what_t *ht = (const void *)th;
- WRITEUINT8(save_p, type);
-}
-*/
-
-//
-// P_NetArchiveThinkers
-//
-//
static void P_NetArchiveThinkers(void)
{
const thinker_t *th;
@@ -2231,27 +2188,27 @@ static void P_NetArchiveThinkers(void)
}
else if (th->function.acp1 == (actionf_p1)T_ContinuousFalling)
{
- SaveSpecialLevelThinker(th, tc_continuousfalling);
+ SaveContinuousFallThinker(th, tc_continuousfalling);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_ThwompSector)
{
- SaveSpecialLevelThinker(th, tc_thwomp);
+ SaveThwompThinker(th, tc_thwomp);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_NoEnemiesSector)
{
- SaveSpecialLevelThinker(th, tc_noenemies);
+ SaveNoEnemiesThinker(th, tc_noenemies);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_EachTimeThinker)
{
- SaveSpecialLevelThinker(th, tc_eachtime);
+ SaveEachTimeThinker(th, tc_eachtime);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_RaiseSector)
{
- SaveSpecialLevelThinker(th, tc_raisesector);
+ SaveRaiseThinker(th, tc_raisesector);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_CameraScanner)
@@ -2276,37 +2233,27 @@ static void P_NetArchiveThinkers(void)
}
else if (th->function.acp1 == (actionf_p1)T_BounceCheese)
{
- SaveSpecialLevelThinker(th, tc_bouncecheese);
+ SaveBounceCheeseThinker(th, tc_bouncecheese);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_StartCrumble)
{
- SaveElevatorThinker(th, tc_startcrumble);
+ SaveCrumbleThinker(th, tc_startcrumble);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_MarioBlock)
{
- SaveSpecialLevelThinker(th, tc_marioblock);
+ SaveMarioBlockThinker(th, tc_marioblock);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_MarioBlockChecker)
{
- SaveSpecialLevelThinker(th, tc_marioblockchecker);
- continue;
- }
- else if (th->function.acp1 == (actionf_p1)T_SpikeSector)
- {
- SaveSpecialLevelThinker(th, tc_spikesector);
+ SaveMarioCheckThinker(th, tc_marioblockchecker);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_FloatSector)
{
- SaveSpecialLevelThinker(th, tc_floatsector);
- continue;
- }
- else if (th->function.acp1 == (actionf_p1)T_BridgeThinker)
- {
- SaveSpecialLevelThinker(th, tc_bridgethinker);
+ SaveFloatThinker(th, tc_floatsector);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_LaserFlash)
@@ -2344,7 +2291,6 @@ static void P_NetArchiveThinkers(void)
SavePlaneDisplaceThinker(th, tc_planedisplace);
continue;
}
-#ifdef POLYOBJECTS
else if (th->function.acp1 == (actionf_p1)T_PolyObjRotate)
{
SavePolyrotatetThinker(th, tc_polyrotate);
@@ -2390,8 +2336,6 @@ static void P_NetArchiveThinkers(void)
SavePolyfadeThinker(th, tc_polyfade);
continue;
}
-#endif
-#ifdef ESLOPE
else if (th->function.acp1 == (actionf_p1)T_DynamicSlopeLine)
{
SaveDynamicSlopeThinker(th, tc_dynslopeline);
@@ -2402,7 +2346,6 @@ static void P_NetArchiveThinkers(void)
SaveDynamicSlopeThinker(th, tc_dynslopevert);
continue;
}
-#endif // ESLOPE
#ifdef PARANOIA
else if (th->function.acp1 != (actionf_p1)P_RemoveThinkerDelayed) // wait garbage collection
I_Error("unknown thinker type %p", th->function.acp1);
@@ -2463,7 +2406,6 @@ static inline player_t *LoadPlayer(UINT32 player)
return &players[player];
}
-#ifdef ESLOPE
static inline pslope_t *LoadSlope(UINT32 slopeid)
{
pslope_t *p = slopelist;
@@ -2475,13 +2417,7 @@ static inline pslope_t *LoadSlope(UINT32 slopeid)
} while ((p = p->next));
return NULL;
}
-#endif // ESLOPE
-//
-// LoadMobjThinker
-//
-// Loads a mobj_t from a save game
-//
static thinker_t* LoadMobjThinker(actionf_p1 thinker)
{
thinker_t *next;
@@ -2506,34 +2442,16 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
if (diff2 & MD2_FLOORROVER)
{
- size_t floor_sectornum = (size_t)READUINT32(save_p);
- size_t floor_rovernum = (size_t)READUINT32(save_p);
- ffloor_t *rover = NULL;
- size_t rovernum = 0;
-
- for (rover = sectors[floor_sectornum].ffloors; rover; rover = rover->next)
- {
- if (rovernum == floor_rovernum)
- break;
- rovernum++;
- }
- floorrover = rover;
+ sector_t *sec = LoadSector(READUINT32(save_p));
+ UINT16 id = READUINT16(save_p);
+ floorrover = P_GetFFloorByID(sec, id);
}
if (diff2 & MD2_CEILINGROVER)
{
- size_t ceiling_sectornum = (size_t)READUINT32(save_p);
- size_t ceiling_rovernum = (size_t)READUINT32(save_p);
- ffloor_t *rover = NULL;
- size_t rovernum = 0;
-
- for (rover = sectors[ceiling_sectornum].ffloors; rover; rover = rover->next)
- {
- if (rovernum == ceiling_rovernum)
- break;
- rovernum++;
- }
- ceilingrover = rover;
+ sector_t *sec = LoadSector(READUINT32(save_p));
+ UINT16 id = READUINT16(save_p);
+ ceilingrover = P_GetFFloorByID(sec, id);
}
if (diff & MD_SPAWNPOINT)
@@ -2711,7 +2629,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
if (diff2 & MD2_SKIN)
mobj->skin = &skins[READUINT8(save_p)];
if (diff2 & MD2_COLOR)
- mobj->color = READUINT8(save_p);
+ mobj->color = READUINT16(save_p);
if (diff2 & MD2_EXTVAL1)
mobj->extravalue1 = READINT32(save_p);
if (diff2 & MD2_EXTVAL2)
@@ -2720,10 +2638,8 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
mobj->hnext = (mobj_t *)(size_t)READUINT32(save_p);
if (diff2 & MD2_HPREV)
mobj->hprev = (mobj_t *)(size_t)READUINT32(save_p);
-#ifdef ESLOPE
if (diff2 & MD2_SLOPE)
mobj->standingslope = P_SlopeById(READUINT16(save_p));
-#endif
if (diff2 & MD2_COLORIZED)
mobj->colorized = READUINT8(save_p);
if (diff2 & MD2_ROLLANGLE)
@@ -2760,46 +2676,145 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
return &mobj->thinker;
}
-//
-// LoadSpecialLevelThinker
-//
-// Loads a levelspecthink_t from a save game
-//
-// floorOrCeiling:
-// 0 - Don't set
-// 1 - Floor Only
-// 2 - Ceiling Only
-// 3 - Both
-//
-static thinker_t* LoadSpecialLevelThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
+static thinker_t* LoadNoEnemiesThinker(actionf_p1 thinker)
{
- levelspecthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
- size_t i;
+ noenemies_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sourceline = LoadLine(READUINT32(save_p));
+ return &ht->thinker;
+}
+
+static thinker_t* LoadBounceCheeseThinker(actionf_p1 thinker)
+{
+ bouncecheese_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sourceline = LoadLine(READUINT32(save_p));
+ ht->sector = LoadSector(READUINT32(save_p));
+ ht->speed = READFIXED(save_p);
+ ht->distance = READFIXED(save_p);
+ ht->floorwasheight = READFIXED(save_p);
+ ht->ceilingwasheight = READFIXED(save_p);
+ ht->low = READCHAR(save_p);
+
+ if (ht->sector)
+ ht->sector->ceilingdata = ht;
+
+ return &ht->thinker;
+}
+
+static thinker_t* LoadContinuousFallThinker(actionf_p1 thinker)
+{
+ continuousfall_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
- for (i = 0; i < 16; i++)
+ ht->sector = LoadSector(READUINT32(save_p));
+ ht->speed = READFIXED(save_p);
+ ht->direction = READINT32(save_p);
+ ht->floorstartheight = READFIXED(save_p);
+ ht->ceilingstartheight = READFIXED(save_p);
+ ht->destheight = READFIXED(save_p);
+
+ if (ht->sector)
+ {
+ ht->sector->ceilingdata = ht;
+ ht->sector->floordata = ht;
+ }
+
+ return &ht->thinker;
+}
+
+static thinker_t* LoadMarioBlockThinker(actionf_p1 thinker)
+{
+ mariothink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sector = LoadSector(READUINT32(save_p));
+ ht->speed = READFIXED(save_p);
+ ht->direction = READINT32(save_p);
+ ht->floorstartheight = READFIXED(save_p);
+ ht->ceilingstartheight = READFIXED(save_p);
+ ht->tag = READINT16(save_p);
+
+ if (ht->sector)
{
- ht->vars[i] = READFIXED(save_p); //var[16]
- ht->var2s[i] = READFIXED(save_p); //var[16]
+ ht->sector->ceilingdata = ht;
+ ht->sector->floordata = ht;
}
+
+ return &ht->thinker;
+}
+
+static thinker_t* LoadMarioCheckThinker(actionf_p1 thinker)
+{
+ mariocheck_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sourceline = LoadLine(READUINT32(save_p));
+ ht->sector = LoadSector(READUINT32(save_p));
+ return &ht->thinker;
+}
+
+static thinker_t* LoadThwompThinker(actionf_p1 thinker)
+{
+ thwomp_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
ht->sourceline = LoadLine(READUINT32(save_p));
ht->sector = LoadSector(READUINT32(save_p));
+ ht->crushspeed = READFIXED(save_p);
+ ht->retractspeed = READFIXED(save_p);
+ ht->direction = READINT32(save_p);
+ ht->floorstartheight = READFIXED(save_p);
+ ht->ceilingstartheight = READFIXED(save_p);
+ ht->delay = READINT32(save_p);
+ ht->tag = READINT16(save_p);
+ ht->sound = READUINT16(save_p);
if (ht->sector)
{
- if (floorOrCeiling & 2)
- ht->sector->ceilingdata = ht;
- if (floorOrCeiling & 1)
- ht->sector->floordata = ht;
+ ht->sector->ceilingdata = ht;
+ ht->sector->floordata = ht;
}
return &ht->thinker;
}
-//
-// LoadCeilingThinker
-//
-// Loads a ceiling_t from a save game
-//
+static thinker_t* LoadFloatThinker(actionf_p1 thinker)
+{
+ floatthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sourceline = LoadLine(READUINT32(save_p));
+ ht->sector = LoadSector(READUINT32(save_p));
+ ht->tag = READINT16(save_p);
+ return &ht->thinker;
+}
+
+static thinker_t* LoadEachTimeThinker(actionf_p1 thinker)
+{
+ size_t i;
+ eachtime_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sourceline = LoadLine(READUINT32(save_p));
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ ht->playersInArea[i] = READCHAR(save_p);
+ ht->playersOnArea[i] = READCHAR(save_p);
+ }
+ ht->triggerOnExit = READCHAR(save_p);
+ return &ht->thinker;
+}
+
+static thinker_t* LoadRaiseThinker(actionf_p1 thinker)
+{
+ raise_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->tag = READINT16(save_p);
+ ht->sector = LoadSector(READUINT32(save_p));
+ ht->ceilingbottom = READFIXED(save_p);
+ ht->ceilingtop = READFIXED(save_p);
+ ht->basespeed = READFIXED(save_p);
+ ht->extraspeed = READFIXED(save_p);
+ ht->shaketimer = READUINT8(save_p);
+ ht->flags = READUINT8(save_p);
+ return &ht->thinker;
+}
+
static thinker_t* LoadCeilingThinker(actionf_p1 thinker)
{
ceiling_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2824,11 +2839,6 @@ static thinker_t* LoadCeilingThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadFloormoveThinker
-//
-// Loads a floormove_t from a save game
-//
static thinker_t* LoadFloormoveThinker(actionf_p1 thinker)
{
floormove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2848,11 +2858,6 @@ static thinker_t* LoadFloormoveThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadLightflashThinker
-//
-// Loads a lightflash_t from a save game
-//
static thinker_t* LoadLightflashThinker(actionf_p1 thinker)
{
lightflash_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2865,11 +2870,6 @@ static thinker_t* LoadLightflashThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadStrobeThinker
-//
-// Loads a strobe_t from a save game
-//
static thinker_t* LoadStrobeThinker(actionf_p1 thinker)
{
strobe_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2885,11 +2885,6 @@ static thinker_t* LoadStrobeThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadGlowThinker
-//
-// Loads a glow_t from a save game
-//
static thinker_t* LoadGlowThinker(actionf_p1 thinker)
{
glow_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2903,11 +2898,7 @@ static thinker_t* LoadGlowThinker(actionf_p1 thinker)
ht->sector->lightingdata = ht;
return &ht->thinker;
}
-//
-// LoadFireflickerThinker
-//
-// Loads a fireflicker_t from a save game
-//
+
static thinker_t* LoadFireflickerThinker(actionf_p1 thinker)
{
fireflicker_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2921,12 +2912,8 @@ static thinker_t* LoadFireflickerThinker(actionf_p1 thinker)
ht->sector->lightingdata = ht;
return &ht->thinker;
}
-//
-// LoadElevatorThinker
-//
-// Loads a elevator_t from a save game
-//
-static thinker_t* LoadElevatorThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
+
+static thinker_t* LoadElevatorThinker(actionf_p1 thinker, boolean setplanedata)
{
elevator_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
ht->thinker.function.acp1 = thinker;
@@ -2945,25 +2932,39 @@ static thinker_t* LoadElevatorThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
ht->delaytimer = READFIXED(save_p);
ht->floorwasheight = READFIXED(save_p);
ht->ceilingwasheight = READFIXED(save_p);
- ht->player = LoadPlayer(READUINT32(save_p)); // was dummy
ht->sourceline = LoadLine(READUINT32(save_p));
- if (ht->sector)
+ if (ht->sector && setplanedata)
{
- if (floorOrCeiling & 2)
- ht->sector->ceilingdata = ht;
- if (floorOrCeiling & 1)
- ht->sector->floordata = ht;
+ ht->sector->ceilingdata = ht;
+ ht->sector->floordata = ht;
}
return &ht->thinker;
}
-//
-// LoadScrollThinker
-//
-// Loads a scroll_t from a save game
-//
+static thinker_t* LoadCrumbleThinker(actionf_p1 thinker)
+{
+ crumble_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
+ ht->thinker.function.acp1 = thinker;
+ ht->sourceline = LoadLine(READUINT32(save_p));
+ ht->sector = LoadSector(READUINT32(save_p));
+ ht->actionsector = LoadSector(READUINT32(save_p));
+ ht->player = LoadPlayer(READUINT32(save_p));
+ ht->direction = READINT32(save_p);
+ ht->origalpha = READINT32(save_p);
+ ht->timer = READINT32(save_p);
+ ht->speed = READFIXED(save_p);
+ ht->floorwasheight = READFIXED(save_p);
+ ht->ceilingwasheight = READFIXED(save_p);
+ ht->flags = READUINT8(save_p);
+
+ if (ht->sector)
+ ht->sector->floordata = ht;
+
+ return &ht->thinker;
+}
+
static thinker_t* LoadScrollThinker(actionf_p1 thinker)
{
scroll_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2981,11 +2982,6 @@ static thinker_t* LoadScrollThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadFrictionThinker
-//
-// Loads a friction_t from a save game
-//
static inline thinker_t* LoadFrictionThinker(actionf_p1 thinker)
{
friction_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -2998,11 +2994,6 @@ static inline thinker_t* LoadFrictionThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadPusherThinker
-//
-// Loads a pusher_t from a save game
-//
static thinker_t* LoadPusherThinker(actionf_p1 thinker)
{
pusher_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3024,31 +3015,16 @@ static thinker_t* LoadPusherThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadLaserThinker
-//
-// Loads a laserthink_t from a save game
-//
static inline thinker_t* LoadLaserThinker(actionf_p1 thinker)
{
laserthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
- ffloor_t *rover = NULL;
ht->thinker.function.acp1 = thinker;
- ht->sector = LoadSector(READUINT32(save_p));
- ht->sec = LoadSector(READUINT32(save_p));
+ ht->tag = READINT16(save_p);
ht->sourceline = LoadLine(READUINT32(save_p));
- for (rover = ht->sector->ffloors; rover; rover = rover->next)
- if (rover->secnum == (size_t)(ht->sec - sectors)
- && rover->master == ht->sourceline)
- ht->ffloor = rover;
+ ht->nobosses = READUINT8(save_p);
return &ht->thinker;
}
-//
-// LoadLightlevelThinker
-//
-// Loads a lightlevel_t from a save game
-//
static inline thinker_t* LoadLightlevelThinker(actionf_p1 thinker)
{
lightlevel_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3064,11 +3040,6 @@ static inline thinker_t* LoadLightlevelThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadExecutorThinker
-//
-// Loads a executor_t from a save game
-//
static inline thinker_t* LoadExecutorThinker(actionf_p1 thinker)
{
executor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3080,11 +3051,6 @@ static inline thinker_t* LoadExecutorThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadDisappearThinker
-//
-// Loads a disappear_t thinker
-//
static inline thinker_t* LoadDisappearThinker(actionf_p1 thinker)
{
disappear_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3099,11 +3065,6 @@ static inline thinker_t* LoadDisappearThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadFadeThinker
-//
-// Loads a fade_t thinker
-//
static inline thinker_t* LoadFadeThinker(actionf_p1 thinker)
{
sector_t *ss;
@@ -3146,10 +3107,6 @@ static inline thinker_t* LoadFadeThinker(actionf_p1 thinker)
return &ht->thinker;
}
-// LoadFadeColormapThinker
-//
-// Loads a fadecolormap_t from a save game
-//
static inline thinker_t* LoadFadeColormapThinker(actionf_p1 thinker)
{
fadecolormap_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3165,11 +3122,6 @@ static inline thinker_t* LoadFadeColormapThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadPlaneDisplaceThinker
-//
-// Loads a planedisplace_t thinker
-//
static inline thinker_t* LoadPlaneDisplaceThinker(actionf_p1 thinker)
{
planedisplace_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3183,8 +3135,6 @@ static inline thinker_t* LoadPlaneDisplaceThinker(actionf_p1 thinker)
return &ht->thinker;
}
-#ifdef ESLOPE
-/// Save a dynamic slope thinker.
static inline thinker_t* LoadDynamicSlopeThinker(actionf_p1 thinker)
{
dynplanethink_t* ht = Z_Malloc(sizeof(*ht), PU_LEVSPEC, NULL);
@@ -3198,15 +3148,7 @@ static inline thinker_t* LoadDynamicSlopeThinker(actionf_p1 thinker)
READMEM(save_p, ht->vex, sizeof(ht->vex));
return &ht->thinker;
}
-#endif // ESLOPE
-
-#ifdef POLYOBJECTS
-//
-// LoadPolyrotateThinker
-//
-// Loads a polyrotate_t thinker
-//
static inline thinker_t* LoadPolyrotatetThinker(actionf_p1 thinker)
{
polyrotate_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3214,14 +3156,10 @@ static inline thinker_t* LoadPolyrotatetThinker(actionf_p1 thinker)
ht->polyObjNum = READINT32(save_p);
ht->speed = READINT32(save_p);
ht->distance = READINT32(save_p);
+ ht->turnobjs = READUINT8(save_p);
return &ht->thinker;
}
-//
-// LoadPolymoveThinker
-//
-// Loads a polymovet_t thinker
-//
static thinker_t* LoadPolymoveThinker(actionf_p1 thinker)
{
polymove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3235,11 +3173,6 @@ static thinker_t* LoadPolymoveThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadPolywaypointThinker
-//
-// Loads a polywaypoint_t thinker
-//
static inline thinker_t* LoadPolywaypointThinker(actionf_p1 thinker)
{
polywaypoint_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3249,22 +3182,12 @@ static inline thinker_t* LoadPolywaypointThinker(actionf_p1 thinker)
ht->sequence = READINT32(save_p);
ht->pointnum = READINT32(save_p);
ht->direction = READINT32(save_p);
- ht->comeback = READUINT8(save_p);
- ht->wrap = READUINT8(save_p);
+ ht->returnbehavior = READUINT8(save_p);
ht->continuous = READUINT8(save_p);
ht->stophere = READUINT8(save_p);
- ht->diffx = READFIXED(save_p);
- ht->diffy = READFIXED(save_p);
- ht->diffz = READFIXED(save_p);
- ht->target = LoadMobj(READUINT32(save_p));
return &ht->thinker;
}
-//
-// LoadPolyslidedoorThinker
-//
-// loads a polyslidedoor_t thinker
-//
static inline thinker_t* LoadPolyslidedoorThinker(actionf_p1 thinker)
{
polyslidedoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3285,11 +3208,6 @@ static inline thinker_t* LoadPolyslidedoorThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadPolyswingdoorThinker
-//
-// Loads a polyswingdoor_t thinker
-//
static inline thinker_t* LoadPolyswingdoorThinker(actionf_p1 thinker)
{
polyswingdoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3305,11 +3223,6 @@ static inline thinker_t* LoadPolyswingdoorThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadPolydisplaceThinker
-//
-// Loads a polydisplace_t thinker
-//
static inline thinker_t* LoadPolydisplaceThinker(actionf_p1 thinker)
{
polydisplace_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3334,11 +3247,6 @@ static inline thinker_t* LoadPolyrotdisplaceThinker(actionf_p1 thinker)
return &ht->thinker;
}
-//
-// LoadPolyfadeThinker
-//
-// Loads a polyfadet_t thinker
-//
static thinker_t* LoadPolyfadeThinker(actionf_p1 thinker)
{
polyfade_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
@@ -3353,24 +3261,7 @@ static thinker_t* LoadPolyfadeThinker(actionf_p1 thinker)
ht->timer = READINT32(save_p);
return &ht->thinker;
}
-#endif
-
-/*
-//
-// LoadWhatThinker
-//
-// load a what_t thinker
-//
-static inline void LoadWhatThinker(actionf_p1 thinker)
-{
- what_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
- ht->thinker.function.acp1 = thinker;
-}
-*/
-//
-// P_NetUnArchiveThinkers
-//
static void P_NetUnArchiveThinkers(void)
{
thinker_t *currentthinker;
@@ -3455,61 +3346,51 @@ static void P_NetUnArchiveThinkers(void)
break;
case tc_elevator:
- th = LoadElevatorThinker((actionf_p1)T_MoveElevator, 3);
+ th = LoadElevatorThinker((actionf_p1)T_MoveElevator, true);
break;
case tc_continuousfalling:
- th = LoadSpecialLevelThinker((actionf_p1)T_ContinuousFalling, 3);
+ th = LoadContinuousFallThinker((actionf_p1)T_ContinuousFalling);
break;
case tc_thwomp:
- th = LoadSpecialLevelThinker((actionf_p1)T_ThwompSector, 3);
+ th = LoadThwompThinker((actionf_p1)T_ThwompSector);
break;
case tc_noenemies:
- th = LoadSpecialLevelThinker((actionf_p1)T_NoEnemiesSector, 0);
+ th = LoadNoEnemiesThinker((actionf_p1)T_NoEnemiesSector);
break;
case tc_eachtime:
- th = LoadSpecialLevelThinker((actionf_p1)T_EachTimeThinker, 0);
+ th = LoadEachTimeThinker((actionf_p1)T_EachTimeThinker);
break;
case tc_raisesector:
- th = LoadSpecialLevelThinker((actionf_p1)T_RaiseSector, 0);
+ th = LoadRaiseThinker((actionf_p1)T_RaiseSector);
break;
- /// \todo rewrite all the code that uses an elevator_t but isn't an elevator
- /// \note working on it!
case tc_camerascanner:
- th = LoadElevatorThinker((actionf_p1)T_CameraScanner, 0);
+ th = LoadElevatorThinker((actionf_p1)T_CameraScanner, false);
break;
case tc_bouncecheese:
- th = LoadSpecialLevelThinker((actionf_p1)T_BounceCheese, 2);
+ th = LoadBounceCheeseThinker((actionf_p1)T_BounceCheese);
break;
case tc_startcrumble:
- th = LoadElevatorThinker((actionf_p1)T_StartCrumble, 1);
+ th = LoadCrumbleThinker((actionf_p1)T_StartCrumble);
break;
case tc_marioblock:
- th = LoadSpecialLevelThinker((actionf_p1)T_MarioBlock, 3);
+ th = LoadMarioBlockThinker((actionf_p1)T_MarioBlock);
break;
case tc_marioblockchecker:
- th = LoadSpecialLevelThinker((actionf_p1)T_MarioBlockChecker, 0);
- break;
-
- case tc_spikesector:
- th = LoadSpecialLevelThinker((actionf_p1)T_SpikeSector, 0);
+ th = LoadMarioCheckThinker((actionf_p1)T_MarioBlockChecker);
break;
case tc_floatsector:
- th = LoadSpecialLevelThinker((actionf_p1)T_FloatSector, 0);
- break;
-
- case tc_bridgethinker:
- th = LoadSpecialLevelThinker((actionf_p1)T_BridgeThinker, 3);
+ th = LoadFloatThinker((actionf_p1)T_FloatSector);
break;
case tc_laserflash:
@@ -3540,7 +3421,6 @@ static void P_NetUnArchiveThinkers(void)
case tc_planedisplace:
th = LoadPlaneDisplaceThinker((actionf_p1)T_PlaneDisplace);
break;
-#ifdef POLYOBJECTS
case tc_polyrotate:
th = LoadPolyrotatetThinker((actionf_p1)T_PolyObjRotate);
break;
@@ -3551,7 +3431,6 @@ static void P_NetUnArchiveThinkers(void)
case tc_polywaypoint:
th = LoadPolywaypointThinker((actionf_p1)T_PolyObjWaypoint);
- restoreNum = true;
break;
case tc_polyslidedoor:
@@ -3577,8 +3456,7 @@ static void P_NetUnArchiveThinkers(void)
case tc_polyfade:
th = LoadPolyfadeThinker((actionf_p1)T_PolyObjFade);
break;
-#endif
-#ifdef ESLOPE
+
case tc_dynslopeline:
th = LoadDynamicSlopeThinker((actionf_p1)T_DynamicSlopeLine);
break;
@@ -3586,7 +3464,6 @@ static void P_NetUnArchiveThinkers(void)
case tc_dynslopevert:
th = LoadDynamicSlopeThinker((actionf_p1)T_DynamicSlopeVert);
break;
-#endif // ESLOPE
case tc_scroll:
th = LoadScrollThinker((actionf_p1)T_Scroll);
@@ -3613,7 +3490,6 @@ static void P_NetUnArchiveThinkers(void)
if (restoreNum)
{
executor_t *delay = NULL;
- polywaypoint_t *polywp = NULL;
UINT32 mobjnum;
for (currentthinker = thlist[THINK_MAIN].next; currentthinker != &thlist[THINK_MAIN]; currentthinker = currentthinker->next)
{
@@ -3624,15 +3500,6 @@ static void P_NetUnArchiveThinkers(void)
continue;
delay->caller = P_FindNewPosition(mobjnum);
}
- for (currentthinker = thlist[THINK_POLYOBJ].next; currentthinker != &thlist[THINK_POLYOBJ]; currentthinker = currentthinker->next)
- {
- if (currentthinker->function.acp1 != (actionf_p1)T_PolyObjWaypoint)
- continue;
- polywp = (void *)currentthinker;
- if (!(mobjnum = (UINT32)(size_t)polywp->target))
- continue;
- polywp->target = P_FindNewPosition(mobjnum);
- }
}
}
@@ -3640,7 +3507,6 @@ static void P_NetUnArchiveThinkers(void)
//
// haleyjd 03/26/06: PolyObject saving code
//
-#ifdef POLYOBJECTS
#define PD_FLAGS 0x01
#define PD_TRANS 0x02
@@ -3729,10 +3595,7 @@ static inline void P_UnArchivePolyObjects(void)
for (i = 0; i < numSavedPolys; ++i)
P_UnArchivePolyObj(&PolyObjects[i]);
}
-#endif
-//
-// P_FinishMobjs
-//
+
static inline void P_FinishMobjs(void)
{
thinker_t *currentthinker;
@@ -3841,9 +3704,6 @@ static void P_RelinkPointers(void)
}
}
-//
-// P_NetArchiveSpecials
-//
static inline void P_NetArchiveSpecials(void)
{
size_t i, z;
@@ -3884,9 +3744,6 @@ static inline void P_NetArchiveSpecials(void)
WRITEUINT8(save_p, 0x00);
}
-//
-// P_NetUnArchiveSpecials
-//
static void P_NetUnArchiveSpecials(void)
{
size_t i;
@@ -4183,8 +4040,6 @@ void P_SaveGame(void)
{
P_ArchiveMisc();
P_ArchivePlayer();
-
- // yes, even in non HAVE_BLUA
P_ArchiveLuabanksAndConsistency();
}
@@ -4213,16 +4068,13 @@ void P_SaveNetGame(void)
if (gamestate == GS_LEVEL)
{
P_NetArchiveWorld();
-#ifdef POLYOBJECTS
P_ArchivePolyObjects();
-#endif
P_NetArchiveThinkers();
P_NetArchiveSpecials();
P_NetArchiveColormaps();
+ P_NetArchiveWaypoints();
}
-#ifdef HAVE_BLUA
LUA_Archive();
-#endif
P_ArchiveLuabanksAndConsistency();
}
@@ -4255,18 +4107,15 @@ boolean P_LoadNetGame(void)
if (gamestate == GS_LEVEL)
{
P_NetUnArchiveWorld();
-#ifdef POLYOBJECTS
P_UnArchivePolyObjects();
-#endif
P_NetUnArchiveThinkers();
P_NetUnArchiveSpecials();
P_NetUnArchiveColormaps();
+ P_NetUnArchiveWaypoints();
P_RelinkPointers();
P_FinishMobjs();
}
-#ifdef HAVE_BLUA
LUA_UnArchive();
-#endif
// This is stupid and hacky, but maybe it'll work!
P_SetRandSeed(P_GetInitSeed());
diff --git a/src/p_setup.c b/src/p_setup.c
index 857bb1d43a70c21e163c8092a4feeca06c49ce62..84e89d7463abb5190b456d2c1d44e239f5c5cca1 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -57,9 +57,7 @@
#include "filesrch.h" // refreshdirmenu
-#ifdef HAVE_BLUA
#include "lua_hud.h" // level title
-#endif
#include "f_finale.h" // wipes
@@ -79,9 +77,7 @@
#include "hardware/hw_model.h"
#endif
-#ifdef ESLOPE
#include "p_slopes.h"
-#endif
#include "fastcmp.h" // textmap parsing
@@ -148,6 +144,133 @@ mapthing_t *playerstarts[MAXPLAYERS];
mapthing_t *bluectfstarts[MAXPLAYERS];
mapthing_t *redctfstarts[MAXPLAYERS];
+// Maintain waypoints
+mobj_t *waypoints[NUMWAYPOINTSEQUENCES][WAYPOINTSEQUENCESIZE];
+UINT16 numwaypoints[NUMWAYPOINTSEQUENCES];
+
+void P_AddWaypoint(UINT8 sequence, UINT8 id, mobj_t *waypoint)
+{
+ waypoints[sequence][id] = waypoint;
+ if (id >= numwaypoints[sequence])
+ numwaypoints[sequence] = id + 1;
+}
+
+static void P_ResetWaypoints(void)
+{
+ UINT16 sequence, id;
+ for (sequence = 0; sequence < NUMWAYPOINTSEQUENCES; sequence++)
+ {
+ for (id = 0; id < numwaypoints[sequence]; id++)
+ waypoints[sequence][id] = NULL;
+
+ numwaypoints[sequence] = 0;
+ }
+}
+
+mobj_t *P_GetFirstWaypoint(UINT8 sequence)
+{
+ return waypoints[sequence][0];
+}
+
+mobj_t *P_GetLastWaypoint(UINT8 sequence)
+{
+ return waypoints[sequence][numwaypoints[sequence] - 1];
+}
+
+mobj_t *P_GetPreviousWaypoint(mobj_t *current, boolean wrap)
+{
+ UINT8 sequence = current->threshold;
+ UINT8 id = current->health;
+
+ if (id == 0)
+ {
+ if (!wrap)
+ return NULL;
+
+ id = numwaypoints[sequence] - 1;
+ }
+ else
+ id--;
+
+ return waypoints[sequence][id];
+}
+
+mobj_t *P_GetNextWaypoint(mobj_t *current, boolean wrap)
+{
+ UINT8 sequence = current->threshold;
+ UINT8 id = current->health;
+
+ if (id == numwaypoints[sequence] - 1)
+ {
+ if (!wrap)
+ return NULL;
+
+ id = 0;
+ }
+ else
+ id++;
+
+ return waypoints[sequence][id];
+}
+
+mobj_t *P_GetClosestWaypoint(UINT8 sequence, mobj_t *mo)
+{
+ UINT8 wp;
+ mobj_t *mo2, *result = NULL;
+ fixed_t bestdist = 0;
+ fixed_t curdist;
+
+ for (wp = 0; wp < numwaypoints[sequence]; wp++)
+ {
+ mo2 = waypoints[sequence][wp];
+
+ if (!mo2)
+ continue;
+
+ curdist = P_AproxDistance(P_AproxDistance(mo->x - mo2->x, mo->y - mo2->y), mo->z - mo2->z);
+
+ if (result && curdist > bestdist)
+ continue;
+
+ result = mo2;
+ bestdist = curdist;
+ }
+
+ return result;
+}
+
+// Return true if all waypoints are in the same location
+boolean P_IsDegeneratedWaypointSequence(UINT8 sequence)
+{
+ mobj_t *first, *waypoint;
+ UINT8 wp;
+
+ if (numwaypoints[sequence] <= 1)
+ return true;
+
+ first = waypoints[sequence][0];
+
+ for (wp = 1; wp < numwaypoints[sequence]; wp++)
+ {
+ waypoint = waypoints[sequence][wp];
+
+ if (!waypoint)
+ continue;
+
+ if (waypoint->x != first->x)
+ return false;
+
+ if (waypoint->y != first->y)
+ return false;
+
+ if (waypoint->z != first->z)
+ return false;
+ }
+
+ return true;
+}
+
+
/** Logs an error about a map being corrupt, then terminate.
* This allows reporting highly technical errors for usefulness, without
* confusing a novice map designer who simply needs to run ZenNode.
@@ -222,6 +345,9 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->typeoflevel = 0;
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
mapheaderinfo[num]->startrings = 0;
+ mapheaderinfo[num]->sstimer = 90;
+ mapheaderinfo[num]->ssspheres = 1;
+ mapheaderinfo[num]->gravity = FRACUNIT/2;
mapheaderinfo[num]->keywords[0] = '\0';
snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
mapheaderinfo[num]->musname[6] = 0;
@@ -697,47 +823,27 @@ void P_ScanThings(INT16 mapnum, INT16 wadnum, INT16 lumpnum)
static void P_SpawnEmeraldHunt(void)
{
- INT32 emer1, emer2, emer3;
- INT32 timeout = 0; // keeps from getting stuck
+ INT32 emer[3], num[MAXHUNTEMERALDS], i, randomkey;
+ fixed_t x, y, z;
- emer1 = emer2 = emer3 = 0;
+ for (i = 0; i < numhuntemeralds; i++)
+ num[i] = i;
- //increment spawn numbers because zero is valid.
- emer1 = (P_RandomKey(numhuntemeralds)) + 1;
- while (timeout++ < 100)
+ for (i = 0; i < 3; i++)
{
- emer2 = (P_RandomKey(numhuntemeralds)) + 1;
+ // generate random index, shuffle afterwards
+ randomkey = P_RandomKey(numhuntemeralds--);
+ emer[i] = num[randomkey];
+ num[randomkey] = num[numhuntemeralds];
+ num[numhuntemeralds] = emer[i];
- if (emer2 != emer1)
- break;
+ // spawn emerald
+ x = huntemeralds[emer[i]]->x<<FRACBITS;
+ y = huntemeralds[emer[i]]->y<<FRACBITS;
+ z = P_GetMapThingSpawnHeight(MT_EMERHUNT, huntemeralds[emer[i]], x, y);
+ P_SetMobjStateNF(P_SpawnMobj(x, y, z, MT_EMERHUNT),
+ mobjinfo[MT_EMERHUNT].spawnstate+i);
}
-
- timeout = 0;
- while (timeout++ < 100)
- {
- emer3 = (P_RandomKey(numhuntemeralds)) + 1;
-
- if (emer3 != emer2 && emer3 != emer1)
- break;
- }
-
- //decrement spawn values to the actual number because zero is valid.
- if (emer1--)
- P_SpawnMobj(huntemeralds[emer1]->x<<FRACBITS,
- huntemeralds[emer1]->y<<FRACBITS,
- huntemeralds[emer1]->z<<FRACBITS, MT_EMERHUNT);
-
- if (emer2--)
- P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer2]->x<<FRACBITS,
- huntemeralds[emer2]->y<<FRACBITS,
- huntemeralds[emer2]->z<<FRACBITS, MT_EMERHUNT),
- mobjinfo[MT_EMERHUNT].spawnstate+1);
-
- if (emer3--)
- P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer3]->x<<FRACBITS,
- huntemeralds[emer3]->y<<FRACBITS,
- huntemeralds[emer3]->z<<FRACBITS, MT_EMERHUNT),
- mobjinfo[MT_EMERHUNT].spawnstate+2);
}
static void P_SpawnMapThings(boolean spawnemblems)
@@ -870,13 +976,12 @@ static void P_InitializeSector(sector_t *ss)
ss->camsec = -1;
ss->floorlightsec = ss->ceilinglightsec = -1;
- ss->crumblestate = 0;
+ ss->crumblestate = CRUMBLE_NONE;
ss->touching_thinglist = NULL;
ss->linecount = 0;
ss->lines = NULL;
- ss->tagline = NULL;
ss->ffloors = NULL;
ss->attached = NULL;
@@ -911,11 +1016,9 @@ static void P_InitializeSector(sector_t *ss)
ss->preciplist = NULL;
ss->touching_preciplist = NULL;
-#ifdef ESLOPE
ss->f_slope = NULL;
ss->c_slope = NULL;
ss->hasslope = false;
-#endif
ss->spawn_lightlevel = ss->lightlevel;
@@ -980,9 +1083,7 @@ static void P_InitializeLinedef(line_t *ld)
ld->splats = NULL;
#endif
ld->firsttag = ld->nexttag = -1;
-#ifdef POLYOBJECTS
ld->polyobj = NULL;
-#endif
ld->text = NULL;
ld->callcount = 0;
@@ -1187,10 +1288,14 @@ static void P_LoadSidedefs(UINT8 *data)
case 9: // Mace parameters
case 14: // Bustable block parameters
case 15: // Fan particle spawner parameters
+ case 334: // Trigger linedef executor: Object dye - Continuous
+ case 335: // Trigger linedef executor: Object dye - Each time
+ case 336: // Trigger linedef executor: Object dye - Once
case 425: // Calls P_SetMobjState on calling mobj
case 434: // Custom Power
case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors
case 461: // Spawns an object on the map based on texture offsets
+ case 463: // Colorizes an object
{
char process[8*3+1];
memset(process,0,8*3+1);
@@ -1892,10 +1997,8 @@ static void P_InitializeSeg(seg_t *seg)
seg->numlights = 0;
seg->rlights = NULL;
-#ifdef POLYOBJECTS
seg->polyseg = NULL;
seg->dontrenderme = false;
-#endif
}
static void P_LoadSegs(UINT8 *data)
@@ -2258,11 +2361,9 @@ static boolean P_LoadBlockMap(UINT8 *data, size_t count)
blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
blockmap = blockmaplump+4;
-#ifdef POLYOBJECTS
// haleyjd 2/22/06: setup polyobject blockmap
count = sizeof(*polyblocklinks) * bmapwidth * bmapheight;
polyblocklinks = Z_Calloc(count, PU_LEVEL, NULL);
-#endif
return true;
}
@@ -2513,11 +2614,9 @@ static void P_CreateBlockMap(void)
blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
blockmap = blockmaplump + 4;
-#ifdef POLYOBJECTS
// haleyjd 2/22/06: setup polyobject blockmap
count = sizeof(*polyblocklinks) * bmapwidth * bmapheight;
polyblocklinks = Z_Calloc(count, PU_LEVEL, NULL);
-#endif
}
}
@@ -3096,7 +3195,7 @@ static void P_InitTagGametype(void)
//Also, you'd never have to loop through all 32 players slots to find anything ever again.
for (i = 0; i < MAXPLAYERS; i++)
{
- if (playeringame[i] && !(players[i].spectator && players[i].quittime))
+ if (playeringame[i] && !(players[i].spectator || players[i].quittime))
{
playersactive[realnumplayers] = i; //stores the player's node in the array.
realnumplayers++;
@@ -3526,9 +3625,7 @@ boolean P_LoadLevel(boolean fromnetsave)
// Close text prompt before freeing the old level
F_EndTextPrompt(false, true);
-#ifdef HAVE_BLUA
LUA_InvalidateLevel();
-#endif
for (ss = sectors; sectors+numsectors != ss; ss++)
{
@@ -3575,6 +3672,8 @@ boolean P_LoadLevel(boolean fromnetsave)
P_ResetSpawnpoints();
+ P_ResetWaypoints();
+
P_MapStart();
if (!P_LoadMapFromFile())
@@ -3584,9 +3683,7 @@ boolean P_LoadLevel(boolean fromnetsave)
// anything that P_SpawnSlopes/P_LoadThings needs to know
P_InitSpecials();
-#ifdef ESLOPE
P_SpawnSlopes(fromnetsave);
-#endif
P_SpawnMapThings(!fromnetsave);
skyboxmo[0] = skyboxviewpnts[0];
@@ -3665,9 +3762,7 @@ boolean P_LoadLevel(boolean fromnetsave)
G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1);
}
P_PreTicker(2);
-#ifdef HAVE_BLUA
LUAh_MapLoad();
-#endif
}
// No render mode, stop here.
@@ -3786,12 +3881,12 @@ static lumpinfo_t* FindFolder(const char *folName, UINT16 *start, UINT16 *end, l
{
UINT16 numlumps = *pnumlumps;
size_t i = *pi;
- if (!stricmp(lumpinfo->name2, folName))
+ if (!stricmp(lumpinfo->fullname, folName))
{
lumpinfo++;
*start = ++i;
for (; i < numlumps; i++, lumpinfo++)
- if (strnicmp(lumpinfo->name2, folName, strlen(folName)))
+ if (strnicmp(lumpinfo->fullname, folName, strlen(folName)))
break;
lumpinfo--;
*end = i-- - *start;
@@ -3859,10 +3954,8 @@ boolean P_AddWadFile(const char *wadfilename)
// Update the detected resources.
// Note: ALWAYS load Lua scripts first, SOCs right after, and the remaining resources afterwards.
-#ifdef HAVE_BLUA
// if (luaNum) // Lua scripts.
// P_LoadLuaScrRange(wadnum, luaPos, luaNum);
-#endif
// if (socNum) // SOCs.
// P_LoadDehackRange(wadnum, socPos, socNum);
if (sfxNum) // Sounds. TODO: Function currently only updates already existing sounds, the rest is handled somewhere else.
diff --git a/src/p_sight.c b/src/p_sight.c
index 4ea14cca0ea7286bad2d779617f179748ea5e6cc..2e1e499970418d23f5129e9271199592dbb9ce23 100644
--- a/src/p_sight.c
+++ b/src/p_sight.c
@@ -100,7 +100,6 @@ static fixed_t P_InterceptVector2(divline_t *v2, divline_t *v1)
return frac;
}
-#ifdef POLYOBJECTS
static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
{
size_t i;
@@ -169,7 +168,6 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
return true;
}
-#endif
//
// P_CrossSubsector
@@ -180,9 +178,7 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
{
seg_t *seg;
INT32 count;
-#ifdef POLYOBJECTS
polyobj_t *po; // haleyjd 02/23/06
-#endif
#ifdef RANGECHECK
if (num >= numsubsectors)
@@ -192,7 +188,6 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
// haleyjd 02/23/06: this assignment should be after the above check
seg = segs + subsectors[num].firstline;
-#ifdef POLYOBJECTS
// haleyjd 02/23/06: check polyobject lines
if ((po = subsectors[num].polyList))
{
@@ -207,7 +202,6 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
po = (polyobj_t *)(po->link.next);
}
}
-#endif
for (count = subsectors[num].numlines; --count >= 0; seg++) // check lines
{
@@ -218,9 +212,7 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
const vertex_t *v1,*v2;
fixed_t frac;
fixed_t frontf, backf, frontc, backc;
-#ifdef ESLOPE
fixed_t fracx, fracy;
-#endif
if (seg->glseg)
continue;
@@ -263,21 +255,14 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
front = seg->frontsector;
back = seg->backsector;
-#ifdef ESLOPE
// calculate position at intercept
fracx = los->strace.x + FixedMul(los->strace.dx, frac);
fracy = los->strace.y + FixedMul(los->strace.dy, frac);
// calculate sector heights
- frontf = (front->f_slope) ? P_GetZAt(front->f_slope, fracx, fracy) : front->floorheight;
- frontc = (front->c_slope) ? P_GetZAt(front->c_slope, fracx, fracy) : front->ceilingheight;
- backf = (back->f_slope) ? P_GetZAt(back->f_slope, fracx, fracy) : back->floorheight;
- backc = (back->c_slope) ? P_GetZAt(back->c_slope, fracx, fracy) : back->ceilingheight;
-#else
- frontf = front->floorheight;
- frontc = front->ceilingheight;
- backf = back->floorheight;
- backc = back->ceilingheight;
-#endif
+ frontf = P_GetSectorFloorZAt (front, fracx, fracy);
+ frontc = P_GetSectorCeilingZAt(front, fracx, fracy);
+ backf = P_GetSectorFloorZAt (back , fracx, fracy);
+ backc = P_GetSectorCeilingZAt(back , fracx, fracy);
// crosses a two sided line
// no wall to block sight with?
if (frontf == backf && frontc == backc
@@ -327,15 +312,10 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
continue;
}
-#ifdef ESLOPE
- topz = (*rover->t_slope) ? P_GetZAt(*rover->t_slope, fracx, fracy) : *rover->topheight;
- bottomz = (*rover->b_slope) ? P_GetZAt(*rover->b_slope, fracx, fracy) : *rover->bottomheight;
-#else
- topz = *rover->topheight;
- bottomz = *rover->bottomheight;
-#endif
- topslope = FixedDiv(topz - los->sightzstart , frac);
- bottomslope = FixedDiv(bottomz - los->sightzstart , frac);
+ topz = P_GetFFloorTopZAt (rover, fracx, fracy);
+ bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
+ topslope = FixedDiv( topz - los->sightzstart, frac);
+ bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
return false; // view completely blocked
}
@@ -348,15 +328,10 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
continue;
}
-#ifdef ESLOPE
- topz = (*rover->t_slope) ? P_GetZAt(*rover->t_slope, fracx, fracy) : *rover->topheight;
- bottomz = (*rover->b_slope) ? P_GetZAt(*rover->b_slope, fracx, fracy) : *rover->bottomheight;
-#else
- topz = *rover->topheight;
- bottomz = *rover->bottomheight;
-#endif
- topslope = FixedDiv(topz - los->sightzstart , frac);
- bottomslope = FixedDiv(bottomz - los->sightzstart , frac);
+ topz = P_GetFFloorTopZAt (rover, fracx, fracy);
+ bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
+ topslope = FixedDiv( topz - los->sightzstart, frac);
+ bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
return false; // view completely blocked
}
@@ -432,15 +407,10 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
// killough 11/98: shortcut for melee situations
// same subsector? obviously visible
-#ifndef POLYOBJECTS
- if (t1->subsector == t2->subsector)
- return true;
-#else
// haleyjd 02/23/06: can't do this if there are polyobjects in the subsec
if (!t1->subsector->polyList &&
t1->subsector == t2->subsector)
return true;
-#endif
// An unobstructed LOS is possible.
// Now look from eyes of t1 to any part of t2.
@@ -487,26 +457,10 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
continue;
}
-#ifdef ESLOPE
- if (*rover->t_slope)
- {
- topz1 = P_GetZAt(*rover->t_slope, t1->x, t1->y);
- topz2 = P_GetZAt(*rover->t_slope, t2->x, t2->y);
- }
- else
- topz1 = topz2 = *rover->topheight;
-
- if (*rover->b_slope)
- {
- bottomz1 = P_GetZAt(*rover->b_slope, t1->x, t1->y);
- bottomz2 = P_GetZAt(*rover->b_slope, t2->x, t2->y);
- }
- else
- bottomz1 = bottomz2 = *rover->bottomheight;
-#else
- topz1 = topz2 = *rover->topheight;
- bottomz1 = bottomz2 = *rover->bottomheight;
-#endif
+ topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y);
+ topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y);
+ bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y);
+ bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y);
// Check for blocking floors here.
if ((los.sightzstart < bottomz1 && t2->z >= topz2)
@@ -519,7 +473,7 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
if (rover->flags & FF_SOLID)
continue; // shortcut since neither mobj can be inside the 3dfloor
- if (!(rover->flags & FF_INVERTPLANES))
+ if (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))
{
if (los.sightzstart >= topz1 && t2->z + t2->height < topz2)
return false; // blocked by upper outside plane
@@ -528,7 +482,7 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
return false; // blocked by lower outside plane
}
- if (rover->flags & FF_INVERTPLANES || rover->flags & FF_BOTHPLANES)
+ if (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)
{
if (los.sightzstart < topz1 && t2->z >= topz2)
return false; // blocked by upper inside plane
diff --git a/src/p_slopes.c b/src/p_slopes.c
index e275964e33696bd005aa73dc9c1a362375c97e0d..6aeb1b02596633e7c4d6a9db1e0f0853b6c244c3 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -23,8 +23,6 @@
#include "p_maputl.h"
#include "w_wad.h"
-#ifdef ESLOPE
-
pslope_t *slopelist = NULL;
UINT16 slopecount = 0;
@@ -568,7 +566,7 @@ void P_CopySectorSlope(line_t *line)
int i, special = line->special;
// Check for copy linedefs
- for (i = -1; (i = P_FindSectorFromLineTag(line, i)) >= 0;)
+ for (i = -1; (i = P_FindSectorFromTag(line->tag, i)) >= 0;)
{
sector_t *srcsec = sectors + i;
@@ -657,17 +655,49 @@ void P_SpawnSlopes(const boolean fromsave) {
// Various utilities related to slopes
//
-//
-// P_GetZAt
-//
// Returns the height of the sloped plane at (x, y) as a fixed_t
-//
-fixed_t P_GetZAt(pslope_t *slope, fixed_t x, fixed_t y)
+fixed_t P_GetSlopeZAt(const pslope_t *slope, fixed_t x, fixed_t y)
+{
+ fixed_t dist = FixedMul(x - slope->o.x, slope->d.x) +
+ FixedMul(y - slope->o.y, slope->d.y);
+
+ return slope->o.z + FixedMul(dist, slope->zdelta);
+}
+
+// Like P_GetSlopeZAt but falls back to z if slope is NULL
+fixed_t P_GetZAt(const pslope_t *slope, fixed_t x, fixed_t y, fixed_t z)
{
- fixed_t dist = FixedMul(x - slope->o.x, slope->d.x) +
- FixedMul(y - slope->o.y, slope->d.y);
+ return slope ? P_GetSlopeZAt(slope, x, y) : z;
+}
- return slope->o.z + FixedMul(dist, slope->zdelta);
+// Returns the height of the sector floor at (x, y)
+fixed_t P_GetSectorFloorZAt(const sector_t *sector, fixed_t x, fixed_t y)
+{
+ return sector->f_slope ? P_GetSlopeZAt(sector->f_slope, x, y) : sector->floorheight;
+}
+
+// Returns the height of the sector ceiling at (x, y)
+fixed_t P_GetSectorCeilingZAt(const sector_t *sector, fixed_t x, fixed_t y)
+{
+ return sector->c_slope ? P_GetSlopeZAt(sector->c_slope, x, y) : sector->ceilingheight;
+}
+
+// Returns the height of the FOF top at (x, y)
+fixed_t P_GetFFloorTopZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y)
+{
+ return *ffloor->t_slope ? P_GetSlopeZAt(*ffloor->t_slope, x, y) : *ffloor->topheight;
+}
+
+// Returns the height of the FOF bottom at (x, y)
+fixed_t P_GetFFloorBottomZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y)
+{
+ return *ffloor->b_slope ? P_GetSlopeZAt(*ffloor->b_slope, x, y) : *ffloor->bottomheight;
+}
+
+// Returns the height of the light list at (x, y)
+fixed_t P_GetLightZAt(const lightlist_t *light, fixed_t x, fixed_t y)
+{
+ return light->slope ? P_GetSlopeZAt(light->slope, x, y) : light->height;
}
@@ -844,6 +874,3 @@ void P_ButteredSlope(mobj_t *mo)
P_Thrust(mo, mo->standingslope->xydirection, thrust);
}
-
-// EOF
-#endif // #ifdef ESLOPE
diff --git a/src/p_slopes.h b/src/p_slopes.h
index f8159b88423f76d6367b8dc36496e0417a1ba6fc..06d900b666b91c8a901392a4f243b0941a0d05e7 100644
--- a/src/p_slopes.h
+++ b/src/p_slopes.h
@@ -15,8 +15,6 @@
#include "m_fixed.h" // Vectors
-#ifdef ESLOPE
-
extern pslope_t *slopelist;
extern UINT16 slopecount;
@@ -35,7 +33,21 @@ void P_CopySectorSlope(line_t *line);
pslope_t *P_SlopeById(UINT16 id);
// Returns the height of the sloped plane at (x, y) as a fixed_t
-fixed_t P_GetZAt(pslope_t *slope, fixed_t x, fixed_t y);
+fixed_t P_GetSlopeZAt(const pslope_t *slope, fixed_t x, fixed_t y);
+
+// Like P_GetSlopeZAt but falls back to z if slope is NULL
+fixed_t P_GetZAt(const pslope_t *slope, fixed_t x, fixed_t y, fixed_t z);
+
+// Returns the height of the sector at (x, y)
+fixed_t P_GetSectorFloorZAt (const sector_t *sector, fixed_t x, fixed_t y);
+fixed_t P_GetSectorCeilingZAt(const sector_t *sector, fixed_t x, fixed_t y);
+
+// Returns the height of the FOF at (x, y)
+fixed_t P_GetFFloorTopZAt (const ffloor_t *ffloor, fixed_t x, fixed_t y);
+fixed_t P_GetFFloorBottomZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y);
+
+// Returns the height of the light list at (x, y)
+fixed_t P_GetLightZAt(const lightlist_t *light, fixed_t x, fixed_t y);
// Lots of physics-based bullshit
void P_QuantizeMomentumToSlope(vector3_t *momentum, pslope_t *slope);
@@ -74,5 +86,4 @@ typedef struct
void T_DynamicSlopeLine (dynplanethink_t* th);
void T_DynamicSlopeVert (dynplanethink_t* th);
-#endif // #ifdef ESLOPE
#endif // #ifndef P_SLOPES_H__
diff --git a/src/p_spec.c b/src/p_spec.c
index aecdb3b98f75583a2bb7492442085645f4517720..57ae42c698cd5d88dbb75ef6ccd01f106bf0800f 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -114,12 +114,11 @@ static void P_ResetColormapFader(sector_t *sector);
static void Add_ColormapFader(sector_t *sector, extracolormap_t *source_exc, extracolormap_t *dest_exc,
boolean ticbased, INT32 duration);
static void P_AddBlockThinker(sector_t *sec, line_t *sourceline);
-static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline);
+static void P_AddFloatThinker(sector_t *sec, UINT16 tag, line_t *sourceline);
//static void P_AddBridgeThinker(line_t *sourceline, sector_t *sec);
static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinkerlist_t *secthinkers);
static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec);
static void Add_Friction(INT32 friction, INT32 movefactor, INT32 affectee, INT32 referrer);
-static void P_AddSpikeThinker(sector_t *sec, INT32 referrer);
static void P_AddPlaneDisplaceThinker(INT32 type, fixed_t speed, INT32 control, INT32 affectee, UINT8 reverse);
@@ -988,42 +987,12 @@ static sector_t *P_FindModelCeilingSector(fixed_t ceildestheight, INT32 secnum)
}
#endif
-/** Searches the tag lists for the next sector tagged to a line.
- *
- * \param line Tagged line used as a reference.
- * \param start -1 to start at the beginning, or the result of a previous call
- * to keep searching.
- * \return Number of the next tagged sector found.
- * \sa P_FindSectorFromTag, P_FindLineFromLineTag
- */
-INT32 P_FindSectorFromLineTag(line_t *line, INT32 start)
-{
- if (line->tag == -1)
- {
- start++;
-
- if (start >= (INT32)numsectors)
- return -1;
-
- return start;
- }
- else
- {
- start = start >= 0 ? sectors[start].nexttag :
- sectors[(unsigned)line->tag % numsectors].firsttag;
- while (start >= 0 && sectors[start].tag != line->tag)
- start = sectors[start].nexttag;
- return start;
- }
-}
-
/** Searches the tag lists for the next sector with a given tag.
*
* \param tag Tag number to look for.
* \param start -1 to start anew, or the result of a previous call to keep
* searching.
* \return Number of the next tagged sector found.
- * \sa P_FindSectorFromLineTag
*/
INT32 P_FindSectorFromTag(INT16 tag, INT32 start)
{
@@ -1046,42 +1015,12 @@ INT32 P_FindSectorFromTag(INT16 tag, INT32 start)
}
}
-/** Searches the tag lists for the next line tagged to a line.
- *
- * \param line Tagged line used as a reference.
- * \param start -1 to start anew, or the result of a previous call to keep
- * searching.
- * \return Number of the next tagged line found.
- * \sa P_FindSectorFromLineTag
- */
-static INT32 P_FindLineFromLineTag(const line_t *line, INT32 start)
-{
- if (line->tag == -1)
- {
- start++;
-
- if (start >= (INT32)numlines)
- return -1;
-
- return start;
- }
- else
- {
- start = start >= 0 ? lines[start].nexttag :
- lines[(unsigned)line->tag % numlines].firsttag;
- while (start >= 0 && lines[start].tag != line->tag)
- start = lines[start].nexttag;
- return start;
- }
-}
-#if 0
/** Searches the tag lists for the next line with a given tag and special.
*
* \param tag Tag number.
* \param start -1 to start anew, or the result of a previous call to keep
* searching.
* \return Number of next suitable line found.
- * \sa P_FindLineFromLineTag
* \author Graue <graue@oceanbase.org>
*/
static INT32 P_FindLineFromTag(INT32 tag, INT32 start)
@@ -1090,7 +1029,7 @@ static INT32 P_FindLineFromTag(INT32 tag, INT32 start)
{
start++;
- if (start >= numlines)
+ if (start >= (INT32)numlines)
return -1;
return start;
@@ -1104,10 +1043,7 @@ static INT32 P_FindLineFromTag(INT32 tag, INT32 start)
return start;
}
}
-#endif
-//
-// P_FindSpecialLineFromTag
-//
+
INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start)
{
if (tag == -1)
@@ -1137,14 +1073,8 @@ INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start)
}
}
-// haleyjd: temporary define
-#ifdef POLYOBJECTS
-//
-// PolyDoor
-//
// Parses arguments for parameterized polyobject door types
-//
static boolean PolyDoor(line_t *line)
{
polydoordata_t pdd;
@@ -1181,11 +1111,7 @@ static boolean PolyDoor(line_t *line)
return EV_DoPolyDoor(&pdd);
}
-//
-// PolyMove
-//
// Parses arguments for parameterized polyobject move specials
-//
static boolean PolyMove(line_t *line)
{
polymovedata_t pmd;
@@ -1200,12 +1126,8 @@ static boolean PolyMove(line_t *line)
return EV_DoPolyObjMove(&pmd);
}
-//
-// PolyInvisible
-//
// Makes a polyobject invisible and intangible
// If NOCLIMB is ticked, the polyobject will still be tangible, just not visible.
-//
static void PolyInvisible(line_t *line)
{
INT32 polyObjNum = line->tag;
@@ -1228,12 +1150,8 @@ static void PolyInvisible(line_t *line)
po->flags &= ~POF_RENDERALL;
}
-//
-// PolyVisible
-//
// Makes a polyobject visible and tangible
// If NOCLIMB is ticked, the polyobject will not be tangible, just visible.
-//
static void PolyVisible(line_t *line)
{
INT32 polyObjNum = line->tag;
@@ -1256,16 +1174,14 @@ static void PolyVisible(line_t *line)
po->flags |= (po->spawnflags & POF_RENDERALL);
}
-//
-// PolyTranslucency
-//
+
// Sets the translucency of a polyobject
// Frontsector floor / 100 = translevel
-//
static void PolyTranslucency(line_t *line)
{
INT32 polyObjNum = line->tag;
polyobj_t *po;
+ INT32 value;
if (!(po = Polyobj_GetForNum(polyObjNum)))
{
@@ -1277,37 +1193,28 @@ static void PolyTranslucency(line_t *line)
if (po->isBad)
return;
- // if DONTPEGBOTTOM, specify raw translucency value in Front X Offset
- // else, take it out of 1000. If Front X Offset is specified, use that. Else, use floorheight.
+ // If Front X Offset is specified, use that. Else, use floorheight.
+ value = (sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : line->frontsector->floorheight) >> FRACBITS;
+
+ // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000.
+ if (!(line->flags & ML_DONTPEGBOTTOM))
+ value /= 100;
+
if (line->flags & ML_EFFECT3) // relative calc
- po->translucency = max(min(po->translucency + ((line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), -1000) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), -1000) / 100)),
- NUMTRANSMAPS), 0);
+ po->translucency += value;
else
- po->translucency = (line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), 0)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), 0))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), 0) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), 0) / 100);
+ po->translucency = value;
+
+ po->translucency = max(min(po->translucency, NUMTRANSMAPS), 0);
}
-//
-// PolyFade
-//
// Makes a polyobject translucency fade and applies tangibility
-//
static boolean PolyFade(line_t *line)
{
INT32 polyObjNum = line->tag;
polyobj_t *po;
polyfadedata_t pfd;
+ INT32 value;
if (!(po = Polyobj_GetForNum(polyObjNum)))
{
@@ -1330,25 +1237,19 @@ static boolean PolyFade(line_t *line)
pfd.polyObjNum = polyObjNum;
- // if DONTPEGBOTTOM, specify raw translucency value in Front X Offset
- // else, take it out of 1000. If Front X Offset is specified, use that. Else, use floorheight.
+ // If Front X Offset is specified, use that. Else, use floorheight.
+ value = (sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : line->frontsector->floorheight) >> FRACBITS;
+
+ // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000.
+ if (!(line->flags & ML_DONTPEGBOTTOM))
+ value /= 100;
+
if (line->flags & ML_EFFECT3) // relative calc
- pfd.destvalue = max(min(po->translucency + ((line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), -1000) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), -1000) / 100)),
- NUMTRANSMAPS), 0);
+ pfd.destvalue = po->translucency + value;
else
- pfd.destvalue = (line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), 0)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), 0))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), 0) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), 0) / 100);
+ pfd.destvalue = value;
+
+ pfd.destvalue = max(min(pfd.destvalue, NUMTRANSMAPS), 0);
// already equal, nothing to do
if (po->translucency == pfd.destvalue)
@@ -1367,11 +1268,7 @@ static boolean PolyFade(line_t *line)
return EV_DoPolyObjFade(&pfd);
}
-//
-// PolyWaypoint
-//
// Parses arguments for parameterized polyobject waypoint movement
-//
static boolean PolyWaypoint(line_t *line)
{
polywaypointdata_t pwd;
@@ -1379,19 +1276,26 @@ static boolean PolyWaypoint(line_t *line)
pwd.polyObjNum = line->tag;
pwd.speed = sides[line->sidenum[0]].textureoffset / 8;
pwd.sequence = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Sequence #
- pwd.reverse = (line->flags & ML_EFFECT1) == ML_EFFECT1; // Reverse?
- pwd.comeback = (line->flags & ML_EFFECT2) == ML_EFFECT2; // Return when reaching end?
- pwd.wrap = (line->flags & ML_EFFECT3) == ML_EFFECT3; // Wrap around waypoints
- pwd.continuous = (line->flags & ML_EFFECT4) == ML_EFFECT4; // Continuously move - used with COMEBACK or WRAP
+
+ // Behavior after reaching the last waypoint?
+ if (line->flags & ML_EFFECT3)
+ pwd.returnbehavior = PWR_WRAP; // Wrap back to first waypoint
+ else if (line->flags & ML_EFFECT2)
+ pwd.returnbehavior = PWR_COMEBACK; // Go through sequence in reverse
+ else
+ pwd.returnbehavior = PWR_STOP; // Stop
+
+ // Flags
+ pwd.flags = 0;
+ if (line->flags & ML_EFFECT1)
+ pwd.flags |= PWF_REVERSE;
+ if (line->flags & ML_EFFECT4)
+ pwd.flags |= PWF_LOOP;
return EV_DoPolyObjWaypoint(&pwd);
}
-//
-// PolyRotate
-//
// Parses arguments for parameterized polyobject rotate specials
-//
static boolean PolyRotate(line_t *line)
{
polyrotdata_t prd;
@@ -1416,11 +1320,20 @@ static boolean PolyRotate(line_t *line)
return EV_DoPolyObjRotate(&prd);
}
-//
-// PolyDisplace
-//
+// Parses arguments for polyobject flag waving special
+static boolean PolyFlag(line_t *line)
+{
+ polyflagdata_t pfd;
+
+ pfd.polyObjNum = line->tag;
+ pfd.speed = P_AproxDistance(line->dx, line->dy) >> FRACBITS;
+ pfd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y) >> ANGLETOFINESHIFT;
+ pfd.momx = sides[line->sidenum[0]].textureoffset >> FRACBITS;
+
+ return EV_DoPolyObjFlag(&pfd);
+}
+
// Parses arguments for parameterized polyobject move-by-sector-heights specials
-//
static boolean PolyDisplace(line_t *line)
{
polydisplacedata_t pdd;
@@ -1435,8 +1348,7 @@ static boolean PolyDisplace(line_t *line)
}
-/** Similar to PolyDisplace().
- */
+// Parses arguments for parameterized polyobject rotate-by-sector-heights specials
static boolean PolyRotDisplace(line_t *line)
{
polyrotdisplacedata_t pdd;
@@ -1462,8 +1374,6 @@ static boolean PolyRotDisplace(line_t *line)
return EV_DoPolyObjRotDisplace(&pdd);
}
-#endif // ifdef POLYOBJECTS
-
/** Changes a sector's tag.
* Used by the linedef executor tag changer and by crumblers.
*
@@ -2034,6 +1944,17 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
if (!(actor && actor->player && ((stricmp(triggerline->text, skins[actor->player->skin].name) == 0) ^ ((triggerline->flags & ML_NOCLIMB) == ML_NOCLIMB))))
return false;
break;
+ case 334: // object dye - continuous
+ case 335: // object dye - each time
+ case 336: // object dye - once
+ {
+ INT32 triggercolor = (INT32)sides[triggerline->sidenum[0]].toptexture;
+ UINT8 color = (actor->player ? actor->player->powers[pw_dye] : actor->color);
+ boolean invert = (triggerline->flags & ML_NOCLIMB ? true : false);
+
+ if (invert ^ (triggercolor != color))
+ return false;
+ }
default:
break;
}
@@ -2167,6 +2088,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|| specialtype == 328 // Nights lap - Once
|| specialtype == 330 // Nights Bonus Time - Once
|| specialtype == 333 // Skin - Once
+ || specialtype == 336 // Dye - Once
|| specialtype == 399) // Level Load
triggerline->special = 0; // Clear it out
@@ -2208,7 +2130,8 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
|| lines[masterline].special == 310 // CTF Red team - Each time
|| lines[masterline].special == 312 // CTF Blue team - Each time
|| lines[masterline].special == 322 // Trigger on X calls - Each Time
- || lines[masterline].special == 332)// Skin - Each time
+ || lines[masterline].special == 332 // Skin - Each time
+ || lines[masterline].special == 335)// Dye - Each time
continue;
if (lines[masterline].special < 300
@@ -2488,7 +2411,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
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
if (sectors[secnum].lightingdata)
{
@@ -2543,7 +2466,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)
{
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
P_ChangeSectorTag(secnum,(INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS));
break;
}
@@ -2553,7 +2476,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)
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
if (sectors[secnum].floordata)
{
@@ -2623,7 +2546,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
else
{
- if ((secnum = P_FindSectorFromLineTag(line, -1)) < 0)
+ if ((secnum = P_FindSectorFromTag(line->tag, -1)) < 0)
return;
dest = P_GetObjectTypeInSectorNum(MT_TELEPORTMAN, secnum);
@@ -2738,7 +2661,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;
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
sec = §ors[secnum];
S_StartSound(&sec->soundorg, sfxnum);
@@ -2853,7 +2776,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 416: // Spawn adjustable fire flicker
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2887,7 +2810,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 417: // Spawn adjustable glowing light
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2921,7 +2844,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 418: // Spawn adjustable strobe flash (unsynchronized)
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2955,7 +2878,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 419: // Spawn adjustable strobe flash (synchronized)
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -3003,7 +2926,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 421: // Stop lighting effect in tagged sectors
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
if (sectors[secnum].lightingdata)
{
P_RemoveThinker(&((elevator_t *)sectors[secnum].lightingdata)->thinker);
@@ -3018,7 +2941,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if ((!mo || !mo->player) && !titlemapinaction) // only players have views, and title screens
return;
- if ((secnum = P_FindSectorFromLineTag(line, -1)) < 0)
+ if ((secnum = P_FindSectorFromTag(line->tag, -1)) < 0)
return;
altview = P_GetObjectTypeInSectorNum(MT_ALTVIEWMAN, secnum);
@@ -3337,7 +3260,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;
- while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
+ while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
{
boolean tryagain;
sec = sectors + secnum;
@@ -3366,14 +3289,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
case 443: // Calls a named Lua function
-#ifdef HAVE_BLUA
if (line->text)
LUAh_LinedefExecute(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 the front texture fields)\n", sizeu1(line-lines));
-#else
- CONS_Alert(CONS_ERROR, "The map is trying to run a Lua script, but this exe was not compiled with Lua support!\n");
-#endif
break;
case 444: // Earthquake camera
@@ -3496,7 +3415,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
// Except it is activated by linedef executor, not level load
// This could even override existing colormaps I believe
// -- Monster Iestyn 14/06/18
- for (secnum = -1; (secnum = P_FindSectorFromLineTag(line, secnum)) >= 0 ;)
+ for (secnum = -1; (secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0 ;)
{
P_ResetColormapFader(§ors[secnum]);
@@ -3824,7 +3743,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
case 455: // Fade colormap
- for (secnum = -1; (secnum = P_FindSectorFromLineTag(line, secnum)) >= 0 ;)
+ for (secnum = -1; (secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0 ;)
{
extracolormap_t *source_exc, *dest_exc, *exc;
INT32 speed = (INT32)((line->flags & ML_DONTPEGBOTTOM) || !sides[line->sidenum[0]].rowoffset) && line->sidenum[1] != 0xFFFF ?
@@ -3913,7 +3832,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 456: // Stop fade colormap
- for (secnum = -1; (secnum = P_FindSectorFromLineTag(line, secnum)) >= 0 ;)
+ for (secnum = -1; (secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0 ;)
P_ResetColormapFader(§ors[secnum]);
break;
@@ -3927,7 +3846,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
boolean persist = (line->flags & ML_EFFECT2);
mobj_t *anchormo;
- if ((secnum = P_FindSectorFromLineTag(line, -1)) < 0)
+ if ((secnum = P_FindSectorFromTag(line->tag, -1)) < 0)
return;
anchormo = P_GetObjectTypeInSectorNum(MT_ANGLEMAN, secnum);
@@ -4018,7 +3937,11 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
mobj = P_SpawnMobj(x, y, z, type);
if (mobj)
+ {
+ if (line->flags & ML_EFFECT1)
+ mobj->angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y);
CONS_Debug(DBG_GAMELOGIC, "Linedef Type %d - Spawn Object: %d spawned at (%d, %d, %d)\n", line->special, mobj->type, mobj->x>>FRACBITS, mobj->y>>FRACBITS, mobj->z>>FRACBITS); //TODO: Convert mobj->type to a string somehow.
+ }
else
CONS_Alert(CONS_ERROR,"Linedef Type %d - Spawn Object: Object did not spawn!\n", line->special);
}
@@ -4042,7 +3965,63 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
break;
-#ifdef POLYOBJECTS
+ case 463: // Dye object
+ {
+ INT32 color = sides[line->sidenum[0]].toptexture;
+
+ if (mo)
+ {
+ if (color < 0 || color >= numskincolors)
+ return;
+
+ var1 = 0;
+ var2 = color;
+ A_Dye(mo);
+ }
+ }
+ break;
+
+ case 464: // Trigger Egg Capsule
+ {
+ thinker_t *th;
+ mobj_t *mo2;
+
+ // Find the center of the Eggtrap and release all the pretty animals!
+ // The chimps are my friends.. heeheeheheehehee..... - LouisJM
+ for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
+ {
+ if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+ continue;
+
+ mo2 = (mobj_t *)th;
+
+ if (mo2->type != MT_EGGTRAP)
+ continue;
+
+ if (!mo2->spawnpoint)
+ continue;
+
+ if (mo2->spawnpoint->angle != line->tag)
+ continue;
+
+ P_KillMobj(mo2, NULL, mo, 0);
+ }
+
+ if (!(line->flags & ML_NOCLIMB))
+ {
+ INT32 i;
+
+ // Mark all players with the time to exit thingy!
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (!playeringame[i])
+ continue;
+ P_DoPlayerExit(&players[i]);
+ }
+ }
+ }
+ break;
+
case 480: // Polyobj_DoorSlide
case 481: // Polyobj_DoorSwing
PolyDoor(line);
@@ -4072,7 +4051,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 492:
PolyFade(line);
break;
-#endif
default:
break;
@@ -4421,7 +4399,8 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_ELECTRIC);
break;
case 5: // Spikes
- // Don't do anything. In Soviet Russia, spikes find you.
+ if (roversector || P_MobjReadyToTrigger(player->mo, sector))
+ P_DamageMobj(player->mo, NULL, NULL, 1, DMG_SPIKE);
break;
case 6: // Death Pit (Camera Mod)
case 7: // Death Pit (No Camera Mod)
@@ -4831,9 +4810,7 @@ DoneSection2:
INT32 sequence;
fixed_t speed;
INT32 lineindex;
- thinker_t *th;
mobj_t *waypoint = NULL;
- mobj_t *mo2;
angle_t an;
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE)
@@ -4858,25 +4835,7 @@ DoneSection2:
break;
}
- // scan the thinkers
- // to find the first waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
- if (mo2->threshold != sequence)
- continue;
- if (mo2->health != 0)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = P_GetFirstWaypoint(sequence);
if (!waypoint)
{
@@ -4913,9 +4872,7 @@ DoneSection2:
INT32 sequence;
fixed_t speed;
INT32 lineindex;
- thinker_t *th;
mobj_t *waypoint = NULL;
- mobj_t *mo2;
angle_t an;
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE)
@@ -4940,25 +4897,7 @@ DoneSection2:
break;
}
- // scan the thinkers
- // to find the last waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
- if (mo2->threshold != sequence)
- continue;
-
- if (!waypoint)
- waypoint = mo2;
- else if (mo2->health > waypoint->health)
- waypoint = mo2;
- }
+ waypoint = P_GetLastWaypoint(sequence);
if (!waypoint)
{
@@ -5040,14 +4979,11 @@ DoneSection2:
INT32 sequence;
fixed_t speed;
INT32 lineindex;
- thinker_t *th;
mobj_t *waypointmid = NULL;
mobj_t *waypointhigh = NULL;
mobj_t *waypointlow = NULL;
- mobj_t *mo2;
mobj_t *closest = NULL;
vector3_t p, line[2], resulthigh, resultlow;
- mobj_t *highest = NULL;
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ROPEHANG)
break;
@@ -5093,98 +5029,16 @@ DoneSection2:
// Determine the closest spot on the line between the three waypoints
// Put player at that location.
- // scan the thinkers
- // to find the first waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (!highest)
- highest = mo2;
- else if (mo2->health > highest->health) // Find the highest waypoint # in case we wrap
- highest = mo2;
-
- if (closest && P_AproxDistance(P_AproxDistance(player->mo->x-mo2->x, player->mo->y-mo2->y),
- player->mo->z-mo2->z) > P_AproxDistance(P_AproxDistance(player->mo->x-closest->x,
- player->mo->y-closest->y), player->mo->z-closest->z))
- continue;
-
- // Found a target
- closest = mo2;
- }
-
- waypointmid = closest;
+ waypointmid = P_GetClosestWaypoint(sequence, player->mo);
- closest = NULL;
-
- if (waypointmid == NULL)
+ if (!waypointmid)
{
CONS_Debug(DBG_GAMELOGIC, "ERROR: WAYPOINT(S) IN SEQUENCE %d NOT FOUND.\n", sequence);
break;
}
- // Find waypoint before this one (waypointlow)
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (waypointmid->health == 0)
- {
- if (mo2->health != highest->health)
- continue;
- }
- else if (mo2->health != waypointmid->health - 1)
- continue;
-
- // Found a target
- waypointlow = mo2;
- break;
- }
-
- // Find waypoint after this one (waypointhigh)
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (waypointmid->health == highest->health)
- {
- if (mo2->health != 0)
- continue;
- }
- else if (mo2->health != waypointmid->health + 1)
- continue;
-
- // Found a target
- waypointhigh = mo2;
- break;
- }
+ waypointlow = P_GetPreviousWaypoint(waypointmid, true);
+ waypointhigh = P_GetNextWaypoint(waypointmid, true);
CONS_Debug(DBG_GAMELOGIC, "WaypointMid: %d; WaypointLow: %d; WaypointHigh: %d\n",
waypointmid->health, waypointlow ? waypointlow->health : -1, waypointhigh ? waypointhigh->health : -1);
@@ -5231,6 +5085,7 @@ DoneSection2:
if (lines[lineindex].flags & ML_EFFECT1) // Don't wrap
{
+ mobj_t *highest = P_GetLastWaypoint(sequence);
highest->flags |= MF_SLIDEME;
}
@@ -5242,7 +5097,7 @@ DoneSection2:
player->mo->y = resulthigh.y;
player->mo->z = resulthigh.z - P_GetPlayerHeight(player);
}
- else if ((lines[lineindex].flags & ML_EFFECT1) && waypointmid->health == highest->health)
+ else if ((lines[lineindex].flags & ML_EFFECT1) && waypointmid->health == numwaypoints[sequence] - 1)
{
closest = waypointmid;
player->mo->x = resultlow.x;
@@ -5649,6 +5504,35 @@ void P_UpdateSpecials(void)
}
}
+//
+// Floor over floors (FOFs), 3Dfloors, 3Dblocks, fake floors (ffloors), rovers, or whatever you want to call them
+//
+
+/** Gets the ID number for a 3Dfloor in its target sector.
+ *
+ * \param fflr The 3Dfloor we want an ID for.
+ * \return ID of 3Dfloor in target sector. Note that the first FOF's ID is 0. UINT16_MAX is given if invalid.
+ * \sa P_GetFFloorByID
+ */
+UINT16 P_GetFFloorID(ffloor_t *fflr)
+{
+ ffloor_t *rover;
+ sector_t *sec;
+ UINT16 i = 0;
+
+ if (!fflr)
+ return UINT16_MAX;
+
+ sec = fflr->target;
+
+ if (!sec->ffloors)
+ return UINT16_MAX;
+ for (rover = sec->ffloors; rover; rover = rover->next, i++)
+ if (rover == fflr)
+ return i;
+ return UINT16_MAX;
+}
+
/** Gets a 3Dfloor by control sector.
*
* \param sec Target sector.
@@ -5673,7 +5557,7 @@ static inline ffloor_t *P_GetFFloorBySec(sector_t *sec, sector_t *sec2)
* \param sec Target sector.
* \param id ID of 3Dfloor in target sector. Note that the first FOF's ID is 0.
* \return Pointer to found 3Dfloor, or NULL.
- * \sa P_GetFFloorBySec
+ * \sa P_GetFFloorBySec, P_GetFFloorID
*/
ffloor_t *P_GetFFloorByID(sector_t *sec, UINT16 id)
{
@@ -5729,7 +5613,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
thinker_t *th;
friction_t *f;
pusher_t *p;
- levelspecthink_t *lst;
size_t sec2num;
size_t i;
@@ -5747,8 +5630,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
sec2->floorheight = tempceiling;
}
- sec2->tagline = master;
-
if (sec2->numattached == 0)
{
sec2->attached = Z_Malloc(sizeof (*sec2->attached) * sec2->maxattached, PU_STATIC, NULL);
@@ -5792,7 +5673,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
fflr->topyoffs = &sec2->ceiling_yoffs;
fflr->topangle = &sec2->ceilingpic_angle;
-#ifdef ESLOPE
// Add slopes
fflr->t_slope = &sec2->c_slope;
fflr->b_slope = &sec2->f_slope;
@@ -5800,7 +5680,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
// (this fixes FOF slopes glitching initially at level load in software mode)
if (sec2->hasslope)
sec->hasslope = true;
-#endif
if ((flags & FF_SOLID) && (master->flags & ML_EFFECT1)) // Block player only
flags &= ~FF_BLOCKOTHERS;
@@ -5834,16 +5713,8 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
else if (th == &thlist[THINK_MAIN])
break;
- // Should this FOF have spikeness?
- if (th->function.acp1 == (actionf_p1)T_SpikeSector)
- {
- lst = (levelspecthink_t *)th;
-
- if (lst->sector == sec2)
- P_AddSpikeThinker(sec, (INT32)sec2num);
- }
// Should this FOF have friction?
- else if(th->function.acp1 == (actionf_p1)T_Friction)
+ if(th->function.acp1 == (actionf_p1)T_Friction)
{
f = (friction_t *)th;
@@ -5890,7 +5761,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
}
if ((flags & FF_CRUMBLE))
- sec2->crumblestate = 1;
+ sec2->crumblestate = CRUMBLE_WAIT;
if ((flags & FF_FLOATBOB))
{
@@ -5907,28 +5778,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
// SPECIAL SPAWNING
//
-/** Adds a spike thinker.
- * Sector type Section1:5 will result in this effect.
- *
- * \param sec Sector in which to add the thinker.
- * \param referrer If != sec, then we're dealing with a FOF
- * \sa P_SpawnSpecials, T_SpikeSector
- * \author SSNTails <http://www.ssntails.org>
- */
-static void P_AddSpikeThinker(sector_t *sec, INT32 referrer)
-{
- levelspecthink_t *spikes;
-
- // create and initialize new thinker
- spikes = Z_Calloc(sizeof (*spikes), PU_LEVSPEC, NULL);
- P_AddThinker(THINK_MAIN, &spikes->thinker);
-
- spikes->thinker.function.acp1 = (actionf_p1)T_SpikeSector;
-
- spikes->sector = sec;
- spikes->vars[0] = referrer;
-}
-
/** Adds a float thinker.
* Float thinkers cause solid 3Dfloors to float on water.
*
@@ -5937,9 +5786,9 @@ static void P_AddSpikeThinker(sector_t *sec, INT32 referrer)
* \sa P_SpawnSpecials, T_FloatSector
* \author SSNTails <http://www.ssntails.org>
*/
-static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline)
+static void P_AddFloatThinker(sector_t *sec, UINT16 tag, line_t *sourceline)
{
- levelspecthink_t *floater;
+ floatthink_t *floater;
// create and initialize new thinker
floater = Z_Calloc(sizeof (*floater), PU_LEVSPEC, NULL);
@@ -5948,43 +5797,10 @@ static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline)
floater->thinker.function.acp1 = (actionf_p1)T_FloatSector;
floater->sector = sec;
- floater->vars[0] = tag;
+ floater->tag = (INT16)tag;
floater->sourceline = sourceline;
}
-/** Adds a bridge thinker.
- * Bridge thinkers cause a group of FOFs to behave like
- * a bridge made up of pieces, that bows under weight.
- *
- * \param sec Control sector.
- * \sa P_SpawnSpecials, T_BridgeThinker
- * \author SSNTails <http://www.ssntails.org>
- */
-/*
-static inline void P_AddBridgeThinker(line_t *sourceline, sector_t *sec)
-{
- levelspecthink_t *bridge;
-
- // create an initialize new thinker
- bridge = Z_Calloc(sizeof (*bridge), PU_LEVSPEC, NULL);
- P_AddThinker(THINK_MAIN, &bridge->thinker);
-
- bridge->thinker.function.acp1 = (actionf_p1)T_BridgeThinker;
-
- bridge->sector = sec;
- bridge->vars[0] = sourceline->frontsector->floorheight;
- bridge->vars[1] = sourceline->frontsector->ceilingheight;
- bridge->vars[2] = P_AproxDistance(sourceline->dx, sourceline->dy); // Speed
- bridge->vars[2] = FixedDiv(bridge->vars[2], 16*FRACUNIT);
- bridge->vars[3] = bridge->vars[2];
-
- // Start tag and end tag are TARGET SECTORS, not CONTROL SECTORS
- // Control sector tags should be End_Tag + (End_Tag - Start_Tag)
- bridge->vars[4] = sourceline->tag; // Start tag
- bridge->vars[5] = (sides[sourceline->sidenum[0]].textureoffset>>FRACBITS); // End tag
-}
-*/
-
/**
* Adds a plane displacement thinker.
* Whenever the "control" sector moves,
@@ -6026,7 +5842,7 @@ static void P_AddPlaneDisplaceThinker(INT32 type, fixed_t speed, INT32 control,
*/
static void P_AddBlockThinker(sector_t *sec, line_t *sourceline)
{
- levelspecthink_t *block;
+ mariocheck_t *block;
// create and initialize new elevator thinker
block = Z_Calloc(sizeof (*block), PU_LEVSPEC, NULL);
@@ -6047,109 +5863,67 @@ static void P_AddBlockThinker(sector_t *sec, line_t *sourceline)
* there already.
*
* \param sec Control sector.
- * \param actionsector Target sector.
- * \param sourceline Control linedef.
* \sa P_SpawnSpecials, T_RaiseSector
* \author SSNTails <http://www.ssntails.org>
*/
-static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline)
+static void P_AddRaiseThinker(sector_t *sec, INT16 tag, fixed_t speed, fixed_t ceilingtop, fixed_t ceilingbottom, boolean lower, boolean spindash)
{
- levelspecthink_t *raise;
+ raise_t *raise;
raise = Z_Calloc(sizeof (*raise), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &raise->thinker);
raise->thinker.function.acp1 = (actionf_p1)T_RaiseSector;
- if (sourceline->flags & ML_BLOCKMONSTERS)
- raise->vars[0] = 1;
- else
- raise->vars[0] = 0;
-
- // set up the fields
+ raise->tag = tag;
raise->sector = sec;
- // Require a spindash to activate
- if (sourceline->flags & ML_NOCLIMB)
- raise->vars[1] = 1;
- else
- raise->vars[1] = 0;
-
- raise->vars[2] = P_AproxDistance(sourceline->dx, sourceline->dy);
- raise->vars[2] = FixedDiv(raise->vars[2], 4*FRACUNIT);
- raise->vars[3] = raise->vars[2];
-
- raise->vars[5] = P_FindHighestCeilingSurrounding(sec);
- raise->vars[4] = raise->vars[5]
- - (sec->ceilingheight - sec->floorheight);
+ raise->ceilingtop = ceilingtop;
+ raise->ceilingbottom = ceilingbottom;
- raise->vars[7] = P_FindLowestCeilingSurrounding(sec);
- raise->vars[6] = raise->vars[7]
- - (sec->ceilingheight - sec->floorheight);
+ raise->basespeed = speed;
- raise->sourceline = sourceline;
+ if (lower)
+ raise->flags |= RF_REVERSE;
+ if (spindash)
+ raise->flags |= RF_SPINDASH;
}
-static void P_AddAirbob(sector_t *sec, line_t *sourceline, boolean noadjust, boolean dynamic)
+static void P_AddAirbob(sector_t *sec, INT16 tag, fixed_t dist, boolean raise, boolean spindash, boolean dynamic)
{
- levelspecthink_t *airbob;
+ raise_t *airbob;
airbob = Z_Calloc(sizeof (*airbob), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &airbob->thinker);
airbob->thinker.function.acp1 = (actionf_p1)T_RaiseSector;
- // set up the fields
+ airbob->tag = tag;
airbob->sector = sec;
- // Require a spindash to activate
- if (sourceline->flags & ML_NOCLIMB)
- airbob->vars[1] = 1;
- else
- airbob->vars[1] = 0;
-
- airbob->vars[2] = FRACUNIT;
-
- if (noadjust)
- airbob->vars[7] = airbob->sector->ceilingheight-16*FRACUNIT;
- else
- airbob->vars[7] = airbob->sector->ceilingheight - P_AproxDistance(sourceline->dx, sourceline->dy);
- airbob->vars[6] = airbob->vars[7]
- - (sec->ceilingheight - sec->floorheight);
-
- airbob->vars[3] = airbob->vars[2];
-
- if (sourceline->flags & ML_BLOCKMONSTERS)
- airbob->vars[0] = 1;
- else
- airbob->vars[0] = 0;
-
- airbob->vars[5] = sec->ceilingheight;
- airbob->vars[4] = airbob->vars[5]
- - (sec->ceilingheight - sec->floorheight);
+ airbob->ceilingtop = sec->ceilingheight;
+ airbob->ceilingbottom = sec->ceilingheight - dist;
- airbob->vars[9] = dynamic ? 1 : 0;
+ airbob->basespeed = FRACUNIT;
- airbob->sourceline = sourceline;
+ if (!raise)
+ airbob->flags |= RF_REVERSE;
+ if (spindash)
+ airbob->flags |= RF_SPINDASH;
+ if (dynamic)
+ airbob->flags |= RF_DYNAMIC;
}
/** Adds a thwomp thinker.
* Even thwomps need to think!
*
* \param sec Control sector.
- * \param actionsector Target sector.
- * \param sourceline Control linedef.
* \sa P_SpawnSpecials, T_ThwompSector
* \author SSNTails <http://www.ssntails.org>
*/
-static inline void P_AddThwompThinker(sector_t *sec, sector_t *actionsector, line_t *sourceline)
+static inline void P_AddThwompThinker(sector_t *sec, INT16 tag, line_t *sourceline, fixed_t crushspeed, fixed_t retractspeed, UINT16 sound)
{
-#define speed vars[1]
-#define direction vars[2]
-#define distance vars[3]
-#define floorwasheight vars[4]
-#define ceilingwasheight vars[5]
- levelspecthink_t *thwomp;
+ thwomp_t *thwomp;
// You *probably* already have a thwomp in this sector. If you've combined it with something
// else that uses the floordata/ceilingdata, you must be weird.
@@ -6163,34 +5937,33 @@ static inline void P_AddThwompThinker(sector_t *sec, sector_t *actionsector, lin
thwomp->thinker.function.acp1 = (actionf_p1)T_ThwompSector;
// set up the fields according to the type of elevator action
+ thwomp->sourceline = sourceline;
thwomp->sector = sec;
- thwomp->vars[0] = actionsector->tag;
- thwomp->floorwasheight = thwomp->sector->floorheight;
- thwomp->ceilingwasheight = thwomp->sector->ceilingheight;
+ thwomp->crushspeed = crushspeed;
+ thwomp->retractspeed = retractspeed;
thwomp->direction = 0;
- thwomp->distance = 1;
- thwomp->sourceline = sourceline;
- thwomp->sector->floordata = thwomp;
- thwomp->sector->ceilingdata = thwomp;
- return;
-#undef speed
-#undef direction
-#undef distance
-#undef floorwasheight
-#undef ceilingwasheight
+ thwomp->floorstartheight = sec->floorheight;
+ thwomp->ceilingstartheight = sec->ceilingheight;
+ thwomp->delay = 1;
+ thwomp->tag = tag;
+ thwomp->sound = sound;
+
+ sec->floordata = thwomp;
+ sec->ceilingdata = thwomp;
+ // Start with 'resting' texture
+ sides[sourceline->sidenum[0]].midtexture = sides[sourceline->sidenum[0]].bottomtexture;
}
/** Adds a thinker which checks if any MF_ENEMY objects with health are in the defined area.
* If not, a linedef executor is run once.
*
- * \param sec Control sector.
* \param sourceline Control linedef.
* \sa P_SpawnSpecials, T_NoEnemiesSector
* \author SSNTails <http://www.ssntails.org>
*/
-static inline void P_AddNoEnemiesThinker(sector_t *sec, line_t *sourceline)
+static inline void P_AddNoEnemiesThinker(line_t *sourceline)
{
- levelspecthink_t *nobaddies;
+ noenemies_t *nobaddies;
// create and initialize new thinker
nobaddies = Z_Calloc(sizeof (*nobaddies), PU_LEVSPEC, NULL);
@@ -6198,21 +5971,19 @@ static inline void P_AddNoEnemiesThinker(sector_t *sec, line_t *sourceline)
nobaddies->thinker.function.acp1 = (actionf_p1)T_NoEnemiesSector;
- nobaddies->sector = sec;
nobaddies->sourceline = sourceline;
}
/** Adds a thinker for Each-Time linedef executors. A linedef executor is run
* only when a player enters the area and doesn't run again until they re-enter.
*
- * \param sec Control sector that contains the lines of executors we will want to run.
* \param sourceline Control linedef.
* \sa P_SpawnSpecials, T_EachTimeThinker
* \author SSNTails <http://www.ssntails.org>
*/
-static void P_AddEachTimeThinker(sector_t *sec, line_t *sourceline)
+static void P_AddEachTimeThinker(line_t *sourceline)
{
- levelspecthink_t *eachtime;
+ eachtime_t *eachtime;
// create and initialize new thinker
eachtime = Z_Calloc(sizeof (*eachtime), PU_LEVSPEC, NULL);
@@ -6220,8 +5991,8 @@ static void P_AddEachTimeThinker(sector_t *sec, line_t *sourceline)
eachtime->thinker.function.acp1 = (actionf_p1)T_EachTimeThinker;
- eachtime->sector = sec;
eachtime->sourceline = sourceline;
+ eachtime->triggerOnExit = !!(sourceline->flags & ML_BOUNCY);
}
/** Adds a camera scanner.
@@ -6236,6 +6007,8 @@ static inline void P_AddCameraScanner(sector_t *sourcesec, sector_t *actionsecto
{
elevator_t *elevator; // Why not? LOL
+ CONS_Alert(CONS_WARNING, M_GetText("Detected a camera scanner effect (linedef type 5). This effect is deprecated and will be removed in the future!\n"));
+
// create and initialize new elevator thinker
elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &elevator->thinker);
@@ -6249,98 +6022,85 @@ static inline void P_AddCameraScanner(sector_t *sourcesec, sector_t *actionsecto
elevator->distance = FixedInt(AngleFixed(angle));
}
-static const ffloortype_e laserflags = FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT;
-
/** Flashes a laser block.
*
* \param flash Thinker structure for this laser.
- * \sa EV_AddLaserThinker
+ * \sa P_AddLaserThinker
* \author SSNTails <http://www.ssntails.org>
*/
void T_LaserFlash(laserthink_t *flash)
{
msecnode_t *node;
mobj_t *thing;
- sector_t *sourcesec;
- ffloor_t *fflr = flash->ffloor;
- sector_t *sector = flash->sector;
+ INT32 s;
+ ffloor_t *fflr;
+ sector_t *sector;
+ sector_t *sourcesec = flash->sourceline->frontsector;
fixed_t top, bottom;
- if (!fflr || !(fflr->flags & FF_EXISTS))
- return;
+ for (s = -1; (s = P_FindSectorFromTag(flash->tag, s)) >= 0 ;)
+ {
+ sector = §ors[s];
+ for (fflr = sector->ffloors; fflr; fflr = fflr->next)
+ {
+ if (fflr->master != flash->sourceline)
+ continue;
- if (leveltime & 2)
- //fflr->flags |= FF_RENDERALL;
- fflr->alpha = 0xB0;
- else
- //fflr->flags &= ~FF_RENDERALL;
- fflr->alpha = 0x90;
-
- sourcesec = fflr->master->frontsector; // Less to type!
-
-#ifdef ESLOPE
- top = (*fflr->t_slope) ? P_GetZAt(*fflr->t_slope, sector->soundorg.x, sector->soundorg.y)
- : *fflr->topheight;
- bottom = (*fflr->b_slope) ? P_GetZAt(*fflr->b_slope, sector->soundorg.x, sector->soundorg.y)
- : *fflr->bottomheight;
- sector->soundorg.z = (top + bottom)/2;
-#else
- sector->soundorg.z = (*fflr->topheight + *fflr->bottomheight)/2;
-#endif
- S_StartSound(§or->soundorg, sfx_laser);
+ if (!(fflr->flags & FF_EXISTS))
+ break;
- // Seek out objects to DESTROY! MUAHAHHAHAHAA!!!*cough*
- for (node = sector->touching_thinglist; node && node->m_thing; node = node->m_thinglist_next)
- {
- thing = node->m_thing;
+ if (leveltime & 2)
+ //fflr->flags |= FF_RENDERALL;
+ fflr->alpha = 0xB0;
+ else
+ //fflr->flags &= ~FF_RENDERALL;
+ fflr->alpha = 0x90;
- if ((fflr->master->flags & ML_EFFECT1)
- && thing->flags & MF_BOSS)
- continue; // Don't hurt bosses
+ top = P_GetFFloorTopZAt (fflr, sector->soundorg.x, sector->soundorg.y);
+ bottom = P_GetFFloorBottomZAt(fflr, sector->soundorg.x, sector->soundorg.y);
+ sector->soundorg.z = (top + bottom)/2;
+ S_StartSound(§or->soundorg, sfx_laser);
- // Don't endlessly kill egg guard shields (or anything else for that matter)
- if (thing->health <= 0)
- continue;
+ // Seek out objects to DESTROY! MUAHAHHAHAHAA!!!*cough*
+ for (node = sector->touching_thinglist; node && node->m_thing; node = node->m_thinglist_next)
+ {
+ thing = node->m_thing;
- top = P_GetSpecialTopZ(thing, sourcesec, sector);
- bottom = P_GetSpecialBottomZ(thing, sourcesec, sector);
+ if (flash->nobosses && thing->flags & MF_BOSS)
+ continue; // Don't hurt bosses
- if (thing->z >= top
- || thing->z + thing->height <= bottom)
- continue;
+ // Don't endlessly kill egg guard shields (or anything else for that matter)
+ if (thing->health <= 0)
+ continue;
+
+ top = P_GetSpecialTopZ(thing, sourcesec, sector);
+ bottom = P_GetSpecialBottomZ(thing, sourcesec, sector);
+
+ if (thing->z >= top
+ || thing->z + thing->height <= bottom)
+ continue;
- if (thing->flags & MF_SHOOTABLE)
- P_DamageMobj(thing, NULL, NULL, 1, 0);
- else if (thing->type == MT_EGGSHIELD)
- P_KillMobj(thing, NULL, NULL, 0);
+ if (thing->flags & MF_SHOOTABLE)
+ P_DamageMobj(thing, NULL, NULL, 1, 0);
+ else if (thing->type == MT_EGGSHIELD)
+ P_KillMobj(thing, NULL, NULL, 0);
+ }
+
+ break;
+ }
}
}
-/** Adds a laser thinker to a 3Dfloor.
- *
- * \param fflr 3Dfloor to turn into a laser block.
- * \param sector Target sector.
- * \param secthkiners Lists of thinkers sorted by sector. May be NULL.
- * \sa T_LaserFlash
- * \author SSNTails <http://www.ssntails.org>
- */
-static inline void EV_AddLaserThinker(sector_t *sec, sector_t *sec2, line_t *line, thinkerlist_t *secthinkers)
+static inline void P_AddLaserThinker(INT16 tag, line_t *line, boolean nobosses)
{
- laserthink_t *flash;
- ffloor_t *fflr = P_AddFakeFloor(sec, sec2, line, laserflags, secthinkers);
-
- if (!fflr)
- return;
-
- flash = Z_Calloc(sizeof (*flash), PU_LEVSPEC, NULL);
+ laserthink_t *flash = Z_Calloc(sizeof (*flash), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &flash->thinker);
flash->thinker.function.acp1 = (actionf_p1)T_LaserFlash;
- flash->ffloor = fflr;
- flash->sector = sec; // For finding mobjs
- flash->sec = sec2;
+ flash->tag = tag;
flash->sourceline = line;
+ flash->nobosses = nobosses;
}
//
@@ -6370,11 +6130,11 @@ static void P_RunLevelLoadExecutors(void)
void P_InitSpecials(void)
{
// Set the default gravity. Custom gravity overrides this setting.
- gravity = FRACUNIT/2;
+ gravity = mapheaderinfo[gamemap-1]->gravity;
// Defaults in case levels don't have them set.
- sstimer = 90*TICRATE + 6;
- ssspheres = 1;
+ sstimer = mapheaderinfo[gamemap-1]->sstimer*TICRATE + 6;
+ ssspheres = mapheaderinfo[gamemap-1]->ssspheres;
CheckForBustableBlocks = CheckForBouncySector = CheckForQuicksand = CheckForMarioBlocks = CheckForFloatBob = CheckForReverseGravity = false;
@@ -6452,9 +6212,11 @@ void P_SpawnSpecials(boolean fromnetsave)
switch(GETSECSPECIAL(sector->special, 1))
{
case 5: // Spikes
- P_AddSpikeThinker(sector, (INT32)(sector-sectors));
+ //Terrible hack to replace an even worse hack:
+ //Spike damage automatically sets SF_TRIGGERSPECIAL_TOUCH.
+ //Yes, this also affects other specials on the same sector. Sorry.
+ sector->flags |= SF_TRIGGERSPECIAL_TOUCH;
break;
-
case 15: // Bouncy sector
CheckForBouncySector = true;
break;
@@ -6500,9 +6262,7 @@ void P_SpawnSpecials(boolean fromnetsave)
// Firstly, find out how many there are in each sector
for (th = thlist[THINK_MAIN].next; th != &thlist[THINK_MAIN]; th = th->next)
{
- if (th->function.acp1 == (actionf_p1)T_SpikeSector)
- secthinkers[((levelspecthink_t *)th)->sector - sectors].count++;
- else if (th->function.acp1 == (actionf_p1)T_Friction)
+ if (th->function.acp1 == (actionf_p1)T_Friction)
secthinkers[((friction_t *)th)->affectee].count++;
else if (th->function.acp1 == (actionf_p1)T_Pusher)
secthinkers[((pusher_t *)th)->affectee].count++;
@@ -6522,9 +6282,7 @@ void P_SpawnSpecials(boolean fromnetsave)
{
size_t secnum = (size_t)-1;
- if (th->function.acp1 == (actionf_p1)T_SpikeSector)
- secnum = ((levelspecthink_t *)th)->sector - sectors;
- else if (th->function.acp1 == (actionf_p1)T_Friction)
+ if (th->function.acp1 == (actionf_p1)T_Friction)
secnum = ((friction_t *)th)->affectee;
else if (th->function.acp1 == (actionf_p1)T_Pusher)
secnum = ((pusher_t *)th)->affectee;
@@ -6563,7 +6321,7 @@ void P_SpawnSpecials(boolean fromnetsave)
case 1: // Definable gravity per sector
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
{
sectors[s].gravity = §ors[sec].floorheight; // This allows it to change in realtime!
@@ -6587,7 +6345,7 @@ void P_SpawnSpecials(boolean fromnetsave)
case 5: // Change camera info
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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;
@@ -6614,7 +6372,7 @@ void P_SpawnSpecials(boolean fromnetsave)
P_ApplyFlatAlignment(lines + i, lines[i].frontsector, flatangle, xoffs, yoffs);
else
{
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0;)
P_ApplyFlatAlignment(lines + i, sectors + s, flatangle, xoffs, yoffs);
}
}
@@ -6625,7 +6383,7 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 8: // Sector Parameters
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
{
if (lines[i].flags & ML_NOCLIMB)
{
@@ -6653,7 +6411,7 @@ void P_SpawnSpecials(boolean fromnetsave)
case 10: // Vertical culling plane for sprites and FOFs
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
break;
@@ -6714,18 +6472,18 @@ void P_SpawnSpecials(boolean fromnetsave)
case 63: // support for drawn heights coming from different sector
sec = sides[*lines[i].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
sectors[s].heightsec = (INT32)sec;
break;
case 64: // Appearing/Disappearing FOF option
if (lines[i].flags & ML_BLOCKMONSTERS) { // Find FOFs by control sector tag
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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
- for (s = -1; (s = P_FindLineFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindLineFromTag(lines[i].tag, s)) >= 0 ;)
{
if ((size_t)s == i)
continue;
@@ -6734,23 +6492,16 @@ void P_SpawnSpecials(boolean fromnetsave)
}
break;
- case 65: // Bridge Thinker
- /*
- // Disable this until it's working right!
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
- P_AddBridgeThinker(&lines[i], §ors[s]);*/
- break;
-
case 66: // Displace floor by front sector
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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;
@@ -6944,18 +6695,19 @@ void P_SpawnSpecials(boolean fromnetsave)
case 150: // Air bobbing platform
case 151: // Adjustable air bobbing platform
+ {
+ fixed_t dist = (lines[i].special == 150) ? 16*FRACUNIT : P_AproxDistance(lines[i].dx, lines[i].dy);
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddAirbob(lines[i].frontsector, lines + i, (lines[i].special != 151), false);
+ P_AddAirbob(lines[i].frontsector, lines[i].tag, dist, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
+ }
case 152: // Adjustable air bobbing platform in reverse
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddAirbob(lines[i].frontsector, lines + i, true, false);
+ P_AddAirbob(lines[i].frontsector, lines[i].tag, P_AproxDistance(lines[i].dx, lines[i].dy), true, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 153: // Dynamic Sinking Platform
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddAirbob(lines[i].frontsector, lines + i, false, true);
+ P_AddAirbob(lines[i].frontsector, lines[i].tag, P_AproxDistance(lines[i].dx, lines[i].dy), false, !!(lines[i].flags & ML_NOCLIMB), true);
break;
case 160: // Float/bob platform
@@ -7005,15 +6757,13 @@ void P_SpawnSpecials(boolean fromnetsave)
case 176: // Air bobbing platform that will crumble and bob on the water when it falls and hits
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_FLOATBOB|FF_CRUMBLE, secthinkers);
- lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddAirbob(lines[i].frontsector, lines + i, true, false);
+ P_AddAirbob(lines[i].frontsector, lines[i].tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 177: // Air bobbing platform that will crumble and bob on
// the water when it falls and hits, then never return
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_FLOATBOB|FF_CRUMBLE|FF_NORETURN, secthinkers);
- lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddAirbob(lines[i].frontsector, lines + i, true, false);
+ P_AddAirbob(lines[i].frontsector, lines[i].tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 178: // Crumbling platform that will float when it hits water
@@ -7026,49 +6776,36 @@ void P_SpawnSpecials(boolean fromnetsave)
case 180: // Air bobbing platform that will crumble
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_CRUMBLE, secthinkers);
- lines[i].flags |= ML_BLOCKMONSTERS;
- P_AddAirbob(lines[i].frontsector, lines + i, true, false);
+ P_AddAirbob(lines[i].frontsector, lines[i].tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 190: // Rising Platform FOF (solid, opaque, shadows)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
- break;
-
case 191: // Rising Platform FOF (solid, opaque, no shadows)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_CUTLEVEL, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
- break;
-
case 192: // Rising Platform TL block: FOF (solid, translucent)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
- break;
-
case 193: // Rising Platform FOF (solid, invisible)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_NOSHADE, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
- break;
-
case 194: // Rising Platform 'Platform' - You can jump up through it
- // If line has no-climb set, don't give it shadows, otherwise do
- ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_BOTHPLANES|FF_ALLSIDES;
- if (lines[i].flags & ML_NOCLIMB)
- ffloorflags |= FF_NOSHADE;
-
- P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
- break;
-
case 195: // Rising Platform Translucent "platform"
- // If line has no-climb set, don't give it shadows, otherwise do
- ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_TRANSLUCENT|FF_BOTHPLANES|FF_ALLSIDES|FF_EXTRA|FF_CUTEXTRA;
- if (lines[i].flags & ML_NOCLIMB)
+ {
+ fixed_t speed = FixedDiv(P_AproxDistance(lines[i].dx, lines[i].dy), 4*FRACUNIT);
+ fixed_t ceilingtop = P_FindHighestCeilingSurrounding(lines[i].frontsector);
+ fixed_t ceilingbottom = P_FindLowestCeilingSurrounding(lines[i].frontsector);
+
+ ffloorflags = FF_EXISTS|FF_SOLID;
+ if (lines[i].special != 193)
+ ffloorflags |= FF_RENDERALL;
+ if (lines[i].special <= 191)
+ ffloorflags |= FF_CUTLEVEL;
+ if (lines[i].special == 192 || lines[i].special == 195)
+ ffloorflags |= FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA;
+ if (lines[i].special >= 194)
+ ffloorflags |= FF_PLATFORM|FF_BOTHPLANES|FF_ALLSIDES;
+ if (lines[i].special != 190 && (lines[i].special <= 193 || lines[i].flags & ML_NOCLIMB))
ffloorflags |= FF_NOSHADE;
-
P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i]);
+
+ P_AddRaiseThinker(lines[i].frontsector, lines[i].tag, speed, ceilingtop, ceilingbottom, !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
+ }
case 200: // Double light effect
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_CUTSPRITES|FF_DOUBLESHADOW, secthinkers);
@@ -7079,7 +6816,7 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 202: // Fog
- ffloorflags = FF_EXISTS|FF_RENDERALL|FF_FOG|FF_BOTHPLANES|FF_INVERTPLANES|FF_ALLSIDES|FF_INVERTSIDES|FF_CUTEXTRA|FF_EXTRA|FF_DOUBLESHADOW|FF_CUTSPRITES;
+ ffloorflags = FF_EXISTS|FF_RENDERALL|FF_FOG|FF_INVERTPLANES|FF_INVERTSIDES|FF_CUTEXTRA|FF_EXTRA|FF_DOUBLESHADOW|FF_CUTSPRITES;
sec = sides[*lines[i].sidenum].sector - sectors;
// SoM: Because it's fog, check for an extra colormap and set the fog flag...
if (sectors[sec].extra_colormap)
@@ -7124,14 +6861,14 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 251: // A THWOMP!
- sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
- {
- P_AddThwompThinker(§ors[sec], §ors[s], &lines[i]);
- P_AddFakeFloor(§ors[s], §ors[sec], lines + i,
- FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- }
+ {
+ fixed_t crushspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dy >> 3 : 10*FRACUNIT;
+ fixed_t retractspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dx >> 3 : 2*FRACUNIT;
+ UINT16 sound = (lines[i].flags & ML_EFFECT4) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : sfx_thwomp;
+ P_AddThwompThinker(lines[i].frontsector, lines[i].tag, &lines[i], crushspeed, retractspeed, sound);
+ P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
break;
+ }
case 252: // Shatter block (breaks when touched)
ffloorflags = FF_EXISTS|FF_BLOCKOTHERS|FF_RENDERALL|FF_BUSTUP|FF_SHATTER;
@@ -7170,11 +6907,8 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 258: // Laser block
- sec = sides[*lines[i].sidenum].sector - sectors;
-
- // No longer totally disrupts netgames
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
- EV_AddLaserThinker(§ors[s], §ors[sec], lines + i, secthinkers);
+ P_AddLaserThinker(lines[i].tag, lines + i, !!(lines[i].flags & ML_EFFECT1));
+ P_AddFakeFloorsByLine(i, FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT, secthinkers);
break;
case 259: // Custom FOF
@@ -7215,14 +6949,13 @@ void P_SpawnSpecials(boolean fromnetsave)
case 310:
case 312:
case 332:
- sec = sides[*lines[i].sidenum].sector - sectors;
- P_AddEachTimeThinker(§ors[sec], &lines[i]);
+ case 335:
+ P_AddEachTimeThinker(&lines[i]);
break;
// No More Enemies Linedef Exec
case 313:
- sec = sides[*lines[i].sidenum].sector - sectors;
- P_AddNoEnemiesThinker(§ors[sec], &lines[i]);
+ P_AddNoEnemiesThinker(&lines[i]);
break;
// Pushable linedef executors (count # of pushables)
@@ -7246,10 +6979,7 @@ void P_SpawnSpecials(boolean fromnetsave)
else
lines[i].callcount = sides[lines[i].sidenum[0]].textureoffset>>FRACBITS;
if (lines[i].special == 322) // Each time
- {
- sec = sides[*lines[i].sidenum].sector - sectors;
- P_AddEachTimeThinker(§ors[sec], &lines[i]);
- }
+ P_AddEachTimeThinker(&lines[i]);
break;
// NiGHTS trigger executors
@@ -7268,6 +6998,11 @@ void P_SpawnSpecials(boolean fromnetsave)
case 333:
break;
+ // Object dye executors
+ case 334:
+ case 336:
+ break;
+
case 399: // Linedef execute on map load
// This is handled in P_RunLevelLoadExecutors.
break;
@@ -7330,6 +7065,9 @@ void P_SpawnSpecials(boolean fromnetsave)
// 503 is used for a scroller
// 504 is used for a scroller
// 505 is used for a scroller
+ // 506 is used for a scroller
+ // 507 is used for a scroller
+ // 508 is used for a scroller
// 510 is used for a scroller
// 511 is used for a scroller
// 512 is used for a scroller
@@ -7359,46 +7097,46 @@ void P_SpawnSpecials(boolean fromnetsave)
case 600: // floor lighting independently (e.g. lava)
sec = sides[*lines[i].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
sectors[s].floorlightsec = (INT32)sec;
break;
case 601: // ceiling lighting independently
sec = sides[*lines[i].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
sectors[s].ceilinglightsec = (INT32)sec;
break;
case 602: // Adjustable pulsating light
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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;
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
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.
- for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
sectors[s].extra_colormap = sectors[s].spawn_extra_colormap = sides[lines[i].sidenum[0]].colormap_data;
break;
@@ -7414,7 +7152,6 @@ void P_SpawnSpecials(boolean fromnetsave)
Z_Free(secthinkers);
-#ifdef POLYOBJECTS
// haleyjd 02/20/06: spawn polyobjects
Polyobj_InitLevel();
@@ -7423,7 +7160,7 @@ void P_SpawnSpecials(boolean fromnetsave)
switch (lines[i].special)
{
case 30: // Polyobj_Flag
- EV_DoPolyObjFlag(&lines[i]);
+ PolyFlag(&lines[i]);
break;
case 31: // Polyobj_Displace
@@ -7435,7 +7172,6 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
}
}
-#endif
P_RunLevelLoadExecutors();
}
@@ -7453,7 +7189,7 @@ static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinker
INT32 s;
size_t sec = sides[*lines[line].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromLineTag(lines+line, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[line].tag, s)) >= 0 ;)
P_AddFakeFloor(§ors[s], §ors[sec], lines+line, ffloorflags, secthinkers);
}
@@ -7815,7 +7551,7 @@ static void P_SpawnScrollers(void)
case 513: // scroll effect ceiling
case 533: // scroll and carry objects on ceiling
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Scroller(sc_ceiling, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 533)
break;
@@ -7824,13 +7560,13 @@ static void P_SpawnScrollers(void)
case 523: // carry objects on ceiling
dx = FixedMul(dx, CARRYFACTOR);
dy = FixedMul(dy, CARRYFACTOR);
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
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
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Scroller(sc_floor, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 530)
break;
@@ -7839,16 +7575,29 @@ static void P_SpawnScrollers(void)
case 520: // carry objects on floor
dx = FixedMul(dx, CARRYFACTOR);
dy = FixedMul(dy, CARRYFACTOR);
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Scroller(sc_carry, dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
break;
// scroll wall according to linedef
// (same direction and speed as scrolling floors)
case 502:
- for (s = -1; (s = P_FindLineFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindLineFromTag(l->tag, s)) >= 0 ;)
if (s != (INT32)i)
- Add_Scroller(sc_side, dx, dy, control, lines[s].sidenum[0], accel, 0);
+ {
+ if (l->flags & ML_EFFECT2) // use texture offsets instead
+ {
+ dx = sides[l->sidenum[0]].textureoffset;
+ dy = sides[l->sidenum[0]].rowoffset;
+ }
+ if (l->flags & ML_EFFECT3)
+ {
+ if (lines[s].sidenum[1] != 0xffff)
+ Add_Scroller(sc_side, dx, dy, control, lines[s].sidenum[1], accel, 0);
+ }
+ else
+ Add_Scroller(sc_side, dx, dy, control, lines[s].sidenum[0], accel, 0);
+ }
break;
case 505:
@@ -7862,7 +7611,25 @@ static void P_SpawnScrollers(void)
if (s != 0xffff)
Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, lines[i].sidenum[0], accel, 0);
else
- CONS_Debug(DBG_GAMELOGIC, "Line special 506 (line #%s) missing 2nd side!\n", sizeu1(i));
+ CONS_Debug(DBG_GAMELOGIC, "Line special 506 (line #%s) missing back side!\n", sizeu1(i));
+ break;
+
+ case 507:
+ s = lines[i].sidenum[0];
+
+ if (lines[i].sidenum[1] != 0xffff)
+ Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, lines[i].sidenum[1], accel, 0);
+ else
+ CONS_Debug(DBG_GAMELOGIC, "Line special 507 (line #%s) missing back side!\n", sizeu1(i));
+ break;
+
+ case 508:
+ s = lines[i].sidenum[1];
+
+ if (s != 0xffff)
+ Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, s, accel, 0);
+ else
+ CONS_Debug(DBG_GAMELOGIC, "Line special 508 (line #%s) missing back side!\n", sizeu1(i));
break;
case 500: // scroll first side
@@ -7916,7 +7683,7 @@ void T_Disappear(disappear_t *d)
ffloor_t *rover;
register INT32 s;
- for (s = -1; (s = P_FindSectorFromLineTag(&lines[d->affectee], s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(lines[d->affectee].tag, s)) >= 0 ;)
{
for (rover = sectors[s].ffloors; rover; rover = rover->next)
{
@@ -7931,12 +7698,7 @@ void T_Disappear(disappear_t *d)
if (!(lines[d->sourceline].flags & ML_NOCLIMB))
{
-#ifdef ESLOPE
- if (*rover->t_slope)
- sectors[s].soundorg.z = P_GetZAt(*rover->t_slope, sectors[s].soundorg.x, sectors[s].soundorg.y);
- else
-#endif
- sectors[s].soundorg.z = *rover->topheight;
+ sectors[s].soundorg.z = P_GetFFloorTopZAt(rover, sectors[s].soundorg.x, sectors[s].soundorg.y);
S_StartSound(§ors[s].soundorg, sfx_appear);
}
}
@@ -8675,7 +8437,7 @@ static void P_SpawnFriction(void)
else
movefactor = FRACUNIT;
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Friction(friction, movefactor, s, -1);
}
}
@@ -9210,15 +8972,15 @@ static void P_SpawnPushers(void)
switch (l->special)
{
case 541: // wind
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Pusher(p_wind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 544: // current
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Pusher(p_current, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 547: // push/pull
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
{
thing = P_GetPushThing(s);
if (thing) // No MT_P* means no effect
@@ -9226,19 +8988,19 @@ static void P_SpawnPushers(void)
}
break;
case 545: // current up
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Pusher(p_upcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 546: // current down
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Pusher(p_downcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 542: // wind up
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
Add_Pusher(p_upwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 543: // wind down
- for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
+ for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
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 6377059b6ccd066c08abc3554cb844e86df427cf..596d8171d2acfb8b8b337f8a4fc4c686f2d3ce9b 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -55,7 +55,6 @@ fixed_t P_FindNextLowestFloor(sector_t *sec, fixed_t currentheight);
fixed_t P_FindLowestCeilingSurrounding(sector_t *sec);
fixed_t P_FindHighestCeilingSurrounding(sector_t *sec);
-INT32 P_FindSectorFromLineTag(line_t *line, INT32 start);
INT32 P_FindSectorFromTag(INT16 tag, INT32 start);
INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start);
@@ -74,6 +73,7 @@ void P_RunDeNightserizeExecutors(mobj_t *actor);
void P_RunNightsLapExecutors(mobj_t *actor);
void P_RunNightsCapsuleTouchExecutors(mobj_t *actor, boolean entering, boolean enoughspheres);
+UINT16 P_GetFFloorID(ffloor_t *fflr);
ffloor_t *P_GetFFloorByID(sector_t *sec, UINT16 id);
//
@@ -104,10 +104,9 @@ typedef struct
typedef struct
{
thinker_t thinker; ///< Thinker structure for laser.
- ffloor_t *ffloor; ///< 3Dfloor that is a laser.
- sector_t *sector; ///< Sector in which the effect takes place.
- sector_t *sec;
+ INT16 tag;
line_t *sourceline;
+ UINT8 nobosses;
} laserthink_t;
/** Strobe light action structure..
@@ -307,18 +306,130 @@ typedef struct
fixed_t delaytimer;
fixed_t floorwasheight; // Height the floor WAS at
fixed_t ceilingwasheight; // Height the ceiling WAS at
- player_t *player; // Player who initiated the thinker (used for airbob)
line_t *sourceline;
} elevator_t;
+typedef enum
+{
+ CF_RETURN = 1, // Return after crumbling
+ CF_FLOATBOB = 1<<1, // Float on water
+ CF_REVERSE = 1<<2, // Reverse gravity
+} crumbleflag_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ line_t *sourceline;
+ sector_t *sector;
+ sector_t *actionsector; // The sector the rover action is taking place in.
+ player_t *player; // Player who initiated the thinker (used for airbob)
+ INT32 direction;
+ INT32 origalpha;
+ INT32 timer;
+ fixed_t speed;
+ fixed_t floorwasheight; // Height the floor WAS at
+ fixed_t ceilingwasheight; // Height the ceiling WAS at
+ UINT8 flags;
+} crumble_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ line_t *sourceline; // Source line of the thinker
+} noenemies_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ sector_t *sector;
+ fixed_t speed;
+ INT32 direction;
+ fixed_t floorstartheight;
+ fixed_t ceilingstartheight;
+ fixed_t destheight;
+} continuousfall_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ line_t *sourceline;
+ sector_t *sector;
+ fixed_t speed;
+ fixed_t distance;
+ fixed_t floorwasheight;
+ fixed_t ceilingwasheight;
+ boolean low;
+} bouncecheese_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ sector_t *sector;
+ fixed_t speed;
+ INT32 direction;
+ fixed_t floorstartheight;
+ fixed_t ceilingstartheight;
+ INT16 tag;
+} mariothink_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ line_t *sourceline;
+ sector_t *sector;
+} mariocheck_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ line_t *sourceline;
+ sector_t *sector;
+ fixed_t crushspeed;
+ fixed_t retractspeed;
+ INT32 direction;
+ fixed_t floorstartheight;
+ fixed_t ceilingstartheight;
+ INT32 delay;
+ INT16 tag;
+ UINT16 sound;
+} thwomp_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ line_t *sourceline;
+ sector_t *sector;
+ INT16 tag;
+} floatthink_t;
+
typedef struct
{
thinker_t thinker;
- fixed_t vars[16]; // Misc. variables
- fixed_t var2s[16]; // Second misc variables buffer.
line_t *sourceline; // Source line of the thinker
- sector_t *sector; // Sector the thinker is from
-} levelspecthink_t;
+ boolean playersInArea[MAXPLAYERS];
+ boolean playersOnArea[MAXPLAYERS];
+ boolean triggerOnExit;
+} eachtime_t;
+
+typedef enum
+{
+ RF_REVERSE = 1, //Lower when stood on
+ RF_SPINDASH = 1<<1, //Require spindash to move
+ RF_DYNAMIC = 1<<2, //Dynamically sinking platform
+} raiseflag_t;
+
+typedef struct
+{
+ thinker_t thinker;
+ INT16 tag;
+ sector_t *sector;
+ fixed_t ceilingbottom;
+ fixed_t ceilingtop;
+ fixed_t basespeed;
+ fixed_t extraspeed; //For dynamically sinking platform
+ UINT8 shaketimer; //For dynamically sinking platform
+ UINT8 flags;
+} raise_t;
#define ELEVATORSPEED (FRACUNIT*4)
#define FLOORSPEED (FRACUNIT)
@@ -331,36 +442,34 @@ typedef enum
} result_e;
result_e T_MovePlane(sector_t *sector, fixed_t speed, fixed_t dest, boolean crush,
- INT32 floorOrCeiling, INT32 direction);
-INT32 EV_DoFloor(line_t *line, floor_e floortype);
-INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed);
+ boolean ceiling, INT32 direction);
+void EV_DoFloor(line_t *line, floor_e floortype);
+void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed);
void EV_CrumbleChain(sector_t *sec, ffloor_t *rover);
-INT32 EV_BounceSector(sector_t *sector, fixed_t momz, line_t *sourceline);
+void EV_BounceSector(sector_t *sector, fixed_t momz, line_t *sourceline);
// Some other special 3dfloor types
INT32 EV_StartCrumble(sector_t *sector, ffloor_t *rover,
boolean floating, player_t *player, fixed_t origalpha, boolean crumblereturn);
-INT32 EV_DoContinuousFall(sector_t *sec, sector_t *pbacksector, fixed_t spd, boolean backwards);
+void EV_DoContinuousFall(sector_t *sec, sector_t *backsector, fixed_t spd, boolean backwards);
-INT32 EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher);
+void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher);
void T_MoveFloor(floormove_t *movefloor);
void T_MoveElevator(elevator_t *elevator);
-void T_ContinuousFalling(levelspecthink_t *faller);
-void T_BounceCheese(levelspecthink_t *bouncer);
-void T_StartCrumble(elevator_t *elevator);
-void T_MarioBlock(levelspecthink_t *block);
-void T_SpikeSector(levelspecthink_t *spikes);
-void T_FloatSector(levelspecthink_t *floater);
-void T_BridgeThinker(levelspecthink_t *bridge);
-void T_MarioBlockChecker(levelspecthink_t *block);
-void T_ThwompSector(levelspecthink_t *thwomp);
-void T_NoEnemiesSector(levelspecthink_t *nobaddies);
-void T_EachTimeThinker(levelspecthink_t *eachtime);
+void T_ContinuousFalling(continuousfall_t *faller);
+void T_BounceCheese(bouncecheese_t *bouncer);
+void T_StartCrumble(crumble_t *crumble);
+void T_MarioBlock(mariothink_t *block);
+void T_FloatSector(floatthink_t *floater);
+void T_MarioBlockChecker(mariocheck_t *block);
+void T_ThwompSector(thwomp_t *thwomp);
+void T_NoEnemiesSector(noenemies_t *nobaddies);
+void T_EachTimeThinker(eachtime_t *eachtime);
void T_CameraScanner(elevator_t *elevator);
-void T_RaiseSector(levelspecthink_t *sraise);
+void T_RaiseSector(raise_t *raise);
typedef struct
{
diff --git a/src/p_tick.c b/src/p_tick.c
index 1d421ad37c1686f5db2a5b1cb58306e2695e75fb..7ea6edb2d5c4090f996e9ad6e1ff744ccb1e97b5 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -269,9 +269,7 @@ void P_RemoveThinkerDelayed(thinker_t *thinker)
//
void P_RemoveThinker(thinker_t *thinker)
{
-#ifdef HAVE_BLUA
LUA_InvalidateUserdata(thinker);
-#endif
thinker->function.acp1 = (actionf_p1)P_RemoveThinkerDelayed;
}
@@ -643,9 +641,7 @@ void P_Ticker(boolean run)
if (demoplayback)
G_ReadDemoTiccmd(&players[consoleplayer].cmd, 0);
- #ifdef HAVE_BLUA
LUAh_PreThinkFrame();
- #endif
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
@@ -671,9 +667,7 @@ void P_Ticker(boolean run)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerAfterThink(&players[i]);
-#ifdef HAVE_BLUA
LUAh_ThinkFrame();
-#endif
}
// Run shield positioning
@@ -745,9 +739,7 @@ void P_Ticker(boolean run)
if (modeattacking)
G_GhostTicker();
-#ifdef HAVE_BLUA
LUAh_PostThinkFrame();
-#endif
}
P_MapEnd();
@@ -767,9 +759,8 @@ void P_PreTicker(INT32 frames)
{
P_MapStart();
-#ifdef HAVE_BLUA
LUAh_PreThinkFrame();
-#endif
+
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
{
@@ -793,9 +784,7 @@ void P_PreTicker(INT32 frames)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerAfterThink(&players[i]);
-#ifdef HAVE_BLUA
LUAh_ThinkFrame();
-#endif
// Run shield positioning
P_RunShields();
@@ -804,9 +793,7 @@ void P_PreTicker(INT32 frames)
P_UpdateSpecials();
P_RespawnSpecials();
-#ifdef HAVE_BLUA
LUAh_PostThinkFrame();
-#endif
P_MapEnd();
}
diff --git a/src/p_user.c b/src/p_user.c
index 01584eee9f7721bd8c404d69052eeac9bf776fa9..fc5e90c07c97a0ab4a909c8a4103ca067d887976 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -395,7 +395,7 @@ void P_GiveFinishFlags(player_t *player)
mobj_t* flag = P_SpawnMobjFromMobj(player->mo, xoffs, yoffs, 0, MT_FINISHFLAG);
flag->angle = angle;
angle += FixedAngle(120*FRACUNIT);
-
+
P_SetTarget(&flag->target, player->mo);
}
}
@@ -1109,7 +1109,6 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
if (!player->mo || player->spectator || !thing || P_MobjWasRemoved(thing))
return false;
-#ifdef HAVE_BLUA
{
UINT8 shouldCollide = LUAh_PlayerCanDamage(player, thing);
if (P_MobjWasRemoved(thing))
@@ -1119,7 +1118,6 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
else if (shouldCollide == 2)
return false; // force no
}
-#endif
// Invinc/super. Not for Monitors.
if (!(thing->flags & MF_MONITOR) && (player->powers[pw_invulnerability] || player->powers[pw_super]))
@@ -1390,7 +1388,7 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
// Continues are worthless in netgames.
// If that stops being the case uncomment this.
-/* if (!ultimatemode && players[i].marescore > 50000
+/* if (!ultimatemode && continuesInSession && players[i].marescore > 50000
&& oldscore < 50000)
{
players[i].continues += 1;
@@ -1410,7 +1408,7 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
else
player->marescore = MAXSCORE;
- if (!ultimatemode && !(netgame || multiplayer) && G_IsSpecialStage(gamemap)
+ if (!ultimatemode && continuesInSession && G_IsSpecialStage(gamemap)
&& player->marescore >= 50000 && oldscore < 50000)
{
player->continues += 1;
@@ -1492,17 +1490,10 @@ void P_PlayLivesJingle(player_t *player)
if (player && !P_IsLocalPlayer(player))
return;
- if (use1upSound)
+ if (use1upSound || cv_1upsound.value)
S_StartSound(NULL, sfx_oneup);
else if (mariomode)
S_StartSound(NULL, sfx_marioa);
- else if (cv_1upsound.value)
- {
- if (S_sfx[sfx_oneup].lumpnum != LUMPERROR)
- S_StartSound(NULL, sfx_oneup);
- else
- S_StartSound(NULL, sfx_chchng);/* at least play something! */
- }
else
{
P_PlayJingle(player, JT_1UP);
@@ -1521,7 +1512,7 @@ void P_PlayJingle(player_t *player, jingletype_t jingletype)
char newmusic[7];
strncpy(newmusic, musname, 7);
-#if defined(HAVE_BLUA) && defined(HAVE_LUA_MUSICPLUS)
+#ifdef HAVE_LUA_MUSICPLUS
if(LUAh_MusicJingle(jingletype, newmusic, &musflags, &looping))
return;
#endif
@@ -1536,7 +1527,7 @@ void P_PlayJingle(player_t *player, jingletype_t jingletype)
void P_PlayJingleMusic(player_t *player, const char *musname, UINT16 musflags, boolean looping, UINT16 status)
{
// If gamestate != GS_LEVEL, always play the jingle (1-up intermission)
- if (gamestate == GS_LEVEL && !P_IsLocalPlayer(player))
+ if (gamestate == GS_LEVEL && player && !P_IsLocalPlayer(player))
return;
S_RetainMusic(musname, musflags, looping, 0, status);
@@ -1544,7 +1535,7 @@ void P_PlayJingleMusic(player_t *player, const char *musname, UINT16 musflags, b
S_ChangeMusicInternal(musname, looping);
}
-boolean P_EvaluateMusicStatus(UINT16 status)
+boolean P_EvaluateMusicStatus(UINT16 status, const char *musname)
{
// \todo lua hook
int i;
@@ -1601,8 +1592,11 @@ boolean P_EvaluateMusicStatus(UINT16 status)
result = (players[i].nightstime && players[i].nightstime <= 10*TICRATE);
break;
- case JT_NONE: // Null state
case JT_OTHER: // Other state
+ result = LUAh_ShouldJingleContinue(&players[i], musname);
+ break;
+
+ case JT_NONE: // Null state
case JT_MASTER: // Main level music
default:
result = true;
@@ -1865,10 +1859,8 @@ void P_SpawnShieldOrb(player_t *player)
I_Error("P_SpawnShieldOrb: player->mo is NULL!\n");
#endif
-#ifdef HAVE_BLUA
if (LUAh_ShieldSpawn(player))
return;
-#endif
if (player->powers[pw_shield] & SH_FORCE)
orbtype = MT_FORCE_ORB;
@@ -1924,7 +1916,7 @@ void P_SpawnShieldOrb(player_t *player)
shieldobj->colorized = true;
}
else
- shieldobj->color = (UINT8)shieldobj->info->painchance;
+ shieldobj->color = (UINT16)shieldobj->info->painchance;
shieldobj->threshold = (player->powers[pw_shield] & SH_FORCE) ? SH_FORCE : (player->powers[pw_shield] & SH_NOSTACK);
if (shieldobj->info->seestate)
@@ -2275,13 +2267,8 @@ boolean P_InSpaceSector(mobj_t *mo) // Returns true if you are in space
if (GETSECSPECIAL(rover->master->frontsector->special, 1) != SPACESPECIAL)
continue;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) : *rover->bottomheight;
-#else
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-#endif
+ topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
if (mo->z + (mo->height/2) > topheight)
continue;
@@ -2518,13 +2505,8 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand
if (!(rover->flags & FF_QUICKSAND))
continue;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) : *rover->bottomheight;
-#else
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-#endif
+ topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
if (mo->z + flipoffset > topheight)
continue;
@@ -2539,6 +2521,72 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand
return false; // No sand here, Captain!
}
+static boolean P_PlayerCanBust(player_t *player, ffloor_t *rover)
+{
+ if (!(rover->flags & FF_EXISTS))
+ return false;
+
+ if (!(rover->flags & FF_BUSTUP))
+ return false;
+
+ /*if (rover->master->frontsector->crumblestate != CRUMBLE_NONE)
+ return false;*/
+
+ // If it's an FF_SHATTER, you can break it just by touching it.
+ if (rover->flags & FF_SHATTER)
+ return true;
+
+ // If it's an FF_SPINBUST, you can break it if you are in your spinning frames
+ // (either from jumping or spindashing).
+ if (rover->flags & FF_SPINBUST)
+ {
+ if ((player->pflags & PF_SPINNING) && !(player->pflags & PF_STARTDASH))
+ return true;
+
+ if ((player->pflags & PF_JUMPED) && !(player->pflags & PF_NOJUMPDAMAGE))
+ return true;
+ }
+
+ // Strong abilities can break even FF_STRONGBUST.
+ if (player->charability == CA_GLIDEANDCLIMB)
+ return true;
+
+ if (player->pflags & PF_BOUNCING)
+ return true;
+
+ if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)
+ return true;
+
+ if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)
+ return true;
+
+ // Everyone else is out of luck.
+ if (rover->flags & FF_STRONGBUST)
+ return false;
+
+ // Spinning (and not jumping)
+ if ((player->pflags & PF_SPINNING) && !(player->pflags & PF_JUMPED))
+ return true;
+
+ // Super
+ if (player->powers[pw_super])
+ return true;
+
+ // Dashmode
+ if ((player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE) && player->dashmode >= DASHMODE_THRESHOLD)
+ return true;
+
+ // NiGHTS drill
+ if (player->pflags & PF_DRILLING)
+ return true;
+
+ // Recording for Metal Sonic
+ if (metalrecording)
+ return true;
+
+ return false;
+}
+
static void P_CheckBustableBlocks(player_t *player)
{
msecnode_t *node;
@@ -2561,121 +2609,83 @@ static void P_CheckBustableBlocks(player_t *player)
for (node = player->mo->touching_sectorlist; node; node = node->m_sectorlist_next)
{
+ ffloor_t *rover;
+ fixed_t topheight, bottomheight;
+
if (!node->m_sector)
break;
- if (node->m_sector->ffloors)
- {
- ffloor_t *rover;
- fixed_t topheight, bottomheight;
-
- for (rover = node->m_sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS)) continue;
-
- if ((rover->flags & FF_BUSTUP)/* && !rover->master->frontsector->crumblestate*/)
- {
- // If it's an FF_SHATTER, you can break it just by touching it.
- if (rover->flags & FF_SHATTER)
- goto bust;
-
- // If it's an FF_SPINBUST, you can break it if you are in your spinning frames
- // (either from jumping or spindashing).
- if (rover->flags & FF_SPINBUST
- && (((player->pflags & PF_SPINNING) && !(player->pflags & PF_STARTDASH))
- || (player->pflags & PF_JUMPED && !(player->pflags & PF_NOJUMPDAMAGE))))
- goto bust;
-
- // You can always break it if you have CA_GLIDEANDCLIMB
- // or if you are bouncing on it
- // or you are using CA_TWINSPIN/CA2_MELEE.
- if (player->charability == CA_GLIDEANDCLIMB
- || (player->pflags & PF_BOUNCING)
- || ((player->charability == CA_TWINSPIN) && (player->panim == PA_ABILITY))
- || (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2))
- goto bust;
-
- if (rover->flags & FF_STRONGBUST)
- continue;
+ if (!node->m_sector->ffloors)
+ continue;
- // If it's not an FF_STRONGBUST, you can break if you are spinning (and not jumping)
- // or you are super
- // or you are in dashmode with SF_DASHMODE
- // or you are drilling in NiGHTS
- // or you are recording for Metal Sonic
- if (!((player->pflags & PF_SPINNING) && !(player->pflags & PF_JUMPED))
- && !(player->powers[pw_super])
- && !(((player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)) && (player->dashmode >= DASHMODE_THRESHOLD))
- && !(player->pflags & PF_DRILLING)
- && !metalrecording)
- continue;
+ for (rover = node->m_sector->ffloors; rover; rover = rover->next)
+ {
+ if (!P_PlayerCanBust(player, rover))
+ continue;
- bust:
- topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
- bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
+ topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
+ bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
- if (((player->charability == CA_TWINSPIN) && (player->panim == PA_ABILITY))
- || ((P_MobjFlip(player->mo)*player->mo->momz < 0) && (player->pflags & PF_BOUNCING || ((player->charability2 == CA2_MELEE) && (player->panim == PA_ABILITY2)))))
- {
- topheight -= player->mo->momz;
- bottomheight -= player->mo->momz;
- }
+ if (((player->charability == CA_TWINSPIN) && (player->panim == PA_ABILITY))
+ || ((P_MobjFlip(player->mo)*player->mo->momz < 0) && (player->pflags & PF_BOUNCING || ((player->charability2 == CA2_MELEE) && (player->panim == PA_ABILITY2)))))
+ {
+ topheight -= player->mo->momz;
+ bottomheight -= player->mo->momz;
+ }
- // Height checks
- if (rover->flags & FF_SHATTERBOTTOM)
- {
- if (player->mo->z+player->mo->momz + player->mo->height < bottomheight)
- continue;
+ // Height checks
+ if (rover->flags & FF_SHATTERBOTTOM)
+ {
+ if (player->mo->z + player->mo->momz + player->mo->height < bottomheight)
+ continue;
- if (player->mo->z+player->mo->height > bottomheight)
- continue;
- }
- else if (rover->flags & FF_SPINBUST)
- {
- if (player->mo->z+player->mo->momz > topheight)
- continue;
+ if (player->mo->z + player->mo->height > bottomheight)
+ continue;
+ }
+ else if (rover->flags & FF_SPINBUST)
+ {
+ if (player->mo->z + player->mo->momz > topheight)
+ continue;
- if (player->mo->z + player->mo->height < bottomheight)
- continue;
- }
- else if (rover->flags & FF_SHATTER)
- {
- if (player->mo->z + player->mo->momz > topheight)
- continue;
+ if (player->mo->z + player->mo->height < bottomheight)
+ continue;
+ }
+ else if (rover->flags & FF_SHATTER)
+ {
+ if (player->mo->z + player->mo->momz > topheight)
+ continue;
- if (player->mo->z+player->mo->momz + player->mo->height < bottomheight)
- continue;
- }
- else
- {
- if (player->mo->z >= topheight)
- continue;
+ if (player->mo->z + player->mo->momz + player->mo->height < bottomheight)
+ continue;
+ }
+ else
+ {
+ if (player->mo->z >= topheight)
+ continue;
- if (player->mo->z + player->mo->height < bottomheight)
- continue;
- }
+ if (player->mo->z + player->mo->height < bottomheight)
+ continue;
+ }
- // Impede the player's fall a bit
- if (((rover->flags & FF_SPINBUST) || (rover->flags & FF_SHATTER)) && player->mo->z >= topheight)
- player->mo->momz >>= 1;
- else if (rover->flags & FF_SHATTER)
- {
- player->mo->momx >>= 1;
- player->mo->momy >>= 1;
- }
+ // Impede the player's fall a bit
+ if (((rover->flags & FF_SPINBUST) || (rover->flags & FF_SHATTER)) && player->mo->z >= topheight)
+ player->mo->momz >>= 1;
+ else if (rover->flags & FF_SHATTER)
+ {
+ player->mo->momx >>= 1;
+ player->mo->momy >>= 1;
+ }
- //if (metalrecording)
- // G_RecordBustup(rover);
+ //if (metalrecording)
+ // G_RecordBustup(rover);
- EV_CrumbleChain(NULL, rover); // node->m_sector
+ EV_CrumbleChain(NULL, rover); // node->m_sector
- // Run a linedef executor??
- if (rover->master->flags & ML_EFFECT5)
- P_LinedefExecute((INT16)(P_AproxDistance(rover->master->dx, rover->master->dy)>>FRACBITS), player->mo, node->m_sector);
+ // Run a linedef executor??
+ if (rover->master->flags & ML_EFFECT5)
+ P_LinedefExecute((INT16)(P_AproxDistance(rover->master->dx, rover->master->dy)>>FRACBITS), player->mo, node->m_sector);
- goto bustupdone;
- }
- }
+ goto bustupdone;
}
}
bustupdone:
@@ -2694,9 +2704,7 @@ static void P_CheckBouncySectors(player_t *player)
fixed_t oldx;
fixed_t oldy;
fixed_t oldz;
-#ifdef ESLOPE
vector3_t momentum;
-#endif
oldx = player->mo->x;
oldy = player->mo->y;
@@ -2710,130 +2718,109 @@ static void P_CheckBouncySectors(player_t *player)
for (node = player->mo->touching_sectorlist; node; node = node->m_sectorlist_next)
{
+ ffloor_t *rover;
+
if (!node->m_sector)
break;
- if (node->m_sector->ffloors)
+ if (!node->m_sector->ffloors)
+ continue;
+
+ for (rover = node->m_sector->ffloors; rover; rover = rover->next)
{
- ffloor_t *rover;
- boolean top = true;
+ fixed_t bouncestrength;
fixed_t topheight, bottomheight;
- for (rover = node->m_sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS))
- continue; // FOFs should not be bouncy if they don't even "exist"
-
- if (GETSECSPECIAL(rover->master->frontsector->special, 1) != 15)
- continue; // this sector type is required for FOFs to be bouncy
-
- topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
- bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
-
- if (player->mo->z > topheight)
- continue;
-
- if (player->mo->z + player->mo->height < bottomheight)
- continue;
-
- if (oldz < P_GetFOFTopZ(player->mo, node->m_sector, rover, oldx, oldy, NULL)
- && oldz + player->mo->height > P_GetFOFBottomZ(player->mo, node->m_sector, rover, oldx, oldy, NULL))
- top = false;
-
- {
- fixed_t linedist;
-
- linedist = P_AproxDistance(rover->master->v1->x-rover->master->v2->x, rover->master->v1->y-rover->master->v2->y);
+ if (!(rover->flags & FF_EXISTS))
+ continue; // FOFs should not be bouncy if they don't even "exist"
- linedist = FixedDiv(linedist,100*FRACUNIT);
+ if (GETSECSPECIAL(rover->master->frontsector->special, 1) != 15)
+ continue; // this sector type is required for FOFs to be bouncy
- if (top)
- {
- fixed_t newmom;
-
-#ifdef ESLOPE
- pslope_t *slope;
- if (abs(oldz - topheight) < abs(oldz + player->mo->height - bottomheight)) { // Hit top
- slope = *rover->t_slope;
- } else { // Hit bottom
- slope = *rover->b_slope;
- }
+ topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
+ bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
- momentum.x = player->mo->momx;
- momentum.y = player->mo->momy;
- momentum.z = player->mo->momz*2;
+ if (player->mo->z > topheight)
+ continue;
- if (slope)
- P_ReverseQuantizeMomentumToSlope(&momentum, slope);
+ if (player->mo->z + player->mo->height < bottomheight)
+ continue;
- newmom = momentum.z = -FixedMul(momentum.z,linedist)/2;
-#else
- newmom = -FixedMul(player->mo->momz,linedist);
-#endif
+ bouncestrength = P_AproxDistance(rover->master->dx, rover->master->dy)/100;
- if (abs(newmom) < (linedist*2))
- {
- goto bouncydone;
- }
+ if (oldz < P_GetFOFTopZ(player->mo, node->m_sector, rover, oldx, oldy, NULL)
+ && oldz + player->mo->height > P_GetFOFBottomZ(player->mo, node->m_sector, rover, oldx, oldy, NULL))
+ {
+ player->mo->momx = -FixedMul(player->mo->momx,bouncestrength);
+ player->mo->momy = -FixedMul(player->mo->momy,bouncestrength);
- if (!(rover->master->flags & ML_BOUNCY))
- {
- if (newmom > 0)
- {
- if (newmom < 8*FRACUNIT)
- newmom = 8*FRACUNIT;
- }
- else if (newmom > -8*FRACUNIT && newmom != 0)
- newmom = -8*FRACUNIT;
- }
+ 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;
- if (newmom > P_GetPlayerHeight(player)/2)
- newmom = P_GetPlayerHeight(player)/2;
- else if (newmom < -P_GetPlayerHeight(player)/2)
- newmom = -P_GetPlayerHeight(player)/2;
+ momentum.x = player->mo->momx;
+ momentum.y = player->mo->momy;
+ momentum.z = player->mo->momz*2;
-#ifdef ESLOPE
- momentum.z = newmom*2;
+ if (slope)
+ P_ReverseQuantizeMomentumToSlope(&momentum, slope);
- if (slope)
- P_QuantizeMomentumToSlope(&momentum, slope);
+ newmom = momentum.z = -FixedMul(momentum.z,bouncestrength)/2;
- player->mo->momx = momentum.x;
- player->mo->momy = momentum.y;
- player->mo->momz = momentum.z/2;
-#else
- player->mo->momz = newmom;
-#endif
+ if (abs(newmom) < (bouncestrength*2))
+ goto bouncydone;
- if (player->pflags & PF_SPINNING)
- {
- player->pflags &= ~PF_SPINNING;
- player->pflags |= P_GetJumpFlags(player);
- player->pflags |= PF_THOKKED;
- }
- }
- else
+ if (!(rover->master->flags & ML_BOUNCY))
+ {
+ if (newmom > 0)
{
- player->mo->momx = -FixedMul(player->mo->momx,linedist);
- player->mo->momy = -FixedMul(player->mo->momy,linedist);
-
- if (player->pflags & PF_SPINNING)
- {
- player->pflags &= ~PF_SPINNING;
- player->pflags |= P_GetJumpFlags(player);
- player->pflags |= PF_THOKKED;
- }
+ if (newmom < 8*FRACUNIT)
+ newmom = 8*FRACUNIT;
}
-
- if ((player->pflags & PF_SPINNING) && player->speed < FixedMul(1<<FRACBITS, player->mo->scale) && player->mo->momz)
+ else if (newmom < 0)
{
- player->pflags &= ~PF_SPINNING;
- player->pflags |= P_GetJumpFlags(player);
+ if (newmom > -8*FRACUNIT)
+ newmom = -8*FRACUNIT;
}
+ }
- goto bouncydone;
+ 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 (slope)
+ P_QuantizeMomentumToSlope(&momentum, slope);
+
+ player->mo->momx = momentum.x;
+ player->mo->momy = momentum.y;
+ player->mo->momz = momentum.z/2;
+
+ 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;
}
}
bouncydone:
@@ -2860,13 +2847,8 @@ static void P_CheckQuicksand(player_t *player)
if (!(rover->flags & FF_QUICKSAND))
continue;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-#else
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-#endif
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (topheight >= player->mo->z && bottomheight < player->mo->z + player->mo->height)
{
@@ -3019,7 +3001,7 @@ static void P_CheckInvincibilityTimer(player_t *player)
return;
if (mariomode && !player->powers[pw_super])
- player->mo->color = (UINT8)(SKINCOLOR_RUBY + (leveltime % (MAXSKINCOLORS - SKINCOLOR_RUBY))); // Passes through all saturated colours
+ player->mo->color = (UINT16)(SKINCOLOR_RUBY + (leveltime % (numskincolors - SKINCOLOR_RUBY))); // Passes through all saturated colours
else if (leveltime % (TICRATE/7) == 0)
{
mobj_t *sparkle = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_IVSP);
@@ -3200,26 +3182,19 @@ static void P_DoClimbing(player_t *player)
boolean thrust = false;
boolean boostup = false;
boolean skyclimber = false;
- fixed_t floorheight, ceilingheight; // ESLOPE
+ fixed_t floorheight, ceilingheight;
if (!glidesector)
floorclimb = true;
else
{
-#ifdef ESLOPE
- floorheight = glidesector->sector->f_slope ? P_GetZAt(glidesector->sector->f_slope, player->mo->x, player->mo->y)
- : glidesector->sector->floorheight;
- ceilingheight = glidesector->sector->c_slope ? P_GetZAt(glidesector->sector->c_slope, player->mo->x, player->mo->y)
- : glidesector->sector->ceilingheight;
-#else
- floorheight = glidesector->sector->floorheight;
- ceilingheight = glidesector->sector->ceilingheight;
-#endif
+ floorheight = P_GetSectorFloorZAt (glidesector->sector, player->mo->x, player->mo->y);
+ ceilingheight = P_GetSectorCeilingZAt(glidesector->sector, player->mo->x, player->mo->y);
if (glidesector->sector->ffloors)
{
ffloor_t *rover;
- fixed_t topheight, bottomheight; // ESLOPE
+ fixed_t topheight, bottomheight;
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
{
@@ -3228,13 +3203,8 @@ static void P_DoClimbing(player_t *player)
floorclimb = true;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-#else
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-#endif
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
// Only supports rovers that are moving like an 'elevator', not just the top or bottom.
if (rover->master->frontsector->floorspeed && rover->master->frontsector->ceilspeed == 42)
@@ -3275,12 +3245,7 @@ static void P_DoClimbing(player_t *player)
if (roverbelow == rover)
continue;
-#ifdef ESLOPE
- bottomheight2 = *roverbelow->b_slope ? P_GetZAt(*roverbelow->b_slope, player->mo->x, player->mo->y) : *roverbelow->bottomheight;
-#else
- bottomheight2 = *roverbelow->bottomheight;
-#endif
-
+ bottomheight2 = P_GetFFloorBottomZAt(roverbelow, player->mo->x, player->mo->y);
if (bottomheight2 < topheight + FixedMul(16*FRACUNIT, player->mo->scale))
foundfof = true;
}
@@ -3325,12 +3290,7 @@ static void P_DoClimbing(player_t *player)
if (roverbelow == rover)
continue;
-#ifdef ESLOPE
- topheight2 = *roverbelow->t_slope ? P_GetZAt(*roverbelow->t_slope, player->mo->x, player->mo->y) : *roverbelow->topheight;
-#else
- topheight2 = *roverbelow->topheight;
-#endif
-
+ topheight2 = P_GetFFloorTopZAt(roverbelow, player->mo->x, player->mo->y);
if (topheight2 > bottomheight - FixedMul(16*FRACUNIT, player->mo->scale))
foundfof = true;
}
@@ -3384,12 +3344,7 @@ static void P_DoClimbing(player_t *player)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
continue;
-#ifdef ESLOPE
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-#else
- bottomheight = *rover->bottomheight;
-#endif
-
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (bottomheight < floorheight + FixedMul(16*FRACUNIT, player->mo->scale))
{
foundfof = true;
@@ -3429,12 +3384,7 @@ static void P_DoClimbing(player_t *player)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
continue;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
-#else
- topheight = *rover->topheight;
-#endif
-
+ topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
if (topheight > ceilingheight - FixedMul(16*FRACUNIT, player->mo->scale))
{
foundfof = true;
@@ -3806,14 +3756,8 @@ static void P_DoTeeter(player_t *player)
sec = R_PointInSubsector(checkx, checky)->sector;
- ceilingheight = sec->ceilingheight;
- floorheight = sec->floorheight;
-#ifdef ESLOPE
- if (sec->c_slope)
- ceilingheight = P_GetZAt(sec->c_slope, checkx, checky);
- if (sec->f_slope)
- floorheight = P_GetZAt(sec->f_slope, checkx, checky);
-#endif
+ ceilingheight = P_GetSectorCeilingZAt(sec, checkx, checky);
+ floorheight = P_GetSectorFloorZAt (sec, checkx, checky);
highestceilingheight = (ceilingheight > highestceilingheight) ? ceilingheight : highestceilingheight;
lowestfloorheight = (floorheight < lowestfloorheight) ? floorheight : lowestfloorheight;
@@ -3824,13 +3768,8 @@ static void P_DoTeeter(player_t *player)
{
if (!(rover->flags & FF_EXISTS)) continue;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-#else
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-#endif
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (P_CheckSolidLava(rover))
;
@@ -3902,7 +3841,6 @@ static void P_DoTeeter(player_t *player)
BMBOUNDFIX(xl, xh, yl, yh);
// Polyobjects
-#ifdef POLYOBJECTS
validcount++;
for (by = yl; by <= yh; by++)
@@ -3996,7 +3934,6 @@ static void P_DoTeeter(player_t *player)
plink = (polymaplink_t *)(plink->link.next);
}
}
-#endif
if (teeter) // only bother with objects as a last resort if you were already teetering
{
mobj_t *oldtmthing = tmthing;
@@ -4497,13 +4434,16 @@ void P_DoJump(player_t *player, boolean soundandstate)
else if (player->powers[pw_carry] == CR_ROLLOUT)
{
player->mo->momz = 9*FRACUNIT;
- if (P_MobjFlip(player->mo->tracer)*player->mo->tracer->momz > 0)
- player->mo->momz += player->mo->tracer->momz;
- if (!P_IsObjectOnGround(player->mo->tracer))
- P_SetObjectMomZ(player->mo->tracer, -9*FRACUNIT, true);
+ if (player->mo->tracer)
+ {
+ if (P_MobjFlip(player->mo->tracer)*player->mo->tracer->momz > 0)
+ player->mo->momz += player->mo->tracer->momz;
+ if (!P_IsObjectOnGround(player->mo->tracer))
+ P_SetObjectMomZ(player->mo->tracer, -9*FRACUNIT, true);
+ player->mo->tracer->flags |= MF_PUSHABLE;
+ P_SetTarget(&player->mo->tracer->tracer, NULL);
+ }
player->powers[pw_carry] = CR_NONE;
- player->mo->tracer->flags |= MF_PUSHABLE;
- P_SetTarget(&player->mo->tracer->tracer, NULL);
P_SetTarget(&player->mo->tracer, NULL);
}
else if (player->mo->eflags & MFE_GOOWATER)
@@ -4633,17 +4573,13 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
&& (player->pflags & PF_JUMPSTASIS || player->mo->state-states != S_PLAY_GLIDE_LANDING))
return;
-#ifdef HAVE_BLUA
if (cmd->buttons & BT_USE)
{
if (LUAh_SpinSpecial(player))
return;
}
-#endif
-#ifdef ESLOPE
canstand = (!player->mo->standingslope || (player->mo->standingslope->flags & SL_NOPHYSICS) || abs(player->mo->standingslope->zdelta) < FRACUNIT/2);
-#endif
///////////////////////////////
// ability-specific behavior //
@@ -5065,6 +5001,15 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
player->pflags |= PF_THOKKED;
}
+static void P_DoTwinSpin(player_t *player)
+{
+ player->pflags &= ~PF_NOJUMPDAMAGE;
+ player->pflags |= P_GetJumpFlags(player) | PF_THOKKED;
+ S_StartSound(player->mo, sfx_s3k42);
+ player->mo->frame = 0;
+ P_SetPlayerMobjState(player->mo, S_PLAY_TWINSPIN);
+}
+
//
// P_DoJumpStuff
//
@@ -5125,11 +5070,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
}
}
}
- if (cmd->buttons & BT_USE // Spin button effects
- #ifdef HAVE_BLUA
- && !LUAh_ShieldSpecial(player)
- #endif
- )
+ if (cmd->buttons & BT_USE && !LUAh_ShieldSpecial(player)) // Spin button effects
{
// Force stop
if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE)
@@ -5207,51 +5148,43 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
// and you don't have a shield, do it!
P_DoSuperTransformation(player, false);
}
- else
-#ifdef HAVE_BLUA
- if (!LUAh_JumpSpinSpecial(player))
-#endif
- switch (player->charability)
- {
- case CA_THOK:
- if (player->powers[pw_super]) // Super Sonic float
- {
- if ((player->speed > 5*player->mo->scale) // FixedMul(5<<FRACBITS, player->mo->scale), but scale is FRACUNIT-based
- && (P_MobjFlip(player->mo)*player->mo->momz <= 0))
+ else if (!LUAh_JumpSpinSpecial(player))
+ switch (player->charability)
+ {
+ case CA_THOK:
+ if (player->powers[pw_super]) // Super Sonic float
{
- if (player->panim != PA_RUN && player->panim != PA_WALK)
+ if ((player->speed > 5*player->mo->scale) // FixedMul(5<<FRACBITS, player->mo->scale), but scale is FRACUNIT-based
+ && (P_MobjFlip(player->mo)*player->mo->momz <= 0))
{
- if (player->speed >= FixedMul(player->runspeed, player->mo->scale))
- P_SetPlayerMobjState(player->mo, S_PLAY_FLOAT_RUN);
- else
- P_SetPlayerMobjState(player->mo, S_PLAY_FLOAT);
- }
+ if (player->panim != PA_RUN && player->panim != PA_WALK)
+ {
+ if (player->speed >= FixedMul(player->runspeed, player->mo->scale))
+ P_SetPlayerMobjState(player->mo, S_PLAY_FLOAT_RUN);
+ else
+ P_SetPlayerMobjState(player->mo, S_PLAY_FLOAT);
+ }
- player->mo->momz = 0;
- player->pflags &= ~(PF_STARTJUMP|PF_SPINNING);
+ player->mo->momz = 0;
+ player->pflags &= ~(PF_STARTJUMP|PF_SPINNING);
+ }
}
- }
- break;
- case CA_TELEKINESIS:
- if (!(player->pflags & (PF_THOKKED|PF_USEDOWN)) || (player->charflags & SF_MULTIABILITY))
- {
- P_Telekinesis(player,
- -FixedMul(player->actionspd, player->mo->scale), // -ve thrust (pulling towards player)
- FixedMul(384*FRACUNIT, player->mo->scale));
- }
- break;
- case CA_TWINSPIN:
- if ((player->charability2 == CA2_MELEE) && (!(player->pflags & (PF_THOKKED|PF_USEDOWN)) || player->charflags & SF_MULTIABILITY))
- {
- player->pflags |= PF_THOKKED;
- S_StartSound(player->mo, sfx_s3k42);
- player->mo->frame = 0;
- P_SetPlayerMobjState(player->mo, S_PLAY_TWINSPIN);
- }
- break;
- default:
- break;
- }
+ break;
+ case CA_TELEKINESIS:
+ if (!(player->pflags & (PF_THOKKED|PF_USEDOWN)) || (player->charflags & SF_MULTIABILITY))
+ {
+ P_Telekinesis(player,
+ -FixedMul(player->actionspd, player->mo->scale), // -ve thrust (pulling towards player)
+ FixedMul(384*FRACUNIT, player->mo->scale));
+ }
+ break;
+ case CA_TWINSPIN:
+ if ((player->charability2 == CA2_MELEE) && (!(player->pflags & (PF_THOKKED|PF_USEDOWN)) || player->charflags & SF_MULTIABILITY))
+ P_DoTwinSpin(player);
+ break;
+ default:
+ break;
+ }
}
}
@@ -5287,16 +5220,13 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
if (cmd->buttons & BT_JUMP && !player->exiting && !P_PlayerInPain(player))
{
-#ifdef HAVE_BLUA
if (LUAh_JumpSpecial(player))
;
- else
-#endif
- if (player->pflags & PF_JUMPDOWN) // all situations below this require jump button not to be pressed already
+ // all situations below this require jump button not to be pressed already
+ else if (player->pflags & PF_JUMPDOWN)
;
- else
// Jump S3&K style while in quicksand.
- if (P_InQuicksand(player->mo))
+ else if (P_InQuicksand(player->mo))
{
P_DoJump(player, true);
player->secondjump = 0;
@@ -5308,9 +5238,8 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
P_SetTarget(&player->mo->tracer, NULL);
player->powers[pw_flashing] = TICRATE/4;
}
- else
// can't jump while in air, can't jump while jumping
- if (onground || player->climbing || player->powers[pw_carry])
+ else if (onground || player->climbing || player->powers[pw_carry])
{
P_DoJump(player, true);
player->secondjump = 0;
@@ -5326,9 +5255,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
}*/
else if (player->pflags & PF_JUMPED)
{
-#ifdef HAVE_BLUA
if (!LUAh_AbilitySpecial(player))
-#endif
switch (player->charability)
{
case CA_THOK:
@@ -5510,12 +5437,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
break;
case CA_TWINSPIN:
if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
- {
- player->pflags |= PF_THOKKED;
- S_StartSound(player->mo, sfx_s3k42);
- player->mo->frame = 0;
- P_SetPlayerMobjState(player->mo, S_PLAY_TWINSPIN);
- }
+ P_DoTwinSpin(player);
break;
default:
break;
@@ -5523,30 +5445,28 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
}
else if (player->pflags & PF_THOKKED)
{
-#ifdef HAVE_BLUA
if (!LUAh_AbilitySpecial(player))
-#endif
- switch (player->charability)
- {
- case CA_FLY:
- case CA_SWIM: // Swim
- if (player->charability == CA_SWIM && !(player->mo->eflags & MFE_UNDERWATER))
- ; // Can't do anything if you're a fish out of water!
- else if (player->powers[pw_tailsfly]) // If currently flying, give an ascend boost.
- {
- player->fly1 = 20;
+ switch (player->charability)
+ {
+ case CA_FLY:
+ case CA_SWIM: // Swim
+ if (player->charability == CA_SWIM && !(player->mo->eflags & MFE_UNDERWATER))
+ ; // Can't do anything if you're a fish out of water!
+ else if (player->powers[pw_tailsfly]) // If currently flying, give an ascend boost.
+ {
+ player->fly1 = 20;
- if (player->charability == CA_SWIM)
- player->fly1 /= 2;
+ if (player->charability == CA_SWIM)
+ player->fly1 /= 2;
- // Slow down!
- if (player->speed > FixedMul(8*FRACUNIT, player->mo->scale) && player->speed > FixedMul(player->normalspeed>>1, player->mo->scale))
- P_Thrust(player->mo, R_PointToAngle2(0,0,player->mo->momx,player->mo->momy), FixedMul(-4*FRACUNIT, player->mo->scale));
- }
- break;
- default:
- break;
- }
+ // Slow down!
+ if (player->speed > FixedMul(8*FRACUNIT, player->mo->scale) && player->speed > FixedMul(player->normalspeed>>1, player->mo->scale))
+ P_Thrust(player->mo, R_PointToAngle2(0,0,player->mo->momx,player->mo->momy), FixedMul(-4*FRACUNIT, player->mo->scale));
+ }
+ break;
+ default:
+ break;
+ }
}
else if ((player->powers[pw_shield] & SH_NOSTACK) == SH_WHIRLWIND && !player->powers[pw_super])
P_DoJumpShield(player);
@@ -5776,11 +5696,7 @@ static void P_2dMovement(player_t *player)
}
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
player->cmomx = player->cmomy = 0;
- else if (player->onconveyor != 2 && player->onconveyor != 4
-#ifdef POLYOBJECTS
- && player->onconveyor != 1
-#endif
- )
+ else if (player->onconveyor != 2 && player->onconveyor != 4 && player->onconveyor != 1)
player->cmomx = player->cmomy = 0;
player->rmomx = player->mo->momx - player->cmomx;
@@ -5921,12 +5837,10 @@ static void P_3dMovement(player_t *player)
controlstyle_e controlstyle;
boolean spin = ((onground = P_IsObjectOnGround(player->mo)) && (player->pflags & (PF_SPINNING|PF_THOKKED)) == PF_SPINNING && (player->rmomx || player->rmomy) && !(player->pflags & PF_STARTDASH));
fixed_t oldMagnitude, newMagnitude;
-#ifdef ESLOPE
vector3_t totalthrust;
totalthrust.x = totalthrust.y = 0; // I forget if this is needed
totalthrust.z = FRACUNIT*P_MobjFlip(player->mo)/3; // A bit of extra push-back on slopes
-#endif // ESLOPE
// Get the old momentum; this will be needed at the end of the function! -SH
oldMagnitude = R_PointToDist2(player->mo->momx - player->cmomx, player->mo->momy - player->cmomy, 0, 0);
@@ -5977,11 +5891,7 @@ static void P_3dMovement(player_t *player)
}
else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
player->cmomx = player->cmomy = 0;
- else if (player->onconveyor != 2 && player->onconveyor != 4
-#ifdef POLYOBJECTS
- && player->onconveyor != 1
-#endif
- )
+ else if (player->onconveyor != 2 && player->onconveyor != 4 && player->onconveyor != 1)
player->cmomx = player->cmomy = 0;
player->rmomx = player->mo->momx - player->cmomx;
@@ -6127,12 +6037,8 @@ static void P_3dMovement(player_t *player)
movepushforward = FixedMul(movepushforward, player->mo->scale);
-#ifdef ESLOPE
totalthrust.x += P_ReturnThrustX(player->mo, movepushangle, movepushforward);
totalthrust.y += P_ReturnThrustY(player->mo, movepushangle, movepushforward);
-#else
- P_Thrust(player->mo, movepushangle, movepushforward);
-#endif
}
// Sideways movement
if (player->climbing)
@@ -6175,12 +6081,8 @@ static void P_3dMovement(player_t *player)
movepushforward = FixedMul(movepushforward, player->mo->scale);
-#ifdef ESLOPE
totalthrust.x += P_ReturnThrustX(player->mo, controldirection, movepushforward);
totalthrust.y += P_ReturnThrustY(player->mo, controldirection, movepushforward);
-#else
- P_Thrust(player->mo, controldirection, movepushforward);
-#endif
}
}
else if (cmd->sidemove && !(player->pflags & PF_GLIDING) && !player->exiting && !P_PlayerInPain(player))
@@ -6209,15 +6111,10 @@ static void P_3dMovement(player_t *player)
// Finally move the player now that their speed/direction has been decided.
movepushside = FixedMul(movepushside, player->mo->scale);
-#ifdef ESLOPE
totalthrust.x += P_ReturnThrustX(player->mo, movepushsideangle, movepushside);
totalthrust.y += P_ReturnThrustY(player->mo, movepushsideangle, movepushside);
-#else
- P_Thrust(player->mo, movepushsideangle, movepushside);
-#endif
}
-#ifdef ESLOPE
if ((totalthrust.x || totalthrust.y)
&& player->mo->standingslope && (!(player->mo->standingslope->flags & SL_NOPHYSICS)) && abs(player->mo->standingslope->zdelta) > FRACUNIT/2) {
// Factor thrust to slope, but only for the part pushing up it!
@@ -6237,7 +6134,6 @@ static void P_3dMovement(player_t *player)
player->mo->momx += totalthrust.x;
player->mo->momy += totalthrust.y;
-#endif
// Time to ask three questions:
// 1) Are we over topspeed?
@@ -7850,14 +7746,13 @@ void P_ElementalFire(player_t *player, boolean cropcircle)
newx = player->mo->x + P_ReturnThrustX(player->mo, (travelangle + ((i&1) ? -1 : 1)*ANGLE_135), FixedMul(24*FRACUNIT, player->mo->scale));
newy = player->mo->y + P_ReturnThrustY(player->mo, (travelangle + ((i&1) ? -1 : 1)*ANGLE_135), FixedMul(24*FRACUNIT, player->mo->scale));
-#ifdef ESLOPE
if (player->mo->standingslope)
{
- ground = P_GetZAt(player->mo->standingslope, newx, newy);
+ ground = P_GetSlopeZAt(player->mo->standingslope, newx, newy);
if (player->mo->eflags & MFE_VERTICALFLIP)
ground -= FixedMul(mobjinfo[MT_SPINFIRE].height, player->mo->scale);
}
-#endif
+
flame = P_SpawnMobj(newx, newy, ground, MT_SPINFIRE);
P_SetTarget(&flame->target, player->mo);
flame->angle = travelangle;
@@ -8073,7 +7968,7 @@ static void P_MovePlayer(player_t *player)
&& player->mo->state < &states[S_PLAY_NIGHTS_TRANS6]))) // Note the < instead of <=
{
skin_t *skin = ((skin_t *)(player->mo->skin));
- if (skin->flags & SF_SUPER)
+ if (( skin->flags & (SF_SUPER|SF_NONIGHTSSUPER) ) == SF_SUPER)
{
player->mo->color = skin->supercolor
+ ((player->nightstime == player->startedtime)
@@ -8829,10 +8724,7 @@ static void P_MovePlayer(player_t *player)
static void P_DoZoomTube(player_t *player)
{
- INT32 sequence;
fixed_t speed;
- thinker_t *th;
- mobj_t *mo2;
mobj_t *waypoint = NULL;
fixed_t dist;
boolean reverse;
@@ -8848,8 +8740,6 @@ static void P_DoZoomTube(player_t *player)
speed = abs(player->speed);
- sequence = player->mo->tracer->threshold;
-
// change slope
dist = P_AproxDistance(P_AproxDistance(player->mo->tracer->x - player->mo->x, player->mo->tracer->y - player->mo->y), player->mo->tracer->z - player->mo->z);
@@ -8881,28 +8771,7 @@ static void P_DoZoomTube(player_t *player)
CONS_Debug(DBG_GAMELOGIC, "Looking for next waypoint...\n");
// Find next waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (reverse && mo2->health != player->mo->tracer->health - 1)
- continue;
-
- if (!reverse && mo2->health != player->mo->tracer->health + 1)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = reverse ? P_GetPreviousWaypoint(player->mo->tracer, false) : P_GetNextWaypoint(player->mo->tracer, false);
if (waypoint)
{
@@ -8953,8 +8822,6 @@ static void P_DoRopeHang(player_t *player)
{
INT32 sequence;
fixed_t speed;
- thinker_t *th;
- mobj_t *mo2;
mobj_t *waypoint = NULL;
fixed_t dist;
fixed_t playerz;
@@ -9017,50 +8884,14 @@ static void P_DoRopeHang(player_t *player)
CONS_Debug(DBG_GAMELOGIC, "Looking for next waypoint...\n");
// Find next waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (mo2->health != player->mo->tracer->health + 1)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = P_GetNextWaypoint(player->mo->tracer, false);
if (!(player->mo->tracer->flags & MF_SLIDEME) && !waypoint)
{
CONS_Debug(DBG_GAMELOGIC, "Next waypoint not found, wrapping to start...\n");
// Wrap around back to first waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (mo2->health != 0)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = P_GetFirstWaypoint(sequence);
}
if (waypoint)
@@ -9422,7 +9253,7 @@ boolean P_HomingAttack(mobj_t *source, mobj_t *enemy) // Home in on your target
if (enemy->health <= 0) // dead
return false;
- if (!((enemy->flags & (MF_ENEMY|MF_BOSS|MF_MONITOR) && (enemy->flags & MF_SHOOTABLE)) || (enemy->flags & MF_SPRING)) == !(enemy->flags2 & MF2_INVERTAIMABLE)) // allows if it has the flags desired XOR it has the invert aimable flag
+ if (source->player && (!((enemy->flags & (MF_ENEMY|MF_BOSS|MF_MONITOR) && (enemy->flags & MF_SHOOTABLE)) || (enemy->flags & MF_SPRING)) == !(enemy->flags2 & MF2_INVERTAIMABLE))) // allows if it has the flags desired XOR it has the invert aimable flag
return false;
if (enemy->flags2 & MF2_FRET)
@@ -9634,7 +9465,7 @@ static void P_DeathThink(player_t *player)
// continue logic
if (!(netgame || multiplayer) && player->lives <= 0)
{
- if (player->deadtimer > (3*TICRATE) && (cmd->buttons & BT_USE || cmd->buttons & BT_JUMP) && player->continues > 0)
+ if (player->deadtimer > (3*TICRATE) && (cmd->buttons & BT_USE || cmd->buttons & BT_JUMP) && (!continuesInSession || player->continues > 0))
G_UseContinue();
else if (player->deadtimer >= gameovertics)
G_UseContinue(); // Even if we don't have one this handles ending the game
@@ -10328,7 +10159,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
}
}
-#ifdef POLYOBJECTS
// Check polyobjects and see if floorz/ceilingz need to be altered
{
INT32 xl, xh, yl, yh, bx, by;
@@ -10407,7 +10237,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
}
}
}
-#endif
// crushed camera
if (myceilingz <= myfloorz + thiscam->height && !resetcalled && !cameranoclip)
@@ -10635,10 +10464,8 @@ boolean P_SpectatorJoinGame(player_t *player)
else
changeto = (P_RandomFixed() & 1) + 1;
-#ifdef HAVE_BLUA
if (!LUAh_TeamSwitch(player, changeto, true, false, false))
return false;
-#endif
if (player->mo)
{
@@ -10652,11 +10479,9 @@ boolean P_SpectatorJoinGame(player_t *player)
//Reset away view
if (P_IsLocalPlayer(player) && displayplayer != consoleplayer)
{
-#ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(player, &players[displayplayer], true);
-#endif
+ LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -10674,10 +10499,8 @@ 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)))
{
-#ifdef HAVE_BLUA
if (!LUAh_TeamSwitch(player, 3, true, false, false))
return false;
-#endif
if (player->mo)
{
P_RemoveMobj(player->mo);
@@ -10701,11 +10524,9 @@ boolean P_SpectatorJoinGame(player_t *player)
//Reset away view
if (P_IsLocalPlayer(player) && displayplayer != consoleplayer)
{
-#ifdef HAVE_BLUA
// Call ViewpointSwitch hooks here.
// The viewpoint was forcibly changed.
- LUAh_ViewpointSwitch(player, &players[displayplayer], true);
-#endif
+ LUAh_ViewpointSwitch(player, &players[consoleplayer], true);
displayplayer = consoleplayer;
}
@@ -10768,13 +10589,8 @@ static void P_CalcPostImg(player_t *player)
if (!(rover->flags & FF_EXISTS))
continue;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-#else
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-#endif
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (pviewheight >= topheight || pviewheight <= bottomheight)
continue;
@@ -10796,13 +10612,8 @@ static void P_CalcPostImg(player_t *player)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKPLAYER)
continue;
-#ifdef ESLOPE
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-#else
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-#endif
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (pviewheight >= topheight || pviewheight <= bottomheight)
continue;
@@ -10864,7 +10675,7 @@ static sector_t *P_GetMinecartSector(fixed_t x, fixed_t y, fixed_t z, fixed_t *n
if (!(rover->flags & (FF_EXISTS|FF_BLOCKOTHERS)))
continue;
- *nz = *rover->t_slope ? P_GetZAt(*rover->t_slope, x, y) : *rover->topheight;
+ *nz = P_GetFFloorTopZAt(rover, x, y);
if (abs(z - *nz) <= 56*FRACUNIT)
{
sec = §ors[rover->secnum];
@@ -10874,7 +10685,7 @@ static sector_t *P_GetMinecartSector(fixed_t x, fixed_t y, fixed_t z, fixed_t *n
}
- *nz = sec->f_slope ? P_GetZAt(sec->f_slope, x, y) : sec->floorheight;
+ *nz = P_GetSectorFloorZAt(sec, x, y);
if (abs(z - *nz) > 56*FRACUNIT)
return NULL;
@@ -11228,8 +11039,8 @@ static void P_MinecartThink(player_t *player)
if (minecart->standingslope)
{
fixed_t fa2 = (minecart->angle >> ANGLETOFINESHIFT) & FINEMASK;
- fixed_t front = P_GetZAt(minecart->standingslope, minecart->x, minecart->y);
- fixed_t back = P_GetZAt(minecart->standingslope, minecart->x - FINECOSINE(fa2), minecart->y - FINESINE(fa2));
+ fixed_t front = P_GetSlopeZAt(minecart->standingslope, minecart->x, minecart->y);
+ fixed_t back = P_GetSlopeZAt(minecart->standingslope, minecart->x - FINECOSINE(fa2), minecart->y - FINESINE(fa2));
if (abs(front - back) < 3*FRACUNIT)
currentSpeed += (back - front)/3;
@@ -11628,9 +11439,7 @@ void P_PlayerThink(player_t *player)
}
if (player->playerstate == PST_REBORN)
{
-#ifdef HAVE_BLUA
LUAh_PlayerThink(player);
-#endif
return;
}
}
@@ -11734,9 +11543,7 @@ void P_PlayerThink(player_t *player)
if (player->playerstate == PST_DEAD)
{
-#ifdef HAVE_BLUA
LUAh_PlayerThink(player);
-#endif
return;
}
}
@@ -11840,10 +11647,8 @@ void P_PlayerThink(player_t *player)
P_MobjCheckWater(player->mo);
#ifndef SECTORSPECIALSAFTERTHINK
-#ifdef POLYOBJECTS
if (player->onconveyor != 1 || !P_IsObjectOnGround(player->mo))
-#endif
- player->onconveyor = 0;
+ player->onconveyor = 0;
// check special sectors : damage & secrets
if (!player->spectator)
@@ -11859,9 +11664,7 @@ void P_PlayerThink(player_t *player)
{
player->mo->flags2 &= ~MF2_SHADOW;
P_DeathThink(player);
-#ifdef HAVE_BLUA
LUAh_PlayerThink(player);
-#endif
return;
}
@@ -11903,9 +11706,7 @@ void P_PlayerThink(player_t *player)
{
if (P_SpectatorJoinGame(player))
{
-#ifdef HAVE_BLUA
LUAh_PlayerThink(player);
-#endif
return; // player->mo was removed.
}
}
@@ -12010,9 +11811,7 @@ void P_PlayerThink(player_t *player)
if (!player->mo)
{
-#ifdef HAVE_BLUA
LUAh_PlayerThink(player);
-#endif
return; // P_MovePlayer removed player->mo.
}
@@ -12062,6 +11861,9 @@ void P_PlayerThink(player_t *player)
factor = 4;
}
break;
+ case CR_DUSTDEVIL:
+ player->drawangle += ANG20;
+ break;
/* -- in case we wanted to have the camera freely movable during zoom tubes
case CR_ZOOMTUBE:*/
case CR_ROPEHANG:
@@ -12207,12 +12009,10 @@ void P_PlayerThink(player_t *player)
// it lasts for one tic.
player->pflags &= ~PF_FULLSTASIS;
-#ifdef POLYOBJECTS
if (player->onconveyor == 1)
player->onconveyor = 3;
else if (player->onconveyor == 3)
player->cmomy = player->cmomx = 0;
-#endif
P_DoSuperStuff(player);
P_CheckSneakerAndLivesTimer(player);
@@ -12454,9 +12254,7 @@ void P_PlayerThink(player_t *player)
}
#undef dashmode
-#ifdef HAVE_BLUA
LUAh_PlayerThink(player);
-#endif
/*
// Colormap verification
@@ -12547,10 +12345,8 @@ void P_PlayerAfterThink(player_t *player)
cmd = &player->cmd;
#ifdef SECTORSPECIALSAFTERTHINK
-#ifdef POLYOBJECTS
if (player->onconveyor != 1 || !P_IsObjectOnGround(player->mo))
-#endif
- player->onconveyor = 0;
+ player->onconveyor = 0;
// check special sectors : damage & secrets
if (!player->spectator)
@@ -12840,6 +12636,19 @@ void P_PlayerAfterThink(player_t *player)
}
break;
}
+ case CR_DUSTDEVIL:
+ {
+ mobj_t *mo = player->mo, *dustdevil = player->mo->tracer;
+
+ if (abs(mo->x - dustdevil->x) > dustdevil->radius || abs(mo->y - dustdevil->y) > dustdevil->radius)
+ {
+ P_SetTarget(&player->mo->tracer, NULL);
+ player->powers[pw_carry] = CR_NONE;
+ break;
+ }
+
+ break;
+ }
case CR_ROLLOUT:
{
mobj_t *mo = player->mo, *rock = player->mo->tracer;
@@ -12981,6 +12790,12 @@ void P_PlayerAfterThink(player_t *player)
player->mo->flags |= MF_NOGRAVITY;
}
+ if (player->powers[pw_dye])
+ {
+ player->mo->colorized = true;
+ player->mo->color = player->powers[pw_dye];
+ }
+
if (player->followmobj && (player->spectator || player->mo->health <= 0 || player->followmobj->type != player->followitem))
{
P_RemoveMobj(player->followmobj);
@@ -13006,11 +12821,9 @@ void P_PlayerAfterThink(player_t *player)
if (player->followmobj)
{
-#ifdef HAVE_BLUA
if (LUAh_FollowMobj(player, player->followmobj) || P_MobjWasRemoved(player->followmobj))
{;}
else
-#endif
{
switch (player->followmobj->type)
{
diff --git a/src/r_bsp.c b/src/r_bsp.c
index 355d55bc686ed20155acbec19f6d2737420ab625..a430ef04069446eb0aee9452e6acb737ae4332f5 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -354,15 +354,11 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back)
{
return (
-#ifdef POLYOBJECTS
!line->polyseg &&
-#endif
back->ceilingpic == front->ceilingpic
&& back->floorpic == front->floorpic
-#ifdef ESLOPE
&& back->f_slope == front->f_slope
&& back->c_slope == front->c_slope
-#endif
&& back->lightlevel == front->lightlevel
&& !line->sidedef->midtexture
// Check offsets too!
@@ -484,35 +480,28 @@ static void R_AddLine(seg_t *line)
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
- if (
-#ifdef POLYOBJECTS
- !line->polyseg &&
-#endif
- !line->sidedef->midtexture
- && ((!frontsector->ffloors && !backsector->ffloors)
- || (frontsector->tag == backsector->tag)))
+ if (!line->polyseg &&
+ !line->sidedef->midtexture
+ && ((!frontsector->ffloors && !backsector->ffloors)
+ || (frontsector->tag == backsector->tag)))
return; // line is empty, don't even bother
goto clippass; // treat like wide open window instead
}
// Closed door.
-#ifdef ESLOPE
if (frontsector->f_slope || frontsector->c_slope || backsector->f_slope || backsector->c_slope)
{
fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, line->v1->x, line->v1->y); \
- end2 = P_GetZAt(slope, line->v2->x, line->v2->y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, line->v1->x, line->v1->y, normalheight); \
+ end2 = P_GetZAt(slope, line->v2->x, line->v2->y, normalheight);
- SLOPEPARAMS(frontsector->f_slope, frontf1, frontf2, frontsector->floorheight)
+ SLOPEPARAMS(frontsector->f_slope, frontf1, frontf2, frontsector-> floorheight)
SLOPEPARAMS(frontsector->c_slope, frontc1, frontc2, frontsector->ceilingheight)
- SLOPEPARAMS( backsector->f_slope, backf1, backf2, backsector->floorheight)
- SLOPEPARAMS( backsector->c_slope, backc1, backc2, backsector->ceilingheight)
+ SLOPEPARAMS( backsector->f_slope, backf1, backf2, backsector-> floorheight)
+ SLOPEPARAMS( backsector->c_slope, backc1, backc2, backsector->ceilingheight)
#undef SLOPEPARAMS
// if both ceilings are skies, consider it always "open"
// same for floors
@@ -542,7 +531,6 @@ static void R_AddLine(seg_t *line)
goto clippass;
}
else
-#endif
{
// if both ceilings are skies, consider it always "open"
// same for floors
@@ -658,8 +646,6 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
return true;
}
-#ifdef POLYOBJECTS
-
size_t numpolys; // number of polyobjects in current subsector
size_t num_po_ptrs; // number of polyobject pointers allocated
polyobj_t **po_ptrs; // temp ptr array to sort polyobject pointers
@@ -826,7 +812,6 @@ static void R_AddPolyObjects(subsector_t *sub)
R_AddLine(po_ptrs[i]->segs[j]);
}
}
-#endif
//
// R_Subsector
@@ -866,17 +851,8 @@ static void R_Subsector(size_t num)
floorcolormap = ceilingcolormap = frontsector->extra_colormap;
- floorcenterz =
-#ifdef ESLOPE
- frontsector->f_slope ? P_GetZAt(frontsector->f_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-#endif
- frontsector->floorheight;
-
- ceilingcenterz =
-#ifdef ESLOPE
- frontsector->c_slope ? P_GetZAt(frontsector->c_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-#endif
- frontsector->ceilingheight;
+ floorcenterz = P_GetSectorFloorZAt (frontsector, frontsector->soundorg.x, frontsector->soundorg.y);
+ ceilingcenterz = P_GetSectorCeilingZAt(frontsector, frontsector->soundorg.x, frontsector->soundorg.y);
// Check and prep all 3D floors. Set the sector floor/ceiling light levels and colormaps.
if (frontsector->ffloors)
@@ -902,53 +878,29 @@ static void R_Subsector(size_t num)
sub->sector->extra_colormap = frontsector->extra_colormap;
- if (((
-#ifdef ESLOPE
- frontsector->f_slope ? P_GetZAt(frontsector->f_slope, viewx, viewy) :
-#endif
- frontsector->floorheight) < viewz || frontsector->floorpic == skyflatnum
- || (frontsector->heightsec != -1
- && sectors[frontsector->heightsec].ceilingpic == skyflatnum)))
+ if (P_GetSectorFloorZAt(frontsector, viewx, viewy) < viewz
+ || frontsector->floorpic == skyflatnum
+ || (frontsector->heightsec != -1 && sectors[frontsector->heightsec].ceilingpic == skyflatnum))
{
floorplane = R_FindPlane(frontsector->floorheight, frontsector->floorpic, floorlightlevel,
- frontsector->floor_xoffs, frontsector->floor_yoffs, frontsector->floorpic_angle, floorcolormap, NULL
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
-#ifdef ESLOPE
- , frontsector->f_slope
-#endif
- );
+ frontsector->floor_xoffs, frontsector->floor_yoffs, frontsector->floorpic_angle, floorcolormap, NULL, NULL, frontsector->f_slope);
}
else
floorplane = NULL;
- if (((
-#ifdef ESLOPE
- frontsector->c_slope ? P_GetZAt(frontsector->c_slope, viewx, viewy) :
-#endif
- frontsector->ceilingheight) > viewz || frontsector->ceilingpic == skyflatnum
- || (frontsector->heightsec != -1
- && sectors[frontsector->heightsec].floorpic == skyflatnum)))
+ if (P_GetSectorCeilingZAt(frontsector, viewx, viewy) > viewz
+ || frontsector->ceilingpic == skyflatnum
+ || (frontsector->heightsec != -1 && sectors[frontsector->heightsec].floorpic == skyflatnum))
{
ceilingplane = R_FindPlane(frontsector->ceilingheight, frontsector->ceilingpic,
ceilinglightlevel, frontsector->ceiling_xoffs, frontsector->ceiling_yoffs, frontsector->ceilingpic_angle,
- ceilingcolormap, NULL
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
-#ifdef ESLOPE
- , frontsector->c_slope
-#endif
- );
+ ceilingcolormap, NULL, NULL, frontsector->c_slope);
}
else
ceilingplane = NULL;
numffloors = 0;
-#ifdef ESLOPE
ffloor[numffloors].slope = NULL;
-#endif
ffloor[numffloors].plane = NULL;
ffloor[numffloors].polyobj = NULL;
if (frontsector->ffloors)
@@ -973,43 +925,26 @@ static void R_Subsector(size_t num)
ffloor[numffloors].plane = NULL;
ffloor[numffloors].polyobj = NULL;
- heightcheck =
-#ifdef ESLOPE
- *rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) :
-#endif
- *rover->bottomheight;
+ heightcheck = P_GetFFloorBottomZAt(rover, viewx, viewy);
- planecenterz =
-#ifdef ESLOPE
- *rover->b_slope ? P_GetZAt(*rover->b_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-#endif
- *rover->bottomheight;
+ planecenterz = P_GetFFloorBottomZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y);
if (planecenterz <= ceilingcenterz
&& planecenterz >= floorcenterz
- && ((viewz < heightcheck && !(rover->flags & FF_INVERTPLANES))
- || (viewz > heightcheck && (rover->flags & FF_BOTHPLANES))))
+ && ((viewz < heightcheck && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)))
+ || (viewz > heightcheck && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
light = R_GetPlaneLight(frontsector, planecenterz,
viewz < heightcheck);
ffloor[numffloors].plane = R_FindPlane(*rover->bottomheight, *rover->bottompic,
*frontsector->lightlist[light].lightlevel, *rover->bottomxoffs,
- *rover->bottomyoffs, *rover->bottomangle, *frontsector->lightlist[light].extra_colormap, rover
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
-#ifdef ESLOPE
- , *rover->b_slope
-#endif
- );
+ *rover->bottomyoffs, *rover->bottomangle, *frontsector->lightlist[light].extra_colormap, rover, NULL, *rover->b_slope);
-#ifdef ESLOPE
ffloor[numffloors].slope = *rover->b_slope;
// Tell the renderer this sector has slopes in it.
if (ffloor[numffloors].slope)
frontsector->hasslope = true;
-#endif
ffloor[numffloors].height = heightcheck;
ffloor[numffloors].ffloor = rover;
@@ -1020,42 +955,25 @@ static void R_Subsector(size_t num)
ffloor[numffloors].plane = NULL;
ffloor[numffloors].polyobj = NULL;
- heightcheck =
-#ifdef ESLOPE
- *rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) :
-#endif
- *rover->topheight;
+ heightcheck = P_GetFFloorTopZAt(rover, viewx, viewy);
- planecenterz =
-#ifdef ESLOPE
- *rover->t_slope ? P_GetZAt(*rover->t_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-#endif
- *rover->topheight;
+ planecenterz = P_GetFFloorTopZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y);
if (planecenterz >= floorcenterz
&& planecenterz <= ceilingcenterz
- && ((viewz > heightcheck && !(rover->flags & FF_INVERTPLANES))
- || (viewz < heightcheck && (rover->flags & FF_BOTHPLANES))))
+ && ((viewz > heightcheck && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)))
+ || (viewz < heightcheck && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
light = R_GetPlaneLight(frontsector, planecenterz, viewz < heightcheck);
ffloor[numffloors].plane = R_FindPlane(*rover->topheight, *rover->toppic,
*frontsector->lightlist[light].lightlevel, *rover->topxoffs, *rover->topyoffs, *rover->topangle,
- *frontsector->lightlist[light].extra_colormap, rover
-#ifdef POLYOBJECTS_PLANES
- , NULL
-#endif
-#ifdef ESLOPE
- , *rover->t_slope
-#endif
- );
+ *frontsector->lightlist[light].extra_colormap, rover, NULL, *rover->t_slope);
-#ifdef ESLOPE
ffloor[numffloors].slope = *rover->t_slope;
// Tell the renderer this sector has slopes in it.
if (ffloor[numffloors].slope)
frontsector->hasslope = true;
-#endif
ffloor[numffloors].height = heightcheck;
ffloor[numffloors].ffloor = rover;
@@ -1064,7 +982,6 @@ static void R_Subsector(size_t num)
}
}
-#ifdef POLYOBJECTS_PLANES
// Polyobjects have planes, too!
if (sub->polyList)
{
@@ -1093,18 +1010,13 @@ static void R_Subsector(size_t num)
ffloor[numffloors].plane = R_FindPlane(polysec->floorheight, polysec->floorpic,
(light == -1 ? frontsector->lightlevel : *frontsector->lightlist[light].lightlevel), polysec->floor_xoffs, polysec->floor_yoffs,
polysec->floorpic_angle-po->angle,
- (light == -1 ? frontsector->extra_colormap : *frontsector->lightlist[light].extra_colormap), NULL, po
-#ifdef ESLOPE
- , NULL // will ffloors be slopable eventually?
-#endif
- );
+ (light == -1 ? frontsector->extra_colormap : *frontsector->lightlist[light].extra_colormap), NULL, po,
+ NULL); // will ffloors be slopable eventually?
ffloor[numffloors].height = polysec->floorheight;
ffloor[numffloors].polyobj = po;
-#ifdef ESLOPE
ffloor[numffloors].slope = NULL;
-#endif
-// ffloor[numffloors].ffloor = rover;
+ //ffloor[numffloors].ffloor = rover;
po->visplane = ffloor[numffloors].plane;
numffloors++;
}
@@ -1121,18 +1033,13 @@ static void R_Subsector(size_t num)
light = R_GetPlaneLight(frontsector, polysec->floorheight, viewz < polysec->floorheight);
ffloor[numffloors].plane = R_FindPlane(polysec->ceilingheight, polysec->ceilingpic,
(light == -1 ? frontsector->lightlevel : *frontsector->lightlist[light].lightlevel), polysec->ceiling_xoffs, polysec->ceiling_yoffs, polysec->ceilingpic_angle-po->angle,
- (light == -1 ? frontsector->extra_colormap : *frontsector->lightlist[light].extra_colormap), NULL, po
-#ifdef ESLOPE
- , NULL // will ffloors be slopable eventually?
-#endif
- );
+ (light == -1 ? frontsector->extra_colormap : *frontsector->lightlist[light].extra_colormap), NULL, po,
+ NULL); // will ffloors be slopable eventually?
ffloor[numffloors].polyobj = po;
ffloor[numffloors].height = polysec->ceilingheight;
-#ifdef ESLOPE
ffloor[numffloors].slope = NULL;
-#endif
-// ffloor[numffloors].ffloor = rover;
+ //ffloor[numffloors].ffloor = rover;
po->visplane = ffloor[numffloors].plane;
numffloors++;
}
@@ -1140,7 +1047,6 @@ static void R_Subsector(size_t num)
po = (polyobj_t *)(po->link.next);
}
}
-#endif
#ifdef FLOORSPLATS
if (sub->splats)
@@ -1163,21 +1069,15 @@ static void R_Subsector(size_t num)
firstseg = NULL;
-#ifdef POLYOBJECTS
// haleyjd 02/19/06: draw polyobjects before static lines
if (sub->polyList)
R_AddPolyObjects(sub);
-#endif
while (count--)
{
// CONS_Debug(DBG_GAMELOGIC, "Adding normal line %d...(%d)\n", line->linedef-lines, leveltime);
- if (!line->glseg
-#ifdef POLYOBJECTS
- && !line->polyseg // ignore segs that belong to polyobjects
-#endif
- )
- R_AddLine(line);
+ if (!line->glseg && !line->polyseg) // ignore segs that belong to polyobjects
+ R_AddLine(line);
line++;
curline = NULL; /* cph 2001/11/18 - must clear curline now we're done with it, so stuff doesn't try using it for other things */
}
@@ -1195,11 +1095,9 @@ void R_Prep3DFloors(sector_t *sector)
fixed_t bestheight, maxheight;
INT32 count, i;
sector_t *sec;
-#ifdef ESLOPE
pslope_t *bestslope = NULL;
fixed_t heighttest; // I think it's better to check the Z height at the sector's center
// than assume unsloped heights are accurate indicators of order in sloped sectors. -Red
-#endif
count = 1;
for (rover = sector->ffloors; rover; rover = rover->next)
@@ -1222,14 +1120,10 @@ void R_Prep3DFloors(sector_t *sector)
else
memset(sector->lightlist, 0, sizeof (lightlist_t) * count);
-#ifdef ESLOPE
- heighttest = sector->c_slope ? P_GetZAt(sector->c_slope, sector->soundorg.x, sector->soundorg.y) : sector->ceilingheight;
+ heighttest = P_GetSectorCeilingZAt(sector, sector->soundorg.x, sector->soundorg.y);
sector->lightlist[0].height = heighttest + 1;
sector->lightlist[0].slope = sector->c_slope;
-#else
- sector->lightlist[0].height = sector->ceilingheight + 1;
-#endif
sector->lightlist[0].lightlevel = §or->lightlevel;
sector->lightlist[0].caster = NULL;
sector->lightlist[0].extra_colormap = §or->extra_colormap;
@@ -1247,8 +1141,7 @@ void R_Prep3DFloors(sector_t *sector)
&& !(rover->flags & FF_CUTLEVEL) && !(rover->flags & FF_CUTSPRITES)))
continue;
-#ifdef ESLOPE
- heighttest = *rover->t_slope ? P_GetZAt(*rover->t_slope, sector->soundorg.x, sector->soundorg.y) : *rover->topheight;
+ heighttest = P_GetFFloorTopZAt(rover, sector->soundorg.x, sector->soundorg.y);
if (heighttest > bestheight && heighttest < maxheight)
{
@@ -1258,7 +1151,7 @@ void R_Prep3DFloors(sector_t *sector)
continue;
}
if (rover->flags & FF_DOUBLESHADOW) {
- heighttest = *rover->b_slope ? P_GetZAt(*rover->b_slope, sector->soundorg.x, sector->soundorg.y) : *rover->bottomheight;
+ heighttest = P_GetFFloorBottomZAt(rover, sector->soundorg.x, sector->soundorg.y);
if (heighttest > bestheight
&& heighttest < maxheight)
@@ -1269,21 +1162,6 @@ void R_Prep3DFloors(sector_t *sector)
continue;
}
}
-#else
- if (*rover->topheight > bestheight && *rover->topheight < maxheight)
- {
- best = rover;
- bestheight = *rover->topheight;
- continue;
- }
- if (rover->flags & FF_DOUBLESHADOW && *rover->bottomheight > bestheight
- && *rover->bottomheight < maxheight)
- {
- best = rover;
- bestheight = *rover->bottomheight;
- continue;
- }
-#endif
}
if (!best)
{
@@ -1294,9 +1172,7 @@ void R_Prep3DFloors(sector_t *sector)
sector->lightlist[i].height = maxheight = bestheight;
sector->lightlist[i].caster = best;
sector->lightlist[i].flags = best->flags;
-#ifdef ESLOPE
sector->lightlist[i].slope = bestslope;
-#endif
sec = §ors[best->secnum];
if (best->flags & FF_NOSHADE)
@@ -1317,12 +1193,8 @@ void R_Prep3DFloors(sector_t *sector)
if (best->flags & FF_DOUBLESHADOW)
{
-#ifdef ESLOPE
- heighttest = *best->b_slope ? P_GetZAt(*best->b_slope, sector->soundorg.x, sector->soundorg.y) : *best->bottomheight;
+ heighttest = P_GetFFloorBottomZAt(best, sector->soundorg.x, sector->soundorg.y);
if (bestheight == heighttest) ///TODO: do this in a more efficient way -Red
-#else
- if (bestheight == *best->bottomheight)
-#endif
{
sector->lightlist[i].lightlevel = sector->lightlist[best->lastlight].lightlevel;
sector->lightlist[i].extra_colormap =
diff --git a/src/r_bsp.h b/src/r_bsp.h
index 1562b79f6333bffabba3fd3c3f26d0f3015e8ae2..e2da8ebaf54e2226140ee008897d0eefb2432751 100644
--- a/src/r_bsp.h
+++ b/src/r_bsp.h
@@ -40,13 +40,11 @@ void R_PortalClearClipSegs(INT32 start, INT32 end);
void R_ClearDrawSegs(void);
void R_RenderBSPNode(INT32 bspnum);
-#ifdef POLYOBJECTS
void R_SortPolyObjects(subsector_t *sub);
extern size_t numpolys; // number of polyobjects in current subsector
extern size_t num_po_ptrs; // number of polyobject pointers allocated
extern polyobj_t **po_ptrs; // temp ptr array to sort polyobject pointers
-#endif
sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
INT32 *ceilinglightlevel, boolean back);
diff --git a/src/r_data.c b/src/r_data.c
index 553e83bbc186ff2fe52d2a599f0201ba7930ceac..b7221499650a9048c892dafbabff76264fd7b2f9 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -722,14 +722,12 @@ Rloadflats (INT32 i, INT32 w)
}
else
{
- texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
+ texstart = W_CheckNumForMarkerStartPwad("F_START", (UINT16)w, 0);
texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
}
if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
- texstart++; // Do not count the first marker
-
// Work through each lump between the markers in the WAD.
for (j = 0; j < (texend - texstart); j++)
{
@@ -842,7 +840,7 @@ Rloadtextures (INT32 i, INT32 w)
}
else
{
- texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
+ texstart = W_CheckNumForMarkerStartPwad(TX_START, (UINT16)w, 0);
texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
if (texturesLumpPos != INT16_MAX)
@@ -851,8 +849,6 @@ Rloadtextures (INT32 i, INT32 w)
if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
- texstart++; // Do not count the first marker
-
// Work through each lump between the markers in the WAD.
for (j = 0; j < (texend - texstart); j++)
{
@@ -959,14 +955,12 @@ void R_LoadTextures(void)
}
else
{
- texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
+ texstart = W_CheckNumForMarkerStartPwad("F_START", (UINT16)w, 0);
texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
}
if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
- texstart++; // Do not count the first marker
-
// PK3s have subfolders, so we can't just make a simple sum
if (wadfiles[w]->type == RET_PK3)
{
@@ -999,15 +993,13 @@ void R_LoadTextures(void)
}
else
{
- texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
+ texstart = W_CheckNumForMarkerStartPwad(TX_START, (UINT16)w, 0);
texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
}
if (texstart == INT16_MAX || texend == INT16_MAX)
continue;
- texstart++; // Do not count the first marker
-
// PK3s have subfolders, so we can't just make a simple sum
if (wadfiles[w]->type == RET_PK3)
{
@@ -1593,9 +1585,9 @@ lumpnum_t R_GetFlatNumForName(const char *name)
switch (wadfiles[i]->type)
{
case RET_WAD:
- if ((start = W_CheckNumForNamePwad("F_START", (UINT16)i, 0)) == INT16_MAX)
+ if ((start = W_CheckNumForMarkerStartPwad("F_START", (UINT16)i, 0)) == INT16_MAX)
{
- if ((start = W_CheckNumForNamePwad("FF_START", (UINT16)i, 0)) == INT16_MAX)
+ if ((start = W_CheckNumForMarkerStartPwad("FF_START", (UINT16)i, 0)) == INT16_MAX)
continue;
else if ((end = W_CheckNumForNamePwad("FF_END", (UINT16)i, start)) == INT16_MAX)
continue;
diff --git a/src/r_defs.h b/src/r_defs.h
index e6f1e4e7c882d7dbbfe6842b38ad29479977e929..a36568192ebbd320a58b88a58c079e15ba76d833 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -28,8 +28,6 @@
#include "m_aatree.h"
#endif
-#define POLYOBJECTS
-
//
// ClipWallSegment
// Clips the given range of columns
@@ -107,9 +105,7 @@ typedef struct
fixed_t z; ///< Z coordinate.
} degenmobj_t;
-#ifdef POLYOBJECTS
#include "p_polyobj.h"
-#endif
// Store fake planes in a resizable array insted of just by
// heightsec. Allows for multiple fake planes.
@@ -130,11 +126,11 @@ typedef enum
FF_CUTEXTRA = 0x100, ///< Cuts out hidden translucent pixels.
FF_CUTLEVEL = 0x180, ///< Cuts out all hidden pixels.
FF_CUTSPRITES = 0x200, ///< Final step in making 3D water.
- FF_BOTHPLANES = 0x400, ///< Renders both planes all the time.
+ FF_BOTHPLANES = 0x400, ///< Render inside and outside planes.
FF_EXTRA = 0x800, ///< Gets cut by ::FF_CUTEXTRA.
FF_TRANSLUCENT = 0x1000, ///< See through!
FF_FOG = 0x2000, ///< Fog "brush."
- FF_INVERTPLANES = 0x4000, ///< Reverse the plane visibility rules.
+ FF_INVERTPLANES = 0x4000, ///< Only render inside planes.
FF_ALLSIDES = 0x8000, ///< Render inside and outside sides.
FF_INVERTSIDES = 0x10000, ///< Only render inside sides.
FF_DOUBLESHADOW = 0x20000, ///< Make two lightlist entries to reset light?
@@ -171,11 +167,9 @@ typedef struct ffloor_s
fixed_t *bottomyoffs;
angle_t *bottomangle;
-#ifdef ESLOPE
// Pointers to pointers. Yup.
struct pslope_s **t_slope;
struct pslope_s **b_slope;
-#endif
size_t secnum;
ffloortype_e flags;
@@ -208,9 +202,7 @@ typedef struct lightlist_s
extracolormap_t **extra_colormap; // pointer-to-a-pointer, so we can react to colormap changes
INT32 flags;
ffloor_t *caster;
-#ifdef ESLOPE
struct pslope_s *slope; // FF_DOUBLESHADOW makes me have to store this pointer here. Bluh bluh.
-#endif
} lightlist_t;
@@ -244,7 +236,6 @@ typedef struct linechain_s
// Slopes
-#ifdef ESLOPE
typedef enum {
SL_NOPHYSICS = 1, /// This plane will have no physics applied besides the positioning.
SL_DYNAMIC = 1<<1, /// This plane slope will be assigned a thinker to make it dynamic.
@@ -268,7 +259,6 @@ typedef struct pslope_s
UINT8 flags; // Slope options
} pslope_t;
-#endif
typedef enum
{
@@ -283,6 +273,16 @@ typedef enum
SF_INVERTPRECIP = 1<<4,
} sectorflags_t;
+
+typedef enum
+{
+ CRUMBLE_NONE, // No crumble thinker
+ CRUMBLE_WAIT, // Don't float on water because this is supposed to wait for a crumble
+ CRUMBLE_ACTIVATED, // Crumble thinker activated, but hasn't fallen yet
+ CRUMBLE_FALL, // Crumble thinker is falling
+ CRUMBLE_RESTORE, // Crumble thinker is about to restore to original position
+} crumblestate_t;
+
//
// The SECTORS record, at runtime.
// Stores things/mobjs.
@@ -334,11 +334,6 @@ typedef struct sector_s
size_t linecount;
struct line_s **lines; // [linecount] size
- // Hack: store special line tagging to some sectors
- // to efficiently help work around bugs by directly
- // referencing the specific line that the problem happens in.
- // (used in T_MovePlane mobj physics)
- struct line_s *tagline;
// Improved fake floor hack
ffloor_t *ffloors;
@@ -379,12 +374,10 @@ typedef struct sector_s
precipmobj_t *preciplist;
struct mprecipsecnode_s *touching_preciplist;
-#ifdef ESLOPE
// Eternity engine slope
pslope_t *f_slope; // floor slope
pslope_t *c_slope; // ceiling slope
boolean hasslope; // The sector, or one of its visible FOFs, contains a slope
-#endif
// for fade thinker
INT16 spawn_lightlevel;
@@ -437,9 +430,7 @@ typedef struct line_s
void *splats; // wallsplat_t list
#endif
INT32 firsttag, nexttag; // improves searches for tags.
-#ifdef POLYOBJECTS
polyobj_t *polyobj; // Belongs to a polyobject?
-#endif
char *text; // a concatenation of all front and back texture names, for linedef specials that require a string.
INT16 callcount; // no. of calls left before triggering, for the "X calls" linedef specials, defaults to 0
@@ -482,9 +473,7 @@ typedef struct subsector_s
sector_t *sector;
INT16 numlines;
UINT16 firstline;
-#ifdef POLYOBJECTS
struct polyobj_s *polyList; // haleyjd 02/19/06: list of polyobjects
-#endif
#if 1//#ifdef FLOORSPLATS
void *splats; // floorsplat_t list
#endif
@@ -587,10 +576,8 @@ typedef struct seg_s
// Why slow things down by calculating lightlists for every thick side?
size_t numlights;
r_lightlist_t *rlights;
-#ifdef POLYOBJECTS
polyobj_t *polyseg;
boolean dontrenderme;
-#endif
boolean glseg;
} seg_t;
@@ -668,11 +655,9 @@ typedef struct drawseg_s
UINT8 portalpass; // if > 0 and <= portalrender, do not affect sprite clipping
-#ifdef ESLOPE
fixed_t maskedtextureheight[MAXVIDWIDTH]; // For handling sloped midtextures
vertex_t leftpos, rightpos; // Used for rendering FOF walls with slopes
-#endif
} drawseg_t;
typedef enum
diff --git a/src/r_draw.c b/src/r_draw.c
index f46f4fb134b75e5f79905f7bba152d5c65299e7b..5351ef37f079b151a0c5c3effd5fe3d006109783 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -105,12 +105,10 @@ boolean ds_powersoftwo;
UINT8 *ds_source; // start of a 64*64 tile image
UINT8 *ds_transmap; // one of the translucency tables
-#ifdef ESLOPE
pslope_t *ds_slope; // Current slope being used
floatv3_t ds_su[MAXVIDHEIGHT], ds_sv[MAXVIDHEIGHT], ds_sz[MAXVIDHEIGHT]; // Vectors for... stuff?
floatv3_t *ds_sup, *ds_svp, *ds_szp;
float focallengthf, zeroheight;
-#endif
/** \brief Variable flat sizes
*/
@@ -137,318 +135,6 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
static UINT8** translationtablecache[MAXSKINS + 7] = {NULL};
-const UINT8 Color_Index[MAXTRANSLATIONS-1][16] = {
- // {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, // SKINCOLOR_NONE
-
- // Greyscale ranges
- {0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11}, // SKINCOLOR_WHITE
- {0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x05, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11, 0x12}, // SKINCOLOR_BONE
- {0x02, 0x03, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14}, // SKINCOLOR_CLOUDY
- {0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}, // SKINCOLOR_GREY
- {0x02, 0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d, 0x1f}, // SKINCOLOR_SILVER
- {0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16, 0x17, 0x17, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1c, 0x1d}, // SKINCOLOR_CARBON
- {0x00, 0x05, 0x0a, 0x0f, 0x14, 0x19, 0x1a, 0x1b, 0x1c, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f}, // SKINCOLOR_JET
- {0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1b, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f}, // SKINCOLOR_BLACK
-
- // Desaturated
- {0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x91, 0x91, 0x91, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xaf}, // SKINCOLOR_AETHER
- {0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0xaa, 0xaa, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xad, 0xae, 0xaf}, // SKINCOLOR_SLATE
- {0x90, 0x91, 0x92, 0x93, 0x94, 0x94, 0x95, 0xac, 0xac, 0xad, 0xad, 0xa8, 0xa8, 0xa9, 0xfd, 0xfe}, // SKINCOLOR_BLUEBELL
- {0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0xd3, 0xd3, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0x2b, 0x2c, 0x2e}, // SKINCOLOR_PINK
- {0xd0, 0x30, 0xd8, 0xd9, 0xda, 0xdb, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe3, 0xe6, 0xe8, 0xe9}, // SKINCOLOR_YOGURT
- {0xdf, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef}, // SKINCOLOR_BROWN
- {0xde, 0xe0, 0xe1, 0xe4, 0xe7, 0xe9, 0xeb, 0xec, 0xed, 0xed, 0xed, 0x19, 0x19, 0x1b, 0x1d, 0x1e}, // SKINCOLOR_BRONZE
- {0x51, 0x51, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x56, 0x57, 0xf5, 0xf5, 0xf9, 0xf9, 0xed, 0xed}, // SKINCOLOR_TAN
- {0x54, 0x55, 0x56, 0x56, 0xf2, 0xf3, 0xf3, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfb, 0xed, 0xed}, // SKINCOLOR_BEIGE
- {0x58, 0x58, 0x59, 0x59, 0x5a, 0x5a, 0x5b, 0x5b, 0x5b, 0x5c, 0x5d, 0x5d, 0x5e, 0x5e, 0x5f, 0x5f}, // SKINCOLOR_MOSS
- {0x90, 0x90, 0x91, 0x91, 0xaa, 0xaa, 0xab, 0xab, 0xab, 0xac, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf}, // SKINCOLOR_AZURE
- {0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc2, 0xc3, 0xc3, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7}, // SKINCOLOR_LAVENDER
-
- // Viv's vivid colours (toast 21/07/17)
- {0xb0, 0xb0, 0xc9, 0xca, 0xcc, 0x26, 0x27, 0x28, 0x29, 0x2a, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfd}, // SKINCOLOR_RUBY
- {0xd0, 0xd0, 0xd1, 0xd2, 0x20, 0x21, 0x24, 0x25, 0x26, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e}, // SKINCOLOR_SALMON
- {0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x47, 0x2e, 0x2f}, // SKINCOLOR_RED
- {0x27, 0x27, 0x28, 0x28, 0x29, 0x2a, 0x2b, 0x2b, 0x2c, 0x2d, 0x2e, 0x2e, 0x2e, 0x2f, 0x2f, 0x1f}, // SKINCOLOR_CRIMSON
- {0x31, 0x32, 0x33, 0x36, 0x22, 0x22, 0x25, 0x25, 0x25, 0xcd, 0xcf, 0xcf, 0xc5, 0xc5, 0xc7, 0xc7}, // SKINCOLOR_FLAME
- {0x48, 0x49, 0x40, 0x33, 0x34, 0x36, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2b, 0x2c, 0x47, 0x2e, 0x2f}, // SKINCOLOR_KETCHUP
- {0xd0, 0x30, 0x31, 0x31, 0x32, 0x32, 0xdc, 0xdc, 0xdc, 0xd3, 0xd4, 0xd4, 0xcc, 0xcd, 0xce, 0xcf}, // SKINCOLOR_PEACHY
- {0xd8, 0xd9, 0xdb, 0xdc, 0xde, 0xdf, 0xd5, 0xd5, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0x1d, 0x1f}, // SKINCOLOR_QUAIL
- {0x51, 0x52, 0x40, 0x40, 0x34, 0x36, 0xd5, 0xd5, 0xd6, 0xd7, 0xcf, 0xcf, 0xc6, 0xc6, 0xc7, 0xfe}, // SKINCOLOR_SUNSET
- {0x58, 0x54, 0x40, 0x34, 0x35, 0x38, 0x3a, 0x3c, 0x3d, 0x2a, 0x2b, 0x2c, 0x2c, 0xba, 0xba, 0xbb}, // SKINCOLOR_COPPER
- {0x00, 0xd8, 0xd9, 0xda, 0xdb, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e}, // SKINCOLOR_APRICOT
- {0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x2c}, // SKINCOLOR_ORANGE
- {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3c, 0x3d, 0x3d, 0x3d, 0x3f, 0x2c, 0x2d, 0x47, 0x2e, 0x2f, 0x2f}, // SKINCOLOR_RUST
- {0x51, 0x51, 0x54, 0x54, 0x41, 0x42, 0x43, 0x43, 0x44, 0x45, 0x46, 0x3f, 0x2d, 0x2e, 0x2f, 0x2f}, // SKINCOLOR_GOLD
- {0x53, 0x40, 0x41, 0x42, 0x43, 0xe6, 0xe9, 0xe9, 0xea, 0xec, 0xec, 0xc6, 0xc6, 0xc7, 0xc7, 0xfe}, // SKINCOLOR_SANDY
- {0x52, 0x53, 0x49, 0x49, 0x4a, 0x4a, 0x4b, 0x4b, 0x4b, 0x4c, 0x4d, 0x4d, 0x4e, 0x4e, 0x4f, 0xed}, // SKINCOLOR_YELLOW
- {0x4b, 0x4b, 0x4c, 0x4c, 0x4d, 0x4e, 0xe7, 0xe7, 0xe9, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7, 0xfd}, // SKINCOLOR_OLIVE
- {0x50, 0x51, 0x52, 0x53, 0x48, 0xbc, 0xbd, 0xbe, 0xbe, 0xbf, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, // SKINCOLOR_LIME
- {0x58, 0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbe, 0xbe, 0xbe, 0xbf, 0x5e, 0x5e, 0x5f, 0x5f, 0x77, 0x77}, // SKINCOLOR_PERIDOT
- {0x49, 0x49, 0xbc, 0xbd, 0xbe, 0xbe, 0xbe, 0x67, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6d}, // SKINCOLOR_APPLE
- {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, // SKINCOLOR_GREEN
- {0x65, 0x66, 0x67, 0x68, 0x69, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6e, 0x6e, 0x6e, 0x6f}, // SKINCOLOR_FOREST
- {0x70, 0x70, 0x71, 0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x75, 0x75, 0x76, 0x76, 0x77, 0x77}, // SKINCOLOR_EMERALD
- {0x00, 0x00, 0x58, 0x58, 0x59, 0x62, 0x62, 0x62, 0x64, 0x67, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a}, // SKINCOLOR_MINT
- {0x01, 0x58, 0x59, 0x5a, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0xfd, 0xfd}, // SKINCOLOR_SEAFOAM
- {0x78, 0x79, 0x7a, 0x7a, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c, 0x7d, 0x7e, 0x7e, 0x7f, 0x7f, 0x76, 0x77}, // SKINCOLOR_AQUA
- {0x78, 0x78, 0x8c, 0x8c, 0x8d, 0x8d, 0x8d, 0x8e, 0x8e, 0x8f, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0x8a}, // SKINCOLOR_TEAL
- {0x00, 0x78, 0x78, 0x79, 0x8d, 0x87, 0x88, 0x89, 0x89, 0xae, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfd}, // SKINCOLOR_WAVE
- {0x80, 0x81, 0xff, 0xff, 0x83, 0x83, 0x8d, 0x8d, 0x8d, 0x8e, 0x7e, 0x7f, 0x76, 0x76, 0x77, 0x6e}, // SKINCOLOR_CYAN
- {0x80, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x85, 0x85, 0x86, 0x87, 0x88, 0x89, 0x89, 0x8a, 0x8b}, // SKINCOLOR_SKY
- {0x85, 0x86, 0x87, 0x88, 0x88, 0x89, 0x89, 0x89, 0x8a, 0x8a, 0xfd, 0xfd, 0xfd, 0x1f, 0x1f, 0x1f}, // SKINCOLOR_CERULEAN
- {0x00, 0x00, 0x00, 0x00, 0x80, 0x81, 0x83, 0x83, 0x86, 0x87, 0x95, 0x95, 0xad, 0xad, 0xae, 0xaf}, // SKINCOLOR_ICY
- {0x80, 0x83, 0x86, 0x87, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, // SKINCOLOR_SAPPHIRE
- {0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x9a, 0x9c, 0x9d, 0x9d, 0x9e, 0x9e, 0x9e}, // SKINCOLOR_CORNFLOWER
- {0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, // SKINCOLOR_BLUE
- {0x93, 0x94, 0x95, 0x96, 0x98, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfd, 0xfe, 0xfe}, // SKINCOLOR_COBALT
- {0x80, 0x81, 0x83, 0x86, 0x94, 0x94, 0xa3, 0xa3, 0xa4, 0xa6, 0xa6, 0xa6, 0xa8, 0xa8, 0xa9, 0xa9}, // SKINCOLOR_VAPOR
- {0x92, 0x93, 0x94, 0x94, 0xac, 0xad, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf, 0xa9, 0xa9, 0xfd, 0xfd}, // SKINCOLOR_DUSK
- {0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, // SKINCOLOR_PASTEL
- {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa5, 0xa6, 0xa7, 0xa7, 0xa8, 0xa8, 0xa9, 0xa9}, // SKINCOLOR_PURPLE
- {0x00, 0xd0, 0xd0, 0xc8, 0xc8, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, // SKINCOLOR_BUBBLEGUM
- {0xb3, 0xb3, 0xb4, 0xb5, 0xb6, 0xb6, 0xb7, 0xb7, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb}, // SKINCOLOR_MAGENTA
- {0xb3, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb, 0xc7, 0xc7, 0x1d, 0x1d, 0x1e}, // SKINCOLOR_NEON
- {0xd0, 0xd1, 0xd2, 0xca, 0xcc, 0xb8, 0xb9, 0xb9, 0xba, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfe, 0xfe}, // SKINCOLOR_VIOLET
- {0x00, 0xd0, 0xd1, 0xd2, 0xd3, 0xc1, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xfe, 0x1f}, // SKINCOLOR_LILAC
- {0xc8, 0xd3, 0xd5, 0xd6, 0xd7, 0xce, 0xcf, 0xb9, 0xb9, 0xba, 0xba, 0xa9, 0xa9, 0xa9, 0xfd, 0xfe}, // SKINCOLOR_PLUM
- {0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xcd, 0xce, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfe, 0xfe}, // SKINCOLOR_RASPBERRY
- {0xfc, 0xc8, 0xc8, 0xc9, 0xc9, 0xca, 0xca, 0xcb, 0xcb, 0xcc, 0xcc, 0xcd, 0xcd, 0xce, 0xce, 0xcf}, // SKINCOLOR_ROSY
-
- // {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, // SKINCOLOR_?
-
- // super
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03}, // SKINCOLOR_SUPERSILVER1
- {0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07}, // SKINCOLOR_SUPERSILVER2
- {0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b}, // SKINCOLOR_SUPERSILVER3
- {0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11}, // SKINCOLOR_SUPERSILVER4
- {0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13}, // SKINCOLOR_SUPERSILVER5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2}, // SKINCOLOR_SUPERRED1
- {0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd0, 0xd1, 0xd1, 0xd1, 0xd2, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21}, // SKINCOLOR_SUPERRED2
- {0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23}, // SKINCOLOR_SUPERRED3
- {0x00, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24}, // SKINCOLOR_SUPERRED4
- {0xd0, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25}, // SKINCOLOR_SUPERRED5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34}, // SKINCOLOR_SUPERORANGE1
- {0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34}, // SKINCOLOR_SUPERORANGE2
- {0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x35}, // SKINCOLOR_SUPERORANGE3
- {0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46}, // SKINCOLOR_SUPERORANGE4
- {0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46, 0x47}, // SKINCOLOR_SUPERORANGE5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x52, 0x53, 0x48}, // SKINCOLOR_SUPERGOLD1
- {0x00, 0x50, 0x51, 0x52, 0x53, 0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41}, // SKINCOLOR_SUPERGOLD2
- {0x51, 0x52, 0x53, 0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43}, // SKINCOLOR_SUPERGOLD3
- {0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46}, // SKINCOLOR_SUPERGOLD4
- {0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47}, // SKINCOLOR_SUPERGOLD5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc}, // SKINCOLOR_SUPERPERIDOT1
- {0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe}, // SKINCOLOR_SUPERPERIDOT2
- {0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf}, // SKINCOLOR_SUPERPERIDOT3
- {0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f}, // SKINCOLOR_SUPERPERIDOT4
- {0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f, 0x77}, // SKINCOLOR_SUPERPERIDOT5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x81, 0x82, 0x83, 0x84}, // SKINCOLOR_SUPERSKY1
- {0x00, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86}, // SKINCOLOR_SUPERSKY2
- {0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87}, // SKINCOLOR_SUPERSKY3
- {0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a}, // SKINCOLOR_SUPERSKY4
- {0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a, 0x8b}, // SKINCOLOR_SUPERSKY5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa2}, // SKINCOLOR_SUPERPURPLE1
- {0x00, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5}, // SKINCOLOR_SUPERPURPLE2
- {0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6}, // SKINCOLOR_SUPERPURPLE3
- {0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9}, // SKINCOLOR_SUPERPURPLE4
- {0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9, 0xfd}, // SKINCOLOR_SUPERPURPLE5
-
- {0x00, 0xd0, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x32, 0x33, 0x37, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x2e}, // SKINCOLOR_SUPERRUST1
- {0x30, 0x31, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x38, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x47, 0x2e}, // SKINCOLOR_SUPERRUST2
- {0x31, 0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x3a, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x2e, 0x2e}, // SKINCOLOR_SUPERRUST3
- {0x48, 0x40, 0x41, 0x42, 0x43, 0x44, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x47, 0x2e, 0x2e, 0x2e}, // SKINCOLOR_SUPERRUST4
- {0x41, 0x42, 0x43, 0x43, 0x44, 0x44, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xed, 0xee, 0xee, 0xef, 0xef}, // SKINCOLOR_SUPERRUST5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52}, // SKINCOLOR_SUPERTAN1
- {0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5}, // SKINCOLOR_SUPERTAN2
- {0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9}, // SKINCOLOR_SUPERTAN3
- {0x51, 0x52, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed}, // SKINCOLOR_SUPERTAN4
- {0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed, 0xee, 0xef, 0xef} // SKINCOLOR_SUPERTAN5
-};
-
-// See also the enum skincolors_t
-// TODO Callum: Can this be translated?
-const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS] =
-{
- "None", // SKINCOLOR_NONE,
-
- // Greyscale ranges
- "White", // SKINCOLOR_WHITE,
- "Bone", // SKINCOLOR_BONE,
- "Cloudy", // SKINCOLOR_CLOUDY,
- "Grey", // SKINCOLOR_GREY,
- "Silver", // SKINCOLOR_SILVER,
- "Carbon", // SKINCOLOR_CARBON,
- "Jet", // SKINCOLOR_JET,
- "Black", // SKINCOLOR_BLACK,
-
- // Desaturated
- "Aether", // SKINCOLOR_AETHER,
- "Slate", // SKINCOLOR_SLATE,
- "Bluebell", // SKINCOLOR_BLUEBELL,
- "Pink", // SKINCOLOR_PINK,
- "Yogurt", // SKINCOLOR_YOGURT,
- "Brown", // SKINCOLOR_BROWN,
- "Bronze", // SKINCOLOR_BRONZE,
- "Tan", // SKINCOLOR_TAN,
- "Beige", // SKINCOLOR_BEIGE,
- "Moss", // SKINCOLOR_MOSS,
- "Azure", // SKINCOLOR_AZURE,
- "Lavender", // SKINCOLOR_LAVENDER,
-
- // Viv's vivid colours (toast 21/07/17)
- "Ruby", // SKINCOLOR_RUBY,
- "Salmon", // SKINCOLOR_SALMON,
- "Red", // SKINCOLOR_RED,
- "Crimson", // SKINCOLOR_CRIMSON,
- "Flame", // SKINCOLOR_FLAME,
- "Ketchup", // SKINCOLOR_KETCHUP,
- "Peachy", // SKINCOLOR_PEACHY,
- "Quail", // SKINCOLOR_QUAIL,
- "Sunset", // SKINCOLOR_SUNSET,
- "Copper", // SKINCOLOR_COPPER,
- "Apricot", // SKINCOLOR_APRICOT,
- "Orange", // SKINCOLOR_ORANGE,
- "Rust", // SKINCOLOR_RUST,
- "Gold", // SKINCOLOR_GOLD,
- "Sandy", // SKINCOLOR_SANDY,
- "Yellow", // SKINCOLOR_YELLOW,
- "Olive", // SKINCOLOR_OLIVE,
- "Lime", // SKINCOLOR_LIME,
- "Peridot", // SKINCOLOR_PERIDOT,
- "Apple", // SKINCOLOR_APPLE,
- "Green", // SKINCOLOR_GREEN,
- "Forest", // SKINCOLOR_FOREST,
- "Emerald", // SKINCOLOR_EMERALD,
- "Mint", // SKINCOLOR_MINT,
- "Seafoam", // SKINCOLOR_SEAFOAM,
- "Aqua", // SKINCOLOR_AQUA,
- "Teal", // SKINCOLOR_TEAL,
- "Wave", // SKINCOLOR_WAVE,
- "Cyan", // SKINCOLOR_CYAN,
- "Sky", // SKINCOLOR_SKY,
- "Cerulean", // SKINCOLOR_CERULEAN,
- "Icy", // SKINCOLOR_ICY,
- "Sapphire", // SKINCOLOR_SAPPHIRE,
- "Cornflower", // SKINCOLOR_CORNFLOWER,
- "Blue", // SKINCOLOR_BLUE,
- "Cobalt", // SKINCOLOR_COBALT,
- "Vapor", // SKINCOLOR_VAPOR,
- "Dusk", // SKINCOLOR_DUSK,
- "Pastel", // SKINCOLOR_PASTEL,
- "Purple", // SKINCOLOR_PURPLE,
- "Bubblegum", // SKINCOLOR_BUBBLEGUM,
- "Magenta", // SKINCOLOR_MAGENTA,
- "Neon", // SKINCOLOR_NEON,
- "Violet", // SKINCOLOR_VIOLET,
- "Lilac", // SKINCOLOR_LILAC,
- "Plum", // SKINCOLOR_PLUM,
- "Raspberry", // SKINCOLOR_RASPBERRY,
- "Rosy", // SKINCOLOR_ROSY,
-
- // Super behaves by different rules (one name per 5 colours), and will be accessed exclusively via R_GetSuperColorByName instead of R_GetColorByName.
- "Silver", // SKINCOLOR_SUPERSILVER1,
- "Red", // SKINCOLOR_SUPERRED1,
- "Orange", // SKINCOLOR_SUPERORANGE1,
- "Gold", // SKINCOLOR_SUPERGOLD1,
- "Peridot", // SKINCOLOR_SUPERPERIDOT1,
- "Sky", // SKINCOLOR_SUPERSKY1,
- "Purple", // SKINCOLOR_SUPERPURPLE1,
- "Rust", // SKINCOLOR_SUPERRUST1,
- "Tan" // SKINCOLOR_SUPERTAN1,
-};
-
-/*
-A word of warning: If the following array is non-symmetrical,
-A_SignPlayer's prefoppositecolor behaviour will break.
-*/
-// [0] = opposite skin color,
-// [1] = shade index used by signpost, 0-15 (actual sprite frame is 15 minus this value)
-const UINT8 Color_Opposite[MAXSKINCOLORS - 1][2] =
-{
- // {SKINCOLOR_NONE, 8}, // SKINCOLOR_NONE
-
- // Greyscale ranges
- {SKINCOLOR_BLACK, 5}, // SKINCOLOR_WHITE,
- {SKINCOLOR_JET, 7}, // SKINCOLOR_BONE,
- {SKINCOLOR_CARBON, 7}, // SKINCOLOR_CLOUDY,
- {SKINCOLOR_AETHER, 12}, // SKINCOLOR_GREY,
- {SKINCOLOR_SLATE, 12}, // SKINCOLOR_SILVER,
- {SKINCOLOR_CLOUDY, 7}, // SKINCOLOR_CARBON,
- {SKINCOLOR_BONE, 7}, // SKINCOLOR_JET,
- {SKINCOLOR_WHITE, 7}, // SKINCOLOR_BLACK,
-
- // Desaturated
- {SKINCOLOR_GREY, 15}, // SKINCOLOR_AETHER,
- {SKINCOLOR_SILVER, 12}, // SKINCOLOR_SLATE,
- {SKINCOLOR_COPPER, 4}, // SKINCOLOR_BLUEBELL,
- {SKINCOLOR_AZURE, 9}, // SKINCOLOR_PINK,
- {SKINCOLOR_RUST, 7}, // SKINCOLOR_YOGURT,
- {SKINCOLOR_TAN, 2}, // SKINCOLOR_BROWN,
- {SKINCOLOR_KETCHUP, 0}, // SKINCOLOR_BRONZE,
- {SKINCOLOR_BROWN, 12}, // SKINCOLOR_TAN,
- {SKINCOLOR_MOSS, 5}, // SKINCOLOR_BEIGE,
- {SKINCOLOR_BEIGE, 13}, // SKINCOLOR_MOSS,
- {SKINCOLOR_PINK, 5}, // SKINCOLOR_AZURE,
- {SKINCOLOR_GOLD, 4}, // SKINCOLOR_LAVENDER,
-
- // Viv's vivid colours (toast 21/07/17)
- {SKINCOLOR_EMERALD, 10}, // SKINCOLOR_RUBY,
- {SKINCOLOR_FOREST, 6}, // SKINCOLOR_SALMON,
- {SKINCOLOR_GREEN, 10}, // SKINCOLOR_RED,
- {SKINCOLOR_ICY, 10}, // SKINCOLOR_CRIMSON,
- {SKINCOLOR_PURPLE, 8}, // SKINCOLOR_FLAME,
- {SKINCOLOR_BRONZE, 8}, // SKINCOLOR_KETCHUP,
- {SKINCOLOR_TEAL, 7}, // SKINCOLOR_PEACHY,
- {SKINCOLOR_WAVE, 5}, // SKINCOLOR_QUAIL,
- {SKINCOLOR_SAPPHIRE, 5}, // SKINCOLOR_SUNSET,
- {SKINCOLOR_BLUEBELL, 5}, // SKINCOLOR_COPPER
- {SKINCOLOR_CYAN, 4}, // SKINCOLOR_APRICOT,
- {SKINCOLOR_BLUE, 4}, // SKINCOLOR_ORANGE,
- {SKINCOLOR_YOGURT, 8}, // SKINCOLOR_RUST,
- {SKINCOLOR_LAVENDER, 10}, // SKINCOLOR_GOLD,
- {SKINCOLOR_SKY, 8}, // SKINCOLOR_SANDY,
- {SKINCOLOR_CORNFLOWER, 8}, // SKINCOLOR_YELLOW,
- {SKINCOLOR_DUSK, 3}, // SKINCOLOR_OLIVE,
- {SKINCOLOR_MAGENTA, 9}, // SKINCOLOR_LIME,
- {SKINCOLOR_COBALT, 2}, // SKINCOLOR_PERIDOT,
- {SKINCOLOR_RASPBERRY, 13}, // SKINCOLOR_APPLE,
- {SKINCOLOR_RED, 6}, // SKINCOLOR_GREEN,
- {SKINCOLOR_SALMON, 9}, // SKINCOLOR_FOREST,
- {SKINCOLOR_RUBY, 4}, // SKINCOLOR_EMERALD,
- {SKINCOLOR_VIOLET, 5}, // SKINCOLOR_MINT,
- {SKINCOLOR_PLUM, 6}, // SKINCOLOR_SEAFOAM,
- {SKINCOLOR_ROSY, 7}, // SKINCOLOR_AQUA,
- {SKINCOLOR_PEACHY, 7}, // SKINCOLOR_TEAL,
- {SKINCOLOR_QUAIL, 5}, // SKINCOLOR_WAVE,
- {SKINCOLOR_APRICOT, 6}, // SKINCOLOR_CYAN,
- {SKINCOLOR_SANDY, 1}, // SKINCOLOR_SKY,
- {SKINCOLOR_NEON, 4}, // SKINCOLOR_CERULEAN,
- {SKINCOLOR_CRIMSON, 0}, // SKINCOLOR_ICY,
- {SKINCOLOR_SUNSET, 5}, // SKINCOLOR_SAPPHIRE,
- {SKINCOLOR_YELLOW, 4}, // SKINCOLOR_CORNFLOWER,
- {SKINCOLOR_ORANGE, 5}, // SKINCOLOR_BLUE,
- {SKINCOLOR_PERIDOT, 5}, // SKINCOLOR_COBALT,
- {SKINCOLOR_LILAC, 4}, // SKINCOLOR_VAPOR,
- {SKINCOLOR_OLIVE, 0}, // SKINCOLOR_DUSK,
- {SKINCOLOR_BUBBLEGUM, 9}, // SKINCOLOR_PASTEL,
- {SKINCOLOR_FLAME, 7}, // SKINCOLOR_PURPLE,
- {SKINCOLOR_PASTEL, 8}, // SKINCOLOR_BUBBLEGUM,
- {SKINCOLOR_LIME, 6}, // SKINCOLOR_MAGENTA,
- {SKINCOLOR_CERULEAN, 2}, // SKINCOLOR_NEON,
- {SKINCOLOR_MINT, 6}, // SKINCOLOR_VIOLET,
- {SKINCOLOR_VAPOR, 4}, // SKINCOLOR_LILAC,
- {SKINCOLOR_MINT, 7}, // SKINCOLOR_PLUM,
- {SKINCOLOR_APPLE, 13}, // SKINCOLOR_RASPBERRY
- {SKINCOLOR_AQUA, 1} // SKINCOLOR_ROSY,
-};
-
CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
/** \brief The R_InitTranslationTables
@@ -498,7 +184,7 @@ void R_InitTranslationTables(void)
\param dest_colormap colormap to populate
\param skincolor translation color
*/
-static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
+static void R_RainbowColormap(UINT8 *dest_colormap, UINT16 skincolor)
{
INT32 i;
RGBA_t color;
@@ -511,7 +197,7 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
// first generate the brightness of all the colours of that skincolour
for (i = 0; i < 16; i++)
{
- color = V_GetColor(Color_Index[skincolor-1][i]);
+ color = V_GetColor(skincolors[skincolor].ramp[i]);
SETBRIGHTNESS(colorbrightnesses[i], color.s.red, color.s.green, color.s.blue);
}
@@ -532,7 +218,7 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
if (temp < brightdif)
{
brightdif = (UINT16)temp;
- dest_colormap[i] = Color_Index[skincolor-1][j];
+ dest_colormap[i] = skincolors[skincolor].ramp[j];
}
}
}
@@ -540,7 +226,7 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
#undef SETBRIGHTNESS
-static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color)
+static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, UINT16 color)
{
INT32 i, starttranscolor, skinramplength;
@@ -553,7 +239,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8));
return;
case TC_RAINBOW:
- if (color >= MAXTRANSLATIONS)
+ if (color >= numskincolors)
I_Error("Invalid skin color #%hu.", (UINT16)color);
if (color != SKINCOLOR_NONE)
{
@@ -562,11 +248,11 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
}
break;
case TC_BLINK:
- if (color >= MAXTRANSLATIONS)
+ if (color >= numskincolors)
I_Error("Invalid skin color #%hu.", (UINT16)color);
if (color != SKINCOLOR_NONE)
{
- memset(dest_colormap, Color_Index[color-1][3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
+ memset(dest_colormap, skincolors[color].ramp[3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
return;
}
break;
@@ -587,11 +273,11 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
{
for (i = 0; i < 6; i++)
{
- dest_colormap[Color_Index[SKINCOLOR_BLUE-1][12-i]] = Color_Index[SKINCOLOR_BLUE-1][i];
+ dest_colormap[skincolors[SKINCOLOR_BLUE].ramp[12-i]] = skincolors[SKINCOLOR_BLUE].ramp[i];
}
dest_colormap[159] = dest_colormap[253] = dest_colormap[254] = 0;
for (i = 0; i < 16; i++)
- dest_colormap[96+i] = dest_colormap[Color_Index[SKINCOLOR_COBALT-1][i]];
+ dest_colormap[96+i] = dest_colormap[skincolors[SKINCOLOR_COBALT].ramp[i]];
}
else if (skinnum == TC_DASHMODE) // This is a long one, because MotorRoach basically hand-picked the indices
{
@@ -636,7 +322,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
return;
}
- if (color >= MAXTRANSLATIONS)
+ if (color >= numskincolors)
I_Error("Invalid skin color #%hu.", (UINT16)color);
starttranscolor = (skinnum != TC_DEFAULT) ? skins[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
@@ -660,7 +346,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
// Build the translated ramp
for (i = 0; i < skinramplength; i++)
- dest_colormap[starttranscolor + i] = (UINT8)Color_Index[color-1][i];
+ dest_colormap[starttranscolor + i] = (UINT8)skincolors[color].ramp[i];
}
@@ -672,7 +358,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
\return Colormap. If not cached, caller should Z_Free.
*/
-UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
+UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags)
{
UINT8* ret;
INT32 skintableindex;
@@ -695,7 +381,7 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
// Allocate table for skin if necessary
if (!translationtablecache[skintableindex])
- translationtablecache[skintableindex] = Z_Calloc(MAXTRANSLATIONS * sizeof(UINT8**), PU_STATIC, NULL);
+ translationtablecache[skintableindex] = Z_Calloc(MAXSKINCOLORS * sizeof(UINT8**), PU_STATIC, NULL);
// Get colormap
ret = translationtablecache[skintableindex][color];
@@ -730,29 +416,32 @@ void R_FlushTranslationColormapCache(void)
for (i = 0; i < (INT32)(sizeof(translationtablecache) / sizeof(translationtablecache[0])); i++)
if (translationtablecache[i])
- memset(translationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
+ memset(translationtablecache[i], 0, MAXSKINCOLORS * sizeof(UINT8**));
}
-UINT8 R_GetColorByName(const char *name)
+UINT16 R_GetColorByName(const char *name)
{
- UINT8 color = (UINT8)atoi(name);
- if (color > 0 && color < MAXSKINCOLORS)
+ UINT16 color = (UINT16)atoi(name);
+ if (color > 0 && color < numskincolors)
return color;
- for (color = 1; color < MAXSKINCOLORS; color++)
- if (!stricmp(Color_Names[color], name))
+ for (color = 1; color < numskincolors; color++)
+ if (!stricmp(skincolors[color].name, name))
return color;
return SKINCOLOR_GREEN;
}
-UINT8 R_GetSuperColorByName(const char *name)
+UINT16 R_GetSuperColorByName(const char *name)
{
- UINT8 color; /* = (UINT8)atoi(name); -- This isn't relevant to S_SKIN, which is the only way it's accessible right now. Let's simplify things.
- if (color > MAXSKINCOLORS && color < MAXTRANSLATIONS && !((color - MAXSKINCOLORS) % 5))
- return color;*/
- for (color = 0; color < NUMSUPERCOLORS; color++)
- if (!stricmp(Color_Names[color + MAXSKINCOLORS], name))
- return ((color*5) + MAXSKINCOLORS);
- return SKINCOLOR_SUPERGOLD1;
+ UINT16 i, color = SKINCOLOR_SUPERGOLD1;
+ char *realname = Z_Malloc(MAXCOLORNAME+1, PU_STATIC, NULL);
+ snprintf(realname, MAXCOLORNAME+1, "Super %s 1", name);
+ for (i = 1; i < numskincolors; i++)
+ if (!stricmp(skincolors[i].name, realname)) {
+ color = i;
+ break;
+ }
+ Z_Free(realname);
+ return color;
}
// ==========================================================================
diff --git a/src/r_draw.h b/src/r_draw.h
index 870d294c35eafb8468a13155c383853020a754bd..329c4974a6ca722322fb754fd3faf90e6cd92e13 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -62,7 +62,6 @@ extern boolean ds_powersoftwo;
extern UINT8 *ds_source;
extern UINT8 *ds_transmap;
-#ifdef ESLOPE
typedef struct {
float x, y, z;
} floatv3_t;
@@ -71,7 +70,6 @@ extern pslope_t *ds_slope; // Current slope being used
extern floatv3_t ds_su[MAXVIDHEIGHT], ds_sv[MAXVIDHEIGHT], ds_sz[MAXVIDHEIGHT]; // Vectors for... stuff?
extern floatv3_t *ds_sup, *ds_svp, *ds_szp;
extern float focallengthf, zeroheight;
-#endif
// Variable flat sizes
extern UINT32 nflatxshift;
@@ -114,10 +112,10 @@ extern lumpnum_t viewborderlump[8];
// Initialize color translation tables, for player rendering etc.
void R_InitTranslationTables(void);
-UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags);
+UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags);
void R_FlushTranslationColormapCache(void);
-UINT8 R_GetColorByName(const char *name);
-UINT8 R_GetSuperColorByName(const char *name);
+UINT16 R_GetColorByName(const char *name);
+UINT16 R_GetSuperColorByName(const char *name);
// Custom player skin translation
void R_InitViewBuffer(INT32 width, INT32 height);
@@ -152,7 +150,6 @@ void R_DrawSpan_8(void);
void R_DrawSplat_8(void);
void R_DrawTranslucentSpan_8(void);
void R_DrawTranslucentSplat_8(void);
-#ifdef ESLOPE
void R_DrawTiltedSpan_8(void);
void R_DrawTiltedTranslucentSpan_8(void);
#ifndef NOWATER
@@ -161,7 +158,6 @@ void R_DrawTiltedTranslucentWaterSpan_8(void);
void R_DrawTiltedSplat_8(void);
void R_CalcTiltedLighting(fixed_t start, fixed_t end);
extern INT32 tiltlighting[MAXVIDWIDTH];
-#endif
#ifndef NOWATER
void R_DrawTranslucentWaterSpan_8(void);
extern INT32 ds_bgofs;
@@ -174,14 +170,12 @@ void R_DrawSpan_NPO2_8(void);
void R_DrawTranslucentSpan_NPO2_8(void);
void R_DrawSplat_NPO2_8(void);
void R_DrawTranslucentSplat_NPO2_8(void);
-#ifdef ESLOPE
void R_DrawTiltedSpan_NPO2_8(void);
void R_DrawTiltedTranslucentSpan_NPO2_8(void);
#ifndef NOWATER
void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void);
#endif
void R_DrawTiltedSplat_NPO2_8(void);
-#endif
#ifndef NOWATER
void R_DrawTranslucentWaterSpan_NPO2_8(void);
#endif
diff --git a/src/r_draw8.c b/src/r_draw8.c
index fe0a23770e4fcabcd5fc32c529ebd10e7b617903..940ea724b31ef2411514799d4a9f7df7e284c907 100644
--- a/src/r_draw8.c
+++ b/src/r_draw8.c
@@ -620,7 +620,6 @@ void R_DrawSpan_8 (void)
}
}
-#ifdef ESLOPE
// R_CalcTiltedLighting
// Exactly what it says on the tin. I wish I wasn't too lazy to explain things properly.
INT32 tiltlighting[MAXVIDWIDTH];
@@ -1199,7 +1198,6 @@ void R_DrawTiltedSplat_8(void)
}
#endif
}
-#endif // ESLOPE
/** \brief The R_DrawSplat_8 function
Just like R_DrawSpan_8, but skips transparent pixels.
diff --git a/src/r_draw8_npo2.c b/src/r_draw8_npo2.c
index b91f492f2417535d84516b81cd1354f1c8268d1e..02015569455e94df9e4ec9a8c8be835cbd0da856 100644
--- a/src/r_draw8_npo2.c
+++ b/src/r_draw8_npo2.c
@@ -61,8 +61,6 @@ void R_DrawSpan_NPO2_8 (void)
}
}
-#ifdef ESLOPE
-
#define PLANELIGHTFLOAT (BASEVIDWIDTH * BASEVIDWIDTH / vid.width / (zeroheight - FIXED_TO_FLOAT(viewz)) / 21.0f * FIXED_TO_FLOAT(fovtan))
/** \brief The R_DrawTiltedSpan_NPO2_8 function
@@ -661,7 +659,6 @@ void R_DrawTiltedSplat_NPO2_8(void)
}
#endif
}
-#endif // ESLOPE
/** \brief The R_DrawSplat_NPO2_8 function
Just like R_DrawSpan_NPO2_8, but skips transparent pixels.
@@ -846,7 +843,6 @@ void R_DrawTranslucentWaterSpan_NPO2_8(void)
}
}
-#ifdef ESLOPE
/** \brief The R_DrawTiltedTranslucentWaterSpan_NPO2_8 function
Like DrawTiltedTranslucentSpan_NPO2, but for water
*/
@@ -1043,5 +1039,4 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
}
#endif
}
-#endif // ESLOPE
#endif // NOWATER
diff --git a/src/r_main.c b/src/r_main.c
index 4d1be4b1452ecada3a7dbc44fd9ceba2e1b74d9d..cf7360804338b1e9e9c20f068307b98ea3151fbd 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -479,9 +479,7 @@ static void R_InitTextureMapping(void)
focallength = FixedDiv(projection,
FINETANGENT(FINEANGLES/4+FIELDOFVIEW/2));
-#ifdef ESLOPE
focallengthf = FIXED_TO_FLOAT(focallength);
-#endif
for (i = 0; i < FINEANGLES/2; i++)
{
@@ -1442,7 +1440,7 @@ void R_RenderPlayerView(player_t *player)
else
{
portalclipstart = 0;
- portalclipend = viewwidth-1;
+ portalclipend = viewwidth;
R_ClearClipSegs();
}
R_ClearDrawSegs();
diff --git a/src/r_patch.c b/src/r_patch.c
index 9e31d4d191b8a4e8876722c3c17156096eee92af..ad4b3329a439daf4a5605fb3e8569b2fdc0bd680 100644
--- a/src/r_patch.c
+++ b/src/r_patch.c
@@ -1231,9 +1231,9 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
if (!R_CheckIfPatch(lump))
return;
- width = patch->width;
- height = patch->height;
- leftoffset = patch->leftoffset;
+ width = SHORT(patch->width);
+ height = SHORT(patch->height);
+ leftoffset = SHORT(patch->leftoffset);
// rotation pivot
px = SPRITE_XCENTER;
@@ -1348,7 +1348,7 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
newpatch = R_MaskedFlatToPatch(rawdst, newwidth, newheight, 0, 0, &size);
{
newpatch->leftoffset = (newpatch->width / 2) + (leftoffset - px);
- newpatch->topoffset = (newpatch->height / 2) + (patch->topoffset - py);
+ newpatch->topoffset = (newpatch->height / 2) + (SHORT(patch->topoffset) - py);
}
//BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
@@ -1358,6 +1358,12 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
// P_PrecacheLevel
if (devparm) spritememory += size;
+ // convert everything to little-endian, for big-endian support
+ newpatch->width = SHORT(newpatch->width);
+ newpatch->height = SHORT(newpatch->height);
+ newpatch->leftoffset = SHORT(newpatch->leftoffset);
+ newpatch->topoffset = SHORT(newpatch->topoffset);
+
#ifdef HWRENDER
if (rendermode == render_opengl)
{
diff --git a/src/r_plane.c b/src/r_plane.c
index e1e45517a66d4a530a6477d4970e58d18d6bc292..92795d0fbba4b7797035c8d86a89bd5ae7daa321 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -202,7 +202,6 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
// Needed for ds_bgofs
R_PlaneRipple(currentplane, y, planeheight);
-#ifdef ESLOPE
if (currentplane->slope)
{
ds_sup = &ds_su[y];
@@ -210,7 +209,6 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
ds_szp = &ds_sz[y];
}
else
-#endif
{
ds_xfrac += ripple_xfrac;
ds_yfrac += ripple_yfrac;
@@ -227,12 +225,10 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
if (pindex >= MAXLIGHTZ)
pindex = MAXLIGHTZ - 1;
-#ifdef ESLOPE
if (currentplane->slope)
ds_colormap = colormaps;
else
-#endif
- ds_colormap = planezlight[pindex];
+ ds_colormap = planezlight[pindex];
if (currentplane->extra_colormap)
ds_colormap = currentplane->extra_colormap->colormap + (ds_colormap - colormaps);
@@ -341,21 +337,12 @@ static visplane_t *new_visplane(unsigned hash)
//
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 *pfloor
-#ifdef POLYOBJECTS_PLANES
- , polyobj_t *polyobj
-#endif
-#ifdef ESLOPE
- , pslope_t *slope
-#endif
- )
+ ffloor_t *pfloor, polyobj_t *polyobj, pslope_t *slope)
{
visplane_t *check;
unsigned hash;
-#ifdef ESLOPE
- if (slope); else // Don't mess with this right now if a slope is involved
-#endif
+ if (!slope) // Don't mess with this right now if a slope is involved
{
xoff += viewx;
yoff -= viewy;
@@ -370,7 +357,6 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
}
}
-#ifdef POLYOBJECTS_PLANES
if (polyobj)
{
if (polyobj->angle != 0)
@@ -385,7 +371,6 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
yoff += polyobj->centerPt.y;
}
}
-#endif
// This appears to fix the Nimbus Ruins sky bug.
if (picnum == skyflatnum && pfloor)
@@ -399,12 +384,10 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
for (check = visplanes[hash]; check; check = check->next)
{
-#ifdef POLYOBJECTS_PLANES
if (check->polyobj && pfloor)
continue;
if (polyobj != check->polyobj)
continue;
-#endif
if (height == check->height && picnum == check->picnum
&& lightlevel == check->lightlevel
&& xoff == check->xoffs && yoff == check->yoffs
@@ -413,10 +396,7 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
&& check->viewx == viewx && check->viewy == viewy && check->viewz == viewz
&& check->viewangle == viewangle
&& check->plangle == plangle
-#ifdef ESLOPE
- && check->slope == slope
-#endif
- )
+ && check->slope == slope)
{
return check;
}
@@ -438,12 +418,8 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
check->viewz = viewz;
check->viewangle = viewangle;
check->plangle = plangle;
-#ifdef POLYOBJECTS_PLANES
check->polyobj = polyobj;
-#endif
-#ifdef ESLOPE
check->slope = slope;
-#endif
memset(check->top, 0xff, sizeof (check->top));
memset(check->bottom, 0x00, sizeof (check->bottom));
@@ -510,12 +486,8 @@ visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop)
new_pl->viewz = pl->viewz;
new_pl->viewangle = pl->viewangle;
new_pl->plangle = pl->plangle;
-#ifdef POLYOBJECTS_PLANES
new_pl->polyobj = pl->polyobj;
-#endif
-#ifdef ESLOPE
new_pl->slope = pl->slope;
-#endif
pl = new_pl;
pl->minx = start;
pl->maxx = stop;
@@ -539,11 +511,9 @@ void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop)
// INT32 unionl, unionh;
// INT32 x;
-#ifdef POLYOBJECTS_PLANES
// Don't expand polyobject planes here - we do that on our own.
if (pl->polyobj)
return;
-#endif
if (pl->minx > start) pl->minx = start;
if (pl->maxx < stop) pl->maxx = stop;
@@ -619,11 +589,7 @@ void R_DrawPlanes(void)
{
for (pl = visplanes[i]; pl; pl = pl->next)
{
- if (pl->ffloor != NULL
-#ifdef POLYOBJECTS_PLANES
- || pl->polyobj != NULL
-#endif
- )
+ if (pl->ffloor != NULL || pl->polyobj != NULL)
continue;
R_DrawSinglePlane(pl);
@@ -860,7 +826,6 @@ static UINT8 *R_GetTextureFlat(levelflat_t *levelflat, boolean leveltexture, boo
return flat;
}
-#ifdef ESLOPE
static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
{
// Potentially override other stuff for now cus we're mean. :< But draw a slope plane!
@@ -868,15 +833,15 @@ static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
floatv3_t p, m, n;
float ang;
float vx, vy, vz;
- // compiler complains when P_GetZAt is used in FLOAT_TO_FIXED directly
- // use this as a temp var to store P_GetZAt's return value each time
+ // 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;
vx = FIXED_TO_FLOAT(pl->viewx+xoffs);
vy = FIXED_TO_FLOAT(pl->viewy-yoffs);
vz = FIXED_TO_FLOAT(pl->viewz);
- temp = P_GetZAt(pl->slope, pl->viewx, pl->viewy);
+ temp = P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy);
zeroheight = FIXED_TO_FLOAT(temp);
// p is the texture origin in view space
@@ -885,7 +850,7 @@ static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
ang = ANG2RAD(ANGLE_270 - pl->viewangle);
p.x = vx * cos(ang) - vy * sin(ang);
p.z = vx * sin(ang) + vy * cos(ang);
- temp = P_GetZAt(pl->slope, -xoffs, yoffs);
+ temp = P_GetSlopeZAt(pl->slope, -xoffs, yoffs);
p.y = FIXED_TO_FLOAT(temp) - vz;
// m is the v direction vector in view space
@@ -898,9 +863,9 @@ static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
n.z = -cos(ang);
ang = ANG2RAD(pl->plangle);
- temp = P_GetZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(sin(ang)), pl->viewy + FLOAT_TO_FIXED(cos(ang)));
+ temp = P_GetSlopeZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(sin(ang)), pl->viewy + FLOAT_TO_FIXED(cos(ang)));
m.y = FIXED_TO_FLOAT(temp) - zeroheight;
- temp = P_GetZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(cos(ang)), pl->viewy - FLOAT_TO_FIXED(sin(ang)));
+ temp = P_GetSlopeZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(cos(ang)), pl->viewy - FLOAT_TO_FIXED(sin(ang)));
n.y = FIXED_TO_FLOAT(temp) - zeroheight;
if (ds_powersoftwo)
@@ -951,7 +916,6 @@ d.z = (v1.x * v2.y) - (v1.y * v2.x)
}
#undef SFMULT
}
-#endif // ESLOPE
void R_DrawSinglePlane(visplane_t *pl)
{
@@ -979,118 +943,118 @@ void R_DrawSinglePlane(visplane_t *pl)
#endif
spanfunc = spanfuncs[BASEDRAWFUNC];
-#ifdef POLYOBJECTS_PLANES
- if (pl->polyobj && pl->polyobj->translucency != 0)
+ if (pl->polyobj)
{
- spanfunctype = SPANDRAWFUNC_TRANS;
-
// Hacked up support for alpha value in software mode Tails 09-24-2002 (sidenote: ported to polys 10-15-2014, there was no time travel involved -Red)
if (pl->polyobj->translucency >= 10)
return; // Don't even draw it
else if (pl->polyobj->translucency > 0)
+ {
+ spanfunctype = (pl->polyobj->flags & POF_SPLAT) ? SPANDRAWFUNC_TRANSSPLAT : SPANDRAWFUNC_TRANS;
ds_transmap = transtables + ((pl->polyobj->translucency-1)<<FF_TRANSSHIFT);
- else // Opaque, but allow transparent flat pixels
+ }
+ else if (pl->polyobj->flags & POF_SPLAT) // Opaque, but allow transparent flat pixels
spanfunctype = SPANDRAWFUNC_SPLAT;
- if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
+ if (pl->polyobj->translucency == 0 || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
light = (pl->lightlevel >> LIGHTSEGSHIFT);
else
light = LIGHTLEVELS-1;
-
- } else
-#endif
- if (pl->ffloor)
+ }
+ else
{
- // Don't draw planes that shouldn't be drawn.
- for (rover = pl->ffloor->target->ffloors; rover; rover = rover->next)
+ if (pl->ffloor)
{
- if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA))
+ // Don't draw planes that shouldn't be drawn.
+ for (rover = pl->ffloor->target->ffloors; rover; rover = rover->next)
{
- if (pl->ffloor->flags & FF_EXTRA)
+ if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA))
{
- // The plane is from an extra 3D floor... Check the flags so
- // there are no undesired cuts.
- if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE)))
- && pl->height < *rover->topheight
- && pl->height > *rover->bottomheight)
- return;
+ if (pl->ffloor->flags & FF_EXTRA)
+ {
+ // The plane is from an extra 3D floor... Check the flags so
+ // there are no undesired cuts.
+ if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE)))
+ && pl->height < *rover->topheight
+ && pl->height > *rover->bottomheight)
+ return;
+ }
}
}
- }
- if (pl->ffloor->flags & FF_TRANSLUCENT)
- {
- spanfunctype = 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 = transtables + ((tr_trans90-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 64)
- ds_transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 89)
- ds_transmap = transtables + ((tr_trans70-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 115)
- ds_transmap = transtables + ((tr_trans60-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 140)
- ds_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 166)
- ds_transmap = transtables + ((tr_trans40-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 192)
- ds_transmap = transtables + ((tr_trans30-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 217)
- ds_transmap = transtables + ((tr_trans20-1)<<FF_TRANSSHIFT);
- else if (pl->ffloor->alpha < 243)
- ds_transmap = transtables + ((tr_trans10-1)<<FF_TRANSSHIFT);
- else // Opaque, but allow transparent flat pixels
- spanfunctype = SPANDRAWFUNC_SPLAT;
-
- if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
+ if (pl->ffloor->flags & FF_TRANSLUCENT)
+ {
+ 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 = transtables + ((tr_trans90-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 64)
+ ds_transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 89)
+ ds_transmap = transtables + ((tr_trans70-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 115)
+ ds_transmap = transtables + ((tr_trans60-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 140)
+ ds_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 166)
+ ds_transmap = transtables + ((tr_trans40-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 192)
+ ds_transmap = transtables + ((tr_trans30-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 217)
+ ds_transmap = transtables + ((tr_trans20-1)<<FF_TRANSSHIFT);
+ else if (pl->ffloor->alpha < 243)
+ ds_transmap = transtables + ((tr_trans10-1)<<FF_TRANSSHIFT);
+ else // Opaque, but allow transparent flat pixels
+ spanfunctype = SPANDRAWFUNC_SPLAT;
+
+ if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
+ light = (pl->lightlevel >> LIGHTSEGSHIFT);
+ else
+ light = LIGHTLEVELS-1;
+ }
+ else if (pl->ffloor->flags & FF_FOG)
+ {
+ spanfunctype = SPANDRAWFUNC_FOG;
light = (pl->lightlevel >> LIGHTSEGSHIFT);
- else
- light = LIGHTLEVELS-1;
- }
- else if (pl->ffloor->flags & FF_FOG)
- {
- spanfunctype = SPANDRAWFUNC_FOG;
- light = (pl->lightlevel >> LIGHTSEGSHIFT);
- }
- else light = (pl->lightlevel >> LIGHTSEGSHIFT);
-
-#ifndef NOWATER
- if (pl->ffloor->flags & FF_RIPPLE)
- {
- INT32 top, bottom;
+ }
+ else light = (pl->lightlevel >> LIGHTSEGSHIFT);
- itswater = true;
- if (spanfunctype == SPANDRAWFUNC_TRANS)
+ #ifndef NOWATER
+ if (pl->ffloor->flags & FF_RIPPLE)
{
- spanfunctype = SPANDRAWFUNC_WATER;
+ INT32 top, bottom;
+
+ itswater = true;
+ if (spanfunctype == SPANDRAWFUNC_TRANS)
+ {
+ spanfunctype = SPANDRAWFUNC_WATER;
- // Copy the current scene, ugh
- top = pl->high-8;
- bottom = pl->low+8;
+ // Copy the current scene, ugh
+ top = pl->high-8;
+ bottom = pl->low+8;
- if (top < 0)
- top = 0;
- if (bottom > vid.height)
- bottom = vid.height;
+ if (top < 0)
+ top = 0;
+ if (bottom > vid.height)
+ bottom = vid.height;
- // Only copy the part of the screen we need
- VID_BlitLinearScreen((splitscreen && viewplayer == &players[secondarydisplayplayer]) ? screens[0] + (top+(vid.height>>1))*vid.width : screens[0]+((top)*vid.width), screens[1]+((top)*vid.width),
- vid.width, bottom-top,
- vid.width, vid.width);
+ // Only copy the part of the screen we need
+ VID_BlitLinearScreen((splitscreen && viewplayer == &players[secondarydisplayplayer]) ? screens[0] + (top+(vid.height>>1))*vid.width : screens[0]+((top)*vid.width), screens[1]+((top)*vid.width),
+ vid.width, bottom-top,
+ vid.width, vid.width);
+ }
}
+ #endif
}
-#endif
+ else
+ light = (pl->lightlevel >> LIGHTSEGSHIFT);
}
- else light = (pl->lightlevel >> LIGHTSEGSHIFT);
-#ifdef ESLOPE
- if (!pl->slope) // Don't mess with angle on slopes! We'll handle this ourselves later
-#endif
- if (viewangle != pl->viewangle+pl->plangle)
+ if (!pl->slope // Don't mess with angle on slopes! We'll handle this ourselves later
+ && viewangle != pl->viewangle+pl->plangle)
{
memset(cachedheight, 0, sizeof (cachedheight));
angle = (pl->viewangle+pl->plangle-ANGLE_90)>>ANGLETOFINESHIFT;
@@ -1148,7 +1112,6 @@ void R_DrawSinglePlane(visplane_t *pl)
if (light < 0)
light = 0;
-#ifdef ESLOPE
if (pl->slope)
{
float fudgecanyon = 0;
@@ -1214,7 +1177,7 @@ void R_DrawSinglePlane(visplane_t *pl)
if (itswater)
{
INT32 i;
- fixed_t plheight = abs(P_GetZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
+ fixed_t plheight = abs(P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
fixed_t rxoffs = xoffs;
fixed_t ryoffs = yoffs;
@@ -1248,10 +1211,9 @@ void R_DrawSinglePlane(visplane_t *pl)
spanfunctype = SPANDRAWFUNC_TILTED;
planezlight = scalelight[light];
- } else
-#endif // ESLOPE
-
- planezlight = zlight[light];
+ }
+ else
+ planezlight = zlight[light];
// Use the correct span drawer depending on the powers-of-twoness
if (!ds_powersoftwo)
diff --git a/src/r_plane.h b/src/r_plane.h
index 405dd9726a543889a47474891d209550a8c77ec4..67fa19f38bedd3535f6ad1ec6f501139aa8bd426 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -47,12 +47,8 @@ typedef struct visplane_s
fixed_t xoffs, yoffs; // Scrolling flats.
struct ffloor_s *ffloor;
-#ifdef POLYOBJECTS_PLANES
polyobj_t *polyobj;
-#endif
-#ifdef ESLOPE
pslope_t *slope;
-#endif
} visplane_t;
extern visplane_t *visplanes[MAXVISPLANES];
@@ -82,14 +78,7 @@ 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
-#ifdef POLYOBJECTS_PLANES
- , polyobj_t *polyobj
-#endif
-#ifdef ESLOPE
- , pslope_t *slope
-#endif
- );
+ extracolormap_t *planecolormap, ffloor_t *ffloor, polyobj_t *polyobj, pslope_t *slope);
visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop);
void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop);
void R_PlaneBounds(visplane_t *plane);
@@ -110,18 +99,14 @@ typedef struct planemgr_s
INT16 f_clip[MAXVIDWIDTH];
INT16 c_clip[MAXVIDWIDTH];
-#ifdef ESLOPE
// For slope rendering; the height at the other end
fixed_t f_pos_slope;
fixed_t b_pos_slope;
struct pslope_s *slope;
-#endif
struct ffloor_s *ffloor;
-#ifdef POLYOBJECTS_PLANES
polyobj_t *polyobj;
-#endif
} visffloor_t;
extern visffloor_t ffloor[MAXFFLOORS];
diff --git a/src/r_segs.c b/src/r_segs.c
index 32a9221474bc69d8bf105a90cc5b9e390988e0ab..741a25254037fbc1dd15017603e116d3ee4f8f7d 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -52,20 +52,16 @@ static fixed_t rw_offset2; // for splats
static fixed_t rw_scale, rw_scalestep;
static fixed_t rw_midtexturemid, rw_toptexturemid, rw_bottomtexturemid;
static INT32 worldtop, worldbottom, worldhigh, worldlow;
-#ifdef ESLOPE
static INT32 worldtopslope, worldbottomslope, worldhighslope, worldlowslope; // worldtop/bottom at end of slope
static fixed_t rw_toptextureslide, rw_midtextureslide, rw_bottomtextureslide; // Defines how to adjust Y offsets along the wall for slopes
static fixed_t rw_midtextureback, rw_midtexturebackslide; // Values for masked midtexture height calculation
-#endif
static fixed_t pixhigh, pixlow, pixhighstep, pixlowstep;
static fixed_t topfrac, topstep;
static fixed_t bottomfrac, bottomstep;
static lighttable_t **walllights;
static INT16 *maskedtexturecol;
-#ifdef ESLOPE
static fixed_t *maskedtextureheight = NULL;
-#endif
// ==========================================================================
// R_Splats Wall Splats Drawer
@@ -291,9 +287,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
sector_t *front, *back;
INT32 times, repeats;
INT64 overflow_test;
-#ifdef ESLOPE
INT32 range;
-#endif
// Calculate light table.
// Use different light tables
@@ -341,9 +335,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
}
-#ifdef ESLOPE
range = max(ds->x2-ds->x1, 1);
-#endif
rw_scalestep = ds->scalestep;
spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
@@ -381,30 +373,20 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
for (i = 0; i < dc_numlights; i++)
{
-#ifdef ESLOPE
fixed_t leftheight, rightheight;
-#endif
light = &frontsector->lightlist[i];
rlight = &dc_lightlist[i];
-#ifdef ESLOPE
- if (light->slope) {
- leftheight = P_GetZAt(light->slope, ds->leftpos.x, ds->leftpos.y);
- rightheight = P_GetZAt(light->slope, ds->rightpos.x, ds->rightpos.y);
- } else
- leftheight = rightheight = light->height;
+ leftheight = P_GetLightZAt(light, ds-> leftpos.x, ds-> leftpos.y);
+ rightheight = P_GetLightZAt(light, ds->rightpos.x, ds->rightpos.y);
- leftheight -= viewz;
+ leftheight -= viewz;
rightheight -= viewz;
- rlight->height = (centeryfrac) - FixedMul(leftheight, ds->scale1);
+ rlight->height = (centeryfrac) - FixedMul(leftheight , ds->scale1);
rlight->heightstep = (centeryfrac) - FixedMul(rightheight, ds->scale2);
rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
//if (x1 > ds->x1)
//rlight->height -= (x1 - ds->x1)*rlight->heightstep;
-#else
- rlight->height = (centeryfrac) - FixedMul((light->height - viewz), spryscale);
- rlight->heightstep = -FixedMul(rw_scalestep, (light->height - viewz));
-#endif
rlight->startheight = rlight->height; // keep starting value here to reset for each repeat
rlight->lightlevel = *light->lightlevel;
rlight->extra_colormap = *light->extra_colormap;
@@ -505,40 +487,17 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
}
}
-#ifndef ESLOPE
- if (curline->linedef->flags & ML_DONTPEGBOTTOM)
- {
- dc_texturemid = front->floorheight > back->floorheight
- ? front->floorheight : back->floorheight;
- dc_texturemid = dc_texturemid + textureheight[texnum] - viewz;
- }
- else
- {
- dc_texturemid = front->ceilingheight < back->ceilingheight
- ? front->ceilingheight : back->ceilingheight;
- dc_texturemid = dc_texturemid - viewz;
- }
- dc_texturemid += curline->sidedef->rowoffset;
-
- if (curline->linedef->flags & ML_DONTPEGBOTTOM)
- dc_texturemid += (textureheight[texnum])*times;
- else
- dc_texturemid -= (textureheight[texnum])*times;
-#endif
-
dc_texheight = textureheight[texnum]>>FRACBITS;
// draw the columns
for (dc_x = x1; dc_x <= x2; dc_x++)
{
-#ifdef ESLOPE
dc_texturemid = ds->maskedtextureheight[dc_x];
if (!!(curline->linedef->flags & ML_DONTPEGBOTTOM) ^ !!(curline->linedef->flags & ML_EFFECT3))
dc_texturemid += (textureheight[texnum])*times + textureheight[texnum];
else
dc_texturemid -= (textureheight[texnum])*times;
-#endif
// calculate lighting
if (maskedtexturecol[dc_x] != INT16_MAX)
{
@@ -648,7 +607,6 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
// draw the texture
col = (column_t *)((UINT8 *)R_GetColumn(texnum, maskedtexturecol[dc_x]) - 3);
-//#ifdef POLYOBJECTS_PLANES
#if 0 // Disabling this allows inside edges to render below the planes, for until the clipping is fixed to work right when POs are near the camera. -Red
if (curline->dontrenderme && curline->polyseg && (curline->polyseg->flags & POF_RENDERPLANES))
{
@@ -747,14 +705,8 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
fixed_t offsetvalue = 0;
lightlist_t *light;
r_lightlist_t *rlight;
-#ifdef ESLOPE
INT32 range;
-#endif
-#ifndef ESLOPE
- fixed_t lheight;
-#endif
line_t *newline = NULL;
-#ifdef ESLOPE
// Render FOF sides kinda like normal sides, with the frac and step and everything
// NOTE: INT64 instead of fixed_t because overflow concerns
INT64 top_frac, top_step, bottom_frac, bottom_step;
@@ -764,7 +716,6 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
INT32 oldx = -1;
fixed_t left_top, left_bottom; // needed here for slope skewing
pslope_t *skewslope = NULL;
-#endif
void (*colfunc_2s) (column_t *);
@@ -821,9 +772,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
else if (pfloor->flags & FF_FOG)
colfunc = colfuncs[COLDRAWFUNC_FOG];
-#ifdef ESLOPE
range = max(ds->x2-ds->x1, 1);
-#endif
//SoM: Moved these up here so they are available for my lightlist calculations
rw_scalestep = ds->scalestep;
spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
@@ -840,21 +789,15 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
for (i = p = 0; i < dc_numlights; i++)
{
-#ifdef ESLOPE
fixed_t leftheight, rightheight;
fixed_t pfloorleft, pfloorright;
INT64 overflow_test;
-#endif
light = &frontsector->lightlist[i];
rlight = &dc_lightlist[p];
-#ifdef ESLOPE
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, ds->leftpos.x, ds->leftpos.y); \
- end2 = P_GetZAt(slope, ds->rightpos.x, ds->rightpos.y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, ds-> leftpos.x, ds-> leftpos.y, normalheight); \
+ end2 = P_GetZAt(slope, ds->rightpos.x, ds->rightpos.y, normalheight);
SLOPEPARAMS(light->slope, leftheight, rightheight, light->height)
SLOPEPARAMS(*pfloor->b_slope, pfloorleft, pfloorright, *pfloor->bottomheight)
@@ -867,8 +810,8 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
if (leftheight > pfloorleft && rightheight > pfloorright && i+1 < dc_numlights)
{
lightlist_t *nextlight = &frontsector->lightlist[i+1];
- if ((nextlight->slope ? P_GetZAt(nextlight->slope, ds->leftpos.x, ds->leftpos.y) : nextlight->height) > pfloorleft
- && (nextlight->slope ? P_GetZAt(nextlight->slope, ds->rightpos.x, ds->rightpos.y) : nextlight->height) > pfloorright)
+ if (P_GetZAt(nextlight->slope, ds-> leftpos.x, ds-> leftpos.y, nextlight->height) > pfloorleft
+ && P_GetZAt(nextlight->slope, ds->rightpos.x, ds->rightpos.y, nextlight->height) > pfloorright)
continue;
}
@@ -888,21 +831,9 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
else if (overflow_test > (INT64)CLAMPMIN) rlight->heightstep = (fixed_t)overflow_test;
else rlight->heightstep = CLAMPMIN;
rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
-#else
- if (light->height < *pfloor->bottomheight)
- continue;
-
- if (light->height > *pfloor->topheight && i+1 < dc_numlights && frontsector->lightlist[i+1].height > *pfloor->topheight)
- continue;
-
- lheight = light->height;// > *pfloor->topheight ? *pfloor->topheight + FRACUNIT : light->height;
- rlight->heightstep = -FixedMul (rw_scalestep, (lheight - viewz));
- rlight->height = (centeryfrac) - FixedMul((lheight - viewz), spryscale);
-#endif
rlight->flags = light->flags;
if (light->flags & FF_CUTLEVEL)
{
-#ifdef ESLOPE
SLOPEPARAMS(*light->caster->b_slope, leftheight, rightheight, *light->caster->bottomheight)
#undef SLOPEPARAMS
leftheight -= viewz;
@@ -919,11 +850,6 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
else if (overflow_test > (INT64)CLAMPMIN) rlight->botheightstep = (fixed_t)overflow_test;
else rlight->botheightstep = CLAMPMIN;
rlight->botheightstep = (rlight->botheightstep-rlight->botheight)/(range);
-#else
- lheight = *light->caster->bottomheight;// > *pfloor->topheight ? *pfloor->topheight + FRACUNIT : *light->caster->bottomheight;
- rlight->botheightstep = -FixedMul (rw_scalestep, (lheight - viewz));
- rlight->botheight = (centeryfrac) - FixedMul((lheight - viewz), spryscale);
-#endif
}
rlight->lightlevel = *light->lightlevel;
@@ -980,17 +906,10 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
mceilingclip = ds->sprtopclip;
dc_texheight = textureheight[texnum]>>FRACBITS;
-#ifdef ESLOPE
// calculate both left ends
- if (*pfloor->t_slope)
- left_top = P_GetZAt(*pfloor->t_slope, ds->leftpos.x, ds->leftpos.y) - viewz;
- else
- left_top = *pfloor->topheight - viewz;
+ left_top = P_GetFFloorTopZAt (pfloor, ds->leftpos.x, ds->leftpos.y) - viewz;
+ left_bottom = P_GetFFloorBottomZAt(pfloor, ds->leftpos.x, ds->leftpos.y) - viewz;
- if (*pfloor->b_slope)
- left_bottom = P_GetZAt(*pfloor->b_slope, ds->leftpos.x, ds->leftpos.y) - viewz;
- else
- left_bottom = *pfloor->bottomheight - viewz;
skewslope = *pfloor->t_slope; // skew using top slope by default
if (newline)
{
@@ -1003,21 +922,18 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
if (slopeskew)
dc_texturemid = left_top;
else
-#endif
- dc_texturemid = *pfloor->topheight - viewz;
+ dc_texturemid = *pfloor->topheight - viewz;
if (newline)
{
offsetvalue = sides[newline->sidenum[0]].rowoffset;
if (newline->flags & ML_DONTPEGBOTTOM)
{
-#ifdef ESLOPE
skewslope = *pfloor->b_slope; // skew using bottom slope
if (slopeskew)
dc_texturemid = left_bottom;
else
-#endif
- offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
+ offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
}
}
else
@@ -1025,17 +941,14 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
offsetvalue = sides[pfloor->master->sidenum[0]].rowoffset;
if (curline->linedef->flags & ML_DONTPEGBOTTOM)
{
-#ifdef ESLOPE
skewslope = *pfloor->b_slope; // skew using bottom slope
if (slopeskew)
dc_texturemid = left_bottom;
else
-#endif
- offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
+ offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
}
}
-#ifdef ESLOPE
if (slopeskew)
{
angle_t lineangle = R_PointToAngle2(curline->v1->x, curline->v1->y, curline->v2->x, curline->v2->y);
@@ -1043,7 +956,6 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
if (skewslope)
ffloortextureslide = FixedMul(skewslope->zdelta, FINECOSINE((lineangle-skewslope->xydirection)>>ANGLETOFINESHIFT));
}
-#endif
dc_texturemid += offsetvalue;
@@ -1068,21 +980,13 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
lengthcol = textures[texnum]->height;
}
-#ifdef ESLOPE
// Set heights according to plane, or slope, whichever
{
fixed_t right_top, right_bottom;
// calculate right ends now
- if (*pfloor->t_slope)
- right_top = P_GetZAt(*pfloor->t_slope, ds->rightpos.x, ds->rightpos.y) - viewz;
- else
- right_top = *pfloor->topheight - viewz;
-
- if (*pfloor->b_slope)
- right_bottom = P_GetZAt(*pfloor->b_slope, ds->rightpos.x, ds->rightpos.y) - viewz;
- else
- right_bottom = *pfloor->bottomheight - viewz;
+ right_top = P_GetFFloorTopZAt (pfloor, ds->rightpos.x, ds->rightpos.y) - viewz;
+ right_bottom = P_GetFFloorBottomZAt(pfloor, ds->rightpos.x, ds->rightpos.y) - viewz;
// using INT64 to avoid 32bit overflow
top_frac = (INT64)centeryfrac - (((INT64)left_top * ds->scale1) >> FRACBITS);
@@ -1096,24 +1000,20 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
top_frac += top_step * (x1 - ds->x1);
bottom_frac += bottom_step * (x1 - ds->x1);
}
-#endif
// draw the columns
for (dc_x = x1; dc_x <= x2; dc_x++)
{
if (maskedtexturecol[dc_x] != INT16_MAX)
{
-#ifdef ESLOPE
if (ffloortextureslide) { // skew FOF walls
if (oldx != -1)
dc_texturemid += FixedMul(ffloortextureslide, (maskedtexturecol[oldx]-maskedtexturecol[dc_x])<<FRACBITS);
oldx = dc_x;
}
-#endif
// Calculate bounds
// clamp the values if necessary to avoid overflows and rendering glitches caused by them
-#ifdef ESLOPE
if (top_frac > (INT64)CLAMPMAX) sprtopscreen = windowtop = CLAMPMAX;
else if (top_frac > (INT64)CLAMPMIN) sprtopscreen = windowtop = (fixed_t)top_frac;
else sprtopscreen = windowtop = CLAMPMIN;
@@ -1123,10 +1023,6 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
top_frac += top_step;
bottom_frac += bottom_step;
-#else
- sprtopscreen = windowtop = (centeryfrac - FixedMul((dc_texturemid - offsetvalue), spryscale));
- sprbotscreen = windowbottom = FixedMul(*pfloor->topheight - *pfloor->bottomheight, spryscale) + sprtopscreen;
-#endif
// SoM: If column is out of range, why bother with it??
if (windowbottom < topbounds || windowtop > bottombounds)
@@ -1336,9 +1232,7 @@ static void R_RenderSegLoop (void)
INT32 mid;
fixed_t texturecolumn = 0;
-#ifdef ESLOPE
fixed_t oldtexturecolumn = -1;
-#endif
INT32 top;
INT32 bottom;
INT32 i;
@@ -1395,10 +1289,8 @@ static void R_RenderSegLoop (void)
for (i = 0; i < numffloors; i++)
{
-#ifdef POLYOBJECTS_PLANES
if (ffloor[i].polyobj && (!curline->polyseg || ffloor[i].polyobj != curline->polyseg))
continue;
-#endif
if (ffloor[i].height < viewz)
{
@@ -1411,18 +1303,19 @@ static void R_RenderSegLoop (void)
if (bottom_w > bottom)
bottom_w = bottom;
-#ifdef POLYOBJECTS_PLANES
// Polyobject-specific hack to fix plane leaking -Red
- if (ffloor[i].polyobj && top_w >= bottom_w) {
+ if (ffloor[i].polyobj && top_w >= bottom_w)
+ {
ffloor[i].plane->top[rw_x] = 0xFFFF;
ffloor[i].plane->bottom[rw_x] = 0x0000; // fix for sky plane drawing crashes - Monster Iestyn 25/05/18
- } else
-#endif
-
- if (top_w <= bottom_w)
+ }
+ else
{
- ffloor[i].plane->top[rw_x] = (INT16)top_w;
- ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ if (top_w <= bottom_w)
+ {
+ ffloor[i].plane->top[rw_x] = (INT16)top_w;
+ ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ }
}
}
else if (ffloor[i].height > viewz)
@@ -1436,18 +1329,19 @@ static void R_RenderSegLoop (void)
if (bottom_w > bottom)
bottom_w = bottom;
-#ifdef POLYOBJECTS_PLANES
// Polyobject-specific hack to fix plane leaking -Red
- if (ffloor[i].polyobj && top_w >= bottom_w) {
+ if (ffloor[i].polyobj && top_w >= bottom_w)
+ {
ffloor[i].plane->top[rw_x] = 0xFFFF;
ffloor[i].plane->bottom[rw_x] = 0x0000; // fix for sky plane drawing crashes - Monster Iestyn 25/05/18
- } else
-#endif
-
- if (top_w <= bottom_w)
+ }
+ else
{
- ffloor[i].plane->top[rw_x] = (INT16)top_w;
- ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ if (top_w <= bottom_w)
+ {
+ ffloor[i].plane->top[rw_x] = (INT16)top_w;
+ ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ }
}
}
}
@@ -1458,7 +1352,6 @@ static void R_RenderSegLoop (void)
angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
texturecolumn = rw_offset-FixedMul(FINETANGENT(angle),rw_distance);
-#ifdef ESLOPE
if (oldtexturecolumn != -1) {
rw_bottomtexturemid += FixedMul(rw_bottomtextureslide, oldtexturecolumn-texturecolumn);
rw_midtexturemid += FixedMul(rw_midtextureslide, oldtexturecolumn-texturecolumn);
@@ -1466,7 +1359,6 @@ static void R_RenderSegLoop (void)
rw_midtextureback += FixedMul(rw_midtexturebackslide, oldtexturecolumn-texturecolumn);
}
oldtexturecolumn = texturecolumn;
-#endif
texturecolumn >>= FRACBITS;
@@ -1642,13 +1534,11 @@ static void R_RenderSegLoop (void)
// for backdrawing of masked mid texture
maskedtexturecol[rw_x] = (INT16)texturecolumn;
-#ifdef ESLOPE
if (maskedtextureheight != NULL) {
maskedtextureheight[rw_x] = (!!(curline->linedef->flags & ML_DONTPEGBOTTOM) ^ !!(curline->linedef->flags & ML_EFFECT3) ?
max(rw_midtexturemid, rw_midtextureback) :
min(rw_midtexturemid, rw_midtextureback));
}
-#endif
}
if (dc_numlights)
@@ -1704,26 +1594,19 @@ void R_StoreWallRange(INT32 start, INT32 stop)
fixed_t sineval;
angle_t distangle, offsetangle;
boolean longboi;
-#ifndef ESLOPE
- fixed_t vtop;
-#endif
INT32 lightnum;
INT32 i, p;
lightlist_t *light;
r_lightlist_t *rlight;
INT32 range;
-#ifdef ESLOPE
vertex_t segleft, segright;
fixed_t ceilingfrontslide, floorfrontslide, ceilingbackslide, floorbackslide;
-#endif
static size_t maxdrawsegs = 0;
-#ifdef ESLOPE
maskedtextureheight = NULL;
//initialize segleft and segright
memset(&segleft, 0x00, sizeof(segleft));
memset(&segright, 0x00, sizeof(segright));
-#endif
colfunc = colfuncs[BASEDRAWFUNC];
@@ -1833,7 +1716,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// calculate texture boundaries
// and decide if floor / ceiling marks are needed
-#ifdef ESLOPE
// Figure out map coordinates of where start and end are mapping to on seg, so we can clip right for slope bullshit
if (frontsector->hasslope || (backsector && backsector->hasslope)) // Commenting this out for FOFslop. -Red
{
@@ -1886,11 +1768,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, segleft.x, segleft.y); \
- end2 = P_GetZAt(slope, segright.x, segright.y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, segleft.x, segleft.y, normalheight); \
+ end2 = P_GetZAt(slope, segright.x, segright.y, normalheight);
SLOPEPARAMS(frontsector->c_slope, worldtop, worldtopslope, frontsector->ceilingheight)
SLOPEPARAMS(frontsector->f_slope, worldbottom, worldbottomslope, frontsector->floorheight)
@@ -1900,10 +1779,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
worldtopslope -= viewz;
worldbottom -= viewz;
worldbottomslope -= viewz;
-#else
- worldtop = frontsector->ceilingheight - viewz;
- worldbottom = frontsector->floorheight - viewz;
-#endif
midtexture = toptexture = bottomtexture = maskedtexture = 0;
ds_p->maskedtexturecol = NULL;
@@ -1920,23 +1795,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
for (i = 0; i < numffloors; i++)
{
-#ifdef POLYOBJECTS_PLANES
if (ffloor[i].polyobj && (!ds_p->curline->polyseg || ffloor[i].polyobj != ds_p->curline->polyseg))
continue;
-#endif
-#ifdef ESLOPE
- if (ffloor[i].slope) {
- ffloor[i].f_pos = P_GetZAt(ffloor[i].slope, segleft.x, segleft.y) - viewz;
- ffloor[i].f_pos_slope = P_GetZAt(ffloor[i].slope, segright.x, segright.y) - viewz;
- } else
- ffloor[i].f_pos_slope =
-#endif
- ffloor[i].f_pos = ffloor[i].height - viewz;
+ ffloor[i].f_pos = P_GetZAt(ffloor[i].slope, segleft .x, segleft .y, ffloor[i].height) - viewz;
+ ffloor[i].f_pos_slope = P_GetZAt(ffloor[i].slope, segright.x, segright.y, ffloor[i].height) - viewz;
}
}
-#ifdef ESLOPE
// Set up texture Y offset slides for sloped walls
rw_toptextureslide = rw_midtextureslide = rw_bottomtextureslide = 0;
ceilingfrontslide = floorfrontslide = ceilingbackslide = floorbackslide = 0;
@@ -1956,7 +1822,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (backsector && backsector->c_slope)
ceilingbackslide = FixedMul(backsector->c_slope->zdelta, FINECOSINE((lineangle-backsector->c_slope->xydirection)>>ANGLETOFINESHIFT));
}
-#endif
if (!backsector)
{
@@ -1966,33 +1831,22 @@ void R_StoreWallRange(INT32 start, INT32 stop)
texheight = textureheight[midtexture];
// a single sided line is terminal, so it must mark ends
markfloor = markceiling = true;
-#ifdef ESLOPE
if (linedef->flags & ML_EFFECT2) {
if (linedef->flags & ML_DONTPEGBOTTOM)
rw_midtexturemid = frontsector->floorheight + texheight - viewz;
else
rw_midtexturemid = frontsector->ceilingheight - viewz;
}
- else
-#endif
- if (linedef->flags & ML_DONTPEGBOTTOM)
+ else if (linedef->flags & ML_DONTPEGBOTTOM)
{
-#ifdef ESLOPE
rw_midtexturemid = worldbottom + texheight;
rw_midtextureslide = floorfrontslide;
-#else
- vtop = frontsector->floorheight + texheight;
- // bottom of texture at bottom
- rw_midtexturemid = vtop - viewz;
-#endif
}
else
{
// top of texture at top
rw_midtexturemid = worldtop;
-#ifdef ESLOPE
rw_midtextureslide = ceilingfrontslide;
-#endif
}
rw_midtexturemid += sidedef->rowoffset;
@@ -2008,17 +1862,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
boolean bothceilingssky = false; // turned on if both back and front ceilings are sky
boolean bothfloorssky = false; // likewise, but for floors
-#ifdef ESLOPE
SLOPEPARAMS(backsector->c_slope, worldhigh, worldhighslope, backsector->ceilingheight)
SLOPEPARAMS(backsector->f_slope, worldlow, worldlowslope, backsector->floorheight)
worldhigh -= viewz;
worldhighslope -= viewz;
worldlow -= viewz;
worldlowslope -= viewz;
-#else
- worldhigh = backsector->ceilingheight - viewz;
- worldlow = backsector->floorheight - viewz;
-#endif
// hack to allow height changes in outdoor areas
// This is what gets rid of the upper textures if there should be sky
@@ -2040,27 +1889,15 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (!bothfloorssky)
{
- if (
-#ifdef ESLOPE
- worldbottomslope > worldlowslope ||
-#endif
- worldbottom > worldlow)
+ if (worldbottomslope > worldlowslope || worldbottom > worldlow)
{
ds_p->silhouette = SIL_BOTTOM;
-#ifdef ESLOPE
- if ((backsector->f_slope ? P_GetZAt(backsector->f_slope, viewx, viewy) : backsector->floorheight) > viewz)
+ if (P_GetSectorFloorZAt(backsector, viewx, viewy) > viewz)
ds_p->bsilheight = INT32_MAX;
else
ds_p->bsilheight = (frontsector->f_slope ? INT32_MAX : frontsector->floorheight);
-#else
- ds_p->bsilheight = frontsector->floorheight;
-#endif
}
-#ifdef ESLOPE
- else if ((backsector->f_slope ? P_GetZAt(backsector->f_slope, viewx, viewy) : backsector->floorheight) > viewz)
-#else
- else if (backsector->floorheight > viewz)
-#endif
+ else if (P_GetSectorFloorZAt(backsector, viewx, viewy) > viewz)
{
ds_p->silhouette = SIL_BOTTOM;
ds_p->bsilheight = INT32_MAX;
@@ -2070,27 +1907,15 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (!bothceilingssky)
{
- if (
-#ifdef ESLOPE
- worldtopslope < worldhighslope ||
-#endif
- worldtop < worldhigh)
+ if (worldtopslope < worldhighslope || worldtop < worldhigh)
{
ds_p->silhouette |= SIL_TOP;
-#ifdef ESLOPE
- if ((backsector->c_slope ? P_GetZAt(backsector->c_slope, viewx, viewy) : backsector->ceilingheight) < viewz)
+ if (P_GetSectorCeilingZAt(backsector, viewx, viewy) < viewz)
ds_p->tsilheight = INT32_MIN;
else
ds_p->tsilheight = (frontsector->c_slope ? INT32_MIN : frontsector->ceilingheight);
-#else
- ds_p->tsilheight = frontsector->ceilingheight;
-#endif
}
-#ifdef ESLOPE
- else if ((backsector->c_slope ? P_GetZAt(backsector->c_slope, viewx, viewy) : backsector->ceilingheight) < viewz)
-#else
- else if (backsector->ceilingheight < viewz)
-#endif
+ else if (P_GetSectorCeilingZAt(backsector, viewx, viewy) < viewz)
{
ds_p->silhouette |= SIL_TOP;
ds_p->tsilheight = INT32_MIN;
@@ -2100,22 +1925,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (!bothceilingssky && !bothfloorssky)
{
-#ifdef ESLOPE
if (worldhigh <= worldbottom && worldhighslope <= worldbottomslope)
-#else
- if (worldhigh <= worldbottom)
-#endif
{
ds_p->sprbottomclip = negonearray;
ds_p->bsilheight = INT32_MAX;
ds_p->silhouette |= SIL_BOTTOM;
}
-#ifdef ESLOPE
if (worldlow >= worldtop && worldlowslope >= worldtopslope)
-#else
- if (worldlow >= worldtop)
-#endif
{
ds_p->sprtopclip = screenheightarray;
ds_p->tsilheight = INT32_MIN;
@@ -2128,21 +1945,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// Without the following code, sprites get displayed behind closed doors.
if (!bothceilingssky && !bothfloorssky)
{
-#ifdef ESLOPE
if (doorclosed || (worldhigh <= worldbottom && worldhighslope <= worldbottomslope))
-#else
- if (doorclosed || backsector->ceilingheight <= frontsector->floorheight)
-#endif
{
ds_p->sprbottomclip = negonearray;
ds_p->bsilheight = INT32_MAX;
ds_p->silhouette |= SIL_BOTTOM;
}
-#ifdef ESLOPE
if (doorclosed || (worldlow >= worldtop && worldlowslope >= worldtopslope))
-#else
- if (doorclosed || backsector->floorheight >= frontsector->ceilingheight)
-#endif
{ // killough 1/17/98, 2/8/98
ds_p->sprtopclip = screenheightarray;
ds_p->tsilheight = INT32_MIN;
@@ -2157,10 +1966,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
markfloor = false;
}
else if (worldlow != worldbottom
-#ifdef ESLOPE
|| worldlowslope != worldbottomslope
|| backsector->f_slope != frontsector->f_slope
-#endif
|| backsector->floorpic != frontsector->floorpic
|| backsector->lightlevel != frontsector->lightlevel
//SoM: 3/22/2000: Check floor x and y offsets.
@@ -2190,10 +1997,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
markceiling = false;
}
else if (worldhigh != worldtop
-#ifdef ESLOPE
|| worldhighslope != worldtopslope
|| backsector->c_slope != frontsector->c_slope
-#endif
|| backsector->ceilingpic != frontsector->ceilingpic
|| backsector->lightlevel != frontsector->lightlevel
//SoM: 3/22/2000: Check floor x and y offsets.
@@ -2217,13 +2022,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (!bothceilingssky && !bothfloorssky)
{
-#ifdef ESLOPE
if ((worldhigh <= worldbottom && worldhighslope <= worldbottomslope)
|| (worldlow >= worldtop && worldlowslope >= worldtopslope))
-#else
- if (backsector->ceilingheight <= frontsector->floorheight
- || backsector->floorheight >= frontsector->ceilingheight)
-#endif
{
// closed door
markceiling = markfloor = true;
@@ -2232,11 +2032,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// check TOP TEXTURE
if (!bothceilingssky // never draw the top texture if on
- && (worldhigh < worldtop
-#ifdef ESLOPE
- || worldhighslope < worldtopslope
-#endif
- ))
+ && (worldhigh < worldtop || worldhighslope < worldtopslope))
{
fixed_t texheight;
// top texture
@@ -2256,67 +2052,47 @@ void R_StoreWallRange(INT32 start, INT32 stop)
toptexture = R_GetTextureNum(sidedef->toptexture);
texheight = textureheight[toptexture];
}
-#ifdef ESLOPE
if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked
if (linedef->flags & ML_DONTPEGTOP)
rw_toptexturemid = frontsector->ceilingheight - viewz;
else
rw_toptexturemid = backsector->ceilingheight - viewz;
- } else
-#endif
- if (linedef->flags & ML_DONTPEGTOP)
+ }
+ else if (linedef->flags & ML_DONTPEGTOP)
{
// top of texture at top
rw_toptexturemid = worldtop;
-#ifdef ESLOPE
rw_toptextureslide = ceilingfrontslide;
-#endif
}
else
{
-#ifdef ESLOPE
rw_toptexturemid = worldhigh + texheight;
rw_toptextureslide = ceilingbackslide;
-#else
- vtop = backsector->ceilingheight + texheight;
- // bottom of texture
- rw_toptexturemid = vtop - viewz;
-#endif
}
}
// check BOTTOM TEXTURE
if (!bothfloorssky // never draw the bottom texture if on
- && (worldlow > worldbottom
-#ifdef ESLOPE
- || worldlowslope > worldbottomslope
-#endif
- )) //seulement si VISIBLE!!!
+ && (worldlow > worldbottom || worldlowslope > worldbottomslope)) // Only if VISIBLE!!!
{
// bottom texture
bottomtexture = R_GetTextureNum(sidedef->bottomtexture);
-#ifdef ESLOPE
if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked
if (linedef->flags & ML_DONTPEGBOTTOM)
rw_bottomtexturemid = frontsector->floorheight - viewz;
else
rw_bottomtexturemid = backsector->floorheight - viewz;
- } else
-#endif
- if (linedef->flags & ML_DONTPEGBOTTOM)
+ }
+ else if (linedef->flags & ML_DONTPEGBOTTOM)
{
// bottom of texture at bottom
// top of texture at top
rw_bottomtexturemid = worldbottom;
-#ifdef ESLOPE
rw_bottomtextureslide = floorfrontslide;
-#endif
}
else { // top of texture at top
rw_bottomtexturemid = worldlow;
-#ifdef ESLOPE
rw_bottomtextureslide = floorbackslide;
-#endif
}
}
@@ -2329,12 +2105,10 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ffloor_t *rover;
ffloor_t *r2;
fixed_t lowcut, highcut;
-#ifdef ESLOPE
fixed_t lowcutslope, highcutslope;
// Used for height comparisons and etc across FOFs and slopes
fixed_t high1, highslope1, low1, lowslope1, high2, highslope2, low2, lowslope2;
-#endif
//markceiling = markfloor = true;
maskedtexture = true;
@@ -2344,10 +2118,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
lowcut = max(worldbottom, worldlow) + viewz;
highcut = min(worldtop, worldhigh) + viewz;
-#ifdef ESLOPE
lowcutslope = max(worldbottomslope, worldlowslope) + viewz;
highcutslope = min(worldtopslope, worldhighslope) + viewz;
-#endif
if (frontsector->ffloors && backsector->ffloors)
{
@@ -2356,22 +2128,17 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS))
continue;
- if (rover->flags & FF_INVERTSIDES)
+ if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES)
continue;
if (rover->norender == leveltime)
continue;
-#ifdef ESLOPE
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;
-#else
- if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
- continue;
-#endif
for (r2 = frontsector->ffloors; r2; r2 = r2->next)
{
@@ -2395,7 +2162,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue;
}
-#ifdef ESLOPE
SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
SLOPEPARAMS(*r2->b_slope, low2, lowslope2, *r2->bottomheight)
@@ -2403,12 +2169,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue;
if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2))
continue;
-#else
- if (*r2->topheight < lowcut || *r2->bottomheight > highcut)
- continue;
- if (*rover->topheight > *r2->topheight || *rover->bottomheight < *r2->bottomheight)
- continue;
-#endif
break;
}
@@ -2423,22 +2183,17 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS))
continue;
- if (!(rover->flags & FF_ALLSIDES))
+ if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES))
continue;
if (rover->norender == leveltime)
continue;
-#ifdef ESLOPE
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;
-#else
- if (*rover->topheight < lowcut || *rover->bottomheight > highcut)
- continue;
-#endif
for (r2 = backsector->ffloors; r2; r2 = r2->next)
{
@@ -2462,7 +2217,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue;
}
-#ifdef ESLOPE
SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
SLOPEPARAMS(*r2->b_slope, low2, lowslope2, *r2->bottomheight)
#undef SLOPEPARAMS
@@ -2470,12 +2224,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue;
if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2))
continue;
-#else
- if (*r2->topheight < lowcut || *r2->bottomheight > highcut)
- continue;
- if (*rover->topheight > *r2->topheight || *rover->bottomheight < *r2->bottomheight)
- continue;
-#endif
break;
}
@@ -2490,22 +2238,19 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
for (rover = backsector->ffloors, i = 0; rover && i < MAXFFLOORS; rover = rover->next)
{
- if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS) || rover->flags & FF_INVERTSIDES)
+ if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS))
+ continue;
+ if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES)
continue;
if (rover->norender == leveltime)
continue;
-#ifdef ESLOPE
// Oy vey.
- if (( (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) <= worldbottom+viewz
- && (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) <= worldbottomslope+viewz)
- ||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) >= worldtop+viewz
- && (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldtopslope+viewz))
+ if ( ((P_GetFFloorTopZAt (rover, segleft .x, segleft .y)) <= worldbottom + viewz
+ && (P_GetFFloorTopZAt (rover, segright.x, segright.y)) <= worldbottomslope + viewz)
+ ||((P_GetFFloorBottomZAt(rover, segleft .x, segleft .y)) >= worldtop + viewz
+ && (P_GetFFloorBottomZAt(rover, segright.x, segright.y)) >= worldtopslope + viewz))
continue;
-#else
- if (*rover->topheight <= frontsector->floorheight || *rover->bottomheight >= frontsector->ceilingheight)
- continue;
-#endif
ds_p->thicksides[i] = rover;
i++;
@@ -2515,29 +2260,24 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
for (rover = frontsector->ffloors, i = 0; rover && i < MAXFFLOORS; rover = rover->next)
{
- if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_ALLSIDES))
+ if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS))
+ continue;
+ if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES))
continue;
if (rover->norender == leveltime)
continue;
-#ifdef ESLOPE
// Oy vey.
- if (( (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) <= worldbottom+viewz
- && (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) <= worldbottomslope+viewz)
- ||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) >= worldtop+viewz
- && (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldtopslope+viewz))
+ if ( (P_GetFFloorTopZAt (rover, segleft .x, segleft .y) <= worldbottom + viewz
+ && P_GetFFloorTopZAt (rover, segright.x, segright.y) <= worldbottomslope + viewz)
+ ||(P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) >= worldtop + viewz
+ && P_GetFFloorBottomZAt(rover, segright.x, segright.y) >= worldtopslope + viewz))
continue;
- if (( (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) <= worldlow+viewz
- && (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) <= worldlowslope+viewz)
- ||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) >= worldhigh+viewz
- && (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldhighslope+viewz))
- continue;
-#else
- if (*rover->topheight <= frontsector->floorheight || *rover->bottomheight >= frontsector->ceilingheight)
+ if ( (P_GetFFloorTopZAt (rover, segleft .x, segleft .y) <= worldlow + viewz
+ && P_GetFFloorTopZAt (rover, segright.x, segright.y) <= worldlowslope + viewz)
+ ||(P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) >= worldhigh + viewz
+ && P_GetFFloorBottomZAt(rover, segright.x, segright.y) >= worldhighslope + viewz))
continue;
- if (*rover->topheight <= backsector->floorheight || *rover->bottomheight >= backsector->ceilingheight)
- continue;
-#endif
ds_p->thicksides[i] = rover;
i++;
@@ -2557,40 +2297,45 @@ void R_StoreWallRange(INT32 start, INT32 stop)
else
ds_p->maskedtexturecol = ds_p->thicksidecol;
-#ifdef ESLOPE
maskedtextureheight = ds_p->maskedtextureheight; // note to red, this == &(ds_p->maskedtextureheight[0])
-#ifdef POLYOBJECTS
- if (curline->polyseg) { // use REAL front and back floors please, so midtexture rendering isn't mucked up
+ if (curline->polyseg)
+ { // use REAL front and back floors please, so midtexture rendering isn't mucked up
rw_midtextureslide = rw_midtexturebackslide = 0;
if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
rw_midtexturemid = rw_midtextureback = max(curline->frontsector->floorheight, curline->backsector->floorheight) - viewz;
else
rw_midtexturemid = rw_midtextureback = min(curline->frontsector->ceilingheight, curline->backsector->ceilingheight) - viewz;
- } else
-#endif
- // Set midtexture starting height
- if (linedef->flags & ML_EFFECT2) { // Ignore slopes when texturing
- rw_midtextureslide = rw_midtexturebackslide = 0;
- if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
- rw_midtexturemid = rw_midtextureback = max(frontsector->floorheight, backsector->floorheight) - viewz;
+ }
+ else
+ {
+ // Set midtexture starting height
+ if (linedef->flags & ML_EFFECT2)
+ { // Ignore slopes when texturing
+ rw_midtextureslide = rw_midtexturebackslide = 0;
+ if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
+ rw_midtexturemid = rw_midtextureback = max(frontsector->floorheight, backsector->floorheight) - viewz;
+ else
+ rw_midtexturemid = rw_midtextureback = min(frontsector->ceilingheight, backsector->ceilingheight) - viewz;
+
+ }
+ else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
+ {
+ rw_midtexturemid = worldbottom;
+ rw_midtextureslide = floorfrontslide;
+ rw_midtextureback = worldlow;
+ rw_midtexturebackslide = floorbackslide;
+ }
else
- rw_midtexturemid = rw_midtextureback = min(frontsector->ceilingheight, backsector->ceilingheight) - viewz;
-
- } else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) {
- rw_midtexturemid = worldbottom;
- rw_midtextureslide = floorfrontslide;
- rw_midtextureback = worldlow;
- rw_midtexturebackslide = floorbackslide;
- } else {
- rw_midtexturemid = worldtop;
- rw_midtextureslide = ceilingfrontslide;
- rw_midtextureback = worldhigh;
- rw_midtexturebackslide = ceilingbackslide;
+ {
+ rw_midtexturemid = worldtop;
+ rw_midtextureslide = ceilingfrontslide;
+ rw_midtextureback = worldhigh;
+ rw_midtexturebackslide = ceilingbackslide;
+ }
}
rw_midtexturemid += sidedef->rowoffset;
rw_midtextureback += sidedef->rowoffset;
-#endif
maskedtexture = true;
}
@@ -2654,23 +2399,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// and doesn't need to be marked.
if (frontsector->heightsec == -1)
{
- if (frontsector->floorpic != skyflatnum
- && (
-#ifdef ESLOPE
- frontsector->f_slope ? P_GetZAt(frontsector->f_slope, viewx, viewy) :
-#endif
- frontsector->floorheight) >= viewz)
+ if (frontsector->floorpic != skyflatnum && P_GetSectorFloorZAt(frontsector, viewx, viewy) >= viewz)
{
// above view plane
markfloor = false;
}
- if (frontsector->ceilingpic != skyflatnum
- && (
-#ifdef ESLOPE
- frontsector->c_slope ? P_GetZAt(frontsector->c_slope, viewx, viewy) :
-#endif
- frontsector->ceilingheight) <= viewz)
+ if (frontsector->ceilingpic != skyflatnum && P_GetSectorCeilingZAt(frontsector, viewx, viewy) <= viewz)
{
// below view plane
markceiling = false;
@@ -2680,10 +2415,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// calculate incremental stepping values for texture edges
worldtop >>= 4;
worldbottom >>= 4;
-#ifdef ESLOPE
worldtopslope >>= 4;
worldbottomslope >>= 4;
-#endif
if (linedef->special == HORIZONSPECIAL) { // HORIZON LINES
topstep = bottomstep = 0;
@@ -2696,7 +2429,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
bottomstep = -FixedMul (rw_scalestep,worldbottom);
bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
-#ifdef ESLOPE
if (frontsector->c_slope) {
fixed_t topfracend = (centeryfrac>>4) - FixedMul (worldtopslope, ds_p->scale2);
topstep = (topfracend-topfrac)/(range);
@@ -2705,7 +2437,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
fixed_t bottomfracend = (centeryfrac>>4) - FixedMul (worldbottomslope, ds_p->scale2);
bottomstep = (bottomfracend-bottomfrac)/(range);
}
-#endif
}
dc_numlights = 0;
@@ -2721,83 +2452,57 @@ void R_StoreWallRange(INT32 start, INT32 stop)
for (i = p = 0; i < dc_numlights; i++)
{
-#ifdef ESLOPE
fixed_t leftheight, rightheight;
-#endif
light = &frontsector->lightlist[i];
rlight = &dc_lightlist[p];
-#ifdef ESLOPE
- if (light->slope) {
- leftheight = P_GetZAt(light->slope, segleft.x, segleft.y);
- rightheight = P_GetZAt(light->slope, segright.x, segright.y);
+ leftheight = P_GetLightZAt(light, segleft.x, segleft.y);
+ rightheight = P_GetLightZAt(light, segright.x, segright.y);
+ if (light->slope)
// Flag sector as having slopes
frontsector->hasslope = true;
- } else
- leftheight = rightheight = light->height;
leftheight -= viewz;
rightheight -= viewz;
leftheight >>= 4;
rightheight >>= 4;
-#endif
if (i != 0)
{
-#ifdef ESLOPE
if (leftheight < worldbottom && rightheight < worldbottomslope)
continue;
if (leftheight > worldtop && rightheight > worldtopslope && i+1 < dc_numlights && frontsector->lightlist[i+1].height > frontsector->ceilingheight)
continue;
-#else
- if (light->height < frontsector->floorheight)
- continue;
-
- if (light->height > frontsector->ceilingheight && i+1 < dc_numlights && frontsector->lightlist[i+1].height > frontsector->ceilingheight)
- continue;
-#endif
}
-#ifdef ESLOPE
rlight->height = (centeryfrac>>4) - FixedMul(leftheight, rw_scale);
rlight->heightstep = (centeryfrac>>4) - FixedMul(rightheight, ds_p->scale2);
rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
-#else
- rlight->height = (centeryfrac>>4) - FixedMul((light->height - viewz) >> 4, rw_scale);
- rlight->heightstep = -FixedMul (rw_scalestep, (light->height - viewz) >> 4);
-#endif
rlight->flags = light->flags;
if (light->caster && light->caster->flags & FF_CUTSOLIDS)
{
-#ifdef ESLOPE
- if (*light->caster->b_slope) {
- leftheight = P_GetZAt(*light->caster->b_slope, segleft.x, segleft.y);
- rightheight = P_GetZAt(*light->caster->b_slope, segright.x, segright.y);
+ leftheight = P_GetFFloorBottomZAt(light->caster, segleft.x, segleft.y);
+ rightheight = P_GetFFloorBottomZAt(light->caster, segright.x, segright.y);
+ if (*light->caster->b_slope)
// Flag sector as having slopes
frontsector->hasslope = true;
- } else
- leftheight = rightheight = *light->caster->bottomheight;
- leftheight -= viewz;
+ leftheight -= viewz;
rightheight -= viewz;
- leftheight >>= 4;
+ leftheight >>= 4;
rightheight >>= 4;
rlight->botheight = (centeryfrac>>4) - FixedMul(leftheight, rw_scale);
rlight->botheightstep = (centeryfrac>>4) - FixedMul(rightheight, ds_p->scale2);
rlight->botheightstep = (rlight->botheightstep-rlight->botheight)/(range);
-#else
- rlight->botheight = (centeryfrac >> 4) - FixedMul((*light->caster->bottomheight - viewz) >> 4, rw_scale);
- rlight->botheightstep = -FixedMul (rw_scalestep, (*light->caster->bottomheight - viewz) >> 4);
-#endif
}
rlight->lightlevel = *light->lightlevel;
@@ -2813,9 +2518,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
for (i = 0; i < numffloors; i++)
{
ffloor[i].f_pos >>= 4;
-#ifdef ESLOPE
ffloor[i].f_pos_slope >>= 4;
-#endif
if (linedef->special == HORIZONSPECIAL) // Horizon lines extend FOFs in contact with them too.
{
ffloor[i].f_step = 0;
@@ -2824,13 +2527,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
}
else
{
-#ifdef ESLOPE
ffloor[i].f_frac = (centeryfrac>>4) - FixedMul(ffloor[i].f_pos, rw_scale);
ffloor[i].f_step = ((centeryfrac>>4) - FixedMul(ffloor[i].f_pos_slope, ds_p->scale2) - ffloor[i].f_frac)/(range);
-#else
- ffloor[i].f_step = FixedMul(-rw_scalestep, ffloor[i].f_pos);
- ffloor[i].f_frac = (centeryfrac>>4) - FixedMul(ffloor[i].f_pos, rw_scale);
-#endif
}
}
}
@@ -2839,42 +2537,34 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
worldhigh >>= 4;
worldlow >>= 4;
-#ifdef ESLOPE
worldhighslope >>= 4;
worldlowslope >>= 4;
-#endif
if (toptexture)
{
pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
pixhighstep = -FixedMul (rw_scalestep,worldhigh);
-#ifdef ESLOPE
if (backsector->c_slope) {
fixed_t topfracend = (centeryfrac>>4) - FixedMul (worldhighslope, ds_p->scale2);
pixhighstep = (topfracend-pixhigh)/(range);
}
-#endif
}
if (bottomtexture)
{
pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale);
pixlowstep = -FixedMul (rw_scalestep,worldlow);
-#ifdef ESLOPE
if (backsector->f_slope) {
fixed_t bottomfracend = (centeryfrac>>4) - FixedMul (worldlowslope, ds_p->scale2);
pixlowstep = (bottomfracend-pixlow)/(range);
}
-#endif
}
{
ffloor_t * rover;
-#ifdef ESLOPE
fixed_t roverleft, roverright;
fixed_t planevistest;
-#endif
i = 0;
if (backsector->ffloors)
@@ -2886,19 +2576,18 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (rover->norender == leveltime)
continue;
-#ifdef ESLOPE
// Let the renderer know this sector is sloped.
if (*rover->b_slope || *rover->t_slope)
backsector->hasslope = true;
- roverleft = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) - viewz;
- roverright = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) - viewz;
- planevistest = (*rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) : *rover->bottomheight);
+ roverleft = P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorBottomZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorBottomZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
- ((viewz < planevistest && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz > planevistest && (rover->flags & FF_BOTHPLANES))))
+ ((viewz < planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) ||
+ (viewz > planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
//ffloor[i].slope = *rover->b_slope;
ffloor[i].b_pos = roverleft;
@@ -2914,14 +2603,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (i >= MAXFFLOORS)
break;
- roverleft = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) - viewz;
- roverright = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) - viewz;
- planevistest = (*rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) : *rover->topheight);
+ roverleft = P_GetFFloorTopZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorTopZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorTopZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
- ((viewz > planevistest && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz < planevistest && (rover->flags & FF_BOTHPLANES))))
+ ((viewz > planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) ||
+ (viewz < planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
//ffloor[i].slope = *rover->t_slope;
ffloor[i].b_pos = roverleft;
@@ -2933,34 +2622,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ffloor[i].b_step = (ffloor[i].b_step-ffloor[i].b_frac)/(range);
i++;
}
-#else
- if (*rover->bottomheight <= backsector->ceilingheight &&
- *rover->bottomheight >= backsector->floorheight &&
- ((viewz < *rover->bottomheight && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz > *rover->bottomheight && (rover->flags & FF_BOTHPLANES))))
- {
- ffloor[i].b_pos = *rover->bottomheight;
- ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
- ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
- ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
- i++;
- }
-
- if (i >= MAXFFLOORS)
- break;
-
- if (*rover->topheight >= backsector->floorheight &&
- *rover->topheight <= backsector->ceilingheight &&
- ((viewz > *rover->topheight && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz < *rover->topheight && (rover->flags & FF_BOTHPLANES))))
- {
- ffloor[i].b_pos = *rover->topheight;
- ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
- ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
- ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
- i++;
- }
-#endif
}
}
else if (frontsector && frontsector->ffloors)
@@ -2972,20 +2633,18 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (rover->norender == leveltime)
continue;
-
-#ifdef ESLOPE
// Let the renderer know this sector is sloped.
if (*rover->b_slope || *rover->t_slope)
frontsector->hasslope = true;
- roverleft = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) - viewz;
- roverright = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) - viewz;
- planevistest = (*rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) : *rover->bottomheight);
+ roverleft = P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorBottomZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorBottomZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
- ((viewz < planevistest && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz > planevistest && (rover->flags & FF_BOTHPLANES))))
+ ((viewz < planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) ||
+ (viewz > planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
//ffloor[i].slope = *rover->b_slope;
ffloor[i].b_pos = roverleft;
@@ -3001,14 +2660,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (i >= MAXFFLOORS)
break;
- roverleft = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) - viewz;
- roverright = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) - viewz;
- planevistest = (*rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) : *rover->topheight);
+ roverleft = P_GetFFloorTopZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorTopZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorTopZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
- ((viewz > planevistest && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz < planevistest && (rover->flags & FF_BOTHPLANES))))
+ ((viewz > planevistest && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))) ||
+ (viewz < planevistest && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{
//ffloor[i].slope = *rover->t_slope;
ffloor[i].b_pos = roverleft;
@@ -3020,35 +2679,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ffloor[i].b_step = (ffloor[i].b_step-ffloor[i].b_frac)/(range);
i++;
}
-#else
- if (*rover->bottomheight <= frontsector->ceilingheight &&
- *rover->bottomheight >= frontsector->floorheight &&
- ((viewz < *rover->bottomheight && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz > *rover->bottomheight && (rover->flags & FF_BOTHPLANES))))
- {
- ffloor[i].b_pos = *rover->bottomheight;
- ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
- ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
- ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
- i++;
- }
- if (i >= MAXFFLOORS)
- break;
- if (*rover->topheight >= frontsector->floorheight &&
- *rover->topheight <= frontsector->ceilingheight &&
- ((viewz > *rover->topheight && !(rover->flags & FF_INVERTPLANES)) ||
- (viewz < *rover->topheight && (rover->flags & FF_BOTHPLANES))))
- {
- ffloor[i].b_pos = *rover->topheight;
- ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
- ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
- ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
- i++;
- }
-#endif
}
}
-#ifdef POLYOBJECTS_PLANES
if (curline->polyseg && frontsector && (curline->polyseg->flags & POF_RENDERPLANES))
{
while (i < numffloors && ffloor[i].polyobj != curline->polyseg) i++;
@@ -3062,9 +2694,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (ffloor[i].plane->maxx < ds_p->x2)
ffloor[i].plane->maxx = ds_p->x2;
-#ifdef ESLOPE
ffloor[i].slope = NULL;
-#endif
ffloor[i].b_pos = backsector->floorheight;
ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
@@ -3081,9 +2711,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (ffloor[i].plane->maxx < ds_p->x2)
ffloor[i].plane->maxx = ds_p->x2;
-#ifdef ESLOPE
ffloor[i].slope = NULL;
-#endif
ffloor[i].b_pos = backsector->ceilingheight;
ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
@@ -3091,7 +2719,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
i++;
}
}
-#endif
numbackffloors = i;
}
@@ -3145,7 +2772,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
for (i = 0; i < numffloors; i++)
R_ExpandPlane(ffloor[i].plane, rw_x, rw_stopx - 1);
}
-#ifdef POLYOBJECTS_PLANES
// FIXME hack to fix planes disappearing when a seg goes behind the camera. This NEEDS to be changed to be done properly. -Red
if (curline->polyseg)
{
@@ -3160,7 +2786,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ffloor[i].plane->maxx = rw_stopx - 1;
}
}
-#endif
}
#ifdef WALLSPLATS
diff --git a/src/r_skins.c b/src/r_skins.c
index 2e9548bd7cd0831469b3169f6618d726996ab4c6..57ce382c4183618a66dde1c45a0874b48d5a7535 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -248,7 +248,7 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
{
player_t *player = &players[playernum];
skin_t *skin = &skins[skinnum];
- UINT8 newcolor = 0;
+ UINT16 newcolor = 0;
if (skinnum >= 0 && skinnum < numskins && R_SkinUsable(playernum, skinnum)) // Make sure it exists!
{
@@ -504,6 +504,7 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value)
GETFLAG(FASTEDGE)
GETFLAG(MULTIABILITY)
GETFLAG(NONIGHTSROTATION)
+ GETFLAG(NONIGHTSSUPER)
#undef GETFLAG
else // let's check if it's a sound, otherwise error out
diff --git a/src/r_skins.h b/src/r_skins.h
index 96697b4220038c1bdbe491cbd4943b2b4127113b..45c90bdb4b9e5964547c579abcbdd3d80ed91162 100644
--- a/src/r_skins.h
+++ b/src/r_skins.h
@@ -65,9 +65,9 @@ typedef struct
// Definable color translation table
UINT8 starttranscolor;
- UINT8 prefcolor;
- UINT8 supercolor;
- UINT8 prefoppositecolor; // if 0 use tables instead
+ UINT16 prefcolor;
+ UINT16 supercolor;
+ UINT16 prefoppositecolor; // if 0 use tables instead
fixed_t highresscale; // scale of highres, default is 0.5
UINT8 contspeed; // continue screen animation speed
diff --git a/src/r_things.c b/src/r_things.c
index 02c347929bd560cf6e7fc0589380c37a2bfdb1b9..de5eb208f49bdebf4c5041bde1dbc0b883e83b38 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -428,9 +428,9 @@ void R_AddSpriteDefs(UINT16 wadnum)
switch (wadfiles[wadnum]->type)
{
case RET_WAD:
- start = W_CheckNumForNamePwad("S_START", wadnum, 0);
+ start = W_CheckNumForMarkerStartPwad("S_START", wadnum, 0);
if (start == INT16_MAX)
- start = W_CheckNumForNamePwad("SS_START", wadnum, 0); //deutex compatib.
+ start = W_CheckNumForMarkerStartPwad("SS_START", wadnum, 0); //deutex compatib.
end = W_CheckNumForNamePwad("S_END",wadnum,start);
if (end == INT16_MAX)
@@ -452,8 +452,6 @@ void R_AddSpriteDefs(UINT16 wadnum)
start = 0; //let say S_START is lump 0
}
- else
- start++; // just after S_START
if (end == INT16_MAX || start >= end)
{
@@ -890,7 +888,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
vis->x2 = vid.width-1;
localcolfunc = (vis->cut & SC_VFLIP) ? R_DrawFlippedMaskedColumn : R_DrawMaskedColumn;
- lengthcol = patch->height;
+ lengthcol = SHORT(patch->height);
// Split drawing loops for paper and non-paper to reduce conditional checks per sprite
if (vis->scalestep)
@@ -1021,15 +1019,12 @@ static void R_SplitSprite(vissprite_t *sprite)
for (i = 1; i < sector->numlights; i++)
{
- fixed_t testheight = sector->lightlist[i].height;
+ fixed_t testheight;
if (!(sector->lightlist[i].caster->flags & FF_CUTSPRITES))
continue;
-#ifdef ESLOPE
- if (sector->lightlist[i].slope)
- testheight = P_GetZAt(sector->lightlist[i].slope, sprite->gx, sprite->gy);
-#endif
+ testheight = P_GetLightZAt(§or->lightlist[i], sprite->gx, sprite->gy);
if (testheight >= sprite->gzt)
continue;
@@ -1101,25 +1096,29 @@ static void R_SplitSprite(vissprite_t *sprite)
//
fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
{
- fixed_t z, floorz = INT32_MIN;
- pslope_t *slope, *floorslope = NULL;
+ boolean isflipped = thing->eflags & MFE_VERTICALFLIP;
+ fixed_t z, groundz = isflipped ? INT32_MAX : INT32_MIN;
+ pslope_t *slope, *groundslope = NULL;
msecnode_t *node;
sector_t *sector;
ffloor_t *rover;
+#define CHECKZ (isflipped ? z > thing->z+thing->height/2 && z < groundz : z < thing->z+thing->height/2 && z > groundz)
for (node = thing->touching_sectorlist; node; node = node->m_sectorlist_next)
{
sector = node->m_sector;
- slope = (sector->heightsec != -1) ? NULL : sector->f_slope;
- z = slope ? P_GetZAt(slope, thing->x, thing->y) : (
- (sector->heightsec != -1) ? sectors[sector->heightsec].floorheight : sector->floorheight
- );
+ slope = sector->heightsec != -1 ? NULL : (isflipped ? sector->c_slope : sector->f_slope);
+
+ if (sector->heightsec != -1)
+ z = isflipped ? sectors[sector->heightsec].ceilingheight : sectors[sector->heightsec].floorheight;
+ else
+ z = isflipped ? P_GetSectorCeilingZAt(sector, thing->x, thing->y) : P_GetSectorFloorZAt(sector, thing->x, thing->y);
- if (z < thing->z+thing->height/2 && z > floorz)
+ if CHECKZ
{
- floorz = z;
- floorslope = slope;
+ groundz = z;
+ groundslope = slope;
}
if (sector->ffloors)
@@ -1128,24 +1127,25 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || (rover->alpha < 90 && !(rover->flags & FF_SWIMMABLE)))
continue;
- z = *rover->t_slope ? P_GetZAt(*rover->t_slope, thing->x, thing->y) : *rover->topheight;
- if (z < thing->z+thing->height/2 && z > floorz)
+ z = isflipped ? P_GetFFloorBottomZAt(rover, thing->x, thing->y) : P_GetFFloorTopZAt(rover, thing->x, thing->y);
+ if CHECKZ
{
- floorz = z;
- floorslope = *rover->t_slope;
+ groundz = z;
+ groundslope = isflipped ? *rover->b_slope : *rover->t_slope;
}
}
}
- if (thing->floorz > floorz + (!floorslope ? 0 : FixedMul(abs(floorslope->zdelta), thing->radius*3/2)))
+ if (isflipped ? (thing->ceilingz < groundz - (!groundslope ? 0 : FixedMul(abs(groundslope->zdelta), thing->radius*3/2)))
+ : (thing->floorz > groundz + (!groundslope ? 0 : FixedMul(abs(groundslope->zdelta), thing->radius*3/2))))
{
- floorz = thing->floorz;
- floorslope = NULL;
+ groundz = isflipped ? thing->ceilingz : thing->floorz;
+ groundslope = NULL;
}
#if 0 // Unfortunately, this drops CEZ2 down to sub-17 FPS on my i7.
-//#ifdef POLYOBJECTS
- // Check polyobjects and see if floorz needs to be altered, for rings only because they don't update floorz
+ // NOTE: this section was not updated to reflect reverse gravity support
+ // Check polyobjects and see if groundz needs to be altered, for rings only because they don't update floorz
if (thing->type == MT_RING)
{
INT32 xl, xh, yl, yh, bx, by;
@@ -1190,10 +1190,10 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
// We're inside it! Yess...
z = po->lines[0]->backsector->ceilingheight;
- if (z < thing->z+thing->height/2 && z > floorz)
+ if (z < thing->z+thing->height/2 && z > groundz)
{
- floorz = z;
- floorslope = NULL;
+ groundz = z;
+ groundslope = NULL;
}
}
plink = (polymaplink_t *)(plink->link.next);
@@ -1203,9 +1203,10 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
#endif
if (shadowslope != NULL)
- *shadowslope = floorslope;
+ *shadowslope = groundslope;
- return floorz;
+ return groundz;
+#undef CHECKZ
}
static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale, fixed_t tx, fixed_t tz)
@@ -1216,14 +1217,15 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
INT32 light = 0;
fixed_t scalemul; UINT8 trans;
fixed_t floordiff;
- fixed_t floorz;
- pslope_t *floorslope;
+ fixed_t groundz;
+ pslope_t *groundslope;
+ boolean isflipped = thing->eflags & MFE_VERTICALFLIP;
- floorz = R_GetShadowZ(thing, &floorslope);
+ groundz = R_GetShadowZ(thing, &groundslope);
- if (abs(floorz-viewz)/tz > 4) return; // Prevent stretchy shadows and possible crashes
+ if (abs(groundz-viewz)/tz > 4) return; // Prevent stretchy shadows and possible crashes
- floordiff = abs(thing->z - floorz);
+ floordiff = abs((isflipped ? thing->height : 0) + thing->z - groundz);
trans = floordiff / (100*FRACUNIT) + 3;
if (trans >= 9) return;
@@ -1234,48 +1236,48 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
xscale = FixedDiv(projection, tz);
yscale = FixedDiv(projectiony, tz);
shadowxscale = FixedMul(thing->radius*2, scalemul);
- shadowyscale = FixedMul(FixedMul(thing->radius*2, scalemul), FixedDiv(abs(floorz - viewz), tz));
- shadowyscale = min(shadowyscale, shadowxscale) / patch->height;
- shadowxscale /= patch->width;
+ shadowyscale = FixedMul(FixedMul(thing->radius*2, scalemul), FixedDiv(abs(groundz - viewz), tz));
+ shadowyscale = min(shadowyscale, shadowxscale) / SHORT(patch->height);
+ shadowxscale /= SHORT(patch->width);
shadowskew = 0;
- if (floorslope)
+ if (groundslope)
{
// haha let's try some dumb stuff
fixed_t xslope, zslope;
- angle_t sloperelang = (R_PointToAngle(thing->x, thing->y) - floorslope->xydirection) >> ANGLETOFINESHIFT;
+ angle_t sloperelang = (R_PointToAngle(thing->x, thing->y) - groundslope->xydirection) >> ANGLETOFINESHIFT;
- xslope = FixedMul(FINESINE(sloperelang), floorslope->zdelta);
- zslope = FixedMul(FINECOSINE(sloperelang), floorslope->zdelta);
+ xslope = FixedMul(FINESINE(sloperelang), groundslope->zdelta);
+ zslope = FixedMul(FINECOSINE(sloperelang), groundslope->zdelta);
//CONS_Printf("Shadow is sloped by %d %d\n", xslope, zslope);
- if (viewz < floorz)
- shadowyscale += FixedMul(FixedMul(thing->radius*2 / patch->height, scalemul), zslope);
+ if (viewz < groundz)
+ shadowyscale += FixedMul(FixedMul(thing->radius*2 / SHORT(patch->height), scalemul), zslope);
else
- shadowyscale -= FixedMul(FixedMul(thing->radius*2 / patch->height, scalemul), zslope);
+ shadowyscale -= FixedMul(FixedMul(thing->radius*2 / SHORT(patch->height), scalemul), zslope);
shadowyscale = abs(shadowyscale);
shadowskew = xslope;
}
- tx -= patch->width * shadowxscale/2;
+ tx -= SHORT(patch->width) * shadowxscale/2;
x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
if (x1 >= viewwidth) return;
- tx += patch->width * shadowxscale;
+ tx += SHORT(patch->width) * shadowxscale;
x2 = ((centerxfrac + FixedMul(tx,xscale))>>FRACBITS); x2--;
if (x2 < 0 || x2 <= x1) return;
- if (shadowyscale < FRACUNIT/patch->height) return; // fix some crashes?
+ if (shadowyscale < FRACUNIT/SHORT(patch->height)) return; // fix some crashes?
shadow = R_NewVisSprite();
shadow->patch = patch;
shadow->heightsec = vis->heightsec;
shadow->thingheight = FRACUNIT;
- shadow->pz = floorz;
+ shadow->pz = groundz + (isflipped ? -shadow->thingheight : 0);
shadow->pzt = shadow->pz + shadow->thingheight;
shadow->mobjflags = 0;
@@ -1283,8 +1285,8 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
shadow->dispoffset = vis->dispoffset - 5;
shadow->gx = thing->x;
shadow->gy = thing->y;
- shadow->gzt = shadow->pz + shadow->patch->height * shadowyscale / 2;
- shadow->gz = shadow->gzt - shadow->patch->height * shadowyscale;
+ shadow->gzt = (isflipped ? shadow->pzt : shadow->pz) + SHORT(patch->height) * shadowyscale / 2;
+ shadow->gz = shadow->gzt - SHORT(patch->height) * shadowyscale;
shadow->texturemid = FixedMul(thing->scale, FixedDiv(shadow->gzt - viewz, shadowyscale));
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
shadow->texturemid = FixedMul(shadow->texturemid, ((skin_t *)thing->skin)->highresscale);
@@ -1305,7 +1307,7 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
shadow->startfrac = 0;
//shadow->xiscale = 0x7ffffff0 / (shadow->xscale/2);
- shadow->xiscale = (patch->width<<FRACBITS)/(x2-x1+1); // fuck it
+ shadow->xiscale = (SHORT(patch->width)<<FRACBITS)/(x2-x1+1); // fuck it
if (shadow->x1 > x1)
shadow->startfrac += shadow->xiscale*(shadow->x1-x1);
@@ -1317,20 +1319,17 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
if (thing->subsector->sector->numlights)
{
INT32 lightnum;
-#ifdef ESLOPE // R_GetPlaneLight won't work on sloped lights!
light = thing->subsector->sector->numlights - 1;
+ // R_GetPlaneLight won't work on sloped lights!
for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
- fixed_t h = thing->subsector->sector->lightlist[lightnum].slope ? P_GetZAt(thing->subsector->sector->lightlist[lightnum].slope, thing->x, thing->y)
- : thing->subsector->sector->lightlist[lightnum].height;
+ fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y);
if (h <= shadow->gzt) {
light = lightnum - 1;
break;
}
}
-#else
- light = R_GetPlaneLight(thing->subsector->sector, shadow->gzt, false);
-#endif
+ //light = R_GetPlaneLight(thing->subsector->sector, shadow->gzt, false);
}
if (thing->subsector->sector->numlights)
@@ -1353,7 +1352,6 @@ static void R_ProjectSprite(mobj_t *thing)
{
mobj_t *oldthing = thing;
fixed_t tr_x, tr_y;
- fixed_t gxt, gyt;
fixed_t tx, tz;
fixed_t xscale, yscale, sortscale; //added : 02-02-98 : aaargll..if I were a math-guy!!!
@@ -1366,7 +1364,7 @@ static void R_ProjectSprite(mobj_t *thing)
#endif
size_t lump;
- size_t rot;
+ size_t frame, rot;
UINT16 flip;
boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP));
@@ -1406,21 +1404,16 @@ static void R_ProjectSprite(mobj_t *thing)
tr_x = thing->x - viewx;
tr_y = thing->y - viewy;
- gxt = FixedMul(tr_x, viewcos);
- gyt = -FixedMul(tr_y, viewsin);
-
- tz = gxt-gyt;
+ tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); // near/far distance
// thing is behind view plane?
if (!papersprite && (tz < FixedMul(MINZ, this_scale))) // papersprite clipping is handled later
return;
- gxt = -FixedMul(tr_x, viewsin);
- gyt = FixedMul(tr_y, viewcos);
- basetx = tx = -(gyt + gxt);
+ basetx = tx = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos); // sideways distance
// too far off the side?
- if (!papersprite && abs(tx) > tz<<2) // papersprite clipping is handled later
+ if (!papersprite && abs(tx) > FixedMul(tz, fovtan)<<2) // papersprite clipping is handled later
return;
// aspect ratio stuff
@@ -1433,7 +1426,7 @@ static void R_ProjectSprite(mobj_t *thing)
I_Error("R_ProjectSprite: invalid sprite number %d ", thing->sprite);
#endif
- rot = thing->frame&FF_FRAMEMASK;
+ frame = thing->frame&FF_FRAMEMASK;
//Fab : 02-08-98: 'skin' override spritedef currently used for skin
if (thing->skin && thing->sprite == SPR_PLAY)
@@ -1442,15 +1435,15 @@ static void R_ProjectSprite(mobj_t *thing)
#ifdef ROTSPRITE
sprinfo = &((skin_t *)thing->skin)->sprinfo[thing->sprite2];
#endif
- if (rot >= sprdef->numframes) {
- CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid skins[\"%s\"].sprites[%sSPR2_%s] frame %s\n"), ((skin_t *)thing->skin)->name, ((thing->sprite2 & FF_SPR2SUPER) ? "FF_SPR2SUPER|": ""), spr2names[(thing->sprite2 & ~FF_SPR2SUPER)], sizeu5(rot));
+ if (frame >= sprdef->numframes) {
+ CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid skins[\"%s\"].sprites[%sSPR2_%s] frame %s\n"), ((skin_t *)thing->skin)->name, ((thing->sprite2 & FF_SPR2SUPER) ? "FF_SPR2SUPER|": ""), spr2names[(thing->sprite2 & ~FF_SPR2SUPER)], sizeu5(frame));
thing->sprite = states[S_UNKNOWN].sprite;
thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite];
#ifdef ROTSPRITE
sprinfo = NULL;
#endif
- rot = thing->frame&FF_FRAMEMASK;
+ frame = thing->frame&FF_FRAMEMASK;
}
}
else
@@ -1460,10 +1453,10 @@ static void R_ProjectSprite(mobj_t *thing)
sprinfo = NULL;
#endif
- if (rot >= sprdef->numframes)
+ if (frame >= sprdef->numframes)
{
CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid sprite frame %s/%s for %s\n"),
- sizeu1(rot), sizeu2(sprdef->numframes), sprnames[thing->sprite]);
+ sizeu1(frame), sizeu2(sprdef->numframes), sprnames[thing->sprite]);
if (thing->sprite == thing->state->sprite && thing->frame == thing->state->frame)
{
thing->state->sprite = states[S_UNKNOWN].sprite;
@@ -1472,11 +1465,11 @@ static void R_ProjectSprite(mobj_t *thing)
thing->sprite = states[S_UNKNOWN].sprite;
thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite];
- rot = thing->frame&FF_FRAMEMASK;
+ frame = thing->frame&FF_FRAMEMASK;
}
}
- sprframe = &sprdef->spriteframes[rot];
+ sprframe = &sprdef->spriteframes[frame];
#ifdef PARANOIA
if (!sprframe)
@@ -1530,14 +1523,14 @@ static void R_ProjectSprite(mobj_t *thing)
{
rollangle = R_GetRollAngle(thing->rollangle);
if (!(sprframe->rotsprite.cached & (1<<rot)))
- R_CacheRotSprite(thing->sprite, (thing->frame & FF_FRAMEMASK), sprinfo, sprframe, rot, flip);
+ R_CacheRotSprite(thing->sprite, frame, sprinfo, sprframe, rot, flip);
rotsprite = sprframe->rotsprite.patch[rot][rollangle];
if (rotsprite != NULL)
{
- spr_width = rotsprite->width << FRACBITS;
- spr_height = rotsprite->height << FRACBITS;
- spr_offset = rotsprite->leftoffset << FRACBITS;
- spr_topoffset = rotsprite->topoffset << FRACBITS;
+ spr_width = SHORT(rotsprite->width) << FRACBITS;
+ spr_height = SHORT(rotsprite->height) << FRACBITS;
+ spr_offset = SHORT(rotsprite->leftoffset) << FRACBITS;
+ spr_topoffset = SHORT(rotsprite->topoffset) << FRACBITS;
// flip -> rotate, not rotate -> flip
flip = 0;
}
@@ -1568,17 +1561,9 @@ static void R_ProjectSprite(mobj_t *thing)
tr_x += FixedMul(offset, cosmul);
tr_y += FixedMul(offset, sinmul);
- gxt = FixedMul(tr_x, viewcos);
- gyt = -FixedMul(tr_y, viewsin);
- tz = gxt-gyt;
- yscale = FixedDiv(projectiony, tz);
- //if (yscale < 64) return; // Fix some funky visuals
+ tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
- gxt = -FixedMul(tr_x, viewsin);
- gyt = FixedMul(tr_y, viewcos);
- tx = -(gyt + gxt);
- xscale = FixedDiv(projection, tz);
- x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
+ tx = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
// Get paperoffset (offset) and paperoffset (distance)
paperoffset = -FixedMul(tr_x, cosmul) - FixedMul(tr_y, sinmul);
@@ -1592,17 +1577,9 @@ static void R_ProjectSprite(mobj_t *thing)
tr_x += FixedMul(offset2, cosmul);
tr_y += FixedMul(offset2, sinmul);
- gxt = FixedMul(tr_x, viewcos);
- gyt = -FixedMul(tr_y, viewsin);
- tz2 = gxt-gyt;
- yscale2 = FixedDiv(projectiony, tz2);
- //if (yscale2 < 64) return; // ditto
+ tz2 = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
- gxt = -FixedMul(tr_x, viewsin);
- gyt = FixedMul(tr_y, viewcos);
- tx2 = -(gyt + gxt);
- xscale2 = FixedDiv(projection, tz2);
- x2 = ((centerxfrac + FixedMul(tx2,xscale2))>>FRACBITS);
+ tx2 = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
return;
@@ -1613,24 +1590,31 @@ static void R_ProjectSprite(mobj_t *thing)
fixed_t div = FixedDiv(tz2-tz, FixedMul(MINZ, this_scale)-tz);
tx += FixedDiv(tx2-tx, div);
tz = FixedMul(MINZ, this_scale);
- yscale = FixedDiv(projectiony, tz);
- xscale = FixedDiv(projection, tz);
- x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
}
else if (tz2 < FixedMul(MINZ, this_scale))
{
fixed_t div = FixedDiv(tz-tz2, FixedMul(MINZ, this_scale)-tz2);
tx2 += FixedDiv(tx-tx2, div);
tz2 = FixedMul(MINZ, this_scale);
- yscale2 = FixedDiv(projectiony, tz2);
- xscale2 = FixedDiv(projection, tz2);
- x2 = (centerxfrac + FixedMul(tx2,xscale2))>>FRACBITS;
}
+ if (tx2 < -(FixedMul(tz2, fovtan)<<2) || tx > FixedMul(tz, fovtan)<<2) // too far off the side?
+ return;
+
+ yscale = FixedDiv(projectiony, tz);
+ xscale = FixedDiv(projection, tz);
+
+ x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
+
// off the right side?
if (x1 > viewwidth)
return;
+ yscale2 = FixedDiv(projectiony, tz2);
+ xscale2 = FixedDiv(projection, tz2);
+
+ x2 = (centerxfrac + FixedMul(tx2,xscale2))>>FRACBITS;
+
// off the left side
if (x2 < 0)
return;
@@ -1677,9 +1661,7 @@ static void R_ProjectSprite(mobj_t *thing)
tr_x = thing->x - viewx;
tr_y = thing->y - viewy;
- gxt = FixedMul(tr_x, viewcos);
- gyt = -FixedMul(tr_y, viewsin);
- tz = gxt-gyt;
+ tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
linkscale = FixedDiv(projectiony, tz);
if (tz < FixedMul(MINZ, this_scale))
@@ -1695,7 +1677,7 @@ static void R_ProjectSprite(mobj_t *thing)
// PORTAL SPRITE CLIPPING
if (portalrender && portalclipline)
{
- if (x2 < portalclipstart || x1 > portalclipend)
+ if (x2 < portalclipstart || x1 >= portalclipend)
return;
if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0)
@@ -1726,20 +1708,17 @@ static void R_ProjectSprite(mobj_t *thing)
if (thing->subsector->sector->numlights)
{
INT32 lightnum;
-#ifdef ESLOPE // R_GetPlaneLight won't work on sloped lights!
light = thing->subsector->sector->numlights - 1;
+ // R_GetPlaneLight won't work on sloped lights!
for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
- fixed_t h = thing->subsector->sector->lightlist[lightnum].slope ? P_GetZAt(thing->subsector->sector->lightlist[lightnum].slope, thing->x, thing->y)
- : thing->subsector->sector->lightlist[lightnum].height;
+ fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y);
if (h <= gzt) {
light = lightnum - 1;
break;
}
}
-#else
- light = R_GetPlaneLight(thing->subsector->sector, gzt, false);
-#endif
+ //light = R_GetPlaneLight(thing->subsector->sector, gzt, false);
lightnum = (*thing->subsector->sector->lightlist[light].lightlevel >> LIGHTSEGSHIFT);
if (lightnum < 0)
@@ -1882,7 +1861,6 @@ static void R_ProjectSprite(mobj_t *thing)
static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
{
fixed_t tr_x, tr_y;
- fixed_t gxt, gyt;
fixed_t tx, tz;
fixed_t xscale, yscale; //added : 02-02-98 : aaargll..if I were a math-guy!!!
@@ -1903,21 +1881,16 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
tr_x = thing->x - viewx;
tr_y = thing->y - viewy;
- gxt = FixedMul(tr_x, viewcos);
- gyt = -FixedMul(tr_y, viewsin);
-
- tz = gxt - gyt;
+ tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); // near/far distance
// thing is behind view plane?
if (tz < MINZ)
return;
- gxt = -FixedMul(tr_x, viewsin);
- gyt = FixedMul(tr_y, viewcos);
- tx = -(gyt + gxt);
+ tx = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos); // sideways distance
// too far off the side?
- if (abs(tx) > tz<<2)
+ if (abs(tx) > FixedMul(tz, fovtan)<<2)
return;
// aspect ratio stuff :
@@ -1967,7 +1940,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
// PORTAL SPRITE CLIPPING
if (portalrender && portalclipline)
{
- if (x2 < portalclipstart || x1 > portalclipend)
+ if (x2 < portalclipstart || x1 >= portalclipend)
return;
if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0)
@@ -2279,7 +2252,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
entry->ffloor = ds->thicksides[i];
}
}
-#ifdef POLYOBJECTS_PLANES
// Check for a polyobject plane, but only if this is a front line
if (ds->curline->polyseg && ds->curline->polyseg->visplane && !ds->curline->side) {
plane = ds->curline->polyseg->visplane;
@@ -2295,7 +2267,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
}
ds->curline->polyseg->visplane = NULL;
}
-#endif
if (ds->maskedtexturecol)
{
entry = R_CreateDrawNode(head);
@@ -2343,7 +2314,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
if (tempskip)
return;
-#ifdef POLYOBJECTS_PLANES
// find all the remaining polyobject planes and add them on the end of the list
// probably this is a terrible idea if we wanted them to be sorted properly
// but it works getting them in for now
@@ -2364,7 +2334,6 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
// note: no seg is set, for what should be obvious reasons
PolyObjects[i].visplane = NULL;
}
-#endif
// No vissprites in this mask?
if (mask->vissprites[1] - mask->vissprites[0] == 0)
@@ -2389,14 +2358,9 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
if (rover->szt > r2->plane->low || rover->sz < r2->plane->high)
continue;
-#ifdef ESLOPE
// Effective height may be different for each comparison in the case of slopes
- if (r2->plane->slope) {
- planeobjectz = P_GetZAt(r2->plane->slope, rover->gx, rover->gy);
- planecameraz = P_GetZAt(r2->plane->slope, viewx, viewy);
- } else
-#endif
- planeobjectz = planecameraz = r2->plane->height;
+ planeobjectz = P_GetZAt(r2->plane->slope, rover->gx, rover->gy, r2->plane->height);
+ planecameraz = P_GetZAt(r2->plane->slope, viewx, viewy, r2->plane->height);
if (rover->mobjflags & MF_NOCLIPHEIGHT)
{
@@ -2454,21 +2418,10 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
if (scale <= rover->sortscale)
continue;
-#ifdef ESLOPE
- if (*r2->ffloor->t_slope) {
- topplaneobjectz = P_GetZAt(*r2->ffloor->t_slope, rover->gx, rover->gy);
- topplanecameraz = P_GetZAt(*r2->ffloor->t_slope, viewx, viewy);
- } else
-#endif
- topplaneobjectz = topplanecameraz = *r2->ffloor->topheight;
-
-#ifdef ESLOPE
- if (*r2->ffloor->b_slope) {
- botplaneobjectz = P_GetZAt(*r2->ffloor->b_slope, rover->gx, rover->gy);
- botplanecameraz = P_GetZAt(*r2->ffloor->b_slope, viewx, viewy);
- } else
-#endif
- botplaneobjectz = botplanecameraz = *r2->ffloor->bottomheight;
+ topplaneobjectz = P_GetFFloorTopZAt (r2->ffloor, rover->gx, rover->gy);
+ topplanecameraz = P_GetFFloorTopZAt (r2->ffloor, viewx, viewy);
+ botplaneobjectz = P_GetFFloorBottomZAt(r2->ffloor, rover->gx, rover->gy);
+ botplanecameraz = P_GetFFloorBottomZAt(r2->ffloor, viewx, viewy);
if ((topplanecameraz > viewz && botplanecameraz < viewz) ||
(topplanecameraz < viewz && rover->gzt < topplaneobjectz) ||
diff --git a/src/s_sound.c b/src/s_sound.c
index 8e9461d785b9eecef326d4238494230791425211..5ed9fd83a22d8f475c7400878db264d329a42bd1 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -40,7 +40,7 @@ extern INT32 msg_id;
#include "m_misc.h" // for tunes command
#include "m_cond.h" // for conditionsets
-#if defined(HAVE_BLUA) && defined(HAVE_LUA_MUSICPLUS)
+#ifdef HAVE_LUA_MUSICPLUS
#include "lua_hook.h" // MusicChange hook
#endif
@@ -134,6 +134,7 @@ consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_Y
consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
#ifdef HAVE_OPENMPT
+openmpt_module *openmpt_mhandle = NULL;
static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}};
consvar_t cv_modfilter = {"modfilter", "0", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL};
#endif
@@ -1456,6 +1457,7 @@ musicdef_t soundtestsfx = {
0, // with no conditions
0,
0,
+ 0,
false,
NULL
};
@@ -1651,6 +1653,8 @@ ReadMusicDefFields (UINT16 wadnum, int line, boolean fields, char *stoken,
fixed_t bpmf = FLOAT_TO_FIXED(bpm);
if (bpmf > 0)
def->bpm = FixedDiv((60*TICRATE)<<FRACBITS, bpmf);
+ } else if (!stricmp(stoken, "loopms")) {
+ def->loop_ms = atoi(textline);
} else {
CONS_Alert(CONS_WARNING,
"MUSICDEF: Invalid field '%s'. (file %s, line %d)\n",
@@ -1672,7 +1676,7 @@ void S_LoadMusicDefs(UINT16 wadnum)
char *lf;
char *stoken;
- size_t nlf;
+ size_t nlf = 0xFFFFFFFF;
size_t ncr;
musicdef_t *def = NULL;
@@ -1907,6 +1911,10 @@ UINT32 S_GetMusicPosition(void)
/// In this section: mazmazz doesn't know how to do dynamic arrays or struct pointers!
/// ------------------------
+char music_stack_nextmusname[7];
+boolean music_stack_noposition = false;
+UINT32 music_stack_fadeout = 0;
+UINT32 music_stack_fadein = 0;
static musicstack_t *music_stacks = NULL;
static musicstack_t *last_music_stack = NULL;
@@ -2045,7 +2053,7 @@ static musicstack_t *S_GetMusicStackEntry(UINT16 status, boolean fromfirst, INT1
if (!status || mst->status == status)
{
- if (P_EvaluateMusicStatus(mst->status))
+ if (P_EvaluateMusicStatus(mst->status, mst->musname))
{
if (!S_MusicExists(mst->musname, !midi_disabled, !digital_disabled)) // paranoia
S_RemoveMusicStackEntry(mst); // then continue
@@ -2262,6 +2270,8 @@ static void S_UnloadMusic(void)
static boolean S_PlayMusic(boolean looping, UINT32 fadeinms)
{
+ musicdef_t *def;
+
if (S_MusicDisabled())
return false;
@@ -2273,6 +2283,17 @@ static boolean S_PlayMusic(boolean looping, UINT32 fadeinms)
return false;
}
+ /* set loop point from MUSICDEF */
+ for (def = musicdefstart; def; def = def->next)
+ {
+ if (strcasecmp(def->name, music_name) == 0)
+ {
+ if (def->loop_ms)
+ S_SetMusicLoopPoint(def->loop_ms);
+ break;
+ }
+ }
+
S_InitMusicVolume(); // switch between digi and sequence volume
if (S_MusicNotInFocus())
@@ -2314,7 +2335,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
return;
strncpy(newmusic, mmusic, 7);
-#if defined(HAVE_BLUA) && defined(HAVE_LUA_MUSICPLUS)
+#ifdef HAVE_LUA_MUSICPLUS
if(LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms))
return;
#endif
diff --git a/src/s_sound.h b/src/s_sound.h
index d7e0c46ab8dd1fbc683cea7b5ed246fc2ebc6dda..3334fcb69d7bf18820776130c627ba948b1ecb52 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -22,7 +22,7 @@
#ifdef HAVE_OPENMPT
#include "libopenmpt/libopenmpt.h"
-openmpt_module *openmpt_mhandle;
+extern openmpt_module *openmpt_mhandle;
#endif
// mask used to indicate sound origin is player item pickup
@@ -208,6 +208,7 @@ typedef struct musicdef_s
INT16 soundtestcond; // +ve for map, -ve for conditionset, 0 for already here
tic_t stoppingtics;
fixed_t bpm;
+ UINT32 loop_ms;/* override LOOPPOINT/LOOPMS */
boolean allowed; // question marks or listenable on sound test?
struct musicdef_s *next;
} musicdef_t;
@@ -261,10 +262,10 @@ typedef struct musicstack_s
struct musicstack_s *next;
} musicstack_t;
-char music_stack_nextmusname[7];
-boolean music_stack_noposition;
-UINT32 music_stack_fadeout;
-UINT32 music_stack_fadein;
+extern char music_stack_nextmusname[7];
+extern boolean music_stack_noposition;
+extern UINT32 music_stack_fadeout;
+extern UINT32 music_stack_fadein;
void S_SetStackAdjustmentStart(void);
void S_AdjustMusicStackTics(void);
@@ -332,7 +333,7 @@ void S_StopSoundByNum(sfxenum_t sfxnum);
#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
-const char *compat_special_music_slots[16];
+extern const char *compat_special_music_slots[16];
#endif
#endif
diff --git a/src/screen.c b/src/screen.c
index 011477338ac94b3f00c98d2a8503c6aa30dc84fb..e01d1a81a8160918010a61cc389646664a91cbb0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -127,14 +127,12 @@ void SCR_SetDrawFuncs(void)
#ifndef NOWATER
spanfuncs[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_8;
#endif
-#ifdef ESLOPE
spanfuncs[SPANDRAWFUNC_TILTED] = R_DrawTiltedSpan_8;
spanfuncs[SPANDRAWFUNC_TILTEDTRANS] = R_DrawTiltedTranslucentSpan_8;
#ifndef NOWATER
spanfuncs[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedTranslucentWaterSpan_8;
#endif
spanfuncs[SPANDRAWFUNC_TILTEDSPLAT] = R_DrawTiltedSplat_8;
-#endif
// Lactozilla: Non-powers-of-two
spanfuncs_npo2[BASEDRAWFUNC] = R_DrawSpan_NPO2_8;
@@ -145,14 +143,12 @@ void SCR_SetDrawFuncs(void)
#ifndef NOWATER
spanfuncs_npo2[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_NPO2_8;
#endif
-#ifdef ESLOPE
spanfuncs_npo2[SPANDRAWFUNC_TILTED] = R_DrawTiltedSpan_NPO2_8;
spanfuncs_npo2[SPANDRAWFUNC_TILTEDTRANS] = R_DrawTiltedTranslucentSpan_NPO2_8;
#ifndef NOWATER
spanfuncs_npo2[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedTranslucentWaterSpan_NPO2_8;
#endif
spanfuncs_npo2[SPANDRAWFUNC_TILTEDSPLAT] = R_DrawTiltedSplat_NPO2_8;
-#endif
#ifdef RUSEASM
if (R_ASM)
@@ -530,6 +526,9 @@ void SCR_DisplayTicRate(void)
INT32 ticcntcolor = 0;
const INT32 h = vid.height-(8*vid.dupy);
+ if (gamestate == GS_NULL)
+ return;
+
for (i = lasttic + 1; i < TICRATE+lasttic && i < ontic; ++i)
fpsgraph[i % TICRATE] = false;
@@ -542,10 +541,16 @@ void SCR_DisplayTicRate(void)
if (totaltics <= TICRATE/2) ticcntcolor = V_REDMAP;
else if (totaltics == TICRATE) ticcntcolor = V_GREENMAP;
- V_DrawString(vid.width-(72*vid.dupx), h,
- V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "FPS:");
- V_DrawString(vid.width-(40*vid.dupx), h,
- ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d/%02u", totaltics, TICRATE));
+ if (cv_ticrate.value == 2) // compact counter
+ V_DrawString(vid.width-(16*vid.dupx), h,
+ ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d", totaltics));
+ else if (cv_ticrate.value == 1) // full counter
+ {
+ V_DrawString(vid.width-(72*vid.dupx), h,
+ V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "FPS:");
+ V_DrawString(vid.width-(40*vid.dupx), h,
+ ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d/%02u", totaltics, TICRATE));
+ }
lasttic = ontic;
}
diff --git a/src/screen.h b/src/screen.h
index 717ce9adc66c9511bce54238cc116ca8ffe49cd1..ddbd499bbd347d691c79e8ba0a4cbf416a300abd 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -140,13 +140,11 @@ enum
#ifndef NOWATER
SPANDRAWFUNC_WATER,
#endif
-#ifdef ESLOPE
SPANDRAWFUNC_TILTED,
SPANDRAWFUNC_TILTEDTRANS,
SPANDRAWFUNC_TILTEDSPLAT,
#ifndef NOWATER
SPANDRAWFUNC_TILTEDWATER,
-#endif
#endif
SPANDRAWFUNC_MAX
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj
index 7e260f4c01ed5a83960bd8f65bdc1f50fbad5ee6..6a55ac2d6837bd3e76fe5db3165732077143e8a5 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj
+++ b/src/sdl/Srb2SDL-vc10.vcxproj
@@ -213,6 +213,7 @@
<ClInclude Include="..\fastcmp.h" />
<ClInclude Include="..\filesrch.h" />
<ClInclude Include="..\f_finale.h" />
+ <ClInclude Include="..\g_demo.h" />
<ClInclude Include="..\g_game.h" />
<ClInclude Include="..\g_input.h" />
<ClInclude Include="..\g_state.h" />
@@ -337,6 +338,7 @@
<ClCompile Include="..\blua\lfunc.c" />
<ClCompile Include="..\blua\lgc.c" />
<ClCompile Include="..\blua\linit.c" />
+ <ClCompile Include="..\blua\liolib.c" />
<ClCompile Include="..\blua\llex.c" />
<ClCompile Include="..\blua\lmem.c" />
<ClCompile Include="..\blua\lobject.c" />
@@ -364,6 +366,7 @@
<ClCompile Include="..\filesrch.c" />
<ClCompile Include="..\f_finale.c" />
<ClCompile Include="..\f_wipe.c" />
+ <ClCompile Include="..\g_demo.c" />
<ClCompile Include="..\g_game.c" />
<ClCompile Include="..\g_input.c" />
<ClCompile Include="..\hardware\hw3sound.c" />
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj.filters b/src/sdl/Srb2SDL-vc10.vcxproj.filters
index 21820551a4ad1bfcfe85765d7975fa482c646e55..89ba1b588ab5b149394327b6b5077853772ac5cf 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj.filters
+++ b/src/sdl/Srb2SDL-vc10.vcxproj.filters
@@ -180,6 +180,9 @@
<ClInclude Include="..\f_finale.h">
<Filter>F_Frame</Filter>
</ClInclude>
+ <ClInclude Include="..\g_demo.h">
+ <Filter>G_Game</Filter>
+ </ClInclude>
<ClInclude Include="..\g_game.h">
<Filter>G_Game</Filter>
</ClInclude>
@@ -531,6 +534,9 @@
<ClCompile Include="..\blua\linit.c">
<Filter>BLUA</Filter>
</ClCompile>
+ <ClCompile Include="..\blua\liolib.c">
+ <Filter>BLUA</Filter>
+ </ClCompile>
<ClCompile Include="..\blua\llex.c">
<Filter>BLUA</Filter>
</ClCompile>
@@ -600,6 +606,9 @@
<ClCompile Include="..\f_wipe.c">
<Filter>F_Frame</Filter>
</ClCompile>
+ <ClCompile Include="..\g_demo.c">
+ <Filter>G_Game</Filter>
+ </ClCompile>
<ClCompile Include="..\g_game.c">
<Filter>G_Game</Filter>
</ClCompile>
diff --git a/src/sdl/Srb2SDL-vc9.vcproj b/src/sdl/Srb2SDL-vc9.vcproj
index 3898aeba4efc53c9bd06fe38834d164ae31d64c1..9ef4301cc2b0bf605e7440086b89c79fba54b663 100644
--- a/src/sdl/Srb2SDL-vc9.vcproj
+++ b/src/sdl/Srb2SDL-vc9.vcproj
@@ -50,7 +50,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -145,7 +145,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="_DEBUG;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -248,7 +248,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;USEASM;HAVE_PNG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
PrecompiledHeaderFile=".\..\..\objs\VC9\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch"
@@ -350,7 +350,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="NDEBUG;SDLMAIN;NO_STDIO_REDIRECT;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_PNG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
PrecompiledHeaderFile=".\..\..\objs\VC9\$(Platform)\$(Configuration)\SDL\Srb2SDL-vc9.pch"
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 5d0009927f1f64579c538d2cc604ee30fa3aa007..1dee379c0d8d95db186f1e9e3bb301554ed0549f 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#endif
-#ifdef __unix__
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#include <errno.h>
#endif
@@ -103,6 +103,93 @@ static inline VOID MakeCodeWritable(VOID)
}
#endif
+#ifdef LOGMESSAGES
+static void InitLogging(void)
+{
+ const char *logdir = NULL;
+ time_t my_time;
+ struct tm * timeinfo;
+ const char *format;
+ const char *reldir;
+ int left;
+ boolean fileabs;
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+ const char *link;
+#endif
+
+ logdir = D_Home();
+
+ my_time = time(NULL);
+ timeinfo = localtime(&my_time);
+
+ if (M_CheckParm("-logfile") && M_IsNextParm())
+ {
+ format = M_GetNextParm();
+ fileabs = M_IsPathAbsolute(format);
+ }
+ else
+ {
+ format = "log-%Y-%m-%d_%H-%M-%S.txt";
+ fileabs = false;
+ }
+
+ if (fileabs)
+ {
+ strftime(logfilename, sizeof logfilename, format, timeinfo);
+ }
+ else
+ {
+ if (M_CheckParm("-logdir") && M_IsNextParm())
+ reldir = M_GetNextParm();
+ else
+ reldir = "logs";
+
+ if (M_IsPathAbsolute(reldir))
+ {
+ left = snprintf(logfilename, sizeof logfilename,
+ "%s"PATHSEP, reldir);
+ }
+ else
+#ifdef DEFAULTDIR
+ if (logdir)
+ {
+ left = snprintf(logfilename, sizeof logfilename,
+ "%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
+ }
+ else
+#endif/*DEFAULTDIR*/
+ {
+ left = snprintf(logfilename, sizeof logfilename,
+ "."PATHSEP"%s"PATHSEP, reldir);
+ }
+
+ strftime(&logfilename[left], sizeof logfilename - left,
+ format, timeinfo);
+ }
+
+ M_MkdirEachUntil(logfilename,
+ M_PathParts(logdir) - 1,
+ M_PathParts(logfilename) - 1, 0755);
+
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+ logstream = fopen(logfilename, "w");
+#ifdef DEFAULTDIR
+ if (logdir)
+ link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
+ else
+#endif/*DEFAULTDIR*/
+ link = "latest-log.txt";
+ unlink(link);
+ if (symlink(logfilename, link) == -1)
+ {
+ I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
+ }
+#else/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
+ logstream = fopen("latest-log.txt", "wt+");
+#endif/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
+}
+#endif
+
/** \brief The main function
@@ -121,7 +208,6 @@ int SDL_main(int argc, char **argv)
int main(int argc, char **argv)
#endif
{
- const char *logdir = NULL;
myargc = argc;
myargv = argv; /// \todo pull out path to exe from this string
@@ -135,90 +221,9 @@ int main(int argc, char **argv)
#ifdef LOGMESSAGES
if (!M_CheckParm("-nolog"))
- {
- time_t my_time;
- struct tm * timeinfo;
- const char *format;
- const char *reldir;
- int left;
- boolean fileabs;
-#ifdef __unix__
- const char *link;
-#endif
-
- logdir = D_Home();
-
- my_time = time(NULL);
- timeinfo = localtime(&my_time);
-
- if (M_CheckParm("-logfile") && M_IsNextParm())
- {
- format = M_GetNextParm();
- fileabs = M_IsPathAbsolute(format);
- }
- else
- {
- format = "log-%Y-%m-%d_%H-%M-%S.txt";
- fileabs = false;
- }
-
- if (fileabs)
- {
- strftime(logfilename, sizeof logfilename, format, timeinfo);
- }
- else
- {
- if (M_CheckParm("-logdir") && M_IsNextParm())
- reldir = M_GetNextParm();
- else
- reldir = "logs";
-
- if (M_IsPathAbsolute(reldir))
- {
- left = snprintf(logfilename, sizeof logfilename,
- "%s"PATHSEP, reldir);
- }
- else
-#ifdef DEFAULTDIR
- if (logdir)
- {
- left = snprintf(logfilename, sizeof logfilename,
- "%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
- }
- else
-#endif/*DEFAULTDIR*/
- {
- left = snprintf(logfilename, sizeof logfilename,
- "."PATHSEP"%s"PATHSEP, reldir);
- }
+ InitLogging();
#endif/*LOGMESSAGES*/
- strftime(&logfilename[left], sizeof logfilename - left,
- format, timeinfo);
- }
-
- M_MkdirEachUntil(logfilename,
- M_PathParts(logdir) - 1,
- M_PathParts(logfilename) - 1, 0755);
-
-#ifdef __unix__
- logstream = fopen(logfilename, "w");
-#ifdef DEFAULTDIR
- if (logdir)
- link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
- else
-#endif/*DEFAULTDIR*/
- link = "latest-log.txt";
- unlink(link);
- if (symlink(logfilename, link) == -1)
- {
- I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
- }
-#else/*__unix__*/
- logstream = fopen("latest-log.txt", "wt+");
-#endif/*__unix__*/
- }
-
//I_OutputMsg("I_StartupSystem() ...\n");
I_StartupSystem();
#if defined (_WIN32)
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 426904c63abf0525e5c22d7f1bc723293c1bd670..cd6555f5517bf5f0bd902868956e833c4291c4d5 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -178,6 +178,8 @@ static char returnWadPath[256];
#include "../m_argv.h"
+#include "../m_menu.h"
+
#ifdef MAC_ALERT
#include "macosx/mac_alert.h"
#endif
@@ -2315,6 +2317,7 @@ void I_Quit(void)
G_StopMetalRecording(false);
D_QuitNetGame();
+ M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
@@ -2431,6 +2434,7 @@ void I_Error(const char *error, ...)
G_StopMetalRecording(false);
D_QuitNetGame();
+ M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
@@ -2506,7 +2510,7 @@ void I_RemoveExitFunc(void (*func)())
}
}
-#ifndef __unix__
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
static void Shittycopyerror(const char *name)
{
I_OutputMsg(
@@ -2546,7 +2550,7 @@ static void Shittylogcopy(void)
Shittycopyerror(logfilename);
}
}
-#endif/*__unix__*/
+#endif/*!(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))*/
//
// Closes down everything. This includes restoring the initial
@@ -2570,7 +2574,7 @@ void I_ShutdownSystem(void)
if (logstream)
{
I_OutputMsg("I_ShutdownSystem(): end of logstream.\n");
-#ifndef __unix__
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
Shittylogcopy();
#endif
fclose(logstream);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 2a129fbde2b41d593fd34359f13d6a463e4d8b94..f06e101241b2599d846b36cce2a73668200588a1 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -217,7 +217,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen, SDL_bool
else
{
Impl_CreateWindow(fullscreen);
- Impl_SetWindowIcon();
wasfullscreen = fullscreen;
SDL_SetWindowSize(window, width, height);
if (fullscreen)
@@ -368,7 +367,9 @@ static boolean IgnoreMouse(void)
return false;
if (menuactive)
return !M_MouseNeeded();
- if (paused || con_destlines || chat_on || gamestate != GS_LEVEL)
+ if (paused || con_destlines || chat_on)
+ return true;
+ if (gamestate != GS_LEVEL && gamestate != GS_INTERMISSION && gamestate != GS_CUTSCENE)
return true;
return false;
}
@@ -1627,12 +1628,15 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
window = SDL_CreateWindow("SRB2 "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
realwidth, realheight, flags);
+
if (window == NULL)
{
CONS_Printf(M_GetText("Couldn't create window: %s\n"), SDL_GetError());
return SDL_FALSE;
}
+ Impl_SetWindowIcon();
+
return Impl_CreateContext();
}
@@ -1649,12 +1653,8 @@ static void Impl_SetWindowName(const char *title)
static void Impl_SetWindowIcon(void)
{
- if (window == NULL || icoSurface == NULL)
- {
- return;
- }
- //SDL2STUB(); // Monster Iestyn: why is this stubbed?
- SDL_SetWindowIcon(window, icoSurface);
+ if (window && icoSurface)
+ SDL_SetWindowIcon(window, icoSurface);
}
static void Impl_VideoSetupSDLBuffer(void)
@@ -1761,6 +1761,11 @@ void I_StartupGraphics(void)
VID_StartupOpenGL();
#endif
+ // Window icon
+#ifdef HAVE_IMAGE
+ icoSurface = IMG_ReadXPMFromArray(SDL_icon_xpm);
+#endif
+
// Fury: we do window initialization after GL setup to allow
// SDL_GL_LoadLibrary to work well on Windows
@@ -1779,11 +1784,6 @@ void I_StartupGraphics(void)
#ifdef HAVE_TTF
I_ShutdownTTF();
#endif
- // Window icon
-#ifdef HAVE_IMAGE
- icoSurface = IMG_ReadXPMFromArray(SDL_icon_xpm);
-#endif
- Impl_SetWindowIcon();
VID_SetMode(VID_GetModeForSize(BASEVIDWIDTH, BASEVIDHEIGHT));
diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
index b615bc1dfd40daea3db522e7c2fc7520fc03b495..745513eeb3542cbf68d6515c09cb8e6abc56db97 100644
--- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -1219,7 +1219,7 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.2.2;
+ CURRENT_PROJECT_VERSION = 2.2.4;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
NORMALSRB2,
@@ -1231,7 +1231,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.2.2;
+ CURRENT_PROJECT_VERSION = 2.2.4;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1272,7 +1272,6 @@
HAVE_SDL,
HAVE_MIXER,
HAVE_PNG,
- HAVE_BLUA,
LUA_USE_POSIX,
COMPVERSION,
HWRENDER,
@@ -1395,7 +1394,6 @@
HAVE_SDL,
HAVE_MIXER,
HAVE_PNG,
- HAVE_BLUA,
LUA_USE_POSIX,
COMPVERSION,
HWRENDER,
diff --git a/src/sounds.c b/src/sounds.c
index ca943c2d06f0fd9d86e0a3616a86c84b857f65e3..9894fd13ecb2509be3118b48dfa53eda04db8467 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -527,7 +527,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k8a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boing"},
{"s3k8b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful hit"},
{"s3k8c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Humming power"},
- {"s3k8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"s3k8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "/"},
{"s3k8e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accelerating"},
{"s3k8f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Opening"},
{"s3k90", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Impact"},
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 4864f2af694a964c5075a82f7535512779887930..086e80291275cbc174dbe700d5b248e5a78a23a6 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -42,9 +42,7 @@
#include "hardware/hw_main.h"
#endif
-#ifdef HAVE_BLUA
#include "lua_hud.h"
-#endif
UINT16 objectsdrawn = 0;
@@ -458,7 +456,7 @@ boolean st_overlay;
//
// Supports different colors! woo!
static void ST_DrawNightsOverlayNum(fixed_t x /* right border */, fixed_t y, fixed_t s, INT32 a,
- UINT32 num, patch_t **numpat, skincolors_t colornum)
+ UINT32 num, patch_t **numpat, skincolornum_t colornum)
{
fixed_t w = SHORT(numpat[0]->width)*s;
const UINT8 *colormap;
@@ -969,11 +967,7 @@ static void ST_drawLivesArea(void)
V_DrawThinString(hudinfo[HUD_LIVES].x+18, hudinfo[HUD_LIVES].y, v_colmap, skins[stplyr->skin].hudname);
// Power Stones collected
- if (G_RingSlingerGametype()
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_powerstones)
-#endif
- )
+ if (G_RingSlingerGametype() && LUA_HudEnabled(hud_powerstones))
{
INT32 workx = hudinfo[HUD_LIVES].x+1, j;
if ((leveltime & 1) && stplyr->powers[pw_invulnerability] && (stplyr->powers[pw_sneakers] == stplyr->powers[pw_invulnerability])) // hack; extremely unlikely to be activated unintentionally
@@ -998,7 +992,7 @@ static void ST_drawLivesArea(void)
static void ST_drawInput(void)
{
- const INT32 accent = V_SNAPTOLEFT|V_SNAPTOBOTTOM|(stplyr->skincolor ? Color_Index[stplyr->skincolor-1][4] : 0);
+ const INT32 accent = V_SNAPTOLEFT|V_SNAPTOBOTTOM|(stplyr->skincolor ? skincolors[stplyr->skincolor].ramp[4] : 0);
INT32 col;
UINT8 offs;
@@ -1331,27 +1325,30 @@ void ST_drawTitleCard(void)
{
char *lvlttl = mapheaderinfo[gamemap-1]->lvlttl;
char *subttl = mapheaderinfo[gamemap-1]->subttl;
- INT32 actnum = mapheaderinfo[gamemap-1]->actnum;
+ UINT8 actnum = mapheaderinfo[gamemap-1]->actnum;
INT32 lvlttlxpos, ttlnumxpos, zonexpos;
INT32 subttlxpos = BASEVIDWIDTH/2;
INT32 ttlscroll = FixedInt(lt_scroll);
INT32 zzticker;
patch_t *actpat, *zigzag, *zztext;
+ UINT8 colornum;
+ const UINT8 *colormap;
+
+ if (players[consoleplayer].skincolor)
+ colornum = players[consoleplayer].skincolor;
+ else
+ colornum = cv_playercolor.value;
+
+ colormap = R_GetTranslationColormap(TC_DEFAULT, colornum, GTC_CACHE);
if (!G_IsTitleCardAvailable())
return;
-#ifdef HAVE_BLUA
if (!LUA_HudEnabled(hud_stagetitle))
goto luahook;
-#endif
if (lt_ticker >= (lt_endtime + TICRATE))
-#ifdef HAVE_BLUA
goto luahook;
-#else
- return;
-#endif
if ((lt_ticker-lt_lasttic) > 1)
lt_ticker = lt_lasttic+1;
@@ -1376,16 +1373,21 @@ void ST_drawTitleCard(void)
if (!splitscreen || (splitscreen && stplyr == &players[displayplayer]))
{
zzticker = lt_ticker;
- V_DrawScaledPatch(FixedInt(lt_zigzag), (-zzticker) % zigzag->height, V_SNAPTOTOP|V_SNAPTOLEFT, zigzag);
- V_DrawScaledPatch(FixedInt(lt_zigzag), (zigzag->height-zzticker) % zigzag->height, V_SNAPTOTOP|V_SNAPTOLEFT, zigzag);
- V_DrawScaledPatch(FixedInt(lt_zigzag), (-zigzag->height+zzticker) % zztext->height, V_SNAPTOTOP|V_SNAPTOLEFT, zztext);
- V_DrawScaledPatch(FixedInt(lt_zigzag), (zzticker) % zztext->height, V_SNAPTOTOP|V_SNAPTOLEFT, zztext);
+ 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), (zzticker) % zztext->height, V_SNAPTOTOP|V_SNAPTOLEFT, zztext, colormap);
}
if (actnum)
{
if (!splitscreen)
- V_DrawScaledPatch(ttlnumxpos + ttlscroll, 104 - ttlscroll, 0, actpat);
+ {
+ if (actnum > 9) // slightly offset the act diamond for two-digit act numbers
+ V_DrawMappedPatch(ttlnumxpos + (V_LevelActNumWidth(actnum)/4) + ttlscroll, 104 - ttlscroll, 0, actpat, colormap);
+ else
+ V_DrawMappedPatch(ttlnumxpos + ttlscroll, 104 - ttlscroll, 0, actpat, colormap);
+ }
V_DrawLevelActNum(ttlnumxpos + ttlscroll, 104, V_PERPLAYER, actnum);
}
@@ -1396,10 +1398,8 @@ void ST_drawTitleCard(void)
lt_lasttic = lt_ticker;
-#ifdef HAVE_BLUA
luahook:
LUAh_TitleCardHUD(stplyr);
-#endif
}
//
@@ -1444,7 +1444,7 @@ static void ST_drawPowerupHUD(void)
if (stplyr->spectator || stplyr->playerstate != PST_LIVE)
return;
-
+
// ---------
// Finish icon
// ---------
@@ -1700,14 +1700,14 @@ static void ST_drawNightsRecords(void)
// 2.0-1: [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold
/*#define NUMLINKCOLORS 14
-static skincolors_t linkColor[NUMLINKCOLORS] =
+static skincolornum_t linkColor[NUMLINKCOLORS] =
{SKINCOLOR_BEIGE, SKINCOLOR_LAVENDER, SKINCOLOR_AZURE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE,
SKINCOLOR_MAGENTA, SKINCOLOR_SILVER, SKINCOLOR_SUPERGOLD4, SKINCOLOR_PINK, SKINCOLOR_RED,
SKINCOLOR_BLUE, SKINCOLOR_GREEN, SKINCOLOR_CYAN, SKINCOLOR_GOLD};*/
// 2.2 indev list: (unix time 1470866042) <Rob> Emerald, Aqua, Cyan, Blue, Pastel, Purple, Magenta, Rosy, Red, Orange, Gold, Yellow, Peridot
/*#define NUMLINKCOLORS 13
-static skincolors_t linkColor[NUMLINKCOLORS] =
+static skincolornum_t linkColor[NUMLINKCOLORS] =
{SKINCOLOR_EMERALD, SKINCOLOR_AQUA, SKINCOLOR_CYAN, SKINCOLOR_BLUE, SKINCOLOR_PASTEL,
SKINCOLOR_PURPLE, SKINCOLOR_MAGENTA, SKINCOLOR_ROSY, SKINCOLOR_RED, SKINCOLOR_ORANGE,
SKINCOLOR_GOLD, SKINCOLOR_YELLOW, SKINCOLOR_PERIDOT};*/
@@ -1716,7 +1716,7 @@ static skincolors_t linkColor[NUMLINKCOLORS] =
// [20:00:25] <baldobo> Also Icy for the link freeze text color
// [20:04:03] <baldobo> I would start it on lime
/*#define NUMLINKCOLORS 18
-static skincolors_t linkColor[NUMLINKCOLORS] =
+static skincolornum_t linkColor[NUMLINKCOLORS] =
{SKINCOLOR_LIME, SKINCOLOR_EMERALD, SKINCOLOR_AQUA, SKINCOLOR_CYAN, SKINCOLOR_SKY,
SKINCOLOR_SAPPHIRE, SKINCOLOR_PASTEL, SKINCOLOR_PURPLE, SKINCOLOR_BUBBLEGUM, SKINCOLOR_MAGENTA,
SKINCOLOR_ROSY, SKINCOLOR_RUBY, SKINCOLOR_RED, SKINCOLOR_FLAME, SKINCOLOR_SUNSET,
@@ -1724,7 +1724,7 @@ static skincolors_t linkColor[NUMLINKCOLORS] =
// 2.2+ list for real this time: https://wiki.srb2.org/wiki/User:Rob/Sandbox (check history around 31/10/17, spoopy)
#define NUMLINKCOLORS 12
-static skincolors_t linkColor[2][NUMLINKCOLORS] = {
+static skincolornum_t linkColor[2][NUMLINKCOLORS] = {
{SKINCOLOR_EMERALD, SKINCOLOR_AQUA, SKINCOLOR_SKY, SKINCOLOR_BLUE, SKINCOLOR_PURPLE, SKINCOLOR_MAGENTA,
SKINCOLOR_ROSY, SKINCOLOR_RED, SKINCOLOR_ORANGE, SKINCOLOR_GOLD, SKINCOLOR_YELLOW, SKINCOLOR_PERIDOT},
{SKINCOLOR_SEAFOAM, SKINCOLOR_CYAN, SKINCOLOR_WAVE, SKINCOLOR_SAPPHIRE, SKINCOLOR_VAPOR, SKINCOLOR_BUBBLEGUM,
@@ -1735,7 +1735,7 @@ static void ST_drawNiGHTSLink(void)
static INT32 prevsel[2] = {0, 0}, prevtime[2] = {0, 0};
const UINT8 q = ((splitscreen && stplyr == &players[secondarydisplayplayer]) ? 1 : 0);
INT32 sel = ((stplyr->linkcount-1) / 5) % NUMLINKCOLORS, aflag = V_PERPLAYER, mag = ((stplyr->linkcount-1 >= 300) ? 1 : 0);
- skincolors_t colornum;
+ skincolornum_t colornum;
fixed_t x, y, scale;
if (sel != prevsel[q])
@@ -1785,11 +1785,7 @@ static void ST_drawNiGHTSHUD(void)
const boolean oldspecialstage = (G_IsSpecialStage(gamemap) && !(maptol & TOL_NIGHTS));
// Drill meter
- if (
-#ifdef HAVE_BLUA
- LUA_HudEnabled(hud_nightsdrill) &&
-#endif
- stplyr->powers[pw_carry] == CR_NIGHTSMODE)
+ if (LUA_HudEnabled(hud_nightsdrill) && stplyr->powers[pw_carry] == CR_NIGHTSMODE)
{
INT32 locx = 16, locy = 180;
INT32 dfill;
@@ -1831,9 +1827,7 @@ static void ST_drawNiGHTSHUD(void)
if (!oldspecialstage
// Don't display when the score is showing (it popping up for a split second when exiting a map is intentional)
&& !(stplyr->texttimer && stplyr->textvar == 4)
-#ifdef HAVE_BLUA
&& LUA_HudEnabled(hud_nightslink)
-#endif
&& ((cv_debug & DBG_NIGHTSBASIC) || stplyr->linkcount > 1)) // When debugging, show "0 Link".
{
ST_drawNiGHTSLink();
@@ -1847,10 +1841,8 @@ static void ST_drawNiGHTSHUD(void)
}
// Begin drawing brackets/chip display
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_nightsspheres))
{
-#endif
ST_DrawTopLeftOverlayPatch(16, 8, nbracket);
if (G_IsSpecialStage(gamemap))
ST_DrawTopLeftOverlayPatch(24, 16, (
@@ -1987,24 +1979,14 @@ static void ST_drawNiGHTSHUD(void)
V_DrawTallNum((total_spherecount >= 1000) ? 76 : 72, 8 + 11, V_PERPLAYER|V_SNAPTOTOP|V_SNAPTOLEFT|V_HUDTRANS, total_spherecount);
else
V_DrawTallNum(68, 8 + 11, V_PERPLAYER|V_SNAPTOTOP|V_SNAPTOLEFT|V_HUDTRANS, total_spherecount);
-#ifdef HAVE_BLUA
}
-#endif
// Score
- if (!stplyr->exiting && !oldspecialstage
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_nightsscore)
-#endif
- )
+ if (!stplyr->exiting && !oldspecialstage && LUA_HudEnabled(hud_nightsscore))
ST_DrawNightsOverlayNum(304<<FRACBITS, 14<<FRACBITS, FRACUNIT, V_PERPLAYER|V_SNAPTOTOP|V_SNAPTORIGHT, stplyr->marescore, nightsnum, SKINCOLOR_AZURE);
- if (!stplyr->exiting
-#ifdef HAVE_BLUA
// TODO give this its own section for Lua
- && LUA_HudEnabled(hud_nightsscore)
-#endif
- )
+ if (!stplyr->exiting && LUA_HudEnabled(hud_nightsscore))
{
if (modeattacking == ATTACKING_NIGHTS)
{
@@ -2027,11 +2009,7 @@ static void ST_drawNiGHTSHUD(void)
}
// Ideya time remaining
- if (!stplyr->exiting && stplyr->nightstime > 0
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_nightstime)
-#endif
- )
+ if (!stplyr->exiting && stplyr->nightstime > 0 && LUA_HudEnabled(hud_nightstime))
{
INT32 realnightstime = stplyr->nightstime/TICRATE;
INT32 numbersize;
@@ -2122,10 +2100,8 @@ static void ST_drawNiGHTSHUD(void)
}
// Records/extra text
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_nightsrecords))
-#endif
- ST_drawNightsRecords();
+ ST_drawNightsRecords();
}
}
@@ -2403,20 +2379,16 @@ static void ST_drawTeamHUD(void)
else
p = bmatcico;
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_teamscores))
-#endif
- V_DrawSmallScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
+ V_DrawSmallScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
if (gametyperules & GTR_TEAMFLAGS)
p = rflagico;
else
p = rmatcico;
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_teamscores))
-#endif
- V_DrawSmallScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
+ V_DrawSmallScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
if (!(gametyperules & GTR_TEAMFLAGS))
goto num;
@@ -2427,18 +2399,12 @@ static void ST_drawTeamHUD(void)
// Show which flags aren't at base.
for (i = 0; i < MAXPLAYERS; i++)
{
- if (players[i].gotflag & GF_BLUEFLAG // Blue flag isn't at base
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_teamscores)
-#endif
- )
+ // Blue flag isn't at base
+ if (players[i].gotflag & GF_BLUEFLAG && LUA_HudEnabled(hud_teamscores))
V_DrawScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(nonicon->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon);
- if (players[i].gotflag & GF_REDFLAG // Red flag isn't at base
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_teamscores)
-#endif
- )
+ // Red flag isn't at base
+ if (players[i].gotflag & GF_REDFLAG && LUA_HudEnabled(hud_teamscores))
V_DrawScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(nonicon2->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon2);
whichflag |= players[i].gotflag;
@@ -2449,32 +2415,20 @@ static void ST_drawTeamHUD(void)
// Display a countdown timer showing how much time left until the flag returns to base.
{
- if (blueflag && blueflag->fuse > 1
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_teamscores)
-#endif
- )
+ if (blueflag && blueflag->fuse > 1 && LUA_HudEnabled(hud_teamscores))
V_DrawCenteredString(BASEVIDWIDTH/2 - SEP, 8, V_YELLOWMAP|V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", (blueflag->fuse / TICRATE)));
- if (redflag && redflag->fuse > 1
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_teamscores)
-#endif
- )
+ if (redflag && redflag->fuse > 1 && LUA_HudEnabled(hud_teamscores))
V_DrawCenteredString(BASEVIDWIDTH/2 + SEP, 8, V_YELLOWMAP|V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", (redflag->fuse / TICRATE)));
}
}
num:
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_teamscores))
-#endif
- V_DrawCenteredString(BASEVIDWIDTH/2 - SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", bluescore));
+ V_DrawCenteredString(BASEVIDWIDTH/2 - SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", bluescore));
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_teamscores))
-#endif
- V_DrawCenteredString(BASEVIDWIDTH/2 + SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", redscore));
+ V_DrawCenteredString(BASEVIDWIDTH/2 + SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", redscore));
#undef SEP
}
@@ -2661,24 +2615,14 @@ static void ST_overlayDrawer(void)
ST_drawNiGHTSHUD();
else
{
-#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_score))
-#endif
- ST_drawScore();
-#ifdef HAVE_BLUA
+ ST_drawScore();
if (LUA_HudEnabled(hud_time))
-#endif
- ST_drawTime();
-#ifdef HAVE_BLUA
+ ST_drawTime();
if (LUA_HudEnabled(hud_rings))
-#endif
- ST_drawRings();
+ ST_drawRings();
- if (!modeattacking
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_lives)
-#endif
- )
+ if (!modeattacking && LUA_HudEnabled(hud_lives))
ST_drawLivesArea();
}
}
@@ -2753,11 +2697,7 @@ static void ST_overlayDrawer(void)
// Draw Match-related stuff
//\note Match HUD is drawn no matter what gametype.
// ... just not if you're a spectator.
- if (!stplyr->spectator
-#ifdef HAVE_BLUA
- && (LUA_HudEnabled(hud_weaponrings))
-#endif
- )
+ if (!stplyr->spectator && LUA_HudEnabled(hud_weaponrings))
ST_drawMatchHUD();
// Race HUD Stuff
@@ -2798,20 +2738,14 @@ static void ST_overlayDrawer(void)
else if (!(netgame || multiplayer) && cv_powerupdisplay.value == 2)
ST_drawPowerupHUD(); // same as it ever was...
-#ifdef HAVE_BLUA
if (!(netgame || multiplayer) || !hu_showscores)
LUAh_GameHUD(stplyr);
-#endif
// draw level title Tails
if (stagetitle && (!WipeInAction) && (!WipeStageTitle))
ST_drawTitleCard();
- if (!hu_showscores && (netgame || multiplayer)
-#ifdef HAVE_BLUA
- && LUA_HudEnabled(hud_textspectator)
-#endif
- )
+ if (!hu_showscores && (netgame || multiplayer) && LUA_HudEnabled(hud_textspectator))
ST_drawTextHUD();
if (modeattacking && !(demoplayback && hu_showscores))
diff --git a/src/tables.c b/src/tables.c
index 00424db22af16fc65b2cf0d3c1821c769fe3c80d..70a1ecd0addf7fae640d44847f7ffec8c70d8278 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -72,7 +72,7 @@ static FUNCMATH angle_t AngleAdj(const fixed_t fa, const fixed_t wf,
const angle_t adj = 0x77;
const boolean fan = fa < 0;
const fixed_t sl = FixedDiv(fa, wf*2);
- const fixed_t lb = FixedRem(fa, wf*2);
+ const fixed_t lb = fa % (wf*2);
const fixed_t lo = (wf*2)-lb;
if (ra == 0)
diff --git a/src/v_video.c b/src/v_video.c
index aa7937237c84f883a5e707f3c0266caa5eb54c80..5fd3020f65268ddda37e173e8b5966e85afaa8ce 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -42,7 +42,8 @@ UINT8 *screens[5];
// screens[3] = fade screen start
// screens[4] = fade screen end, postimage tempoarary buffer
-consvar_t cv_ticrate = {"showfps", "No", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t ticrate_cons_t[] = {{0, "No"}, {1, "Full"}, {2, "Compact"}, {0, NULL}};
+consvar_t cv_ticrate = {"showfps", "No", CV_SAVE, ticrate_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static void CV_palette_OnChange(void);
@@ -1039,7 +1040,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
// V_DrawContinueIcon
// Draw a mini player! If we can, that is. Otherwise we draw a star.
//
-void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor)
+void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT16 skincolor)
{
if (skinnum >= 0 && skinnum < numskins && skins[skinnum].sprites[SPR2_XTRA].numframes > XTRA_CONTINUE)
{
@@ -2951,13 +2952,19 @@ void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
}
// Draw an act number for a level title
-// Todo: actually draw two-digit numbers as two act num patches
-void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, INT32 num)
+void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, UINT8 num)
{
- if (num < 0 || num > 19)
+ if (num > 99)
return; // not supported
- V_DrawScaledPatch(x, y, flags, ttlnum[num]);
+ while (num > 0)
+ {
+ if (num > 9) // if there are two digits, draw second digit first
+ V_DrawScaledPatch(x + (V_LevelActNumWidth(num) - V_LevelActNumWidth(num%10)), y, flags, ttlnum[num%10]);
+ else
+ V_DrawScaledPatch(x, y, flags, ttlnum[num]);
+ num = num/10;
+ }
}
// Write a string using the credit font
@@ -3338,13 +3345,21 @@ INT32 V_LevelNameHeight(const char *string)
}
// For ST_drawTitleCard
-// Returns the width of the act num patch
-INT32 V_LevelActNumWidth(INT32 num)
+// Returns the width of the act num patch(es)
+INT16 V_LevelActNumWidth(UINT8 num)
{
- if (num < 0 || num > 19)
- return 0; // not a valid number
+ INT16 result = 0;
+
+ if (num == 0)
+ result = SHORT(ttlnum[num]->width);
- return SHORT(ttlnum[num]->width);
+ while (num > 0 && num <= 99)
+ {
+ result = result + SHORT(ttlnum[num%10]->width);
+ num = num/10;
+ }
+
+ return result;
}
//
@@ -3694,7 +3709,7 @@ void V_Init(void)
#ifdef DEBUG
CONS_Debug(DBG_RENDER, "V_Init done:\n");
- for (i = 0; i < NUMSCREENS+1; i++)
+ for (i = 0; i < NUMSCREENS; i++)
CONS_Debug(DBG_RENDER, " screens[%d] = %x\n", i, screens[i]);
#endif
}
diff --git a/src/v_video.h b/src/v_video.h
index ed623a57f4e771781f45fb32c50c210dd804c0f4..9f7a9a9e9c29dd8fb23ecfbfb4d1d09d1d7cba8d 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -160,7 +160,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
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_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor);
+void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT16 skincolor);
// Draw a linear block of pixels into the view buffer.
void V_DrawBlock(INT32 x, INT32 y, INT32 scrn, INT32 width, INT32 height, const UINT8 *src);
@@ -238,12 +238,12 @@ void V_DrawRightAlignedSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option
// Draw tall nums, used for menu, HUD, intermission
void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num);
void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits);
-void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, INT32 num);
+void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, UINT8 num);
// Find string width from lt_font chars
INT32 V_LevelNameWidth(const char *string);
INT32 V_LevelNameHeight(const char *string);
-INT32 V_LevelActNumWidth(INT32 num); // act number width
+INT16 V_LevelActNumWidth(UINT8 num); // act number width
void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string);
INT32 V_CreditStringWidth(const char *string);
diff --git a/src/w_wad.c b/src/w_wad.c
index f356f33fe31b88cf2fda7f5a3759a768700332ee..c01780ec29aa0521eade995d49e242cad1442f2b 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -76,6 +76,10 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
//int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
#endif
+#ifdef _DEBUG
+#include "console.h"
+#endif
+
#ifndef O_BINARY
#define O_BINARY 0
#endif
@@ -92,7 +96,7 @@ typedef struct
typedef struct lumpnum_cache_s
{
- char lumpname[8];
+ char lumpname[32];
lumpnum_t lumpnum;
} lumpnum_cache_t;
@@ -114,13 +118,18 @@ void W_Shutdown(void)
{
while (numwadfiles--)
{
- fclose(wadfiles[numwadfiles]->handle);
- Z_Free(wadfiles[numwadfiles]->filename);
- while (wadfiles[numwadfiles]->numlumps--)
- Z_Free(wadfiles[numwadfiles]->lumpinfo[wadfiles[numwadfiles]->numlumps].name2);
+ wadfile_t *wad = wadfiles[numwadfiles];
+
+ fclose(wad->handle);
+ Z_Free(wad->filename);
+ while (wad->numlumps--)
+ {
+ Z_Free(wad->lumpinfo[wad->numlumps].longname);
+ Z_Free(wad->lumpinfo[wad->numlumps].fullname);
+ }
- Z_Free(wadfiles[numwadfiles]->lumpinfo);
- Z_Free(wadfiles[numwadfiles]);
+ Z_Free(wad->lumpinfo);
+ Z_Free(wad);
}
}
@@ -189,28 +198,26 @@ FILE *W_OpenWadFile(const char **filename, boolean useerrors)
static inline void W_LoadDehackedLumpsPK3(UINT16 wadnum, boolean mainfile)
{
UINT16 posStart, posEnd;
-#ifdef HAVE_BLUA
+
posStart = W_CheckNumForFolderStartPK3("Lua/", wadnum, 0);
if (posStart != INT16_MAX)
{
posEnd = W_CheckNumForFolderEndPK3("Lua/", wadnum, posStart);
- posStart++; // first "lump" will be "Lua/" folder itself, so ignore it
for (; posStart < posEnd; posStart++)
LUA_LoadLump(wadnum, posStart);
}
-#endif
+
posStart = W_CheckNumForFolderStartPK3("SOC/", wadnum, 0);
if (posStart != INT16_MAX)
{
posEnd = W_CheckNumForFolderEndPK3("SOC/", wadnum, posStart);
- posStart++; // first "lump" will be "SOC/" folder itself, so ignore it
for(; posStart < posEnd; posStart++)
{
lumpinfo_t *lump_p = &wadfiles[wadnum]->lumpinfo[posStart];
- size_t length = strlen(wadfiles[wadnum]->filename) + 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
+ size_t length = strlen(wadfiles[wadnum]->filename) + 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
char *name = malloc(length + 1);
- sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->name2);
+ sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->fullname);
name[length] = '\0';
CONS_Printf(M_GetText("Loading SOC from %s\n"), name);
DEH_LoadDehackedLumpPwad(wadnum, posStart, mainfile);
@@ -224,7 +231,6 @@ static inline void W_LoadDehackedLumps(UINT16 wadnum, boolean mainfile)
{
UINT16 lump;
-#ifdef HAVE_BLUA
// Find Lua scripts before SOCs to allow new A_Actions in SOC editing.
{
lumpinfo_t *lump_p = wadfiles[wadnum]->lumpinfo;
@@ -232,16 +238,15 @@ static inline void W_LoadDehackedLumps(UINT16 wadnum, boolean mainfile)
if (memcmp(lump_p->name,"LUA_",4)==0)
LUA_LoadLump(wadnum, lump);
}
-#endif
{
lumpinfo_t *lump_p = wadfiles[wadnum]->lumpinfo;
for (lump = 0; lump < wadfiles[wadnum]->numlumps; lump++, lump_p++)
if (memcmp(lump_p->name,"SOC_",4)==0) // Check for generic SOC lump
{ // shameless copy+paste of code from LUA_LoadLump
- size_t length = strlen(wadfiles[wadnum]->filename) + 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
+ size_t length = strlen(wadfiles[wadnum]->filename) + 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
char *name = malloc(length + 1);
- sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->name2);
+ sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->fullname);
name[length] = '\0';
CONS_Printf(M_GetText("Loading SOC from %s\n"), name);
@@ -343,10 +348,17 @@ static lumpinfo_t* ResGetLumpsStandalone (FILE* handle, UINT16* numlumps, const
lumpinfo->size = ftell(handle);
fseek(handle, 0, SEEK_SET);
strcpy(lumpinfo->name, lumpname);
+
+ // Allocate the lump's long name.
+ lumpinfo->longname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
+ strcpy(lumpinfo->longname, lumpname);
+ lumpinfo->longname[8] = '\0';
+
// Allocate the lump's full name.
- lumpinfo->name2 = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
- strcpy(lumpinfo->name2, lumpname);
- lumpinfo->name2[8] = '\0';
+ lumpinfo->fullname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
+ strcpy(lumpinfo->fullname, lumpname);
+ lumpinfo->fullname[8] = '\0';
+
*numlumps = 1;
return lumpinfo;
}
@@ -433,10 +445,16 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
lump_p->compression = CM_NOCOMPRESSION;
memset(lump_p->name, 0x00, 9);
strncpy(lump_p->name, fileinfo->name, 8);
+
+ // Allocate the lump's long name.
+ lump_p->longname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
+ strncpy(lump_p->longname, fileinfo->name, 8);
+ lump_p->longname[8] = '\0';
+
// Allocate the lump's full name.
- lump_p->name2 = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
- strncpy(lump_p->name2, fileinfo->name, 8);
- lump_p->name2[8] = '\0';
+ lump_p->fullname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
+ strncpy(lump_p->fullname, fileinfo->name, 8);
+ lump_p->fullname[8] = '\0';
}
free(fileinfov);
*nlmp = numlumps;
@@ -527,8 +545,8 @@ typedef struct zlentry_s
static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
{
zend_t zend;
- zentry_t* zentries;
- zentry_t* zentry;
+ zentry_t zentry;
+ zlentry_t zlentry;
UINT16 numlumps = *nlmp;
lumpinfo_t* lumpinfo;
@@ -556,40 +574,36 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
numlumps = zend.entries;
lump_p = lumpinfo = Z_Malloc(numlumps * sizeof (*lumpinfo), PU_STATIC, NULL);
- zentry = zentries = malloc(numlumps * sizeof (*zentries));
fseek(handle, zend.cdiroffset, SEEK_SET);
- for (i = 0; i < numlumps; i++, zentry++, lump_p++)
+ for (i = 0; i < numlumps; i++, lump_p++)
{
char* fullname;
char* trimname;
char* dotpos;
- if (fread(zentry, 1, sizeof(zentry_t), handle) < sizeof(zentry_t))
+ if (fread(&zentry, 1, sizeof(zentry_t), handle) < sizeof(zentry_t))
{
CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", M_FileError(handle));
Z_Free(lumpinfo);
- free(zentries);
return NULL;
}
- if (memcmp(zentry->signature, pat_central, 4))
+ if (memcmp(zentry.signature, pat_central, 4))
{
CONS_Alert(CONS_ERROR, "Central directory is corrupt\n");
Z_Free(lumpinfo);
- free(zentries);
return NULL;
}
- lump_p->position = zentry->offset + zentry->namelen + zentry->xtralen + sizeof(zlentry_t);
- lump_p->disksize = zentry->compsize;
- lump_p->size = zentry->size;
+ 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->size = zentry.size;
- fullname = malloc(zentry->namelen + 1);
- if (fgets(fullname, zentry->namelen + 1, handle) != fullname)
+ fullname = malloc(zentry.namelen + 1);
+ if (fgets(fullname, zentry.namelen + 1, handle) != fullname)
{
CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", M_FileError(handle));
Z_Free(lumpinfo);
- free(zentries);
free(fullname);
return NULL;
}
@@ -606,12 +620,15 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
memset(lump_p->name, '\0', 9); // Making sure they're initialized to 0. Is it necessary?
strncpy(lump_p->name, trimname, min(8, dotpos - trimname));
- lump_p->name2 = Z_Calloc(zentry->namelen + 1, PU_STATIC, NULL);
- strncpy(lump_p->name2, fullname, zentry->namelen);
+ lump_p->longname = Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL);
+ strlcpy(lump_p->longname, trimname, dotpos - trimname + 1);
+
+ lump_p->fullname = Z_Calloc(zentry.namelen + 1, PU_STATIC, NULL);
+ strncpy(lump_p->fullname, fullname, zentry.namelen);
free(fullname);
- switch(zentry->compression)
+ switch(zentry.compression)
{
case 0:
lump_p->compression = CM_NOCOMPRESSION;
@@ -629,9 +646,29 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
lump_p->compression = CM_UNSUPPORTED;
break;
}
+
+ // skip and ignore comments/extra fields
+ if (fseek(handle, zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
+ {
+ CONS_Alert(CONS_ERROR, "Central directory is corrupt\n");
+ Z_Free(lumpinfo);
+ return NULL;
+ }
}
- free(zentries);
+ // Adjust lump position values properly
+ for (i = 0, lump_p = lumpinfo; i < numlumps; i++, lump_p++)
+ {
+ // skip and ignore comments/extra fields
+ if ((fseek(handle, lump_p->position, SEEK_SET) != 0) || (fread(&zlentry, 1, sizeof(zlentry_t), handle) < sizeof(zlentry_t)))
+ {
+ CONS_Alert(CONS_ERROR, "Local headers for lump %s are corrupt\n", lump_p->fullname);
+ Z_Free(lumpinfo);
+ return NULL;
+ }
+
+ lump_p->position += sizeof(zlentry_t) + zlentry.namelen + zlentry.xtralen;
+ }
*nlmp = numlumps;
return lumpinfo;
@@ -749,11 +786,9 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
case RET_SOC:
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "OBJCTCFG");
break;
-#ifdef HAVE_BLUA
case RET_LUA:
lumpinfo = ResGetLumpsStandalone(handle, &numlumps, "LUA_INIT");
break;
-#endif
case RET_PK3:
lumpinfo = ResGetLumpsZip(handle, &numlumps);
break;
@@ -827,11 +862,9 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
CONS_Printf(M_GetText("Loading SOC from %s\n"), wadfile->filename);
DEH_LoadDehackedLumpPwad(numwadfiles - 1, 0, mainfile);
break;
-#ifdef HAVE_BLUA
case RET_LUA:
LUA_LoadLump(numwadfiles - 1, 0);
break;
-#endif
default:
break;
}
@@ -902,16 +935,48 @@ const char *W_CheckNameForNum(lumpnum_t lumpnum)
UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
{
UINT16 i;
- static char uname[9];
+ static char uname[8 + 1];
+
+ if (!TestValidLump(wad,0))
+ return INT16_MAX;
- memset(uname, 0x00, sizeof uname);
- strncpy(uname, name, 8);
- uname[8] = 0;
+ strlcpy(uname, name, sizeof uname);
strupr(uname);
+ //
+ // scan forward
+ // start at 'startlump', useful parameter when there are multiple
+ // resources with the same name
+ //
+ if (startlump < wadfiles[wad]->numlumps)
+ {
+ lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
+ for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
+ if (!strncmp(lump_p->name, uname, sizeof(uname) - 1))
+ return i;
+ }
+
+ // not found.
+ return INT16_MAX;
+}
+
+//
+// Like W_CheckNumForNamePwad, but can find entries with long names
+//
+// Should be the only version, but that's not possible until we fix
+// all the instances of non null-terminated strings in the codebase...
+//
+UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
+{
+ UINT16 i;
+ static char uname[256 + 1];
+
if (!TestValidLump(wad,0))
return INT16_MAX;
+ strlcpy(uname, name, sizeof uname);
+ strupr(uname);
+
//
// scan forward
// start at 'startlump', useful parameter when there are multiple
@@ -921,7 +986,7 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
{
lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
- if (memcmp(lump_p->name,uname,8) == 0)
+ if (!strcmp(lump_p->longname, uname))
return i;
}
@@ -929,15 +994,32 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
return INT16_MAX;
}
+UINT16
+W_CheckNumForMarkerStartPwad (const char *name, UINT16 wad, UINT16 startlump)
+{
+ UINT16 marker;
+ marker = W_CheckNumForNamePwad(name, wad, startlump);
+ if (marker != INT16_MAX)
+ marker++; // Do not count the first marker
+ return marker;
+}
+
// Look for the first lump from a folder.
UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlump)
{
+ size_t name_length;
INT32 i;
lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
+ name_length = strlen(name);
for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
{
- if (strnicmp(name, lump_p->name2, strlen(name)) == 0)
+ if (strnicmp(name, lump_p->fullname, name_length) == 0)
+ {
+ /* SLADE is special and puts a single directory entry. Skip that. */
+ if (strlen(lump_p->fullname) == name_length)
+ i++;
break;
+ }
}
return i;
}
@@ -951,7 +1033,7 @@ UINT16 W_CheckNumForFolderEndPK3(const char *name, UINT16 wad, UINT16 startlump)
lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
{
- if (strnicmp(name, lump_p->name2, strlen(name)))
+ if (strnicmp(name, lump_p->fullname, strlen(name)))
break;
}
return i;
@@ -965,7 +1047,7 @@ UINT16 W_CheckNumForFullNamePK3(const char *name, UINT16 wad, UINT16 startlump)
lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
{
- if (!strnicmp(name, lump_p->name2, strlen(name)))
+ if (!strnicmp(name, lump_p->fullname, strlen(name)))
{
return i;
}
@@ -990,7 +1072,8 @@ lumpnum_t W_CheckNumForName(const char *name)
// most recent entries first
for (i = lumpnumcacheindex + LUMPNUMCACHESIZE; i > lumpnumcacheindex; i--)
{
- if (strncmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name, 8) == 0)
+ if (!lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname[8]
+ && strncmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name, 8) == 0)
{
lumpnumcacheindex = i & (LUMPNUMCACHESIZE - 1);
return lumpnumcache[lumpnumcacheindex].lumpnum;
@@ -1010,6 +1093,7 @@ lumpnum_t W_CheckNumForName(const char *name)
{
// Update the cache.
lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
+ memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', 32);
strncpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 8);
lumpnumcache[lumpnumcacheindex].lumpnum = (i<<16)+check;
@@ -1017,6 +1101,55 @@ lumpnum_t W_CheckNumForName(const char *name)
}
}
+//
+// Like W_CheckNumForName, but can find entries with long names
+//
+// Should be the only version, but that's not possible until we fix
+// all the instances of non null-terminated strings in the codebase...
+//
+lumpnum_t W_CheckNumForLongName(const char *name)
+{
+ INT32 i;
+ lumpnum_t check = INT16_MAX;
+
+ if (!*name) // some doofus gave us an empty string?
+ return LUMPERROR;
+
+ // Check the lumpnumcache first. Loop backwards so that we check
+ // most recent entries first
+ for (i = lumpnumcacheindex + LUMPNUMCACHESIZE; i > lumpnumcacheindex; i--)
+ {
+ if (strcmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name) == 0)
+ {
+ lumpnumcacheindex = i & (LUMPNUMCACHESIZE - 1);
+ return lumpnumcache[lumpnumcacheindex].lumpnum;
+ }
+ }
+
+ // scan wad files backwards so patch lump files take precedence
+ for (i = numwadfiles - 1; i >= 0; i--)
+ {
+ check = W_CheckNumForLongNamePwad(name,(UINT16)i,0);
+ if (check != INT16_MAX)
+ break; //found it
+ }
+
+ if (check == INT16_MAX) return LUMPERROR;
+ else
+ {
+ if (strlen(name) < 32)
+ {
+ // Update the cache.
+ lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
+ memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', 32);
+ strlcpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 32);
+ lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) + check;
+ }
+
+ return (i << 16) + check;
+ }
+}
+
// Look for valid map data through all added files in descendant order.
// Get a map marker for WADs, and a standalone WAD file lump inside PK3s.
// TODO: Make it search through cache first, maybe...?
@@ -1040,7 +1173,7 @@ lumpnum_t W_CheckNumForMap(const char *name)
else
continue;
// Now look for the specified map.
- for (++lumpNum; lumpNum < end; lumpNum++)
+ for (; lumpNum < end; lumpNum++)
if (!strnicmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
return (i<<16) + lumpNum;
}
@@ -1065,6 +1198,24 @@ lumpnum_t W_GetNumForName(const char *name)
return i;
}
+//
+// Like W_GetNumForName, but can find entries with long names
+//
+// Should be the only version, but that's not possible until we fix
+// all the instances of non null-terminated strings in the codebase...
+//
+lumpnum_t W_GetNumForLongName(const char *name)
+{
+ lumpnum_t i;
+
+ i = W_CheckNumForLongName(name);
+
+ if (i == LUMPERROR)
+ I_Error("W_GetNumForLongName: %s not found!\n", name);
+
+ return i;
+}
+
//
// W_CheckNumForNameInBlock
// Checks only in blocks from blockstart lump to blockend lump
@@ -1104,7 +1255,7 @@ UINT8 W_LumpExists(const char *name)
{
lumpinfo_t *lump_p = wadfiles[i]->lumpinfo;
for (j = 0; j < wadfiles[i]->numlumps; ++j, ++lump_p)
- if (fastcmp(lump_p->name,name))
+ if (fastcmp(lump_p->longname, name))
return true;
}
return false;
@@ -1135,7 +1286,7 @@ boolean W_IsLumpWad(lumpnum_t lumpnum)
{
if (wadfiles[WADFILENUM(lumpnum)]->type == RET_PK3)
{
- const char *lumpfullName = (wadfiles[WADFILENUM(lumpnum)]->lumpinfo + LUMPNUM(lumpnum))->name2;
+ const char *lumpfullName = (wadfiles[WADFILENUM(lumpnum)]->lumpinfo + LUMPNUM(lumpnum))->fullname;
if (strlen(lumpfullName) < 4)
return false; // can't possibly be a WAD can it?
@@ -1153,7 +1304,7 @@ boolean W_IsLumpFolder(UINT16 wad, UINT16 lump)
{
if (wadfiles[wad]->type == RET_PK3)
{
- const char *name = wadfiles[wad]->lumpinfo[lump].name2;
+ const char *name = wadfiles[wad]->lumpinfo[lump].fullname;
return (name[strlen(name)-1] == '/'); // folders end in '/'
}
@@ -1231,7 +1382,7 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
{
size_t bytesread = fread(dest, 1, size, handle);
if (R_IsLumpPNG((UINT8 *)dest, bytesread))
- W_ThrowPNGError(l->name2, wadfiles[wad]->filename);
+ W_ThrowPNGError(l->fullname, wadfiles[wad]->filename);
return bytesread;
}
#else
@@ -1273,7 +1424,7 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
Z_Free(decData);
#ifdef NO_PNG_LUMPS
if (R_IsLumpPNG((UINT8 *)dest, size))
- W_ThrowPNGError(l->name2, wadfiles[wad]->filename);
+ W_ThrowPNGError(l->fullname, wadfiles[wad]->filename);
#endif
return size;
#else
@@ -1336,7 +1487,7 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
#ifdef NO_PNG_LUMPS
if (R_IsLumpPNG((UINT8 *)dest, size))
- W_ThrowPNGError(l->name2, wadfiles[wad]->filename);
+ W_ThrowPNGError(l->fullname, wadfiles[wad]->filename);
#endif
return size;
}
@@ -1624,6 +1775,17 @@ void *W_CachePatchName(const char *name, INT32 tag)
return W_CachePatchNum(W_GetNumForName("MISSING"), tag);
return W_CachePatchNum(num, tag);
}
+
+void *W_CachePatchLongName(const char *name, INT32 tag)
+{
+ lumpnum_t num;
+
+ num = W_CheckNumForLongName(name);
+
+ if (num == LUMPERROR)
+ return W_CachePatchNum(W_GetNumForLongName("MISSING"), tag);
+ return W_CachePatchNum(num, tag);
+}
#ifndef NOMD5
#define MD5_LEN 16
@@ -1842,6 +2004,10 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
}
free(fullname);
+
+ // skip and ignore comments/extra fields
+ if (fseek(fp, zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
+ return true;
}
return true;
@@ -1867,10 +2033,7 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
{
// detect wad file by the absence of the other supported extensions
if (stricmp(&filename[strlen(filename) - 4], ".soc")
-#ifdef HAVE_BLUA
- && stricmp(&filename[strlen(filename) - 4], ".lua")
-#endif
- )
+ && stricmp(&filename[strlen(filename) - 4], ".lua"))
{
goodfile = W_VerifyWAD(handle, checklist, status);
}
diff --git a/src/w_wad.h b/src/w_wad.h
index 86a0db1d40bcfc9e048afcfc8c2dfb4403e78836..fddc65529de1dbc8a31f3c730eda7fbb556889f1 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -66,9 +66,10 @@ typedef struct
{
unsigned long position; // filelump_t filepos
unsigned long disksize; // filelump_t size
- char name[9]; // filelump_t name[]
- char *name2; // Used by PK3s. Dynamically allocated name.
- size_t size; // real (uncompressed) size
+ char name[9]; // filelump_t name[] e.g. "LongEntr"
+ char *longname; // e.g. "LongEntryName"
+ char *fullname; // e.g. "Folder/Subfolder/LongEntryName.extension"
+ size_t size; // real (uncompressed) size
compmethod compression; // lump compression method
} lumpinfo_t;
@@ -155,6 +156,10 @@ const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump);
const char *W_CheckNameForNum(lumpnum_t lumpnum);
UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump); // checks only in one pwad
+UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump);
+
+/* Find the first lump after F_START for instance. */
+UINT16 W_CheckNumForMarkerStartPwad(const char *name, UINT16 wad, UINT16 startlump);
UINT16 W_CheckNumForFullNamePK3(const char *name, UINT16 wad, UINT16 startlump);
UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlump);
@@ -162,7 +167,9 @@ UINT16 W_CheckNumForFolderEndPK3(const char *name, UINT16 wad, UINT16 startlump)
lumpnum_t W_CheckNumForMap(const char *name);
lumpnum_t W_CheckNumForName(const char *name);
+lumpnum_t W_CheckNumForLongName(const char *name);
lumpnum_t W_GetNumForName(const char *name); // like W_CheckNumForName but I_Error on LUMPERROR
+lumpnum_t W_GetNumForLongName(const char *name);
lumpnum_t W_CheckNumForNameInBlock(const char *name, const char *blockstart, const char *blockend);
UINT8 W_LumpExists(const char *name); // Lua uses this.
@@ -190,6 +197,7 @@ boolean W_IsPatchCached(lumpnum_t lump, void *ptr);
void *W_CacheLumpName(const char *name, INT32 tag);
void *W_CachePatchName(const char *name, INT32 tag);
+void *W_CachePatchLongName(const char *name, INT32 tag);
// Returns either a Software patch, or an OpenGL patch.
// Performs any necessary conversions from PNG images.
diff --git a/src/win32/Srb2win-vc9.vcproj b/src/win32/Srb2win-vc9.vcproj
index a64b8638cde6986a2377440a62bfe060293cb93f..4c17bb6f74bec52209d79ac5fc03854f674e5438 100644
--- a/src/win32/Srb2win-vc9.vcproj
+++ b/src/win32/Srb2win-vc9.vcproj
@@ -55,7 +55,7 @@
Optimization="0"
OmitFramePointers="false"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="_DEBUG;_WINDOWS;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="_DEBUG;_WINDOWS;USEASM;HAVE_PNG;COMPVERSION;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="true"
RuntimeLibrary="1"
EnableFunctionLevelLinking="true"
@@ -153,7 +153,7 @@
Optimization="0"
OmitFramePointers="false"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="_DEBUG;_WINDOWS;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="_DEBUG;_WINDOWS;HAVE_PNG;COMPVERSION;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
SmallerTypeCheck="true"
@@ -256,7 +256,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="NDEBUG;_WINDOWS;USEASM;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="NDEBUG;_WINDOWS;USEASM;HAVE_PNG;COMPVERSION;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -356,7 +356,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\libs\libpng-src";"$(ProjectDir)..\..\libs\zlib""
- PreprocessorDefinitions="NDEBUG;_WINDOWS;HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
+ PreprocessorDefinitions="NDEBUG;_WINDOWS;HAVE_PNG;COMPVERSION;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index 8a29f7e188593becc0c480b77008ae1841e8b737..e1d90881ba4fac766c3720eb318c0a3b58cfbfe6 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -643,37 +643,28 @@ int WINAPI WinMain (HINSTANCE hInstance,
int nCmdShow)
{
int Result = -1;
-
-#if 0
- // Win95 and NT <4 don't have this, so link at runtime.
- p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent");
-#endif
-
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(lpCmdLine);
UNREFERENCED_PARAMETER(nCmdShow);
+ {
#if 0
+ p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent");
+ if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
#ifdef BUGTRAP
- // Try BugTrap first.
- if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) && InitBugTrap())
- Result = HandledWinMain(hInstance);
- else
- {
+ && !InitBugTrap()
#endif
- // Try Dr MinGW's exception handler.
- if (!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
+ )
#endif
+ {
LoadLibraryA("exchndl.dll");
-
+ }
+ }
#ifndef __MINGW32__
- prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);
+ prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);
#endif
-
- Result = HandledWinMain(hInstance);
+ Result = HandledWinMain(hInstance);
#ifdef BUGTRAP
- } // BT failure clause.
-
// This is safe even if BT didn't start.
ShutdownBugTrap();
#endif
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index 42733c30909897d2437387dbe3b6365a096b40d8..6c4ff4484fbcbca3097a316c3502248b1af682ba 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -54,6 +54,8 @@
#include "../screen.h"
+#include "../m_menu.h"
+
// Wheel support for Win95/WinNT3.51
#include <zmouse.h>
@@ -650,6 +652,7 @@ void I_Error(const char *error, ...)
G_StopMetalRecording(false);
D_QuitNetGame();
+ M_FreePlayerSetupColors();
// shutdown everything that was started
I_ShutdownSystem();
@@ -746,6 +749,8 @@ void I_Quit(void)
// so do it before.
D_QuitNetGame();
+ M_FreePlayerSetupColors();
+
// shutdown everything that was started
I_ShutdownSystem();
@@ -3199,7 +3204,7 @@ INT32 I_GetKey(void)
// -----------------
#define DI_KEYBOARD_BUFFERSIZE 32 // number of data elements in keyboard buffer
-void I_StartupKeyboard(void)
+static void I_StartupKeyboard(void)
{
DIPROPDWORD dip;
@@ -3435,6 +3440,8 @@ INT32 I_StartupSystem(void)
// some 'more global than globals' things to initialize here ?
graphics_started = keyboard_started = sound_started = cdaudio_started = false;
+ I_StartupKeyboard();
+
#ifdef NDEBUG
#ifdef BUGTRAP
diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c
index 4e7bab5696d6861350412b47f52b591352da8cde..5fa2195866b08329f02c0057b1aaa6d9f384a977 100644
--- a/src/win32/win_vid.c
+++ b/src/win32/win_vid.c
@@ -56,6 +56,7 @@ static consvar_t cv_stretch = {"stretch", "On", CV_SAVE|CV_NOSHOWHELP, CV_OnOff,
static consvar_t cv_ontop = {"ontop", "Never", 0, CV_NeverOnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
boolean highcolor;
+int vid_opengl_state = 0;
static BOOL bDIBMode; // means we are using DIB instead of DirectDraw surfaces
static LPBITMAPINFO bmiMain = NULL;
@@ -949,7 +950,10 @@ INT32 VID_SetMode(INT32 modenum)
}
void VID_CheckRenderer(void) {}
-void VID_CheckGLLoaded(rendermode_t oldrender) {}
+void VID_CheckGLLoaded(rendermode_t oldrender)
+{
+ (void)oldrender;
+}
// ========================================================================
// Free the video buffer of the last video mode,
diff --git a/src/y_inter.c b/src/y_inter.c
index 6f23ef1b1f6fa1f983f064ef1abc11154702f274..2fe0de60519b7b965387dabd6f42912825d0a4f8 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -37,9 +37,7 @@
#include "m_cond.h" // condition sets
#include "lua_hook.h" // IntermissionThinker hook
-#ifdef HAVE_BLUA
#include "lua_hud.h"
-#endif
#ifdef HWRENDER
#include "hardware/hw_main.h"
@@ -75,7 +73,7 @@ typedef union
UINT32 score, total; // fake score, total
UINT32 tics; // time
- INT32 actnum; // act number being displayed
+ UINT8 actnum; // act number being displayed
patch_t *ptotal; // TOTAL
UINT8 gotlife; // Number of extra lives obtained
} coop;
@@ -101,7 +99,7 @@ typedef union
UINT8 continues;
patch_t *pcontinues;
INT32 *playerchar; // Continue HUD
- UINT8 *playercolor;
+ UINT16 *playercolor;
UINT8 gotlife; // Number of extra lives obtained
} spec;
@@ -109,7 +107,7 @@ typedef union
struct
{
UINT32 scores[MAXPLAYERS]; // Winner's score
- UINT8 *color[MAXPLAYERS]; // Winner's color #
+ UINT16 *color[MAXPLAYERS]; // Winner's color #
boolean spectator[MAXPLAYERS]; // Spectator list
INT32 *character[MAXPLAYERS]; // Winner's character #
INT32 num[MAXPLAYERS]; // Winner's player #
@@ -123,7 +121,7 @@ typedef union
struct
{
- UINT8 *color[MAXPLAYERS]; // Winner's color #
+ UINT16 *color[MAXPLAYERS]; // Winner's color #
INT32 *character[MAXPLAYERS]; // Winner's character #
INT32 num[MAXPLAYERS]; // Winner's player #
char name[MAXPLAYERS][9]; // Winner's name
@@ -330,9 +328,7 @@ void Y_IntermissionDrawer(void)
if (intertype == int_none)
{
-#ifdef HAVE_BLUA
LUAh_IntermissionHUD();
-#endif
return;
}
@@ -384,11 +380,9 @@ void Y_IntermissionDrawer(void)
else
V_DrawPatchFill(bgtile);
-#ifdef HAVE_BLUA
LUAh_IntermissionHUD();
if (!LUA_HudEnabled(hud_intermissiontally))
goto skiptallydrawer;
-#endif
dontdrawbg:
if (intertype == int_coop)
@@ -570,7 +564,7 @@ dontdrawbg:
V_DrawTallNum(BASEVIDWIDTH + xoffset4 - 68, 125+yoffset, 0, data.spec.score);
// Draw continues!
- if (!multiplayer /* && (data.spec.continues & 0x80) */) // Always draw outside of netplay
+ if (continuesInSession /* && (data.spec.continues & 0x80) */) // Always draw when continues are a thing
{
UINT8 continues = data.spec.continues & 0x7F;
@@ -944,11 +938,9 @@ dontdrawbg:
}
}
-#ifdef HAVE_BLUA
skiptallydrawer:
if (!LUA_HudEnabled(hud_intermissionmessages))
return;
-#endif
if (timer)
V_DrawCenteredString(BASEVIDWIDTH/2, 188, V_YELLOWMAP,
@@ -973,9 +965,7 @@ void Y_Ticker(void)
if (paused || P_AutoPause())
return;
-#ifdef HAVE_BLUA
LUAh_IntermissionThinker();
-#endif
intertic++;
diff --git a/src/z_zone.c b/src/z_zone.c
index d971357e99d7f4d9d08d19104f69cc35b3fdace7..2387a11433592e99fb149b85d88863ace01ab016 100644
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -217,11 +217,9 @@ void Z_Free(void *ptr)
CONS_Debug(DBG_MEMORY, "Z_Free at %s:%d\n", file, line);
#endif
-#ifdef HAVE_BLUA
// anything that isn't by lua gets passed to lua just in case.
if (block->tag != PU_LUA)
LUA_InvalidateUserdata(ptr);
-#endif
// TODO: if zdebugging, make sure no other block has a user
// that is about to be freed.