From 7811c56489eaf0b7f78c8ac2491b7446d2d23989 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Mon, 11 Apr 2011 18:35:38 -0700 Subject: [PATCH] Keep binary identity with whitespace fixes, and don't break the zip --- .gitattributes | 1 + .../plInputCore/plInputInterfaceMgr.cpp | 2 +- .../plSurface/ShaderSrc/AssShader.zip | Bin 9664 -> 9590 bytes .../MaxComponent/plPhysicalComponents.cpp | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9a986a87..6f62c6ac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ *.bmp -text *.ICO -text *.ico -text +*.zip -text diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp index 3418ca80..f07e81b4 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp @@ -772,7 +772,7 @@ void plInputInterfaceMgr::WriteKeyMap( void ) fprintf(gKeyFile, "#\n"); fprintf(gKeyFile, "# For example, to map Control-Shift-W to Walk Forward\n"); fprintf(gKeyFile, "# your key mapping entry would look like this:\n"); - fprintf(gKeyFile, "# Keyboard.BindAction W_C_S \"Walk Forward\"\n"); + fprintf(gKeyFile, "# Keyboard.BindAction \tW_C_S \t\"Walk Forward\"\n"); fprintf(gKeyFile, "# This also works for console command bindings\n"); diff --git a/Sources/Plasma/PubUtilLib/plSurface/ShaderSrc/AssShader.zip b/Sources/Plasma/PubUtilLib/plSurface/ShaderSrc/AssShader.zip index 065a9d77a6680372a20c1198f1c78aa717af4c02..40e75b970508b403c7a182eaa2f71b032d8ac94d 100644 GIT binary patch delta 5115 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 P!YkQ{arz&iRWSY!#KcSa delta 5140 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 NhliVJne+PbzX4o?N9X_m diff --git a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp index f1e22ed5..93233499 100644 --- a/Sources/Tools/MaxComponent/plPhysicalComponents.cpp +++ b/Sources/Tools/MaxComponent/plPhysicalComponents.cpp @@ -1578,7 +1578,7 @@ CLASS_DESC(plPhysSubWorldComponent, gPhysSubWorldDesc, "Subworld", "Subworld", C ParamBlockDesc2 gPhysSubWorldBk ( - plComponent::kBlkComp, _T("Subworld "), 0, &gPhysSubWorldDesc, P_AUTO_CONSTRUCT + P_AUTO_UI, plComponent::kRefComp, + plComponent::kBlkComp, _T("Subworld\t"), 0, &gPhysSubWorldDesc, P_AUTO_CONSTRUCT + P_AUTO_UI, plComponent::kRefComp, //Roll out IDD_COMP_PHYS_SUBWORLD, IDS_COMP_PHYS_SUBWORLD, 0, 0, NULL,