summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--projects/openttd_vs100.vcxproj1
-rw-r--r--projects/openttd_vs100.vcxproj.filters3
-rw-r--r--projects/openttd_vs80.vcproj4
-rw-r--r--projects/openttd_vs90.vcproj4
-rw-r--r--source.list1
-rw-r--r--src/aircraft_cmd.cpp22
-rw-r--r--src/misc/crc32.hpp75
-rw-r--r--src/music_gui.cpp7
-rw-r--r--src/newgrf.cpp16
-rw-r--r--src/pathfinder/npf/npf.cpp9
-rw-r--r--src/tgp.cpp28
11 files changed, 4 insertions, 166 deletions
diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index 190823fc5..c402cb851 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -1016,7 +1016,6 @@
<ClInclude Include="..\src\misc\blob.hpp" />
<ClCompile Include="..\src\misc\countedobj.cpp" />
<ClInclude Include="..\src\misc\countedptr.hpp" />
- <ClInclude Include="..\src\misc\crc32.hpp" />
<ClCompile Include="..\src\misc\dbg_helpers.cpp" />
<ClInclude Include="..\src\misc\dbg_helpers.h" />
<ClInclude Include="..\src\misc\fixedsizearray.hpp" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index da6bd7e99..5ec84b4ed 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -2251,9 +2251,6 @@
<ClInclude Include="..\src\misc\countedptr.hpp">
<Filter>Misc</Filter>
</ClInclude>
- <ClInclude Include="..\src\misc\crc32.hpp">
- <Filter>Misc</Filter>
- </ClInclude>
<ClCompile Include="..\src\misc\dbg_helpers.cpp">
<Filter>Misc</Filter>
</ClCompile>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 9dff3f882..48216df45 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -3408,10 +3408,6 @@
>
</File>
<File
- RelativePath=".\..\src\misc\crc32.hpp"
- >
- </File>
- <File
RelativePath=".\..\src\misc\dbg_helpers.cpp"
>
</File>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 482f9f788..adf3a41e9 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -3405,10 +3405,6 @@
>
</File>
<File
- RelativePath=".\..\src\misc\crc32.hpp"
- >
- </File>
- <File
RelativePath=".\..\src\misc\dbg_helpers.cpp"
>
</File>
diff --git a/source.list b/source.list
index 0b1a07ffc..e94a216d0 100644
--- a/source.list
+++ b/source.list
@@ -802,7 +802,6 @@ misc/binaryheap.hpp
misc/blob.hpp
misc/countedobj.cpp
misc/countedptr.hpp
-misc/crc32.hpp
misc/dbg_helpers.cpp
misc/dbg_helpers.h
misc/fixedsizearray.hpp
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 7ec87742f..b778dc620 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -141,28 +141,6 @@ static StationID FindNearestHangar(const Aircraft *v)
return index;
}
-#if 0
-/**
- * Check if given vehicle has a goto hangar in his orders
- * @param v vehicle to inquiry
- * @return true if vehicle v has an airport in the schedule, that has a hangar
- */
-static bool HaveHangarInOrderList(Aircraft *v)
-{
- const Order *order;
-
- FOR_VEHICLE_ORDERS(v, order) {
- const Station *st = Station::Get(order->station);
- if (st->owner == v->owner && (st->facilities & FACIL_AIRPORT)) {
- /* If an airport doesn't have a hangar, skip it */
- if (st->Airport()->nof_depots != 0) return true;
- }
- }
-
- return false;
-}
-#endif
-
SpriteID Aircraft::GetImage(Direction direction) const
{
uint8 spritenum = this->spritenum;
diff --git a/src/misc/crc32.hpp b/src/misc/crc32.hpp
deleted file mode 100644
index a4b0eefc4..000000000
--- a/src/misc/crc32.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/* $Id$ */
-
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file crc32.hpp Cyclic reduncancy check support. */
-
-#ifndef CRC32_HPP
-#define CRC32_HPP
-
-#if 0 /* reenable when needed */
-struct CCrc32
-{
- static uint32 Calc(const void *pBuffer, int nCount)
- {
- uint32 crc = 0xffffffff;
- const uint32 *pTable = CrcTable();
-
- uint8 *begin = (uint8*)pBuffer;
- uint8 *end = begin + nCount;
- for (uint8 *cur = begin; cur < end; cur++) {
- crc = (crc >> 8) ^ pTable[cur[0] ^ (uint8)(crc & 0xff)];
- }
- crc ^= 0xffffffff;
-
- return crc;
- }
-
- static const uint32 *CrcTable()
- {
- static const uint32 Table[256] =
- {
- 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
- 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
- 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
- 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
- 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
- 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
- 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
- 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
- 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
- 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
- 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
- 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
- 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
- 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
- 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
- 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
- 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
- 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
- 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
- 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
- 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
- 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
- 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
- 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
- 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
- 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
- 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
- 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
- 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
- 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
- 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
- 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
- };
- return Table;
- }
-};
-#endif /* 0 */
-
-#endif /* CRC32_HPP */
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index e215a121e..45d03b0d5 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -717,13 +717,6 @@ struct MusicWindow : public Window {
break;
}
}
-
-#if 0
- virtual void OnTick()
- {
- this->SetWidgetDirty(MW_GAUGE);
- }
-#endif
};
static const NWidgetPart _nested_music_window_widgets[] = {
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 54506a07d..94e3f1347 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -4317,22 +4317,6 @@ static void FeatureNewName(ByteReader *buf)
break;
}
break;
-
-#if 0
- case GSF_CANALS:
- case GSF_BRIDGES:
- AddGRFString(_cur_spriteid, id, lang, name);
- switch (GB(id, 8, 8)) {
- case 0xC9: // House name
- default:
- grfmsg(7, "FeatureNewName: Unsupported ID (0x%04X)", id);
- }
- break;
-
- default :
- grfmsg(7, "FeatureNewName: Unsupported feature (0x%02X)", feature);
- break;
-#endif
}
}
}
diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp
index 851163ac6..f03b2d9af 100644
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@ -124,15 +124,6 @@ static uint NPFDistanceTrack(TileIndex t0, TileIndex t1)
return diagTracks * NPF_TILE_LENGTH + straightTracks * NPF_TILE_LENGTH * STRAIGHT_TRACK_LENGTH;
}
-
-#if 0
-static uint NTPHash(uint key1, uint key2)
-{
- /* This function uses the old hash, which is fixed on 10 bits (1024 buckets) */
- return PATHFIND_HASH_TILE(key1);
-}
-#endif
-
/**
* Calculates a hash value for use in the NPF.
* @param key1 The TileIndex of the tile to hash
diff --git a/src/tgp.cpp b/src/tgp.cpp
index 691765304..368fd3af0 100644
--- a/src/tgp.cpp
+++ b/src/tgp.cpp
@@ -890,26 +890,6 @@ static double int_noise(const long x, const long y, const int prime)
/**
- * Hj. Malthaner's routine included 2 different noise smoothing methods.
- * We now use the "raw" int_noise one.
- * However, it may be useful to move to the other routine in future.
- * So it is included too.
- */
-static double smoothed_noise(const int x, const int y, const int prime)
-{
-#if 0
- /* A hilly world (four corner smooth) */
- const double sides = int_noise(x - 1, y) + int_noise(x + 1, y) + int_noise(x, y - 1) + int_noise(x, y + 1);
- const double center = int_noise(x, y);
- return (sides + sides + center * 4) / 8.0;
-#endif
-
- /* This gives very hilly world */
- return int_noise(x, y, prime);
-}
-
-
-/**
* This routine determines the interpolated value between a and b
*/
static inline double linear_interpolate(const double a, const double b, const double x)
@@ -930,10 +910,10 @@ static double interpolated_noise(const double x, const double y, const int prime
const double fractional_X = x - (double)integer_X;
const double fractional_Y = y - (double)integer_Y;
- const double v1 = smoothed_noise(integer_X, integer_Y, prime);
- const double v2 = smoothed_noise(integer_X + 1, integer_Y, prime);
- const double v3 = smoothed_noise(integer_X, integer_Y + 1, prime);
- const double v4 = smoothed_noise(integer_X + 1, integer_Y + 1, prime);
+ const double v1 = int_noise(integer_X, integer_Y, prime);
+ const double v2 = int_noise(integer_X + 1, integer_Y, prime);
+ const double v3 = int_noise(integer_X, integer_Y + 1, prime);
+ const double v4 = int_noise(integer_X + 1, integer_Y + 1, prime);
const double i1 = linear_interpolate(v1, v2, fractional_X);
const double i2 = linear_interpolate(v3, v4, fractional_X);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-24 20:51:34 +0000