diff options
| author | Steven Fuller <relnev@icculus.org> | 2008-05-04 20:47:08 -0700 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:37 +0200 |
| commit | 5d3725f9d972cde917ab9b076cb0b89b33557c7a (patch) | |
| tree | 7378f5fac1dc90fd3d8f52f02db25714010f8912 /src/win95/bmpnames.cpp | |
| parent | 9b449609fac7b23f2f9655ce2d766f1f56679ba4 (diff) | |
Removed a lot of tool code.
Diffstat (limited to 'src/win95/bmpnames.cpp')
| -rw-r--r-- | src/win95/bmpnames.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/win95/bmpnames.cpp b/src/win95/bmpnames.cpp index 961ac00..b27e4ea 100644 --- a/src/win95/bmpnames.cpp +++ b/src/win95/bmpnames.cpp @@ -2,21 +2,9 @@ #include "bmpnames.hpp" #include "mishchnk.hpp" -#if engine #define UseLocalAssert No #include "ourasert.h" #define assert(x) GLOBALASSERT(x) -#else -#if cencon -#include "ccassert.h" -#else -#include <assert.h> -#endif -#endif - -#ifdef cencon -#define new my_new -#endif //macro for helping to force inclusion of chunks when using libraries FORCE_CHUNK_INCLUDE_IMPLEMENT(bmpnames) @@ -24,9 +12,6 @@ FORCE_CHUNK_INCLUDE_IMPLEMENT(bmpnames) BMP_Name::BMP_Name (const char * fname, int const gbnc_version) : flags((BMPN_Flags)DEFAULT_BMPN_FLAGS), index(0), version_num (gbnc_version << BMPNAME_PARENT_VER_SHIFT), enum_id(0), priority (DEFAULT_BMPN_PRIORITY), transparency_colour_union(0) -#if cencon -, md5val(0) -#endif { filename = new char [strlen(fname)+1]; strcpy (filename, fname); @@ -34,9 +19,6 @@ BMP_Name::BMP_Name (const char * fname, int const gbnc_version) BMP_Name::BMP_Name (const char * fname) : flags((BMPN_Flags)DEFAULT_BMPN_FLAGS), index(0), version_num (0), enum_id(0), priority (DEFAULT_BMPN_PRIORITY), transparency_colour_union(0) -#if cencon -, md5val(0) -#endif { filename = new char [strlen(fname)+1]; strcpy (filename, fname); @@ -60,9 +42,6 @@ BMP_Name::BMP_Name (const BMP_Name & bn) enum_id = bn.enum_id; priority = bn.priority; transparency_colour_union = bn.transparency_colour_union; - #if cencon - md5val = bn.md5val; - #endif } void BMP_Name::Validate(void) @@ -88,13 +67,8 @@ const BMP_Name & BMP_Name::operator=(const BMP_Name & bn) enum_id = bn.enum_id; priority = bn.priority; transparency_colour_union = bn.transparency_colour_union; - #if cencon - md5val = bn.md5val; - #endif return(*this); - - } |