Fix compile errors, backport input code for RR

# Conflicts:
#	platform/Windows/voidsw.vcxproj
#	source/blood/src/controls.cpp
#	source/blood/src/m32common.cpp
#	source/rr/src/actors.cpp
#	source/rr/src/anim.cpp
#	source/rr/src/demo.cpp
#	source/rr/src/game.cpp
#	source/rr/src/gameexec.cpp
#	source/rr/src/global.h
#	source/rr/src/menus.cpp
#	source/rr/src/menus.h
#	source/rr/src/net.cpp
#	source/rr/src/player.cpp
#	source/rr/src/premap.cpp
#	source/rr/src/savegame.cpp
#	source/rr/src/sbar.cpp
#	source/rr/src/screens.cpp
#	source/rr/src/sector.cpp
This commit is contained in:
nukeykt 2019-09-14 01:23:10 +09:00 committed by Christoph Oelckers
parent f6cd86d77e
commit 996dfde6d0
21 changed files with 395 additions and 385 deletions

View file

@ -278,7 +278,7 @@ void CheckSndData(char *file, int line)
//
void
SoundCallBack(unsigned int num)
SoundCallBack(intptr_t num)
{
VOC_INFOp vp;