From 1ab559f613951a7f9e4e870e9f6235d26911a3df Mon Sep 17 00:00:00 2001 From: wdbee Date: Mon, 21 Dec 2009 14:19:16 +0000 Subject: [PATCH] Update simplix_36GP pitting speedways git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2028 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 86eef97896e905a926dc5211b5ef6bce7bbf1247 Former-commit-id: 09365bd04ddc81d401e3905787553654fcf8c93f --- .../simplix_36GP/tracks/a-speedway.xml | 4 +-- .../simplix_36GP/tracks/b-speedway.xml | 2 +- .../simplix_36GP/tracks/c-speedway.xml | 2 +- .../simplix_36GP/tracks/d-speedway.xml | 2 +- .../simplix_36GP/tracks/e-speedway.xml | 2 +- .../simplix_36GP/tracks/f-speedway.xml | 2 +- .../simplix_36GP/tracks/g-speedway.xml | 2 +- .../simplix/simplix_36GP/tracks/michigan.xml | 29 +++++++++++++++++++ .../simplix/simplix_sc/tracks/a-speedway.xml | 4 +-- .../simplix/simplix_sc/tracks/b-speedway.xml | 2 +- .../simplix/simplix_sc/tracks/c-speedway.xml | 2 +- .../simplix/simplix_sc/tracks/d-speedway.xml | 2 +- .../simplix/simplix_sc/tracks/e-speedway.xml | 2 +- .../simplix/simplix_sc/tracks/f-speedway.xml | 2 +- .../simplix/simplix_sc/tracks/g-speedway.xml | 2 +- .../simplix/simplix_sc/tracks/michigan.xml | 29 +++++++++++++++++++ .../simplix_trb1/tracks/a-speedway.xml | 4 +-- .../simplix_trb1/tracks/b-speedway.xml | 2 +- .../simplix_trb1/tracks/c-speedway.xml | 2 +- .../simplix_trb1/tracks/d-speedway.xml | 2 +- .../simplix_trb1/tracks/e-speedway.xml | 2 +- .../simplix_trb1/tracks/f-speedway.xml | 2 +- .../simplix_trb1/tracks/g-speedway.xml | 2 +- .../simplix/simplix_trb1/tracks/michigan.xml | 29 +++++++++++++++++++ src/drivers/simplix/src/unitdriver.cpp | 4 +-- src/drivers/simplix/src/unitpit.cpp | 5 ++++ 26 files changed, 118 insertions(+), 26 deletions(-) create mode 100644 src/drivers/simplix/simplix_36GP/tracks/michigan.xml create mode 100644 src/drivers/simplix/simplix_sc/tracks/michigan.xml create mode 100644 src/drivers/simplix/simplix_trb1/tracks/michigan.xml diff --git a/src/drivers/simplix/simplix_36GP/tracks/a-speedway.xml b/src/drivers/simplix/simplix_36GP/tracks/a-speedway.xml index 113a373d0..fb4078b47 100644 --- a/src/drivers/simplix/simplix_36GP/tracks/a-speedway.xml +++ b/src/drivers/simplix/simplix_36GP/tracks/a-speedway.xml @@ -13,10 +13,10 @@
- + - + diff --git a/src/drivers/simplix/simplix_36GP/tracks/b-speedway.xml b/src/drivers/simplix/simplix_36GP/tracks/b-speedway.xml index 4bff00bb9..18f1e7674 100644 --- a/src/drivers/simplix/simplix_36GP/tracks/b-speedway.xml +++ b/src/drivers/simplix/simplix_36GP/tracks/b-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_36GP/tracks/c-speedway.xml b/src/drivers/simplix/simplix_36GP/tracks/c-speedway.xml index f91fc0c45..a3977c770 100644 --- a/src/drivers/simplix/simplix_36GP/tracks/c-speedway.xml +++ b/src/drivers/simplix/simplix_36GP/tracks/c-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_36GP/tracks/d-speedway.xml b/src/drivers/simplix/simplix_36GP/tracks/d-speedway.xml index 7a2dcb958..99f4debd0 100644 --- a/src/drivers/simplix/simplix_36GP/tracks/d-speedway.xml +++ b/src/drivers/simplix/simplix_36GP/tracks/d-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_36GP/tracks/e-speedway.xml b/src/drivers/simplix/simplix_36GP/tracks/e-speedway.xml index b5db8503f..b5ec8d03f 100644 --- a/src/drivers/simplix/simplix_36GP/tracks/e-speedway.xml +++ b/src/drivers/simplix/simplix_36GP/tracks/e-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_36GP/tracks/f-speedway.xml b/src/drivers/simplix/simplix_36GP/tracks/f-speedway.xml index 72f4abc01..de23c68f8 100644 --- a/src/drivers/simplix/simplix_36GP/tracks/f-speedway.xml +++ b/src/drivers/simplix/simplix_36GP/tracks/f-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_36GP/tracks/g-speedway.xml b/src/drivers/simplix/simplix_36GP/tracks/g-speedway.xml index 1b64da187..edae35286 100644 --- a/src/drivers/simplix/simplix_36GP/tracks/g-speedway.xml +++ b/src/drivers/simplix/simplix_36GP/tracks/g-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_36GP/tracks/michigan.xml b/src/drivers/simplix/simplix_36GP/tracks/michigan.xml new file mode 100644 index 000000000..a0a5bb9f5 --- /dev/null +++ b/src/drivers/simplix/simplix_36GP/tracks/michigan.xml @@ -0,0 +1,29 @@ + + + + + + + + +
+ + + + + + + + + + + + + +
+
diff --git a/src/drivers/simplix/simplix_sc/tracks/a-speedway.xml b/src/drivers/simplix/simplix_sc/tracks/a-speedway.xml index 113a373d0..fb4078b47 100644 --- a/src/drivers/simplix/simplix_sc/tracks/a-speedway.xml +++ b/src/drivers/simplix/simplix_sc/tracks/a-speedway.xml @@ -13,10 +13,10 @@
- + - + diff --git a/src/drivers/simplix/simplix_sc/tracks/b-speedway.xml b/src/drivers/simplix/simplix_sc/tracks/b-speedway.xml index 4bff00bb9..18f1e7674 100644 --- a/src/drivers/simplix/simplix_sc/tracks/b-speedway.xml +++ b/src/drivers/simplix/simplix_sc/tracks/b-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_sc/tracks/c-speedway.xml b/src/drivers/simplix/simplix_sc/tracks/c-speedway.xml index f91fc0c45..a3977c770 100644 --- a/src/drivers/simplix/simplix_sc/tracks/c-speedway.xml +++ b/src/drivers/simplix/simplix_sc/tracks/c-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_sc/tracks/d-speedway.xml b/src/drivers/simplix/simplix_sc/tracks/d-speedway.xml index 7a2dcb958..99f4debd0 100644 --- a/src/drivers/simplix/simplix_sc/tracks/d-speedway.xml +++ b/src/drivers/simplix/simplix_sc/tracks/d-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_sc/tracks/e-speedway.xml b/src/drivers/simplix/simplix_sc/tracks/e-speedway.xml index b5db8503f..b5ec8d03f 100644 --- a/src/drivers/simplix/simplix_sc/tracks/e-speedway.xml +++ b/src/drivers/simplix/simplix_sc/tracks/e-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_sc/tracks/f-speedway.xml b/src/drivers/simplix/simplix_sc/tracks/f-speedway.xml index 72f4abc01..de23c68f8 100644 --- a/src/drivers/simplix/simplix_sc/tracks/f-speedway.xml +++ b/src/drivers/simplix/simplix_sc/tracks/f-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_sc/tracks/g-speedway.xml b/src/drivers/simplix/simplix_sc/tracks/g-speedway.xml index 1b64da187..edae35286 100644 --- a/src/drivers/simplix/simplix_sc/tracks/g-speedway.xml +++ b/src/drivers/simplix/simplix_sc/tracks/g-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_sc/tracks/michigan.xml b/src/drivers/simplix/simplix_sc/tracks/michigan.xml new file mode 100644 index 000000000..a0a5bb9f5 --- /dev/null +++ b/src/drivers/simplix/simplix_sc/tracks/michigan.xml @@ -0,0 +1,29 @@ + + + + + + + + +
+ + + + + + + + + + + + + +
+
diff --git a/src/drivers/simplix/simplix_trb1/tracks/a-speedway.xml b/src/drivers/simplix/simplix_trb1/tracks/a-speedway.xml index 113a373d0..fb4078b47 100644 --- a/src/drivers/simplix/simplix_trb1/tracks/a-speedway.xml +++ b/src/drivers/simplix/simplix_trb1/tracks/a-speedway.xml @@ -13,10 +13,10 @@
- + - + diff --git a/src/drivers/simplix/simplix_trb1/tracks/b-speedway.xml b/src/drivers/simplix/simplix_trb1/tracks/b-speedway.xml index 4bff00bb9..18f1e7674 100644 --- a/src/drivers/simplix/simplix_trb1/tracks/b-speedway.xml +++ b/src/drivers/simplix/simplix_trb1/tracks/b-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_trb1/tracks/c-speedway.xml b/src/drivers/simplix/simplix_trb1/tracks/c-speedway.xml index f91fc0c45..a3977c770 100644 --- a/src/drivers/simplix/simplix_trb1/tracks/c-speedway.xml +++ b/src/drivers/simplix/simplix_trb1/tracks/c-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_trb1/tracks/d-speedway.xml b/src/drivers/simplix/simplix_trb1/tracks/d-speedway.xml index 7a2dcb958..99f4debd0 100644 --- a/src/drivers/simplix/simplix_trb1/tracks/d-speedway.xml +++ b/src/drivers/simplix/simplix_trb1/tracks/d-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_trb1/tracks/e-speedway.xml b/src/drivers/simplix/simplix_trb1/tracks/e-speedway.xml index b5db8503f..b5ec8d03f 100644 --- a/src/drivers/simplix/simplix_trb1/tracks/e-speedway.xml +++ b/src/drivers/simplix/simplix_trb1/tracks/e-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_trb1/tracks/f-speedway.xml b/src/drivers/simplix/simplix_trb1/tracks/f-speedway.xml index 72f4abc01..de23c68f8 100644 --- a/src/drivers/simplix/simplix_trb1/tracks/f-speedway.xml +++ b/src/drivers/simplix/simplix_trb1/tracks/f-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_trb1/tracks/g-speedway.xml b/src/drivers/simplix/simplix_trb1/tracks/g-speedway.xml index 1b64da187..edae35286 100644 --- a/src/drivers/simplix/simplix_trb1/tracks/g-speedway.xml +++ b/src/drivers/simplix/simplix_trb1/tracks/g-speedway.xml @@ -13,7 +13,7 @@
- + diff --git a/src/drivers/simplix/simplix_trb1/tracks/michigan.xml b/src/drivers/simplix/simplix_trb1/tracks/michigan.xml new file mode 100644 index 000000000..a0a5bb9f5 --- /dev/null +++ b/src/drivers/simplix/simplix_trb1/tracks/michigan.xml @@ -0,0 +1,29 @@ + + + + + + + + +
+ + + + + + + + + + + + + +
+
diff --git a/src/drivers/simplix/src/unitdriver.cpp b/src/drivers/simplix/src/unitdriver.cpp index 0a9d9ad33..0e3723b90 100644 --- a/src/drivers/simplix/src/unitdriver.cpp +++ b/src/drivers/simplix/src/unitdriver.cpp @@ -1057,12 +1057,12 @@ void TDriver::NewRace(PtCarElt Car, PSituation Situation) //--------------------------------------------------------------------------* void TDriver::Drive() { -/* +/** / if (CarLaps == 1 + oIndex) oTestPitStop = 1; else oTestPitStop = 0; -*/ +/ **/ /* if(!Qualification) { diff --git a/src/drivers/simplix/src/unitpit.cpp b/src/drivers/simplix/src/unitpit.cpp index e4b211009..096fa704d 100644 --- a/src/drivers/simplix/src/unitpit.cpp +++ b/src/drivers/simplix/src/unitpit.cpp @@ -529,6 +529,11 @@ void TPitLane::MakePath { Factor = 3.00; Speed = 11.0; + if (FirstPit) + { + Factor = 1.00; + Speed = 4.0; + } } oPathPoints[Idx0].MaxSpeed = oPathPoints[Idx0].Speed = Speed;