marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change .c4i extension to .oci

Armin Burgmeier 2011-03-13 16:56:26 +01:00
parent 675c077ed2
commit c61e92ec98
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -722,7 +722,7 @@ EXTRA_DIST = \
src/res/line1.bmp \
src/res/Play2.bmp \
src/res/Brush2.bmp \
src/res/c4i.ico \
src/res/oci.ico \
src/res/c4u.ico \
src/res/Cursor.bmp \
src/res/Grab.bmp \

4
src/c4group/C4Components.h
View File

@ -147,7 +147,7 @@
#define C4CFN_DefFiles "*.ocd"
#define C4CFN_PlayerFiles "*.ocp"
#define C4CFN_MaterialFiles "*.c4m"
#define C4CFN_ObjectInfoFiles "*.c4i"
#define C4CFN_ObjectInfoFiles "*.oci"
#define C4CFN_MusicFiles "*.mid"
#define C4CFN_SoundFiles "*.wav|*.ogg"
#define C4CFN_PNGFiles "*.png"
@ -170,7 +170,7 @@
#define C4FLS_SectionLandscape "Scenario.txt|Landscape.bmp|Landscape.png|PXS.c4b|MassMover.c4b"
#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|*.c4i"
#define C4FLS_Player "Player.txt|Portrait.png|Portrait.bmp|*.oci"
#define C4FLS_Object "ObjectInfo.txt|Portrait.png|Portrait.bmp"
#define C4FLS_Folder "Folder.txt|Title*.txt|Info.txt|Desc*.rtf|Title.png|Title.bmp|Icon.png|Icon.bmp|Author.txt|Version.txt|*.ocs|Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|FolderMap.txt|FolderMap.png"
#define C4FLS_Material "TexMap.txt|*.bmp|*.png|*.c4m"

6
src/game/object/C4ObjectInfo.cpp
View File

