1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- New Feature: Added option to disable the automatic cursor swap (between exchanging positions and other actions eg. talking). (by tazpn)

Browse Source 
o if enabled in the option screen, the cursor will not change periodically to the exchange position.
o if enabled, you can manually exchange positions by pressing 'x'
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290487#Post290487

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-09-09 06:50:17 +00:00
parent 9b566f502c
commit 1687c148f9
12 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+4
View File
@@ -201,6 +201,7 @@ BOOLEAN LoadGameSettings()
gGameSettings.fOptions[TOPTION_MERC_CASTS_LIGHT] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_MERC_CASTS_LIGHT" , TRUE );
gGameSettings.fOptions[TOPTION_HIDE_BULLETS] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_HIDE_BULLETS" , FALSE );
gGameSettings.fOptions[TOPTION_TRACKING_MODE] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_TRACKING_MODE" , TRUE );
gGameSettings.fOptions[TOPTION_DISABLE_CURSOR_SWAP] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_DISABLE_CURSOR_SWAP" , FALSE );
gGameSettings.fOptions[NUM_ALL_GAME_OPTIONS] = iniReader.ReadBoolean("JA2 Game Settings","NUM_ALL_GAME_OPTIONS" , FALSE );
@@ -357,6 +358,7 @@ BOOLEAN SaveGameSettings()
settings << "TOPTION_USE_NCTH = " << (gGameSettings.fOptions[TOPTION_USE_NCTH] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_SHOW_TACTICAL_FACE_GEAR = " << (gGameSettings.fOptions[TOPTION_SHOW_TACTICAL_FACE_GEAR] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_SHOW_TACTICAL_FACE_ICONS = " << (gGameSettings.fOptions[TOPTION_SHOW_TACTICAL_FACE_ICONS] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_DISABLE_CURSOR_SWAP = " << (gGameSettings.fOptions[TOPTION_DISABLE_CURSOR_SWAP] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_CHEAT_MODE_OPTIONS_HEADER = " << (gGameSettings.fOptions[TOPTION_CHEAT_MODE_OPTIONS_HEADER] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = " << (gGameSettings.fOptions[TOPTION_FORCE_BOBBY_RAY_SHIPMENTS] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_CHEAT_MODE_OPTIONS_END = " << (gGameSettings.fOptions[TOPTION_CHEAT_MODE_OPTIONS_END] ? "TRUE" : "FALSE" ) << endl;
@@ -477,6 +479,8 @@ void InitGameSettings()
gGameSettings.fOptions[ TOPTION_REPORT_MISS_MARGIN ] = FALSE;
gGameSettings.fOptions[ TOPTION_DISABLE_CURSOR_SWAP ] = FALSE;
// arynn: Cheat/Debug Menu
gGameSettings.fOptions[ TOPTION_CHEAT_MODE_OPTIONS_HEADER ] = FALSE;
gGameSettings.fOptions[ TOPTION_FORCE_BOBBY_RAY_SHIPMENTS ] = FALSE; // force all pending Bobby Ray shipments
GameSettings.h
+2
View File
@@ -76,6 +76,8 @@ enum
TOPTION_SHOW_TACTICAL_FACE_GEAR,
TOPTION_SHOW_TACTICAL_FACE_ICONS,
TOPTION_DISABLE_CURSOR_SWAP, // Disable cursor swapping every second between talk and quick exchange
// arynn: Debug/Cheat
TOPTION_CHEAT_MODE_OPTIONS_HEADER,
TOPTION_FORCE_BOBBY_RAY_SHIPMENTS, // force all pending Bobby Ray shipments
Tactical/Handle UI.cpp
+20 -9
View File
@@ -586,10 +586,13 @@ UINT32 HandleTacticalUI( void )
}
}
if ( ( GetJA2Clock( ) - guiUIInterfaceSwapCursorsTime ) > 1000 )
if ( !gGameSettings.fOptions[TOPTION_DISABLE_CURSOR_SWAP] )
{
gfOKForExchangeCursor = !gfOKForExchangeCursor;
guiUIInterfaceSwapCursorsTime = GetJA2Clock( );
if ( ( GetJA2Clock( ) - guiUIInterfaceSwapCursorsTime ) > 1000 )
{
gfOKForExchangeCursor = !gfOKForExchangeCursor;
guiUIInterfaceSwapCursorsTime = GetJA2Clock( );
}
}
// OK, do a check for on an int tile...
@@ -6553,13 +6556,21 @@ BOOLEAN ValidQuickExchangePosition( )
}
}
if ( fOldOnValidGuy != fOnValidGuy )
if ( gGameSettings.fOptions[TOPTION_DISABLE_CURSOR_SWAP] )
{
// Update timer....
// ATE: Adjust clock for automatic swapping so that the 'feel' is there....
guiUIInterfaceSwapCursorsTime = GetJA2Clock( );
// Default it!
gfOKForExchangeCursor = TRUE;
gfOKForExchangeCursor = FALSE;
fOnValidGuy = FALSE;
}
else
{
if ( fOldOnValidGuy != fOnValidGuy )
{
// Update timer....
// ATE: Adjust clock for automatic swapping so that the 'feel' is there....
guiUIInterfaceSwapCursorsTime = GetJA2Clock( );
// Default it!
gfOKForExchangeCursor = TRUE;
}
}
// Update old value.....
Utils/_ChineseText.cpp
+2
View File
@@ -4906,6 +4906,7 @@ STR16 zOptionsToggleText[] =
L"开启新的 CTH 系统", // use NCTH
L"显示脸部装备图",
L"显示脸部装备图标",
L"Disable Cursor Swap", // Disable Cursor Swap // TODO.Translate
L"--作弊模式选项--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"强制 Bobby Ray 送货", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5010,6 +5011,7 @@ STR16 zOptionsScreenHelpText[] =
L"当启用时, 使用新命中率系统和光标。",
L"当启用时, 将会看到佣兵脸部装备图。",
L"当启用时, 将在佣兵肖像右下角显示脸部装备图标",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"强制 Bobby Ray 出货",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_DutchText.cpp
+2
View File
@@ -4903,6 +4903,7 @@ STR16 zOptionsToggleText[] =
L"Activate New CTH system", // use NCTH
L"Show Face gear graphics", // TODO.Translate
L"Show Face gear icons",
L"Disable Cursor Swap", // Disable Cursor Swap // TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5007,6 +5008,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, New CTH system and cursor is used.",
L"When ON, you will see the equipped face gear on the merc portraits.", // TODO.Translate
L"When ON, you will see icons for the equipped face gear on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_EnglishText.cpp
+2
View File
@@ -4907,6 +4907,7 @@ STR16 zOptionsToggleText[] =
L"Use new Chance to Hit System", // use NCTH
L"Show Face Gear Graphics",
L"Show Face Gear Icons",
L"Disable Cursor Swap", // Disable Cursor Swap
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5011,6 +5012,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, the new chance to hit system and cursor is used.",
L"When ON, you will see the equipped face gear on the merc portraits.",
L"When ON, you will see icons for the equipped face gear on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_FrenchText.cpp
+2
View File
@@ -4908,6 +4908,7 @@ STR16 zOptionsToggleText[] =
L"Activate New CTH system", // use NCTH
L"Show Face gear graphics", // TODO.Translate
L"Show Face gear icons",
L"Disable Cursor Swap", // Disable Cursor Swap // TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5012,6 +5013,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, New CTH system and cursor is used.",
L"When ON, you will see the equipped face gear on the merc portraits.", // TODO.Translate
L"When ON, you will see icons for the equipped face gear on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_GermanText.cpp
+2
View File
@@ -4753,6 +4753,7 @@ STR16 zOptionsToggleText[] =
L"Neues Zielsystem verwenden", // use NCTH
L"Gesichtsequipment-Grafiken",
L"Gesichtsequipment-Icons",
L"Cursor-Wechsel deaktivieren", // Disable Cursor Swap // TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Erzwinge BR Lieferung", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -4857,6 +4858,7 @@ STR16 zOptionsScreenHelpText[] =
L"Wenn diese Funktion aktiviert ist, wird das neue Zielsystem und der neue Zielcursor verwendet.",
L"Wenn diese Funktion aktiviert ist, sehen sie das Gesichtsequipment Ihrer Söldner direkt auf dem Portrait.",
L"Wenn diese Funktion aktiviert ist, sehen sie Icons für das Gesichtsequipment in der rechten unteren Ecke des Portraits.",
L"Wenn diese Funktion aktiviert ist, wird der Mauscursor nicht automatisch wechseln zwischen Personen-Positionswechsel und weiteren Aktionen.\nFür manuellen Positionswechsel drücken Sie |x.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_ItalianText.cpp
+2
View File
@@ -4895,6 +4895,7 @@ STR16 zOptionsToggleText[] =
L"Activate New CTH system", // use NCTH
L"Show Face gear graphics", // TODO.Translate
L"Show Face gear icons",
L"Disable Cursor Swap", // Disable Cursor Swap // TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -4999,6 +5000,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, New CTH system and cursor is used.",
L"When ON, you will see the equipped face gear on the merc portraits.", // TODO.Translate
L"When ON, you will see icons for the equipped face gear on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_PolishText.cpp
+2
View File
@@ -4907,6 +4907,7 @@ STR16 zOptionsToggleText[] =
L"Activate New CTH system", // use NCTH
L"Show Face gear graphics", // TODO.Translate
L"Show Face gear icons",
L"Disable Cursor Swap", // Disable Cursor Swap // TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5011,6 +5012,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, New CTH system and cursor is used.",
L"When ON, you will see the equipped face gear on the merc portraits.", // TODO.Translate
L"When ON, you will see icons for the equipped face gear on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Wymuœ wszystkie oczekiwane dostawy od Bobby Ray's.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_RussianText.cpp
+2
View File
@@ -4896,6 +4896,7 @@ STR16 zOptionsToggleText[] =
L"Новая система прицеливания", // use NCTH
L"Показать снаряжение на голове", //Show Face gear graphics
L"Показать иконки снаряжения",
L"Disable Cursor Swap", // Disable Cursor Swap // TODO.Translate
L"--Читерские настройки--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Ускорить доставку Бобби Рэя", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5000,6 +5001,7 @@ STR16 zOptionsScreenHelpText[] =
L"Если включено, будет задействована новая система прицеливания \nи новый курсор прицеливания.",
L"Если включено, на портрете наёмника будет отображено одетое головное снаряжение.",
L"Если включено, в правом нижнем углу \nна портрете наёмника будут отображены иконки \nодетого головного снаряжения.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Выберите этот пункт чтобы груз Бобби Рэя прибыл немедленно.",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_TaiwaneseText.cpp
+2
View File
@@ -4908,6 +4908,7 @@ STR16 zOptionsToggleText[] =
L"Activate New CTH system", // use NCTH
L"Show Face gear graphics", // TODO.Translate
L"Show Face gear icons",
L"Disable Cursor Swap", // Disable Cursor Swap // TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Force Bobby Ray shipments", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5012,6 +5013,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, New CTH system and cursor is used.",
L"When ON, you will see the equipped face gear on the merc portraits.", // TODO.Translate
L"When ON, you will see icons for the equipped face gear on the merc portraits in the lower right corner.",
L"When ON, the cursor will not toggle between exchange position and other actions. Press |x to initiate quick exchange.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Force all pending Bobby Ray shipments",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",