From 9f8c5d8fd268cc6007047025650951a546133ce1 Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 15 Nov 2005 09:05:16 +0000 Subject: (svn r3186) Unnecessary casts and truncation --- network_data.c | 2 +- openttd.c | 2 +- tree_cmd.c | 2 +- tunnelbridge_cmd.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/network_data.c b/network_data.c index 54604c3ed..827081a4e 100644 --- a/network_data.c +++ b/network_data.c @@ -42,7 +42,7 @@ Packet *NetworkSend_Init(PacketType type) void NetworkSend_uint8(Packet *packet, uint8 data) { assert(packet->size < sizeof(packet->buffer) - sizeof(data)); - packet->buffer[packet->size++] = data & 0xFF; + packet->buffer[packet->size++] = data; } void NetworkSend_uint16(Packet *packet, uint16 data) diff --git a/openttd.c b/openttd.c index 35f4eae8d..a8855c981 100644 --- a/openttd.c +++ b/openttd.c @@ -888,7 +888,7 @@ static void DoAutosave(void) SetDParam(0, p->name_1); SetDParam(1, p->name_2); SetDParam(2, _date); - s = (char*)GetString(buf + strlen(_path.autosave_dir) + strlen(PATHSEP), STR_4004); + s = GetString(buf + strlen(_path.autosave_dir) + strlen(PATHSEP), STR_4004); strcpy(s, ".sav"); } else { /* Save a maximum of 15 autosaves */ int n = _autosave_ctr; diff --git a/tree_cmd.c b/tree_cmd.c index 61d64d4c9..0356a2ab2 100644 --- a/tree_cmd.c +++ b/tree_cmd.c @@ -321,7 +321,7 @@ static void DrawTile_Trees(TileInfo *ti) i = (ti->map5 >> 6) + 1; do { - if (te[--i].image != 0 && (byte)(te[i].x + te[i].y) < min) { + if (te[--i].image != 0 && te[i].x + te[i].y < min) { min = te[i].x + te[i].y; tep = &te[i]; } diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index b37de5511..cb88c0bdd 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -1056,7 +1056,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti) AddSortableSpriteToDraw(image+1, ti->x + 15, ti->y + 15, 1, 1, 8, (byte)ti->z); // draw bridge? - } else if ((byte)ti->map5 & 0x80) { + } else if (ti->map5 & 0x80) { RailType rt; int base_offset; -- cgit v1.2.3-70-g09d2