Commit Graph

517 Commits (e5edaeabfd8b7fcc1d261a0767cdbb50bfaa7c5e)

Author SHA1 Message Date
Giel van Schijndel 3fb2610c6c Convert OpenDocument documents shortcuts.odt and todo.odt to reStructuredText (easier to edit and view)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6545 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-11 20:49:43 +00:00
Per Inge Mathisen 2528179e0b pie2wzm: Support new WZM connector spec.
qwzm: Fix tessellation bug in PIE conversion code. Fix crash.
wzm base: Detect more errors, print nicer WZM output.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6508 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-26 19:28:22 +00:00
Per Inge Mathisen 739fbcce41 qwzm: Add beginnings of connector support.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6496 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-26 00:37:11 +00:00
Per Inge Mathisen 7314ba1b29 qwzm: Add short-cut keys and some GUI prettifying.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6459 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-12 18:29:33 +00:00
Per Inge Mathisen b63790aaba qwzm: Forgot to commit one file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6458 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-12 17:55:19 +00:00
Per Inge Mathisen 0d243ce82d qwzm: Show animation frames as they are animated. Allow user to manually step through frames.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6452 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-10 21:27:42 +00:00
Per Inge Mathisen 001c5f2326 qwzm: You can now add and remove animation frames to models.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6451 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-10 20:34:08 +00:00
Per Inge Mathisen 7c477d668d qwzm: Allow basic editing of animation frames. You can change timing, translation and rotation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6447 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-09 21:27:19 +00:00
Per Inge Mathisen 5a98e7c029 qwzm: Add dialog to display the animation frames for each model mesh.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6446 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-09 20:59:57 +00:00
Per Inge Mathisen 541335f18e I forgot one file...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6244 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-04 22:07:24 +00:00
Per Inge Mathisen f714179393 qwzm: Refactor model loading functions to save code lines and remove duplicate code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6242 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:31:51 +00:00
Per Inge Mathisen 3d34a03813 qwzm: Move conversion functions into their own file. Add TODO messages to stdout for stuff that doesn't work.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6241 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:07:17 +00:00
Per Inge Mathisen 753bc5ac03 qwzm: Add import from PIE feature.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6240 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 20:52:00 +00:00
Per Inge Mathisen 28d9734e8f pie2wzm: Remove two bad TODO items
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6239 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 20:49:26 +00:00
Per Inge Mathisen 07c1245e01 qwzm: Add 3DS import feature.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6238 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 19:50:54 +00:00
Per Inge Mathisen 632b539aea wzmutils: Add WZM save model function.
qwzm: Add more dummy GUI stubs. Implement save and save as.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 17:47:10 +00:00
Per Inge Mathisen 615520bc59 wzmviewer/qwzm: Unify animation code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6236 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 15:16:03 +00:00
Per Inge Mathisen ecb8208534 qwzm: Brute force fix for infinitely extrapolating interpolation in no animation case.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6235 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:47:35 +00:00
Per Inge Mathisen d7c9a522c9 qwzm: Fix animation bug due to using different timers for drawing and animating.
However, introduces new bug, when animation is not on, interpolation function will 
extrapolate into infinity, creating really funny non-animation animation.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:10:10 +00:00
Per Inge Mathisen a2031b9fd3 wzmviewer: Refactor more code for sharing with qwzm
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6233 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 22:24:09 +00:00
Per Inge Mathisen 232629a685 qwzm: Add more error reporting
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6232 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 20:57:43 +00:00
Per Inge Mathisen b32d3eaa76 Fix valgrind warning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6231 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 20:35:55 +00:00
Per Inge Mathisen 797701f42b Add WZM editor written in Qt. Be warned that it is still buggy and incomplete.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6228 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 17:56:58 +00:00
Per Inge Mathisen bc4a850c94 wzmviewer: More refactoring to ease code sharing between programs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6226 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 16:33:37 +00:00
Per Inge Mathisen 3345cb2180 Refactor wzmviewer for easier code sharing with other programs.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6225 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 13:22:51 +00:00
Giel van Schijndel 5f5489b650 * Stuff SESSIONDESC.dwUser[1-4] in an array: SESSIONDESC.dwUserFlags\[4]
* Rewrite NETgetGameFlagsUnjoined such that it's not hardcoded for its `flag` parameter anymore

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6150 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-14 12:58:59 +00:00
Giel van Schijndel c5c4025eb1 Fix a syntax error in the part of html2trac that deals with <u> tags
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5969 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 08:43:37 +00:00
Per Inge Mathisen 1cbb4857b7 wzmviewer: Fix animation support. Add oil derrick sample WZM file for testing. Notice that I have
inverted the rotation numbers, and done away with the multiplied by 1000 from the ANI file format.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5815 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 21:23:08 +00:00
Per Inge Mathisen 419e25b44f pie2wzm: Fix wrong guesswork on import of team colours.
wzmviewer: Clean up team colour and animation confusion. Update to latest WZM spec.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5811 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 20:03:35 +00:00
Per Inge Mathisen fee5ee63c8 Add obj2pie converter by elio. Fixed some compiler warnings and style issues.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5774 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 17:55:57 +00:00
Dennis Schridde 571f019dbf Fix definitions: "Note that you need a space in front of the defined term."
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5756 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 21:59:19 +00:00
Dennis Schridde 9b07458f0d XHTML 1.1 to Trac Wiki converter
Usage: ./html2trac.rb < input.xhtml > output.trac
Note that this is currently customised for the scripting manual and quite possible that you have to extend/adjust it before it works for any other file.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5755 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 21:53:18 +00:00
Buginator 2df15ab5c6 Fixes endian issue with master server code.
We always want the structure packed to be 'network byte order' (big-endian).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5728 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 18:11:00 +00:00
Giel van Schijndel 7125ab811c Access OpenGL headers on Mac OSX through OpenGL/<header> instead of opengl/<header> (lower case)
This fixes a compile error reported by <ruud> on IRC

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5641 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-22 20:23:24 +00:00
Giel van Schijndel fbeca90347 Modify the 'forward declaration name' of COMPONENT_TYPE for EditWorld to still match that of Warzone itself, which got changed in r5485
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5492 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-11 11:48:18 +00:00
Dennis Schridde 022315eef0 Hardcode top_srcdir to make building from non-topdir possible, dont depend on the touch command, fix LDFLAGS to not depend on the removed TARGET variable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 20:10:16 +00:00
Dennis Schridde 302a557478 Rename "raw" Makefiles to "win32" Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:29:04 +00:00
Dennis Schridde 45f23a4926 Merge commit 'HEAD@{3}'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:44 +00:00
Dennis Schridde 050ec39c11 Use the (also new in this commit) relative variants of the directories almost everywhere.
Exception is when generating the .wz files, where we need the path to the build directory and building a reverse relative path to $(srcdir) will be messy.
Also silence submake.mk a great deal.
Bug #11883 should be fixed now for the most part.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5325 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 23:41:52 +00:00
Dennis Schridde fd2bfb0e0f Prepare for another fix for parts of bug #11883: Issues with the improved raw Makefiles
- Rename Makefile.raw to lowercase


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5321 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:48:45 +00:00
Dennis Schridde 73b35ab8d6 Rename top_srcdir/top_builddir to abs_top_srcdir/abs_top_builddir, to make this more obvious.
Their use is currently flawed, since it will not work in directories with spaces in them... (


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5319 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 20:19:54 +00:00
Dennis Schridde 9bd8b24921 Boost raw Makefiles
- Use PACKAGE, PACKAGE_VERSION, remove VERSION
- Allow out-of-source-dir builds (mkdir build && cd build && make -f ../Makefile.raw)
- Move config.mk from $(top_srcdir)/makerules/config.mk to $(top_builddir)/config.mk
   When keeping current behaviour (srcdir=builddir), this means: Move it from makerules into the main directory


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5308 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 13:54:47 +00:00
Giel van Schijndel c8d9336618 Update the Pygments WRF lexer for the changes done to the WRF file format in r5188:5189
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5190 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 20:03:37 +00:00
Giel van Schijndel d16f801020 Add the new LeveLexer from r4833 to the Python Egg as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4834 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 00:45:15 +00:00
Giel van Schijndel d83e9ff749 * Add yet another Pygments lexer: LevelLexer which lexes .lev files
* Mark the .lev files as text/x-wzlev


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4833 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 00:41:59 +00:00
Giel van Schijndel cbda32117e Add a STRRES lexer as well for Pygments
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4814 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 01:46:59 +00:00
Giel van Schijndel 7688f97ed3 * Add support for single line comments to the WRFLexer
* Perform non-greedy matching to match string literals (the data type in WRF files)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4813 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 01:46:55 +00:00
Giel van Schijndel c6fb031d82 Don't use a 'Whitespace' token, use 'Text' instead
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4811 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 00:50:54 +00:00
Giel van Schijndel 58bf1f3481 Make the WRFLexer parse text/x-wrf files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4810 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 00:47:56 +00:00
Giel van Schijndel 56e269d2c1 Add a lexer for Pygments (a generic syntax highlighter in Python)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4807 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 23:38:28 +00:00
Giel van Schijndel 72240c1958 Recreate the EditWorld project and workspace
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-07 14:33:53 +00:00
Giel van Schijndel cc0639a9a6 * Remove some unused variables
* Fix a few syntax errors
 * Comment out (#if 0) a template function which MSVC doesn't seem to appreciate
 * Rename some variables


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4538 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-07 14:27:05 +00:00
Per Inge Mathisen cf48229cc3 Update the usage help for 3DS conversion tools.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4500 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 19:54:12 +00:00
Dennis Schridde 387fbd52d3 Typo in masterserver
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4437 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 17:30:19 +00:00
Dennis Schridde 7a688bdf45 Better debug output
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4386 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 12:08:13 +00:00
Dennis Schridde 40a2257a31 Fix NameError, Remove code duplication by using private method, Move private methods to top
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4385 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 12:02:37 +00:00
Dennis Schridde 9acf48f307 Check games every 100 requests
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4375 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 16:47:06 +00:00
Giel van Schijndel bb4c6e56c2 * Mark some variables as volatile (they're shared across threads)
* Assert proper usage of ReadWriteMutex


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4374 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 16:30:41 +00:00
Dennis Schridde 8370aa874c Use globals
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4372 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 15:49:26 +00:00
Dennis Schridde 132c61b913 test->check + cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4371 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 15:45:59 +00:00
Dennis Schridde 88cf9281ed Move vitality test into game class
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4370 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:23:46 +00:00
Dennis Schridde 227976de92 Move debug message (gamedb has its own header, no need to repeat it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4369 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:22:32 +00:00
Dennis Schridde c7824914e0 Mention client IP in debug messages
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4368 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:17:33 +00:00
Dennis Schridde d85628ef27 gdb->gamedb and dont let struct.error raise over handle()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4367 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:09:44 +00:00
Dennis Schridde 4108ad54fc Fix "AttributeError: Game instance has no attribute 'requestHandler'"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4366 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:03:42 +00:00
Dennis Schridde 7a08a17a6b Indention Bug (tm)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4365 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 13:09:14 +00:00
Dennis Schridde 39a4686df7 Mistake in last commit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4364 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 12:48:08 +00:00
Dennis Schridde 6ab996879b Cleanup indention
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4363 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 12:45:12 +00:00
Dennis Schridde 39f34056a9 Import from __future__ has to be first in file. Additionaly let the lobby tester connect to lobby.wz2100.net
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 00:33:16 +00:00
Per Inge Mathisen f80e30643b pie2wzm: Handle the no-cull PIE flag by adding an extra polygon that faces
the opposite way. This way we can enable backface culling all the time.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4026 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 21:26:43 +00:00
Per Inge Mathisen a433f0c362 Add new tool: 3ds2wzm to convert from 3DS MAX to WZM format.
3ds2pie: Fix calculation of number of levels to import.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3929 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 21:23:23 +00:00
Per Inge Mathisen db3d0fc7f0 wzmviewer: Interpolate positions between frames for bone heap animation to
make animation smooth.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3928 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 20:36:43 +00:00
Per Inge Mathisen f45da9872b Fix memory leak in WZM code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3927 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 20:00:36 +00:00
Per Inge Mathisen d632cadb8a Add WZM -> 3DS converter.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3925 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 19:27:47 +00:00
Per Inge Mathisen 6bec88ac91 wzmviewer: Reorganize source code for easier maintenance and reuse.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3920 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 18:29:33 +00:00
Per Inge Mathisen e042cf4ebf wzmviewer: Bone heap animation support. Add some safety checks.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3895 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 22:20:16 +00:00
Per Inge Mathisen ad5851f3bf wzmviewer: Add support for displaying texture animations.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3891 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 16:39:23 +00:00
Dennis Schridde 9fec1a998e Use QLayout instead of fixed size.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3859 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-23 12:25:37 +00:00
Dennis Schridde 2c10e37c49 Add Slider/SpinBox combination to set model scale. Closes patch #986 (but differs from it).
Also fix minimum/maximum sizes to prevent resizing of the window.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3858 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-23 11:44:36 +00:00
Per Inge Mathisen 69e71c5778 3ds2pie: Add option to scale imported model by a given factor to correct errors
seen in Blender 3DS export.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3853 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-22 18:47:21 +00:00
Per Inge Mathisen 37a96b2041 pie2wzm: Add option to reverse winding of polygons.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3800 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 16:32:13 +00:00
Per Inge Mathisen 52a2f9a041 wzmviewer: Fix dimension calculation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3741 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 17:38:28 +00:00
Per Inge Mathisen 749ad7ded1 pie2wzm: Add newlines.
wzmviewer: Hack perspective depending on model size.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3740 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 17:24:11 +00:00
Per Inge Mathisen 84c61fed77 Fix crash in wzmviewer due to a not properly initialized frame variable.
Thanks to Buginator for reporting the problem.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3731 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 19:45:49 +00:00
Per Inge Mathisen b174ddd773 Make PIE/WZM tools more easily compile on Windows.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3730 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 18:56:31 +00:00
Per Inge Mathisen 6c179bb935 pie2wzm: Fix division by zero error introduced in the previous commit to it when
a mesh has no animation.
wzmviewer: Press '+' to cycle through animations or team colours. F1/F2 to 
enable/disable polygon culling. F3/F4 to enable/disable wireframe mode.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3720 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 18:43:21 +00:00
Per Inge Mathisen 05a6223814 pie2wzm: Remove output parameter - generate output filename automatically.
Add cmdline option to not guess team colour and force animation instead.
Add support for texture animation that wraps around the edge of the texture.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3718 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 17:55:15 +00:00
Per Inge Mathisen baed19b3b0 wzmviewer: Fix bug when reading in multi-mesh files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3716 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:54:57 +00:00
Per Inge Mathisen 49e97ae793 Add a very simple model viewer application for the WZM format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3715 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:38:49 +00:00
Per Inge Mathisen b278c8d77d pi2wzm: Write correct TEXTURE directive. Fix bug in index array generation.
Generate correct animation frame list. Add support for converting connectors.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3714 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:27:03 +00:00
Per Inge Mathisen 0207ceb4c1 Add a tool to convert from the PIE format to the imaginary WZM format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3710 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-07 14:59:53 +00:00
Per Inge Mathisen f47c263d99 pie23ds: Fix handling of texture animation / team colour.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3706 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 21:08:46 +00:00
Per Inge Mathisen 8dfb001797 Remove two forgotten debug printfs in pie23ds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3705 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 17:43:26 +00:00
Per Inge Mathisen 8b037dc016 Add a very basic PIE -> 3DS conversion tool.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3704 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 17:38:49 +00:00
Per Inge Mathisen 0f647f937e Make 3ds2pie tool conform to PIE standard even though the Warzone code ignores
the exact number given in the LEVEL directive.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3703 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 17:35:28 +00:00
Giel van Schijndel 748adec208 Use network byte order for struct unpacking on the lobby server (rather than native byte ordering)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3666 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:51:56 +00:00
Dennis Schridde 76fddad000 Generic cleanup. Mostly remove struct keyword where unnecessary.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3585 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:02:28 +00:00
Giel van Schijndel d868ec0a50 * Make Win::HWND a "strong" typedef; this guarantees that code that just assumes Win::HWND is the same type as ::HWND (from <windows.h>) will fail to compile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3551 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-24 00:43:10 +00:00
Giel van Schijndel c1eb47283e * Fix a typo in a Doxygen comment
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3494 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 23:09:34 +00:00
Giel van Schijndel 8ce3b1fcce * Initialise `_errCode` in Win::Error's constructor (because it's declared const...)
* Handle `show_command_last__` in the switch for `__ShellExecuteShowCmd` to prevent warnings
 * Don't specify default template parameters for function template Win::ShellExecute as function templates cannot have default template parameters

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3482 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 17:15:35 +00:00
Giel van Schijndel 31a31943bc Forgot to update EditWorld's projectfile in r3480, so doing it now
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3481 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 16:28:19 +00:00
Giel van Schijndel bfa243f575 * Move some WinAPI functions into new file winapi.[ch]pp and a namespace of its own: 'Win'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3480 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 16:25:32 +00:00
Dennis Schridde d8d2697d0d Per says all of swapYZ, reverseWinding, invertUV are necessary for 3DS Max created .3ds files, so enable them all by default. (In GUI and CLI.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3477 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 12:55:22 +00:00
Dennis Schridde d22bf8f49c Add tooltips
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 22:28:13 +00:00
Dennis Schridde bb6437fe06 Drag&Drop support. (Any filename ending in ".3ds" is accepted.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3469 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:40:40 +00:00
Dennis Schridde 4ac1dfecfd - Replace texpageNr lineEdit, with texturePage spinBox.
- Remove associated error-checking (emptyness), since that is guaranteed by Qt.
- Use Ui::Gui3ds2pie instead of Ui_Gui3ds2pie. (Autodetected by Qt/UIC. make distclean if it complains.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3466 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 02:26:05 +00:00
Dennis Schridde 716d1796b5 Enable swapYZ by default, like in the commandline variant.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3465 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:54:49 +00:00
Dennis Schridde 356ed35cbb Add Qt4 GUI. It uses 3ds2pie.c:dump_pie_file() and only has very basic error checking right now.
- To get the (currently only german) translation, run "lrelease 3ds2pie_gui.pro".
- When translating with (Qt Linguist), make sure to use the preview function to check whether your strings fit into the UI.
  If they don't, try to use a shorter translation, otherwise adapt the UI.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3464 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:19:55 +00:00
Dennis Schridde 4ea16727f9 3ds2pie says it is licensed as LGPL-2.1, so use that instead.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3463 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:14:19 +00:00
Dennis Schridde cb768653a6 Remove unnecessary (CVS?) header.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3462 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:13:31 +00:00
Dennis Schridde 5dc7edf2c1 Move 3ds2pie.c out of src/ again...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3461 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 00:28:00 +00:00
Dennis Schridde b557a843ca - Make dump_pie_file work on parameters instead of globals
- Use C89 tolower() for string conversion
- Fix unsignedness warnings
- Some variable renames
- Move parse_args and associated globals into !WZ_3DS2PIE_GUI


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3460 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 23:39:45 +00:00
Dennis Schridde 7edfeb0b0e Move C file to src/ to match default project settings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3459 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 23:10:46 +00:00
Dennis Schridde a01c019d97 Prepare for additional GUI.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3457 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 22:01:21 +00:00
Dennis Schridde ad2658fcec Move 3ds2pie from conversion_tools to a dedicated directory.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3456 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 21:30:55 +00:00
Giel van Schijndel 546abc300e * Use more correct prototypes for the member functions of class BMPHandler, this should reduce unnecessary casting to and from void*
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3451 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 14:09:08 +00:00
Giel van Schijndel 6afd374095 Don't depend on Windows API specific functions when an alternative is provided by the C library:
* Replace usage of WinAPI function lstrcmpA with libc function strcmp

This addresses #4


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3450 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 13:56:41 +00:00
Per Inge Mathisen 7b81b5c76f Fix some ugly shadowing and reuse of variables.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3428 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-10 17:50:40 +00:00
Per Inge Mathisen f7fbf845c0 Small cleanup to animation code, and fix copy&paste typo in 3ds2pie.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3412 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 21:58:05 +00:00
Giel van Schijndel 28f40cd637 * Initialise CBrushProp's member variables in the constructor's initialisation list instead of its code-body
* Rename some private member variables: s/m_\([^\s]\+\)/_\1/g

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3410 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 18:01:03 +00:00
Giel van Schijndel 12ea06d1b6 * Remove the IMG -> XML convertor script as the IMG format has been changed to CSV in r3302
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3397 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:53:45 +00:00
Per Inge Mathisen eeb1c6832c Add a number of options to the 3DS to PIE converter. It can now successfully import
3DS models made in 3DS Max to Warzone.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3396 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:26:15 +00:00
Per Inge Mathisen 9c032e04ac Fix a basic mistake in the converter, and make texture filenames lowercase.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3384 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 15:29:27 +00:00
Per Inge Mathisen 2455f1ee4d A basic 3DS -> PIE format converter. Currently handles a single, textured
triangle mesh only.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3382 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 14:56:44 +00:00
Dennis Schridde 389c0246d1 Rename some files with spaces in them.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3367 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 21:21:10 +00:00
Giel van Schijndel d288708bab * Don't write unused (i.e. it isn't ever read by EditWorld or Warzone) taglist.tag anymore when exporting maps (complements r3357)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3358 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 16:20:09 +00:00
Giel van Schijndel 17faff7281 * Remove unused member functions AssertValid and Dump from some MFC classes (less porting for me!)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3344 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 18:39:22 +00:00
Giel van Schijndel 1d83be8064 * s/tagWriteSeparator/tagWriteNext/g for consistency's sake (to match the tagReadNext function, which is the reading equivalent)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3334 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-04 13:37:42 +00:00
Giel van Schijndel dc391434a3 * Remove text/plain mime-type from editworld.rc
* Add a simple resource file (editworld.rc) for the wxWidgets version of EditWorld containing two icons (aside from the default wxWidgets icons)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3211 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 12:17:02 +00:00
Giel van Schijndel 88e0d37c1c * Rename mainfrm.cpp and mainfrm.h to mainframe.cpp and mainframe.h respectively
* Remove mainfrm.cpp and mainfrm.h from the Code::Blocks project file (as mainframe.cpp and mainframe.h where already present)
 * Add mainframe.xrc to the Code::Blocks project file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3210 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 11:47:39 +00:00
Giel van Schijndel 712b4f11d0 * After reporting the bug when loading menus in wxSmith from XRC files to the Code::Blocks devs they've fixed it
* So now convert our MainFrame window to an XRC file
  * This results in less code (as the window is now defined as an XML file rather than a huge amount of window creating code)
  * Also the compile time has now drastically decreased for mainframe.cpp

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3209 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 11:26:57 +00:00
Giel van Schijndel 9fd1fde8ec * Add a start for the MainFrame window (and display it when starting the program)
* An implementation of Help->About is already provided :-D (which is probably the easiest thing about the program...)
  * Currently this window is produced through means of code generation since I can work around something that seems to be a bug in wxSmith this way (the "bug" only occurs when defining windows in XML resource files)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3207 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 00:08:25 +00:00
Giel van Schijndel c86606c553 * Just upgraded my Code::Blocks installation (to r4751 of it); updating the generated parts of the code...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3204 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:09:52 +00:00
Giel van Schijndel 4239adc560 * Fix an error where we would execute the wrong application code (wxApp instead of EditWorldApp)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3199 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 16:07:31 +00:00
Giel van Schijndel 45125b9fc0 * Add all wxWidgets dialogs to the Code::Blocks project file and let wxSmith manage them
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3197 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:46:33 +00:00
Giel van Schijndel 6d03d9e4a7 * Don't mark the wxID_OK button as default since that is done by wxWidgets itself already
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3195 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:37:08 +00:00
Giel van Schijndel c6958c887c * Make sure to add listctrlval.hpp, numtextval.[ch]pp and wxstringconv.hpp to the Code::Blocks project file (for EditWorld) as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3192 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 14:28:22 +00:00
Giel van Schijndel 5c2ac3b1f2 * Add a "main.cpp" file to contain the main application start code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3190 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 01:08:26 +00:00
Giel van Schijndel bc05caa6f6 * Use $(#boost) instead of an absolute path
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3188 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 00:52:04 +00:00
Giel van Schijndel 131ee472c4 * Add a Code::Blocks project file to aid in porting of EditWorld
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3187 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 00:18:36 +00:00
Giel van Schijndel d584c8f2cb * Don't use #pragma implementation as it causes warnings (not to mention I haven't got a clue what it's supposed to do...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3186 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 00:17:42 +00:00
Giel van Schijndel ff51a264c7 * Rename initiallimitsdlg.[ch]pp to initiallimitsdialog.[ch]pp
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3185 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 19:28:53 +00:00
Giel van Schijndel f41d6c52a6 * Clean up the class declaration of CMainFrame
* Make sure to add proper #include guards to every header file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3184 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 19:08:20 +00:00
Giel van Schijndel 8a3b056ac0 * Make sure to include the proper wxWidgets headers (at the proper place, not to interfere with wxSmith)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3183 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 18:47:04 +00:00
Giel van Schijndel 4c783140ee * Remove a left over debugging statement which I accidentily committed in r3181
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3182 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 18:28:11 +00:00
Giel van Schijndel c7894a8a01 * Make globals g_HomeDirectory and g_WorkDirectory an std::string instead of char[1024]
* Use a function to return the current directory as an std::string (rather than writing it into a buffer that's given along)
 * #define snprintf _snprintf so we can use that as well...
 * Some const correctness

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3181 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 18:26:40 +00:00
Giel van Schijndel 8708174859 * Move the declaration of CBTEditApp to the implementation file since I don't want to export it through the header
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3180 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 17:13:40 +00:00
Giel van Schijndel 2a4c3e6c12 * Alphabetically sort the project file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3179 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 17:13:26 +00:00
Per Inge Mathisen 8ba3716f13 pietoaster: Clean up OpenGL includes. Include SDL_opengl.h instead of gl.h - do not
use both. Fixes warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3175 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-25 18:26:15 +00:00
Dennis Schridde b6833db069 - define snprintf to _snprintf for MSVC
- use wzglobal.h defines where applicable
- add macros.h for imdloader.h: MAX/MIN
- sed RaNdOmTyPe to SDL-type: Reverts r2611 to easy porting.
  Watermelon afaik uses MSVC which has no stdint(.h), thus using it would make no immediate sense to him, since he has no more interest in POSIX-support.
- sed Bool/TRUE/FALSE to bool/true/false, like r2609
NOTE: r3171 was not vanilla 0.3, but also included a modified Makefile by me, wzglobal.h and some minor compilation fixes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3172 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 22:50:45 +00:00
Dennis Schridde d99dcb0ce1 Version 0.3 of PieToaster
Features:
1. Editing:
 * Polygon duplication
 * Support for submodel
 * Commandline 'filename' is optional, also allows to enter filename via GUI
 * Multiple pies loading
 * Merging of multiple pies into one file
 * Support for 3DTRANS animation (oil derik)
 * Support for 3DFRAMES animation (cyborg)

2. Load and Save:
 * Creation, Load, Save of ani animation
 * Submodel add and remove

3. Model View:
 * Optional VBO for polygon and grids rendering
 * VBO cache for grids
 * Separated frames in animation rendering
 * Animation play

4. GUI:
 * Improved overall GUI usability

5. Fixes:
 * Fixed various bugs in GUI creation strings


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3171 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 22:11:18 +00:00
Giel van Schijndel efba7fe2c4 * Rename the "url" tag of wxHyperLink to "href"
* Remove warzone2100.png from the current directory (it was just a (cheap) copy from icons/warzone2100.png anyway)
  * In aboutdialog.xrc refer to the warzone2100.png from icons/ instead...

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3169 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 21:20:34 +00:00
Giel van Schijndel 3ebbf43b9f * Add another ported dialog: InfoDialog; to directory wxDialogs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3168 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 20:52:59 +00:00
Giel van Schijndel f2d8ba9617 * Rename class ExportInfo to InfoDialog and exportinfo.[ch]pp to infodialog.[ch]pp since other than being __used__ to display export info it has on its own nothing to do with export info
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3164 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 16:50:14 +00:00
Giel van Schijndel 4ed296cbcd * Don't allocate a string buffer from the heap
* and especially don't use the wrong delete operator!! (delete [] String; was necessary not without the '[]')
Greater ease in porting to wxWidgets:
 * Rename class CExportInfo to ExportInfo
 * Pass the string to display to ExportInfo's constructor rather than funking around with its member variables (encapsulation!)
 * Clean up & remove large portions of ExportInfo's (unnecessary) code

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3149 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 01:17:50 +00:00
Giel van Schijndel 811f62370c * Add another ported dialog: AboutDialog; to directory wxDialogs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3148 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 00:40:28 +00:00
Giel van Schijndel 9ef5a36aaa * Add a wxWidgets XML Resource Handler for wxHyperLink (is a member class of wxHyperLink itself: wxHyperLink::XmlHandler)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3147 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 00:19:19 +00:00
Giel van Schijndel 3b2417bddd * Fix a small error where we would use the wrong class name for DECLARE_DYNAMIC_CLASS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3146 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 00:15:14 +00:00
Giel van Schijndel 4e784c5c02 * Add wxHyperLink class (copied from the wxCode project)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3145 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 23:39:16 +00:00
Dennis Schridde d21c8a2753 Correcting germanified Gerard...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3140 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 18:43:43 +00:00
Dennis Schridde c9e197c902 Improved MasterServer by Gerhard Schaden, patch #893.
Depends on Python 2.5, but we should have that on the server very soon.
Should effectively help fight ghostgames and also be easily extensible in the future. (Gerhard talked about a web-interface with admin functions. :) )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3139 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 18:40:10 +00:00
Dennis Schridde 3c7898d1c3 Add fancy author/version/doc headers to masterserver
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3120 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 15:21:11 +00:00
Gerard Krol 49958fcc6b Expire games that were updated > 1 hour ago.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3114 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 20:51:06 +00:00
Giel van Schijndel a57b33f800 * Fix a wrong date in the license header (was 1007 instead of 2007...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2852 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 16:34:51 +00:00
Giel van Schijndel 9fd3c1a7f1 * Make conversion tool "imgfile" also output the file-format-version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2726 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:49:43 +00:00
Giel van Schijndel 811eafc0af * Add a directory for conversion tools (conversion from some internal WZ format to another format)
* Add conversion tool '''imgfile'''
  * This tool will read in an "IMG" file ("IMG" is the WRF identifier) from standard intput; it'll then reformat it as XML and output it to standard output


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2725 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:41:27 +00:00
Giel van Schijndel 3510671340 * Rename test.bak to test.lnd
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2649 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 21:55:40 +00:00
Giel van Schijndel 870a536646 * Initialize PhysicsFS before using it
NOTE: PieToaster ''should'' compile, link and run on GNU/Linux systems right now (it does for me)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2613 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:26:26 +00:00
Giel van Schijndel 498959f9bb * #include <stdint.h> where we need it
* Use proper constness in main() to shut up gcc warning about wrong constness


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2612 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:23:59 +00:00
Giel van Schijndel 5a91f73056 * Replace usage of SDL types Uint* and Sint* for usage of standard C types uint*_t and int*_t respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2611 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:17:37 +00:00
Giel van Schijndel 62f1be11f1 * Use "rm -f" to shut up the darn warning messages if several of the to-delete files don't exist while cleaning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2610 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:14:18 +00:00
Giel van Schijndel 579e952cb8 * Lets use the built-in bool-type instead of a dirty macro!
* replace [Bb][Oo][Oo][Ll] with bool
   * replace TRUE with true
   * replace FALSE with false

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2609 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:04:25 +00:00
Giel van Schijndel 8cd7f8fd5b * Replace all instances of ''_snprintf'' with ''snprintf''
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2608 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:43:01 +00:00
Giel van Schijndel 3344b5b01c * Fix #include directives so compiling becomes yet a bit closer to possible
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2607 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:34:44 +00:00
Giel van Schijndel 0bb24b12c2 * Add a ''very'' simple Makefile for compiling PieToaster
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2606 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:29:35 +00:00
Giel van Schijndel c6392febca * Link PieToaster's sources to the repository history
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2604 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:12:10 +00:00
Giel van Schijndel 26a1f19cfe * Add initial version of PieToaster
* Developed by Carl Hee <Watermelon>
   * Licensed under the conditions of the GPLv3


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2603 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 12:29:36 +00:00
Giel van Schijndel eef217fc4a * Make some EditWorld documents be valid reStructured Text
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2583 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-22 00:38:08 +00:00
Giel van Schijndel 03629c04ab * Set svn:mime-type to text/x-rst to get Wiki-like markup in Python-powered viewers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2580 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-21 22:29:03 +00:00
Giel van Schijndel 1dd3e33c2c * Add DirectX -> OpenGL porting tasks to EditWorld's TODO list as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2545 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-11 23:04:21 +00:00
Giel van Schijndel 173f093901 * Fix tile_texpage2mipmap_tileset, it now makes imagemagick output zero-padded filenames up to 2 digits (like Warzone expects)
* Bump version numbers of tile_texpage2mipmap_tileset to 1.2

Patch by Kevin Gillette <kage>: http://forums.wz2100.net/index.php?topic=1010.msg9137#msg9137

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2542 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-11 22:47:13 +00:00
Giel van Schijndel 69ad10edc4 * Fix a compile error when attempting to perform a "Release" compile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2454 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-08 12:20:22 +00:00
Giel van Schijndel fe265cdc57 * Remove unused bitmap pumpkin16.bmp which is just a 16 colour version of res/bitmap1.bmp
* Remove unused bitmaps res/bitmap2.bmp res/bmp00001.bmp; also remove them from our resource file
 * Don't use a magic number in editworld.rc for means of referring to res/bitmap1.bmp use IDB_BITMAP1 instead

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2453 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-08 12:12:34 +00:00
Giel van Schijndel b2f95025ed * Remove M$ SourceSafe file (we don't use SourceSafe!! We use Subversion!!!)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2452 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-08 11:47:29 +00:00
Giel van Schijndel c0c7c6fa51 * Remove the last uses of template class ListNode<T> which was a cheap replacement of std::list<T>
* Remove some commented out functions from heightmap.cpp which where duplicated (i.e. functions with the same name and parameter prototypes existed elsewhere in the file) and used ListNode<T>
 * Replace usage of ListNode<T> with std::list<T> usage; actually I replaced it with std::list<T>::iterator or std::list<T>::const_iterator since all code that still used ListNode<T> was code iterating over an instance of ListNode<T>
 * Remove listtemp.h which contained template class ListNode<T>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2451 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-08 11:42:30 +00:00
Giel van Schijndel fa12543c0d * Remove rather empty file stdafx.cpp
* #define VC_EXTRALEAN before including MFC & Windows headers to exclude some unused stuff

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2447 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 21:58:15 +00:00
Giel van Schijndel 30a62a1b6c * Add window IDs to TODO file; which is easier to understand (I hope) than filenames
* Remove several unused windows from the resource file: IDD_EDITSTATS, IDD_HEIGHTSCALE, IDD_OBJECTTYPES, IDD_SETSTATSCHOICE, IDD_SETSTATSCOMBO and IDD_SETSTATSVALUE

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2446 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 20:46:54 +00:00
Giel van Schijndel c0df2cb97f * Rename CAboutDlg to AboutDialog and move it out of btedit.cpp into aboutdialog.[ch]pp
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2445 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 20:26:50 +00:00
Giel van Schijndel 41dada6a26 * Make Limits dialog resizeable and alter the proportions slightly to make this window easier to work with
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2444 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 19:21:38 +00:00
Giel van Schijndel 4cf90b9f8c * Remove empty destructors
* Update EditWorld's TODO file (remove limitsdialog.cpp from the list of yet to port windows)
 * Use wxWidgets' precompiled header in numtextval.hpp

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2443 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 18:59:10 +00:00
Giel van Schijndel c7efa311fc * Add template class wxListCtrlValidator<Container> which is a specialization of wxGenericValidator that only works on wxListCtrl instances
* This class uses a container of integers instead of wxArrayInt (C++ container as specified in section 23.1 of the ISO C++ standard 1998)
 * Add another ported dialog: LimitsDialog; to directory wxDialogs

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2442 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 16:38:55 +00:00
Giel van Schijndel acccbf667e * Rename function names to names similar to what wxSmith produces (wxSmith is a wxWidgets dialog-editor plug-in for Code::Blocks)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2441 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 16:23:26 +00:00
Giel van Schijndel e5fdf5e346 * Remove #include directives for unused header files (btedit.h and debugprint.hpp)
* Wrap some strings in _T() macro (deals with unicode/ascii text)
 * Add an header guard to limitsdialog.hpp
 * Use std::deque's constructor to load data into it from two InputIterators (first & last); note: in case of MSVC6 this requires you to fix the flawed STL

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2439 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 11:40:19 +00:00
Giel van Schijndel a2ceea149f * Use references for output parameters for function CHeightMap::GetMapSize instead of pointers (also use "unsigned int" instead of "DWORD")
* Change the return value of functions CHeightMap::GetMapWidth and CHeightMap::GetMapHeight from "DWORD" to "unsigned int" (also don't mark these functions as inline anymore)
 * Mark function CHeightMap::GetScrollLimits as const and remove the inline keyword from its declaration
 * Add a template function CHeightMap::SetScrollLimits which uses std::list::assign() to copy a list of CScrollLimits from two input iterators (in MSVC6 I had to fix the STL implementation to get this to compile, GCC works fine though, newer versions of MSVC *should* work as well btw)
Greater ease in porting to wxWidgets:
 * Rename class CLimitsDialog to LimitsDialog
 * Add templated constructor to LimitsDialog
  * This constructor initializes an std::deque<CScrollLimits> (_limitsList) with a list of scrolling limits
  * This constructor depends on InputIterators (as defined by the C++ standard in section 24.1.1) for its initialization
 * Put member data in a private part of LimitsDialog's class declaration
 * Make sure all member functions of LimitsDialog only work on its own private data and not on other classes' data
 * Instead the usercode using LimitsDialog can use the InputIterators provided by LimitsDialog::firstLimit and LimitsDialog::lastLimit to copy data over (e.g. using STL Containers' assign() member function)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2435 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-25 17:32:02 +00:00
Giel van Schijndel 876c8b3b61 * Fix the Blender import & export scripts such that they're completely compatible with eachother (i.e. import->export->import == import)
* Add two python mini-scripts (find-bad-pies.py and find-poly-nums.py) that are of fairly little general use, but may serve as an example of how to interface with pie.py (pie.py must be in the python path for these scripts to work)
  * find-bad-pies.py when given a list of filenames will find the ones that, as far as the pie parser (pie.py) is concerned, aren't valid
  * find-poly-nums.py was created to find out if there were any pies that contained any polygons with more than 4 sides
Patch by Kevin Gillette <kage> ( http://forums.wz2100.net/index.php?topic=550.msg7829#msg7829 )

 * Update svn:eol-style and svn:mime-type for all trunk/tools/blender/* files

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2420 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-20 15:09:13 +00:00
Giel van Schijndel 3e8cb6ba4c * Add Python script for the conversion of old-style one-texturepage tilesets to mipmapped tilesets
By Kevin Gillette <kage>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2383 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 10:24:52 +00:00
Giel van Schijndel 5285f0a096 * Cleanup CLimitsDialog's code to make it easier to port it to wxWidgets
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2366 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-09 14:18:57 +00:00
Giel van Schijndel ba7d1d5078 * move class CUndoRedo from bteditdoc.cpp to new file undoredo.cpp
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2363 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-08 20:39:07 +00:00
Giel van Schijndel 243bc7ddb8 * Remove unused files model.cpp/h and seedfill.cpp
* remove #include "snapprefs.h" directive
 * remove non-existent file d3dwrap.h from project file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2362 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-08 20:10:38 +00:00
Giel van Schijndel 0397a75255 * Remove unused window CSnapPrefs or IDD_OBJECTPREFS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2361 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-08 19:45:37 +00:00
Giel van Schijndel 9d148e7f8b * Remove unused window CInfoDialog or IDD_DEBUGINFO
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2360 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-08 19:37:17 +00:00
Giel van Schijndel 0931065023 * Use dynamic_cast<T*> instead of wxWidgets' own RTTI implementation (t*)->IsKindOf(CLASSINFO(T))
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2267 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 16:55:19 +00:00
Giel van Schijndel 0a310fdd5c * Use dynamic_cast<T*> instead of a C-style (T*) cast (dynamic_cast is safer since it walks the inheritance tree to check whether the pointer is actually of type T)
* Also dynamic_cast<T*> (which is compiler supported) should not be slower (if not faster) than wxWidgets' own RTTI implementation (t*)->IsKindOf(CLASSINFO(T))

This _does_ require RTTI to be enabled in wxWidgets' compilation; just enabling RTTI (as a compiler option) will only increase binary size, it should not add runtime overhead

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2264 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 16:45:40 +00:00
Giel van Schijndel bab9bd3316 * Add conversion functions for converting wxString <-> std::string (we're assuming UTF-8 encoding for std::string here)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2263 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 16:30:25 +00:00
Giel van Schijndel bba2360eef * Add another ported dialog: InitialLimitsDialog; to directory wxDialogs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2262 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 15:56:39 +00:00
Giel van Schijndel c4b9711e46 * Don't return a reference to a temporary; instead return by value
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2261 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 15:47:27 +00:00
Giel van Schijndel 32f0b5bb1b * Minor cleanup:
* remove some unnecessary #include directives
  * add header guards
  * declare some member functions const
  * Add "const std::string& InitialLimitsDlg::SelectedString() const" which retrieves the string of the currently selected item

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2260 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 15:43:01 +00:00
Giel van Schijndel 087703e801 * Replace usage of ListNode<CScrollLimits> by class CHeightMap by std::list<CScrollLimits>
* Some const correctness: "char*" -> "const char*"
 * Fix a bug "if (a = b);" -> "if (a == b);"
 * Fix a possible error where NULL might be dereferenced in CHeightMap::DrawScrollLimits (actually if that function would be called dereferencing NULL would be inevitable)
 * Use references for output parameters rather than pointers
 * If we use operator new[] then we should use operator delete[]
 * Remove workaround for bad std::advance implementation since we're not using advance with our own iterators anymore

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2259 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 14:04:24 +00:00
Giel van Schijndel 8310f9170e * Replace usage of ListNode<GateWay> by class CHeightMap by std::list<GateWay>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2257 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-29 12:51:49 +00:00
Giel van Schijndel 817e2ace65 * Replace usage of ListNode<C3DObjectInstance> by class CHeightMap by std::list<C3DObjectInstance>
* Make all member functions of CHeightMap that have an argument list declaration of "(void)" use "()" instead
 * Rename std::advance in limitsdialog.cpp to just advance since it otherwise conflicts with MSVC's (flawed) implementation

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2255 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 20:00:57 +00:00
Giel van Schijndel cdc92ebfe6 * Apply ListNode<T>::iterator in class CBTEditDoc
* Initialize CHeightMap's member variables using the constructor's initalization list rather than its body

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2254 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 17:54:08 +00:00
Giel van Schijndel d50c04ef6b * Replace usage of ListNode<C3DObjectInstance> by class CBTEditDoc by std::list<C3DObjectInstance>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2251 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:34:28 +00:00
Giel van Schijndel bca3e1f535 * Some const correctness
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2250 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:30:05 +00:00
Giel van Schijndel 4ef9247c6a * Move CBTEditDoc's member initialisation from the constructor's body into the initialization list
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2248 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 14:05:19 +00:00
Dennis Schridde 0463b3be26 Version 1.1a of Kage's pie_import.py: fixed a bug that prevented team colors from ever importing correctly.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2239 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 10:42:33 +00:00
Giel van Schijndel 7abcb85aa2 * Fix compile error caused by not #including <cassert>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2237 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 00:13:18 +00:00
Giel van Schijndel 92d0f946bb * Add a safety assert to ListNode<T>::iterator to make sure null pointers are asserted on
* Update the TODO list since SaveSegmentDialog has been ported from MFC to wxWidgets already
 * Remove some commented out occurances of "ListNode<.*>.*\*" (yes regexp), to decrease the search context for refactoring code to use iterators

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2236 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 00:06:12 +00:00
Giel van Schijndel 21e85b4e62 * Add copy constructor to class scrollLimitStringIterator
* Apply ListNode<T>::iterator for some for-loops
 * Make CHeightMap::GetScrollLimits return "ListNode<CSrollLimits>::iterator" instead of "ListNode<CSrollLimits>*" (effectively forcing all clients of this function to work in iterator style)
 * Fix ListNode<T>::iterator::operator=
 * Add function "void goToBegin()" to ListNode<T>::iterator (shouldn't be at the iterator I know, but this is the most intuitive intermediate solution)
 * Add an own implementation of std::advance to limitsdialog.cpp (it is needed there);
  * since apparently MSVC's STL developers can't even write something like: "for(; n ; --n) ++i;" correctly!!!

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2235 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 23:53:07 +00:00
Giel van Schijndel 7e2a03a022 Greater ease in porting to wxWidgets:
* Rename class CInitialLimitsDlg to InitialLimitsDlg
 * Add templated constructor to InitialLimitsDlg
  * This constructor initializes an std::deque<std::string> (_stringList) with a list of strings
  * This constructor depends on InputIterators (as defined by the C++ standard in section 24.1.1) for its initialization
 * InitialLimitsDlg::OnInitDialog() now initializes its ComboBox with strings that have been loaded by the constructor from _stringList
 * Add a proxy class that serves as an InputIterator for the initialization of InitialLimitsDlg
  * This class is a proxy to ListNode<CScrollLimits>::iterator such that it extracts CScrollLimits.ScriptName and constructs an std::string from it
 - These changes decouple InitialLimitsDlg from the implementation and interface of CHeightMap and CScrollLimits

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2234 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 23:07:17 +00:00
Giel van Schijndel d6ee80ee25 * Remove annoying usage of DEBUG_NEW since it seems to be causing compile errors at seemingly random times (which is _no_ fun)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2233 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 22:42:59 +00:00
Giel van Schijndel 84f7676349 * Add class ListNode<T>::iterator so that we can iterator over a linked list of ListNode<T>s (this will ease porting of code that uses class ListNode<T> to std::list<T> instead
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2232 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 22:29:46 +00:00
Giel van Schijndel 8010de593a * Put implementation in class declaration of template class ListNode<T> for increased locality and readability
* Enable compilation of RTTI (RunTime Type-Information) compilation (not using any of it, .., yet)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2231 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 21:11:57 +00:00
Giel van Schijndel f73e4e6488 * Remove some spaces which caused problems with svn:keywords
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2221 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 15:34:26 +00:00
Giel van Schijndel b4afe5b827 * Use wxStdDialogButtonSizer for the default buttons instead of a wxBoxSizer with some wxButtons in it
* Rename the dialog in savesegmentdialog.xrc from "Dialog" to "Save Map Segment"

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2220 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 15:33:15 +00:00
Giel van Schijndel 3c24ae3d6f * Rename AutoFlagDialog::OnDegree to OnRotate
* Give all parameters of AutoFlagDialog a default value
 * Fix typo (used _TogXFlip and _TogYFlip instead of _ToggleXFlip and _ToggleYFlip respectively)
 * Rename buttons ID_OK and ID_CANCEL to wxID_OK and wxID_CANCEL respectively; this causes wxWidgets' default handlers to be used for these

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2218 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 14:30:07 +00:00
Giel van Schijndel 4a34916549 * Fix some syntax errors (missing semi-colons, or semi-colons where they shouldn't be)
* Add a default constructor for wxNumericTextValidator
 * class wxNumericTextValidator:
  * add DECLARE_DYNAMIC_CLASS, DECLARE_EVENT_TABLE and IMPLEMENT_DYNAMIC_CLASS
  * fix BEGIN_EVENT_TABLE (use wxNumericTextValidator instead of wxTextValidator)
 * return *this in copy assignment operator
 * Some other minor fixes

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2217 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-27 14:20:34 +00:00
Giel van Schijndel d8b7837c3b * Add another ported dialog: SaveSegmentDialog; to directory wxDialogs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2214 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 22:28:55 +00:00
Giel van Schijndel 22712ec8d1 * Remove our own "custom" event handler for the cancel button "ID_CANCEL" and use wxDialog::OnCancel instead
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2213 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 22:22:34 +00:00
Giel van Schijndel 31c4a1de54 * Use wxDialog::OK and wxDialog::Cancel in the handlers for ID_OK and ID_CANCEL respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2212 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 22:16:41 +00:00
Giel van Schijndel 18bf3bfa9c * Add special wxValidator derivation: wxNumericTextValidator
* This class validates input for wxTextCtrl to be numeric only
  * Also upon initialization of the window that contains the "validated" text controls; these controls will be filled with a number given by a passed pointer
  * Upon closing of this window the current value from these text controls will be written back into that pointer

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2211 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 22:11:35 +00:00
Dennis Schridde 962a6db92c Version 1.1 of the Blender scripts by Kage.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2210 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 20:53:20 +00:00
Giel van Schijndel e684aed3b6 Greater ease in porting to wxWidgets:
* Rename class CSaveSegmentDialog to SaveSegmentDialog
 * Don't allow public access to private data members anymore
 * Initialize private data members with constructor
 * Add public access, member functions for private data members
 * Don't define functions in a header file
 * Add a header guard

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2209 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 20:04:46 +00:00
Giel van Schijndel e7ff6f8af0 * Update TODO file: we already converted one dialog from MFC to wxWidgets: yay!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2207 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 14:42:55 +00:00
Giel van Schijndel c355c4dcdf * Add directory wxDialogs; I'll use this as a temporary storage for dialogs which have been ported from MFC to wxWidgets
* Add first converted dialog: AutoFlagDialog; to directory wxDialogs

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2206 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 14:38:22 +00:00
Giel van Schijndel 90ca240964 Greater ease in porting to wxWidgets:
* Rename class CAutoFlagDialog to AutoFlagDialog
 * Don't allow public access to private data members anymore
 * Initialize private data members with constructor
 * Add public access, read-only, member functions for private data members
 * Upon initialization add button "handlers" to private pointers; rather than retrieving these pointers each time again
 * Use only one function OnRotate() rather than four functions OnRot0, OnRot90, OnRot180 and OnRot270 which all have the exact same definition

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2205 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 14:12:20 +00:00
Giel van Schijndel 80c4492003 * Clean out class declaration of CEdgeBrush
* Turn protected section of CEdgeBrush into a private section
 * Mark all the functions that have their definition in the header as inline

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2204 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 11:17:16 +00:00
Giel van Schijndel a027ced426 * Remove THIS_FILE from all files; which basically was an unused wrapper around macro __FILE__
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2203 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 11:01:20 +00:00
Giel van Schijndel 79ea5bb199 * Update EditWorld's TODO file
* Add list of files requiring porting from MFC to wxWidgets

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2202 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 10:54:32 +00:00
Giel van Schijndel b543a89e13 * #include required header <ostream>
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2201 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 10:50:50 +00:00
Giel van Schijndel 20d790a4fa Cleanup:
* Rename class CKeyHandler to KeyHandler (I don't want freaking MFC style classnames being prefixed with 'C')
 * Modify class KeyHandler to use std::bitset instead of an array of bools
 * Use forward declarations for pointers instead of including the entire header

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2200 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 10:50:15 +00:00
Giel van Schijndel 6634aa66fa * Remove unused files debug.[ch]
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2199 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 09:40:03 +00:00
Giel van Schijndel f10cdeb157 * Make debugprint.c a C++ file instead of C
* Use std::ostream instead of FILE* for debug printing

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2198 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 09:36:45 +00:00
Giel van Schijndel 595c4838ac * Use stack allocated objects instead of heap allocated; since they're safer (don't require explicit deallocation), and it's obvious that the only reason why they where heap allocated is probably that whoever wrote that piece of code was addicted to the "operator new"
* Use std::ostream instead of FILE* for PCXHandler::WritePCX
 * Change utility functions EncodeLine and EncodedPut to work with std::ostream instead of FILE* now

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2197 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 00:50:32 +00:00
Giel van Schijndel 2fcc6e82c2 * Use std::istream instead of FILE* for PCXHandler::ReadPCX
* Change private member functions of PCXHandler; EncodedGet, EncodeLine and EncodedPut into static, inline, non-member, utility functions (EncodedGet now also works with std::istream)
 * Use std::string for the composition of strings, rather than some char[] buffer and strcpy + strcat

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2196 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-26 00:18:21 +00:00
Giel van Schijndel 06afa3c7a0 * Less violation of encapsulation: use private instead of protected (since we don't need access to these members anyway; plus we don't inherit from these classes ATM)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2190 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-25 14:58:16 +00:00
Giel van Schijndel f54618b6c4 * Remove files gateinterface.* which basically where a C<->C++ interface to the gateway* files (these are now C++ files)
* Move previous interface functions into gateway.cpp

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2187 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 18:49:29 +00:00
Giel van Schijndel 5a9cc58788 * Fix yet some more dependencies in header files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2186 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 18:44:18 +00:00
Giel van Schijndel 2e28b1926a * Fix some header dependencies
* Indent class CHeightMap in a more readable manner

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2183 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 18:05:32 +00:00
Giel van Schijndel c05b65d532 * Fix compile error by including dependent header (<windows.h>: ugh)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2182 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 17:43:48 +00:00
Giel van Schijndel 4c7f823d2f Cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2181 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-24 17:34:28 +00:00