Replace objective pickup graphics (#173)

Fix non-resizable editor window
Adjust objective rendering in editor UI
Add missing license for mine_pickup.png
This commit is contained in:
Cong
2015-01-07 00:27:32 +11:00
parent cfd019c824
commit ff60a9a3bd
26 changed files with 51 additions and 2 deletions

BIN
graphics/bag.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 B

5
graphics/bag.txt Normal file
View File

@@ -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/

BIN
graphics/blueprint.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 308 B

4
graphics/blueprint.txt Normal file
View File

@@ -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/

BIN
graphics/bottle.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 B

4
graphics/bottle.txt Normal file
View File

@@ -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/

BIN
graphics/cd.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 386 B

4
graphics/cd.txt Normal file
View File

@@ -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/

BIN
graphics/circuit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

4
graphics/circuit.txt Normal file
View File

@@ -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/

BIN
graphics/disk1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 B

4
graphics/disk1.txt Normal file
View File

@@ -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/

BIN
graphics/disk2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 B

4
graphics/disk2.txt Normal file
View File

@@ -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/

BIN
graphics/disk3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 B

4
graphics/disk3.txt Normal file
View File

@@ -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/

BIN
graphics/folder.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 292 B

4
graphics/folder.txt Normal file
View File

@@ -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/

BIN
graphics/holo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

4
graphics/holo.txt Normal file
View File

@@ -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/

4
graphics/mine_pickup.txt Normal file
View File

@@ -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/

BIN
graphics/paper.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

BIN
graphics/radio.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 B

4
graphics/radio.txt Normal file
View File

@@ -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/

View File

@@ -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)
{

View File

@@ -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)