summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2004-12-13 11:17:59 +0000
committertruelight <truelight@openttd.org>2004-12-13 11:17:59 +0000
commitf80094deb729fc889003a33420ad4b6bb09444e3 (patch)
tree84030d93a9644ce45726ffbc7b8805d77d3cfc7a
parentc0603e476872ce76838d81f46c2e75e6636d1e65 (diff)
downloadopenttd-f80094deb729fc889003a33420ad4b6bb09444e3.tar.xz
(svn r1045) -Fix: OpenTTD compiles again under VC6 (sign_de)
-rw-r--r--functions.h2
-rw-r--r--gfx.c2
-rw-r--r--md5.c1
-rw-r--r--network.c2
-rw-r--r--network_data.h2
5 files changed, 5 insertions, 4 deletions
diff --git a/functions.h b/functions.h
index 7c35d7a53..54595290d 100644
--- a/functions.h
+++ b/functions.h
@@ -134,7 +134,7 @@ void DrawTextEffects(DrawPixelInfo *dpi);
void InitTextMessage();
void DrawTextMessage();
-void AddTextMessage(uint16 color, uint8 duration, const char *message, ...);
+void CDECL AddTextMessage(uint16 color, uint8 duration, const char *message, ...);
void UndrawTextMessage();
void TextMessageDailyLoop();
diff --git a/gfx.c b/gfx.c
index 821c08278..58376e22a 100644
--- a/gfx.c
+++ b/gfx.c
@@ -1510,7 +1510,7 @@ void DoPaletteAnimations()
int j;
int i;
const ExtraPaletteValues *ev = &_extra_palette_values;
- byte old_val[c*3];
+ byte old_val[114]; // max(c*(38:28)) = 114
d = _cur_palette + 217*3;
memcpy(old_val, d, c*3);
diff --git a/md5.c b/md5.c
index c35d96c5e..59fe5e7cf 100644
--- a/md5.c
+++ b/md5.c
@@ -53,6 +53,7 @@
#include "md5.h"
#include <string.h>
+#include "stdafx.h"
#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
#ifdef ARCH_IS_BIG_ENDIAN
diff --git a/network.c b/network.c
index b9fef269d..ddab48f2c 100644
--- a/network.c
+++ b/network.c
@@ -61,7 +61,7 @@ void NetworkGetClientName(char *client_name, size_t size, ClientState *cs)
// This puts a text-message to the console, or in the future, the chat-box,
// (to keep it all a bit more general)
-void NetworkTextMessage(NetworkAction action, uint16 color, const char *name, const char *str, ...)
+void CDECL NetworkTextMessage(NetworkAction action, uint16 color, const char *name, const char *str, ...)
{
char buf[1024];
va_list va;
diff --git a/network_data.h b/network_data.h
index 424cd6241..bd05673f3 100644
--- a/network_data.h
+++ b/network_data.h
@@ -210,7 +210,7 @@ void NetworkAddCommandQueue(ClientState *cs, CommandPacket *cp);
// from network.c
void CloseClient(ClientState *cs);
-void NetworkTextMessage(NetworkAction action, uint16 color, const char *name, const char *str, ...);
+void CDECL NetworkTextMessage(NetworkAction action, uint16 color, const char *name, const char *str, ...);
void NetworkGetClientName(char *clientname, size_t size, ClientState *cs);
uint NetworkCalculateLag(const ClientState *cs);
byte NetworkGetCurrentLanguageIndex();