mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22630) -Cleanup: Remove SwitchToNormalRefStack() and SwitchToErrorRefStack().

This commit is contained in:
frosch 2011-07-03 14:33:17 +00:00
parent 2a55273291
commit 5ea8b07e05
2 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/newgrf_text.cpp
View File

@ -920,11 +920,8 @@ struct TextRefStack {
void RewindStack() { this->position = 0; } void RewindStack() { this->position = 0; }
}; };
static TextRefStack _newgrf_normal_textrefstack;
static TextRefStack _newgrf_error_textrefstack;
/** The stack that is used for TTDP compatible string code parsing */ /** The stack that is used for TTDP compatible string code parsing */
static TextRefStack *_newgrf_textrefstack = &_newgrf_normal_textrefstack; static TextRefStack _newgrf_textrefstack;
/** /**
* Check whether the NewGRF text stack is in use. * Check whether the NewGRF text stack is in use.
@ -932,7 +929,7 @@ static TextRefStack *_newgrf_textrefstack = &_newgrf_normal_textrefstack;
*/ */
bool UsingNewGRFTextStack() bool UsingNewGRFTextStack()
{ {
return _newgrf_textrefstack->used; return _newgrf_textrefstack.used;
} }
/** /**
@ -941,7 +938,7 @@ bool UsingNewGRFTextStack()
*/ */
struct TextRefStack *CreateTextRefStackBackup() struct TextRefStack *CreateTextRefStackBackup()
{ {
return new TextRefStack(*_newgrf_textrefstack); return new TextRefStack(_newgrf_textrefstack);
} }
/** /**
@ -950,7 +947,7 @@ struct TextRefStack *CreateTextRefStackBackup()
*/ */
void RestoreTextRefStackBackup(struct TextRefStack *backup) void RestoreTextRefStackBackup(struct TextRefStack *backup)
{ {
*_newgrf_textrefstack = *backup; _newgrf_textrefstack = *backup;
delete backup; delete backup;
} }
@ -975,9 +972,9 @@ void StartTextRefStackUsage(byte numEntries, const uint32 *values)
{ {
extern TemporaryStorageArray<int32, 0x110> _temp_store; extern TemporaryStorageArray<int32, 0x110> _temp_store;
_newgrf_textrefstack->ResetStack(); _newgrf_textrefstack.ResetStack();
byte *p = _newgrf_textrefstack->stack; byte *p = _newgrf_textrefstack.stack;
for (uint i = 0; i < numEntries; i++) { for (uint i = 0; i < numEntries; i++) {
uint32 value = values != NULL ? values[i] : _temp_store.GetValue(0x100 + i); uint32 value = values != NULL ? values[i] : _temp_store.GetValue(0x100 + i);
for (uint j = 0; j < 32; j += 8) { for (uint j = 0; j < 32; j += 8) {
@ -990,22 +987,12 @@ void StartTextRefStackUsage(byte numEntries, const uint32 *values)
/** Stop using the TTDP compatible string code parsing */ /** Stop using the TTDP compatible string code parsing */
void StopTextRefStackUsage() void StopTextRefStackUsage()
{ {
_newgrf_textrefstack->used = false; _newgrf_textrefstack.used = false;
}
void SwitchToNormalRefStack()
{
_newgrf_textrefstack = &_newgrf_normal_textrefstack;
}
void SwitchToErrorRefStack()
{
_newgrf_textrefstack = &_newgrf_error_textrefstack;
} }
void RewindTextRefStack() void RewindTextRefStack()
{ {
_newgrf_textrefstack->RewindStack(); _newgrf_textrefstack.RewindStack();
} }
/** /**
@ -1018,38 +1005,38 @@ void RewindTextRefStack()
*/ */
uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const char **str, int64 *argv) uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const char **str, int64 *argv)
{ {
if (_newgrf_textrefstack->used) { if (_newgrf_textrefstack.used) {
switch (scc) { switch (scc) {
default: NOT_REACHED(); default: NOT_REACHED();
case SCC_NEWGRF_PRINT_SIGNED_BYTE: *argv = _newgrf_textrefstack->PopSignedByte(); break; case SCC_NEWGRF_PRINT_SIGNED_BYTE: *argv = _newgrf_textrefstack.PopSignedByte(); break;
case SCC_NEWGRF_PRINT_SIGNED_WORD: *argv = _newgrf_textrefstack->PopSignedWord(); break; case SCC_NEWGRF_PRINT_SIGNED_WORD: *argv = _newgrf_textrefstack.PopSignedWord(); break;
case SCC_NEWGRF_PRINT_QWORD_CURRENCY: *argv = _newgrf_textrefstack->PopUnsignedQWord(); break; case SCC_NEWGRF_PRINT_QWORD_CURRENCY: *argv = _newgrf_textrefstack.PopUnsignedQWord(); break;
case SCC_NEWGRF_PRINT_DWORD_CURRENCY: case SCC_NEWGRF_PRINT_DWORD_CURRENCY:
case SCC_NEWGRF_PRINT_DWORD: *argv = _newgrf_textrefstack->PopSignedDWord(); break; case SCC_NEWGRF_PRINT_DWORD: *argv = _newgrf_textrefstack.PopSignedDWord(); break;
case SCC_NEWGRF_PRINT_HEX_BYTE: *argv = _newgrf_textrefstack->PopUnsignedByte(); break; case SCC_NEWGRF_PRINT_HEX_BYTE: *argv = _newgrf_textrefstack.PopUnsignedByte(); break;
case SCC_NEWGRF_PRINT_HEX_DWORD: *argv = _newgrf_textrefstack->PopUnsignedDWord(); break; case SCC_NEWGRF_PRINT_HEX_DWORD: *argv = _newgrf_textrefstack.PopUnsignedDWord(); break;
case SCC_NEWGRF_PRINT_HEX_QWORD: *argv = _newgrf_textrefstack->PopSignedQWord(); break; case SCC_NEWGRF_PRINT_HEX_QWORD: *argv = _newgrf_textrefstack.PopSignedQWord(); break;
case SCC_NEWGRF_PRINT_HEX_WORD: case SCC_NEWGRF_PRINT_HEX_WORD:
case SCC_NEWGRF_PRINT_WORD_SPEED: case SCC_NEWGRF_PRINT_WORD_SPEED:
case SCC_NEWGRF_PRINT_WORD_VOLUME: case SCC_NEWGRF_PRINT_WORD_VOLUME:
case SCC_NEWGRF_PRINT_WORD_WEIGHT: case SCC_NEWGRF_PRINT_WORD_WEIGHT:
case SCC_NEWGRF_PRINT_WORD_STATION_NAME: case SCC_NEWGRF_PRINT_WORD_STATION_NAME:
case SCC_NEWGRF_PRINT_UNSIGNED_WORD: *argv = _newgrf_textrefstack->PopUnsignedWord(); break; case SCC_NEWGRF_PRINT_UNSIGNED_WORD: *argv = _newgrf_textrefstack.PopUnsignedWord(); break;
case SCC_NEWGRF_PRINT_DATE: case SCC_NEWGRF_PRINT_DATE:
case SCC_NEWGRF_PRINT_MONTH_YEAR: *argv = _newgrf_textrefstack->PopSignedWord() + DAYS_TILL_ORIGINAL_BASE_YEAR; break; case SCC_NEWGRF_PRINT_MONTH_YEAR: *argv = _newgrf_textrefstack.PopSignedWord() + DAYS_TILL_ORIGINAL_BASE_YEAR; break;
case SCC_NEWGRF_DISCARD_WORD: _newgrf_textrefstack->PopUnsignedWord(); break; case SCC_NEWGRF_DISCARD_WORD: _newgrf_textrefstack.PopUnsignedWord(); break;
case SCC_NEWGRF_ROTATE_TOP_4_WORDS: _newgrf_textrefstack->RotateTop4Words(); break; case SCC_NEWGRF_ROTATE_TOP_4_WORDS: _newgrf_textrefstack.RotateTop4Words(); break;
case SCC_NEWGRF_PUSH_WORD: _newgrf_textrefstack->PushWord(Utf8Consume(str)); break; case SCC_NEWGRF_PUSH_WORD: _newgrf_textrefstack.PushWord(Utf8Consume(str)); break;
case SCC_NEWGRF_UNPRINT: *buff = max(*buff - Utf8Consume(str), buf_start); break; case SCC_NEWGRF_UNPRINT: *buff = max(*buff - Utf8Consume(str), buf_start); break;
case SCC_NEWGRF_PRINT_STRING_ID: case SCC_NEWGRF_PRINT_STRING_ID:
*argv = TTDPStringIDToOTTDStringIDMapping(_newgrf_textrefstack->PopUnsignedWord()); *argv = TTDPStringIDToOTTDStringIDMapping(_newgrf_textrefstack.PopUnsignedWord());
break; break;
} }
} }

2
src/newgrf_text.h
View File

@ -36,8 +36,6 @@ bool CheckGrfLangID(byte lang_id, byte grf_version);
void StartTextRefStackUsage(byte numEntries, const uint32 *values = NULL); void StartTextRefStackUsage(byte numEntries, const uint32 *values = NULL);
void StopTextRefStackUsage(); void StopTextRefStackUsage();
void SwitchToNormalRefStack();
void SwitchToErrorRefStack();
void RewindTextRefStack(); void RewindTextRefStack();
bool UsingNewGRFTextStack(); bool UsingNewGRFTextStack();
struct TextRefStack *CreateTextRefStackBackup(); struct TextRefStack *CreateTextRefStackBackup();