back disable warnings into stdafx.h, vc6 is lack of warnings support

svn-id: r9337
This commit is contained in:
Paweł Kołodziejski 2003-07-31 18:35:01 +00:00
parent bb8d0361e7
commit e5e117006a
17 changed files with 492 additions and 66 deletions

470
bs2.dsp Normal file
View file

@ -0,0 +1,470 @@
# Microsoft Developer Studio Project File - Name="bs2" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=bs2 - Win32 mad mp3 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "bs2.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "bs2.mak" CFG="bs2 - Win32 mad mp3 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "bs2 - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "bs2 - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "bs2 - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "bs2 - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "bs2 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "bs2___Release"
# PROP Intermediate_Dir "bs2___Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /YX /FD /c
# ADD BASE RSC /l 0x415 /d "NDEBUG"
# ADD RSC /l 0x415 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "bs2 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "bs2___Win32_Debug"
# PROP BASE Intermediate_Dir "bs2___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "bs2___Debug"
# PROP Intermediate_Dir "bs2___Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x415 /d "_DEBUG"
# ADD RSC /l 0x415 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "bs2 - Win32 mad mp3 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "bs2___Win32_mad mp3_Debug"
# PROP BASE Intermediate_Dir "bs2___Win32_mad mp3_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "bs2___mad_mp3_Debug"
# PROP Intermediate_Dir "bs2___mad_mp3_Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x415 /d "_DEBUG"
# ADD RSC /l 0x415 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "bs2 - Win32 mad mp3 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "bs2___Win32_mad mp3_Release"
# PROP BASE Intermediate_Dir "bs2___Win32_mad mp3_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "bs2___mad_mp3_Release"
# PROP Intermediate_Dir "bs2___mad_mp3_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /c
# ADD BASE RSC /l 0x415 /d "NDEBUG"
# ADD RSC /l 0x415 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "bs2 - Win32 Release"
# Name "bs2 - Win32 Debug"
# Name "bs2 - Win32 mad mp3 Debug"
# Name "bs2 - Win32 mad mp3 Release"
# Begin Group "Source Files"
# PROP Default_Filter ""
# Begin Group "driver"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\bs2\driver\_console.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\_console.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\_mouse.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\_mouse.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\d_draw.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\d_draw.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\d_sound.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\d_sound.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\ddutil.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\driver96.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\keyboard.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\keyboard.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\language.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\menu.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\menu.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\misc.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\mouse.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\palette.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\palette.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\rdwin.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\rdwin.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\render.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\render.h
# End Source File
# Begin Source File
SOURCE=.\bs2\driver\sprite.cpp
# End Source File
# End Group
# Begin Source File
SOURCE=.\bs2\anims.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\anims.h
# End Source File
# Begin Source File
SOURCE=.\bs2\build_display.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\build_display.h
# End Source File
# Begin Source File
SOURCE=.\bs2\console.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\console.h
# End Source File
# Begin Source File
SOURCE=.\bs2\controls.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\controls.h
# End Source File
# Begin Source File
SOURCE=.\bs2\credits.h
# End Source File
# Begin Source File
SOURCE=.\bs2\debug.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\debug.h
# End Source File
# Begin Source File
SOURCE=.\bs2\defs.h
# End Source File
# Begin Source File
SOURCE=.\bs2\events.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\events.h
# End Source File
# Begin Source File
SOURCE=.\bs2\function.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\function.h
# End Source File
# Begin Source File
SOURCE=.\bs2\header.h
# End Source File
# Begin Source File
SOURCE=.\bs2\icons.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\icons.h
# End Source File
# Begin Source File
SOURCE=.\bs2\interpreter.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\interpreter.h
# End Source File
# Begin Source File
SOURCE=.\bs2\layers.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\layers.h
# End Source File
# Begin Source File
SOURCE=.\bs2\logic.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\logic.h
# End Source File
# Begin Source File
SOURCE=.\bs2\maketext.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\maketext.h
# End Source File
# Begin Source File
SOURCE=.\bs2\mem_view.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\mem_view.h
# End Source File
# Begin Source File
SOURCE=.\bs2\memory.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\memory.h
# End Source File
# Begin Source File
SOURCE=.\bs2\mouse.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\mouse.h
# End Source File
# Begin Source File
SOURCE=.\bs2\object.h
# End Source File
# Begin Source File
SOURCE=.\bs2\protocol.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\protocol.h
# End Source File
# Begin Source File
SOURCE=.\bs2\resman.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\resman.h
# End Source File
# Begin Source File
SOURCE=.\bs2\router.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\router.h
# End Source File
# Begin Source File
SOURCE=.\bs2\save_rest.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\save_rest.h
# End Source File
# Begin Source File
SOURCE=.\bs2\scroll.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\scroll.h
# End Source File
# Begin Source File
SOURCE=.\bs2\sound.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\sound.h
# End Source File
# Begin Source File
SOURCE=.\bs2\speech.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\speech.h
# End Source File
# Begin Source File
SOURCE=.\bs2\startup.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\startup.h
# End Source File
# Begin Source File
SOURCE=.\bs2\sword2.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\sword2.h
# End Source File
# Begin Source File
SOURCE=.\bs2\sync.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\sync.h
# End Source File
# Begin Source File
SOURCE=.\bs2\tony_gsdk.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\tony_gsdk.h
# End Source File
# Begin Source File
SOURCE=.\bs2\walker.cpp
# End Source File
# Begin Source File
SOURCE=.\bs2\walker.h
# End Source File
# End Group
# End Target
# End Project

