1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Browse Source
This commit is contained in:
Overhaul
2007-06-29 10:40:05 +00:00
parent dc441a425d
commit e6024e5151
46 changed files with 4912 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Explosion Control.cpp
+1
View File
@@ -2051,6 +2051,7 @@ void GetRayStopInfo( UINT32 uiNewSpot, UINT8 ubDir, INT8 bLevel, BOOLEAN fSmokeE
}
// ATE: For smoke, don't let it go over roof....
// 0verhaul: Why not?
if ( fSmokeEffect )
{
if ( bLevel )
TileEngine/SmokeEffects.cpp
+3 -2
View File
@@ -185,7 +185,8 @@ INT32 NewSmokeEffect( INT16 sGridNo, UINT16 usItem, INT8 bLevel, UINT8 ubOwner )
pSmoke->uiTimeOfLastUpdate = GetWorldTotalSeconds( );
// Are we indoors?
if ( GetTerrainType( sGridNo ) == FLAT_FLOOR )
// 0verhaul: Are we on the floor level?
if ( GetTerrainType( sGridNo ) == FLAT_FLOOR && bLevel)
{
pSmoke->bFlags |= SMOKE_EFFECT_INDOORS;
}
@@ -579,7 +580,7 @@ void DecaySmokeEffects( UINT32 uiTime )
else
{
// damage anyone standing in cloud
SpreadEffect( pSmoke->sGridNo, pSmoke->ubRadius, pSmoke->usItem, pSmoke->ubOwner, REDO_SPREAD_EFFECT, 0, cnt );
SpreadEffect( pSmoke->sGridNo, pSmoke->ubRadius, pSmoke->usItem, pSmoke->ubOwner, REDO_SPREAD_EFFECT, bLevel, cnt );
}
}
}
TileEngine/TileEngine_2005Express.vcproj
+458
View File
@@ -0,0 +1,458 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="TileEngine_2005Express"
ProjectGUID="{FC1938E8-9253-49A8-AA99-4639BBB46C1B}"
RootNamespace="TileEngine_2005Express"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\Ambient Control.h"
>
</File>
<File
RelativePath=".\Ambient Types.h"
>
</File>
<File
RelativePath=".\Buildings.h"
>
</File>
<File
RelativePath=".\environment.h"
>
</File>
<File
RelativePath=".\Exit Grids.h"
>
</File>
<File
RelativePath=".\Explosion Control.h"
>
</File>
<File
RelativePath=".\Fog Of War.h"
>
</File>
<File
RelativePath=".\Interactive Tiles.h"
>
</File>
<File
RelativePath=".\Isometric Utils.h"
>
</File>
<File
RelativePath=".\LightEffects.h"
>
</File>
<File
RelativePath=".\lighting.h"
>
</File>
<File
RelativePath=".\Map Edgepoints.h"
>
</File>
<File
RelativePath=".\overhead map.h"
>
</File>
<File
RelativePath=".\phys math.h"
>
</File>
<File
RelativePath=".\physics.h"
>
</File>
<File
RelativePath=".\pits.h"
>
</File>
<File
RelativePath=".\Radar Screen.h"
>
</File>
<File
RelativePath=".\Render Dirty.h"
>
</File>
<File
RelativePath=".\Render Fun.h"
>
</File>
<File
RelativePath=".\renderworld.h"
>
</File>
<File
RelativePath=".\SaveLoadMap.h"
>
</File>
<File
RelativePath=".\Shade Table Util.h"
>
</File>
<File
RelativePath=".\Simple Render Utils.h"
>
</File>
<File
RelativePath=".\Smell.h"
>
</File>
<File
RelativePath=".\SmokeEffects.h"
>
</File>
<File
RelativePath=".\Structure Internals.h"
>
</File>
<File
RelativePath=".\structure.h"
>
</File>
<File
RelativePath=".\sysutil.h"
>
</File>
<File
RelativePath=".\Tactical Placement GUI.h"
>
</File>
<File
RelativePath=".\Tile Animation.h"
>
</File>
<File
RelativePath=".\Tile Cache.h"
>
</File>
<File
RelativePath=".\Tile Surface.h"
>
</File>
<File
RelativePath=".\TileDat.h"
>
</File>
<File
RelativePath=".\tiledef.h"
>
</File>
<File
RelativePath=".\TileEngine All.h"
>
</File>
<File
RelativePath=".\World Tileset Enums.h"
>
</File>
<File
RelativePath=".\WorldDat.h"
>
</File>
<File
RelativePath=".\worlddef.h"
>
</File>
<File
RelativePath=".\worldman.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\Ambient Control.cpp"
>
</File>
<File
RelativePath=".\Buildings.cpp"
>
</File>
<File
RelativePath=".\environment.cpp"
>
</File>
<File
RelativePath=".\Exit Grids.cpp"
>
</File>
<File
RelativePath=".\Explosion Control.cpp"
>
</File>
<File
RelativePath=".\Fog Of War.cpp"
>
</File>
<File
RelativePath=".\Interactive Tiles.cpp"
>
</File>
<File
RelativePath=".\Isometric Utils.cpp"
>
</File>
<File
RelativePath=".\LightEffects.cpp"
>
</File>
<File
RelativePath=".\lighting.cpp"
>
</File>
<File
RelativePath=".\Map Edgepoints.cpp"
>
</File>
<File
RelativePath=".\overhead map.cpp"
>
</File>
<File
RelativePath=".\phys math.cpp"
>
</File>
<File
RelativePath=".\physics.cpp"
>
</File>
<File
RelativePath=".\pits.cpp"
>
</File>
<File
RelativePath=".\Radar Screen.cpp"
>
</File>
<File
RelativePath=".\Render Dirty.cpp"
>
</File>
<File
RelativePath=".\Render Fun.cpp"
>
</File>
<File
RelativePath=".\renderworld.cpp"
>
</File>
<File
RelativePath=".\SaveLoadMap.cpp"
>
</File>
<File
RelativePath=".\Shade Table Util.cpp"
>
</File>
<File
RelativePath=".\Simple Render Utils.cpp"
>
</File>
<File
RelativePath=".\Smell.cpp"
>
</File>
<File
RelativePath=".\SmokeEffects.cpp"
>
</File>
<File
RelativePath=".\structure.cpp"
>
</File>
<File
RelativePath=".\sysutil.cpp"
>
</File>
<File
RelativePath=".\Tactical Placement GUI.cpp"
>
</File>
<File
RelativePath=".\Tile Animation.cpp"
>
</File>
<File
RelativePath=".\Tile Cache.cpp"
>
</File>
<File
RelativePath=".\Tile Surface.cpp"
>
</File>
<File
RelativePath=".\TileDat.cpp"
>
</File>
<File
RelativePath=".\tiledef.cpp"
>
</File>
<File
RelativePath=".\WorldDat.cpp"
>
</File>
<File
RelativePath=".\worlddef.cpp"
>
</File>
<File
RelativePath=".\worldman.cpp"
>
</File>
<File
RelativePath=".\XML_ExplosionData.cpp"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
TileEngine/worlddef.cpp
+1 -1
View File
@@ -2480,7 +2480,7 @@ BOOLEAN EvaluateWorld( STR8 pSector, UINT8 ubLevel )
{ //skip static priority placement
// WDS - Clean up inventory handling
LOADDATA( &priority, pBuffer, SIZEOF_SOLDIERCREATE_STRUCT_POD); //SIZEOF_SOLDIERCREATE_STRUCT );
priority.CopyOldDataToNew();
priority.CopyOldInventoryToNew();
if( priority.ubProfile != NO_PROFILE )
pTeam->ubProfile++;
else