diff --git a/Makefile.am b/Makefile.am index bb681876d..409c2ddb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -735,7 +735,7 @@ EXTRA_DIST = \ src/res/Halt2.bmp \ src/res/mouse1.bmp \ src/res/rect1.bmp \ - src/res/c4b.ico \ + src/res/ocb.ico \ src/res/c4l.ico \ src/res/c4x.ico \ src/res/Halt.bmp \ diff --git a/src/c4group/C4Components.h b/src/c4group/C4Components.h index 3e69b94af..3b93d07bd 100644 --- a/src/c4group/C4Components.h +++ b/src/c4group/C4Components.h @@ -66,9 +66,9 @@ #define C4CFN_Author "Author.txt" #define C4CFN_Version "Version.txt" #define C4CFN_Game "Game.txt" -#define C4CFN_PXS "PXS.c4b" -#define C4CFN_MassMover "MassMover.c4b" -#define C4CFN_CtrlRec "CtrlRec.c4b" +#define C4CFN_PXS "PXS.ocb" +#define C4CFN_MassMover "MassMover.ocb" +#define C4CFN_CtrlRec "CtrlRec.ocb" #define C4CFN_CtrlRecText "CtrlRec.txt" #define C4CFN_LogRec "Record.log" #define C4CFN_TexMap "TexMap.txt" @@ -165,9 +165,9 @@ // TODO: proper sorting of scaled def graphics (once we know what order we might load them in...) -#define C4FLS_Scenario "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|Fonts.txt|Scenario.txt|Title*.txt|Info.txt|Desc*.rtf|Icon.png|Icon.bmp|Game.txt|StringTbl*.txt|Teams.txt|Parameters.txt|Info.txt|Sect*.ocg|Music.ocg|*.mid|*.wav|Desc*.rtf|Title.bmp|Title.png|*.ocd|Material.ocg|MatMap.txt|Landscape.bmp|Landscape.png|" C4CFN_DiffLandscape "|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.c4b|MassMover.c4b|CtrlRec.c4b|Strings.txt|Objects.txt|RoundResults.txt|Author.txt|Version.txt|Names.txt|*.ocd|Script.c|Script*.c|System.ocg" -#define C4FLS_Section "Scenario.txt|Game.txt|Landscape.bmp|Landscape.png|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.c4b|MassMover.c4b|CtrlRec.c4b|Strings.txt|Objects.txt" -#define C4FLS_SectionLandscape "Scenario.txt|Landscape.bmp|Landscape.png|PXS.c4b|MassMover.c4b" +#define C4FLS_Scenario "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|Fonts.txt|Scenario.txt|Title*.txt|Info.txt|Desc*.rtf|Icon.png|Icon.bmp|Game.txt|StringTbl*.txt|Teams.txt|Parameters.txt|Info.txt|Sect*.ocg|Music.ocg|*.mid|*.wav|Desc*.rtf|Title.bmp|Title.png|*.ocd|Material.ocg|MatMap.txt|Landscape.bmp|Landscape.png|" C4CFN_DiffLandscape "|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.ocb|MassMover.ocb|CtrlRec.ocb|Strings.txt|Objects.txt|RoundResults.txt|Author.txt|Version.txt|Names.txt|*.ocd|Script.c|Script*.c|System.ocg" +#define C4FLS_Section "Scenario.txt|Game.txt|Landscape.bmp|Landscape.png|Sky.bmp|Sky.png|Sky.jpeg|Sky.jpg|PXS.ocb|MassMover.ocb|CtrlRec.ocb|Strings.txt|Objects.txt" +#define C4FLS_SectionLandscape "Scenario.txt|Landscape.bmp|Landscape.png|PXS.ocb|MassMover.ocb" #define C4FLS_SectionObjects "Strings.txt|Objects.txt" #define C4FLS_Def "Particle.txt|DefCore.txt|Graphics.png|Overlay.png|Graphics*.png|Overlay*.png|Portrait*.png|StringTbl*.txt|Script.c|Script*.c|C4Script.c|Names*.txt|Title*.txt|ClonkNames.txt|Rank.txt|Rank.png|Desc*.txt|Overlay.png|Title.png|Icon.bmp|Author.txt|Version.txt|*.wav|*.ocd" #define C4FLS_Player "Player.txt|Portrait.png|Portrait.bmp|*.oci" diff --git a/src/control/C4Record.cpp b/src/control/C4Record.cpp index 67d605c33..7961ff019 100644 --- a/src/control/C4Record.cpp +++ b/src/control/C4Record.cpp @@ -36,7 +36,7 @@ #define IMMEDIATEREC -#define DEBUGREC_EXTFILE "DbgRec.c4b" // if defined, an external file is used for debugrec writing (replays only) +#define DEBUGREC_EXTFILE "DbgRec.ocb" // if defined, an external file is used for debugrec writing (replays only) #define DEBUGREC_EXTFILE_WRITE // if defined, the external file is used for debugrec writing. Otherwise read/check #ifdef DEBUGREC diff --git a/src/game/object/C4InfoCore.cpp b/src/game/object/C4InfoCore.cpp index 9b319d347..3ea4e19a1 100644 --- a/src/game/object/C4InfoCore.cpp +++ b/src/game/object/C4InfoCore.cpp @@ -111,7 +111,7 @@ bool C4PlayerInfoCore::Save(C4Group &hGroup) return false; if (!hGroup.Add(C4CFN_PlayerInfoCore,Source,false,true)) return false; - hGroup.Delete("C4Player.c4b"); + hGroup.Delete("C4Player.ocb"); return true; } diff --git a/src/platform/C4FileClasses.cpp b/src/platform/C4FileClasses.cpp index a7104849b..69838c96d 100644 --- a/src/platform/C4FileClasses.cpp +++ b/src/platform/C4FileClasses.cpp @@ -55,7 +55,7 @@ bool SetC4FileClasses(const char *szEnginePath) if (!SetRegFileClass("OpenClonk.Definition", ,"ocd", "OpenClonk Object Definition", szEnginePath, 5, C4FileClassContentType)) return false; if (!SetRegFileClass("OpenClonk.Object", ,"oci", "OpenClonk Object Info", szEnginePath, 6, C4FileClassContentType)) return false; if (!SetRegFileClass("OpenClonk.Material", ,"ocm", "OpenClonk Material", szEnginePath, 7, "text/plain")) return false; - if (!SetRegFileClass("Clonk4.Binary", "c4b", "Clonk 4 Binary", szEnginePath, 8, "application/octet-stream")) return false; + if (!SetRegFileClass("OpenClonk.Binary", ,"ocb", "OpenClonk Binary", szEnginePath, 8, "application/octet-stream")) return false; if (!SetRegFileClass("Clonk4.Video", "c4v", "Clonk 4 Video", szEnginePath, 9, "video/avi")) return false; if (!SetRegFileClass("Clonk4.Weblink", "c4l", "Clonk 4 Weblink", szEnginePath, 10, C4FileClassContentType)) return false; if (!SetRegFileClass("Clonk4.Update", "c4u", "Clonk 4 Update", szEnginePath, 11, C4FileClassContentType)) return false; diff --git a/src/res/c4b.ico b/src/res/c4b.ico deleted file mode 100644 index dd80df0d8..000000000 Binary files a/src/res/c4b.ico and /dev/null differ diff --git a/src/res/engine.rc b/src/res/engine.rc index 17a2d621b..93998ac5a 100644 --- a/src/res/engine.rc +++ b/src/res/engine.rc @@ -39,7 +39,7 @@ IDI_04_OCP ICON DISCARDABLE "ocp.ico" IDI_06_OCD ICON DISCARDABLE "ocd.ico" IDI_07_OCI ICON DISCARDABLE "oci.ico" IDI_08_OCM ICON DISCARDABLE "ocm.ico" -IDI_09_C4B ICON DISCARDABLE "c4b.ico" +IDI_09_OCB ICON DISCARDABLE "ocb.ico" IDI_10_C4V ICON DISCARDABLE "c4v.ico" IDI_11_C4L ICON DISCARDABLE "c4l.ico" IDI_13_C4U ICON DISCARDABLE "c4u.ico" diff --git a/src/res/ocb.ico b/src/res/ocb.ico new file mode 100644 index 000000000..309dd9b8b Binary files /dev/null and b/src/res/ocb.ico differ diff --git a/src/res/resource.h b/src/res/resource.h index f46db16f8..2f6eeab8a 100644 --- a/src/res/resource.h +++ b/src/res/resource.h @@ -66,7 +66,7 @@ #define IDI_06_OCD 4006 #define IDI_07_OCI 4007 #define IDI_08_OCM 4008 -#define IDI_09_C4B 4009 +#define IDI_09_OCB 4009 #define IDI_10_C4V 4010 #define IDI_11_C4L 4011 #define IDI_13_C4U 4013 diff --git a/tools/install/oc.nsi b/tools/install/oc.nsi index 7f85cc867..68542ae6c 100644 --- a/tools/install/oc.nsi +++ b/tools/install/oc.nsi @@ -117,8 +117,8 @@ Section -Post WriteRegStr HKCR ".oci\Content Type" "" "vnd.clonk.c4group" WriteRegStr HKCR ".ocm" "" "OpenClonk.Material" WriteRegStr HKCR ".ocm\Content Type" "" "text/plain" - WriteRegStr HKCR ".c4b" "" "Clonk4.Binary" - WriteRegStr HKCR ".c4b\Content Type" "" "application/octet-stream" + WriteRegStr HKCR ".ocb" "" "OpenClonk.Binary" + WriteRegStr HKCR ".ocb\Content Type" "" "application/octet-stream" WriteRegStr HKCR ".c4v" "" "Clonk4.Video" WriteRegStr HKCR ".c4v\Content Type" "" "video/avi" WriteRegStr HKCR ".c4l" "" "Clonk4.Weblink" @@ -140,8 +140,8 @@ Section -Post WriteRegStr HKCR "OpenClonk.Object\DefaultIcon" "" "$INSTDIR\Clonk.exe,6" WriteRegStr HKCR "OpenClonk.Material" "" "OpenClonk Material" WriteRegStr HKCR "OpenClonk.Material\DefaultIcon" "" "$INSTDIR\Clonk.exe,7" - WriteRegStr HKCR "Clonk4.Binary" "" "Clonk 4 Binary" - WriteRegStr HKCR "Clonk4.Binary\DefaultIcon" "" "$INSTDIR\Clonk.exe,8" + WriteRegStr HKCR "OpenClonk.Binary" "" "OpenClonk Binary" + WriteRegStr HKCR "OpenClonk.Binary\DefaultIcon" "" "$INSTDIR\Clonk.exe,8" WriteRegStr HKCR "Clonk4.Video" "" "Clonk 4 Video" WriteRegStr HKCR "Clonk4.Video\DefaultIcon" "" "$INSTDIR\Clonk.exe,9" WriteRegStr HKCR "Clonk4.Weblink" "" "Clonk 4 Weblink" @@ -209,8 +209,8 @@ Section Uninstall DeleteRegKey HKCR "OpenClonk.Object" DeleteRegKey HKCR ".ocm" DeleteRegKey HKCR "OpenClonk.Material" - DeleteRegKey HKCR ".c4b" - DeleteRegKey HKCR "Clonk4.Binary" + DeleteRegKey HKCR ".ocb" + DeleteRegKey HKCR "OpenClonk.Binary" DeleteRegKey HKCR ".c4v" DeleteRegKey HKCR "Clonk4.Video" DeleteRegKey HKCR ".c4l"