teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-18 23:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

long -> int

Browse source
This commit is contained in:
nukeykt 2019-09-24 11:22:16 +09:00 committed by Christoph Oelckers
parent 216ce4da9b
commit 402d9b8f02
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/blood/src/actor.cpp
View file

@ -7820,7 +7820,7 @@ void debrisMove(int listIndex) {
switch (warp) { switch (warp) {
case kMarkerUpWater: case kMarkerUpWater:
case kMarkerUpGoo: 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)); sfxPlay3DSoundCP(pSprite, 720, -1, 0, pitch, 75 - Random(40));
if (sector[pSprite->sectnum].extra < 0 || !xsector[sector[pSprite->sectnum].extra].Underwater) if (sector[pSprite->sectnum].extra < 0 || !xsector[sector[pSprite->sectnum].extra].Underwater)

2
source/blood/src/db.cpp
View file

@ -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); IOBuffer1.Write(&nCRC, 4);
int nHandle = Bopen(sMapExt, BO_BINARY|BO_TRUNC|BO_CREAT|BO_WRONLY, BS_IREAD|BS_IWRITE); int nHandle = Bopen(sMapExt, BO_BINARY|BO_TRUNC|BO_CREAT|BO_WRONLY, BS_IREAD|BS_IWRITE);
if (nHandle == -1) if (nHandle == -1)

4
source/blood/src/triggers.cpp
View file

@ -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: 2 = force swap min and max if goal value was reached - */
/* - hitag: 3 = force reset counter - */ /* - hitag: 3 = force reset counter - */
long data = getDataFieldOfObject(type, nDest, pXSource->data1); int data = getDataFieldOfObject(type, nDest, pXSource->data1);
if (data == -65535) return; if (data == -65535) return;
if (pXSource->data2 < pXSource->data3) { if (pXSource->data2 < pXSource->data3) {
@ -4511,7 +4511,7 @@ void UniMissileTrapSeqCallback(int, int nXSprite)
// add velocity controlling // add velocity controlling
if (pXSprite->data2 > 0) { if (pXSprite->data2 > 0) {
long velocity = pXSprite->data2 << 12; int velocity = pXSprite->data2 << 12;
xvel[pMissile->xvel] = mulscale(velocity, dx, 14); xvel[pMissile->xvel] = mulscale(velocity, dx, 14);
yvel[pMissile->xvel] = mulscale(velocity, dy, 14); yvel[pMissile->xvel] = mulscale(velocity, dy, 14);
zvel[pMissile->xvel] = mulscale(velocity, dz, 14); zvel[pMissile->xvel] = mulscale(velocity, dz, 14);