diff --git a/Makefile.am b/Makefile.am index 409c2ddb9..541cfa9d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -730,7 +730,7 @@ EXTRA_DIST = \ src/res/Play.bmp \ src/res/Brush.bmp \ src/res/c4k.ico \ - src/res/c4v.ico \ + src/res/ocv.ico \ src/res/dynamic1.bmp \ src/res/Halt2.bmp \ src/res/mouse1.bmp \ diff --git a/src/c4group/C4Components.h b/src/c4group/C4Components.h index 3b93d07bd..bf87b33af 100644 --- a/src/c4group/C4Components.h +++ b/src/c4group/C4Components.h @@ -128,7 +128,7 @@ #define C4CFN_Titles "Title*.txt|Title.txt" #define C4CFN_DefNameFiles "Names*.txt|Names.txt" -#define C4CFN_Splash "Splash.c4v" +#define C4CFN_Splash "Splash.ocv" #define C4CFN_TempMusic "~Music.tmp" #define C4CFN_TempMusic2 "~Music2.tmp" @@ -155,7 +155,7 @@ #define C4CFN_ScenarioFiles "*.ocs" #define C4CFN_FolderFiles "*.ocf" #define C4CFN_QueueFiles "*.c4q" -#define C4CFN_AnimationFiles "*.c4v" +#define C4CFN_AnimationFiles "*.ocv" #define C4CFN_KeyFiles "*.c4k" #define C4CFN_ScriptFiles "*.c" #define C4CFN_ImageFiles "*.png|*.bmp|*.jpeg|*.jpg" diff --git a/src/platform/C4FileClasses.cpp b/src/platform/C4FileClasses.cpp index 69838c96d..a212ffcd5 100644 --- a/src/platform/C4FileClasses.cpp +++ b/src/platform/C4FileClasses.cpp @@ -56,7 +56,7 @@ bool SetC4FileClasses(const char *szEnginePath) 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("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("OpenClonk.Video", ,"ocv", "OpenClonk 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/c4v.ico b/src/res/c4v.ico deleted file mode 100644 index da7bf3cb2..000000000 Binary files a/src/res/c4v.ico and /dev/null differ diff --git a/src/res/engine.rc b/src/res/engine.rc index 93998ac5a..e0774ec0a 100644 --- a/src/res/engine.rc +++ b/src/res/engine.rc @@ -40,7 +40,7 @@ IDI_06_OCD ICON DISCARDABLE "ocd.ico" IDI_07_OCI ICON DISCARDABLE "oci.ico" IDI_08_OCM ICON DISCARDABLE "ocm.ico" IDI_09_OCB ICON DISCARDABLE "ocb.ico" -IDI_10_C4V ICON DISCARDABLE "c4v.ico" +IDI_10_OCV ICON DISCARDABLE "ocv.ico" IDI_11_C4L ICON DISCARDABLE "c4l.ico" IDI_13_C4U ICON DISCARDABLE "c4u.ico" diff --git a/src/res/ocv.ico b/src/res/ocv.ico new file mode 100644 index 000000000..4df1a878e Binary files /dev/null and b/src/res/ocv.ico differ diff --git a/src/res/resource.h b/src/res/resource.h index 2f6eeab8a..94f50c728 100644 --- a/src/res/resource.h +++ b/src/res/resource.h @@ -67,7 +67,7 @@ #define IDI_07_OCI 4007 #define IDI_08_OCM 4008 #define IDI_09_OCB 4009 -#define IDI_10_C4V 4010 +#define IDI_10_OCV 4010 #define IDI_11_C4L 4011 #define IDI_13_C4U 4013 #define IDM_FILE_CLOSE 5003 diff --git a/tools/install/oc.nsi b/tools/install/oc.nsi index 68542ae6c..550e16db1 100644 --- a/tools/install/oc.nsi +++ b/tools/install/oc.nsi @@ -119,8 +119,8 @@ Section -Post WriteRegStr HKCR ".ocm\Content Type" "" "text/plain" 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 ".ocv" "" "OpenClonk.Video" + WriteRegStr HKCR ".ocv\Content Type" "" "video/avi" WriteRegStr HKCR ".c4l" "" "Clonk4.Weblink" WriteRegStr HKCR ".c4l\Content Type" "" "vnd.clonk.c4group" WriteRegStr HKCR ".c4u" "" "Clonk4.Update" @@ -142,8 +142,8 @@ Section -Post WriteRegStr HKCR "OpenClonk.Material\DefaultIcon" "" "$INSTDIR\Clonk.exe,7" 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 "OpenClonk.Video" "" "OpenClonk Video" + WriteRegStr HKCR "OpenClonk.Video\DefaultIcon" "" "$INSTDIR\Clonk.exe,9" WriteRegStr HKCR "Clonk4.Weblink" "" "Clonk 4 Weblink" WriteRegStr HKCR "Clonk4.Weblink\DefaultIcon" "" "$INSTDIR\Clonk.exe,10" WriteRegStr HKCR "Clonk4.Update" "" "Clonk 4 Update" @@ -211,8 +211,8 @@ Section Uninstall DeleteRegKey HKCR "OpenClonk.Material" DeleteRegKey HKCR ".ocb" DeleteRegKey HKCR "OpenClonk.Binary" - DeleteRegKey HKCR ".c4v" - DeleteRegKey HKCR "Clonk4.Video" + DeleteRegKey HKCR ".ocv" + DeleteRegKey HKCR "OpenClonk.Video" DeleteRegKey HKCR ".c4l" DeleteRegKey HKCR "Clonk4.Weblink" DeleteRegKey HKCR ".c4u"