From 41a1b5867dd12f4efb5c850125d05fd943903022 Mon Sep 17 00:00:00 2001 From: Armin Burgmeier Date: Sun, 13 Mar 2011 16:16:45 +0100 Subject: [PATCH] Change .c4g extension to .ocg --- CMakeLists.txt | 4 ++-- Makefile.am | 6 ++--- planet/AUTHORS | 4 ++-- .../{System.c4g => System.ocg}/Boompack.c | 0 .../{System.c4g => System.ocg}/Clonk.c | 0 .../{System.c4g => System.ocg}/Arrow.c | 0 .../{System.c4g => System.ocg}/Blink.c | 0 .../{System.c4g => System.ocg}/Clonk.c | 0 .../{System.c4g => System.ocg}/NoRain.c | 0 .../{System.c4g => System.ocg}/DoubleTools.c | 0 .../{System.c4g => System.ocg}/NoRain.c | 0 .../{Material.c4g => Material.ocg}/Ice.c4m | 0 .../{Material.c4g => Material.ocg}/Snow.c4m | 0 .../{Material.c4g => Material.ocg}/TEXMAP.TXT | 0 .../{Material.c4g => Material.ocg}/Water.c4m | 0 .../{Material.c4g => Material.ocg}/brick1.jpg | Bin .../brickback.jpg | Bin .../{Material.c4g => Material.ocg}/tunnel.jpg | Bin .../{System.c4g => System.ocg}/Explode.c | 0 .../{System.c4g => System.ocg}/LessBubbles.c | 0 .../{System.c4g => System.ocg}/StoneDoor.c | 0 .../UnUseableRopeLadders.c | 0 .../Ametyst.c4m | 0 .../Ametyst.jpg | Bin .../{Material.c4g => Material.ocg}/Ruby.c4m | 0 .../{Material.c4g => Material.ocg}/Ruby.jpg | Bin .../{Material.c4g => Material.ocg}/TEXMAP.TXT | 0 .../tunnelAmethyst.jpg | Bin .../tunnelRuby.jpg | Bin .../{System.c4g => System.ocg}/PowderKeg.c | 0 .../{System.c4g => System.ocg}/StoneDoor.c | 0 .../UnUseableRopeLadders.c | 0 .../{System.c4g => System.ocg}/CheatArrow.c | 0 .../{System.c4g => System.ocg}/King_Bow.c | 0 .../{System.c4g => System.ocg}/King_Club.c | 0 .../{System.c4g => System.ocg}/King_Javelin.c | 0 .../{System.c4g => System.ocg}/King_Musket.c | 0 .../King_MusketBullet.c | 0 .../{System.c4g => System.ocg}/King_Sword.c | 0 .../MultipleSelection.c | 0 .../{System.c4g => System.ocg}/NoRain.c | 0 .../{System.c4g => System.ocg}/SlowJar.c | 0 .../MultipleSelection.c | 0 .../UnUseableRopeLadders.c | 0 .../{Material.c4g => Material.ocg}/TEXMAP.TXT | 0 .../{Material.c4g => Material.ocg}/brick1.jpg | Bin .../brickback.jpg | Bin .../{Material.c4g => Material.ocg}/earth.jpg | Bin .../earth_dry.jpg | Bin .../earth_rough.jpg | Bin .../{System.c4g => System.ocg}/Clonk.c | 0 .../{System.c4g => System.ocg}/NoRain.c | 0 .../{System.c4g => System.ocg}/FastDynamite.c | 0 .../FlyingArrowpack.c | 0 .../FlyingBoompack.c | 0 .../FlyingDynamite.c | 0 .../{System.c4g => System.ocg}/Lifesteal.c | 0 .../{System.c4g => System.ocg}/NoRain.c | 0 .../NoRegeneration.c | 0 .../{System.c4g => System.ocg}/CheatArrow.c | 0 .../SensitiveWindGenerator.c | 0 .../{Graphics.c4g => Graphics.ocg}/Arrow.png | Bin .../Authors.txt | 0 .../Background.png | Bin .../{Graphics.c4g => Graphics.ocg}/Build.png | Bin planet/{Graphics.c4g => Graphics.ocg}/C4.PAL | Bin .../Captain.png | Bin .../Clouds1.jpg | Bin .../Clouds2.jpg | Bin .../Construction.png | Bin .../Control.png | Bin .../{Graphics.c4g => Graphics.ocg}/Crew.png | Bin .../CursorLarge.png | Bin .../CursorMedium.png | Bin .../CursorSmall.png | Bin .../Endeavour.ttf | Bin .../{Graphics.c4g => Graphics.ocg}/Energy.png | Bin .../{Graphics.c4g => Graphics.ocg}/Exit.png | Bin .../{Graphics.c4g => Graphics.ocg}/Fire.png | Bin .../{Graphics.c4g => Graphics.ocg}/Flag.png | Bin .../GUIBigArrows.png | Bin .../GUIButton.png | Bin .../GUIButtonDown.png | Bin .../GUIButtonHighlight.png | Bin .../GUICaption.png | Bin .../GUICheckbox.png | Bin .../GUIContext.png | Bin .../GUIIcons.png | Bin .../GUIIcons2.png | Bin .../GUIProgress.png | Bin .../GUIScroll.png | Bin .../GUISubmenu.png | Bin .../Gamepad.png | Bin .../{Graphics.c4g => Graphics.ocg}/Hand.png | Bin .../{Graphics.c4g => Graphics.ocg}/Liquid.png | Bin .../Loader1.jpg | Bin .../{Graphics.c4g => Graphics.ocg}/Logo.png | Bin .../{Graphics.c4g => Graphics.ocg}/Menu.png | Bin .../Options.png | Bin .../{Graphics.c4g => Graphics.ocg}/Player.png | Bin .../Portrait1.png | Bin .../Portrait2.png | Bin .../Portrait3.png | Bin .../Portrait4.png | Bin .../Portrait5.png | Bin .../{Graphics.c4g => Graphics.ocg}/Rank.png | Bin .../SelectMark.png | Bin .../StartupAboutBG.png | Bin .../StartupBigButton.png | Bin .../StartupBigButtonDown.png | Bin .../StartupBookScroll.png | Bin .../StartupContext.png | Bin .../StartupDlgPaper.png | Bin .../StartupLogo.png | Bin .../StartupMainMenuBG.jpg | Bin .../StartupNetGetRef.png | Bin .../StartupNetworkBG.jpg | Bin .../StartupOptionIcons.png | Bin .../StartupPlrPropBG.png | Bin .../StartupPlrSelBG.jpg | Bin .../StartupScenSelBG.jpg | Bin .../StartupScenSelIcons.png | Bin .../StartupScenSelTitleOv.png | Bin .../StartupTabClip.png | Bin .../UpperBoard.png | Bin .../Version.txt | 0 .../{Graphics.c4g => Graphics.ocg}/Wealth.png | Bin .../{Material.c4g => Material.ocg}/Acid.c4m | 0 .../{Material.c4g => Material.ocg}/Brick.c4m | 0 .../BrickSoft.c4m | 0 .../{Material.c4g => Material.ocg}/Coal.c4m | 0 .../DuroLava.c4m | 0 .../{Material.c4g => Material.ocg}/Earth.c4m | 0 .../{Material.c4g => Material.ocg}/Gold.c4m | 0 .../Granite.c4m | 0 planet/{Material.c4g => Material.ocg}/Ice.c4m | 0 .../{Material.c4g => Material.ocg}/Lava.c4m | 0 .../{Material.c4g => Material.ocg}/Lava.png | Bin planet/{Material.c4g => Material.ocg}/ORE.c4m | 0 .../{Material.c4g => Material.ocg}/Rock.c4m | 0 .../{Material.c4g => Material.ocg}/Sand.c4m | 0 .../SandDry.c4m | 0 .../{Material.c4g => Material.ocg}/Smooth.jpg | Bin .../{Material.c4g => Material.ocg}/Snow.c4m | 0 .../{Material.c4g => Material.ocg}/Snow.png | Bin .../Sulphur.c4m | 0 .../{Material.c4g => Material.ocg}/TEXMAP.TXT | 0 .../{Material.c4g => Material.ocg}/Tunnel.c4m | 0 .../Vehicle.c4m | 0 .../Version.txt | 0 .../{Material.c4g => Material.ocg}/Water.c4m | 0 .../{Material.c4g => Material.ocg}/acid.png | Bin .../authors.txt | 0 .../{Material.c4g => Material.ocg}/brick1.jpg | Bin .../brickback.jpg | Bin .../{Material.c4g => Material.ocg}/coal.jpg | Bin .../{Material.c4g => Material.ocg}/earth.jpg | Bin .../earth_dry.jpg | Bin .../earth_rough.jpg | Bin .../{Material.c4g => Material.ocg}/gold.jpg | Bin .../granite.jpg | Bin .../{Material.c4g => Material.ocg}/ice2.jpg | Bin .../{Material.c4g => Material.ocg}/ice3.jpg | Bin .../lava_red.png | Bin planet/{Material.c4g => Material.ocg}/ore.jpg | Bin .../{Material.c4g => Material.ocg}/rock.jpg | Bin .../rock_cracked.jpg | Bin .../sand_rough.jpg | Bin .../{Material.c4g => Material.ocg}/snow1.jpg | Bin .../sulphur.jpg | Bin .../{Material.c4g => Material.ocg}/tunnel.jpg | Bin .../{Material.c4g => Material.ocg}/water.jpg | Bin planet/{Music.c4g => Music.ocg}/Version.txt | 0 .../Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c | 2 +- .../Libraries.c4d/ClonkControl.c4d/Script.c | 2 +- planet/{Sound.c4g => Sound.ocg}/BirdsLoop.ogg | Bin planet/{Sound.c4g => Sound.ocg}/Blast1.wav | Bin planet/{Sound.c4g => Sound.ocg}/Blast2.wav | Bin planet/{Sound.c4g => Sound.ocg}/Blast3.wav | Bin planet/{Sound.c4g => Sound.ocg}/Click.wav | Bin planet/{Sound.c4g => Sound.ocg}/Clonk.ogg | Bin planet/{Sound.c4g => Sound.ocg}/Confirm1.wav | Bin planet/{Sound.c4g => Sound.ocg}/Confirm2.wav | Bin planet/{Sound.c4g => Sound.ocg}/Confirm3.wav | Bin planet/{Sound.c4g => Sound.ocg}/Die.wav | Bin planet/{Sound.c4g => Sound.ocg}/Fanfare.wav | Bin planet/{Sound.c4g => Sound.ocg}/Fuse.wav | Bin planet/{Sound.c4g => Sound.ocg}/FuseLoop.wav | Bin planet/{Sound.c4g => Sound.ocg}/Hurt1.wav | Bin planet/{Sound.c4g => Sound.ocg}/Hurt2.wav | Bin .../{Sound.c4g => Sound.ocg}/MonsterDie.wav | Bin .../MonsterGrowl1.wav | Bin .../MonsterGrowl2.wav | Bin .../MonsterGrowl3.wav | Bin .../ProjectileHitLiving1.ogg | Bin .../ProjectileHitLiving2.ogg | Bin planet/{Sound.c4g => Sound.ocg}/RockHit1.wav | Bin planet/{Sound.c4g => Sound.ocg}/RockHit2.wav | Bin planet/{Sound.c4g => Sound.ocg}/Sizzle.ogg | Bin planet/{Sound.c4g => Sound.ocg}/Snuff1.wav | Bin planet/{Sound.c4g => Sound.ocg}/Snuff2.wav | Bin planet/{Sound.c4g => Sound.ocg}/Splash1.wav | Bin planet/{Sound.c4g => Sound.ocg}/Splash2.wav | Bin planet/{Sound.c4g => Sound.ocg}/Splash3.wav | Bin planet/{Sound.c4g => Sound.ocg}/Version.txt | 0 planet/{Sound.c4g => Sound.ocg}/WindLoop.ogg | Bin planet/{Sound.c4g => Sound.ocg}/WipfAroof.wav | Bin planet/{Sound.c4g => Sound.ocg}/WipfWhine.wav | Bin planet/{Sound.c4g => Sound.ocg}/authors.txt | 0 planet/{System.c4g => System.ocg}/C4.c | 0 planet/{System.c4g => System.ocg}/Colors.c | 0 planet/{System.c4g => System.ocg}/Commits.c | 0 planet/{System.c4g => System.ocg}/Explode.c | 0 .../{System.c4g => System.ocg}/FindObject.c | 0 planet/{System.c4g => System.ocg}/Fire.c | 0 planet/{System.c4g => System.ocg}/GetXVal.c | 0 planet/{System.c4g => System.ocg}/Helpers.c | 0 planet/{System.c4g => System.ocg}/HitChecks.c | 0 .../{System.c4g => System.ocg}/LanguageDE.txt | 0 .../{System.c4g => System.ocg}/LanguageUS.txt | 0 .../MeshAnimation.c | 0 .../MeshTransformation.c | 0 planet/{System.c4g => System.ocg}/Names.txt | 0 planet/{System.c4g => System.ocg}/Player.c | 0 .../PlayerControl.c | 0 .../PlayerControls.txt | 0 planet/{System.c4g => System.ocg}/Schedule.c | 0 planet/{System.c4g => System.ocg}/Version.txt | 0 .../{System.c4g => System.ocg}/Plane.c | 0 .../{System.c4g => System.ocg}/Restart.c | 0 .../{System.c4g => System.ocg}/Clonk.c | 0 .../{System.c4g => System.ocg}/Clonk.c | 0 .../{System.c4g => System.ocg}/FlagGoal.c | 0 .../{System.c4g => System.ocg}/Ropeladder.c | 0 .../StringTblDE.txt | 0 .../StringTblUS.txt | 0 .../{System.c4g => System.ocg}/WeaponFade.c | 0 .../{System.c4g => System.ocg}/AIAttack.c | 0 .../{System.c4g => System.ocg}/AIBowAttack.c | 0 .../{System.c4g => System.ocg}/AIGuardArea.c | 0 .../AIJavelinAttack.c | 0 .../{System.c4g => System.ocg}/AILog.c | 0 .../AIMeleeAttack.c | 0 .../AIMusketAttack.c | 0 .../AIRangedAttack.c | 0 .../AISwordAttack.c | 0 .../{System.c4g => System.ocg}/Ammo.c | 0 .../{System.c4g => System.ocg}/Cloud.c | 0 .../{System.c4g => System.ocg}/Collect.c | 0 .../StringTblDE.txt | 0 .../StringTblUS.txt | 0 src/C4Application.cpp | 4 ++-- src/C4Application.h | 4 ++-- src/C4Game.cpp | 6 ++--- src/c4group/C4Components.h | 18 +++++++------- src/c4group/C4Extra.cpp | 2 +- src/c4group/C4Extra.h | 4 ++-- src/c4group/C4GroupSet.h | 8 +++---- src/c4group/C4Language.cpp | 22 +++++++++--------- src/c4group/C4Update.cpp | 4 ++-- src/c4group/c4group_ng.cpp | 2 +- src/control/C4GameParameters.cpp | 6 ++--- src/control/C4PlayerInfoConflicts.cpp | 2 +- src/gui/C4StartupPlrSelDlg.cpp | 2 +- src/lib/StdMeshMaterial.cpp | 2 +- src/lib/texture/C4GraphicsResource.cpp | 6 ++--- src/lib/texture/C4GraphicsResource.h | 4 ++-- src/network/C4Network2.cpp | 2 +- src/platform/C4FileClasses.cpp | 2 +- src/platform/C4MusicSystem.cpp | 2 +- src/platform/C4MusicSystem.h | 2 +- src/res/c4g.ico | Bin 26582 -> 0 bytes src/res/engine.rc | 2 +- src/res/ocg.ico | Bin 0 -> 22486 bytes src/res/resource.h | 2 +- src/script/C4AulParse.cpp | 4 ++-- tools/install/oc.nsi | 12 +++++----- 277 files changed, 71 insertions(+), 71 deletions(-) rename planet/BackToTheRocks.c4f/Boomrace.ocs/{System.c4g => System.ocg}/Boompack.c (100%) rename planet/BackToTheRocks.c4f/Boomrace.ocs/{System.c4g => System.ocg}/Clonk.c (100%) rename planet/BackToTheRocks.c4f/Boomshire.ocs/{System.c4g => System.ocg}/Arrow.c (100%) rename planet/BackToTheRocks.c4f/Boomshire.ocs/{System.c4g => System.ocg}/Blink.c (100%) rename planet/BackToTheRocks.c4f/Boomshire.ocs/{System.c4g => System.ocg}/Clonk.c (100%) rename planet/BackToTheRocks.c4f/Boomshire.ocs/{System.c4g => System.ocg}/NoRain.c (100%) rename planet/BackToTheRocks.c4f/BristleRidge.ocs/{System.c4g => System.ocg}/DoubleTools.c (100%) rename planet/BackToTheRocks.c4f/BristleRidge.ocs/{System.c4g => System.ocg}/NoRain.c (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{Material.c4g => Material.ocg}/Ice.c4m (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{Material.c4g => Material.ocg}/Snow.c4m (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{Material.c4g => Material.ocg}/TEXMAP.TXT (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{Material.c4g => Material.ocg}/Water.c4m (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{Material.c4g => Material.ocg}/brick1.jpg (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{Material.c4g => Material.ocg}/brickback.jpg (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{Material.c4g => Material.ocg}/tunnel.jpg (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{System.c4g => System.ocg}/Explode.c (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{System.c4g => System.ocg}/LessBubbles.c (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{System.c4g => System.ocg}/StoneDoor.c (100%) rename planet/BackToTheRocks.c4f/FrozenFortress.ocs/{System.c4g => System.ocg}/UnUseableRopeLadders.c (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{Material.c4g => Material.ocg}/Ametyst.c4m (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{Material.c4g => Material.ocg}/Ametyst.jpg (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{Material.c4g => Material.ocg}/Ruby.c4m (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{Material.c4g => Material.ocg}/Ruby.jpg (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{Material.c4g => Material.ocg}/TEXMAP.TXT (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{Material.c4g => Material.ocg}/tunnelAmethyst.jpg (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{Material.c4g => Material.ocg}/tunnelRuby.jpg (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{System.c4g => System.ocg}/PowderKeg.c (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{System.c4g => System.ocg}/StoneDoor.c (100%) rename planet/BackToTheRocks.c4f/Hideout.ocs/{System.c4g => System.ocg}/UnUseableRopeLadders.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/CheatArrow.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/King_Bow.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/King_Club.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/King_Javelin.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/King_Musket.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/King_MusketBullet.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/King_Sword.c (100%) rename planet/BackToTheRocks.c4f/MoltenMonarch.ocs/{System.c4g => System.ocg}/MultipleSelection.c (100%) rename planet/BackToTheRocks.c4f/Overcast.ocs/{System.c4g => System.ocg}/NoRain.c (100%) rename planet/BackToTheRocks.c4f/Overcast.ocs/{System.c4g => System.ocg}/SlowJar.c (100%) rename planet/BackToTheRocks.c4f/RockBottom.ocs/{System.c4g => System.ocg}/MultipleSelection.c (100%) rename planet/BackToTheRocks.c4f/Ruins.ocs/{System.c4g => System.ocg}/UnUseableRopeLadders.c (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{Material.c4g => Material.ocg}/TEXMAP.TXT (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{Material.c4g => Material.ocg}/brick1.jpg (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{Material.c4g => Material.ocg}/brickback.jpg (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{Material.c4g => Material.ocg}/earth.jpg (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{Material.c4g => Material.ocg}/earth_dry.jpg (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{Material.c4g => Material.ocg}/earth_rough.jpg (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{System.c4g => System.ocg}/Clonk.c (100%) rename planet/BackToTheRocks.c4f/ScorchedGardens.ocs/{System.c4g => System.ocg}/NoRain.c (100%) rename planet/BackToTheRocks.c4f/ThunderousSkies.ocs/{System.c4g => System.ocg}/FastDynamite.c (100%) rename planet/BackToTheRocks.c4f/ThunderousSkies.ocs/{System.c4g => System.ocg}/FlyingArrowpack.c (100%) rename planet/BackToTheRocks.c4f/ThunderousSkies.ocs/{System.c4g => System.ocg}/FlyingBoompack.c (100%) rename planet/BackToTheRocks.c4f/ThunderousSkies.ocs/{System.c4g => System.ocg}/FlyingDynamite.c (100%) rename planet/BackToTheRocks.c4f/ThunderousSkies.ocs/{System.c4g => System.ocg}/Lifesteal.c (100%) rename planet/BackToTheRocks.c4f/ThunderousSkies.ocs/{System.c4g => System.ocg}/NoRain.c (100%) rename planet/BackToTheRocks.c4f/ThunderousSkies.ocs/{System.c4g => System.ocg}/NoRegeneration.c (100%) rename planet/BackToTheRocks.c4f/Windmill.ocs/{System.c4g => System.ocg}/CheatArrow.c (100%) rename planet/BackToTheRocks.c4f/Windmill.ocs/{System.c4g => System.ocg}/SensitiveWindGenerator.c (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Arrow.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Authors.txt (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Background.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Build.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/C4.PAL (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Captain.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Clouds1.jpg (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Clouds2.jpg (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Construction.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Control.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Crew.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/CursorLarge.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/CursorMedium.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/CursorSmall.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Endeavour.ttf (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Energy.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Exit.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Fire.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Flag.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIBigArrows.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIButton.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIButtonDown.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIButtonHighlight.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUICaption.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUICheckbox.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIContext.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIIcons.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIIcons2.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIProgress.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUIScroll.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/GUISubmenu.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Gamepad.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Hand.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Liquid.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Loader1.jpg (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Logo.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Menu.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Options.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Player.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Portrait1.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Portrait2.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Portrait3.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Portrait4.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Portrait5.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Rank.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/SelectMark.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupAboutBG.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupBigButton.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupBigButtonDown.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupBookScroll.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupContext.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupDlgPaper.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupLogo.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupMainMenuBG.jpg (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupNetGetRef.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupNetworkBG.jpg (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupOptionIcons.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupPlrPropBG.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupPlrSelBG.jpg (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupScenSelBG.jpg (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupScenSelIcons.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupScenSelTitleOv.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/StartupTabClip.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/UpperBoard.png (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Version.txt (100%) rename planet/{Graphics.c4g => Graphics.ocg}/Wealth.png (100%) rename planet/{Material.c4g => Material.ocg}/Acid.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Brick.c4m (100%) rename planet/{Material.c4g => Material.ocg}/BrickSoft.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Coal.c4m (100%) rename planet/{Material.c4g => Material.ocg}/DuroLava.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Earth.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Gold.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Granite.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Ice.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Lava.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Lava.png (100%) rename planet/{Material.c4g => Material.ocg}/ORE.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Rock.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Sand.c4m (100%) rename planet/{Material.c4g => Material.ocg}/SandDry.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Smooth.jpg (100%) rename planet/{Material.c4g => Material.ocg}/Snow.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Snow.png (100%) rename planet/{Material.c4g => Material.ocg}/Sulphur.c4m (100%) rename planet/{Material.c4g => Material.ocg}/TEXMAP.TXT (100%) rename planet/{Material.c4g => Material.ocg}/Tunnel.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Vehicle.c4m (100%) rename planet/{Material.c4g => Material.ocg}/Version.txt (100%) rename planet/{Material.c4g => Material.ocg}/Water.c4m (100%) rename planet/{Material.c4g => Material.ocg}/acid.png (100%) rename planet/{Material.c4g => Material.ocg}/authors.txt (100%) rename planet/{Material.c4g => Material.ocg}/brick1.jpg (100%) rename planet/{Material.c4g => Material.ocg}/brickback.jpg (100%) rename planet/{Material.c4g => Material.ocg}/coal.jpg (100%) rename planet/{Material.c4g => Material.ocg}/earth.jpg (100%) rename planet/{Material.c4g => Material.ocg}/earth_dry.jpg (100%) rename planet/{Material.c4g => Material.ocg}/earth_rough.jpg (100%) rename planet/{Material.c4g => Material.ocg}/gold.jpg (100%) rename planet/{Material.c4g => Material.ocg}/granite.jpg (100%) rename planet/{Material.c4g => Material.ocg}/ice2.jpg (100%) rename planet/{Material.c4g => Material.ocg}/ice3.jpg (100%) rename planet/{Material.c4g => Material.ocg}/lava_red.png (100%) rename planet/{Material.c4g => Material.ocg}/ore.jpg (100%) rename planet/{Material.c4g => Material.ocg}/rock.jpg (100%) rename planet/{Material.c4g => Material.ocg}/rock_cracked.jpg (100%) rename planet/{Material.c4g => Material.ocg}/sand_rough.jpg (100%) rename planet/{Material.c4g => Material.ocg}/snow1.jpg (100%) rename planet/{Material.c4g => Material.ocg}/sulphur.jpg (100%) rename planet/{Material.c4g => Material.ocg}/tunnel.jpg (100%) rename planet/{Material.c4g => Material.ocg}/water.jpg (100%) rename planet/{Music.c4g => Music.ocg}/Version.txt (100%) rename planet/{Sound.c4g => Sound.ocg}/BirdsLoop.ogg (100%) rename planet/{Sound.c4g => Sound.ocg}/Blast1.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Blast2.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Blast3.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Click.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Clonk.ogg (100%) rename planet/{Sound.c4g => Sound.ocg}/Confirm1.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Confirm2.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Confirm3.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Die.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Fanfare.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Fuse.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/FuseLoop.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Hurt1.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Hurt2.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/MonsterDie.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/MonsterGrowl1.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/MonsterGrowl2.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/MonsterGrowl3.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/ProjectileHitLiving1.ogg (100%) rename planet/{Sound.c4g => Sound.ocg}/ProjectileHitLiving2.ogg (100%) rename planet/{Sound.c4g => Sound.ocg}/RockHit1.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/RockHit2.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Sizzle.ogg (100%) rename planet/{Sound.c4g => Sound.ocg}/Snuff1.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Snuff2.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Splash1.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Splash2.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Splash3.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/Version.txt (100%) rename planet/{Sound.c4g => Sound.ocg}/WindLoop.ogg (100%) rename planet/{Sound.c4g => Sound.ocg}/WipfAroof.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/WipfWhine.wav (100%) rename planet/{Sound.c4g => Sound.ocg}/authors.txt (100%) rename planet/{System.c4g => System.ocg}/C4.c (100%) rename planet/{System.c4g => System.ocg}/Colors.c (100%) rename planet/{System.c4g => System.ocg}/Commits.c (100%) rename planet/{System.c4g => System.ocg}/Explode.c (100%) rename planet/{System.c4g => System.ocg}/FindObject.c (100%) rename planet/{System.c4g => System.ocg}/Fire.c (100%) rename planet/{System.c4g => System.ocg}/GetXVal.c (100%) rename planet/{System.c4g => System.ocg}/Helpers.c (100%) rename planet/{System.c4g => System.ocg}/HitChecks.c (100%) rename planet/{System.c4g => System.ocg}/LanguageDE.txt (100%) rename planet/{System.c4g => System.ocg}/LanguageUS.txt (100%) rename planet/{System.c4g => System.ocg}/MeshAnimation.c (100%) rename planet/{System.c4g => System.ocg}/MeshTransformation.c (100%) rename planet/{System.c4g => System.ocg}/Names.txt (100%) rename planet/{System.c4g => System.ocg}/Player.c (100%) rename planet/{System.c4g => System.ocg}/PlayerControl.c (100%) rename planet/{System.c4g => System.ocg}/PlayerControls.txt (100%) rename planet/{System.c4g => System.ocg}/Schedule.c (100%) rename planet/{System.c4g => System.ocg}/Version.txt (100%) rename planet/Tests.c4f/AirRace.ocs/{System.c4g => System.ocg}/Plane.c (100%) rename planet/Tests.c4f/AirRace.ocs/{System.c4g => System.ocg}/Restart.c (100%) rename planet/Tutorial.c4f/Tutorial02.ocs/{System.c4g => System.ocg}/Clonk.c (100%) rename planet/Tutorial.c4f/Tutorial03.ocs/{System.c4g => System.ocg}/Clonk.c (100%) rename planet/Tutorial.c4f/Tutorial03.ocs/{System.c4g => System.ocg}/FlagGoal.c (100%) rename planet/Tutorial.c4f/Tutorial03.ocs/{System.c4g => System.ocg}/Ropeladder.c (100%) rename planet/Tutorial.c4f/Tutorial03.ocs/{System.c4g => System.ocg}/StringTblDE.txt (100%) rename planet/Tutorial.c4f/Tutorial03.ocs/{System.c4g => System.ocg}/StringTblUS.txt (100%) rename planet/Tutorial.c4f/Tutorial03.ocs/{System.c4g => System.ocg}/WeaponFade.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AIAttack.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AIBowAttack.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AIGuardArea.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AIJavelinAttack.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AILog.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AIMeleeAttack.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AIMusketAttack.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AIRangedAttack.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/AISwordAttack.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/Ammo.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/Cloud.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/Collect.c (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/StringTblDE.txt (100%) rename planet/Tutorial.c4f/Tutorial04.ocs/{System.c4g => System.ocg}/StringTblUS.txt (100%) delete mode 100644 src/res/c4g.ico create mode 100644 src/res/ocg.ico diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a7181138..27034c1ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1178,7 +1178,7 @@ ENDIF() ") # Remove previously installed data files -FILE(GLOB OC_INSTALLED_DATA_FILES "${CMAKE_INSTALL_PREFIX}/share/openclonk/*.c4[dfg]" "${CMAKE_INSTALL_PREFIX}/share/openclonk/*.oc[s] ") +FILE(GLOB OC_INSTALLED_DATA_FILES "${CMAKE_INSTALL_PREFIX}/share/openclonk/*.c4[df]" "${CMAKE_INSTALL_PREFIX}/share/openclonk/*.oc[gs] ") install(CODE " FOREACH(CURRENT_FILE ${OC_INSTALLED_DATA_FILES}) FILE(REMOVE \${CURRENT_FILE}) @@ -1186,7 +1186,7 @@ ENDFOREACH() ") # Install new files -FILE(GLOB OC_DATA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/planet/*.c4[dfg]" "${CMAKE_CURRENT_SOURCE_DIR}/planet/*.oc[s]") +FILE(GLOB OC_DATA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/planet/*.c4[df]" "${CMAKE_CURRENT_SOURCE_DIR}/planet/*.oc[gs]") install(DIRECTORY ${OC_DATA_FILES} DESTINATION share/openclonk) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/clonk.desktop DESTINATION share/applications) diff --git a/Makefile.am b/Makefile.am index 2d36377ec..09361504f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -693,8 +693,8 @@ EXTRA_DIST = \ Version.txt \ CMakeLists.txt \ config.h.cmake \ - planet/System.c4g/LanguageUS.txt \ - planet/System.c4g/LanguageDE.txt \ + planet/System.ocg/LanguageUS.txt \ + planet/System.ocg/LanguageDE.txt \ clonk.anjuta \ licenses \ src/netio/NetIO.dsp \ @@ -715,7 +715,7 @@ EXTRA_DIST = \ src/res/Static_Trans.png \ src/c4group/Resource.rc \ src/res/brush1.bmp \ - src/res/c4g.ico \ + src/res/ocg.ico \ src/res/ocs.ico \ src/res/Cursor2.bmp \ src/res/Game.pal \ diff --git a/planet/AUTHORS b/planet/AUTHORS index d64d5fbe5..e537eb4b7 100644 --- a/planet/AUTHORS +++ b/planet/AUTHORS @@ -30,9 +30,9 @@ Music Sounds ====== -See authors.txt in Sound.c4g +See authors.txt in Sound.ocg Material textures ================= -See authors.txt in Material.c4g +See authors.txt in Material.ocg diff --git a/planet/BackToTheRocks.c4f/Boomrace.ocs/System.c4g/Boompack.c b/planet/BackToTheRocks.c4f/Boomrace.ocs/System.ocg/Boompack.c similarity index 100% rename from planet/BackToTheRocks.c4f/Boomrace.ocs/System.c4g/Boompack.c rename to planet/BackToTheRocks.c4f/Boomrace.ocs/System.ocg/Boompack.c diff --git a/planet/BackToTheRocks.c4f/Boomrace.ocs/System.c4g/Clonk.c b/planet/BackToTheRocks.c4f/Boomrace.ocs/System.ocg/Clonk.c similarity index 100% rename from planet/BackToTheRocks.c4f/Boomrace.ocs/System.c4g/Clonk.c rename to planet/BackToTheRocks.c4f/Boomrace.ocs/System.ocg/Clonk.c diff --git a/planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/Arrow.c b/planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/Arrow.c similarity index 100% rename from planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/Arrow.c rename to planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/Arrow.c diff --git a/planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/Blink.c b/planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/Blink.c similarity index 100% rename from planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/Blink.c rename to planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/Blink.c diff --git a/planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/Clonk.c b/planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/Clonk.c similarity index 100% rename from planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/Clonk.c rename to planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/Clonk.c diff --git a/planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/NoRain.c b/planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/NoRain.c similarity index 100% rename from planet/BackToTheRocks.c4f/Boomshire.ocs/System.c4g/NoRain.c rename to planet/BackToTheRocks.c4f/Boomshire.ocs/System.ocg/NoRain.c diff --git a/planet/BackToTheRocks.c4f/BristleRidge.ocs/System.c4g/DoubleTools.c b/planet/BackToTheRocks.c4f/BristleRidge.ocs/System.ocg/DoubleTools.c similarity index 100% rename from planet/BackToTheRocks.c4f/BristleRidge.ocs/System.c4g/DoubleTools.c rename to planet/BackToTheRocks.c4f/BristleRidge.ocs/System.ocg/DoubleTools.c diff --git a/planet/BackToTheRocks.c4f/BristleRidge.ocs/System.c4g/NoRain.c b/planet/BackToTheRocks.c4f/BristleRidge.ocs/System.ocg/NoRain.c similarity index 100% rename from planet/BackToTheRocks.c4f/BristleRidge.ocs/System.c4g/NoRain.c rename to planet/BackToTheRocks.c4f/BristleRidge.ocs/System.ocg/NoRain.c diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/Ice.c4m b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/Ice.c4m similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/Ice.c4m rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/Ice.c4m diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/Snow.c4m b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/Snow.c4m similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/Snow.c4m rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/Snow.c4m diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/TEXMAP.TXT b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/TEXMAP.TXT similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/TEXMAP.TXT rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/TEXMAP.TXT diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/Water.c4m b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/Water.c4m similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/Water.c4m rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/Water.c4m diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/brick1.jpg b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/brick1.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/brick1.jpg rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/brick1.jpg diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/brickback.jpg b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/brickback.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/brickback.jpg rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/brickback.jpg diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/tunnel.jpg b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/tunnel.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.c4g/tunnel.jpg rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/Material.ocg/tunnel.jpg diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/Explode.c b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/Explode.c similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/Explode.c rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/Explode.c diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/LessBubbles.c b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/LessBubbles.c similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/LessBubbles.c rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/LessBubbles.c diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/StoneDoor.c b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/StoneDoor.c similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/StoneDoor.c rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/StoneDoor.c diff --git a/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/UnUseableRopeLadders.c b/planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/UnUseableRopeLadders.c similarity index 100% rename from planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.c4g/UnUseableRopeLadders.c rename to planet/BackToTheRocks.c4f/FrozenFortress.ocs/System.ocg/UnUseableRopeLadders.c diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ametyst.c4m b/planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ametyst.c4m similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ametyst.c4m rename to planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ametyst.c4m diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ametyst.jpg b/planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ametyst.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ametyst.jpg rename to planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ametyst.jpg diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ruby.c4m b/planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ruby.c4m similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ruby.c4m rename to planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ruby.c4m diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ruby.jpg b/planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ruby.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/Ruby.jpg rename to planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/Ruby.jpg diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/TEXMAP.TXT b/planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/TEXMAP.TXT similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/TEXMAP.TXT rename to planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/TEXMAP.TXT diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/tunnelAmethyst.jpg b/planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/tunnelAmethyst.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/tunnelAmethyst.jpg rename to planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/tunnelAmethyst.jpg diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/tunnelRuby.jpg b/planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/tunnelRuby.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/Material.c4g/tunnelRuby.jpg rename to planet/BackToTheRocks.c4f/Hideout.ocs/Material.ocg/tunnelRuby.jpg diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/System.c4g/PowderKeg.c b/planet/BackToTheRocks.c4f/Hideout.ocs/System.ocg/PowderKeg.c similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/System.c4g/PowderKeg.c rename to planet/BackToTheRocks.c4f/Hideout.ocs/System.ocg/PowderKeg.c diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/System.c4g/StoneDoor.c b/planet/BackToTheRocks.c4f/Hideout.ocs/System.ocg/StoneDoor.c similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/System.c4g/StoneDoor.c rename to planet/BackToTheRocks.c4f/Hideout.ocs/System.ocg/StoneDoor.c diff --git a/planet/BackToTheRocks.c4f/Hideout.ocs/System.c4g/UnUseableRopeLadders.c b/planet/BackToTheRocks.c4f/Hideout.ocs/System.ocg/UnUseableRopeLadders.c similarity index 100% rename from planet/BackToTheRocks.c4f/Hideout.ocs/System.c4g/UnUseableRopeLadders.c rename to planet/BackToTheRocks.c4f/Hideout.ocs/System.ocg/UnUseableRopeLadders.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/CheatArrow.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/CheatArrow.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/CheatArrow.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/CheatArrow.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Bow.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Bow.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Bow.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Bow.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Club.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Club.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Club.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Club.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Javelin.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Javelin.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Javelin.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Javelin.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Musket.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Musket.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Musket.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Musket.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_MusketBullet.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_MusketBullet.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_MusketBullet.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_MusketBullet.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Sword.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Sword.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/King_Sword.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/King_Sword.c diff --git a/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/MultipleSelection.c b/planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/MultipleSelection.c similarity index 100% rename from planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.c4g/MultipleSelection.c rename to planet/BackToTheRocks.c4f/MoltenMonarch.ocs/System.ocg/MultipleSelection.c diff --git a/planet/BackToTheRocks.c4f/Overcast.ocs/System.c4g/NoRain.c b/planet/BackToTheRocks.c4f/Overcast.ocs/System.ocg/NoRain.c similarity index 100% rename from planet/BackToTheRocks.c4f/Overcast.ocs/System.c4g/NoRain.c rename to planet/BackToTheRocks.c4f/Overcast.ocs/System.ocg/NoRain.c diff --git a/planet/BackToTheRocks.c4f/Overcast.ocs/System.c4g/SlowJar.c b/planet/BackToTheRocks.c4f/Overcast.ocs/System.ocg/SlowJar.c similarity index 100% rename from planet/BackToTheRocks.c4f/Overcast.ocs/System.c4g/SlowJar.c rename to planet/BackToTheRocks.c4f/Overcast.ocs/System.ocg/SlowJar.c diff --git a/planet/BackToTheRocks.c4f/RockBottom.ocs/System.c4g/MultipleSelection.c b/planet/BackToTheRocks.c4f/RockBottom.ocs/System.ocg/MultipleSelection.c similarity index 100% rename from planet/BackToTheRocks.c4f/RockBottom.ocs/System.c4g/MultipleSelection.c rename to planet/BackToTheRocks.c4f/RockBottom.ocs/System.ocg/MultipleSelection.c diff --git a/planet/BackToTheRocks.c4f/Ruins.ocs/System.c4g/UnUseableRopeLadders.c b/planet/BackToTheRocks.c4f/Ruins.ocs/System.ocg/UnUseableRopeLadders.c similarity index 100% rename from planet/BackToTheRocks.c4f/Ruins.ocs/System.c4g/UnUseableRopeLadders.c rename to planet/BackToTheRocks.c4f/Ruins.ocs/System.ocg/UnUseableRopeLadders.c diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/TEXMAP.TXT b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/TEXMAP.TXT similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/TEXMAP.TXT rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/TEXMAP.TXT diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/brick1.jpg b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/brick1.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/brick1.jpg rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/brick1.jpg diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/brickback.jpg b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/brickback.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/brickback.jpg rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/brickback.jpg diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/earth.jpg b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/earth.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/earth.jpg rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/earth.jpg diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/earth_dry.jpg b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/earth_dry.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/earth_dry.jpg rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/earth_dry.jpg diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/earth_rough.jpg b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/earth_rough.jpg similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.c4g/earth_rough.jpg rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/Material.ocg/earth_rough.jpg diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.c4g/Clonk.c b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.ocg/Clonk.c similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.c4g/Clonk.c rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.ocg/Clonk.c diff --git a/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.c4g/NoRain.c b/planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.ocg/NoRain.c similarity index 100% rename from planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.c4g/NoRain.c rename to planet/BackToTheRocks.c4f/ScorchedGardens.ocs/System.ocg/NoRain.c diff --git a/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FastDynamite.c b/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FastDynamite.c similarity index 100% rename from planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FastDynamite.c rename to planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FastDynamite.c diff --git a/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FlyingArrowpack.c b/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FlyingArrowpack.c similarity index 100% rename from planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FlyingArrowpack.c rename to planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FlyingArrowpack.c diff --git a/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FlyingBoompack.c b/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FlyingBoompack.c similarity index 100% rename from planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FlyingBoompack.c rename to planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FlyingBoompack.c diff --git a/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FlyingDynamite.c b/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FlyingDynamite.c similarity index 100% rename from planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/FlyingDynamite.c rename to planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/FlyingDynamite.c diff --git a/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/Lifesteal.c b/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/Lifesteal.c similarity index 100% rename from planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/Lifesteal.c rename to planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/Lifesteal.c diff --git a/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/NoRain.c b/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/NoRain.c similarity index 100% rename from planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/NoRain.c rename to planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/NoRain.c diff --git a/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/NoRegeneration.c b/planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/NoRegeneration.c similarity index 100% rename from planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.c4g/NoRegeneration.c rename to planet/BackToTheRocks.c4f/ThunderousSkies.ocs/System.ocg/NoRegeneration.c diff --git a/planet/BackToTheRocks.c4f/Windmill.ocs/System.c4g/CheatArrow.c b/planet/BackToTheRocks.c4f/Windmill.ocs/System.ocg/CheatArrow.c similarity index 100% rename from planet/BackToTheRocks.c4f/Windmill.ocs/System.c4g/CheatArrow.c rename to planet/BackToTheRocks.c4f/Windmill.ocs/System.ocg/CheatArrow.c diff --git a/planet/BackToTheRocks.c4f/Windmill.ocs/System.c4g/SensitiveWindGenerator.c b/planet/BackToTheRocks.c4f/Windmill.ocs/System.ocg/SensitiveWindGenerator.c similarity index 100% rename from planet/BackToTheRocks.c4f/Windmill.ocs/System.c4g/SensitiveWindGenerator.c rename to planet/BackToTheRocks.c4f/Windmill.ocs/System.ocg/SensitiveWindGenerator.c diff --git a/planet/Graphics.c4g/Arrow.png b/planet/Graphics.ocg/Arrow.png similarity index 100% rename from planet/Graphics.c4g/Arrow.png rename to planet/Graphics.ocg/Arrow.png diff --git a/planet/Graphics.c4g/Authors.txt b/planet/Graphics.ocg/Authors.txt similarity index 100% rename from planet/Graphics.c4g/Authors.txt rename to planet/Graphics.ocg/Authors.txt diff --git a/planet/Graphics.c4g/Background.png b/planet/Graphics.ocg/Background.png similarity index 100% rename from planet/Graphics.c4g/Background.png rename to planet/Graphics.ocg/Background.png diff --git a/planet/Graphics.c4g/Build.png b/planet/Graphics.ocg/Build.png similarity index 100% rename from planet/Graphics.c4g/Build.png rename to planet/Graphics.ocg/Build.png diff --git a/planet/Graphics.c4g/C4.PAL b/planet/Graphics.ocg/C4.PAL similarity index 100% rename from planet/Graphics.c4g/C4.PAL rename to planet/Graphics.ocg/C4.PAL diff --git a/planet/Graphics.c4g/Captain.png b/planet/Graphics.ocg/Captain.png similarity index 100% rename from planet/Graphics.c4g/Captain.png rename to planet/Graphics.ocg/Captain.png diff --git a/planet/Graphics.c4g/Clouds1.jpg b/planet/Graphics.ocg/Clouds1.jpg similarity index 100% rename from planet/Graphics.c4g/Clouds1.jpg rename to planet/Graphics.ocg/Clouds1.jpg diff --git a/planet/Graphics.c4g/Clouds2.jpg b/planet/Graphics.ocg/Clouds2.jpg similarity index 100% rename from planet/Graphics.c4g/Clouds2.jpg rename to planet/Graphics.ocg/Clouds2.jpg diff --git a/planet/Graphics.c4g/Construction.png b/planet/Graphics.ocg/Construction.png similarity index 100% rename from planet/Graphics.c4g/Construction.png rename to planet/Graphics.ocg/Construction.png diff --git a/planet/Graphics.c4g/Control.png b/planet/Graphics.ocg/Control.png similarity index 100% rename from planet/Graphics.c4g/Control.png rename to planet/Graphics.ocg/Control.png diff --git a/planet/Graphics.c4g/Crew.png b/planet/Graphics.ocg/Crew.png similarity index 100% rename from planet/Graphics.c4g/Crew.png rename to planet/Graphics.ocg/Crew.png diff --git a/planet/Graphics.c4g/CursorLarge.png b/planet/Graphics.ocg/CursorLarge.png similarity index 100% rename from planet/Graphics.c4g/CursorLarge.png rename to planet/Graphics.ocg/CursorLarge.png diff --git a/planet/Graphics.c4g/CursorMedium.png b/planet/Graphics.ocg/CursorMedium.png similarity index 100% rename from planet/Graphics.c4g/CursorMedium.png rename to planet/Graphics.ocg/CursorMedium.png diff --git a/planet/Graphics.c4g/CursorSmall.png b/planet/Graphics.ocg/CursorSmall.png similarity index 100% rename from planet/Graphics.c4g/CursorSmall.png rename to planet/Graphics.ocg/CursorSmall.png diff --git a/planet/Graphics.c4g/Endeavour.ttf b/planet/Graphics.ocg/Endeavour.ttf similarity index 100% rename from planet/Graphics.c4g/Endeavour.ttf rename to planet/Graphics.ocg/Endeavour.ttf diff --git a/planet/Graphics.c4g/Energy.png b/planet/Graphics.ocg/Energy.png similarity index 100% rename from planet/Graphics.c4g/Energy.png rename to planet/Graphics.ocg/Energy.png diff --git a/planet/Graphics.c4g/Exit.png b/planet/Graphics.ocg/Exit.png similarity index 100% rename from planet/Graphics.c4g/Exit.png rename to planet/Graphics.ocg/Exit.png diff --git a/planet/Graphics.c4g/Fire.png b/planet/Graphics.ocg/Fire.png similarity index 100% rename from planet/Graphics.c4g/Fire.png rename to planet/Graphics.ocg/Fire.png diff --git a/planet/Graphics.c4g/Flag.png b/planet/Graphics.ocg/Flag.png similarity index 100% rename from planet/Graphics.c4g/Flag.png rename to planet/Graphics.ocg/Flag.png diff --git a/planet/Graphics.c4g/GUIBigArrows.png b/planet/Graphics.ocg/GUIBigArrows.png similarity index 100% rename from planet/Graphics.c4g/GUIBigArrows.png rename to planet/Graphics.ocg/GUIBigArrows.png diff --git a/planet/Graphics.c4g/GUIButton.png b/planet/Graphics.ocg/GUIButton.png similarity index 100% rename from planet/Graphics.c4g/GUIButton.png rename to planet/Graphics.ocg/GUIButton.png diff --git a/planet/Graphics.c4g/GUIButtonDown.png b/planet/Graphics.ocg/GUIButtonDown.png similarity index 100% rename from planet/Graphics.c4g/GUIButtonDown.png rename to planet/Graphics.ocg/GUIButtonDown.png diff --git a/planet/Graphics.c4g/GUIButtonHighlight.png b/planet/Graphics.ocg/GUIButtonHighlight.png similarity index 100% rename from planet/Graphics.c4g/GUIButtonHighlight.png rename to planet/Graphics.ocg/GUIButtonHighlight.png diff --git a/planet/Graphics.c4g/GUICaption.png b/planet/Graphics.ocg/GUICaption.png similarity index 100% rename from planet/Graphics.c4g/GUICaption.png rename to planet/Graphics.ocg/GUICaption.png diff --git a/planet/Graphics.c4g/GUICheckbox.png b/planet/Graphics.ocg/GUICheckbox.png similarity index 100% rename from planet/Graphics.c4g/GUICheckbox.png rename to planet/Graphics.ocg/GUICheckbox.png diff --git a/planet/Graphics.c4g/GUIContext.png b/planet/Graphics.ocg/GUIContext.png similarity index 100% rename from planet/Graphics.c4g/GUIContext.png rename to planet/Graphics.ocg/GUIContext.png diff --git a/planet/Graphics.c4g/GUIIcons.png b/planet/Graphics.ocg/GUIIcons.png similarity index 100% rename from planet/Graphics.c4g/GUIIcons.png rename to planet/Graphics.ocg/GUIIcons.png diff --git a/planet/Graphics.c4g/GUIIcons2.png b/planet/Graphics.ocg/GUIIcons2.png similarity index 100% rename from planet/Graphics.c4g/GUIIcons2.png rename to planet/Graphics.ocg/GUIIcons2.png diff --git a/planet/Graphics.c4g/GUIProgress.png b/planet/Graphics.ocg/GUIProgress.png similarity index 100% rename from planet/Graphics.c4g/GUIProgress.png rename to planet/Graphics.ocg/GUIProgress.png diff --git a/planet/Graphics.c4g/GUIScroll.png b/planet/Graphics.ocg/GUIScroll.png similarity index 100% rename from planet/Graphics.c4g/GUIScroll.png rename to planet/Graphics.ocg/GUIScroll.png diff --git a/planet/Graphics.c4g/GUISubmenu.png b/planet/Graphics.ocg/GUISubmenu.png similarity index 100% rename from planet/Graphics.c4g/GUISubmenu.png rename to planet/Graphics.ocg/GUISubmenu.png diff --git a/planet/Graphics.c4g/Gamepad.png b/planet/Graphics.ocg/Gamepad.png similarity index 100% rename from planet/Graphics.c4g/Gamepad.png rename to planet/Graphics.ocg/Gamepad.png diff --git a/planet/Graphics.c4g/Hand.png b/planet/Graphics.ocg/Hand.png similarity index 100% rename from planet/Graphics.c4g/Hand.png rename to planet/Graphics.ocg/Hand.png diff --git a/planet/Graphics.c4g/Liquid.png b/planet/Graphics.ocg/Liquid.png similarity index 100% rename from planet/Graphics.c4g/Liquid.png rename to planet/Graphics.ocg/Liquid.png diff --git a/planet/Graphics.c4g/Loader1.jpg b/planet/Graphics.ocg/Loader1.jpg similarity index 100% rename from planet/Graphics.c4g/Loader1.jpg rename to planet/Graphics.ocg/Loader1.jpg diff --git a/planet/Graphics.c4g/Logo.png b/planet/Graphics.ocg/Logo.png similarity index 100% rename from planet/Graphics.c4g/Logo.png rename to planet/Graphics.ocg/Logo.png diff --git a/planet/Graphics.c4g/Menu.png b/planet/Graphics.ocg/Menu.png similarity index 100% rename from planet/Graphics.c4g/Menu.png rename to planet/Graphics.ocg/Menu.png diff --git a/planet/Graphics.c4g/Options.png b/planet/Graphics.ocg/Options.png similarity index 100% rename from planet/Graphics.c4g/Options.png rename to planet/Graphics.ocg/Options.png diff --git a/planet/Graphics.c4g/Player.png b/planet/Graphics.ocg/Player.png similarity index 100% rename from planet/Graphics.c4g/Player.png rename to planet/Graphics.ocg/Player.png diff --git a/planet/Graphics.c4g/Portrait1.png b/planet/Graphics.ocg/Portrait1.png similarity index 100% rename from planet/Graphics.c4g/Portrait1.png rename to planet/Graphics.ocg/Portrait1.png diff --git a/planet/Graphics.c4g/Portrait2.png b/planet/Graphics.ocg/Portrait2.png similarity index 100% rename from planet/Graphics.c4g/Portrait2.png rename to planet/Graphics.ocg/Portrait2.png diff --git a/planet/Graphics.c4g/Portrait3.png b/planet/Graphics.ocg/Portrait3.png similarity index 100% rename from planet/Graphics.c4g/Portrait3.png rename to planet/Graphics.ocg/Portrait3.png diff --git a/planet/Graphics.c4g/Portrait4.png b/planet/Graphics.ocg/Portrait4.png similarity index 100% rename from planet/Graphics.c4g/Portrait4.png rename to planet/Graphics.ocg/Portrait4.png diff --git a/planet/Graphics.c4g/Portrait5.png b/planet/Graphics.ocg/Portrait5.png similarity index 100% rename from planet/Graphics.c4g/Portrait5.png rename to planet/Graphics.ocg/Portrait5.png diff --git a/planet/Graphics.c4g/Rank.png b/planet/Graphics.ocg/Rank.png similarity index 100% rename from planet/Graphics.c4g/Rank.png rename to planet/Graphics.ocg/Rank.png diff --git a/planet/Graphics.c4g/SelectMark.png b/planet/Graphics.ocg/SelectMark.png similarity index 100% rename from planet/Graphics.c4g/SelectMark.png rename to planet/Graphics.ocg/SelectMark.png diff --git a/planet/Graphics.c4g/StartupAboutBG.png b/planet/Graphics.ocg/StartupAboutBG.png similarity index 100% rename from planet/Graphics.c4g/StartupAboutBG.png rename to planet/Graphics.ocg/StartupAboutBG.png diff --git a/planet/Graphics.c4g/StartupBigButton.png b/planet/Graphics.ocg/StartupBigButton.png similarity index 100% rename from planet/Graphics.c4g/StartupBigButton.png rename to planet/Graphics.ocg/StartupBigButton.png diff --git a/planet/Graphics.c4g/StartupBigButtonDown.png b/planet/Graphics.ocg/StartupBigButtonDown.png similarity index 100% rename from planet/Graphics.c4g/StartupBigButtonDown.png rename to planet/Graphics.ocg/StartupBigButtonDown.png diff --git a/planet/Graphics.c4g/StartupBookScroll.png b/planet/Graphics.ocg/StartupBookScroll.png similarity index 100% rename from planet/Graphics.c4g/StartupBookScroll.png rename to planet/Graphics.ocg/StartupBookScroll.png diff --git a/planet/Graphics.c4g/StartupContext.png b/planet/Graphics.ocg/StartupContext.png similarity index 100% rename from planet/Graphics.c4g/StartupContext.png rename to planet/Graphics.ocg/StartupContext.png diff --git a/planet/Graphics.c4g/StartupDlgPaper.png b/planet/Graphics.ocg/StartupDlgPaper.png similarity index 100% rename from planet/Graphics.c4g/StartupDlgPaper.png rename to planet/Graphics.ocg/StartupDlgPaper.png diff --git a/planet/Graphics.c4g/StartupLogo.png b/planet/Graphics.ocg/StartupLogo.png similarity index 100% rename from planet/Graphics.c4g/StartupLogo.png rename to planet/Graphics.ocg/StartupLogo.png diff --git a/planet/Graphics.c4g/StartupMainMenuBG.jpg b/planet/Graphics.ocg/StartupMainMenuBG.jpg similarity index 100% rename from planet/Graphics.c4g/StartupMainMenuBG.jpg rename to planet/Graphics.ocg/StartupMainMenuBG.jpg diff --git a/planet/Graphics.c4g/StartupNetGetRef.png b/planet/Graphics.ocg/StartupNetGetRef.png similarity index 100% rename from planet/Graphics.c4g/StartupNetGetRef.png rename to planet/Graphics.ocg/StartupNetGetRef.png diff --git a/planet/Graphics.c4g/StartupNetworkBG.jpg b/planet/Graphics.ocg/StartupNetworkBG.jpg similarity index 100% rename from planet/Graphics.c4g/StartupNetworkBG.jpg rename to planet/Graphics.ocg/StartupNetworkBG.jpg diff --git a/planet/Graphics.c4g/StartupOptionIcons.png b/planet/Graphics.ocg/StartupOptionIcons.png similarity index 100% rename from planet/Graphics.c4g/StartupOptionIcons.png rename to planet/Graphics.ocg/StartupOptionIcons.png diff --git a/planet/Graphics.c4g/StartupPlrPropBG.png b/planet/Graphics.ocg/StartupPlrPropBG.png similarity index 100% rename from planet/Graphics.c4g/StartupPlrPropBG.png rename to planet/Graphics.ocg/StartupPlrPropBG.png diff --git a/planet/Graphics.c4g/StartupPlrSelBG.jpg b/planet/Graphics.ocg/StartupPlrSelBG.jpg similarity index 100% rename from planet/Graphics.c4g/StartupPlrSelBG.jpg rename to planet/Graphics.ocg/StartupPlrSelBG.jpg diff --git a/planet/Graphics.c4g/StartupScenSelBG.jpg b/planet/Graphics.ocg/StartupScenSelBG.jpg similarity index 100% rename from planet/Graphics.c4g/StartupScenSelBG.jpg rename to planet/Graphics.ocg/StartupScenSelBG.jpg diff --git a/planet/Graphics.c4g/StartupScenSelIcons.png b/planet/Graphics.ocg/StartupScenSelIcons.png similarity index 100% rename from planet/Graphics.c4g/StartupScenSelIcons.png rename to planet/Graphics.ocg/StartupScenSelIcons.png diff --git a/planet/Graphics.c4g/StartupScenSelTitleOv.png b/planet/Graphics.ocg/StartupScenSelTitleOv.png similarity index 100% rename from planet/Graphics.c4g/StartupScenSelTitleOv.png rename to planet/Graphics.ocg/StartupScenSelTitleOv.png diff --git a/planet/Graphics.c4g/StartupTabClip.png b/planet/Graphics.ocg/StartupTabClip.png similarity index 100% rename from planet/Graphics.c4g/StartupTabClip.png rename to planet/Graphics.ocg/StartupTabClip.png diff --git a/planet/Graphics.c4g/UpperBoard.png b/planet/Graphics.ocg/UpperBoard.png similarity index 100% rename from planet/Graphics.c4g/UpperBoard.png rename to planet/Graphics.ocg/UpperBoard.png diff --git a/planet/Graphics.c4g/Version.txt b/planet/Graphics.ocg/Version.txt similarity index 100% rename from planet/Graphics.c4g/Version.txt rename to planet/Graphics.ocg/Version.txt diff --git a/planet/Graphics.c4g/Wealth.png b/planet/Graphics.ocg/Wealth.png similarity index 100% rename from planet/Graphics.c4g/Wealth.png rename to planet/Graphics.ocg/Wealth.png diff --git a/planet/Material.c4g/Acid.c4m b/planet/Material.ocg/Acid.c4m similarity index 100% rename from planet/Material.c4g/Acid.c4m rename to planet/Material.ocg/Acid.c4m diff --git a/planet/Material.c4g/Brick.c4m b/planet/Material.ocg/Brick.c4m similarity index 100% rename from planet/Material.c4g/Brick.c4m rename to planet/Material.ocg/Brick.c4m diff --git a/planet/Material.c4g/BrickSoft.c4m b/planet/Material.ocg/BrickSoft.c4m similarity index 100% rename from planet/Material.c4g/BrickSoft.c4m rename to planet/Material.ocg/BrickSoft.c4m diff --git a/planet/Material.c4g/Coal.c4m b/planet/Material.ocg/Coal.c4m similarity index 100% rename from planet/Material.c4g/Coal.c4m rename to planet/Material.ocg/Coal.c4m diff --git a/planet/Material.c4g/DuroLava.c4m b/planet/Material.ocg/DuroLava.c4m similarity index 100% rename from planet/Material.c4g/DuroLava.c4m rename to planet/Material.ocg/DuroLava.c4m diff --git a/planet/Material.c4g/Earth.c4m b/planet/Material.ocg/Earth.c4m similarity index 100% rename from planet/Material.c4g/Earth.c4m rename to planet/Material.ocg/Earth.c4m diff --git a/planet/Material.c4g/Gold.c4m b/planet/Material.ocg/Gold.c4m similarity index 100% rename from planet/Material.c4g/Gold.c4m rename to planet/Material.ocg/Gold.c4m diff --git a/planet/Material.c4g/Granite.c4m b/planet/Material.ocg/Granite.c4m similarity index 100% rename from planet/Material.c4g/Granite.c4m rename to planet/Material.ocg/Granite.c4m diff --git a/planet/Material.c4g/Ice.c4m b/planet/Material.ocg/Ice.c4m similarity index 100% rename from planet/Material.c4g/Ice.c4m rename to planet/Material.ocg/Ice.c4m diff --git a/planet/Material.c4g/Lava.c4m b/planet/Material.ocg/Lava.c4m similarity index 100% rename from planet/Material.c4g/Lava.c4m rename to planet/Material.ocg/Lava.c4m diff --git a/planet/Material.c4g/Lava.png b/planet/Material.ocg/Lava.png similarity index 100% rename from planet/Material.c4g/Lava.png rename to planet/Material.ocg/Lava.png diff --git a/planet/Material.c4g/ORE.c4m b/planet/Material.ocg/ORE.c4m similarity index 100% rename from planet/Material.c4g/ORE.c4m rename to planet/Material.ocg/ORE.c4m diff --git a/planet/Material.c4g/Rock.c4m b/planet/Material.ocg/Rock.c4m similarity index 100% rename from planet/Material.c4g/Rock.c4m rename to planet/Material.ocg/Rock.c4m diff --git a/planet/Material.c4g/Sand.c4m b/planet/Material.ocg/Sand.c4m similarity index 100% rename from planet/Material.c4g/Sand.c4m rename to planet/Material.ocg/Sand.c4m diff --git a/planet/Material.c4g/SandDry.c4m b/planet/Material.ocg/SandDry.c4m similarity index 100% rename from planet/Material.c4g/SandDry.c4m rename to planet/Material.ocg/SandDry.c4m diff --git a/planet/Material.c4g/Smooth.jpg b/planet/Material.ocg/Smooth.jpg similarity index 100% rename from planet/Material.c4g/Smooth.jpg rename to planet/Material.ocg/Smooth.jpg diff --git a/planet/Material.c4g/Snow.c4m b/planet/Material.ocg/Snow.c4m similarity index 100% rename from planet/Material.c4g/Snow.c4m rename to planet/Material.ocg/Snow.c4m diff --git a/planet/Material.c4g/Snow.png b/planet/Material.ocg/Snow.png similarity index 100% rename from planet/Material.c4g/Snow.png rename to planet/Material.ocg/Snow.png diff --git a/planet/Material.c4g/Sulphur.c4m b/planet/Material.ocg/Sulphur.c4m similarity index 100% rename from planet/Material.c4g/Sulphur.c4m rename to planet/Material.ocg/Sulphur.c4m diff --git a/planet/Material.c4g/TEXMAP.TXT b/planet/Material.ocg/TEXMAP.TXT similarity index 100% rename from planet/Material.c4g/TEXMAP.TXT rename to planet/Material.ocg/TEXMAP.TXT diff --git a/planet/Material.c4g/Tunnel.c4m b/planet/Material.ocg/Tunnel.c4m similarity index 100% rename from planet/Material.c4g/Tunnel.c4m rename to planet/Material.ocg/Tunnel.c4m diff --git a/planet/Material.c4g/Vehicle.c4m b/planet/Material.ocg/Vehicle.c4m similarity index 100% rename from planet/Material.c4g/Vehicle.c4m rename to planet/Material.ocg/Vehicle.c4m diff --git a/planet/Material.c4g/Version.txt b/planet/Material.ocg/Version.txt similarity index 100% rename from planet/Material.c4g/Version.txt rename to planet/Material.ocg/Version.txt diff --git a/planet/Material.c4g/Water.c4m b/planet/Material.ocg/Water.c4m similarity index 100% rename from planet/Material.c4g/Water.c4m rename to planet/Material.ocg/Water.c4m diff --git a/planet/Material.c4g/acid.png b/planet/Material.ocg/acid.png similarity index 100% rename from planet/Material.c4g/acid.png rename to planet/Material.ocg/acid.png diff --git a/planet/Material.c4g/authors.txt b/planet/Material.ocg/authors.txt similarity index 100% rename from planet/Material.c4g/authors.txt rename to planet/Material.ocg/authors.txt diff --git a/planet/Material.c4g/brick1.jpg b/planet/Material.ocg/brick1.jpg similarity index 100% rename from planet/Material.c4g/brick1.jpg rename to planet/Material.ocg/brick1.jpg diff --git a/planet/Material.c4g/brickback.jpg b/planet/Material.ocg/brickback.jpg similarity index 100% rename from planet/Material.c4g/brickback.jpg rename to planet/Material.ocg/brickback.jpg diff --git a/planet/Material.c4g/coal.jpg b/planet/Material.ocg/coal.jpg similarity index 100% rename from planet/Material.c4g/coal.jpg rename to planet/Material.ocg/coal.jpg diff --git a/planet/Material.c4g/earth.jpg b/planet/Material.ocg/earth.jpg similarity index 100% rename from planet/Material.c4g/earth.jpg rename to planet/Material.ocg/earth.jpg diff --git a/planet/Material.c4g/earth_dry.jpg b/planet/Material.ocg/earth_dry.jpg similarity index 100% rename from planet/Material.c4g/earth_dry.jpg rename to planet/Material.ocg/earth_dry.jpg diff --git a/planet/Material.c4g/earth_rough.jpg b/planet/Material.ocg/earth_rough.jpg similarity index 100% rename from planet/Material.c4g/earth_rough.jpg rename to planet/Material.ocg/earth_rough.jpg diff --git a/planet/Material.c4g/gold.jpg b/planet/Material.ocg/gold.jpg similarity index 100% rename from planet/Material.c4g/gold.jpg rename to planet/Material.ocg/gold.jpg diff --git a/planet/Material.c4g/granite.jpg b/planet/Material.ocg/granite.jpg similarity index 100% rename from planet/Material.c4g/granite.jpg rename to planet/Material.ocg/granite.jpg diff --git a/planet/Material.c4g/ice2.jpg b/planet/Material.ocg/ice2.jpg similarity index 100% rename from planet/Material.c4g/ice2.jpg rename to planet/Material.ocg/ice2.jpg diff --git a/planet/Material.c4g/ice3.jpg b/planet/Material.ocg/ice3.jpg similarity index 100% rename from planet/Material.c4g/ice3.jpg rename to planet/Material.ocg/ice3.jpg diff --git a/planet/Material.c4g/lava_red.png b/planet/Material.ocg/lava_red.png similarity index 100% rename from planet/Material.c4g/lava_red.png rename to planet/Material.ocg/lava_red.png diff --git a/planet/Material.c4g/ore.jpg b/planet/Material.ocg/ore.jpg similarity index 100% rename from planet/Material.c4g/ore.jpg rename to planet/Material.ocg/ore.jpg diff --git a/planet/Material.c4g/rock.jpg b/planet/Material.ocg/rock.jpg similarity index 100% rename from planet/Material.c4g/rock.jpg rename to planet/Material.ocg/rock.jpg diff --git a/planet/Material.c4g/rock_cracked.jpg b/planet/Material.ocg/rock_cracked.jpg similarity index 100% rename from planet/Material.c4g/rock_cracked.jpg rename to planet/Material.ocg/rock_cracked.jpg diff --git a/planet/Material.c4g/sand_rough.jpg b/planet/Material.ocg/sand_rough.jpg similarity index 100% rename from planet/Material.c4g/sand_rough.jpg rename to planet/Material.ocg/sand_rough.jpg diff --git a/planet/Material.c4g/snow1.jpg b/planet/Material.ocg/snow1.jpg similarity index 100% rename from planet/Material.c4g/snow1.jpg rename to planet/Material.ocg/snow1.jpg diff --git a/planet/Material.c4g/sulphur.jpg b/planet/Material.ocg/sulphur.jpg similarity index 100% rename from planet/Material.c4g/sulphur.jpg rename to planet/Material.ocg/sulphur.jpg diff --git a/planet/Material.c4g/tunnel.jpg b/planet/Material.ocg/tunnel.jpg similarity index 100% rename from planet/Material.c4g/tunnel.jpg rename to planet/Material.ocg/tunnel.jpg diff --git a/planet/Material.c4g/water.jpg b/planet/Material.ocg/water.jpg similarity index 100% rename from planet/Material.c4g/water.jpg rename to planet/Material.ocg/water.jpg diff --git a/planet/Music.c4g/Version.txt b/planet/Music.ocg/Version.txt similarity index 100% rename from planet/Music.c4g/Version.txt rename to planet/Music.ocg/Version.txt diff --git a/planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c b/planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c index 957b176ff..b51c6610e 100644 --- a/planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c +++ b/planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c @@ -5,7 +5,7 @@ The arrow is the standard ammo for the bow and base object for all other types of arrows. This object is stackable (up to 15) as it is required from the bow. - The arrow employs the HitCheck effect (in System.c4g/HitChecks.c) originally + The arrow employs the HitCheck effect (in System.ocg/HitChecks.c) originally from Hazard to search for targets during flight. */ diff --git a/planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Script.c b/planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Script.c index 1a2cfd9a2..8fe2d64c2 100644 --- a/planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Script.c +++ b/planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Script.c @@ -5,7 +5,7 @@ This object provides handling of the clonk controls including item management, backpack controls and standard throwing behaviour. It should be included into any clonk/crew definition. - The controls in System.c4g/PlayerControl.c only provide basic movement + The controls in System.ocg/PlayerControl.c only provide basic movement handling, namely the movement left, right, up and down. The rest is handled here: Grabbing, ungrabbing, shifting and pushing vehicles into buildings; diff --git a/planet/Sound.c4g/BirdsLoop.ogg b/planet/Sound.ocg/BirdsLoop.ogg similarity index 100% rename from planet/Sound.c4g/BirdsLoop.ogg rename to planet/Sound.ocg/BirdsLoop.ogg diff --git a/planet/Sound.c4g/Blast1.wav b/planet/Sound.ocg/Blast1.wav similarity index 100% rename from planet/Sound.c4g/Blast1.wav rename to planet/Sound.ocg/Blast1.wav diff --git a/planet/Sound.c4g/Blast2.wav b/planet/Sound.ocg/Blast2.wav similarity index 100% rename from planet/Sound.c4g/Blast2.wav rename to planet/Sound.ocg/Blast2.wav diff --git a/planet/Sound.c4g/Blast3.wav b/planet/Sound.ocg/Blast3.wav similarity index 100% rename from planet/Sound.c4g/Blast3.wav rename to planet/Sound.ocg/Blast3.wav diff --git a/planet/Sound.c4g/Click.wav b/planet/Sound.ocg/Click.wav similarity index 100% rename from planet/Sound.c4g/Click.wav rename to planet/Sound.ocg/Click.wav diff --git a/planet/Sound.c4g/Clonk.ogg b/planet/Sound.ocg/Clonk.ogg similarity index 100% rename from planet/Sound.c4g/Clonk.ogg rename to planet/Sound.ocg/Clonk.ogg diff --git a/planet/Sound.c4g/Confirm1.wav b/planet/Sound.ocg/Confirm1.wav similarity index 100% rename from planet/Sound.c4g/Confirm1.wav rename to planet/Sound.ocg/Confirm1.wav diff --git a/planet/Sound.c4g/Confirm2.wav b/planet/Sound.ocg/Confirm2.wav similarity index 100% rename from planet/Sound.c4g/Confirm2.wav rename to planet/Sound.ocg/Confirm2.wav diff --git a/planet/Sound.c4g/Confirm3.wav b/planet/Sound.ocg/Confirm3.wav similarity index 100% rename from planet/Sound.c4g/Confirm3.wav rename to planet/Sound.ocg/Confirm3.wav diff --git a/planet/Sound.c4g/Die.wav b/planet/Sound.ocg/Die.wav similarity index 100% rename from planet/Sound.c4g/Die.wav rename to planet/Sound.ocg/Die.wav diff --git a/planet/Sound.c4g/Fanfare.wav b/planet/Sound.ocg/Fanfare.wav similarity index 100% rename from planet/Sound.c4g/Fanfare.wav rename to planet/Sound.ocg/Fanfare.wav diff --git a/planet/Sound.c4g/Fuse.wav b/planet/Sound.ocg/Fuse.wav similarity index 100% rename from planet/Sound.c4g/Fuse.wav rename to planet/Sound.ocg/Fuse.wav diff --git a/planet/Sound.c4g/FuseLoop.wav b/planet/Sound.ocg/FuseLoop.wav similarity index 100% rename from planet/Sound.c4g/FuseLoop.wav rename to planet/Sound.ocg/FuseLoop.wav diff --git a/planet/Sound.c4g/Hurt1.wav b/planet/Sound.ocg/Hurt1.wav similarity index 100% rename from planet/Sound.c4g/Hurt1.wav rename to planet/Sound.ocg/Hurt1.wav diff --git a/planet/Sound.c4g/Hurt2.wav b/planet/Sound.ocg/Hurt2.wav similarity index 100% rename from planet/Sound.c4g/Hurt2.wav rename to planet/Sound.ocg/Hurt2.wav diff --git a/planet/Sound.c4g/MonsterDie.wav b/planet/Sound.ocg/MonsterDie.wav similarity index 100% rename from planet/Sound.c4g/MonsterDie.wav rename to planet/Sound.ocg/MonsterDie.wav diff --git a/planet/Sound.c4g/MonsterGrowl1.wav b/planet/Sound.ocg/MonsterGrowl1.wav similarity index 100% rename from planet/Sound.c4g/MonsterGrowl1.wav rename to planet/Sound.ocg/MonsterGrowl1.wav diff --git a/planet/Sound.c4g/MonsterGrowl2.wav b/planet/Sound.ocg/MonsterGrowl2.wav similarity index 100% rename from planet/Sound.c4g/MonsterGrowl2.wav rename to planet/Sound.ocg/MonsterGrowl2.wav diff --git a/planet/Sound.c4g/MonsterGrowl3.wav b/planet/Sound.ocg/MonsterGrowl3.wav similarity index 100% rename from planet/Sound.c4g/MonsterGrowl3.wav rename to planet/Sound.ocg/MonsterGrowl3.wav diff --git a/planet/Sound.c4g/ProjectileHitLiving1.ogg b/planet/Sound.ocg/ProjectileHitLiving1.ogg similarity index 100% rename from planet/Sound.c4g/ProjectileHitLiving1.ogg rename to planet/Sound.ocg/ProjectileHitLiving1.ogg diff --git a/planet/Sound.c4g/ProjectileHitLiving2.ogg b/planet/Sound.ocg/ProjectileHitLiving2.ogg similarity index 100% rename from planet/Sound.c4g/ProjectileHitLiving2.ogg rename to planet/Sound.ocg/ProjectileHitLiving2.ogg diff --git a/planet/Sound.c4g/RockHit1.wav b/planet/Sound.ocg/RockHit1.wav similarity index 100% rename from planet/Sound.c4g/RockHit1.wav rename to planet/Sound.ocg/RockHit1.wav diff --git a/planet/Sound.c4g/RockHit2.wav b/planet/Sound.ocg/RockHit2.wav similarity index 100% rename from planet/Sound.c4g/RockHit2.wav rename to planet/Sound.ocg/RockHit2.wav diff --git a/planet/Sound.c4g/Sizzle.ogg b/planet/Sound.ocg/Sizzle.ogg similarity index 100% rename from planet/Sound.c4g/Sizzle.ogg rename to planet/Sound.ocg/Sizzle.ogg diff --git a/planet/Sound.c4g/Snuff1.wav b/planet/Sound.ocg/Snuff1.wav similarity index 100% rename from planet/Sound.c4g/Snuff1.wav rename to planet/Sound.ocg/Snuff1.wav diff --git a/planet/Sound.c4g/Snuff2.wav b/planet/Sound.ocg/Snuff2.wav similarity index 100% rename from planet/Sound.c4g/Snuff2.wav rename to planet/Sound.ocg/Snuff2.wav diff --git a/planet/Sound.c4g/Splash1.wav b/planet/Sound.ocg/Splash1.wav similarity index 100% rename from planet/Sound.c4g/Splash1.wav rename to planet/Sound.ocg/Splash1.wav diff --git a/planet/Sound.c4g/Splash2.wav b/planet/Sound.ocg/Splash2.wav similarity index 100% rename from planet/Sound.c4g/Splash2.wav rename to planet/Sound.ocg/Splash2.wav diff --git a/planet/Sound.c4g/Splash3.wav b/planet/Sound.ocg/Splash3.wav similarity index 100% rename from planet/Sound.c4g/Splash3.wav rename to planet/Sound.ocg/Splash3.wav diff --git a/planet/Sound.c4g/Version.txt b/planet/Sound.ocg/Version.txt similarity index 100% rename from planet/Sound.c4g/Version.txt rename to planet/Sound.ocg/Version.txt diff --git a/planet/Sound.c4g/WindLoop.ogg b/planet/Sound.ocg/WindLoop.ogg similarity index 100% rename from planet/Sound.c4g/WindLoop.ogg rename to planet/Sound.ocg/WindLoop.ogg diff --git a/planet/Sound.c4g/WipfAroof.wav b/planet/Sound.ocg/WipfAroof.wav similarity index 100% rename from planet/Sound.c4g/WipfAroof.wav rename to planet/Sound.ocg/WipfAroof.wav diff --git a/planet/Sound.c4g/WipfWhine.wav b/planet/Sound.ocg/WipfWhine.wav similarity index 100% rename from planet/Sound.c4g/WipfWhine.wav rename to planet/Sound.ocg/WipfWhine.wav diff --git a/planet/Sound.c4g/authors.txt b/planet/Sound.ocg/authors.txt similarity index 100% rename from planet/Sound.c4g/authors.txt rename to planet/Sound.ocg/authors.txt diff --git a/planet/System.c4g/C4.c b/planet/System.ocg/C4.c similarity index 100% rename from planet/System.c4g/C4.c rename to planet/System.ocg/C4.c diff --git a/planet/System.c4g/Colors.c b/planet/System.ocg/Colors.c similarity index 100% rename from planet/System.c4g/Colors.c rename to planet/System.ocg/Colors.c diff --git a/planet/System.c4g/Commits.c b/planet/System.ocg/Commits.c similarity index 100% rename from planet/System.c4g/Commits.c rename to planet/System.ocg/Commits.c diff --git a/planet/System.c4g/Explode.c b/planet/System.ocg/Explode.c similarity index 100% rename from planet/System.c4g/Explode.c rename to planet/System.ocg/Explode.c diff --git a/planet/System.c4g/FindObject.c b/planet/System.ocg/FindObject.c similarity index 100% rename from planet/System.c4g/FindObject.c rename to planet/System.ocg/FindObject.c diff --git a/planet/System.c4g/Fire.c b/planet/System.ocg/Fire.c similarity index 100% rename from planet/System.c4g/Fire.c rename to planet/System.ocg/Fire.c diff --git a/planet/System.c4g/GetXVal.c b/planet/System.ocg/GetXVal.c similarity index 100% rename from planet/System.c4g/GetXVal.c rename to planet/System.ocg/GetXVal.c diff --git a/planet/System.c4g/Helpers.c b/planet/System.ocg/Helpers.c similarity index 100% rename from planet/System.c4g/Helpers.c rename to planet/System.ocg/Helpers.c diff --git a/planet/System.c4g/HitChecks.c b/planet/System.ocg/HitChecks.c similarity index 100% rename from planet/System.c4g/HitChecks.c rename to planet/System.ocg/HitChecks.c diff --git a/planet/System.c4g/LanguageDE.txt b/planet/System.ocg/LanguageDE.txt similarity index 100% rename from planet/System.c4g/LanguageDE.txt rename to planet/System.ocg/LanguageDE.txt diff --git a/planet/System.c4g/LanguageUS.txt b/planet/System.ocg/LanguageUS.txt similarity index 100% rename from planet/System.c4g/LanguageUS.txt rename to planet/System.ocg/LanguageUS.txt diff --git a/planet/System.c4g/MeshAnimation.c b/planet/System.ocg/MeshAnimation.c similarity index 100% rename from planet/System.c4g/MeshAnimation.c rename to planet/System.ocg/MeshAnimation.c diff --git a/planet/System.c4g/MeshTransformation.c b/planet/System.ocg/MeshTransformation.c similarity index 100% rename from planet/System.c4g/MeshTransformation.c rename to planet/System.ocg/MeshTransformation.c diff --git a/planet/System.c4g/Names.txt b/planet/System.ocg/Names.txt similarity index 100% rename from planet/System.c4g/Names.txt rename to planet/System.ocg/Names.txt diff --git a/planet/System.c4g/Player.c b/planet/System.ocg/Player.c similarity index 100% rename from planet/System.c4g/Player.c rename to planet/System.ocg/Player.c diff --git a/planet/System.c4g/PlayerControl.c b/planet/System.ocg/PlayerControl.c similarity index 100% rename from planet/System.c4g/PlayerControl.c rename to planet/System.ocg/PlayerControl.c diff --git a/planet/System.c4g/PlayerControls.txt b/planet/System.ocg/PlayerControls.txt similarity index 100% rename from planet/System.c4g/PlayerControls.txt rename to planet/System.ocg/PlayerControls.txt diff --git a/planet/System.c4g/Schedule.c b/planet/System.ocg/Schedule.c similarity index 100% rename from planet/System.c4g/Schedule.c rename to planet/System.ocg/Schedule.c diff --git a/planet/System.c4g/Version.txt b/planet/System.ocg/Version.txt similarity index 100% rename from planet/System.c4g/Version.txt rename to planet/System.ocg/Version.txt diff --git a/planet/Tests.c4f/AirRace.ocs/System.c4g/Plane.c b/planet/Tests.c4f/AirRace.ocs/System.ocg/Plane.c similarity index 100% rename from planet/Tests.c4f/AirRace.ocs/System.c4g/Plane.c rename to planet/Tests.c4f/AirRace.ocs/System.ocg/Plane.c diff --git a/planet/Tests.c4f/AirRace.ocs/System.c4g/Restart.c b/planet/Tests.c4f/AirRace.ocs/System.ocg/Restart.c similarity index 100% rename from planet/Tests.c4f/AirRace.ocs/System.c4g/Restart.c rename to planet/Tests.c4f/AirRace.ocs/System.ocg/Restart.c diff --git a/planet/Tutorial.c4f/Tutorial02.ocs/System.c4g/Clonk.c b/planet/Tutorial.c4f/Tutorial02.ocs/System.ocg/Clonk.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial02.ocs/System.c4g/Clonk.c rename to planet/Tutorial.c4f/Tutorial02.ocs/System.ocg/Clonk.c diff --git a/planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/Clonk.c b/planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/Clonk.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/Clonk.c rename to planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/Clonk.c diff --git a/planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/FlagGoal.c b/planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/FlagGoal.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/FlagGoal.c rename to planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/FlagGoal.c diff --git a/planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/Ropeladder.c b/planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/Ropeladder.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/Ropeladder.c rename to planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/Ropeladder.c diff --git a/planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/StringTblDE.txt b/planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/StringTblDE.txt similarity index 100% rename from planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/StringTblDE.txt rename to planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/StringTblDE.txt diff --git a/planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/StringTblUS.txt b/planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/StringTblUS.txt similarity index 100% rename from planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/StringTblUS.txt rename to planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/StringTblUS.txt diff --git a/planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/WeaponFade.c b/planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/WeaponFade.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial03.ocs/System.c4g/WeaponFade.c rename to planet/Tutorial.c4f/Tutorial03.ocs/System.ocg/WeaponFade.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIAttack.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIAttack.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIAttack.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIAttack.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIBowAttack.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIBowAttack.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIBowAttack.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIBowAttack.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIGuardArea.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIGuardArea.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIGuardArea.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIGuardArea.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIJavelinAttack.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIJavelinAttack.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIJavelinAttack.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIJavelinAttack.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AILog.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AILog.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AILog.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AILog.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIMeleeAttack.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIMeleeAttack.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIMeleeAttack.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIMeleeAttack.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIMusketAttack.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIMusketAttack.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIMusketAttack.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIMusketAttack.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIRangedAttack.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIRangedAttack.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AIRangedAttack.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AIRangedAttack.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AISwordAttack.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AISwordAttack.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/AISwordAttack.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/AISwordAttack.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/Ammo.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/Ammo.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/Ammo.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/Ammo.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/Cloud.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/Cloud.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/Cloud.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/Cloud.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/Collect.c b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/Collect.c similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/Collect.c rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/Collect.c diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/StringTblDE.txt b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/StringTblDE.txt similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/StringTblDE.txt rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/StringTblDE.txt diff --git a/planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/StringTblUS.txt b/planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/StringTblUS.txt similarity index 100% rename from planet/Tutorial.c4f/Tutorial04.ocs/System.c4g/StringTblUS.txt rename to planet/Tutorial.c4f/Tutorial04.ocs/System.ocg/StringTblUS.txt diff --git a/src/C4Application.cpp b/src/C4Application.cpp index 08fd36ae3..5209b1161 100644 --- a/src/C4Application.cpp +++ b/src/C4Application.cpp @@ -119,7 +119,7 @@ bool C4Application::DoInit(int argc, char * argv[]) // Error opening system group - no LogFatal, because it needs language table. // This will *not* use the FatalErrors stack, but this will cause the game // to instantly halt, anyway. - const char *szMessage = "Error opening system group file (System.c4g)!"; + const char *szMessage = "Error opening system group file (System.ocg)!"; Log(szMessage); // Fatal error, game cannot start - have player notice MessageDialog(szMessage); @@ -533,7 +533,7 @@ void C4Application::Clear() // stop timer Remove(pGameTimer); delete pGameTimer; pGameTimer = NULL; - // close system group (System.c4g) + // close system group (System.ocg) SystemGroup.Close(); // Log if (IsResStrTableLoaded()) // Avoid (double and undefined) message on (second?) shutdown... diff --git a/src/C4Application.h b/src/C4Application.h index f3213ec9e..90aa5c456 100644 --- a/src/C4Application.h +++ b/src/C4Application.h @@ -44,7 +44,7 @@ public: ~C4Application(); // Flag for restarting the engine at the end bool restartAtEnd; - // main System.c4g in working folder + // main System.ocg in working folder C4Group SystemGroup; C4MusicSystem MusicSystem; C4SoundSystem SoundSystem; @@ -58,7 +58,7 @@ public: // Tick timing void GameTick(); void Draw(); - // System.c4g helper funcs + // System.ocg helper funcs bool OpenSystemGroup() { return SystemGroup.IsOpen() || SystemGroup.Open(C4CFN_System); } void CloseSystemGroup() { SystemGroup.Close(); } void SetGameTickDelay(int iDelay); diff --git a/src/C4Game.cpp b/src/C4Game.cpp index 99ea7ed4a..5740d6d42 100644 --- a/src/C4Game.cpp +++ b/src/C4Game.cpp @@ -2066,7 +2066,7 @@ bool C4Game::InitGame(C4Group &hGroup, bool fLoadSection, bool fLoadSky) if (!InitDefs()) return false; SetInitProgress(55); - // Scenario scripts (and local system.c4g) + // Scenario scripts (and local system.ocg) // After defs to get overloading priority if (!LoadScenarioScripts() || !LoadAdditionalSystemGroup(ScenarioFile)) { LogFatal(LoadResStr("IDS_PRC_FAIL")); return false; } @@ -2650,7 +2650,7 @@ bool C4Game::LoadScenarioScripts() bool C4Game::LoadAdditionalSystemGroup(C4Group &parent_group) { - // called for scenario local and definition local System.c4g groups + // called for scenario local and definition local System.ocg groups C4Group SysGroup; char fn[_MAX_FNAME+1] = { 0 }; if (SysGroup.OpenAsChild(&parent_group, C4CFN_System)) @@ -2797,7 +2797,7 @@ bool C4Game::InitKeyboard() void C4Game::UpdateLanguage() { - // Reload System.c4g string table + // Reload System.ocg string table MainSysLangStringTable.LoadEx(Application.SystemGroup, C4CFN_ScriptStringTbl, Config.General.LanguageEx); } diff --git a/src/c4group/C4Components.h b/src/c4group/C4Components.h index 5af615fcd..7c8cd6391 100644 --- a/src/c4group/C4Components.h +++ b/src/c4group/C4Components.h @@ -27,15 +27,15 @@ #define C4CFN_Engine "Clonk.exe" -#define C4CFN_Material "Material.c4g" -#define C4CFN_Sound "Sound.c4g" -#define C4CFN_Graphics "Graphics.c4g" -#define C4CFN_System "System.c4g" -#define C4CFN_Music "Music.c4g" -#define C4CFN_Extra "Extra.c4g" -#define C4CFN_Languages "Language.c4g" +#define C4CFN_Material "Material.ocg" +#define C4CFN_Sound "Sound.ocg" +#define C4CFN_Graphics "Graphics.ocg" +#define C4CFN_System "System.ocg" +#define C4CFN_Music "Music.ocg" +#define C4CFN_Extra "Extra.ocg" +#define C4CFN_Languages "Language.ocg" -#define C4CFN_ScenarioSections "Sect*.c4g" +#define C4CFN_ScenarioSections "Sect*.ocg" #define C4CFN_Objects "Objects.c4d" @@ -165,7 +165,7 @@ // 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*.c4g|Music.c4g|*.mid|*.wav|Desc*.rtf|Title.bmp|Title.png|*.c4d|Material.c4g|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|*.c4d|Script.c|Script*.c|System.c4g" +#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|*.c4d|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|*.c4d|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_SectionObjects "Strings.txt|Objects.txt" diff --git a/src/c4group/C4Extra.cpp b/src/c4group/C4Extra.cpp index edcf19d9b..285908fe4 100644 --- a/src/c4group/C4Extra.cpp +++ b/src/c4group/C4Extra.cpp @@ -17,7 +17,7 @@ * "Clonk" is a registered trademark of Matthes Bender. * See clonk_trademark_license.txt for full license. */ -// user-customizable multimedia package Extra.c4g +// user-customizable multimedia package Extra.ocg #include #include diff --git a/src/c4group/C4Extra.h b/src/c4group/C4Extra.h index 93454b5a3..f252c8c6d 100644 --- a/src/c4group/C4Extra.h +++ b/src/c4group/C4Extra.h @@ -15,7 +15,7 @@ * "Clonk" is a registered trademark of Matthes Bender. * See clonk_trademark_license.txt for full license. */ -// user-customizable multimedia package Extra.c4g +// user-customizable multimedia package Extra.ocg #ifndef INC_C4Extra #define INC_C4Extra @@ -33,7 +33,7 @@ public: bool Init(); // init extra group, using scneario presets bool InitGroup(); // open extra group - std::vector ExtraGroups; // extra.c4g root folders + std::vector ExtraGroups; // extra.ocg root folders protected: bool LoadDef(C4Group &hGroup, const char *szName); // load preset for definition diff --git a/src/c4group/C4GroupSet.h b/src/c4group/C4GroupSet.h index d3023aff8..96b2f56df 100644 --- a/src/c4group/C4GroupSet.h +++ b/src/c4group/C4GroupSet.h @@ -25,8 +25,8 @@ // group set priorities #define C4GSPrio_Base 0 // lowest priority for global system files #define C4GSPrio_Pack 1 // overloads by object packs -#define C4GSPrio_ExtraRoot 2 // overloads by Extra.c4g root folder -#define C4GSPrio_Extra 3 // overloads by Extra.c4g +#define C4GSPrio_ExtraRoot 2 // overloads by Extra.ocg root folder +#define C4GSPrio_Extra 3 // overloads by Extra.ocg #define C4GSPrio_Definition 4 // overloads by definition file - latter defined definition files have higher priority #define C4GSPrio_Definition2 99 // highest priority a given definition may have #define C4GSPrio_Folder 100 // overloads by local scenario folder - each child folder has higher priority @@ -34,9 +34,9 @@ #define C4GSPrio_Scenario 200 // overloads by scenario: highest priority // group node contents -#define C4GSCnt_Graphics 1 // contains Graphics.c4g +#define C4GSCnt_Graphics 1 // contains Graphics.ocg #define C4GSCnt_Loaders 2 // contains loader files -#define C4GSCnt_Material 4 // contains Material.c4g +#define C4GSCnt_Material 4 // contains Material.ocg #define C4GSCnt_Music 8 // contains music #define C4GSCnt_Definitions 16 // contains definition files #define C4GSCnt_FontDefs 32 // contains font definitions diff --git a/src/c4group/C4Language.cpp b/src/c4group/C4Language.cpp index 3a59a1071..4ca36eaff 100644 --- a/src/c4group/C4Language.cpp +++ b/src/c4group/C4Language.cpp @@ -63,12 +63,12 @@ bool C4Language::Init() // Clear (to allow clean re-init) Clear(); - // Look for available language packs in Language.c4g Opening Language.c4g as a group and + // Look for available language packs in Language.ocg Opening Language.ocg as a group and /*C4Group *pPack; the packs as children is no good - char strPackFilename[_MAX_FNAME + 1]; C4Group simply cannot handle it. So Log("Registering languages..."); we need to open the pack group files if (PackDirectory.Open(C4CFN_Languages)) directly... - while (PackDirectory.FindNextEntry("*.c4g", strPackFilename)) + while (PackDirectory.FindNextEntry("*.ocg", strPackFilename)) { pPack = new C4Group(); if (pPack->OpenAsChild(&PackDirectory, strPackFilename)) @@ -83,8 +83,8 @@ bool C4Language::Init() } }*/ - // Make sure Language.c4g is unpacked (TODO: This won't work properly if Language.c4g is in system data path) - // Assume for now that Language.c4g is either at a writable location or unpacked already. + // Make sure Language.ocg is unpacked (TODO: This won't work properly if Language.ocg is in system data path) + // Assume for now that Language.ocg is either at a writable location or unpacked already. // TODO: Use all Language.c4gs that we find, and merge them. // TODO: Use gettext instead? StdStrBuf langPath; @@ -101,16 +101,16 @@ bool C4Language::Init() } } - // Break if no language.c4g found + // Break if no language.ocg found if(iter != Reloc.end()) { - // Look for available language packs in Language.c4g + // Look for available language packs in Language.ocg C4Group *pPack; char strPackFilename[_MAX_FNAME + 1], strEntry[_MAX_FNAME + 1]; //Log("Registering languages..."); if (PackDirectory.Open(langPath.getData())) { - while (PackDirectory.FindNextEntry("*.c4g", strEntry)) + while (PackDirectory.FindNextEntry("*.ocg", strEntry)) { sprintf(strPackFilename, "%s" DirSep "%s", C4CFN_Languages, strEntry); pPack = new C4Group(); @@ -361,7 +361,7 @@ C4GroupSet C4Language::GetPackGroups(C4Group & hGroup) void C4Language::InitInfos() { C4Group hGroup; - // First, look in System.c4g + // First, look in System.ocg if (Reloc.Open(hGroup, C4CFN_System)) { LoadInfos(hGroup); @@ -370,7 +370,7 @@ void C4Language::InitInfos() // Now look through the registered packs C4Group *pPack; for (int iPack = 0; (pPack = Packs.GetGroup(iPack)); iPack++) - // Does it contain a System.c4g child group? + // Does it contain a System.ocg child group? if (hGroup.OpenAsChild(pPack, C4CFN_System)) { LoadInfos(hGroup); @@ -458,7 +458,7 @@ bool C4Language::LoadLanguage(const char *strLanguages) bool C4Language::InitStringTable(const char *strCode) { C4Group hGroup; - // First, look in System.c4g + // First, look in System.ocg if (Reloc.Open(hGroup, C4CFN_System)) { if (LoadStringTable(hGroup, strCode)) @@ -468,7 +468,7 @@ bool C4Language::InitStringTable(const char *strCode) // Now look through the registered packs C4Group *pPack; for (int iPack = 0; (pPack = Packs.GetGroup(iPack)); iPack++) - // Does it contain a System.c4g child group? + // Does it contain a System.ocg child group? if (hGroup.OpenAsChild(pPack, C4CFN_System)) { if (LoadStringTable(hGroup, strCode)) diff --git a/src/c4group/C4Update.cpp b/src/c4group/C4Update.cpp index 34f632137..0709b5a62 100644 --- a/src/c4group/C4Update.cpp +++ b/src/c4group/C4Update.cpp @@ -376,8 +376,8 @@ bool C4UpdatePackage::Execute(C4Group *pGroup) } else { - // only allow Extra.c4g-Updates - if (!SEqual2(DestPath, "Extra.c4g")) + // only allow Extra.ocg-Updates + if (!SEqual2(DestPath, "Extra.ocg")) return false; } diff --git a/src/c4group/c4group_ng.cpp b/src/c4group/c4group_ng.cpp index 28cdae681..3e7374889 100644 --- a/src/c4group/c4group_ng.cpp +++ b/src/c4group/c4group_ng.cpp @@ -517,7 +517,7 @@ int main(int argc, char *argv[]) printf(" -i Register shell -u Unregister shell\n"); printf(" -x: Execute shell command when done\n"); printf("\n"); - printf("Examples: c4group pack.c4g -x\n"); + printf("Examples: c4group pack.ocg -x\n"); printf(" c4group update.c4u -g ver1.c4f ver2.c4f New_Version\n"); printf(" c4group -i\n"); } diff --git a/src/control/C4GameParameters.cpp b/src/control/C4GameParameters.cpp index 848794fed..31cb73fb8 100644 --- a/src/control/C4GameParameters.cpp +++ b/src/control/C4GameParameters.cpp @@ -232,9 +232,9 @@ bool C4GameResList::Load(const char *szDefinitionFilenames) if (*szSegment) CreateByFile(NRT_Definitions, szSegment); } - // add System.c4g + // add System.ocg CreateByFile(NRT_System, C4CFN_System); - // add all instances of Material.c4g, except those inside the scenario file + // add all instances of Material.ocg, except those inside the scenario file C4Group *pMatParentGrp = NULL; while ((pMatParentGrp = Game.GroupSet.FindGroup(C4GSCnt_Material, pMatParentGrp))) if (pMatParentGrp != &Game.ScenarioFile) @@ -242,7 +242,7 @@ bool C4GameResList::Load(const char *szDefinitionFilenames) StdStrBuf MaterialPath = pMatParentGrp->GetFullName() + DirSep C4CFN_Material; CreateByFile(NRT_Material, (pMatParentGrp->GetFullName() + DirSep C4CFN_Material).getData()); } - // add global Material.c4g + // add global Material.ocg CreateByFile(NRT_Material, C4CFN_Material); // done; success return true; diff --git a/src/control/C4PlayerInfoConflicts.cpp b/src/control/C4PlayerInfoConflicts.cpp index 6b4a4a2a0..f86a3064a 100644 --- a/src/control/C4PlayerInfoConflicts.cpp +++ b/src/control/C4PlayerInfoConflicts.cpp @@ -427,7 +427,7 @@ void C4PlayerInfoListAttributeConflictResolver::Resolve() } -/*C4Group g; g.Open("test.c4g"); +/*C4Group g; g.Open("test.ocg"); C4PlayerInfoList l1, l2, l3; l1.Load(g, "in1.txt"); l2.Load(g, "in2.txt"); diff --git a/src/gui/C4StartupPlrSelDlg.cpp b/src/gui/C4StartupPlrSelDlg.cpp index 9f4400749..837699c84 100644 --- a/src/gui/C4StartupPlrSelDlg.cpp +++ b/src/gui/C4StartupPlrSelDlg.cpp @@ -69,7 +69,7 @@ StdStrBuf DateString(int iTime) // Fixme: This should use the already open group from C4GraphicsResource static bool GetPortrait(char **ppBytes, size_t *ipSize) { - // select random portrait from Graphics.c4g + // select random portrait from Graphics.ocg C4Group GfxGroup; int iCount; StdStrBuf EntryName; diff --git a/src/lib/StdMeshMaterial.cpp b/src/lib/StdMeshMaterial.cpp index 4b07bd265..b0707a2ad 100644 --- a/src/lib/StdMeshMaterial.cpp +++ b/src/lib/StdMeshMaterial.cpp @@ -995,7 +995,7 @@ void StdMeshMatManager::Parse(const char* mat_script, const char* filename, StdM // Note that if there is a parent, then it needs to be loaded // already. This currently makes only sense when its defined above // in the same material script file or in a parent definition. - // We could later support material scripts in the System.c4g. + // We could later support material scripts in the System.ocg. StdCopyStrBuf parent_name; ctx.AdvanceRequired(parent_name, TOKEN_IDTF); ctx.AdvanceRequired(token_name, TOKEN_BRACE_OPEN); diff --git a/src/lib/texture/C4GraphicsResource.cpp b/src/lib/texture/C4GraphicsResource.cpp index 9d20d576c..a2d241f70 100644 --- a/src/lib/texture/C4GraphicsResource.cpp +++ b/src/lib/texture/C4GraphicsResource.cpp @@ -20,7 +20,7 @@ * See clonk_trademark_license.txt for full license. */ -/* Loads all standard graphics from Graphics.c4g */ +/* Loads all standard graphics from Graphics.ocg */ #include #include @@ -137,7 +137,7 @@ void C4GraphicsResource::Clear() // unhook deflist from font FontRegular.SetCustomImages(NULL); - // closing the group set will also close the graphics.c4g + // closing the group set will also close the graphics.ocg // this is just for games that failed to init // normally, this is done after successful init anyway CloseFiles(); @@ -145,7 +145,7 @@ void C4GraphicsResource::Clear() bool C4GraphicsResource::InitFonts() { - // this regards scenario-specific fonts or overloads in Extra.c4g + // this regards scenario-specific fonts or overloads in Extra.ocg const char *szFont; if (*Game.C4S.Head.Font) szFont = Game.C4S.Head.Font; else szFont = Config.General.RXFontName; if (!::FontLoader.InitFont(FontRegular, szFont, C4FontLoader::C4FT_Main, Config.General.RXFontSize, &Files)) return false; diff --git a/src/lib/texture/C4GraphicsResource.h b/src/lib/texture/C4GraphicsResource.h index 3236780dc..29372e965 100644 --- a/src/lib/texture/C4GraphicsResource.h +++ b/src/lib/texture/C4GraphicsResource.h @@ -18,7 +18,7 @@ * See clonk_trademark_license.txt for full license. */ -/* Loads all standard graphics from Graphics.c4g */ +/* Loads all standard graphics from Graphics.ocg */ #ifndef INC_C4GraphicsResource #define INC_C4GraphicsResource @@ -113,7 +113,7 @@ public: bool IsInitialized() { return fInitialized; } // return whether any gfx are loaded (so dlgs can be shown) - bool RegisterGlobalGraphics(); // register global Graphics.c4g into own group set + bool RegisterGlobalGraphics(); // register global Graphics.ocg into own group set bool RegisterMainGroups(); // register new groups of Game.GroupSet into own group set void CloseFiles(); // free group set diff --git a/src/network/C4Network2.cpp b/src/network/C4Network2.cpp index 2b6373c9f..c96a2cacc 100644 --- a/src/network/C4Network2.cpp +++ b/src/network/C4Network2.cpp @@ -537,7 +537,7 @@ bool C4Network2::RetrieveScenario(char *szScenario) !C4Group_UnpackDirectory(szTempDynamic)) return false; - // unpack Material.c4g if materials need to be merged + // unpack Material.ocg if materials need to be merged StdStrBuf MaterialScenario, MaterialDynamic; MaterialScenario.Format("%s" DirSep C4CFN_Material, szScenario); MaterialDynamic.Format("%s" DirSep C4CFN_Material, szTempDynamic); diff --git a/src/platform/C4FileClasses.cpp b/src/platform/C4FileClasses.cpp index 0f5276cc1..da6f04868 100644 --- a/src/platform/C4FileClasses.cpp +++ b/src/platform/C4FileClasses.cpp @@ -49,7 +49,7 @@ bool SetC4FileClasses(const char *szEnginePath) { if (!SetRegFileClass("OpenClonk.Scenario", ,"ocs", "OpenClonk Scenario", szEnginePath, 1, C4FileClassContentType)) return false; - if (!SetRegFileClass("Clonk4.Group", "c4g", "Clonk 4 Group", szEnginePath, 2, C4FileClassContentType)) return false; + if (!SetRegFileClass("OpenClonk.Group", ,"ocg", "OpenClonk Group", szEnginePath, 2, C4FileClassContentType)) return false; if (!SetRegFileClass("Clonk4.Folder", "c4f", "Clonk 4 Folder", szEnginePath, 3, C4FileClassContentType)) return false; if (!SetRegFileClass("Clonk4.Player", "c4p", "Clonk 4 Player", szEnginePath, 4, C4FileClassContentType)) return false; if (!SetRegFileClass("Clonk4.Definition", "c4d", "Clonk 4 Object Definition", szEnginePath, 5, C4FileClassContentType)) return false; diff --git a/src/platform/C4MusicSystem.cpp b/src/platform/C4MusicSystem.cpp index 57852ec0c..3a9e323b7 100644 --- a/src/platform/C4MusicSystem.cpp +++ b/src/platform/C4MusicSystem.cpp @@ -23,7 +23,7 @@ * See clonk_trademark_license.txt for full license. */ -/* Handles Music.c4g and randomly plays songs */ +/* Handles Music.ocg and randomly plays songs */ #include #include diff --git a/src/platform/C4MusicSystem.h b/src/platform/C4MusicSystem.h index 035cc8bcf..603e7b1df 100644 --- a/src/platform/C4MusicSystem.h +++ b/src/platform/C4MusicSystem.h @@ -21,7 +21,7 @@ * See clonk_trademark_license.txt for full license. */ -/* Handles Music.c4g and randomly plays songs */ +/* Handles Music.ocg and randomly plays songs */ #ifndef INC_C4MusicSystem #define INC_C4MusicSystem diff --git a/src/res/c4g.ico b/src/res/c4g.ico deleted file mode 100644 index 7438ea79ccbf15b2169dcd76d1ad2cf7e837f7af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26582 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 diff --git a/src/res/engine.rc b/src/res/engine.rc index 26aa757db..5ad193334 100644 --- a/src/res/engine.rc +++ b/src/res/engine.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // remains consistent on all systems. IDI_00_C4X ICON DISCARDABLE "oc.ico" IDI_01_OCS ICON DISCARDABLE "ocs.ico" -IDI_02_C4G ICON DISCARDABLE "c4g.ico" +IDI_02_OCG ICON DISCARDABLE "ocg.ico" IDI_03_C4F ICON DISCARDABLE "c4f.ico" IDI_04_C4P ICON DISCARDABLE "c4p.ico" IDI_06_C4D ICON DISCARDABLE "c4d.ico" diff --git a/src/res/ocg.ico b/src/res/ocg.ico new file mode 100644 index 0000000000000000000000000000000000000000..c5a0e7b8c0148d1db2a84baf07df32d3849eb622 GIT binary patch literal 22486 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

kv{&oBxQGU;kzj6P60l9CQ AegFUf literal 0 HcmV?d00001 diff --git a/src/res/resource.h b/src/res/resource.h index fe857cb85..2f982e519 100644 --- a/src/res/resource.h +++ b/src/res/resource.h @@ -60,7 +60,7 @@ #define IDD_TOOLS 3003 #define IDI_00_C4X 4000 #define IDI_01_OCS 4001 -#define IDI_02_C4G 4002 +#define IDI_02_OCG 4002 #define IDI_03_C4F 4003 #define IDI_04_C4P 4004 #define IDI_06_C4D 4006 diff --git a/src/script/C4AulParse.cpp b/src/script/C4AulParse.cpp index 871426721..cd98f0d39 100644 --- a/src/script/C4AulParse.cpp +++ b/src/script/C4AulParse.cpp @@ -230,7 +230,7 @@ void C4AulScript::Warn(const char *pMsg, const char *pIdtf) void C4AulParseState::Warn(const char *pMsg, const char *pIdtf) { - // do not show errors for System.c4g scripts that appear to be pure #appendto scripts + // do not show errors for System.ocg scripts that appear to be pure #appendto scripts if (Fn && !Fn->Owner->Def && !Fn->Owner->Appends.empty()) return; // script doesn't own function -> skip // (exception: global functions) @@ -3055,7 +3055,7 @@ bool C4AulScript::Parse() } catch (C4AulError *err) { - // do not show errors for System.c4g scripts that appear to be pure #appendto scripts + // do not show errors for System.ocg scripts that appear to be pure #appendto scripts if (Fn->Owner->Def || Fn->Owner->Appends.empty()) { // show diff --git a/tools/install/oc.nsi b/tools/install/oc.nsi index 4686570bf..c6befd8d3 100644 --- a/tools/install/oc.nsi +++ b/tools/install/oc.nsi @@ -105,8 +105,8 @@ Section -Post ; Register file types WriteRegStr HKCR ".ocs" "" "OpenClonk.Scenario" WriteRegStr HKCR ".ocs\Content Type" "" "vnd.clonk.c4group" - WriteRegStr HKCR ".c4g" "" "Clonk4.Group" - WriteRegStr HKCR ".c4g\Content Type" "" "vnd.clonk.c4group" + WriteRegStr HKCR ".ocg" "" "OpenClonk.Group" + WriteRegStr HKCR ".ocg\Content Type" "" "vnd.clonk.c4group" WriteRegStr HKCR ".c4f" "" "Clonk4.Folder" WriteRegStr HKCR ".c4f\Content Type" "" "vnd.clonk.c4group" WriteRegStr HKCR ".c4p" "" "Clonk4.Player" @@ -128,8 +128,8 @@ Section -Post ; Register file classes WriteRegStr HKCR "OpenClonk.Scenario" "" "OpenClonk Scenario" WriteRegStr HKCR "OpenClonk.Scenario\DefaultIcon" "" "$INSTDIR\Clonk.exe,1" - WriteRegStr HKCR "Clonk4.Group" "" "Clonk 4 Group" - WriteRegStr HKCR "Clonk4.Group\DefaultIcon" "" "$INSTDIR\Clonk.exe,2" + WriteRegStr HKCR "OpenClonk.Group" "" "OpenClonk Group" + WriteRegStr HKCR "OpenClonk.Group\DefaultIcon" "" "$INSTDIR\Clonk.exe,2" WriteRegStr HKCR "Clonk4.Folder" "" "Clonk 4 Folder" WriteRegStr HKCR "Clonk4.Folder\DefaultIcon" "" "$INSTDIR\Clonk.exe,3" WriteRegStr HKCR "Clonk4.Player" "" "Clonk 4 Player" @@ -197,8 +197,8 @@ Section Uninstall ; Registry: classes DeleteRegKey HKCR ".ocs" DeleteRegKey HKCR "OpenClonk.Scenario" - DeleteRegKey HKCR ".c4g" - DeleteRegKey HKCR "Clonk4.Group" + DeleteRegKey HKCR ".ocg" + DeleteRegKey HKCR "OpenClonk.Group" DeleteRegKey HKCR ".c4f" DeleteRegKey HKCR "Clonk4.Folder" DeleteRegKey HKCR ".c4p"