View file

@ -36,9 +36,6 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
//#pragma warning (disable: 4244)
//#pragma warning (disable: 4101)
#define scumm_stricmp stricmp #define scumm_stricmp stricmp
#define scumm_strnicmp strnicmp #define scumm_strnicmp strnicmp
#define snprintf _snprintf #define snprintf _snprintf

View file

@ -35,6 +35,10 @@
#elif defined(WIN32) #elif defined(WIN32)
#pragma once
#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
#pragma warning( disable : 4244 ) // turn off "conversion type" warning
#pragma warning( disable : 4390 ) // turn oof "empty statement" warning for BS2 code
#if !defined(_WIN32_WCE) #if !defined(_WIN32_WCE)

View file

@ -24,11 +24,6 @@
#include "newgui.h" #include "newgui.h"
#include "common/engine.h" #include "common/engine.h"
#ifdef _MSC_VER
// Disable "unknown pragma" warning in MSVC 6
#pragma warning(disable : 4068)
#endif
#define UP_DOWN_BOX_HEIGHT 10 #define UP_DOWN_BOX_HEIGHT 10
// Little up/down arrow // Little up/down arrow

View file

@ -27,12 +27,6 @@
# include "palm.h" # include "palm.h"
#endif #endif
#ifdef _MSC_VER
// Disable "unknown pragma" warning in MSVC 6
#pragma warning(disable : 4068)
#endif
/* /*
* TODO list * TODO list
* - get a nicer font which contains diacrits (ŠšŸ§Žˆ etc.) * - get a nicer font which contains diacrits (ŠšŸ§Žˆ etc.)

View file

@ -23,12 +23,6 @@
#include "dialog.h" #include "dialog.h"
#include "newgui.h" #include "newgui.h"
#ifdef _MSC_VER
// Disable "unknown pragma" warning in MSVC 6
#pragma warning(disable : 4068)
#endif
Widget::Widget (Dialog *boss, int x, int y, int w, int h) Widget::Widget (Dialog *boss, int x, int y, int w, int h)
: _type(0), _boss(boss), _x(x), _y(y), _w(w), _h(h), : _type(0), _boss(boss), _x(x), _y(y), _w(w), _h(h),
_id(0), _flags(0), _hasFocus(false) { _id(0), _flags(0), _hasFocus(false) {

View file

@ -89,7 +89,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "scumm___mad_mp3_Debug" # PROP Intermediate_Dir "scumm___mad_mp3_Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "common" /I "scumm" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /vmg /GR /GX /ZI /Od /I "." /I "common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x415 /d "_DEBUG" # ADD BASE RSC /l 0x415 /d "_DEBUG"
# ADD RSC /l 0x415 /d "_DEBUG" # ADD RSC /l 0x415 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

View file

@ -36,11 +36,6 @@
#include "gui/ListWidget.h" #include "gui/ListWidget.h"
#include "common/config-file.h" #include "common/config-file.h"
#ifdef _MSC_VER
// Disable "unknown pragma" warning in MSVC 6
#pragma warning(disable : 4068)
#endif
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#include "gapi_keys.h" #include "gapi_keys.h"
extern bool _get_key_mapping; extern bool _get_key_mapping;

View file

@ -28,11 +28,6 @@
#include "usage_bits.h" #include "usage_bits.h"
#include "util.h" #include "util.h"
#ifdef _MSC_VER
// Disable "unknown pragma" warning in MSVC 6
#pragma warning(disable : 4068)
#endif
enum { enum {
kScrolltime = 500, // ms scrolling is supposed to take kScrolltime = 500, // ms scrolling is supposed to take
kPictureDelay = 20 kPictureDelay = 20

View file

@ -52,11 +52,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#ifdef _MSC_VER
// Disable "unknown pragma" warning in MSVC 6
#pragma warning(disable : 4068)
#endif
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
extern bool isSmartphone(void); extern bool isSmartphone(void);
#endif #endif

View file

@ -98,7 +98,7 @@ LINK32=link.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "USE_MAD" /Yu"stdafx.h" /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "./sound" /I "./" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /D "USE_MAD" /Yu"stdafx.h" /FD /GZ /c
# SUBTRACT BASE CPP /Fr # SUBTRACT BASE CPP /Fr
# ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "sound" /I "common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "DISABLE_SWORD2" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "sound" /I "common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ALLOW_GDI" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /YX /FD /GZ /c
# SUBTRACT CPP /Fr # SUBTRACT CPP /Fr
# ADD BASE RSC /l 0x41d /d "_DEBUG" # ADD BASE RSC /l 0x41d /d "_DEBUG"
# ADD RSC /l 0x41d /d "_DEBUG" # ADD RSC /l 0x41d /d "_DEBUG"

View file

@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
############################################################################### ###############################################################################
Project: "bs2"=.\bs2.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "scumm"=.\scumm.dsp - Package Owner=<4> Project: "scumm"=.\scumm.dsp - Package Owner=<4>
Package=<5> Package=<5>
@ -32,6 +44,9 @@ Package=<4>
Begin Project Dependency Begin Project Dependency
Project_Dep_Name sky Project_Dep_Name sky
End Project Dependency End Project Dependency
Begin Project Dependency
Project_Dep_Name bs2
End Project Dependency
}}} }}}
############################################################################### ###############################################################################

View file

@ -20,15 +20,7 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#ifdef _MSC_VER
// disable warning "truncation of constant value". Some signed
// fields of the structs are saved as unsigned in the .h files
#pragma warning(disable : 4305)
#pragma warning(disable : 4309)
#endif
#include "sky/compact.h" #include "sky/compact.h"
#include "sky/compacts/0compact.h" #include "sky/compacts/0compact.h"
#include "sky/compacts/1compact.h" #include "sky/compacts/1compact.h"
#include "sky/compacts/29comp.h" #include "sky/compacts/29comp.h"
@ -44,11 +36,6 @@
#include "sky/compacts/lincmenu.h" #include "sky/compacts/lincmenu.h"
#include "sky/compacts/z_compac.h" #include "sky/compacts/z_compac.h"
#ifdef _MSC_VER
#pragma warning(default : 4305)
#pragma warning(default : 4309)
#endif
#define COMPACT_SIZE (sizeof(compactOffsets)/sizeof(uint32)) #define COMPACT_SIZE (sizeof(compactOffsets)/sizeof(uint32))
#define EXTCOMPACT_SIZE (sizeof(extCompactOffsets)/sizeof(uint32)) #define EXTCOMPACT_SIZE (sizeof(extCompactOffsets)/sizeof(uint32))
#define MEGASET_SIZE (sizeof(megaSetOffsets)/sizeof(uint32)) #define MEGASET_SIZE (sizeof(megaSetOffsets)/sizeof(uint32))

View file

@ -26,11 +26,6 @@
#include "common/file.h" #include "common/file.h"
#include "common/util.h" #include "common/util.h"
#ifdef _MSC_VER
// Disable "unknown pragma" warning in MSVC 6
#pragma warning(disable : 4068)
#endif
template<bool is16Bit, bool isUnsigned> template<bool is16Bit, bool isUnsigned>
static inline int16 readSample(const byte *ptr) { static inline int16 readSample(const byte *ptr) {
uint16 sample = is16Bit ? READ_BE_UINT16(ptr) : (*ptr << 8); uint16 sample = is16Bit ? READ_BE_UINT16(ptr) : (*ptr << 8);

View file

@ -176,12 +176,6 @@ the_end:
return (ST_SUCCESS); return (ST_SUCCESS);
} }
#ifndef _MSC_VER
#pragma mark -
#endif
LinearRateConverter::LinearRateConverter(st_rate_t inrate, st_rate_t outrate) { LinearRateConverter::LinearRateConverter(st_rate_t inrate, st_rate_t outrate) {
st_rate_start(&effp, inrate, outrate); st_rate_start(&effp, inrate, outrate);
} }

View file

@ -146,6 +146,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include "stdafx.h"
//#include <windows.h> //#include <windows.h>
//#include <windowsx.h> //#include <windowsx.h>
#include <stdio.h> #include <stdio.h>
@ -156,7 +157,6 @@
#include "common/engine.h" #include "common/engine.h"
#include "d_draw.h" #include "d_draw.h"
#include "driver96.h" #include "driver96.h"
#include "stdafx.h"
#include "../sword2.h" #include "../sword2.h"
#define PALTABLESIZE 64*64*64 #define PALTABLESIZE 64*64*64

View file

@ -33,10 +33,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef _MSC_VER
#include <unistd.h>
#endif
#include "stdafx.h" #include "stdafx.h"
//#include "src\driver96.h" //#include "src\driver96.h"
#include "debug.h" #include "debug.h"