From 395a5d9991b500c681ff384f8d3b4e153e687abb Mon Sep 17 00:00:00 2001 From: cirdan Date: Sat, 8 Dec 2012 19:21:55 +0100 Subject: Cleanup: Remove unused ChunkType flag CH_AUTO_LENGTH CH_AUTO_LENGTH is no longer used anywhere, so remove all code that depends on it. --- src/saveload/saveload.cpp | 32 -------------------------------- src/saveload/saveload.h | 1 - 2 files changed, 33 deletions(-) diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 4f3b7e991..3471a8295 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -1753,32 +1753,6 @@ static void SlLoadCheckChunk(const ChunkHandler *ch) } } -/** - * Stub Chunk handlers to only calculate length and do nothing else. - * The intended chunk handler that should be called. - */ -static ChunkSaveLoadProc *_stub_save_proc; - -/** - * Stub Chunk handlers to only calculate length and do nothing else. - * Actually call the intended chunk handler. - * @param arg ignored parameter. - */ -static inline void SlStubSaveProc2(void *arg) -{ - _stub_save_proc(); -} - -/** - * Stub Chunk handlers to only calculate length and do nothing else. - * Call SlAutoLenth with our stub save proc that will eventually - * call the intended chunk handler. - */ -static void SlStubSaveProc() -{ - SlAutolength(SlStubSaveProc2, nullptr); -} - /** * Save a chunk of data (eg. vehicles, stations, etc.). Each chunk is * prefixed by an ID identifying it, followed by data, and terminator where appropriate @@ -1794,12 +1768,6 @@ static void SlSaveChunk(const ChunkHandler *ch) SlWriteUint32(ch->id); DEBUG(sl, 2, "Saving chunk %c%c%c%c", ch->id >> 24, ch->id >> 16, ch->id >> 8, ch->id); - if (ch->flags & CH_AUTO_LENGTH) { - /* Need to calculate the length. Solve that by calling SlAutoLength in the save_proc. */ - _stub_save_proc = proc; - proc = SlStubSaveProc; - } - _sl.block_mode = ch->flags & CH_TYPE_MASK; switch (ch->flags & CH_TYPE_MASK) { case CH_RIFF: diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 58a291932..a153b3630 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -409,7 +409,6 @@ enum ChunkType { CH_SPARSE_ARRAY = 2, CH_TYPE_MASK = 3, CH_LAST = 8, ///< Last chunk in this array. - CH_AUTO_LENGTH = 16, }; /** -- cgit v1.2.3-54-g00ecf