zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

This commit is contained in:
Christoph Oelckers 2016-02-09 11:51:39 +01:00
parent 8823b60c0d 93ff8562dc
commit 26b657b637
11 changed files with 965 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actor.h
View File

@ -647,6 +647,8 @@ public:
// Returns true if this actor is within melee range of its target
bool CheckMeleeRange();
bool CheckNoDelay();
virtual void BeginPlay(); // Called immediately after the actor is created
virtual void PostBeginPlay(); // Called immediately before the actor's first tick
virtual void LevelSpawned(); // Called after BeginPlay if this actor was spawned by the world

11
src/g_shared/a_fastprojectile.cpp
View File

@ -138,17 +138,8 @@ void AFastProjectile::Tick ()
}
}
}
if ((flags7 & MF7_HANDLENODELAY) && !(flags2 & MF2_DORMANT))
{
flags7 &= ~MF7_HANDLENODELAY;
if (state->GetNoDelay())
{
// For immediately spawned objects with the NoDelay flag set for their
// Spawn state, explicitly call the current state's function.
if (state->CallAction(this, this) && (ObjectFlags & OF_EuthanizeMe))
if (!CheckNoDelay())
return; // freed itself
}
}
// Advance the state
if (tics != -1)
{

2
src/menu/playermenu.cpp
View File

@ -484,7 +484,7 @@ void FSliderItem::Drawer(bool selected)
screen->DrawText(mFont, selected? OptionSettings.mFontColorSelection : mFontColor, mXpos, mYpos, text, DTA_Clean, true, TAG_DONE);
int x = SmallFont->StringWidth ("Green") + 8 + mXpos;
int x2 = SmallFont->StringWidth (mText) + 8 + mXpos;
int x2 = SmallFont->StringWidth (text) + 8 + mXpos;
DrawSlider (MAX(x2, x), mYpos);
}

43
src/p_mobj.cpp
View File

@ -3841,17 +3841,8 @@ void AActor::Tick ()
Destroy();
return;
}
if ((flags7 & MF7_HANDLENODELAY) && !(flags2 & MF2_DORMANT))
{
flags7 &= ~MF7_HANDLENODELAY;
if (state->GetNoDelay())
{
// For immediately spawned objects with the NoDelay flag set for their
// Spawn state, explicitly call the current state's function.
if (state->CallAction(this, this) && (ObjectFlags & OF_EuthanizeMe))
if (!CheckNoDelay())
return; // freed itself
}
}
// cycle through states, calling action functions at transitions
if (tics != -1)
{
@ -3892,6 +3883,38 @@ void AActor::Tick ()
}
}
//==========================================================================
//
// AActor :: CheckNoDelay
//
//==========================================================================
bool AActor::CheckNoDelay()
{
if ((flags7 & MF7_HANDLENODELAY) && !(flags2 & MF2_DORMANT))
{
flags7 &= ~MF7_HANDLENODELAY;
if (state->GetNoDelay())
{
// For immediately spawned objects with the NoDelay flag set for their
// Spawn state, explicitly call the current state's function.
if (state->CallAction(this, this))
{
if (ObjectFlags & OF_EuthanizeMe)
{
return false; // freed itself
}
if (ObjectFlags & OF_StateChanged)
{
ObjectFlags &= ~OF_StateChanged;
return SetState(state);
}
}
}
}
return true;
}
//==========================================================================
//
// AActor :: CheckSectorTransition

4
src/thingdef/thingdef_codeptr.cpp
View File

@ -238,14 +238,14 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, CountInv)
self = COPY_AAPTR(self, pick_pointer);
if (self == NULL || itemtype == NULL)
{
ret->SetInt(false);
ret->SetInt(0);
}
else
{
AInventory *item = self->FindInventory(itemtype);
ret->SetInt(item ? item->Amount : 0);
return 1;
}
return 1;
}
return 0;
}

62
tools/re2c/config.msc.h Normal file
View File

@ -0,0 +1,62 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <stdint.h> header file. */
/* #undef HAVE_STDINT_H */
/* Name of package */
/* #undef PACKAGE */
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "re2c-general@lists.sourceforge.net"
/* Define to the full name of this package. */
#define PACKAGE_NAME "re2c"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "re2c 0.16"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "re2c"
/* Define to the home page for this package. */
/* #undef PACKAGE_URL */
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.16"
/* The size of `0i8', as computed by sizeof. */
#define SIZEOF_0I8 1
/* The size of `0l', as computed by sizeof. */
#define SIZEOF_0L 4
/* The size of `0ll', as computed by sizeof. */
#define SIZEOF_0LL 8
/* The size of `char', as computed by sizeof. */
#define SIZEOF_CHAR 1
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4
/* The size of `long long', as computed by sizeof. */
#define SIZEOF_LONG_LONG 8
/* The size of `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
/* The size of `void *', as computed by sizeof. */
#ifdef _M_X64
#define SIZEOF_VOID_P 8
#else
#define SIZEOF_VOID_P 4
#endif
/* The size of `__int64', as computed by sizeof. */
#define SIZEOF___INT64 8
/* Version number of package */
/* #undef VERSION */

