diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c6a3ce799db5690be895b5f73c71bbed698ae8a6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,33 @@
+language: c
+sudo: required
+dist: trusty
+
+env:
+- CFLAGS=-Wno-absolute-value -Werror
+
+compiler:
+ - gcc
+ - clang
+
+cache:
+ directories:
+ - $HOME/srb2_cache
+
+addons:
+ apt:
+ packages:
+ - libsdl2-mixer-dev
+ - libpng-dev
+ - libgl1-mesa-dev
+ - libgme-dev
+ - p7zip-full
+
+before_script:
+ - mkdir $HOME/srb2_cache
+ - wget http://rosenthalcastle.org/srb2/SRB2-v2114-Installer.exe -c -O $HOME/srb2_cache/SRB2-v2114-Installer.exe
+ - 7z x $HOME/srb2_cache/SRB2-v2114-Installer.exe -oassets
+ - mkdir build
+ - cd build
+ - cmake ..
+
+script: make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8fe0ab5731f219e3661c9f8316c873986ec98d5..738e5332d7f3ac9926b46e397a122e2a66051ede 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,9 +80,6 @@ endif()
if(${CMAKE_SYSTEM} MATCHES "Darwin")
add_definitions(-DMACOSX)
- if(${CMAKE_C_COMPILER_ID} MATCHES "Clang")
- set(CLANG ON)
- endif()
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
diff --git a/bin/Resources/debian/README.Debian b/assets/debian/README.Debian
similarity index 100%
rename from bin/Resources/debian/README.Debian
rename to assets/debian/README.Debian
diff --git a/bin/Resources/debian/README.source b/assets/debian/README.source
similarity index 100%
rename from bin/Resources/debian/README.source
rename to assets/debian/README.source
diff --git a/assets/debian/changelog b/assets/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..a316b7df73f0a0f4e865d71416464f95358d6e3f
--- /dev/null
+++ b/assets/debian/changelog
@@ -0,0 +1,12 @@
+srb2-data (2.1.14~1) unstable; urgency=low
+
+ * Updated for SRB2 v2.1.14
+
+ -- Alam Arias <alam+debian@srb2.org> Sat, 6 Jan 2016 11:00:00 -0500
+
+
+srb2-data (2.0.6-2) maverick; urgency=high
+
+ * Initial proper release..
+
+ -- Callum Dickinson <gcfreak_ag20@hotmail.com> Sat, 29 Jan 2011 01:18:42 +1300
diff --git a/bin/Resources/debian/compat b/assets/debian/compat
similarity index 100%
rename from bin/Resources/debian/compat
rename to assets/debian/compat
diff --git a/bin/Resources/debian/control b/assets/debian/control
similarity index 100%
rename from bin/Resources/debian/control
rename to assets/debian/control
diff --git a/bin/Resources/debian/copyright b/assets/debian/copyright
similarity index 100%
rename from bin/Resources/debian/copyright
rename to assets/debian/copyright
diff --git a/bin/Resources/debian/rules b/assets/debian/rules
similarity index 95%
rename from bin/Resources/debian/rules
rename to assets/debian/rules
index 514d8e07c5f7361659914ae167a9a070adc741d7..d86f92af2f81a8f63755431b95911ee2c2dfd204 100755
--- a/bin/Resources/debian/rules
+++ b/assets/debian/rules
@@ -37,7 +37,7 @@ RM := rm -rf
DIR := $(shell pwd)
PACKAGE := $(shell cat $(DIR)/debian/control | grep 'Package:' | sed -e 's/Package: //g')
-DATAFILES := drill.dta music.dta soar.dta zones.dta player.dta rings.wpn srb2.wad
+DATAFILES := srb2.srb zones.dta player.dta rings.dta music.dta
DATADIR := usr/games/SRB2
RESOURCEDIR := .
@@ -48,7 +48,7 @@ build:
# This will need to be updated every time SRB2 official version is
# Copy data files to their install locations, and add data files to include-binaries
for file in $(DATAFILES); do \
- $(WGET) http://alam.srb2.org/SRB2/2.0.6-Final/Resources/$$file; \
+ $(WGET) http://alam.srb2.org/SRB2/2.1.14-Final/Resources/$$file; \
if test "$$file" = "srb2.wad"; then \
$(INSTALL) $(RESOURCEDIR)/$$file $(DIR)/debian/tmp/$(DATADIR)/srb2.srb; \
else \
diff --git a/assets/debian/source/format b/assets/debian/source/format
new file mode 100644
index 0000000000000000000000000000000000000000..89ae9db8f88b823b6a7eabf55e203658739da122
--- /dev/null
+++ b/assets/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/bin/Resources/debian/changelog b/bin/Resources/debian/changelog
deleted file mode 100644
index 0c514d4d22fc73af8471e425df66d83bc17777e0..0000000000000000000000000000000000000000
--- a/bin/Resources/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-srb2-data (2.0.6-2) maverick; urgency=high
-
- * Initial proper release..
-
- -- Callum Dickinson <gcfreak_ag20@hotmail.com> Sat, 29 Jan 2011 01:18:42 +1300
diff --git a/bin/Resources/debian/source/format b/bin/Resources/debian/source/format
deleted file mode 100644
index 163aaf8d82b6c54f23c45f32895dbdfdcc27b047..0000000000000000000000000000000000000000
--- a/bin/Resources/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/control b/debian/control
index c64a85c4811d314e2657895b841cbd6d0b57ab0a..63b075f17d9eaa8c18680629cc9fab1cf0652ce3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,19 @@ Source: srb2
Section: games
Priority: extra
Maintainer: Callum Dickinson <gcfreak_ag20@hotmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libsdl1.2-dev (>= 1.2.7), libsdl-mixer1.2-dev (>= 1.2.7), libpng12-dev (>= 1.2.7), libglu1-dev | libglu-dev, libosmesa6-dev | libgl-dev, nasm [i386]
+Build-Depends: debhelper (>= 7.0.50~),
+ libsdl2-dev,
+ libsdl2-mixer-dev,
+ libpng12-dev (>= 1.2.7),
+ libglu1-dev | libglu-dev,
+ libosmesa6-dev | libgl-dev,
+ nasm [i386]
Standards-Version: 3.8.4
Homepage: http://www.srb2.org
Package: srb2
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.0.6)
+Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.1.14)
Description: A cross-platform 3D Sonic fangame
Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
fangame built using a modified version of the Doom Legacy
@@ -22,8 +28,8 @@ Description: A cross-platform 3D Sonic fangame
Package: srb2-dbg
Architecture: any
-# FIXME: should be Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.0.6), srb2 but dh_shlibdeps is being an asshat
-Depends: libc6, ${misc:Depends}, srb2-data (= 2.0.6), srb2
+# FIXME: should be Depends: ${shlibs:Depends}, ${misc:Depends}, srb2-data (= 2.1.14), srb2 but dh_shlibdeps is being an asshat
+Depends: libc6, ${misc:Depends}, srb2-data (= 2.1.14), srb2
Description: A cross-platform 3D Sonic fangame
Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
fangame built using a modified version of the Doom Legacy
diff --git a/debian/rules b/debian/rules
index 33ade54c8fe2aea2303df5a034c8c6574cc21f1f..e49784a0f21925400271c273bd547a1ffac93faf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,16 +59,18 @@ DBGNAME = debug/$(EXENAME)
PKGDIR = usr/games
DBGDIR = usr/lib/debug/$(PKGDIR)
+PIXMAPS_DIR = usr/share/pixmaps
+DESKTOP_DIR = usr/share/applications
PREFIX = $(shell test "$(CROSS_COMPILE_BUILD)" != "$(CROSS_COMPILE_HOST)" && echo "PREFIX=$(CROSS_COMPILE_HOST)")
OS = LINUX=1
NONX86 = $(shell test "`echo $(CROSS_COMPILE_HOST) | grep 'i[3-6]86'`" || echo "NONX86=1")
-MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) SDL_PKGCONFIG=sdl PNG_PKGCONFIG=libpng NOOBJDUMP=1
+MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) SDL_PKGCONFIG=sdl2 PNG_PKGCONFIG=libpng NOOBJDUMP=1
MENUFILE1 = ?package($(PACKAGE)):needs="X11" section="$(SECTION)"
MENUFILE2 = title="$(TITLE)" command="/$(PKGDIR)/$(PACKAGE)"
# FIXME pkg-config dir hacks
-export PKG_CONFIG_LIBDIR = /usr/$(CROSS_COMPILE_HOST)/lib/pkgconfig
+export PKG_CONFIG_LIBDIR = /usr/lib/$(CROSS_COMPILE_HOST)/pkgconfig
BINDIR := $(DIR)/bin/Linux/Release
-LDFLAGS += "-Wl,-rpath=/usr/$(CROSS_COMPILE_HOST)/lib/"
+LDFLAGS += "-Wl,-rpath=/usr/lib/$(CROSS_COMPILE_HOST)"
build:
$(MKDIR) $(BINDIR)/debug
@@ -80,14 +82,23 @@ binary-indep:
echo "no need to do any arch-independent stuff"
binary-arch:
+ # create ddirs
$(MKDIR) $(DIR)/debian/tmp/$(PKGDIR) $(DIR)/debian/tmp/$(DBGDIR)
+ $(MKDIR) $(DIR)/debian/tmp/$(PKGDIR) $(DIR)/debian/tmp/$(DESKTOP_DIR)
+ $(MKDIR) $(DIR)/debian/tmp/$(PKGDIR) $(DIR)/debian/tmp/$(PIXMAPS_DIR)
+ # install main binaries
$(INSTALL) $(BINDIR)/$(EXENAME) $(DIR)/debian/tmp/$(PKGDIR)/$(PACKAGE)
$(INSTALL) $(BINDIR)/$(DBGNAME) $(DIR)/debian/tmp/$(DBGDIR)/$(PACKAGE)
+ # Install desktop file and banner image
+ $(INSTALL) $(DIR)/srb2.png $(DIR)/debian/tmp/usr/share/pixmaps
+ $(INSTALL) $(DIR)/debian/srb2.desktop $(DIR)/debian/tmp/usr/share/applications
# add compiled binaries to include-binaries
echo $(BINDIR)/$(EXENAME) >> $(DIR)/debian/source/include-binaries
echo $(BINDIR)/$(EXENAME) >> $(DIR)/debian/source/include-binaries
# Generate install folder files
echo $(PKGDIR) > $(DIR)/debian/$(PACKAGE).install
+ echo $(DESKTOP_DIR) >> $(DIR)/debian/$(PACKAGE).install
+ echo $(PIXMAPS_DIR) >> $(DIR)/debian/$(PACKAGE).install
echo $(DBGDIR) > $(DIR)/debian/$(DBGPKG).install
binary: binary-arch
diff --git a/debian/srb2.desktop b/debian/srb2.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..661832b93d4364c8011e08c841df415b6131553e
--- /dev/null
+++ b/debian/srb2.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Sonic Robo Blast 2
+Comment=A free 3D Sonic the Hedgehog fan-game built using a modified ver. of the Doom Legacy source port
+Encoding=UTF-8
+Exec=srb2
+Icon=/usr/share/pixmaps/srb2.png
+Terminal=false
+Type=Application
+StartupNotify=false
+Categories=Application;Game;
diff --git a/srb2.png b/srb2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c13eae9a5d1ca26167abfe56486e2e7a642cd6c
Binary files /dev/null and b/srb2.png differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6da19018313c93735a84864a3a294508fd546b43..17bb0028abaa50d0408fa7454de1cafc5af08432 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -163,7 +163,7 @@ set(SRB2_CORE_GAME_SOURCES
p_tick.h
)
-if(NOT CLANG)
+if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
set(SRB2_CORE_SOURCES ${SRB2_CORE_SOURCES} string.c)
endif()
@@ -403,10 +403,14 @@ find_package(ENet)
# Compatibility flag with later versions of GCC
# We should really fix our code to not need this
-if(NOT CLANG AND NOT MSVC)
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields)
endif()
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
+endif()
+
add_definitions(-DCMAKECONFIG)
#add_library(SRB2Core STATIC
diff --git a/src/b_bot.c b/src/b_bot.c
index 0636d93661486705eaa370af12c64bffea055bc5..7f55b50b1accbeccdb46c2c5c8e614208a7314b6 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -49,7 +49,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
if (sonic->player->pflags & (PF_MACESPIN|PF_ITEMHANG))
{
cmd->forwardmove = sonic->player->cmd.forwardmove;
- cmd->angleturn = abs(tails->angle - sonic->angle)>>16;
+ cmd->angleturn = abs((tails->angle - sonic->angle))>>16;
if (sonic->angle < tails->angle)
cmd->angleturn = -cmd->angleturn;
} else if (dist > FixedMul(512*FRACUNIT, tails->scale))
diff --git a/src/f_finale.c b/src/f_finale.c
index a85fd11cb0438fb3950401339007f55cb8f71858..507616f3ca37c841802d6ec455dcebc9f7adf539 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -603,7 +603,7 @@ static void F_IntroDrawScene(void)
if (finalecount-84 < 58) { // Pure Fat is driving up!
int ftime = (finalecount-84);
- x = (-189<<FRACBITS) + (FixedMul((6<<FRACBITS)+FRACUNIT/3, ftime<<FRACBITS) - FixedMul((6<<FRACBITS)+FRACUNIT/3, FixedDiv(FixedMul(ftime<<FRACBITS, ftime<<FRACBITS), 120<<FRACBITS)));
+ x = (-189*FRACUNIT) + (FixedMul((6<<FRACBITS)+FRACUNIT/3, ftime<<FRACBITS) - FixedMul((6<<FRACBITS)+FRACUNIT/3, FixedDiv(FixedMul(ftime<<FRACBITS, ftime<<FRACBITS), 120<<FRACBITS)));
y = (BASEVIDHEIGHT<<FRACBITS) - FixedMul(417<<FRACBITS, aspect);
// Draw the body
V_DrawSciencePatch(x, y, V_SNAPTOLEFT|V_SNAPTOBOTTOM, (patch = W_CachePatchName("PUREFAT1", PU_CACHE)), aspect);
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index c1ed368d68d82f6eb092bbadb8132a6d32ee44b1..4eaed1259868a7dfa373b77a2bb947c2807c0566 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -41,6 +41,7 @@
#include "../r_things.h"
#include "hw_main.h"
+#include "../v_video.h"
#ifdef HAVE_PNG
#ifndef _MSC_VER
@@ -881,6 +882,59 @@ static void md2_loadTexture(md2_t *model)
HWR_UnlockCachedPatch(grpatch);
}
+// -----------------+
+// md2_loadBlendTexture : Download a pcx or png texture for blending MD2 models
+// -----------------+
+static void md2_loadBlendTexture(md2_t *model)
+{
+ GLPatch_t *grpatch;
+ char *filename = Z_Malloc(strlen(model->filename)+7, PU_STATIC, NULL);
+ strcpy(filename, model->filename);
+
+ FIL_ForceExtension(filename, "_blend.png");
+
+ if (model->blendgrpatch)
+ {
+ grpatch = model->blendgrpatch;
+ Z_Free(grpatch->mipmap.grInfo.data);
+ }
+ else
+ grpatch = Z_Calloc(sizeof *grpatch, PU_HWRPATCHINFO,
+ &(model->blendgrpatch));
+
+ if (!grpatch->mipmap.downloaded && !grpatch->mipmap.grInfo.data)
+ {
+ int w = 0, h = 0;
+#ifdef HAVE_PNG
+ grpatch->mipmap.grInfo.format = PNG_Load(filename, &w, &h, grpatch);
+ if (grpatch->mipmap.grInfo.format == 0)
+#endif
+ grpatch->mipmap.grInfo.format = PCX_Load(filename, &w, &h, grpatch);
+ if (grpatch->mipmap.grInfo.format == 0)
+ {
+ Z_Free(filename);
+ return;
+ }
+
+ grpatch->mipmap.downloaded = 0;
+ grpatch->mipmap.flags = 0;
+
+ grpatch->width = (INT16)w;
+ grpatch->height = (INT16)h;
+ grpatch->mipmap.width = (UINT16)w;
+ grpatch->mipmap.height = (UINT16)h;
+
+ // not correct!
+ grpatch->mipmap.grInfo.smallLodLog2 = GR_LOD_LOG2_256;
+ grpatch->mipmap.grInfo.largeLodLog2 = GR_LOD_LOG2_256;
+ grpatch->mipmap.grInfo.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
+ }
+ HWD.pfnSetTexture(&grpatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary
+ HWR_UnlockCachedPatch(grpatch);
+
+ Z_Free(filename);
+}
+
// Don't spam the console, or the OS with fopen requests!
static boolean nomd2s = false;
@@ -1050,6 +1104,238 @@ spritemd2found:
fclose(f);
}
+static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, GLMipmap_t *grmip, skincolors_t color)
+{
+ UINT16 w = gpatch->width, h = gpatch->height;
+ UINT32 size = w*h;
+ RGBA_t *image, *blendimage, *cur, blendcolor;
+
+ if (grmip->width == 0)
+ {
+
+ grmip->width = gpatch->width;
+ grmip->height = gpatch->height;
+
+ // no wrap around, no chroma key
+ grmip->flags = 0;
+ // setup the texture info
+ grmip->grInfo.format = GR_RGBA;
+ }
+
+ Z_Free(grmip->grInfo.data);
+ grmip->grInfo.data = NULL;
+
+ cur = Z_Malloc(size*4, PU_HWRCACHE, &grmip->grInfo.data);
+ memset(cur, 0x00, size*4);
+
+ image = gpatch->mipmap.grInfo.data;
+ blendimage = blendgpatch->mipmap.grInfo.data;
+
+ switch (color)
+ {
+ case SKINCOLOR_WHITE:
+ blendcolor = V_GetColor(3);
+ break;
+ case SKINCOLOR_SILVER:
+ blendcolor = V_GetColor(10);
+ break;
+ case SKINCOLOR_GREY:
+ blendcolor = V_GetColor(15);
+ break;
+ case SKINCOLOR_BLACK:
+ blendcolor = V_GetColor(27);
+ break;
+ case SKINCOLOR_BEIGE:
+ blendcolor = V_GetColor(247);
+ break;
+ case SKINCOLOR_PEACH:
+ blendcolor = V_GetColor(218);
+ break;
+ case SKINCOLOR_BROWN:
+ blendcolor = V_GetColor(234);
+ break;
+ case SKINCOLOR_RED:
+ blendcolor = V_GetColor(38);
+ break;
+ case SKINCOLOR_CRIMSON:
+ blendcolor = V_GetColor(45);
+ break;
+ case SKINCOLOR_ORANGE:
+ blendcolor = V_GetColor(54);
+ break;
+ case SKINCOLOR_RUST:
+ blendcolor = V_GetColor(60);
+ break;
+ case SKINCOLOR_GOLD:
+ blendcolor = V_GetColor(67);
+ break;
+ case SKINCOLOR_YELLOW:
+ blendcolor = V_GetColor(73);
+ break;
+ case SKINCOLOR_TAN:
+ blendcolor = V_GetColor(85);
+ break;
+ case SKINCOLOR_MOSS:
+ blendcolor = V_GetColor(92);
+ break;
+ case SKINCOLOR_PERIDOT:
+ blendcolor = V_GetColor(188);
+ break;
+ case SKINCOLOR_GREEN:
+ blendcolor = V_GetColor(101);
+ break;
+ case SKINCOLOR_EMERALD:
+ blendcolor = V_GetColor(112);
+ break;
+ case SKINCOLOR_AQUA:
+ blendcolor = V_GetColor(122);
+ break;
+ case SKINCOLOR_TEAL:
+ blendcolor = V_GetColor(141);
+ break;
+ case SKINCOLOR_CYAN:
+ blendcolor = V_GetColor(131);
+ break;
+ case SKINCOLOR_BLUE:
+ blendcolor = V_GetColor(152);
+ break;
+ case SKINCOLOR_AZURE:
+ blendcolor = V_GetColor(171);
+ break;
+ case SKINCOLOR_PASTEL:
+ blendcolor = V_GetColor(161);
+ break;
+ case SKINCOLOR_PURPLE:
+ blendcolor = V_GetColor(165);
+ break;
+ case SKINCOLOR_LAVENDER:
+ blendcolor = V_GetColor(195);
+ break;
+ case SKINCOLOR_MAGENTA:
+ blendcolor = V_GetColor(183);
+ break;
+ case SKINCOLOR_PINK:
+ blendcolor = V_GetColor(211);
+ break;
+ case SKINCOLOR_ROSY:
+ blendcolor = V_GetColor(202);
+ break;
+ case SKINCOLOR_SUPER1:
+ blendcolor = V_GetColor(80);
+ break;
+ case SKINCOLOR_SUPER2:
+ blendcolor = V_GetColor(83);
+ break;
+ case SKINCOLOR_SUPER3:
+ blendcolor = V_GetColor(73);
+ break;
+ case SKINCOLOR_SUPER4:
+ blendcolor = V_GetColor(64);
+ break;
+ case SKINCOLOR_SUPER5:
+ blendcolor = V_GetColor(67);
+ break;
+
+ case SKINCOLOR_TSUPER1:
+ case SKINCOLOR_TSUPER2:
+ case SKINCOLOR_TSUPER3:
+ case SKINCOLOR_TSUPER4:
+ case SKINCOLOR_TSUPER5:
+ case SKINCOLOR_KSUPER1:
+ case SKINCOLOR_KSUPER2:
+ case SKINCOLOR_KSUPER3:
+ case SKINCOLOR_KSUPER4:
+ case SKINCOLOR_KSUPER5:
+ default:
+ blendcolor = V_GetColor(255);
+ break;
+ }
+
+ while (size--)
+ {
+ if (blendimage->s.alpha == 0)
+ {
+ // Don't bother with blending the pixel if the alpha of the blend pixel is 0
+ cur->rgba = image->rgba;
+ }
+ else
+ {
+ INT32 tempcolor;
+ INT16 tempmult, tempalpha;
+ tempalpha = -(abs(blendimage->s.red-127)-127)*2;
+ if (tempalpha > 255)
+ tempalpha = 255;
+ else if (tempalpha < 0)
+ tempalpha = 0;
+
+ tempmult = (blendimage->s.red-127)*2;
+ if (tempmult > 255)
+ tempmult = 255;
+ else if (tempmult < 0)
+ tempmult = 0;
+
+ tempcolor = (image->s.red*(255-blendimage->s.alpha))/255 + ((tempmult + ((tempalpha*blendcolor.s.red)/255)) * blendimage->s.alpha)/255;
+ cur->s.red = (UINT8)tempcolor;
+ tempcolor = (image->s.green*(255-blendimage->s.alpha))/255 + ((tempmult + ((tempalpha*blendcolor.s.green)/255)) * blendimage->s.alpha)/255;
+ cur->s.green = (UINT8)tempcolor;
+ tempcolor = (image->s.blue*(255-blendimage->s.alpha))/255 + ((tempmult + ((tempalpha*blendcolor.s.blue)/255)) * blendimage->s.alpha)/255;
+ cur->s.blue = (UINT8)tempcolor;
+ cur->s.alpha = image->s.alpha;
+ }
+
+ cur++; image++; blendimage++;
+ }
+
+ return;
+}
+
+static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, const UINT8 *colormap, skincolors_t color)
+{
+ // mostly copied from HWR_GetMappedPatch, hence the similarities and comment
+ GLMipmap_t *grmip, *newmip;
+
+ if (colormap == colormaps || colormap == NULL)
+ {
+ // Don't do any blending
+ HWD.pfnSetTexture(&gpatch->mipmap);
+ return;
+ }
+
+ // search for the mimmap
+ // skip the first (no colormap translated)
+ for (grmip = &gpatch->mipmap; grmip->nextcolormap; )
+ {
+ grmip = grmip->nextcolormap;
+ if (grmip->colormap == colormap)
+ {
+ if (grmip->downloaded && grmip->grInfo.data)
+ {
+ HWD.pfnSetTexture(grmip); // found the colormap, set it to the correct texture
+ Z_ChangeTag(grmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
+ return;
+ }
+ }
+ }
+
+ // If here, the blended texture has not been created
+ // So we create it
+
+ //BP: WARNING: don't free it manually without clearing the cache of harware renderer
+ // (it have a liste of mipmap)
+ // this malloc is cleared in HWR_FreeTextureCache
+ // (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
+ newmip = calloc(1, sizeof (*newmip));
+ if (newmip == NULL)
+ I_Error("%s: Out of memory", "HWR_GetMappedPatch");
+ grmip->nextcolormap = newmip;
+ newmip->colormap = colormap;
+
+ HWR_CreateBlendedTexture(gpatch, blendgpatch, newmip, color);
+
+ HWD.pfnSetTexture(newmip);
+ Z_ChangeTag(newmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
+}
+
// -----------------+
// HWR_DrawMD2 : Draw MD2
@@ -1180,13 +1466,25 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
gpatch = md2->grpatch;
if (!gpatch || !gpatch->mipmap.grInfo.format || !gpatch->mipmap.downloaded)
md2_loadTexture(md2);
-
gpatch = md2->grpatch; // Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
+ if ((gpatch && gpatch->mipmap.grInfo.format) // don't load the blend texture if the base texture isn't available
+ && (!md2->blendgrpatch || !((GLPatch_t *)md2->blendgrpatch)->mipmap.grInfo.format || !((GLPatch_t *)md2->blendgrpatch)->mipmap.downloaded))
+ md2_loadBlendTexture(md2);
+
if (gpatch && gpatch->mipmap.grInfo.format) // else if meant that if a texture couldn't be loaded, it would just end up using something else's texture
{
- // This is safe, since we know the texture has been downloaded
- HWD.pfnSetTexture(&gpatch->mipmap);
+ if ((skincolors_t)spr->mobj->color != SKINCOLOR_NONE &&
+ md2->blendgrpatch && ((GLPatch_t *)md2->blendgrpatch)->mipmap.grInfo.format
+ && gpatch->width == ((GLPatch_t *)md2->blendgrpatch)->width && gpatch->height == ((GLPatch_t *)md2->blendgrpatch)->height)
+ {
+ HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, spr->colormap, (skincolors_t)spr->mobj->color);
+ }
+ else
+ {
+ // This is safe, since we know the texture has been downloaded
+ HWD.pfnSetTexture(&gpatch->mipmap);
+ }
}
else
{
diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h
index 0fb486ea07914564e5e5f69f4241e619dfed2107..36078268b50d590114e5025833b0197b0c3a0b19 100644
--- a/src/hardware/hw_md2.h
+++ b/src/hardware/hw_md2.h
@@ -120,6 +120,7 @@ typedef struct
float offset;
md2_model_t *model;
void *grpatch;
+ void *blendgrpatch;
boolean notfound;
INT32 skin;
} md2_t;
diff --git a/src/info.c b/src/info.c
index 10ce319bf08cebcf0d5a6df2405af6b7e9b44baf..6e98de0a378d53eb67d8d51722e2dfa76927ff23 100644
--- a/src/info.c
+++ b/src/info.c
@@ -4266,7 +4266,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MT_GOOP, // painchance
sfx_dmpain, // painsound
S_EGGMOBILE2_PAIN2, // meleestate
- MT_EGGMOBILE2_POGO, // missilestate
+ (statenum_t)MT_EGGMOBILE2_POGO, // missilestate
S_EGGMOBILE2_DIE1, // deathstate
S_EGGMOBILE2_FLEE1,// xdeathstate
sfx_cybdth, // deathsound
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 576d7bc4f00b3cdc9ab326e51059b3b61aab737c..b7d7a586573d4a2a1fb2f4932ff736cf97edbe19 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -107,7 +107,7 @@ static UINT8 cheatf_devmode(void)
G_SetGameModified(false);
for (i = 0; i < MAXUNLOCKABLES; i++)
unlockables[i].unlocked = true;
- devparm = TRUE;
+ devparm = true;
cv_debug |= 0x8000;
// Refresh secrets menu existing.
diff --git a/src/m_menu.c b/src/m_menu.c
index 9ef4c3bfa4574bb6151eef55341262d3ef681338..9e7eaf8bb6c3a1b6107253561f1946b001dc77ea 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6072,7 +6072,7 @@ static void M_RoomMenu(INT32 choice)
for (i = 0; room_list[i].header.buffer[0]; i++)
{
- if(room_list[i].name != '\0')
+ if(*room_list[i].name != '\0')
{
MP_RoomMenu[i+1].text = room_list[i].name;
roomIds[i] = room_list[i].id;
diff --git a/src/m_misc.c b/src/m_misc.c
index eaafc06967c24e6eb8c16cf8101a08bbf6d1131d..22effdddfef3c65a5d4edb056e19b59d0434fa72 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -677,7 +677,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
else
snprintf(maptext, 8, "Unknown");
- if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl)
+ if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl[0] != '\0')
snprintf(lvlttltext, 48, "%s%s%s",
mapheaderinfo[gamemap-1]->lvlttl,
(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " ZONE",
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 09274b5a80de2fa6185eb4113dac01ba332cc5f5..bc3dfb7c6238d6f2e5606f7b17cd1c902979d765 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -6362,7 +6362,7 @@ void A_Boss2PogoTarget(mobj_t *actor)
if (actor->info->missilestate) // spawn the pogo stick collision box
{
- mobj_t *pogo = P_SpawnMobj(actor->x, actor->y, actor->z - mobjinfo[actor->info->missilestate].height, actor->info->missilestate);
+ mobj_t *pogo = P_SpawnMobj(actor->x, actor->y, actor->z - mobjinfo[actor->info->missilestate].height, (mobjtype_t)actor->info->missilestate);
pogo->target = actor;
}
diff --git a/src/p_map.c b/src/p_map.c
index 2f9824641841618a732cd8991a91ce14434bff45..9c81e0669638f23278c8244b27ce99c3227b4de1 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2646,8 +2646,8 @@ isblocking:
climbangle += (ANGLE_90 * (whichside ? -1 : 1));
- if (((!slidemo->player->climbing && abs(slidemo->angle - ANGLE_90 - climbline) < ANGLE_45)
- || (slidemo->player->climbing == 1 && abs(slidemo->angle - climbline) < ANGLE_135))
+ if (((!slidemo->player->climbing && abs((slidemo->angle - ANGLE_90 - climbline)) < ANGLE_45)
+ || (slidemo->player->climbing == 1 && abs((slidemo->angle - climbline)) < ANGLE_135))
&& P_IsClimbingValid(slidemo->player, climbangle))
{
slidemo->angle = climbangle;
diff --git a/src/p_user.c b/src/p_user.c
index 44a4b45f321e6aa26342731f3fc707407b1b449c..35cf445f9b989b28d2496c7fd3c306cf61116b2e 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -7984,9 +7984,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (player == &players[consoleplayer])
{
if (focusangle >= localangle)
- localangle += abs(focusangle - localangle)>>5;
+ localangle += abs((focusangle - localangle))>>5;
else
- localangle -= abs(focusangle - localangle)>>5;
+ localangle -= abs((focusangle - localangle))>>5;
}
}
else if (P_AnalogMove(player)) // Analog
diff --git a/src/r_things.c b/src/r_things.c
index b94db488e9e1cb1439c81b24e2419c28b8555d7f..a5f795e0bbf5e43d2712414609e03e8c0a3e6c12 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1105,7 +1105,7 @@ static void R_ProjectSprite(mobj_t *thing)
{
sprdef = &((skin_t *)thing->skin)->sprites[thing->sprite2];
if (rot >= sprdef->numframes) {
- CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid skins[\"%s\"].sprites[SPR2_%s] frame %d\n"), ((skin_t *)thing->skin)->name, spr2names[thing->sprite2], rot);
+ CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid skins[\"%s\"].sprites[SPR2_%s] frame %s\n"), ((skin_t *)thing->skin)->name, spr2names[thing->sprite2], sizeu5(rot));
thing->sprite = states[S_UNKNOWN].sprite;
thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite];
diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt
index 875c35cd5cfa3c5fb887c8d68a195f5b3c7571e2..d562b61e50de4e19d7f300f2fe7455dcac3fe402 100644
--- a/src/sdl/CMakeLists.txt
+++ b/src/sdl/CMakeLists.txt
@@ -116,7 +116,7 @@ if(${SDL2_FOUND})
add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 ${SRB2_SDL2_TOTAL_SOURCES})
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME ${SRB2_SDL2_EXE_NAME})
- if(CLANG)
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
add_framework(CoreFoundation SRB2SDL2)
add_framework(SDL2 SRB2SDL2)
add_framework(SDL2_mixer SRB2SDL2)
@@ -226,7 +226,7 @@ if(${SDL2_FOUND})
endif()
#### Installation ####
- if (CLANG)
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
install(TARGETS SRB2SDL2
BUNDLE DESTINATION .
)
@@ -267,7 +267,7 @@ if(${SDL2_FOUND})
# Mac bundle fixup
- if(CLANG)
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
install(CODE "
include(BundleUtilities)
fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/Sonic Robo Blast 2.app\"
@@ -281,4 +281,4 @@ if(${SDL2_FOUND})
else()
message(WARNING "SDL2 was not found, so the SDL2 target will not be available.")
set(SRB2_SDL2_AVAILABLE NO PARENT_SCOPE)
-endif()
\ No newline at end of file
+endif()
diff --git a/src/sdl/Makefile.cfg b/src/sdl/Makefile.cfg
index 3b92a9fb8f03301d6bfbb381c76a47ea7a6cd743..b54f7057c9a0e750bb99ef2fe0417fc0f7d532bf 100644
--- a/src/sdl/Makefile.cfg
+++ b/src/sdl/Makefile.cfg
@@ -119,6 +119,12 @@ ifdef SDL_NET
SDL_LDFLAGS+=-lSDL2_net
endif
+ifdef MINGW
+ifndef NOSDLMAIN
+ SDLMAIN=1
+endif
+endif
+
ifdef SDLMAIN
OPTS+=-DSDLMAIN
else