From dcd730348444fc66f531121f30ce11ca6b428cbe Mon Sep 17 00:00:00 2001 From: OmniBlade Date: Tue, 25 Jun 2024 09:51:54 +0100 Subject: [PATCH] Cleanup more use of the "long" data type. This datatype varies in length between platforms so its use is not portable. --- common/blowfish.cpp | 4 ++-- common/combuf.cpp | 44 +++++++++++++++++------------------ common/delay.cpp | 2 +- common/iff.cpp | 6 ++--- common/keyframe.cpp | 16 ++++++------- common/rawfile.h | 2 +- common/wsa.cpp | 4 ++-- redalert/aircraft.cpp | 6 ++--- redalert/bullet.cpp | 2 +- redalert/conquer.cpp | 32 ++++++++++++------------- redalert/dllinterface.cpp | 32 ++++++++++++------------- redalert/foot.cpp | 2 +- redalert/function.h | 4 ++-- redalert/init.cpp | 4 ++-- redalert/jshell.cpp | 4 ++-- redalert/logic.cpp | 4 ++-- redalert/netdlg.cpp | 4 ++-- redalert/rawolapi.h | 6 ++--- redalert/unit.cpp | 6 ++--- redalert/vessel.cpp | 6 ++--- tiberiandawn/abstract.h | 2 +- tiberiandawn/aircraft.cpp | 6 ++--- tiberiandawn/aircraft.h | 2 +- tiberiandawn/debug.cpp | 4 ++-- tiberiandawn/dllinterface.cpp | 4 ++-- tiberiandawn/findpath.cpp | 2 +- tiberiandawn/foot.cpp | 4 ++-- tiberiandawn/function.h | 10 ++++---- tiberiandawn/iconset.cpp | 6 ++--- tiberiandawn/init.cpp | 4 ++-- tiberiandawn/jshell.cpp | 8 +++---- tiberiandawn/logic.cpp | 2 +- tiberiandawn/mapeddlg.cpp | 12 +++++----- tiberiandawn/mission.cpp | 2 +- tiberiandawn/netdlg.cpp | 2 +- tiberiandawn/object.cpp | 6 ++--- tiberiandawn/scenario.cpp | 4 ++-- tiberiandawn/techno.cpp | 4 ++-- tiberiandawn/tile.h | 2 +- tiberiandawn/trigger.cpp | 2 +- 40 files changed, 139 insertions(+), 139 deletions(-) diff --git a/common/blowfish.cpp b/common/blowfish.cpp index 77af26f7..8dc5f2a6 100644 --- a/common/blowfish.cpp +++ b/common/blowfish.cpp @@ -161,8 +161,8 @@ void BlowfishEngine::Submit_Key(void const* key, int length) ** the table data WHILE it is using the table data, the tables are ** thoroughly obfuscated by this process. */ - unsigned int left = 0x00000000L; - unsigned int right = 0x00000000L; + unsigned int left = 0x00000000; + unsigned int right = 0x00000000; unsigned int* p_en = &P_Encrypt[0]; // Encryption table. unsigned int* p_de = &P_Decrypt[ROUNDS + 1]; // Decryption table. for (int p_index = 0; p_index < ROUNDS + 2; p_index += 2) { diff --git a/common/combuf.cpp b/common/combuf.cpp index 57167d33..1a1c6e9d 100644 --- a/common/combuf.cpp +++ b/common/combuf.cpp @@ -184,13 +184,13 @@ void CommBufferClass::Init(void) //------------------------------------------------------------------------ // Init data members //------------------------------------------------------------------------ - SendTotal = 0L; - ReceiveTotal = 0L; + SendTotal = 0; + ReceiveTotal = 0; - DelaySum = 0L; - NumDelay = 0L; - MeanDelay = 0L; - MaxDelay = 0L; + DelaySum = 0; + NumDelay = 0; + MeanDelay = 0; + MaxDelay = 0; SendCount = 0; @@ -202,9 +202,9 @@ void CommBufferClass::Init(void) for (i = 0; i < MaxSend; i++) { SendQueue[i].IsActive = 0; SendQueue[i].IsACK = 0; - SendQueue[i].FirstTime = 0L; - SendQueue[i].LastTime = 0L; - SendQueue[i].SendCount = 0L; + SendQueue[i].FirstTime = 0; + SendQueue[i].LastTime = 0; + SendQueue[i].SendCount = 0; SendQueue[i].BufLen = 0; SendQueue[i].ExtraLen = 0; @@ -261,9 +261,9 @@ void CommBufferClass::Init_Send_Queue(void) for (i = 0; i < MaxSend; i++) { SendQueue[i].IsActive = 0; SendQueue[i].IsACK = 0; - SendQueue[i].FirstTime = 0L; - SendQueue[i].LastTime = 0L; - SendQueue[i].SendCount = 0L; + SendQueue[i].FirstTime = 0; + SendQueue[i].LastTime = 0; + SendQueue[i].SendCount = 0; SendQueue[i].BufLen = 0; SendQueue[i].ExtraLen = 0; @@ -319,9 +319,9 @@ int CommBufferClass::Queue_Send(void* buf, int buflen, void* extrabuf, int extra //------------------------------------------------------------------------ SendQueue[index].IsActive = 1; // entry is now active SendQueue[index].IsACK = 0; // entry hasn't been ACK'd - SendQueue[index].FirstTime = 0L; // filled in by Manager when sent - SendQueue[index].LastTime = 0L; // filled in by Manager when sent - SendQueue[index].SendCount = 0L; // filled in by Manager when sent + SendQueue[index].FirstTime = 0; // filled in by Manager when sent + SendQueue[index].LastTime = 0; // filled in by Manager when sent + SendQueue[index].SendCount = 0; // filled in by Manager when sent SendQueue[index].BufLen = buflen; // save buffer size //------------------------------------------------------------------------ @@ -409,9 +409,9 @@ int CommBufferClass::UnQueue_Send(void* buf, int* buflen, int index, void* extra //------------------------------------------------------------------------ SendQueue[SendIndex[index]].IsActive = 0; SendQueue[SendIndex[index]].IsACK = 0; - SendQueue[SendIndex[index]].FirstTime = 0L; - SendQueue[SendIndex[index]].LastTime = 0L; - SendQueue[SendIndex[index]].SendCount = 0L; + SendQueue[SendIndex[index]].FirstTime = 0; + SendQueue[SendIndex[index]].LastTime = 0; + SendQueue[SendIndex[index]].SendCount = 0; SendQueue[SendIndex[index]].BufLen = 0; SendQueue[SendIndex[index]].ExtraLen = 0; @@ -745,10 +745,10 @@ unsigned int CommBufferClass::Max_Response_Time(void) *=========================================================================*/ void CommBufferClass::Reset_Response_Time(void) { - DelaySum = 0L; - NumDelay = 0L; - MeanDelay = 0L; - MaxDelay = 0L; + DelaySum = 0; + NumDelay = 0; + MeanDelay = 0; + MaxDelay = 0; } /* end of Reset_Response_Time */ diff --git a/common/delay.cpp b/common/delay.cpp index 6a2b3592..e3942aa5 100644 --- a/common/delay.cpp +++ b/common/delay.cpp @@ -38,7 +38,7 @@ void Delay(int duration) TimerClass timer(BT_SYSTEM, true); while (duration--) { - count = timer.Time() + 1L; + count = timer.Time() + 1; while (count >= (unsigned)timer.Time()) { ; } diff --git a/common/iff.cpp b/common/iff.cpp index 8d04a6ec..5c9508a1 100644 --- a/common/iff.cpp +++ b/common/iff.cpp @@ -168,7 +168,7 @@ unsigned int Get_Iff_Chunk_Size(int fh, int id) /* Otherwise, go to the next chunk in the file */ - chunksize = (chunksize + 1) & 0xFFFFFFFEL; + chunksize = (chunksize + 1) & 0xFFFFFFFE; Seek_File(fh, chunksize, SEEK_CUR); } } @@ -228,7 +228,7 @@ unsigned int Read_Iff_Chunk(int fh, int id, void* buffer, unsigned int maxsize) maxsize = MIN(maxsize, chunksize); Read_File(fh, buffer, maxsize); // Read the buffer. - chunksize = (chunksize + 1) & 0xFFFFFFFEL; + chunksize = (chunksize + 1) & 0xFFFFFFFE; if (maxsize < chunksize) { Seek_File(fh, chunksize - maxsize, SEEK_CUR); } @@ -243,7 +243,7 @@ unsigned int Read_Iff_Chunk(int fh, int id, void* buffer, unsigned int maxsize) /* Otherwise, go to the next chunk in the file */ - chunksize = (chunksize + 1) & 0xFFFFFFFEL; + chunksize = (chunksize + 1) & 0xFFFFFFFE; Seek_File(fh, chunksize, SEEK_CUR); } } diff --git a/common/keyframe.cpp b/common/keyframe.cpp index c57f26e1..67b97b05 100644 --- a/common/keyframe.cpp +++ b/common/keyframe.cpp @@ -350,7 +350,7 @@ uintptr_t Build_Frame(void const* dataptr, unsigned short framenumber, void* buf ptr = (char*)Add_Long_To_Pointer(dataptr, (offset[0] & 0x00FFFFFFL)); if (keyfr.flags & 1) { - ptr = (char*)Add_Long_To_Pointer(ptr, 768L); + ptr = (char*)Add_Long_To_Pointer(ptr, 768); } length = LCW_Uncompress(ptr, buffptr, buffsize); } else { // key delta or delta @@ -366,19 +366,19 @@ uintptr_t Build_Frame(void const* dataptr, unsigned short framenumber, void* buf } // key frame - offcurr = offset[1] & 0x00FFFFFFL; + offcurr = offset[1] & 0x00FFFFFF; // key delta - offdiff = (offset[0] & 0x00FFFFFFL) - offcurr; + offdiff = (offset[0] & 0x00FFFFFF) - offcurr; ptr = (char*)Add_Long_To_Pointer(dataptr, offcurr); if (keyfr.flags & 1) { - ptr = (char*)Add_Long_To_Pointer(ptr, 768L); + ptr = (char*)Add_Long_To_Pointer(ptr, 768); } #ifndef FIXIT_SCORE_CRASH - off16 = (unsigned int)lockptr & 0x00003FFFL; + off16 = (unsigned int)lockptr & 0x00003FFF; #endif length = LCW_Uncompress(ptr, buffptr, buffsize); @@ -391,7 +391,7 @@ uintptr_t Build_Frame(void const* dataptr, unsigned short framenumber, void* buf if (((offset[2] & 0x00FFFFFFL) - offcurr) >= (0x00010000L - off16)) { ptr = (char*)Add_Long_To_Pointer(ptr, offdiff); - off16 = (unsigned int)ptr & 0x00003FFFL; + off16 = (unsigned int)ptr & 0x00003FFF; offcurr += offdiff; offdiff = 0; @@ -414,7 +414,7 @@ uintptr_t Build_Frame(void const* dataptr, unsigned short framenumber, void* buf if (((offset[subframe + 2] & 0x00FFFFFFL) - offcurr) >= (0x00010000L - off16)) { ptr = (char*)Add_Long_To_Pointer(ptr, offdiff); - off16 = (unsigned int)lockptr & 0x00003FFFL; + off16 = (unsigned int)lockptr & 0x00003FFF; offcurr += offdiff; offdiff = 0; @@ -637,7 +637,7 @@ bool Get_Build_Frame_Palette(void const* dataptr, void* palette) frames = le16toh(frames); if (flags & 1) { char const* ptr = (char const*)Add_Long_To_Pointer( - dataptr, ((((long)sizeof(unsigned long) << 1) * frames + 16 + sizeof(KeyFrameHeaderType)))); + dataptr, ((((int)sizeof(unsigned) << 1) * frames + 16 + sizeof(KeyFrameHeaderType)))); memcpy(palette, ptr, 768L); return (true); diff --git a/common/rawfile.h b/common/rawfile.h index 58993430..adfa7d4a 100644 --- a/common/rawfile.h +++ b/common/rawfile.h @@ -119,7 +119,7 @@ class RawFileClass : public FileClass */ int Transfer_Block_Size(void) { - return (int)((unsigned)UINT_MAX) - 16L; + return (int)((unsigned)UINT_MAX) - 16; }; int Raw_Seek(int pos, int dir = SEEK_CUR); diff --git a/common/wsa.cpp b/common/wsa.cpp index d124bfd1..dc31e29c 100644 --- a/common/wsa.cpp +++ b/common/wsa.cpp @@ -254,7 +254,7 @@ void* Open_Animation(char const* file_name, // Else size is zero. // if (user_flags & WSA_OPEN_DIRECT) { - target_buffer_size = 0L; + target_buffer_size = 0; } else { anim_flags |= WSA_TARGET_IN_BUFFER; target_buffer_size = (unsigned int)file_header.pixel_width * file_header.pixel_height; @@ -1079,7 +1079,7 @@ static unsigned int Get_File_Frame_Offset(int file_handle, int frame, int palett Seek_File(file_handle, (frame << 2) + WSA_FILE_HEADER_SIZE, SEEK_SET); if (Read_File(file_handle, (char*)&offset, sizeof(uint32_t)) != sizeof(uint32_t)) { - offset = 0L; + offset = 0; } offset = le32toh(offset); offset += palette_adjust; diff --git a/redalert/aircraft.cpp b/redalert/aircraft.cpp index deb2ec7d..ca4eb46d 100644 --- a/redalert/aircraft.cpp +++ b/redalert/aircraft.cpp @@ -644,7 +644,7 @@ void AircraftClass::Read_INI(CCINIClass& ini) if (token) { coord = Cell_Coord((CELL)atoi(token)); } else { - coord = 0xFFFFFFFFL; + coord = 0xFFFFFFFF; } token = strtok(NULL, ","); @@ -2921,7 +2921,7 @@ RadioMessageType AircraftClass::Receive_Message(RadioClass* from, RadioMessageTy if (cell == 0) { Transmit_Message(RADIO_OVER_OUT, from); } else { - param = (long)::As_Target(cell); + param = ::As_Target(cell); /* ** Tell the potential passenger where it should go. If the passenger is @@ -2929,7 +2929,7 @@ RadioMessageType AircraftClass::Receive_Message(RadioClass* from, RadioMessageTy ** directly. */ if (Transmit_Message(RADIO_MOVE_HERE, param, from) == RADIO_YEA_NOW_WHAT) { - param = (long)As_Target(); + param = As_Target(); Transmit_Message(RADIO_TETHER); if (Transmit_Message(RADIO_MOVE_HERE, param, from) != RADIO_ROGER) { Transmit_Message(RADIO_OVER_OUT, from); diff --git a/redalert/bullet.cpp b/redalert/bullet.cpp index b3264fed..9a600af6 100644 --- a/redalert/bullet.cpp +++ b/redalert/bullet.cpp @@ -533,7 +533,7 @@ int BulletClass::Shape_Number(void) const ** For tumbling projectiles, fetch offset stage. */ if (Class->Tumble > 0) { - shapenum += (long)Frame % Class->Tumble; + shapenum += Frame % Class->Tumble; } return (shapenum); diff --git a/redalert/conquer.cpp b/redalert/conquer.cpp index bbda852c..93d195a0 100644 --- a/redalert/conquer.cpp +++ b/redalert/conquer.cpp @@ -864,8 +864,8 @@ void Toggle_Formation(void) // MBL 03.23.2020: this has been copied to DLLExportClass::Team_Units_Formation_Toggle_On(), and modified as needed #ifndef REMASTER_BUILD int team = -1; - long minx = 0x7FFFFFFFL, miny = 0x7FFFFFFFL; - long maxx = 0, maxy = 0; + int minx = 0x7FFFFFFF, miny = 0x7FFFFFFF; + int maxx = 0, maxy = 0; int index; bool setform = 0; @@ -3540,8 +3540,8 @@ void Handle_Team(int team, int action) ** Create the team. */ case 2: { - long minx = 0x7FFFFFFFL, miny = 0x7FFFFFFFL; - long maxx = 0, maxy = 0; + int minx = 0x7FFFFFFF, miny = 0x7FFFFFFF; + int maxx = 0, maxy = 0; team_form_data.TeamSpeed[team] = SPEED_WHEEL; team_form_data.TeamMaxSpeed[team] = MPH_LIGHT_SPEED; for (index = 0; index < Units.Count(); index++) { @@ -3552,8 +3552,8 @@ void Handle_Team(int team, int action) if (obj->Is_Selected_By_Player()) { obj->Group = team; obj->Mark(MARK_CHANGE); - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); if (xc < minx) minx = xc; if (xc > maxx) @@ -3578,8 +3578,8 @@ void Handle_Team(int team, int action) if (obj->Is_Selected_By_Player()) { obj->Group = team; obj->Mark(MARK_CHANGE); - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); if (xc < minx) minx = xc; if (xc > maxx) @@ -3604,8 +3604,8 @@ void Handle_Team(int team, int action) if (obj->Is_Selected_By_Player()) { obj->Group = team; obj->Mark(MARK_CHANGE); - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); if (xc < minx) minx = xc; if (xc > maxx) @@ -3649,8 +3649,8 @@ void Handle_Team(int team, int action) #else #if (1) // Old always-north formation stuff - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); obj->XFormOffset = xc - centerx; obj->YFormOffset = yc - centery; @@ -3676,8 +3676,8 @@ void Handle_Team(int team, int action) #else #if (1) // Old always-north formation stuff - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); obj->XFormOffset = xc - centerx; obj->YFormOffset = yc - centery; @@ -4257,7 +4257,7 @@ bool Force_CD_Available(int cd) #endif #ifdef FRENCH - sprintf(buffer, "InsŠrez le %s", _cd_name[cd]); + sprintf(buffer, "Ins�rez le %s", _cd_name[cd]); #else #ifdef GERMAN sprintf(buffer, "Bitte %s", _cd_name[cd]); @@ -4268,7 +4268,7 @@ bool Force_CD_Available(int cd) } else { #ifdef DVD #ifdef FRENCH - sprintf(buffer, "InsŠrez le %s", _cd_name[4]); + sprintf(buffer, "Ins�rez le %s", _cd_name[4]); #else #ifdef GERMAN sprintf(buffer, "Bitte %s", _cd_name[4]); diff --git a/redalert/dllinterface.cpp b/redalert/dllinterface.cpp index 1ec7194d..b9ede1f8 100644 --- a/redalert/dllinterface.cpp +++ b/redalert/dllinterface.cpp @@ -6093,7 +6093,7 @@ bool DLLExportClass::Get_Shroud_State(uint64 player_id, unsigned char* buffer_in for (int y = 0; y < map_cell_height; y++) { for (int x = 0; x < map_cell_width; x++) { CELL cell = XY_Cell(map_cell_x + x, map_cell_y + y); - COORDINATE coord = Cell_Coord(cell) & 0xFF00FF00L; + COORDINATE coord = Cell_Coord(cell) & 0xFF00FF00; memory_needed += sizeof(CNCShroudEntryStruct); if (memory_needed >= buffer_size) { @@ -6434,7 +6434,7 @@ bool DLLExportClass::Get_Dynamic_Map_State(uint64 player_id, unsigned char* buff for (int y = 0; y < map_cell_height; y++) { for (int x = 0; x < map_cell_width; x++) { CELL cell = XY_Cell(map_cell_x + x, map_cell_y + y); - COORDINATE coord = Cell_Coord(cell) & 0xFF00FF00L; + COORDINATE coord = Cell_Coord(cell) & 0xFF00FF00; memory_needed += sizeof(CNCDynamicMapEntryStruct) * 2; if (memory_needed >= buffer_size) { @@ -7568,8 +7568,8 @@ void DLLExportClass::Team_Units_Formation_Toggle_On(uint64 player_id) // int team = MAX_TEAMS; - long minx = 0x7FFFFFFFL, miny = 0x7FFFFFFFL; - long maxx = 0, maxy = 0; + int minx = 0x7FFFFFFFL, miny = 0x7FFFFFFF; + int maxx = 0, maxy = 0; int index; bool setform = 0; @@ -7659,8 +7659,8 @@ void DLLExportClass::Team_Units_Formation_Toggle_On(uint64 player_id) if (obj && !obj->IsInLimbo && obj->House == PlayerPtr && obj->Group == team) { obj->Mark(MARK_CHANGE); if (setform) { - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); if (xc < minx) minx = xc; if (xc > maxx) @@ -7684,8 +7684,8 @@ void DLLExportClass::Team_Units_Formation_Toggle_On(uint64 player_id) if (obj && !obj->IsInLimbo && obj->House == PlayerPtr && obj->Group == team) { obj->Mark(MARK_CHANGE); if (setform) { - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); if (xc < minx) minx = xc; if (xc > maxx) @@ -7708,8 +7708,8 @@ void DLLExportClass::Team_Units_Formation_Toggle_On(uint64 player_id) if (obj && !obj->IsInLimbo && obj->House == PlayerPtr && obj->Group == team) { obj->Mark(MARK_CHANGE); if (setform) { - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); if (xc < minx) minx = xc; if (xc > maxx) @@ -7739,8 +7739,8 @@ void DLLExportClass::Team_Units_Formation_Toggle_On(uint64 player_id) for (index = 0; index < Units.Count(); index++) { UnitClass* obj = Units.Ptr(index); if (obj && !obj->IsInLimbo && obj->House == PlayerPtr && obj->Group == team) { - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); obj->XFormOffset = xc - centerx; obj->YFormOffset = yc - centery; @@ -7750,8 +7750,8 @@ void DLLExportClass::Team_Units_Formation_Toggle_On(uint64 player_id) for (index = 0; index < Infantry.Count(); index++) { InfantryClass* obj = Infantry.Ptr(index); if (obj && !obj->IsInLimbo && obj->House == PlayerPtr && obj->Group == team) { - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); obj->XFormOffset = xc - centerx; obj->YFormOffset = yc - centery; @@ -7761,8 +7761,8 @@ void DLLExportClass::Team_Units_Formation_Toggle_On(uint64 player_id) for (index = 0; index < Vessels.Count(); index++) { VesselClass* obj = Vessels.Ptr(index); if (obj && !obj->IsInLimbo && obj->House == PlayerPtr && obj->Group == team) { - long xc = Cell_X(Coord_Cell(obj->Center_Coord())); - long yc = Cell_Y(Coord_Cell(obj->Center_Coord())); + int xc = Cell_X(Coord_Cell(obj->Center_Coord())); + int yc = Cell_Y(Coord_Cell(obj->Center_Coord())); obj->XFormOffset = xc - centerx; obj->YFormOffset = yc - centery; diff --git a/redalert/foot.cpp b/redalert/foot.cpp index 25cbd243..f31f0d80 100644 --- a/redalert/foot.cpp +++ b/redalert/foot.cpp @@ -1706,7 +1706,7 @@ RadioMessageType FootClass::Receive_Message(RadioClass* from, RadioMessageType m ** then it doesn't need further movement instructions. */ case RADIO_NEED_TO_MOVE: - param = (long)NavCom; + param = NavCom; if (!Target_Legal(NavCom)) { return (RADIO_ROGER); } diff --git a/redalert/function.h b/redalert/function.h index 21ff2e94..6aad22a2 100644 --- a/redalert/function.h +++ b/redalert/function.h @@ -379,7 +379,7 @@ bool Read_Scenario_INI_Write_INB(char* root, bool fresh); ** INIT.CPP */ void Load_Title_Page(bool visible = false); -int Obfuscate(char const* string); +unsigned Obfuscate(char const* string); void Anim_Init(void); bool Init_Game(int argc, char* argv[]); bool Select_Game(bool fade = false); @@ -398,7 +398,7 @@ void* Conquer_Build_Fading_Table(PaletteClass const& palette, void* dest, int co void* Small_Icon(void const* iconptr, int iconnum); void Set_Window(int window, int x, int y, int w, int h); int Load_Uncompress(FileClass& file, BufferClass& uncomp_buff, BufferClass& dest_buff, void* reserved_data); -long Translucent_Table_Size(int count); +int Translucent_Table_Size(int count); void* Build_Translucent_Table(PaletteClass const& palette, TLucentType const* control, int count, void* buffer); void* Conquer_Build_Translucent_Table(PaletteClass const& palette, TLucentType const* control, int count, void* buffer); void* Make_Fading_Table(PaletteClass const& palette, void* dest, int color, int frac); diff --git a/redalert/init.cpp b/redalert/init.cpp index 558360c0..6ac406cf 100644 --- a/redalert/init.cpp +++ b/redalert/init.cpp @@ -1627,7 +1627,7 @@ bool Parse_Command_Line(int argc, char* argv[]) * HISTORY: * * 08/19/1995 JLB : Created. * *=============================================================================================*/ -int Obfuscate(char const* string) +unsigned Obfuscate(char const* string) { char buffer[1024]; @@ -2610,7 +2610,7 @@ static void Init_Authorization(void) #ifdef NEVER while (!ok && counter) { SmartPtr str = Fetch_Password(TXT_PASSWORD_CAPTION, TXT_PASSWORD_MESSAGE, TXT_OK); - SmartPtr lptr = &CheatCodes[0]; + SmartPtr lptr = &CheatCodes[0]; while (*lptr) { if (Obfuscate(str) == *lptr++) { ok = true; diff --git a/redalert/jshell.cpp b/redalert/jshell.cpp index 3bd4feef..f5d7582b 100644 --- a/redalert/jshell.cpp +++ b/redalert/jshell.cpp @@ -282,9 +282,9 @@ int Load_Picture(char const* filename, * HISTORY: * * 04/02/1994 JLB : Created. * *=============================================================================================*/ -long Translucent_Table_Size(int count) +int Translucent_Table_Size(int count) { - return (256L + (256L * count)); + return (256 + (256 * count)); } /*********************************************************************************************** diff --git a/redalert/logic.cpp b/redalert/logic.cpp index 321af94c..5def3407 100644 --- a/redalert/logic.cpp +++ b/redalert/logic.cpp @@ -76,7 +76,7 @@ void LogicClass::Debug_Dump(MonoClass* mono) const _framecounter++; mono->Set_Cursor(1, 1); - mono->Printf("%ld", (long)Scen.Timer); + mono->Printf("%d", (int)Scen.Timer); mono->Set_Cursor(10, 1); mono->Printf("%3d", FramesPerSecond); mono->Set_Cursor(1, 3); @@ -110,7 +110,7 @@ void LogicClass::Debug_Dump(MonoClass* mono) const mono->Set_Cursor(1, 22); mono->Printf("%3d", Factories.Count()); - SpareTicks = min((long)SpareTicks, (long)TIMER_SECOND); + SpareTicks = min(SpareTicks, TIMER_SECOND); /* ** CPU utilization record. diff --git a/redalert/netdlg.cpp b/redalert/netdlg.cpp index 715bc7b4..067e7169 100644 --- a/redalert/netdlg.cpp +++ b/redalert/netdlg.cpp @@ -3520,8 +3520,8 @@ static int Net_New_Dialog(void) int transmit; // 1 = re-transmit new game options - long ok_timer = 0; // for timing OK button - int index; // index for rejecting a player + int ok_timer = 0; // for timing OK button + int index; // index for rejecting a player int rc; int i, j; char* item; diff --git a/redalert/rawolapi.h b/redalert/rawolapi.h index b152420b..bc6c72bd 100644 --- a/redalert/rawolapi.h +++ b/redalert/rawolapi.h @@ -224,7 +224,7 @@ class RAChatEventSink : /////public CComObjectRoot, /////public IConnectionPoint void InsertUserSorted(User* pUserNew); private: - long m_cRef; // Reference Count + int m_cRef; // Reference Count }; //*********************************************************************************************** @@ -266,7 +266,7 @@ class RADownloadEventSink : bool bResumed; private: - long m_cRef; // Ref count + int m_cRef; // Ref count }; //*********************************************************************************************** @@ -305,7 +305,7 @@ class RANetUtilEventSink : WolapiObject* pOwner; // Link back to the object that contains me. private: - long m_cRef; // Reference Count + int m_cRef; // Reference Count }; //*********************************************************************************************** diff --git a/redalert/unit.cpp b/redalert/unit.cpp index 7af29f89..06762f51 100644 --- a/redalert/unit.cpp +++ b/redalert/unit.cpp @@ -825,7 +825,7 @@ RadioMessageType UnitClass::Receive_Message(RadioClass* from, RadioMessageType m if (cell == 0) { Transmit_Message(RADIO_OVER_OUT, from); } else { - param = (long)::As_Target(cell); + param = ::As_Target(cell); Do_Turn(dir); /* @@ -860,7 +860,7 @@ RadioMessageType UnitClass::Receive_Message(RadioClass* from, RadioMessageType m #else if (*this != UNIT_APC || Is_Door_Open()) { #endif - param = (long)As_Target(); + param = As_Target(); Transmit_Message(RADIO_TETHER); if (Transmit_Message(RADIO_MOVE_HERE, param, from) != RADIO_ROGER) { Transmit_Message(RADIO_OVER_OUT, from); @@ -5267,7 +5267,7 @@ void UnitClass::Shroud_Regen(void) if (IsActive && Strength) { // Now shroud around the new center - ShroudBits = 0L; + ShroudBits = 0; ShroudCenter = Coord_Cell(Center_Coord()); centerx = Cell_X(ShroudCenter); centery = Cell_Y(ShroudCenter); diff --git a/redalert/vessel.cpp b/redalert/vessel.cpp index 85df50eb..fa782eec 100644 --- a/redalert/vessel.cpp +++ b/redalert/vessel.cpp @@ -660,7 +660,7 @@ void VesselClass::AI(void) ** If not, then close the door. */ if (!Is_Door_Closed() && Mission != MISSION_UNLOAD && Transmit_Message(RADIO_TRYING_TO_LOAD) != RADIO_ROGER - && !(long)DoorShutCountDown) { + && !(int)DoorShutCountDown) { LST_Close_Door(); } } @@ -1518,7 +1518,7 @@ RadioMessageType VesselClass::Receive_Message(RadioClass* from, RadioMessageType if (cell == 0) { Transmit_Message(RADIO_OVER_OUT, from); } else { - param = (long)::As_Target(cell); + param = ::As_Target(cell); /* ** If it is now facing the correct direction, then open the @@ -1536,7 +1536,7 @@ RadioMessageType VesselClass::Receive_Message(RadioClass* from, RadioMessageType */ if (Transmit_Message(RADIO_MOVE_HERE, param, from) == RADIO_YEA_NOW_WHAT) { if (Is_Door_Open()) { - param = (long)As_Target(); + param = As_Target(); Transmit_Message(RADIO_TETHER); if (Transmit_Message(RADIO_MOVE_HERE, param, from) != RADIO_ROGER) { Transmit_Message(RADIO_OVER_OUT, from); diff --git a/tiberiandawn/abstract.h b/tiberiandawn/abstract.h index a9339f8e..6977d6c2 100644 --- a/tiberiandawn/abstract.h +++ b/tiberiandawn/abstract.h @@ -78,7 +78,7 @@ class AbstractClass */ AbstractClass(void) { - Coord = 0L; + Coord = 0; }; AbstractClass(NoInitClass const& x){}; virtual ~AbstractClass(void){}; diff --git a/tiberiandawn/aircraft.cpp b/tiberiandawn/aircraft.cpp index 7bd31304..e27af1c6 100644 --- a/tiberiandawn/aircraft.cpp +++ b/tiberiandawn/aircraft.cpp @@ -2654,7 +2654,7 @@ RadioMessageType AircraftClass::Receive_Message(RadioClass* from, RadioMessageTy if (cell == 0) { Transmit_Message(RADIO_OVER_OUT, from); } else { - param = (long)::As_Target(cell); + param = ::As_Target(cell); /* ** Tell the potential passenger where it should go. If the passenger is @@ -2662,7 +2662,7 @@ RadioMessageType AircraftClass::Receive_Message(RadioClass* from, RadioMessageTy ** directly. */ if (Transmit_Message(RADIO_MOVE_HERE, param, from) == RADIO_YEA_NOW_WHAT) { - param = (long)As_Target(); + param = As_Target(); Transmit_Message(RADIO_TETHER); if (Transmit_Message(RADIO_MOVE_HERE, param, from) != RADIO_ROGER) { Transmit_Message(RADIO_OVER_OUT, from); @@ -3558,7 +3558,7 @@ void AircraftClass::Response_Select(void) } } -void AircraftClass::Set_Reinforcement_Delay(long delay) +void AircraftClass::Set_Reinforcement_Delay(int delay) { ReinforcementStart = Frame + delay; } diff --git a/tiberiandawn/aircraft.h b/tiberiandawn/aircraft.h index 26083d1d..4756029b 100644 --- a/tiberiandawn/aircraft.h +++ b/tiberiandawn/aircraft.h @@ -175,7 +175,7 @@ class AircraftClass : public FootClass, public FlyClass virtual void Enter_Idle_Mode(bool initial = false); virtual RadioMessageType Receive_Message(RadioClass* from, RadioMessageType message, int& param); virtual void Scatter(COORDINATE threat, bool forced = false, bool nokidding = false); - void Set_Reinforcement_Delay(long delay); + void Set_Reinforcement_Delay(int delay); /* ** Scenario and debug support. diff --git a/tiberiandawn/debug.cpp b/tiberiandawn/debug.cpp index 4932504f..6a64255b 100644 --- a/tiberiandawn/debug.cpp +++ b/tiberiandawn/debug.cpp @@ -437,7 +437,7 @@ void Debug_Key(unsigned input) if (fh) { fprintf(fh, "track 2\n"); - coord = 0x0100FF00L; + coord = 0x0100FF00; for (index = 0; index <= 48; index++) { fprintf(fh, "0x%08lXL\n", coord); coord = Coord_Move(coord, 32, 11); @@ -445,7 +445,7 @@ void Debug_Key(unsigned input) fprintf(fh, "\n\n"); fprintf(fh, "track 1\n"); - coord = 0x01000000L; + coord = 0x01000000; for (index = 0; index <= 40; index++) { fprintf(fh, "0x%08lXL\n", coord); coord = Coord_Move(coord, 0, 11); diff --git a/tiberiandawn/dllinterface.cpp b/tiberiandawn/dllinterface.cpp index 7ccce4b2..1bca8f29 100644 --- a/tiberiandawn/dllinterface.cpp +++ b/tiberiandawn/dllinterface.cpp @@ -661,7 +661,7 @@ extern "C" __declspec(dllexport) bool __cdecl CNC_Get_Visible_Page(unsigned char } unsigned char* raw_buffer = (unsigned char*)gbuffer->Get_Buffer(); - long raw_size = gbuffer->Get_Size(); + int raw_size = gbuffer->Get_Size(); if (raw_buffer == NULL || gbuffer->Get_Width() < view_port_width || gbuffer->Get_Height() < view_port_height) { return false; } @@ -2282,7 +2282,7 @@ unsigned int DLLExportClass::TD_Calculate_Leadership(int house, unsigned int uni unsigned int DLLExportClass::TD_Calculate_Score(unsigned int leadership, unsigned int efficiency, unsigned int build_level) { - long total = ((leadership * 40) + (4600) + (efficiency * 14)) / 100; + int total = ((leadership * 40) + (4600) + (efficiency * 14)) / 100; if (!total) total++; total *= (build_level + 1); diff --git a/tiberiandawn/findpath.cpp b/tiberiandawn/findpath.cpp index da2071a5..2ad8505a 100644 --- a/tiberiandawn/findpath.cpp +++ b/tiberiandawn/findpath.cpp @@ -204,7 +204,7 @@ static CELL StartLocation; *=========================================================================*/ int Point_Relative_To_Line(int x, int z, int x1, int z1, int x2, int z2) { - return ((((long)x - (long)x2) * ((long)z1 - (long)z2)) - (((long)z - (long)z2) * ((long)x1 - (long)x2))); + return (((x - x2) * (z1 - z2)) - ((z - z2) * (x1 - x2))); } /*************************************************************************** diff --git a/tiberiandawn/foot.cpp b/tiberiandawn/foot.cpp index 37fde5e0..2c4a1572 100644 --- a/tiberiandawn/foot.cpp +++ b/tiberiandawn/foot.cpp @@ -169,7 +169,7 @@ FootClass::FootClass(HousesType house) IsDeploying = false; IsNewNavCom = false; IsPlanningToLook = false; - HeadToCoord = 0L; + HeadToCoord = 0; PathDelay = 0; Group = -1; TryTryAgain = PATH_RETRY; @@ -1551,7 +1551,7 @@ RadioMessageType FootClass::Receive_Message(RadioClass* from, RadioMessageType m ** then it doesn't need furthur movement instructions. */ case RADIO_NEED_TO_MOVE: - param = (long)NavCom; + param = NavCom; if (!Target_Legal(NavCom)) { return (RADIO_ROGER); } diff --git a/tiberiandawn/function.h b/tiberiandawn/function.h index c1806dfe..d5df0698 100644 --- a/tiberiandawn/function.h +++ b/tiberiandawn/function.h @@ -493,7 +493,7 @@ int Scan_Place_Object(ObjectClass* obj, CELL cell); ** INIT.CPP */ void Uninit_Game(void); -long Obfuscate(char const* string); +unsigned Obfuscate(char const* string); void Anim_Init(void); bool Init_Game(int argc, char* argv[]); bool Select_Game(bool fade = false); @@ -508,8 +508,8 @@ void Load_Recording_Values(void); */ void* Small_Icon(void const* iconptr, int iconnum); void Set_Window(int window, int x, int y, int w, int h); -long Load_Uncompress(FileClass& file, BufferClass& uncomp_buff, BufferClass& dest_buff, void* reserved_data); -long Translucent_Table_Size(int count); +int Load_Uncompress(FileClass& file, BufferClass& uncomp_buff, BufferClass& dest_buff, void* reserved_data); +int Translucent_Table_Size(int count); void* Build_Translucent_Table(void const* palette, TLucentType const* control, int count, void* buffer); void* Conquer_Build_Translucent_Table(void const* palette, TLucentType const* control, int count, void* buffer); @@ -839,8 +839,8 @@ inline COORDINATE Coord_Mid(COORDINATE coord1, COORDINATE coord2) inline COORDINATE XYPixel_Coord(int x, int y) { - return ((COORDINATE)MAKE_LONG((int)(((long)y * (long)ICON_LEPTON_H) / (long)ICON_PIXEL_H) /*+LEPTON_OFFSET_Y*/, - (int)(((long)x * (long)ICON_LEPTON_W) / (long)ICON_PIXEL_W) /*+LEPTON_OFFSET_X*/)); + return ((COORDINATE)MAKE_LONG((int)((y * ICON_LEPTON_H) / ICON_PIXEL_H) /*+LEPTON_OFFSET_Y*/, + (int)((x * ICON_LEPTON_W) / ICON_PIXEL_W) /*+LEPTON_OFFSET_X*/)); } inline int Lepton_To_Pixel(int lepton) diff --git a/tiberiandawn/iconset.cpp b/tiberiandawn/iconset.cpp index 83b05646..c89b430c 100644 --- a/tiberiandawn/iconset.cpp +++ b/tiberiandawn/iconset.cpp @@ -49,7 +49,7 @@ // extern int Misc; int Misc; -long Get_Icon_Set_Size(void const* iconset); +int Get_Icon_Set_Size(void const* iconset); int Get_Icon_Set_Width(void const* iconset); int Get_Icon_Set_Height(void const* iconset); void* Get_Icon_Set_Icondata(void const* iconset); @@ -69,7 +69,7 @@ void* Get_Icon_Set_Map(void const* iconset); // PRIVATE char *IconPalette = NULL; // MCGA only. // PRIVATE char *IconRemap = NULL; // MCGA only. -long Get_Icon_Set_Size(void const* iconset) +int Get_Icon_Set_Size(void const* iconset) { IControl_Type* icontrol; int size = 0; @@ -110,7 +110,7 @@ void* Get_Icon_Set_Icondata(void const* iconset) IControl_Type* icontrol; icontrol = (IControl_Type*)iconset; if (icontrol) - return (Add_Long_To_Pointer(iconset, (long)le32toh(icontrol->Icons))); + return (Add_Long_To_Pointer(iconset, le32toh(icontrol->Icons))); return (NULL); } diff --git a/tiberiandawn/init.cpp b/tiberiandawn/init.cpp index f8c79db2..a3c73809 100644 --- a/tiberiandawn/init.cpp +++ b/tiberiandawn/init.cpp @@ -1629,7 +1629,7 @@ bool Parse_Command_Line(int argc, char* argv[]) for (int index = 1; index < argc; index++) { char* string; // Pointer to argument. - long code = 0; + int code = 0; char arg_string[512]; int str_len = (int)strlen(argv[index]); @@ -2331,7 +2331,7 @@ void Load_Recording_Values(void) * HISTORY: * * 08/19/1995 JLB : Created. * *=============================================================================================*/ -long Obfuscate(char const* string) +unsigned Obfuscate(char const* string) { char buffer[1024]; diff --git a/tiberiandawn/jshell.cpp b/tiberiandawn/jshell.cpp index 96095e7a..e3dc221f 100644 --- a/tiberiandawn/jshell.cpp +++ b/tiberiandawn/jshell.cpp @@ -191,7 +191,7 @@ void File_Fatal(char const* message) * HISTORY: * * 10/17/1994 JLB : Created. * *=============================================================================================*/ -long Load_Uncompress(FileClass& file, BufferClass& uncomp_buff, BufferClass& dest_buff, void* reserved_data) +int Load_Uncompress(FileClass& file, BufferClass& uncomp_buff, BufferClass& dest_buff, void* reserved_data) { unsigned short size; void* sptr = uncomp_buff.Get_Buffer(); @@ -264,7 +264,7 @@ long Load_Uncompress(FileClass& file, BufferClass& uncomp_buff, BufferClass& des if (opened) { file.Close(); } - return ((long)size); + return ((int)size); } /*********************************************************************************************** @@ -283,9 +283,9 @@ long Load_Uncompress(FileClass& file, BufferClass& uncomp_buff, BufferClass& des * HISTORY: * * 04/02/1994 JLB : Created. * *=============================================================================================*/ -long Translucent_Table_Size(int count) +int Translucent_Table_Size(int count) { - return (256L + (256L * count)); + return (256 + (256 * count)); } /*********************************************************************************************** diff --git a/tiberiandawn/logic.cpp b/tiberiandawn/logic.cpp index ea1640a2..3b894e46 100644 --- a/tiberiandawn/logic.cpp +++ b/tiberiandawn/logic.cpp @@ -132,7 +132,7 @@ void LogicClass::Debug_Dump(MonoClass* mono) const /* ** Fill in the data for the current frame's performance record. */ - SpareTicks = MIN((long)SpareTicks, (long)TIMER_SECOND); + SpareTicks = MIN(SpareTicks, TIMER_SECOND); _record[RECORDCOUNT - 1].Graphic = Fixed_To_Cardinal(RECORDHEIGHT, Cardinal_To_Fixed(TIMER_SECOND, SpareTicks)); /* diff --git a/tiberiandawn/mapeddlg.cpp b/tiberiandawn/mapeddlg.cpp index f697ef42..967688ee 100644 --- a/tiberiandawn/mapeddlg.cpp +++ b/tiberiandawn/mapeddlg.cpp @@ -1896,9 +1896,9 @@ int MapEditClass::Scenario_Dialog(void) */ orig_theater = theater = Theater; if (ScenPlayer != SCEN_PLAYER_MPLAYER) { - gdi_credits = HouseClass::As_Pointer(HOUSE_GOOD)->Credits / 1000L; - nod_credits = HouseClass::As_Pointer(HOUSE_BAD)->Credits / 1000L; - neut_credits = HouseClass::As_Pointer(HOUSE_NEUTRAL)->Credits / 1000L; + gdi_credits = HouseClass::As_Pointer(HOUSE_GOOD)->Credits / 1000; + nod_credits = HouseClass::As_Pointer(HOUSE_BAD)->Credits / 1000; + neut_credits = HouseClass::As_Pointer(HOUSE_NEUTRAL)->Credits / 1000; gdi_edge = HouseClass::As_Pointer(HOUSE_GOOD)->Edge; nod_edge = HouseClass::As_Pointer(HOUSE_BAD)->Edge; } else { @@ -2208,9 +2208,9 @@ int MapEditClass::Scenario_Dialog(void) gdi_credits = atol(gdicred_buf); nod_credits = atol(nodcred_buf); neut_credits = atol(neutcred_buf); - HouseClass::As_Pointer(HOUSE_GOOD)->Credits = gdi_credits * 1000L; - HouseClass::As_Pointer(HOUSE_BAD)->Credits = nod_credits * 1000L; - HouseClass::As_Pointer(HOUSE_NEUTRAL)->Credits = neut_credits * 1000L; + HouseClass::As_Pointer(HOUSE_GOOD)->Credits = gdi_credits * 1000; + HouseClass::As_Pointer(HOUSE_BAD)->Credits = nod_credits * 1000; + HouseClass::As_Pointer(HOUSE_NEUTRAL)->Credits = neut_credits * 1000; /* ............................... Edges ................................. */ diff --git a/tiberiandawn/mission.cpp b/tiberiandawn/mission.cpp index 69118a62..0c2e3f4b 100644 --- a/tiberiandawn/mission.cpp +++ b/tiberiandawn/mission.cpp @@ -211,7 +211,7 @@ void MissionClass::Debug_Dump(MonoClass* mono) const mono->Printf("%5.5s[%4.4s]", MissionClass::Mission_Name(Mission), MissionClass::Mission_Name(MissionQueue)); // mono->Text_Print(MissionClass::Mission_Name(Mission), 21, 1); mono->Set_Cursor(20, 7); - mono->Printf("%2d", (long)Timer); + mono->Printf("%2d", (int)Timer); mono->Set_Cursor(74, 1); mono->Printf("%2d", Status); diff --git a/tiberiandawn/netdlg.cpp b/tiberiandawn/netdlg.cpp index 9462e0cf..6cb52cd3 100644 --- a/tiberiandawn/netdlg.cpp +++ b/tiberiandawn/netdlg.cpp @@ -4022,7 +4022,7 @@ static JoinEventType Get_NewGame_Responses(ColorListClass* playerlist) uint32_t Compute_Name_CRC(char* name) { char buf[80]; - uint32_t crc = 0L; + uint32_t crc = 0; int i; strcpy(buf, name); diff --git a/tiberiandawn/object.cpp b/tiberiandawn/object.cpp index bf1d5cff..dcf557e7 100644 --- a/tiberiandawn/object.cpp +++ b/tiberiandawn/object.cpp @@ -278,9 +278,9 @@ void const* ObjectTypeClass::Get_Cameo_Data(void) const *=============================================================================================*/ ObjectClass::ObjectClass(void) { - Coord = 0xFFFFFFFFL; // Some bogus illegal value. - Next = 0; // Not part of any object list. - Trigger = 0; // No associated trigger. + Coord = 0xFFFFFFFF; // Some bogus illegal value. + Next = 0; // Not part of any object list. + Trigger = 0; // No associated trigger. IsToDamage = false; IsToDisplay = false; // Redraw is presumed unnecessary. IsInLimbo = true; // Always presumed to start in limbo state. diff --git a/tiberiandawn/scenario.cpp b/tiberiandawn/scenario.cpp index 13e51773..47f8b420 100644 --- a/tiberiandawn/scenario.cpp +++ b/tiberiandawn/scenario.cpp @@ -259,8 +259,8 @@ bool Read_Scenario(char* root) ** so that tutorial message will reappear in scenario two. */ if (Scen.Scenario < 5) { - TutorFlags[0] = 0L; - TutorFlags[1] = 0L; + TutorFlags[0] = 0; + TutorFlags[1] = 0; } } else { diff --git a/tiberiandawn/techno.cpp b/tiberiandawn/techno.cpp index 015154b2..07b96eb4 100644 --- a/tiberiandawn/techno.cpp +++ b/tiberiandawn/techno.cpp @@ -2126,7 +2126,7 @@ FireErrorType TechnoClass::Can_Fire(TARGET target, int which) const // Mono_Printf("Infantry[0]=%p.\n", Infantry.Raw_Ptr(0)); // Mono_Printf("Buildings[0]=%p.\n", Buildings.Raw_Ptr(0)); // Mono_Printf("Aircraft[0]=%p.\n", Aircraft.Raw_Ptr(0)); - // Mono_Printf("object=%p, Strength=%d, IsActive=%d, IsInLimbo=%d.\n", object, (long)object->Strength, + // Mono_Printf("object=%p, Strength=%d, IsActive=%d, IsInLimbo=%d.\n", object, (int)object->Strength, // object->IsActive, object->IsInLimbo);Get_Key(); if (object && /*(object->IsActive || GameToPlay != GAME_NORMAL) &&*/ object->Is_Techno() && ((TechnoClass*)object)->Is_Cloaked(this)) { @@ -2376,7 +2376,7 @@ BulletClass* TechnoClass::Fire_At(TARGET target, int which) // Mono_Printf("Infantry[0]=%p.\n", Infantry.Raw_Ptr(0)); // Mono_Printf("Buildings[0]=%p.\n", Buildings.Raw_Ptr(0)); // Mono_Printf("Aircraft[0]=%p.\n", Aircraft.Raw_Ptr(0)); - // Mono_Printf("object=%p, Strength=%d, IsActive=%d, IsInLimbo=%d.\n", object, (long)object->Strength, + // Mono_Printf("object=%p, Strength=%d, IsActive=%d, IsInLimbo=%d.\n", object, (int)object->Strength, // object->IsActive, object->IsInLimbo);Get_Key(); bullet->Payback = this; bullet->Strength = (short)firepower; diff --git a/tiberiandawn/tile.h b/tiberiandawn/tile.h index 7ed015ba..d343fea4 100644 --- a/tiberiandawn/tile.h +++ b/tiberiandawn/tile.h @@ -37,7 +37,7 @@ /*=========================================================================*/ /* The following prototypes are for the file: ICONSET.CPP */ /*=========================================================================*/ -long Get_Icon_Set_Size(void const* iconset); +int Get_Icon_Set_Size(void const* iconset); int Get_Icon_Set_Width(void const* iconset); int Get_Icon_Set_Height(void const* iconset); void* Get_Icon_Set_Icondata(void const* iconset); diff --git a/tiberiandawn/trigger.cpp b/tiberiandawn/trigger.cpp index 477634bd..977352a7 100644 --- a/tiberiandawn/trigger.cpp +++ b/tiberiandawn/trigger.cpp @@ -280,7 +280,7 @@ TriggerClass::TriggerClass(void) Event = EVENT_NONE; Action = ACTION_NONE; House = HOUSE_NONE; - DataCopy = Data = 0L; + DataCopy = Data = 0; Name[0] = '\0'; Team = NULL; }