From 402d9b8f023baa1ac655c75d9f97a043b29d810f Mon Sep 17 00:00:00 2001 From: nukeykt Date: Tue, 24 Sep 2019 11:22:16 +0900 Subject: [PATCH] long -> int --- source/blood/src/actor.cpp | 2 +- source/blood/src/db.cpp | 2 +- source/blood/src/triggers.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp index dfbd9b580..b05ad5773 100644 --- a/source/blood/src/actor.cpp +++ b/source/blood/src/actor.cpp @@ -7820,7 +7820,7 @@ void debrisMove(int listIndex) { switch (warp) { case kMarkerUpWater: case kMarkerUpGoo: - long pitch = (150000 - (gSpriteMass[pSprite->extra].mass << 9)) + Random3(8192); + int pitch = (150000 - (gSpriteMass[pSprite->extra].mass << 9)) + Random3(8192); sfxPlay3DSoundCP(pSprite, 720, -1, 0, pitch, 75 - Random(40)); if (sector[pSprite->sectnum].extra < 0 || !xsector[sector[pSprite->sectnum].extra].Underwater) diff --git a/source/blood/src/db.cpp b/source/blood/src/db.cpp index fd36ecebd..efbbe90d9 100644 --- a/source/blood/src/db.cpp +++ b/source/blood/src/db.cpp @@ -1622,7 +1622,7 @@ int dbSaveMap(const char *pPath, int nX, int nY, int nZ, short nAngle, short nSe } } } - unsigned long nCRC = Bcrc32(pData, nSize-4, 0); + unsigned int nCRC = Bcrc32(pData, nSize-4, 0); IOBuffer1.Write(&nCRC, 4); int nHandle = Bopen(sMapExt, BO_BINARY|BO_TRUNC|BO_CREAT|BO_WRONLY, BS_IREAD|BS_IWRITE); if (nHandle == -1) diff --git a/source/blood/src/triggers.cpp b/source/blood/src/triggers.cpp index b2b9a20de..ba8add1a6 100644 --- a/source/blood/src/triggers.cpp +++ b/source/blood/src/triggers.cpp @@ -2885,7 +2885,7 @@ void pastePropertiesInObj(int type, int nDest, EVENT event) { /* - hitag: 2 = force swap min and max if goal value was reached - */ /* - hitag: 3 = force reset counter - */ - long data = getDataFieldOfObject(type, nDest, pXSource->data1); + int data = getDataFieldOfObject(type, nDest, pXSource->data1); if (data == -65535) return; if (pXSource->data2 < pXSource->data3) { @@ -4511,7 +4511,7 @@ void UniMissileTrapSeqCallback(int, int nXSprite) // add velocity controlling if (pXSprite->data2 > 0) { - long velocity = pXSprite->data2 << 12; + int velocity = pXSprite->data2 << 12; xvel[pMissile->xvel] = mulscale(velocity, dx, 14); yvel[pMissile->xvel] = mulscale(velocity, dy, 14); zvel[pMissile->xvel] = mulscale(velocity, dz, 14);