From 28182ca5e37456f211a6068fcb54650c49053b66 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 1 May 2021 22:51:19 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Fix=20a=20couple=20more=20compil?= =?UTF-8?q?ation=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/dead.cpp | 2 +- Source/towners.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/dead.cpp b/Source/dead.cpp index 047b56afb..919e8e7a7 100644 --- a/Source/dead.cpp +++ b/Source/dead.cpp @@ -65,7 +65,7 @@ void InitDead() } } - assert(nd <= MaxDead); + assert(static_cast(nd) <= MaxDead); } void AddDead(Point tilePosition, int8_t dv, direction ddir) diff --git a/Source/towners.cpp b/Source/towners.cpp index bde6d3bd7..dbbdd19aa 100644 --- a/Source/towners.cpp +++ b/Source/towners.cpp @@ -204,7 +204,6 @@ void NewTownerAnim(int tnum, BYTE *pAnim, uint8_t numFrames, int Delay) void InitTownerInfo(int i, int w, bool sel, _talker_id t, int x, int y, int ao) { - memset(&towners[i], 0, sizeof(TownerStruct)); towners[i]._tSelFlag = sel; towners[i]._tAnimWidth = w; towners[i]._tMsgSaid = false;