mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8114) Allocate struct GRFText in the C++ way

release/0.6
tron 2007-01-14 08:37:16 +00:00
parent 7eca68cfe9
commit 2fa5337474
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/newgrf_text.cpp
View File

@ -131,11 +131,29 @@ const iso_grf iso_codes[] = {
* Each of those elements represent the string, * Each of those elements represent the string,
* but according to a different lang. * but according to a different lang.
*/ */
typedef struct GRFText { struct GRFText {
struct GRFText *next; public:
byte langid; static GRFText* New(byte langid, const char* text)
char text[VARARRAY_SIZE]; {
} GRFText; return new(strlen(text) + 1) GRFText(langid, text);
}
private:
GRFText(byte langid_, const char* text_) : next(NULL), langid(langid_)
{
strcpy(text, text_);
}
void* operator new(size_t size, size_t extra)
{
return ::operator new(size + extra);
}
public:
GRFText *next;
byte langid;
char text[VARARRAY_SIZE];
};
/** /**
@ -265,7 +283,6 @@ char *TranslateTTDPatchCodes(const char *str)
StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool new_scheme, const char *text_to_add, StringID def_string) StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool new_scheme, const char *text_to_add, StringID def_string)
{ {
char *translatedtext; char *translatedtext;
GRFText *newtext;
uint id; uint id;
/* When working with the old language scheme (grf_version is less than 7) and /* When working with the old language scheme (grf_version is less than 7) and
@ -297,10 +314,7 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne
translatedtext = TranslateTTDPatchCodes(text_to_add); translatedtext = TranslateTTDPatchCodes(text_to_add);
newtext = (GRFText*)malloc(sizeof(*newtext) + strlen(translatedtext) + 1); GRFText *newtext = GRFText::New(langid_to_add, translatedtext);
newtext->next = NULL;
newtext->langid = langid_to_add;
strcpy(newtext->text, translatedtext);
free(translatedtext); free(translatedtext);
@ -321,7 +335,7 @@ StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid_to_add, bool ne
if (text->langid != langid_to_add) continue; if (text->langid != langid_to_add) continue;
newtext->next = text->next; newtext->next = text->next;
*ptext = newtext; *ptext = newtext;
free(text); delete text;
replaced = true; replaced = true;
break; break;
} }
@ -426,7 +440,7 @@ void CleanUpStrings(void)
GRFText *grftext = _grf_text[id].textholder; GRFText *grftext = _grf_text[id].textholder;
while (grftext != NULL) { while (grftext != NULL) {
GRFText *grftext2 = grftext->next; GRFText *grftext2 = grftext->next;
free(grftext); delete grftext;
grftext = grftext2; grftext = grftext2;
} }
_grf_text[id].grfid = 0; _grf_text[id].grfid = 0;