845
tools/re2c/re2c.vcproj Normal file
View File

@ -0,0 +1,845 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="re2c"
ProjectGUID="{667D2EE7-C357-49E2-9BAB-0A4A45F0F76E}"
RootNamespace="re2c"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="."
IntermediateDirectory="Build"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
CallingConvention="0"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/re2c.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
CallingConvention="0"
DisableSpecificWarnings="4996;4244"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/re2c.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="."
IntermediateDirectory="Build"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/re2c.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
CallingConvention="0"
DisableSpecificWarnings="4996;4244"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/re2c.exe"
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\src\ir\adfa\adfa.cc"
>
</File>
<File
RelativePath=".\src\codegen\bitmap.cc"
>
</File>
<File
RelativePath=".\src\ir\nfa\calc_size.cc"
>
</File>
<File
RelativePath=".\src\parse\code.cc"
>
</File>
<File
RelativePath=".\src\ir\compile.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\control_flow.cc"
>
</File>
<File
RelativePath=".\src\ir\dfa\determinization.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\display.cc"
>
</File>
<File
RelativePath=".\src\codegen\emit_action.cc"
>
</File>
<File
RelativePath=".\src\codegen\emit_dfa.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\enc.cc"
>
</File>
<File
RelativePath=".\src\ir\dfa\fillpoints.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\fixed_length.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\generate_code.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\generate_data.cc"
>
</File>
<File
RelativePath=".\src\codegen\go_construct.cc"
>
</File>
<File
RelativePath=".\src\codegen\go_destruct.cc"
>
</File>
<File
RelativePath=".\src\codegen\go_emit.cc"
>
</File>
<File
RelativePath=".\src\codegen\go_used_labels.cc"
>
</File>
<File
RelativePath=".\src\parse\input.cc"
>
</File>
<File
RelativePath=".\src\codegen\input_api.cc"
>
</File>
<File
RelativePath=".\src\codegen\label.cc"
>
</File>
<File
RelativePath=".\src\parse\lex.cc"
>
</File>
<File
RelativePath=".\src\parse\lex_conf.cc"
>
</File>
<File
RelativePath=".\src\main.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\match_empty.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\maxlen.cc"
>
</File>
<File
RelativePath=".\src\ir\dfa\minimization.cc"
>
</File>
<File
RelativePath=".\src\conf\msg.cc"
>
</File>
<File
RelativePath=".\src\ir\nfa\nfa.cc"
>
</File>
<File
RelativePath=".\src\conf\opt.cc"
>
</File>
<File
RelativePath=".\src\codegen\output.cc"
>
</File>
<File
RelativePath=".\src\conf\parse_opts.cc"
>
</File>
<File
RelativePath=".\src\parse\parser.cc"
>
</File>
<File
RelativePath=".\src\ir\adfa\prepare.cc"
>
</File>
<File
RelativePath=".\src\codegen\print.cc"
>
</File>
<File
RelativePath=".\src\util\range.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\range_suffix.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp.cc"
>
</File>
<File
RelativePath=".\src\ir\rule_rank.cc"
>
</File>
<File
RelativePath=".\src\util\s_to_n32_unsafe.cc"
>
</File>
<File
RelativePath=".\src\parse\scanner.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\skeleton.cc"
>
</File>
<File
RelativePath=".\src\ir\nfa\split.cc"
>
</File>
<File
RelativePath=".\src\parse\unescape.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\unreachable.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf16\utf16.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf16\utf16_range.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf16\utf16_regexp.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf8\utf8.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf8\utf8_range.cc"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf8\utf8_regexp.cc"
>
</File>
<File
RelativePath=".\src\conf\warn.cc"
>
</File>
<File
RelativePath=".\src\ir\skeleton\way.cc"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\src\ir\adfa\action.h"
>
</File>
<File
RelativePath=".\src\ir\adfa\adfa.h"
>
</File>
<File
RelativePath=".\src\util\allocate.h"
>
</File>
<File
RelativePath=".\src\util\attribute.h"
>
</File>
<File
RelativePath=".\src\codegen\bitmap.h"
>
</File>
<File
RelativePath=".\src\util\c99_stdint.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\case.h"
>
</File>
<File
RelativePath=".\src\parse\code.h"
>
</File>
<File
RelativePath=".\src\ir\compile.h"
>
</File>
<File
RelativePath=".\config.msc.h"
>
</File>
<File
RelativePath=".\src\util\counter.h"
>
</File>
<File
RelativePath=".\src\ir\dfa\dfa.h"
>
</File>
<File
RelativePath=".\src\codegen\emit.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\empty_class_policy.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\enc.h"
>
</File>
<File
RelativePath=".\src\parse\extop.h"
>
</File>
<File
RelativePath=".\src\util\forbid_copy.h"
>
</File>
<File
RelativePath=".\src\util\free_list.h"
>
</File>
<File
RelativePath=".\src\globals.h"
>
</File>
<File
RelativePath=".\src\codegen\go.h"
>
</File>
<File
RelativePath=".\src\codegen\indent.h"
>
</File>
<File
RelativePath=".\src\parse\input.h"
>
</File>
<File
RelativePath=".\src\codegen\input_api.h"
>
</File>
<File
RelativePath=".\src\codegen\label.h"
>
</File>
<File
RelativePath=".\src\parse\loc.h"
>
</File>
<File
RelativePath=".\src\util\local_increment.h"
>
</File>
<File
RelativePath=".\src\conf\msg.h"
>
</File>
<File
RelativePath=".\src\ir\nfa\nfa.h"
>
</File>
<File
RelativePath=".\src\conf\opt.h"
>
</File>
<File
RelativePath=".\src\util\ord_hash_set.h"
>
</File>
<File
RelativePath=".\src\codegen\output.h"
>
</File>
<File
RelativePath=".\src\parse\parser.h"
>
</File>
<File
RelativePath=".\src\ir\skeleton\path.h"
>
</File>
<File
RelativePath=".\src\codegen\print.h"
>
</File>
<File
RelativePath=".\src\util\range.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\range_suffix.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp_alt.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp_cat.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp_close.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp_match.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp_null.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\regexp_rule.h"
>
</File>
<File
RelativePath=".\src\ir\rule_rank.h"
>
</File>
<File
RelativePath=".\src\parse\rules.h"
>
</File>
<File
RelativePath=".\src\util\s_to_n32_unsafe.h"
>
</File>
<File
RelativePath=".\src\parse\scanner.h"
>
</File>
<File
RelativePath=".\src\ir\skeleton\skeleton.h"
>
</File>
<File
RelativePath=".\src\util\smart_ptr.h"
>
</File>
<File
RelativePath=".\src\parse\spec.h"
>
</File>
<File
RelativePath=".\src\util\static_assert.h"
>
</File>
<File
RelativePath=".\src\util\u32lim.h"
>
</File>
<File
RelativePath=".\src\parse\unescape.h"
>
</File>
<File
RelativePath=".\src\util\uniq_vector.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf16\utf16.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf16\utf16_range.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf16\utf16_regexp.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf8\utf8.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf8\utf8_range.h"
>
</File>
<File
RelativePath=".\src\ir\regexp\encoding\utf8\utf8_regexp.h"
>
</File>
<File
RelativePath=".\src\conf\warn.h"
>
</File>
<File
RelativePath=".\src\ir\skeleton\way.h"
>
</File>
<File
RelativePath=".\src\parse\y.tab.h"
>
</File>
</Filter>
<File
RelativePath=".\CMakeLists.txt"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

