1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

significantly cleaned up includes (by IoP)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-05-02 22:42:08 +00:00
parent a0a0490771
commit 3bc5ff75cc
203 changed files with 47 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimLinks.cpp
-1
View File
@@ -4,7 +4,6 @@
#include "laptop.h"
#include "AimLinks.h"
#include "aim.h"
#include "Utilities.h"
#include "WCheck.h"
#include "WordWrap.h"
#include "Text.h"
Laptop/AimSort.cpp
-1
View File
@@ -9,7 +9,6 @@
#include "WordWrap.h"
#include "Soldier Profile.h"
#include "stdlib.h"
#include "Game Clock.h"
#include "Text.h"
#include "Multi Language Graphic Utils.h"
#include "english.h"
Laptop/BobbyRAmmo.cpp
-2
View File
@@ -8,8 +8,6 @@
#include "Utilities.h"
#include "WCheck.h"
#include "WordWrap.h"
#include "Cursors.h"
#include "interface items.h"
#include "Encrypted File.h"
#include "text.h"
#endif
Laptop/BobbyRArmour.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "Utilities.h"
#include "WCheck.h"
#include "WordWrap.h"
#include "Cursors.h"
#include "Text.h"
#endif
Laptop/BobbyRGuns.cpp
+1 -2
View File
@@ -14,7 +14,6 @@
#include "Store Inventory.h"
#include "LaptopSave.h"
#include "Finances.h"
#include "AimMembers.h"
#include "Overhead.h"
#include "Weapons.h"
#include "GameSettings.h"
@@ -4298,4 +4297,4 @@ void GetHelpTextForItemInLaptop( STR16 pzStr, UINT16 usItemNumber )
}
break;
}
}
}
Laptop/BobbyRMailOrder.cpp
-1
View File
@@ -32,7 +32,6 @@
#include "connect.h"
#include "GameSettings.h"
#include <vfs/Core/vfs.h>
#include <vfs/Core/vfs_file_raii.h>
#include <vfs/Core/File/vfs_file.h>
/*
Laptop/BobbyRMisc.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "Utilities.h"
#include "WCheck.h"
#include "WordWrap.h"
#include "Cursors.h"
#include "Text.h"
#endif
Laptop/BobbyRUsed.cpp
-2
View File
@@ -8,9 +8,7 @@
#include "Utilities.h"
#include "WCheck.h"
#include "WordWrap.h"
#include "Cursors.h"
#include "Text.h"
#include "LaptopSave.h"
#endif
UINT32 guiUsedBackground;
Laptop/BriefingRoom.cpp
+1 -3
View File
@@ -11,8 +11,6 @@
#include "email.h"
#include "Game Clock.h"
#include "Text.h"
#include "LaptopSave.h"
#include "Multi Language Graphic Utils.h"
#include "soldier profile type.h"
#endif
@@ -593,4 +591,4 @@ void ResetActivationBriefingRoomStringTextBox(void)
uiCursorBriefingRoomPosition = StringPixLength( pPlayerBriefingRoomActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X;
DisplayPlayerActivationBriefingRoomString();
DisplayActivationBriefingRoomStringCursor();
}
}
Laptop/BriefingRoomM.cpp
+1 -3
View File
@@ -11,8 +11,6 @@
#include "email.h"
#include "Game Clock.h"
#include "Text.h"
#include "LaptopSave.h"
#include "Multi Language Graphic Utils.h"
#include "soldier profile type.h"
#endif
@@ -662,4 +660,4 @@ void ResetActivationBriefingRoomEnterStringTextBox(void)
uiCursorBriefingRoomEnterPosition = StringPixLength( pPlayerBriefingRoomEnterActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X;
DisplayPlayerActivationBriefingRoomEnterString();
DisplayActivationBriefingRoomEnterStringCursor();
}
}
Laptop/Encyclopedia.cpp
-4
View File
@@ -2,8 +2,6 @@
#include "Laptop All.h"
#else
#include "Laptop All.h"
#include "Utilities.h"
#include "WCheck.h"
#include "timer control.h"
#include "Debug.h"
#include "WordWrap.h"
@@ -11,8 +9,6 @@
#include "email.h"
#include "Game Clock.h"
#include "Text.h"
#include "LaptopSave.h"
#include "Multi Language Graphic Utils.h"
#include "soldier profile type.h"
#endif
Laptop/Encyclopedia_Data.cpp
+1 -3
View File
@@ -8,7 +8,6 @@
#include "WCheck.h"
#include "WordWrap.h"
#include "Text.h"
#include "Multi Language Graphic Utils.h"
#include "Encrypted File.h"
#include "Soldier Profile.h"
#endif
@@ -16,7 +15,6 @@
#include "Encyclopedia_Data.h"
#include "Encyclopedia.h"
#include "Quests.h"
#include "Tactical Save.h"
#define MAX_FILTR_LOCATION_BUTTONS 11
#define FILTR_INVENTORY_BUTTONS 5
@@ -3131,4 +3129,4 @@ void BtnEncyclopediaTogglesCallback( GUI_BUTTON *btn, INT32 reason )
}
}
}
*/
*/
Laptop/IMP AboutUs.cpp
-2
View File
@@ -5,10 +5,8 @@
#include "CharProfile.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP Attribute Entrance.cpp
-3
View File
@@ -4,13 +4,10 @@
#include "CharProfile.h"
#include "IMP Attribute Entrance.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP Attribute Finish.cpp
-3
View File
@@ -4,15 +4,12 @@
#include "CharProfile.h"
#include "IMP Attribute Finish.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "input.h"
#include "Isometric Utils.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP Attribute Selection.cpp
+1 -4
View File
@@ -6,16 +6,13 @@
#include "CharProfile.h"
#include "IMP Attribute Selection.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "input.h"
#include "Isometric Utils.h"
#include "IMP Skill Trait.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
@@ -2238,4 +2235,4 @@ INT8 StartingLevelChosen()
return(iStartingLevel);
else
return(1);
}
}
Laptop/IMP Begin Screen.cpp
-5
View File
@@ -7,11 +7,9 @@
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Timer Control.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
@@ -21,18 +19,15 @@
#include "messageboxscreen.h"
#include "Soldier Profile Type.h"
#include "IMP Portraits.h"
#include "IMP Voices.h"
#include "IMP Attribute Selection.h"
#include "english.h"
#include "line.h"
#include "Merc Hiring.h"
#include "strategic.h"
#include "Game Clock.h"
#include "text.h"
#include "LaptopSave.h"
#endif
#include <vfs/Tools/vfs_parser_tools.h>
#define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138
#define NICK_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 195
Laptop/IMP Character Trait.cpp
+1 -3
View File
@@ -17,8 +17,6 @@
#include "_Ja25EnglishText.h"
#include "wordwrap.h"
#include "CharProfile.h"
#include "soldier profile type.h"
#include "IMP Compile Character.h"
#include "GameSettings.h"
#endif
@@ -493,4 +491,4 @@ void AssignCharacterTraitHelpText( UINT8 ubNumber )
SetRegionHelpEndCallback( &gMR_CharacterTraitHelpTextRegions[ubNumber], MSYS_NO_CALLBACK );
return;
}
}
Laptop/IMP Character and Disability Entrance.cpp
-3
View File
@@ -4,13 +4,10 @@
#include "CharProfile.h"
#include "IMP Character and Disability Entrance.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP Color Choosing.cpp
+1 -4
View File
@@ -14,13 +14,10 @@
#include "cursors.h"
#include "IMP MainPage.h"
#include "IMPVideoObjects.h"
#include "_Ja25EnglishText.h"
#include "wordwrap.h"
#include "CharProfile.h"
#include "soldier profile type.h"
#include "IMP Compile Character.h"
#include "IMP Portraits.h"
#include "IMP Begin Screen.h"
#include "WCheck.h"
#include "Animation Data.h"
#include "GameSettings.h"
@@ -1204,4 +1201,4 @@ void SetBadAss( BOOLEAN fSetTrue )
bBadAss = TRUE;
else
bBadAss = FALSE;
}
}
Laptop/IMP Compile Character.cpp
-12
View File
@@ -6,29 +6,17 @@
#include "laptop.h"
#include "CharProfile.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "GameSettings.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "IMP AboutUs.h"
#include "IMP MainPage.h"
#include "IMP Begin Screen.h"
#include "IMP Personality Entrance.h"
#include "IMP Personality Quiz.h"
#include "IMP Personality Finish.h"
#include "IMP Skill Trait.h"
#include "IMP Attribute Entrance.h"
#include "IMP Attribute Selection.h"
#include "IMP Attribute Finish.h"
#include "IMP Portraits.h"
#include "IMP Compile Character.h"
#include "IMP Voices.h"
#include "IMP Finish.h"
#include "Soldier Profile Type.h"
#include "Soldier Profile.h"
#include "Animation Data.h"
Laptop/IMP Confirm.cpp
-4
View File
@@ -6,10 +6,8 @@
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
@@ -22,7 +20,6 @@
#include "Soldier Profile Type.h"
#include "Soldier Control.h"
#include "IMP Portraits.h"
#include "IMP Voices.h"
#include "Overhead.h"
#include "finances.h"
#include "history.h"
@@ -34,7 +31,6 @@
#include "weapons.h"
#include "Random.h"
#include "GameVersion.h"
#include "faces.h"
#include "GameSettings.h"
#endif
Laptop/IMP Disability Trait.cpp
+1 -3
View File
@@ -17,8 +17,6 @@
#include "_Ja25EnglishText.h"
#include "wordwrap.h"
#include "CharProfile.h"
#include "soldier profile type.h"
#include "IMP Compile Character.h"
#include "GameSettings.h"
#endif
@@ -505,4 +503,4 @@ void AssignDisabilityHelpText( UINT8 ubNumber )
SetRegionHelpEndCallback( &gMR_DisabilityHelpTextRegions[ubNumber], MSYS_NO_CALLBACK );
return;
}
}
Laptop/IMP Finish.cpp
-3
View File
@@ -4,7 +4,6 @@
#include "CharProfile.h"
#include "IMP Finish.h"
#include "IMP Portraits.h"
#include "IMP HomePage.h"
#include "IMP MainPage.h"
#include "IMP Voices.h"
#include "IMPVideoObjects.h"
@@ -13,14 +12,12 @@
#include "Timer Control.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
#include "IMP Attribute Selection.h"
#include "IMP Text System.h"
#include "soundman.h"
#include "IMP Compile Character.h"
#include "text.h"
#endif
Laptop/IMP HomePage.cpp
-2
View File
@@ -6,11 +6,9 @@
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "IMP Compile Character.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP MainPage.cpp
-3
View File
@@ -8,18 +8,15 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
#include "finances.h"
#include "IMP Attribute Selection.h"
#include "IMP Text System.h"
#include "IMP Finish.h"
#include "mousesystem.h"
#include "Merc Hiring.h"
#include "LaptopSave.h"
#include "IMP Compile Character.h"
#include "IMP Portraits.h"
#include "soldier profile type.h"
#include "GameSettings.h"
Laptop/IMP Personality Entrance.cpp
-3
View File
@@ -4,13 +4,10 @@
#include "CharProfile.h"
#include "IMP Personality Entrance.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP Personality Finish.cpp
-4
View File
@@ -4,14 +4,10 @@
#include "CharProfile.h"
#include "IMP Personality Finish.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Timer Control.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP Personality Quiz.cpp
-3
View File
@@ -4,13 +4,10 @@
#include "CharProfile.h"
#include "IMP Personality Quiz.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMP Portraits.cpp
-4
View File
@@ -4,7 +4,6 @@
#include "CharProfile.h"
#include "IMP Portraits.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
@@ -12,13 +11,10 @@
#include "Isometric Utils.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
#include "IMP Text System.h"
#include "IMP Voices.h"
#include "IMP Compile Character.h"
#endif
#include "IMP Confirm.h"
Laptop/IMP Text System.cpp
-2
View File
@@ -3,7 +3,6 @@
#else
#include "WordWrap.h"
#include "sgp.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "IMP Text System.h"
#include "CharProfile.h"
@@ -24,7 +23,6 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "soldier profile.h"
Laptop/IMP Voices.cpp
-3
View File
@@ -4,15 +4,12 @@
#include "CharProfile.h"
#include "IMP Voices.h"
#include "IMP MainPage.h"
#include "IMP HomePage.h"
#include "IMPVideoObjects.h"
#include "Utilities.h"
#include "WCheck.h"
#include "input.h"
#include "Isometric Utils.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "laptop.h"
Laptop/IMPVideoObjects.cpp
-3
View File
@@ -6,10 +6,7 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "IMP HomePage.h"
#include "laptop.h"
#include "Multi Language Graphic Utils.h"
#include "IMP Attribute Selection.h"
Laptop/XML_Email.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "expat.h"
#include "XML.h"
#include "Interface.h"
#include "Item Statistics.h"
#include "LuaInitNPCs.h"
#include "email.h"
#endif
Laptop/XML_EmailMercAvailable.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "expat.h"
#include "XML.h"
#include "Interface.h"
#include "Item Statistics.h"
#include "LuaInitNPCs.h"
#include "email.h"
#endif
Laptop/XML_EmailMercLevelUp.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "expat.h"
#include "XML.h"
#include "Interface.h"
#include "Item Statistics.h"
#include "LuaInitNPCs.h"
#include "email.h"
#endif
Laptop/XML_EncyclopediaLocation.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "expat.h"
#include "XML.h"
#include "Interface.h"
#include "Item Statistics.h"
#include "LuaInitNPCs.h"
#include "email.h"
#include "InterfaceItemImages.h"
Laptop/XML_IMPPortraits.cpp
-1
View File
@@ -7,7 +7,6 @@
#include "XML.h"
#include "Interface.h"
#include "IMP Confirm.h"
#include "IMP Portraits.h"
#include "Soldier Profile.h"
#endif
Laptop/email.cpp
-3
View File
@@ -7,16 +7,13 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "soldier profile.h"
#include "CharProfile.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 "Text.h"
Laptop/files.cpp
-1
View File
@@ -10,7 +10,6 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "email.h"
Laptop/finances.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "Soldier Profile.h"
Laptop/florist Cards.cpp
-1
View File
@@ -9,7 +9,6 @@
#include "WordWrap.h"
#include "Cursors.h"
#include "Encrypted File.h"
#include "Florist Gallery.h"
#include "Text.h"
#endif
Laptop/history.cpp
-1
View File
@@ -8,7 +8,6 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "Soldier Profile.h"
Laptop/personnel.cpp
-2
View File
@@ -7,7 +7,6 @@
#include "WCheck.h"
#include "Debug.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Encrypted File.h"
#include "cursors.h"
#include "Overhead.h"
@@ -17,7 +16,6 @@
#include "Game Clock.h"
#include "finances.h"
#include "LaptopSave.h"
#include "AimMembers.h"
#include "Map Screen Interface Map.h"
#include "input.h"
#include "english.h"