Commit Graph

2557 Commits (927aa2c39d2e2078a59d871cb16410b9583f8c69)

Author SHA1 Message Date
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
Freddie Witherden 27c3a29d73 Update combFire weapon to use the new getDroidEffectiveLevel function.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3178 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 14:25:32 +00:00
Freddie Witherden 624825854c Add getDroidEffectiveLevel that returns MAX(droidLevel, droidsCmdrLevel).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3177 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-25 22:06:51 +00:00
Per Inge Mathisen 2390ed5d63 Remove wrongly set (ie was unused) water xyz for tiles, and fix wrong comments.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3176 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-25 20:37:33 +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
Giel van Schijndel 7f528c37d0 * Remove empty lines (to reduce diff size)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3174 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-25 13:00:09 +00:00
Giel van Schijndel bc66705498 * In Vector3uw explicitly use uint16_t instead of UWORD
* Add a function NETVector3uw to use for passing Vector3uw objects more conveniently over the network

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3173 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 23:36:02 +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
Dennis Schridde 248a8cb510 Minor indent
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3170 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 22:05:15 +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 ae79afb9a4 * Use sasprintf in combination with sendTextMessage instead of DBCONPRINTF followed by sendTextMessage; which A) wouldn't work on non-debug builds, and B) would send the message twice to the local player on debug builds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3167 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 20:23:55 +00:00
Giel van Schijndel cbb1011be9 * Fix a slight error I made in runningMultiplayer() where I swapped true & false
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3166 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 20:12:33 +00:00
Gerard Krol fbe50e45ff Update for the removal of optimisepath.c and the cleanup of the sequence code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3165 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 18:24:26 +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 06dab81c11 * Update Code::Blocks and MSVC project files to complement the cleanup of sequence code in r3162
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3163 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 16:31:51 +00:00
Gerard Krol 58b82f44ad Remove all RPL cruft from the sequence code. The new sequence code can be added to sequence.c easily. Projects will need to be updated.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3162 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 15:57:29 +00:00
Freddie Witherden 8f5fb1c714 Commit the final part of patch #897 (send/recvDestroyStructure)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3161 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 15:15:10 +00:00
Giel van Schijndel 776babad75 * Use a function to check for true multiplayer games (i.e. neither single player nor skirmish); rather than using a lot of copy-pasted code
* Allow cheating in true multiplayer games, but only when the debug keymap is enabled (which can only be enabled in debug builds)
Patch #899 by Buginator with some modifications by me (mainly adding all runningMultiplayer() calls)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3160 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 15:10:43 +00:00
Freddie Witherden 7e9b108645 Commit part 4 of patch #897 (send/recv structure demolished messages.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3159 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 15:10:34 +00:00
Freddie Witherden ea9d378131 Commit part 3 of patch #897 (and there is still more to come!).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3158 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 14:57:58 +00:00
Giel van Schijndel fd9d44e1d3 * Mark some strings for gettext translation
* Change rangeOnScreen to a bool

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3157 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 14:48:44 +00:00
Freddie Witherden 3bc0d30be1 Commit part two of patch #897 by Buginator along with some small changes by myself.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3156 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 14:47:44 +00:00
Freddie Witherden 838e9f6009 Commit the first patch of patch #897 by Buginator and myself with some additional changes by myself
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3155 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 14:41:25 +00:00
Giel van Schijndel 84202107e7 * Remove #include "optimisepath.h" from src/move.c (didn't see this while committing r3153)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3154 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 14:05:31 +00:00
Giel van Schijndel bffd531dd7 * Remove unused file src/optimisepath.[ch]
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3153 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 14:02:13 +00:00
Giel van Schijndel fbf03af195 * Remove macros:
* ROUND: replace by a static inline function (math_round) instead
  * FRACTCONST: this macro just cast both of its arguments to float and then divide the first by the second
  * MAKEFRACT_D: this macro would cast to FRACT_D (which was typedef'd as float but should have been typedef'd as double); so cast to double instead (where required)
  * FRACTmul_D: would cast both of its arguments to FRACT_D and multiply them
  * FRACTdiv_D: would cast both of its arguments to FRACT_D and divide the first by the second
  * MAKEINT & MAKEINT_D (where #defined the same); this macro would just cast to SDWORD (aka "int" or "signed int")

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3152 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 13:57:19 +00:00
Giel van Schijndel e8be7978e6 * Make some functions const correct
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3151 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 11:59:47 +00:00
Giel van Schijndel 97991eab77 * Make sure that buildings we cheated ourselves (in debug mode with the "CTRL+O" menu) will be sent to the other players in a multiplayer game as well
* Also send a console text message to all players when a user does cheat himself a building

Patch #898 by Buginator; comments written by me

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3150 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 11:36:21 +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 09a8e33f61 Rename PACKAGE_MAINTAINER to PACKAGE_DISTRIBUTOR to clarify.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3144 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 21:14:02 +00:00
Dennis Schridde 4dd10fd6bb clparse.c:262: warning: enumeration value ‘CLI_CONFIGDIR’ not handled in switch
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3143 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 21:13:06 +00:00
Dennis Schridde 94548aa9db Enhanced authors file:
- Added some names/nicks where they were missing
- List area of main contribution (:)
- Include credits for major achievements (+)
Feel free to enhance...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3142 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 20:14:46 +00:00
Giel van Schijndel 06f01e129a * #Define PACKAGE_VERSION instead of VERSION in the raw Makefiles (synonymous to r3125 which was for the Code::Blocks project file)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3141 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 19:58:20 +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