Commit Graph

2641 Commits (daad83d316eec164d38ac076768285be5def37ca)

Author SHA1 Message Date
Per Inge Mathisen 5cca5e2893 Make droid experience a floating point in tagfile format, and add better
error reporting for user errors when they forget to update definition file.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3229 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 19:53:14 +00:00
Per Inge Mathisen 3550e701f6 Fix indentation and remove some dead code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3228 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 19:39:31 +00:00
Per Inge Mathisen 52aa90d200 Fix a few spelling errors, and add a new debug category 'multisync'.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3227 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 17:55:20 +00:00
Dennis Schridde 82921fea9e Merge back r3223 from branches/2.0:
- Move win32/*.ico into icons/
- Modify windows icon to use 4/8/32bpp per size (except at 48x48 where 8 and 32bpp are sufficient), so that it properly displays on Vista
- Add splashbar I used for MojoSetup
- Add windows uninstaller icon
- Use (un)installer icon for the NSIS installer


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3224 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 13:55:17 +00:00
Freddie Witherden d5a506c3bb Commit the final part of patch #901, which deals with droid synching/checking.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3222 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 12:22:55 +00:00
Freddie Witherden a21fb63b8e Commit part four of patch #901. This deals with structure synching.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3221 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 12:21:14 +00:00
Freddie Witherden 62d372c471 Commit part 3 of patch #901, score submission is now ported over to the new API.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3220 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 12:18:40 +00:00
Freddie Witherden c2c5fdb3dc Commit the second part of patch #901. This ports power check functions to the new netcode API.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3219 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 12:15:45 +00:00
Freddie Witherden 919cac4c78 Commit the first part of patch #901. This ports the ping functions over to the new netcode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3218 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-29 12:13:18 +00:00
Christian Ohm 6334f1d6d1 Change "Total Power Requibyte.r" back to "Total Power Required".
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3217 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 21:38:27 +00:00
Giel van Schijndel 851615f5db * Don't display _("Sorry, that cheat is disabled in multiplayer games.") on the ingame console when just typing regular text
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3216 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 21:29:01 +00:00
Christian Ohm a128029caf Replace the credits screen with a cleaned up version.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3213 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 19:02:00 +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
Ari Johnson b7230cb273 Updated trunk Xcode project to use libvorbis-1.2.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3208 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 00:08:44 +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
Ari Johnson 47816967a7 Updated Xcode project and some endian fixes; also changed endian_*() calls
to expand to ((void) (x)) on little-endian systems, so that the compiler
will catch little-endian developers who forget to update the endian_*()
calls when they change the names of structure fields.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3205 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:55:34 +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 b0909d4c18 * Get rid of some unnecessary global variables (aAudioName, aTextName, aSubtitleName) since stack allocated variables sufficed
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3203 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:03:09 +00:00
Freddie Witherden 2f37e44da6 Revert r3198 which for some reason asserts.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3202 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 22:32:08 +00:00
Freddie Witherden 6a338c71ce Use the endian swapping functions provided by SDL.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3201 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 19:29:53 +00:00
Giel van Schijndel 31940330ab * Set svn:* properties
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3200 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 16:32:19 +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
Freddie Witherden 71b2a9260e Save psDroid->experience as a float so we do not loose precision. Tagfile only.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3198 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:51:45 +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
Per Inge Mathisen 0c10287938 Add some doxygen documentation for tagfile code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3196 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:37:15 +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
Freddie Witherden 28a1b3e2b3 Fix a bug in recvDestroyStructure due to use of the un-safe function destroyStruct
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3194 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:14:26 +00:00
Per Inge Mathisen f7e7e44329 Add new tagfile method tagRead8vDup which reads an unsigned byte array of unknown
length, allocates a memory buffer for it, and returns it. Not recommended for
general usage.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3193 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 14:57:22 +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
Freddie Witherden f2c631b76c Remove multistruct.c debug print-lines.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3191 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 14:09:33 +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
Per Inge Mathisen fae5745233 Remove unused function pie_DrawImageFileID. Rename pie_SetColourKeyedBlack to
pie_SetAlphaTest, and do not enable it while drawing the ordinary terrain.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3189 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 01:05:37 +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
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