1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +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
Standard Gaming Platform/Button System.cpp
+4
View File
@@ -2791,6 +2791,10 @@ void QuickButtonCallbackMButn( MOUSE_REGION *reg, INT32 reason )
{
StateAfter = (b->uiFlags & BUTTON_CLICKED_ON) ? (TRUE) : (FALSE);
}
else
{
StateAfter = !( reason & MSYS_CALLBACK_REASON_LBUTTON_UP );
}
// Play sounds for this enabled button (disabled sounds have already been done)
if( b->ubSoundSchemeID && b->uiFlags & BUTTON_ENABLED )
Standard Gaming Platform/Compression.h
+1 -1
View File
@@ -23,7 +23,7 @@
//
// 3) call DecompressFini() with the decompression pointer when you're done
PTR DecompressInit( BYTE * pCompressedData, UINT32 uiDataSize );
PTR DecompressInit( PTR pCompressedData, UINT32 uiDataSize );
UINT32 Decompress( PTR pDecompPtr, BYTE * pBuffer, UINT32 uiBufferLen );
void DecompressFini( PTR pDecompPtr );
Standard Gaming Platform/ExceptionHandling.cpp
+1
View File
@@ -7,6 +7,7 @@
#include <stdlib.h>
#include <malloc.h>
#include <stdio.h>
#include "FileMan.h"
#endif
#include "ExceptionHandling.h"
Standard Gaming Platform/FileCat.cpp
+3 -1
View File
@@ -73,6 +73,8 @@ size_t TFileCat::RemoveDir(std::string dir, bool pathIncludesRoot)
void TFileCat::TraverseDir(std::string dir, int depth)
{
using std::string;
static string dot( ".");
static string dotdot( "..");
if (!dir.empty()) dir += '\\';
@@ -82,7 +84,7 @@ void TFileCat::TraverseDir(std::string dir, int depth)
unsigned attrib;
while ( readDir.NextFile(fileName, attrib) ) {
if (string(".") == fileName || string("..") == fileName) continue;
if (dot == fileName || dotdot == fileName) continue;
string fullPath = dir + fileName;
Standard Gaming Platform/SGP_2005Express.vcproj
+566
View File
@@ -0,0 +1,566 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="SGP_2005Express"
ProjectGUID="{6283CE93-2960-4596-8E74-7A6FBA8716FF}"
RootNamespace="SGP_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;NO_ZLIB_COMPRESSION"
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;NO_ZLIB_COMPRESSION"
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=".\Bitmap.h"
>
</File>
<File
RelativePath=".\Button Sound Control.h"
>
</File>
<File
RelativePath=".\Button System.h"
>
</File>
<File
RelativePath=".\Compression.h"
>
</File>
<File
RelativePath=".\Container.h"
>
</File>
<File
RelativePath=".\Cursor Control.h"
>
</File>
<File
RelativePath=".\DbMan.h"
>
</File>
<File
RelativePath=".\ddraw.h"
>
</File>
<File
RelativePath=".\DEBUG.H"
>
</File>
<File
RelativePath=".\DirectDraw Calls.h"
>
</File>
<File
RelativePath=".\DirectX Common.h"
>
</File>
<File
RelativePath=".\dsound.h"
>
</File>
<File
RelativePath=".\english.h"
>
</File>
<File
RelativePath=".\ExceptionHandling.h"
>
</File>
<File
RelativePath=".\expat.h"
>
</File>
<File
RelativePath=".\FileCat.h"
>
</File>
<File
RelativePath=".\FileMan.h"
>
</File>
<File
RelativePath=".\flic.h"
>
</File>
<File
RelativePath=".\fmod.h"
>
</File>
<File
RelativePath=".\fmod_errors.h"
>
</File>
<File
RelativePath=".\Font.h"
>
</File>
<File
RelativePath=".\himage.h"
>
</File>
<File
RelativePath=".\imgfmt.h"
>
</File>
<File
RelativePath=".\impTGA.h"
>
</File>
<File
RelativePath=".\input.h"
>
</File>
<File
RelativePath=".\Install.h"
>
</File>
<File
RelativePath=".\Ja2 Libs.h"
>
</File>
<File
RelativePath=".\JA2 SGP ALL.H"
>
</File>
<File
RelativePath=".\LibraryDataBase.h"
>
</File>
<File
RelativePath=".\line.h"
>
</File>
<File
RelativePath=".\MemMan.h"
>
</File>
<File
RelativePath=".\mousesystem.h"
>
</File>
<File
RelativePath=".\mousesystem_macros.h"
>
</File>
<File
RelativePath=".\Mss-old.h"
>
</File>
<File
RelativePath=".\Mss.h"
>
</File>
<File
RelativePath=".\Mutex Manager.h"
>
</File>
<File
RelativePath=".\pcx.h"
>
</File>
<File
RelativePath=".\RAD.H"
>
</File>
<File
RelativePath=".\random.h"
>
</File>
<File
RelativePath=".\readdir.h"
>
</File>
<File
RelativePath=".\RegInst.h"
>
</File>
<File
RelativePath=".\sgp.h"
>
</File>
<File
RelativePath=".\shading.h"
>
</File>
<File
RelativePath=".\SMACK.H"
>
</File>
<File
RelativePath=".\soundman.h"
>
</File>
<File
RelativePath=".\STCI.h"
>
</File>
<File
RelativePath=".\stringicmp.h"
>
</File>
<File
RelativePath=".\timer.h"
>
</File>
<File
RelativePath=".\TopicIDs.h"
>
</File>
<File
RelativePath=".\TopicOps.h"
>
</File>
<File
RelativePath=".\trle.h"
>
</File>
<File
RelativePath=".\Types.h"
>
</File>
<File
RelativePath=".\video.h"
>
</File>
<File
RelativePath=".\video_private.h"
>
</File>
<File
RelativePath=".\vobject.h"
>
</File>
<File
RelativePath=".\vobject_blitters.h"
>
</File>
<File
RelativePath=".\vobject_private.h"
>
</File>
<File
RelativePath=".\vsurface.h"
>
</File>
<File
RelativePath=".\vsurface_private.h"
>
</File>
<File
RelativePath=".\WCheck.h"
>
</File>
<File
RelativePath=".\WinFont.h"
>
</File>
<File
RelativePath=".\WizShare.h"
>
</File>
<File
RelativePath=".\ZCONF.H"
>
</File>
<File
RelativePath=".\ZLIB.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=".\Button Sound Control.cpp"
>
</File>
<File
RelativePath=".\Button System.cpp"
>
</File>
<File
RelativePath=".\Container.cpp"
>
</File>
<File
RelativePath=".\Cursor Control.cpp"
>
</File>
<File
RelativePath=".\DbMan.cpp"
>
</File>
<File
RelativePath=".\DEBUG.cpp"
>
</File>
<File
RelativePath=".\DirectDraw Calls.cpp"
>
</File>
<File
RelativePath=".\DirectX Common.cpp"
>
</File>
<File
RelativePath=".\English.cpp"
>
</File>
<File
RelativePath=".\ExceptionHandling.cpp"
>
</File>
<File
RelativePath=".\FileCat.cpp"
>
</File>
<File
RelativePath=".\FileMan.cpp"
>
</File>
<File
RelativePath=".\Font.cpp"
>
</File>
<File
RelativePath=".\himage.cpp"
>
</File>
<File
RelativePath=".\impTGA.cpp"
>
</File>
<File
RelativePath=".\input.cpp"
>
</File>
<File
RelativePath=".\Install.cpp"
>
</File>
<File
RelativePath=".\LibraryDataBase.cpp"
>
</File>
<File
RelativePath=".\line.cpp"
>
</File>
<File
RelativePath=".\MemMan.cpp"
>
</File>
<File
RelativePath=".\mousesystem.cpp"
>
</File>
<File
RelativePath=".\Mutex Manager.cpp"
>
</File>
<File
RelativePath=".\PCX.cpp"
>
</File>
<File
RelativePath=".\Random.cpp"
>
</File>
<File
RelativePath=".\readdir.cpp"
>
</File>
<File
RelativePath=".\RegInst.cpp"
>
</File>
<File
RelativePath=".\sgp.cpp"
>
</File>
<File
RelativePath=".\shading.cpp"
>
</File>
<File
RelativePath=".\soundman.cpp"
>
</File>
<File
RelativePath=".\STCI.cpp"
>
</File>
<File
RelativePath=".\stringicmp.cpp"
>
</File>
<File
RelativePath=".\timer.cpp"
>
</File>
<File
RelativePath=".\video.cpp"
>
</File>
<File
RelativePath=".\vobject.cpp"
>
</File>
<File
RelativePath=".\vobject_blitters.cpp"
>
</File>
<File
RelativePath=".\vsurface.cpp"
>
</File>
<File
RelativePath=".\WinFont.cpp"
>
</File>
</Filter>
<File
RelativePath=".\ddraw.lib"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Standard Gaming Platform/himage.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ BOOLEAN Copy8BPPCompressedImageTo8BPPBuffer( HIMAGE hImage, BYTE *pDestBuf, UINT
CHECKF( pDecompPtr );
// Allocate memory for one scanline
pScanLine = MemAlloc( hImage->usWidth );
pScanLine = (UINT8*) MemAlloc( hImage->usWidth );
CHECKF( pScanLine );
// go past all the scanlines we don't need to process
Standard Gaming Platform/stringicmp.cpp
+15
View File
@@ -12,6 +12,7 @@ bool TStringiLess::operator() (std::string const& s1, std::string const& s2) con
// An MSVC compliance issue...
//using std::toupper;
#if 0
std::string::const_iterator p1 = s1.begin();
std::string::const_iterator p2 = s2.begin();
@@ -24,4 +25,18 @@ bool TStringiLess::operator() (std::string const& s1, std::string const& s2) con
if (p2 == s2.end()) return false;
return toupper(*p1) < toupper(*p2);
#else
const char *p1 = s1.c_str();
const char *p2 = s2.c_str();
while (*p1 && *p2 && toupper(*p1) == toupper(*p2)) {
++p1;
++p2;
}
if (!*p1) return *p2;
if (!*p2) return false;
return toupper(*p1) < toupper(*p2);
#endif
}