summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-08 01:41:40 +0100
committeraap <aap@papnet.eu>2021-01-08 01:41:40 +0100
commitebdf08a5144fa98fd5a0700c4865d7c6673d947e (patch)
treea239d268f61711c158583f9bc515f012b4c3fb8e /src/control
parentAdd support of PS2 audio streams to OpenAL (diff)
downloadre3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar
re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.gz
re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.bz2
re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.lz
re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.xz
re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.zst
re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/GameLogic.cpp8
-rw-r--r--src/control/Script.cpp2
-rw-r--r--src/control/Script4.cpp63
3 files changed, 37 insertions, 36 deletions
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index e7f7d525..2eea9645 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -420,7 +420,7 @@ CGameLogic::SetUpShortCut(CVector vStartPos, float fStartAngle, CVector vEndPos,
ShortCutStartOrientation = fStartAngle;
ShortCutDestination = vEndPos;
ShortCutDestinationOrientation = fEndAngle;
- CStreaming::RequestModel(MI_KAUFMAN, 0);
+ CStreaming::RequestModel(MI_CABBIE, 0);
}
void
@@ -452,11 +452,11 @@ CGameLogic::UpdateShortCut()
{
switch (ShortCutState) {
case SHORTCUT_INIT:
- if (!CStreaming::HasModelLoaded(MI_KAUFMAN)) {
- CStreaming::RequestModel(MI_KAUFMAN, 0);
+ if (!CStreaming::HasModelLoaded(MI_CABBIE)) {
+ CStreaming::RequestModel(MI_CABBIE, 0);
return;
}
- pShortCutTaxi = new CAutomobile(MI_KAUFMAN, RANDOM_VEHICLE);
+ pShortCutTaxi = new CAutomobile(MI_CABBIE, RANDOM_VEHICLE);
if (!pShortCutTaxi)
return;
pShortCutTaxi->SetPosition(ShortCutStart);
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 4fdd6fd0..9aea49d3 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -2201,7 +2201,7 @@ int open_script()
#endif
switch (scriptToLoad) {
case 0: scriptfile = "main.scm"; break;
- case 1: scriptfile = "freeroam_miami.scm"; break;
+ case 1: scriptfile = "freeroam_lcs.scm"; break;
case 2: scriptfile = "main_d.scm"; break;
}
return CFileMgr::OpenFile(scriptfile, "rb");
diff --git a/src/control/Script4.cpp b/src/control/Script4.cpp
index d350bafd..3abd7f38 100644
--- a/src/control/Script4.cpp
+++ b/src/control/Script4.cpp
@@ -1817,6 +1817,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
continue;
if (CModelInfo::IsCarModel(model) || CModelInfo::IsBikeModel(model)) {
switch (model) {
+ // TODO(LCS): do it right
case MI_LANDSTAL:
case MI_LINERUN:
case MI_RIO:
@@ -1842,13 +1843,13 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
case MI_ANGEL:
case MI_COACH:
case MI_RCBANDIT:
- case MI_ROMERO:
- case MI_PACKER:
- case MI_SENTXS:
+ //case MI_ROMERO:
+ //case MI_PACKER:
+ //case MI_SENTXS:
case MI_SQUALO:
case MI_SEASPAR:
case MI_PIZZABOY:
- case MI_GANGBUR:
+ //case MI_GANGBUR:
case MI_AIRTRAIN:
case MI_DEADDODO:
case MI_SPEEDER:
@@ -1857,44 +1858,44 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
case MI_FLATBED:
case MI_YANKEE:
case MI_CADDY:
- case MI_ZEBRA:
+ //case MI_ZEBRA:
case MI_TOPFUN:
case MI_SKIMMER:
case MI_RCBARON:
case MI_RCRAIDER:
case MI_SPARROW:
case MI_PATRIOT:
- case MI_LOVEFIST:
+ //case MI_LOVEFIST:
case MI_COASTG:
case MI_DINGHY:
- case MI_HERMES:
- case MI_SABRETUR:
+ //case MI_HERMES:
+ //case MI_SABRETUR:
case MI_PHEONIX:
- case MI_WALTON:
+ //case MI_WALTON:
case MI_COMET:
- case MI_DELUXO:
- case MI_BURRITO:
- case MI_SPAND:
+ //case MI_DELUXO:
+ //case MI_BURRITO:
+ //case MI_SPAND:
case MI_MARQUIS:
case MI_BAGGAGE:
- case MI_KAUFMAN:
+ //case MI_KAUFMAN:
case MI_MAVERICK:
case MI_VCNMAV:
- case MI_RANCHER:
+ //case MI_RANCHER:
case MI_FBIRANCH:
case MI_JETMAX:
- case MI_HOTRING:
+ //case MI_HOTRING:
case MI_SANDKING:
- case MI_BLISTAC:
+ //case MI_BLISTAC:
case MI_POLMAV:
- case MI_BOXVILLE:
- case MI_BENSON:
- case MI_MESA:
+ //case MI_BOXVILLE:
+ //case MI_BENSON:
+ //case MI_MESA:
case MI_RCGOBLIN:
- case MI_HOTRINA:
- case MI_HOTRINB:
- case MI_BLOODRA:
- case MI_BLOODRB:
+ //case MI_HOTRINA:
+ //case MI_HOTRINB:
+ //case MI_BLOODRA:
+ //case MI_BLOODRB:
case MI_VICECHEE:
model = -1;
break;
@@ -1909,23 +1910,23 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
case MI_MOONBEAM:
case MI_ESPERANT:
case MI_TAXI:
- case MI_WASHING:
+ //case MI_WASHING:
case MI_BOBCAT:
case MI_BANSHEE:
case MI_CABBIE:
case MI_STALLION:
case MI_RUMPO:
- case MI_ADMIRAL:
+ //case MI_ADMIRAL:
case MI_PCJ600:
case MI_FAGGIO:
case MI_FREEWAY:
- case MI_GLENDALE:
- case MI_OCEANIC:
+ //case MI_GLENDALE:
+ //case MI_OCEANIC:
case MI_SANCHEZ:
- case MI_SABRE:
- case MI_REGINA:
- case MI_VIRGO:
- case MI_GREENWOO:
+ //case MI_SABRE:
+ //case MI_REGINA:
+ //case MI_VIRGO:
+ //case MI_GREENWOO:
break;
default:
printf("CREATE_RANDOM_CAR_FOR_CAR_PARK - Unknown car model %d\n", CStreaming::ms_vehiclesLoaded[index]);