Commit Graph

64 Commits (358dcb434a85083e415457d7f07afe95f47f0aa8)

Author SHA1 Message Date
dak180 6c8e465bc5 Move the map tools builds out of the main xcode project. 2011-12-16 15:35:02 -05:00
Per Inge Mathisen 8034045046 Compile fix 2011-11-19 23:54:13 +01:00
Per Inge Mathisen 74d92a17e4 Make source compatible with physfs 1 again. 2011-11-06 23:23:42 +01:00
Per Inge Mathisen 3e53f79675 mapconv: Add command line option -cam to generate map data appropriate for campaign. 2011-10-29 16:47:31 -04:00
Per Inge Mathisen 554bf6b380 Fix build warnings 2011-09-25 23:55:24 -04:00
Cyp f282cc289c Fix some warn-unused-result warnings.
Wasn't compiling with -Werror.
2011-09-02 12:07:18 +02:00
Per Inge Mathisen ca8595f25a Make sure that structure IDs are never zero for converted maps. Fixes ticket:2833 2011-07-31 22:49:55 +02:00
safety0ff bc26936424 Further improve documentation of map/pngsave.h. 2011-07-30 17:29:31 +00:00
safety0ff 6bf33d2000 Fix autotools compilation of map2preview (reverts some parts of 65e00db411). 2011-07-30 17:29:31 +00:00
dak180 a899f46775 Add the map tools to the xcode project. 2011-07-30 00:39:56 -04:00
safety0ff 65e00db411 Remove Qt dependency from map tools.
Place origin at the top of the preview image.
Fix bug for ARGB32 method for map tool png saving rootines and add RGB888 method.
No longer stretch the preview image.
2011-07-29 22:16:59 +00:00
safety0ff e1f78ed5fb Fix comments and documentation of variables whose meaning and name were modified.
Also remove use of inexistant variable.
2011-07-27 23:25:02 +00:00
Rene Jochum dd96412f66 The CMakeLists.txt for 7b20e5c8bf. 2011-07-28 05:11:04 +02:00
Rene Jochum 7b20e5c8bf Improve cmake in tools/map by Safety0ff,
remove some unused includes from vector.h.
2011-07-28 05:03:42 +02:00
Rene Jochum 1c15b75073 Remove the converting requirement in tools/map/map2preview. 2011-07-28 03:30:27 +02:00
Rene Jochum cbe8c925b6 Add support for plain dir maps in tools/map. 2011-07-28 02:43:41 +02:00
Per Inge Mathisen 23b4d3e8a1 Add map/tools to ordinary build system. 2011-07-28 01:32:09 +02:00
Rene Jochum b50744261c Fix intention in map/tools. 2011-07-28 01:36:08 +02:00
Rene Jochum 064c7fcd85 Add some more improvements to the map tool. 2011-07-27 06:28:31 +02:00
Rene Jochum 4a227a1b5b Add a map preview tool, fix various things in tools/map. 2011-07-27 02:39:50 +02:00
Per Inge Mathisen b04a07cbf7 Ignore height value set in ini savegames for features, recalculate it on load every time instead. 2011-07-16 20:32:24 +02:00
Per Inge Mathisen e94d8b5743 Initial mapconv changes for .gam to .ini support. 2011-07-11 20:39:21 +02:00
Per Inge Mathisen 29dd80d936 Split references to player index and player start position on map in savegames. This has already
been done in the codebase earlier. This cleans up any remaining confusion and hacks related to
how players are indexed, and closes ticket:2806
2011-07-03 13:15:31 +02:00
Per Inge Mathisen 09eb6e79f3 Convert structures in savegames to ini file format. 2011-07-02 14:30:51 +02:00
Per Inge Mathisen f73a699bf2 Update map conversion utility for structures. 2011-07-02 14:30:51 +02:00
Per Inge Mathisen cc0e183b96 Fix unit tests 2011-06-12 12:04:27 +02:00
Per Inge Mathisen b70dfe8885 Convert features to ini format. Fix IDs of droids in existing maps. 2011-06-11 21:57:49 +02:00
Per Inge Mathisen ff31f8d395 Change unit.ini -> droid.ini, since "unit" is an unused concept in Warzone. 2011-06-11 19:19:43 +02:00
buginator c560f8a3e9 Fix typo 2010-12-06 21:14:00 -05:00
Safety0ff 72464dfe24 mapconv: Fix an small error in an error output.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11714 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-20 18:34:42 +02:00
Buginator edb644a03b Fix (and add missing) headers to files.
2009  Warzone Resurrection Project -> 2010  Warzone 2100 Project

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:33 +02:00
Per Inge Mathisen 3b425a0653 map2png: Fix conversion bug
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8656 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Per Inge Mathisen c6e328bbd3 Add debug message when map loading fails in map tools.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8655 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Per Inge Mathisen b531c153f7 mapconv: Also convert gameType and gameTime from missions to new format.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8018 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:07:10 +02:00
Per Inge Mathisen 7866c35fcb mapload: Do not error out when encountering maps without map or terrain info. Deal with it.
mapconv: Handle maps without map and terrain info (such as map expand missions).


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8017 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:07:10 +02:00
Per Inge Mathisen 650be0e27e mapconv: Now saves in same directory as read from, puts map files in correct directory, and generates a useful game.ini file
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7976 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:07:05 +02:00
Per Inge Mathisen 4ff191aeea Fix compilation of map tools. Add support for version 10 game files with power information.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7905 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:06:53 +02:00
Per Inge Mathisen fe7b8fc515 mapconv: Fix key typos. Implement scroll limits and level name.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7693 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
Per Inge Mathisen ec95a12e54 Implement entire Deliverance format in new PNG/INI format. That is, the binary map format
delivered by editworld and used for skirmish and campaign maps.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7692 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
Per Inge Mathisen 5a5a637ecd Clean up map tools a bit. Add new tool mapconvert that converts existing maps to proposed new map format
based on INI and PNG files.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7691 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:25 +02:00
Giel van Schijndel 1f89497235 Prevent leaking memory in mapFree by deallocating all memory we allocated
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6910 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-30 16:10:58 +02:00
Per Inge Mathisen da04dd5173 map2lnd: Use the right edge brush set for each tileset.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6837 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-11 21:30:36 +00:00
Per Inge Mathisen 811bb12786 map2png: Little utility to create PNG previews from map files. Very basic at the moment.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6830 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-09 23:05:54 +00:00
Per Inge Mathisen 7a9da735e2 map2lnd: Fix bug in setting the number of objects in the exported map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6818 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 17:15:14 +00:00
Per Inge Mathisen b8268b2370 mapinfo: Correct for structure padding. Now we can parse savegame structures, too.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6817 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 17:06:11 +00:00
Per Inge Mathisen 48ff63c9d1 map2lnd: Export structures as well.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6816 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 16:52:17 +00:00
Per Inge Mathisen eb14b8753d map2lnd: Support exporting droids.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6815 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 15:11:54 +00:00
Per Inge Mathisen eb8329e481 mapinfo: Read droid data for editworld maps (not savegames).
mapinfo: Calculate number of players by checking construction droids.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6814 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 14:19:28 +00:00
Per Inge Mathisen 3fd2879d6a mapinfo: Fix crash on some failures upon trying to close already closed file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6803 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 21:52:34 +00:00
Per Inge Mathisen c8dcde2182 map2lnd: Fix bug in positioning of features. Thanks again to Mysteryem for debugging help.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6797 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:57:41 +00:00