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

Added ingame option to invert mouse wheel direction (by Iop)

Browse Source 
o Howto get synaptic touchpad working with 1.13: http://www.bears-pit.com/board/ubbthreads.php/topics/314276/Synaptic_touchpad_with_JA2_v1_.html#Post314276

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-01-19 20:08:11 +00:00
parent 56e08dbeae
commit f8531461d3
13 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+3
View File
@@ -259,6 +259,7 @@ BOOLEAN LoadGameSettings()
gGameSettings.fOptions[TOPTION_SHOW_LAST_ENEMY] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SHOW_LAST_ENEMY" , FALSE );
gGameSettings.fOptions[TOPTION_SHOW_LBE_CONTENT] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_SHOW_LBE_CONTENT" , TRUE );
gGameSettings.fOptions[TOPTION_INVERT_WHEEL] = iniReader.ReadBoolean("JA2 Game Settings","TOPTION_INVERT_WHEEL" , FALSE );
gGameSettings.fOptions[NUM_ALL_GAME_OPTIONS] = iniReader.ReadBoolean("JA2 Game Settings","NUM_ALL_GAME_OPTIONS" , FALSE );
@@ -419,6 +420,7 @@ BOOLEAN SaveGameSettings()
settings << "TOPTION_AUTO_FAST_FORWARD_MODE = " << (gGameSettings.fOptions[TOPTION_AUTO_FAST_FORWARD_MODE] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_SHOW_LAST_ENEMY = " << (gGameSettings.fOptions[TOPTION_SHOW_LAST_ENEMY] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_SHOW_LBE_CONTENT = " << (gGameSettings.fOptions[TOPTION_SHOW_LBE_CONTENT] ? "TRUE" : "FALSE" ) << endl;
settings << "TOPTION_INVERT_WHEEL = " << (gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? "TRUE" : "FALSE" ) << endl;
#ifdef ENABLE_ZOMBIES
settings << "TOPTION_ZOMBIES = " << (gGameSettings.fOptions[TOPTION_ZOMBIES] ? "TRUE" : "FALSE" ) << endl;
@@ -556,6 +558,7 @@ void InitGameSettings()
gGameSettings.fOptions[TOPTION_SHOW_LAST_ENEMY] = FALSE;
gGameSettings.fOptions[TOPTION_SHOW_LBE_CONTENT] = TRUE;
gGameSettings.fOptions[TOPTION_INVERT_WHEEL] = FALSE;
#ifdef ENABLE_ZOMBIES
gGameSettings.fOptions[ TOPTION_ZOMBIES ] = FALSE; // Flugente Zombies 1.0
GameSettings.h
+1
View File
@@ -94,6 +94,7 @@ enum
TOPTION_SHOW_LAST_ENEMY, //DBrot: show approximate locations for the last enemies
TOPTION_SHOW_LBE_CONTENT, //DBrot: toggle between the content of an lbe and its attachments
TOPTION_INVERT_WHEEL, //jikuja: invert mouse wheel
// arynn: Debug/Cheat
TOPTION_CHEAT_MODE_OPTIONS_HEADER,
Tactical/Real Time Input.cpp
+1
View File
@@ -1736,6 +1736,7 @@ void QueryRTWheels( UINT32 *puiNewEvent )
INT32 sMapPos=0;
UINT8 bID;
gViewportRegion.WheelState = gViewportRegion.WheelState * ( gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? -1 : 1 );
if ( gViewportRegion.uiFlags & MSYS_MOUSE_IN_AREA )
{
if (!GetMouseMapPos( &sMapPos ) )
Tactical/Turn Based Input.cpp
+1
View File
@@ -6822,6 +6822,7 @@ void QueryTBWheel( UINT32 *puiNewEvent )
INT32 usMapPos=0;
UINT8 bID;
gViewportRegion.WheelState = gViewportRegion.WheelState * ( gGameSettings.fOptions[TOPTION_INVERT_WHEEL] ? -1 : 1 );
// stub
if ( gViewportRegion.uiFlags & MSYS_MOUSE_IN_AREA )
{
Utils/_ChineseText.cpp
+2
View File
@@ -5137,6 +5137,7 @@ STR16 zOptionsToggleText[] =
L"区域物品栏弹窗匹配拾取", // the_bob : enable popups for picking items from sector inv
L"标记剩余敌人",
L"显示LBE(携行具)物品",
L"Invert mouse wheel", // TODO.Translate
L"--作弊模式选项--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"强制 Bobby Ray 送货", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5252,6 +5253,7 @@ STR16 zOptionsScreenHelpText[] =
L"打开时，在区域物品栏界面，点击佣兵身上空白的携行具位置会弹窗匹配拾取物品。",
L"打开时，会直接显示该区域最后一个敌人的大致位置。",
L"打开时，在区域物品栏界面，右键点击装有物品的携行具时可直接显示包含的物品。",
L"When ON, inverts mouse wheel directions.", // 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
@@ -5137,6 +5137,7 @@ STR16 zOptionsToggleText[] =
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Invert mouse wheel", // 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
@@ -5252,6 +5253,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"When ON, inverts mouse wheel directions.", // 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
@@ -5135,6 +5135,7 @@ STR16 zOptionsToggleText[] =
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv
L"Mark Remaining Hostiles",
L"Show LBE Content",
L"Invert mouse wheel",
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
@@ -5250,6 +5251,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.",
L"When ON, approximate locations of the last enemies in the sector are highlighted.",
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.",
L"When ON, inverts mouse wheel directions.",
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
@@ -5132,6 +5132,7 @@ STR16 zOptionsToggleText[] =
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Invert mouse wheel", // TODO.Translate
L"--Cheat Mode Options--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Forcer envois Bobby Ray", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5246,6 +5247,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"When ON, inverts mouse wheel directions.", // TODO.Translate
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_HEADER",
L"Forcer tous les envois en attente de Bobby Ray",
L"(text not rendered)TOPTION_CHEAT_MODE_OPTIONS_END",
Utils/_GermanText.cpp
+4 -2
View File
@@ -4982,7 +4982,8 @@ STR16 zOptionsToggleText[] =
#endif
L"Inventar Popup-Menüs", // the_bob : enable popups for picking items from sector inv
L"Übrige Feinde markieren",
L"Tascheninhalt anzeigen",
L"Tascheninhalt anzeigen",
L"Mausradrichtung umkehren",
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
@@ -5097,7 +5098,8 @@ STR16 zOptionsScreenHelpText[] =
#endif
L"Wenn diese Funktion aktiviert ist, und Sie mit der linken Maustaste auf einen freien Söldner-Inventarplatz klicken (während das Sektor-Inventar angezeigt wird), wird ein hilfreiches Popup-Menü eingeblendet.",
L"Wenn diese Funktion aktiviert ist, wird die ungefähre Postion der verbleibenden Feinde auf der Übersichtskarte schraffiert",
L"Wenn diese Funktion aktiviert ist, wird in der erweiterten Beschreibung von Tashen statt den Anbauteilen deren Inhalt angezeigt.",
L"Wenn diese Funktion aktiviert ist, wird in der erweiterten Beschreibung von Taschen statt den Anbauteilen deren Inhalt angezeigt.",
L"Wenn diese Funktion aktiviert ist, wird die Mausradrichtung umgekehrt",
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
@@ -5121,6 +5121,7 @@ STR16 zOptionsToggleText[] =
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Invert mouse wheel", // 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
@@ -5236,6 +5237,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"When ON, inverts mouse wheel directions.", // 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
@@ -5135,6 +5135,7 @@ STR16 zOptionsToggleText[] =
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Invert mouse wheel", // 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
@@ -5250,6 +5251,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"When ON, inverts mouse wheel directions.", // 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
@@ -5104,6 +5104,7 @@ STR16 zOptionsToggleText[] =
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Invert mouse wheel", // TODO.Translate
L"--Читерские настройки--", // TOPTION_CHEAT_MODE_OPTIONS_HEADER,
L"Ускорить доставку Бобби Рэя", // force all pending Bobby Ray shipments
L"-----------------", // TOPTION_CHEAT_MODE_OPTIONS_END
@@ -5219,6 +5220,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"When ON, inverts mouse wheel directions.", // 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
@@ -5139,6 +5139,7 @@ STR16 zOptionsToggleText[] =
L"Enable inventory popups", // the_bob : enable popups for picking items from sector inv // TODO.Translate
L"Mark Remaining Hostiles", //TODO.Translate
L"Show LBE Content", //TODO.Translate
L"Invert mouse wheel", // 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
@@ -5254,6 +5255,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, enables popup boxes that appear when you left click on empty merc inventory slots while viewing sector inventory in mapscreen.", // TODO.Translate
L"When ON, approximate locations of the last enemies in the sector are highlighted.", //TODO.Translate
L"When ON, show the contents of an LBE item, otherwise show the regular NAS interface.", //TODO.Translate
L"When ON, inverts mouse wheel directions.", // 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",