4
tools/re2c/src/conf/msg.cc
View File

@ -2,7 +2,11 @@
#include <stdio.h>
#include <string>
#if defined(_MSC_VER) && _MSC_VER < 1500
#include "config.msc.h"
#else
#include "config.h"
#endif
#include "src/conf/msg.h"
namespace re2c {

4
tools/re2c/src/util/c99_stdint.h
View File

@ -1,7 +1,11 @@
#ifndef _RE2C_UTIL_C99_STDINT_
#define _RE2C_UTIL_C99_STDINT_
#if defined(_MSC_VER) && _MSC_VER < 1500
#include "config.msc.h"
#else
#include "config.h"
#endif
#if HAVE_STDINT_H
# include <stdint.h>

2
tools/re2c/src/util/range.h
View File

@ -55,7 +55,7 @@ private:
static void append (Range ** & ptail, uint32_t l, uint32_t u);
// test addition and subtraction
template <uint8_t> friend Range * re2c_test::range (uint32_t n);
//template <uint8_t> friend Range * re2c_test::range (uint32_t n);
FORBID_COPY (Range);
};

8
zdoom.vcproj
View File

@ -622,6 +622,10 @@
RelativePath=".\src\dthinker.cpp"
>
</File>
<File
RelativePath=".\src\edata.cpp"
>
</File>
<File
RelativePath=".\src\f_wipe.cpp"
>
@ -1271,6 +1275,10 @@
RelativePath=".\src\dthinker.h"
>
</File>
<File
RelativePath=".\src\edata.h"
>
</File>
<File
RelativePath=".\src\f_finale.h"
>