Replace objective pickup graphics (#173)

Fix non-resizable editor window Adjust objective rendering in editor UI Add missing license for mine_pickup.png
cxong · Jan 6, 2015 · ff60a9a · ff60a9a
1 parent cfd019c
commit ff60a9a
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 2 deletions.
diff --git a/graphics/bag.png b/graphics/bag.png
diff --git a/graphics/bag.txt b/graphics/bag.txt
@@ -0,0 +1,5 @@
+Derived from Various inventory 24 pixel icon set
+by OceansDream (http://oceansdream.deviantart.com/art/Pixel-Icons-available-for-use-121152370)
+http://opengameart.org/content/various-inventory-24-pixel-icon-set
+http://creativecommons.org/licenses/by/3.0/
+http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/graphics/blueprint.png b/graphics/blueprint.png
diff --git a/graphics/blueprint.txt b/graphics/blueprint.txt
@@ -0,0 +1,4 @@
+Derived from 141 Military Icons Set
+by AngryMeteor.com
+http://opengameart.org/content/141-military-icons-set
+http://creativecommons.org/licenses/by/3.0/
diff --git a/graphics/bottle.png b/graphics/bottle.png
diff --git a/graphics/bottle.txt b/graphics/bottle.txt
@@ -0,0 +1,4 @@
+Derived from RPG item set
+by Jetrel
+http://opengameart.org/content/rpg-item-set
+http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/graphics/cd.png b/graphics/cd.png
diff --git a/graphics/cd.txt b/graphics/cd.txt
@@ -0,0 +1,4 @@
+Derived from Tango Desktop Icons
+by Tango Desktop Project (http://tango.freedesktop.org/)
+http://opengameart.org/content/tango-desktop-icons
+http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/graphics/circuit.png b/graphics/circuit.png
diff --git a/graphics/circuit.txt b/graphics/circuit.txt
@@ -0,0 +1,4 @@
+Adapted from 141 Military Icons Set by AngryMeteor.com
+http://opengameart.org/content/141-military-icons-set
+
+http://creativecommons.org/licenses/by/3.0/
diff --git a/graphics/disk1.png b/graphics/disk1.png
diff --git a/graphics/disk1.txt b/graphics/disk1.txt
@@ -0,0 +1,4 @@
+Derived from Tango Desktop Icons
+by Tango Desktop Project (http://tango.freedesktop.org/)
+http://opengameart.org/content/tango-desktop-icons
+http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/graphics/disk2.png b/graphics/disk2.png
diff --git a/graphics/disk2.txt b/graphics/disk2.txt
@@ -0,0 +1,4 @@
+Derived from Tango Desktop Icons
+by Tango Desktop Project (http://tango.freedesktop.org/)
+http://opengameart.org/content/tango-desktop-icons
+http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/graphics/disk3.png b/graphics/disk3.png
diff --git a/graphics/disk3.txt b/graphics/disk3.txt
@@ -0,0 +1,4 @@
+Derived from Tango Desktop Icons
+by Tango Desktop Project (http://tango.freedesktop.org/)
+http://opengameart.org/content/tango-desktop-icons
+http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/graphics/folder.png b/graphics/folder.png
diff --git a/graphics/folder.txt b/graphics/folder.txt
@@ -0,0 +1,4 @@
+Derived from Tango Desktop Icons
+by Tango Desktop Project (http://tango.freedesktop.org/)
+http://opengameart.org/content/tango-desktop-icons
+http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/graphics/holo.png b/graphics/holo.png
diff --git a/graphics/holo.txt b/graphics/holo.txt
@@ -0,0 +1,4 @@
+Derived from Tango Desktop Icons
+by Tango Desktop Project (http://tango.freedesktop.org/)
+http://opengameart.org/content/tango-desktop-icons
+http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/graphics/mine_pickup.txt b/graphics/mine_pickup.txt
@@ -0,0 +1,4 @@
+Adapted from 141 Military Icons Set by AngryMeteor.com
+http://opengameart.org/content/141-military-icons-set
+
+http://creativecommons.org/licenses/by/3.0/
diff --git a/graphics/paper.png b/graphics/paper.png
diff --git a/graphics/radio.png b/graphics/radio.png
diff --git a/graphics/radio.txt b/graphics/radio.txt
@@ -0,0 +1,4 @@
+Adapted from 141 Military Icons Set by AngryMeteor.com
+http://opengameart.org/content/141-military-icons-set
+
+http://creativecommons.org/licenses/by/3.0/
diff --git a/src/cdogsed.c b/src/cdogsed.c
@@ -1217,7 +1217,6 @@ int main(int argc, char *argv[])
 	EditorBrushInit(&brush);
 
 	gConfig = ConfigLoad(GetConfigFilePath(CONFIG_FILE));
-	gGraphicsDevice.cachedConfig.IsEditor = true;
 	if (!PicManagerTryInit(
 		&gPicManager, "graphics/cdogs.px", "graphics/cdogs2.px"))
 	{
@@ -1231,6 +1230,7 @@ int main(int argc, char *argv[])
 	ConfigGet(&gConfig, "Graphics.ScaleFactor")->u.Int.Value = 2;
 	ConfigGet(&gConfig, "Graphics.ResolutionWidth")->u.Int.Value = 400;
 	ConfigGet(&gConfig, "Graphics.ResolutionHeight")->u.Int.Value = 300;
+	gGraphicsDevice.cachedConfig.IsEditor = true;
 	GraphicsInitialize(&gGraphicsDevice, gPicManager.palette, 0);
 	if (!gGraphicsDevice.IsInitialized)
 	{

diff --git a/src/cdogsed/editor_ui.c b/src/cdogsed/editor_ui.c
@@ -800,7 +800,7 @@ static void MissionDrawObjective(
 	}
 	else if (newPic != NULL)
 	{
-		Blit(g, newPic, Vec2iAdd(drawPos, newPic->offset));
+		Blit(g, newPic, Vec2iMinus(drawPos, Vec2iScaleDiv(newPic->size, 2)));
 	}
 }
 static MissionObjective *GetMissionObjective(const Mission *m, const int idx)