summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-08-26 14:39:05 +0000
committerDarkvater <darkvater@openttd.org>2006-08-26 14:39:05 +0000
commit0babca183e09ac79165ef06caca286974ec6f8b1 (patch)
tree8f82242ae1a94e83e8758db0b2ce4b76cd80a282
parent5eb6d9202c867f8418ff2f09040827af23045f0c (diff)
downloadopenttd-0babca183e09ac79165ef06caca286974ec6f8b1.tar.xz
(svn r6139) -Codechange: strings are StringID. This should be changed in strings.h as well, but you would need to include openttd.h and that opens a whole new can of worms.
-rw-r--r--strings.c2
-rw-r--r--strings.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/strings.c b/strings.c
index d57d70129..92cfa2d6f 100644
--- a/strings.c
+++ b/strings.c
@@ -168,7 +168,7 @@ static const char *GetStringPtr(StringID string)
// These 8 bits will only be set when FormatString wants to print
// the string in a different case. No one else except FormatString
// should set those bits.
-char *GetStringWithArgs(char *buffr, uint string, const int32 *argv)
+char *GetStringWithArgs(char *buffr, StringID string, const int32 *argv)
{
uint index = GB(string, 0, 11);
uint tab = GB(string, 11, 5);
diff --git a/strings.h b/strings.h
index f984bd480..063d5a365 100644
--- a/strings.h
+++ b/strings.h
@@ -12,7 +12,7 @@ static inline char* InlineString(char* buf, uint16 string)
}
char *GetString(char *buffr, uint16 string);
-char *GetStringWithArgs(char *buffr, uint string, const int32 *argv);
+char *GetStringWithArgs(char *buffr, uint16 string, const int32 *argv);
extern char _userstring[128];