diff --git a/common/keyframe.cpp b/common/keyframe.cpp index c57f26e1..8304962c 100644 --- a/common/keyframe.cpp +++ b/common/keyframe.cpp @@ -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/redalert/aircraft.cpp b/redalert/aircraft.cpp index deb2ec7d..c8f39a29 100644 --- a/redalert/aircraft.cpp +++ b/redalert/aircraft.cpp @@ -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..b4f11d40 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 = 0x7FFFFFFFL, miny = 0x7FFFFFFFL; + 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; diff --git a/redalert/dllinterface.cpp b/redalert/dllinterface.cpp index 1ec7194d..23b67a96 100644 --- a/redalert/dllinterface.cpp +++ b/redalert/dllinterface.cpp @@ -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 = 0x7FFFFFFFL; + 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..071c6336 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); 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/aircraft.cpp b/tiberiandawn/aircraft.cpp index 7bd31304..3b2af2eb 100644 --- a/tiberiandawn/aircraft.cpp +++ b/tiberiandawn/aircraft.cpp @@ -2000,26 +2000,26 @@ void AircraftClass::Debug_Dump(MonoClass* mono) const { Validate(); mono->Set_Cursor(0, 0); - mono->Print("ÚName:ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÂMission:ÄÄÄÂTarCom:ÂNavCom:ÂRadio:ÂCoord:ÄÄÂAltitudeÂSt:Ä¿\n" - "³ ³ ³ ³ ³ ³ ³ ³ ³\n" - "ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÂNÂYÂHealth:ÄÂFdir:ÂÄBdir:ÄÂSpeed:ÂÄÄÄÄÄÁÄÄÄÄÄÄÂCargo:ÄÄÄÄÁÄÄÄÄ´\n" - "³Active........³ ³ ³ ³ ³ ³ ³ ³ ³\n" - "³Limbo.........³ ³ ÃÄÄÄÄÄÄÄÄÁÄÄÄÄÄÁÄÄÄÄÄÄÄÁÄÄÄÄÄÄÁÄÄÄÄÄÄÄÄÄÄÄÄÁÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´\n" - "³Owned.........³ ³ ³Last Message: ³\n" - "³Discovered....³ ³ ÃTimer:ÂArm:ÂÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÂFlash:ÂStage:ÂTeam:ÄÄÄÄÂArch:´\n" - "³Selected......³ ³ ³ ³ ³ ³ ³ ³ ³ ³ ³\n" - "³Teathered.....³ ³ ÃÄÄÄÄÄÄÁÄÄÄÄÁÄÄÄÄÄÄÁÄÄÄÄÄÄÄÄÄÁÄÄÄÄÄÄÁÄÄÄÄÄÄÁÄÄÄÄÄÄÄÄÄÁÄÄÄÄÄÙ\n" - "³Locked on Map.³ ³ ³ \n" - "³ ³ ³ ³ \n" - "³Is A Loaner...³ ³ ³ \n" - "³Is Landing....³ ³ ³ \n" - "³Is Taking Off.³ ³ ³ \n" - "³ ³ ³ ³ \n" - "³ ³ ³ ³ \n" - "³ ³ ³ ³ \n" - "³Recoiling.....³ ³ ³ \n" - "³To Display....³ ³ ³ \n" - "ÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÁÄÁÄÙ \n"); + mono->Print("�Name:���������������Mission:����TarCom:�NavCom:�Radio:�Coord:���Altitude�St:Ä¿\n" + "� � � � � � � � �\n" + "����������������N�Y�Health:��Fdir:��Bdir:��Speed:��������������Cargo:��������Ĵ\n" + "�Active........� � � � � � � � �\n" + "�Limbo.........� � ����������������������������������������������������������Ĵ\n" + "�Owned.........� � �Last Message: �\n" + "�Discovered....� � �Timer:�Arm:������������������Flash:�Stage:�Team:�����Arch:�\n" + "�Selected......� � � � � � � � � � �\n" + "�Teathered.....� � ������������������������������������������������������������\n" + "�Locked on Map.� � � \n" + "� � � � \n" + "�Is A Loaner...� � � \n" + "�Is Landing....� � � \n" + "�Is Taking Off.� � � \n" + "� � � � \n" + "� � � � \n" + "� � � � \n" + "�Recoiling.....� � � \n" + "�To Display....� � � \n" + "�������������������� \n"); mono->Set_Cursor(1, 1); mono->Printf("%s:%s", House->Class->IniName, Class->IniName); mono->Set_Cursor(36, 3); @@ -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/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..47a4c835 100644 --- a/tiberiandawn/foot.cpp +++ b/tiberiandawn/foot.cpp @@ -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..1fdc8738 100644 --- a/tiberiandawn/function.h +++ b/tiberiandawn/function.h @@ -39,53 +39,53 @@ Map(screen) class heirarchy. MapeditClass(most derived class)-- scenario editor - ³ MouseClass-- handles mouse animation and display control - ³ ScrollClass-- map scroll handler - ³ HelpClass-- pop + � MouseClass-- handles mouse animation and display control + � ScrollClass-- map scroll handler + � HelpClass-- pop - up help text handler - ³ TabClass-- file folder tab screen mode control dispatcher - ³ SidebarClass-- displays and controls construction list sidebar - ³ PowerClass-- display power production + � TabClass-- file folder tab screen mode control dispatcher + � SidebarClass-- displays and controls construction list sidebar + � PowerClass-- display power production / consumption bargraph - ³ RadarClass-- displays and controls radar map - ³ DisplayClass-- general tactical map display handler - ³ MapClass-- general tactical map data handler - ³ GScreenClass(pure virtual base class)-- generic screen control + � RadarClass-- displays and controls radar map + � DisplayClass-- general tactical map display handler + � MapClass-- general tactical map data handler + � GScreenClass(pure virtual base class)-- generic screen control AbstractClass - ³ - ³ - ³ - ³ ObjectClass - ³ - ÚÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÅÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄ¿ - AnimClass ³ TemplateClass ³ ÃÄ FuseClass ³ TerrainClass - ³ ³ ÃÄ FlyClass ³ - ³ ³ BulletClass ³ OverlayClass MissionClass SmudgeClass - ³ RadioClass - ³ - ÃÄ CrewClass - ÃÄ FlasherClass - ÃÄ StageClass - ÃÄ CargoClass TechnoClass - ³ - ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÁÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ FootClass BuildingClass - ³ - ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ DriveClass InfantryClass ÃÄ FlyClass - ³ AircraftClass TurretClass - ³ TarComClass - ³ UnitClass + � + � + � + � ObjectClass + � + ����������������������������������������������������������������Ŀ + AnimClass � TemplateClass � �� FuseClass � TerrainClass + � � �� FlyClass � + � � BulletClass � OverlayClass MissionClass SmudgeClass + � RadioClass + � + �� CrewClass + �� FlasherClass + �� StageClass + �� CargoClass TechnoClass + � + �����������������������������������������������������Ŀ FootClass BuildingClass + � + ����������������������������Ŀ DriveClass InfantryClass �� FlyClass + � AircraftClass TurretClass + � TarComClass + � UnitClass AbstractTypeClass - ³ ObjectTypeClass - ³ - ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÅÄÄÄÄÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ - ³ ³ ³ ³ TechnoTypeClass ³ ³ ³ - ³ BulletTypeClass ³ ³ - ³ TemplateTypeClass ³ - ÚÄÄÄÄÄÄÄÄÁÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÂÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ TerrainTypeClass - ³ ³ ³ ³ UnitTypeClass ³ BuildingTypeClass ³ - ³ InfantryTypeClass AircraftTypeClass + � ObjectTypeClass + � + �����������������������������������������������������Ŀ + � � � � TechnoTypeClass � � � + � BulletTypeClass � � + � TemplateTypeClass � + �����������������������������������������Ŀ TerrainTypeClass + � � � � UnitTypeClass � BuildingTypeClass � + � InfantryTypeClass AircraftTypeClass */ #if !defined _WIN32 || defined NOMINMAX @@ -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/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/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);