@ -71,7 +71,7 @@ bool C4ObjectInfo::Load(C4Group &hMother, const char *szEntryname, bool fLoadPor
{
// New version
if (SEqualNoCase(GetExtension(szEntryname),"c4i"))
if (SEqualNoCase(GetExtension(szEntryname),"oci"))
{
C4Group hChild;
if (hChild.OpenAsChild(&hMother,szEntryname))
@ -171,7 +171,7 @@ bool C4ObjectInfo::Save(C4Group &hGroup, bool fStoreTiny, C4DefList *pDefs)
char szTempGroup[_MAX_PATH+1];
SCopy(Name, szTempGroup, _MAX_PATH);
MakeFilenameFromTitle(szTempGroup);
SAppend(".c4i",szTempGroup, _MAX_PATH);
SAppend(".oci",szTempGroup, _MAX_PATH);
if (!SEqualNoCase(Filename, szTempGroup))
{
if (!Filename[0])
@ -186,7 +186,7 @@ bool C4ObjectInfo::Save(C4Group &hGroup, bool fStoreTiny, C4DefList *pDefs)
while (iLen && Inside(Filename[iLen-1], '0', '9')) --iLen;
if (iLen>_MAX_PATH-22) { LogF("Error generating unique filename for %s(%s): Path overflow", Name, hGroup.GetFullName().getData()); break; }
snprintf(Filename+iLen, 22, "%d", iFinNum+1);
EnforceExtension(Filename, "c4i");
EnforceExtension(Filename, "oci");
}
}
else

2
src/game/object/C4ObjectInfoList.cpp
View File

@ -65,7 +65,7 @@ int32_t C4ObjectInfoList::Load(C4Group &hGroup, bool fLoadPortraits)
int32_t infn=0;
char entryname[256+1];
// Search all c4i files
// Search all oci files
hGroup.ResetSearch();
while (hGroup.FindNextEntry(C4CFN_ObjectInfoFiles,entryname))
if ((ninf=new C4ObjectInfo))

2
src/gui/C4StartupPlrSelDlg.cpp
View File

@ -443,7 +443,7 @@ bool C4StartupPlrSelDlg::CrewListItem::SetName(const char *szNewName)
SCopy(szNewName, fn, _MAX_PATH);
MakeFilenameFromTitle(fn);
if (!*fn) return false;
SAppend(".c4i", fn, _MAX_PATH);
SAppend(".oci", fn, _MAX_PATH);
// check if a rename is due
if (!ItemIdentical(fn, GetFilename().getData()))
{

2
src/platform/C4FileClasses.cpp
View File

@ -53,7 +53,7 @@ bool SetC4FileClasses(const char *szEnginePath)
if (!SetRegFileClass("OpenClonk.Folder", ,"ocf", "OpenClonk Folder", szEnginePath, 3, C4FileClassContentType)) return false;
if (!SetRegFileClass("OpenClonk.Player", ,"ocp", "OpenClonk Player", szEnginePath, 4, C4FileClassContentType)) return false;
if (!SetRegFileClass("OpenClonk.Definition", ,"ocd", "OpenClonk Object Definition", szEnginePath, 5, C4FileClassContentType)) return false;
if (!SetRegFileClass("Clonk4.Object", "c4i", "Clonk 4 Object Info", szEnginePath, 6, C4FileClassContentType)) return false;
if (!SetRegFileClass("OpenClonk.Object", ,"oci", "OpenClonk Object Info", szEnginePath, 6, C4FileClassContentType)) return false;
if (!SetRegFileClass("Clonk4.Material", "c4m", "Clonk 4 Material", szEnginePath, 7, "text/plain")) return false;
if (!SetRegFileClass("Clonk4.Binary", "c4b", "Clonk 4 Binary", szEnginePath, 8, "application/octet-stream")) return false;
if (!SetRegFileClass("Clonk4.Video", "c4v", "Clonk 4 Video", szEnginePath, 9, "video/avi")) return false;

BIN
src/res/c4i.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

2
src/res/engine.rc
View File

@ -37,7 +37,7 @@ IDI_02_OCG ICON DISCARDABLE "ocg.ico"
IDI_03_OCF ICON DISCARDABLE "ocf.ico"
IDI_04_OCP ICON DISCARDABLE "ocp.ico"
IDI_06_OCD ICON DISCARDABLE "ocd.ico"
IDI_07_C4I ICON DISCARDABLE "c4i.ico"
IDI_07_OCI ICON DISCARDABLE "oci.ico"
IDI_08_C4M ICON DISCARDABLE "c4m.ico"
IDI_09_C4B ICON DISCARDABLE "c4b.ico"
IDI_10_C4V ICON DISCARDABLE "c4v.ico"

BIN
src/res/oci.ico 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

2
src/res/resource.h
View File

@ -64,7 +64,7 @@
#define IDI_03_OCF 4003
#define IDI_04_OCP 4004
#define IDI_06_OCD 4006
#define IDI_07_C4I 4007
#define IDI_07_OCI 4007
#define IDI_08_C4M 4008
#define IDI_09_C4B 4009
#define IDI_10_C4V 4010

12
tools/install/oc.nsi
View File

@ -113,8 +113,8 @@ Section -Post
WriteRegStr HKCR ".ocp\Content Type" "" "vnd.clonk.c4group"
WriteRegStr HKCR ".ocd" "" "OpenClonk.Definition"
WriteRegStr HKCR ".ocd\Content Type" "" "vnd.clonk.c4group"
WriteRegStr HKCR ".c4i" "" "Clonk4.Object"
WriteRegStr HKCR ".c4i\Content Type" "" "vnd.clonk.c4group"
WriteRegStr HKCR ".oci" "" "OpenClonk.Object"
WriteRegStr HKCR ".oci\Content Type" "" "vnd.clonk.c4group"
WriteRegStr HKCR ".c4m" "" "Clonk4.Material"
WriteRegStr HKCR ".c4m\Content Type" "" "text/plain"
WriteRegStr HKCR ".c4b" "" "Clonk4.Binary"
@ -136,8 +136,8 @@ Section -Post
WriteRegStr HKCR "OpenClonk.Player\DefaultIcon" "" "$INSTDIR\Clonk.exe,4"
WriteRegStr HKCR "OpenClonk.Definition" "" "OpenClonk Object Definition"
WriteRegStr HKCR "OpenClonk.Definition\DefaultIcon" "" "$INSTDIR\Clonk.exe,5"
WriteRegStr HKCR "Clonk4.Object" "" "Clonk 4 Object Info"
WriteRegStr HKCR "Clonk4.Object\DefaultIcon" "" "$INSTDIR\Clonk.exe,6"
WriteRegStr HKCR "OpenClonk.Object" "" "OpenClonk Object Info"
WriteRegStr HKCR "OpenClonk.Object\DefaultIcon" "" "$INSTDIR\Clonk.exe,6"
WriteRegStr HKCR "Clonk4.Material" "" "Clonk 4 Material"
WriteRegStr HKCR "Clonk4.Material\DefaultIcon" "" "$INSTDIR\Clonk.exe,7"
WriteRegStr HKCR "Clonk4.Binary" "" "Clonk 4 Binary"
@ -205,8 +205,8 @@ Section Uninstall
DeleteRegKey HKCR "OpenClonk.Player"
DeleteRegKey HKCR ".ocd"
DeleteRegKey HKCR "OpenClonk.Definition"
DeleteRegKey HKCR ".c4i"
DeleteRegKey HKCR "Clonk4.Object"
DeleteRegKey HKCR ".oci"
DeleteRegKey HKCR "OpenClonk.Object"
DeleteRegKey HKCR ".c4m"
DeleteRegKey HKCR "Clonk4.Material"
DeleteRegKey HKCR ".c4b"