From 9dc5dca209dce4cb846e99bc6d421444be8b22fa Mon Sep 17 00:00:00 2001 From: aap Date: Sat, 16 May 2020 11:34:51 +0200 Subject: [PATCH] remove some unneeded plane paths for the moment; also different exe icon --- src/skel/win/gta3.ico | Bin 2238 -> 0 bytes src/skel/win/gtavc.ico | Bin 0 -> 3262 bytes src/skel/win/win.rc | 2 +- src/vehicles/Plane.cpp | 2 ++ 4 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 src/skel/win/gta3.ico create mode 100644 src/skel/win/gtavc.ico diff --git a/src/skel/win/gta3.ico b/src/skel/win/gta3.ico deleted file mode 100644 index 2017c8116bb76bf612babe81eb013c2c0250dbc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 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 literal 0 HcmV?d00001 diff --git a/src/skel/win/win.rc b/src/skel/win/win.rc index 379c473d..9b5aa305 100644 --- a/src/skel/win/win.rc +++ b/src/skel/win/win.rc @@ -42,6 +42,6 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_MAIN_ICON ICON DISCARDABLE "gta3.ico" +IDI_MAIN_ICON ICON DISCARDABLE "gtavc.ico" ///////////////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp index 39069364..8f32f12a 100644 --- a/src/vehicles/Plane.cpp +++ b/src/vehicles/Plane.cpp @@ -735,6 +735,7 @@ CPlane::InitPlanes(void) TotalDurationOfFlightPath2 = TotalLengthOfFlightPath2/CRUISE_SPEED; } +/* // Mission Cesna if(pPath3Nodes == nil){ pPath3Nodes = LoadPath("data\\paths\\flight3.dat", NumPath3Nodes, TotalLengthOfFlightPath3, false); @@ -746,6 +747,7 @@ CPlane::InitPlanes(void) pPath4Nodes = LoadPath("data\\paths\\flight4.dat", NumPath4Nodes, TotalLengthOfFlightPath4, false); TotalDurationOfFlightPath4 = TotalLengthOfFlightPath4/CRUISE_SPEED; } +*/ CStreaming::LoadAllRequestedModels(false); CStreaming::RequestModel(MI_AIRTRAIN, 0);