From 616d9a08e6604c6dee309cbb57684115b36dde03 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Tue, 12 Aug 2025 02:07:11 -0300 Subject: [PATCH 01/14] Fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected --- Strategic/Assignments.cpp | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 3645f296..3993c715 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -18251,7 +18251,6 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn INT32 iCounter = 0; SOLDIERTYPE *pSoldier = NULL; UINT8 ubNumberOfSelectedSoldiers = 0; - CHAR16 sString[ 128 ]; for( iCounter = 0; iCounter < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS; ++iCounter ) { @@ -18306,27 +18305,21 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn } } - // if there was anyone processed, check for success and inform player of failure - if( ubNumberOfSelectedSoldiers ) + if( ubNumberOfSelectedSoldiers == 0 ) { - if( fSuccess == FALSE ) - { - if( fWakeUp ) - { - // inform player not everyone could be woke up - swprintf( sString, pMapErrorString[ 27 ] ); - } - else - { - // inform player not everyone could be put to sleep - swprintf( sString, pMapErrorString[ 26 ]); - } + return fSuccess; + } - if( fDisplayWarning ) - { - DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL); - } - } + if( !fDisplayWarning ) { + return fSuccess; + } + + CHAR16 sString[ 128 ]; + swprintf( sString, fWakeUp ? pMapErrorString[ 27 ] : pMapErrorString[ 26 ] ); + if( gGameExternalOptions.fSleepDisplayFailNotification ) + { + // inform player not everyone could be woke up or put to sleep + DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL); } return( fSuccess ); From 11202d7e7e595012233a4c93874c4e42b355f6c0 Mon Sep 17 00:00:00 2001 From: Kitty <58940527+kitty624@users.noreply.github.com> Date: Thu, 14 Aug 2025 12:53:10 +0200 Subject: [PATCH 02/14] Expanded and sorted nationalities (#485) - added Tracona for use with UB, etc - sorted alphabetical (english) for more ease of use during IMP creation - that sorting starts only after original nationalities (from after Metaviran) - expanded and adjusted the existing ones - tried to achieve a decent amount from every continent - while sorting the language specific files, preserved existing translations - adjusted MercProfiles in related gamedir change --- Tactical/soldier profile type.h | 121 +++++++++++------ i18n/_ChineseText.cpp | 224 +++++++++++++++++++++----------- i18n/_DutchText.cpp | 220 ++++++++++++++++++++----------- i18n/_EnglishText.cpp | 220 ++++++++++++++++++++----------- i18n/_FrenchText.cpp | 220 ++++++++++++++++++++----------- i18n/_GermanText.cpp | 220 ++++++++++++++++++++----------- i18n/_ItalianText.cpp | 220 ++++++++++++++++++++----------- i18n/_PolishText.cpp | 220 ++++++++++++++++++++----------- i18n/_RussianText.cpp | 218 +++++++++++++++++++++---------- 9 files changed, 1258 insertions(+), 625 deletions(-) diff --git a/Tactical/soldier profile type.h b/Tactical/soldier profile type.h index 222d5401..e57155ee 100644 --- a/Tactical/soldier profile type.h +++ b/Tactical/soldier profile type.h @@ -242,15 +242,15 @@ typedef enum { // old Sirtech values AMERICAN_NAT = 0, // take that, Murica! Sirtech knew you have no value :-) - ARAB_NAT = 1, + ARAB_NAT = 1, AUSTRALIAN_NAT = 2, BRITISH_NAT = 3, CANADIAN_NAT = 4, CUBAN_NAT = 5, DANISH_NAT = 6, FRENCH_NAT = 7, - RUSSIAN_NAT = 8, - NIGERIAN_NAT = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing + RUSSIAN_NAT = 8, // kitty: changed 9 from nigerian (moved down) to traconian (UB takes place in Tracona) + TRACONIAN_NAT = 9, // this was simply not defined in original data (I did not find any country), but we can't have any holes in here, so just invented soemthing SWISS_NAT = 10, JAMAICAN_NAT = 11, POLISH_NAT = 12, @@ -261,64 +261,105 @@ typedef enum SCOTTISH_NAT = 17, ARULCAN_NAT = 18, GERMAN_NAT = 19, - AFRICAN_NAT = 20, + AFRICAN_NAT = 20, ITALIAN_NAT = 21, DUTCH_NAT = 22, ROMANIAN_NAT = 23, METAVIRAN_NAT = 24, // new values, because why not - GREEK_NAT, // 25 - ESTONIAN_NAT, - VENEZUELAN_NAT , - JAPANESE_NAT, - TURKISH_NAT, - INDIAN_NAT, // 30 - MEXICAN_NAT, - NORWEGIAN_NAT, - SPANISH_NAT, - BRASILIAN_NAT, - FINNISH_NAT, // 35 - IRANIAN_NAT, - ISRAELI_NAT, - BULGARIAN_NAT, - SWEDISH_NAT, - IRAQI_NAT, // 40 - SYRIAN_NAT, - BELGIAN_NAT, - PORTOGUESE_NAT, - BELARUSIAN_NAT, - SERBIAN_NAT, // 45 - PAKISTANI_NAT, + // kitty: + // added a few more and removed some, hoping to achieve a decent amount from every inhabited continent (plus one, in the 90's, relatively well-known fictional one) + // 0-24 original ja2 nationalities (except 9, see there) + // sorted non-original ones in (english) alphabetic order for some more ease of use during IMP creation + AFGHAN_NAT, // 25 ALBANIAN_NAT, ARGENTINIAN_NAT, ARMENIAN_NAT, - AZERBAIJANI_NAT, // 50 + AZERBAIJANI_NAT, + BANGLADESHI_NAT, // 30 + BELARUSIAN_NAT, + BELGIAN_NAT, + BENINESE_NAT, BOLIVIAN_NAT, - CHILEAN_NAT, - CIRCASSIAN_NAT, + BOSNIAN_NAT, // 35 + BRASILIAN_NAT, + BULGARIAN_NAT, + CAMBODIAN_NAT, + CHADIAN_NAT, + CHILEAN_NAT, // 40 COLUMBIAN_NAT, - EGYPTIAN_NAT, // 55 + CONGOLESE_NAT, + CROATIAN_NAT, + ECUADORIAN_NAT, + EGYPTIAN_NAT, // 45 + ENGLISH_NAT, + ERITREAN_NAT, + ESTONIAN_NAT, ETHIOPIAN_NAT, + FILIPINO_NAT, // 50 + FINNISH_NAT, GEORGIAN_NAT, + GREEK_NAT, + GUATEMALAN_NAT, + HAITIAN_NAT, // 55 + HONDURAN_NAT, + INDIAN_NAT, + INDONESIAN_NAT, + IRANIAN_NAT, + IRAQI_NAT, // 60 + ISLANDIC_NAT, + ISRAELI_NAT, + JAPANESE_NAT, JORDANIAN_NAT, - KAZAKHSTANI_NAT, - KENYAN_NAT, // 60 - KOREAN_NAT, + KAZAKHSTANI_NAT, // 65 + KOREAN_NAT, KYRGYZSTANI_NAT, + LAOTIAN_NAT, + LATVIAN_NAT, + LEBANESE_NAT, // 70 + LITHUANIAN_NAT, + LYBIAN_NAT, + MACEDONIAN_NAT, + MALAYSIAN_NAT, + MEXICAN_NAT, // 75 MONGOLIAN_NAT, - PALESTINIAN_NAT, - PANAMANIAN_NAT, // 65 - RHODESIAN_NAT, + MOROCCAN_NAT, + MOZAMBICAN_NAT, + MYANMA_NAT, + NAMIBIAN_NAT, // 80 + NICARAGUAN_NAT, + NIGERIAN_NAT, + NIGERIEN_NAT, + NORWEGIAN_NAT, + PAKISTANI_NAT, // 85 + PANAMANIAN_NAT, + PORTOGUESE_NAT, + RWANDANESE_NAT, SALVADORAN_NAT, - SAUDI_NAT, + SAUDI_NAT, // 90 + SERBIAN_NAT, + SLOVAKIAN_NAT, + SLOVENIAN_NAT, SOMALI_NAT, - THAI_NAT, // 70 + SPANISH_NAT, // 95 + SUDANESE_NAT, + SWEDISH_NAT, + SYRIAN_NAT, + THAI_NAT, + TOGOLESE_NAT, // 100 + TUNISIAN_NAT, + TURKISH_NAT, + UGANDAN_NAT, UKRAINIAN_NAT, + URUGUAYAN_NAT, // 105 UZBEKISTANI_NAT, + VENEZUELAN_NAT, + VIETNAMESE_NAT, WELSH_NAT, - YAZIDI_NAT, - ZIMBABWEAN_NAT, // 75 + YEMENI_NAT, // 110 + ZAMUNDAN_NAT, // Zamunda + ZIMBABWEAN_NAT, NUM_NATIONALITIES } Nationalities; diff --git a/i18n/_ChineseText.cpp b/i18n/_ChineseText.cpp index 56deb055..fa9f7f99 100644 --- a/i18n/_ChineseText.cpp +++ b/i18n/_ChineseText.cpp @@ -9424,13 +9424,13 @@ STR16 szNationalityText[]= L"丹麦人", L"法国人", L"俄国人", - L"尼日利亚人", + L"Tracona人", // (UB takes place in Tracona) L"瑞士人", // 10 L"牙买加人", L"波兰人", L"中国人", L"爱尔兰人", - L"南非人", // 15 + L"南非人", // 15 L"匈牙利人", L"苏格兰人", L"Arulco人", @@ -9442,57 +9442,94 @@ STR16 szNationalityText[]= L"Metavira人", // newly added from here on - L"希腊人", // 25 - L"爱沙尼亚人", - L"委内瑞拉人", - L"日本人", - L"土耳其人", - L"印度人", // 30 - L"墨西哥人", - L"挪威人", - L"西班牙人", - L"巴西人", - L"芬兰人", // 35 - L"伊朗人", - L"以色列人", - L"保加利亚人", - L"瑞典人", - L"伊拉克人", // 40 - L"叙利亚人", - L"比利时人", - L"葡萄牙人", - L"白俄罗斯人", - L"塞尔维亚人", // 45 - L"巴基斯坦人", + L"Afghan", // 25 L"Albanian", L"Argentinian", L"Armenian", - L"Azerbaijani", // 50 + L"Azerbaijani", + L"Bangladeshi ", // 30 + L"白俄罗斯人", + L"比利时人", + L"Beninese", L"Bolivian", - L"Chilean", - L"Circassian", + L"Bosnian", // 35 + L"巴西人", + L"保加利亚人", + L"Cambodian", + L"Chadian", + L"Chilean", // 40 L"Columbian", - L"Egyptian", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Egyptian", // 45 + L"English", + L"Eritrean", + L"爱沙尼亚人", L"Ethiopian", + L"Filipino", // 50 + L"芬兰人", L"Georgian", + L"希腊人", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"印度人", + L"Indonesian", + L"伊朗人", + L"伊拉克人", // 60 + L"Islandic", + L"以色列人", + L"日本人", L"Jordanian", - L"Kazakhstani", - L"Kenyan", // 60 + L"Kazakhstani", // 65 L"Korean", L"Kyrgyzstani", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"墨西哥人", // 75 L"Mongolian", - L"Palestinian", - L"Panamanian", // 65 - L"Rhodesian", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"尼日利亚人", + L"Nigerien", + L"挪威人", + L"Pakistani", // 85 + L"Panamanian", + L"葡萄牙人", + L"Rwandanese", L"Salvadoran", - L"Saudi", + L"Saudi", // 90 + L"塞尔维亚人", + L"Slovakian", + L"Slovenian", L"Somali", - L"Thai", // 70 + L"西班牙人", // 95 + L"Sudanese", + L"瑞典人", + L"叙利亚人", + L"Thai", + L"Togolese", // 100 + L"Tunisian", + L"土耳其人", + L"Ugandan", L"Ukrainian", + L"Uruguayan", // 105 L"Uzbekistani", + L"委内瑞拉人", + L"Vietnamese", L"Welsh", - L"Yazidi", - L"Zimbabwean", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Zimbabwean", }; STR16 szNationalityTextAdjective[] = @@ -9506,13 +9543,13 @@ STR16 szNationalityTextAdjective[] = L"丹麦人", L"法国人", L"俄国人", - L"尼日利亚人", + L"traconia人" // UB takes place in Tracona L"瑞士人", // 10 L"牙买加人", L"波兰人", L"中国人", L"爱尔兰人", - L"南非人", // 15 + L"南非人", // 15 L"匈牙利人", L"苏格兰人", L"Arulco人", @@ -9524,57 +9561,94 @@ STR16 szNationalityTextAdjective[] = L"Metavira人", // newly added from here on - L"希腊人", // 25 - L"爱沙尼亚人", - L"委内瑞拉人", - L"日本人", - L"土耳其人", - L"印度人", // 30 - L"墨西哥人", - L"挪威人", - L"西班牙人", - L"巴西人", - L"芬兰人", // 35 - L"伊朗人", - L"以色列人", - L"保加利亚人", - L"瑞典人", - L"伊拉克人", // 40 - L"叙利亚人", - L"比利时人", - L"葡萄牙人", - L"白俄罗斯人", - L"塞尔维亚人", // 45 - L"巴基斯坦人", + L"afghans", // 25 L"albanians", L"argentinians", L"armenians", - L"azerbaijani", // 50 + L"azerbaijani", + L"bangladeshi", // 30 + L"白俄罗斯人", + L"比利时人", + L"beninese", L"bolivians", - L"chileans", - L"circassians", + L"bosnians", // 35 + L"巴西人", + L"保加利亚人", + L"cambodians", + L"chadians", + L"chileans", // 40 L"columbians", - L"egyptians", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"egyptians", // 45 + L"englishmen", + L"eritreans", + L"爱沙尼亚人", L"ethiopians", + L"filipinos", // 50 + L"芬兰人", L"georgians", + L"希腊人", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"印度人", + L"indonesians", + L"伊朗人", + L"伊拉克人", // 60 + L"islandics", + L"以色列人", + L"日本人", L"jordanians", - L"kazakhstani", - L"kenyans", // 60 + L"kazakhstani", // 65 L"koreans", L"kyrgyzstani", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"墨西哥人", // 75 L"mongolians", - L"palestinians", - L"panamanians", // 65 - L"rhodesians", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"尼日利亚人", + L"nigeriens", + L"挪威人", + L"巴基斯坦人", // 85 + L"panamanians", + L"葡萄牙人", + L"rwandanese", L"salvadorans", - L"saudis", - L"somalis", - L"thais", // 70 + L"saudis", // 90 + L"塞尔维亚人", + L"slovakians", + L"slovenians", + L"somali", + L"西班牙人", // 95 + L"sudanese", + L"瑞典人", + L"叙利亚人", + L"thais", + L"togolese", // 100 + L"tunisians", + L"土耳其人", + L"ugandans", L"ukrainians", + L"uruguayans", // 105 L"uzbekistani", + L"委内瑞拉人", + L"vietnamese", L"welshs", - L"yazidis", - L"zimbabweans", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"zimbabweans", }; // special text used if we do not hate any nation (value of -1) diff --git a/i18n/_DutchText.cpp b/i18n/_DutchText.cpp index 580bb33c..c2413fac 100644 --- a/i18n/_DutchText.cpp +++ b/i18n/_DutchText.cpp @@ -9436,7 +9436,7 @@ STR16 szNationalityText[]= L"Danish", L"French", L"Russian", - L"Nigerian", + L"Traconian", L"Swiss", // 10 L"Jamaican", L"Polish", @@ -9454,57 +9454,94 @@ STR16 szNationalityText[]= L"Metaviran", // newly added from here on - L"Greek", // 25 - L"Estonian", - L"Venezuelan", - L"Japanese", - L"Turkish", - L"Indian", // 30 - L"Mexican", - L"Norwegian", - L"Spanish", - L"Brasilian", - L"Finnish", // 35 - L"Iranian", - L"Israeli", - L"Bulgarian", - L"Swedish", - L"Iraqi", // 40 - L"Syrian", - L"Belgian", - L"Portoguese", - L"Belarusian", // TODO.Translate - L"Serbian", // 45 - L"Pakistani", + L"Afghan", // 25 L"Albanian", L"Argentinian", L"Armenian", - L"Azerbaijani", // 50 + L"Azerbaijani", + L"Bangladeshi ", // 30 + L"Belarusian", + L"Belgian", + L"Beninese", L"Bolivian", - L"Chilean", - L"Circassian", + L"Bosnian", // 35 + L"Brasilian", + L"Bulgarian", + L"Cambodian", + L"Chadian", + L"Chilean", // 40 L"Columbian", - L"Egyptian", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Egyptian", // 45 + L"English", + L"Eritrean", + L"Estonian", L"Ethiopian", + L"Filipino", // 50 + L"Finnish", L"Georgian", + L"Greek", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"Indian", + L"Indonesian", + L"Iranian", + L"Iraqi", // 60 + L"Islandic", + L"Israeli", + L"Japanese", L"Jordanian", - L"Kazakhstani", - L"Kenyan", // 60 + L"Kazakhstani", // 65 L"Korean", L"Kyrgyzstani", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"Mexican", // 75 L"Mongolian", - L"Palestinian", - L"Panamanian", // 65 - L"Rhodesian", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"Nigerian", + L"Nigerien", + L"Norwegian", + L"Pakistani", // 85 + L"Panamanian", + L"Portoguese", + L"Rwandanese", L"Salvadoran", - L"Saudi", + L"Saudi", // 90 + L"Serbian", + L"Slovakian", + L"Slovenian", L"Somali", - L"Thai", // 70 + L"Spanish", // 95 + L"Sudanese", + L"Swedish", + L"Syrian", + L"Thai", + L"Togolese", // 100 + L"Tunisian", + L"Turkish", + L"Ugandan", L"Ukrainian", + L"Uruguayan", // 105 L"Uzbekistani", + L"Venezuelan", + L"Vietnamese", L"Welsh", - L"Yazidi", - L"Zimbabwean", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Zimbabwean", }; STR16 szNationalityTextAdjective[] = // TODO.Translate @@ -9518,7 +9555,7 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"danes", L"frenchmen", L"russians", - L"nigerians", + L"traconians", L"swiss", // 10 L"jamaicans", L"poles", @@ -9536,57 +9573,94 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"metavirans", // newly added from here on - L"greek", // 25 - L"estonians", - L"venezuelans", - L"japanese", - L"turks", - L"indians", // 30 - L"mexicans", - L"norwegians", - L"spaniards", - L"brasilians", - L"finns", // 35 - L"iranians", - L"israelis", - L"bulgarians", - L"swedes", - L"iraqis", // 40 - L"syrians", - L"belgians", - L"portoguese", - L"belarusian", - L"serbians", // 45 - L"pakistanis", + L"afghans", // 25 L"albanians", L"argentinians", L"armenians", - L"azerbaijani", // 50 + L"azerbaijani", + L"bangladeshi", // 30 + L"belarusians", + L"belgians", + L"beninese", L"bolivians", - L"chileans", - L"circassians", + L"bosnians", // 35 + L"brasilians", + L"bulgarians", + L"cambodians", + L"chadians", + L"chileans", // 40 L"columbians", - L"egyptians", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"egyptians", // 45 + L"englishmen", + L"eritreans", + L"estonians", L"ethiopians", + L"filipinos", // 50 + L"finns", L"georgians", + L"greek", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"indians", + L"indonesians", + L"iranians", + L"iraqis", // 60 + L"islandics", + L"israelis", + L"japanese", L"jordanians", - L"kazakhstani", - L"kenyans", // 60 + L"kazakhstani", // 65 L"koreans", L"kyrgyzstani", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"mexicans", // 75 L"mongolians", - L"palestinians", - L"panamanians", // 65 - L"rhodesians", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"nigerians", + L"nigeriens", + L"norwegians", + L"pakistanis", // 85 + L"panamanians", + L"portoguese", + L"rwandanese", L"salvadorans", - L"saudis", - L"somalis", - L"thais", // 70 + L"saudis", // 90 + L"serbians", + L"slovakians", + L"slovenians", + L"somali", + L"spaniards", // 95 + L"sudanese", + L"swedes", + L"syrians", + L"thais", + L"togolese", // 100 + L"tunisians", + L"turks", + L"ugandans", L"ukrainians", + L"uruguayans", // 105 L"uzbekistani", + L"venezuelans", + L"vietnamese", L"welshs", - L"yazidis", - L"zimbabweans", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"zimbabweans", }; // special text used if we do not hate any nation (value of -1) diff --git a/i18n/_EnglishText.cpp b/i18n/_EnglishText.cpp index 377ad755..00cee405 100644 --- a/i18n/_EnglishText.cpp +++ b/i18n/_EnglishText.cpp @@ -9424,7 +9424,7 @@ STR16 szNationalityText[]= L"Danish", L"French", L"Russian", - L"Nigerian", + L"Traconian", // UB takes place in Tracona L"Swiss", // 10 L"Jamaican", L"Polish", @@ -9442,57 +9442,94 @@ STR16 szNationalityText[]= L"Metaviran", // newly added from here on - L"Greek", // 25 - L"Estonian", - L"Venezuelan", - L"Japanese", - L"Turkish", - L"Indian", // 30 - L"Mexican", - L"Norwegian", - L"Spanish", - L"Brasilian", - L"Finnish", // 35 - L"Iranian", - L"Israeli", - L"Bulgarian", - L"Swedish", - L"Iraqi", // 40 - L"Syrian", - L"Belgian", - L"Portoguese", - L"Belarusian", - L"Serbian", // 45 - L"Pakistani", + L"Afghan", // 25 L"Albanian", L"Argentinian", L"Armenian", - L"Azerbaijani", // 50 + L"Azerbaijani", + L"Bangladeshi ", // 30 + L"Belarusian", + L"Belgian", + L"Beninese", L"Bolivian", - L"Chilean", - L"Circassian", + L"Bosnian", // 35 + L"Brasilian", + L"Bulgarian", + L"Cambodian", + L"Chadian", + L"Chilean", // 40 L"Columbian", - L"Egyptian", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Egyptian", // 45 + L"English", + L"Eritrean", + L"Estonian", L"Ethiopian", + L"Filipino", // 50 + L"Finnish", L"Georgian", + L"Greek", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"Indian", + L"Indonesian", + L"Iranian", + L"Iraqi", // 60 + L"Islandic", + L"Israeli", + L"Japanese", L"Jordanian", - L"Kazakhstani", - L"Kenyan", // 60 + L"Kazakhstani", // 65 L"Korean", L"Kyrgyzstani", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"Mexican", // 75 L"Mongolian", - L"Palestinian", - L"Panamanian", // 65 - L"Rhodesian", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"Nigerian", + L"Nigerien", + L"Norwegian", + L"Pakistani", // 85 + L"Panamanian", + L"Portoguese", + L"Rwandanese", L"Salvadoran", - L"Saudi", + L"Saudi", // 90 + L"Serbian", + L"Slovakian", + L"Slovenian", L"Somali", - L"Thai", // 70 + L"Spanish", // 95 + L"Sudanese", + L"Swedish", + L"Syrian", + L"Thai", + L"Togolese", // 100 + L"Tunisian", + L"Turkish", + L"Ugandan", L"Ukrainian", + L"Uruguayan", // 105 L"Uzbekistani", + L"Venezuelan", + L"Vietnamese", L"Welsh", - L"Yazidi", - L"Zimbabwean", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Zimbabwean", }; STR16 szNationalityTextAdjective[] = @@ -9506,7 +9543,7 @@ STR16 szNationalityTextAdjective[] = L"danes", L"frenchmen", L"russians", - L"nigerians", + L"traconians", L"swiss", // 10 L"jamaicans", L"poles", @@ -9524,57 +9561,94 @@ STR16 szNationalityTextAdjective[] = L"metavirans", // newly added from here on - L"greek", // 25 - L"estonians", - L"venezuelans", - L"japanese", - L"turks", - L"indians", // 30 - L"mexicans", - L"norwegians", - L"spaniards", - L"brasilians", - L"finns", // 35 - L"iranians", - L"israelis", - L"bulgarians", - L"swedes", - L"iraqis", // 40 - L"syrians", - L"belgians", - L"portoguese", - L"belarusians", - L"serbians", // 45 - L"pakistanis", + L"afghans", // 25 L"albanians", L"argentinians", L"armenians", - L"azerbaijani", // 50 + L"azerbaijani", + L"bangladeshi", // 30 + L"belarusians", + L"belgians", + L"beninese", L"bolivians", - L"chileans", - L"circassians", + L"bosnians", // 35 + L"brasilians", + L"bulgarians", + L"cambodians", + L"chadians", + L"chileans", // 40 L"columbians", - L"egyptians", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"egyptians", // 45 + L"englishmen", + L"eritreans", + L"estonians", L"ethiopians", + L"filipinos", // 50 + L"finns", L"georgians", + L"greek", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"indians", + L"indonesians", + L"iranians", + L"iraqis", // 60 + L"islandics", + L"israelis", + L"japanese", L"jordanians", - L"kazakhstani", - L"kenyans", // 60 + L"kazakhstani", // 65 L"koreans", L"kyrgyzstani", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"mexicans", // 75 L"mongolians", - L"palestinians", - L"panamanians", // 65 - L"rhodesians", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"nigerians", + L"nigeriens", + L"norwegians", + L"pakistanis", // 85 + L"panamanians", + L"portoguese", + L"rwandanese", L"salvadorans", - L"saudis", - L"somalis", - L"thais", // 70 + L"saudis", // 90 + L"serbians", + L"slovakians", + L"slovenians", + L"somali", + L"spaniards", // 95 + L"sudanese", + L"swedes", + L"syrians", + L"thais", + L"togolese", // 100 + L"tunisians", + L"turks", + L"ugandans", L"ukrainians", + L"uruguayans", // 105 L"uzbekistani", + L"venezuelans", + L"vietnamese", L"welshs", - L"yazidis", - L"zimbabweans", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"zimbabweans", }; // special text used if we do not hate any nation (value of -1) diff --git a/i18n/_FrenchText.cpp b/i18n/_FrenchText.cpp index fbd776a8..cc9980cb 100644 --- a/i18n/_FrenchText.cpp +++ b/i18n/_FrenchText.cpp @@ -9418,7 +9418,7 @@ STR16 szNationalityText[]= L"Danois", L"Français", L"Russe", - L"Nigérian", + L"Traconian", L"Suisse", // 10 L"Jamaïcain", L"Polonais", @@ -9436,57 +9436,94 @@ STR16 szNationalityText[]= L"Métavirien", // newly added from here on - L"Grec", // 25 - L"Estonien", - L"Vénézuélien", - L"Japonais", - L"Turc", - L"Indien", // 30 - L"Mexicain", - L"Norvégien", - L"Espagnol", - L"Brésilien", - L"Finlandais", // 35 - L"Iranien", - L"Israélien", - L"Bulgare", - L"Suédois", - L"Irakien", // 40 - L"Syrien", - L"Belge", - L"Portugais", - L"Belarusian", // TODO.Translate - L"Serbian", // 45 - L"Pakistani", + L"Afghan", // 25 L"Albanian", L"Argentinian", L"Armenian", - L"Azerbaijani", // 50 + L"Azerbaijani", + L"Bangladeshi ", // 30 + L"Belarusian", + L"Belge", + L"Beninese", L"Bolivian", - L"Chilean", - L"Circassian", + L"Bosnian", // 35 + L"Brésilien", + L"Bulgare", + L"Cambodian", + L"Chadian", + L"Chilean", // 40 L"Columbian", - L"Egyptian", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Egyptian", // 45 + L"English", + L"Eritrean", + L"Estonien", L"Ethiopian", + L"Filipino", // 50 + L"Finlandais", L"Georgian", + L"Grec", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"Indien", + L"Indonesian", + L"Iranien", + L"Irakien", // 60 + L"Islandic", + L"Israélien", + L"Japonais", L"Jordanian", - L"Kazakhstani", - L"Kenyan", // 60 + L"Kazakhstani", // 65 L"Korean", L"Kyrgyzstani", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"Mexicain", // 75 L"Mongolian", - L"Palestinian", - L"Panamanian", // 65 - L"Rhodesian", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"Nigérian", + L"Nigerien", + L"Norvégien", + L"Pakistani", // 85 + L"Panamanian", + L"Portugais", + L"Rwandanese", L"Salvadoran", - L"Saudi", + L"Saudi", // 90 + L"Serbian", + L"Slovakian", + L"Slovenian", L"Somali", - L"Thai", // 70 + L"Espagnol", // 95 + L"Sudanese", + L"Suédois", + L"Syrien", + L"Thai", + L"Togolese", // 100 + L"Tunisian", + L"Turc", + L"Ugandan", L"Ukrainian", + L"Uruguayan", // 105 L"Uzbekistani", + L"Vénézuélien", + L"Vietnamese", L"Welsh", - L"Yazidi", - L"Zimbabwean", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Zimbabwean", }; STR16 szNationalityTextAdjective[] = // TODO.Translate @@ -9500,7 +9537,7 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"danes", L"frenchmen", L"russians", - L"nigerians", + L"traconians", L"swiss", // 10 L"jamaicans", L"poles", @@ -9518,57 +9555,94 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"metavirans", // newly added from here on - L"greek", // 25 - L"estonians", - L"venezuelans", - L"japanese", - L"turks", - L"indians", // 30 - L"mexicans", - L"norwegians", - L"spaniards", - L"brasilians", - L"finns", // 35 - L"iranians", - L"israelis", - L"bulgarians", - L"swedes", - L"iraqis", // 40 - L"syrians", - L"belgians", - L"portoguese", - L"belarusian", - L"serbians", // 45 - L"pakistanis", + L"afghans", // 25 L"albanians", L"argentinians", L"armenians", - L"azerbaijani", // 50 + L"azerbaijani", + L"bangladeshi", // 30 + L"belarusians", + L"belgians", + L"beninese", L"bolivians", - L"chileans", - L"circassians", + L"bosnians", // 35 + L"brasilians", + L"bulgarians", + L"cambodians", + L"chadians", + L"chileans", // 40 L"columbians", - L"egyptians", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"egyptians", // 45 + L"englishmen", + L"eritreans", + L"estonians", L"ethiopians", + L"filipinos", // 50 + L"finns", L"georgians", + L"greek", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"indians", + L"indonesians", + L"iranians", + L"iraqis", // 60 + L"islandics", + L"israelis", + L"japanese", L"jordanians", - L"kazakhstani", - L"kenyans", // 60 + L"kazakhstani", // 65 L"koreans", L"kyrgyzstani", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"mexicans", // 75 L"mongolians", - L"palestinians", - L"panamanians", // 65 - L"rhodesians", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"nigerians", + L"nigeriens", + L"norwegians", + L"pakistanis", // 85 + L"panamanians", + L"portoguese", + L"rwandanese", L"salvadorans", - L"saudis", - L"somalis", - L"thais", // 70 + L"saudis", // 90 + L"serbians", + L"slovakians", + L"slovenians", + L"somali", + L"spaniards", // 95 + L"sudanese", + L"swedes", + L"syrians", + L"thais", + L"togolese", // 100 + L"tunisians", + L"turks", + L"ugandans", L"ukrainians", + L"uruguayans", // 105 L"uzbekistani", + L"venezuelans", + L"vietnamese", L"welshs", - L"yazidis", - L"zimbabweans", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"zimbabweans", }; // special text used if we do not hate any nation (value of -1) diff --git a/i18n/_GermanText.cpp b/i18n/_GermanText.cpp index 4b66db3f..cba8f6e5 100644 --- a/i18n/_GermanText.cpp +++ b/i18n/_GermanText.cpp @@ -9287,7 +9287,7 @@ STR16 szNationalityText[]= L"Danish", L"French", L"Russian", - L"Nigerian", + L"Traconian", L"Swiss", // 10 L"Jamaican", L"Polish", @@ -9305,57 +9305,94 @@ STR16 szNationalityText[]= L"Metaviran", // newly added from here on - L"Greek", // 25 - L"Estonian", - L"Venezuelan", - L"Japanese", - L"Turkish", - L"Indian", // 30 - L"Mexican", - L"Norwegian", - L"Spanish", - L"Brasilian", - L"Finnish", // 35 - L"Iranian", - L"Israeli", - L"Bulgarian", - L"Swedish", - L"Iraqi", // 40 - L"Syrian", - L"Belgian", - L"Portoguese", - L"Belarusian", // TODO.Translate - L"Serbian", // 45 - L"Pakistani", + L"Afghan", // 25 L"Albanian", L"Argentinian", L"Armenian", - L"Azerbaijani", // 50 + L"Azerbaijani", + L"Bangladeshi ", // 30 + L"Belarusian", + L"Belgian", + L"Beninese", L"Bolivian", - L"Chilean", - L"Circassian", + L"Bosnian", // 35 + L"Brasilian", + L"Bulgarian", + L"Cambodian", + L"Chadian", + L"Chilean", // 40 L"Columbian", - L"Egyptian", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Egyptian", // 45 + L"English", + L"Eritrean", + L"Estonian", L"Ethiopian", + L"Filipino", // 50 + L"Finnish", L"Georgian", + L"Greek", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"Indian", + L"Indonesian", + L"Iranian", + L"Iraqi", // 60 + L"Islandic", + L"Israeli", + L"Japanese", L"Jordanian", - L"Kazakhstani", - L"Kenyan", // 60 + L"Kazakhstani", // 65 L"Korean", L"Kyrgyzstani", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"Mexican", // 75 L"Mongolian", - L"Palestinian", - L"Panamanian", // 65 - L"Rhodesian", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"Nigerian", + L"Nigerien", + L"Norwegian", + L"Pakistani", // 85 + L"Panamanian", + L"Portoguese", + L"Rwandanese", L"Salvadoran", - L"Saudi", + L"Saudi", // 90 + L"Serbian", + L"Slovakian", + L"Slovenian", L"Somali", - L"Thai", // 70 + L"Spanish", // 95 + L"Sudanese", + L"Swedish", + L"Syrian", + L"Thai", + L"Togolese", // 100 + L"Tunisian", + L"Turkish", + L"Ugandan", L"Ukrainian", + L"Uruguayan", // 105 L"Uzbekistani", + L"Venezuelan", + L"Vietnamese", L"Welsh", - L"Yazidi", - L"Zimbabwean", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Zimbabwean", }; // TODO.Translate @@ -9370,7 +9407,7 @@ STR16 szNationalityTextAdjective[] = L"danes", L"frenchmen", L"russians", - L"nigerians", + L"traconians", L"swiss", // 10 L"jamaicans", L"poles", @@ -9388,57 +9425,94 @@ STR16 szNationalityTextAdjective[] = L"metavirans", // newly added from here on - L"greek", // 25 - L"estonians", - L"venezuelans", - L"japanese", - L"turks", - L"indians", // 30 - L"mexicans", - L"norwegians", - L"spaniards", - L"brasilians", - L"finns", // 35 - L"iranians", - L"israelis", - L"bulgarians", - L"swedes", - L"iraqis", // 40 - L"syrians", - L"belgians", - L"portoguese", - L"belarusian", - L"serbians", // 45 - L"pakistanis", + L"afghans", // 25 L"albanians", L"argentinians", L"armenians", - L"azerbaijani", // 50 + L"azerbaijani", + L"bangladeshi", // 30 + L"belarusians", + L"belgians", + L"beninese", L"bolivians", - L"chileans", - L"circassians", + L"bosnians", // 35 + L"brasilians", + L"bulgarians", + L"cambodians", + L"chadians", + L"chileans", // 40 L"columbians", - L"egyptians", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"egyptians", // 45 + L"englishmen", + L"eritreans", + L"estonians", L"ethiopians", + L"filipinos", // 50 + L"finns", L"georgians", + L"greek", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"indians", + L"indonesians", + L"iranians", + L"iraqis", // 60 + L"islandics", + L"israelis", + L"japanese", L"jordanians", - L"kazakhstani", - L"kenyans", // 60 + L"kazakhstani", // 65 L"koreans", L"kyrgyzstani", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"mexicans", // 75 L"mongolians", - L"palestinians", - L"panamanians", // 65 - L"rhodesians", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"nigerians", + L"nigeriens", + L"norwegians", + L"pakistanis", // 85 + L"panamanians", + L"portoguese", + L"rwandanese", L"salvadorans", - L"saudis", - L"somalis", - L"thais", // 70 + L"saudis", // 90 + L"serbians", + L"slovakians", + L"slovenians", + L"somali", + L"spaniards", // 95 + L"sudanese", + L"swedes", + L"syrians", + L"thais", + L"togolese", // 100 + L"tunisians", + L"turks", + L"ugandans", L"ukrainians", + L"uruguayans", // 105 L"uzbekistani", + L"venezuelans", + L"vietnamese", L"welshs", - L"yazidis", - L"zimbabweans", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"zimbabweans", }; // special text used if we do not hate any nation (value of -1) diff --git a/i18n/_ItalianText.cpp b/i18n/_ItalianText.cpp index 0601468b..c9e9dd39 100644 --- a/i18n/_ItalianText.cpp +++ b/i18n/_ItalianText.cpp @@ -9427,7 +9427,7 @@ STR16 szNationalityText[]= L"Danish", L"French", L"Russian", - L"Nigerian", + L"Traconian", L"Swiss", // 10 L"Jamaican", L"Polish", @@ -9445,57 +9445,94 @@ STR16 szNationalityText[]= L"Metaviran", // newly added from here on - L"Greek", // 25 - L"Estonian", - L"Venezuelan", - L"Japanese", - L"Turkish", - L"Indian", // 30 - L"Mexican", - L"Norwegian", - L"Spanish", - L"Brasilian", - L"Finnish", // 35 - L"Iranian", - L"Israeli", - L"Bulgarian", - L"Swedish", - L"Iraqi", // 40 - L"Syrian", - L"Belgian", - L"Portoguese", - L"Belarusian", // TODO.Translate - L"Serbian", // 45 - L"Pakistani", + L"Afghan", // 25 L"Albanian", L"Argentinian", L"Armenian", - L"Azerbaijani", // 50 + L"Azerbaijani", + L"Bangladeshi ", // 30 + L"Belarusian", + L"Belgian", + L"Beninese", L"Bolivian", - L"Chilean", - L"Circassian", + L"Bosnian", // 35 + L"Brasilian", + L"Bulgarian", + L"Cambodian", + L"Chadian", + L"Chilean", // 40 L"Columbian", - L"Egyptian", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Egyptian", // 45 + L"English", + L"Eritrean", + L"Estonian", L"Ethiopian", + L"Filipino", // 50 + L"Finnish", L"Georgian", + L"Greek", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"Indian", + L"Indonesian", + L"Iranian", + L"Iraqi", // 60 + L"Islandic", + L"Israeli", + L"Japanese", L"Jordanian", - L"Kazakhstani", - L"Kenyan", // 60 + L"Kazakhstani", // 65 L"Korean", L"Kyrgyzstani", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"Mexican", // 75 L"Mongolian", - L"Palestinian", - L"Panamanian", // 65 - L"Rhodesian", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"Nigerian", + L"Nigerien", + L"Norwegian", + L"Pakistani", // 85 + L"Panamanian", + L"Portoguese", + L"Rwandanese", L"Salvadoran", - L"Saudi", + L"Saudi", // 90 + L"Serbian", + L"Slovakian", + L"Slovenian", L"Somali", - L"Thai", // 70 + L"Spanish", // 95 + L"Sudanese", + L"Swedish", + L"Syrian", + L"Thai", + L"Togolese", // 100 + L"Tunisian", + L"Turkish", + L"Ugandan", L"Ukrainian", + L"Uruguayan", // 105 L"Uzbekistani", + L"Venezuelan", + L"Vietnamese", L"Welsh", - L"Yazidi", - L"Zimbabwean", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Zimbabwean", }; STR16 szNationalityTextAdjective[] = // TODO.Translate @@ -9509,7 +9546,7 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"danes", L"frenchmen", L"russians", - L"nigerians", + L"traconians", L"swiss", // 10 L"jamaicans", L"poles", @@ -9527,57 +9564,94 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"metavirans", // newly added from here on - L"greek", // 25 - L"estonians", - L"venezuelans", - L"japanese", - L"turks", - L"indians", // 30 - L"mexicans", - L"norwegians", - L"spaniards", - L"brasilians", - L"finns", // 35 - L"iranians", - L"israelis", - L"bulgarians", - L"swedes", - L"iraqis", // 40 - L"syrians", - L"belgians", - L"portoguese", - L"belarusian", - L"serbians", // 45 - L"pakistanis", + L"afghans", // 25 L"albanians", L"argentinians", L"armenians", - L"azerbaijani", // 50 + L"azerbaijani", + L"bangladeshi", // 30 + L"belarusians", + L"belgians", + L"beninese", L"bolivians", - L"chileans", - L"circassians", + L"bosnians", // 35 + L"brasilians", + L"bulgarians", + L"cambodians", + L"chadians", + L"chileans", // 40 L"columbians", - L"egyptians", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"egyptians", // 45 + L"englishmen", + L"eritreans", + L"estonians", L"ethiopians", + L"filipinos", // 50 + L"finns", L"georgians", + L"greek", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"indians", + L"indonesians", + L"iranians", + L"iraqis", // 60 + L"islandics", + L"israelis", + L"japanese", L"jordanians", - L"kazakhstani", - L"kenyans", // 60 + L"kazakhstani", // 65 L"koreans", L"kyrgyzstani", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"mexicans", // 75 L"mongolians", - L"palestinians", - L"panamanians", // 65 - L"rhodesians", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"nigerians", + L"nigeriens", + L"norwegians", + L"pakistanis", // 85 + L"panamanians", + L"portoguese", + L"rwandanese", L"salvadorans", - L"saudis", - L"somalis", - L"thais", // 70 + L"saudis", // 90 + L"serbians", + L"slovakians", + L"slovenians", + L"somali", + L"spaniards", // 95 + L"sudanese", + L"swedes", + L"syrians", + L"thais", + L"togolese", // 100 + L"tunisians", + L"turks", + L"ugandans", L"ukrainians", + L"uruguayans", // 105 L"uzbekistani", + L"venezuelans", + L"vietnamese", L"welshs", - L"yazidis", - L"zimbabweans", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"zimbabweans", }; // special text used if we do not hate any nation (value of -1) diff --git a/i18n/_PolishText.cpp b/i18n/_PolishText.cpp index f49fe637..a395a803 100644 --- a/i18n/_PolishText.cpp +++ b/i18n/_PolishText.cpp @@ -9440,7 +9440,7 @@ STR16 szNationalityText[]= L"Danish", L"French", L"Russian", - L"Nigerian", + L"Traconian", L"Swiss", // 10 L"Jamaican", L"Polish", @@ -9458,57 +9458,94 @@ STR16 szNationalityText[]= L"Metaviran", // newly added from here on - L"Greek", // 25 - L"Estonian", - L"Venezuelan", - L"Japanese", - L"Turkish", - L"Indian", // 30 - L"Mexican", - L"Norwegian", - L"Spanish", - L"Brasilian", - L"Finnish", // 35 - L"Iranian", - L"Israeli", - L"Bulgarian", - L"Swedish", - L"Iraqi", // 40 - L"Syrian", - L"Belgian", - L"Portoguese", - L"Belarusian", // TODO.Translate - L"Serbian", // 45 - L"Pakistani", + L"Afghan", // 25 L"Albanian", L"Argentinian", L"Armenian", - L"Azerbaijani", // 50 + L"Azerbaijani", + L"Bangladeshi ", // 30 + L"Belarusian", + L"Belgian", + L"Beninese", L"Bolivian", - L"Chilean", - L"Circassian", + L"Bosnian", // 35 + L"Brasilian", + L"Bulgarian", + L"Cambodian", + L"Chadian", + L"Chilean", // 40 L"Columbian", - L"Egyptian", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Egyptian", // 45 + L"English", + L"Eritrean", + L"Estonian", L"Ethiopian", + L"Filipino", // 50 + L"Finnish", L"Georgian", + L"Greek", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"Indian", + L"Indonesian", + L"Iranian", + L"Iraqi", // 60 + L"Islandic", + L"Israeli", + L"Japanese", L"Jordanian", - L"Kazakhstani", - L"Kenyan", // 60 + L"Kazakhstani", // 65 L"Korean", L"Kyrgyzstani", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"Mexican", // 75 L"Mongolian", - L"Palestinian", - L"Panamanian", // 65 - L"Rhodesian", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"Nigerian", + L"Nigerien", + L"Norwegian", + L"Pakistani", // 85 + L"Panamanian", + L"Portoguese", + L"Rwandanese", L"Salvadoran", - L"Saudi", + L"Saudi", // 90 + L"Serbian", + L"Slovakian", + L"Slovenian", L"Somali", - L"Thai", // 70 + L"Spanish", // 95 + L"Sudanese", + L"Swedish", + L"Syrian", + L"Thai", + L"Togolese", // 100 + L"Tunisian", + L"Turkish", + L"Ugandan", L"Ukrainian", + L"Uruguayan", // 105 L"Uzbekistani", + L"Venezuelan", + L"Vietnamese", L"Welsh", - L"Yazidi", - L"Zimbabwean", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Zimbabwean", }; STR16 szNationalityTextAdjective[] = // TODO.Translate @@ -9522,7 +9559,7 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"danes", L"frenchmen", L"russians", - L"nigerians", + L"traconians", L"swiss", // 10 L"jamaicans", L"poles", @@ -9540,57 +9577,94 @@ STR16 szNationalityTextAdjective[] = // TODO.Translate L"metavirans", // newly added from here on - L"greek", // 25 - L"estonians", - L"venezuelans", - L"japanese", - L"turks", - L"indians", // 30 - L"mexicans", - L"norwegians", - L"spaniards", - L"brasilians", - L"finns", // 35 - L"iranians", - L"israelis", - L"bulgarians", - L"swedes", - L"iraqis", // 40 - L"syrians", - L"belgians", - L"portoguese", - L"belarusian", - L"serbians", // 45 - L"pakistanis", + L"afghans", // 25 L"albanians", L"argentinians", L"armenians", - L"azerbaijani", // 50 + L"azerbaijani", + L"bangladeshi", // 30 + L"belarusians", + L"belgians", + L"beninese", L"bolivians", - L"chileans", - L"circassians", + L"bosnians", // 35 + L"brasilians", + L"bulgarians", + L"cambodians", + L"chadians", + L"chileans", // 40 L"columbians", - L"egyptians", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"egyptians", // 45 + L"englishmen", + L"eritreans", + L"estonians", L"ethiopians", + L"filipinos", // 50 + L"finns", L"georgians", + L"greek", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"indians", + L"indonesians", + L"iranians", + L"iraqis", // 60 + L"islandics", + L"israelis", + L"japanese", L"jordanians", - L"kazakhstani", - L"kenyans", // 60 + L"kazakhstani", // 65 L"koreans", L"kyrgyzstani", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"mexicans", // 75 L"mongolians", - L"palestinians", - L"panamanians", // 65 - L"rhodesians", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"nigerians", + L"nigeriens", + L"norwegians", + L"pakistanis", // 85 + L"panamanians", + L"portoguese", + L"rwandanese", L"salvadorans", - L"saudis", - L"somalis", - L"thais", // 70 + L"saudis", // 90 + L"serbians", + L"slovakians", + L"slovenians", + L"somali", + L"spaniards", // 95 + L"sudanese", + L"swedes", + L"syrians", + L"thais", + L"togolese", // 100 + L"tunisians", + L"turks", + L"ugandans", L"ukrainians", + L"uruguayans", // 105 L"uzbekistani", + L"venezuelans", + L"vietnamese", L"welshs", - L"yazidis", - L"zimbabweans", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"zimbabweans", }; // special text used if we do not hate any nation (value of -1) diff --git a/i18n/_RussianText.cpp b/i18n/_RussianText.cpp index 5b1a777e..b5bdf85d 100644 --- a/i18n/_RussianText.cpp +++ b/i18n/_RussianText.cpp @@ -9419,7 +9419,7 @@ STR16 szNationalityText[]= L"Датчанин", L"Француз", L"Русский", - L"Нигериец", + L"Traconian", // UB takes place in Tracona L"Швейцарец", // 10 L"Ямаец", L"Поляк", @@ -9437,57 +9437,94 @@ STR16 szNationalityText[]= L"Метавирец", // newly added from here on - L"Грек", // 25 - L"Эстонец", - L"Венесуэлец", - L"Японец", - L"Турок", - L"Индиец", // 30 - L"Мексиканец", - L"Норвежец", - L"Испанец", - L"Бразилец", - L"Финн", // 35 - L"Иранец", - L"Израильтянин", - L"Болгарин", - L"Швед", - L"Иракец", // 40 - L"Сириец", - L"Бельгиец", - L"Португалец", - L"Белорус", - L"Серб", // 45 - L"Пакистанец", + L"Afghan", // 25 L"Албанец", L"Аргентинец", L"Армянин", - L"Азербайджанец", // 50 + L"Азербайджанец", + L"Bangladeshi ", // 30 + L"Белорус", + L"Бельгиец", + L"Beninese", L"Боливиец", - L"Чилиец", - L"Черкес", + L"Bosnian", // 35 + L"Бразилец", + L"Болгарин", + L"Cambodian", + L"Chadian", + L"Чилиец", // 40 L"Колумбиец", - L"Египтянин", // 55 + L"Congolese", + L"Croatian", + L"Ecuadorian", + L"Египтянин", // 45 + L"English", + L"Eritrean", + L"Эстонец", L"Эфиоп", + L"Filipino", // 50 + L"Финн", L"Грузин", + L"Грек", + L"Guatemalan", + L"Haitian", // 55 + L"Honduran", + L"Индиец", + L"Indonesian", + L"Иранец", + L"Иракец", // 60 + L"Islandic", + L"Израильтянин", + L"Японец", L"Иорданец", - L"Казахстанец", - L"Кениец", // 60 + L"Казахстанец", // 65 L"Кореец", L"Кыргызстанец", + L"Laotian", + L"Latvian", + L"Lebanese", // 70 + L"Lithuanian", + L"Lybian", + L"Macedonian", + L"Malaysian", + L"Мексиканец", // 75 L"Монгол", - L"Палестинец", - L"Панамец", // 65 - L"Родезиец", + L"Moroccan", + L"Mozambican", + L"Myanma", + L"Namibian", // 80 + L"Nicaraguan", + L"Нигериец", + L"Nigerien", + L"Норвежец", + L"Пакистанец", // 85 + L"Панамец", + L"Португалец", + L"Rwandanese", L"Сальвадорец", - L"Саудовец", + L"Саудовец", // 90 + L"Серб", + L"Slovakian", + L"Slovenian", L"Сомалиец", - L"Таец", // 70 + L"Испанец", // 95 + L"Sudanese", + L"Швед", + L"Сириец", + L"Таец", + L"Togolese", // 100 + L"Tunisian", + L"Турок", + L"Ugandan", L"Украинец", + L"Uruguayan", // 105 L"Узбекистанец", + L"Венесуэлец", + L"Vietnamese", L"Валлиец", - L"Езид", - L"Зимбабвиец", // 75 + L"Yemeni", // 110 + L"Zamundan", // Zamunda + L"Зимбабвиец", }; STR16 szNationalityTextAdjective[] = @@ -9501,7 +9538,7 @@ STR16 szNationalityTextAdjective[] = L"датчан", L"французов", L"русских", - L"нигерийцев", + L"traconians", L"швейцарцев", // 10 L"ямайцев", L"поляков", @@ -9519,57 +9556,94 @@ STR16 szNationalityTextAdjective[] = L"метавирцев", // newly added from here on - L"греков", // 25 - L"эстонцев", - L"венесуэльцев", - L"японцев", - L"турков", - L"индийцев", // 30 - L"мексиканцев", - L"норвежцев", - L"испанцев", - L"бразильцев", - L"финнов", // 35 - L"иранцев", - L"израильтянинов", - L"болгаров", - L"шведов", - L"иракцев", // 40 - L"сирийцев", - L"бельгийцев", - L"португальцев", - L"белорусов", - L"сербов", // 45 - L"пакистанцев", + L"afghans", // 25 L"албанцев", L"аргентинцев", L"армян", - L"азербайджанцев", // 50 + L"азербайджанцев", + L"bangladeshi", // 30 + L"белорусов", + L"бельгийцев", + L"beninese", L"боливийцев", - L"чилийцев", - L"черкесов", + L"bosnians", // 35 + L"бразильцев", + L"болгаров", + L"cambodians", + L"chadians", + L"чилийцев", // 40 L"колумбийцев", - L"египтян", // 55 + L"congolese", + L"croatians", + L"ecuadorians", + L"египтян", // 45 + L"englishmen", + L"eritreans", + L"эстонцев", L"эфиопов", + L"filipinos", // 50 + L"финнов", L"грузин", + L"греков", + L"guatemalans", + L"haitians", // 55 + L"hondurans", + L"индийцев", + L"indonesians", + L"иранцев", + L"иракцев", // 60 + L"islandics", + L"израильтянинов", + L"японцев", L"иорданцев", - L"казахстанцев", - L"кенийцев", // 60 + L"казахстанцев", // 65 L"корейцев", L"кыргызстанцев", + L"laotians", + L"latvians", + L"lebanese", // 70 + L"lithuanians", + L"lybians", + L"macedonians", + L"malaysians", + L"мексиканцев", // 75 L"монголов", - L"палестинцев", - L"панамцев", // 65 - L"родезийцев", + L"moroccans", + L"mozambicans", + L"myanmarians", + L"namibians", // 80 + L"nicaraguans", + L"нигерийцев", + L"nigeriens", + L"норвежцев", + L"пакистанцев", // 85 + L"панамцев", + L"португальцев", + L"rwandanese", L"сальвадорцев", - L"саудовцев", + L"саудовцев", // 90 + L"сербов", + L"slovakians", + L"slovenians", L"сомалийцев", - L"тайцев", // 70 + L"испанцев", // 95 + L"sudanese", + L"шведов", + L"сирийцев", + L"тайцев", + L"togolese", // 100 + L"tunisians", + L"турков", + L"ugandans", L"украинцев", + L"uruguayans", // 105 L"узбекистанцев", + L"венесуэльцев", + L"vietnamese", L"валлийцев", - L"езидов", - L"зимбабвийцев", // 75 + L"yemenites", // 110 + L"zamundans", // Zamunda + L"зимбабвийцев", }; // special text used if we do not hate any nation (value of -1) From e8399bb7c8a78b5d30ab4c71217a57bc892eca79 Mon Sep 17 00:00:00 2001 From: BeatAroundTheBuscher <81776525+BeatAroundTheBuscher@users.noreply.github.com> Date: Fri, 15 Aug 2025 22:52:43 +0200 Subject: [PATCH 03/14] Make backpack AP stance costs depend on actual weight instead of a bool checking if a backpack is equipped or not (#486) * Externalize the Divisor for usBackPackWeight A new ini value BACKPACK_WEIGHT_FACTOR is introduced to replace the hard coded 50. The value goes from 1 to 250 and its default value is 50 as before. * Refactor usBPPenalty into its own function GetBackbackAPPenaltyFromBackpack The same code is also used in GetAPsCrouch as well as GetAPsProne The intent of the change is to make sure that backpacks including their content do not add an additional AP cost of +1. Now it checks if the backpack weight is > ubBackPackWeightFactorForAPPenalty (default value 50). The min exists to make sure that the AP cost does not become higher than previously. Previously the bool fBackpackCheck was used to add +1 if there is any backpack. But this also includes an empty tactical sling (backpack with 0.2 kg) and therefore makes the item much less interesting to use. --- Ja2/GameSettings.cpp | 3 +++ Ja2/GameSettings.h | 3 +++ Tactical/Points.cpp | 46 +++++++++++++++++++++++++++++--------------- Tactical/Points.h | 3 +++ 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/Ja2/GameSettings.cpp b/Ja2/GameSettings.cpp index cd796702..6f31793b 100644 --- a/Ja2/GameSettings.cpp +++ b/Ja2/GameSettings.cpp @@ -1679,6 +1679,9 @@ void LoadGameExternalOptions() //JMich.BackpackClimb gGameExternalOptions.sBackpackWeightToClimb = iniReader.ReadInteger("Tactical Gameplay Settings", "MAX_BACKPACK_WEIGHT_TO_CLIMB", -1); gGameExternalOptions.fUseGlobalBackpackSettings = iniReader.ReadBoolean("Tactical Gameplay Settings", "USE_GLOBAL_BACKPACK_SETTINGS", TRUE); + + // Buscher + gGameExternalOptions.ubBackPackWeightFactorForAPPenalty = iniReader.ReadInteger("Tactical Gameplay Settings", "BACKPACK_WEIGHT_FACTOR", 50, 1, 250); // sevenfm gGameExternalOptions.fShowEnemyWeapon = iniReader.ReadBoolean("Tactical Gameplay Settings","SHOW_ENEMY_WEAPON", FALSE); diff --git a/Ja2/GameSettings.h b/Ja2/GameSettings.h index 6148086c..74fba2dd 100644 --- a/Ja2/GameSettings.h +++ b/Ja2/GameSettings.h @@ -1361,6 +1361,9 @@ typedef struct INT16 sBackpackWeightToClimb; BOOLEAN fUseGlobalBackpackSettings; + // Buscher + UINT8 ubBackPackWeightFactorForAPPenalty; + // sevenfm: show enemy weapon above soldier in tactical BOOLEAN fShowEnemyWeapon; BOOLEAN fShowEnemyExtendedInfo; diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index ee07e3f0..927425f9 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -604,19 +604,7 @@ INT16 ActionPointCost( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 bDir, UINT16 u UINT16 usBPPenalty = APBPConstants[AP_MODIFIER_PACK]; if ( bSlot == BPACKPOCKPOS ) //Backpack caried on back { - OBJECTTYPE * pObj = &( pSoldier->inv[ BPACKPOCKPOS ] ); - UINT16 usBackPackWeight = CalculateObjectWeight( pObj ); - // CalculateObjectWeight checks for active LBE gear. Unfortunatly our backpack is not active since we are carying it. - // Sounds not intuitive at all, active means the LBE caries items (marked with blue *), but when put on the LBE adittional slots of our soldier - // are activated where something can be carried. So we have to add the weights of those slots as well. - std::vector vbLBESlots; - GetLBESlots( BPACKPOCKPOS, vbLBESlots ); - for ( UINT8 i = 0; i < vbLBESlots.size() ; i++ ) - { - pObj = &( pSoldier->inv[ vbLBESlots[ i ] ] ); - usBackPackWeight += CalculateObjectWeight( pObj ); - } - usBPPenalty = min( ( usBackPackWeight / 50 ), usBPPenalty ); //1 AP penalty for each 5kg of weight up to the penalty defined by AP_MODIFIER_PACK (default = 4) + usBPPenalty = GetBackbackAPPenaltyFromBackpack(pSoldier); } else //Backpack caried not on back (maybe somewhere inside another LBE or in Hand?) { @@ -3979,7 +3967,8 @@ INT16 GetAPsCrouch( SOLDIERTYPE *pSoldier, BOOLEAN fBackpackCheck ) // if backpack and new inventory if ( fBackpackCheck && (UsingNewInventorySystem() == true) && pSoldier->inv[BPACKPOCKPOS].exists() == true && !pSoldier->flags.ZipperFlag) - iFinalAPsToCrouch += fBackpackCheck;//dnl ch70 160913 was 1 + // min was added to stick with the behaviour above (+1) assuming the backpack is heavier than BACKPACK_WEIGHT_FACTOR + iFinalAPsToCrouch += min(1, GetBackbackAPPenaltyFromBackpack(pSoldier)); // -x% APs needed to change stance for MA trait if ( HAS_SKILL_TRAIT( pSoldier, MARTIAL_ARTS_NT ) && ( gGameOptions.fNewTraitSystem )) @@ -3999,7 +3988,8 @@ INT16 GetAPsProne( SOLDIERTYPE *pSoldier, BOOLEAN fBackpackCheck ) // if backpack and new inventory if ( fBackpackCheck && (UsingNewInventorySystem() == true) && pSoldier->inv[BPACKPOCKPOS].exists() == true && !pSoldier->flags.ZipperFlag) - iFinalAPsToLieDown += fBackpackCheck;//dnl ch70 160913 was 1 + // min was added to stick with the behaviour above (+1) assuming the backpack is heavier than BACKPACK_WEIGHT_FACTOR + iFinalAPsToLieDown += min(1, GetBackbackAPPenaltyFromBackpack(pSoldier)); // -x% APs needed to change stance for MA trait if ( HAS_SKILL_TRAIT( pSoldier, MARTIAL_ARTS_NT ) && ( gGameOptions.fNewTraitSystem )) @@ -4403,3 +4393,29 @@ INT16 GetAPsToStartDrag(SOLDIERTYPE *pSoldier, BOOLEAN fStance) return sAPCost; } +INT16 GetBackbackAPPenaltyFromBackpack(SOLDIERTYPE *pSoldier) +{ + UINT16 usBPPenalty = 0; + OBJECTTYPE * pObj = &( pSoldier->inv[ BPACKPOCKPOS ] ); + + if ((UsingNewInventorySystem() == true) && pSoldier->inv[BPACKPOCKPOS].exists() && pObj != NULL) + { + UINT16 usBackPackWeight = CalculateObjectWeight( pObj ); + // CalculateObjectWeight checks for active LBE gear. Unfortunatly our backpack is not active since we are carying it. + // Sounds not intuitive at all, active means the LBE caries items (marked with blue *), but when put on the LBE adittional slots of our soldier + // are activated where something can be carried. So we have to add the weights of those slots as well. + std::vector vbLBESlots; + GetLBESlots( BPACKPOCKPOS, vbLBESlots ); + for ( UINT8 i = 0; i < vbLBESlots.size() ; i++ ) + { + pObj = &( pSoldier->inv[ vbLBESlots[ i ] ] ); + usBackPackWeight += CalculateObjectWeight( pObj ); + } + //1 AP penalty for each 5kg of weight up to the penalty defined by AP_MODIFIER_PACK (default = 4) + // BUSCHER: Externalized the weight factor (previously 50 = 5.0 kg) + // usBPPenalty = min( ( usBackPackWeight / 50 ), usBPPenalty ); + usBPPenalty = min( ( usBackPackWeight / gGameExternalOptions.ubBackPackWeightFactorForAPPenalty), APBPConstants[AP_MODIFIER_PACK] ); + + } + return usBPPenalty; +} \ No newline at end of file diff --git a/Tactical/Points.h b/Tactical/Points.h index 7ca66c9d..9bf9dec9 100644 --- a/Tactical/Points.h +++ b/Tactical/Points.h @@ -391,4 +391,7 @@ INT32 GetBPCostForRecoilkick( SOLDIERTYPE * pSoldier ); INT16 GetAPsToBreakWindow(SOLDIERTYPE *pSoldier, BOOLEAN fStance); INT16 GetAPsToStartDrag(SOLDIERTYPE *pSoldier, BOOLEAN fStance); +// Buscher +INT16 GetBackbackAPPenaltyFromBackpack(SOLDIERTYPE *pSoldier); + #endif From e9b12908f7ccd81b3ac9fea012ebcb1448a0fc79 Mon Sep 17 00:00:00 2001 From: BeatAroundTheBuscher <81776525+BeatAroundTheBuscher@users.noreply.github.com> Date: Sat, 16 Aug 2025 03:40:43 +0200 Subject: [PATCH 04/14] ASD/ARC: Fix Error by One in gasCan Vector (#472) * ASD/ARC: Fix Error by One in gasCan Vector * Add size check for the gasCan vector as part of ARC * Remove unused Vectors for ARC --- Strategic/Rebel Command.cpp | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/Strategic/Rebel Command.cpp b/Strategic/Rebel Command.cpp index 2f8a05c2..7c169657 100644 --- a/Strategic/Rebel Command.cpp +++ b/Strategic/Rebel Command.cpp @@ -129,21 +129,10 @@ namespace ItemIdCache { // cache these values on load so that we don't need to search for them every time something happens std::vector gasCans; - std::vector firstAidKits; - std::vector medKits; - std::vector toolKits; - std::vector ammo[10]; // coolness void Clear() { gasCans.clear(); - firstAidKits.clear(); - medKits.clear(); - toolKits.clear(); - for (int i = 0; i < 10; ++i) - { - ammo[i].clear(); - } } } @@ -4418,23 +4407,6 @@ void SetupInfo() for (UINT16 i = 0; i < MAXITEMS; ++i) { if (ItemIsGascan(i)) ItemIdCache::gasCans.push_back(i); - else if (ItemIsFirstAidKit(i)) ItemIdCache::firstAidKits.push_back(i); - else if (ItemIsMedicalKit(i)) ItemIdCache::medKits.push_back(i); - else if (ItemIsToolkit(i)) ItemIdCache::toolKits.push_back(i); - else if (Item[i].usItemClass & IC_AMMO) - { - if (Magazine[Item[i].ubClassIndex].ubMagType == AMMO_BOX) - { - if ((gGameOptions.fGunNut || !ItemIsOnlyInTonsOfGuns(i)) - && (gGameOptions.ubGameStyle == STYLE_SCIFI || !ItemIsOnlyInScifi(i))) - { - // coolness runs from 1-10, so apply offset - const UINT8 coolness = min(max(1, Item[i].ubCoolness), 10); - ItemIdCache::ammo[coolness-1].push_back(i); - } - } - } - } } @@ -4772,8 +4744,10 @@ void ApplyAdditionalASDEffects() { case MissionHelpers::DISRUPT_ASD_STEAL_FUEL: { - // spawn a gas can - CreateItemAtAirport(ItemIdCache::gasCans.at(ItemIdCache::gasCans.size()), 75 + Random(26)); + // only spawn a gas can if at least one gas can is known by the game (ItemIsGascan) + if (ItemIdCache::gasCans.size() > 0) + // The gas can is spawned like a Bobby Ray delivery (you need to open the crate) + CreateItemAtAirport(ItemIdCache::gasCans.at(ItemIdCache::gasCans.size() -1), 75 + Random(26)); // say it came from the ASD's reserves AddStrategicAIResources(ASD_FUEL, -(gGameExternalOptions.gASDResource_Fuel_Jeep + Random(gGameExternalOptions.gASDResource_Fuel_Jeep))); From ed00830202dec89eadeb4fae61b2d60b0bfa23b2 Mon Sep 17 00:00:00 2001 From: BeatAroundTheBuscher <81776525+BeatAroundTheBuscher@users.noreply.github.com> Date: Sun, 17 Aug 2025 03:01:12 +0200 Subject: [PATCH 05/14] Fixes Upper/Lower Casing for include paths (#487) * Fixing upper/lower case for includes types.h, zconf.h and zlib.h were renamed so that global includes like Types.h are not used. --- CMakeLists.txt | 2 +- Console/Cursors.cpp | 2 +- Console/Dialogs.cpp | 2 +- Console/FileStream.cpp | 2 +- Editor/Button Defines.h | 2 +- Editor/Cursor Modes.cpp | 2 +- Editor/Cursor Modes.h | 2 +- Editor/Editor Callback Prototypes.h | 2 +- Editor/Editor Modes.cpp | 2 +- Editor/Editor Modes.h | 2 +- Editor/Editor Taskbar Creation.cpp | 4 +- Editor/Editor Taskbar Creation.h | 2 +- Editor/Editor Taskbar Utils.cpp | 4 +- Editor/Editor Taskbar Utils.h | 2 +- Editor/Editor Undo.cpp | 4 +- Editor/Editor Undo.h | 2 +- Editor/EditorBuildings.cpp | 2 +- Editor/EditorBuildings.h | 2 +- Editor/EditorDefines.h | 4 +- Editor/EditorItems.cpp | 20 ++--- Editor/EditorItems.h | 2 +- Editor/EditorMapInfo.cpp | 18 ++--- Editor/EditorMapInfo.h | 2 +- Editor/EditorMercs.cpp | 20 ++--- Editor/EditorMercs.h | 2 +- Editor/EditorTerrain.cpp | 8 +- Editor/EditorTerrain.h | 2 +- Editor/Item Statistics.cpp | 6 +- Editor/Item Statistics.h | 2 +- Editor/LoadScreen.cpp | 4 +- Editor/LoadScreen.h | 4 +- Editor/Road Smoothing.cpp | 2 +- Editor/Road Smoothing.h | 2 +- Editor/Sector Summary.cpp | 8 +- Editor/Sector Summary.h | 2 +- Editor/SmartMethod.h | 2 +- Editor/Smoothing Utils.h | 2 +- Editor/Summary Info.h | 4 +- Editor/edit_sys.h | 2 +- Editor/editscreen.cpp | 18 ++--- Editor/editscreen.h | 2 +- Editor/messagebox.cpp | 2 +- Editor/messagebox.h | 2 +- Editor/newsmooth.cpp | 2 +- Editor/newsmooth.h | 2 +- Editor/popupmenu.cpp | 12 +-- Editor/popupmenu.h | 2 +- Editor/selectwin.cpp | 2 +- Editor/selectwin.h | 4 +- Editor/smooth.cpp | 6 +- Editor/smooth.h | 2 +- Ja2/Credits.cpp | 22 +++--- Ja2/Fade Screen.cpp | 8 +- Ja2/FeaturesScreen.cpp | 20 ++--- Ja2/GameInitOptionsScreen.cpp | 14 ++-- Ja2/GameSettings.cpp | 10 +-- Ja2/GameSettings.h | 2 +- Ja2/GameVersion.cpp | 2 +- Ja2/HelpScreen.cpp | 14 ++-- Ja2/Init.cpp | 16 ++-- Ja2/Intro.cpp | 10 +-- Ja2/JA2 Splash.cpp | 4 +- Ja2/Ja25Update.cpp | 36 ++++----- Ja2/Ja25Update.h | 2 +- Ja2/Loading Screen.cpp | 8 +- Ja2/MPChatScreen.cpp | 12 +-- Ja2/MPConnectScreen.cpp | 16 ++-- Ja2/MPHostScreen.cpp | 18 ++--- Ja2/MPJoinScreen.cpp | 18 ++--- Ja2/MPScoreScreen.cpp | 12 +-- Ja2/MainMenuScreen.cpp | 28 +++---- Ja2/MessageBoxScreen.cpp | 12 +-- Ja2/Options Screen.cpp | 20 ++--- Ja2/SaveLoadGame.cpp | 66 ++++++++--------- Ja2/SaveLoadScreen.cpp | 24 +++--- Ja2/Screens.h | 4 +- Ja2/TimeLogging.h | 2 +- Ja2/aniviewscreen.cpp | 8 +- Ja2/builddefines.h | 2 +- Ja2/gameloop.cpp | 14 ++-- Ja2/gameloop.h | 2 +- Ja2/gamescreen.cpp | 48 ++++++------ Ja2/gamescreen.h | 2 +- Ja2/jascreens.cpp | 30 ++++---- Ja2/jascreens.h | 2 +- Ja2/legion cfg.cpp | 24 +++--- Ja2/ub_config.cpp | 24 +++--- Laptop/AimFacialIndex.cpp | 4 +- Laptop/AimMembers.cpp | 26 +++---- Laptop/AimSort.cpp | 2 +- Laptop/BobbyR.cpp | 8 +- Laptop/BobbyRAmmo.cpp | 2 +- Laptop/BobbyRGuns.cpp | 6 +- Laptop/BobbyRMailOrder.cpp | 6 +- Laptop/BobbyRShipments.cpp | 8 +- Laptop/BriefingRoom.cpp | 4 +- Laptop/BriefingRoomM.cpp | 4 +- Laptop/BrokenLink.cpp | 6 +- Laptop/CampaignHistoryMain.cpp | 2 +- Laptop/CampaignStats.cpp | 2 +- Laptop/CharProfile.cpp | 4 +- Laptop/Encyclopedia_Data_new.cpp | 2 +- Laptop/Encyclopedia_new.cpp | 2 +- Laptop/FacilityProduction.cpp | 2 +- Laptop/IMP AboutUs.cpp | 4 +- Laptop/IMP Attribute Entrance.cpp | 4 +- Laptop/IMP Attribute Finish.cpp | 4 +- Laptop/IMP Attribute Selection.cpp | 6 +- Laptop/IMP Background.cpp | 10 +-- Laptop/IMP Background.h | 2 +- Laptop/IMP Begin Screen.cpp | 10 +-- Laptop/IMP Character Trait.cpp | 10 +-- Laptop/IMP Character Trait.h | 2 +- .../IMP Character and Disability Entrance.cpp | 6 +- Laptop/IMP Color Choosing.cpp | 10 +-- Laptop/IMP Color Choosing.h | 2 +- Laptop/IMP Compile Character.cpp | 4 +- Laptop/IMP Confirm.cpp | 10 +-- Laptop/IMP Disability Trait.cpp | 10 +-- Laptop/IMP Disability Trait.h | 2 +- Laptop/IMP Finish.cpp | 6 +- Laptop/IMP Gear Entrance.cpp | 4 +- Laptop/IMP Gear Entrance.h | 2 +- Laptop/IMP Gear.cpp | 10 +-- Laptop/IMP Gear.h | 2 +- Laptop/IMP HomePage.cpp | 4 +- Laptop/IMP MainPage.cpp | 4 +- Laptop/IMP Minor Trait.cpp | 10 +-- Laptop/IMP Minor Trait.h | 2 +- Laptop/IMP Personality Entrance.cpp | 4 +- Laptop/IMP Personality Finish.cpp | 4 +- Laptop/IMP Personality Quiz.cpp | 4 +- Laptop/IMP Portraits.cpp | 4 +- Laptop/IMP Prejudice.cpp | 10 +-- Laptop/IMP Prejudice.h | 2 +- Laptop/IMP Skill Trait.cpp | 10 +-- Laptop/IMP Skill Trait.h | 2 +- Laptop/IMP Text System.cpp | 10 +-- Laptop/IMP Voices.cpp | 6 +- Laptop/IMPVideoObjects.cpp | 2 +- Laptop/Intelmarket.cpp | 2 +- Laptop/MilitiaWebsite.cpp | 4 +- Laptop/PMC.cpp | 4 +- Laptop/PostalService.cpp | 4 +- Laptop/PostalService.h | 12 +-- Laptop/Store Inventory.cpp | 8 +- Laptop/WHO.cpp | 2 +- Laptop/XML_DeliveryMethods.cpp | 6 +- Laptop/XML_ShippingDestinations.cpp | 6 +- Laptop/aim.cpp | 4 +- Laptop/email.cpp | 8 +- Laptop/files.cpp | 8 +- Laptop/finances.cpp | 6 +- Laptop/florist Order Form.cpp | 10 +-- Laptop/history.cpp | 10 +-- Laptop/insurance Contract.cpp | 6 +- Laptop/insurance.cpp | 2 +- Laptop/laptop.cpp | 22 +++--- Laptop/laptop.h | 2 +- Laptop/merccompare.cpp | 2 +- Laptop/mercs Account.cpp | 4 +- Laptop/mercs Files.cpp | 8 +- Laptop/mercs No Account.cpp | 2 +- Laptop/mercs.cpp | 8 +- Laptop/personnel.cpp | 8 +- Laptop/personnel.h | 2 +- Laptop/sirtech.cpp | 2 +- ModularizedTacticalAI/src/LegacyAIPlan.cpp | 2 +- .../src/LegacyAIPlanFactory.cpp | 2 +- .../src/LegacyArmedVehiclePlan.cpp | 2 +- ModularizedTacticalAI/src/Plan.cpp | 4 +- Multiplayer/client.cpp | 52 ++++++------- Multiplayer/connect.h | 2 +- Multiplayer/raknet/Gen_RPC8.h | 2 +- Multiplayer/server.cpp | 10 +-- Multiplayer/transfer_rules.cpp | 2 +- Strategic/AI Viewer.cpp | 8 +- Strategic/ASD.cpp | 6 +- Strategic/ASD.h | 2 +- Strategic/Assignments.cpp | 18 ++--- Strategic/Assignments.h | 2 +- Strategic/Auto Resolve.cpp | 14 ++-- Strategic/Campaign Init.cpp | 4 +- Strategic/Creature Spreading.cpp | 6 +- Strategic/Facilities.cpp | 2 +- Strategic/Facilities.h | 2 +- Strategic/Game Clock.cpp | 10 +-- Strategic/Game Event Hook.cpp | 14 ++-- Strategic/Game Events.cpp | 2 +- Strategic/Game Init.cpp | 30 ++++---- Strategic/Hourly Update.cpp | 2 +- Strategic/Ja25 Strategic Ai.cpp | 38 +++++----- Strategic/LuaInitNPCs.cpp | 2 +- Strategic/LuaInitNPCs.h | 2 +- Strategic/Luaglobal.h | 2 +- Strategic/Map Screen Helicopter.cpp | 12 +-- Strategic/Map Screen Helicopter.h | 2 +- Strategic/Map Screen Interface Border.cpp | 2 +- Strategic/Map Screen Interface Border.h | 2 +- Strategic/Map Screen Interface Bottom.cpp | 16 ++-- .../Map Screen Interface Map Inventory.cpp | 6 +- Strategic/Map Screen Interface Map.cpp | 2 +- .../Map Screen Interface TownMine Info.cpp | 6 +- .../Map Screen Interface TownMine Info.h | 2 +- Strategic/Map Screen Interface.cpp | 14 ++-- Strategic/Map Screen Interface.h | 2 +- Strategic/MapScreen Quotes.cpp | 10 +-- Strategic/Meanwhile.cpp | 32 ++++---- Strategic/Merc Contract.cpp | 10 +-- Strategic/MilitiaIndividual.cpp | 2 +- Strategic/MilitiaSquads.cpp | 6 +- Strategic/MilitiaSquads.h | 4 +- Strategic/MiniEvents.h | 2 +- Strategic/Player Command.cpp | 14 ++-- Strategic/PreBattle Interface.cpp | 12 +-- Strategic/Queen Command.cpp | 14 ++-- Strategic/Quest Debug System.cpp | 22 +++--- Strategic/Quests.cpp | 16 ++-- Strategic/Rebel Command.cpp | 2 +- Strategic/Rebel Command.h | 2 +- Strategic/Reinforcement.cpp | 6 +- Strategic/Scheduling.cpp | 8 +- Strategic/Scheduling.h | 2 +- Strategic/Strategic AI.cpp | 4 +- Strategic/Strategic Event Handler.cpp | 8 +- Strategic/Strategic Event Handler.h | 2 +- Strategic/Strategic Merc Handler.cpp | 16 ++-- Strategic/Strategic Mines LUA.h | 2 +- Strategic/Strategic Mines.cpp | 6 +- Strategic/Strategic Mines.h | 2 +- Strategic/Strategic Movement Costs.cpp | 2 +- Strategic/Strategic Movement.cpp | 14 ++-- Strategic/Strategic Pathing.cpp | 2 +- Strategic/Strategic Status.cpp | 2 +- Strategic/Strategic Town Loyalty.cpp | 8 +- Strategic/Strategic Town Loyalty.h | 2 +- Strategic/Strategic Transport Groups.h | 2 +- Strategic/Strategic Turns.cpp | 18 ++--- Strategic/Town Militia.cpp | 8 +- Strategic/Town Militia.h | 2 +- Strategic/UndergroundInit.h | 2 +- Strategic/XML_ExtraItems.cpp | 2 +- Strategic/XML_Facilities.cpp | 2 +- Strategic/XML_FacilityTypes.cpp | 2 +- Strategic/XML_SquadNames.cpp | 2 +- Strategic/mapscreen.cpp | 38 +++++----- Strategic/mapscreen.h | 2 +- Strategic/strategic town reputation.cpp | 6 +- Strategic/strategic.cpp | 6 +- Strategic/strategic.h | 4 +- Strategic/strategicmap.cpp | 66 ++++++++--------- Strategic/strategicmap.h | 2 +- Tactical/Air Raid.cpp | 34 ++++----- Tactical/Air Raid.h | 2 +- Tactical/Animation Cache.cpp | 4 +- Tactical/Animation Control.cpp | 8 +- Tactical/Animation Data.cpp | 8 +- Tactical/Arms Dealer Init.cpp | 12 +-- Tactical/ArmsDealerInvInit.cpp | 12 +-- Tactical/Auto Bandage.cpp | 24 +++--- Tactical/Boxing.cpp | 10 +-- Tactical/Bullets.h | 4 +- Tactical/Campaign.cpp | 10 +-- Tactical/Civ Quotes.cpp | 16 ++-- Tactical/Dialogue Control.cpp | 42 +++++------ Tactical/Disease.h | 2 +- Tactical/DisplayCover.cpp | 10 +-- Tactical/Drugs And Alcohol.cpp | 16 ++-- Tactical/DynamicDialogue.h | 2 +- Tactical/End Game.cpp | 8 +- Tactical/Enemy Soldier Save.cpp | 16 ++-- Tactical/EnemyItemDrops.cpp | 4 +- Tactical/Faces.cpp | 28 +++---- Tactical/Food.cpp | 10 +-- Tactical/GAP.cpp | 4 +- Tactical/Handle Doors.cpp | 14 ++-- Tactical/Handle Items.cpp | 66 ++++++++--------- Tactical/Handle UI Plan.cpp | 12 +-- Tactical/Handle UI.cpp | 74 +++++++++---------- Tactical/Interface Control.cpp | 30 ++++---- Tactical/Interface Cursors.cpp | 14 ++-- Tactical/Interface Dialogue.cpp | 58 +++++++-------- Tactical/Interface Enhanced.cpp | 32 ++++---- Tactical/Interface Items.cpp | 52 ++++++------- Tactical/Interface Items.h | 2 +- Tactical/Interface Panels.cpp | 46 ++++++------ Tactical/Interface Utils.cpp | 10 +-- Tactical/Interface.cpp | 48 ++++++------ Tactical/Interface.h | 2 +- Tactical/InterfaceItemImages.cpp | 2 +- Tactical/InterfaceItemImages.h | 2 +- Tactical/Inventory Choosing.cpp | 4 +- Tactical/Item Types.cpp | 8 +- Tactical/Items.cpp | 30 ++++---- Tactical/Ja25_Tactical.cpp | 20 ++--- Tactical/Keys.cpp | 26 +++---- Tactical/LOS.cpp | 32 ++++---- Tactical/LogicalBodyTypes/AbstractXMLLoader.h | 2 +- Tactical/LogicalBodyTypes/PaletteTable.h | 2 +- Tactical/Map Information.cpp | 6 +- Tactical/Merc Entering.cpp | 28 +++---- Tactical/Merc Hiring.cpp | 16 ++-- Tactical/Militia Control.cpp | 12 +-- Tactical/Militia Control.h | 2 +- Tactical/Minigame.cpp | 16 ++-- Tactical/Morale.cpp | 12 +-- Tactical/Morale.h | 2 +- Tactical/Overhead Types.h | 2 +- Tactical/Overhead.cpp | 70 +++++++++--------- Tactical/Overhead.h | 2 +- Tactical/PATHAI.H | 2 +- Tactical/PATHAI.cpp | 20 ++--- Tactical/Points.cpp | 30 ++++---- Tactical/Rain.cpp | 34 ++++----- Tactical/RandomMerc.cpp | 4 +- Tactical/Real Time Input.cpp | 46 ++++++------ Tactical/Rotting Corpses.cpp | 40 +++++----- Tactical/Rotting Corpses.h | 2 +- Tactical/ShopKeeper Interface.cpp | 30 ++++---- Tactical/SkillCheck.cpp | 4 +- Tactical/SkillMenu.cpp | 2 +- Tactical/Soldier Add.cpp | 26 +++---- Tactical/Soldier Ani.cpp | 50 ++++++------- Tactical/Soldier Control.cpp | 62 ++++++++-------- Tactical/Soldier Create.cpp | 26 +++---- Tactical/Soldier Create.h | 2 +- Tactical/Soldier Find.cpp | 18 ++--- Tactical/Soldier Functions.h | 2 +- Tactical/Soldier Init List.cpp | 18 ++--- Tactical/Soldier Profile.cpp | 26 +++---- Tactical/Soldier Profile.h | 2 +- Tactical/Soldier Tile.cpp | 20 ++--- Tactical/Soldier macros.h | 6 +- Tactical/SoldierTooltips.cpp | 16 ++-- Tactical/Spread Burst.cpp | 20 ++--- Tactical/Squads.cpp | 10 +-- Tactical/Strategic Exit GUI.cpp | 8 +- Tactical/Structure Wrap.cpp | 10 +-- Tactical/Tactical Save.cpp | 22 +++--- Tactical/Tactical Save.h | 6 +- Tactical/Tactical Turns.cpp | 26 +++---- Tactical/TeamTurns.cpp | 38 +++++----- Tactical/Turn Based Input.cpp | 72 +++++++++--------- Tactical/UI Cursors.cpp | 32 ++++---- Tactical/VehicleMenu.cpp | 6 +- Tactical/Vehicles.cpp | 24 +++--- Tactical/Vehicles.h | 2 +- Tactical/Weapons.cpp | 36 ++++----- Tactical/World Items.cpp | 18 ++--- Tactical/World Items.h | 2 +- Tactical/XML.h | 2 +- Tactical/XML_AmmoStrings.cpp | 6 +- Tactical/XML_AmmoTypes.cpp | 4 +- Tactical/XML_Armour.cpp | 4 +- Tactical/XML_AttachmentInfo.cpp | 4 +- Tactical/XML_AttachmentSlots.cpp | 4 +- Tactical/XML_Attachments.cpp | 6 +- Tactical/XML_BurstSounds.cpp | 28 +++---- Tactical/XML_Clothes.cpp | 2 +- Tactical/XML_ComboMergeInfo.cpp | 4 +- Tactical/XML_CompatibleFaceItems.cpp | 4 +- Tactical/XML_Disease.cpp | 2 +- Tactical/XML_Drugs.cpp | 2 +- Tactical/XML_EnemyAmmoDrops.cpp | 4 +- Tactical/XML_EnemyArmourDrops.cpp | 4 +- Tactical/XML_EnemyExplosiveDrops.cpp | 4 +- Tactical/XML_EnemyItemChoice.cpp | 4 +- Tactical/XML_EnemyMiscDrops.cpp | 4 +- Tactical/XML_EnemyWeaponChoice.cpp | 4 +- Tactical/XML_EnemyWeaponDrops.cpp | 26 +++---- Tactical/XML_Explosive.cpp | 4 +- Tactical/XML_Food.cpp | 2 +- Tactical/XML_FoodOpinions.cpp | 2 +- Tactical/XML_IMPItemChoices.cpp | 4 +- Tactical/XML_IncompatibleAttachments.cpp | 4 +- Tactical/XML_InteractiveTiles.cpp | 2 +- Tactical/XML_ItemAdjustments.cpp | 6 +- Tactical/XML_LBEPocket.cpp | 4 +- Tactical/XML_Launchable.cpp | 4 +- Tactical/XML_LoadBearingEquipment.cpp | 4 +- Tactical/XML_Magazine.cpp | 4 +- Tactical/XML_MercStartingGear.cpp | 4 +- Tactical/XML_Merchants.cpp | 2 +- Tactical/XML_Merge.cpp | 6 +- Tactical/XML_NewFaceGear.cpp | 2 +- Tactical/XML_Opinions.cpp | 2 +- Tactical/XML_Profiles.cpp | 2 +- Tactical/XML_RandomItem.cpp | 2 +- Tactical/XML_RandomStats.cpp | 2 +- Tactical/XML_SectorLoadscreens.cpp | 4 +- Tactical/XML_SpreadPatterns.cpp | 28 +++---- Tactical/XML_StructureConstruct.cpp | 2 +- Tactical/XML_StructureDeconstruct.cpp | 2 +- Tactical/XML_Structure_Move.cpp | 2 +- Tactical/XML_TonyInventory.cpp | 4 +- Tactical/XML_Vehicles.cpp | 12 +-- Tactical/bullets.cpp | 8 +- Tactical/faces.h | 2 +- Tactical/fov.cpp | 26 +++---- Tactical/fov.h | 2 +- Tactical/interface Dialogue.h | 2 +- Tactical/opplist.cpp | 40 +++++----- Tactical/soldier profile type.h | 2 +- Tactical/soldier tile.h | 2 +- TacticalAI/AIList.cpp | 2 +- TacticalAI/AIList.h | 2 +- TacticalAI/AIMain.cpp | 28 +++---- TacticalAI/AIUtils.cpp | 10 +-- TacticalAI/Attacks.cpp | 6 +- TacticalAI/CreatureDecideAction.cpp | 4 +- TacticalAI/DecideAction.cpp | 16 ++-- TacticalAI/FindLocations.cpp | 10 +-- TacticalAI/Knowledge.cpp | 2 +- TacticalAI/Medical.cpp | 8 +- TacticalAI/Movement.cpp | 6 +- TacticalAI/NPC.cpp | 20 ++--- TacticalAI/PanicButtons.cpp | 4 +- TacticalAI/QuestDebug.cpp | 4 +- TacticalAI/Realtime.cpp | 10 +-- TacticalAI/ZombieDecideAction.cpp | 16 ++-- TileEngine/Ambient Control.cpp | 4 +- TileEngine/Ambient Control.h | 2 +- TileEngine/Buildings.cpp | 4 +- TileEngine/Exit Grids.cpp | 6 +- TileEngine/Exit Grids.h | 2 +- TileEngine/Explosion Control.cpp | 40 +++++----- TileEngine/Interactive Tiles.cpp | 12 +-- TileEngine/Isometric Utils.cpp | 14 ++-- TileEngine/LightEffects.cpp | 8 +- TileEngine/Map Edgepoints.cpp | 6 +- TileEngine/Radar Screen.cpp | 4 +- TileEngine/Render Dirty.cpp | 2 +- TileEngine/Render Fun.cpp | 6 +- TileEngine/SaveLoadMap.cpp | 16 ++-- TileEngine/SaveLoadMap.h | 2 +- TileEngine/Shade Table Util.cpp | 2 +- TileEngine/Smell.cpp | 8 +- TileEngine/Smell.h | 2 +- TileEngine/SmokeEffects.cpp | 18 ++--- TileEngine/Tactical Placement GUI.cpp | 10 +-- TileEngine/Tile Animation.cpp | 12 +-- TileEngine/Tile Cache.cpp | 8 +- TileEngine/Tile Surface.cpp | 4 +- TileEngine/WorldDat.cpp | 8 +- TileEngine/WorldDat.h | 2 +- TileEngine/XML_ExplosionData.cpp | 4 +- TileEngine/environment.cpp | 4 +- TileEngine/lighting.cpp | 8 +- TileEngine/overhead map.cpp | 16 ++-- TileEngine/physics.cpp | 20 ++--- TileEngine/pits.cpp | 2 +- TileEngine/renderworld.cpp | 14 ++-- TileEngine/structure.cpp | 18 ++--- TileEngine/structure.h | 2 +- TileEngine/sysutil.cpp | 2 +- TileEngine/sysutil.h | 4 +- TileEngine/tiledef.cpp | 8 +- TileEngine/worlddef.cpp | 22 +++--- TileEngine/worldman.cpp | 8 +- Utils/Animated ProgressBar.cpp | 6 +- Utils/Cinematics Bink.cpp | 14 ++-- Utils/Cinematics.cpp | 4 +- Utils/Cinematics.h | 2 +- Utils/Cursors.cpp | 8 +- Utils/Encrypted File.cpp | 4 +- Utils/Event Pump.cpp | 4 +- Utils/Font Control.cpp | 2 +- Utils/Font Control.h | 2 +- Utils/INIReader.cpp | 4 +- Utils/INIReader.h | 4 +- Utils/KeyMap.cpp | 2 +- Utils/KeyMap.h | 2 +- Utils/MapUtility.cpp | 20 ++--- Utils/MercTextBox.cpp | 2 +- Utils/MercTextBox.h | 2 +- Utils/Multilingual Text Code Generator.cpp | 4 +- Utils/Music Control.cpp | 6 +- Utils/STIConvert.cpp | 8 +- Utils/Slider.cpp | 6 +- Utils/Sound Control.cpp | 4 +- Utils/Text Input.cpp | 6 +- Utils/Text Utils.cpp | 4 +- Utils/Timer Control.cpp | 8 +- Utils/Utilities.cpp | 10 +-- Utils/Utilities.h | 2 +- Utils/Utils All.h | 54 +++++++------- Utils/Win Util.cpp | 2 +- Utils/WordWrap.cpp | 2 +- Utils/XMLAccess.cpp | 2 +- Utils/XMLProperties.cpp | 2 +- Utils/XML_Items.cpp | 28 +++---- Utils/XML_Language.h | 2 +- Utils/XML_SenderNameList.h | 2 +- Utils/message.cpp | 10 +-- Utils/message.h | 4 +- Utils/popup_class.cpp | 8 +- ext/VFS/ext/7z/CMakeLists.txt | 2 +- ext/VFS/ext/7z/doc/lzma.txt | 2 +- ext/VFS/ext/7z/src/7zBuf.h | 2 +- ext/VFS/ext/7z/src/7zCrc.h | 2 +- ext/VFS/ext/7z/src/7zFile.h | 2 +- ext/VFS/ext/7z/src/7zStream.c | 2 +- ext/VFS/ext/7z/src/Bcj2.h | 2 +- ext/VFS/ext/7z/src/Bra.h | 2 +- ext/VFS/ext/7z/src/CpuArch.h | 2 +- ext/VFS/ext/7z/src/Delta.h | 2 +- ext/VFS/ext/7z/src/LzFind.h | 2 +- ext/VFS/ext/7z/src/Lzma86.h | 2 +- ext/VFS/ext/7z/src/LzmaDec.h | 2 +- ext/VFS/ext/7z/src/LzmaEnc.h | 2 +- ext/VFS/ext/7z/src/LzmaLib.h | 2 +- ext/VFS/ext/7z/src/Ppmd.h | 2 +- ext/VFS/ext/7z/src/Sha256.h | 2 +- ext/VFS/ext/7z/src/Threads.h | 2 +- ext/VFS/ext/7z/src/XzCrc64.h | 2 +- ext/VFS/ext/7z/src/{Types.h => types.h} | 2 +- ext/VFS/include/vfs/Tools/vfs_hp_timer.h | 2 +- ext/export/src/export/jsd/structure.cpp | 2 +- ext/export/src/export/sti/Image.h | 2 +- ext/export/src/export/sti/STCI_lib.cpp | 2 +- ext/export/src/export/sti/STCI_lib.h | 2 +- ext/export/src/export/sti/stci_image_utils.h | 2 +- ext/export/src/ja2/imgfmt.h | 2 +- ext/export/src/ja2/{Types.h => types.h} | 0 i18n/ExportStrings.cpp | 8 +- i18n/Multi Language Graphic Utils.cpp | 4 +- i18n/_ChineseText.cpp | 4 +- i18n/_DutchText.cpp | 4 +- i18n/_EnglishText.cpp | 4 +- i18n/_FrenchText.cpp | 4 +- i18n/_GermanText.cpp | 4 +- i18n/_ItalianText.cpp | 4 +- i18n/_Ja25ChineseText.cpp | 4 +- i18n/_Ja25DutchText.cpp | 4 +- i18n/_Ja25EnglishText.cpp | 4 +- i18n/_Ja25FrenchText.cpp | 4 +- i18n/_Ja25GermanText.cpp | 4 +- i18n/_Ja25ItalianText.cpp | 4 +- i18n/_Ja25PolishText.cpp | 4 +- i18n/_Ja25RussianText.cpp | 4 +- i18n/_PolishText.cpp | 4 +- i18n/_RussianText.cpp | 4 +- i18n/include/Text.h | 2 +- i18n/include/language.hpp | 2 +- lua/Lua Interpreter.h | 2 +- lua/lua.cpp | 2 +- lua/lua_class_interface.cpp | 2 +- lua/lua_state.cpp | 2 +- lua/lwstring.cpp | 2 +- lua/lwstring.h | 2 +- sgp/Button System.cpp | 6 +- sgp/Compression.cpp | 2 +- sgp/Cursor Control.h | 8 +- sgp/DEBUG.H | 2 +- sgp/DEBUG.cpp | 4 +- sgp/DirectDraw Calls.cpp | 2 +- sgp/DirectX Common.cpp | 2 +- sgp/FileMan.cpp | 4 +- sgp/FileMan.h | 2 +- sgp/Font.cpp | 6 +- sgp/Font.h | 2 +- sgp/LibraryDataBase.cpp | 4 +- sgp/LibraryDataBase.h | 2 +- sgp/MemMan.cpp | 2 +- sgp/PCX.cpp | 4 +- sgp/Random.cpp | 4 +- sgp/SMACK.H | 2 +- sgp/STCI.cpp | 4 +- sgp/WinFont.cpp | 8 +- sgp/himage.cpp | 6 +- sgp/imgfmt.h | 2 +- sgp/impTGA.cpp | 6 +- sgp/input.cpp | 4 +- sgp/mousesystem.cpp | 6 +- sgp/random.h | 4 +- sgp/sgp.cpp | 10 +-- sgp/sgp.h | 2 +- sgp/sgp_logger.cpp | 4 +- sgp/shading.cpp | 2 +- sgp/soundman.cpp | 2 +- sgp/{Types.h => types.h} | 0 sgp/video.cpp | 14 ++-- sgp/video.h | 8 +- sgp/vobject.cpp | 4 +- sgp/vobject_blitters.cpp | 4 +- sgp/vsurface.cpp | 4 +- sgp/{ZCONF.H => zconf.h} | 2 +- sgp/{ZLIB.H => zlib.h} | 0 588 files changed, 2576 insertions(+), 2576 deletions(-) rename ext/VFS/ext/7z/src/{Types.h => types.h} (95%) rename ext/export/src/ja2/{Types.h => types.h} (100%) rename sgp/{Types.h => types.h} (100%) rename sgp/{ZCONF.H => zconf.h} (95%) rename sgp/{ZLIB.H => zlib.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9be4f1c6..4201e90f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ include_directories( "${CMAKE_SOURCE_DIR}/Strategic" "${CMAKE_SOURCE_DIR}/sgp" "${CMAKE_SOURCE_DIR}/Ja2/Res" - "${CMAKE_SOURCE_DIR}/Lua" + "${CMAKE_SOURCE_DIR}/lua" "${CMAKE_SOURCE_DIR}/Laptop" "${CMAKE_SOURCE_DIR}/Multiplayer" "${CMAKE_SOURCE_DIR}/Editor" diff --git a/Console/Cursors.cpp b/Console/Cursors.cpp index 56579cae..88b9087c 100644 --- a/Console/Cursors.cpp +++ b/Console/Cursors.cpp @@ -27,7 +27,7 @@ // Cursors.h - cursor classes //#include "stdafx.h" -#include +#include #include #include "Cursors.h" diff --git a/Console/Dialogs.cpp b/Console/Dialogs.cpp index 0ffc2f20..18574e04 100644 --- a/Console/Dialogs.cpp +++ b/Console/Dialogs.cpp @@ -29,7 +29,7 @@ // About dialog class, etc... //#include "stdafx.h" -#include +#include #include "resource.h" #include "Console.h" diff --git a/Console/FileStream.cpp b/Console/FileStream.cpp index c78c0028..2e56aedd 100644 --- a/Console/FileStream.cpp +++ b/Console/FileStream.cpp @@ -33,7 +33,7 @@ //#include "stdafx.h" //#include -#include +#include #include #include "FileStream.h" diff --git a/Editor/Button Defines.h b/Editor/Button Defines.h index 677aa6ce..991bb93c 100644 --- a/Editor/Button Defines.h +++ b/Editor/Button Defines.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __BUTTON_DEFINES_H diff --git a/Editor/Cursor Modes.cpp b/Editor/Cursor Modes.cpp index 16bb60b7..a4f60979 100644 --- a/Editor/Cursor Modes.cpp +++ b/Editor/Cursor Modes.cpp @@ -7,7 +7,7 @@ #include "renderworld.h" #include "random.h" #include "worldman.h" - #include "interface.h" + #include "Interface.h" #include "Isometric Utils.h" #include "editscreen.h" #include "EditorDefines.h" diff --git a/Editor/Cursor Modes.h b/Editor/Cursor Modes.h index c4994185..fe9e3af3 100644 --- a/Editor/Cursor Modes.h +++ b/Editor/Cursor Modes.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __CURSOR_MODES_H diff --git a/Editor/Editor Callback Prototypes.h b/Editor/Editor Callback Prototypes.h index 3cb2ff60..3794ab35 100644 --- a/Editor/Editor Callback Prototypes.h +++ b/Editor/Editor Callback Prototypes.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_CALLBACK_PROTOTYPES_H diff --git a/Editor/Editor Modes.cpp b/Editor/Editor Modes.cpp index f8cd9084..81d23d08 100644 --- a/Editor/Editor Modes.cpp +++ b/Editor/Editor Modes.cpp @@ -17,7 +17,7 @@ #include "environment.h" #include "worlddef.h" #include "Exit Grids.h" - #include "Worldman.h" + #include "worldman.h" BOOLEAN gfShowExitGrids = FALSE; diff --git a/Editor/Editor Modes.h b/Editor/Editor Modes.h index 3eae7696..de860f51 100644 --- a/Editor/Editor Modes.h +++ b/Editor/Editor Modes.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_MODES_H diff --git a/Editor/Editor Taskbar Creation.cpp b/Editor/Editor Taskbar Creation.cpp index 1b7f5c50..15f74641 100644 --- a/Editor/Editor Taskbar Creation.cpp +++ b/Editor/Editor Taskbar Creation.cpp @@ -5,7 +5,7 @@ //sgp #include "Button System.h" #include "Font Control.h" - #include "debug.h" + #include "DEBUG.H" //editor #include "EditorDefines.h" #include "Editor Callback Prototypes.h" @@ -14,7 +14,7 @@ #include "EditorMapInfo.h" //tactical #include "Soldier Create.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "local.h" #include "Text.h" diff --git a/Editor/Editor Taskbar Creation.h b/Editor/Editor Taskbar Creation.h index ca645a7e..a91061e8 100644 --- a/Editor/Editor Taskbar Creation.h +++ b/Editor/Editor Taskbar Creation.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_TASKBAR_CREATION_H diff --git a/Editor/Editor Taskbar Utils.cpp b/Editor/Editor Taskbar Utils.cpp index 75a77b06..a3944735 100644 --- a/Editor/Editor Taskbar Utils.cpp +++ b/Editor/Editor Taskbar Utils.cpp @@ -11,13 +11,13 @@ #include "WorldDat.h" #include "Render Dirty.h" #include "sysutil.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "environment.h" #include "Interface Items.h" #include "Soldier Find.h" #include "World Items.h" #include "Text.h" - #include "Overhead map.h" + #include "overhead map.h" #include "Cursor Modes.h" #include "editscreen.h" #include "EditorTerrain.h" diff --git a/Editor/Editor Taskbar Utils.h b/Editor/Editor Taskbar Utils.h index 563452e6..930bb8fc 100644 --- a/Editor/Editor Taskbar Utils.h +++ b/Editor/Editor Taskbar Utils.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_TASKBAR_UTILS_H diff --git a/Editor/Editor Undo.cpp b/Editor/Editor Undo.cpp index 0d09d8b9..642d4833 100644 --- a/Editor/Editor Undo.cpp +++ b/Editor/Editor Undo.cpp @@ -6,7 +6,7 @@ #include "worldman.h" #include "smooth.h" #include "input.h" - #include "debug.h" + #include "DEBUG.H" #include "Isometric Utils.h" #include "editscreen.h" @@ -15,7 +15,7 @@ #include "Cursor Modes.h" #include "Exit Grids.h" //dnl ch86 110214 - #include "keys.h" + #include "Keys.h" #include "EditorItems.h" #include "EditorMapInfo.h" diff --git a/Editor/Editor Undo.h b/Editor/Editor Undo.h index c7b470a4..e399eba4 100644 --- a/Editor/Editor Undo.h +++ b/Editor/Editor Undo.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITOR_UNDO_H diff --git a/Editor/EditorBuildings.cpp b/Editor/EditorBuildings.cpp index fd7f9c29..d6ecccf2 100644 --- a/Editor/EditorBuildings.cpp +++ b/Editor/EditorBuildings.cpp @@ -18,7 +18,7 @@ #include "Editor Modes.h" #include "Smoothing Utils.h" #include "Text Input.h" - #include "keys.h" + #include "Keys.h" #include "environment.h" #include "selectwin.h" #include "Simple Render Utils.h" diff --git a/Editor/EditorBuildings.h b/Editor/EditorBuildings.h index bfeb0a8f..4fe900f4 100644 --- a/Editor/EditorBuildings.h +++ b/Editor/EditorBuildings.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORBUILDINGS_H diff --git a/Editor/EditorDefines.h b/Editor/EditorDefines.h index 28f40081..053c3348 100644 --- a/Editor/EditorDefines.h +++ b/Editor/EditorDefines.h @@ -1,10 +1,10 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORDEFINES_H #define __EDITORDEFINES_H -#include "Types.h" +#include "types.h" #include "Button Defines.h" diff --git a/Editor/EditorItems.cpp b/Editor/EditorItems.cpp index 7c0b3364..bd8751db 100644 --- a/Editor/EditorItems.cpp +++ b/Editor/EditorItems.cpp @@ -9,34 +9,34 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "interface items.h" - #include "text.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Interface Items.h" + #include "Text.h" + #include "Utilities.h" #include "Action Items.h" #include "World Items.h" #include "EditorDefines.h" #include "EditorItems.h" #include "EditorMercs.h" - #include "weapons.h" + #include "Weapons.h" #include "Editor Taskbar Utils.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "Item Statistics.h" #include "Simple Render Utils.h" #include "worldman.h" #include "random.h" - #include "Pits.h" - #include "keys.h" + #include "pits.h" + #include "Keys.h" #include "InterfaceItemImages.h" #include "Editor Undo.h"//dnl ch86 220214 diff --git a/Editor/EditorItems.h b/Editor/EditorItems.h index e56fbfdf..04aff1dc 100644 --- a/Editor/EditorItems.h +++ b/Editor/EditorItems.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORITEMS_H diff --git a/Editor/EditorMapInfo.cpp b/Editor/EditorMapInfo.cpp index b4335ab3..adec5870 100644 --- a/Editor/EditorMapInfo.cpp +++ b/Editor/EditorMapInfo.cpp @@ -9,23 +9,23 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "line.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "interface items.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Interface Items.h" + #include "Utilities.h" #include "World Items.h" #include "worldman.h" - #include "overhead.h" //GetSoldier + #include "Overhead.h" //GetSoldier #include "renderworld.h" #include "Animation Data.h" #include "Animation Control.h" @@ -37,11 +37,11 @@ #include "Soldier Init List.h" #include "strategicmap.h" #include "Soldier Add.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Text Input.h" - #include "Random.h" - #include "wordwrap.h" + #include "random.h" + #include "WordWrap.h" #include "EditorItems.h" #include "Editor Taskbar Utils.h" #include "Exit Grids.h" diff --git a/Editor/EditorMapInfo.h b/Editor/EditorMapInfo.h index b9cbdf7a..03f93db3 100644 --- a/Editor/EditorMapInfo.h +++ b/Editor/EditorMapInfo.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORMAPINFO_H diff --git a/Editor/EditorMercs.cpp b/Editor/EditorMercs.cpp index 737d3a6f..f91421bd 100644 --- a/Editor/EditorMercs.cpp +++ b/Editor/EditorMercs.cpp @@ -9,24 +9,24 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "line.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "interface items.h" - #include "text.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Interface Items.h" + #include "Text.h" + #include "Utilities.h" #include "World Items.h" #include "worldman.h" - #include "overhead.h" //GetSoldier + #include "Overhead.h" //GetSoldier #include "renderworld.h" #include "Animation Data.h" #include "Animation Control.h" @@ -39,11 +39,11 @@ #include "Soldier Init List.h" #include "strategicmap.h" #include "Soldier Add.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Text Input.h" - #include "Random.h" - #include "wordwrap.h" + #include "random.h" + #include "WordWrap.h" #include "EditorItems.h" #include "Editor Taskbar Utils.h" #include "Exit Grids.h" diff --git a/Editor/EditorMercs.h b/Editor/EditorMercs.h index 71e66ccd..64dc4a9e 100644 --- a/Editor/EditorMercs.h +++ b/Editor/EditorMercs.h @@ -1,6 +1,6 @@ #pragma once -#include "BuildDefines.h" +#include "builddefines.h" //----------------------------------------------- // diff --git a/Editor/EditorTerrain.cpp b/Editor/EditorTerrain.cpp index 932b44ef..14560d0c 100644 --- a/Editor/EditorTerrain.cpp +++ b/Editor/EditorTerrain.cpp @@ -9,18 +9,18 @@ #include "vobject.h" #include "mousesystem.h" #include "Button System.h" - #include "wcheck.h" + #include "WCheck.h" #include "vsurface.h" #include "input.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "editscreen.h" #include "selectwin.h" #include "video.h" #include "vobject_blitters.h" - #include "interface panels.h" - #include "utilities.h" + #include "Interface Panels.h" + #include "Utilities.h" #include "World Items.h" #include "EditorDefines.h" #include "EditorTerrain.h" diff --git a/Editor/EditorTerrain.h b/Editor/EditorTerrain.h index 5b48ff0d..8be6a062 100644 --- a/Editor/EditorTerrain.h +++ b/Editor/EditorTerrain.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDITORTERRAIN_H diff --git a/Editor/Item Statistics.cpp b/Editor/Item Statistics.cpp index 57a1851b..da20b785 100644 --- a/Editor/Item Statistics.cpp +++ b/Editor/Item Statistics.cpp @@ -7,7 +7,7 @@ #include "types.h" #include "mousesystem.h" #include "Button System.h" - #include "font control.h" + #include "Font Control.h" #include "EditorDefines.h" #include "Editor Taskbar Utils.h" #include "EditorMercs.h" @@ -20,10 +20,10 @@ #include "Weapons.h" #include "Items.h" #include "editscreen.h" - #include "Random.h" + #include "random.h" #include "Handle Items.h" #include "World Items.h" - #include "PopupMenu.h" + #include "popupmenu.h" #include "pits.h" #include "Text.h" diff --git a/Editor/Item Statistics.h b/Editor/Item Statistics.h index 63b80a6c..be19922d 100644 --- a/Editor/Item Statistics.h +++ b/Editor/Item Statistics.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifndef __ITEM_STATISTICS_H #define __ITEM_STATISTICS_H diff --git a/Editor/LoadScreen.cpp b/Editor/LoadScreen.cpp index cba550c2..4cd76d65 100644 --- a/Editor/LoadScreen.cpp +++ b/Editor/LoadScreen.cpp @@ -5,8 +5,8 @@ #include #include "Font Control.h" #include "renderworld.h" - #include "render dirty.h" - #include "loadscreen.h" + #include "Render Dirty.h" + #include "LoadScreen.h" #include "selectwin.h" #include "EditorDefines.h" #include "messagebox.h" diff --git a/Editor/LoadScreen.h b/Editor/LoadScreen.h index 24518194..f5216028 100644 --- a/Editor/LoadScreen.h +++ b/Editor/LoadScreen.h @@ -1,5 +1,5 @@ -#include "BuildDefines.h" -#include "Fileman.h" +#include "builddefines.h" +#include "FileMan.h" #define FILENAME_BUFLEN (30 + 4 + 1)//dnl ch39 190909 +4 is for ".dat", +1 is for '\0' //dnl ch81 021213 diff --git a/Editor/Road Smoothing.cpp b/Editor/Road Smoothing.cpp index 26787509..9c26abcd 100644 --- a/Editor/Road Smoothing.cpp +++ b/Editor/Road Smoothing.cpp @@ -4,7 +4,7 @@ #include "types.h" #include "Road Smoothing.h" - #include "tiledat.h" + #include "TileDat.h" #include "worlddef.h" #include "worldman.h" #include "Editor Undo.h" diff --git a/Editor/Road Smoothing.h b/Editor/Road Smoothing.h index f1b899d9..f91f9b2f 100644 --- a/Editor/Road Smoothing.h +++ b/Editor/Road Smoothing.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR diff --git a/Editor/Sector Summary.cpp b/Editor/Sector Summary.cpp index 9c328cfa..739d0931 100644 --- a/Editor/Sector Summary.cpp +++ b/Editor/Sector Summary.cpp @@ -15,22 +15,22 @@ #include "line.h" #include "input.h" #include "vobject_blitters.h" - #include "loadscreen.h" + #include "LoadScreen.h" #include "Text Input.h" #include "mousesystem.h" #include "strategicmap.h" - #include "Fileman.h" + #include "FileMan.h" #include "Exit Grids.h" #include "Map Information.h" #include "Summary Info.h" #include "Animated ProgressBar.h" #include "worlddef.h" - #include "worlddat.h" + #include "WorldDat.h" #include "EditorDefines.h" #include "editscreen.h" #include "english.h" #include "World Items.h" - #include "text.h" + #include "Text.h" #include "Soldier Create.h" #include "GameVersion.h" #include "Campaign Types.h" diff --git a/Editor/Sector Summary.h b/Editor/Sector Summary.h index c1c97758..21246830 100644 --- a/Editor/Sector Summary.h +++ b/Editor/Sector Summary.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SECTOR_SUMMARY_H diff --git a/Editor/SmartMethod.h b/Editor/SmartMethod.h index 09aedce9..7717e4a4 100644 --- a/Editor/SmartMethod.h +++ b/Editor/SmartMethod.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMARTMETHOD_H diff --git a/Editor/Smoothing Utils.h b/Editor/Smoothing Utils.h index 7da29628..325c926c 100644 --- a/Editor/Smoothing Utils.h +++ b/Editor/Smoothing Utils.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMOOTHING_UTILS_H diff --git a/Editor/Summary Info.h b/Editor/Summary Info.h index 9aae3973..e8ee9be5 100644 --- a/Editor/Summary Info.h +++ b/Editor/Summary Info.h @@ -1,10 +1,10 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SUMMARY_INFO_H #define __SUMMARY_INFO_H -#include "Types.h" +#include "types.h" //dnl ch28 #define GLOBAL_SUMMARY_VERSION 15 diff --git a/Editor/edit_sys.h b/Editor/edit_sys.h index b7c5693b..a4f702be 100644 --- a/Editor/edit_sys.h +++ b/Editor/edit_sys.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __EDIT_SYS_H diff --git a/Editor/editscreen.cpp b/Editor/editscreen.cpp index 563561ed..759a30c5 100644 --- a/Editor/editscreen.cpp +++ b/Editor/editscreen.cpp @@ -12,22 +12,22 @@ #include "edit_sys.h" #include "screenids.h" #include "editscreen.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "SmartMethod.h" #include "selectwin.h" #include "Interface.h" #include "lighting.h" #include "Interactive Tiles.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Overhead.h" #include "Handle UI.h" #include "Event Pump.h" #include "world items.h" - #include "loadscreen.h" - #include "render dirty.h" - #include "isometric utils.h" + #include "LoadScreen.h" + #include "Render Dirty.h" + #include "Isometric Utils.h" #include "message.h" - #include "render fun.h" + #include "Render Fun.h" #include "popupmenu.h" #include "overhead map.h" #include "EditorDefines.h" @@ -39,7 +39,7 @@ #include "newsmooth.h" #include "Smoothing Utils.h" #include "messagebox.h" - #include "messageboxscreen.h" + #include "MessageBoxScreen.h" #include "Soldier Create.h" #include "Soldier Init List.h" #include "Text Input.h" @@ -59,7 +59,7 @@ #include "line.h" #include "english.h" #include "random.h" - #include "scheduling.h" + #include "Scheduling.h" #include "Road Smoothing.h" #include "strategicmap.h" #include "message.h" @@ -70,7 +70,7 @@ #include "GameSettings.h" #include "Summary Info.h" #include "connect.h"//dnl - #include "cursors.h"//dnl ch2 210909 + #include "Cursors.h"//dnl ch2 210909 #include "Cursor Control.h"//dnl ch2 210909 #include "maputility.h"//dnl ch49 061009 #include "Text.h" diff --git a/Editor/editscreen.h b/Editor/editscreen.h index 1f3c591a..c28c617b 100644 --- a/Editor/editscreen.h +++ b/Editor/editscreen.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef EDITSCREEN_H diff --git a/Editor/messagebox.cpp b/Editor/messagebox.cpp index 52226450..5e3221fc 100644 --- a/Editor/messagebox.cpp +++ b/Editor/messagebox.cpp @@ -4,7 +4,7 @@ #include "vobject.h" #include "video.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "messagebox.h" #include "input.h" diff --git a/Editor/messagebox.h b/Editor/messagebox.h index 9f0a57fa..f43e0682 100644 --- a/Editor/messagebox.h +++ b/Editor/messagebox.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __MESSAGEBOX_H diff --git a/Editor/newsmooth.cpp b/Editor/newsmooth.cpp index 2123937a..bbfc694b 100644 --- a/Editor/newsmooth.cpp +++ b/Editor/newsmooth.cpp @@ -14,7 +14,7 @@ #include "Editor Undo.h" #include "Structure Internals.h" #include "environment.h" - #include "Random.h" + #include "random.h" #include "Render Fun.h" diff --git a/Editor/newsmooth.h b/Editor/newsmooth.h index 640b7f22..b2889a82 100644 --- a/Editor/newsmooth.h +++ b/Editor/newsmooth.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __NEWSMOOTH_H diff --git a/Editor/popupmenu.cpp b/Editor/popupmenu.cpp index 8d43a90a..34feabd6 100644 --- a/Editor/popupmenu.cpp +++ b/Editor/popupmenu.cpp @@ -16,18 +16,18 @@ #include "tiledef.h" #include "sysutil.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "line.h" - #include "worlddat.h" + #include "WorldDat.h" #include "selectwin.h" #include "popupmenu.h" #include "EditorDefines.h" - #include "render dirty.h" - #include "debug.h" + #include "Render Dirty.h" + #include "DEBUG.H" #include "mousesystem.h" - #include "cursors.h" - #include "overhead types.h" + #include "Cursors.h" + #include "Overhead Types.h" #include "EditorMercs.h" #include "Scheduling.h" #include "english.h" diff --git a/Editor/popupmenu.h b/Editor/popupmenu.h index 94c2ec3f..fe5ffb19 100644 --- a/Editor/popupmenu.h +++ b/Editor/popupmenu.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR //popupmenu.h diff --git a/Editor/selectwin.cpp b/Editor/selectwin.cpp index baf826a4..6eeb97cd 100644 --- a/Editor/selectwin.cpp +++ b/Editor/selectwin.cpp @@ -6,7 +6,7 @@ #include "tiledef.h" #include "vsurface.h" - #include "worlddat.h" + #include "WorldDat.h" #include "random.h" #include "sysutil.h" #include "Font Control.h" diff --git a/Editor/selectwin.h b/Editor/selectwin.h index 7d9c8981..c5fb5388 100644 --- a/Editor/selectwin.h +++ b/Editor/selectwin.h @@ -1,10 +1,10 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef _SELECTION_WIN_H_ #define _SELECTION_WIN_H_ -#include "Types.h" +#include "types.h" #include "vobject.h" #include "mousesystem.h" diff --git a/Editor/smooth.cpp b/Editor/smooth.cpp index c835a29a..b9400401 100644 --- a/Editor/smooth.cpp +++ b/Editor/smooth.cpp @@ -5,15 +5,15 @@ #include "stdlib.h" #include "FileMan.h" #include "time.h" - #include "debug.h" + #include "DEBUG.H" #include "tiledef.h" #include "worlddef.h" #include "worldman.h" #include "smooth.h" #include "editscreen.h" #include "selectwin.h" - #include "isometric utils.h" - #include "structure wrap.h" + #include "Isometric Utils.h" + #include "Structure Wrap.h" #include "Exit Grids.h" #include "Editor Undo.h" diff --git a/Editor/smooth.h b/Editor/smooth.h index 4637d179..9201ef7c 100644 --- a/Editor/smooth.h +++ b/Editor/smooth.h @@ -1,4 +1,4 @@ -#include "BuildDefines.h" +#include "builddefines.h" #ifdef JA2EDITOR #ifndef __SMOOTH_H diff --git a/Ja2/Credits.cpp b/Ja2/Credits.cpp index f2d1fdeb..24a8b6aa 100644 --- a/Ja2/Credits.cpp +++ b/Ja2/Credits.cpp @@ -1,24 +1,24 @@ - #include "Types.h" + #include "types.h" #include "Credits.h" #include "vsurface.h" #include "mousesystem.h" #include "Text.h" - #include "wordwrap.h" - #include "Video.h" - #include "render dirty.h" + #include "WordWrap.h" + #include "video.h" + #include "Render Dirty.h" #include "local.h" - #include "utilities.h" + #include "Utilities.h" #include "WCheck.h" #include "screenids.h" #include "Font Control.h" - #include "cursors.h" - #include "font.h" - #include "wordwrap.h" + #include "Cursors.h" + #include "Font.h" + #include "WordWrap.h" #include "sysutil.h" - #include "Input.h" + #include "input.h" #include "english.h" - #include "encrypted file.h" - #include "Random.h" + #include "Encrypted File.h" + #include "random.h" //externals extern HVSURFACE ghFrameBuffer; diff --git a/Ja2/Fade Screen.cpp b/Ja2/Fade Screen.cpp index 2f44de73..635f9b29 100644 --- a/Ja2/Fade Screen.cpp +++ b/Ja2/Fade Screen.cpp @@ -1,12 +1,12 @@ #include "sgp.h" #include "screenids.h" #include "Timer Control.h" - #include "sys globals.h" - #include "fade screen.h" + #include "Sys Globals.h" + #include "Fade Screen.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "cursor control.h" - #include "music control.h" + #include "Cursor Control.h" + #include "Music Control.h" #include "Render Dirty.h" #include "gameloop.h" diff --git a/Ja2/FeaturesScreen.cpp b/Ja2/FeaturesScreen.cpp index 50535f97..34ce1f74 100644 --- a/Ja2/FeaturesScreen.cpp +++ b/Ja2/FeaturesScreen.cpp @@ -1,6 +1,6 @@ -#include "Types.h" +#include "types.h" #include "FeaturesScreen.h" -#include "Video.h" +#include "video.h" #include "Font Control.h" #include "Game Clock.h" #include "Text Input.h" @@ -10,29 +10,29 @@ #include "WordWrap.h" #include "WCheck.h" #include "Utilities.h" -#include "Debug.h" +#include "DEBUG.H" #include "Sound Control.h" #include "Ambient Control.h" -#include "Worlddat.h" -#include "Worlddef.h" +#include "WorldDat.h" +#include "worlddef.h" #include "GameSettings.h" #include "Game Init.h" -#include "English.h" +#include "english.h" #include "Overhead.h" -#include "Gap.h" +#include "GAP.H" #include "Cursors.h" -#include "SysUtil.h" +#include "sysutil.h" #include "Exit Grids.h" #include "Text.h" #include "Interface Control.h" -#include "Message.h" +#include "message.h" #include "Multi Language Graphic Utils.h" #include "Map Information.h" #include "Sys Globals.h" #include "insurance.h" #include "connect.h" -#include "WorldMan.h" +#include "worldman.h" #include "Init.h" #include "Game Events.h" diff --git a/Ja2/GameInitOptionsScreen.cpp b/Ja2/GameInitOptionsScreen.cpp index b2eb2216..08ebadbf 100644 --- a/Ja2/GameInitOptionsScreen.cpp +++ b/Ja2/GameInitOptionsScreen.cpp @@ -1,19 +1,19 @@ - #include "Types.h" + #include "types.h" #include "GameInitOptionsScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" #include "Music Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Intro.h" #include "Text.h" #include "_Ja25EnglishText.h" @@ -21,7 +21,7 @@ #include "gameloop.h" #include "connect.h" -#include "saveloadscreen.h" +#include "SaveLoadScreen.h" #ifdef JA2UB #include "ub_config.h" diff --git a/Ja2/GameSettings.cpp b/Ja2/GameSettings.cpp index 6f31793b..2010e851 100644 --- a/Ja2/GameSettings.cpp +++ b/Ja2/GameSettings.cpp @@ -1,7 +1,7 @@ - #include "Types.h" + #include "types.h" #include "GameSettings.h" #include "FileMan.h" - #include "String.h" + #include "string.h" #include "Sound Control.h" #include "SaveLoadScreen.h" #include "Music Control.h" @@ -9,19 +9,19 @@ #include "Overhead.h" #include "GameVersion.h" #include "LibraryDataBase.h" - #include "Debug.h" + #include "DEBUG.H" #include "HelpScreen.h" #include "INIReader.h" #include "Shade Table Util.h" #include "soldier profile type.h" - #include "Random.h" + #include "random.h" #include "SaveLoadGame.h" #include "sgp.h" #include "screenids.h" #include "Font Control.h" #include "message.h" #include "Campaign.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "strategicmap.h" #include "Queen Command.h" #include "Game Clock.h" diff --git a/Ja2/GameSettings.h b/Ja2/GameSettings.h index 74fba2dd..54027660 100644 --- a/Ja2/GameSettings.h +++ b/Ja2/GameSettings.h @@ -1,7 +1,7 @@ #ifndef _GAME_SETTINGS__H_ #define _GAME_SETTINGS__H_ -#include "Types.h" +#include "types.h" #include "Strategic Status.h" #include "Morale.h" #include "GameInitOptionsScreen.h" diff --git a/Ja2/GameVersion.cpp b/Ja2/GameVersion.cpp index d91a7c51..6a38c8a5 100644 --- a/Ja2/GameVersion.cpp +++ b/Ja2/GameVersion.cpp @@ -1,4 +1,4 @@ - #include "Types.h" + #include "types.h" #include "GameVersion.h" // diff --git a/Ja2/HelpScreen.cpp b/Ja2/HelpScreen.cpp index dcf0ccc4..9583b102 100644 --- a/Ja2/HelpScreen.cpp +++ b/Ja2/HelpScreen.cpp @@ -1,19 +1,19 @@ #include "sgp.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "wcheck.h" - #include "cursors.h" - #include "font control.h" - #include "cursor control.h" - #include "render dirty.h" + #include "WCheck.h" + #include "Cursors.h" + #include "Font Control.h" + #include "Cursor Control.h" + #include "Render Dirty.h" #include "Text.h" #include "Utilities.h" #include "WordWrap.h" #include "Font Control.h" - #include "text.h" + #include "Text.h" #include "HelpScreen.h" #include "HelpScreenText.h" - #include "Line.h" + #include "line.h" #include "Game Clock.h" #include "GameSettings.h" #include "laptop.h" diff --git a/Ja2/Init.cpp b/Ja2/Init.cpp index a80bf217..ca6840c5 100644 --- a/Ja2/Init.cpp +++ b/Ja2/Init.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" #include #include "sgp.h" - #include "Gameloop.h" + #include "gameloop.h" #include "Screens.h" #include "INIReader.h" #include "vobject_blitters.h" @@ -10,7 +10,7 @@ #include "sysutil.h" #include "worlddef.h" #include "Animation Data.h" - #include "overhead.h" + #include "Overhead.h" #include "Font Control.h" #include "Button System.h" #include "Timer Control.h" @@ -21,18 +21,18 @@ #include "Event Pump.h" #include "lighting.h" #include "Cursor Control.h" - #include "music control.h" + #include "Music Control.h" #include "video.h" #include "mapscreen.h" - #include "interface items.h" - #include "Maputility.h" + #include "Interface Items.h" + #include "maputility.h" #include "strategic.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "Text.h" #include "laptop.h" #include "NPC.h" #include "MercTextBox.h" - #include "tile cache.h" + #include "Tile Cache.h" #include "strategicmap.h" #include "Map Information.h" #include "Shade Table Util.h" @@ -44,7 +44,7 @@ #include "jascreens.h" #include "XML.h" #include "SaveLoadGame.h" - #include "weapons.h" + #include "Weapons.h" #include "Strategic Movement.h" #include "Vehicles.h" #include "Multilingual Text Code Generator.h" diff --git a/Ja2/Intro.cpp b/Ja2/Intro.cpp index 113873cd..7fc5cbf7 100644 --- a/Ja2/Intro.cpp +++ b/Ja2/Intro.cpp @@ -1,14 +1,14 @@ #include "sgp.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "font control.h" - #include "cursor control.h" - #include "render dirty.h" + #include "Font Control.h" + #include "Cursor Control.h" + #include "Render Dirty.h" #include "Text.h" #include "Utilities.h" #include "WordWrap.h" - #include "text.h" - #include "Line.h" + #include "Text.h" + #include "line.h" #include "Intro.h" #include "Cinematics.h" #include "Cinematics Bink.h" diff --git a/Ja2/JA2 Splash.cpp b/Ja2/JA2 Splash.cpp index c7d9634d..6aab7b97 100644 --- a/Ja2/JA2 Splash.cpp +++ b/Ja2/JA2 Splash.cpp @@ -1,7 +1,7 @@ -#include "Types.h" +#include "types.h" #include "vsurface.h" #include "mainmenuscreen.h" -#include "Video.h" +#include "video.h" #include "Timer Control.h" #include "Multi Language Graphic Utils.h" #include diff --git a/Ja2/Ja25Update.cpp b/Ja2/Ja25Update.cpp index 4fd737e1..a038c64e 100644 --- a/Ja2/Ja25Update.cpp +++ b/Ja2/Ja25Update.cpp @@ -4,7 +4,7 @@ #include #include "Render Fun.h" #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" //#include "Soldier Control.h" @@ -12,21 +12,21 @@ #include "Animation Data.h" #include "Animation Control.h" #include -#include "pathai.h" -#include "Random.h" +#include "PATHAI.H" +#include "random.h" #include "Isometric Utils.h" #include "renderworld.h" #include "video.h" -#include "weapons.h" +#include "Weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" -#include "Event pump.h" +#include "Event Pump.h" #include "ai.h" -#include "interface.h" +#include "Interface.h" #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "english.h" #include "Squads.h" @@ -34,33 +34,33 @@ #include "Networking.h" #include "NetworkEvent.h" #endif -#include "items.h" -#include "Soundman.h" -#include "utilities.h" -#include "Strategic.h" +#include "Items.h" +#include "soundman.h" +#include "Utilities.h" +#include "strategic.h" #include "soldier tile.h" #include "Smell.h" #include "Keys.h" -#include "dialogue control.h" -#include "soldier functions.h" +#include "Dialogue Control.h" +#include "Soldier Functions.h" #include "Exit Grids.h" #include "Quests.h" #include "message.h" #include "SkillCheck.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "GameSettings.h" #include "ShopKeeper Interface.h" -#include "vehicles.h" +#include "Vehicles.h" #include "strategicmap.h" -#include "morale.h" -#include "drugs and alcohol.h" +#include "Morale.h" +#include "Drugs And Alcohol.h" #include "SkillCheck.h" #include "Map Information.h" #include "Buildings.h" #include "Text.h" #include "Campaign Types.h" #include "Strategic Status.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Debug Control.h" #ifdef JA2UB diff --git a/Ja2/Ja25Update.h b/Ja2/Ja25Update.h index a2edef1c..d9948a29 100644 --- a/Ja2/Ja25Update.h +++ b/Ja2/Ja25Update.h @@ -1,7 +1,7 @@ #ifndef JA25UPDATE__C_ #define JA25UPDATE__C_ -#include "Types.h" +#include "types.h" #ifdef JA2UB diff --git a/Ja2/Loading Screen.cpp b/Ja2/Loading Screen.cpp index 2650cc9f..0ade7191 100644 --- a/Ja2/Loading Screen.cpp +++ b/Ja2/Loading Screen.cpp @@ -4,12 +4,12 @@ #include "Campaign Types.h" #include "Game Clock.h" #include "GameSettings.h" - #include "Random.h" - #include "Debug.h" + #include "random.h" + #include "DEBUG.H" #include "local.h" #include "Font Control.h" - #include "font.h" - #include "render dirty.h" + #include "Font.h" + #include "Render Dirty.h" #include "Strategic Movement.h" #include "UndergroundInit.h" #include diff --git a/Ja2/MPChatScreen.cpp b/Ja2/MPChatScreen.cpp index 78ed6a65..5742e3bf 100644 --- a/Ja2/MPChatScreen.cpp +++ b/Ja2/MPChatScreen.cpp @@ -1,26 +1,26 @@ #include "sgp.h" #include "screenids.h" #include "Timer Control.h" - #include "fade screen.h" + #include "Fade Screen.h" #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "cursors.h" - #include "font control.h" + #include "Cursors.h" + #include "Font Control.h" #include "Map Screen Interface.h" #include "renderworld.h" #include "gameloop.h" #include "english.h" #include "GameSettings.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "laptop.h" - #include "text.h" + #include "Text.h" #include "Text Input.h" #include "overhead map.h" #include "MPChatScreen.h" #include "WordWrap.h" #include "message.h" -#include "utilities.h" +#include "Utilities.h" #include "connect.h" #define CHATBOX_WIDTH 310 // 350 is the max size, the PrepareMercPopupBox will add the X_MARGIN to both sides diff --git a/Ja2/MPConnectScreen.cpp b/Ja2/MPConnectScreen.cpp index b6a1214a..a07c64b8 100644 --- a/Ja2/MPConnectScreen.cpp +++ b/Ja2/MPConnectScreen.cpp @@ -1,19 +1,19 @@ - #include "Types.h" + #include "types.h" #include "MPConnectScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" #include "Music Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Text.h" #include "Text Input.h" #include "Soldier Profile.h" @@ -25,8 +25,8 @@ #include "connect.h" #include "network.h" // for client name #include "message.h" -#include "init.h" -#include "xml.h" +#include "Init.h" +#include "XML.h" //////////////////////////////////////////// diff --git a/Ja2/MPHostScreen.cpp b/Ja2/MPHostScreen.cpp index 21ec5580..15a7025d 100644 --- a/Ja2/MPHostScreen.cpp +++ b/Ja2/MPHostScreen.cpp @@ -1,18 +1,18 @@ - #include "Types.h" + #include "types.h" #include "MPHostScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Intro.h" #include "Text.h" #include "Text Input.h" @@ -22,7 +22,7 @@ #include "gameloop.h" #include "connect.h" #include "network.h" -#include "saveloadscreen.h" +#include "SaveLoadScreen.h" #include "GameInitOptionsScreen.h" @@ -31,9 +31,9 @@ #include #include #include "MPJoinScreen.h" -#include "MainMenuScreen.h" +#include "mainmenuscreen.h" #include "Init.h" -#include "xml.h" +#include "XML.h" //////////////////////////////////////////// // diff --git a/Ja2/MPJoinScreen.cpp b/Ja2/MPJoinScreen.cpp index 9eebad5f..9670f37f 100644 --- a/Ja2/MPJoinScreen.cpp +++ b/Ja2/MPJoinScreen.cpp @@ -1,18 +1,18 @@ - #include "Types.h" + #include "types.h" #include "MPJoinScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Text.h" #include "Text Input.h" #include "Soldier Profile.h" @@ -20,15 +20,15 @@ #include "gameloop.h" #include "connect.h" #include "network.h" // for client name -#include "saveloadscreen.h" -#include "game init.h" +#include "SaveLoadScreen.h" +#include "Game Init.h" #include #include #include #include -#include "Random.h" +#include "random.h" //////////////////////////////////////////// // diff --git a/Ja2/MPScoreScreen.cpp b/Ja2/MPScoreScreen.cpp index 51d6e1a2..6a2812db 100644 --- a/Ja2/MPScoreScreen.cpp +++ b/Ja2/MPScoreScreen.cpp @@ -1,19 +1,19 @@ - #include "Types.h" + #include "types.h" #include "MPScoreScreen.h" #include "GameSettings.h" #include "Utilities.h" - #include "wCheck.h" + #include "WCheck.h" #include "Font Control.h" #include "WordWrap.h" #include "Render Dirty.h" - #include "Input.h" + #include "input.h" #include "Options Screen.h" - #include "English.h" - #include "Sysutil.h" + #include "english.h" + #include "sysutil.h" #include "Fade Screen.h" #include "Cursor Control.h" #include "Music Control.h" - #include "cursors.h" + #include "Cursors.h" #include "Intro.h" #include "Text.h" #include "Text Input.h" diff --git a/Ja2/MainMenuScreen.cpp b/Ja2/MainMenuScreen.cpp index 22d2a266..5069bbb6 100644 --- a/Ja2/MainMenuScreen.cpp +++ b/Ja2/MainMenuScreen.cpp @@ -4,35 +4,35 @@ #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "cursors.h" - #include "font control.h" + #include "Cursors.h" + #include "Font Control.h" #include "mainmenuscreen.h" - #include "cursor control.h" - #include "render dirty.h" - #include "music control.h" + #include "Cursor Control.h" + #include "Render Dirty.h" + #include "Music Control.h" #include "GameSettings.h" #include "SaveLoadScreen.h" #include "SaveLoadGame.h" #include "Options Screen.h" - #include "English.h" - #include "Gameloop.h" + #include "english.h" + #include "gameloop.h" #include "Game Init.h" #include "Utilities.h" #include "WordWrap.h" #include "Font Control.h" - #include "text.h" + #include "Text.h" #include "Multi Language Graphic Utils.h" #include "Encrypted File.h" - #include "ja2 splash.h" + #include "JA2 Splash.h" #include "GameVersion.h" -#include "gamesettings.h" +#include "GameSettings.h" #include "connect.h" #include "strategic.h" -#include "strategic movement.h" -#include "overhead.h" -#include "init.h" -#include "xml.h" +#include "Strategic Movement.h" +#include "Overhead.h" +#include "Init.h" +#include "XML.h" #include #include diff --git a/Ja2/MessageBoxScreen.cpp b/Ja2/MessageBoxScreen.cpp index 79f9feb5..5166fb3f 100644 --- a/Ja2/MessageBoxScreen.cpp +++ b/Ja2/MessageBoxScreen.cpp @@ -1,21 +1,21 @@ #include "sgp.h" #include "screenids.h" - #include "fade screen.h" + #include "Fade Screen.h" #include "sysutil.h" #include "vobject_blitters.h" #include "MercTextBox.h" - #include "cursors.h" - #include "messageboxscreen.h" - #include "font control.h" + #include "Cursors.h" + #include "MessageBoxScreen.h" + #include "Font Control.h" #include "Map Screen Interface.h" #include "renderworld.h" #include "gameloop.h" #include "english.h" #include "GameSettings.h" #include "Interface Control.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "laptop.h" - #include "text.h" + #include "Text.h" #include "Text Input.h" #include "overhead map.h" #include "DropDown.h" // added by Flugente diff --git a/Ja2/Options Screen.cpp b/Ja2/Options Screen.cpp index 6a9ce3d1..bd57e8bf 100644 --- a/Ja2/Options Screen.cpp +++ b/Ja2/Options Screen.cpp @@ -1,6 +1,6 @@ - #include "Types.h" + #include "types.h" #include "Options Screen.h" - #include "Video.h" + #include "video.h" #include "Font Control.h" #include "Game Clock.h" #include "Text Input.h" @@ -11,24 +11,24 @@ #include "WCheck.h" #include "Utilities.h" #include "Slider.h" - #include "Debug.h" + #include "DEBUG.H" #include "Music Control.h" #include "Sound Control.h" #include "soundman.h" #include "Ambient Control.h" - #include "Worlddat.h" - #include "Worlddef.h" + #include "WorldDat.h" + #include "worlddef.h" #include "GameSettings.h" #include "Game Init.h" - #include "English.h" + #include "english.h" #include "Overhead.h" - #include "Gap.h" + #include "GAP.H" #include "Cursors.h" - #include "SysUtil.h" + #include "sysutil.h" #include "Exit Grids.h" #include "Text.h" #include "Interface Control.h" - #include "Message.h" + #include "message.h" #include "Multi Language Graphic Utils.h" #include "Map Information.h" #include "SmokeEffects.h" @@ -36,7 +36,7 @@ #include "Cheats.h" #include "connect.h" -#include "WorldMan.h" +#include "worldman.h" #include "Init.h" #include "Game Events.h" #include "PostalService.h" diff --git a/Ja2/SaveLoadGame.cpp b/Ja2/SaveLoadGame.cpp index 71c4d713..79cadef6 100644 --- a/Ja2/SaveLoadGame.cpp +++ b/Ja2/SaveLoadGame.cpp @@ -1,32 +1,32 @@ - #include "Types.h" + #include "types.h" #include "Soldier Profile.h" #include "FileMan.h" #include #include - #include "Debug.h" - #include "OverHead.h" + #include "DEBUG.H" + #include "Overhead.h" #include "Keys.h" #include "finances.h" - #include "History.h" + #include "history.h" #include "files.h" - #include "Laptop.h" - #include "iniReader.h" - #include "Email.h" - #include "Strategicmap.h" + #include "laptop.h" + #include "INIReader.h" + #include "email.h" + #include "strategicmap.h" #include "Game Events.h" #include "Game Clock.h" #include "Soldier Create.h" - #include "WorldDef.h" + #include "worlddef.h" #include "LaptopSave.h" #include "strategicmap.h" #include "Queen Command.h" #include "SaveLoadGame.h" #include "Tactical Save.h" #include "Squads.h" - #include "Environment.h" - #include "Lighting.h" + #include "environment.h" + #include "lighting.h" #include "Strategic Movement.h" - #include "Strategic.h" + #include "strategic.h" #include "Isometric Utils.h" #include "Quests.h" #include "opplist.h" @@ -38,17 +38,17 @@ #include "GameSettings.h" #include "Music Control.h" #include "Options Screen.h" - #include "Ai.h" - #include "RenderWorld.h" + #include "ai.h" + #include "renderworld.h" #include "SmokeEffects.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Bottom.h" #include "Interface.h" #include "Map Screen Helicopter.h" - #include "Environment.h" + #include "environment.h" #include "Arms Dealer Init.h" #include "Tactical Placement GUI.h" @@ -57,43 +57,43 @@ #include "Vehicles.h" #include "Merc Contract.h" #include "Bullets.h" - #include "air raid.h" + #include "Air Raid.h" #include "physics.h" #include "Strategic Pathing.h" #include "TeamTurns.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "Creature Spreading.h" #include "Strategic Status.h" - #include "Prebattle Interface.h" + #include "PreBattle Interface.h" #include "Boxing.h" #include "Strategic AI.h" #include "Map Screen Interface Map.h" #include "Meanwhile.h" - #include "dialogue control.h" - #include "text.h" - #include "Map Screen Interface.h" - #include "lighteffects.h" + #include "Dialogue Control.h" + #include "Text.h" + #include "Map Screen Interface.h" + #include "LightEffects.h" #include "HelpScreen.h" #include "Animated ProgressBar.h" - #include "merctextbox.h" - #include "render dirty.h" + #include "MercTextBox.h" + #include "Render Dirty.h" #include "Map Information.h" #include "Interface Items.h" #include "Civ Quotes.h" #include "Scheduling.h" #include "Animation Data.h" #include "Game Init.h" - #include "cheats.h" + #include "Cheats.h" #include "Strategic Event Handler.h" - #include "interface panels.h" - #include "interface dialogue.h" + #include "Interface Panels.h" + #include "interface Dialogue.h" #include "Assignments.h" #include "Interface Items.h" - #include "Shopkeeper Interface.h" - #include "postalservice.h" + #include "ShopKeeper Interface.h" + #include "PostalService.h" // HEADROCK HAM B1: Additional Include for HAM #include "MilitiaSquads.h" // HEADROCK HAM 3.5: Another include for HAM @@ -110,17 +110,17 @@ #include "Rebel Command.h" #include "BobbyR.h" -#include "Imp Portraits.h" +#include "IMP Portraits.h" #include "Loading Screen.h" #include "Interface Utils.h" #include "Squads.h" #include "IMP Confirm.h" #include "Enemy Soldier Save.h" #include "BobbyRMailOrder.h" -#include "Mercs.h" +#include "mercs.h" #include "INIReader.h" #include "mercs.h" -#include "soldier Profile.h" +#include "Soldier Profile.h" #ifdef JA2UB #include "Ja25 Strategic Ai.h" #include "Ja25_Tactical.h" diff --git a/Ja2/SaveLoadScreen.cpp b/Ja2/SaveLoadScreen.cpp index e5442659..a1a30800 100644 --- a/Ja2/SaveLoadScreen.cpp +++ b/Ja2/SaveLoadScreen.cpp @@ -1,34 +1,34 @@ - #include "Types.h" + #include "types.h" #include "SaveLoadScreen.h" - #include "Video.h" + #include "video.h" #include "Font Control.h" #include "Game Clock.h" #include "Render Dirty.h" #include "Text Input.h" #include "SaveLoadGame.h" - #include "Stdio.h" + #include "stdio.h" #include "WordWrap.h" - #include "StrategicMap.h" - #include "Finances.h" + #include "strategicmap.h" + #include "finances.h" #include "WCheck.h" #include "Utilities.h" #include "Cursors.h" - #include "VObject.h" + #include "vobject.h" #include "Merc Hiring.h" #include "LaptopSave.h" #include "Options Screen.h" #include "GameVersion.h" - #include "SysUtil.h" + #include "sysutil.h" #include "Tactical Save.h" - #include "OverHead.h" + #include "Overhead.h" #include "gamescreen.h" #include "GameSettings.h" - #include "fade screen.h" - #include "English.h" - #include "Gameloop.h" + #include "Fade Screen.h" + #include "english.h" + #include "gameloop.h" #include "Game Init.h" #include "Text.h" - #include "Message.h" + #include "message.h" #include "Map Screen Interface.h" #include "Multi Language Graphic Utils.h" #include "Campaign Types.h" diff --git a/Ja2/Screens.h b/Ja2/Screens.h index f94c05c8..d8f556a5 100644 --- a/Ja2/Screens.h +++ b/Ja2/Screens.h @@ -1,8 +1,8 @@ #ifndef __SCREEN_MANAGER #define __SCREEN_MANAGER -#include "Types.h" -#include "ScreenIds.h" +#include "types.h" +#include "screenids.h" // Each screen in the game comes with a Status flag (what was the last thing the screen was doing), an Initialization // function (which loads up the screen if necessary), a Handler function which is called while the screen is showing and diff --git a/Ja2/TimeLogging.h b/Ja2/TimeLogging.h index 7caab289..2478faa2 100644 --- a/Ja2/TimeLogging.h +++ b/Ja2/TimeLogging.h @@ -1,5 +1,5 @@ #pragma once -#include "Types.h" +#include "types.h" void TimingLogInitialize(const CHAR8* filename); void TimingLog(const CHAR8* logEvent, int n); diff --git a/Ja2/aniviewscreen.cpp b/Ja2/aniviewscreen.cpp index 638e67a2..6cf3a7b8 100644 --- a/Ja2/aniviewscreen.cpp +++ b/Ja2/aniviewscreen.cpp @@ -9,9 +9,9 @@ #include "worlddef.h" #include "renderworld.h" #include "input.h" - #include "font.h" + #include "Font.h" #include "screenids.h" - #include "overhead.h" + #include "Overhead.h" #include "sysutil.h" #include "Font Control.h" #include "Animation Control.h" @@ -23,8 +23,8 @@ #include #include #include "english.h" - #include "Fileman.h" - #include "messageboxscreen.h" + #include "FileMan.h" + #include "MessageBoxScreen.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Ja2/builddefines.h b/Ja2/builddefines.h index eb71defe..9391b6c3 100644 --- a/Ja2/builddefines.h +++ b/Ja2/builddefines.h @@ -77,6 +77,6 @@ #define _CRT_NON_CONFORMING_SWPRINTFS #define _SCL_SECURE_NO_WARNINGS -#include "Profiler.h" +#include "profiler.h" #endif diff --git a/Ja2/gameloop.cpp b/Ja2/gameloop.cpp index d65f7dae..56a8493f 100644 --- a/Ja2/gameloop.cpp +++ b/Ja2/gameloop.cpp @@ -1,17 +1,17 @@ #include #include #include "sgp.h" - #include "Gameloop.h" + #include "gameloop.h" #include "Screens.h" - #include "cursors.h" - #include "init.h" - #include "music control.h" - #include "sys globals.h" + #include "Cursors.h" + #include "Init.h" + #include "Music Control.h" + #include "Sys Globals.h" #include "laptop.h" #include "mapscreen.h" #include "Game Clock.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "LibraryDataBase.h" #include "Map Screen Interface.h" #include "Tactical Save.h" @@ -19,7 +19,7 @@ #include "GameSettings.h" #include "mapscreen.h" #include "Interface Control.h" - #include "text.h" + #include "Text.h" #include "HelpScreen.h" #include "PreBattle Interface.h" #include "Tactical Placement GUI.h"//dnl ch45 071009 diff --git a/Ja2/gameloop.h b/Ja2/gameloop.h index 6c5d2357..1f4fe3ea 100644 --- a/Ja2/gameloop.h +++ b/Ja2/gameloop.h @@ -1,7 +1,7 @@ #ifndef __GAMELOOP_ #define __GAMELOOP_ -#include "Types.h" +#include "types.h" // main game loop systems #define INIT_SYSTEM 0 diff --git a/Ja2/gamescreen.cpp b/Ja2/gamescreen.cpp index ba3ceb80..b3028c8b 100644 --- a/Ja2/gamescreen.cpp +++ b/Ja2/gamescreen.cpp @@ -6,10 +6,10 @@ #include "vobject.h" #include "worlddef.h" #include "renderworld.h" - #include "font.h" + #include "Font.h" #include "screenids.h" - #include "screens.h" - #include "overhead.h" + #include "Screens.h" + #include "Overhead.h" #include "Isometric Utils.h" #include "sysutil.h" #include "input.h" @@ -22,60 +22,60 @@ #include "Handle UI.h" #include #include - #include "cursors.h" + #include "Cursors.h" #include "vobject_blitters.h" #include "Button System.h" #include "lighting.h" #include "renderworld.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "environment.h" - #include "bullets.h" + #include "Bullets.h" #include "Assignments.h" #include "message.h" #include #include "overhead map.h" #include "Strategic Exit GUI.h" - #include "strategic movement.h" + #include "Strategic Movement.h" #include "Tactical Placement GUI.h" - #include "Air raid.h" + #include "Air Raid.h" #include "Game Clock.h" - #include "game init.h" + #include "Game Init.h" //DEF: Test Code #ifdef NETWORKED #include "Networking.h" #endif - #include "interface control.h" - #include "game clock.h" + #include "Interface Control.h" + #include "Game Clock.h" #include "physics.h" - #include "fade screen.h" - #include "dialogue control.h" - #include "soldier macros.h" + #include "Fade Screen.h" + #include "Dialogue Control.h" + #include "Soldier macros.h" #include "faces.h" #include "strategicmap.h" #include "gamescreen.h" - #include "interface.h" - #include "cursor control.h" - #include "strategic turns.h" + #include "Interface.h" + #include "Cursor Control.h" + #include "Strategic Turns.h" #include "merc entering.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Soldier Init List.h" - #include "interface panels.h" + #include "Interface Panels.h" #include "Map Information.h" #include "environment.h" #include "Squads.h" - #include "interface dialogue.h" - #include "auto bandage.h" - #include "meanwhile.h" - #include "strategic ai.h" + #include "interface Dialogue.h" + #include "Auto Bandage.h" + #include "Meanwhile.h" + #include "Strategic AI.h" #include "HelpScreen.h" #include "PreBattle Interface.h" #include "Sound Control.h" #include "MessageBoxScreen.h" #include "Text.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "editscreen.h" #include "Scheduling.h" #include "Animated ProgressBar.h" diff --git a/Ja2/gamescreen.h b/Ja2/gamescreen.h index de0696a4..da597829 100644 --- a/Ja2/gamescreen.h +++ b/Ja2/gamescreen.h @@ -2,7 +2,7 @@ #define _GAMESCREEN_H -#include "fade screen.h" +#include "Fade Screen.h" #define ARE_IN_FADE_IN( ) ( gfFadeIn || gfFadeInitialized ) diff --git a/Ja2/jascreens.cpp b/Ja2/jascreens.cpp index 9e7df483..7fec7bab 100644 --- a/Ja2/jascreens.cpp +++ b/Ja2/jascreens.cpp @@ -6,13 +6,13 @@ #include "himage.h" #include "vobject.h" #include "vobject_blitters.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" - #include "font.h" + #include "Font.h" #include "timer.h" #include "mousesystem.h" #include "screenids.h" - #include "screens.h" + #include "Screens.h" #include "Font Control.h" #include "sysutil.h" #include "tiledef.h" @@ -22,30 +22,30 @@ #include #include "Timer Control.h" #include "Sys Globals.h" - #include "interface.h" - #include "overhead.h" - #include "utilities.h" - #include "render dirty.h" + #include "Interface.h" + #include "Overhead.h" + #include "Utilities.h" + #include "Render Dirty.h" #include "jascreens.h" #include "gameloop.h" #include "Event Pump.h" - #include "animation cache.h" + #include "Animation Cache.h" #include "lighting.h" #include "mainmenuscreen.h" #include "Game Init.h" - #include "init.h" - #include "cursor control.h" - #include "utilities.h" + #include "Init.h" + #include "Cursor Control.h" + #include "Utilities.h" #include "GameVersion.h" - #include "game clock.h" + #include "Game Clock.h" #include "gamescreen.h" #include "english.h" - #include "Random.h" + #include "random.h" #include "WordWrap.h" #include "Sound Control.h" #include "WordWrap.h" - #include "text.h" - #include "IniReader.h" + #include "Text.h" + #include "INIReader.h" #include "sgp_logger.h" #include diff --git a/Ja2/jascreens.h b/Ja2/jascreens.h index 1822b377..a05ddbb6 100644 --- a/Ja2/jascreens.h +++ b/Ja2/jascreens.h @@ -2,7 +2,7 @@ #define __JASCREENS_H_ #include "sgp.h" -#include "ScreenIds.h" +#include "screenids.h" #include "mousesystem.h" #include "Button System.h" #include diff --git a/Ja2/legion cfg.cpp b/Ja2/legion cfg.cpp index 2004c497..4bf3f8df 100644 --- a/Ja2/legion cfg.cpp +++ b/Ja2/legion cfg.cpp @@ -1,10 +1,10 @@ //legion 2 - #include "Types.h" #include "types.h" - #include "Random.h" + #include "types.h" + #include "random.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" @@ -17,36 +17,36 @@ #include "laptop.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "email.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "strategicmap.h" - #include "game init.h" - #include "animation data.h" - #include "soldier create.h" + #include "Game Init.h" + #include "Animation Data.h" + #include "Soldier Create.h" #include "Soldier Init List.h" #include "strategic.h" #include "Squads.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "Message.h" + #include "message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" #include "Quests.h" #include "Strategic AI.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "GameSettings.h" #include "INIReader.h" #include "Soldier Profile.h" #include "XML.h" #include "Item Types.h" #include "Items.h" - #include "text.h" + #include "Text.h" #include "GameSettings.h" #ifdef JA2UB diff --git a/Ja2/ub_config.cpp b/Ja2/ub_config.cpp index 908f7584..d16ff60c 100644 --- a/Ja2/ub_config.cpp +++ b/Ja2/ub_config.cpp @@ -1,9 +1,9 @@ - #include "Types.h" #include "types.h" - #include "Random.h" + #include "types.h" + #include "random.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" @@ -16,36 +16,36 @@ #include "laptop.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "email.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "strategicmap.h" - #include "game init.h" - #include "animation data.h" - #include "soldier create.h" + #include "Game Init.h" + #include "Animation Data.h" + #include "Soldier Create.h" #include "Soldier Init List.h" #include "strategic.h" #include "Squads.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "Message.h" + #include "message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" #include "Quests.h" #include "Strategic AI.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "GameSettings.h" #include "INIReader.h" #include "Soldier Profile.h" #include "XML.h" #include "Item Types.h" #include "Items.h" - #include "text.h" + #include "Text.h" #include "GameSettings.h" #ifdef JA2UB diff --git a/Laptop/AimFacialIndex.cpp b/Laptop/AimFacialIndex.cpp index 60b88e78..e6230f51 100644 --- a/Laptop/AimFacialIndex.cpp +++ b/Laptop/AimFacialIndex.cpp @@ -4,11 +4,11 @@ #include "Utilities.h" #include "WCheck.h" #include "stdio.h" - #include "Aim.h" + #include "aim.h" #include "Soldier Profile.h" #include "email.h" #include "Text.h" - #include "aimsort.h" + #include "AimSort.h" #include "Assignments.h" #include "GameSettings.h" #include "english.h" diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index 490d0a63..e5485db0 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -1,30 +1,30 @@ #include "email.h" #include "laptop.h" #include "AimMembers.h" - #include "Aim.h" + #include "aim.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "stdio.h" #include "sysutil.h" #include "Soldier Profile.h" #include "Soldier Control.h" - #include "InterFace Items.h" - #include "overhead.h" + #include "Interface Items.h" + #include "Overhead.h" #include "WordWrap.h" #include "finances.h" #include "vsurface.h" - #include "VObject.h" + #include "vobject.h" #include "Game Clock.h" - #include "overhead.h" - #include "Faces.h" - #include "dialogue control.h" - #include "text.h" - #include "History.h" + #include "Overhead.h" + #include "faces.h" + #include "Dialogue Control.h" + #include "Text.h" + #include "history.h" #include "Game Event Hook.h" #include "MercTextBox.h" #include "Render Dirty.h" - #include "weapons.h" + #include "Weapons.h" #include "Soldier Add.h" #include "Merc Hiring.h" #include "strategic.h" @@ -32,7 +32,7 @@ #include "LaptopSave.h" #include "english.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "Strategic Status.h" #include "Merc Contract.h" #include "Strategic Merc Handler.h" @@ -40,7 +40,7 @@ #include "Sound Control.h" #include "Quests.h" #include "strategicmap.h" - #include "Personnel.h" + #include "personnel.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item #include "Strategic Town Loyalty.h" diff --git a/Laptop/AimSort.cpp b/Laptop/AimSort.cpp index 1b5b0f05..3652bf56 100644 --- a/Laptop/AimSort.cpp +++ b/Laptop/AimSort.cpp @@ -1,6 +1,6 @@ #include "laptop.h" #include "AimSort.h" - #include "Aim.h" + #include "aim.h" #include "WCheck.h" #include "Utilities.h" #include "WordWrap.h" diff --git a/Laptop/BobbyR.cpp b/Laptop/BobbyR.cpp index fcba33a6..504ce303 100644 --- a/Laptop/BobbyR.cpp +++ b/Laptop/BobbyR.cpp @@ -5,20 +5,20 @@ #include "WCheck.h" #include "WordWrap.h" #include "Cursors.h" - #include "interface items.h" + #include "Interface Items.h" #include "Weapons.h" #include "Store Inventory.h" #include "Game Event Hook.h" #include "Game Clock.h" #include "LaptopSave.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "Multi Language Graphic Utils.h" // #include "Utility.h" - #include "armsdealerinvinit.h" + #include "ArmsDealerInvInit.h" #include "GameSettings.h" #include "message.h" - #include "postalservice.h" + #include "PostalService.h" #ifdef JA2TESTVERSION diff --git a/Laptop/BobbyRAmmo.cpp b/Laptop/BobbyRAmmo.cpp index 8b4b6a53..162932b8 100644 --- a/Laptop/BobbyRAmmo.cpp +++ b/Laptop/BobbyRAmmo.cpp @@ -6,7 +6,7 @@ #include "WCheck.h" #include "WordWrap.h" #include "Encrypted File.h" - #include "text.h" + #include "Text.h" UINT32 guiAmmoBackground; UINT32 guiAmmoGrid; diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp index c8ae1e61..d8cc71c4 100644 --- a/Laptop/BobbyRGuns.cpp +++ b/Laptop/BobbyRGuns.cpp @@ -5,12 +5,12 @@ #include "WCheck.h" #include "WordWrap.h" #include "Cursors.h" - #include "interface items.h" + #include "Interface Items.h" #include "Encrypted File.h" - #include "text.h" + #include "Text.h" #include "Store Inventory.h" #include "LaptopSave.h" - #include "Finances.h" + #include "finances.h" #include "Overhead.h" #include "Weapons.h" #include "GameSettings.h" diff --git a/Laptop/BobbyRMailOrder.cpp b/Laptop/BobbyRMailOrder.cpp index a145c7a7..b5243636 100644 --- a/Laptop/BobbyRMailOrder.cpp +++ b/Laptop/BobbyRMailOrder.cpp @@ -10,7 +10,7 @@ #include "finances.h" #include "Game Clock.h" #include "Game Event Hook.h" - #include "Random.h" + #include "random.h" #include "LaptopSave.h" #include "Soldier Profile.h" #include "input.h" @@ -20,8 +20,8 @@ #include "Multi Language Graphic Utils.h" #include "strategic.h" #include "strategicmap.h" - #include "isometric utils.h" - #include "postalservice.h" + #include "Isometric Utils.h" + #include "PostalService.h" #include "english.h" #include diff --git a/Laptop/BobbyRShipments.cpp b/Laptop/BobbyRShipments.cpp index 28f208f3..dc8db902 100644 --- a/Laptop/BobbyRShipments.cpp +++ b/Laptop/BobbyRShipments.cpp @@ -1,13 +1,13 @@ #include "laptop.h" #include "BobbyRShipments.h" - #include "bobbyr.h" - #include "utilities.h" + #include "BobbyR.h" + #include "Utilities.h" #include "WCheck.h" #include "Text.h" #include "BobbyRGuns.h" - #include "cursors.h" + #include "Cursors.h" #include "BobbyRMailOrder.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "strategic.h" #include "strategicmap.h" #include "PostalService.h" diff --git a/Laptop/BriefingRoom.cpp b/Laptop/BriefingRoom.cpp index dc5c6711..b209eb9e 100644 --- a/Laptop/BriefingRoom.cpp +++ b/Laptop/BriefingRoom.cpp @@ -1,7 +1,7 @@ #include "Utilities.h" #include "WCheck.h" - #include "timer control.h" - #include "Debug.h" + #include "Timer Control.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "email.h" diff --git a/Laptop/BriefingRoomM.cpp b/Laptop/BriefingRoomM.cpp index 69a0c0da..511eff63 100644 --- a/Laptop/BriefingRoomM.cpp +++ b/Laptop/BriefingRoomM.cpp @@ -1,7 +1,7 @@ #include "Utilities.h" #include "WCheck.h" - #include "timer control.h" - #include "Debug.h" + #include "Timer Control.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "email.h" diff --git a/Laptop/BrokenLink.cpp b/Laptop/BrokenLink.cpp index 8c6fb157..4bcdc696 100644 --- a/Laptop/BrokenLink.cpp +++ b/Laptop/BrokenLink.cpp @@ -1,9 +1,9 @@ - #include "Types.h" - #include "font.h" + #include "types.h" + #include "Font.h" #include "laptop.h" #include "Font Control.h" #include "Text.h" - #include "wordwrap.h" + #include "WordWrap.h" #define BROKEN_LINK__FONT FONT12ARIAL #define BROKEN_LINK__COLOR FONT_MCOLOR_BLACK diff --git a/Laptop/CampaignHistoryMain.cpp b/Laptop/CampaignHistoryMain.cpp index e030ff87..9d13a13e 100644 --- a/Laptop/CampaignHistoryMain.cpp +++ b/Laptop/CampaignHistoryMain.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" - #include "Line.h" + #include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/CampaignStats.cpp b/Laptop/CampaignStats.cpp index bfc4e91d..2acae08b 100644 --- a/Laptop/CampaignStats.cpp +++ b/Laptop/CampaignStats.cpp @@ -11,7 +11,7 @@ #include "Game Clock.h" #include "Soldier macros.h" #include "Text.h" -#include "Laptop.h" +#include "laptop.h" #include "LaptopSave.h" #include "email.h" #include "DynamicDialogue.h" diff --git a/Laptop/CharProfile.cpp b/Laptop/CharProfile.cpp index 182f4bf7..92b16ebc 100644 --- a/Laptop/CharProfile.cpp +++ b/Laptop/CharProfile.cpp @@ -1,5 +1,5 @@ #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "CharProfile.h" #include "IMP AboutUs.h" #include "IMP Attribute Entrance.h" @@ -19,7 +19,7 @@ #include "IMP Personality Finish.h" #include "IMPVideoObjects.h" #include "IMP Confirm.h" - #include "messageboxscreen.h" + #include "MessageBoxScreen.h" #include "LaptopSave.h" // These 5 added - SANDRO #include "IMP Character and Disability Entrance.h" diff --git a/Laptop/Encyclopedia_Data_new.cpp b/Laptop/Encyclopedia_Data_new.cpp index 2dff5b82..e488c1d0 100644 --- a/Laptop/Encyclopedia_Data_new.cpp +++ b/Laptop/Encyclopedia_Data_new.cpp @@ -1,4 +1,4 @@ - #include "Types.h" + #include "types.h" #include "WCheck.h" #include #include "GameSettings.h" diff --git a/Laptop/Encyclopedia_new.cpp b/Laptop/Encyclopedia_new.cpp index 08596e8c..5122d4ef 100644 --- a/Laptop/Encyclopedia_new.cpp +++ b/Laptop/Encyclopedia_new.cpp @@ -29,7 +29,7 @@ /// uncomment to use just graphic + mouseregion instead of real buttons. No sounds, no button states, just plain 'hyperlinks'. #define ENC_USE_BUTTONSYSTEM - #include "Types.h" + #include "types.h" #include "WCheck.h" #include "DEBUG.H" #include "GameSettings.h" diff --git a/Laptop/FacilityProduction.cpp b/Laptop/FacilityProduction.cpp index ea60571d..e195b14e 100644 --- a/Laptop/FacilityProduction.cpp +++ b/Laptop/FacilityProduction.cpp @@ -8,7 +8,7 @@ #include "WCheck.h" #include "Utilities.h" #include "WordWrap.h" -#include "Line.h" +#include "line.h" #include "Text.h" #include "FacilityProduction.h" #include "Map Screen Interface.h" diff --git a/Laptop/IMP AboutUs.cpp b/Laptop/IMP AboutUs.cpp index 991aaca5..eceef0d6 100644 --- a/Laptop/IMP AboutUs.cpp +++ b/Laptop/IMP AboutUs.cpp @@ -2,10 +2,10 @@ #include "CharProfile.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Attribute Entrance.cpp b/Laptop/IMP Attribute Entrance.cpp index 0ec42966..16fa7de3 100644 --- a/Laptop/IMP Attribute Entrance.cpp +++ b/Laptop/IMP Attribute Entrance.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Attribute Finish.cpp b/Laptop/IMP Attribute Finish.cpp index b87813f1..80689bc4 100644 --- a/Laptop/IMP Attribute Finish.cpp +++ b/Laptop/IMP Attribute Finish.cpp @@ -5,10 +5,10 @@ #include "Utilities.h" #include "input.h" #include "Isometric Utils.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "IMP Attribute Selection.h" diff --git a/Laptop/IMP Attribute Selection.cpp b/Laptop/IMP Attribute Selection.cpp index 6400f0f0..0a720b40 100644 --- a/Laptop/IMP Attribute Selection.cpp +++ b/Laptop/IMP Attribute Selection.cpp @@ -6,14 +6,14 @@ #include "input.h" #include "Isometric Utils.h" #include "IMP Skill Trait.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "IMP Compile Character.h" - #include "text.h" + #include "Text.h" #include "GameSettings.h" // Added these 3 - SANDRO #include "IMP Disability Trait.h" diff --git a/Laptop/IMP Background.cpp b/Laptop/IMP Background.cpp index 14b30fa4..577bd094 100644 --- a/Laptop/IMP Background.cpp +++ b/Laptop/IMP Background.cpp @@ -1,17 +1,17 @@ #include "IMP Background.h" #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Background.h b/Laptop/IMP Background.h index ffd1dce9..9c8a5e1e 100644 --- a/Laptop/IMP Background.h +++ b/Laptop/IMP Background.h @@ -1,7 +1,7 @@ #ifndef __IMP_BACKGROUND__H_ #define __IMP_BACKGROUND__H_ -#include "Types.h" +#include "types.h" #include "mousesystem.h" void EnterIMPBackground( void ); diff --git a/Laptop/IMP Begin Screen.cpp b/Laptop/IMP Begin Screen.cpp index 3037f6b6..eb46951d 100644 --- a/Laptop/IMP Begin Screen.cpp +++ b/Laptop/IMP Begin Screen.cpp @@ -5,23 +5,23 @@ #include "IMPVideoObjects.h" #include "Utilities.h" #include "Timer Control.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Finish.h" #include "IMP Text System.h" #include "Text Input.h" - #include "messageboxscreen.h" - #include "Soldier Profile Type.h" + #include "MessageBoxScreen.h" + #include "soldier profile type.h" #include "IMP Portraits.h" #include "IMP Attribute Selection.h" #include "english.h" #include "line.h" #include "Merc Hiring.h" #include "strategic.h" - #include "text.h" + #include "Text.h" #include "LaptopSave.h" #include diff --git a/Laptop/IMP Character Trait.cpp b/Laptop/IMP Character Trait.cpp index e7703298..cf2e85ce 100644 --- a/Laptop/IMP Character Trait.cpp +++ b/Laptop/IMP Character Trait.cpp @@ -1,16 +1,16 @@ #include "IMP Character Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "GameSettings.h" diff --git a/Laptop/IMP Character Trait.h b/Laptop/IMP Character Trait.h index 06ed9747..df46f8a7 100644 --- a/Laptop/IMP Character Trait.h +++ b/Laptop/IMP Character Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_CHARACTER_TRAIT__H_ #define __IMP_CHARACTER_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPCharacterTrait( void ); void RenderIMPCharacterTrait( void ); diff --git a/Laptop/IMP Character and Disability Entrance.cpp b/Laptop/IMP Character and Disability Entrance.cpp index 5cae0c9a..c61a5ec9 100644 --- a/Laptop/IMP Character and Disability Entrance.cpp +++ b/Laptop/IMP Character and Disability Entrance.cpp @@ -3,13 +3,13 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" - #include "text.h" + #include "Text.h" // IMP personality entrance buttons diff --git a/Laptop/IMP Color Choosing.cpp b/Laptop/IMP Color Choosing.cpp index 310cf62d..2a239ba5 100644 --- a/Laptop/IMP Color Choosing.cpp +++ b/Laptop/IMP Color Choosing.cpp @@ -1,15 +1,15 @@ #include "IMP Color Choosing.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Portraits.h" diff --git a/Laptop/IMP Color Choosing.h b/Laptop/IMP Color Choosing.h index 162d9de3..bc486872 100644 --- a/Laptop/IMP Color Choosing.h +++ b/Laptop/IMP Color Choosing.h @@ -1,7 +1,7 @@ #ifndef __IMP_COLOR_CHOOSING_SKIN_HAIR__H_ #define __IMP_COLOR_CHOOSING_SKIN_HAIR__H_ -#include "Types.h" +#include "types.h" void EnterIMPColorChoice( void ); void RenderIMPColorChoice( void ); diff --git a/Laptop/IMP Compile Character.cpp b/Laptop/IMP Compile Character.cpp index 0420b1c4..ea7ae826 100644 --- a/Laptop/IMP Compile Character.cpp +++ b/Laptop/IMP Compile Character.cpp @@ -1,7 +1,7 @@ #include "laptop.h" #include "CharProfile.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "GameSettings.h" @@ -12,7 +12,7 @@ #include "IMP Attribute Selection.h" #include "IMP Portraits.h" #include "IMP Compile Character.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Animation Data.h" #include "random.h" diff --git a/Laptop/IMP Confirm.cpp b/Laptop/IMP Confirm.cpp index b5a0ac1a..8a9572d2 100644 --- a/Laptop/IMP Confirm.cpp +++ b/Laptop/IMP Confirm.cpp @@ -3,10 +3,10 @@ #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Compile Character.h" #include "soldier profile type.h" @@ -14,7 +14,7 @@ #include "IMP Confirm.h" #include "finances.h" #include "Soldier Profile.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Control.h" #include "IMP Portraits.h" #include "Overhead.h" @@ -25,8 +25,8 @@ #include "Game Event Hook.h" #include "LaptopSave.h" #include "strategic.h" - #include "weapons.h" - #include "Random.h" + #include "Weapons.h" + #include "random.h" #include "GameVersion.h" #include "GameSettings.h" #include "IMP Gear.h" // added by Flugente diff --git a/Laptop/IMP Disability Trait.cpp b/Laptop/IMP Disability Trait.cpp index b5a8e1be..944cdd24 100644 --- a/Laptop/IMP Disability Trait.cpp +++ b/Laptop/IMP Disability Trait.cpp @@ -1,16 +1,16 @@ #include "IMP Disability Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "GameSettings.h" diff --git a/Laptop/IMP Disability Trait.h b/Laptop/IMP Disability Trait.h index 58ffd66a..1022c896 100644 --- a/Laptop/IMP Disability Trait.h +++ b/Laptop/IMP Disability Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_DISABILITY_TRAIT__H_ #define __IMP_DISABILITY_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPDisabilityTrait( void ); void RenderIMPDisabilityTrait( void ); diff --git a/Laptop/IMP Finish.cpp b/Laptop/IMP Finish.cpp index f1a8bdbb..60c2d71f 100644 --- a/Laptop/IMP Finish.cpp +++ b/Laptop/IMP Finish.cpp @@ -7,15 +7,15 @@ #include "Utilities.h" #include "WCheck.h" #include "Timer Control.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Attribute Selection.h" #include "IMP Text System.h" #include "soundman.h" - #include "text.h" + #include "Text.h" #include "IMP Confirm.h" diff --git a/Laptop/IMP Gear Entrance.cpp b/Laptop/IMP Gear Entrance.cpp index 88da8903..a1f7c057 100644 --- a/Laptop/IMP Gear Entrance.cpp +++ b/Laptop/IMP Gear Entrance.cpp @@ -8,10 +8,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" -#include "Debug.h" +#include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" -#include "cursors.h" +#include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "Text.h" diff --git a/Laptop/IMP Gear Entrance.h b/Laptop/IMP Gear Entrance.h index 1a73e253..7bcb4c22 100644 --- a/Laptop/IMP Gear Entrance.h +++ b/Laptop/IMP Gear Entrance.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" void EnterIMPGearEntrance( void ); void RenderIMPGearEntrance( void ); diff --git a/Laptop/IMP Gear.cpp b/Laptop/IMP Gear.cpp index 0d84fb2f..a969e7b0 100644 --- a/Laptop/IMP Gear.cpp +++ b/Laptop/IMP Gear.cpp @@ -6,17 +6,17 @@ #include "IMP Gear.h" #include "IMP Skill Trait.h" #include "Button System.h" -#include "utilities.h" -#include "Debug.h" +#include "Utilities.h" +#include "DEBUG.H" #include "Text.h" #include "Font Control.h" -#include "font.h" +#include "Font.h" #include "laptop.h" -#include "cursors.h" +#include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" -#include "wordwrap.h" +#include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Gear.h b/Laptop/IMP Gear.h index 01d1971d..3cca01ae 100644 --- a/Laptop/IMP Gear.h +++ b/Laptop/IMP Gear.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" #include "soldier profile type.h" void EnterIMPGear( void ); diff --git a/Laptop/IMP HomePage.cpp b/Laptop/IMP HomePage.cpp index b54fa8a3..65c8568f 100644 --- a/Laptop/IMP HomePage.cpp +++ b/Laptop/IMP HomePage.cpp @@ -2,11 +2,11 @@ #include "IMP HomePage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "IMP Compile Character.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "Timer Control.h" diff --git a/Laptop/IMP MainPage.cpp b/Laptop/IMP MainPage.cpp index 41acd733..026067bf 100644 --- a/Laptop/IMP MainPage.cpp +++ b/Laptop/IMP MainPage.cpp @@ -3,10 +3,10 @@ #include "IMPVideoObjects.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Attribute Selection.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp index 848b4c49..c7f053c2 100644 --- a/Laptop/IMP Minor Trait.cpp +++ b/Laptop/IMP Minor Trait.cpp @@ -1,17 +1,17 @@ #include "IMP Minor Trait.h" #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Minor Trait.h b/Laptop/IMP Minor Trait.h index 14d2501c..43bb0b91 100644 --- a/Laptop/IMP Minor Trait.h +++ b/Laptop/IMP Minor Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_MINOR_TRAIT__H_ #define __IMP_MINOR_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPMinorTrait( void ); void RenderIMPMinorTrait( void ); diff --git a/Laptop/IMP Personality Entrance.cpp b/Laptop/IMP Personality Entrance.cpp index 2402663f..ea88eabe 100644 --- a/Laptop/IMP Personality Entrance.cpp +++ b/Laptop/IMP Personality Entrance.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Personality Finish.cpp b/Laptop/IMP Personality Finish.cpp index cd5a0de5..61794594 100644 --- a/Laptop/IMP Personality Finish.cpp +++ b/Laptop/IMP Personality Finish.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Personality Quiz.cpp b/Laptop/IMP Personality Quiz.cpp index 3a1cfe8f..ed30843f 100644 --- a/Laptop/IMP Personality Quiz.cpp +++ b/Laptop/IMP Personality Quiz.cpp @@ -3,10 +3,10 @@ #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "Utilities.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Compile Character.h" #include "soldier profile type.h" diff --git a/Laptop/IMP Portraits.cpp b/Laptop/IMP Portraits.cpp index 9ba70518..8ad0de12 100644 --- a/Laptop/IMP Portraits.cpp +++ b/Laptop/IMP Portraits.cpp @@ -6,10 +6,10 @@ #include "WCheck.h" #include "input.h" #include "Isometric Utils.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "IMP Text System.h" diff --git a/Laptop/IMP Prejudice.cpp b/Laptop/IMP Prejudice.cpp index 11712753..0b5b3fe6 100644 --- a/Laptop/IMP Prejudice.cpp +++ b/Laptop/IMP Prejudice.cpp @@ -6,17 +6,17 @@ #include "IMP Prejudice.h" #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Prejudice.h b/Laptop/IMP Prejudice.h index 572f24bc..8bdcf304 100644 --- a/Laptop/IMP Prejudice.h +++ b/Laptop/IMP Prejudice.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" void EnterIMPPrejudice( void ); void RenderIMPPrejudice( void ); diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp index 93fab856..fbfd0e39 100644 --- a/Laptop/IMP Skill Trait.cpp +++ b/Laptop/IMP Skill Trait.cpp @@ -1,16 +1,16 @@ #include "IMP Skill Trait.h" #include "Button System.h" - #include "utilities.h" - #include "Debug.h" + #include "Utilities.h" + #include "DEBUG.H" #include "Text.h" #include "Font Control.h" - #include "font.h" + #include "Font.h" #include "laptop.h" - #include "cursors.h" + #include "Cursors.h" #include "IMP MainPage.h" #include "IMPVideoObjects.h" #include "_Ja25EnglishText.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "CharProfile.h" #include "soldier profile type.h" #include "IMP Compile Character.h" diff --git a/Laptop/IMP Skill Trait.h b/Laptop/IMP Skill Trait.h index 7f537213..8eda49cf 100644 --- a/Laptop/IMP Skill Trait.h +++ b/Laptop/IMP Skill Trait.h @@ -1,7 +1,7 @@ #ifndef __IMP_SKILL_TRAIT__H_ #define __IMP_SKILL_TRAIT__H_ -#include "Types.h" +#include "types.h" void EnterIMPSkillTrait( void ); void RenderIMPSkillTrait( void ); diff --git a/Laptop/IMP Text System.cpp b/Laptop/IMP Text System.cpp index 9555ef80..06fd15d4 100644 --- a/Laptop/IMP Text System.cpp +++ b/Laptop/IMP Text System.cpp @@ -12,24 +12,24 @@ #include "IMP Confirm.h" #include "GameSettings.h" #include "Text.h" - #include "_Ja25Englishtext.h" + #include "_Ja25EnglishText.h" #ifdef JA2UB #include "laptop.h" #include "email.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" - #include "soldier profile.h" + #include "Cursors.h" + #include "Soldier Profile.h" #include "IMP Compile Character.h" #include "IMP Voices.h" #include "IMP Portraits.h" #include "Game Clock.h" #include "environment.h" #include "AimMembers.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "LaptopSave.h" #include "finances.h" diff --git a/Laptop/IMP Voices.cpp b/Laptop/IMP Voices.cpp index ed2398f7..dda39cfd 100644 --- a/Laptop/IMP Voices.cpp +++ b/Laptop/IMP Voices.cpp @@ -5,14 +5,14 @@ #include "Utilities.h" #include "input.h" #include "Isometric Utils.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "laptop.h" #include "Sound Control.h" #include "IMP Text System.h" - #include "text.h" + #include "Text.h" #include "soldier profile type.h" #include "GameSettings.h" #include "LaptopSave.h" diff --git a/Laptop/IMPVideoObjects.cpp b/Laptop/IMPVideoObjects.cpp index 57948a69..63198d6e 100644 --- a/Laptop/IMPVideoObjects.cpp +++ b/Laptop/IMPVideoObjects.cpp @@ -1,7 +1,7 @@ #include "IMPVideoObjects.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "laptop.h" diff --git a/Laptop/Intelmarket.cpp b/Laptop/Intelmarket.cpp index 99d3c839..8a2d62f4 100644 --- a/Laptop/Intelmarket.cpp +++ b/Laptop/Intelmarket.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/MilitiaWebsite.cpp b/Laptop/MilitiaWebsite.cpp index 16104a7e..96e093d0 100644 --- a/Laptop/MilitiaWebsite.cpp +++ b/Laptop/MilitiaWebsite.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -32,7 +32,7 @@ #include "GameVersion.h" #include "message.h" #include "Game Event Hook.h" -#include "militia control.h" +#include "Militia Control.h" #include "Town Militia.h" #include "Strategic Town Loyalty.h" diff --git a/Laptop/PMC.cpp b/Laptop/PMC.cpp index aac3c86f..76ffbc68 100644 --- a/Laptop/PMC.cpp +++ b/Laptop/PMC.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -32,7 +32,7 @@ #include "GameVersion.h" #include "message.h" #include "Game Event Hook.h" -#include "militia control.h" +#include "Militia Control.h" #include "Town Militia.h" #include "Strategic Town Loyalty.h" #include "MilitiaIndividual.h" diff --git a/Laptop/PostalService.cpp b/Laptop/PostalService.cpp index b1fbf9f7..5081540f 100644 --- a/Laptop/PostalService.cpp +++ b/Laptop/PostalService.cpp @@ -1,11 +1,11 @@ #include "SaveLoadMap.h" #include "Structure Wrap.h" #include "Tactical Save.h" -#include "postalservice.h" +#include "PostalService.h" #include "strategic.h" #include "strategicmap.h" #include "random.h" -#include "game clock.h" +#include "Game Clock.h" #include "GameSettings.h" #include #include diff --git a/Laptop/PostalService.h b/Laptop/PostalService.h index dfd4df5c..3830a973 100644 --- a/Laptop/PostalService.h +++ b/Laptop/PostalService.h @@ -4,12 +4,12 @@ #include "SaveLoadMap.h" #include "Structure Wrap.h" #include "Tactical Save.h" -#include "laptopsave.h" -#include "postalservice.h" -#include "isometric utils.h" -#include "debug.h" -#include "game event hook.h" -#include "game events.h" +#include "LaptopSave.h" +#include "PostalService.h" +#include "Isometric Utils.h" +#include "DEBUG.H" +#include "Game Event Hook.h" +#include "Game Events.h" #include #include #include diff --git a/Laptop/Store Inventory.cpp b/Laptop/Store Inventory.cpp index b21fa906..cdf7be05 100644 --- a/Laptop/Store Inventory.cpp +++ b/Laptop/Store Inventory.cpp @@ -1,11 +1,11 @@ - #include "Types.h" + #include "types.h" #include "Store Inventory.h" - #include "Random.h" + #include "random.h" #include "Weapons.h" - #include "Debug.h" + #include "DEBUG.H" #include "LaptopSave.h" #include "ShopKeeper Interface.h" - #include "armsdealerinvinit.h" + #include "ArmsDealerInvInit.h" #include "GameSettings.h" diff --git a/Laptop/WHO.cpp b/Laptop/WHO.cpp index 1b077b9f..ff5f498a 100644 --- a/Laptop/WHO.cpp +++ b/Laptop/WHO.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/XML_DeliveryMethods.cpp b/Laptop/XML_DeliveryMethods.cpp index 07751b22..652cea6b 100644 --- a/Laptop/XML_DeliveryMethods.cpp +++ b/Laptop/XML_DeliveryMethods.cpp @@ -1,7 +1,7 @@ #include "sgp.h" -#include "overhead types.h" -#include "overhead.h" -#include "text.h" +#include "Overhead Types.h" +#include "Overhead.h" +#include "Text.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Laptop/XML_ShippingDestinations.cpp b/Laptop/XML_ShippingDestinations.cpp index e17b76ea..01ea3206 100644 --- a/Laptop/XML_ShippingDestinations.cpp +++ b/Laptop/XML_ShippingDestinations.cpp @@ -1,7 +1,7 @@ #include "sgp.h" -#include "overhead types.h" -#include "overhead.h" -#include "text.h" +#include "Overhead Types.h" +#include "Overhead.h" +#include "Text.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Laptop/aim.cpp b/Laptop/aim.cpp index a03a80d5..e5c50446 100644 --- a/Laptop/aim.cpp +++ b/Laptop/aim.cpp @@ -2,8 +2,8 @@ #include "aim.h" #include "Utilities.h" #include "WCheck.h" - #include "timer control.h" - #include "Debug.h" + #include "Timer Control.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" #include "email.h" diff --git a/Laptop/email.cpp b/Laptop/email.cpp index 6c12710f..43305543 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -2,17 +2,17 @@ #include "email.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" - #include "soldier profile.h" + #include "Cursors.h" + #include "Soldier Profile.h" #include "CharProfile.h" #include "IMP Compile Character.h" #include "IMP Portraits.h" #include "Game Clock.h" #include "AimMembers.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "LaptopSave.h" #include "finances.h" diff --git a/Laptop/files.cpp b/Laptop/files.cpp index 3de647b9..d3705523 100644 --- a/Laptop/files.cpp +++ b/Laptop/files.cpp @@ -3,15 +3,15 @@ #include #include "laptop.h" #include "files.h" - #include "Game clock.h" + #include "Game Clock.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "email.h" - #include "text.h" + #include "Text.h" // HEADROCK PROFEX: This is required to display the proper facial image. #include "Soldier Profile.h" #include "GameSettings.h" diff --git a/Laptop/finances.cpp b/Laptop/finances.cpp index ac542863..e785f1a3 100644 --- a/Laptop/finances.cpp +++ b/Laptop/finances.cpp @@ -1,12 +1,12 @@ #include "laptop.h" #include "finances.h" - #include "Game clock.h" + #include "Game Clock.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "Soldier Profile.h" #include "Text.h" #include "Strategic Mines.h" diff --git a/Laptop/florist Order Form.cpp b/Laptop/florist Order Form.cpp index b62696fb..1bba206a 100644 --- a/Laptop/florist Order Form.cpp +++ b/Laptop/florist Order Form.cpp @@ -10,15 +10,15 @@ #include "Encrypted File.h" #include "florist Cards.h" #include "Text Input.h" - #include "Finances.h" - #include "Game clock.h" + #include "finances.h" + #include "Game Clock.h" #include "english.h" #include "Text.h" #include "LaptopSave.h" - #include "Random.h" - #include "postalservice.h" + #include "random.h" + #include "PostalService.h" -#include "meanwhile.h" +#include "Meanwhile.h" #define FLOWER_ORDER_TINY_FONT FONT10ARIAL diff --git a/Laptop/history.cpp b/Laptop/history.cpp index 3ca4a8c4..42880242 100644 --- a/Laptop/history.cpp +++ b/Laptop/history.cpp @@ -1,16 +1,16 @@ #include "laptop.h" - #include "History.h" - #include "Game clock.h" + #include "history.h" + #include "Game Clock.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "Soldier Profile.h" #include "strategicmap.h" #include "QuestText.h" - #include "text.h" + #include "Text.h" #include "message.h" #include "LaptopSave.h" diff --git a/Laptop/insurance Contract.cpp b/Laptop/insurance Contract.cpp index c85cc170..441c40d2 100644 --- a/Laptop/insurance Contract.cpp +++ b/Laptop/insurance Contract.cpp @@ -13,12 +13,12 @@ #include "Soldier Add.h" #include "Game Clock.h" #include "finances.h" - #include "History.h" + #include "history.h" #include "Game Event Hook.h" #include "LaptopSave.h" #include "english.h" #include "Text.h" - #include "Random.h" + #include "random.h" #include "Strategic Status.h" #include "Assignments.h" #include "Map Screen Interface.h" @@ -27,7 +27,7 @@ #ifdef JA2UB #include "ub_config.h" -#include "quests.h" +#include "Quests.h" #endif #define INS_CTRCT_ORDER_GRID_WIDTH 132 diff --git a/Laptop/insurance.cpp b/Laptop/insurance.cpp index 6cb3ce2b..8fc7c326 100644 --- a/Laptop/insurance.cpp +++ b/Laptop/insurance.cpp @@ -5,7 +5,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" - #include "Line.h" + #include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp index 00c2f161..e6da5bcb 100644 --- a/Laptop/laptop.cpp +++ b/Laptop/laptop.cpp @@ -3,8 +3,8 @@ #include "WCheck.h" #include "Render Dirty.h" #include "sysutil.h" - #include "screens.h" - #include "cursors.h" + #include "Screens.h" + #include "Cursors.h" #include "Event Pump.h" #include "laptop.h" #include "aim.h" @@ -45,26 +45,26 @@ #include "Interface Control.h" #include "Game Event Hook.h" #include "WordWrap.h" - #include "Game init.h" + #include "Game Init.h" #include "Game Clock.h" #include "vobject_blitters.h" #include "Soldier Profile.h" #include "Overhead.h" #include "environment.h" #include "LibraryDataBase.h" - #include "music control.h" + #include "Music Control.h" #include "SaveLoadGame.h" #include "LaptopSave.h" - #include "RenderWorld.h" + #include "renderworld.h" #include "gameloop.h" #include "english.h" #include "random.h" #include "Merc Hiring.h" #include "Map Screen Interface.h" - #include "ambient control.h" + #include "Ambient Control.h" #include "Sound Control.h" - #include "text.h" - #include "Message.h" + #include "Text.h" + #include "message.h" #include "Map Screen Interface Bottom.h" #include "Cursor Control.h" #include "Quests.h" @@ -72,8 +72,8 @@ #include "BrokenLink.h" #include "BobbyRShipments.h" #include "Dialogue Control.h" - #include "helpscreen.h" - #include "cheats.h" + #include "HelpScreen.h" + #include "Cheats.h" #include "Strategic Status.h" #include "Arms Dealer Init.h" #include "GameSettings.h" @@ -81,7 +81,7 @@ #include "Encyclopedia_Data_new.h" #include "CampaignHistoryMain.h" // added by Flugente #include "CampaignHistory_Summary.h" // added by Flugente - #include "MercCompare.h" // added by Flugente + #include "merccompare.h" // added by Flugente #include "WHO.h" // added by Flugente #include "PMC.h" // added by Flugente #include "MilitiaWebsite.h" // added by Flugente diff --git a/Laptop/laptop.h b/Laptop/laptop.h index a558dd1b..f02f4b6d 100644 --- a/Laptop/laptop.h +++ b/Laptop/laptop.h @@ -4,7 +4,7 @@ #include "types.h" #include "sgp.h" #include "Font Control.h" -#include "messageboxscreen.h" +#include "MessageBoxScreen.h" diff --git a/Laptop/merccompare.cpp b/Laptop/merccompare.cpp index 413853d5..03b6d9fb 100644 --- a/Laptop/merccompare.cpp +++ b/Laptop/merccompare.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" diff --git a/Laptop/mercs Account.cpp b/Laptop/mercs Account.cpp index b312ef2b..a6748721 100644 --- a/Laptop/mercs Account.cpp +++ b/Laptop/mercs Account.cpp @@ -10,8 +10,8 @@ #include "Game Clock.h" #include "Soldier Add.h" #include "Overhead.h" - #include "History.h" - #include "Email.h" + #include "history.h" + #include "email.h" #include "LaptopSave.h" #include "Text.h" #include "Speck Quotes.h" diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index a32a7a7c..b9e8efe4 100644 --- a/Laptop/mercs Files.cpp +++ b/Laptop/mercs Files.cpp @@ -10,10 +10,10 @@ #include "stdio.h" #include "Encrypted File.h" #include "AimMembers.h" - #include "InterFace Items.h" + #include "Interface Items.h" #include "Game Clock.h" #include "Soldier Add.h" - #include "OverHead.h" + #include "Overhead.h" #include "Game Clock.h" #include "message.h" #include "Font.h" @@ -23,11 +23,11 @@ #include "Multi Language Graphic Utils.h" #include "Quests.h" #include "Assignments.h" - #include "Input.h" + #include "input.h" #include "english.h" #include "finances.h" #include "GameSettings.h" - #include "Personnel.h" + #include "personnel.h" #include "Encyclopedia_new.h" //update encyclopedia item visibility when viewing that item #include "mousesystem.h" diff --git a/Laptop/mercs No Account.cpp b/Laptop/mercs No Account.cpp index d7e7d2a5..ad659ff2 100644 --- a/Laptop/mercs No Account.cpp +++ b/Laptop/mercs No Account.cpp @@ -6,7 +6,7 @@ #include "WordWrap.h" #include "Cursors.h" #include "LaptopSave.h" - #include "Random.h" + #include "random.h" #include "Text.h" #include "Speck Quotes.h" diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp index 0f96750a..c3378a06 100644 --- a/Laptop/mercs.cpp +++ b/Laptop/mercs.cpp @@ -6,13 +6,13 @@ #include "Cursors.h" #include "Overhead.h" #include "Soldier Add.h" - #include "Email.h" + #include "email.h" #include "Game Clock.h" - #include "Faces.h" - #include "dialogue control.h" + #include "faces.h" + #include "Dialogue Control.h" #include "MercTextBox.h" #include "Merc Hiring.h" - #include "Random.h" + #include "random.h" #include "LaptopSave.h" #include "GameSettings.h" #include "Text.h" diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index 935b5cf0..a16a7325 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -2,10 +2,10 @@ #include "personnel.h" #include "Utilities.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "WordWrap.h" #include "Encrypted File.h" - #include "cursors.h" + #include "Cursors.h" #include "Overhead.h" #include "Soldier Profile.h" #include "Text.h" @@ -26,9 +26,9 @@ #include "strategicmap.h" #include "GameSettings.h" #include "Merc Contract.h" - #include "_Ja25Englishtext.h" // added by SANDRO + #include "_Ja25EnglishText.h" // added by SANDRO -#include "Soldier Macros.h" +#include "Soldier macros.h" #include "InterfaceItemImages.h" #include "IMP Skill Trait.h" // added by Flugente diff --git a/Laptop/personnel.h b/Laptop/personnel.h index 5b48dccd..f6a62c1f 100644 --- a/Laptop/personnel.h +++ b/Laptop/personnel.h @@ -2,7 +2,7 @@ #define __PERSONNEL_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" diff --git a/Laptop/sirtech.cpp b/Laptop/sirtech.cpp index 3709ed6e..b9c79358 100644 --- a/Laptop/sirtech.cpp +++ b/Laptop/sirtech.cpp @@ -1,5 +1,5 @@ #include "laptop.h" - #include "SirTech.h" + #include "sirtech.h" void GameInitSirTech() { diff --git a/ModularizedTacticalAI/src/LegacyAIPlan.cpp b/ModularizedTacticalAI/src/LegacyAIPlan.cpp index d672870e..e687ed25 100644 --- a/ModularizedTacticalAI/src/LegacyAIPlan.cpp +++ b/ModularizedTacticalAI/src/LegacyAIPlan.cpp @@ -9,7 +9,7 @@ #include "../../TacticalAI/AIInternals.h" // ACTING_ON_SCHEDULE #include "../../TacticalAI/NPC.h" // NPCReachedDestination #include "../../Tactical/Animation Control.h" // defines ANIM_... -#include "../../Tactical/Soldier Macros.h" // CREATURE_OR_BLOODCAT +#include "../../Tactical/Soldier macros.h" // CREATURE_OR_BLOODCAT #include "../../Tactical/opplist.h" // EndMuzzleFlash #include "../../Tactical/Dialogue Control.h" // DialogueQueueIsEmpty #include "../../TileEngine/Isometric Utils.h" // defines NOWHERE diff --git a/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp b/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp index a71e8be5..e8c29a83 100644 --- a/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp +++ b/ModularizedTacticalAI/src/LegacyAIPlanFactory.cpp @@ -13,7 +13,7 @@ #include "../../TacticalAI/AIInternals.h" // DEBUGAIMSG #include "../../Tactical/Soldier Control.h" // For SOLDIERTYPE definition #include "../../Tactical/Animation Data.h" // For the definition of, wait for it... BLOODCAT! -#include "soldier macros.h" +#include "Soldier macros.h" #include diff --git a/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp b/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp index 7d0112d3..1141b507 100644 --- a/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp +++ b/ModularizedTacticalAI/src/LegacyArmedVehiclePlan.cpp @@ -5,7 +5,7 @@ #include "../include/LegacyArmedVehiclePlan.h" #include "Soldier Control.h" // definition of SOLDIERTYPE -#include "aiinternals.h" +#include "AIInternals.h" namespace AI { diff --git a/ModularizedTacticalAI/src/Plan.cpp b/ModularizedTacticalAI/src/Plan.cpp index ce08b220..8c3efb4e 100644 --- a/ModularizedTacticalAI/src/Plan.cpp +++ b/ModularizedTacticalAI/src/Plan.cpp @@ -4,7 +4,7 @@ #include "../../TacticalAI/AIInternals.h" // ACTING_ON_SCHEDULE #include "../../TacticalAI/NPC.h" // NPCReachedDestination #include "../../Tactical/Animation Control.h" // defines ANIM_... -#include "../../Tactical/Soldier Macros.h" // CREATURE_OR_BLOODCAT +#include "../../Tactical/Soldier macros.h" // CREATURE_OR_BLOODCAT #include "../../Tactical/opplist.h" // EndMuzzleFlash #include "../../Tactical/Dialogue Control.h" // DialogueQueueIsEmpty #include "../../TileEngine/Isometric Utils.h" // defines NOWHERE @@ -12,7 +12,7 @@ #include "../../Utils/Font Control.h" // ScreenMsg about deadlock #include "../../Utils/message.h" // ditto #include "../../TileEngine/Render Fun.h" // defines InARoom -#include "../../Strategic/quests.h" // IN_BROTHEL +#include "../../Strategic/Quests.h" // IN_BROTHEL void HandleAITacticalTraversal(SOLDIERTYPE* pSoldier); // defined in TacticalAI/AIMain.cpp diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index 05803259..b2494545 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -1,10 +1,10 @@ #include "builddefines.h" - #include "bullets.h" + #include "Bullets.h" #include #include - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "worldman.h" @@ -19,27 +19,27 @@ #include "Render Fun.h" #include "Render Dirty.h" #include "mousesystem.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "points.h" - #include "Random.h" + #include "Points.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" - #include "soldier ani.h" + #include "Soldier Ani.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Game Clock.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Merc Hiring.h" #include "Game Event Hook.h" #include "message.h" #include "strategicmap.h" #include "strategic.h" - #include "items.h" + #include "Items.h" #include "Soldier Add.h" - #include "History.h" + #include "history.h" #include "Squads.h" #include "Strategic Merc Handler.h" #include "Dialogue Control.h" @@ -47,7 +47,7 @@ #include "Map Screen Interface Map.h" #include "screenids.h" #include "jascreens.h" - #include "text.h" + #include "Text.h" #include "Merc Contract.h" #include "LaptopSave.h" #include "personnel.h" @@ -55,12 +55,12 @@ #include "Map Screen Interface Bottom.h" #include "Quests.h" #include "GameSettings.h" - #include "Mercs.h" + #include "mercs.h" #include "Handle Doors.h" #include "Campaign Types.h" #include "Tactical Save.h" #include "BobbyRMailOrder.h" - #include "Finances.h" + #include "finances.h" #include "TeamTurns.h" #include "gameloop.h" #include "Options Screen.h" @@ -89,15 +89,15 @@ #include #include #include -#include "music control.h" -#include "map edgepoints.h" +#include "Music Control.h" +#include "Map Edgepoints.h" #include "fresh_header.h" #include "network.h" #include "opplist.h" -#include "tactical placement gui.h" -#include "prebattle interface.h" +#include "Tactical Placement GUI.h" +#include "PreBattle Interface.h" #include "mapscreen.h" #include "MessageBoxScreen.h" @@ -110,25 +110,25 @@ #include #include "transfer_rules.h" -#include "keys.h" +#include "Keys.h" #include "new.h" -#include "Types.h" +#include "types.h" #include "connect.h" #include "message.h" -#include "Event pump.h" +#include "Event Pump.h" #include "Soldier Init List.h" #include "Overhead.h" -#include "weapons.h" +#include "Weapons.h" #include "Merc Hiring.h" -#include "soldier profile.h" +#include "Soldier Profile.h" #include "environment.h" #include "lighting.h" #include "laptop.h" -#include "interface panels.h" -#include "game init.h" +#include "Interface Panels.h" +#include "Game Init.h" #include "Debug Control.h" #include "MPConnectScreen.h" -#include "IniReader.h" +#include "INIReader.h" #include "Map Screen Interface Border.h" extern CHAR16 gzFileTransferDirectory[100]; diff --git a/Multiplayer/connect.h b/Multiplayer/connect.h index d1d94f10..f5eff451 100644 --- a/Multiplayer/connect.h +++ b/Multiplayer/connect.h @@ -3,7 +3,7 @@ #include "Soldier Init List.h" #include "Merc Hiring.h" -#include "event pump.h" +#include "Event Pump.h" #include "Bullets.h" #include "builddefines.h" diff --git a/Multiplayer/raknet/Gen_RPC8.h b/Multiplayer/raknet/Gen_RPC8.h index 1f6f98bc..1a35d182 100644 --- a/Multiplayer/raknet/Gen_RPC8.h +++ b/Multiplayer/raknet/Gen_RPC8.h @@ -12,7 +12,7 @@ #endif #include //#define ASSEMBLY_BLOCK asm -//#include "Types.h" +//#include "types.h" #include "BitStream.h" // #define AUTO_RPC_NO_ASM diff --git a/Multiplayer/server.cpp b/Multiplayer/server.cpp index c1829415..7c932b04 100644 --- a/Multiplayer/server.cpp +++ b/Multiplayer/server.cpp @@ -21,18 +21,18 @@ #include #include "connect.h" #include "types.h" -#include "gamesettings.h" +#include "GameSettings.h" #include "message.h" #include "FileMan.h" -#include "IniReader.h" +#include "INIReader.h" #include #include "transfer_rules.h" #include "MPJoinScreen.h" -#include "game init.h" -#include "text.h" +#include "Game Init.h" +#include "Text.h" #include "network.h" #include "message.h" -#include "overhead.h" +#include "Overhead.h" #include "fresh_header.h" #include "Debug Control.h" #include "MPXmlTeams.hpp" diff --git a/Multiplayer/transfer_rules.cpp b/Multiplayer/transfer_rules.cpp index aac4e2fb..761ec4ed 100644 --- a/Multiplayer/transfer_rules.cpp +++ b/Multiplayer/transfer_rules.cpp @@ -1,5 +1,5 @@ #include "transfer_rules.h" -#include "Debug.h" +#include "DEBUG.H" #include #include #include diff --git a/Strategic/AI Viewer.cpp b/Strategic/AI Viewer.cpp index 01203c01..f7a4e5fe 100644 --- a/Strategic/AI Viewer.cpp +++ b/Strategic/AI Viewer.cpp @@ -15,13 +15,13 @@ #include "Text Input.h" #include "mousesystem.h" #include "strategicmap.h" - #include "Fileman.h" + #include "FileMan.h" #include "Map Information.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "Game Clock.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "GameSettings.h" #include "Game Event Hook.h" @@ -32,7 +32,7 @@ #include "Campaign.h" #include "Auto Resolve.h" #include "Strategic Status.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "Town Militia.h" // added by Flugente #ifdef JA2BETAVERSION diff --git a/Strategic/ASD.cpp b/Strategic/ASD.cpp index 41bad719..bc42caa6 100644 --- a/Strategic/ASD.cpp +++ b/Strategic/ASD.cpp @@ -10,7 +10,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -27,10 +27,10 @@ #include "GameVersion.h" #include "message.h" #include "Game Event Hook.h" -#include "militia control.h" +#include "Militia Control.h" #include "Town Militia.h" #include "Strategic Town Loyalty.h" -#include "map information.h" +#include "Map Information.h" #include "Campaign.h" #include "random.h" diff --git a/Strategic/ASD.h b/Strategic/ASD.h index 62cd5b18..530c611c 100644 --- a/Strategic/ASD.h +++ b/Strategic/ASD.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" /** Flugente: Arulco special division decision code * diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 3993c715..b548c20b 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -1,22 +1,22 @@ #include "Assignments.h" - #include "Strategic.h" + #include "strategic.h" #include "Items.h" #include "Overhead.h" #include "Game Clock.h" #include "stdlib.h" - #include "Message.h" + #include "message.h" #include "Font Control.h" #include "Map Screen Interface.h" - #include "Soldier Profile Type.h" + #include "soldier profile type.h" #include "Soldier Profile.h" #include "Campaign.h" #include "Queen Command.h" #include "strategicmap.h" #include "Text.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "NPC.h" #include "Strategic Town Loyalty.h" - #include "animation control.h" + #include "Animation Control.h" #include "mapscreen.h" #include "Squads.h" #include "Map Screen Helicopter.h" @@ -26,20 +26,20 @@ #include "Map Screen Interface Map.h" #include "Strategic Movement.h" #include "laptop.h" - #include "Finances.h" + #include "finances.h" #include "LaptopSave.h" #include "renderworld.h" #include "Interface Control.h" #include "Interface.h" #include "Soldier Find.h" #include "ai.h" - #include "utilities.h" + #include "Utilities.h" #include "random.h" #include "line.h" #include "Soldier Add.h" #include "GameSettings.h" #include "Isometric Utils.h" - #include "Soldier Macros.h" + #include "Soldier macros.h" #include "Explosion Control.h" #include "SkillCheck.h" #include "Quests.h" @@ -54,7 +54,7 @@ #include "Strategic Status.h" #include "history.h" #include "Map Screen Interface Map Inventory.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" // added by SANDRO #include "AIInternals.h" #include "Morale.h" diff --git a/Strategic/Assignments.h b/Strategic/Assignments.h index 61d59e05..3241a057 100644 --- a/Strategic/Assignments.h +++ b/Strategic/Assignments.h @@ -3,7 +3,7 @@ // header for assignment manipulation/updating for characters -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "mousesystem.h" #include "Strategic Movement.h" diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp index 3820ddf4..a64aa84d 100644 --- a/Strategic/Auto Resolve.cpp +++ b/Strategic/Auto Resolve.cpp @@ -16,8 +16,8 @@ #include "video.h" #include "input.h" #include "gamescreen.h" - #include "render dirty.h" - #include "vObject_Blitters.h" + #include "Render Dirty.h" + #include "vobject_blitters.h" #include "sysutil.h" #include "Font Control.h" #include "Soldier Create.h" @@ -32,10 +32,10 @@ #include "Tactical Save.h" #include "Strategic Status.h" #include "Map Screen Interface.h" - #include "text.h" + #include "Text.h" #include "WordWrap.h" #include "Squads.h" - #include "Random.h" + #include "random.h" #include "line.h" #include "english.h" #include "Strategic Pathing.h" @@ -48,17 +48,17 @@ #include "Strategic AI.h" #include "SkillCheck.h" #include "rt time defines.h" - #include "morale.h" + #include "Morale.h" #include "Strategic Town Loyalty.h" #include "GameSettings.h" #include "Soldier macros.h" #include "strategicmap.h" #include "Quests.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Inventory Choosing.h" #include "Game Event Hook.h" #include "Assignments.h" - #include "cheats.h" + #include "Cheats.h" #include "Map Information.h" #include "MilitiaSquads.h" // #include "Strategic AI.h" diff --git a/Strategic/Campaign Init.cpp b/Strategic/Campaign Init.cpp index 0da5809b..cc6477ae 100644 --- a/Strategic/Campaign Init.cpp +++ b/Strategic/Campaign Init.cpp @@ -1,10 +1,10 @@ #include "ASD.h" // added by Flugente #include "types.h" #include "Campaign Init.h" - #include "Random.h" + #include "random.h" #include "Campaign Types.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "GameSettings.h" diff --git a/Strategic/Creature Spreading.cpp b/Strategic/Creature Spreading.cpp index fac95c5a..79c67c90 100644 --- a/Strategic/Creature Spreading.cpp +++ b/Strategic/Creature Spreading.cpp @@ -1,12 +1,12 @@ #include "types.h" - #include "fileman.h" + #include "FileMan.h" #include "himage.h" #include "Creature Spreading.h" #include "Campaign Types.h" #include "Strategic Movement.h" #include "Game Event Hook.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "message.h" #include "Font Control.h" #include "Soldier Init List.h" @@ -23,7 +23,7 @@ #include "Map Edgepoints.h" #include "Animation Data.h" #include "opplist.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Strategic AI.h" #include "MessageBoxScreen.h" #include "Map Information.h" diff --git a/Strategic/Facilities.cpp b/Strategic/Facilities.cpp index 52975d1a..aa7f0b77 100644 --- a/Strategic/Facilities.cpp +++ b/Strategic/Facilities.cpp @@ -21,7 +21,7 @@ #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "SkillCheck.h" - #include "Random.h" + #include "random.h" #include "strategicmap.h" #include "Game Clock.h" #include "Campaign.h" diff --git a/Strategic/Facilities.h b/Strategic/Facilities.h index 887e4344..ad5ec36d 100644 --- a/Strategic/Facilities.h +++ b/Strategic/Facilities.h @@ -1,7 +1,7 @@ #ifndef _FACILITIES_H #define _FACILITIES_H -#include "campaign types.h" +#include "Campaign Types.h" #include "Soldier Control.h" // Get a specific modifier for a specific assignment at a specific facility. Includes Ambient (non-assignment based) diff --git a/Strategic/Game Clock.cpp b/Strategic/Game Clock.cpp index 6b92c103..bb3d38c7 100644 --- a/Strategic/Game Clock.cpp +++ b/Strategic/Game Clock.cpp @@ -1,17 +1,17 @@ #include "sgp.h" #include "Game Clock.h" #include "Font.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "environment.h" #include "Game Clock.h" #include "message.h" #include "Game Events.h" - #include "assignments.h" + #include "Assignments.h" #include "MercTextBox.h" - #include "Renderworld.h" - #include "Lighting.h" + #include "renderworld.h" + #include "lighting.h" #include "Map Screen Interface.h" #include "PreBattle Interface.h" #include "Event Pump.h" diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 6a64799a..a268b3fa 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -12,21 +12,21 @@ #include "email.h" #include "Game Clock.h" #include "Merc Hiring.h" - #include "Insurance Contract.h" + #include "insurance Contract.h" #include "Strategic Merc Handler.h" #include "Strategic Movement.h" #include "Assignments.h" #include "Strategic Mines.h" #include "Strategic Town Loyalty.h" - #include "Message.h" + #include "message.h" #include "Map Screen Interface.h" #include "Map Screen Helicopter.h" #include "Scheduling.h" #include "Arms Dealer Init.h" - #include "Strategic town reputation.h" - #include "air raid.h" - #include "meanwhile.h" - #include "overhead.h" + #include "strategic town reputation.h" + #include "Air Raid.h" + #include "Meanwhile.h" + #include "Overhead.h" #include "random.h" #include "Creature Spreading.h" #include "Strategic AI.h" @@ -35,7 +35,7 @@ #include "INIReader.h" #include "GameSettings.h" #include "english.h" - #include "Input.h" + #include "input.h" #include "Soldier Profile.h" #include "laptop.h" #include "Campaign.h" diff --git a/Strategic/Game Events.cpp b/Strategic/Game Events.cpp index d6fc6d9b..b78a6172 100644 --- a/Strategic/Game Events.cpp +++ b/Strategic/Game Events.cpp @@ -4,7 +4,7 @@ #include "Game Events.h" #include "Game Clock.h" #include "MemMan.h" - #include "Debug.h" + #include "DEBUG.H" #include "Font Control.h" #include "message.h" #include "MiniEvents.h" diff --git a/Strategic/Game Init.cpp b/Strategic/Game Init.cpp index c47c0578..d4dc7cd2 100644 --- a/Strategic/Game Init.cpp +++ b/Strategic/Game Init.cpp @@ -3,15 +3,15 @@ #include "laptop.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "email.h" #include "Game Clock.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "strategicmap.h" - #include "game init.h" - #include "animation data.h" + #include "Game Init.h" + #include "Animation Data.h" #include "finances.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Soldier Init List.h" #include "strategic.h" #include "history.h" @@ -21,32 +21,32 @@ #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "Map Screen Interface.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "Message.h" + #include "message.h" #include "Game Event Hook.h" #include "Strategic Movement.h" #include "Creature Spreading.h" #include "Quests.h" #include "Strategic AI.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "AimMembers.h" - #include "dialogue control.h" - #include "npc.h" + #include "Dialogue Control.h" + #include "NPC.h" #include "GameSettings.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Map Screen Interface Border.h" #include "Map Screen Helicopter.h" #include "Vehicles.h" #include "Map Screen Interface Map.h" #include "PreBattle Interface.h" - #include "bobbyr.h" - #include "helpscreen.h" + #include "BobbyR.h" + #include "HelpScreen.h" #include "Air Raid.h" #include "Interface.h" - #include "cheats.h" + #include "Cheats.h" #include "Interface Panels.h" // HEADROCK HAM 3.6: Include for adding facility debt reset #include "Facilities.h" @@ -61,7 +61,7 @@ #include "World Items.h" #include "Vehicles.h" -#include "text.h" +#include "Text.h" #include "connect.h" #include "XML.h" #include "mercs.h" diff --git a/Strategic/Hourly Update.cpp b/Strategic/Hourly Update.cpp index f6e3386e..2d573827 100644 --- a/Strategic/Hourly Update.cpp +++ b/Strategic/Hourly Update.cpp @@ -10,7 +10,7 @@ #include "jascreens.h" #include "screenids.h" #include "Items.h" - #include "Random.h" + #include "random.h" #include "finances.h" #include "history.h" #include "Dialogue Control.h" diff --git a/Strategic/Ja25 Strategic Ai.cpp b/Strategic/Ja25 Strategic Ai.cpp index 7e97ba21..c90111cc 100644 --- a/Strategic/Ja25 Strategic Ai.cpp +++ b/Strategic/Ja25 Strategic Ai.cpp @@ -12,61 +12,61 @@ #include "jascreens.h" #include "worlddef.h" #include "Soldier Control.h" - #include "overhead.h" - #include "isometric utils.h" + #include "Overhead.h" + #include "Isometric Utils.h" #include "worlddef.h" - #include "worlddat.h" - #include "text.h" - #include "Soldier add.h" - #include "soldier macros.h" + #include "WorldDat.h" + #include "Text.h" + #include "Soldier Add.h" + #include "Soldier macros.h" #include "Strategic Pathing.h" - #include "soldier create.h" - #include "handle UI.h" + #include "Soldier Create.h" + #include "Handle UI.h" #include "faces.h" #include "renderworld.h" #include "Map Information.h" #include "Assignments.h" #include "message.h" #include "Game Events.h" - #include "quests.h" + #include "Quests.h" #include "FileMan.h" - #include "animated progressbar.h" + #include "Animated ProgressBar.h" #include "Strategic Movement.h" #include "Campaign Types.h" #include "Exit Grids.h" #include "Tactical Save.h" - #include "animation control.h" - #include "squads.h" + #include "Animation Control.h" + #include "Squads.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" #include "Queen Command.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "PreBattle Interface.h" #include "gameloop.h" - #include "Random.h" + #include "random.h" #include "ai.h" - #include "keys.h" + #include "Keys.h" #include "Tactical Placement GUI.h" #include "Map Screen Helicopter.h" #include "Player Command.h" #include "Event Pump.h" - #include "air raid.h" + #include "Air Raid.h" #include "Strategic Mines.h" #include "SaveLoadMap.h" #include "Militia Control.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "Town Militia.h" #include "sysutil.h" #include "Debug Control.h" #include "Queen Command.h" #include "Strategic Event Handler.h" #include "MessageBoxScreen.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Map Screen Interface.h" #include "Bullets.h" #include "physics.h" #include "Auto Resolve.h" - #include "cursors.h" + #include "Cursors.h" #ifdef JA2UB #include "Soldier Init List.h" diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp index 721a5a44..8ce8aa3b 100644 --- a/Strategic/LuaInitNPCs.cpp +++ b/Strategic/LuaInitNPCs.cpp @@ -42,7 +42,7 @@ #include "Game Events.h" #include "email.h" #include "worldman.h" -#include "text.h" +#include "Text.h" #include "Dialogue Control.h" #include "Boxing.h" diff --git a/Strategic/LuaInitNPCs.h b/Strategic/LuaInitNPCs.h index cd663ede..95d8ec27 100644 --- a/Strategic/LuaInitNPCs.h +++ b/Strategic/LuaInitNPCs.h @@ -1,7 +1,7 @@ #ifndef _LUAINITNPCS_H #define _LUAINITNPCS_H -#include "Types.h" +#include "types.h" typedef struct { diff --git a/Strategic/Luaglobal.h b/Strategic/Luaglobal.h index ec602857..ca87b0ff 100644 --- a/Strategic/Luaglobal.h +++ b/Strategic/Luaglobal.h @@ -1,7 +1,7 @@ #ifndef _LUAGLOBAL_H #define _LUAGLOBAL_H -#include "Types.h" +#include "types.h" extern "C" { #include "lua.h" diff --git a/Strategic/Map Screen Helicopter.cpp b/Strategic/Map Screen Helicopter.cpp index 8ba308f9..23f9f31f 100644 --- a/Strategic/Map Screen Helicopter.cpp +++ b/Strategic/Map Screen Helicopter.cpp @@ -1,17 +1,17 @@ #include "Map Screen Helicopter.h" #include "LaptopSave.h" #include "Vehicles.h" - #include "Finances.h" + #include "finances.h" #include "Quests.h" #include "Game Clock.h" #include "strategic.h" #include "Queen Command.h" #include "Strategic Pathing.h" - #include "Random.h" + #include "random.h" #include "Game Event Hook.h" - #include "String.h" + #include "string.h" #include "Dialogue Control.h" - #include "Message.h" + #include "message.h" #include "Strategic Movement.h" #include "Soldier Profile.h" #include "Assignments.h" @@ -19,14 +19,14 @@ #include "strategicmap.h" #include "worlddef.h" #include "worldman.h" - #include "tiledat.h" + #include "TileDat.h" #include "Map Screen Interface.h" #include "Text.h" #include "Squads.h" #include "Player Command.h" #include "Sound Control.h" #include "GameSettings.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Map Screen Interface Border.h" #include "Strategic Event Handler.h" #include "Overhead.h" diff --git a/Strategic/Map Screen Helicopter.h b/Strategic/Map Screen Helicopter.h index 05c8e7bf..4be1bb3e 100644 --- a/Strategic/Map Screen Helicopter.h +++ b/Strategic/Map Screen Helicopter.h @@ -1,7 +1,7 @@ #ifndef __MAP_SCREEN_HELICOPTER_H #define __MAP_SCREEN_HELICOPTER_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" // costs of flying through sectors diff --git a/Strategic/Map Screen Interface Border.cpp b/Strategic/Map Screen Interface Border.cpp index 4155783d..c538d8ab 100644 --- a/Strategic/Map Screen Interface Border.cpp +++ b/Strategic/Map Screen Interface Border.cpp @@ -1,5 +1,5 @@ #include "Map Screen Interface Border.h" - #include "Types.h" + #include "types.h" #include "vsurface.h" #include "mousesystem.h" #include "Button System.h" diff --git a/Strategic/Map Screen Interface Border.h b/Strategic/Map Screen Interface Border.h index 1447b461..3b4feb16 100644 --- a/Strategic/Map Screen Interface Border.h +++ b/Strategic/Map Screen Interface Border.h @@ -1,7 +1,7 @@ #ifndef __MAP_INTERFACE_BORDER_H #define __MAP_INTERFACE_BORDER_H -#include "Types.h" +#include "types.h" //#define MAP_BORDER_START_X 261 //#define MAP_BORDER_START_Y 0 diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index 49ee8f29..bb60945a 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/Strategic/Map Screen Interface Bottom.cpp @@ -1,6 +1,6 @@ #include "Map Screen Interface Bottom.h" #include "Map Screen Interface Border.h" - #include "Types.h" + #include "types.h" #include "vsurface.h" #include "mousesystem.h" #include "Button System.h" @@ -9,16 +9,16 @@ #include "message.h" #include "mapscreen.h" #include "strategicmap.h" - #include "font control.h" + #include "Font Control.h" #include "Radar Screen.h" - #include "game clock.h" + #include "Game Clock.h" #include "sysutil.h" #include "Render Dirty.h" #include "Map Screen Interface.h" #include "Map Screen Interface Map.h" #include "Text.h" #include "Overhead.h" - #include "Prebattle Interface.h" + #include "PreBattle Interface.h" #include "Options Screen.h" #include "Cursor Control.h" #include "gameloop.h" @@ -26,11 +26,11 @@ #include "Tactical Save.h" #include "Campaign Types.h" #include "Air Raid.h" - #include "Finances.h" + #include "finances.h" #include "LaptopSave.h" #include "Interface Items.h" - #include "wordwrap.h" - #include "meanwhile.h" + #include "WordWrap.h" + #include "Meanwhile.h" #include "Dialogue Control.h" #include "Map Screen Helicopter.h" #include "Map Screen Interface TownMine Info.h" @@ -44,7 +44,7 @@ #include "SaveLoadScreen.h" #include "Interface Control.h" #include "Sys Globals.h" -#include "game init.h" +#include "Game Init.h" #ifdef JA2UB #include "Ja25 Strategic Ai.h" diff --git a/Strategic/Map Screen Interface Map Inventory.cpp b/Strategic/Map Screen Interface Map Inventory.cpp index 9f2b21a4..35d25da5 100644 --- a/Strategic/Map Screen Interface Map Inventory.cpp +++ b/Strategic/Map Screen Interface Map Inventory.cpp @@ -20,12 +20,12 @@ #include "GameSettings.h" #include "Radar Screen.h" #include "message.h" - #include "weapons.h" + #include "Weapons.h" #include "finances.h" #include "Game Clock.h" #include "Sound Control.h" - #include "interface panels.h" - #include "wordwrap.h" + #include "Interface Panels.h" + #include "WordWrap.h" #include "Soldier macros.h" #include "rt time defines.h" #include "Encyclopedia_new.h" //Moa: item visibility diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index dc705df5..ccc7fbc1 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -17,7 +17,7 @@ #include "WCheck.h" #include "Assignments.h" #include "Squads.h" - #include "Message.h" + #include "message.h" #include "Soldier Profile.h" #include "Player Command.h" #include "Strategic Movement.h" diff --git a/Strategic/Map Screen Interface TownMine Info.cpp b/Strategic/Map Screen Interface TownMine Info.cpp index 17294d0a..d1b7a12b 100644 --- a/Strategic/Map Screen Interface TownMine Info.cpp +++ b/Strategic/Map Screen Interface TownMine Info.cpp @@ -1,6 +1,6 @@ #include "Map Screen Interface TownMine Info.h" #include "strategicmap.h" - #include "popupbox.h" + #include "PopUpBox.h" #include "Map Screen Interface.h" #include "Queen Command.h" #include "Player Command.h" @@ -15,7 +15,7 @@ #include "Strategic Mines.h" #include "finances.h" #include "Map Screen Interface Map Inventory.h" - #include "Strategic.h" + #include "strategic.h" #include "Utilities.h" #include "video.h" #include "Town Militia.h" @@ -23,7 +23,7 @@ #include "Map Screen Helicopter.h" #include "Tactical Save.h" #include "GameSettings.h" - #include "debug.h" + #include "DEBUG.H" #include "Overhead.h" // added by Flugente #include "Game Clock.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente diff --git a/Strategic/Map Screen Interface TownMine Info.h b/Strategic/Map Screen Interface TownMine Info.h index 73d210f6..d989455c 100644 --- a/Strategic/Map Screen Interface TownMine Info.h +++ b/Strategic/Map Screen Interface TownMine Info.h @@ -1,7 +1,7 @@ #ifndef __MS_I_TOWNMINE_INFO_H #define __MS_I_TOWNMINE_INFO_H -#include "Types.h" +#include "types.h" extern BOOLEAN fShowTownInfo; diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index 678c4fd7..278dfecd 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -8,8 +8,8 @@ #include "Overhead.h" #include "Squads.h" #include "Sound Control.h" - #include "Soundman.h" - #include "Message.h" + #include "soundman.h" + #include "message.h" #include "PopUpBox.h" #include "Game Clock.h" #include "Handle Items.h" @@ -19,20 +19,20 @@ #include "Game Event Hook.h" #include "Tactical Save.h" #include "Quests.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Soldier Profile.h" #include "Strategic Movement.h" #include "Dialogue Control.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Bottom.h" #include "Vehicles.h" - #include "LINE.H" + #include "line.h" #include "Text.h" #include "gameloop.h" #include "Map Screen Helicopter.h" #include "PreBattle Interface.h" #include "WordWrap.h" - #include "interface control.h" + #include "Interface Control.h" #include "GameSettings.h" #include "Campaign Types.h" #include "Map Screen Interface Map Inventory.h" @@ -40,7 +40,7 @@ #include "Keys.h" #include "Soldier macros.h" #include "Militia Control.h" - #include "Random.h" + #include "random.h" #include "Cursor Control.h" #include "renderworld.h" #include "Game Init.h" @@ -51,7 +51,7 @@ #include "Queen Command.h" #include "Render Fun.h" #include "Food.h" - #include "Personnel.h" + #include "personnel.h" #include "mapscreen.h" #include "connect.h" diff --git a/Strategic/Map Screen Interface.h b/Strategic/Map Screen Interface.h index 5e7aafaf..2e8d80ed 100644 --- a/Strategic/Map Screen Interface.h +++ b/Strategic/Map Screen Interface.h @@ -2,7 +2,7 @@ #define MAP_SCREEN_INTERFACE_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "MessageBoxScreen.h" #include "Font Control.h" diff --git a/Strategic/MapScreen Quotes.cpp b/Strategic/MapScreen Quotes.cpp index b90be26f..72cb6375 100644 --- a/Strategic/MapScreen Quotes.cpp +++ b/Strategic/MapScreen Quotes.cpp @@ -6,8 +6,8 @@ #include "Soldier Control.h" #include "Overhead.h" #include "Squads.h" - #include "Soundman.h" - #include "Message.h" + #include "soundman.h" + #include "message.h" #include "PopUpBox.h" #include "Handle Items.h" #include "Interface Items.h" @@ -16,14 +16,14 @@ #include "Game Event Hook.h" #include "Tactical Save.h" #include "Quests.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Soldier Profile.h" #include "Strategic Movement.h" #include "Dialogue Control.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Bottom.h" #include "Vehicles.h" - #include "LINE.H" + #include "line.h" #include "Text.h" #include "gameloop.h" #include "Map Screen Helicopter.h" @@ -36,7 +36,7 @@ #include "Keys.h" #include "Soldier macros.h" #include "Militia Control.h" - #include "Random.h" + #include "random.h" #include "Cursor Control.h" #include "renderworld.h" #include "Strategic Mines.h" diff --git a/Strategic/Meanwhile.cpp b/Strategic/Meanwhile.cpp index 52c578fd..ed189316 100644 --- a/Strategic/Meanwhile.cpp +++ b/Strategic/Meanwhile.cpp @@ -1,24 +1,24 @@ #include "sgp.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "PreBattle Interface.h" - #include "messageboxscreen.h" + #include "MessageBoxScreen.h" #include "strategicmap.h" - #include "fade screen.h" + #include "Fade Screen.h" #include "screenids.h" #include "jascreens.h" - #include "npc.h" - #include "game event hook.h" - #include "game clock.h" - #include "tactical save.h" - #include "soldier profile.h" - #include "overhead.h" - #include "dialogue control.h" + #include "NPC.h" + #include "Game Event Hook.h" + #include "Game Clock.h" + #include "Tactical Save.h" + #include "Soldier Profile.h" + #include "Overhead.h" + #include "Dialogue Control.h" #include "gameloop.h" - #include "npc.h" - #include "assignments.h" + #include "NPC.h" + #include "Assignments.h" #include "strategic.h" - #include "text.h" - #include "interface control.h" + #include "Text.h" + #include "Interface Control.h" #include "Interface Items.h" #include "Map Information.h" #include "Map Screen Interface Map.h" @@ -28,11 +28,11 @@ #include "Game Events.h" #include "GameSettings.h" #include "Strategic AI.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Quests.h" #include "Campaign Types.h" #include "Squads.h" - #include "Random.h" + #include "random.h" #include "GameInitOptionsScreen.h" diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index c5bbaf3d..291b99aa 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -1,15 +1,15 @@ #include "builddefines.h" - #include "Types.h" + #include "types.h" #include "Merc Contract.h" #include "Soldier Profile.h" - #include "History.h" + #include "history.h" #include "finances.h" #include "Game Clock.h" #include "Soldier Add.h" #include "Dialogue Control.h" #include "Soldier Create.h" - #include "Message.h" + #include "message.h" #include "Font Control.h" #include "personnel.h" #include "LaptopSave.h" @@ -23,7 +23,7 @@ #include "Interface Control.h" #include "gamescreen.h" #include "jascreens.h" - #include "Random.h" + #include "random.h" #include "Assignments.h" #include "Strategic Movement.h" #include "Squads.h" @@ -31,7 +31,7 @@ #include "Text.h" #include "Strategic Status.h" #include "mercs.h" - #include "insurance contract.h" + #include "insurance Contract.h" #include "Vehicles.h" #include "email.h" #include "Map Screen Helicopter.h" diff --git a/Strategic/MilitiaIndividual.cpp b/Strategic/MilitiaIndividual.cpp index dade1619..fa117f44 100644 --- a/Strategic/MilitiaIndividual.cpp +++ b/Strategic/MilitiaIndividual.cpp @@ -6,7 +6,7 @@ #include "MilitiaIndividual.h" #include "random.h" -#include "text.h" +#include "Text.h" #include "Overhead Types.h" #include "Game Clock.h" #include "strategicmap.h" diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp index 303ea283..5694509c 100644 --- a/Strategic/MilitiaSquads.cpp +++ b/Strategic/MilitiaSquads.cpp @@ -7,13 +7,13 @@ #include "Strategic Town Loyalty.h" #include "Utilities.h" #include "random.h" - #include "text.h" + #include "Text.h" #include "Map Screen Interface.h" #include "Interface.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "Game Clock.h" #include "Assignments.h" - #include "squads.h" + #include "Squads.h" #include "Soldier Create.h" #include "Dialogue Control.h" #include "GameSettings.h" diff --git a/Strategic/MilitiaSquads.h b/Strategic/MilitiaSquads.h index 499bd38c..4f09125e 100644 --- a/Strategic/MilitiaSquads.h +++ b/Strategic/MilitiaSquads.h @@ -3,9 +3,9 @@ // header for town militia strategic control module -#include "Types.h" +#include "types.h" #include "Soldier Control.h" -#include "campaign types.h" +#include "Campaign Types.h" //#define MAXIMUM_MILITIA_SQUAD_SIZE 30 diff --git a/Strategic/MiniEvents.h b/Strategic/MiniEvents.h index 5ed48a4e..2db09352 100644 --- a/Strategic/MiniEvents.h +++ b/Strategic/MiniEvents.h @@ -3,7 +3,7 @@ #define MINI_EVENT_Z_OFFSET 9 -#include "Types.h" +#include "types.h" void InitMiniEvents(); void CheckMiniEvents(UINT32 nextEventId); diff --git a/Strategic/Player Command.cpp b/Strategic/Player Command.cpp index 51fd7d7d..ba856cb3 100644 --- a/Strategic/Player Command.cpp +++ b/Strategic/Player Command.cpp @@ -1,18 +1,18 @@ #include "Player Command.h" #include "Queen Command.h" #include "Campaign Types.h" - #include "Strategic.h" + #include "strategic.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" - #include "text.h" - #include "laptopsave.h" - #include "quests.h" + #include "Text.h" + #include "LaptopSave.h" + #include "Quests.h" #include "Morale.h" #include "Overhead.h" #include "strategicmap.h" #include "Map Screen Helicopter.h" #include "Game Clock.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "email.h" #include "GameSettings.h" #include "Strategic Status.h" @@ -21,14 +21,14 @@ #include "Map Screen Interface.h" #include "Tactical Save.h" #include "interface Dialogue.h" - #include "Random.h" + #include "random.h" // HEADROCK HAM 3.6: Added for facility string printing... #include "PopUpBox.h" #include "CampaignStats.h" // added by Flugente #include "Town Militia.h" // added by Flugente #include "LuaInitNPCs.h" // added by Flugente -#include "postalservice.h" +#include "PostalService.h" #include "GameInitOptionsScreen.h" diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index 0f04d615..abc745b8 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -14,7 +14,7 @@ #include "Queen Command.h" #include "Strategic Movement.h" #include "Strategic Pathing.h" - #include "text.h" + #include "Text.h" #include "PopUpBox.h" #include "Player Command.h" #include "Cursors.h" @@ -22,19 +22,19 @@ #include "Sound Control.h" #include "english.h" #include "Map Screen Interface Bottom.h" - #include "overhead.h" + #include "Overhead.h" #include "Tactical Placement GUI.h" #include "Town Militia.h" - #include "campaign.h" + #include "Campaign.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "Creature Spreading.h" #include "Multi Language Graphic Utils.h" #include "Map Screen Helicopter.h" #include "Quests.h" #include "Map Screen Interface Border.h" #include "Strategic Status.h" - #include "interface control.h" + #include "Interface Control.h" #include "Strategic Town Loyalty.h" #include "Squads.h" #include "Assignments.h" @@ -45,7 +45,7 @@ #include "Tactical Save.h" #include "message.h" #include "CampaignStats.h" // added by Flugente - #include "militiasquads.h" // added by Flugente + #include "MilitiaSquads.h" // added by Flugente #include "SkillCheck.h" // added by Flugente #include "Strategic Transport Groups.h" #include "Utilities.h" diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index b5ff2ce4..2b14d1b7 100644 --- a/Strategic/Queen Command.cpp +++ b/Strategic/Queen Command.cpp @@ -5,8 +5,8 @@ #include "Overhead Types.h" #include "strategicmap.h" #include "Soldier Init List.h" - #include "debug.h" - #include "Random.h" + #include "DEBUG.H" + #include "random.h" #include "Strategic Movement.h" #include "Overhead.h" #include "Strategic Pathing.h" @@ -15,10 +15,10 @@ #include "Map Edgepoints.h" #include "PreBattle Interface.h" #include "strategic status.h" - #include "squads.h" - #include "assignments.h" - #include "items.h" - #include "tactical save.h" + #include "Squads.h" + #include "Assignments.h" + #include "Items.h" + #include "Tactical Save.h" #include "Soldier Ani.h" #include "Strategic AI.h" #include "GameSettings.h" @@ -36,7 +36,7 @@ #include "Town Militia.h" #include "Dialogue Control.h" #include "Campaign Init.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Soldier macros.h" #include "Morale.h" #include "CampaignStats.h" // added by Flugente diff --git a/Strategic/Quest Debug System.cpp b/Strategic/Quest Debug System.cpp index 06d7457f..82fd36b3 100644 --- a/Strategic/Quest Debug System.cpp +++ b/Strategic/Quest Debug System.cpp @@ -1,10 +1,10 @@ #include "builddefines.h" - #include "Types.h" + #include "types.h" #include "Quest Debug System.h" #include "WCheck.h" #include "Font Control.h" - #include "Video.h" + #include "video.h" #include "Game Clock.h" #include "Render Dirty.h" #include "WordWrap.h" @@ -19,23 +19,23 @@ #include "Text Input.h" #include "Soldier Create.h" #include "strategicmap.h" - #include "soldier add.h" - #include "Opplist.h" + #include "Soldier Add.h" + #include "opplist.h" #include "Handle Items.h" #include "Game Clock.h" #include "environment.h" - #include "dialogue control.h" + #include "Dialogue Control.h" //#include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "MessageBoxScreen.h" - #include "Stdio.h" + #include "stdio.h" #include "english.h" #include "line.h" #include "Keys.h" - #include "Interface Dialogue.h" - #include "SysUtil.h" - #include "Message.h" - #include "Random.h" + #include "interface Dialogue.h" + #include "sysutil.h" + #include "message.h" + #include "random.h" //#ifdef JA2BETAVERSION diff --git a/Strategic/Quests.cpp b/Strategic/Quests.cpp index 55b7bb23..24e83f56 100644 --- a/Strategic/Quests.cpp +++ b/Strategic/Quests.cpp @@ -1,17 +1,17 @@ #include "sgp.h" #include "message.h" - #include "quests.h" - #include "game clock.h" - #include "StrategicMap.h" - #include "soldier profile.h" + #include "Quests.h" + #include "Game Clock.h" + #include "strategicmap.h" + #include "Soldier Profile.h" #include "LaptopSave.h" #include "Handle Items.h" - #include "overhead.h" - #include "Interface Dialogue.h" + #include "Overhead.h" + #include "interface Dialogue.h" #include "Soldier Profile.h" #include "Isometric Utils.h" #include "Render Fun.h" - #include "History.h" + #include "history.h" #include "Map Screen Helicopter.h" #include "Overhead.h" #include "Strategic Mines.h" @@ -23,7 +23,7 @@ #include "GameSettings.h" #include "Arms Dealer Init.h" #include "GameSettings.h" - #include "Random.h" + #include "random.h" #include "Assignments.h" #include "strategic.h" #include "Strategic Event Handler.h" diff --git a/Strategic/Rebel Command.cpp b/Strategic/Rebel Command.cpp index 7c169657..d8812ee4 100644 --- a/Strategic/Rebel Command.cpp +++ b/Strategic/Rebel Command.cpp @@ -75,7 +75,7 @@ Points of interest: #include "GameSettings.h" #include "GameVersion.h" #include "input.h" -#include "Line.h" +#include "line.h" #include "laptop.h" #include "message.h" #include "MessageBoxScreen.h" diff --git a/Strategic/Rebel Command.h b/Strategic/Rebel Command.h index 22b6fd3b..452355a8 100644 --- a/Strategic/Rebel Command.h +++ b/Strategic/Rebel Command.h @@ -4,7 +4,7 @@ #include "CampaignStats.h" #include "mapscreen.h" #include "Soldier Control.h" -#include "Types.h" +#include "types.h" #define REBEL_COMMAND_Z_OFFSET 9 #define REBEL_COMMAND_MAX_ACTIONS_PER_REGION 6 diff --git a/Strategic/Reinforcement.cpp b/Strategic/Reinforcement.cpp index 2adaa4f9..bdad2f07 100644 --- a/Strategic/Reinforcement.cpp +++ b/Strategic/Reinforcement.cpp @@ -7,12 +7,12 @@ #include "Strategic Town Loyalty.h" #include "Utilities.h" #include "random.h" - #include "text.h" + #include "Text.h" #include "Map Screen Interface.h" #include "Interface.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "Assignments.h" - #include "squads.h" + #include "Squads.h" #include "Soldier Create.h" #include "Dialogue Control.h" #include "Queen Command.h" diff --git a/Strategic/Scheduling.cpp b/Strategic/Scheduling.cpp index 7408c37c..06992561 100644 --- a/Strategic/Scheduling.cpp +++ b/Strategic/Scheduling.cpp @@ -1,18 +1,18 @@ #include - #include "Fileman.h" + #include "FileMan.h" #include "types.h" #include "Scheduling.h" #include "message.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "Game Event Hook.h" #include "worlddef.h" #include "Soldier Init List.h" #include "Isometric Utils.h" #include "ai.h" - #include "debug.h" - #include "Random.h" + #include "DEBUG.H" + #include "random.h" #include "Animation Data.h" #include "Map Information.h" #include "Keys.h" diff --git a/Strategic/Scheduling.h b/Strategic/Scheduling.h index aa80f5fb..5a076ac9 100644 --- a/Strategic/Scheduling.h +++ b/Strategic/Scheduling.h @@ -1,7 +1,7 @@ #ifndef __SCHEDULING_H #define __SCHEDULING_H -#include "BuildDefines.h" +#include "builddefines.h" #include "Soldier Init List.h" //Merc scheduling actions diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp index 8a3ca8a1..6572c879 100644 --- a/Strategic/Strategic AI.cpp +++ b/Strategic/Strategic AI.cpp @@ -7,7 +7,7 @@ #include "Game Event Hook.h" #include "GameSettings.h" #include "Campaign Types.h" - #include "Random.h" + #include "random.h" #include "Strategic Pathing.h" #include "message.h" #include "strategicmap.h" @@ -30,7 +30,7 @@ #include "Soldier Profile.h" #include "Scheduling.h" #include "Map Information.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "ASD.h" // added by Flugente #include "Rebel Command.h" #include "Game Event Hook.h" diff --git a/Strategic/Strategic Event Handler.cpp b/Strategic/Strategic Event Handler.cpp index 37147e6b..36a929b2 100644 --- a/Strategic/Strategic Event Handler.cpp +++ b/Strategic/Strategic Event Handler.cpp @@ -5,20 +5,20 @@ #include "Handle Items.h" #include "LaptopSave.h" #include "Tactical Save.h" - #include "StrategicMap.h" + #include "strategicmap.h" #include "Quests.h" #include "Soldier Profile.h" #include "Game Event Hook.h" #include "Game Clock.h" - #include "Interface Dialogue.h" - #include "Random.h" + #include "interface Dialogue.h" + #include "random.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" #include "Soldier Init List.h" #include "SaveLoadMap.h" #include "Soldier Create.h" #include "Soldier Add.h" - #include "Renderworld.h" + #include "renderworld.h" #include "Soldier Profile.h" #include "email.h" #include "strategic.h" diff --git a/Strategic/Strategic Event Handler.h b/Strategic/Strategic Event Handler.h index 65e78aaa..362e4243 100644 --- a/Strategic/Strategic Event Handler.h +++ b/Strategic/Strategic Event Handler.h @@ -1,7 +1,7 @@ #ifndef _STRATEGIC_EVENT_HANDLER_H_ #define _STRATEGIC_EVENT_HANDLER_H_ -#include "Types.h" +#include "types.h" #define KINGPIN_MONEY_SECTOR_X gModSettings.ubKingpinMoneySectorX //5 #define KINGPIN_MONEY_SECTOR_Y gModSettings.ubKingpinMoneySectorY //MAP_ROW_D diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 501e2643..4f5a8221 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -1,8 +1,8 @@ - #include "Types.h" + #include "types.h" #include "Strategic Merc Handler.h" - #include "History.h" - #include "Game clock.h" + #include "history.h" + #include "Game Clock.h" #include "insurance Contract.h" #include "Soldier Profile.h" #include "Game Event Hook.h" @@ -11,15 +11,15 @@ #include "Merc Contract.h" #include "Merc Hiring.h" #include "Dialogue Control.h" - #include "Random.h" + #include "random.h" #include "Morale.h" - #include "Mercs.h" + #include "mercs.h" #include "Mapscreen.h" - #include "weapons.h" - #include "Personnel.h" + #include "Weapons.h" + #include "personnel.h" #include "Strategic Movement.h" #include "LaptopSave.h" - #include "Message.h" + #include "message.h" #include "Text.h" #include "Interface.h" #include "strategic.h" diff --git a/Strategic/Strategic Mines LUA.h b/Strategic/Strategic Mines LUA.h index ff1f129f..d0314474 100644 --- a/Strategic/Strategic Mines LUA.h +++ b/Strategic/Strategic Mines LUA.h @@ -1,7 +1,7 @@ #ifndef STRATEGIC_MINES_LUA_H #define STRATEGIC_MINES_LUA_H -#include "Types.h" +#include "types.h" extern "C" { #include "lua.h" diff --git a/Strategic/Strategic Mines.cpp b/Strategic/Strategic Mines.cpp index 9e99ae85..c998d1bf 100644 --- a/Strategic/Strategic Mines.cpp +++ b/Strategic/Strategic Mines.cpp @@ -1,11 +1,11 @@ - #include + #include #include "Strategic Mines.h" - #include "Finances.h" + #include "finances.h" #include "Strategic Town Loyalty.h" #include "strategic.h" #include "Game Clock.h" #include "strategicmap.h" - #include "Random.h" + #include "random.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "Map Screen Interface.h" diff --git a/Strategic/Strategic Mines.h b/Strategic/Strategic Mines.h index 63351652..74b85361 100644 --- a/Strategic/Strategic Mines.h +++ b/Strategic/Strategic Mines.h @@ -3,7 +3,7 @@ // the .h to the mine management system -#include "Types.h" +#include "types.h" #include "strategicmap.h" #include "mapscreen.h" diff --git a/Strategic/Strategic Movement Costs.cpp b/Strategic/Strategic Movement Costs.cpp index 4f45414e..a641a767 100644 --- a/Strategic/Strategic Movement Costs.cpp +++ b/Strategic/Strategic Movement Costs.cpp @@ -3,7 +3,7 @@ #include "Strategic Movement.h" #include "XML.h" #include "expat.h" - #include "Debug.h" + #include "DEBUG.H" #include "Debug Control.h" #include "Tactical Save.h" #include "Map Screen Interface Map.h" diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index 4afc1b94..4e765ad1 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -3,33 +3,33 @@ #include #include "Strategic Movement.h" #include "MemMan.h" - #include "debug.h" + #include "DEBUG.H" #include "Campaign Types.h" #include "Game Event Hook.h" #include "Game Clock.h" #include "Queen Command.h" - #include "overhead.h" + #include "Overhead.h" #include "strategicmap.h" #include "jascreens.h" #include "Strategic Pathing.h" #include "Map Screen Interface Map.h" #include "PreBattle Interface.h" - #include "Strategic.h" + #include "strategic.h" #include "Assignments.h" #include "Text.h" #include "Font Control.h" #include "message.h" #include "mapscreen.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "Soldier Add.h" #include "Game Events.h" #include "Vehicles.h" #include "Map Screen Helicopter.h" #include "Map Screen Interface.h" #include "Squads.h" - #include "Random.h" - #include "soldier macros.h" + #include "random.h" + #include "Soldier macros.h" #include "Map Information.h" #include "Tactical Save.h" #include "Player Command.h" @@ -38,7 +38,7 @@ #include "Music Control.h" #include "Campaign.h" #include "Isometric Utils.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Inventory Choosing.h" #include "Map Screen Interface Border.h" #include "Auto Resolve.h" diff --git a/Strategic/Strategic Pathing.cpp b/Strategic/Strategic Pathing.cpp index 37c260bf..117f47d0 100644 --- a/Strategic/Strategic Pathing.cpp +++ b/Strategic/Strategic Pathing.cpp @@ -5,7 +5,7 @@ #include "sgp.h" #include "strategic.h" #include "mapscreen.h" - #include "overhead.h" + #include "Overhead.h" #include "strategicmap.h" #include "Strategic Pathing.h" #include "Map Screen Interface Border.h" diff --git a/Strategic/Strategic Status.cpp b/Strategic/Strategic Status.cpp index 0d0d571b..b1c30b39 100644 --- a/Strategic/Strategic Status.cpp +++ b/Strategic/Strategic Status.cpp @@ -6,7 +6,7 @@ #include "Strategic Mines.h" #include "email.h" #include "Game Clock.h" - #include "Debug.h" + #include "DEBUG.H" #include "GameSettings.h" #include "history.h" #include "Strategic Town Loyalty.h" diff --git a/Strategic/Strategic Town Loyalty.cpp b/Strategic/Strategic Town Loyalty.cpp index 9de36dc0..2db0a664 100644 --- a/Strategic/Strategic Town Loyalty.cpp +++ b/Strategic/Strategic Town Loyalty.cpp @@ -9,16 +9,16 @@ #include "Animation Data.h" #include "Quests.h" #include "Font.h" - #include "Message.h" + #include "message.h" #include "LOS.h" #include "World Items.h" #include "Tactical Save.h" #include "Soldier Profile.h" #include "Handle Items.h" #include "random.h" - #include "strategic movement.h" + #include "Strategic Movement.h" #include "Strategic Pathing.h" - #include "vehicles.h" + #include "Vehicles.h" #include "Game Clock.h" #include "Game Event Hook.h" #include "Morale.h" @@ -27,7 +27,7 @@ #include "MessageBoxScreen.h" #include "Town Militia.h" #include "history.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Strategic Status.h" // HEADROCK HAM B1: Added include for Dynamic Roaming Militia #include "MilitiaSquads.h" diff --git a/Strategic/Strategic Town Loyalty.h b/Strategic/Strategic Town Loyalty.h index 2d420c2f..bbea5f52 100644 --- a/Strategic/Strategic Town Loyalty.h +++ b/Strategic/Strategic Town Loyalty.h @@ -1,7 +1,7 @@ #ifndef __STRATEGIC_TOWN_LOYALTY_H #define __STRATEGIC_TOWN_LOYALTY_H -#include "Types.h" +#include "types.h" #include "mapscreen.h" #include "Soldier Control.h" diff --git a/Strategic/Strategic Transport Groups.h b/Strategic/Strategic Transport Groups.h index 3fd873c5..9cb67104 100644 --- a/Strategic/Strategic Transport Groups.h +++ b/Strategic/Strategic Transport Groups.h @@ -2,7 +2,7 @@ #define _STRATEGIC_TRANSPORT_GROUPS_H #include "Campaign Types.h" -#include "Types.h" +#include "types.h" #include enum TransportGroupSectorInfo diff --git a/Strategic/Strategic Turns.cpp b/Strategic/Strategic Turns.cpp index 8feb59e6..3dd8c124 100644 --- a/Strategic/Strategic Turns.cpp +++ b/Strategic/Strategic Turns.cpp @@ -2,20 +2,20 @@ #include "Game Clock.h" #include "Font Control.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "message.h" #include "worlddef.h" - #include "soldier create.h" - #include "soldier add.h" - #include "strategic turns.h" - #include "isometric utils.h" - #include "animation data.h" - #include "animation control.h" + #include "Soldier Create.h" + #include "Soldier Add.h" + #include "Strategic Turns.h" + #include "Isometric Utils.h" + #include "Animation Data.h" + #include "Animation Control.h" #include "Tactical Turns.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "rt time defines.h" - #include "assignments.h" + #include "Assignments.h" diff --git a/Strategic/Town Militia.cpp b/Strategic/Town Militia.cpp index feaf4aed..40eabc8f 100644 --- a/Strategic/Town Militia.cpp +++ b/Strategic/Town Militia.cpp @@ -9,21 +9,21 @@ #include "Strategic Town Loyalty.h" #include "Utilities.h" #include "random.h" - #include "text.h" + #include "Text.h" #include "Map Screen Interface.h" #include "Interface.h" - #include "Laptopsave.h" + #include "LaptopSave.h" #include "finances.h" #include "Game Clock.h" #include "Assignments.h" - #include "squads.h" + #include "Squads.h" #include "Soldier Create.h" #include "Dialogue Control.h" #include "GameSettings.h" #include "Queen Command.h" #include "PreBattle Interface.h" #include "Map Screen Interface Border.h" - #include "interface control.h" + #include "Interface Control.h" #include "Map Screen Interface Map.h" #include "laptop.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente diff --git a/Strategic/Town Militia.h b/Strategic/Town Militia.h index a9ef3536..e2ec865f 100644 --- a/Strategic/Town Militia.h +++ b/Strategic/Town Militia.h @@ -3,7 +3,7 @@ // header for town militia strategic control module -#include "Types.h" +#include "types.h" #include "Soldier Control.h" // how many militia of all ranks can be in any one sector at once diff --git a/Strategic/UndergroundInit.h b/Strategic/UndergroundInit.h index e93ebbbf..d3181334 100644 --- a/Strategic/UndergroundInit.h +++ b/Strategic/UndergroundInit.h @@ -2,7 +2,7 @@ #define _UNDERGROUNDINIT_H #include "Campaign Types.h" -#include "Types.h" +#include "types.h" //#include "Strategic Mines LUA.h" #include "lua_state.h" diff --git a/Strategic/XML_ExtraItems.cpp b/Strategic/XML_ExtraItems.cpp index c5151d63..db41b14a 100644 --- a/Strategic/XML_ExtraItems.cpp +++ b/Strategic/XML_ExtraItems.cpp @@ -2,7 +2,7 @@ #include #include "XML.h" #include "expat.h" -#include "DEBUG.h" +#include "DEBUG.H" #include "string.h" #include "Tactical Save.h" #include "FileMan.h" diff --git a/Strategic/XML_Facilities.cpp b/Strategic/XML_Facilities.cpp index 84fcb759..198e61e1 100644 --- a/Strategic/XML_Facilities.cpp +++ b/Strategic/XML_Facilities.cpp @@ -11,7 +11,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "FileMan.h" #include "Campaign Types.h" diff --git a/Strategic/XML_FacilityTypes.cpp b/Strategic/XML_FacilityTypes.cpp index 598cf88c..60e96453 100644 --- a/Strategic/XML_FacilityTypes.cpp +++ b/Strategic/XML_FacilityTypes.cpp @@ -12,7 +12,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "FileMan.h" #include "Campaign Types.h" diff --git a/Strategic/XML_SquadNames.cpp b/Strategic/XML_SquadNames.cpp index 8d82d6b7..63734fa9 100644 --- a/Strategic/XML_SquadNames.cpp +++ b/Strategic/XML_SquadNames.cpp @@ -1,6 +1,6 @@ #include "sgp.h" #include "Map Screen Interface.h" - #include "overhead.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index ebff1280..2703c65a 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -5,13 +5,13 @@ #include "gameloop.h" #include "sgp.h" #include "vobject.h" - #include "wcheck.h" + #include "WCheck.h" #include "worlddef.h" #include "input.h" - #include "font.h" + #include "Font.h" #include "screenids.h" - #include "screens.h" - #include "overhead.h" + #include "Screens.h" + #include "Overhead.h" #include "sysutil.h" #include "Event Pump.h" #include "Font Control.h" @@ -19,18 +19,18 @@ #include "Interface.h" #include "Handle UI.h" #include "Interface Items.h" - #include "interface utils.h" + #include "Interface Utils.h" #include "lighting.h" #include #include - #include "cursors.h" + #include "Cursors.h" #include "Soldier Profile.h" #include "Interface Panels.h" #include "Interface Control.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "Radar Screen.h" #include "Render Dirty.h" - #include "utilities.h" + #include "Utilities.h" #include "Game Init.h" #include "renderworld.h" #include "finances.h" @@ -41,26 +41,26 @@ #include "faces.h" #include "PopUpBox.h" #include "Game Clock.h" - #include "items.h" + #include "Items.h" #include "Cursor Control.h" - #include "text.h" + #include "Text.h" #include "strategic.h" #include "strategicmap.h" - #include "strategic pathing.h" + #include "Strategic Pathing.h" #include "Map Screen Interface Bottom.h" #include "Map Screen Interface Border.h" #include "Map Screen Interface Map.h" #include "Map Screen Interface.h" #include "Assignments.h" - #include "points.h" + #include "Points.h" #include "Squads.h" #include "Merc Contract.h" #include "Sound Control.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "Dialogue Control.h" #include "Map Screen Interface TownMine Info.h" #include "PreBattle Interface.h" - #include "Personnel.h" + #include "personnel.h" #include "Animated ProgressBar.h" #include "Queen Command.h" #include "LaptopSave.h" @@ -75,19 +75,19 @@ #include "SaveLoadScreen.h" #include "Options Screen.h" #include "Auto Resolve.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Campaign.h" - #include "Random.h" + #include "random.h" #include "Air Raid.h" - #include "quests.h" + #include "Quests.h" #include "Town Militia.h" - #include "weapons.h" + #include "Weapons.h" #include "Player Command.h" #include "Multi Language Graphic Utils.h" #include "HelpScreen.h" #include "Soldier macros.h" #include "Map Information.h" - #include "cheats.h" + #include "Cheats.h" #include "Strategic Town Loyalty.h" #include "GameSettings.h" #include "Militia Control.h" diff --git a/Strategic/mapscreen.h b/Strategic/mapscreen.h index 9bf934e0..3b5a5835 100644 --- a/Strategic/mapscreen.h +++ b/Strategic/mapscreen.h @@ -2,7 +2,7 @@ #define __MAPSCREEN_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #define MAP_WORLD_X 18 diff --git a/Strategic/strategic town reputation.cpp b/Strategic/strategic town reputation.cpp index 06cc6a74..4ef2b90e 100644 --- a/Strategic/strategic town reputation.cpp +++ b/Strategic/strategic town reputation.cpp @@ -1,12 +1,12 @@ #include "types.h" #include "strategic town reputation.h" #include "soldier profile type.h" - #include "game event hook.h" + #include "Game Event Hook.h" #include "Soldier Profile.h" #include "Overhead.h" #include "Game Clock.h" - #include "strategic town loyalty.h" - #include "Debug.h" + #include "Strategic Town Loyalty.h" + #include "DEBUG.H" #include "message.h" diff --git a/Strategic/strategic.cpp b/Strategic/strategic.cpp index 09513662..9d05b97a 100644 --- a/Strategic/strategic.cpp +++ b/Strategic/strategic.cpp @@ -1,5 +1,5 @@ - #include "Strategic.h" - #include "Types.h" + #include "strategic.h" + #include "types.h" #include "Squads.h" #include "jascreens.h" #include "Assignments.h" @@ -13,7 +13,7 @@ #include "Vehicles.h" #include "Game Clock.h" #include "CampaignStats.h" // added by Flugente - #include "militiasquads.h" // added by Flugente + #include "MilitiaSquads.h" // added by Flugente #include "Game Event Hook.h" // added by Flugente #include "message.h" // added by Flugente #include "Text.h" // added by Flugente diff --git a/Strategic/strategic.h b/Strategic/strategic.h index c8d86357..5806f7f6 100644 --- a/Strategic/strategic.h +++ b/Strategic/strategic.h @@ -1,9 +1,9 @@ #ifndef __STRATEGIC_H #define __STRATEGIC_H // header for strategic structure -#include "Types.h" +#include "types.h" #include "mapscreen.h" -#include "soldier control.h" +#include "Soldier Control.h" // Flugente: airspace flags #define AIRSPACE_ENEMY_ACTIVE 0x01 //1 // controlled by enemy and active diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index 010e944e..ad66f7e6 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -12,24 +12,24 @@ #include "jascreens.h" #include "worlddef.h" #include "Soldier Control.h" -#include "overhead.h" -#include "interface panels.h" -#include "isometric utils.h" +#include "Overhead.h" +#include "Interface Panels.h" +#include "Isometric Utils.h" #include "Ambient Control.h" #include "worlddef.h" -#include "worlddat.h" -#include "text.h" -#include "Soldier add.h" -#include "soldier macros.h" +#include "WorldDat.h" +#include "Text.h" +#include "Soldier Add.h" +#include "Soldier macros.h" #include "Strategic Pathing.h" -#include "soldier create.h" -#include "handle UI.h" +#include "Soldier Create.h" +#include "Handle UI.h" #include "faces.h" #include "renderworld.h" #include "gamescreen.h" -#include "game clock.h" +#include "Game Clock.h" #include "Soldier Init List.h" -#include "strategic turns.h" +#include "Strategic Turns.h" #include "merc entering.h" #include "Map Information.h" #include "Assignments.h" @@ -37,50 +37,50 @@ #include "Font Control.h" #include "environment.h" #include "Game Events.h" -#include "quests.h" +#include "Quests.h" #include "FileMan.h" -#include "animated progressbar.h" -#include "music control.h" -#include "fade screen.h" +#include "Animated ProgressBar.h" +#include "Music Control.h" +#include "Fade Screen.h" #include "Strategic Movement.h" #include "Campaign Types.h" -#include "sys globals.h" +#include "Sys Globals.h" #include "Exit Grids.h" #include "Tactical Save.h" -#include "pathai.h" -#include "animation control.h" -#include "squads.h" +#include "PATHAI.H" +#include "Animation Control.h" +#include "Squads.h" #include "worldman.h" #include "Overhead.h" #include "Strategic Town Loyalty.h" #include "Queen Command.h" -#include "cursor control.h" +#include "Cursor Control.h" #include "PreBattle Interface.h" #include "Shade Table Util.h" #include "Scheduling.h" #include "gameloop.h" -#include "Random.h" +#include "random.h" #include "ai.h" #include "opplist.h" -#include "keys.h" +#include "Keys.h" #include "Tactical Placement GUI.h" #include "Map Screen Helicopter.h" -#include "map edgepoints.h" +#include "Map Edgepoints.h" #include "Player Command.h" #include "Event Pump.h" -#include "meanwhile.h" -#include "air raid.h" +#include "Meanwhile.h" +#include "Air Raid.h" #include "Strategic Mines.h" #include "Creature Spreading.h" #include "SaveLoadMap.h" #include "Militia Control.h" -#include "gamesettings.h" -#include "dialogue control.h" +#include "GameSettings.h" +#include "Dialogue Control.h" #include "Town Militia.h" #include "sysutil.h" #include "Sound Control.h" -#include "points.h" -#include "render dirty.h" +#include "Points.h" +#include "Render Dirty.h" #include "Debug Control.h" #include "expat.h" #include "Loading Screen.h" @@ -89,14 +89,14 @@ #include "NPC.h" #include "Strategic Event Handler.h" #include "MessageBoxScreen.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "Map Screen Interface.h" #include "history.h" #include "Bullets.h" #include "physics.h" #include "Explosion Control.h" #include "Auto Resolve.h" -#include "cursors.h" +#include "Cursors.h" #include "GameVersion.h" #include "LuaInitNPCs.h" @@ -408,8 +408,8 @@ UINT32 uiBuildShadeTableTime; UINT32 uiNumTablesSaved; UINT32 uiNumTablesLoaded; UINT32 uiNumImagesReloaded; -#include "render dirty.h" -#include "tiledat.h" +#include "Render Dirty.h" +#include "TileDat.h" #endif // SAM externalization stuff diff --git a/Strategic/strategicmap.h b/Strategic/strategicmap.h index e43191c5..786f1c13 100644 --- a/Strategic/strategicmap.h +++ b/Strategic/strategicmap.h @@ -2,7 +2,7 @@ #define __STRATMAP_H // this file is for manipulation of the strategic map structure #include "types.h" -#include "soldier control.h" +#include "Soldier Control.h" #include "FileMan.h" #include "mapscreen.h" diff --git a/Tactical/Air Raid.cpp b/Tactical/Air Raid.cpp index 120ad3d7..9e6c2fda 100644 --- a/Tactical/Air Raid.cpp +++ b/Tactical/Air Raid.cpp @@ -1,32 +1,32 @@ #include "sgp.h" - #include "air raid.h" - #include "game event hook.h" - #include "game clock.h" + #include "Air Raid.h" + #include "Game Event Hook.h" + #include "Game Clock.h" #include "strategicmap.h" #include "PreBattle Interface.h" #include "screenids.h" #include "jascreens.h" #include "random.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Sound Control.h" - #include "timer control.h" - #include "dialogue control.h" - #include "overhead.h" + #include "Timer Control.h" + #include "Dialogue Control.h" + #include "Overhead.h" #include "message.h" - #include "isometric utils.h" - #include "soldier macros.h" - #include "los.h" + #include "Isometric Utils.h" + #include "Soldier macros.h" + #include "LOS.h" #include "math.h" - #include "explosion control.h" - #include "interface.h" - #include "music control.h" + #include "Explosion Control.h" + #include "Interface.h" + #include "Music Control.h" #include "Campaign Types.h" #include "GameSettings.h" - #include "text.h" + #include "Text.h" #include "Morale.h" - #include "Map screen helicopter.h" - #include "structure wrap.h" - #include "meanwhile.h" + #include "Map Screen Helicopter.h" + #include "Structure Wrap.h" + #include "Meanwhile.h" #include "GameInitOptionsScreen.h" diff --git a/Tactical/Air Raid.h b/Tactical/Air Raid.h index 14fc7cbd..3c213b3b 100644 --- a/Tactical/Air Raid.h +++ b/Tactical/Air Raid.h @@ -1,7 +1,7 @@ #ifndef AIR_RAID_H #define AIR_RAID_H -#include "soldier control.h" +#include "Soldier Control.h" #define AIR_RAID_BEGINNING_GAME 0x00000001 #define AIR_RAID_CAN_RANDOMIZE_TEASE_DIVES 0x00000002 diff --git a/Tactical/Animation Cache.cpp b/Tactical/Animation Cache.cpp index ec30ff95..ee3a3b7d 100644 --- a/Tactical/Animation Cache.cpp +++ b/Tactical/Animation Cache.cpp @@ -2,9 +2,9 @@ #include #include "types.h" - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp index fb2d9275..bf1a8300 100644 --- a/Tactical/Animation Control.cpp +++ b/Tactical/Animation Control.cpp @@ -2,18 +2,18 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "Animation Control.h" #include "Animation Data.h" #include "FileMan.h" -#include "weapons.h" +#include "Weapons.h" #include "message.h" #include "structure.h" #include "worlddef.h" #include "worldman.h" -#include "rotting corpses.h" +#include "Rotting Corpses.h" #include "Debug Control.h" -#include "Random.h" +#include "random.h" #include "Soldier Control.h" #include "connect.h" diff --git a/Tactical/Animation Data.cpp b/Tactical/Animation Data.cpp index a75feb89..cf369488 100644 --- a/Tactical/Animation Data.cpp +++ b/Tactical/Animation Data.cpp @@ -1,9 +1,9 @@ #include "builddefines.h" #include #include - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "Animation Data.h" #include "Animation Control.h" @@ -11,9 +11,9 @@ #include "tiledef.h" #include "Sys Globals.h" #include "Debug Control.h" - #include "utilities.h" + #include "Utilities.h" #include "worlddef.h" - #include "Fileman.h" + #include "FileMan.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Arms Dealer Init.cpp b/Tactical/Arms Dealer Init.cpp index 18744069..40682b17 100644 --- a/Tactical/Arms Dealer Init.cpp +++ b/Tactical/Arms Dealer Init.cpp @@ -1,15 +1,15 @@ - #include "Types.h" + #include "types.h" #include "stdlib.h" #include "Arms Dealer Init.h" - #include "String.h" - #include "Debug.h" - #include "Random.h" + #include "string.h" + #include "DEBUG.H" + #include "random.h" #include "Weapons.h" #include "FileMan.h" #include "Game Clock.h" #include "ArmsDealerInvInit.h" - #include "Message.h" - #include "soldier profile.h" + #include "message.h" + #include "Soldier Profile.h" #include "Handle Items.h" #include "Quests.h" #include "Scheduling.h" diff --git a/Tactical/ArmsDealerInvInit.cpp b/Tactical/ArmsDealerInvInit.cpp index c8376592..d0c05986 100644 --- a/Tactical/ArmsDealerInvInit.cpp +++ b/Tactical/ArmsDealerInvInit.cpp @@ -1,16 +1,16 @@ - #include "Types.h" + #include "types.h" #include "ArmsDealerInvInit.h" //#include "Item Types.h" #include "Arms Dealer Init.h" - #include "DEbug.h" - #include "weapons.h" + #include "DEBUG.H" + #include "Weapons.h" #include "Campaign.h" #include "GameSettings.h" #include "AIInternals.h" #include "LaptopSave.h" - #include "bobbyr.h" - #include "Random.h" - #include "Shopkeeper Interface.h" + #include "BobbyR.h" + #include "random.h" + #include "ShopKeeper Interface.h" #include "connect.h" #include "Rebel Command.h" diff --git a/Tactical/Auto Bandage.cpp b/Tactical/Auto Bandage.cpp index a70f5f0a..b426268b 100644 --- a/Tactical/Auto Bandage.cpp +++ b/Tactical/Auto Bandage.cpp @@ -1,29 +1,29 @@ #include "sgp.h" - #include "overhead.h" - #include "messageboxscreen.h" + #include "Overhead.h" + #include "MessageBoxScreen.h" #include "screenids.h" #include "Handle UI.h" #include "message.h" - #include "game clock.h" - #include "items.h" + #include "Game Clock.h" + #include "Items.h" #include "Text.h" #include "MercTextBox.h" - #include "interface.h" - #include "auto bandage.h" + #include "Interface.h" + #include "Auto Bandage.h" #include "renderworld.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "Event Pump.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "ai.h" - #include "interface control.h" + #include "Interface Control.h" #include "strategicmap.h" - #include "animation control.h" + #include "Animation Control.h" #include "Map Screen Interface.h" #include "Soldier Profile.h" #include "Assignments.h" #include "WordWrap.h" - #include "cursors.h" - #include "English.h" + #include "Cursors.h" + #include "english.h" #include "SkillCheck.h" // added by Flugente #include "Music Control.h" diff --git a/Tactical/Boxing.cpp b/Tactical/Boxing.cpp index 02db51b6..0b1efae7 100644 --- a/Tactical/Boxing.cpp +++ b/Tactical/Boxing.cpp @@ -2,17 +2,17 @@ #include "Overhead.h" #include "Boxing.h" #include "Render Fun.h" - #include "Random.h" - #include "Worldman.h" + #include "random.h" + #include "worldman.h" #include "Soldier Profile.h" #include "NPC.h" - #include "Opplist.h" + #include "opplist.h" #include "ai.h" #include "Dialogue Control.h" #include "Handle UI.h" #include "Points.h" - #include "interface.h" - #include "interface dialogue.h" + #include "Interface.h" + #include "interface Dialogue.h" #include "TeamTurns.h" #include "Music Control.h" #include "history.h" diff --git a/Tactical/Bullets.h b/Tactical/Bullets.h index 4bff3c42..6ae4cbed 100644 --- a/Tactical/Bullets.h +++ b/Tactical/Bullets.h @@ -3,8 +3,8 @@ #include "types.h" #include "Soldier Control.h" -#include "los.h" -#include "tile animation.h" +#include "LOS.h" +#include "Tile Animation.h" #define BULLET_FLAG_CREATURE_SPIT 0x0001 diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index 54d1c78c..81afbea3 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -3,15 +3,15 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "random.h" - #include "campaign.h" - #include "dialogue control.h" + #include "Campaign.h" + #include "Dialogue Control.h" #include "Map Screen Interface.h" - #include "Message.h" + #include "message.h" #include "Game Clock.h" #include "Strategic Mines.h" #include "Strategic Status.h" @@ -22,7 +22,7 @@ #include "Interface.h" #include "Game Event Hook.h" #include "Overhead.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Quests.h" #include "Squads.h" #include "Soldier macros.h" diff --git a/Tactical/Civ Quotes.cpp b/Tactical/Civ Quotes.cpp index 4bcf45e3..12965cf1 100644 --- a/Tactical/Civ Quotes.cpp +++ b/Tactical/Civ Quotes.cpp @@ -1,34 +1,34 @@ #include "builddefines.h" #include -#include "Types.h" -#include "civ quotes.h" +#include "types.h" +#include "Civ Quotes.h" #include "mousesystem.h" #include "strategicmap.h" #include "WCheck.h" #include "FileMan.h" -#include "encrypted file.h" +#include "Encrypted File.h" #include "MessageBoxScreen.h" #include "Queen Command.h" #include "Overhead.h" -#include "render dirty.h" -#include "merctextbox.h" +#include "Render Dirty.h" +#include "MercTextBox.h" #include "ai.h" #include "Text.h" #include "screenids.h" #include "Animation Data.h" -#include "Video.h" +#include "video.h" #include "Font Control.h" #include "message.h" #include "local.h" #include "renderworld.h" #include "Interface.h" -#include "cursors.h" +#include "Cursors.h" #include "Dialogue Control.h" #include "Quests.h" #include "Strategic Town Loyalty.h" #include "NPC.h" #include "Strategic Mines.h" -#include "Random.h" +#include "random.h" #include "connect.h" // for enemy taunts diff --git a/Tactical/Dialogue Control.cpp b/Tactical/Dialogue Control.cpp index 10fa1d9c..224fe5c4 100644 --- a/Tactical/Dialogue Control.cpp +++ b/Tactical/Dialogue Control.cpp @@ -1,54 +1,54 @@ #include "sgp.h" - //#include "soldier control.h" + //#include "Soldier Control.h" #include "Encrypted File.h" #include "faces.h" - #include "wcheck.h" - #include "gap.h" - #include "overhead.h" + #include "WCheck.h" + #include "GAP.H" + #include "Overhead.h" #include "Sound Control.h" - #include "dialogue control.h" - #include "Message.h" - #include "render dirty.h" - #include "soldier profile.h" - #include "wordwrap.h" + #include "Dialogue Control.h" + #include "message.h" + #include "Render Dirty.h" + #include "Soldier Profile.h" + #include "WordWrap.h" #include "sysutil.h" #include "vobject_blitters.h" #include "AimMembers.h" #include "mercs.h" - #include "interface dialogue.h" - #include "merctextbox.h" + #include "interface Dialogue.h" + #include "MercTextBox.h" #include "renderworld.h" - #include "soldier macros.h" - #include "squads.h" + #include "Soldier macros.h" + #include "Squads.h" #include "screenids.h" - #include "interface utils.h" + #include "Interface Utils.h" #include "strategicmap.h" #include "PreBattle Interface.h" #include "Game Clock.h" #include "Quests.h" - #include "cursors.h" + #include "Cursors.h" #include "gamescreen.h" - #include "Random.h" + #include "random.h" #include "Map Screen Helicopter.h" #include "GameSettings.h" #include "ShopKeeper Interface.h" #include "Map Screen Interface.h" - #include "text.h" + #include "Text.h" #include "Merc Contract.h" #include "Town Militia.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "SkillCheck.h" #include "Interface Control.h" #include "finances.h" - #include "civ quotes.h" + #include "Civ Quotes.h" #include "Map Screen Interface Map.h" #include "opplist.h" #include "ai.h" #include "worldman.h" #include "Map Screen Interface Bottom.h" #include "Campaign.h" - #include "end game.h" - #include "los.h" + #include "End Game.h" + #include "LOS.h" #include "qarray.h" #include "Soldier Profile.h" #include diff --git a/Tactical/Disease.h b/Tactical/Disease.h index 3da6349c..15949f8b 100644 --- a/Tactical/Disease.h +++ b/Tactical/Disease.h @@ -6,7 +6,7 @@ * @author Flugente (bears-pit.com) */ -#include "Types.h" +#include "types.h" // number of different diseases. Altering this will alter the size of INT32 sDiseasePoints[NUM_DISEASES]; in SOLDIERTYPE #define NUM_DISEASES 20 diff --git a/Tactical/DisplayCover.cpp b/Tactical/DisplayCover.cpp index b4324511..d27d7949 100644 --- a/Tactical/DisplayCover.cpp +++ b/Tactical/DisplayCover.cpp @@ -1,21 +1,21 @@ #include "builddefines.h" -#include "Types.h" +#include "types.h" #include "Isometric Utils.h" //#include "Soldier Control.h" #include "Overhead.h" -#include "displaycover.h" +#include "DisplayCover.h" #include "Font Control.h" #include "_Ja25EnglishText.h" #include "message.h" #include "GameSettings.h" #include "renderworld.h" #include "Interface.h" -#include "Debug.h" +#include "DEBUG.H" #include "PATHAI.H" #include "worldman.h" #include "opplist.h" -#include "los.h" -#include "weapons.h" +#include "LOS.h" +#include "Weapons.h" #include "Game Clock.h" #include "Animation Control.h" #include "lighting.h" diff --git a/Tactical/Drugs And Alcohol.cpp b/Tactical/Drugs And Alcohol.cpp index 0c7c281c..e5119de4 100644 --- a/Tactical/Drugs And Alcohol.cpp +++ b/Tactical/Drugs And Alcohol.cpp @@ -1,17 +1,17 @@ #include "sgp.h" - #include "soldier control.h" - #include "soldier profile.h" - #include "drugs and alcohol.h" - #include "items.h" - #include "morale.h" - #include "points.h" + #include "Soldier Control.h" + #include "Soldier Profile.h" + #include "Drugs And Alcohol.h" + #include "Items.h" + #include "Morale.h" + #include "Points.h" #include "message.h" #include "GameSettings.h" // SANDRO - had to add this, dammit! - #include "Random.h" + #include "random.h" #include "Text.h" #include "Interface.h" #include "Food.h" // added by Flugente - #include "Animation data.h" // added by Flugente for SoldierBodyTypes + #include "Animation Data.h" // added by Flugente for SoldierBodyTypes #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h"// added by Flugente diff --git a/Tactical/DynamicDialogue.h b/Tactical/DynamicDialogue.h index 2eca4b6b..57c57a9a 100644 --- a/Tactical/DynamicDialogue.h +++ b/Tactical/DynamicDialogue.h @@ -7,7 +7,7 @@ * @brief This file contains declarations of classes and functions used for dynamic dialogue */ -#include "Types.h" +#include "types.h" #include "Soldier Control.h" // Flugente: calculate A's opinion of B diff --git a/Tactical/End Game.cpp b/Tactical/End Game.cpp index 95d86d98..ee6eda90 100644 --- a/Tactical/End Game.cpp +++ b/Tactical/End Game.cpp @@ -1,14 +1,14 @@ #include "Overhead.h" #include "Render Fun.h" - #include "Random.h" - #include "Worldman.h" + #include "random.h" + #include "worldman.h" #include "Soldier Profile.h" #include "NPC.h" #include "ai.h" #include "Dialogue Control.h" #include "Handle UI.h" - #include "end game.h" + #include "End Game.h" #include "Intro.h" #include "Exit Grids.h" #include "strategicmap.h" @@ -20,7 +20,7 @@ #include "Music Control.h" #include "Soldier macros.h" #include "qarray.h" - #include "los.h" + #include "LOS.h" #include "Strategic AI.h" #include "Squads.h" #include "PreBattle Interface.h" diff --git a/Tactical/Enemy Soldier Save.cpp b/Tactical/Enemy Soldier Save.cpp index 0d11d98a..09c4c2fd 100644 --- a/Tactical/Enemy Soldier Save.cpp +++ b/Tactical/Enemy Soldier Save.cpp @@ -6,19 +6,19 @@ #include "types.h" #include "strategicmap.h" - #include "overhead.h" - #include "isometric utils.h" + #include "Overhead.h" + #include "Isometric Utils.h" - #include "soldier add.h" - #include "soldier create.h" + #include "Soldier Add.h" + #include "Soldier Create.h" #include "Soldier Init List.h" - #include "debug.h" - #include "Random.h" - #include "items.h" + #include "DEBUG.H" + #include "random.h" + #include "Items.h" #include "Map Information.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "EditorMercs.h" #include "Animation Data.h" #include "message.h" diff --git a/Tactical/EnemyItemDrops.cpp b/Tactical/EnemyItemDrops.cpp index 0d720289..fdda9f4a 100644 --- a/Tactical/EnemyItemDrops.cpp +++ b/Tactical/EnemyItemDrops.cpp @@ -1,5 +1,5 @@ - #include "Types.h" - #include "DEbug.h" + #include "types.h" + #include "DEBUG.H" #include "EnemyItemDrops.h" WEAPON_DROPS gEnemyWeaponDrops[MAX_DROP_ITEMS]; diff --git a/Tactical/Faces.cpp b/Tactical/Faces.cpp index 6eaa12e8..cd6e505a 100644 --- a/Tactical/Faces.cpp +++ b/Tactical/Faces.cpp @@ -8,30 +8,30 @@ #include "vsurface.h" #include "Render Dirty.h" #include "sysutil.h" - #include "wcheck.h" + #include "WCheck.h" #include "video.h" #include "vobject_blitters.h" #include "faces.h" - #include "utilities.h" - #include "overhead.h" - #include "gap.h" + #include "Utilities.h" + #include "Overhead.h" + #include "GAP.H" #include "Soldier Profile.h" #include "Sound Control.h" - #include "teamturns.h" - #include "soldier macros.h" - #include "dialogue control.h" - #include "font control.h" + #include "TeamTurns.h" + #include "Soldier macros.h" + #include "Dialogue Control.h" + #include "Font Control.h" #include "Assignments.h" - #include "Random.h" + #include "random.h" #include "line.h" #include "GameSettings.h" - #include "squads.h" - #include "interface.h" + #include "Squads.h" + #include "Interface.h" #include "Quests.h" - #include "animation control.h" - #include "drugs and alcohol.h" + #include "Animation Control.h" + #include "Drugs And Alcohol.h" #include "Interface Items.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Map Screen Interface.h" // HEADROCK HAM 3.2: Added two includes so that a function can read values of the Gun Range/hospital location #include "Campaign Types.h" diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index 872a4958..70bbb298 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -1,13 +1,13 @@ #include #include "sgp.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "Food.h" - #include "items.h" - #include "morale.h" - #include "points.h" + #include "Items.h" + #include "Morale.h" + #include "Points.h" #include "message.h" #include "GameSettings.h" // SANDRO - had to add this, dammit! - #include "Random.h" + #include "random.h" #include "Text.h" #include "Interface.h" #include "Dialogue Control.h" diff --git a/Tactical/GAP.cpp b/Tactical/GAP.cpp index 5478734a..efb7271e 100644 --- a/Tactical/GAP.cpp +++ b/Tactical/GAP.cpp @@ -1,8 +1,8 @@ #include "builddefines.h" - #include "debug.h" + #include "DEBUG.H" #include "types.h" //#include "mssw.h" - #include "gap.h" + #include "GAP.H" #include "Sound Control.h" #include "soundman.h" #include diff --git a/Tactical/Handle Doors.cpp b/Tactical/Handle Doors.cpp index ba62ff48..dd018bd5 100644 --- a/Tactical/Handle Doors.cpp +++ b/Tactical/Handle Doors.cpp @@ -7,17 +7,17 @@ #include "renderworld.h" #include "structure.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "opplist.h" - #include "overhead.h" - #include "tile animation.h" + #include "Overhead.h" + #include "Tile Animation.h" #include "Interactive Tiles.h" - #include "handle doors.h" + #include "Handle Doors.h" #include "Sound Control.h" - #include "interface.h" - #include "keys.h" + #include "Interface.h" + #include "Keys.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "random.h" #include "SkillCheck.h" #include "Dialogue Control.h" diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index b7d9414b..90bfba9f 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -1,66 +1,66 @@ #include "connect.h" - #include "items.h" + #include "Items.h" #include "Action Items.h" #include "handle Items.h" - #include "overhead.h" - #include "weapons.h" - #include "points.h" + #include "Overhead.h" + #include "Weapons.h" + #include "Points.h" #include "tiledef.h" #include "worlddef.h" #include "worldman.h" - #include "interface.h" + #include "Interface.h" #include "renderworld.h" #include "Animation Control.h" - #include "font control.h" - #include "render dirty.h" + #include "Font Control.h" + #include "Render Dirty.h" #include "World items.h" - #include "text.h" + #include "Text.h" #include "Timer Control.h" - #include "wcheck.h" - #include "interface items.h" + #include "WCheck.h" + #include "Interface Items.h" #include "physics.h" - #include "soldier profile.h" - #include "interface dialogue.h" - #include "quests.h" + #include "Soldier Profile.h" + #include "interface Dialogue.h" + #include "Quests.h" #include "message.h" - #include "isometric utils.h" - #include "los.h" - #include "dialogue control.h" + #include "Isometric Utils.h" + #include "LOS.h" + #include "Dialogue Control.h" #include "ai.h" - #include "soldier macros.h" - #include "interface panels.h" + #include "Soldier macros.h" + #include "Interface Panels.h" #include "Strategic Town Loyalty.h" - #include "soldier functions.h" + #include "Soldier Functions.h" #include "Map Screen Helicopter.h" - #include "pathai.h" + #include "PATHAI.H" #include "fov.h" #include "MessageBoxScreen.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "SkillCheck.h" #include "Campaign.h" - #include "Random.h" - #include "structure wrap.h" - #include "interactive tiles.h" + #include "random.h" + #include "Structure Wrap.h" + #include "Interactive Tiles.h" #include "SaveLoadMap.h" #include "ShopKeeper Interface.h" #include "Arms Dealer Init.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "Sound Control.h" - #include "squads.h" - #include "rotting corpses.h" - #include "soldier ani.h" - #include "Opplist.h" + #include "Squads.h" + #include "Rotting Corpses.h" + #include "Soldier Ani.h" + #include "opplist.h" #include "qarray.h" - #include "render fun.h" + #include "Render Fun.h" #include "Map Information.h" #include "GameSettings.h" - #include "end game.h" - #include "interface control.h" + #include "End Game.h" + #include "Interface Control.h" #include "Map Screen Interface Map Inventory.h" // added by SANDRO #include "Morale.h" // added by Flugente - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "Food.h" // added by sevenfm - this is needed for _keydown(SHIFT) to work #include "english.h" diff --git a/Tactical/Handle UI Plan.cpp b/Tactical/Handle UI Plan.cpp index fbaac284..6dc32608 100644 --- a/Tactical/Handle UI Plan.cpp +++ b/Tactical/Handle UI Plan.cpp @@ -1,15 +1,15 @@ #include "Handle UI Plan.h" - #include "overhead.h" + #include "Overhead.h" #include "Isometric Utils.h" - #include "pathai.h" + #include "PATHAI.H" #include "Handle UI.h" - #include "points.h" - #include "weapons.h" + #include "Points.h" + #include "Weapons.h" #include "renderworld.h" #include "Animation Control.h" #include "message.h" - #include "soldier create.h" - #include "interface.h" + #include "Soldier Create.h" + #include "Interface.h" UINT8 gubNumUIPlannedMoves = 0; SOLDIERTYPE *gpUIPlannedSoldier = NULL; diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index 75733b2b..2c24e53b 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -3,77 +3,77 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "jascreens.h" -#include "pathai.h" +#include "PATHAI.H" #include "Soldier Control.h" #include "Animation Control.h" #include "Animation Data.h" #include "Event Pump.h" #include "Timer Control.h" #include "mousesystem.h" -#include "cursors.h" +#include "Cursors.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" -#include "overhead.h" +#include "Overhead.h" #include "Sys Globals.h" #include "screenids.h" -#include "interface.h" -#include "cursor control.h" -#include "points.h" +#include "Interface.h" +#include "Cursor Control.h" +#include "Points.h" #include "Interactive Tiles.h" -#include "interface cursors.h" +#include "Interface Cursors.h" #include "opplist.h" #include "worldman.h" -#include "weapons.h" +#include "Weapons.h" #include "renderworld.h" #include "structure.h" -#include "interface panels.h" -#include "weapons.h" +#include "Interface Panels.h" +#include "Weapons.h" #include "Handle items.h" -#include "UI cursors.h" -#include "Handle UI plan.h" -#include "Message.h" -#include "Render fun.h" -#include "interface items.h" +#include "UI Cursors.h" +#include "Handle UI Plan.h" +#include "message.h" +#include "Render Fun.h" +#include "Interface Items.h" #include "physics.h" #include "Soldier Profile.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier create.h" -#include "soldier add.h" -#include "interface dialogue.h" -#include "soldier macros.h" -#include "soldier functions.h" +#include "Soldier Profile.h" +#include "Soldier Create.h" +#include "Soldier Add.h" +#include "interface Dialogue.h" +#include "Soldier macros.h" +#include "Soldier Functions.h" #include "Assignments.h" -#include "squads.h" +#include "Squads.h" #include "Strategic Pathing.h" -#include "strategic movement.h" +#include "Strategic Movement.h" #include "strategic.h" -#include "exit grids.h" -#include "structure wrap.h" -#include "soldier add.h" -#include "Random.h" +#include "Exit Grids.h" +#include "Structure Wrap.h" +#include "Soldier Add.h" +#include "random.h" #include "english.h" -#include "Random.h" +#include "random.h" #include "english.h" -#include "vehicles.h" -#include "messageboxscreen.h" -#include "text.h" -#include "dialogue control.h" +#include "Vehicles.h" +#include "MessageBoxScreen.h" +#include "Text.h" +#include "Dialogue Control.h" #include "line.h" #include "GameSettings.h" -#include "los.h" +#include "LOS.h" #include "Campaign Types.h" #include "Queen Command.h" #include "Options Screen.h" #include "SaveLoadGame.h" -#include "Spread Burst.h" +#include "Spread burst.h" #include "ai.h" #include "Game Clock.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Militia Control.h" #include "qarray.h" #include "environment.h" @@ -82,7 +82,7 @@ #include "DisplayCover.h" #include "english.h" // sevenfm: this is needed for _keydown(SHIFT) to work -#include "teamturns.h" +#include "TeamTurns.h" #include "Options Screen.h" #include "SaveLoadScreen.h" #include "Map Screen Interface.h" // added by Flugente for SquadNames diff --git a/Tactical/Interface Control.cpp b/Tactical/Interface Control.cpp index 343be7a7..a34e89b6 100644 --- a/Tactical/Interface Control.cpp +++ b/Tactical/Interface Control.cpp @@ -6,43 +6,43 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" #include "input.h" #include "Handle UI.h" #include "Animation Control.h" #include "Animation Data.h" #include "renderworld.h" - #include "cursors.h" - #include "radar screen.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "worldman.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" - #include "interface cursors.h" + #include "Render Dirty.h" + #include "Utilities.h" + #include "Interface Cursors.h" #include "lighting.h" #include "Interface Panels.h" - #include "pathai.h" + #include "PATHAI.H" #include "vobject_blitters.h" #include "faces.h" #include "Handle UI Plan.h" - #include "interface control.h" - #include "interface items.h" - #include "interface dialogue.h" - #include "interactive tiles.h" + #include "Interface Control.h" + #include "Interface Items.h" + #include "interface Dialogue.h" + #include "Interactive Tiles.h" #include "Game Clock.h" #include "Strategic Exit GUI.h" #include "PopUpBox.h" #include "Assignments.h" - #include "spread burst.h" - #include "squads.h" + #include "Spread burst.h" + #include "Squads.h" #include "line.h" #include "Militia Control.h" #include "Map Screen Interface.h" - #include "civ quotes.h" + #include "Civ Quotes.h" #include "GameSettings.h" #include "Explosion Control.h" // added by Flugente diff --git a/Tactical/Interface Cursors.cpp b/Tactical/Interface Cursors.cpp index aaae395b..4573e139 100644 --- a/Tactical/Interface Cursors.cpp +++ b/Tactical/Interface Cursors.cpp @@ -5,16 +5,16 @@ #include "vsurface.h" #include "input.h" #include "Handle UI.h" - #include "cursors.h" + #include "Cursors.h" #include "worlddef.h" #include "worldman.h" #include "Interface Cursors.h" - #include "interface.h" - #include "Isometric utils.h" - #include "cursors.h" - #include "sys globals.h" - #include "overhead.h" - #include "interface items.h" + #include "Interface.h" + #include "Isometric Utils.h" + #include "Cursors.h" + #include "Sys Globals.h" + #include "Overhead.h" + #include "Interface Items.h" #include "GameSettings.h" #define DISPLAY_AP_INDEX MOCKFLOOR1 diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index d9cc75fd..19e575a5 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -3,57 +3,57 @@ #include "sgp.h" #include "Encrypted File.h" #include "faces.h" - #include "wcheck.h" - #include "soldier profile.h" - #include "wordwrap.h" + #include "WCheck.h" + #include "Soldier Profile.h" + #include "WordWrap.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "interface dialogue.h" - #include "font control.h" - #include "dialogue control.h" + #include "interface Dialogue.h" + #include "Font Control.h" + #include "Dialogue Control.h" #include "renderworld.h" - #include "npc.h" - #include "interface dialogue.h" - #include "merctextbox.h" + #include "NPC.h" + #include "interface Dialogue.h" + #include "MercTextBox.h" #include "message.h" - #include "items.h" - #include "text.h" - #include "overhead.h" - #include "assignments.h" + #include "Items.h" + #include "Text.h" + #include "Overhead.h" + #include "Assignments.h" #include "strategic.h" #include "strategicmap.h" #include "gamescreen.h" #include "ai.h" - #include "aiinternals.h" - #include "interactive tiles.h" - #include "soldier profile.h" - #include "interface panels.h" - #include "quests.h" - #include "squads.h" - #include "game event hook.h" - #include "game clock.h" + #include "AIInternals.h" + #include "Interactive Tiles.h" + #include "Soldier Profile.h" + #include "Interface Panels.h" + #include "Quests.h" + #include "Squads.h" + #include "Game Event Hook.h" + #include "Game Clock.h" #include "MessageBoxScreen.h" #include "Tactical Save.h" - #include "interface control.h" - #include "cursors.h" - #include "fade screen.h" + #include "Interface Control.h" + #include "Cursors.h" + #include "Fade Screen.h" #include "gameloop.h" #include "finances.h" - #include "saveloadmap.h" + #include "SaveLoadMap.h" #include "Arms Dealer Init.h" #include "ShopKeeper Interface.h" #include "Strategic Town Loyalty.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "GameSettings.h" #include "Strategic Mines.h" #include "Boxing.h" #include "Items.h" - #include "WorldMan.h" + #include "worldman.h" #include "Render Fun.h" // including this for Strategic AI.h #include "Strategic Movement.h" #include "Strategic AI.h" - #include "Soldier create.h" + #include "Soldier Create.h" #include "SkillCheck.h" #include "Sound Control.h" #include "opplist.h" @@ -66,7 +66,7 @@ #include "Queen Command.h" #include "Campaign.h" #include "BobbyRMailOrder.h" - #include "end game.h" + #include "End Game.h" #include "Map Screen Helicopter.h" #include "Cheats.h" #include "Overhead.h" diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp index 85b1d188..22cfe29e 100644 --- a/Tactical/Interface Enhanced.cpp +++ b/Tactical/Interface Enhanced.cpp @@ -6,50 +6,50 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "renderworld.h" #include "Font Control.h" - #include "utilities.h" + #include "Utilities.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" - #include "weapons.h" + #include "Weapons.h" #include "lighting.h" #include "faces.h" #include "mapscreen.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "Interface Items.h" #include "Font Control.h" #include "Cursor Control.h" - #include "interface utils.h" - #include "interface items.h" - #include "wordwrap.h" + #include "Interface Utils.h" + #include "Interface Items.h" + #include "WordWrap.h" #include "vobject_blitters.h" #include "world items.h" - #include "points.h" + #include "Points.h" #include "physics.h" - #include "handle ui.h" + #include "Handle UI.h" #include "ShopKeeper Interface.h" #include "english.h" - #include "keys.h" - #include "Strategicmap.h" - #include "soldier macros.h" - #include "squads.h" + #include "Keys.h" + #include "strategicmap.h" + #include "Soldier macros.h" + #include "Squads.h" #include "MessageBoxScreen.h" #include "GameSettings.h" #include "Map Screen Interface Map Inventory.h" #include "Quests.h" #include "Map Screen Interface.h" #include "Campaign Types.h" - #include "los.h" + #include "LOS.h" #include "Map Screen Interface Map.h" #include "Food.h" // added by Flugente diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 62dc9fa9..561bcee3 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -8,54 +8,54 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "renderworld.h" - #include "sys globals.h" - #include "cursors.h" - #include "radar screen.h" + #include "Sys Globals.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" + #include "Render Dirty.h" + #include "Utilities.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" - #include "pathai.h" - #include "weapons.h" + #include "PATHAI.H" + #include "Weapons.h" #include "lighting.h" #include "faces.h" #include "mapscreen.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "Interface Items.h" #include "Font Control.h" #include "Cursor Control.h" - #include "interface cursors.h" - #include "interface utils.h" - #include "interface items.h" - #include "wordwrap.h" - #include "interface control.h" + #include "Interface Cursors.h" + #include "Interface Utils.h" + #include "Interface Items.h" + #include "WordWrap.h" + #include "Interface Control.h" #include "vobject_blitters.h" #include "world items.h" - #include "points.h" + #include "Points.h" #include "physics.h" #include "finances.h" - #include "ui cursors.h" - #include "handle ui.h" + #include "UI Cursors.h" + #include "Handle UI.h" #include "ShopKeeper Interface.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "english.h" - #include "keys.h" - #include "Strategicmap.h" - #include "soldier macros.h" - #include "game clock.h" - #include "squads.h" + #include "Keys.h" + #include "strategicmap.h" + #include "Soldier macros.h" + #include "Game Clock.h" + #include "Squads.h" #include "MessageBoxScreen.h" #include "GameSettings.h" #include "Map Screen Interface Map Inventory.h" @@ -63,7 +63,7 @@ #include "Map Screen Interface.h" #include "Campaign Types.h" #include "opplist.h" - #include "los.h" + #include "LOS.h" #include "Map Screen Interface Map.h" #include "Interface Enhanced.h" #include "InterfaceItemImages.h" diff --git a/Tactical/Interface Items.h b/Tactical/Interface Items.h index 607890ff..48953969 100644 --- a/Tactical/Interface Items.h +++ b/Tactical/Interface Items.h @@ -1,7 +1,7 @@ #ifndef __INTERFACE_ITEMS_H #define __INTERFACE_ITEMS_H -#include "items.h" +#include "Items.h" #include "Handle Items.h" #include "popup_class.h" diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 5eb07868..e3f4c0c3 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -6,42 +6,42 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "renderworld.h" - #include "cursors.h" - #include "radar screen.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" + #include "Render Dirty.h" + #include "Utilities.h" #include "Sound Control.h" #include "Interface Panels.h" #include "Animation Control.h" #include "Soldier Control.h" - #include "pathai.h" - #include "weapons.h" + #include "PATHAI.H" + #include "Weapons.h" #include "lighting.h" #include "faces.h" #include "mapscreen.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "Interface Items.h" - #include "interface control.h" - #include "interface utils.h" + #include "Interface Control.h" + #include "Interface Utils.h" #include "Game Clock.h" #include "mapscreen.h" - #include "Soldier Macros.h" + #include "Soldier macros.h" #include "strategicmap.h" - #include "soldier functions.h" + #include "Soldier Functions.h" #include "gamescreen.h" #include "Assignments.h" - #include "points.h" + #include "Points.h" #include "Squads.h" #include "strategic.h" #include "Map Screen Interface Map.h" @@ -50,21 +50,21 @@ #include "Options Screen.h" #include "ShopKeeper Interface.h" #include "english.h" - #include "keys.h" + #include "Keys.h" #include "Soldier Add.h" - #include "vehicles.h" - #include "gamesettings.h" - #include "dialogue control.h" + #include "Vehicles.h" + #include "GameSettings.h" + #include "Dialogue Control.h" #include "Items.h" - #include "drugs and alcohol.h" - #include "los.h" + #include "Drugs And Alcohol.h" + #include "LOS.h" #include "opplist.h" #include "vobject_blitters.h" - #include "Finances.h" + #include "finances.h" #include "LaptopSave.h" #include "Cursor Control.h" #include "MessageBoxScreen.h" - #include "wordwrap.h" + #include "WordWrap.h" #include "Boxing.h" #include "personnel.h" // HEADROCK HAM 3.6: This is required for Stat Progress Bars diff --git a/Tactical/Interface Utils.cpp b/Tactical/Interface Utils.cpp index 73519abc..a37f4522 100644 --- a/Tactical/Interface Utils.cpp +++ b/Tactical/Interface Utils.cpp @@ -3,13 +3,13 @@ #include "sgp.h" #include "himage.h" #include "vobject.h" - #include "interface utils.h" - #include "render dirty.h" - #include "interface.h" + #include "Interface Utils.h" + #include "Render Dirty.h" + #include "Interface.h" #include "sysutil.h" #include "faces.h" - #include "render dirty.h" - #include "weapons.h" + #include "Render Dirty.h" + #include "Weapons.h" #include "Overhead.h" #include "Soldier macros.h" #include "line.h" diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index 9d0c27db..64881ccc 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -7,56 +7,56 @@ #include "himage.h" #include "vobject.h" #include "sysutil.h" - #include "overhead.h" + #include "Overhead.h" #include "mousesystem.h" #include "Button System.h" - #include "interface.h" + #include "Interface.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "input.h" #include "Handle UI.h" #include "Animation Control.h" #include "Animation Data.h" #include "renderworld.h" - #include "sys globals.h" - #include "cursors.h" - #include "radar screen.h" + #include "Sys Globals.h" + #include "Cursors.h" + #include "Radar Screen.h" #include "worldman.h" #include "Font Control.h" - #include "render dirty.h" - #include "utilities.h" - #include "interface cursors.h" + #include "Render Dirty.h" + #include "Utilities.h" + #include "Interface Cursors.h" #include "Sound Control.h" #include "lighting.h" #include "Interface Panels.h" - #include "pathai.h" + #include "PATHAI.H" #include "vobject_blitters.h" #include "faces.h" #include "Handle UI Plan.h" - #include "interface control.h" - #include "interface items.h" - #include "soldier profile.h" + #include "Interface Control.h" + #include "Interface Items.h" + #include "Soldier Profile.h" #include "MercTextBox.h" - #include "soldier functions.h" - #include "cursor control.h" - #include "handle doors.h" - #include "keys.h" - #include "text.h" - #include "points.h" - #include "soldier macros.h" - #include "game clock.h" + #include "Soldier Functions.h" + #include "Cursor Control.h" + #include "Handle Doors.h" + #include "Keys.h" + #include "Text.h" + #include "Points.h" + #include "Soldier macros.h" + #include "Game Clock.h" #include "physics.h" #include "Map Screen Interface Map.h" #include "line.h" #include "Vehicles.h" - #include "messageboxscreen.h" - #include "gamesettings.h" + #include "MessageBoxScreen.h" + #include "GameSettings.h" #include "Squads.h" #include "message.h" #include "strategicmap.h" #include "Queen Command.h" // HEADROCK HAM 4: Included for new CTH indicator - #include "weapons.h" + #include "Weapons.h" #include "Map Screen Interface.h" // added by Flugente for SquadNames #include "environment.h" #include "SkillCheck.h" // added by Flugente diff --git a/Tactical/Interface.h b/Tactical/Interface.h index 18f4bd33..ea13f36b 100644 --- a/Tactical/Interface.h +++ b/Tactical/Interface.h @@ -1,7 +1,7 @@ #ifndef _INTERFACE_H #define _INTERFACE_H -#include "handle UI.h" +#include "Handle UI.h" #include "mousesystem.h" #include "structure.h" #include "Assignments.h" // added by Flugente for the stat-enums diff --git a/Tactical/InterfaceItemImages.cpp b/Tactical/InterfaceItemImages.cpp index 2bed22b9..679eed22 100644 --- a/Tactical/InterfaceItemImages.cpp +++ b/Tactical/InterfaceItemImages.cpp @@ -2,7 +2,7 @@ #include "DEBUG.H" #include "vobject.h" -#include "utilities.h" +#include "Utilities.h" #include "GameSettings.h" #include diff --git a/Tactical/InterfaceItemImages.h b/Tactical/InterfaceItemImages.h index 635a3105..2c6eb395 100644 --- a/Tactical/InterfaceItemImages.h +++ b/Tactical/InterfaceItemImages.h @@ -1,7 +1,7 @@ #ifndef _ITERFACEITEMIMAGES_H_ #define _ITERFACEITEMIMAGES_H_ -#include "Types.h" +#include "types.h" #include #include #include diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index 72bfa796..060f9d22 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -1,8 +1,8 @@ #include #include "Inventory Choosing.h" - #include "animation data.h" + #include "Animation Data.h" #include "Items.h" - #include "Random.h" + #include "random.h" #include "Weapons.h" #include "Strategic Status.h" #include "Campaign.h" diff --git a/Tactical/Item Types.cpp b/Tactical/Item Types.cpp index b80888d0..5a4fed34 100644 --- a/Tactical/Item Types.cpp +++ b/Tactical/Item Types.cpp @@ -1,13 +1,13 @@ #include "Item Types.h" -#include "Debug.h" +#include "DEBUG.H" #include "Items.h" #include "GameSettings.h" #include "screenids.h" #include "Action Items.h" // added by Flugente for the ACTION_ITEM_BLOW_UP value -#include "Random.h" // added by Flugente -#include "Message.h" // added by BOB for missing LBE info messages -#include "overhead.h" // added by BOB for missing LBE info messages +#include "random.h" // added by Flugente +#include "message.h" // added by BOB for missing LBE info messages +#include "Overhead.h" // added by BOB for missing LBE info messages #include "Map Screen Interface.h" // added by BOB for missing LBE info messages diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 61f51e32..74dd2e79 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -1,28 +1,28 @@ - #include "items.h" + #include "Items.h" #include "Action Items.h" - #include "weapons.h" + #include "Weapons.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle UI.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "Sound Control.h" #include "Isometric Utils.h" #include "Animation Data.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" - #include "interface.h" - #include "interface panels.h" - #include "explosion control.h" + #include "Interface.h" + #include "Interface Panels.h" + #include "Explosion Control.h" #include "Keys.h" #include "faces.h" - #include "wcheck.h" - #include "soldier profile.h" + #include "WCheck.h" + #include "Soldier Profile.h" #include "SkillCheck.h" - #include "los.h" + #include "LOS.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "fov.h" #include "MessageBoxScreen.h" @@ -41,16 +41,16 @@ #include "Soldier macros.h" #include "Smell.h" #include "lighting.h" - #include "utilities.h" + #include "Utilities.h" #include "english.h" - #include "debug control.h" + #include "Debug Control.h" #include "math.h" // THE_BOB : added for pocket popup definitions #include #include "popup_definition.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "Food.h" #include "opplist.h" #include "Sys Globals.h"//dnl ch74 201013 diff --git a/Tactical/Ja25_Tactical.cpp b/Tactical/Ja25_Tactical.cpp index 28ee41e2..e77b35f2 100644 --- a/Tactical/Ja25_Tactical.cpp +++ b/Tactical/Ja25_Tactical.cpp @@ -1,21 +1,21 @@ - #include "items.h" - #include "weapons.h" + #include "Items.h" + #include "Weapons.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle UI.h" #include "Animation Control.h" #include "Isometric Utils.h" #include "Animation Data.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" - #include "interface.h" + #include "Interface.h" #include "Keys.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "SkillCheck.h" - #include "los.h" + #include "LOS.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "MessageBoxScreen.h" @@ -30,9 +30,9 @@ #include "Soldier macros.h" #include "Smell.h" #include "lighting.h" - #include "utilities.h" + #include "Utilities.h" #include "english.h" - #include "debug control.h" + #include "Debug Control.h" #ifdef JA2UB #include "worldman.h" diff --git a/Tactical/Keys.cpp b/Tactical/Keys.cpp index b8dc66e4..0c489d7a 100644 --- a/Tactical/Keys.cpp +++ b/Tactical/Keys.cpp @@ -5,35 +5,35 @@ #include "types.h" #include "Keys.h" - #include "debug.h" + #include "DEBUG.H" #include "Smoothing Utils.h" #include "SkillCheck.h" #include "opplist.h" - #include "items.h" - #include "weapons.h" + #include "Items.h" + #include "Weapons.h" #include "ai.h" #include "message.h" - #include "text.h" - #include "explosion control.h" - #include "isometric utils.h" - #include "StrategicMap.h" + #include "Text.h" + #include "Explosion Control.h" + #include "Isometric Utils.h" + #include "strategicmap.h" #include "Tactical Save.h" #include "Campaign Types.h" - #include "los.h" + #include "LOS.h" #include "opplist.h" - #include "tiledat.h" - #include "overhead.h" + #include "TileDat.h" + #include "Overhead.h" #include "structure.h" #include "renderworld.h" #include "worldman.h" - #include "wcheck.h" + #include "WCheck.h" #include "random.h" #include "worlddef.h" - #include "campaign.h" + #include "Campaign.h" #include "Sound Control.h" #include "Interface.h" #include "Game Clock.h" - #include "handle doors.h" + #include "Handle Doors.h" #include "Map Screen Interface.h" #include "GameSettings.h" // added by SANDRO #include "Dialogue Control.h" // added by Flugente diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index 6d674b55..2821976f 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -4,41 +4,41 @@ #include #include -#include "wcheck.h" +#include "WCheck.h" #include "Isometric Utils.h" -#include "debug.h" -#include "los.h" -#include "animation control.h" -#include "Random.h" -//#include "soldier control.h" +#include "DEBUG.H" +#include "LOS.h" +#include "Animation Control.h" +#include "random.h" +//#include "Soldier Control.h" #include "Event Pump.h" -#include "overhead.h" -#include "weapons.h" +#include "Overhead.h" +#include "Weapons.h" #include "opplist.h" -#include "bullets.h" +#include "Bullets.h" #include "lighting.h" #include "phys math.h" -#include "items.h" +#include "Items.h" #include "Soldier Profile.h" #include "worldman.h" -#include "rotting corpses.h" +#include "Rotting Corpses.h" #include "GameSettings.h" -#include "keys.h" +#include "Keys.h" #include "message.h" #include "Structure Wrap.h" -#include "campaign.h" +#include "Campaign.h" #include "environment.h" -#include "Pathai.h" +#include "PATHAI.H" #include "Soldier macros.h" #include "strategicmap.h" #include "Interface.h" -#include "points.h" +#include "Points.h" #include "Smell.h" #include "Text.h" #include "Quests.h" -#include "items.h" +#include "Items.h" #include "Item Types.h" #include "Vehicles.h" #include "fresh_header.h" diff --git a/Tactical/LogicalBodyTypes/AbstractXMLLoader.h b/Tactical/LogicalBodyTypes/AbstractXMLLoader.h index 20749ba0..e96f666d 100644 --- a/Tactical/LogicalBodyTypes/AbstractXMLLoader.h +++ b/Tactical/LogicalBodyTypes/AbstractXMLLoader.h @@ -6,7 +6,7 @@ #include #include #include "expat.h" -#include "Types.h" +#include "types.h" #include "XML.h" #include "TopicIDs.h" #include "TopicOps.h" diff --git a/Tactical/LogicalBodyTypes/PaletteTable.h b/Tactical/LogicalBodyTypes/PaletteTable.h index 0c2141e8..e8eef780 100644 --- a/Tactical/LogicalBodyTypes/PaletteTable.h +++ b/Tactical/LogicalBodyTypes/PaletteTable.h @@ -3,7 +3,7 @@ #ifndef _LBT_PALETTETABLE__H_ #define _LBT_PALETTETABLE__H_ -#include "soldier control.h" +#include "Soldier Control.h" #include "Utilities.h" #include "lighting.h" diff --git a/Tactical/Map Information.cpp b/Tactical/Map Information.cpp index 0ff75813..c1457d70 100644 --- a/Tactical/Map Information.cpp +++ b/Tactical/Map Information.cpp @@ -1,9 +1,9 @@ #include - #include "fileMan.h" + #include "FileMan.h" #include "types.h" #include "Map Information.h" #include "Soldier Init List.h" - #include "Random.h" + #include "random.h" #include "worlddef.h" #include "renderworld.h" #include "EditorMercs.h" @@ -12,7 +12,7 @@ #include "Animation Data.h" #include "Road Smoothing.h" #include "message.h" - #include "weapons.h" + #include "Weapons.h" #include "environment.h" #include "lighting.h" #include "Animated ProgressBar.h" diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp index eacb0f7c..003052e2 100644 --- a/Tactical/Merc Entering.cpp +++ b/Tactical/Merc Entering.cpp @@ -2,35 +2,35 @@ #include #include #include "stdlib.h" - #include "debug.h" - //#include "soldier control.h" + #include "DEBUG.H" + //#include "Soldier Control.h" // HEADROCK HAM 3.5: Strange that this wasn't included. #include "GameSettings.h" - #include "weapons.h" + #include "Weapons.h" #include "handle items.h" #include "worlddef.h" - #include "rotting corpses.h" - #include "tile cache.h" - #include "isometric utils.h" - #include "animation control.h" - #include "utilities.h" - #include "game clock.h" - #include "soldier create.h" + #include "Rotting Corpses.h" + #include "Tile Cache.h" + #include "Isometric Utils.h" + #include "Animation Control.h" + #include "Utilities.h" + #include "Game Clock.h" + #include "Soldier Create.h" #include "renderworld.h" - #include "tile animation.h" + #include "Tile Animation.h" #include "merc entering.h" #include "Sound Control.h" #include "strategic.h" #include "strategicmap.h" #include "Handle UI.h" - #include "squads.h" + #include "Squads.h" #include "english.h" - #include "cursor control.h" + #include "Cursor Control.h" #include "Merc Hiring.h" #include "Font Control.h" #include "message.h" #include "Text.h" - #include "strategic turns.h" + #include "Strategic Turns.h" #include "ai.h" #include "Dialogue Control.h" #include "Music Control.h" diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp index faa73287..154b7351 100644 --- a/Tactical/Merc Hiring.cpp +++ b/Tactical/Merc Hiring.cpp @@ -2,7 +2,7 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "renderworld.h" @@ -13,25 +13,25 @@ #include "Isometric Utils.h" #include "Event Pump.h" #include "Render Fun.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "Random.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Game Clock.h" - #include "soldier create.h" + #include "Soldier Create.h" #include "Merc Hiring.h" #include "Game Event Hook.h" #include "message.h" #include "strategicmap.h" #include "strategic.h" - #include "items.h" + #include "Items.h" #include "Soldier Add.h" - #include "History.h" + #include "history.h" #include "Squads.h" #include "Strategic Merc Handler.h" #include "Dialogue Control.h" @@ -39,7 +39,7 @@ #include "Map Screen Interface Map.h" #include "screenids.h" #include "jascreens.h" - #include "text.h" + #include "Text.h" #include "Merc Contract.h" #include "LaptopSave.h" #include "personnel.h" diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp index 935d7852..52a2ea57 100644 --- a/Tactical/Militia Control.cpp +++ b/Tactical/Militia Control.cpp @@ -9,20 +9,20 @@ #include "Map Screen Interface.h" #include "Queen Command.h" #include "strategic.h" - #include "popupbox.h" - #include "interface control.h" + #include "PopUpBox.h" + #include "Interface Control.h" #include "Map Screen Interface Map.h" #include "renderworld.h" #include "Text.h" - #include "utilities.h" + #include "Utilities.h" #include "Interface.h" #include "GameSettings.h" - #include "Input.h" + #include "input.h" #include "opplist.h" - #include "los.h" + #include "LOS.h" #include "Items.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "Campaign.h" #include "ai.h" #include "Isometric Utils.h" diff --git a/Tactical/Militia Control.h b/Tactical/Militia Control.h index b309e288..0e055a57 100644 --- a/Tactical/Militia Control.h +++ b/Tactical/Militia Control.h @@ -1,7 +1,7 @@ #ifndef __MILITIA_CONTROL_H #define __MILITIA_CONTROL_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "mousesystem.h" #include "Strategic Movement.h" diff --git a/Tactical/Minigame.cpp b/Tactical/Minigame.cpp index b87b3b1a..fc2282ee 100644 --- a/Tactical/Minigame.cpp +++ b/Tactical/Minigame.cpp @@ -13,7 +13,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "Cursors.h" -#include "Line.h" +#include "line.h" #include "Insurance Text.h" #include "Encrypted File.h" #include "Text.h" @@ -32,20 +32,20 @@ #include "himage.h" #include "vobject.h" #include "vobject_blitters.h" -#include "wcheck.h" +#include "WCheck.h" #include "input.h" -#include "font.h" +#include "Font.h" #include "timer.h" #include "mousesystem.h" #include #include #include "Timer Control.h" #include "Sys Globals.h" -#include "interface.h" -#include "utilities.h" -#include "render dirty.h" -#include "cursor control.h" -#include "utilities.h" +#include "Interface.h" +#include "Utilities.h" +#include "Render Dirty.h" +#include "Cursor Control.h" +#include "Utilities.h" #include "english.h" #include "WordWrap.h" #include "gamescreen.h" diff --git a/Tactical/Morale.cpp b/Tactical/Morale.cpp index 0783a3f4..bd8c6fe9 100644 --- a/Tactical/Morale.cpp +++ b/Tactical/Morale.cpp @@ -2,16 +2,16 @@ #include "Morale.h" #include "Overhead.h" #include "Soldier Profile.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "Map Screen Interface.h" #include "message.h" - #include "assignments.h" + #include "Assignments.h" #include "Strategic Movement.h" #include "Strategic Status.h" #include "SkillCheck.h" - #include "drugs and alcohol.h" - #include "StrategicMap.h" - #include "Debug.h" + #include "Drugs And Alcohol.h" + #include "strategicmap.h" + #include "DEBUG.H" #include "Squads.h" #include "ai.h" #include "Campaign.h" @@ -33,7 +33,7 @@ #include "connect.h" #include "fresh_header.h" -#include "Random.h" +#include "random.h" #include "Merc Contract.h" diff --git a/Tactical/Morale.h b/Tactical/Morale.h index c423faa3..ecf8d40f 100644 --- a/Tactical/Morale.h +++ b/Tactical/Morale.h @@ -1,7 +1,7 @@ #ifndef _MORALE_H #define _MORALE_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" //#define DEFAULT_MORALE 50 diff --git a/Tactical/Overhead Types.h b/Tactical/Overhead Types.h index 9a349c5f..abe6f5e4 100644 --- a/Tactical/Overhead Types.h +++ b/Tactical/Overhead Types.h @@ -2,7 +2,7 @@ #define __OVERHEAD_TYPES_H // GLOBAL HEADER FOR DATA, TYPES FOR TACTICAL ENGINE -#include "Types.h" +#include "types.h" #define REFINE_AIM_1 0 #define REFINE_AIM_MID1 1 diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index ad349607..1e54041a 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -2,9 +2,9 @@ #include #include #include -#include "wcheck.h" +#include "WCheck.h" #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "worldman.h" @@ -19,30 +19,30 @@ #include "Render Fun.h" #include "Render Dirty.h" #include "mousesystem.h" -#include "interface.h" +#include "Interface.h" #include "sysutil.h" #include "FileMan.h" -#include "points.h" -#include "Random.h" +#include "Points.h" +#include "random.h" #include "ai.h" #include "Interactive Tiles.h" -#include "soldier ani.h" +#include "Soldier Ani.h" #include "english.h" -#include "overhead.h" +#include "Overhead.h" #include "opplist.h" #include "Sound Control.h" #include "Font Control.h" #include "lighting.h" -#include "pathai.h" +#include "PATHAI.H" #include "screenids.h" -#include "weapons.h" -#include "rotting corpses.h" +#include "Weapons.h" +#include "Rotting Corpses.h" #include "lighting.h" #include "Handle UI Plan.h" #include "structure.h" -#include "interface panels.h" +#include "Interface Panels.h" #include "message.h" -#include "items.h" +#include "Items.h" #include "Soldier Profile.h" #include "fov.h" #include "Soldier macros.h" @@ -51,60 +51,60 @@ #include "Networking.h" #include "NetworkEvent.h" #endif -#include "structure wrap.h" -#include "tile animation.h" +#include "Structure Wrap.h" +#include "Tile Animation.h" #include "Strategic Merc Handler.h" -#include "strategic turns.h" +#include "Strategic Turns.h" #include "Squads.h" #include "Morale.h" #include "Campaign.h" -#include "music control.h" +#include "Music Control.h" #include "faces.h" -#include "dialogue control.h" +#include "Dialogue Control.h" #include "Queen Command.h" #include "Quests.h" #include "NPC.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier functions.h" -#include "auto bandage.h" +#include "Soldier Profile.h" +#include "Soldier Functions.h" +#include "Auto Bandage.h" #include "Game Event Hook.h" #include "Explosion Control.h" #include "SkillCheck.h" #include "World Items.h" -#include "smell.h" +#include "Smell.h" #include "Player Command.h" #include "GameSettings.h" -#include "messageboxscreen.h" +#include "MessageBoxScreen.h" #include "Game Clock.h" #include "Strategic Town Loyalty.h" #include "Strategic Mines.h" -#include "interface items.h" -#include "text.h" -#include "keys.h" +#include "Interface Items.h" +#include "Text.h" +#include "Keys.h" #include "Boxing.h" #include "Town Militia.h" -#include "meanwhile.h" +#include "Meanwhile.h" #include "Map Screen Helicopter.h" -#include "interface control.h" -#include "exit grids.h" +#include "Interface Control.h" +#include "Exit Grids.h" #include "jascreens.h" #include "strategic.h" #include "arms dealer init.h" -#include "interface utils.h" +#include "Interface Utils.h" #include "Air Raid.h" -#include "civ quotes.h" -#include "drugs and alcohol.h" +#include "Civ Quotes.h" +#include "Drugs And Alcohol.h" #include "history.h" -#include "los.h" -#include "interface dialogue.h" +#include "LOS.h" +#include "interface Dialogue.h" #include "Strategic AI.h" -#include "end game.h" +#include "End Game.h" #include "Strategic Status.h" #include "PreBattle Interface.h" #include "Militia Control.h" #include "Lua Interpreter.h" -#include "bullets.h" +#include "Bullets.h" #include "Inventory Choosing.h" // added by Flugente for TakeMilitiaEquipmentfromSector() #include "CampaignStats.h" // added by Flugente #include "DynamicDialogue.h" // added by Flugente for HandleDynamicOpinions() diff --git a/Tactical/Overhead.h b/Tactical/Overhead.h index 16c42a6f..9c0fa095 100644 --- a/Tactical/Overhead.h +++ b/Tactical/Overhead.h @@ -5,7 +5,7 @@ #include #include "Soldier Control.h" #include -#include "soldier find.h" +#include "Soldier Find.h" #include "Campaign Types.h" // added by Flugente for SECTORINFO and UNDERGROUND_SECTORINFO #define ADD_SOLDIER_NO_PROFILE_ID 200 diff --git a/Tactical/PATHAI.H b/Tactical/PATHAI.H index cf80a125..53c00255 100644 --- a/Tactical/PATHAI.H +++ b/Tactical/PATHAI.H @@ -8,7 +8,7 @@ #ifndef _PATHAI_H #define _PATHAI_H -#include "isometric utils.h" +#include "Isometric Utils.h" namespace ASTAR { #include "BinaryHeap.hpp" diff --git a/Tactical/PATHAI.cpp b/Tactical/PATHAI.cpp index 02a8067d..54c83a16 100644 --- a/Tactical/PATHAI.cpp +++ b/Tactical/PATHAI.cpp @@ -11,14 +11,14 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" - #include "interface.h" + #include "Interface.h" #include #include "input.h" @@ -26,18 +26,18 @@ #include "worlddef.h" #include "worldman.h" // #include "renderworld.h" - #include "pathai.h" + #include "PATHAI.H" #include "Points.h" #include "ai.h" - #include "Random.h" + #include "random.h" #include "message.h" - #include "structure wrap.h" - #include "keys.h" - #include "gamesettings.h" + #include "Structure Wrap.h" + #include "Keys.h" + #include "GameSettings.h" #include "Buildings.h" - #include "soldier profile.h" // added by SANDRO + #include "Soldier Profile.h" // added by SANDRO #include "Soldier macros.h" - #include "AIinternals.h" + #include "AIInternals.h" #include "Rotting Corpses.h" #include "Meanwhile.h" #include "connect.h" @@ -50,7 +50,7 @@ class SOLDIERTYPE; #include "BinaryHeap.hpp" #include "opplist.h" -#include "weapons.h" +#include "Weapons.h" extern BOOLEAN gubWorldTileInLight[MAX_ALLOWED_WORLD_MAX]; extern BOOLEAN gubIsCorpseThere[MAX_ALLOWED_WORLD_MAX]; extern INT32 gubMerkCanSeeThisTile[MAX_ALLOWED_WORLD_MAX]; diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index 927425f9..42d8cc46 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -1,30 +1,30 @@ #include "sgp.h" #include "worlddef.h" - #include "points.h" - #include "overhead.h" - #include "Font control.h" - #include "interface.h" - #include "Isometric utils.h" - #include "pathai.h" - #include "interface.h" + #include "Points.h" + #include "Overhead.h" + #include "Font Control.h" + #include "Interface.h" + #include "Isometric Utils.h" + #include "PATHAI.H" + #include "Interface.h" #include "message.h" #include "Animation Control.h" #include "Weapons.h" - #include "structure wrap.h" - #include "dialogue control.h" - #include "items.h" + #include "Structure Wrap.h" + #include "Dialogue Control.h" + #include "Items.h" #include "rt time defines.h" #include "ai.h" - #include "handle ui.h" - #include "text.h" + #include "Handle UI.h" + #include "Text.h" #include "SkillCheck.h" - #include "wcheck.h" + #include "WCheck.h" #include "Soldier Profile.h" #include "Soldier macros.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "GameSettings.h" #include "worldman.h" #include "math.h" diff --git a/Tactical/Rain.cpp b/Tactical/Rain.cpp index fbb80d34..ad18bc12 100644 --- a/Tactical/Rain.cpp +++ b/Tactical/Rain.cpp @@ -1,43 +1,43 @@ #include "types.h" - //#include "soldier control.h" - #include "overhead.h" - #include "animation control.h" + //#include "Soldier Control.h" + #include "Overhead.h" + #include "Animation Control.h" #include "timer.h" - #include "event pump.h" + #include "Event Pump.h" // #include "Sound Control.h" - #include "interface.h" - #include "Font Control.H" + #include "Interface.h" + #include "Font Control.h" #include "ai.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "TeamTurns.h" #include "Smell.h" #include "Soldier Functions.h" - #include "cursors.h" + #include "Cursors.h" #include "Queen Command.h" #include "lighting.h" #include "environment.h" - #include "dialogue control.h" - #include "Soldier Profile Type.h" - #include "air raid.h" + #include "Dialogue Control.h" + #include "soldier profile type.h" + #include "Air Raid.h" #include "SkillCheck.h" #include "AIInternals.h" #include "AIList.h" #ifdef DEBUG_INTERRUPTS - #include "debug.h" + #include "DEBUG.H" #endif - #include "render dirty.h" + #include "Render Dirty.h" #include "GameSettings.h" #include "screenids.h" #include "vsurface.h" #include "math.h" - #include "merctextbox.h" - #include "Video.h" + #include "MercTextBox.h" + #include "video.h" #include "local.h" #include "line.h" #include "overhead map.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Rain.h" diff --git a/Tactical/RandomMerc.cpp b/Tactical/RandomMerc.cpp index 0e0a2413..4c1448c2 100644 --- a/Tactical/RandomMerc.cpp +++ b/Tactical/RandomMerc.cpp @@ -1,12 +1,12 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "renderworld.h" - #include "Random.h" + #include "random.h" #include "Campaign.h" #include "XML.h" diff --git a/Tactical/Real Time Input.cpp b/Tactical/Real Time Input.cpp index f62e77de..1560b738 100644 --- a/Tactical/Real Time Input.cpp +++ b/Tactical/Real Time Input.cpp @@ -1,10 +1,10 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "jascreens.h" -#include "pathai.h" +#include "PATHAI.H" //#include "Soldier Control.h" #include "Animation Control.h" #include "Animation Data.h" @@ -13,28 +13,28 @@ #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" -#include "overhead.h" +#include "Overhead.h" #include "Sys Globals.h" #include "screenids.h" -#include "interface.h" -#include "cursor control.h" +#include "Interface.h" +#include "Cursor Control.h" #include "Interactive Tiles.h" -#include "spread burst.h" +#include "Spread burst.h" #include "world items.h" -#include "interface items.h" +#include "Interface Items.h" #include "physics.h" -#include "ui cursors.h" +#include "UI Cursors.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier create.h" -#include "soldier add.h" -#include "dialogue control.h" -#include "interface dialogue.h" -#include "interactive tiles.h" -#include "messageboxscreen.h" +#include "Soldier Profile.h" +#include "Soldier Create.h" +#include "Soldier Add.h" +#include "Dialogue Control.h" +#include "interface Dialogue.h" +#include "Interactive Tiles.h" +#include "MessageBoxScreen.h" #include "gameloop.h" -#include "spread burst.h" -#include "explosion control.h" +#include "Spread burst.h" +#include "Explosion Control.h" #include "message.h" #include "Strategic Exit GUI.h" #include "Assignments.h" @@ -42,18 +42,18 @@ #include "renderworld.h" #include "GameSettings.h" #include "english.h" -#include "text.h" -#include "soldier macros.h" -#include "render dirty.h" +#include "Text.h" +#include "Soldier macros.h" +#include "Render Dirty.h" #include "Militia Control.h" -#include "render dirty.h" +#include "Render Dirty.h" #include "Militia Control.h" ///***dddd #include "Squads.h" #include "Interface Panels.h" -#include "Soldier functions.h" +#include "Soldier Functions.h" #include "SaveLoadMap.h" -#include "worlddat.h" //for gtileset +#include "WorldDat.h" //for gtileset #include "Debug Control.h" //for livelog #include "SkillMenu.h" // sevenfm: need this for TraitsMenu diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp index 64707e3f..fb77052d 100644 --- a/Tactical/Rotting Corpses.cpp +++ b/Tactical/Rotting Corpses.cpp @@ -1,36 +1,36 @@ #include "builddefines.h" #include #include - #include "wcheck.h" + #include "WCheck.h" #include "stdlib.h" - #include "debug.h" - //#include "soldier control.h" - #include "weapons.h" + #include "DEBUG.H" + //#include "Soldier Control.h" + #include "Weapons.h" #include "handle items.h" #include "worlddef.h" #include "worldman.h" - #include "rotting corpses.h" - #include "tile cache.h" - #include "isometric utils.h" - #include "animation control.h" - #include "utilities.h" - #include "game clock.h" - #include "soldier create.h" + #include "Rotting Corpses.h" + #include "Tile Cache.h" + #include "Isometric Utils.h" + #include "Animation Control.h" + #include "Utilities.h" + #include "Game Clock.h" + #include "Soldier Create.h" #include "renderworld.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "strategicmap.h" - #include "los.h" + #include "LOS.h" #include "opplist.h" #include "structure.h" #include "message.h" #include "Sound Control.h" - #include "pathai.h" - #include "Random.h" - #include "dialogue control.h" - #include "items.h" - #include "smell.h" + #include "PATHAI.H" + #include "random.h" + #include "Dialogue Control.h" + #include "Items.h" + #include "Smell.h" #include "World Items.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "GameSettings.h" #include "Interface Items.h" #include "Soldier Profile.h" @@ -42,7 +42,7 @@ #include "Interface.h" #include "Music Control.h" #include "Campaign Types.h" - #include "text.h" // added by Flugente + #include "Text.h" // added by Flugente #include "Vehicles.h" // added by silversurfer #include "ai.h" // added by Flugente #include "PreBattle Interface.h" // added by Flugente diff --git a/Tactical/Rotting Corpses.h b/Tactical/Rotting Corpses.h index af65bcbc..dc0c0c27 100644 --- a/Tactical/Rotting Corpses.h +++ b/Tactical/Rotting Corpses.h @@ -1,7 +1,7 @@ #ifndef _ROTTING_CORPSES_H #define _ROTTING_CORPSES_H -#include "tile animation.h" +#include "Tile Animation.h" #define NUM_CORPSE_SHADES 17 #define CORPSE_WARNING_MAX 5 diff --git a/Tactical/ShopKeeper Interface.cpp b/Tactical/ShopKeeper Interface.cpp index b58d61bb..d940af9b 100644 --- a/Tactical/ShopKeeper Interface.cpp +++ b/Tactical/ShopKeeper Interface.cpp @@ -1,4 +1,4 @@ - #include "Types.h" + #include "types.h" #include "ShopKeeper Interface.h" #include "Utilities.h" #include "Game Clock.h" @@ -10,43 +10,43 @@ #include "Interface Control.h" #include "Overhead.h" #include "Cursors.h" - #include "SysUtil.h" + #include "sysutil.h" #include "Interface Panels.h" #include "Radar Screen.h" #include "Interface Items.h" #include "Interface Utils.h" - #include "VObject_Blitters.h" - #include "Finances.h" + #include "vobject_blitters.h" + #include "finances.h" #include "Text.h" #include "Cursor Control.h" - #include "Input.h" + #include "input.h" #include "Arms Dealer Init.h" #include "english.h" #include "Soldier Add.h" - #include "Faces.h" + #include "faces.h" #include "Dialogue Control.h" #include "ShopKeeper Quotes.h" #include "GameSettings.h" #include "MercTextBox.h" - #include "Random.h" + #include "random.h" #include "Squads.h" #include "Soldier Profile.h" - #include "Message.h" - #include "Personnel.h" + #include "message.h" + #include "personnel.h" #include "LaptopSave.h" #include "Quests.h" #include "Weapons.h" #include "MessageBoxScreen.h" - #include "LINE.H" - #include "Drugs and Alcohol.h" + #include "line.h" + #include "Drugs And Alcohol.h" #include "Map Screen Interface.h" #include "Soldier macros.h" - #include "armsdealerinvinit.h" + #include "ArmsDealerInvInit.h" #include "opplist.h" - #include "los.h" + #include "LOS.h" #include "NPC.h" #include "Soldier Create.h" - #include "PATHAI.h" + #include "PATHAI.H" #include "Points.h" #include "InterfaceItemImages.h" #include "Encyclopedia_new.h" @@ -64,7 +64,7 @@ #include "ub_config.h" #endif -#include "BuildDefines.h" +#include "builddefines.h" #include //////////////////////////////////////////// diff --git a/Tactical/SkillCheck.cpp b/Tactical/SkillCheck.cpp index cff7ad4e..28b35b6a 100644 --- a/Tactical/SkillCheck.cpp +++ b/Tactical/SkillCheck.cpp @@ -1,13 +1,13 @@ #include "SkillCheck.h" #include "Soldier Profile.h" - #include "Random.h" + #include "random.h" #include "Items.h" #include "Dialogue Control.h" #include "Overhead.h" #include "Soldier macros.h" #include "Isometric Utils.h" #include "Morale.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "strategicmap.h" // added by SANDRO #include "GameSettings.h" diff --git a/Tactical/SkillMenu.cpp b/Tactical/SkillMenu.cpp index bb11f167..93bfb503 100644 --- a/Tactical/SkillMenu.cpp +++ b/Tactical/SkillMenu.cpp @@ -4,7 +4,7 @@ */ #include "SkillMenu.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #include "Overhead.h" #include "Text.h" #include "Isometric Utils.h" diff --git a/Tactical/Soldier Add.cpp b/Tactical/Soldier Add.cpp index 67b0e79d..71689197 100644 --- a/Tactical/Soldier Add.cpp +++ b/Tactical/Soldier Add.cpp @@ -1,22 +1,22 @@ #include "sgp.h" - #include "overhead.h" - #include "overhead types.h" - #include "isometric utils.h" - #include "interface panels.h" - #include "soldier macros.h" + #include "Overhead.h" + #include "Overhead Types.h" + #include "Isometric Utils.h" + #include "Interface Panels.h" + #include "Soldier macros.h" #include "strategicmap.h" #include "strategic.h" - #include "animation control.h" - #include "soldier create.h" + #include "Animation Control.h" + #include "Soldier Create.h" #include "Soldier Init List.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "Map Information.h" #include "fov.h" - #include "pathai.h" - #include "Random.h" + #include "PATHAI.H" + #include "random.h" #include "Render Fun.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Exit Grids.h" #include "Interface.h" // added by Flugente for zBackground #include "renderworld.h" // added by Flugente @@ -31,8 +31,8 @@ #endif #include "GameSettings.h" // ary-05/05/2009 : add forced turn mode -#include "text.h" // : add forced turn mode -#include "font control.h" // : add forced turn mode +#include "Text.h" // : add forced turn mode +#include "Font Control.h" // : add forced turn mode #include "message.h" // : add forced turn mode #include "connect.h" //forward declarations of common classes to eliminate includes diff --git a/Tactical/Soldier Ani.cpp b/Tactical/Soldier Ani.cpp index 662bc460..f294f9da 100644 --- a/Tactical/Soldier Ani.cpp +++ b/Tactical/Soldier Ani.cpp @@ -1,61 +1,61 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "Soldier Control.h" // I need this here - SANDRO #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" -#include "weapons.h" -#include "soldier ani.h" -#include "Random.h" +#include "Weapons.h" +#include "Soldier Ani.h" +#include "random.h" #include "video.h" #include "vobject_blitters.h" #include "Sound Control.h" -#include "isometric utils.h" +#include "Isometric Utils.h" #include "Handle UI.h" #include "Event Pump.h" #include "opplist.h" #include "lighting.h" #include "ai.h" #include "renderworld.h" -#include "interactive tiles.h" -#include "points.h" +#include "Interactive Tiles.h" +#include "Points.h" #include "message.h" #include "world items.h" #include "physics.h" -#include "soldier create.h" -#include "dialogue control.h" -#include "soldier functions.h" -#include "rotting corpses.h" +#include "Soldier Create.h" +#include "Dialogue Control.h" +#include "Soldier Functions.h" +#include "Rotting Corpses.h" #include "merc entering.h" -#include "soldier add.h" -#include "soldier profile.h" -#include "soldier functions.h" -#include "interface.h" +#include "Soldier Add.h" +#include "Soldier Profile.h" +#include "Soldier Functions.h" +#include "Interface.h" #include "qarray.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "Strategic Town Loyalty.h" #include "Squads.h" #include "worldman.h" -#include "structure wrap.h" -#include "pathai.h" +#include "Structure Wrap.h" +#include "PATHAI.H" #include "pits.h" -#include "text.h" -#include "npc.h" -#include "meanwhile.h" +#include "Text.h" +#include "NPC.h" +#include "Meanwhile.h" #include "Explosion Control.h" #include "fov.h" -#include "campaign.h" -#include "los.h" +#include "Campaign.h" +#include "LOS.h" #include "GameSettings.h" #include "Boxing.h" -#include "drugs and alcohol.h" +#include "Drugs And Alcohol.h" #include "Smell.h" #include "GameSettings.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "Strategic Status.h" #include "Food.h" #include "CampaignStats.h" // added by Flugente diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index f9bdabce..5efcf821 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -2,10 +2,10 @@ #include #include #include -#include "wcheck.h" +#include "WCheck.h" #include "Render Fun.h" #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" //#include "Soldier Control.h" @@ -14,28 +14,28 @@ #include "Animation Control.h" #define _USE_MATH_DEFINES // for C #include -#include "pathai.h" -#include "Random.h" +#include "PATHAI.H" +#include "random.h" #include "worldman.h" #include "Isometric Utils.h" #include "renderworld.h" #include "video.h" -#include "points.h" +#include "Points.h" #include "Sound Control.h" -#include "weapons.h" +#include "Weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" -#include "soldier ani.h" -#include "Event pump.h" +#include "Soldier Ani.h" +#include "Event Pump.h" #include "opplist.h" #include "ai.h" -#include "interface.h" +#include "Interface.h" #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" -#include "gap.h" -#include "campaign.h" -#include "soldier macros.h" +#include "GAP.H" +#include "Campaign.h" +#include "Soldier macros.h" #include "english.h" #include "Squads.h" @@ -43,37 +43,37 @@ #include "Networking.h" #include "NetworkEvent.h" #endif -#include "structure wrap.h" -#include "items.h" -#include "Soundman.h" -#include "utilities.h" -#include "Strategic.h" +#include "Structure Wrap.h" +#include "Items.h" +#include "soundman.h" +#include "Utilities.h" +#include "strategic.h" #include "soldier tile.h" #include "Smell.h" #include "Keys.h" -#include "dialogue control.h" -#include "soldier functions.h" +#include "Dialogue Control.h" +#include "Soldier Functions.h" #include "rt time defines.h" #include "Exit Grids.h" #include "Quests.h" #include "message.h" #include "NPC.h" #include "SkillCheck.h" -#include "handle doors.h" -#include "interface dialogue.h" -#include "smokeeffects.h" +#include "Handle Doors.h" +#include "interface Dialogue.h" +#include "SmokeEffects.h" #include "GameSettings.h" -#include "tile animation.h" +#include "Tile Animation.h" #include "ShopKeeper Interface.h" -#include "vehicles.h" -#include "rotting corpses.h" +#include "Vehicles.h" +#include "Rotting Corpses.h" #include "Interface Control.h" #include "strategicmap.h" -#include "morale.h" -#include "meanwhile.h" -#include "drugs and alcohol.h" +#include "Morale.h" +#include "Meanwhile.h" +#include "Drugs And Alcohol.h" #include "SkillCheck.h" -#include "boxing.h" +#include "Boxing.h" #include "overhead map.h" #include "Map Information.h" #include "environment.h" @@ -84,7 +84,7 @@ #include "Strategic Merc Handler.h" #include "Campaign Types.h" #include "Strategic Status.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Strategic Pathing.h" #include "Debug Control.h" #include "LOS.h" // added by SANDRO @@ -120,7 +120,7 @@ #include "Tactical Save.h" // added by Flugente for AddItemsToUnLoadedSector() #include "LightEffects.h" // added by Flugente for CreatePersonalLight() #include "DynamicDialogue.h" // added by Flugente for HandleDynamicOpinions() -#include "strategic town loyalty.h" // added by Flugente for gTownLoyalty +#include "Strategic Town Loyalty.h" // added by Flugente for gTownLoyalty #include "Rebel Command.h" //forward declarations of common classes to eliminate includes diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index 202d1dc6..706f5590 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -1,16 +1,16 @@ #include "sgp.h" #include "Soldier Create.h" - #include "overhead.h" - #include "wcheck.h" - #include "soldier profile.h" - #include "animation control.h" - #include "animation data.h" + #include "Overhead.h" + #include "WCheck.h" + #include "Soldier Profile.h" + #include "Animation Control.h" + #include "Animation Data.h" #include "Sound Control.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "faces.h" - #include "isometric utils.h" - #include "items.h" - #include "weapons.h" + #include "Isometric Utils.h" + #include "Items.h" + #include "Weapons.h" #include "opplist.h" #include "random.h" #include "Assignments.h" @@ -18,7 +18,7 @@ #include "Smell.h" #include "Squads.h" #include "Interface Panels.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Inventory Choosing.h" #include "Queen Command.h" #include "Soldier Add.h" @@ -27,9 +27,9 @@ #include "Sys Globals.h" #include "Scheduling.h" #include "Rotting Corpses.h" - #include "vehicles.h" - #include "handle ui.h" - #include "text.h" + #include "Vehicles.h" + #include "Handle UI.h" + #include "Text.h" #include "Campaign.h" #include "GameSettings.h" #include "PreBattle Interface.h" diff --git a/Tactical/Soldier Create.h b/Tactical/Soldier Create.h index 06398454..dcf458ed 100644 --- a/Tactical/Soldier Create.h +++ b/Tactical/Soldier Create.h @@ -6,7 +6,7 @@ #include "vobject.h" #include "Overhead Types.h" //#include "Item Types.h" -#include "soldier control.h" +#include "Soldier Control.h" #include #include diff --git a/Tactical/Soldier Find.cpp b/Tactical/Soldier Find.cpp index c45b35c0..34736ccc 100644 --- a/Tactical/Soldier Find.cpp +++ b/Tactical/Soldier Find.cpp @@ -1,7 +1,7 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "worldman.h" @@ -14,32 +14,32 @@ #include "Event Pump.h" #include "Render Fun.h" #include "mousesystem.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "Random.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" //#include "Sound Control.h" #include "lighting.h" - #include "pathai.h" + #include "PATHAI.H" #include "screenids.h" - #include "weapons.h" + #include "Weapons.h" #include "lighting.h" #include "Handle UI Plan.h" #include "structure.h" #include "message.h" - #include "items.h" + #include "Items.h" #include "Soldier Profile.h" #include "fov.h" #include "Soldier macros.h" #include "soldier tile.h" - #include "soldier find.h" + #include "Soldier Find.h" #include "Vehicles.h" #include "GameSettings.h" - #include "ui cursors.h" + #include "UI Cursors.h" BOOLEAN IsGridNoInScreenRect( INT32 sGridNo, SGPRect *pRect ); diff --git a/Tactical/Soldier Functions.h b/Tactical/Soldier Functions.h index a48fb12a..e78601c8 100644 --- a/Tactical/Soldier Functions.h +++ b/Tactical/Soldier Functions.h @@ -1,7 +1,7 @@ #ifndef _SOLDIER_FUNCTIONS_H #define _SOLDIER_FUNCTIONS_H -#include "soldier control.h" +#include "Soldier Control.h" void ContinueMercMovement( SOLDIERTYPE *pSoldier ); diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index 85b2e5cf..15d4121c 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -5,20 +5,20 @@ #include "types.h" #include "strategicmap.h" -#include "overhead.h" -#include "isometric utils.h" +#include "Overhead.h" +#include "Isometric Utils.h" -#include "soldier add.h" -#include "soldier create.h" +#include "Soldier Add.h" +#include "Soldier Create.h" #include "Soldier Init List.h" -#include "debug.h" -#include "Random.h" -#include "items.h" +#include "DEBUG.H" +#include "random.h" +#include "Items.h" #include "GameSettings.h" #include "Map Information.h" -#include "soldier profile.h" +#include "Soldier Profile.h" #include "Sys Globals.h" #include "EditorMercs.h" #include "Animation Data.h" @@ -27,7 +27,7 @@ #include "Sound Control.h" #include "Quests.h" #include "Render Fun.h" -#include "meanwhile.h" +#include "Meanwhile.h" #include "Map Screen Interface Map.h" #include "mapscreen.h" #include "Debug Control.h" diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index ee38c12c..6dc342a4 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -1,7 +1,7 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "math.h" #include "worlddef.h" #include "renderworld.h" @@ -12,32 +12,32 @@ #include "Isometric Utils.h" #include "Event Pump.h" #include "Render Fun.h" - #include "interface.h" + #include "Interface.h" #include "sysutil.h" #include "FileMan.h" - #include "Random.h" + #include "random.h" #include "ai.h" #include "Interactive Tiles.h" - #include "soldier ani.h" + #include "Soldier Ani.h" #include "english.h" - #include "overhead.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Game Clock.h" - #include "assignments.h" + #include "Assignments.h" #include "Dialogue Control.h" - #include "soldier create.h" - #include "soldier add.h" + #include "Soldier Create.h" + #include "Soldier Add.h" #include "opplist.h" - #include "weapons.h" + #include "Weapons.h" #include "Strategic Town Loyalty.h" - #include "squads.h" + #include "Squads.h" #include "Tactical Save.h" #include "Quests.h" #include "aim.h" - #include "Interface Dialogue.h" + #include "interface Dialogue.h" #include "GameSettings.h" #include "strategic town reputation.h" - #include "interface utils.h" + #include "Interface Utils.h" #include "Game Event Hook.h" #include "Map Information.h" #include "history.h" @@ -46,7 +46,7 @@ #include "Player Command.h" #include "strategic.h" #include "strategicmap.h" // added by SANDRO - #include "drugs and alcohol.h" // added by Flugente + #include "Drugs And Alcohol.h" // added by Flugente #include "Campaign.h" #include "LuaInitNPCs.h" // added by Flugente diff --git a/Tactical/Soldier Profile.h b/Tactical/Soldier Profile.h index 39e0860e..2382003e 100644 --- a/Tactical/Soldier Profile.h +++ b/Tactical/Soldier Profile.h @@ -2,7 +2,7 @@ #define __SOLDER_PROFILE_H #include "Soldier Control.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #include "Merc Hiring.h" typedef struct diff --git a/Tactical/Soldier Tile.cpp b/Tactical/Soldier Tile.cpp index 6b994eac..f4de60f0 100644 --- a/Tactical/Soldier Tile.cpp +++ b/Tactical/Soldier Tile.cpp @@ -3,29 +3,29 @@ #include #include "Render Fun.h" #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "Overhead Types.h" #include "Animation Cache.h" #include "Animation Data.h" #include "Animation Control.h" - #include "pathai.h" - #include "Random.h" + #include "PATHAI.H" + #include "random.h" #include "worldman.h" #include "Isometric Utils.h" #include "renderworld.h" #include "video.h" - #include "points.h" + #include "Points.h" // #include "Sound Control.h" #include "lighting.h" - #include "weapons.h" + #include "Weapons.h" #include "vobject_blitters.h" #include "Handle UI.h" - #include "Event pump.h" + #include "Event Pump.h" #include "opplist.h" #include "ai.h" - #include "interface.h" + #include "Interface.h" #include "lighting.h" #include "faces.h" #include "Soldier Profile.h" @@ -35,10 +35,10 @@ #include "NetworkEvent.h" #endif - #include "items.h" - #include "Soundman.h" + #include "Items.h" + #include "soundman.h" #include "soldier tile.h" - #include "soldier add.h" + #include "Soldier Add.h" #include "fov.h" #include "Font Control.h" #include "message.h" diff --git a/Tactical/Soldier macros.h b/Tactical/Soldier macros.h index a436a3cd..4707cb99 100644 --- a/Tactical/Soldier macros.h +++ b/Tactical/Soldier macros.h @@ -2,9 +2,9 @@ #define SOLDIER_MACROS_H // MACROS FOR EASIER SOLDIER CONTROL -#include "teamturns.h" -#include "soldier profile.h" -#include "assignments.h" +#include "TeamTurns.h" +#include "Soldier Profile.h" +#include "Assignments.h" #include "Animation Data.h" // MACROS diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 731bb636..f441dc74 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -1,7 +1,7 @@ -#include "Types.h" -#include "Windows.h" +#include "types.h" +#include "windows.h" //#include "Soldier Control.h" -#include "Input.h" +#include "input.h" #include "english.h" #include "Isometric Utils.h" #include "GameSettings.h" @@ -10,14 +10,14 @@ #include "Text.h" #include "lighting.h" #include "Interface.h" -#include "weapons.h" +#include "Weapons.h" #include "renderworld.h" #include "Font Control.h" -#include "font.h" +#include "Font.h" #include "local.h" #include "vsurface.h" #include "line.h" -#include "los.h" +#include "LOS.h" // added by SANDRO #include "SkillCheck.h" #include "soldier profile type.h" @@ -28,8 +28,8 @@ #include "AIInternals.h" #include "opplist.h" #include "Map Screen Interface.h" -#include "cheats.h" -#include "Drugs and Alcohol.h" +#include "Cheats.h" +#include "Drugs And Alcohol.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Spread Burst.cpp b/Tactical/Spread Burst.cpp index 1f8ae857..4362859c 100644 --- a/Tactical/Spread Burst.cpp +++ b/Tactical/Spread Burst.cpp @@ -1,17 +1,17 @@ #include #include #include "stdlib.h" - #include "debug.h" - //#include "soldier control.h" - #include "weapons.h" - #include "cursor control.h" - #include "soldier find.h" - #include "isometric utils.h" + #include "DEBUG.H" + //#include "Soldier Control.h" + #include "Weapons.h" + #include "Cursor Control.h" + #include "Soldier Find.h" + #include "Isometric Utils.h" #include "renderworld.h" - #include "render dirty.h" - #include "interface.h" - #include "spread burst.h" - #include "points.h" + #include "Render Dirty.h" + #include "Interface.h" + #include "Spread burst.h" + #include "Points.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/Squads.cpp b/Tactical/Squads.cpp index a7dda1b1..8b1de4e1 100644 --- a/Tactical/Squads.cpp +++ b/Tactical/Squads.cpp @@ -1,16 +1,16 @@ - #include "Types.h" + #include "types.h" #include "Squads.h" #include "Strategic Pathing.h" - #include "Strategicmap.h" - #include "Faces.h" + #include "strategicmap.h" + #include "faces.h" #include "Strategic Movement.h" #include "Assignments.h" - #include "OverHead.h" + #include "Overhead.h" #include "Interface.h" #include "Vehicles.h" #include "Map Screen Helicopter.h" #include "Soldier Profile.h" - #include "Debug.h" + #include "DEBUG.H" #include "jascreens.h" #include "screenids.h" #include "Soldier macros.h" diff --git a/Tactical/Strategic Exit GUI.cpp b/Tactical/Strategic Exit GUI.cpp index 18dcb08f..b09acb0f 100644 --- a/Tactical/Strategic Exit GUI.cpp +++ b/Tactical/Strategic Exit GUI.cpp @@ -8,17 +8,17 @@ #include "Game Clock.h" #include "sysutil.h" #include "Font Control.h" - #include "text.h" + #include "Text.h" #include "PopUpBox.h" #include "Cursors.h" #include "Strategic Exit GUI.h" #include "MercTextBox.h" #include "renderworld.h" - #include "overhead.h" - #include "cursor control.h" + #include "Overhead.h" + #include "Cursor Control.h" #include "input.h" #include "english.h" - #include "text.h" + #include "Text.h" #include "Strategic Movement.h" #include "Squads.h" #include "Assignments.h" diff --git a/Tactical/Structure Wrap.cpp b/Tactical/Structure Wrap.cpp index 3a388897..2973b640 100644 --- a/Tactical/Structure Wrap.cpp +++ b/Tactical/Structure Wrap.cpp @@ -1,14 +1,14 @@ #include - #include "debug.h" + #include "DEBUG.H" #include "worlddef.h" #include "worldman.h" - #include "structure wrap.h" - #include "isometric utils.h" + #include "Structure Wrap.h" + #include "Isometric Utils.h" #include "worldman.h" - #include "overhead.h" + #include "Overhead.h" #include "renderworld.h" #include "strategicmap.h" - #include "rotting corpses.h" + #include "Rotting Corpses.h" #include "WorldDat.h" // added by Flugente extern BOOLEAN DoesSAMExistHere( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ, INT32 sGridNo ); diff --git a/Tactical/Tactical Save.cpp b/Tactical/Tactical Save.cpp index 7352422f..1cfacd97 100644 --- a/Tactical/Tactical Save.cpp +++ b/Tactical/Tactical Save.cpp @@ -1,33 +1,33 @@ - #include "Types.h" + #include "types.h" #include "MemMan.h" #include "message.h" #include "Items.h" #include "Handle Items.h" - #include "StrategicMap.h" + #include "strategicmap.h" #include "Tactical Save.h" #include #include "Campaign Types.h" #include "SaveLoadGame.h" - #include "WorldDef.h" - #include "rotting corpses.h" - #include "OverHead.h" + #include "worlddef.h" + #include "Rotting Corpses.h" + #include "Overhead.h" #include "Keys.h" #include "Soldier Create.h" #include "Soldier Profile.h" #include "Isometric Utils.h" #include "Soldier Add.h" - #include "Npc.h" - #include "Ai.h" + #include "NPC.h" + #include "ai.h" #include "Game Clock.h" #include "Animation Control.h" #include "Map Information.h" #include "SaveLoadMap.h" - #include "debug.h" - #include "Random.h" - #include "quests.h" + #include "DEBUG.H" + #include "random.h" + #include "Quests.h" #include "Animated ProgressBar.h" #include "Text.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "Enemy Soldier Save.h" #include "SmokeEffects.h" #include "LightEffects.h" diff --git a/Tactical/Tactical Save.h b/Tactical/Tactical Save.h index 6f60237a..0dfafcfd 100644 --- a/Tactical/Tactical Save.h +++ b/Tactical/Tactical Save.h @@ -3,10 +3,10 @@ #include "World Items.h" -#include "WorldDef.h" -#include "rotting corpses.h" +#include "worlddef.h" +#include "Rotting Corpses.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #define MAPS_DIR "Temp\\" diff --git a/Tactical/Tactical Turns.cpp b/Tactical/Tactical Turns.cpp index 9816d8a7..5cb5c9d5 100644 --- a/Tactical/Tactical Turns.cpp +++ b/Tactical/Tactical Turns.cpp @@ -2,27 +2,27 @@ #include "Game Clock.h" #include "Font Control.h" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "message.h" #include "worlddef.h" - #include "rotting corpses.h" - #include "soldier create.h" - #include "soldier add.h" - #include "isometric utils.h" - #include "animation data.h" - #include "animation control.h" + #include "Rotting Corpses.h" + #include "Soldier Create.h" + #include "Soldier Add.h" + #include "Isometric Utils.h" + #include "Animation Data.h" + #include "Animation Control.h" #include "Tactical Turns.h" - #include "smell.h" + #include "Smell.h" #include "opplist.h" #include "Queen Command.h" - #include "dialogue control.h" - #include "smokeeffects.h" - #include "lighteffects.h" - #include "campaign.h" + #include "Dialogue Control.h" + #include "SmokeEffects.h" + #include "LightEffects.h" + #include "Campaign.h" #include "Soldier macros.h" #include "strategicmap.h" - #include "Random.h" + #include "random.h" #include "Explosion Control.h" #include "Dialogue Control.h" // added by Flugente diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp index ddf9e443..28a372f3 100644 --- a/Tactical/TeamTurns.cpp +++ b/Tactical/TeamTurns.cpp @@ -1,47 +1,47 @@ #include "types.h" - #include "overhead.h" - #include "animation control.h" - #include "points.h" + #include "Overhead.h" + #include "Animation Control.h" + #include "Points.h" #include "opplist.h" #include "timer.h" - #include "event pump.h" + #include "Event Pump.h" #include "Sound Control.h" - #include "interface.h" + #include "Interface.h" #include "Isometric Utils.h" - #include "Font Control.H" + #include "Font Control.h" #include "ai.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "text.h" + #include "Text.h" #include "TeamTurns.h" #include "Smell.h" - #include "game clock.h" + #include "Game Clock.h" #include "Soldier Functions.h" - #include "cursors.h" + #include "Cursors.h" #include "Queen Command.h" - #include "Pathai.h" + #include "PATHAI.H" #include "lighting.h" #include "environment.h" #include "Explosion Control.h" - #include "dialogue control.h" - #include "Soldier Profile Type.h" + #include "Dialogue Control.h" + #include "soldier profile type.h" #include "SmokeEffects.h" - #include "lighteffects.h" - #include "air raid.h" - #include "meanwhile.h" + #include "LightEffects.h" + #include "Air Raid.h" + #include "Meanwhile.h" #include "SkillCheck.h" #include "AIInternals.h" #include "AIList.h" #ifdef DEBUG_INTERRUPTS - #include "debug.h" + #include "DEBUG.H" #endif #include "renderworld.h" - #include "rotting corpses.h" + #include "Rotting Corpses.h" #include "Squads.h" #include "Soldier macros.h" #include "Soldier Profile.h" #include "NPC.h" - #include "drugs and alcohol.h" // added by Flugente + #include "Drugs And Alcohol.h" // added by Flugente #ifdef JA2UB #include "Ja25_Tactical.h" diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 13f5666f..0bd3c26d 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -2,10 +2,10 @@ #include #include #include "stdlib.h" -#include "debug.h" +#include "DEBUG.H" #include "math.h" #include "jascreens.h" -#include "pathai.h" +#include "PATHAI.H" #include "Animation Control.h" #include "Animation Data.h" #include "Event Pump.h" @@ -13,22 +13,22 @@ #include "Handle UI.h" #include "Isometric Utils.h" #include "input.h" -#include "overhead.h" +#include "Overhead.h" #include "Sys Globals.h" #include "screenids.h" -#include "interface.h" -#include "cursor control.h" -#include "points.h" +#include "Interface.h" +#include "Cursor Control.h" +#include "Points.h" #include "Interactive Tiles.h" -#include "interface cursors.h" -#include "weapons.h" +#include "Interface Cursors.h" +#include "Weapons.h" #include "lighting.h" -#include "sound control.h" +#include "Sound Control.h" #include "environment.h" #include "Music Control.h" #include "ai.h" #include "renderworld.h" -#include "font control.h" +#include "Font Control.h" #include "worldman.h" #include "Handle UI Plan.h" #include "message.h" @@ -39,39 +39,39 @@ #include "overhead map.h" #include "world items.h" #include "Game Clock.h" -#include "interface items.h" +#include "Interface Items.h" #include "physics.h" -#include "ui cursors.h" +#include "UI Cursors.h" #include "worldman.h" #include "strategicmap.h" -#include "soldier profile.h" -#include "soldier create.h" -#include "soldier add.h" -#include "dialogue control.h" -#include "interface dialogue.h" +#include "Soldier Profile.h" +#include "Soldier Create.h" +#include "Soldier Add.h" +#include "Dialogue Control.h" +#include "interface Dialogue.h" #include "opplist.h" -#include "interactive tiles.h" -#include "messageboxscreen.h" +#include "Interactive Tiles.h" +#include "MessageBoxScreen.h" #include "gameloop.h" -#include "spread burst.h" -#include "explosion control.h" +#include "Spread burst.h" +#include "Explosion Control.h" #include "QuestDebug.h" -#include "assignments.h" -#include "EditScreen.h" +#include "Assignments.h" +#include "editscreen.h" #include "SaveLoadGame.h" -#include "los.h" +#include "LOS.h" #include "Exit Grids.h" #include "Strategic Exit GUI.h" -#include "auto bandage.h" +#include "Auto Bandage.h" #include "Options Screen.h" -#include "squads.h" -#include "interface panels.h" +#include "Squads.h" +#include "Interface Panels.h" #include "soldier tile.h" -#include "Soldier functions.h" +#include "Soldier Functions.h" #include "Game Events.h" #include "english.h" -#include "Random.h" +#include "random.h" #include "Assignments.h" #include "Map Screen Interface.h" #include "renderworld.h" @@ -80,16 +80,16 @@ #include "Arms Dealer Init.h" #include "ShopKeeper Interface.h" #include "GameSettings.h" -#include "vehicles.h" +#include "Vehicles.h" #include "SaveLoadScreen.h" -#include "Air raid.h" -#include "meanwhile.h" -#include "text.h" +#include "Air Raid.h" +#include "Meanwhile.h" +#include "Text.h" #include "Inventory Choosing.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "HelpScreen.h" -#include "cheats.h" -#include "displaycover.h" +#include "Cheats.h" +#include "DisplayCover.h" #include "Tactical Save.h" #include "history.h" #include "Queen Command.h" diff --git a/Tactical/UI Cursors.cpp b/Tactical/UI Cursors.cpp index 142aff02..91a1f360 100644 --- a/Tactical/UI Cursors.cpp +++ b/Tactical/UI Cursors.cpp @@ -1,33 +1,33 @@ - #include "items.h" - #include "weapons.h" + #include "Items.h" + #include "Weapons.h" #include "Interface Cursors.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle UI.h" #include "Animation Control.h" - #include "points.h" + #include "Points.h" #include "Sound Control.h" - #include "Sys globals.h" + #include "Sys Globals.h" #include "Isometric Utils.h" #include "Animation Data.h" #include "worldman.h" - #include "ui cursors.h" - #include "los.h" + #include "UI Cursors.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" - #include "ui cursors.h" - #include "cursors.h" - #include "cursor control.h" - #include "structure wrap.h" + #include "Interface.h" + #include "UI Cursors.h" + #include "Cursors.h" + #include "Cursor Control.h" + #include "Structure Wrap.h" #include "physics.h" - #include "soldier macros.h" - #include "text.h" - #include "spread burst.h" + #include "Soldier macros.h" + #include "Text.h" + #include "Spread burst.h" #include "GameSettings.h" #include "Interactive Tiles.h" #include "PATHAI.H" #include "SkillCheck.h" // added by SANDRO - #include "message.H" //ddd + #include "message.h" //ddd #include "english.h" // added by Flugente //forward declarations of common classes to eliminate includes diff --git a/Tactical/VehicleMenu.cpp b/Tactical/VehicleMenu.cpp index ca4d704a..5cca5bd8 100644 --- a/Tactical/VehicleMenu.cpp +++ b/Tactical/VehicleMenu.cpp @@ -1,16 +1,16 @@ // anv: totally not a copy of SkillMenu.cpp #include "VehicleMenu.h" -#include "Soldier Profile Type.h" +#include "soldier profile type.h" #include "Overhead.h" #include "Text.h" #include "Isometric Utils.h" #include "DisplayCover.h" #include "worldman.h" #include "Vehicles.h" -#include "soldier macros.h" +#include "Soldier macros.h" #include "Soldier Add.h" -#include "PATHAI.h" +#include "PATHAI.H" #include "Points.h" #include "Handle UI.h" #include "Squads.h" diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp index d954d75a..467aa217 100644 --- a/Tactical/Vehicles.cpp +++ b/Tactical/Vehicles.cpp @@ -1,28 +1,28 @@ #include "Vehicles.h" - #include "String.h" + #include "string.h" #include "Strategic Pathing.h" #include "Assignments.h" #include "Strategic Movement.h" #include "Squads.h" #include "Map Screen Helicopter.h" #include "Game Clock.h" - #include "overhead.h" - #include "soldier profile.h" + #include "Overhead.h" + #include "Soldier Profile.h" #include "Sound Control.h" #include "soundman.h" - #include "soldier add.h" - #include "interface panels.h" + #include "Soldier Add.h" + #include "Interface Panels.h" #include "strategic.h" #include "worlddef.h" #include "Isometric Utils.h" #include "Mapscreen.h" #include "message.h" - #include "interface.h" - #include "Random.h" - #include "text.h" - #include "explosion control.h" - #include "soldier create.h" - #include "animation control.h" + #include "Interface.h" + #include "random.h" + #include "Text.h" + #include "Explosion Control.h" + #include "Soldier Create.h" + #include "Animation Control.h" #include "strategicmap.h" #include "Interface Control.h" #include "Campaign Types.h" @@ -33,7 +33,7 @@ #include "Tactical Save.h" #include "Soldier macros.h" #include "opplist.h" - #include "Soldier ani.h" + #include "Soldier Ani.h" #include "GameSettings.h" #include "Queen Command.h" diff --git a/Tactical/Vehicles.h b/Tactical/Vehicles.h index 571fa98e..456e54df 100644 --- a/Tactical/Vehicles.h +++ b/Tactical/Vehicles.h @@ -1,7 +1,7 @@ #ifndef _VEHICLES_H #define _VEHICLES_H -#include "Types.h" +#include "types.h" #include "Soldier Control.h" #include "Strategic Movement.h" diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index 77e7e0a3..0acc9a29 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -1,40 +1,40 @@ #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Sound Control.h" #include "Cheats.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "worldman.h" #include "math.h" - #include "points.h" + #include "Points.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" #include "opplist.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" - #include "tile animation.h" + #include "Tile Animation.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Render Fun.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" - #include "meanwhile.h" + #include "Bullets.h" + #include "Morale.h" + #include "Meanwhile.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" @@ -50,7 +50,7 @@ #include "CampaignStats.h" // added by Flugente #include "environment.h" // added by silversurfer // sevenfm - #include "buildings.h" // SameBuilding + #include "Buildings.h" // SameBuilding //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/Tactical/World Items.cpp b/Tactical/World Items.cpp index d6eb1c8f..ade73087 100644 --- a/Tactical/World Items.cpp +++ b/Tactical/World Items.cpp @@ -1,17 +1,17 @@ - #include "items.h" + #include "Items.h" #include "handle Items.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "tiledef.h" #include "worlddef.h" - #include "interface.h" + #include "Interface.h" #include "renderworld.h" #include "Animation Control.h" - #include "font control.h" + #include "Font Control.h" #include "World items.h" - #include "debug.h" - #include "Isometric utils.h" - #include "sys globals.h" + #include "DEBUG.H" + #include "Isometric Utils.h" + #include "Sys Globals.h" #include "Tactical Save.h" #include "strategicmap.h" #include "Campaign Types.h" @@ -22,7 +22,7 @@ #include "Quests.h" #include "Soldier Profile.h" #include "message.h" - #include "map screen interface map inventory.h" // added by Flugente + #include "Map Screen Interface Map Inventory.h" // added by Flugente #include "connect.h" #ifdef JA2EDITOR//dnl ch84 290114 #include "Item Statistics.h" diff --git a/Tactical/World Items.h b/Tactical/World Items.h index 524b67b8..fa57ec59 100644 --- a/Tactical/World Items.h +++ b/Tactical/World Items.h @@ -1,7 +1,7 @@ #ifndef __WORLD_ITEMS #define __WORLD_ITEMS -#include "items.h" +#include "Items.h" #include "FileMan.h" diff --git a/Tactical/XML.h b/Tactical/XML.h index d1ab96b9..277a8bd0 100644 --- a/Tactical/XML.h +++ b/Tactical/XML.h @@ -2,7 +2,7 @@ #define __XML_H #include "expat.h" -#include "armsdealerinvinit.h" +#include "ArmsDealerInvInit.h" #include "EnemyItemDrops.h" #include "Loading Screen.h" #include "faces.h" diff --git a/Tactical/XML_AmmoStrings.cpp b/Tactical/XML_AmmoStrings.cpp index 65ea633b..16069ccd 100644 --- a/Tactical/XML_AmmoStrings.cpp +++ b/Tactical/XML_AmmoStrings.cpp @@ -1,7 +1,7 @@ #include "sgp.h" - #include "overhead types.h" - #include "overhead.h" - #include "text.h" + #include "Overhead Types.h" + #include "Overhead.h" + #include "Text.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_AmmoTypes.cpp b/Tactical/XML_AmmoTypes.cpp index 04dfa754..22442b70 100644 --- a/Tactical/XML_AmmoTypes.cpp +++ b/Tactical/XML_AmmoTypes.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "weapons.h" - #include "overhead.h" + #include "Weapons.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Armour.cpp b/Tactical/XML_Armour.cpp index 316b517a..ae4abab8 100644 --- a/Tactical/XML_Armour.cpp +++ b/Tactical/XML_Armour.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "weapons.h" - #include "overhead.h" + #include "Weapons.h" + #include "Overhead.h" #include "GameSettings.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_AttachmentInfo.cpp b/Tactical/XML_AttachmentInfo.cpp index 7bd8a0bf..35f1bd3d 100644 --- a/Tactical/XML_AttachmentInfo.cpp +++ b/Tactical/XML_AttachmentInfo.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_AttachmentSlots.cpp b/Tactical/XML_AttachmentSlots.cpp index 80e76a49..d68ac1bc 100644 --- a/Tactical/XML_AttachmentSlots.cpp +++ b/Tactical/XML_AttachmentSlots.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Attachments.cpp b/Tactical/XML_Attachments.cpp index fdb28fc9..e38f2c74 100644 --- a/Tactical/XML_Attachments.cpp +++ b/Tactical/XML_Attachments.cpp @@ -1,9 +1,9 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" struct diff --git a/Tactical/XML_BurstSounds.cpp b/Tactical/XML_BurstSounds.cpp index 8e140deb..d1d91f68 100644 --- a/Tactical/XML_BurstSounds.cpp +++ b/Tactical/XML_BurstSounds.cpp @@ -1,34 +1,34 @@ #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Sound Control.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" - #include "explosion control.h" + #include "Explosion Control.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Clothes.cpp b/Tactical/XML_Clothes.cpp index 319aa9a3..0541a899 100644 --- a/Tactical/XML_Clothes.cpp +++ b/Tactical/XML_Clothes.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_ComboMergeInfo.cpp b/Tactical/XML_ComboMergeInfo.cpp index 52e4d7b2..8184398b 100644 --- a/Tactical/XML_ComboMergeInfo.cpp +++ b/Tactical/XML_ComboMergeInfo.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_CompatibleFaceItems.cpp b/Tactical/XML_CompatibleFaceItems.cpp index 195749fc..be38b1f9 100644 --- a/Tactical/XML_CompatibleFaceItems.cpp +++ b/Tactical/XML_CompatibleFaceItems.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Disease.cpp b/Tactical/XML_Disease.cpp index a64f75a1..e446f1f1 100644 --- a/Tactical/XML_Disease.cpp +++ b/Tactical/XML_Disease.cpp @@ -1,5 +1,5 @@ #include "sgp.h" -#include "overhead.h" +#include "Overhead.h" #include "Disease.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Drugs.cpp b/Tactical/XML_Drugs.cpp index 2f59756a..dbc6f76f 100644 --- a/Tactical/XML_Drugs.cpp +++ b/Tactical/XML_Drugs.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Drugs And Alcohol.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_EnemyAmmoDrops.cpp b/Tactical/XML_EnemyAmmoDrops.cpp index 7642dd9b..31eaa617 100644 --- a/Tactical/XML_EnemyAmmoDrops.cpp +++ b/Tactical/XML_EnemyAmmoDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyArmourDrops.cpp b/Tactical/XML_EnemyArmourDrops.cpp index 0e5fc490..b34c25d1 100644 --- a/Tactical/XML_EnemyArmourDrops.cpp +++ b/Tactical/XML_EnemyArmourDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyExplosiveDrops.cpp b/Tactical/XML_EnemyExplosiveDrops.cpp index 206ffd8c..609e8000 100644 --- a/Tactical/XML_EnemyExplosiveDrops.cpp +++ b/Tactical/XML_EnemyExplosiveDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyItemChoice.cpp b/Tactical/XML_EnemyItemChoice.cpp index df4ed87d..2fa46fd8 100644 --- a/Tactical/XML_EnemyItemChoice.cpp +++ b/Tactical/XML_EnemyItemChoice.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyMiscDrops.cpp b/Tactical/XML_EnemyMiscDrops.cpp index b9fff0d8..5ed4b494 100644 --- a/Tactical/XML_EnemyMiscDrops.cpp +++ b/Tactical/XML_EnemyMiscDrops.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyWeaponChoice.cpp b/Tactical/XML_EnemyWeaponChoice.cpp index 241b4d0a..636d85b9 100644 --- a/Tactical/XML_EnemyWeaponChoice.cpp +++ b/Tactical/XML_EnemyWeaponChoice.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_EnemyWeaponDrops.cpp b/Tactical/XML_EnemyWeaponDrops.cpp index 1ac0d6ad..0c591582 100644 --- a/Tactical/XML_EnemyWeaponDrops.cpp +++ b/Tactical/XML_EnemyWeaponDrops.cpp @@ -1,31 +1,31 @@ #include "sgp.h" - #include "overhead types.h" - #include "overhead.h" + #include "Overhead Types.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Explosive.cpp b/Tactical/XML_Explosive.cpp index eed42225..b64ccc03 100644 --- a/Tactical/XML_Explosive.cpp +++ b/Tactical/XML_Explosive.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Food.cpp b/Tactical/XML_Food.cpp index fac80524..4840810e 100644 --- a/Tactical/XML_Food.cpp +++ b/Tactical/XML_Food.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Food.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_FoodOpinions.cpp b/Tactical/XML_FoodOpinions.cpp index 8846743b..7c602e47 100644 --- a/Tactical/XML_FoodOpinions.cpp +++ b/Tactical/XML_FoodOpinions.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Food.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_IMPItemChoices.cpp b/Tactical/XML_IMPItemChoices.cpp index fe639f17..f5f79c9e 100644 --- a/Tactical/XML_IMPItemChoices.cpp +++ b/Tactical/XML_IMPItemChoices.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_IncompatibleAttachments.cpp b/Tactical/XML_IncompatibleAttachments.cpp index 65103d78..b73fe408 100644 --- a/Tactical/XML_IncompatibleAttachments.cpp +++ b/Tactical/XML_IncompatibleAttachments.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_InteractiveTiles.cpp b/Tactical/XML_InteractiveTiles.cpp index e7145446..665d43ec 100644 --- a/Tactical/XML_InteractiveTiles.cpp +++ b/Tactical/XML_InteractiveTiles.cpp @@ -6,7 +6,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" -#include "gamesettings.h" +#include "GameSettings.h" #include "XML.h" #include "FileMan.h" #include "Handle Items.h" diff --git a/Tactical/XML_ItemAdjustments.cpp b/Tactical/XML_ItemAdjustments.cpp index 82ba287a..d528a304 100644 --- a/Tactical/XML_ItemAdjustments.cpp +++ b/Tactical/XML_ItemAdjustments.cpp @@ -1,9 +1,9 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "Item Types.h" diff --git a/Tactical/XML_LBEPocket.cpp b/Tactical/XML_LBEPocket.cpp index e4a6cadc..7810eedb 100644 --- a/Tactical/XML_LBEPocket.cpp +++ b/Tactical/XML_LBEPocket.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Launchable.cpp b/Tactical/XML_Launchable.cpp index 26994d2d..40e7c6b9 100644 --- a/Tactical/XML_Launchable.cpp +++ b/Tactical/XML_Launchable.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_LoadBearingEquipment.cpp b/Tactical/XML_LoadBearingEquipment.cpp index f89cb67b..e9135dd2 100644 --- a/Tactical/XML_LoadBearingEquipment.cpp +++ b/Tactical/XML_LoadBearingEquipment.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Magazine.cpp b/Tactical/XML_Magazine.cpp index 5c989920..f2215eb2 100644 --- a/Tactical/XML_Magazine.cpp +++ b/Tactical/XML_Magazine.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_MercStartingGear.cpp b/Tactical/XML_MercStartingGear.cpp index 1713ea75..69ce78e6 100644 --- a/Tactical/XML_MercStartingGear.cpp +++ b/Tactical/XML_MercStartingGear.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Merchants.cpp b/Tactical/XML_Merchants.cpp index b43c32b4..f1c72ce0 100644 --- a/Tactical/XML_Merchants.cpp +++ b/Tactical/XML_Merchants.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Arms Dealer Init.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Merge.cpp b/Tactical/XML_Merge.cpp index eee7b404..f06064c8 100644 --- a/Tactical/XML_Merge.cpp +++ b/Tactical/XML_Merge.cpp @@ -1,9 +1,9 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" struct diff --git a/Tactical/XML_NewFaceGear.cpp b/Tactical/XML_NewFaceGear.cpp index b941e746..4bde7a05 100644 --- a/Tactical/XML_NewFaceGear.cpp +++ b/Tactical/XML_NewFaceGear.cpp @@ -3,7 +3,7 @@ #include "expat.h" #include "XML.h" #include "Interface.h" - #include "Faces.h" + #include "faces.h" struct { diff --git a/Tactical/XML_Opinions.cpp b/Tactical/XML_Opinions.cpp index a82c5fda..9571b7f3 100644 --- a/Tactical/XML_Opinions.cpp +++ b/Tactical/XML_Opinions.cpp @@ -13,7 +13,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "Soldier Profile.h" diff --git a/Tactical/XML_Profiles.cpp b/Tactical/XML_Profiles.cpp index 380fffb1..adce87e4 100644 --- a/Tactical/XML_Profiles.cpp +++ b/Tactical/XML_Profiles.cpp @@ -13,7 +13,7 @@ #include "sgp.h" #include "Debug Control.h" #include "expat.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "XML.h" #include "Soldier Profile.h" #include "Soldier Profile.h" diff --git a/Tactical/XML_RandomItem.cpp b/Tactical/XML_RandomItem.cpp index 335d1096..554d74c6 100644 --- a/Tactical/XML_RandomItem.cpp +++ b/Tactical/XML_RandomItem.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_RandomStats.cpp b/Tactical/XML_RandomStats.cpp index c9489e97..73ee1838 100644 --- a/Tactical/XML_RandomStats.cpp +++ b/Tactical/XML_RandomStats.cpp @@ -6,7 +6,7 @@ #include "soldier profile type.h" #include "Soldier Profile.h" -#include "Random.h" +#include "random.h" struct { diff --git a/Tactical/XML_SectorLoadscreens.cpp b/Tactical/XML_SectorLoadscreens.cpp index 99a11c1b..ed2c1818 100644 --- a/Tactical/XML_SectorLoadscreens.cpp +++ b/Tactical/XML_SectorLoadscreens.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_SpreadPatterns.cpp b/Tactical/XML_SpreadPatterns.cpp index 5d5732aa..7a7f91a2 100644 --- a/Tactical/XML_SpreadPatterns.cpp +++ b/Tactical/XML_SpreadPatterns.cpp @@ -1,34 +1,34 @@ //zilpin: pellet spread patterns externalized in XML #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "weapons.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Weapons.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_StructureConstruct.cpp b/Tactical/XML_StructureConstruct.cpp index 4a8b3188..99584be6 100644 --- a/Tactical/XML_StructureConstruct.cpp +++ b/Tactical/XML_StructureConstruct.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_StructureDeconstruct.cpp b/Tactical/XML_StructureDeconstruct.cpp index d1128481..7c974d00 100644 --- a/Tactical/XML_StructureDeconstruct.cpp +++ b/Tactical/XML_StructureDeconstruct.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "overhead.h" + #include "Overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_Structure_Move.cpp b/Tactical/XML_Structure_Move.cpp index 9d06e558..0a7d6bcd 100644 --- a/Tactical/XML_Structure_Move.cpp +++ b/Tactical/XML_Structure_Move.cpp @@ -1,5 +1,5 @@ #include "sgp.h" -#include "overhead.h" +#include "Overhead.h" #include "Handle Items.h" #include "Debug Control.h" #include "expat.h" diff --git a/Tactical/XML_TonyInventory.cpp b/Tactical/XML_TonyInventory.cpp index 60336809..565a4a5c 100644 --- a/Tactical/XML_TonyInventory.cpp +++ b/Tactical/XML_TonyInventory.cpp @@ -1,6 +1,6 @@ #include "sgp.h" - #include "overhead.h" - #include "weapons.h" + #include "Overhead.h" + #include "Weapons.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" diff --git a/Tactical/XML_Vehicles.cpp b/Tactical/XML_Vehicles.cpp index 73236aec..e40c6d81 100644 --- a/Tactical/XML_Vehicles.cpp +++ b/Tactical/XML_Vehicles.cpp @@ -1,9 +1,9 @@ - #include "sgp.h" - #include "Debug Control.h" - #include "expat.h" - #include "XML.h" - #include "Interface.h" - #include "Vehicles.h" +#include "sgp.h" +#include "Debug Control.h" +#include "expat.h" +#include "XML.h" +#include "Interface.h" +#include "Vehicles.h" struct { diff --git a/Tactical/bullets.cpp b/Tactical/bullets.cpp index 3d1e62a3..9ee2d929 100644 --- a/Tactical/bullets.cpp +++ b/Tactical/bullets.cpp @@ -7,15 +7,15 @@ #include "renderworld.h" #include "vsurface.h" #include "sysutil.h" - #include "wcheck.h" + #include "WCheck.h" #include "video.h" #include "vobject_blitters.h" #include "faces.h" - #include "utilities.h" - #include "overhead.h" + #include "Utilities.h" + #include "Overhead.h" #include "Soldier Profile.h" #include "Bullets.h" - #include "los.h" + #include "LOS.h" #include "worldman.h" #include "random.h" #include "GameSettings.h" diff --git a/Tactical/faces.h b/Tactical/faces.h index 3e374974..aa496ff5 100644 --- a/Tactical/faces.h +++ b/Tactical/faces.h @@ -5,7 +5,7 @@ #define ANGRY 2 #define SURPRISED 3 -#include "soldier control.h" +#include "Soldier Control.h" #include "soldier profile type.h" // Defines diff --git a/Tactical/fov.cpp b/Tactical/fov.cpp index 7aa7bdba..3291992f 100644 --- a/Tactical/fov.cpp +++ b/Tactical/fov.cpp @@ -1,26 +1,26 @@ #include "sgp.h" #include "Isometric Utils.h" #include "worlddef.h" - #include "render fun.h" + #include "Render Fun.h" #include "renderworld.h" - #include "dialogue control.h" - #include "structure wrap.h" - #include "font control.h" - #include "pathai.h" - #include "overhead.h" - #include "smell.h" + #include "Dialogue Control.h" + #include "Structure Wrap.h" + #include "Font Control.h" + #include "PATHAI.H" + #include "Overhead.h" + #include "Smell.h" #include "fov.h" - #include "rotting corpses.h" - #include "keys.h" + #include "Rotting Corpses.h" + #include "Keys.h" #include "english.h" - #include "Random.h" + #include "random.h" #include "input.h" - #include "exit grids.h" + #include "Exit Grids.h" #include "environment.h" #include "worldman.h" #include "Fog Of War.h" - #include "Strategicmap.h" - #include "boxing.h" + #include "strategicmap.h" + #include "Boxing.h" #include "opplist.h" #include "lighting.h" #include "Soldier macros.h" diff --git a/Tactical/fov.h b/Tactical/fov.h index 82b57eff..017af2a8 100644 --- a/Tactical/fov.h +++ b/Tactical/fov.h @@ -1,7 +1,7 @@ #ifndef __FOV_H #define __FOV_H -#include "overhead.h" +#include "Overhead.h" void RevealRoofsAndItems(SOLDIERTYPE *pSoldier, UINT32 itemsToo, BOOLEAN fShowLocators, UINT8 ubLevel, BOOLEAN fForce ); diff --git a/Tactical/interface Dialogue.h b/Tactical/interface Dialogue.h index 9ca78408..ea1e0059 100644 --- a/Tactical/interface Dialogue.h +++ b/Tactical/interface Dialogue.h @@ -3,7 +3,7 @@ #include "mousesystem.h" -#include "npc.h" +#include "NPC.h" extern UINT8 gubSrcSoldierProfile; diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index 2b8c8cc0..d0e85f9c 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -1,48 +1,48 @@ #include "sgp.h" //#include "ai.h" #include "Isometric Utils.h" - #include "overhead.h" + #include "Overhead.h" #include "math.h" #include "Event Pump.h" #include "random.h" #include "Overhead Types.h" #include "opplist.h" #include "ai.h" - #include "font control.h" - #include "Animation COntrol.h" - #include "los.h" + #include "Font Control.h" + #include "Animation Control.h" + #include "LOS.h" #include "fov.h" - #include "dialogue control.h" + #include "Dialogue Control.h" #include "lighting.h" #include "environment.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "message.h" - #include "soldier profile.h" + #include "Soldier Profile.h" #include "TeamTurns.h" - #include "interactive tiles.h" - #include "render fun.h" + #include "Interactive Tiles.h" + #include "Render Fun.h" #include "Text.h" - #include "timer control.h" - #include "soldier macros.h" - #include "soldier functions.h" - #include "handle ui.h" + #include "Timer Control.h" + #include "Soldier macros.h" + #include "Soldier Functions.h" + #include "Handle UI.h" #include "Queen Command.h" - #include "keys.h" + #include "Keys.h" #include "Campaign.h" #include "Soldier Init List.h" - #include "music control.h" + #include "Music Control.h" #include "Soldier Profile.h" - #include "Strategicmap.h" + #include "strategicmap.h" #include "Quests.h" - #include "meanwhile.h" - #include "WorldMan.h" + #include "Meanwhile.h" + #include "worldman.h" #include "SkillCheck.h" #include "GameSettings.h" #include "Smell.h" #include "Game Clock.h" - #include "civ quotes.h" + #include "Civ Quotes.h" #include "Sound Control.h" - #include "drugs and alcohol.h" + #include "Drugs And Alcohol.h" #include "Interface.h" #include "Explosion Control.h"//dnl ch40 200909 #include "Vehicles.h" diff --git a/Tactical/soldier profile type.h b/Tactical/soldier profile type.h index e57155ee..5e699edd 100644 --- a/Tactical/soldier profile type.h +++ b/Tactical/soldier profile type.h @@ -1,7 +1,7 @@ #ifndef __SOLDER_PROFILE_TYPE_H #define __SOLDER_PROFILE_TYPE_H -#include "overhead types.h" +#include "Overhead Types.h" #include "Soldier Control.h" #include "mapscreen.h" diff --git a/Tactical/soldier tile.h b/Tactical/soldier tile.h index e20e3232..53d514f1 100644 --- a/Tactical/soldier tile.h +++ b/Tactical/soldier tile.h @@ -1,7 +1,7 @@ #ifndef __SOLDIER_TILE_H #define __SOLDIER_TILE_H -#include "soldier control.h" +#include "Soldier Control.h" #define MOVE_TILE_CLEAR 1 #define MOVE_TILE_TEMP_BLOCKED -1 diff --git a/TacticalAI/AIList.cpp b/TacticalAI/AIList.cpp index fef94af5..e237b992 100644 --- a/TacticalAI/AIList.cpp +++ b/TacticalAI/AIList.cpp @@ -12,7 +12,7 @@ #include "AIList.h" #include "Overhead.h" - #include "debug.h" + #include "DEBUG.H" #include "AIInternals.h" #include "ai.h" #include "opplist.h" diff --git a/TacticalAI/AIList.h b/TacticalAI/AIList.h index d67bfc6d..9d3471cc 100644 --- a/TacticalAI/AIList.h +++ b/TacticalAI/AIList.h @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" typedef struct AILIST { diff --git a/TacticalAI/AIMain.cpp b/TacticalAI/AIMain.cpp index ce032d07..5bdc0624 100644 --- a/TacticalAI/AIMain.cpp +++ b/TacticalAI/AIMain.cpp @@ -1,25 +1,25 @@ #include "sgp.h" #include "ai.h" #include "Isometric Utils.h" -#include "overhead.h" +#include "Overhead.h" #include "math.h" #include "Event Pump.h" #include "Soldier Control.h" #include "Overhead Types.h" #include "opplist.h" -#include "animation control.h" -#include "font control.h" -#include "interface.h" +#include "Animation Control.h" +#include "Font Control.h" +#include "Interface.h" #include "screenids.h" #include "worldman.h" -#include "pathai.h" -#include "points.h" -#include "weapons.h" -#include "items.h" +#include "PATHAI.H" +#include "Points.h" +#include "Weapons.h" +#include "Items.h" #include "Handle Items.h" #include "AIInternals.h" -#include "animation data.h" -#include "los.h" +#include "Animation Data.h" +#include "LOS.h" #include "message.h" #include "TeamTurns.h" #include "NPC.h" @@ -30,7 +30,7 @@ #include "Soldier Create.h" #include "Explosion Control.h" #include "Interactive Tiles.h" -#include "interface dialogue.h" +#include "interface Dialogue.h" #include "Vehicles.h" #include "renderworld.h" #include "AIList.h" @@ -39,13 +39,13 @@ #include "physics.h" #include "GameSettings.h" #include "Debug Control.h" -#include "interface panels.h" +#include "Interface Panels.h" #include "Sound Control.h" -#include "civ quotes.h" +#include "Civ Quotes.h" #include "Quests.h" #include "Campaign Types.h" #include "Queen Command.h" -#include "points.h" +#include "Points.h" #include "Soldier Functions.h" // added by SANDRO #include "Text.h" // sevenfm #include "english.h" // sevenfm: for ESC key diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp index e0f53ecc..a7a3821a 100644 --- a/TacticalAI/AIUtils.cpp +++ b/TacticalAI/AIUtils.cpp @@ -2,13 +2,13 @@ #include "Weapons.h" #include "opplist.h" #include "Points.h" - #include "PathAI.h" - #include "WorldMan.h" + #include "PATHAI.H" + #include "worldman.h" #include "AIInternals.h" #include "Items.h" #include "message.h" - #include "los.h" - #include "assignments.h" + #include "LOS.h" + #include "Assignments.h" #include "Soldier Functions.h" #include "Points.h" #include "GameSettings.h" @@ -23,7 +23,7 @@ #include "Vehicles.h" // added by silversurfer #include "Game Clock.h" // sevenfm #include "Rotting Corpses.h" // sevenfm - #include "wcheck.h" // sevenfm + #include "WCheck.h" // sevenfm #include "SmokeEffects.h" // sevenfm #include "GameInitOptionsScreen.h" diff --git a/TacticalAI/Attacks.cpp b/TacticalAI/Attacks.cpp index cfea4a61..7e2e6fd9 100644 --- a/TacticalAI/Attacks.cpp +++ b/TacticalAI/Attacks.cpp @@ -3,11 +3,11 @@ #include "opplist.h" #include "AIInternals.h" #include "LOS.h" -#include "Physics.h" +#include "physics.h" #include "Items.h" #include "Weapons.h" -#include "Spread Burst.h" -#include "overhead.h" +#include "Spread burst.h" +#include "Overhead.h" #include "SkillCheck.h" #include "Soldier Profile.h" #include "Isometric Utils.h" diff --git a/TacticalAI/CreatureDecideAction.cpp b/TacticalAI/CreatureDecideAction.cpp index 94fa1e18..ca0f3688 100644 --- a/TacticalAI/CreatureDecideAction.cpp +++ b/TacticalAI/CreatureDecideAction.cpp @@ -1,11 +1,11 @@ #include "types.h" - //#include "soldier control.h" + //#include "Soldier Control.h" #include "ai.h" #include "AIInternals.h" #include "opplist.h" #include "Items.h" #include "Rotting Corpses.h" - #include "soldier add.h" + #include "Soldier Add.h" //forward declarations of common classes to eliminate includes class OBJECTTYPE; diff --git a/TacticalAI/DecideAction.cpp b/TacticalAI/DecideAction.cpp index 624ccb40..5f6216ea 100644 --- a/TacticalAI/DecideAction.cpp +++ b/TacticalAI/DecideAction.cpp @@ -1,32 +1,32 @@ #include "ai.h" #include "AIInternals.h" -#include "Isometric utils.h" +#include "Isometric Utils.h" #include "Points.h" -#include "overhead.h" +#include "Overhead.h" #include "opplist.h" -#include "items.h" +#include "Items.h" #include "Weapons.h" #include "NPC.h" #include "Soldier Functions.h" #include "worldman.h" #include "Scheduling.h" -#include "Message.h" +#include "message.h" #include "Structure Wrap.h" #include "Keys.h" -#include "pathai.h" +#include "PATHAI.H" #include "Render Fun.h" #include "Boxing.h" // #include "Air Raid.h" #include "Soldier Profile.h" #include "soldier profile type.h" #include "Soldier macros.h" -#include "los.h" +#include "LOS.h" #include "Buildings.h" #include "strategicmap.h" #include "Quests.h" #include "Map Screen Interface Map.h" -#include "soldier ani.h" -#include "rotting corpses.h" +#include "Soldier Ani.h" +#include "Rotting Corpses.h" #include "GameSettings.h" #include "Dialogue Control.h" #include "connect.h" diff --git a/TacticalAI/FindLocations.cpp b/TacticalAI/FindLocations.cpp index 3c9ab556..ac2634fc 100644 --- a/TacticalAI/FindLocations.cpp +++ b/TacticalAI/FindLocations.cpp @@ -2,11 +2,11 @@ #include "Isometric Utils.h" #include "ai.h" #include "AIInternals.h" - #include "los.h" + #include "LOS.h" #include "Weapons.h" - #include "Opplist.h" - #include "pathai.h" - #include "items.h" + #include "opplist.h" + #include "PATHAI.H" + #include "Items.h" #include "World Items.h" #include "Points.h" #include "message.h" @@ -26,7 +26,7 @@ #include "Buildings.h" #include "GameSettings.h" #include "Soldier Profile.h" - #include "rotting corpses.h" // sevenfm + #include "Rotting Corpses.h" // sevenfm //////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/TacticalAI/Knowledge.cpp b/TacticalAI/Knowledge.cpp index c6e93a1f..12077332 100644 --- a/TacticalAI/Knowledge.cpp +++ b/TacticalAI/Knowledge.cpp @@ -2,7 +2,7 @@ #include "AIInternals.h" #include "opplist.h" #include "Soldier Profile.h" - #include "los.h" + #include "LOS.h" #include "NPC.h" #include "Quests.h" #include "Render Fun.h" diff --git a/TacticalAI/Medical.cpp b/TacticalAI/Medical.cpp index 41b89672..d54bc0c7 100644 --- a/TacticalAI/Medical.cpp +++ b/TacticalAI/Medical.cpp @@ -4,10 +4,10 @@ #include "ai.h" #include "AIInternals.h" #include "Animation Control.h" - #include "pathai.h" - #include "overhead.h" - #include "items.h" - #include "Message.h" + #include "PATHAI.H" + #include "Overhead.h" + #include "Items.h" + #include "message.h" #include "Buildings.h" #include "worldman.h" #include "Assignments.h" diff --git a/TacticalAI/Movement.cpp b/TacticalAI/Movement.cpp index 5bc4b0a9..a1137120 100644 --- a/TacticalAI/Movement.cpp +++ b/TacticalAI/Movement.cpp @@ -1,10 +1,10 @@ #include "ai.h" #include "AIInternals.h" #include "Isometric Utils.h" - #include "overhead.h" + #include "Overhead.h" #include "worldman.h" - #include "pathai.h" - //#include "points.h" + #include "PATHAI.H" + //#include "Points.h" #include "message.h" #include "Smell.h" #include "mapscreen.h" diff --git a/TacticalAI/NPC.cpp b/TacticalAI/NPC.cpp index 84702a01..eab9cb7a 100644 --- a/TacticalAI/NPC.cpp +++ b/TacticalAI/NPC.cpp @@ -1,28 +1,28 @@ #include "types.h" - #include "wcheck.h" - #include "overhead.h" + #include "WCheck.h" + #include "Overhead.h" #include "ai.h" #include "Soldier Profile.h" #include "NPC.h" #include "Isometric Utils.h" #include "Quests.h" - #include "interface dialogue.h" + #include "interface Dialogue.h" #include "Game Clock.h" #include "FileMan.h" - #include "Random.h" - #include "items.h" - #include "interface.h" + #include "random.h" + #include "Items.h" + #include "Interface.h" #include "Assignments.h" - #include "soldier macros.h" - #include "dialogue control.h" + #include "Soldier macros.h" + #include "Dialogue Control.h" #include "Strategic Town Loyalty.h" #include "message.h" #include "Timer Control.h" #include "Soldier Add.h" - #include "Soldier Tile.h" + #include "soldier tile.h" #include "Weapons.h" - #include "meanwhile.h" + #include "Meanwhile.h" #ifdef JA2TESTVERSION #include "Quest Debug System.h" diff --git a/TacticalAI/PanicButtons.cpp b/TacticalAI/PanicButtons.cpp index 03c54f3f..5aa40f8a 100644 --- a/TacticalAI/PanicButtons.cpp +++ b/TacticalAI/PanicButtons.cpp @@ -1,7 +1,7 @@ #include "AIInternals.h" #include "ai.h" - #include "pathai.h" - #include "items.h" + #include "PATHAI.H" + #include "Items.h" #include "World Items.h" #include "strategicmap.h" #include "Map Screen Interface Map.h" diff --git a/TacticalAI/QuestDebug.cpp b/TacticalAI/QuestDebug.cpp index 046991f3..799e68d2 100644 --- a/TacticalAI/QuestDebug.cpp +++ b/TacticalAI/QuestDebug.cpp @@ -2,8 +2,8 @@ #include "QuestDebug.h" #include "stdarg.h" #include "stdio.h" - #include "Debug.h" - #include "Message.h" + #include "DEBUG.H" + #include "message.h" #define QUEST_DEBUG_FILE "QuestDebug.txt" diff --git a/TacticalAI/Realtime.cpp b/TacticalAI/Realtime.cpp index 0ec6254f..3f18bdc2 100644 --- a/TacticalAI/Realtime.cpp +++ b/TacticalAI/Realtime.cpp @@ -1,12 +1,12 @@ #include "ai.h" #include "AIInternals.h" - #include "Isometric utils.h" - #include "overhead.h" - #include "soldier add.h" - #include "Soldier Profile Type.h" + #include "Isometric Utils.h" + #include "Overhead.h" + #include "Soldier Add.h" + #include "soldier profile type.h" #include "Items.h" #include "Weapons.h" - #include "Soldier Macros.h" + #include "Soldier macros.h" #include "Soldier Profile.h" #include "NPC.h" #include "Render Fun.h" diff --git a/TacticalAI/ZombieDecideAction.cpp b/TacticalAI/ZombieDecideAction.cpp index 16c7f321..a2dd3275 100644 --- a/TacticalAI/ZombieDecideAction.cpp +++ b/TacticalAI/ZombieDecideAction.cpp @@ -1,32 +1,32 @@ #include "ai.h" #include "AIInternals.h" -#include "Isometric utils.h" +#include "Isometric Utils.h" #include "Points.h" -#include "overhead.h" +#include "Overhead.h" #include "opplist.h" -#include "items.h" +#include "Items.h" #include "Weapons.h" #include "NPC.h" #include "Soldier Functions.h" #include "worldman.h" #include "Scheduling.h" -#include "Message.h" +#include "message.h" #include "Structure Wrap.h" #include "Keys.h" -#include "pathai.h" +#include "PATHAI.H" #include "Render Fun.h" #include "Boxing.h" // #include "Air Raid.h" #include "Soldier Profile.h" #include "soldier profile type.h" #include "Soldier macros.h" -#include "los.h" +#include "LOS.h" #include "Buildings.h" #include "strategicmap.h" #include "Quests.h" #include "Map Screen Interface Map.h" -#include "soldier ani.h" -#include "rotting corpses.h" +#include "Soldier Ani.h" +#include "Rotting Corpses.h" #include "GameSettings.h" #include "Dialogue Control.h" #include "connect.h" diff --git a/TileEngine/Ambient Control.cpp b/TileEngine/Ambient Control.cpp index cf42114a..85d559d4 100644 --- a/TileEngine/Ambient Control.cpp +++ b/TileEngine/Ambient Control.cpp @@ -4,13 +4,13 @@ #include "Sound Control.h" #include "Game Events.h" #include "lighting.h" - #include "Random.h" + #include "random.h" // sevenfm #include "SmokeEffects.h" #include "Overhead.h" #include "Strategic Movement.h" #include "Game Clock.h" - #include "strategic mines.h" + #include "Strategic Mines.h" AMBIENTDATA_STRUCT gAmbData[ MAX_AMBIENT_SOUNDS ]; INT16 gsNumAmbData = 0; diff --git a/TileEngine/Ambient Control.h b/TileEngine/Ambient Control.h index 01035d22..90997d51 100644 --- a/TileEngine/Ambient Control.h +++ b/TileEngine/Ambient Control.h @@ -3,7 +3,7 @@ #include "sgp.h" -#include "Ambient types.h" +#include "Ambient Types.h" BOOLEAN LoadAmbientControlFile( UINT8 ubAmbientID ); diff --git a/TileEngine/Buildings.cpp b/TileEngine/Buildings.cpp index dfcaa7c8..feb3264a 100644 --- a/TileEngine/Buildings.cpp +++ b/TileEngine/Buildings.cpp @@ -1,6 +1,6 @@ - #include "Types.h" + #include "types.h" #include "Buildings.h" - #include "Pathai.h" + #include "PATHAI.H" #include "Structure Wrap.h" #include "Render Fun.h" #include "worldman.h" diff --git a/TileEngine/Exit Grids.cpp b/TileEngine/Exit Grids.cpp index 036b48d5..78feb292 100644 --- a/TileEngine/Exit Grids.cpp +++ b/TileEngine/Exit Grids.cpp @@ -1,12 +1,12 @@ - #include "debug.h" + #include "DEBUG.H" #include "worlddef.h" #include "worldman.h" #include "Exit Grids.h" #include "Editor Undo.h" - #include "StrategicMap.h" + #include "strategicmap.h" #include "Strategic Movement.h" #include "message.h" - #include "pathai.h" + #include "PATHAI.H" #include "Animation Control.h" #include "Sys Globals.h" #include "SaveLoadMap.h" diff --git a/TileEngine/Exit Grids.h b/TileEngine/Exit Grids.h index 0b8a4362..4e13524a 100644 --- a/TileEngine/Exit Grids.h +++ b/TileEngine/Exit Grids.h @@ -1,7 +1,7 @@ #ifndef __EXIT_GRIDS_H #define __EXIT_GRIDS_H -#include "Worlddef.h" +#include "worlddef.h" //dnl ch42 250909 typedef struct diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index d1281de3..abd00f0e 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -1,43 +1,43 @@ #include "builddefines.h" -#include "debug.h" -#include "weapons.h" +#include "DEBUG.H" +#include "Weapons.h" #include "worldman.h" -#include "game clock.h" +#include "Game Clock.h" #include "renderworld.h" -#include "explosion control.h" -#include "sound control.h" -#include "structure wrap.h" -#include "interactive tiles.h" +#include "Explosion Control.h" +#include "Sound Control.h" +#include "Structure Wrap.h" +#include "Interactive Tiles.h" #include "SaveLoadMap.h" -#include "Message.h" -#include "Random.h" -#include "smokeeffects.h" -#include "pathai.h" +#include "message.h" +#include "random.h" +#include "SmokeEffects.h" +#include "PATHAI.H" #include "strategic.h" #include "Action Items.h" -#include "Interface Dialogue.h" +#include "interface Dialogue.h" #include "LightEffects.h" -#include "AI.h" -#include "Soldier tile.h" +#include "ai.h" +#include "soldier tile.h" #include "Render Fun.h" -#include "Opplist.h" -#include "smell.h" -#include "end game.h" +#include "opplist.h" +#include "Smell.h" +#include "End Game.h" #include "Buildings.h" #include "fov.h" #include "Map Information.h" #include "Soldier Functions.h"//dnl ch40 200909 #include "Text.h" // added by SANDRO -#include "campaign.h" // yet another one added +#include "Campaign.h" // yet another one added #include "CampaignStats.h" // added by Flugente #include "Points.h" // added by Flugente #include "Interface Control.h" // added by Flugente for DrawExplosionWarning(...) #include "SkillMenu.h" -#include "Soldier Macros.h" +#include "Soldier macros.h" #include "connect.h" -#include "debug control.h" +#include "Debug Control.h" #include "LuaInitNPCs.h" #include "Luaglobal.h" diff --git a/TileEngine/Interactive Tiles.cpp b/TileEngine/Interactive Tiles.cpp index 550df2ae..02741379 100644 --- a/TileEngine/Interactive Tiles.cpp +++ b/TileEngine/Interactive Tiles.cpp @@ -4,13 +4,13 @@ #include "renderworld.h" #include "Sound Control.h" #include "Interactive Tiles.h" - #include "interface cursors.h" + #include "Interface Cursors.h" #include "worldman.h" - #include "points.h" - #include "structure wrap.h" - #include "tile animation.h" - #include "tile cache.h" - #include "handle doors.h" + #include "Points.h" + #include "Structure Wrap.h" + #include "Tile Animation.h" + #include "Tile Cache.h" + #include "Handle Doors.h" #include "Dialogue Control.h" #include "english.h" #include "NPC.h" diff --git a/TileEngine/Isometric Utils.cpp b/TileEngine/Isometric Utils.cpp index 51d8a986..bde2e369 100644 --- a/TileEngine/Isometric Utils.cpp +++ b/TileEngine/Isometric Utils.cpp @@ -1,14 +1,14 @@ - #include "debug.h" + #include "DEBUG.H" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "worldman.h" #include "Structure Wrap.h" - #include "sys globals.h" - #include "overhead.h" - #include "Random.h" - #include "Pathai.h" + #include "Sys Globals.h" + #include "Overhead.h" + #include "random.h" + #include "PATHAI.H" #include "Map Information.h" -#include "meanwhile.h" +#include "Meanwhile.h" #include "strategicmap.h" UINT32 guiForceRefreshMousePositionCalculation = 0; diff --git a/TileEngine/LightEffects.cpp b/TileEngine/LightEffects.cpp index dcbb1574..339d44d2 100644 --- a/TileEngine/LightEffects.cpp +++ b/TileEngine/LightEffects.cpp @@ -1,9 +1,9 @@ #include "builddefines.h" - #include "debug.h" - #include "animation control.h" - #include "lighteffects.h" - #include "isometric utils.h" + #include "DEBUG.H" + #include "Animation Control.h" + #include "LightEffects.h" + #include "Isometric Utils.h" #include "lighting.h" #include "Game Clock.h" #include "opplist.h" diff --git a/TileEngine/Map Edgepoints.cpp b/TileEngine/Map Edgepoints.cpp index 42106638..ef365584 100644 --- a/TileEngine/Map Edgepoints.cpp +++ b/TileEngine/Map Edgepoints.cpp @@ -1,11 +1,11 @@ //#include // added by Flugente #include "Map Edgepoints.h" - #include "pathai.h" + #include "PATHAI.H" #include "ai.h" #include "Map Information.h" - #include "debug.h" - #include "Random.h" + #include "DEBUG.H" + #include "random.h" #include "Animation Control.h" #include "Render Fun.h" #include "strategicmap.h" diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index 12877324..b59f6c67 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -6,8 +6,8 @@ #include "line.h" #include "renderworld.h" #include "lighting.h" - #include "wcheck.h" - #include "render dirty.h" + #include "WCheck.h" + #include "Render Dirty.h" #include "overhead map.h" #include "Squads.h" #include "Text.h" diff --git a/TileEngine/Render Dirty.cpp b/TileEngine/Render Dirty.cpp index 8fb82dad..0b7be536 100644 --- a/TileEngine/Render Dirty.cpp +++ b/TileEngine/Render Dirty.cpp @@ -6,7 +6,7 @@ #include "vobject_blitters.h" #ifdef JA2BETAVERSION -#include "Message.h" +#include "message.h" #endif // Forward Declarations diff --git a/TileEngine/Render Fun.cpp b/TileEngine/Render Fun.cpp index e2ecd20c..b265f8ed 100644 --- a/TileEngine/Render Fun.cpp +++ b/TileEngine/Render Fun.cpp @@ -1,13 +1,13 @@ #include "Render Fun.h" #include "sysutil.h" - #include "debug.h" + #include "DEBUG.H" #include "worldman.h" #include "Isometric Utils.h" #include "renderworld.h" #include "fov.h" #include "Fog Of War.h" - #include "dialogue control.h" - #include "Random.h" + #include "Dialogue Control.h" + #include "random.h" // Room Information //UINT8 gubWorldRoomInfo[ WORLD_MAX ]; diff --git a/TileEngine/SaveLoadMap.cpp b/TileEngine/SaveLoadMap.cpp index 3ca80d74..0a26d77b 100644 --- a/TileEngine/SaveLoadMap.cpp +++ b/TileEngine/SaveLoadMap.cpp @@ -1,18 +1,18 @@ - #include "Types.h" + #include "types.h" #include "SaveLoadMap.h" - #include "OverHead.h" + #include "Overhead.h" #include "FileMan.h" #include "Tactical Save.h" - #include "Debug.h" - #include "WorldMan.h" - #include "StrategicMap.h" + #include "DEBUG.H" + #include "worldman.h" + #include "strategicmap.h" #include "Campaign Types.h" - #include "RenderWorld.h" + #include "renderworld.h" #include "Render Fun.h" #include "fov.h" - #include "WorldDef.h" + #include "worlddef.h" #include "Exit Grids.h" - #include "Message.h" + #include "message.h" #include "GameSettings.h" #include "Smell.h" diff --git a/TileEngine/SaveLoadMap.h b/TileEngine/SaveLoadMap.h index ff48d158..9e019c27 100644 --- a/TileEngine/SaveLoadMap.h +++ b/TileEngine/SaveLoadMap.h @@ -1,7 +1,7 @@ #ifndef _SAVELOADMAP__H_ #define _SAVELOADMAP__H_ -#include "WorldDef.h" +#include "worlddef.h" #include "Exit Grids.h" //Used for the ubType in the MODIFY_MAP struct diff --git a/TileEngine/Shade Table Util.cpp b/TileEngine/Shade Table Util.cpp index b2345f4f..6827c3c7 100644 --- a/TileEngine/Shade Table Util.cpp +++ b/TileEngine/Shade Table Util.cpp @@ -6,7 +6,7 @@ #include "Shade Table Util.h" #include "video.h" #include "WorldDat.h" - #include "Fileman.h" + #include "FileMan.h" #include diff --git a/TileEngine/Smell.cpp b/TileEngine/Smell.cpp index 45f75140..2d7d7621 100644 --- a/TileEngine/Smell.cpp +++ b/TileEngine/Smell.cpp @@ -1,16 +1,16 @@ #include "worlddef.h" - #include "Random.h" + #include "random.h" #include "Smell.h" #include "worldman.h" #include "renderworld.h" #include "SaveLoadMap.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "message.h" - #include "Isometric utils.h" + #include "Isometric Utils.h" #include "Map Information.h" #include "Game Clock.h" #include "Overhead.h" - #include "debug control.h" + #include "Debug Control.h" /* * Smell & Blood system diff --git a/TileEngine/Smell.h b/TileEngine/Smell.h index c4bbfb34..1e16571e 100644 --- a/TileEngine/Smell.h +++ b/TileEngine/Smell.h @@ -1,4 +1,4 @@ -#include "soldier control.h" +#include "Soldier Control.h" #define HUMAN 0 #define CREATURE_ON_FLOOR 0x01 diff --git a/TileEngine/SmokeEffects.cpp b/TileEngine/SmokeEffects.cpp index 4e202318..2f3de897 100644 --- a/TileEngine/SmokeEffects.cpp +++ b/TileEngine/SmokeEffects.cpp @@ -3,20 +3,20 @@ #include #include #include "stdlib.h" - #include "debug.h" - #include "weapons.h" + #include "DEBUG.H" + #include "Weapons.h" #include "handle items.h" #include "worlddef.h" #include "worldman.h" - #include "animation control.h" - #include "tile animation.h" + #include "Animation Control.h" + #include "Tile Animation.h" #include "handle items.h" - #include "smokeeffects.h" + #include "SmokeEffects.h" #include "message.h" - #include "isometric utils.h" + #include "Isometric Utils.h" #include "renderworld.h" - #include "explosion control.h" - #include "Random.h" + #include "Explosion Control.h" + #include "random.h" #include "Game Clock.h" #include "opplist.h" #include "Campaign Types.h" @@ -27,7 +27,7 @@ #include "Render Fun.h" #include "SaveLoadGame.h" -#include "debug control.h" +#include "Debug Control.h" #include "connect.h" diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp index 7b6c1daa..d4c85236 100644 --- a/TileEngine/Tactical Placement GUI.cpp +++ b/TileEngine/Tactical Placement GUI.cpp @@ -4,17 +4,17 @@ //sgp #include "english.h" - #include "debug.h" + #include "DEBUG.H" #include "video.h" #include "vobject_blitters.h" #include "line.h" //ja2 #include "Tactical Placement GUI.h" - #include "Overhead Map.h" + #include "overhead map.h" #include "strategicmap.h" #include "Interface.h" - #include "overhead.h" + #include "Overhead.h" #include "Render Dirty.h" #include "sysutil.h" #include "PreBattle Interface.h" @@ -24,10 +24,10 @@ #include "message.h" #include "Map Information.h" #include "Soldier Add.h" - #include "cursors.h" + #include "Cursors.h" #include "Cursor Control.h" #include "MessageBoxScreen.h" - #include "text.h" + #include "Text.h" #include "WordWrap.h" #include "Game Clock.h" #include "Isometric Utils.h" diff --git a/TileEngine/Tile Animation.cpp b/TileEngine/Tile Animation.cpp index 266bd856..339c7770 100644 --- a/TileEngine/Tile Animation.cpp +++ b/TileEngine/Tile Animation.cpp @@ -1,16 +1,16 @@ #include "worlddef.h" -#include "tile animation.h" -#include "debug.h" +#include "Tile Animation.h" +#include "DEBUG.H" #include "worldman.h" #include "lighting.h" #include "renderworld.h" -#include "overhead.h" +#include "Overhead.h" #include "ai.h" #include "Sound Control.h" -#include "tile cache.h" -#include "explosion control.h" +#include "Tile Cache.h" +#include "Explosion Control.h" #include "Keys.h" -#include "bullets.h" +#include "Bullets.h" #include "LightEffects.h" #include "SmokeEffects.h" diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index ae94e395..ee8f4dd5 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -1,11 +1,11 @@ #include "builddefines.h" - #include "debug.h" + #include "DEBUG.H" #include "Debug Control.h" - #include "tile surface.h" - #include "tile cache.h" + #include "Tile Surface.h" + #include "Tile Cache.h" #ifdef JA2TESTVERSION - #include "sys globals.h" + #include "Sys Globals.h" #endif UINT32 guiNumTileCacheStructs = 0; diff --git a/TileEngine/Tile Surface.cpp b/TileEngine/Tile Surface.cpp index 9f14fcec..4cbb2062 100644 --- a/TileEngine/Tile Surface.cpp +++ b/TileEngine/Tile Surface.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" - #include "debug.h" - #include "sys globals.h" + #include "DEBUG.H" + #include "Sys Globals.h" #include "XML.h" diff --git a/TileEngine/WorldDat.cpp b/TileEngine/WorldDat.cpp index 92b1b204..e1290a2d 100644 --- a/TileEngine/WorldDat.cpp +++ b/TileEngine/WorldDat.cpp @@ -1,9 +1,9 @@ #include "builddefines.h" - #include "worlddat.h" - #include "sys globals.h" - #include "tile surface.h" - #include "Debug.h" + #include "WorldDat.h" + #include "Sys Globals.h" + #include "Tile Surface.h" + #include "DEBUG.H" #include #include diff --git a/TileEngine/WorldDat.h b/TileEngine/WorldDat.h index 5d020aa2..dfb0ed7c 100644 --- a/TileEngine/WorldDat.h +++ b/TileEngine/WorldDat.h @@ -2,7 +2,7 @@ #define WORLD_DAT_H #include "types.h" -#include "tiledat.h" +#include "TileDat.h" #include "World Tileset Enums.h" typedef void (*TILESET_CALLBACK)( void ); diff --git a/TileEngine/XML_ExplosionData.cpp b/TileEngine/XML_ExplosionData.cpp index 5d3218df..d0203215 100644 --- a/TileEngine/XML_ExplosionData.cpp +++ b/TileEngine/XML_ExplosionData.cpp @@ -3,8 +3,8 @@ #include #include - #include "explosion control.h" - #include "Debug.h" + #include "Explosion Control.h" + #include "DEBUG.H" #include "FileMan.h" #include "Debug Control.h" diff --git a/TileEngine/environment.cpp b/TileEngine/environment.cpp index ad04fdc9..a4cb9540 100644 --- a/TileEngine/environment.cpp +++ b/TileEngine/environment.cpp @@ -2,13 +2,13 @@ #include "environment.h" #include "renderworld.h" #include "Sound Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Game Clock.h" #include "Ambient Control.h" #include "Game Events.h" #include "message.h" #include "opplist.h" - #include "Random.h" + #include "random.h" #include "Points.h" // added by Flugente #include "Campaign.h" // added by Flugente #include "Isometric Utils.h" // added by Flugente diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp index f7652598..edb1b6c5 100644 --- a/TileEngine/lighting.cpp +++ b/TileEngine/lighting.cpp @@ -19,14 +19,14 @@ #include "worlddef.h" #include "renderworld.h" #include "sysutil.h" - #include "debug.h" - #include "wcheck.h" + #include "DEBUG.H" + #include "WCheck.h" #include "Animation Control.h" #include "Sys Globals.h" #include "lighting.h" - #include "structure wrap.h" + #include "Structure Wrap.h" #include "Shade Table Util.h" - #include "rotting corpses.h" + #include "Rotting Corpses.h" #include "PATHAI.H" #define LVL1_L1_PER (50) diff --git a/TileEngine/overhead map.cpp b/TileEngine/overhead map.cpp index b2f7e8e7..58ca53fc 100644 --- a/TileEngine/overhead map.cpp +++ b/TileEngine/overhead map.cpp @@ -1,21 +1,21 @@ #include "builddefines.h" #include "sysutil.h" - #include "utilities.h" + #include "Utilities.h" #include "renderworld.h" #include "vobject_blitters.h" #include "overhead map.h" - #include "interface control.h" - #include "overhead.h" - #include "radar screen.h" - #include "cursors.h" + #include "Interface Control.h" + #include "Overhead.h" + #include "Radar Screen.h" + #include "Cursors.h" #include "Sys Globals.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "Game Clock.h" - #include "interface panels.h" + #include "Interface Panels.h" #include "english.h" #include "line.h" - #include "map information.h" + #include "Map Information.h" #include "Tactical Placement GUI.h" #include "Interactive Tiles.h" #include "gameloop.h" diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp index 138e4b09..3d0c699a 100644 --- a/TileEngine/physics.cpp +++ b/TileEngine/physics.cpp @@ -1,20 +1,20 @@ #include "builddefines.h" #include "physics.h" - #include "wcheck.h" - #include "isometric utils.h" + #include "WCheck.h" + #include "Isometric Utils.h" #include "worldman.h" #include "Sound Control.h" - #include "interface.h" - #include "interface items.h" - #include "explosion control.h" + #include "Interface.h" + #include "Interface Items.h" + #include "Explosion Control.h" #include "Debug Control.h" #include "message.h" - #include "structure wrap.h" - #include "animation control.h" - #include "text.h" - #include "Random.h" - #include "lighteffects.h" + #include "Structure Wrap.h" + #include "Animation Control.h" + #include "Text.h" + #include "random.h" + #include "LightEffects.h" #include "opplist.h" #include "Buildings.h" #include "Dialogue Control.h" // added by Flugente diff --git a/TileEngine/pits.cpp b/TileEngine/pits.cpp index 59478dc6..9ce43311 100644 --- a/TileEngine/pits.cpp +++ b/TileEngine/pits.cpp @@ -8,7 +8,7 @@ #include "strategicmap.h" #include "Isometric Utils.h" #include "Sound Control.h" - #include "animation control.h" + #include "Animation Control.h" #include "strategic.h" #include "Action Items.h" diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index ce88dc76..3655e409 100644 --- a/TileEngine/renderworld.cpp +++ b/TileEngine/renderworld.cpp @@ -7,17 +7,17 @@ #include "renderworld.h" #include "sysutil.h" #include "vobject_blitters.h" - #include "debug.h" - #include "wcheck.h" + #include "DEBUG.H" + #include "WCheck.h" #include "worldman.h" #include "Radar Screen.h" #include "Render Dirty.h" #include "ai.h" - #include "render fun.h" - #include "interactive tiles.h" - #include "tile cache.h" - #include "English.h" - #include "interface control.h" + #include "Render Fun.h" + #include "Interactive Tiles.h" + #include "Tile Cache.h" + #include "english.h" + #include "Interface Control.h" #include "Sound Control.h" #include "LogicalBodyTypes/Layers.h" #include "LogicalBodyTypes/BodyTypeDB.h" diff --git a/TileEngine/structure.cpp b/TileEngine/structure.cpp index 296d0859..445e5ec3 100644 --- a/TileEngine/structure.cpp +++ b/TileEngine/structure.cpp @@ -1,7 +1,7 @@ #include #include "types.h" - #include "wcheck.h" - #include "debug.h" + #include "WCheck.h" + #include "DEBUG.H" #include "FileMan.h" #include "MemMan.h" #include "structure.h" @@ -9,12 +9,12 @@ #include "worlddef.h" #include "worldman.h" - #include "interface.h" + #include "Interface.h" - #include "isometric utils.h" - #include "font.h" - #include "font control.h" - #include "los.h" + #include "Isometric Utils.h" + #include "Font.h" + #include "Font Control.h" + #include "LOS.h" #include "lighting.h" #include "Smell.h" @@ -29,12 +29,12 @@ #include "Editor Undo.h" //for access to AddToUndoList( iMapIndex ) #endif - #include "explosion control.h" + #include "Explosion Control.h" #include "Sound Control.h" #include "Buildings.h" - #include "Random.h" + #include "random.h" #include "Tile Animation.h" #include "Explosion Control.h" // added by Flugente diff --git a/TileEngine/structure.h b/TileEngine/structure.h index a5bf6bd5..69148ab9 100644 --- a/TileEngine/structure.h +++ b/TileEngine/structure.h @@ -3,7 +3,7 @@ #include "Structure Internals.h" #include "tiledef.h" -#include "overhead types.h" +#include "Overhead Types.h" #define NOTHING_BLOCKING 0 #define BLOCKING_REDUCE_RANGE 1 diff --git a/TileEngine/sysutil.cpp b/TileEngine/sysutil.cpp index e3090125..d49c8916 100644 --- a/TileEngine/sysutil.cpp +++ b/TileEngine/sysutil.cpp @@ -1,5 +1,5 @@ #include "sgp.h" - #include "wcheck.h" + #include "WCheck.h" #include "sysutil.h" UINT32 guiBOTTOMPANEL = 0; diff --git a/TileEngine/sysutil.h b/TileEngine/sysutil.h index 5b460d63..eeaba608 100644 --- a/TileEngine/sysutil.h +++ b/TileEngine/sysutil.h @@ -1,9 +1,9 @@ #ifndef __SYSTEM_UTILS #define __SYSTEM_UTILS -#include "font.h" +#include "Font.h" #include "Isometric Utils.h" -#include "interface.h" +#include "Interface.h" // Global variables for video objects extern UINT32 guiBOTTOMPANEL; diff --git a/TileEngine/tiledef.cpp b/TileEngine/tiledef.cpp index 26ca0d4c..1820cb03 100644 --- a/TileEngine/tiledef.cpp +++ b/TileEngine/tiledef.cpp @@ -1,11 +1,11 @@ #include "tiledef.h" #include "worlddef.h" - #include "wcheck.h" - #include "debug.h" + #include "WCheck.h" + #include "DEBUG.H" #include "worldman.h" #include "edit_sys.h" - #include "pathai.h" - #include "tile surface.h" + #include "PATHAI.H" + #include "Tile Surface.h" #include "Tactical Save.h" //#include "editscreen.h" diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index a1fc4b44..36c85844 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -1,26 +1,26 @@ #include "builddefines.h" #include "worlddef.h" - #include "worlddat.h" - #include "wcheck.h" - #include "debug.h" + #include "WorldDat.h" + #include "WCheck.h" + #include "DEBUG.H" #include "worldman.h" - #include "sys globals.h" + #include "Sys Globals.h" #include "Render Fun.h" #include "lighting.h" #include "Interactive Tiles.h" - #include "utilities.h" - #include "overhead.h" + #include "Utilities.h" + #include "Overhead.h" #include "opplist.h" #include "renderworld.h" #include "Radar Screen.h" #include "Exit Grids.h" - #include "tile surface.h" - #include "rotting corpses.h" + #include "Tile Surface.h" + #include "Rotting Corpses.h" #include "Keys.h" #include "Map Information.h" #include "Animated ProgressBar.h" - #include "pathai.h" + #include "PATHAI.H" #include "EditorBuildings.h" #include "Map Edgepoints.h" #include "Shade Table Util.h" @@ -34,13 +34,13 @@ #include "overhead map.h" #include "SmokeEffects.h" #include "LightEffects.h" - #include "meanwhile.h" + #include "Meanwhile.h" #include "LoadScreen.h"//dnl ch30 150909 #include "Interface Cursors.h" #include "Simple Render Utils.h"//dnl ch54 111009 #include "Interface.h" ///ddd - #include "gamesettings.h" + #include "GameSettings.h" #include "editscreen.h" #include "Editor Taskbar Utils.h" diff --git a/TileEngine/worldman.cpp b/TileEngine/worldman.cpp index 6f869e30..ca2c44b4 100644 --- a/TileEngine/worldman.cpp +++ b/TileEngine/worldman.cpp @@ -1,13 +1,13 @@ #include "worlddef.h" #include "worldman.h" - #include "wcheck.h" - #include "debug.h" + #include "WCheck.h" + #include "DEBUG.H" #include "lighting.h" #include "renderworld.h" #include "ai.h" - #include "animation control.h" + #include "Animation Control.h" #include "message.h" - #include "tile cache.h" + #include "Tile Cache.h" #include "SaveLoadMap.h" #include "random.h" // sevenfm diff --git a/Utils/Animated ProgressBar.cpp b/Utils/Animated ProgressBar.cpp index 5cdfa0ab..97de4a38 100644 --- a/Utils/Animated ProgressBar.cpp +++ b/Utils/Animated ProgressBar.cpp @@ -1,18 +1,18 @@ #include "types.h" #include "Animated ProgressBar.h" #include "MemMan.h" - #include "debug.h" + #include "DEBUG.H" #include "Font Control.h" #include "vsurface.h" #include "video.h" #include "Render Dirty.h" - #include "music control.h" + #include "Music Control.h" #include "Timer Control.h" #include "sysutil.h" #include "random.h" #include "math.h" #include "WordWrap.h" - #include "Message.h" + #include "message.h" #include "Text.h" #include "Loading Screen.h" diff --git a/Utils/Cinematics Bink.cpp b/Utils/Cinematics Bink.cpp index 4393c13b..a6eecf20 100644 --- a/Utils/Cinematics Bink.cpp +++ b/Utils/Cinematics Bink.cpp @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" #include #include #include @@ -8,15 +8,15 @@ #include #include -#include "Debug.h" +#include "DEBUG.H" #include "FileMan.h" -#include "smack.h" -#include "DDraw.h" -#include "mss.h" +#include "SMACK.H" +#include "ddraw.h" +#include "Mss.h" #include "DirectX Common.h" #include "DirectDraw Calls.h" -#include "SoundMan.h" -#include "Video.h" +#include "soundman.h" +#include "video.h" #include "Cinematics Bink.h" diff --git a/Utils/Cinematics.cpp b/Utils/Cinematics.cpp index 5e810cbd..579152bf 100644 --- a/Utils/Cinematics.cpp +++ b/Utils/Cinematics.cpp @@ -11,7 +11,7 @@ //---------------------------------------------------------------------------------- //#include "LocalCodeAll.h" -#include "Types.h" +#include "types.h" #include #include #include @@ -23,7 +23,7 @@ #include "DEBUG.H" #include "FileMan.h" -#include "smack.h" +#include "SMACK.H" #include "ddraw.h" #include "DirectX Common.h" #include "DirectDraw Calls.h" diff --git a/Utils/Cinematics.h b/Utils/Cinematics.h index 52be5601..5aebbfbd 100644 --- a/Utils/Cinematics.h +++ b/Utils/Cinematics.h @@ -1,7 +1,7 @@ #ifndef _CINEMATICS_H_ #define _CINEMATICS_H_ -#include "smack.h" +#include "SMACK.H" struct SMKFLIC { diff --git a/Utils/Cursors.cpp b/Utils/Cursors.cpp index 2338d366..e6639e96 100644 --- a/Utils/Cursors.cpp +++ b/Utils/Cursors.cpp @@ -1,15 +1,15 @@ #include "builddefines.h" #include #include "sgp.h" - #include "cursors.h" + #include "Cursors.h" #include "Timer Control.h" #include "jascreens.h" - #include "font.h" + #include "Font.h" #include "Font Control.h" #include "Sys Globals.h" #include "Handle UI.h" - #include "interface.h" - #include "overhead.h" + #include "Interface.h" + #include "Overhead.h" #include "Cursor Control.h" #include "Sound Control.h" // HEADROCK HAM B2.6: included this here to allow toggling the CTH bars. diff --git a/Utils/Encrypted File.cpp b/Utils/Encrypted File.cpp index 20fba544..edeeade0 100644 --- a/Utils/Encrypted File.cpp +++ b/Utils/Encrypted File.cpp @@ -1,9 +1,9 @@ #include "Encrypted File.h" #include "FileMan.h" - #include "Debug.h" + #include "DEBUG.H" // anv: for selecting random line -#include "Random.h" +#include "random.h" // anv: loading random line from the file BOOLEAN LoadEncryptedDataFromFileRandomLine(STR pFileName, STR16 pDestString, UINT32 uiSeekAmount) diff --git a/Utils/Event Pump.cpp b/Utils/Event Pump.cpp index 74576ef5..f955a9d6 100644 --- a/Utils/Event Pump.cpp +++ b/Utils/Event Pump.cpp @@ -1,12 +1,12 @@ #include #include #include "sgp.h" -#include "wcheck.h" +#include "WCheck.h" #include "Event Pump.h" #include "Timer.h" #include "Sound Control.h" #include "Overhead.h" -#include "weapons.h" +#include "Weapons.h" #include "Animation Control.h" #include "opplist.h" #include "Tactical Save.h" diff --git a/Utils/Font Control.cpp b/Utils/Font Control.cpp index efb10ba5..5c652b23 100644 --- a/Utils/Font Control.cpp +++ b/Utils/Font Control.cpp @@ -3,7 +3,7 @@ #include "sgp.h" #include "himage.h" #include "vsurface.h" - #include "wcheck.h" + #include "WCheck.h" #include "Font Control.h" #include diff --git a/Utils/Font Control.h b/Utils/Font Control.h index db5856cd..45ff67f4 100644 --- a/Utils/Font Control.h +++ b/Utils/Font Control.h @@ -2,7 +2,7 @@ #define __FONT_CONTROL_H #include "builddefines.h" -#include "font.h" +#include "Font.h" extern BOOLEAN gfUseWinFonts; extern INT32 giCurWinFont; diff --git a/Utils/INIReader.cpp b/Utils/INIReader.cpp index d238ddb0..284ec7aa 100644 --- a/Utils/INIReader.cpp +++ b/Utils/INIReader.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" -#include "IniReader.h" +#include "INIReader.h" #include "FileMan.h" -#include "debug.h" +#include "DEBUG.H" #include "Font Control.h" #include "message.h" #include diff --git a/Utils/INIReader.h b/Utils/INIReader.h index 11595a1e..1454d8b9 100644 --- a/Utils/INIReader.h +++ b/Utils/INIReader.h @@ -2,8 +2,8 @@ #define INIREADER_H #define NOMINMAX #include -#include -#include +#include +#include #include #include diff --git a/Utils/KeyMap.cpp b/Utils/KeyMap.cpp index 5f040276..a116c9e3 100644 --- a/Utils/KeyMap.cpp +++ b/Utils/KeyMap.cpp @@ -1,6 +1,6 @@ #include "KeyMap.h" #include -#include "text.h" +#include "Text.h" static Str8EnumLookupType gKeyTable[] = { diff --git a/Utils/KeyMap.h b/Utils/KeyMap.h index 9b9a6d7e..6aac83d2 100644 --- a/Utils/KeyMap.h +++ b/Utils/KeyMap.h @@ -1,4 +1,4 @@ -#include +#include extern int ParseKeyString(const STR value); extern BOOLEAN IsKeyPressed(int value); diff --git a/Utils/MapUtility.cpp b/Utils/MapUtility.cpp index baf030a8..84259a8f 100644 --- a/Utils/MapUtility.cpp +++ b/Utils/MapUtility.cpp @@ -2,21 +2,21 @@ #ifdef JA2EDITOR #include "Screens.h" -#include "Maputility.h" +#include "maputility.h" #include "worlddef.h" -#include "overhead.h" -#include "fileman.h" -#include "loadscreen.h" +#include "Overhead.h" +#include "FileMan.h" +#include "LoadScreen.h" #include "overhead map.h" -#include "radar screen.h" +#include "Radar Screen.h" #include "vobject_blitters.h" -#include "sticonvert.h" -#include "font control.h" -#include "worlddat.h" +#include "STIConvert.h" +#include "Font Control.h" +#include "WorldDat.h" #include "english.h" -#include "map information.h" +#include "Map Information.h" #include "line.h" -#include "quantize wrap.h" +#include "Quantize Wrap.h" //dnl ch77 131113 #include "Editor Taskbar Utils.h" #include "Text Input.h" diff --git a/Utils/MercTextBox.cpp b/Utils/MercTextBox.cpp index 39537615..e8dda94e 100644 --- a/Utils/MercTextBox.cpp +++ b/Utils/MercTextBox.cpp @@ -5,7 +5,7 @@ #include "Utilities.h" #include "WordWrap.h" #include "vobject_blitters.h" - #include "Message.h" + #include "message.h" #define TEXT_POPUP_WINDOW_TEXT_OFFSET_X 8 diff --git a/Utils/MercTextBox.h b/Utils/MercTextBox.h index 72bf1808..8ed90859 100644 --- a/Utils/MercTextBox.h +++ b/Utils/MercTextBox.h @@ -1,7 +1,7 @@ #ifndef __MERCTEXTBOX_H_ #define __MERCTEXTBOX_H_ -#include "Types.h" +#include "types.h" #define MERC_POPUP_PREPARE_FLAGS_TRANS_BACK 0x00000001 diff --git a/Utils/Multilingual Text Code Generator.cpp b/Utils/Multilingual Text Code Generator.cpp index 2bdfcb2a..c3eb26d3 100644 --- a/Utils/Multilingual Text Code Generator.cpp +++ b/Utils/Multilingual Text Code Generator.cpp @@ -32,8 +32,8 @@ CREATED: Feb 16, 1999 #include "builddefines.h" #include #include "types.h" -#include "debug.h" -#include "Fileman.h" +#include "DEBUG.H" +#include "FileMan.h" //Currently in JA2's _EnglishText, these tokens make up all of the //format specifiers that are actually used. Feel free to add more, diff --git a/Utils/Music Control.cpp b/Utils/Music Control.cpp index 1030cd3d..335300fc 100644 --- a/Utils/Music Control.cpp +++ b/Utils/Music Control.cpp @@ -1,10 +1,10 @@ #include "types.h" #include "Music Control.h" #include "soundman.h" - #include "Random.h" + #include "random.h" #include "jascreens.h" - #include "overhead.h" - #include "timer control.h" + #include "Overhead.h" + #include "Timer Control.h" #include "strategicmap.h" #include "Overhead Types.h" diff --git a/Utils/STIConvert.cpp b/Utils/STIConvert.cpp index 09018200..caf3b0c9 100644 --- a/Utils/STIConvert.cpp +++ b/Utils/STIConvert.cpp @@ -3,14 +3,14 @@ #include #include #include "types.h" - #include "compression.h" - #include "debug.h" - #include "fileman.h" + #include "Compression.h" + #include "DEBUG.H" + #include "FileMan.h" #include "imgfmt.h" #include "himage.h" #include "pcx.h" #include "impTGA.h" - #include "wcheck.h" + #include "WCheck.h" //CONVERT_TO_16_BIT BOOLEAN ConvertToETRLE( UINT8 ** ppDest, UINT32 * puiDestLen, UINT8 ** ppSubImageBuffer, UINT16 * pusNumberOfSubImages, UINT8 * p8BPPBuffer, UINT16 usWidth, UINT16 usHeight, UINT32 fFlags ); diff --git a/Utils/Slider.cpp b/Utils/Slider.cpp index 5b7383b8..be3f0702 100644 --- a/Utils/Slider.cpp +++ b/Utils/Slider.cpp @@ -1,11 +1,11 @@ - #include "Types.h" + #include "types.h" #include "WordWrap.h" #include "Render Dirty.h" #include "Utilities.h" #include "WCheck.h" #include "Slider.h" - #include "SysUtil.h" - #include "Line.h" + #include "sysutil.h" + #include "line.h" diff --git a/Utils/Sound Control.cpp b/Utils/Sound Control.cpp index 3c8472f8..83ac23e1 100644 --- a/Utils/Sound Control.cpp +++ b/Utils/Sound Control.cpp @@ -3,8 +3,8 @@ #include "sgp.h" #include "Sound Control.h" #include "soundman.h" - #include "overhead.h" - #include "isometric utils.h" + #include "Overhead.h" + #include "Isometric Utils.h" #include "renderworld.h" #include "GameSettings.h" #include "math.h" diff --git a/Utils/Text Input.cpp b/Utils/Text Input.cpp index 7f403388..75aff20e 100644 --- a/Utils/Text Input.cpp +++ b/Utils/Text Input.cpp @@ -4,12 +4,12 @@ #include #include #include "input.h" - #include "font.h" + #include "Font.h" #include "english.h" #include "vsurface.h" #include "video.h" - #include "debug.h" - #include "cursors.h" + #include "DEBUG.H" + #include "Cursors.h" #include "Text Input.h" #include "Timer Control.h" #include "vobject_blitters.h" diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp index 757a20c7..5ae5ac51 100644 --- a/Utils/Text Utils.cpp +++ b/Utils/Text Utils.cpp @@ -1,5 +1,5 @@ - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "GameSettings.h" // sevenfm #include diff --git a/Utils/Timer Control.cpp b/Utils/Timer Control.cpp index ae6ee36c..c38ad656 100644 --- a/Utils/Timer Control.cpp +++ b/Utils/Timer Control.cpp @@ -2,14 +2,14 @@ #include #include #include "stdlib.h" - #include "debug.h" + #include "DEBUG.H" #include "Timer Control.h" - #include "overhead.h" + #include "Overhead.h" #include "handle items.h" #include "worlddef.h" #include "renderworld.h" - #include "interface control.h" - #include "keymap.h" + #include "Interface Control.h" + #include "KeyMap.h" #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/Utils/Utilities.cpp b/Utils/Utilities.cpp index f8ed4476..9e04efc6 100644 --- a/Utils/Utilities.cpp +++ b/Utils/Utilities.cpp @@ -1,16 +1,16 @@ #include "types.h" #include - #include + #include #include "sgp.h" #include "time.h" #include "vobject.h" #include "FileMan.h" #include "Utilities.h" #include "Font Control.h" - #include "overhead.h" - #include "overhead types.h" - #include "wcheck.h" - #include "sys globals.h" + #include "Overhead.h" + #include "Overhead Types.h" + #include "WCheck.h" + #include "Sys Globals.h" extern BOOLEAN GetCDromDriveLetter( STR8 pString ); diff --git a/Utils/Utilities.h b/Utils/Utilities.h index d0d5dda0..933e84b2 100644 --- a/Utils/Utilities.h +++ b/Utils/Utilities.h @@ -1,7 +1,7 @@ #ifndef _UTILITIES_H_ #define _UTILITIES_H_ -#include "Overhead types.h" +#include "Overhead Types.h" #include "sgp.h" diff --git a/Utils/Utils All.h b/Utils/Utils All.h index 3b6750c6..ba28efd7 100644 --- a/Utils/Utils All.h +++ b/Utils/Utils All.h @@ -6,22 +6,22 @@ #include "types.h" #include "Animated ProgressBar.h" #include "MemMan.h" -#include "debug.h" +#include "DEBUG.H" #include "Font Control.h" #include "vsurface.h" #include "video.h" #include "Render Dirty.h" -#include "music control.h" +#include "Music Control.h" #include #include "sgp.h" -#include "cursors.h" +#include "Cursors.h" #include "Timer Control.h" #include "jascreens.h" -#include "font.h" +#include "Font.h" #include "Sys Globals.h" #include "Handle UI.h" -#include "interface.h" -#include "overhead.h" +#include "Interface.h" +#include "Overhead.h" #include "Cursor Control.h" #include "Debug Control.h" #include "stdio.h" @@ -30,64 +30,64 @@ #include #include #include -#include "wcheck.h" +#include "WCheck.h" #include "Event Manager.h" #include "Event Pump.h" #include "Timer.h" #include "Soldier Control.h" #include "Sound Control.h" -#include "weapons.h" +#include "Weapons.h" #include "Animation Control.h" #include "opplist.h" #include "himage.h" #include "vsurface_private.h" -#include "text.h" +#include "Text.h" #include "Screens.h" -#include "Maputility.h" +#include "maputility.h" #include "worlddef.h" -#include "loadscreen.h" +#include "LoadScreen.h" #include "overhead map.h" -#include "radar screen.h" +#include "Radar Screen.h" #include "vobject_blitters.h" -#include "sticonvert.h" -#include "worlddat.h" +#include "STIConvert.h" +#include "WorldDat.h" #include "english.h" -#include "map information.h" +#include "Map Information.h" #include "line.h" #include "MercTextBox.h" #include "renderworld.h" #include "Utilities.h" #include "WordWrap.h" -#include "Message.h" +#include "message.h" #include #include "mbstring.h" #include "local.h" #include "Map Screen Interface Bottom.h" -#include "Soundman.h" -#include "BuildDefines.h" +#include "soundman.h" +#include "builddefines.h" #include "Dialogue Control.h" #include "Multi Language Graphic Utils.h" -#include "Random.h" +#include "random.h" #include "gamescreen.h" #include "Creature Spreading.h" #include "strategicmap.h" -#include "fade screen.h" +#include "Fade Screen.h" #include "PopUpBox.h" #include "sysutil.h" #include "phys math.h" -#include "Types.h" +#include "types.h" #include "WordWrap.h" #include "Render Dirty.h" #include "Utilities.h" #include "Cursors.h" #include "WCheck.h" #include "Slider.h" -#include "SysUtil.h" -#include "Line.h" -#include "isometric utils.h" +#include "sysutil.h" +#include "line.h" +#include "Isometric Utils.h" #include #include -#include "compression.h" +#include "Compression.h" #include "imgfmt.h" #include "pcx.h" #include "impTGA.h" @@ -98,8 +98,8 @@ #include "handle items.h" #include "time.h" #include "vobject.h" -#include "overhead types.h" -#include "tactical save.h" +#include "Overhead Types.h" +#include "Tactical Save.h" #include "KeyMap.h" //#include diff --git a/Utils/Win Util.cpp b/Utils/Win Util.cpp index 78f6df82..65d8f7b7 100644 --- a/Utils/Win Util.cpp +++ b/Utils/Win Util.cpp @@ -4,7 +4,7 @@ #include #include #include "dsutil.h" -#include "debug.h" +#include "DEBUG.H" #include "sgp.h" diff --git a/Utils/WordWrap.cpp b/Utils/WordWrap.cpp index b0e8e432..bd750d0d 100644 --- a/Utils/WordWrap.cpp +++ b/Utils/WordWrap.cpp @@ -2,7 +2,7 @@ #include "sgp.h" #include "Render Dirty.h" #include "Font Control.h" - #include "Stdio.h" + #include "stdio.h" #include "WinFont.h" #include diff --git a/Utils/XMLAccess.cpp b/Utils/XMLAccess.cpp index 44d44484..6d9ce690 100644 --- a/Utils/XMLAccess.cpp +++ b/Utils/XMLAccess.cpp @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" #define WEAPONSFILENAME "TABLEDATA\\Weapons.dat" #define MAX_CHAR_DATA_LENGTH 500 diff --git a/Utils/XMLProperties.cpp b/Utils/XMLProperties.cpp index b75f3b92..8001b4e0 100644 --- a/Utils/XMLProperties.cpp +++ b/Utils/XMLProperties.cpp @@ -8,7 +8,7 @@ #include "XML_Parser.h" #include "XMLWriter.h" -#include "Debug.h" +#include "DEBUG.H" vfs::PropertyContainer::TagMap::TagMap() { diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp index 52f14ece..d8eae129 100644 --- a/Utils/XML_Items.cpp +++ b/Utils/XML_Items.cpp @@ -1,37 +1,37 @@ #include "sgp.h" - #include "overhead types.h" + #include "Overhead Types.h" #include "Soldier Control.h" - #include "overhead.h" + #include "Overhead.h" #include "Event Pump.h" - #include "weapons.h" + #include "Weapons.h" #include "Animation Control.h" #include "Handle UI.h" #include "Isometric Utils.h" #include "math.h" #include "ai.h" - #include "los.h" + #include "LOS.h" #include "renderworld.h" - #include "interface.h" + #include "Interface.h" #include "message.h" - #include "campaign.h" - #include "items.h" - #include "text.h" + #include "Campaign.h" + #include "Items.h" + #include "Text.h" #include "Soldier Profile.h" #include "Dialogue Control.h" #include "SkillCheck.h" #include "Quests.h" - #include "Physics.h" - #include "Random.h" + #include "physics.h" + #include "random.h" #include "Vehicles.h" - #include "bullets.h" - #include "morale.h" + #include "Bullets.h" + #include "Morale.h" #include "SkillCheck.h" - #include "gamesettings.h" + #include "GameSettings.h" #include "SaveLoadMap.h" #include "Debug Control.h" #include "expat.h" #include "XML.h" - #include "utilities.h" + #include "Utilities.h" #include "store inventory.h" // Flugente: in order not to loop over MAXITEMS items if we only have a few thousand, remember the actual number of items in the xml diff --git a/Utils/XML_Language.h b/Utils/XML_Language.h index a039faa6..5c26ab35 100644 --- a/Utils/XML_Language.h +++ b/Utils/XML_Language.h @@ -1,7 +1,7 @@ #ifndef __XML_LANGUAGE_H #define __XML_LANGUAGE_H -#include "Types.h" +#include "types.h" #define MAX_MESSAGE_NAMES_CHARS 400 diff --git a/Utils/XML_SenderNameList.h b/Utils/XML_SenderNameList.h index 3cca54e1..fae15a81 100644 --- a/Utils/XML_SenderNameList.h +++ b/Utils/XML_SenderNameList.h @@ -1,7 +1,7 @@ #ifndef _XML_SENDERNAMELIST_H #define _XML_SENDERNAMELIST_H -#include "Types.h" +#include "types.h" #define MAX_SENDER_NAMES_CHARS 128 diff --git a/Utils/message.cpp b/Utils/message.cpp index 4b09a0b9..0b73c461 100644 --- a/Utils/message.cpp +++ b/Utils/message.cpp @@ -1,21 +1,21 @@ #include "sgp.h" - #include "font.h" + #include "Font.h" #include "types.h" #include "Font Control.h" #include "message.h" #include "memory.h" #include "mbstring.h" #include "Timer Control.h" - #include "render dirty.h" + #include "Render Dirty.h" #include "renderworld.h" #include "local.h" - #include "interface.h" + #include "Interface.h" #include "mapscreen.h" #include "Map Screen Interface Bottom.h" #include "WordWrap.h" #include "Sound Control.h" - #include "Soundman.h" - #include "BuildDefines.h" + #include "soundman.h" + #include "builddefines.h" #include "Dialogue Control.h" #include #include "Game Clock.h" diff --git a/Utils/message.h b/Utils/message.h index 360a764d..d071fae6 100644 --- a/Utils/message.h +++ b/Utils/message.h @@ -2,10 +2,10 @@ #define __MESSAGE_H //#include "sgp.h" -#include "font.h" +#include "Font.h" #include "Font Control.h" #include "types.h" -#include "Fileman.h" +#include "FileMan.h" struct stringstruct{ diff --git a/Utils/popup_class.cpp b/Utils/popup_class.cpp index fec319e9..bb360724 100644 --- a/Utils/popup_class.cpp +++ b/Utils/popup_class.cpp @@ -1,12 +1,12 @@ #include "Map Screen Interface.h" - #include "popupbox.h" - #include "interface control.h" + #include "PopUpBox.h" + #include "Interface Control.h" #include "renderworld.h" #include "Text.h" - #include "utilities.h" + #include "Utilities.h" #include "Interface.h" #include "GameSettings.h" - #include "Input.h" + #include "input.h" #include "Console.h" #include "lwstring.h" diff --git a/ext/VFS/ext/7z/CMakeLists.txt b/ext/VFS/ext/7z/CMakeLists.txt index caa436e3..483d435d 100644 --- a/ext/VFS/ext/7z/CMakeLists.txt +++ b/ext/VFS/ext/7z/CMakeLists.txt @@ -26,7 +26,7 @@ set(INCLUDE_7z src/LzmaLib.h src/Ppmd.h src/Sha256.h - src/Types.h + src/types.h # src/Xz.h # src/XzEnc.h src/7zAlloc.h diff --git a/ext/VFS/ext/7z/doc/lzma.txt b/ext/VFS/ext/7z/doc/lzma.txt index 9d3cef00..b287726d 100644 --- a/ext/VFS/ext/7z/doc/lzma.txt +++ b/ext/VFS/ext/7z/doc/lzma.txt @@ -76,7 +76,7 @@ C/ - C files LzmaDec.* - LZMA decoding LzmaEnc.* - LZMA encoding LzmaLib.* - LZMA Library for DLL calling - Types.h - Basic types for another .c files + types.h - Basic types for another .c files Threads.* - The code for multithreading. LzmaLib - LZMA Library (.DLL for Windows) diff --git a/ext/VFS/ext/7z/src/7zBuf.h b/ext/VFS/ext/7z/src/7zBuf.h index 88ff0c2f..a1124eb9 100644 --- a/ext/VFS/ext/7z/src/7zBuf.h +++ b/ext/VFS/ext/7z/src/7zBuf.h @@ -4,7 +4,7 @@ #ifndef __7Z_BUF_H #define __7Z_BUF_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/7zCrc.h b/ext/VFS/ext/7z/src/7zCrc.h index 4a1ec38c..ddf22795 100644 --- a/ext/VFS/ext/7z/src/7zCrc.h +++ b/ext/VFS/ext/7z/src/7zCrc.h @@ -4,7 +4,7 @@ #ifndef __7Z_CRC_H #define __7Z_CRC_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/7zFile.h b/ext/VFS/ext/7z/src/7zFile.h index 5d857879..496a3715 100644 --- a/ext/VFS/ext/7z/src/7zFile.h +++ b/ext/VFS/ext/7z/src/7zFile.h @@ -14,7 +14,7 @@ #include #endif -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/7zStream.c b/ext/VFS/ext/7z/src/7zStream.c index f0959fb0..5c84216f 100644 --- a/ext/VFS/ext/7z/src/7zStream.c +++ b/ext/VFS/ext/7z/src/7zStream.c @@ -3,7 +3,7 @@ #include -#include "Types.h" +#include "types.h" SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType) { diff --git a/ext/VFS/ext/7z/src/Bcj2.h b/ext/VFS/ext/7z/src/Bcj2.h index d9d857bc..6a87a279 100644 --- a/ext/VFS/ext/7z/src/Bcj2.h +++ b/ext/VFS/ext/7z/src/Bcj2.h @@ -4,7 +4,7 @@ #ifndef __BCJ2_H #define __BCJ2_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/Bra.h b/ext/VFS/ext/7z/src/Bra.h index 9c91e332..f6fbde63 100644 --- a/ext/VFS/ext/7z/src/Bra.h +++ b/ext/VFS/ext/7z/src/Bra.h @@ -4,7 +4,7 @@ #ifndef __BRA_H #define __BRA_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/CpuArch.h b/ext/VFS/ext/7z/src/CpuArch.h index 1cd7c29c..10d4dfc9 100644 --- a/ext/VFS/ext/7z/src/CpuArch.h +++ b/ext/VFS/ext/7z/src/CpuArch.h @@ -4,7 +4,7 @@ #ifndef __CPU_ARCH_H #define __CPU_ARCH_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Delta.h b/ext/VFS/ext/7z/src/Delta.h index 776cd455..cf72817b 100644 --- a/ext/VFS/ext/7z/src/Delta.h +++ b/ext/VFS/ext/7z/src/Delta.h @@ -4,7 +4,7 @@ #ifndef __DELTA_H #define __DELTA_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/LzFind.h b/ext/VFS/ext/7z/src/LzFind.h index 7ebdfa44..d1b5f34a 100644 --- a/ext/VFS/ext/7z/src/LzFind.h +++ b/ext/VFS/ext/7z/src/LzFind.h @@ -4,7 +4,7 @@ #ifndef __LZ_FIND_H #define __LZ_FIND_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/Lzma86.h b/ext/VFS/ext/7z/src/Lzma86.h index 6425bb8f..7bc0b74a 100644 --- a/ext/VFS/ext/7z/src/Lzma86.h +++ b/ext/VFS/ext/7z/src/Lzma86.h @@ -4,7 +4,7 @@ #ifndef __LZMA86_H #define __LZMA86_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/LzmaDec.h b/ext/VFS/ext/7z/src/LzmaDec.h index 6741a644..dcb146f5 100644 --- a/ext/VFS/ext/7z/src/LzmaDec.h +++ b/ext/VFS/ext/7z/src/LzmaDec.h @@ -4,7 +4,7 @@ #ifndef __LZMA_DEC_H #define __LZMA_DEC_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/LzmaEnc.h b/ext/VFS/ext/7z/src/LzmaEnc.h index 7573ba01..b50a953d 100644 --- a/ext/VFS/ext/7z/src/LzmaEnc.h +++ b/ext/VFS/ext/7z/src/LzmaEnc.h @@ -4,7 +4,7 @@ #ifndef __LZMA_ENC_H #define __LZMA_ENC_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/LzmaLib.h b/ext/VFS/ext/7z/src/LzmaLib.h index 55e1e114..0dff2b60 100644 --- a/ext/VFS/ext/7z/src/LzmaLib.h +++ b/ext/VFS/ext/7z/src/LzmaLib.h @@ -4,7 +4,7 @@ #ifndef __LZMA_LIB_H #define __LZMA_LIB_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/Ppmd.h b/ext/VFS/ext/7z/src/Ppmd.h index d62df4d3..42d17284 100644 --- a/ext/VFS/ext/7z/src/Ppmd.h +++ b/ext/VFS/ext/7z/src/Ppmd.h @@ -5,7 +5,7 @@ This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */ #ifndef __PPMD_H #define __PPMD_H -#include "Types.h" +#include "types.h" #include "CpuArch.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Sha256.h b/ext/VFS/ext/7z/src/Sha256.h index 26d1e3af..8b7121e8 100644 --- a/ext/VFS/ext/7z/src/Sha256.h +++ b/ext/VFS/ext/7z/src/Sha256.h @@ -4,7 +4,7 @@ #ifndef __CRYPTO_SHA256_H #define __CRYPTO_SHA256_H -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Threads.h b/ext/VFS/ext/7z/src/Threads.h index 6a7afa82..9ff25dad 100644 --- a/ext/VFS/ext/7z/src/Threads.h +++ b/ext/VFS/ext/7z/src/Threads.h @@ -4,7 +4,7 @@ #ifndef __7Z_THREADS_H #define __7Z_THREADS_H -#include "Types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/ext/VFS/ext/7z/src/XzCrc64.h b/ext/VFS/ext/7z/src/XzCrc64.h index 05d0d09c..0444f5ea 100644 --- a/ext/VFS/ext/7z/src/XzCrc64.h +++ b/ext/VFS/ext/7z/src/XzCrc64.h @@ -6,7 +6,7 @@ #include -#include "Types.h" +#include "types.h" EXTERN_C_BEGIN diff --git a/ext/VFS/ext/7z/src/Types.h b/ext/VFS/ext/7z/src/types.h similarity index 95% rename from ext/VFS/ext/7z/src/Types.h rename to ext/VFS/ext/7z/src/types.h index f193ce2f..53c6a948 100644 --- a/ext/VFS/ext/7z/src/Types.h +++ b/ext/VFS/ext/7z/src/types.h @@ -1,4 +1,4 @@ -/* Types.h -- Basic types +/* types.h -- Basic types 2010-10-09 : Igor Pavlov : Public domain */ #ifndef __7Z_TYPES_H diff --git a/ext/VFS/include/vfs/Tools/vfs_hp_timer.h b/ext/VFS/include/vfs/Tools/vfs_hp_timer.h index dd198cf5..6272ebbd 100644 --- a/ext/VFS/include/vfs/Tools/vfs_hp_timer.h +++ b/ext/VFS/include/vfs/Tools/vfs_hp_timer.h @@ -27,7 +27,7 @@ #include #ifdef WIN32 - #include + #include #elif __linux__ #include #endif diff --git a/ext/export/src/export/jsd/structure.cpp b/ext/export/src/export/jsd/structure.cpp index 7f234e4f..e93bf047 100644 --- a/ext/export/src/export/jsd/structure.cpp +++ b/ext/export/src/export/jsd/structure.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/ext/export/src/export/sti/Image.h b/ext/export/src/export/sti/Image.h index 9a207295..8de3ddd0 100644 --- a/ext/export/src/export/sti/Image.h +++ b/ext/export/src/export/sti/Image.h @@ -1,7 +1,7 @@ #ifndef _IMAGE_H_ #define _IMAGE_H_ -#include "Types.h" +#include "types.h" #include "himage.h" #include diff --git a/ext/export/src/export/sti/STCI_lib.cpp b/ext/export/src/export/sti/STCI_lib.cpp index 0b82d716..16a79489 100644 --- a/ext/export/src/export/sti/STCI_lib.cpp +++ b/ext/export/src/export/sti/STCI_lib.cpp @@ -4,7 +4,7 @@ #include "imgfmt.h" #include "himage.h" -#include "Types.h" +#include "types.h" #include #include #include diff --git a/ext/export/src/export/sti/STCI_lib.h b/ext/export/src/export/sti/STCI_lib.h index df6ac1ad..c4afc856 100644 --- a/ext/export/src/export/sti/STCI_lib.h +++ b/ext/export/src/export/sti/STCI_lib.h @@ -1,4 +1,4 @@ -#include "Types.h" +#include "types.h" #include "himage.h" #include diff --git a/ext/export/src/export/sti/stci_image_utils.h b/ext/export/src/export/sti/stci_image_utils.h index 258baec7..09092153 100644 --- a/ext/export/src/export/sti/stci_image_utils.h +++ b/ext/export/src/export/sti/stci_image_utils.h @@ -1,7 +1,7 @@ #ifndef _STCI_IMAGE_UTILS_H_ #define _STCI_IMAGE_UTILS_H_ -#include "Types.h" +#include "types.h" #include "himage.h" #include #include diff --git a/ext/export/src/ja2/imgfmt.h b/ext/export/src/ja2/imgfmt.h index e88f7eaf..82ed3429 100644 --- a/ext/export/src/ja2/imgfmt.h +++ b/ext/export/src/ja2/imgfmt.h @@ -8,7 +8,7 @@ // * SubRectInfo's (usNumberOfRects > 0, size = usNumberOfSubRects * sizeof(SubRectInfo) ), uncompressed // * Bytes of image data, possibly compressed -#include "Types.h" +#include "types.h" #define STCI_ID_STRING "STCI" #define STCI_ID_LEN 4 diff --git a/ext/export/src/ja2/Types.h b/ext/export/src/ja2/types.h similarity index 100% rename from ext/export/src/ja2/Types.h rename to ext/export/src/ja2/types.h diff --git a/i18n/ExportStrings.cpp b/i18n/ExportStrings.cpp index b79841b9..c390cb17 100644 --- a/i18n/ExportStrings.cpp +++ b/i18n/ExportStrings.cpp @@ -3,12 +3,12 @@ #include "Map Screen Interface.h" #include "personnel.h" #include "soldier profile type.h" -#include "interface.h" +#include "Interface.h" #include "Keys.h" #include "Merc Contract.h" #include "Campaign Types.h" -#include "Finances.h" -#include "Laptop.h" +#include "finances.h" +#include "laptop.h" #include #include @@ -68,7 +68,7 @@ namespace Loc } #include "Assignments.h" -#include "History.h" +#include "history.h" template void ExportSection(vfs::PropertyContainer& props, const vfs::String::char_t* section_name, T* strings, int min, int max) diff --git a/i18n/Multi Language Graphic Utils.cpp b/i18n/Multi Language Graphic Utils.cpp index af383bd7..2530e505 100644 --- a/i18n/Multi Language Graphic Utils.cpp +++ b/i18n/Multi Language Graphic Utils.cpp @@ -1,7 +1,7 @@ #include "builddefines.h" #include "stdio.h" -#include "Windows.h" -#include "Types.h" +#include "windows.h" +#include "types.h" #include "Multi Language Graphic Utils.h" //SB diff --git a/i18n/_ChineseText.cpp b/i18n/_ChineseText.cpp index fa9f7f99..64e7f38f 100644 --- a/i18n/_ChineseText.cpp +++ b/i18n/_ChineseText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("CHINESE") #if defined( CHINESE ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_DutchText.cpp b/i18n/_DutchText.cpp index c2413fac..123fe21d 100644 --- a/i18n/_DutchText.cpp +++ b/i18n/_DutchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("DUTCH") #if defined( DUTCH ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_EnglishText.cpp b/i18n/_EnglishText.cpp index 00cee405..022d8012 100644 --- a/i18n/_EnglishText.cpp +++ b/i18n/_EnglishText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ENGLISH") #if defined( ENGLISH ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_FrenchText.cpp b/i18n/_FrenchText.cpp index cc9980cb..0b0bfa83 100644 --- a/i18n/_FrenchText.cpp +++ b/i18n/_FrenchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("FRENCH") #ifdef FRENCH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_GermanText.cpp b/i18n/_GermanText.cpp index cba8f6e5..04b449d0 100644 --- a/i18n/_GermanText.cpp +++ b/i18n/_GermanText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("GERMAN") #ifdef GERMAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_ItalianText.cpp b/i18n/_ItalianText.cpp index c9e9dd39..a5e2b340 100644 --- a/i18n/_ItalianText.cpp +++ b/i18n/_ItalianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ITALIAN") #if defined( ITALIAN ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_Ja25ChineseText.cpp b/i18n/_Ja25ChineseText.cpp index 1bfcf23e..94e28304 100644 --- a/i18n/_Ja25ChineseText.cpp +++ b/i18n/_Ja25ChineseText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("CHINESE") #ifdef CHINESE - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25DutchText.cpp b/i18n/_Ja25DutchText.cpp index 396f8ac5..33b81428 100644 --- a/i18n/_Ja25DutchText.cpp +++ b/i18n/_Ja25DutchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("DUTCH") #ifdef DUTCH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25EnglishText.cpp b/i18n/_Ja25EnglishText.cpp index 70a0c7e2..aaae4773 100644 --- a/i18n/_Ja25EnglishText.cpp +++ b/i18n/_Ja25EnglishText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ENGLISH") #ifdef ENGLISH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25FrenchText.cpp b/i18n/_Ja25FrenchText.cpp index 17f9fa2a..630fc5fe 100644 --- a/i18n/_Ja25FrenchText.cpp +++ b/i18n/_Ja25FrenchText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("FRENCH") #ifdef FRENCH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25GermanText.cpp b/i18n/_Ja25GermanText.cpp index 663aba59..c8c97c16 100644 --- a/i18n/_Ja25GermanText.cpp +++ b/i18n/_Ja25GermanText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("GERMAN") #ifdef GERMAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25ItalianText.cpp b/i18n/_Ja25ItalianText.cpp index 06d7f298..1ffa7c5c 100644 --- a/i18n/_Ja25ItalianText.cpp +++ b/i18n/_Ja25ItalianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("ITALIAN") #ifdef ITALIAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25PolishText.cpp b/i18n/_Ja25PolishText.cpp index f7835402..1034b458 100644 --- a/i18n/_Ja25PolishText.cpp +++ b/i18n/_Ja25PolishText.cpp @@ -3,8 +3,8 @@ //#pragma setlocale("POLISH") #ifdef POLISH - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_Ja25RussianText.cpp b/i18n/_Ja25RussianText.cpp index 77e48edd..fc037607 100644 --- a/i18n/_Ja25RussianText.cpp +++ b/i18n/_Ja25RussianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("RUSSIAN") #ifdef RUSSIAN - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #endif //suppress : warning LNK4221: no public symbols found; archive member will be inaccessible diff --git a/i18n/_PolishText.cpp b/i18n/_PolishText.cpp index a395a803..028a6ce6 100644 --- a/i18n/_PolishText.cpp +++ b/i18n/_PolishText.cpp @@ -3,8 +3,8 @@ //#pragma setlocale("POLISH") #if defined( POLISH ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/_RussianText.cpp b/i18n/_RussianText.cpp index b5bdf85d..3b0a21c7 100644 --- a/i18n/_RussianText.cpp +++ b/i18n/_RussianText.cpp @@ -2,8 +2,8 @@ //#pragma setlocale("RUSSIAN") #if defined( RUSSIAN ) - #include "text.h" - #include "Fileman.h" + #include "Text.h" + #include "FileMan.h" #include "Scheduling.h" #include "EditorMercs.h" #include "Item Statistics.h" diff --git a/i18n/include/Text.h b/i18n/include/Text.h index 12584904..d9bb16b0 100644 --- a/i18n/include/Text.h +++ b/i18n/include/Text.h @@ -1,7 +1,7 @@ #ifndef __TEXT_H #define __TEXT_H -#include "items.h" +#include "Items.h" #include "types.h" #include "mapscreen.h" #include "XML_Language.h" diff --git a/i18n/include/language.hpp b/i18n/include/language.hpp index bd895bcc..c310e6fd 100644 --- a/i18n/include/language.hpp +++ b/i18n/include/language.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace i18n { enum class Lang diff --git a/lua/Lua Interpreter.h b/lua/Lua Interpreter.h index 8be61dfe..bef02328 100644 --- a/lua/Lua Interpreter.h +++ b/lua/Lua Interpreter.h @@ -7,7 +7,7 @@ extern "C" { #include "lualib.h" } -#include "Types.h" +#include "types.h" typedef struct { STR8 name; diff --git a/lua/lua.cpp b/lua/lua.cpp index 4bd4b181..b3d1cb32 100644 --- a/lua/lua.cpp +++ b/lua/lua.cpp @@ -2,7 +2,7 @@ #include #include #include "Lua Interpreter.h" -#include +#include #include "MemMan.h" lua_State *L; diff --git a/lua/lua_class_interface.cpp b/lua/lua_class_interface.cpp index b9f950b9..4979561c 100644 --- a/lua/lua_class_interface.cpp +++ b/lua/lua_class_interface.cpp @@ -1,6 +1,6 @@ #include "lua_class_interface.h" -#include +#include #define ARRAY_INDEX " idx" // The space is intentional to make this an out-of-band field diff --git a/lua/lua_state.cpp b/lua/lua_state.cpp index 2b11e1b7..f2c7b34d 100644 --- a/lua/lua_state.cpp +++ b/lua/lua_state.cpp @@ -1,5 +1,5 @@ #include "lua_state.h" -#include +#include #include "sgp_logger.h" #include diff --git a/lua/lwstring.cpp b/lua/lwstring.cpp index 83cb1a24..2e25f384 100644 --- a/lua/lwstring.cpp +++ b/lua/lwstring.cpp @@ -1,5 +1,5 @@ #include "builddefines.h" -#include +#include #include "MemMan.h" diff --git a/lua/lwstring.h b/lua/lwstring.h index 306e3fda..be3ba5b9 100644 --- a/lua/lwstring.h +++ b/lua/lwstring.h @@ -15,7 +15,7 @@ extern "C" { #include } -#include "Types.h" +#include "types.h" typedef struct { int len; diff --git a/sgp/Button System.cpp b/sgp/Button System.cpp index 9ccc6bc3..81308e21 100644 --- a/sgp/Button System.cpp +++ b/sgp/Button System.cpp @@ -8,9 +8,9 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" #include "input.h" - #include "memman.h" + #include "MemMan.h" #include "english.h" #include "vobject.h" #include "vobject_blitters.h" @@ -24,7 +24,7 @@ #ifdef _JA2_RENDER_DIRTY #include "Font Control.h" #include "Render Dirty.h" - #include "utilities.h" + #include "Utilities.h" #endif #include diff --git a/sgp/Compression.cpp b/sgp/Compression.cpp index b9922aae..7de1d562 100644 --- a/sgp/Compression.cpp +++ b/sgp/Compression.cpp @@ -1,5 +1,5 @@ #include "MemMan.h" - #include "debug.h" + #include "DEBUG.H" #include "zlib.h" diff --git a/sgp/Cursor Control.h b/sgp/Cursor Control.h index bd3404ca..43553d70 100644 --- a/sgp/Cursor Control.h +++ b/sgp/Cursor Control.h @@ -1,12 +1,12 @@ #ifndef __CURSOR_DATABASE_ #define __CURSOR_DATABASE_ -#include "Types.h" +#include "types.h" #include "FileMan.h" -#include "VObject.h" -#include "VSurface.h" +#include "vobject.h" +#include "vsurface.h" -#include "Video.h" +#include "video.h" #ifdef __cplusplus extern "C" { diff --git a/sgp/DEBUG.H b/sgp/DEBUG.H index 1d0d0c3e..4339ff49 100644 --- a/sgp/DEBUG.H +++ b/sgp/DEBUG.H @@ -1,6 +1,6 @@ //************************************************************************** // -// Filename : debug.h +// Filename : DEBUG.H // // Purpose : prototypes for the debug manager // diff --git a/sgp/DEBUG.cpp b/sgp/DEBUG.cpp index 2aad673b..c7306245 100644 --- a/sgp/DEBUG.cpp +++ b/sgp/DEBUG.cpp @@ -28,7 +28,7 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" //Kris addition #include "screenids.h" @@ -39,7 +39,7 @@ // CJC added #ifndef _NO_DEBUG_TXT - #include "fileman.h" + #include "FileMan.h" #endif #include "GameSettings.h" #include "SaveLoadGame.h" diff --git a/sgp/DirectDraw Calls.cpp b/sgp/DirectDraw Calls.cpp index 99fa328f..4b5451ab 100644 --- a/sgp/DirectDraw Calls.cpp +++ b/sgp/DirectDraw Calls.cpp @@ -2,7 +2,7 @@ #include "DirectDraw Calls.h" #include - #include "debug.h" + #include "DEBUG.H" #include "vobject_blitters.h" // DirectDrawSurface2 Calls diff --git a/sgp/DirectX Common.cpp b/sgp/DirectX Common.cpp index 9c6daefb..403fbb30 100644 --- a/sgp/DirectX Common.cpp +++ b/sgp/DirectX Common.cpp @@ -6,7 +6,7 @@ #include #include "DirectX Common.h" #include - #include "debug.h" + #include "DEBUG.H" void DirectXZeroMem ( void* pMemory, int nSize ) { diff --git a/sgp/FileMan.cpp b/sgp/FileMan.cpp index 6ad5bcf5..c141ddf1 100644 --- a/sgp/FileMan.cpp +++ b/sgp/FileMan.cpp @@ -24,7 +24,7 @@ // Includes // //************************************************************************** - #include "Types.h" + #include "types.h" #include #include #include @@ -34,7 +34,7 @@ #include "windows.h" #include "FileMan.h" #include "MemMan.h" - #include "Debug.h" + #include "DEBUG.H" #include "LibraryDataBase.h" #include "io.h" #include "sgp_logger.h" diff --git a/sgp/FileMan.h b/sgp/FileMan.h index bc860fc8..251749b4 100644 --- a/sgp/FileMan.h +++ b/sgp/FileMan.h @@ -20,7 +20,7 @@ //************************************************************************** #include "types.h" -#include "Windows.h" +#include "windows.h" diff --git a/sgp/Font.cpp b/sgp/Font.cpp index d853c542..63b02569 100644 --- a/sgp/Font.cpp +++ b/sgp/Font.cpp @@ -8,10 +8,10 @@ #include #include "sgp.h" #include "pcx.h" - #include "memman.h" - #include "fileman.h" + #include "MemMan.h" + #include "FileMan.h" #include "Font.h" - #include "Debug.h" + #include "DEBUG.H" #include "video.h" diff --git a/sgp/Font.h b/sgp/Font.h index 16802d61..a48ff41b 100644 --- a/sgp/Font.h +++ b/sgp/Font.h @@ -1,7 +1,7 @@ #ifndef __FONT_H_ #define __FONT_H_ -#include "Types.h" +#include "types.h" #include "himage.h" #include "vobject.h" //#ifdef WINFONTS diff --git a/sgp/LibraryDataBase.cpp b/sgp/LibraryDataBase.cpp index dd5bd67e..acf75294 100644 --- a/sgp/LibraryDataBase.cpp +++ b/sgp/LibraryDataBase.cpp @@ -1,11 +1,11 @@ - #include "Types.h" + #include "types.h" #include "windows.h" #include "FileMan.h" #include "LibraryDataBase.h" #include "MemMan.h" #include "stdio.h" #include "WCheck.h" - #include "Debug.h" + #include "DEBUG.H" #include "video.h" diff --git a/sgp/LibraryDataBase.h b/sgp/LibraryDataBase.h index 86922d8a..06ba02fd 100644 --- a/sgp/LibraryDataBase.h +++ b/sgp/LibraryDataBase.h @@ -1,7 +1,7 @@ #ifndef _LIBRARY_DATABASE_H #define _LIBRARY_DATABASE_H -#include "Types.h" +#include "types.h" #include "windows.h" #include "FileMan.h" diff --git a/sgp/MemMan.cpp b/sgp/MemMan.cpp index caa545e8..06580b1c 100644 --- a/sgp/MemMan.cpp +++ b/sgp/MemMan.cpp @@ -24,7 +24,7 @@ #include #include #include "MemMan.h" - #include "Debug.h" + #include "DEBUG.H" #include #include "sgp_logger.h" #ifdef _DEBUG diff --git a/sgp/PCX.cpp b/sgp/PCX.cpp index 25eb2cb2..4954e97a 100644 --- a/sgp/PCX.cpp +++ b/sgp/PCX.cpp @@ -1,7 +1,7 @@ #include #include "pcx.h" - #include "memman.h" - #include "fileman.h" + #include "MemMan.h" + #include "FileMan.h" // Local typedefs diff --git a/sgp/Random.cpp b/sgp/Random.cpp index d78445dd..a413eae5 100644 --- a/sgp/Random.cpp +++ b/sgp/Random.cpp @@ -1,5 +1,5 @@ -#include "Random.h" -#include "debug control.h" +#include "random.h" +#include "Debug Control.h" extern bool is_client; extern bool is_server; diff --git a/sgp/SMACK.H b/sgp/SMACK.H index 2bb08aeb..ff9f7488 100644 --- a/sgp/SMACK.H +++ b/sgp/SMACK.H @@ -5,7 +5,7 @@ #ifndef __RADRES__ -#include "rad.h" +#include "RAD.H" RADDEFSTART diff --git a/sgp/STCI.cpp b/sgp/STCI.cpp index 7a117e57..9187cee3 100644 --- a/sgp/STCI.cpp +++ b/sgp/STCI.cpp @@ -3,8 +3,8 @@ #include "FileMan.h" #include "imgfmt.h" #include "himage.h" - #include "Types.h" - #include "Debug.h" + #include "types.h" + #include "DEBUG.H" #include "WCheck.h" BOOLEAN STCILoadRGB( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHeader * pHeader ); diff --git a/sgp/WinFont.cpp b/sgp/WinFont.cpp index 0760c928..8836519a 100644 --- a/sgp/WinFont.cpp +++ b/sgp/WinFont.cpp @@ -10,16 +10,16 @@ #include #include #include "sgp.h" -#include "memman.h" -#include "fileman.h" +#include "MemMan.h" +#include "FileMan.h" #include "Font.h" -#include "Debug.h" +#include "DEBUG.H" #include "vsurface.h" #include "vsurface_private.h" #include "DirectX Common.h" #include #include "winfont.h" -#include "font.h" +#include "Font.h" #include "Font Control.h" #include "GameSettings.h" #include diff --git a/sgp/himage.cpp b/sgp/himage.cpp index f2c84bdd..71582fca 100644 --- a/sgp/himage.cpp +++ b/sgp/himage.cpp @@ -3,14 +3,14 @@ #include #include "types.h" #include "string.h" - #include "debug.h" - #include "fileman.h" + #include "DEBUG.H" + #include "FileMan.h" #include "himage.h" #include "impTGA.h" #include "pcx.h" #include "STCI.h" #include "PngLoader.h" - #include "wcheck.h" + #include "WCheck.h" #include "Compression.h" #include "vobject.h" #include "vobject_blitters.h" diff --git a/sgp/imgfmt.h b/sgp/imgfmt.h index 6bdb6919..cfff1431 100644 --- a/sgp/imgfmt.h +++ b/sgp/imgfmt.h @@ -8,7 +8,7 @@ // * SubRectInfo's (usNumberOfRects > 0, size = usNumberOfSubRects * sizeof(SubRectInfo) ), uncompressed // * Bytes of image data, possibly compressed -#include "Types.h" +#include "types.h" #define STCI_ID_STRING "STCI" #define STCI_ID_LEN 4 diff --git a/sgp/impTGA.cpp b/sgp/impTGA.cpp index 8c4564c0..04b52dc6 100644 --- a/sgp/impTGA.cpp +++ b/sgp/impTGA.cpp @@ -17,12 +17,12 @@ //************************************************************************** #include "types.h" - #include "Fileman.h" - #include "memman.h" + #include "FileMan.h" + #include "MemMan.h" #include "WCheck.h" #include "himage.h" #include "string.h" - #include "debug.h" + #include "DEBUG.H" #include "video.h" #include "impTGA.h" diff --git a/sgp/input.cpp b/sgp/input.cpp index d3f51474..7b760e6d 100644 --- a/sgp/input.cpp +++ b/sgp/input.cpp @@ -11,9 +11,9 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" #include "input.h" - #include "memman.h" + #include "MemMan.h" #include "english.h" #include "video.h" #include "local.h" diff --git a/sgp/mousesystem.cpp b/sgp/mousesystem.cpp index a9fb22c2..f57129bf 100644 --- a/sgp/mousesystem.cpp +++ b/sgp/mousesystem.cpp @@ -15,14 +15,14 @@ #include #include #include - #include "debug.h" + #include "DEBUG.H" #include "input.h" - #include "memman.h" + #include "MemMan.h" #include "line.h" #include "video.h" #define BASE_REGION_FLAGS (MSYS_REGION_ENABLED | MSYS_SET_CURSOR) #ifdef _JA2_RENDER_DIRTY - #include "render dirty.h" + #include "Render Dirty.h" #include "Font Control.h" #endif #include "english.h" diff --git a/sgp/random.h b/sgp/random.h index 008c3c68..446fc8d3 100644 --- a/sgp/random.h +++ b/sgp/random.h @@ -3,8 +3,8 @@ #define BMP_RANDOM -#include "Types.h" -#include "Debug.h" +#include "types.h" +#include "DEBUG.H" #include "GameSettings.h" //IMPORTANT: Changing this define will invalidate the JA2 save. If this is necessary, please ifdef your own value. diff --git a/sgp/sgp.cpp b/sgp/sgp.cpp index 07518b0b..b501a0a1 100644 --- a/sgp/sgp.cpp +++ b/sgp/sgp.cpp @@ -7,17 +7,17 @@ #include #include "sgp.h" #include "vobject.h" - #include "font.h" + #include "Font.h" #include "local.h" - #include "Fileman.h" + #include "FileMan.h" #include "input.h" - #include "Random.h" + #include "random.h" #include "gameloop.h" #include "soundman.h" #include "JA2 Splash.h" #include "Timer Control.h" #include "LibraryDataBase.h" - #include "utilities.h" + #include "Utilities.h" #include "GameSettings.h" #include "input.h" @@ -51,7 +51,7 @@ #include "english.h" #include "wine.h" - #include "BuildDefines.h" + #include "builddefines.h" #include "Intro.h" #ifndef WIN32_LEAN_AND_MEAN diff --git a/sgp/sgp.h b/sgp/sgp.h index 138628da..2c01a0b5 100644 --- a/sgp/sgp.h +++ b/sgp/sgp.h @@ -4,7 +4,7 @@ #include "local.h" #include "types.h" #include "timer.h" -#include "debug.h" +#include "DEBUG.H" #include "video.h" diff --git a/sgp/sgp_logger.cpp b/sgp/sgp_logger.cpp index dc82bbde..6499adc9 100644 --- a/sgp/sgp_logger.cpp +++ b/sgp/sgp_logger.cpp @@ -1,8 +1,8 @@ #include "sgp_logger.h" -#include "Debug.h" +#include "DEBUG.H" #include "Font Control.h" -#include "Message.h" +#include "message.h" #include static inline void flush_screen(std::wstringstream& stream) diff --git a/sgp/shading.cpp b/sgp/shading.cpp index 32155139..19a46ff2 100644 --- a/sgp/shading.cpp +++ b/sgp/shading.cpp @@ -1,6 +1,6 @@ #include "DirectDraw Calls.h" #include - #include "debug.h" + #include "DEBUG.H" #include "video.h" #include "himage.h" #include "vobject.h" diff --git a/sgp/soundman.cpp b/sgp/soundman.cpp index 02d33d3e..663f5b87 100644 --- a/sgp/soundman.cpp +++ b/sgp/soundman.cpp @@ -11,7 +11,7 @@ #include #include "soundman.h" #include "FileMan.h" - #include "debug.h" + #include "DEBUG.H" #include "MemMan.h" #include "random.h" #include "fmod.h" diff --git a/sgp/Types.h b/sgp/types.h similarity index 100% rename from sgp/Types.h rename to sgp/types.h diff --git a/sgp/video.cpp b/sgp/video.cpp index f6ca2caf..bbd93c4b 100644 --- a/sgp/video.cpp +++ b/sgp/video.cpp @@ -1,16 +1,16 @@ #include "types.h" -#include "Video.h" +#include "video.h" #include "vobject_blitters.h" #include "sgp.h" #include #include #include "renderworld.h" #include "Render Dirty.h" -#include "fade screen.h" +#include "Fade Screen.h" #include "impTGA.h" -#include "timer control.h" -#include "Fileman.h" -#include "Input.h" +#include "Timer Control.h" +#include "FileMan.h" +#include "input.h" #include "GameSettings.h" #include "sgp_logger.h" @@ -18,8 +18,8 @@ #include #include -#include "Local.h" -#include "text.h" +#include "local.h" +#include "Text.h" #ifndef _MT diff --git a/sgp/video.h b/sgp/video.h index 02527b3a..16bd664f 100644 --- a/sgp/video.h +++ b/sgp/video.h @@ -5,11 +5,11 @@ #include #include -#include "Local.h" -#include "Debug.h" -#include "Types.h" +#include "local.h" +#include "DEBUG.H" +#include "types.h" #include "DirectDraw Calls.h" -#include "VSurface.h" +#include "vsurface.h" #define BUFFER_READY 0x00 #define BUFFER_BUSY 0x01 diff --git a/sgp/vobject.cpp b/sgp/vobject.cpp index 154c2c5d..1276bb0c 100644 --- a/sgp/vobject.cpp +++ b/sgp/vobject.cpp @@ -1,10 +1,10 @@ #include "DirectDraw Calls.h" #include -#include "debug.h" +#include "DEBUG.H" #include "video.h" #include "himage.h" #include "vobject.h" -#include "wcheck.h" +#include "WCheck.h" #include "vobject_blitters.h" #include "sgp.h" diff --git a/sgp/vobject_blitters.cpp b/sgp/vobject_blitters.cpp index 21225e64..6637db9e 100644 --- a/sgp/vobject_blitters.cpp +++ b/sgp/vobject_blitters.cpp @@ -1,10 +1,10 @@ #include "DirectDraw Calls.h" #include - #include "debug.h" + #include "DEBUG.H" #include "video.h" // JA2 #include "himage.h" #include "vobject.h" - #include "wcheck.h" + #include "WCheck.h" #include "vobject.h" #include "vobject_blitters.h" #include "shading.h" diff --git a/sgp/vsurface.cpp b/sgp/vsurface.cpp index 905cf893..07538126 100644 --- a/sgp/vsurface.cpp +++ b/sgp/vsurface.cpp @@ -1,12 +1,12 @@ #include "DirectDraw Calls.h" #include #include -#include "debug.h" +#include "DEBUG.H" #include "video.h" #include "himage.h" #include "vsurface.h" #include "vsurface_private.h" -#include "wcheck.h" +#include "WCheck.h" #include "vobject_blitters.h" extern void SetClippingRect(SGPRect *clip); diff --git a/sgp/ZCONF.H b/sgp/zconf.h similarity index 95% rename from sgp/ZCONF.H rename to sgp/zconf.h index 38df56c4..428f3905 100644 --- a/sgp/ZCONF.H +++ b/sgp/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id: ZCONF.H,v 1.2 2004/03/16 02:00:39 digicrab Exp $ */ +/* $Id: zconf.h,v 1.2 2004/03/16 02:00:39 digicrab Exp $ */ #ifndef _ZCONF_H #define _ZCONF_H diff --git a/sgp/ZLIB.H b/sgp/zlib.h similarity index 100% rename from sgp/ZLIB.H rename to sgp/zlib.h From 3c44f133fdcd6748fc4795bd952852da89bca961 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Sat, 23 Aug 2025 23:57:00 -0300 Subject: [PATCH 06/14] Actually fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected --- Strategic/Assignments.cpp | 15 ++------------- Strategic/mapscreen.cpp | 6 +++--- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index b548c20b..63eab1f4 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -18305,21 +18305,10 @@ BOOLEAN HandleSelectedMercsBeingPutAsleep( BOOLEAN fWakeUp, BOOLEAN fDisplayWarn } } - if( ubNumberOfSelectedSoldiers == 0 ) - { - return fSuccess; - } - - if( !fDisplayWarning ) { - return fSuccess; - } - - CHAR16 sString[ 128 ]; - swprintf( sString, fWakeUp ? pMapErrorString[ 27 ] : pMapErrorString[ 26 ] ); - if( gGameExternalOptions.fSleepDisplayFailNotification ) + if( ubNumberOfSelectedSoldiers && !fSuccess && fDisplayWarning ) { // inform player not everyone could be woke up or put to sleep - DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL); + DoScreenIndependantMessageBox(fWakeUp ? pMapErrorString[27] : pMapErrorString[26], MSG_BOX_FLAG_OK, NULL); } return( fSuccess ); diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 2703c65a..054ce60a 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -11897,12 +11897,12 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason ) if( pSoldier->flags.fMercAsleep == TRUE ) { // try to wake him up - if( SetMercAwake( pSoldier, TRUE, FALSE ) ) + if( SetMercAwake( pSoldier, gGameExternalOptions.fSleepDisplayFailNotification, FALSE ) ) { // HEADROCK HAM B2.8: New feature wakes all trainees/trainers automatically HandleTrainingWakeSynchronize( pSoldier ); // propagate - HandleSelectedMercsBeingPutAsleep( TRUE, TRUE ); + HandleSelectedMercsBeingPutAsleep( TRUE, gGameExternalOptions.fSleepDisplayFailNotification); return; } else @@ -11919,7 +11919,7 @@ void TeamListSleepRegionBtnCallBack( MOUSE_REGION *pRegion, INT32 iReason ) // HEADROCK HAM B2.8: New feature sends all trainees/trainers to sleep automatically HandleTrainingSleepSynchronize( pSoldier ); // propagate - HandleSelectedMercsBeingPutAsleep( FALSE, TRUE ); + HandleSelectedMercsBeingPutAsleep( FALSE, gGameExternalOptions.fSleepDisplayFailNotification); return; } else From 1004ab6c8c5871fa52c0ac11697b074a56148011 Mon Sep 17 00:00:00 2001 From: Buscher Date: Sun, 24 Aug 2025 18:34:37 +0200 Subject: [PATCH 07/14] Added Right Click to time compression to fast forward a single hour --- Strategic/Game Clock.cpp | 6 ++++++ Strategic/Game Clock.h | 3 +++ Strategic/Hourly Update.cpp | 5 +++++ Strategic/Map Screen Interface Bottom.cpp | 21 +++++++++++++++++++++ i18n/_EnglishText.cpp | 2 +- 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Strategic/Game Clock.cpp b/Strategic/Game Clock.cpp index bb3d38c7..26310142 100644 --- a/Strategic/Game Clock.cpp +++ b/Strategic/Game Clock.cpp @@ -45,6 +45,9 @@ BOOLEAN fClockMouseRegionCreated = FALSE; BOOLEAN fTimeCompressHasOccured = FALSE; +// run time compression till next hour +bool stopTimeCompressionNextHour = false; + //This value represents the time that the sector was loaded. If you are in sector A9, and leave //the game clock at that moment will get saved into the temp file associated with it. The next time you //enter A9, this value will contain that time. Used for scheduling purposes. @@ -525,6 +528,9 @@ void SetGameTimeCompressionLevel( UINT32 uiCompressionRate ) { Assert( uiCompressionRate < NUM_TIME_COMPRESS_SPEEDS ); + if( uiCompressionRate == TIME_COMPRESS_X0 ) + stopTimeCompressionNextHour = false; + if( guiCurrentScreen == GAME_SCREEN ) { if( uiCompressionRate != TIME_COMPRESS_X1 ) diff --git a/Strategic/Game Clock.h b/Strategic/Game Clock.h index eed8b06e..62ee8e5b 100644 --- a/Strategic/Game Clock.h +++ b/Strategic/Game Clock.h @@ -109,6 +109,9 @@ extern INT32 giTimeCompressSpeeds[ NUM_TIME_COMPRESS_SPEEDS ]; // compress mode now in use extern INT32 giTimeCompressMode; +// run time compression till next hour +extern bool stopTimeCompressionNextHour; + enum { diff --git a/Strategic/Hourly Update.cpp b/Strategic/Hourly Update.cpp index 2d573827..e87e189e 100644 --- a/Strategic/Hourly Update.cpp +++ b/Strategic/Hourly Update.cpp @@ -86,6 +86,11 @@ CHAR16 zString[128]; if(is_networked) return; + if (stopTimeCompressionNextHour) + { + SetGameTimeCompressionLevel( TIME_COMPRESS_X0); + } + // hourly update of town loyalty HandleTownLoyalty(); diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index bb60945a..8bd67806 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/Strategic/Map Screen Interface Bottom.cpp @@ -713,6 +713,27 @@ void BtnTimeCompressMoreMapScreenCallback( GUI_BUTTON *btn,INT32 reason ) { if ( CommonTimeCompressionChecks() == TRUE ) return; + + // redraw region + if( btn->uiFlags & MSYS_HAS_BACKRECT ) + { + fMapScreenBottomDirty = TRUE; + } + + btn->uiFlags|=(BUTTON_CLICKED_ON); + } + // Start time compression which stops at the next hour + // Button down removes the pop up/tooltip, Button up calls the functionality + else if(reason & MSYS_CALLBACK_REASON_RBUTTON_UP ) + { + if (btn->uiFlags & BUTTON_CLICKED_ON) + { + btn->uiFlags&=~(BUTTON_CLICKED_ON); + fMapScreenBottomDirty = TRUE; + + stopTimeCompressionNextHour = true; + SetGameTimeCompressionLevel( TIME_COMPRESS_60MINS ); + } } } diff --git a/i18n/_EnglishText.cpp b/i18n/_EnglishText.cpp index 022d8012..f567783d 100644 --- a/i18n/_EnglishText.cpp +++ b/i18n/_EnglishText.cpp @@ -4453,7 +4453,7 @@ STR16 pMapScreenBottomFastHelp[] = L"|Laptop", L"Tactical (|E|s|c)", L"|Options", - L"Time Compress (|+)", // time compress more + L"Time Compress (|+)\nRight Click to fast forward one hour", // time compress more L"Time Compress (|-)", // time compress less L"Previous Message (|U|p)\nPrevious Page (|P|g|U|p)", // previous message in scrollable list L"Next Message (|D|o|w|n)\nNext Page (|P|g|D|n)", // next message in the scrollable list From 272ba56fa14ee322771e81f41789be6f2a16edae Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Sat, 30 Aug 2025 18:24:17 -0300 Subject: [PATCH 08/14] remove unused function --- Utils/Text Utils.cpp | 11 ----------- i18n/include/Text.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp index 5ae5ac51..154ef003 100644 --- a/Utils/Text Utils.cpp +++ b/Utils/Text Utils.cpp @@ -388,17 +388,6 @@ void ParseCommandLine ( ++*numargs; } -inline std::string narrow(std::wstring const& text) -{ - std::locale const loc(""); - wchar_t const* from = text.c_str(); - std::size_t const len = text.size(); - std::vector buffer(len + 1); - std::use_facet >(loc).narrow(from, from + len, '_', &buffer[0]); - - return std::string(&buffer[0], &buffer[len]); -} - // convert UTF-8 string to wstring std::wstring utf8_to_wstring(const std::string& str) { diff --git a/i18n/include/Text.h b/i18n/include/Text.h index d9bb16b0..1e14d125 100644 --- a/i18n/include/Text.h +++ b/i18n/include/Text.h @@ -1803,8 +1803,6 @@ BOOLEAN LoadItemProsAndCons( UINT16 usIndex, STR16 pProsString, STR16 pConsStrin BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString ); BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString ); -// sevenfm -inline std::string narrow(std::wstring const& text); // convert UTF-8 string to wstring std::wstring utf8_to_wstring(const std::string& str); // convert wstring to UTF-8 string From 5d3cc7969f847dd85b68ea787e885102e68c72a4 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Sat, 30 Aug 2025 12:44:35 -0300 Subject: [PATCH 09/14] fix code that relies on transitive includes --- Multiplayer/connect.h | 1 + Utils/popup_class.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Multiplayer/connect.h b/Multiplayer/connect.h index f5eff451..d216fb30 100644 --- a/Multiplayer/connect.h +++ b/Multiplayer/connect.h @@ -6,6 +6,7 @@ #include "Event Pump.h" #include "Bullets.h" #include "builddefines.h" +#include "Strategic Movement.h" extern bool isOwnTeamWipedOut; diff --git a/Utils/popup_class.cpp b/Utils/popup_class.cpp index bb360724..b8a53b78 100644 --- a/Utils/popup_class.cpp +++ b/Utils/popup_class.cpp @@ -21,8 +21,8 @@ // functions and variable declarations for binding the class with C callbacks ////////////////////////////////////////////////////////////////// -vector gPopupRegionIndex; -vector gPopupIndex; +std::vector gPopupRegionIndex; +std::vector gPopupIndex; UINT32 gPopupRegionIndexCounter = 0; UINT32 gPopupIndexCounter = 0; UINT32 POPUP::nextid = 0; @@ -237,19 +237,19 @@ BOOLEAN POPUP_OPTION::forceRun() ////////////////////////////////////////////////////////////////// // constructor -POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new wstring(L"Unnamed subPopup"),NULL) //TODO: possible memmory leak! +POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new std::wstring(L"Unnamed subPopup"),NULL) //TODO: possible memmory leak! { this->parent = NULL; this->initSubPopup(); } -POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* name) : POPUP_OPTION(name, NULL) +POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* name) : POPUP_OPTION(name, NULL) { this->parent = NULL; this->initSubPopup(); } -POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL) +POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL) { this->parent = parent; this->initSubPopup(); @@ -342,7 +342,7 @@ static void unShadeOpenSubPopup( POPUP_SUB_POPUP_OPTION * opt ){ void POPUP_SUB_POPUP_OPTION::initSubPopup() { - this->subPopup = new POPUP( (CHAR*) wstring(this->name).c_str() ); + this->subPopup = new POPUP( (CHAR*) std::wstring(this->name).c_str() ); this->subPopup->setCallback(POPUP_CALLBACK_SHOW,new popupCallbackFunction( &shadeOpenSubPopup, this )); this->subPopup->setCallback(POPUP_CALLBACK_HIDE,new popupCallbackFunction( &unShadeOpenSubPopup, this )); @@ -563,7 +563,7 @@ void POPUP::setInitialValues(void) // setup functions -POPUP_OPTION * POPUP::addOption(wstring * name, popupCallback* action) +POPUP_OPTION * POPUP::addOption(std::wstring * name, popupCallback* action) { if (this->optionCount < POPUP_MAX_OPTIONS) { @@ -606,7 +606,7 @@ POPUP_OPTION * POPUP::getOption(UINT16 n) return NULL; } -POPUP * POPUP::addSubMenuOption(wstring * name) +POPUP * POPUP::addSubMenuOption(std::wstring * name) { if (this->subPopupOptionCount < POPUP_MAX_SUB_POPUPS) { From e5d25810f655e91892972498d32b085168f9fc3b Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Sat, 30 Aug 2025 12:43:12 -0300 Subject: [PATCH 10/14] nuke console --- CMakeLists.txt | 2 - Console/CMakeLists.txt | 6 - Console/ComBSTROut.h | 81 -- Console/ComVariantOut.h | 109 -- Console/Console.cpp | 2876 --------------------------------------- Console/Console.h | 746 ---------- Console/Console.rc | 208 --- Console/Cursors.cpp | 769 ----------- Console/Cursors.h | 342 ----- Console/Dialogs.cpp | 134 -- Console/Dialogs.h | 64 - Console/FileStream.cpp | 259 ---- Console/FileStream.h | 107 -- Console/ReadMe.txt | 1200 ---------------- Console/console.ico | Bin 18902 -> 0 bytes Utils/popup_class.cpp | 1 - sgp/sgp.cpp | 16 - 17 files changed, 6920 deletions(-) delete mode 100644 Console/CMakeLists.txt delete mode 100644 Console/ComBSTROut.h delete mode 100644 Console/ComVariantOut.h delete mode 100644 Console/Console.cpp delete mode 100644 Console/Console.h delete mode 100644 Console/Console.rc delete mode 100644 Console/Cursors.cpp delete mode 100644 Console/Cursors.h delete mode 100644 Console/Dialogs.cpp delete mode 100644 Console/Dialogs.h delete mode 100644 Console/FileStream.cpp delete mode 100644 Console/FileStream.h delete mode 100644 Console/ReadMe.txt delete mode 100644 Console/console.ico diff --git a/CMakeLists.txt b/CMakeLists.txt index 4201e90f..fab983a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,6 @@ include_directories( "${CMAKE_SOURCE_DIR}/Laptop" "${CMAKE_SOURCE_DIR}/Multiplayer" "${CMAKE_SOURCE_DIR}/Editor" - "${CMAKE_SOURCE_DIR}/Console" "${CMAKE_SOURCE_DIR}/i18n/include" ) @@ -88,7 +87,6 @@ wine # static libraries whose translation units rely on Application preprocessor definitions. set(Ja2_Libs - Console Editor Ja2 Laptop diff --git a/Console/CMakeLists.txt b/Console/CMakeLists.txt deleted file mode 100644 index 7c67cd0a..00000000 --- a/Console/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -set(ConsoleSrc -"${CMAKE_CURRENT_SOURCE_DIR}/Console.cpp" -"${CMAKE_CURRENT_SOURCE_DIR}/Cursors.cpp" -"${CMAKE_CURRENT_SOURCE_DIR}/Dialogs.cpp" -"${CMAKE_CURRENT_SOURCE_DIR}/FileStream.cpp" -PARENT_SCOPE) diff --git a/Console/ComBSTROut.h b/Console/ComBSTROut.h deleted file mode 100644 index 598e5204..00000000 --- a/Console/ComBSTROut.h +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - -#ifndef _COMBSTROUT_H_ -#define _COMBSTROUT_H_ - -///////////////////////////////////////////////////////////////////////////// -// CComBSTROut - a class that inherits from CComBSTR and adds Out() method -// that should be used instead of & operator for 'out' -// function parameters - -class CComBSTROut : public CComBSTR -{ -public: - - CComBSTROut() - { - } - /*explicit*/ CComBSTROut(int nSize) : CComBSTR(nSize) - { - } - /*explicit*/ CComBSTROut(int nSize, LPCOLESTR sz) : CComBSTR(nSize, sz) - { - } - /*explicit*/ CComBSTROut(LPCOLESTR pSrc) : CComBSTR(pSrc) - { - } - /*explicit*/ CComBSTROut(const CComBSTROut& src) : CComBSTR(src) - { - } - /*explicit*/ CComBSTROut(REFGUID src) : CComBSTR(src) - { - } - -#ifndef OLE2ANSI - CComBSTROut(LPCSTR pSrc) : CComBSTR(pSrc) - { - } - - CComBSTROut(int nSize, LPCSTR sz) : CComBSTR(nSize, sz) - { - } -#endif - - ~CComBSTROut() - { - CComBSTR::~CComBSTR(); - } - - BSTR* Out() - { - Empty(); - return &m_str; - } -}; - -///////////////////////////////////////////////////////////////////////////// - - -#endif // _COMBSTROUT_H_ diff --git a/Console/ComVariantOut.h b/Console/ComVariantOut.h deleted file mode 100644 index 1e52a866..00000000 --- a/Console/ComVariantOut.h +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - -#ifndef _COMVARIANTOUT_H_ -#define _COMVARIANTOUT_H_ - -///////////////////////////////////////////////////////////////////////////// -// CComVariantOut - a class that inherits from CComVariant and adds Out() -// method that should be used instead of & operator for -// 'out' function parameters - -class CComVariantOut : public CComVariant -{ - -public: - CComVariantOut() - { - } - ~CComVariantOut() - { - CComVariant::~CComVariant(); - } - - CComVariantOut(const VARIANT& varSrc) : CComVariant(varSrc) - { - } - - CComVariantOut(const CComVariant& varSrc) : CComVariant(varSrc) - { - } - - CComVariantOut(BSTR bstrSrc) : CComVariant(bstrSrc) - { - } - CComVariantOut(LPCOLESTR lpszSrc) : CComVariant(lpszSrc) - { - } - -#ifndef OLE2ANSI - CComVariantOut(LPCSTR lpszSrc) : CComVariant(lpszSrc) - { - } -#endif - - CComVariantOut(bool bSrc) : CComVariant(bSrc) - { - } - - CComVariantOut(int nSrc) : CComVariant(nSrc) - { - } - CComVariantOut(BYTE nSrc) : CComVariant(nSrc) - { - } - CComVariantOut(short nSrc) : CComVariant(nSrc) - { - } - CComVariantOut(long nSrc, VARTYPE m_varSrc = VT_I4) : CComVariant(nSrc, m_varSrc) - { - } - CComVariantOut(float fltSrc) : CComVariant(fltSrc) - { - } - CComVariantOut(double dblSrc) : CComVariant(dblSrc) - { - } - CComVariantOut(CY cySrc) : CComVariant(cySrc) - { - } - CComVariantOut(IDispatch* pSrc) : CComVariant(pSrc) - { - } - CComVariantOut(IUnknown* pSrc) : CComVariant(pSrc) - { - } - -public: - VARIANT* Out() - { - Clear(); - return this; - } -}; - -///////////////////////////////////////////////////////////////////////////// - - -#endif // _COMVARIANTOUT_H_ diff --git a/Console/Console.cpp b/Console/Console.cpp deleted file mode 100644 index e7453938..00000000 --- a/Console/Console.cpp +++ /dev/null @@ -1,2876 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - -#ifdef UNICODE -#error "Unicode defined" -#endif - -///////////////////////////////////////////////////////////////////////////// -// Console.cpp - console class implementation -#include "builddefines.h" -#undef CINTERFACE - -//#include "stdafx.h" -//#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "resource.h" -#include "FileStream.h" -//#include "ComBSTROut.h" -//#include "ComVariantOut.h" -#include "Cursors.h" -#include "Dialogs.h" -#include "Console.h" - -#ifdef _DEBUG -//#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - -extern HINSTANCE ghInstance; - -///////////////////////////////////////////////////////////////////////////// -// Console class - - -///////////////////////////////////////////////////////////////////////////// -// Console window class names -const TCHAR Console::m_szConsoleClass[] = _T("Console Main Command Window"); -const TCHAR Console::m_szHiddenParentClass[] = _T("Console Invisible Parent Window"); - - -///////////////////////////////////////////////////////////////////////////// -// win console window title -const tstring Console::m_strWinConsoleTitle(_T("Console Command Window")); - - -///////////////////////////////////////////////////////////////////////////// -// ctor/dtor - -Console::Console(LPCTSTR pszConfigFile, LPCTSTR pszShellCmdLine, LPCTSTR pszConsoleTitle, LPCTSTR pszReloadNewConfig) -: m_hWnd(NULL) -, m_bInitializing(TRUE) -, m_bReloading(FALSE) -, m_strConfigEditor(_T("notepad.exe")) -, m_strConfigEditorParams(_T("")) -, m_strShell(_T("")) -, m_strShellCmdLine(pszShellCmdLine) -, m_hwndInvisParent(NULL) -, m_hdcConsole(NULL) -, m_hdcWindow(NULL) -, m_hbmpConsole(NULL) -, m_hbmpConsoleOld(NULL) -, m_hbmpWindow(NULL) -, m_hbmpWindowOld(NULL) -, m_hBkBrush(NULL) -, m_dwMasterRepaintInt(500) -, m_dwChangeRepaintInt(50) -, m_strIconFilename(_T("")) -, m_hSmallIcon(NULL) -, m_hBigIcon(NULL) -, m_hPopupMenu(NULL) -, m_hSysMenu(NULL) -, m_hConfigFilesMenu(NULL) -, m_bPopupMenuDisabled(FALSE) -, m_strWindowTitleDefault(_tcslen(pszConsoleTitle) == 0 ? _T("console") : pszConsoleTitle) -, m_strWindowTitle(m_strWindowTitleDefault) -, m_strWindowTitleCurrent(m_strWindowTitleDefault) -, m_strFontName(_T("Courier New")) -, m_dwFontSize(10) -, m_bBold(FALSE) -, m_bItalic(FALSE) -, m_bUseFontColor(FALSE) -, m_crFontColor(RGB(0, 0, 0)) -, m_hFont(NULL) -, m_hFontOld(NULL) -, m_nX(0) -, m_nY(0) -, m_nInsideBorder(0) -, m_nWindowWidth(0) -, m_nWindowHeight(0) -, m_nXBorderSize(5) -, m_nYBorderSize(5) -, m_nCaptionSize(0) -, m_nClientWidth(0) -, m_nClientHeight(0) -, m_nCharHeight(0) -, m_nCharWidth(0) -, m_dwWindowBorder(BORDER_REGULAR) -, m_bShowScrollbar(TRUE) -, m_nScrollbarStyle(FSB_REGULAR_MODE) -, m_crScrollbarColor(::GetSysColor(COLOR_3DHILIGHT)) -, m_nScrollbarWidth(::GetSystemMetrics(SM_CXVSCROLL)) -, m_nScrollbarButtonHeight(::GetSystemMetrics(SM_CYVSCROLL)) -, m_nScrollbarThunmbHeight(::GetSystemMetrics(SM_CYVTHUMB)) -, m_dwTaskbarButton(TASKBAR_BUTTON_NORMAL) -, m_bMouseDragable(TRUE) -, m_nSnapDst(10) -, m_dwDocked(DOCK_NONE) -, m_dwOriginalZOrder(Z_ORDER_REGULAR) -, m_dwCurrentZOrder(Z_ORDER_REGULAR) -, m_dwTransparency(TRANSPARENCY_NONE) -, m_byAlpha(150) -, m_byInactiveAlpha(150) -, m_crBackground(RGB(0, 0, 0)) -, m_crConsoleBackground(RGB(0, 0, 0)) -, m_bTintSet(FALSE) -, m_byTintOpacity(50) -, m_byTintR(0) -, m_byTintG(0) -, m_byTintB(0) -, m_bBitmapBackground(FALSE) -, m_strBackgroundFile(_T("")) -, m_hdcBackground(NULL) -, m_hbmpBackground(NULL) -, m_hbmpBackgroundOld(NULL) -, m_dwBackgroundStyle(BACKGROUND_STYLE_RESIZE) -, m_bRelativeBackground(FALSE) -, m_bExtendBackground(FALSE) -, m_nBackgroundOffsetX(0) -, m_nBackgroundOffsetY(0) -, m_bHideWindow(FALSE) -, m_bHideConsole(TRUE) -, m_dwHideConsoleTimeout(0) -, m_bStartMinimized(FALSE) -, m_dwCursorStyle(CURSOR_STYLE_CONSOLE) -, m_crCursorColor(RGB(255, 255, 255)) -, m_bCursorVisible(TRUE) -, m_pCursor(NULL) -, m_hWndConsole(NULL) -, m_hStdOut(NULL) -, m_hStdOutFresh(NULL) -, m_hQuitEvent(NULL) -, m_hConsoleProcess(NULL) -, m_hMonitorThread(NULL) -, m_dwRows(50) -, m_dwColumns(80) -, m_dwBufferRows(500) -, m_bUseTextBuffer(TRUE) -, m_nTextSelection(TEXT_SELECTION_NONE) -, m_bCopyOnSelect(FALSE) -, m_bInverseShift(FALSE) -, m_hdcSelection(NULL) -, m_hbmpSelection(NULL) -, m_hbmpSelectionOld(NULL) -, m_hbrushSelection(::CreateSolidBrush(RGB(0xff, 0xff, 0xff))) -, m_pScreenBuffer(NULL) -, m_pScreenBufferNew(NULL) -, m_nTextColor(15) -, m_nTextBgColor(0) -{ - - - m_mouseCursorOffset.x = 0; - m_mouseCursorOffset.y = 0; - - m_coordSelOrigin.X = 0; - m_coordSelOrigin.Y = 0; - - ::ZeroMemory(&m_rectSelection, sizeof(RECT)); - - - ::ZeroMemory(&m_csbiCursor, sizeof(CONSOLE_SCREEN_BUFFER_INFO)); - ::ZeroMemory(&m_csbiConsole, sizeof(CONSOLE_SCREEN_BUFFER_INFO)); - - SetDefaultConsoleColors(); - - AllocateBuffer(); - - // Set the stdout and stderr to this window - HANDLE myOut; - ::CreatePipe( &m_hStdOut, &myOut, NULL, 0); - ::SetStdHandle( STD_OUTPUT_HANDLE, myOut); - ::SetStdHandle( STD_ERROR_HANDLE, myOut); - - int hConHandle = _open_osfhandle((long)myOut, _O_BINARY); //_O_WTEXT); - FILE *fp = _fdopen( hConHandle, "w" ); - *stdout = *fp; - *stderr = *fp; - setvbuf( stdout, NULL, _IONBF, 0 ); - - // create text monitor thread - DWORD dwThreadID; - m_hMonitorThread = ::CreateThread(NULL, 0, Console::MonitorThreadStatic, this, CREATE_SUSPENDED, &dwThreadID); - ::ResumeThread(m_hMonitorThread); -} - -Console::~Console() { - - delete[] m_pScreenBuffer; - delete[] m_pScreenBufferNew; - - if (m_hSmallIcon) ::DestroyIcon(m_hSmallIcon); - if (m_hBigIcon) ::DestroyIcon(m_hBigIcon); - -// ::CloseHandle(m_hConsoleProcess); -// ::CloseHandle(m_hQuitEvent); - - // shutdown console process -// ::CloseHandle(m_hStdOut); -// ::CloseHandle(m_hStdOutFresh); -// if (m_hWndConsole) ::SendMessage(m_hWndConsole, WM_CLOSE, 0, 0); -// ::FreeConsole(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Public methods - -///////////////////////////////////////////////////////////////////////////// -// creates and shows Console window - -BOOL Console::Create(HWND notify) { - - m_notifyhWnd = notify; - - if (m_hWnd) - { - ::ShowWindow( m_hWnd, SW_SHOW); - return TRUE; - } - - if (!GetOptions()) return FALSE; - - if (!RegisterWindowClasses()) return FALSE; - - if (!CreateConsoleWindow()) return FALSE; - - // create window DC - HDC hdcDesktop = ::GetDCEx(m_hWnd, NULL, 0); - m_hdcConsole = ::CreateCompatibleDC(hdcDesktop); - m_hdcWindow = ::CreateCompatibleDC(hdcDesktop); - ::ReleaseDC(m_hWnd, hdcDesktop); - - // create selection DC - m_hdcSelection = ::CreateCompatibleDC(m_hdcWindow); - - if (!SetupMenus()) return FALSE; - - CreateNewFont(); - CreateNewBrush(); - -// SetWindowTransparency(); - SetWindowIcons(); - - GetTextSize(); - GetBordersDimensions(); - CreateCursor(); - - // now we can start the monitor thread - StartShellProcess(); - - // set the long repaint timer - if (m_dwMasterRepaintInt) ::SetTimer(m_hWnd, TIMER_REPAINT_MASTER, m_dwMasterRepaintInt, NULL); - - m_bInitializing = FALSE; - - // register for files/folders drag-n-drop - ::DragAcceptFiles(m_hWnd, TRUE); - - RefreshScreenBuffer(); - ::CopyMemory(m_pScreenBuffer, m_pScreenBufferNew, sizeof(CHAR_INFO) * m_dwRows * m_dwColumns); - RepaintWindow(); - ::UpdateWindow(m_hWnd); - - if (m_bStartMinimized) { - if (m_dwTaskbarButton > TASKBAR_BUTTON_NORMAL) { - m_bHideWindow = TRUE; - } else { - ::ShowWindow(m_hWnd, SW_MINIMIZE); - } - } else { - ::ShowWindow(m_hWnd, SW_SHOW); - } - - ::SetForegroundWindow(m_hWnd); - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Message handlers - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnDestroy() { - - if (!m_bInitializing) { - ::SetEvent(m_hQuitEvent); - ::WaitForSingleObject(m_hMonitorThread, 2000); - ::CloseHandle(m_hMonitorThread); - - // kill timers - ::KillTimer(m_hWnd, TIMER_REPAINT_CHANGE); - if (m_dwMasterRepaintInt) ::KillTimer(m_hWnd, TIMER_REPAINT_MASTER); - - DestroyCursor(); - - // cleanup graphics objects - if (m_hFontOld) ::SelectObject(m_hdcConsole, m_hFontOld); - if (m_hFont) ::DeleteObject(m_hFont); - - if (m_hBkBrush) ::DeleteObject(m_hBkBrush); - - if (m_hbmpConsoleOld) ::SelectObject(m_hdcConsole, m_hbmpConsoleOld); - if (m_hbmpConsole) ::DeleteObject(m_hbmpConsole); - - if (m_hbmpWindowOld) ::SelectObject(m_hdcWindow, m_hbmpWindowOld); - if (m_hbmpWindow) ::DeleteObject(m_hbmpWindow); - - if (m_hbmpBackgroundOld) ::SelectObject(m_hdcBackground, m_hbmpBackgroundOld); - if (m_hbmpBackground) ::DeleteObject(m_hbmpBackground); - if (m_hdcBackground) ::DeleteDC(m_hdcBackground); - - if (m_hbmpSelectionOld) ::SelectObject(m_hdcSelection, m_hbmpSelectionOld); - if (m_hbmpSelection)::DeleteObject(m_hbmpSelection); - if (m_hdcSelection) ::DeleteDC(m_hdcSelection); - - if (m_hbrushSelection) ::DeleteObject(m_hbrushSelection); - - ::DestroyMenu(m_hConfigFilesMenu); - ::DestroyMenu(m_hPopupMenu); - - SetTrayIcon(NIM_DELETE); - - ::DeleteDC(m_hdcConsole); - ::DeleteDC(m_hdcWindow); - ::PostQuitMessage(0); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnNcDestroy() { - if (!m_bInitializing) delete this; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnPaint() { - - PAINTSTRUCT paintStruct; - HDC hdc = ::BeginPaint(m_hWnd, &paintStruct); - - if (!m_nTextSelection) { - // if there's no selection, just blit console image - ::BitBlt( - hdc, - paintStruct.rcPaint.left, - paintStruct.rcPaint.top, - paintStruct.rcPaint.right - paintStruct.rcPaint.left + 1, - paintStruct.rcPaint.bottom - paintStruct.rcPaint.top + 1, - m_hdcConsole, - paintStruct.rcPaint.left, - paintStruct.rcPaint.top, - SRCCOPY); - } else { - // there's a text selection, first compose the image in an off-screen - // buffer, and then blit it - ::BitBlt( - m_hdcWindow, - paintStruct.rcPaint.left, - paintStruct.rcPaint.top, - paintStruct.rcPaint.right - paintStruct.rcPaint.left + 1, - paintStruct.rcPaint.bottom - paintStruct.rcPaint.top + 1, - m_hdcConsole, - paintStruct.rcPaint.left, - paintStruct.rcPaint.top, - SRCCOPY); - - ::BitBlt( - m_hdcWindow, - m_rectSelection.left, - m_rectSelection.top, - m_rectSelection.right - m_rectSelection.left, - m_rectSelection.bottom - m_rectSelection.top, - m_hdcSelection, - 0, - 0, - SRCINVERT); - ::BitBlt( - hdc, - paintStruct.rcPaint.left, - paintStruct.rcPaint.top, - paintStruct.rcPaint.right - paintStruct.rcPaint.left + 1, - paintStruct.rcPaint.bottom - paintStruct.rcPaint.top + 1, - m_hdcWindow, - paintStruct.rcPaint.left, - paintStruct.rcPaint.top, - SRCCOPY); - } - - ::EndPaint(m_hWnd, &paintStruct); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnPaintTimer() { - - ::KillTimer(m_hWnd, TIMER_REPAINT_CHANGE); - RefreshStdOut(); - RefreshScreenBuffer(); - - if (GetChangeRate() > 15) { - ::CopyMemory(m_pScreenBuffer, m_pScreenBufferNew, sizeof(CHAR_INFO) * m_dwRows * m_dwColumns); - RepaintWindow(); - } else { - RepaintWindowChanges(); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnCursorTimer() { - if (m_pCursor) { - m_pCursor->PrepareNext(); - DrawCursor(); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnWindowPosChanging(WINDOWPOS* lpWndPos) { - - if (!(lpWndPos->flags & SWP_NOMOVE)) { - if (m_nSnapDst >= 0) { - // we'll snap Console window to the desktop edges - RECT rectDesktop; - - GetDesktopRect(rectDesktop); - - m_dwDocked = DOCK_NONE; - DWORD dwLeftRight = 0; - DWORD dwTopBottom = 0; - - // now, see if we're close to the edges - if (lpWndPos->x <= rectDesktop.left + m_nSnapDst) { - lpWndPos->x = rectDesktop.left; - dwLeftRight = 1; - } - - if (lpWndPos->x >= rectDesktop.right - m_nWindowWidth - m_nSnapDst) { - lpWndPos->x = rectDesktop.right - m_nWindowWidth; - dwLeftRight = 2; - } - - if (lpWndPos->y <= rectDesktop.top + m_nSnapDst) { - lpWndPos->y = rectDesktop.top; - dwTopBottom = 1; - } - - if (lpWndPos->y >= rectDesktop.bottom - m_nWindowHeight - m_nSnapDst) { - lpWndPos->y = rectDesktop.bottom - m_nWindowHeight; - dwTopBottom = 2; - } - - // now, see if the window is docked - if (dwLeftRight == 1) { - // left edge - if (dwTopBottom == 1) { - // top left - m_dwDocked = DOCK_TOP_LEFT; - } else if (dwTopBottom == 2) { - // bottom left - m_dwDocked = DOCK_BOTTOM_LEFT; - } - } else if (dwLeftRight == 2) { - // right edge - if (dwTopBottom == 1) { - // top right - m_dwDocked = DOCK_TOP_RIGHT; - } else if (dwTopBottom == 2) { - // bottom right - m_dwDocked = DOCK_BOTTOM_RIGHT; - } - } - } - - m_nX = lpWndPos->x; - m_nY = lpWndPos->y; - -// TRACE(_T("Win pos: %ix%i\n"), m_nX, m_nY); - - // we need to repaint for relative backgrounds -// if (m_bRelativeBackground && !m_bInitializing) RepaintWindow(); - } - - if (m_dwCurrentZOrder == Z_ORDER_ONBOTTOM) lpWndPos->hwndInsertAfter = HWND_BOTTOM; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnActivateApp(BOOL bActivate, DWORD dwFlags) { - - if (m_pCursor) { - m_pCursor->SetState(bActivate); - DrawCursor(); - } - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnVScroll(WPARAM wParam) { - -// TRACE(_T("VScroll\n")); - - int nCurrentPos = ::GetScrollPos(m_hWnd, SB_VERT); - int nDelta = 0; - - switch(LOWORD (wParam)) { - - case SB_PAGEUP: - nDelta = -5; - break; - - case SB_PAGEDOWN: - nDelta = 5; - break; - - case SB_LINEUP: - nDelta = -1; - break; - - case SB_LINEDOWN: - nDelta = 1; - break; - - case SB_THUMBTRACK: - nDelta = HIWORD(wParam) - nCurrentPos; - break; - - case SB_ENDSCROLL: - - return; - - default: - return; - } - - if ((nDelta = max(-nCurrentPos, min(nDelta, (int)(m_dwBufferRows-m_dwRows) - nCurrentPos))) != 0) { - - nCurrentPos += nDelta; - - SMALL_RECT sr; - sr.Top = (short) nCurrentPos; -// sr.Bottom = nDelta; - sr.Left = sr.Right = 0; - m_csbiConsole.srWindow = sr; -// ::SetConsoleWindowInfo(m_hStdOutFresh, FALSE, &sr); - - SCROLLINFO si; - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = nCurrentPos; - ::FlatSB_SetScrollInfo(m_hWnd, SB_VERT, &si, TRUE); - - // this seems to work/look much better than direct repainting... - ::SetTimer(m_hWnd, TIMER_REPAINT_CHANGE, m_dwChangeRepaintInt, NULL); - } - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnInputLangChangeRequest(WPARAM wParam, LPARAM lParam) { - ::PostMessage(m_hWndConsole, WM_INPUTLANGCHANGEREQUEST, wParam, lParam); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnLButtonDown(UINT uiFlags, POINTS points) { -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnLButtonUp(UINT uiFlags, POINTS points) { - - if ((m_nTextSelection == TEXT_SELECTION_SELECTED) || - // X Windows select/copy style - ((m_nTextSelection == TEXT_SELECTION_SELECTING) && (m_bCopyOnSelect))) { - - // if the user clicked inside the selection rectangle, copy data - if ((points.x >= m_rectSelection.left) && - (points.x <= m_rectSelection.right) && - (points.y >= m_rectSelection.top) && - (points.y <= m_rectSelection.bottom)) { - - CopyTextToClipboard(); - } - - if (m_bCopyOnSelect) ::ReleaseCapture(); - ClearSelection(); - - } else if (m_nTextSelection == TEXT_SELECTION_SELECTING) { - - if ((m_rectSelection.left == m_rectSelection.right) && - (m_rectSelection.top == m_rectSelection.bottom)) { - - m_nTextSelection = TEXT_SELECTION_NONE; - - } else { - m_nTextSelection = TEXT_SELECTION_SELECTED; - } - ::ReleaseCapture(); - - } else if (m_bMouseDragable) { - // end window drag - ::ReleaseCapture(); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnLButtonDblClick(UINT uiFlags, POINTS points) { - -// ToggleWindowOnTop(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnRButtonUp(UINT uiFlags, POINTS points) { - - if (uiFlags & MK_SHIFT) { - PasteClipoardText(); - } else { - - if (m_bPopupMenuDisabled) return; - - POINT point; - point.x = points.x; - point.y = points.y; - ::ClientToScreen(m_hWnd, &point); - - HMENU hPopup = ::GetSubMenu(m_hPopupMenu, 0); - - // show popup menu - ::TrackPopupMenu(hPopup, 0, point.x, point.y, 0, m_hWnd, NULL); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnMButtonDown(UINT uiFlags, POINTS points) { - - PasteClipoardText(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnMouseMove(UINT uiFlags, POINTS points) { - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnChar(WORD myChar) { - wchar_t text[16]; - - if (myChar == 8) - { - int l = Input.length(); - if (l > 0) - { - wchar_t last = Input[ l - 1]; - if (last == '\n') - { - return; - } - - text[0] = 8; - text[1] = L' '; - text[2] = 8; - text[3] = 0; - - Input.resize( l - 1); - } - else - { - return; - } - } - else if (myChar == '\r') - { - text[0] = '\n'; - text[1] = '\r'; - text[2] = 0; - Input += '\n'; - SendTextToConsole( text); - SendMessage( m_notifyhWnd, WM_INPUTREADY, 0, (LPARAM) &Input); - return; - } - else - { - text[0] = myChar; - text[1] = 0; - Input += text; - } - - SendTextToConsole( text); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnSetCursor(WORD wHitTest, WORD wMouseMessage) { - - if (wHitTest == HTBORDER) { - if (wMouseMessage == WM_LBUTTONDOWN) { - if (m_bMouseDragable) { - // start to drag window - RECT windowRect; - ::GetCursorPos(&m_mouseCursorOffset); - ::GetWindowRect(m_hWnd, &windowRect); - m_mouseCursorOffset.x -= windowRect.left; - m_mouseCursorOffset.y -= windowRect.top; - ::SetCapture(m_hWnd); - } - } else if (wMouseMessage == WM_LBUTTONUP) { - if (m_bMouseDragable) { - // end window drag - ::ReleaseCapture(); - } - } - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnInitMenuPopup(HMENU hMenu, UINT uiPos, BOOL bSysMenu) { - - if ((hMenu != ::GetSubMenu(m_hPopupMenu, 0)) && (hMenu != m_hSysMenu)) return; - - // update configuration files submenu - UpdateConfigFilesSubmenu(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnDropFiles(HDROP hDrop) { - - UINT uiFilesCount = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0); - tstring strFilenames(_T("")); - - // concatenate all filenames - for (UINT i = 0; i < uiFilesCount; ++i) { - TCHAR szFilename[MAX_PATH]; - ::ZeroMemory(szFilename, sizeof(szFilename)); - - ::DragQueryFile(hDrop, i, szFilename, MAX_PATH); - - tstring strFilename(szFilename); - - // if there are spaces in the filename, put quotes around it - if (strFilename.find(_T(" ")) != tstring::npos) strFilename = tstring(_T("\"")) + strFilename + tstring(_T("\"")); - - if (i > 0) strFilenames += _T(" "); - strFilenames += strFilename; - - } - ::DragFinish(hDrop); - - // This function takes text, not file names -// SendTextToConsole(strFilenames.c_str()); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::OnCommand(WPARAM wParam, LPARAM lParam) -{ - if (HIWORD(wParam) == 0) { - // popup menu - return HandleMenuCommand(LOWORD(wParam)); - } - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::OnSysCommand(WPARAM wParam, LPARAM lParam) { - - return HandleMenuCommand(wParam); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::OnTrayNotify(WPARAM wParam, LPARAM lParam) { - - switch (lParam) { - case WM_RBUTTONUP: { - - if (m_bPopupMenuDisabled) return; - - POINT posCursor; - - ::GetCursorPos(&posCursor); - // show popup menu - ::SetForegroundWindow(m_hWnd); - ::TrackPopupMenu(::GetSubMenu(m_hPopupMenu, 0), 0, posCursor.x, posCursor.y, 0, m_hWnd, NULL); - ::PostMessage(m_hWnd, WM_NULL, 0, 0); - - return; - } - - case WM_LBUTTONDOWN: - m_bHideWindow = false; - ShowHideWindow(); - ::SetForegroundWindow(m_hWnd); - return; - - case WM_LBUTTONDBLCLK: - m_bHideWindow = !m_bHideWindow; - ShowHideWindow(); - ::SetForegroundWindow(m_hWnd); - return; - - default : return; - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::GetOptions() { - - return 1; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::RegisterWindowClasses() { - WNDCLASSEX wcx; - - // register the Console window class - ::ZeroMemory(&wcx, sizeof(WNDCLASSEX)); - wcx.cbSize = sizeof(wcx); - wcx.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS; - wcx.lpfnWndProc = Console::WindowProc; - wcx.cbClsExtra = 0; - wcx.cbWndExtra = sizeof(void*); - wcx.hInstance = ghInstance; - wcx.hIcon = ::LoadIcon(ghInstance, MAKEINTRESOURCE(IDI_ICON2)); - wcx.hCursor = ::LoadCursor(NULL, IDC_ARROW); - wcx.hbrBackground = ::CreateSolidBrush(RGB(0, 0, 0)); - wcx.lpszMenuName = NULL; - wcx.lpszClassName = Console::m_szConsoleClass; - wcx.hIconSm = NULL; - - if ((::RegisterClassEx(&wcx) == 0) && (::GetLastError() != ERROR_CLASS_ALREADY_EXISTS)) return FALSE; - - // register the hidden parent window class - ::ZeroMemory(&wcx, sizeof(WNDCLASSEX)); - wcx.cbSize = sizeof(wcx); - wcx.style = 0; - wcx.lpfnWndProc = ::DefWindowProc; - wcx.cbClsExtra = 0; - wcx.cbWndExtra = 0; - wcx.hInstance = ghInstance; - wcx.hIcon = NULL; - wcx.hCursor = ::LoadCursor(NULL, IDC_ARROW); - wcx.hbrBackground = NULL; - wcx.lpszMenuName = NULL; - wcx.lpszClassName = Console::m_szHiddenParentClass; - wcx.hIconSm = NULL; - - if ((::RegisterClassEx(&wcx) == 0) && (::GetLastError() != ERROR_CLASS_ALREADY_EXISTS)) return FALSE; - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::SetupMenus() { - - MENUITEMINFO mii; - - // setup popup menu - if ((m_hPopupMenu = ::LoadMenu(ghInstance, MAKEINTRESOURCE(IDR_POPUP_MENU))) == NULL) return FALSE; - if ((m_hConfigFilesMenu = ::CreateMenu()) == NULL) return FALSE; - - // add stuff to the system menu - TCHAR* arrMenuItems[] = {_T("&Copy"), _T("&Paste")}; - DWORD arrMenuTypes[] = {MFT_STRING, MFT_STRING}; - DWORD arrMenuIDs[] = { ID_COPY, ID_PASTE}; - - m_hSysMenu = ::GetSystemMenu(m_hWnd, FALSE); - - for (int i = 0; i < sizeof(arrMenuIDs)/sizeof(arrMenuIDs[0]); ++i) { - ::ZeroMemory(&mii, sizeof(MENUITEMINFO)); - mii.cbSize = sizeof(MENUITEMINFO); - mii.fMask = MIIM_TYPE | MIIM_ID; - mii.fType = arrMenuTypes[i]; - if (mii.fType == MFT_STRING) { - mii.wID = arrMenuIDs[i]; - mii.dwTypeData = arrMenuItems[i]; - mii.cch = _tcslen(arrMenuItems[i]); - } else { - mii.wID = 0; - } - ::InsertMenuItem(m_hSysMenu, SC_CLOSE, FALSE, &mii); - } - - // set config files menu as a submenu of "Select configuration file" item - // in the popup and system menus - ::ZeroMemory(&mii, sizeof(MENUITEMINFO)); - mii.cbSize = sizeof(MENUITEMINFO); - mii.fMask = MIIM_SUBMENU; - mii.hSubMenu = m_hConfigFilesMenu; - -// ::SetMenuItemInfo(m_hPopupMenu, ID_SEL_CONFIG_FILE, FALSE, &mii); -// ::SetMenuItemInfo(m_hSysMenu, ID_SEL_CONFIG_FILE, FALSE, &mii); - - // load the initial list (so the list can be used by external programs) - UpdateConfigFilesSubmenu(); - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::CreateConsoleWindow() { - - // create the window - DWORD dwWindowStyle = WS_VSCROLL; - if (m_dwTaskbarButton == TASKBAR_BUTTON_NORMAL) dwWindowStyle |= WS_MINIMIZEBOX; - - switch (m_dwWindowBorder) { - case BORDER_NONE : - dwWindowStyle |= WS_POPUPWINDOW & ~WS_BORDER; - break; - case BORDER_REGULAR : - dwWindowStyle |= WS_CAPTION|WS_SYSMENU; - break; - - case BORDER_THIN : - dwWindowStyle |= WS_POPUPWINDOW; - break; - - default: dwWindowStyle |= WS_POPUPWINDOW & ~WS_BORDER; - } - - // If the taskbar style is set to hide or tray, we create an invisible window - // to parent the main window to. This hides the taskbar button while allowing - // us to use the normal title bar. - if (m_dwTaskbarButton > TASKBAR_BUTTON_NORMAL) { - if ((m_hwndInvisParent = ::CreateWindowEx( - WS_EX_TOOLWINDOW, - Console::m_szHiddenParentClass, - _T(""), - WS_POPUP, - 0, - 0, - 0, - 0, - NULL, - NULL, - ghInstance, - NULL)) == NULL) { - - return FALSE; - } - - // don't let the user minimize it if there's no way to restore it - if (m_dwTaskbarButton == TASKBAR_BUTTON_HIDE) dwWindowStyle &= ~WS_MINIMIZEBOX; - } - - - if ((m_hWnd = ::CreateWindowEx( - 0, //m_dwTaskbarButton > TASKBAR_BUTTON_NORMAL ? WS_EX_TOOLWINDOW : 0, - Console::m_szConsoleClass, - m_strWindowTitle.c_str(), - dwWindowStyle, - ((m_nX == -1) || (m_nY == -1)) ? CW_USEDEFAULT : 0, - 0, - 0, - 0, - m_hwndInvisParent, - NULL, - ghInstance, - NULL)) == NULL) { - - return FALSE; - } - - ::SetWindowLongPtr( m_hWnd, GWLP_USERDATA, (LONG_PTR)this); - - if ((m_nX == -1) || (m_nY == -1)) { - RECT rectWindow; - - ::GetWindowRect(m_hWnd, &rectWindow); - m_nX = (int)rectWindow.left; - m_nY = (int)rectWindow.top; - } - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::CreateNewFont() { - - // create a new font - if (m_hFontOld) ::SelectObject(m_hdcConsole, m_hFontOld); - if (m_hFont) ::DeleteObject(m_hFont); - - m_hFont = ::CreateFont( - -MulDiv(m_dwFontSize, ::GetDeviceCaps(m_hdcConsole, LOGPIXELSY), 72), - 0, - 0, - 0, - m_bBold ? FW_BOLD : 0, - m_bItalic, - FALSE, - FALSE, - DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - DEFAULT_PITCH, - m_strFontName.c_str()); - - m_hFontOld = (HFONT)::SelectObject(m_hdcConsole, m_hFont); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::CreateNewBrush() { - - // create a new background brush - if (m_hBkBrush) ::DeleteObject(m_hBkBrush); - m_hBkBrush = ::CreateSolidBrush(m_crBackground); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::CreateCursor() { - switch (m_dwCursorStyle) { - case CURSOR_STYLE_XTERM : - m_pCursor = (Cursor*)new XTermCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_BLOCK : - m_pCursor = (Cursor*)new BlockCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_NBBLOCK : - m_pCursor = (Cursor*)new NBBlockCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_PULSEBLOCK : - m_pCursor = (Cursor*)new PulseBlockCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_BAR : - m_pCursor = (Cursor*)new BarCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_CONSOLE : - m_pCursor = (Cursor*)new ConsoleCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_NBHLINE : - m_pCursor = (Cursor*)new NBHLineCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_HLINE : - m_pCursor = (Cursor*)new HLineCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_VLINE : - m_pCursor = (Cursor*)new VLineCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_RECT : - m_pCursor = (Cursor*)new RectCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_NBRECT : - m_pCursor = (Cursor*)new NBRectCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_PULSERECT : - m_pCursor = (Cursor*)new PulseRectCursor(m_hWnd, m_hdcConsole, m_crCursorColor); - break; - case CURSOR_STYLE_FADEBLOCK : - m_pCursor = (Cursor*)new FadeBlockCursor(m_hWnd, m_hdcConsole, m_crCursorColor, m_crBackground); - break; - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::CreateOffscreenBuffers() { - - HDC hdcDesktop = ::GetDCEx(m_hWnd, NULL, 0); - - // create new window bitmap - if (m_hbmpConsoleOld) ::SelectObject(m_hdcConsole, m_hbmpConsoleOld); - if (m_hbmpConsole) ::DeleteObject(m_hbmpConsole); - - m_hbmpConsole = ::CreateCompatibleBitmap(hdcDesktop, m_nClientWidth, m_nClientHeight); - m_hbmpConsoleOld = (HBITMAP)::SelectObject(m_hdcConsole, m_hbmpConsole); - - if (m_hbmpWindowOld) ::SelectObject(m_hdcWindow, m_hbmpWindowOld); - if (m_hbmpWindow) ::DeleteObject(m_hbmpWindow); - - m_hbmpWindow = ::CreateCompatibleBitmap(hdcDesktop, m_nClientWidth, m_nClientHeight); - m_hbmpWindowOld = (HBITMAP)::SelectObject(m_hdcWindow, m_hbmpWindow); - - // create selection bitmap - if (m_hbmpSelectionOld) ::SelectObject(m_hdcSelection, m_hbmpSelectionOld); - if (m_hbmpSelection) ::DeleteObject(m_hbmpSelection); - - m_hbmpSelection = ::CreateCompatibleBitmap(m_hdcWindow, m_nClientWidth, m_nClientHeight); - m_hbmpSelectionOld = (HBITMAP)::SelectObject(m_hdcSelection, m_hbmpSelection); - - RECT rect; - rect.left = 0; - rect.top = 0; - rect.right = m_nClientWidth; - rect.bottom = m_nClientHeight; - ::FillRect(m_hdcSelection, &rect, m_hbrushSelection); - - ::ReleaseDC(m_hWnd, hdcDesktop); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::GetTextSize() { - - TEXTMETRIC textMetric; - ::GetTextMetrics(m_hdcConsole, &textMetric); - - m_nCharHeight = textMetric.tmHeight; - - if (!(textMetric.tmPitchAndFamily & TMPF_FIXED_PITCH)) { - // fixed pitch font (TMPF_FIXED_PITCH is cleared!!!) - m_nCharWidth = textMetric.tmAveCharWidth; - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::GetBordersDimensions() { - - WINDOWINFO wndInfo; - TITLEBARINFO titlebarInfo; - - ::ZeroMemory(&wndInfo, sizeof(WINDOWINFO)); - ::ZeroMemory(&titlebarInfo, sizeof(TITLEBARINFO)); - - wndInfo.cbSize = sizeof(WINDOWINFO); - titlebarInfo.cbSize = sizeof(TITLEBARINFO); - - ::GetWindowInfo(m_hWnd, &wndInfo); - ::GetTitleBarInfo(m_hWnd, &titlebarInfo); - - m_nXBorderSize = wndInfo.cxWindowBorders; - m_nYBorderSize = wndInfo.cyWindowBorders; - m_nCaptionSize = (titlebarInfo.rgstate[0] & STATE_SYSTEM_INVISIBLE) ? 0 : titlebarInfo.rcTitleBar.bottom - titlebarInfo.rcTitleBar.top; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::CalcWindowSize() { - - m_nClientHeight = m_dwRows * m_nCharHeight + 2*m_nInsideBorder; - - if (m_nCharWidth > 0) { - // fixed pitch font - m_nClientWidth = m_dwColumns * m_nCharWidth + 2*m_nInsideBorder; - } else { - // variable pitch font - int nCharWidth; - ::GetCharWidth32(m_hdcConsole, _TCHAR('m'), _TCHAR('m'), &nCharWidth); - m_nClientWidth = m_dwColumns * nCharWidth; - } - - switch (m_dwWindowBorder) { - case BORDER_NONE : - m_nWindowHeight = m_nClientHeight; - m_nWindowWidth = m_nClientWidth; - break; - - case BORDER_REGULAR : { - - m_nWindowHeight = m_nClientHeight + m_nCaptionSize + 2*m_nYBorderSize; - m_nWindowWidth = m_nClientWidth + 2 * m_nXBorderSize; - - break; - } - - case BORDER_THIN : - - m_nWindowHeight = m_nClientHeight + 2*m_nYBorderSize; - m_nWindowWidth = m_nClientWidth + 2*m_nXBorderSize; - } - - if (m_bShowScrollbar) m_nWindowWidth += m_nScrollbarWidth; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::SetScrollbarStuff() { - - if (m_bUseTextBuffer) { - m_bShowScrollbar = m_dwBufferRows > m_dwRows; - } else { - m_bShowScrollbar = FALSE; - } - - // we don't call InitializeFlatSB due to some problems on Win2k, Windowblinds and new-style scrollbars - if (m_nScrollbarStyle != FSB_REGULAR_MODE) ::InitializeFlatSB(m_hWnd); - ::FlatSB_ShowScrollBar(m_hWnd, SB_VERT, m_bShowScrollbar); - ::FlatSB_SetScrollRange(m_hWnd, SB_VERT, 0, m_dwBufferRows-m_dwRows, FALSE); - - // set scrollbar properties - ::FlatSB_SetScrollProp(m_hWnd, WSB_PROP_VSTYLE, m_nScrollbarStyle, FALSE); - ::FlatSB_SetScrollProp(m_hWnd, WSB_PROP_VBKGCOLOR, m_crScrollbarColor, FALSE); - ::FlatSB_SetScrollProp(m_hWnd, WSB_PROP_CXVSCROLL , m_nScrollbarWidth, FALSE); - ::FlatSB_SetScrollProp(m_hWnd, WSB_PROP_CYVSCROLL, m_nScrollbarButtonHeight, FALSE); - ::FlatSB_SetScrollProp(m_hWnd, WSB_PROP_CYVTHUMB, m_nScrollbarThunmbHeight, TRUE); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::SetDefaultConsoleColors() { - - m_arrConsoleColors[0] = 0x000000; - m_arrConsoleColors[1] = 0x800000; - m_arrConsoleColors[2] = 0x008000; - m_arrConsoleColors[3] = 0x808000; - m_arrConsoleColors[4] = 0x000080; - m_arrConsoleColors[5] = 0x800080; - m_arrConsoleColors[6] = 0x008080; - m_arrConsoleColors[7] = 0xC0C0C0; - m_arrConsoleColors[8] = 0x808080; - m_arrConsoleColors[9] = 0xFF0000; - m_arrConsoleColors[10] = 0x00FF00; - m_arrConsoleColors[11] = 0xFFFF00; - m_arrConsoleColors[12] = 0x0000FF; - m_arrConsoleColors[13] = 0xFF00FF; - m_arrConsoleColors[14] = 0x00FFFF; - m_arrConsoleColors[15] = 0xFFFFFF; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::SetWindowSizeAndPosition() { - - // set window position - DWORD dwScreenWidth = ::GetSystemMetrics(SM_CXSCREEN); - DWORD dwScreenHeight = ::GetSystemMetrics(SM_CYSCREEN); - DWORD dwTop = ::GetSystemMetrics(0); - DWORD dwLeft = ::GetSystemMetrics(0); - - switch (m_dwDocked) { - case DOCK_TOP_LEFT: - // top left - m_nX = dwLeft; - m_nY = dwTop; - break; - - case DOCK_TOP_RIGHT: - // top right - m_nX = dwScreenWidth - m_nWindowWidth; - m_nY = dwTop; - break; - - case DOCK_BOTTOM_RIGHT: - // bottom right - m_nX = dwScreenWidth - m_nWindowWidth; - m_nY = dwScreenHeight - m_nWindowHeight; - break; - - case DOCK_BOTTOM_LEFT: - // bottom left - m_nX = dwLeft; - m_nY = dwScreenHeight - m_nWindowHeight; - break; - } - - HWND hwndZ = 0; - switch (m_dwCurrentZOrder) { - case Z_ORDER_REGULAR : hwndZ = HWND_NOTOPMOST; break; - case Z_ORDER_ONTOP : hwndZ = HWND_TOPMOST; break; - case Z_ORDER_ONBOTTOM : hwndZ = HWND_BOTTOM; break; - default : return; - } - - ::SetWindowPos( - m_hWnd, - hwndZ, - m_nX, - m_nY, - m_nWindowWidth, - m_nWindowHeight, - 0); - - UpdateOnTopMenuItem(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::SetWindowIcons() { - - HICON hOldIcon = NULL; - - if (m_strIconFilename.length() > 0) { - - // custom icon, try loading it... - if ((m_hSmallIcon = (HICON)::LoadImage(NULL, m_strIconFilename.c_str(), IMAGE_ICON, 16, 16, LR_LOADFROMFILE)) != NULL) { - - // icon file exists, load and set the big icon as well - m_hBigIcon = (HICON)::LoadImage(NULL, m_strIconFilename.c_str(), IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE); - hOldIcon = (HICON)::SendMessage(m_hWnd, WM_SETICON, ICON_BIG, (LPARAM)m_hBigIcon); - if (hOldIcon) ::DestroyIcon(hOldIcon); - - } else { - m_hSmallIcon = (HICON)::LoadImage(ghInstance, MAKEINTRESOURCE(IDI_ICON2), IMAGE_ICON, 16, 16, 0); - } - - } else { - m_hSmallIcon = (HICON)::LoadImage(ghInstance, MAKEINTRESOURCE(IDI_ICON2), IMAGE_ICON, 16, 16, 0); - } - - hOldIcon = (HICON)::SendMessage(m_hWnd, WM_SETICON, ICON_SMALL, (LPARAM)m_hSmallIcon); - if (hOldIcon) ::DestroyIcon(hOldIcon); - - SetTrayIcon(m_dwTaskbarButton == TASKBAR_BUTTON_TRAY ? NIM_ADD : NIM_DELETE); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::SetTrayIcon(DWORD dwMessage) { - - NOTIFYICONDATA tnd; - tstring strToolTip(m_strWindowTitle); - - tnd.cbSize = sizeof(NOTIFYICONDATA); - tnd.hWnd = m_hWnd; - tnd.uID = TRAY_ICON_ID; - tnd.uFlags = NIF_MESSAGE|NIF_ICON|NIF_TIP; - tnd.uCallbackMessage = WM_TRAY_NOTIFY; - tnd.hIcon = m_hSmallIcon; - - if (strToolTip.length() > 63) { - strToolTip.resize(59); - strToolTip += _T(" ..."); -// DWORD dw = strToolTip.length(); - } - - _tcscpy(tnd.szTip, strToolTip.c_str()); - return ::Shell_NotifyIcon(dwMessage, &tnd); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::DestroyCursor() { - - if (m_pCursor) - { - delete m_pCursor; - m_pCursor = NULL; - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::EditConfigFile() { - - // prepare editor parameters - tstring strParams(m_strConfigEditorParams); - - if (strParams.length() == 0) { - // no params, just use the config file - strParams = m_strConfigFile; - } else { - tstring::size_type nPos = strParams.find(_T("%f")); - - if (nPos == tstring::npos) { - // no '%f' in editor params, concatenate config file name - strParams += _T(" "); - strParams += m_strConfigFile; - } else { - // replace '%f' with config file name - strParams = strParams.replace(nPos, 2, m_strConfigFile); - } - } - - // start editor - ::ShellExecute(NULL, NULL, m_strConfigEditor.c_str(), strParams.c_str(), NULL, SW_SHOWNORMAL); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::ReloadSettings() { - - m_bInitializing = TRUE; - m_bReloading = TRUE; - - // suspend console monitor thread - ::SuspendThread(m_hMonitorThread); - ::KillTimer(m_hWnd, TIMER_REPAINT_CHANGE); - if (m_dwMasterRepaintInt) ::KillTimer(m_hWnd, TIMER_REPAINT_MASTER); - - // hide Windows console - ::ShowWindow(m_hWndConsole, SW_HIDE); - - // destroy icons - SetTrayIcon(NIM_DELETE); - if (m_hSmallIcon) ::DestroyIcon(m_hSmallIcon); - if (m_hBigIcon) ::DestroyIcon(m_hBigIcon); - - // destroy cursor - DestroyCursor(); - - // destory menus - ::DestroyMenu(m_hConfigFilesMenu); - ::DestroyMenu(m_hPopupMenu); - - // uninitialize flat scrollbars - if (m_nScrollbarStyle != FSB_REGULAR_MODE) ::UninitializeFlatSB(m_hWnd); - - // destory window - ::DestroyWindow(m_hWnd); - if (m_hwndInvisParent) ::DestroyWindow(m_hwndInvisParent); - - // set default values - m_strShell = _T(""); - m_strConfigEditor = _T("notepad.exe"); - m_strConfigEditorParams = _T(""); - m_dwReloadNewConfig = m_dwReloadNewConfigDefault; - m_hwndInvisParent = NULL; - m_dwMasterRepaintInt = 500; - m_dwChangeRepaintInt = 50; - m_strIconFilename = _T(""); - m_hSmallIcon = NULL; - m_hBigIcon = NULL; - m_hPopupMenu = NULL; - m_hConfigFilesMenu = NULL; - m_bPopupMenuDisabled = FALSE; - m_strWindowTitle = m_strWindowTitleDefault; - m_strWindowTitleCurrent = m_strWindowTitleDefault; - m_strFontName = _T("Courier New"); - m_dwFontSize = 10; - m_bBold = FALSE; - m_bItalic = FALSE; - m_bUseFontColor = FALSE; - m_crFontColor = RGB(0, 0, 0); - m_nWindowWidth = 0; - m_nWindowHeight = 0; - m_nXBorderSize = 5; - m_nYBorderSize = 5; - m_nCaptionSize = 0; - m_nClientWidth = 0; - m_nClientHeight = 0; - m_nCharHeight = 0; - m_nCharWidth = 0; - m_dwWindowBorder = BORDER_REGULAR; - m_bShowScrollbar = TRUE; - m_nScrollbarStyle = FSB_REGULAR_MODE; - m_crScrollbarColor = ::GetSysColor(COLOR_3DHILIGHT); - m_nScrollbarWidth = ::GetSystemMetrics(SM_CXVSCROLL); - m_nScrollbarButtonHeight= ::GetSystemMetrics(SM_CYVSCROLL); - m_nScrollbarThunmbHeight= ::GetSystemMetrics(SM_CYVTHUMB); - m_dwTaskbarButton = TASKBAR_BUTTON_NORMAL; - m_bMouseDragable = TRUE; - m_nSnapDst = 10; - m_dwDocked = DOCK_NONE; - m_dwOriginalZOrder = Z_ORDER_REGULAR; - m_dwCurrentZOrder = Z_ORDER_REGULAR; - m_dwTransparency = TRANSPARENCY_NONE; - m_byAlpha = 150; - m_byInactiveAlpha = 150; - m_crBackground = RGB(0, 0, 0); - m_crConsoleBackground = RGB(0, 0, 0); - m_bTintSet = FALSE; - m_byTintOpacity = 50; - m_byTintR = 0; - m_byTintG = 0; - m_byTintB = 0; - m_bBitmapBackground = FALSE; - m_strBackgroundFile = _T(""); - m_dwBackgroundStyle = BACKGROUND_STYLE_RESIZE; - m_bRelativeBackground = FALSE; - m_bExtendBackground = FALSE; - m_bHideWindow = FALSE; - m_bHideConsole = TRUE; - m_dwCursorStyle = CURSOR_STYLE_CONSOLE; - m_bStartMinimized = FALSE; - m_crCursorColor = RGB(255, 255, 255); - m_bCursorVisible = TRUE; - m_dwRows = 50; - m_dwColumns = 80; - m_dwBufferRows = 500; - m_bUseTextBuffer = TRUE; - m_bCopyOnSelect = FALSE; - - m_nTextColor = 15; - m_nTextBgColor = 0; - - SetDefaultConsoleColors(); - - GetOptions(); - - CreateConsoleWindow(); - - SetupMenus(); - - CreateNewFont(); - CreateNewBrush(); - -// SetWindowTransparency(); - SetWindowIcons(); - - CreateCursor(); - - RefreshStdOut(); - GetTextSize(); - GetBordersDimensions(); - InitConsoleWndSize(m_dwColumns); - ResizeConsoleWindow(); -// ShowHideConsole(); - - m_bInitializing = FALSE; - m_bReloading = FALSE; - - RefreshScreenBuffer(); - ::CopyMemory(m_pScreenBuffer, m_pScreenBufferNew, sizeof(CHAR_INFO) * m_dwRows * m_dwColumns); - RepaintWindow(); - - if (m_dwMasterRepaintInt) ::SetTimer(m_hWnd, TIMER_REPAINT_MASTER, m_dwMasterRepaintInt, NULL); - - if (m_bStartMinimized) { - if (m_dwTaskbarButton > TASKBAR_BUTTON_NORMAL) { - m_bHideWindow = TRUE; - } else { - ::ShowWindow(m_hWnd, SW_MINIMIZE); - } - } else { - ::ShowWindow(m_hWnd, SW_SHOW); - } - - ::SetForegroundWindow(m_hWnd); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::StartShellProcess() { - - - // this is a little hack needed to support columns greater than standard 80 - RefreshStdOut(); - InitConsoleWndSize(80); - ResizeConsoleWindow(); - - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::RefreshStdOut() { -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::RefreshScreenBuffer() { - // if we're initializing, do nothing - if (m_bInitializing) return; - -// ::GetConsoleScreenBufferInfo(m_hStdOutFresh, &m_csbiConsole); - - SCROLLINFO si; - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - si.nPos = (int)m_csbiConsole.srWindow.Top; - ::FlatSB_SetScrollInfo(m_hWnd, SB_VERT, &si, TRUE); - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::InitConsoleWndSize(DWORD dwColumns) { - - if (m_nTextSelection) ClearSelection(); - - // get max console size -// COORD coordMaxSize; -// coordMaxSize = ::GetLargestConsoleWindowSize(m_hStdOutFresh); - - // calc max window size - RECT rectDesktop; - GetDesktopRect(rectDesktop); - - DWORD dwMaxColumns = (rectDesktop.right - rectDesktop.left - 2*m_nInsideBorder - 2*m_nXBorderSize - m_nScrollbarWidth)/m_nCharWidth; - DWORD dwMaxRows = (rectDesktop.bottom - rectDesktop.top - 2*m_nInsideBorder - m_nYBorderSize - m_nCaptionSize)/m_nCharHeight; - -// if (m_dwColumns == 0) m_dwColumns = coordMaxSize.X < dwMaxColumns ? coordMaxSize.X : dwMaxColumns; -// if (m_dwRows == 0) m_dwRows = coordMaxSize.Y < dwMaxRows ? coordMaxSize.Y : dwMaxRows; - if (m_dwColumns == 0) m_dwColumns = dwMaxColumns; - if (m_dwRows == 0) m_dwRows = dwMaxRows; - if (m_dwBufferRows < m_dwRows) m_dwBufferRows = m_dwRows; - - COORD coordConsoleSize; - coordConsoleSize.X = (SHORT)dwColumns; - coordConsoleSize.Y = (SHORT)m_dwBufferRows; - - SMALL_RECT srConsoleRect; - srConsoleRect.Top = srConsoleRect.Left =0; -// srConsoleRect.Right = dwColumns - 1; -// srConsoleRect.Bottom= m_dwRows - 1; - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::ResizeConsoleWindow() { - - m_bInitializing = TRUE; - - if (m_nTextSelection) ClearSelection(); - -// CONSOLE_SCREEN_BUFFER_INFO csbi; -// ::GetConsoleScreenBufferInfo(m_hStdOutFresh, &csbi); - - // in case buffer rows increased since last resize, and we're not using text buffer - if (!m_bUseTextBuffer) m_dwBufferRows = m_dwRows; - - COORD coordBuffersSize; - coordBuffersSize.X = (SHORT)m_dwColumns; - coordBuffersSize.Y = (SHORT)m_dwBufferRows; - - SMALL_RECT srConsoleRect; - srConsoleRect.Top = srConsoleRect.Left =0; -// srConsoleRect.Right = m_dwColumns - 1; -// srConsoleRect.Bottom= m_dwRows - 1; - - - SetScrollbarStuff(); - CalcWindowSize(); - SetWindowSizeAndPosition(); - CreateOffscreenBuffers(); - -// if (m_bBitmapBackground) CreateBackgroundBitmap(); -} - -void Console::AllocateBuffer() -{ - // resize screen buffer - delete[] m_pScreenBuffer; - m_pScreenBuffer = new CHAR_INFO[m_dwRows * m_dwColumns]; - m_pScreenBufferNew = new CHAR_INFO[m_dwBufferRows * m_dwColumns]; - ::ZeroMemory( m_pScreenBufferNew, m_dwBufferRows * m_dwColumns * sizeof(CHAR_INFO)); - - m_bInitializing = FALSE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::RepaintWindow() { - - RECT rect; - rect.top = 0; - rect.left = 0; - rect.bottom = m_nClientHeight; - rect.right = m_nClientWidth; - - ::FillRect(m_hdcConsole, &rect, m_hBkBrush); -// } - - DWORD dwX = m_nInsideBorder; - DWORD dwY = m_nInsideBorder; - DWORD dwOffset = m_csbiConsole.srWindow.Top * m_dwColumns; - - WORD attrBG; - - // stuff used for caching - int nBkMode = TRANSPARENT; - COLORREF crBkColor = RGB(0, 0, 0); - COLORREF crTxtColor = RGB(0, 0, 0); - -// int nNewBkMode = TRANSPARENT; -// COLORREF crNewBkColor = RGB(0, 0, 0); -// COLORREF crNewTxtColor = RGB(0, 0, 0); - - bool bTextOut = false; - - wstring strText(L""); - - memcpy(m_pScreenBuffer, m_pScreenBufferNew + dwOffset, sizeof(CHAR_INFO)*m_dwRows * m_dwColumns); - dwOffset = 0; - - if (m_nCharWidth > 0) { - // fixed pitch font - for (DWORD i = 0; i < m_dwRows; ++i) { - - dwX = m_nInsideBorder; - dwY = i*m_nCharHeight + m_nInsideBorder; - - nBkMode = TRANSPARENT; - crBkColor = RGB(0, 0, 0); - crTxtColor = RGB(0, 0, 0); - - bTextOut = false; - - attrBG = m_pScreenBuffer[dwOffset].Attributes >> 4; - - // here we decide how to paint text over the backgound - if (m_arrConsoleColors[attrBG] == m_crConsoleBackground) { - ::SetBkMode(m_hdcConsole, TRANSPARENT); - nBkMode = TRANSPARENT; - } else { - ::SetBkMode(m_hdcConsole, OPAQUE); - nBkMode = OPAQUE; - ::SetBkColor(m_hdcConsole, m_arrConsoleColors[attrBG]); - crBkColor = m_arrConsoleColors[attrBG]; - } - - ::SetTextColor(m_hdcConsole, m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwOffset].Attributes & 0xF]); - crTxtColor = m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwOffset].Attributes & 0xF]; - - strText = m_pScreenBuffer[dwOffset].Char.UnicodeChar; - ++dwOffset; - - for (DWORD j = 1; j < m_dwColumns; ++j) { - - attrBG = m_pScreenBuffer[dwOffset].Attributes >> 4; - - if (m_arrConsoleColors[attrBG] == m_crConsoleBackground) { - if (nBkMode != TRANSPARENT) { - nBkMode = TRANSPARENT; - bTextOut = true; - } - } else { - if (nBkMode != OPAQUE) { - nBkMode = OPAQUE; - bTextOut = true; - } - if (crBkColor != m_arrConsoleColors[attrBG]) { - crBkColor = m_arrConsoleColors[attrBG]; - bTextOut = true; - } - } - - if (crTxtColor != (m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwOffset].Attributes & 0xF])) { - crTxtColor = m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwOffset].Attributes & 0xF]; - bTextOut = true; - } - - if (bTextOut) { - - ::TextOutW(m_hdcConsole, dwX, dwY, strText.c_str(), strText.length()); - dwX += strText.length() * m_nCharWidth; - - ::SetBkMode(m_hdcConsole, nBkMode); - ::SetBkColor(m_hdcConsole, crBkColor); - ::SetTextColor(m_hdcConsole, crTxtColor); - - strText = m_pScreenBuffer[dwOffset].Char.UnicodeChar; - - } else { - strText += m_pScreenBuffer[dwOffset].Char.UnicodeChar; - } - - ++dwOffset; - } - - if (strText.length() > 0) { - ::TextOutW(m_hdcConsole, dwX, dwY, strText.c_str(), strText.length()); - } - } - - } else { - - // variable pitch font - for (DWORD i = 0; i < m_dwRows; ++i) { - - dwX = m_nInsideBorder; - dwY = i*m_nCharHeight + m_nInsideBorder; - - for (DWORD j = 0; j < m_dwColumns; ++j) { - - attrBG = m_pScreenBuffer[dwOffset].Attributes >> 4; - - // here we decide how to paint text over the backgound - if (m_arrConsoleColors[attrBG] == m_crConsoleBackground) { - ::SetBkMode(m_hdcConsole, TRANSPARENT); - } else { - ::SetBkMode(m_hdcConsole, OPAQUE); - ::SetBkColor(m_hdcConsole, m_arrConsoleColors[attrBG]); - } - - ::SetTextColor(m_hdcConsole, m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwOffset].Attributes & 0xF]); - ::TextOutW(m_hdcConsole, dwX, dwY, &(m_pScreenBuffer[dwOffset].Char.UnicodeChar), 1); - int nWidth; - ::GetCharWidth32(m_hdcConsole, m_pScreenBuffer[dwOffset].Char.UnicodeChar, m_pScreenBuffer[dwOffset].Char.UnicodeChar, &nWidth); - dwX += nWidth; - ++dwOffset; - } - } - } - - if (m_pCursor) DrawCursor(TRUE); - - ::InvalidateRect(m_hWnd, NULL, FALSE); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::RepaintWindowChanges() { - - DWORD dwX = m_nInsideBorder; - DWORD dwY = m_nInsideBorder; - DWORD dwDestOffset = 0; - DWORD dwSrcOffset = m_csbiConsole.srWindow.Top * m_dwColumns; - - WORD attrBG; - - if (m_nCharWidth > 0) { - - // fixed pitch font - for (DWORD i = 0; i < m_dwRows; ++i) { - - dwX = m_nInsideBorder; - dwY = i*m_nCharHeight + m_nInsideBorder; - - for (DWORD j = 0; j < m_dwColumns; ++j) { - - if (memcmp(&(m_pScreenBuffer[dwDestOffset]), &(m_pScreenBufferNew[dwSrcOffset]), sizeof(CHAR_INFO))) { - - memcpy(&(m_pScreenBuffer[dwDestOffset]), &(m_pScreenBufferNew[dwSrcOffset]), sizeof(CHAR_INFO)); - - RECT rect; - rect.top = dwY; - rect.left = dwX; - rect.bottom = dwY + m_nCharHeight; - rect.right = dwX + m_nCharWidth; - - ::FillRect(m_hdcConsole, &rect, m_hBkBrush); -// } - - - attrBG = m_pScreenBuffer[dwDestOffset].Attributes >> 4; - - // here we decide how to paint text over the backgound - if (m_arrConsoleColors[attrBG] == m_crConsoleBackground) { - ::SetBkMode(m_hdcConsole, TRANSPARENT); - } else { - ::SetBkMode(m_hdcConsole, OPAQUE); - ::SetBkColor(m_hdcConsole, m_arrConsoleColors[attrBG]); - } - - ::SetTextColor(m_hdcConsole, m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwDestOffset].Attributes & 0xF]); - ::TextOutW(m_hdcConsole, dwX, dwY, &(m_pScreenBuffer[dwDestOffset].Char.UnicodeChar), 1); - - ::InvalidateRect(m_hWnd, &rect, FALSE); - } - - dwX += m_nCharWidth; - ++dwDestOffset; - ++dwSrcOffset; - } - } - - } else { - - // variable pitch font - if (memcmp(m_pScreenBuffer, m_pScreenBufferNew + dwDestOffset, sizeof(CHAR_INFO)*m_dwRows * m_dwColumns)) { - memcpy(m_pScreenBuffer, m_pScreenBufferNew + dwDestOffset, sizeof(CHAR_INFO)*m_dwRows * m_dwColumns); - - RECT rect; - rect.top = 0; - rect.left = 0; - rect.bottom = m_nClientHeight; - rect.right = m_nClientWidth; - - ::FillRect(m_hdcConsole, &rect, m_hBkBrush); -// } - - for (DWORD i = 0; i < m_dwRows; ++i) { - - dwX = m_nInsideBorder; - dwY = i*m_nCharHeight + m_nInsideBorder; - - for (DWORD j = 0; j < m_dwColumns; ++j) { - - attrBG = m_pScreenBuffer[dwDestOffset].Attributes >> 4; - - // here we decide how to paint text over the backgound - if (m_arrConsoleColors[attrBG] == m_crConsoleBackground) { - ::SetBkMode(m_hdcConsole, TRANSPARENT); - } else { - ::SetBkMode(m_hdcConsole, OPAQUE); - ::SetBkColor(m_hdcConsole, m_arrConsoleColors[attrBG]); - } - - ::SetTextColor(m_hdcConsole, m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwDestOffset].Attributes & 0xF]); - ::TextOutW(m_hdcConsole, dwX, dwY, &(m_pScreenBuffer[dwDestOffset].Char.UnicodeChar), 1); - int nWidth; - ::GetCharWidth32(m_hdcConsole, m_pScreenBuffer[dwDestOffset].Char.UnicodeChar, m_pScreenBuffer[dwDestOffset].Char.UnicodeChar, &nWidth); - dwX += nWidth; - ++dwDestOffset; - } - } - - ::InvalidateRect(m_hWnd, NULL, FALSE); - } - } - - if (m_pCursor) DrawCursor(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::DrawCursor(BOOL bOnlyCursor) { - - // first, erase old cursor image if needed - if (!bOnlyCursor && m_bCursorVisible) { - RECT rectCursorOld; - DrawCursorBackground(rectCursorOld); - ::InvalidateRect(m_hWnd, &rectCursorOld, FALSE); - } - - - // ... and draw it - if (m_bCursorVisible) { - - RECT rectCursor; - if (!bOnlyCursor) { - DrawCursorBackground(rectCursor); - } else { - GetCursorRect(rectCursor); - } - m_pCursor->Draw(&rectCursor); - ::InvalidateRect(m_hWnd, &rectCursor, FALSE); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -inline void Console::GetCursorRect(RECT& rectCursor) { - - ::ZeroMemory(&rectCursor, sizeof(RECT)); - - if (m_nCharWidth > 0) { - // fixed pitch - - rectCursor.left = m_csbiCursor.dwCursorPosition.X * m_nCharWidth + m_nInsideBorder; - rectCursor.top = m_csbiCursor.dwCursorPosition.Y * m_nCharHeight + m_nInsideBorder; - rectCursor.right = m_csbiCursor.dwCursorPosition.X * m_nCharWidth + m_nCharWidth + m_nInsideBorder; - rectCursor.bottom = m_csbiCursor.dwCursorPosition.Y * m_nCharHeight + m_nCharHeight + m_nInsideBorder; - - } else { - - // variable pitch, we do a little joggling here :-) - RECT rectLine; - int nLastCharWidth; - std::unique_ptr pszLine(new wchar_t[m_csbiCursor.dwCursorPosition.X + 2]); - ::ZeroMemory(pszLine.get(), (m_csbiCursor.dwCursorPosition.X + 2)*sizeof(wchar_t)); - - for (short i = 0; i <= m_csbiCursor.dwCursorPosition.X; ++i) pszLine.get()[i] = m_pScreenBuffer[m_csbiCursor.dwCursorPosition.Y * m_dwColumns + i].Char.UnicodeChar; - - rectLine.left = rectLine.right = 0; - rectLine.top = rectLine.bottom = m_csbiCursor.dwCursorPosition.Y * m_nCharHeight; - - ::DrawTextW( - m_hdcConsole, - pszLine.get(), - -1, - &rectLine, - DT_CALCRECT); - - if (!::GetCharWidth32( - m_hdcConsole, - pszLine.get()[m_csbiCursor.dwCursorPosition.X], - pszLine.get()[m_csbiCursor.dwCursorPosition.X], - &nLastCharWidth)) { - - return; - } - - rectCursor.left = rectLine.right - (DWORD)nLastCharWidth + m_nInsideBorder; - rectCursor.top = rectLine.top + m_nInsideBorder; - rectCursor.right = rectLine.right + m_nInsideBorder; - rectCursor.bottom = rectLine.bottom + m_nInsideBorder; - } - - rectCursor.top -= m_csbiConsole.srWindow.Top * m_nCharHeight; - rectCursor.bottom -= m_csbiConsole.srWindow.Top * m_nCharHeight; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -inline void Console::DrawCursorBackground(RECT& rectCursor) { - - GetCursorRect(rectCursor); - - if (m_csbiCursor.dwCursorPosition.Y < m_csbiConsole.srWindow.Top || - m_csbiCursor.dwCursorPosition.Y >= m_csbiConsole.srWindow.Top + (SHORT) m_dwRows) { - return; - } - - DWORD dwOffset = (m_csbiCursor.dwCursorPosition.Y-m_csbiConsole.srWindow.Top)*m_dwColumns + m_csbiCursor.dwCursorPosition.X; - WORD attrBG = m_pScreenBuffer[dwOffset].Attributes >> 4; - - // here we decide how to paint text over the backgound - - if (m_arrConsoleColors[attrBG] == m_crConsoleBackground) { - ::SetBkMode(m_hdcConsole, TRANSPARENT); - } else { - ::SetBkMode(m_hdcConsole, OPAQUE); - ::SetBkColor(m_hdcConsole, m_arrConsoleColors[attrBG]); - } - - ::SetTextColor(m_hdcConsole, m_bUseFontColor ? m_crFontColor : m_arrConsoleColors[m_pScreenBuffer[dwOffset].Attributes & 0xF]); - - ::FillRect(m_hdcConsole, &rectCursor, m_hBkBrush); -// } - - ::TextOutW( - m_hdcConsole, - rectCursor.left, - rectCursor.top, - &(m_pScreenBuffer[dwOffset].Char.UnicodeChar), - 1); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::ClearSelection() { - - m_nTextSelection = TEXT_SELECTION_NONE; - m_coordSelOrigin.X = 0; - m_coordSelOrigin.Y = 0; - ::ZeroMemory(&m_rectSelection, sizeof(RECT)); - - RepaintWindow(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -DWORD Console::GetChangeRate() { - - DWORD dwCount = m_dwRows * m_dwColumns; - DWORD dwChangedPositions = 0; - - for (DWORD i = 0; i < dwCount; ++i) { - if (m_pScreenBuffer[i].Char.UnicodeChar != m_pScreenBufferNew[i].Char.UnicodeChar) ++dwChangedPositions; - } - - return dwChangedPositions*100/dwCount; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::ShowHideWindow() { - ::ShowWindowAsync(m_hWnd, m_bHideWindow ? SW_HIDE : SW_SHOW); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::ShowHideConsole() { - ::ShowWindow(m_hWndConsole, m_bHideConsole ? SW_HIDE : SW_SHOWNORMAL); - if (!m_bHideConsole) ::SetForegroundWindow(m_hWndConsole); - UpdateHideConsoleMenuItem(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::ToggleWindowOnTop() { - - if (m_dwCurrentZOrder == m_dwOriginalZOrder) { - m_dwCurrentZOrder = Z_ORDER_ONTOP; - } else { - m_dwCurrentZOrder = m_dwOriginalZOrder; - } - - HWND hwndZ = 0; - switch (m_dwCurrentZOrder) { - case Z_ORDER_REGULAR : hwndZ = HWND_NOTOPMOST; break; - case Z_ORDER_ONTOP : hwndZ = HWND_TOPMOST; break; - case Z_ORDER_ONBOTTOM : hwndZ = HWND_BOTTOM; break; - default : return; - } - - ::SetWindowPos( - m_hWnd, - hwndZ, - 0, - 0, - 0, - 0, - SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); - - UpdateOnTopMenuItem(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL Console::HandleMenuCommand(DWORD dwID) { - - // check if it's one of the main menu commands - switch (dwID) { - -/* - case ID_SHOW_README_FILE: - ShowReadmeFile(); - return FALSE; - - case ID_ABOUT: - About(); - return FALSE; -*/ - - case ID_COPY: - CopyTextToClipboard(); - return FALSE; - - case ID_PASTE: - PasteClipoardText(); - return FALSE; - - - case ID_EXIT_CONSOLE: - ::SendMessage(m_hWnd, WM_CLOSE, 0, 0); - return FALSE; - - case SC_MINIMIZE: - if (m_dwTaskbarButton > TASKBAR_BUTTON_NORMAL) { - m_bHideWindow = !m_bHideWindow; - ShowHideWindow(); - ::SetForegroundWindow(m_hWnd); - return FALSE; - } - return TRUE; - } - - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::UpdateOnTopMenuItem() { - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::UpdateHideConsoleMenuItem() { - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::UpdateConfigFilesSubmenu() { - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::CopyTextToClipboard() { - - int nSelX = (m_rectSelection.left - m_nInsideBorder)/m_nCharWidth; - int nSelY = (m_rectSelection.top - m_nInsideBorder)/m_nCharHeight; - int nSelColumns = (m_rectSelection.right-m_rectSelection.left)/m_nCharWidth; - int nSelRows = (m_rectSelection.bottom-m_rectSelection.top)/m_nCharHeight; - - // nothing selected, just return - if ((nSelColumns == 0) || (nSelRows == 0)) { - ClearSelection(); - return; - } - - if (!::OpenClipboard(m_hWnd)) { - ClearSelection(); - return; - } - - ::EmptyClipboard(); - - HGLOBAL hglbData = ::GlobalAlloc(GMEM_MOVEABLE, (nSelColumns+2)*nSelRows*sizeof(TCHAR)); - if (hglbData == NULL) { - ::CloseClipboard(); - ClearSelection(); - return; - } - - // lock the handle and copy the text to the buffer. - wchar_t* pszData = (wchar_t*)::GlobalLock(hglbData); - - if (pszData) - { - int i; - for (i = 0; i < nSelRows; ++i) { - for (int j = 0; j < nSelColumns; ++j) { - pszData[i*(nSelColumns+2) + j] = m_pScreenBuffer[(nSelY+i)*m_dwColumns + nSelX + j].Char.UnicodeChar; - } - // at the end of each row we put \r\n (except for the last one where we put \0) - pszData[i*(nSelColumns+2) + nSelColumns] = _TCHAR('\r'); - pszData[i*(nSelColumns+2) + nSelColumns + 1] = _TCHAR('\n'); - } - pszData[(i-1)*(nSelColumns+2) + nSelColumns] = _TCHAR('\x0'); - } - - ::GlobalUnlock(hglbData); - - if (::SetClipboardData(CF_UNICODETEXT, hglbData) == NULL) { - // we need to global-free data only if copying failed - } - ::CloseClipboard(); - // !!! No call to GlobalFree here. Next app that uses clipboard will call EmptyClipboard to free the data - - ClearSelection(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::PasteClipoardText() { - - if (!IsClipboardFormatAvailable(CF_UNICODETEXT)) return; - - - if (::OpenClipboard(m_hWnd)) { - HANDLE hData = ::GetClipboardData(CF_UNICODETEXT); - - SendTextToConsole((wchar_t*)::GlobalLock(hData)); - - ::GlobalUnlock(hData); - ::CloseClipboard(); - } - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::ShowReadmeFile() { - - // prepare editor parameters - tstring strParams(m_strConfigEditorParams); - - if (strParams.length() == 0) { - // no params, just use the readme file - strParams = m_strReadmeFile; - } else { - tstring::size_type nPos = strParams.find(_T("%f")); - - if (nPos == tstring::npos) { - // no '%f' in editor params, concatenate readme file name - strParams += _T(" "); - strParams += m_strReadmeFile; - } else { - // replace '%f' with readme file name - strParams = strParams.replace(nPos, 2, m_strReadmeFile); - } - } - - ::ShellExecute(NULL, NULL, m_strConfigEditor.c_str(), strParams.c_str(), NULL, SW_SHOWNORMAL); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// About - shows an about dialog - -void Console::About() -{ - CAboutDlg dlg(m_hWnd); - - dlg.DoModal(); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::SendTextToConsole(const wchar_t *pszText) -{ - - if (!pszText || (wcslen(pszText) == 0)) return; - - BOOL c_state = FALSE; - if (m_pCursor) - { - c_state = (m_pCursor != NULL && m_pCursor->GetState()); - m_pCursor->SetState(FALSE); - DrawCursor(); - } - - int idx = m_csbiCursor.dwCursorPosition.X + m_csbiCursor.dwCursorPosition.Y * m_dwColumns; - - RECT rectInval; - int cursorX; - int cursorY; - WORD attr = (WORD)(m_nTextColor + (m_nTextBgColor << 4)); - - cursorX = m_csbiCursor.dwCursorPosition.X * m_nCharWidth + m_nInsideBorder; - cursorY = m_csbiCursor.dwCursorPosition.Y * m_nCharHeight + m_nInsideBorder; - rectInval.left = cursorX; - rectInval.top = cursorY; - rectInval.right = cursorX; - rectInval.bottom = cursorY + m_nCharHeight; - - for (; *pszText; pszText++) { - int charWidth; - ::GetCharWidth32( m_hdcConsole, *pszText, *pszText, &charWidth); - if (cursorX + m_nCharWidth > rectInval.right) { - rectInval.right = cursorX + m_nCharWidth; - } - if (cursorX < rectInval.left) { - rectInval.left = cursorX; - } - if (cursorY + m_nCharHeight > rectInval.bottom) { - rectInval.bottom = cursorY + m_nCharHeight; - } - if (cursorY < rectInval.top) { - rectInval.top = cursorY; - } - - if (*pszText == 8) { - if (m_csbiCursor.dwCursorPosition.X) { - m_csbiCursor.dwCursorPosition.X--; - cursorX -= m_nCharWidth; - idx--; - } else if (m_csbiCursor.dwCursorPosition.Y) { - if (m_csbiCursor.dwCursorPosition.Y == m_csbiConsole.srWindow.Top) { - OnVScroll( SB_LINEUP); - } - m_csbiCursor.dwCursorPosition.Y--; - m_csbiCursor.dwCursorPosition.X = (SHORT)m_dwColumns - 1; - cursorX = m_nCharWidth * m_csbiCursor.dwCursorPosition.X; - idx--; - } - } else if (*pszText != '\n' && - *pszText != '\r') { - m_pScreenBufferNew[ idx].Attributes = attr; - m_pScreenBufferNew[ idx].Char.UnicodeChar = *pszText; - idx++; - cursorX += m_nCharWidth; - m_csbiCursor.dwCursorPosition.X++; - } - - if (m_csbiCursor.dwCursorPosition.X >= (SHORT) m_dwColumns || *pszText == '\r' || *pszText == '\n' ) { - m_csbiCursor.dwCursorPosition.X = 0; - cursorX = m_nInsideBorder; - if (*pszText != '\r') { - m_csbiCursor.dwCursorPosition.Y++; - if (m_csbiCursor.dwCursorPosition.Y >= (SHORT)m_dwBufferRows) { - m_csbiCursor.dwCursorPosition.Y--; - idx = m_csbiCursor.dwCursorPosition.X + m_csbiCursor.dwCursorPosition.Y * m_dwColumns; - ::CopyMemory( m_pScreenBufferNew, m_pScreenBufferNew + m_dwColumns, idx * sizeof( CHAR_INFO)); - ::ZeroMemory( m_pScreenBufferNew + idx, m_dwColumns * sizeof( CHAR_INFO)); - } else if (m_csbiCursor.dwCursorPosition.Y == m_csbiConsole.srWindow.Top + (SHORT)m_dwRows) { - OnVScroll( SB_LINEDOWN); - } else { - cursorY += m_nCharHeight; - } - } - idx = m_csbiCursor.dwCursorPosition.X + m_csbiCursor.dwCursorPosition.Y * m_dwColumns; - } - } - - ::InvalidateRect( m_hWnd, &rectInval, TRUE); - ::SetTimer(m_hWnd, TIMER_REPAINT_CHANGE, m_dwChangeRepaintInt, NULL); - - if (m_pCursor) - { - m_pCursor->SetState(c_state); - } - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -tstring Console::GetFullFilename(const tstring& strFilename) { - - TCHAR szFilePath[MAX_PATH]; - TCHAR* pszFilename; - - ::ZeroMemory(szFilePath, sizeof(szFilePath)); - ::GetFullPathName(strFilename.c_str(), MAX_PATH, szFilePath, &pszFilename); - - return tstring(szFilePath); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void Console::GetDesktopRect(RECT& rectDesktop) { - -// if (g_bWin2000) { - POINT pt; - if (::GetCursorPos(&pt)) { - MONITORINFO monitorInfo; - monitorInfo.cbSize = sizeof(MONITORINFO); - if (GetMonitorInfo(MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST), &monitorInfo)) { - rectDesktop = monitorInfo.rcWork; - } - - } else { - rectDesktop.left = ::GetSystemMetrics(SM_XVIRTUALSCREEN); - rectDesktop.top = ::GetSystemMetrics(SM_YVIRTUALSCREEN); - rectDesktop.right = rectDesktop.left + ::GetSystemMetrics(SM_CXVIRTUALSCREEN); - rectDesktop.bottom = rectDesktop.top + ::GetSystemMetrics(SM_CYVIRTUALSCREEN); - } - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -LRESULT CALLBACK Console::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - - Console *myself = (Console*) ::GetWindowLongPtr( hwnd, GWLP_USERDATA ); - - switch (uMsg) { - case WM_CREATE: - return 0; - - case WM_PAINT: - // paint the window - myself->OnPaint(); - return 0; - - case WM_ERASEBKGND: - return -1; - - case WM_SIZE: - // set the size and position of the window - return 0; - - case WM_CLOSE: -// ::DestroyWindow(myself->m_hWnd); - // Probably want to just hide the window if the X is hit. That way it can continue - // to update on script output - ShowWindow( hwnd, FALSE); - return 0; - - case WM_DESTROY: - myself->OnDestroy(); - return 0; - - case WM_NCDESTROY: - myself->OnNcDestroy(); - return 0; - - case WM_LBUTTONDOWN: - myself->OnLButtonDown((UINT)wParam, MAKEPOINTS(lParam)); - return 0; - - case WM_LBUTTONUP: - myself->OnLButtonUp((UINT)wParam, MAKEPOINTS(lParam)); - return 0; - - case WM_LBUTTONDBLCLK: - myself->OnLButtonDblClick((UINT)wParam, MAKEPOINTS(lParam)); - return 0; - - case WM_RBUTTONUP: - myself->OnRButtonUp((UINT)wParam, MAKEPOINTS(lParam)); - return 0; - - case WM_MBUTTONDOWN: - myself->OnMButtonDown((UINT)wParam, MAKEPOINTS(lParam)); - return 0; - - case WM_MOUSEMOVE: - myself->OnMouseMove((UINT)wParam, MAKEPOINTS(lParam)); - return 0; - - case WM_SETCURSOR: - myself->OnSetCursor(LOWORD(lParam), HIWORD(lParam)); - ::DefWindowProc(myself->m_hWnd, uMsg, wParam, lParam); - return 0; - - case WM_INITMENUPOPUP: - myself->OnInitMenuPopup((HMENU)wParam, LOWORD(lParam), (BOOL)HIWORD(lParam)); - return 0; - - case WM_DROPFILES: - myself->OnDropFiles((HDROP)wParam); - return 0; - - case WM_WINDOWPOSCHANGING: - myself->OnWindowPosChanging((LPWINDOWPOS)lParam); - return 0; - - case WM_ACTIVATEAPP: - myself->OnActivateApp((BOOL)wParam, (DWORD)lParam); - return 0; - - - case WM_CHAR: - myself->OnChar( (WORD) wParam); - break; - - case WM_KEYDOWN: - case WM_KEYUP: -// case WM_MOUSEWHEEL: -// ::PostMessage(myself->m_hWndConsole, uMsg, wParam, lParam); - return 0; - - - case WM_VSCROLL: - myself->OnVScroll(wParam); - return 0; - - case WM_TIMER: - switch (wParam) { - case TIMER_REPAINT_CHANGE: - case TIMER_REPAINT_MASTER: - myself->OnPaintTimer(); - return 0; - - case CURSOR_TIMER: - myself->OnCursorTimer(); - return 0; - - - default: - return 1; - } - - case WM_COMMAND: - if (myself->OnCommand(wParam, lParam)) { - return ::DefWindowProc(hwnd, uMsg, wParam, lParam); - } else { - return 0; - } - - case WM_SYSCOMMAND: - if (myself->OnSysCommand(wParam, lParam)) { - return ::DefWindowProc(hwnd, uMsg, wParam, lParam); - } else { - return 0; - } - - case WM_TRAY_NOTIFY: - myself->OnTrayNotify(wParam, lParam); - return 0; - -// case WM_SETTINGCHANGE: -// -// myself->OnWallpaperChanged((TCHAR*)lParam); -// return ::DefWindowProc(hwnd, uMsg, wParam, lParam); - - case WM_INPUTLANGCHANGEREQUEST: - myself->OnInputLangChangeRequest(wParam, lParam); - return ::DefWindowProc(hwnd, uMsg, wParam, lParam); - - // process other messages - default: - return ::DefWindowProc(hwnd, uMsg, wParam, lParam); - } - return 0; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// MonitorThread - shell activities monitor - -DWORD WINAPI Console::MonitorThreadStatic(LPVOID lpParam) { - return ((Console*)lpParam)->MonitorThread(); -} - -DWORD Console::MonitorThread() { - -// HANDLE arrHandles[] = {m_hConsoleProcess, m_hQuitEvent, m_hStdOut}; -// HANDLE arrHandles[] = { m_hStdOut}; - - for (;;) { // Infinite loop - AddOutput(); - ::SetTimer(m_hWnd, TIMER_REPAINT_CHANGE, m_dwChangeRepaintInt, NULL); - // we sleep here for a while, to prevent 'flooding' of m_hStdOut events - ::Sleep(m_dwChangeRepaintInt); - ::ResetEvent(m_hStdOut); -// } - } - -// return 0; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -void Console::AddOutput() { - DWORD bytesRead; - char buf[801]; - wchar_t wbuf[801]; - - ::ReadFile( m_hStdOut, buf, sizeof(buf)/sizeof(wchar_t)-1, &bytesRead, NULL); - if (bytesRead == 0) { - return; - } - buf[bytesRead] = 0; - MultiByteToWideChar( CP_UTF8, 0, buf, -1, wbuf, sizeof(wbuf)/sizeof(wbuf[0])); - SendTextToConsole( wbuf); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -BOOL WINAPI Console::CtrlHandler(DWORD dwCtrlType) { - if ((dwCtrlType == CTRL_C_EVENT) || (dwCtrlType == CTRL_BREAK_EVENT)) { - return TRUE; - } else { - return FALSE; - } -} - -///////////////////////////////////////////////////////////////////////////// - - diff --git a/Console/Console.h b/Console/Console.h deleted file mode 100644 index cd79e628..00000000 --- a/Console/Console.h +++ /dev/null @@ -1,746 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Console.h - console class declaration - -#pragma once - -#include -#include - -using namespace std; - -//#include "include/FreeImagePlus.h" - -typedef basic_string tstring; - -#define WM_INPUTREADY WM_USER + 1 - -// tray icon message -#define WM_TRAY_NOTIFY WM_USER + 0x123 - -#define TRAY_ICON_ID 1 - -// timer #defines -#define TIMER_REPAINT_CHANGE 42 // timer that is started after there - // were some changes in the console - -#define TIMER_REPAINT_MASTER 43 // master timer (needed to repaint - // for some DOS programs, can be - // disabled for lower CPU usage) - -#define TIMER_SHOW_HIDE_CONSOLE 100 // used to hide console window when - // starting shell process after a - // defined period of time (some - // shells, like 4NT need console - // window visible during startup for - // all init options to work properly - -// transparency #defines -#define TRANSPARENCY_NONE 0 -#define TRANSPARENCY_ALPHA 1 -#define TRANSPARENCY_COLORKEY 2 -#define TRANSPARENCY_FAKE 3 - -// cusror style #defines -#define CURSOR_STYLE_NONE 0 -#define CURSOR_STYLE_XTERM 1 -#define CURSOR_STYLE_BLOCK 2 -#define CURSOR_STYLE_NBBLOCK 3 -#define CURSOR_STYLE_PULSEBLOCK 4 -#define CURSOR_STYLE_BAR 5 -#define CURSOR_STYLE_CONSOLE 6 -#define CURSOR_STYLE_NBHLINE 7 -#define CURSOR_STYLE_HLINE 8 -#define CURSOR_STYLE_VLINE 9 -#define CURSOR_STYLE_RECT 10 -#define CURSOR_STYLE_NBRECT 11 -#define CURSOR_STYLE_PULSERECT 12 -#define CURSOR_STYLE_FADEBLOCK 13 - -// docking #defines -#define DOCK_NONE 0 -#define DOCK_TOP_LEFT 1 -#define DOCK_TOP_RIGHT 2 -#define DOCK_BOTTOM_RIGHT 3 -#define DOCK_BOTTOM_LEFT 4 - -// Z-order #defines -#define Z_ORDER_REGULAR 0 -#define Z_ORDER_ONTOP 1 -#define Z_ORDER_ONBOTTOM 2 - -// window border defines -#define BORDER_NONE 0 -#define BORDER_REGULAR 1 -#define BORDER_THIN 2 - -// window background style -#define BACKGROUND_STYLE_RESIZE 0 -#define BACKGROUND_STYLE_CENTER 1 -#define BACKGROUND_STYLE_TILE 2 - -// taskbar button defines -#define TASKBAR_BUTTON_NORMAL 0 -#define TASKBAR_BUTTON_HIDE 1 -#define TASKBAR_BUTTON_TRAY 2 - -// new configuration auto-reload defines -#define RELOAD_NEW_CONFIG_PROMPT 0 -#define RELOAD_NEW_CONFIG_YES 1 -#define RELOAD_NEW_CONFIG_NO 2 - -#define TEXT_SELECTION_NONE 0 -#define TEXT_SELECTION_SELECTING 1 -#define TEXT_SELECTION_SELECTED 2 - - -///////////////////////////////////////////////////////////////////////////// -// Console class - -class Console { - public: // ctor/dtor - - Console(LPCTSTR szConfigFile, LPCTSTR szShellCmdLine, LPCTSTR szConsoleTitle, LPCTSTR pszReloadNewConfig); - ~Console(); - - public: - - // creates and shows Console window - BOOL Create(HWND notify); - - private: - - //////////////////// - // message handlers - //////////////////// - - //////////////////////////////// - // windows destruction messages - - // destroys GDI stuff and posts a quit message - void OnDestroy(); - // deletes Console object - void OnNcDestroy(); - - - ///////////////////// - // painting messages - - // handles painting from off-screen buffers - void OnPaint(); - - // handles master and 'change' timers - void OnPaintTimer(); - - // handles cursor timer (for animated cursors) - void OnCursorTimer(); - - - ///////////////////////// - // window state messages - - // handles window position changes (for snapping to desktop edges) - void OnWindowPosChanging(WINDOWPOS* lpWndPos); - - // handles activation message (used for setting alpha transparency and cursor states) - void OnActivateApp(BOOL bActivate, DWORD dwFlags); - - // handles vertical scrolling - void OnVScroll(WPARAM wParam); - - // handles keyboard layout change, posts the same message to the windows console window - void OnInputLangChangeRequest(WPARAM wParam, LPARAM lParam); - - - ////////////////// - // mouse messages - - // handles text selection start and window mouse drag start - void OnLButtonDown(UINT uiFlags, POINTS points); - - // handles text selection end, window mouse drag end and text copy - void OnLButtonUp(UINT uiFlags, POINTS points); - - // toggles always on top flag - void OnLButtonDblClick(UINT uiFlags, POINTS points); - - // pops up the Console menu - void OnRButtonUp(UINT uiFlags, POINTS points); - - // pastes text from clipboard - void OnMButtonDown(UINT uiFlags, POINTS points); - - // handles mouse movement for text selection and window mouse drag - void OnMouseMove(UINT uiFlags, POINTS points); - - // handles start/stop mouse drag for window border - void OnSetCursor(WORD wHitTest, WORD wMouseMessage); - - // handles text input - void OnChar(WORD mychar); - - wstring Input; - - ////////////////// - // other messages - - // called before the Console menu or system menu pops up - // (populates config files submenu with filenames) - void OnInitMenuPopup(HMENU hMenu, UINT uiPos, BOOL bSysMenu); - - // handles drag-n-dropped filenames - void OnDropFiles(HDROP hDrop); - - // handles commands from the Console popup menu - BOOL OnCommand(WPARAM wParam, LPARAM lParam); - - // handles commands from the system popup menu - BOOL OnSysCommand(WPARAM wParam, LPARAM lParam); - - // handles tray icon messages - void OnTrayNotify(WPARAM wParam, LPARAM lParam); - - // handles WM_SETTINGCHANGE (we handle only wallpaper changes here) -// void OnWallpaperChanged(const TCHAR* pszFilename); - - - private: - - /////////////////////////////////////////// - // Console window creation/setup functions - /////////////////////////////////////////// - - // gets Console options - BOOL GetOptions(); - - // registers Console window classes - BOOL RegisterWindowClasses(); - - // adds stuff to system and popup menus - BOOL SetupMenus(); - - // creates Console window - BOOL CreateConsoleWindow(); - - // creates new Console font - void CreateNewFont(); - - // creates new background brush - void CreateNewBrush(); - - // creates the cursor - void CreateCursor(); - - // creates offscreen painting buffers - void CreateOffscreenBuffers(); - - // creates background bitmap - void CreateBackgroundBitmap(); - - // called by the ::EnumDisplayMonitors to create background for each display -// static BOOL CALLBACK BackgroundEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData); - - // gets character width and height - void GetTextSize(); - - // gets window borders (X, Y and caption sizes) - void GetBordersDimensions(); - - // calculates window and client area sizes - void CalcWindowSize(); - - // sets up window transparency (alpha, color key, fake) -// void SetWindowTransparency(); - - // sets scrollbar stuff - void SetScrollbarStuff(); - - // sets default console colors - void SetDefaultConsoleColors(); - - // sets window size and position - void SetWindowSizeAndPosition(); - - // sets Console's big, small and tray icons - void SetWindowIcons(); - - // sets up traybar icon - BOOL SetTrayIcon(DWORD dwMessage); - - // destroys Console cursor - void DestroyCursor(); - - // opens the configuration file in a text editor - void EditConfigFile(); - - // reloads Console settings - void ReloadSettings(); - - - ///////////////////////////// - // windows console functions - ///////////////////////////// - - // allocates the console and starts the command shell - BOOL StartShellProcess(); - - // refreshes m_hStdOutFresh handle - void RefreshStdOut(); - - // gets a fresh console output - void RefreshScreenBuffer(); - - // sets initial windows console size - void InitConsoleWndSize(DWORD dwColumns); - - // resizes the windows console - void ResizeConsoleWindow(); - - // Allocates the screen buffer - void AllocateBuffer(); - - - ////////////////////// - // painting functions - ////////////////////// - - // repaints the memory hdc - void RepaintWindow(); - - // repaints the memory hdc (paint only changes) - void RepaintWindowChanges(); - - // draws the cursor - void DrawCursor(BOOL bOnlyCursor = FALSE); - - // two helper functions for DrawCursor method - - // returns cursor rectangle - inline void GetCursorRect(RECT& rectCursor); - // draws cursor background and returns the cursor rectangle - inline void DrawCursorBackground(RECT& rectCursor); - - // clears text selection - void ClearSelection(); - - // returns the console text change rate since the last painting - // (using this value we decide whether to repaint entire window - // or just the changes) - DWORD GetChangeRate(); - - - ////////////////////////// - // window state functions - ////////////////////////// - - // shows/hides Console window - void ShowHideWindow(); - - // shows/hides windows console window - void ShowHideConsole(); - - // shows/hides windows console window after a timeout (used during - // shell startup) - void ShowHideConsoleTimeout(); - - // toggles 'always on top' status - void ToggleWindowOnTop(); - - - ////////////////// - // menu functions - ////////////////// - - // called by OnCommand and OnSysCommand to handle menu commands - BOOL HandleMenuCommand(DWORD dwID); - - // updates popup and system menus for 'always on top' status - void UpdateOnTopMenuItem(); - - // updates popup and system menus for 'hide console' status - void UpdateHideConsoleMenuItem(); - - // updates configuration files submenu - void UpdateConfigFilesSubmenu(); - - - /////////////////////// - // clipboard functions - /////////////////////// - - // copies selected text to the clipboard - void CopyTextToClipboard(); - - // pastes text from the clipboard - void PasteClipoardText(); - - ////////////////// - // misc functions - ////////////////// - - // shows Readme.txt file - void ShowReadmeFile(); - - // shows about dialog - void About(); - - // sends text to the windows console - void SendTextToConsole(const wchar_t *pszText); - - // returns the full filename - tstring GetFullFilename(const tstring& strFilename); - - // gets a desktop rectangle - void GetDesktopRect(RECT& rectDesktop); - - // Pulls the text from the stdout or stderr handle (both are the same) and sends it to the console - void AddOutput(); - - - /////////////////////// - // 'gearbox' functions - /////////////////////// - - // Console window procedure - static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - - // shell activities monitor - static DWORD WINAPI MonitorThreadStatic(LPVOID lpParam); - DWORD MonitorThread(); - - // CTRL+C, CTRL+BREAK handler - static BOOL WINAPI CtrlHandler(DWORD dwCtrlType); - - - public: // public data - - // Console window handle - HWND m_hWnd; - - HWND m_notifyhWnd; - - // console colors - COLORREF m_arrConsoleColors[16]; - - private: // private data - - // readem filename - tstring m_strReadmeFile; - - BOOL m_bInitializing; - BOOL m_bReloading; - - tstring m_strConfigFile; - tstring m_strConfigEditor; - tstring m_strConfigEditorParams; - - // one of the RELOAD_NEW_CONFIG_* constants - // - specifies relaod behaviour when a new configuration is selected - // (auto reload, don't reload, ask user) - DWORD m_dwReloadNewConfigDefault; - DWORD m_dwReloadNewConfig; - - tstring m_strShell; - tstring m_strShellCmdLine; - - // handle to invisible window - used for hiding the taskbar button in tray and 'hidden' modes - HWND m_hwndInvisParent; - - // memory device context that holds console output image - HDC m_hdcConsole; - // memory device context for an off-screen window buffer (used to - // compose an image from m_hdcConsole and m_hdcSelection if text - // selection is active) - HDC m_hdcWindow; - - // a bitmap used for drawing in the console memory DC - HBITMAP m_hbmpConsole; - HBITMAP m_hbmpConsoleOld; - - // a bitmap used for drawing in the window memory DC - HBITMAP m_hbmpWindow; - HBITMAP m_hbmpWindowOld; - - // brush for painting background - HBRUSH m_hBkBrush; - - // master repaint timer interval (runs independent of changes in the - // console) - DWORD m_dwMasterRepaintInt; - - // change repaint timer interval (when a change occurs, repainting - // will be postponed for this interval) - DWORD m_dwChangeRepaintInt; - - // icon filename - tstring m_strIconFilename; - // program icons - HICON m_hSmallIcon; - HICON m_hBigIcon; - - // popup menu - HMENU m_hPopupMenu; - - // system (taskbar button) menu - HMENU m_hSysMenu; - - // submenu for the XML (config) files - HMENU m_hConfigFilesMenu; - - // set to TRUE if the popup menu is disabled - BOOL m_bPopupMenuDisabled; - - // Console window title variables - // holds the default console title ("console" or the one passed in the cmdline param) - tstring m_strWindowTitleDefault; - // holds the window title (default title, or the one from the config file) - tstring m_strWindowTitle; - // holds the current window title - tstring m_strWindowTitleCurrent; - - // font data - tstring m_strFontName; - DWORD m_dwFontSize; - BOOL m_bBold; - BOOL m_bItalic; - BOOL m_bUseFontColor; - COLORREF m_crFontColor; - HFONT m_hFont; - HFONT m_hFontOld; - - // window X and Y positions - int m_nX; - int m_nY; - - // client area inside border (gives a more 'relaxed' look to windows) - int m_nInsideBorder; - - // window width and height - int m_nWindowWidth; - int m_nWindowHeight; - - // window border sizes - int m_nXBorderSize; - int m_nYBorderSize; - int m_nCaptionSize; - - // client area widht/height - int m_nClientWidth; - int m_nClientHeight; - - // char height and width (used in window repainting) - // Note: width is used only for fixed-pitch fonts to speed up - // repainting - int m_nCharHeight; - int m_nCharWidth; - - // window border type - // 0 - none - // 1 - regular window - // 2 - 1-pixel thin border - DWORD m_dwWindowBorder; - - // scrollbar stuff - BOOL m_bShowScrollbar; - int m_nScrollbarStyle; - COLORREF m_crScrollbarColor; - int m_nScrollbarWidth; - int m_nScrollbarButtonHeight; - int m_nScrollbarThunmbHeight; - - // what to do with the taskbar button - // if the taskbar button is hidden, or placed in the traybar, you - // can't ALT-TAB to console (take care when using with color key - // transparency :-) - // 0 - nothing - // 1 - hide it - // 2 - put icon to traybar - DWORD m_dwTaskbarButton; - - // set to TRUE if the window can be dragged by left-click hold - BOOL m_bMouseDragable; - - // snap distance - int m_nSnapDst; - - // window docking position - // 0 - no dock - // 1 - top left - // 2 - top right - // 3 - bottom right - // 4 - bottom left - DWORD m_dwDocked; - - // window Z-ordering - // 0 - regular - // 1 - always on top - // 2 - always on bottom - DWORD m_dwOriginalZOrder; - DWORD m_dwCurrentZOrder; - - // Win2000/XP transparency - // 0 - none - // 1 - alpha blending - // 2 - colorkey - // 3 - fake transparency - DWORD m_dwTransparency; - - // alpha value for alpha blending (Win2000 and later only!) - BYTE m_byAlpha; - - // alpha value for inactive window - BYTE m_byInactiveAlpha; - - COLORREF m_crBackground; - COLORREF m_crConsoleBackground; - - // this is used for tinting background images and fake transparencies - BOOL m_bTintSet; - BYTE m_byTintOpacity; - BYTE m_byTintR; - BYTE m_byTintG; - BYTE m_byTintB; - - // used when background is an image - BOOL m_bBitmapBackground; - tstring m_strBackgroundFile; - HDC m_hdcBackground; - HBITMAP m_hbmpBackground; - HBITMAP m_hbmpBackgroundOld; - - // background attributes - - // one of BACKGROUND_STYLE_ #defines - DWORD m_dwBackgroundStyle; - // set to true for relative background - BOOL m_bRelativeBackground; - // set to true to extend the background to all monitors - BOOL m_bExtendBackground; - - // offsets used for multiple monitors and relative backgrounds (fake transparency, too) - int m_nBackgroundOffsetX; - int m_nBackgroundOffsetY; - - // used for showing/hiding main window - BOOL m_bHideWindow; - // set to TRUE when the real console is hidden - BOOL m_bHideConsole; - - // timeout used when hiding console window for the first time (some - // shells need console window visible during startup) - DWORD m_dwHideConsoleTimeout; - - // if set to TRUE, Console will be started minimized - BOOL m_bStartMinimized; - - - // cursor style - // 0 - none - // 1 - XTerm - // 2 - block cursor - // 3 - bar cursor - // 4 - console cursor - // 5 - horizontal line - // 6 - vertical line - // 7 - pulse rect - // 8 - fading block - DWORD m_dwCursorStyle; - - COLORREF m_crCursorColor; - - // console screen buffer info for cursor - CONSOLE_SCREEN_BUFFER_INFO m_csbiCursor; - - // wether console cursor is visible or not - BOOL m_bCursorVisible; - - class Cursor* m_pCursor; - - // mouse cursor offset within the window (used for moving the window) - POINT m_mouseCursorOffset; - - ///////////////////// - // console stuff - - // console window handle - HWND m_hWndConsole; - - // console screen buffer info for console repainting - CONSOLE_SCREEN_BUFFER_INFO m_csbiConsole; - - // console stdouts - HANDLE m_hStdOut; - HANDLE m_hStdOutFresh; - - // set when quitting the application - HANDLE m_hQuitEvent; - - // set by monitor thread when detects console process exit - HANDLE m_hConsoleProcess; - - // handle to monitor thread - HANDLE m_hMonitorThread; - - // console rows & columns - DWORD m_dwRows; - DWORD m_dwColumns; - DWORD m_dwBufferRows; - BOOL m_bUseTextBuffer; - - // set to one of TEXT_SELECTION_ #defines - int m_nTextSelection; - - // X Windows style copy-on-select - BOOL m_bCopyOnSelect; - - // Inverse the shift behaviour for selecting and dragging - BOOL m_bInverseShift; - - COORD m_coordSelOrigin; - RECT m_rectSelection; - HDC m_hdcSelection; - HBITMAP m_hbmpSelection; - HBITMAP m_hbmpSelectionOld; - HBRUSH m_hbrushSelection; - - CHAR_INFO* m_pScreenBuffer; - CHAR_INFO* m_pScreenBufferNew; - - DWORD m_nTextColor; - DWORD m_nTextBgColor; - - // Console window class names - static const TCHAR m_szConsoleClass[]; - static const TCHAR m_szHiddenParentClass[]; - - // win console window title - static const tstring m_strWinConsoleTitle; -}; - - - -///////////////////////////////////////////////////////////////////////////// diff --git a/Console/Console.rc b/Console/Console.rc deleted file mode 100644 index 67ea1487..00000000 --- a/Console/Console.rc +++ /dev/null @@ -1,208 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "res\resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -#define IDC_STATIC 00 -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "windows.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Neutral resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1250) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUT DIALOG DISCARDABLE 0, 0, 146, 87 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | - WS_CAPTION | WS_SYSMENU -CAPTION "About Console" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "OK",IDOK,48,66,50,14 - LTEXT "Console v1.5",IDC_STATIC,51,11,42,8 - LTEXT "Copyright 2001-2005 Marko Bozikovic",IDC_STATIC,9,30, - 127,8 - LTEXT "bozho@kset.org",IDC_STATIC,46,45,53,8 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 139 - TOPMARGIN, 7 - BOTTOMMARGIN, 80 - END -END -#endif // APSTUDIO_INVOKED - -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Neutral (Default) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD) -#ifdef _WIN32 -LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -//IDI_ICON2 ICON DISCARDABLE "Console.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_POPUP_MENU MENU DISCARDABLE -BEGIN - POPUP " " - BEGIN -// MENUITEM "Read&me", ID_SHOW_README_FILE - MENUITEM "&About Console", ID_ABOUT - MENUITEM SEPARATOR - MENUITEM "&Copy", ID_COPY - MENUITEM "&Paste", ID_PASTE - MENUITEM SEPARATOR -// MENUITEM "Always on &top", ID_TOGGLE_ONTOP -// MENUITEM "&Hide console", ID_HIDE_CONSOLE -// MENUITEM SEPARATOR -// MENUITEM "&Select configuration file", ID_SEL_CONFIG_FILE -// MENUITEM "&Edit configuration file", ID_EDIT_CONFIG_FILE -// MENUITEM "&Reload settings", ID_RELOAD_SETTINGS -// MENUITEM SEPARATOR - MENUITEM "E&xit", ID_EXIT_CONSOLE - END -END - -#endif // Neutral (Default) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Croatian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HRV) -#ifdef _WIN32 -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,351 - PRODUCTVERSION 1,5,0,351 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "Comments", "A cool console window :-)\0" - VALUE "CompanyName", "Ingenuity Unlimited Ltd.\0" - VALUE "FileDescription", "Console\0" - VALUE "FileVersion", "1.5, Build 351 2005.09.22\0" - VALUE "InternalName", "Console\0" - VALUE "LegalCopyright", "Copyright 2001-2004 Marko Bozikovic\0" - VALUE "LegalTrademarks", "Copyright 2001-2004 Marko Bozikovic\0" - VALUE "OriginalFilename", "Console.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Console\0" - VALUE "ProductVersion", "1.5.00.351\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - -#endif // !_MAC - -#endif // Croatian resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Console/Cursors.cpp b/Console/Cursors.cpp deleted file mode 100644 index 88b9087c..00000000 --- a/Console/Cursors.cpp +++ /dev/null @@ -1,769 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Cursors.h - cursor classes - -//#include "stdafx.h" -#include -#include -#include "Cursors.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - - -///////////////////////////////////////////////////////////////////////////// -// XTermCursor - -XTermCursor::XTermCursor(HWND hwndConsole, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndConsole, hdcWindow, crCursorColor) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -, m_hInactiveBrush(::CreateSolidBrush(crCursorColor)) -{ -} - -XTermCursor::~XTermCursor() { - - ::DeleteObject(m_hActiveBrush); - ::DeleteObject(m_hInactiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void XTermCursor::Draw(LPRECT pRect) { - - if (m_bActive) { - ::FillRect(m_hdcWindow, pRect, m_hActiveBrush); - } else { - ::FrameRect(m_hdcWindow, pRect, m_hInactiveBrush); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void XTermCursor::PrepareNext() { - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// BlockCursor - -BlockCursor::BlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -, m_bVisible(TRUE) -{ - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 750, NULL); -} - -BlockCursor::~BlockCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - ::DeleteObject(m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void BlockCursor::Draw(LPRECT pRect) { - - if (m_bActive && m_bVisible) { - - ::FillRect(m_hdcWindow, pRect, m_hActiveBrush); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void BlockCursor::PrepareNext() { - - m_bVisible = !m_bVisible; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// NBBlockCursor - -NBBlockCursor::NBBlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -{ -} - -NBBlockCursor::~NBBlockCursor() { - - ::DeleteObject(m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void NBBlockCursor::Draw(LPRECT pRect) { - - ::FillRect(m_hdcWindow, pRect, m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void NBBlockCursor::PrepareNext() { -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// PulseBlockCursor - -PulseBlockCursor::PulseBlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -, m_nSize(0) -, m_nMaxSize(0) -, m_nStep(0) -{ - ::ZeroMemory(&m_rect, sizeof(RECT)); - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 100, NULL); -} - -PulseBlockCursor::~PulseBlockCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - ::DeleteObject(m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void PulseBlockCursor::Draw(LPRECT pRect) { - - // this is called only once, to set the size of the cursor - if (m_nMaxSize == 0) { - if ((pRect->right - pRect->left) < (pRect->bottom - pRect->top)) { - m_nMaxSize = (pRect->right - pRect->left) >> 1; - } else { - m_nMaxSize = (pRect->bottom - pRect->top) >> 1; - } - } - - if (m_bActive) { - RECT rect; - ::CopyMemory(&rect, pRect, sizeof(RECT)); - rect.left += m_nSize; - rect.top += m_nSize; - rect.right -= m_nSize; - rect.bottom -= m_nSize; - ::FillRect(m_hdcWindow, &rect, m_hActiveBrush); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void PulseBlockCursor::PrepareNext() { - - if (m_nSize == 0) { - m_nStep = 1; - } else if (m_nSize == m_nMaxSize) { - m_nStep = -1; - } - - m_nSize += m_nStep; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// BarCursor - -BarCursor::BarCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hPen(::CreatePen(PS_SOLID, 1, crCursorColor)) -, m_bVisible(TRUE) -{ - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 750, NULL); -} - -BarCursor::~BarCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - - ::DeleteObject(m_hPen); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void BarCursor::Draw(LPRECT pRect) { - - if (m_bActive && m_bVisible) { - HPEN hOldPen = (HPEN)::SelectObject(m_hdcWindow, m_hPen); - ::MoveToEx(m_hdcWindow, pRect->left, pRect->top, NULL); - ::LineTo(m_hdcWindow, pRect->left, pRect->bottom); - ::SelectObject(m_hdcWindow, hOldPen); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void BarCursor::PrepareNext() { - - m_bVisible = !m_bVisible; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// ConsoleCursor - -ConsoleCursor::ConsoleCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hStdOut(::CreateFile(_T("CONOUT$"), GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0)) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -, m_bVisible(TRUE) -{ - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 750, NULL); -} - -ConsoleCursor::~ConsoleCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - ::DeleteObject(m_hActiveBrush); - ::CloseHandle(m_hStdOut); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void ConsoleCursor::Draw(LPRECT pRect) { - - RECT rect; - - ::CopyMemory(&rect, pRect, sizeof(RECT)); - - if (m_bActive && m_bVisible) { - - rect.top += (rect.bottom - rect.top) * 80 / 100; - - ::FillRect(m_hdcWindow, &rect, m_hActiveBrush); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void ConsoleCursor::PrepareNext() { - - m_bVisible = !m_bVisible; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// NBHLineCursor - -NBHLineCursor::NBHLineCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hPen(::CreatePen(PS_SOLID, 1, crCursorColor)) -{ -} - -NBHLineCursor::~NBHLineCursor() { - - ::DeleteObject(m_hPen); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void NBHLineCursor::Draw(LPRECT pRect) { - - HPEN hOldPen = (HPEN)::SelectObject(m_hdcWindow, m_hPen); - ::MoveToEx(m_hdcWindow, pRect->left, pRect->bottom-1, NULL); - ::LineTo(m_hdcWindow, pRect->right, pRect->bottom-1); - ::SelectObject(m_hdcWindow, hOldPen); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void NBHLineCursor::PrepareNext() { - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// HLineCursor - -HLineCursor::HLineCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hPen(::CreatePen(PS_SOLID, 1, crCursorColor)) -, m_nSize(0) -, m_nPosition(0) -, m_nStep(0) -{ - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 100, NULL); -} - -HLineCursor::~HLineCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - - ::DeleteObject(m_hPen); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void HLineCursor::Draw(LPRECT pRect) { - - // this is called only once, to set the size of the cursor - if (m_nSize != (pRect->bottom - pRect->top - 1)) { - m_nSize = pRect->bottom - pRect->top - 1; - m_nPosition = 0; - m_nStep = 1; - } - - if (m_bActive) { - HPEN hOldPen = (HPEN)::SelectObject(m_hdcWindow, m_hPen); - ::MoveToEx(m_hdcWindow, pRect->left, pRect->top + m_nPosition, NULL); - ::LineTo(m_hdcWindow, pRect->right, pRect->top + m_nPosition); - ::SelectObject(m_hdcWindow, hOldPen); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void HLineCursor::PrepareNext() { - - if (m_nPosition == 0) { - m_nStep = 1; - } else if (m_nPosition == m_nSize) { - m_nStep = -1; - } - - m_nPosition += m_nStep; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// VLineCursor - -VLineCursor::VLineCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hPen(::CreatePen(PS_SOLID, 1, crCursorColor)) -, m_nSize(0) -, m_nPosition(0) -, m_nStep(0) -{ - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 100, NULL); -} - -VLineCursor::~VLineCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - - ::DeleteObject(m_hPen); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void VLineCursor::Draw(LPRECT pRect) { - - // this is called only once, to set the size of the cursor - if (m_nSize != (pRect->right - pRect->left - 1)) { - m_nSize = pRect->right - pRect->left - 1; - m_nPosition = 0; - m_nStep = 1; - } - - if (m_bActive) { - HPEN hOldPen = (HPEN)::SelectObject(m_hdcWindow, m_hPen); - ::MoveToEx(m_hdcWindow, pRect->left + m_nPosition, pRect->top, NULL); - ::LineTo(m_hdcWindow, pRect->left + m_nPosition, pRect->bottom); - ::SelectObject(m_hdcWindow, hOldPen); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void VLineCursor::PrepareNext() { - - if (m_nPosition == 0) { - m_nStep = 1; - } else if (m_nPosition == m_nSize) { - m_nStep = -1; - } - - m_nPosition += m_nStep; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// RectCursor - -RectCursor::RectCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -, m_bVisible(TRUE) -{ - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 750, NULL); -} - -RectCursor::~RectCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - ::DeleteObject(m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void RectCursor::Draw(LPRECT pRect) { - - if (m_bActive && m_bVisible) { - - ::FrameRect(m_hdcWindow, pRect, m_hActiveBrush); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void RectCursor::PrepareNext() { - - m_bVisible = !m_bVisible; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// NBRectCursor - -NBRectCursor::NBRectCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -{ -} - -NBRectCursor::~NBRectCursor() { - - ::DeleteObject(m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void NBRectCursor::Draw(LPRECT pRect) { - - ::FrameRect(m_hdcWindow, pRect, m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void NBRectCursor::PrepareNext() { -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// PulseRectCursor - -PulseRectCursor::PulseRectCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_hActiveBrush(::CreateSolidBrush(crCursorColor)) -, m_nSize(0) -, m_nMaxSize(0) -, m_nStep(0) -{ - ::ZeroMemory(&m_rect, sizeof(RECT)); - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 100, NULL); -} - -PulseRectCursor::~PulseRectCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - ::DeleteObject(m_hActiveBrush); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void PulseRectCursor::Draw(LPRECT pRect) { - - // this is called only once, to set the size of the cursor - if (m_nMaxSize == 0) { - if ((pRect->right - pRect->left) < (pRect->bottom - pRect->top)) { - m_nMaxSize = (pRect->right - pRect->left) >> 1; - } else { - m_nMaxSize = (pRect->bottom - pRect->top) >> 1; - } - } - - if (m_bActive) { - RECT rect; - ::CopyMemory(&rect, pRect, sizeof(RECT)); - rect.left += m_nSize; - rect.top += m_nSize; - rect.right -= m_nSize; - rect.bottom -= m_nSize; - ::FrameRect(m_hdcWindow, &rect, m_hActiveBrush); - } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void PulseRectCursor::PrepareNext() { - - if (m_nSize == 0) { - m_nStep = 1; - } else if (m_nSize == m_nMaxSize) { - m_nStep = -1; - } - - m_nSize += m_nStep; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// FadeBlockCursor - -FadeBlockCursor::FadeBlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor, COLORREF crBkColor) -: Cursor(hwndParent, hdcWindow, crCursorColor) -, m_crCursorColor(crCursorColor) -, m_nStep(1) -, m_crBkColor(crBkColor) -, m_nIndex(0) -, m_hUser32(NULL) -, m_hMemDC(NULL) -{ - m_uiTimer = ::SetTimer(hwndParent, CURSOR_TIMER, 35, NULL); - - FakeBlend(); -// } -} - -FadeBlockCursor::~FadeBlockCursor() { - - if (m_uiTimer) ::KillTimer(m_hwndParent, m_uiTimer); - -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void FadeBlockCursor::Draw(LPRECT pRect) { - - - HBRUSH hBrush = ::CreateSolidBrush(m_arrColors[m_nIndex]); - ::FillRect(m_hdcWindow, pRect, hBrush); - ::DeleteObject(hBrush); -// } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// - -void FadeBlockCursor::PrepareNext() { - if (m_nIndex == 0) { - m_nStep = 1; - } else if (m_nIndex == (FADE_STEPS)) { - m_nStep = -1; - } - m_nIndex += m_nStep; -// } -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// This function is used to create a fake blending for WinNT (uuseful only -// for solid background, though) - -void FadeBlockCursor::FakeBlend() { - - int nDeltaR = ((GetRValue(m_crCursorColor) - GetRValue(m_crBkColor)) << 8) / FADE_STEPS; - int nDeltaG = ((GetGValue(m_crCursorColor) - GetGValue(m_crBkColor)) << 8) / FADE_STEPS; - int nDeltaB = ((GetBValue(m_crCursorColor) - GetBValue(m_crBkColor)) << 8) / FADE_STEPS; - - for (int i = 0; i < FADE_STEPS; ++i) { - m_arrColors[i] = RGB(GetRValue(m_crCursorColor) - (nDeltaR*i >> 8), GetGValue(m_crCursorColor) - (nDeltaG*i >> 8), GetBValue(m_crCursorColor) - (nDeltaB*i >> 8)); - } - - m_arrColors[FADE_STEPS] = m_crBkColor; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - diff --git a/Console/Cursors.h b/Console/Cursors.h deleted file mode 100644 index 3a1f4c17..00000000 --- a/Console/Cursors.h +++ /dev/null @@ -1,342 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Cursors.h - cursor classes - -#pragma once - -#define CURSOR_TIMER 45 - -extern BOOL g_bWin2000; - -///////////////////////////////////////////////////////////////////////////// -// A base class for all the cursors - -class Cursor { - public: - Cursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor) - : m_hwndParent(hwndParent) - , m_hdcWindow(hdcWindow) - , m_crCursorColor(crCursorColor) - , m_bActive(TRUE) - , m_uiTimer(0) - {}; - - virtual ~Cursor(){}; - - void SetState(BOOL bActive) {m_bActive = bActive;}; - BOOL GetState() { return m_bActive; } - - // used to draw current frame of the cursor - virtual void Draw(LPRECT pRect) = 0; - // used to prepare the next frame of cursor animation - virtual void PrepareNext() = 0; - - protected: - - HWND m_hwndParent; - HDC m_hdcWindow; - COLORREF m_crCursorColor; - - BOOL m_bActive; - UINT m_uiTimer; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// XTermCursor - -class XTermCursor : public Cursor { - public: - XTermCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~XTermCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HBRUSH m_hActiveBrush; - HBRUSH m_hInactiveBrush; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// BlockCursor - -class BlockCursor : public Cursor { - public: - BlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~BlockCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HBRUSH m_hActiveBrush; - BOOL m_bVisible; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// NBBlockCursor - -class NBBlockCursor : public Cursor { - public: - NBBlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~NBBlockCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HBRUSH m_hActiveBrush; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// PulseBlockCursor - -class PulseBlockCursor : public Cursor { - public: - PulseBlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~PulseBlockCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HBRUSH m_hActiveBrush; - RECT m_rect; - int m_nSize; - int m_nMaxSize; - int m_nStep; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// BarCursor - -class BarCursor : public Cursor { - public: - BarCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~BarCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HPEN m_hPen; - BOOL m_bVisible; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// ConsoleCursor - -class ConsoleCursor : public Cursor { - public: - ConsoleCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~ConsoleCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HANDLE m_hStdOut; - HBRUSH m_hActiveBrush; - BOOL m_bVisible; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// NBHLineCursor - -class NBHLineCursor : public Cursor { -public: - NBHLineCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~NBHLineCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - -private: - HPEN m_hPen; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// HLineCursor - -class HLineCursor : public Cursor { - public: - HLineCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~HLineCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HPEN m_hPen; - int m_nSize; - int m_nPosition; - int m_nStep; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// VLineCursor - -class VLineCursor : public Cursor { - public: - VLineCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~VLineCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HPEN m_hPen; - int m_nSize; - int m_nPosition; - int m_nStep; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// RectCursor - -class RectCursor : public Cursor { - public: - RectCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~RectCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HBRUSH m_hActiveBrush; - BOOL m_bVisible; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// NBRectCursor - -class NBRectCursor : public Cursor { - public: - NBRectCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~NBRectCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HBRUSH m_hActiveBrush; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// PulseRectCursor - -class PulseRectCursor : public Cursor { - public: - PulseRectCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor); - ~PulseRectCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - HBRUSH m_hActiveBrush; - RECT m_rect; - int m_nSize; - int m_nMaxSize; - int m_nStep; -}; - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// FadeBlockCursor - -#define FADE_STEPS 20 -#define ALPHA_STEP 12 - -#define BLEND_BMP_WIDTH 10 -#define BLEND_BMP_HEIGHT 20 - -class FadeBlockCursor : public Cursor { - public: - FadeBlockCursor(HWND hwndParent, HDC hdcWindow, COLORREF crCursorColor, COLORREF crBkColor); - ~FadeBlockCursor(); - - void Draw(LPRECT pRect); - void PrepareNext(); - - private: - - void FakeBlend(); - - COLORREF m_crCursorColor; - int m_nStep; - - // used under WinNT 4.0 - COLORREF m_crBkColor; - COLORREF m_arrColors[FADE_STEPS+1]; - int m_nIndex; - - // these are used under Win2000 only - HMODULE m_hUser32; - BLENDFUNCTION m_bfn; - HDC m_hMemDC; -}; - -///////////////////////////////////////////////////////////////////////////// diff --git a/Console/Dialogs.cpp b/Console/Dialogs.cpp deleted file mode 100644 index 18574e04..00000000 --- a/Console/Dialogs.cpp +++ /dev/null @@ -1,134 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Dialogs.h - dialog classes -// -// About dialog class, etc... - -//#include "stdafx.h" -#include - -#include "resource.h" -#include "Console.h" -#include "Dialogs.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -extern HINSTANCE ghInstance; - -///////////////////////////////////////////////////////////////////////////// -// About dialog class - -///////////////////////////////////////////////////////////////////////////// -// Ctor/Dtor - -CAboutDlg::CAboutDlg(HWND hwndParent) - : m_hWndParent(hwndParent) -{ -} - - -CAboutDlg::~CAboutDlg() -{ -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// public methods - -///////////////////////////////////////////////////////////////////////////// -// DoModal - shows About dialog - -BOOL CAboutDlg::DoModal() -{ - ::DialogBox( - ghInstance, - MAKEINTRESOURCE(IDD_ABOUT), - m_hWndParent, - CAboutDlg::DialogProc); - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// message handlers - - -///////////////////////////////////////////////////////////////////////////// -// DialogProc - dialog window procedure - -int CALLBACK CAboutDlg::DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - switch (uMsg) { - case WM_INITDIALOG: - return TRUE; - - case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDOK: - case IDCANCEL: - if (HIWORD(wParam) == BN_CLICKED) { - ::EndDialog(hwndDlg, MB_OK); - return TRUE; - } - break; - } - } - - return 0; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - - - - - - - - - - - - - - - diff --git a/Console/Dialogs.h b/Console/Dialogs.h deleted file mode 100644 index 54cafb05..00000000 --- a/Console/Dialogs.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Dialogs.h - dialog classes -// -// About dialog class, etc... - -#pragma once - -///////////////////////////////////////////////////////////////////////////// -// About dialog class - -class CAboutDlg { - public: - CAboutDlg(HWND hwndParent); - ~CAboutDlg(); - - // public methods - public: - - // shows About dialog - BOOL DoModal(); - - // public data - public: - // parent window handle - HWND m_hWndParent; - - // private methods - private: - ///////////////////////// - // message handlers - - // dialog window procedure - static int CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ); - - // private data - private: -}; - -///////////////////////////////////////////////////////////////////////////// diff --git a/Console/FileStream.cpp b/Console/FileStream.cpp deleted file mode 100644 index 2e56aedd..00000000 --- a/Console/FileStream.cpp +++ /dev/null @@ -1,259 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// FileStream.cpp - implementation of IStream interface on any file -// (not strictly COM, I'm faking it here a bit :-) -// - -#undef CINTERFACE -#include "builddefines.h" - -//#include "stdafx.h" -//#include -#include -#include -#include "FileStream.h" - -//#ifdef _DEBUG -//#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -//#endif - -///////////////////////////////////////////////////////////////////////////// -// CreateFileStream - opens/creates a file and returns an IStream interface - -HRESULT CreateFileStream( - LPCTSTR lpFileName, // file name - DWORD dwDesiredAccess, // access mode - DWORD dwShareMode, // share mode - LPSECURITY_ATTRIBUTES lpSecurityAttributes, // SD - DWORD dwCreationDisposition, // how to create - DWORD dwFlagsAndAttributes, // file attributes - HANDLE hTemplateFile, // handle to template file - IStream** ppStream // pointer to IStream interface -) -{ - - HANDLE hFile = ::CreateFile( - lpFileName, - dwDesiredAccess, - dwShareMode, - lpSecurityAttributes, - dwCreationDisposition, - dwFlagsAndAttributes, - hTemplateFile); - - if (hFile == INVALID_HANDLE_VALUE) { -// DWORD a = ::GetLastError(); - ppStream = NULL; - return E_FAIL; - } - - FileStream* pFileStream = new FileStream(hFile); - - return pFileStream->QueryInterface(IID_IStream, (void**)ppStream); -} - -///////////////////////////////////////////////////////////////////////////// - - - -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// FileStream class - -///////////////////////////////////////////////////////////////////////////// -// ctor/dtor - -FileStream::FileStream(HANDLE hFile) - : m_lRefCount(0) - , m_hFile(hFile) -{ -} - -FileStream::~FileStream() -{ - if (m_hFile) ::CloseHandle(m_hFile); -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// IStream methods - -///////////////////////////////////////////////////////////////////////////// -// Read - reads a specified number of bytes from the stream object into memory -// starting at the current seek pointer - -STDMETHODIMP FileStream::Read(void *pv, ULONG cb, ULONG *pcbRead) -{ - if (!::ReadFile(m_hFile, pv, cb, pcbRead, NULL)) return S_FALSE; - - return S_OK; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Write - writes a specified number of bytes into the stream object starting -// at the current seek pointer - -STDMETHODIMP FileStream::Write(void const *pv, ULONG cb, ULONG *pcbWritten) -{ - if (!::WriteFile(m_hFile, pv, cb, pcbWritten, NULL)) return S_FALSE; - - return S_OK; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Seek - changes the seek pointer to a new location relative to the beginning -// of the stream, to the end of the stream, or to the current seek pointer - -STDMETHODIMP FileStream::Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) -{ - DWORD dwFileOrigin; - - DWORD dwMoveLow = dlibMove.LowPart; - LONG lMoveHigh = dlibMove.HighPart; - - switch (dwOrigin) { - case STREAM_SEEK_SET : dwFileOrigin = FILE_BEGIN; break; - case STREAM_SEEK_CUR : dwFileOrigin = FILE_CURRENT; break; - case STREAM_SEEK_END : dwFileOrigin = FILE_END; break; - default:dwFileOrigin = FILE_BEGIN; - } - - DWORD dwRet = ::SetFilePointer(m_hFile, dwMoveLow, &lMoveHigh, dwFileOrigin); - - if (::GetLastError() != NO_ERROR) return STG_E_INVALIDPOINTER; - - plibNewPosition->LowPart = dwRet; - plibNewPosition->HighPart = lMoveHigh; - - return S_OK; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// SetSize - not really doing anything here - -STDMETHODIMP FileStream::SetSize(ULARGE_INTEGER libNewSize) -{ - return S_OK; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// CopyTo - copies a specified number of bytes from the current seek pointer -// in the stream to the current seek pointer in another stream - -STDMETHODIMP FileStream::CopyTo(IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) -{ - // later... - return E_NOTIMPL; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Commit - no work here... - -STDMETHODIMP FileStream::Commit(DWORD grfCommitFlags) -{ - return S_OK; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Revert - no work here... - -STDMETHODIMP FileStream::Revert(void) -{ - return S_OK; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// LockRegion - no work here... - -STDMETHODIMP FileStream::LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) -{ - return E_NOTIMPL; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// UnlockRegion - no work here... - -STDMETHODIMP FileStream::UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) -{ - return E_NOTIMPL; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Stat - no work here... - -STDMETHODIMP FileStream::Stat(STATSTG *pstatstg, DWORD grfStatFlag) -{ - return E_NOTIMPL; -} - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Clone - no work here... - -STDMETHODIMP FileStream::Clone(IStream **ppstm) -{ - return E_NOTIMPL; -} - -///////////////////////////////////////////////////////////////////////////// diff --git a/Console/FileStream.h b/Console/FileStream.h deleted file mode 100644 index 4ac8966b..00000000 --- a/Console/FileStream.h +++ /dev/null @@ -1,107 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2001-2004 by Marko Bozikovic -// All rights reserved -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc., and -// I'll try to keep a version up to date. I can be reached as follows: -// marko.bozikovic@alterbox.net -// bozho@kset.org -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// FileStream.h - implementation of IStream interface on any file -// (not really COM, I'm faking it here a bit :-) -// - -#pragma once - - -///////////////////////////////////////////////////////////////////////////// -// CreateFileStream - opens/creates a file and returns an IStream interface - -HRESULT CreateFileStream( - LPCTSTR lpFileName, // file name - DWORD dwDesiredAccess, // access mode - DWORD dwShareMode, // share mode - LPSECURITY_ATTRIBUTES lpSecurityAttributes, // SD - DWORD dwCreationDisposition, // how to create - DWORD dwFlagsAndAttributes, // file attributes - HANDLE hTemplateFile, // handle to template file - IStream** ppStream // pointer to IStream interface -); - - -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// FileStream class - -class FileStream : public IStream { - public: - FileStream(HANDLE hFile); - ~FileStream(); - - // IUnknown methods - STDMETHOD(QueryInterface)(REFIID riid, void ** ppv) { - if (riid == IID_IUnknown) { - *ppv = static_cast(this); - } else if (riid == IID_IStream) { - *ppv = static_cast(this); - } else { - *ppv = NULL; - return E_NOINTERFACE; - } - - static_cast(*ppv)->AddRef(); - return S_OK; - }; - - STDMETHOD_(ULONG, AddRef)(void) { - return ::InterlockedIncrement(&m_lRefCount); - }; - - STDMETHOD_(ULONG, Release)(void) { - long l = ::InterlockedDecrement(&m_lRefCount); - if (l == 0) delete this; - return l; - }; - - // IStream methods - STDMETHOD(Read)(void *pv, ULONG cb, ULONG *pcbRead); - STDMETHOD(Write)(void const *pv, ULONG cb, ULONG *pcbWritten); - STDMETHOD(Seek)(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition); - STDMETHOD(SetSize)(ULARGE_INTEGER libNewSize); - STDMETHOD(CopyTo)(IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten); - STDMETHOD(Commit)(DWORD grfCommitFlags); - STDMETHOD(Revert)(void); - STDMETHOD(LockRegion)(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); - STDMETHOD(UnlockRegion)(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType); - STDMETHOD(Stat)(STATSTG *pstatstg, DWORD grfStatFlag); - STDMETHOD(Clone)(IStream **ppstm); - - private: // private data - - // reference count - long m_lRefCount; - - // file handle - HANDLE m_hFile; -}; - -///////////////////////////////////////////////////////////////////////////// diff --git a/Console/ReadMe.txt b/Console/ReadMe.txt deleted file mode 100644 index dd1ac002..00000000 --- a/Console/ReadMe.txt +++ /dev/null @@ -1,1200 +0,0 @@ -Console v1.5 Sep 2005 -===================== -for Windows NT/2000/XP - -Copyright (C) 2001-2005 Marko Bozikovic - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Send bug reports, bug fixes, enhancements, requests, flames, etc., and -I'll try to keep a version up to date. I can be reached as follows: - bozho@kset.org - -Console icon is Copyright (C) 2001-2005 by Ante Vukorepa (orcinus@kset.org) - - -1. Requirements -=============== -WinNT 4.0 SP4 or later (it won't work on Win9x/Me) -IE 4.0 (or later) installed. - - -2. File list -============ - -console.exe -FreeImage.dll -FreeImagePlus.dll -console.inf -console.xml -console_big.xml -console_small.xml -devel-changes.txt -Readme.txt -License.txt -Tab Completition.reg -FixedMedium*.fon -TerminalMedium14.fon - - -3. Installation -=============== - -Unzip Console.zip file somewhere :-) - -If you'd like to have "Console here" in the Explorer right-click menu for -drives and directories, install console.inf file (right-click on console.inf -and choose "Install") Remember to do it in the Console directory! - - -4. Uninstall -============ - -If you have installed console.inf (see "Installation" section), run -"Add/Remove Programs" Control Panel applet and remove "Console Here -Extension". - -Delete all the files. - - -5. Overview -=========== - -Console is a Win console window enhancement. It was inspired by eConsole -(http://www.informatik.uni-frankfurt.de/~corion), a great console-enhancement -program (unfortunately, it seems that it's no longer being developed) - -Console features include configurable font, color, size, background image and -transparency (on Win2000 and later) - -Console is *not* a shell. It's simply a nice-looking front end for a shell -of your choice (cmd.exe, 4NT, ksh, Cygwin bash, etc.) - - -6. Acknowledgements -=================== - -A big thanks to Ante Vukorepa for the program icon. -Also, big thanks to Alen Ladavac for help with painting optimizations. - -Many thanks to code contributors: -- Francois Leblanc for mouse wheel messages patch -- Daniel Soto for adding multiple monitors support -- Dean Scarff for adding stuff -- Adam Hodson for adding flat scrollbar support -- Daniel Cheng for making Console window looking like a regular window when - is set to 'tray' or 'hide' -- Rob Davenport for config reload prompt patch and initial comments in the - sample console.xml file - -Thanks also goes to all the people using and testing Console, reporting bugs -and asking for new stuff :-) - - -7. Included fonts -================= - -The fonts included with Console are XFree86 'misc' fonts converted to TTF. I -added them here, since Windows could use nicer console fonts. If you wish to -use them, simply install them as you would any other TTF font (go to Control -Panel -> Fonts and follow instructions :-) - -I guess these fonts are distributed under XFree86 licence, and if you think -I'm in violation of any licence terms by providing these fonts, please drop me -a line. - - -8. FreeImage library -==================== - -Console uses FreeImage library for background image loading and manipulations. -Console source distribution includes only FreeImage library, include and DLL -files. Complete source code for FreeImage can be obtained at: -http://freeimage.sourceforge.net - - -9. Configuration & usage -======================== - -9.1 Running Console -------------------- - -The first thing you might want to set is your COMSPEC environment variable, -since that is the shell Console will start. Set it to your favorite shell -(cmd.exe, 4nt.exe) - -Console command line syntax: -console.exe [] [OPTIONS] - - is the path to the configuration file. If ommited, Console will -try to locate console.xml configuration file in console.exe directory. If the -path contains blanks, enclose it in double quotes. - -Options: - --c - sets initial shell command --t - sets default window title --r - sets default new configuration auto-load - flag - -You can pass initial shell command by using "-c" switch. If the command string -contains blanks, enclose it in double quotes. If the command string itself -contains double quotes, put two double quotes for each double quote appearing -in the command string. E.g: - console.exe console.xml -c "cd ""C:\Program Files""" - -Note: If you use cmd.exe as your shell, you must use /k switch in your command -line string (4NT doesn't need the /k switch): - console.exe console.xml -c "/k " - --t switch specifies the default Console window title. Using the 'title' -attribute in the config file will override this switch. - --r switch specifies the default new configuration auto-reload flag. Possible -values are: 'yes', 'no' and 'prompt'. 'prompt' is the default. Using -'reload_new_config' tag in the config file will override this switch. - -9.2 Copy/Paste --------------- - -To copy text, press and hold shift+left click (or simply left click if Console -is not mouse draggable) Drag to select text, and then left-click inside the -selection to copy. Left-click outside the selection clears it. If you set -copy_on_select tag to true, the selection will be copied immediately after -releasing the mouse button. - -You can paste text into Console using shift+right click or middle click (you -might want to disable middle-button click support for Console in your mouse -drivers for better performance) - -Note: text selection and copy work for fixed-width fonts *only*. Use Lucida -Console or the supplied fonts (if you have any nice looking free fixed width -fonts, feel free to share them :-) - -9.3 International characters ----------------------------- - -Console fully supports Unicode characters, so it should be able to handle all -national characters, but there are some things to note: - -The font you use in Console must include international characters (this one is -obvious, isn't it? :-) Supplied FixedMediumXX fonts don't include all of them. -I have found some FixedMedium Unicode fonts, but I wasn't able to convert them -from bdf to ttf format yet. Your best bet is using Lucida Console font -supplied with Windows. - -After that, you have to configure the Windows console. Start Console and -unhide Win console. By default, the Win console uses the Raster Font that -doesn't have international characters. Open Win console properties and on the -Fonts tab change the font to Lucida Console. Click OK and on the next small -dialog select "Save properties for future windows with the same title" This -will make Win console windows started by Console use Lucida Console font that -has international characters. - -9.4 Controlling Console from other applications ------------------------------------------------ - -Console can be controlled from other applications that support sending -messages to application windows (e.g. PowerPro) - -Console can handle messages for its menu commands sent from other -applications. The other application should send WM_COMMAND message (0x0111 in -hex, or 273 decimal) to the main Console window, with wParam set to command -ID, and lParam set to 0. - -Command IDs (decimal values) are: - -Show Readme.txt file...............40001 -Show About dialog..................40002 -Copy selected text.................40003 -Paste from clipboard...............40004 -Toggle 'always on top' status......40005 -Toggle show/hide Windows console...40006 -Edit configuration file............40008 -Reload settings....................40009 -Exit Console.......................40010 - -For selecting a configuration file, wParam should be between 1000 and 2000 -(1000 being the first .XML file in the startup config file direcotry, files -sorted by filename, ascending) - -9.5 Maximizing Console window ------------------------------ - -Console window can be maximized by setting 'rows' and/or 'columns' of the - tag to 'max'. - -Maximum number of rows and/or columns is determined by both maximum Windows' -console dimensions and maximum Console window size. The smaller will be used -(since Windows console cannot be resized beyond desktop size) - -If the size of your Console window is limited by Windows console maximum size, -you can choose a smaller font in Windows console properties. - -Note that increasing the number of rows and/or columns and reloading the -settings can sometimes result in a corrupt output. I haven't found a solution -for this yet, but it seems that restarting Console solves the problem. - - -9.6 Misc stuff --------------- - -Using left button double click you can toggle between z-order selected in the -configuration file and "always on top" z-order. - -Right-click pops up a menu. You can copy/paste text from the menu, toggle -'always on top' and 'hide console' flags, work with configuration files. You -can switch configuration files by selecting a file from 'Select configuration -file' submenu (currently active configuration file is checked) and reloading -configuration. Configuration files are enumerated from the initial -configuration file's directory. - -You can drag-n-drop a file or directory to Console. If several files are -dropped at once, they will be sent to Console, separated by spaces. Filenames -that contain spaces will be enclosed in double quotes. - -The supplied .reg file is a registry file that will turn on file and directory -name completion for cmd.exe (thanks to Rob 'insanitee' for the idea) To -install it, just double-click on it, and click 'Yes'. - -You can map console font colors to custom values (see configuration section) -Check out supplied console.xml for an example with default values. - -Color indexes for default colors are: -00 - Black 08 - Gray (bright black) -01 - Blue 09 - Bright blue -02 - Green 10 - Bright green -03 - Cyan 11 - Bright cyan -04 - Red 12 - Bright red -05 - Magenta 13 - Bright magenta -06 - Yellow 14 - Bright yellow -07 - White 15 - Bright white - - -10. Configuration file -====================== - -The console configuration file is a simple xml file. Here's a general layout -of the configuration file: - - - - - - 8 - - false - false - Lucida Console - - - - 150 - 150 - bottom left - 10 - regular - - - - - true - - - - - 10 - 10 - 120 - - - false - - 1 - - normal - - - - alpha - - - - - 2.bmp - - - - - - - - - - - - true - - true - - true - - prompt - - - - - -If you ommit tags and/or attributes, default values will be used. - -Here are the tags and attributes: - -console -------- -Description: root tag -Parent: none -Attributes: - title -> sets the console window title (default: console) - - change_refresh -> change refresh interval (in ms) for window - repaint (default: 50) It controls how long window repainting is - delayed after a change has been detected in the real console. - The minimum value for this setting is 5. Note that small values - will increase CPU usage when console contents changes - rapidly (like dumping a large text file on the console) - - refresh -> sets main refresh interval (in ms) for window - repaint (default: 500) Console window is periodically refresh - even if there are no changes detected. This is needed for - proper operation of some DOS programs (eg, RAR). You can switch - this off (by setting it to 0) to reduce CPU usage, but some DOS - programs will not be displayed correctly (if at all :-) - - shell -> sets shell program, overriding COMSPEC environment - variable (if you change this while Console is running, you'll - have to restart it for chages to take effect) - - editor -> specifies text editor that will be used to edit the - configuration file (notepad.exe by default); if the program is - not in your PATH, you'll need to specify the full path - - editor_params -> specifies additional parameters to be passed - to a text editor used to edit configuration file and view the - Readme file; %f in editor_params will be replaced by the - configuration/readme file name; if there's no %f in the - editor_params, the configuration/readme file name will be - concatenated to the editor_params string; if there are spaces - in the filename, place " around %f ("%f") -Data: none - -Note on 'change_refresh' and 'refresh' attributes: Console v1.4 introduced -some window painting improvements, increasing the speed and reducing CPU -usage. You might want to set these parameters much lower for better -performance (something like 5-10 for 'change_refresh' and 100-200 for -'refresh') - - - ------ - Description: Sets the font and its properties - Parent: console - Attributes: none - Data: none - - - ------ - Description: sets font size in points - Parent: font - Attributes: none - Data: font size in points (default: 8) - - - ------ - Description: sets font's bold flag - Parent: font - Attributes: none - Data: true/false (default: false) - - - -------- - Description: sets font's italic flag - Parent: font - Attributes: none - Data: true/false (default: false) - - - ------- - Description: sets font color - Parent: font - Attributes: - r -> 0-255, sets Red component (default: 0) - - g -> 0-255, sets Green component (default: 0) - - b -> 0-255, sets Blue component (default: 0) - Data: none - Note: if this tag is not present, Console will use font colors - from the real console (useful if your shell, like 4NT, - supports different coloring options) - - - -------- - Description: groups font color mapping tags - Parent: font - Attributes: none - Data: none - - - ---------- - Description: maps color No. XX to a new color - Parent: colors - Attributes: - r -> 0-255, sets Red component (default: 0) - - g -> 0-255, sets Green component (default: 0) - - b -> 0-255, sets Blue component (default: 0) - Data: none - Note: XX goes from 00 to 15 (you may ommit colors you don't - want to change) See 'Misc Stuff' section above for - color indexes - - - ------ - Description: sets font's name - Parent: font - Attributes: none - Data: font name (default: Lucida Console) - - - - ---------- - Description: groups window position tags - Parent: console - Attributes: none - Data: none - - - --- - Description: sets initial window X coordinate - Parent: position - Attributes: none - Data: X coordinate - Note: Set to -1 to let the system place the Console window at - startup - - - --- - Description: sets initial window Y coordinate - Parent: position - Attributes: none - Data: Y coordinate - Note: Set to -1 to let the system place the Console window at - startup - - - -------- - Description: sets initial window docking position - Parent: position - Attributes: none - Data: docked position: none, bottom left, bottom right, top - left, top right (default: none) - - - --------------- - Description: sets window snap distance - Parent: position - Attributes: none - Data: snap distance in pixels; use -1 for no snapping (default: - 10) - - - --------- - Description: sets window z ordering - Parent: position - Attributes: none - Data: window z-order: regular, on top, on bottom (default: - regular) - - - - ------------ - Description: groups window appearance tags - Parent: console - Attributes: none - Data: none - - - -------------- - Description: sets real console window visibility - Parent: appearance - Attributes: none - Data: true/false (default: true) - - - ---------------------- - Description: sets timeout for initial console hiding (during startup); - some shells need real console window visible during - startup in order to initialize properly - Parent: appearance - Attributes: none - Data: timeout in milliseconds (default: 0) - - - ----------------- - Description: sets initial 'minimized' status - Parent: appearance - Attributes: none - Data: true/false (default: true) - - - ---------------- - Description: groups scrollbar attributes (if visible) - Parent: appearance - Attributes: none - Data: none - - - ------- - Description: sets scrollbar background color - Parent: scrollbar - Attributes: - r -> 0-255, sets Red component (default: system - default) - - g -> 0-255, sets Green component (default: system - default) - - b -> 0-255, sets Blue component (default: system - default) - Data: none - -