Commit Graph

1902 Commits (beb24f3d10b9b67e59a2d2b4e2cb1e20dcea6aa7)

Author SHA1 Message Date
Giel van Schijndel beb24f3d10 * Replace macro function CLIP_WORLD_OFFMAP with static inline function clip_world_offmap
* Add a Doxygen header to this function

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2487 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 15:11:58 +00:00
Dennis Schridde 930396af83 Remove no longer needed m4 macros. Depends on r2485!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2486 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 13:46:46 +00:00
Dennis Schridde 4c2954bdd4 - Require Ogg/Vorbis. If you rely on Warzone having no sound support please report back!
- Use pkgconfig where possible (sdl, png, ogg/vorbis). Removes m4 file dependencies, tests are faster. If this is a problem for you: Tell me!
- Check against SDL_net using AC_CHECK_* instead of custom m4 macro. Before not much more was tested anyway.
- Enormously simplify OpenGL/OpenAL checks. Functionality should be the same. More diverse error messages. pkgconfig-style LIBS definition.
- Define DATADIR/LOCALEDIR via config.h instead of via CFLAGS. Should move them into dependency checks.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2485 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 13:34:23 +00:00
Dennis Schridde 087c433997 Bump pofiles.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2484 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 13:22:21 +00:00
Roman C fa7866beba Fixed actionCalcPullBackPoint() that was generating off-map coords. Used to be one of the reasons for the "fpathRoute: target coords off map" assert in fpathRoute().
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2483 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-27 13:00:38 +00:00
Roman C 6daca4513a Fixed a C99-style for loop.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2482 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-27 12:23:23 +00:00
Giel van Schijndel 97192c00cb * Fix wrong indentation style used in r2480
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2481 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:57:06 +00:00
Giel van Schijndel a8bfacf6ed * Rename iV_DrawText to iV_DrawTextRotated and create a static inline function iV_DrawText which calls iV_DrawTextRotated with rotation=0.f
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2480 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:40:56 +00:00
Giel van Schijndel 1d877d50cd * Mark some strings for translation by GNU Gettext
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2479 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:21:18 +00:00
Giel van Schijndel f2ed173848 * Get rid of some duplication in string declaration (difference between DEBUG and Non-DEBUG builds); use preprocessor string concatenation instead
* Don't use a magic number (-1), but a named value instead: PIE_TEXT_WHITE

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2478 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 20:19:55 +00:00
Giel van Schijndel 470ea85417 * Remove lib/framework/utf8.c[ch] as we don't need it just right now (we can always revert this commit later on if necessary)
* This commit removes utf8.[ch] from all build systems (manual text-editing for the most of them)
 * For the removal from the XCode project I just reverted r2288

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2477 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 19:46:10 +00:00
Giel van Schijndel d57ffdccd6 * Fix rather annoying different indentation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2476 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 19:13:37 +00:00
Giel van Schijndel aaf2a42747 * Synchronize raw Makefile system with changes to NSIS file in r2466
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2475 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 16:11:24 +00:00
Roman C de47062749 Updated ChangeLog.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2474 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 13:48:32 +00:00
Roman C ab81e57255 Fixed bug #8690, patch by Pallas.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2473 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 13:33:45 +00:00
Per Inge Mathisen a590c7e36d Fix one-off counting error in assert checking of droid lists.
Patch and bug report by Martin Koller.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2472 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-24 21:04:44 +00:00
Giel van Schijndel f99cd3e326 * Fix Code::Blocks object output directories
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2471 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-24 19:34:03 +00:00
Giel van Schijndel 244842406c * Add dual platform support to Code::Blocks project file (now supports both Linux and Windows, requires a rather recent version of Code::Blocks though)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2470 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-24 19:16:58 +00:00
Giel van Schijndel 33b5764611 * Rename winmain.h to main.h since all it's forward declarations refer to main.c and having nothing whatsoever to do with MSWin
* Remove forward declaration of "BOOL frontendInitialised" since it is nowhere defined

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2469 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-24 18:16:10 +00:00
Giel van Schijndel ebe882625f * Fix doxygen comment
* Fix indentation

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2468 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-23 21:43:57 +00:00
Dennis Schridde f9713037a6 Patch tr-de-t9n-r2448-v2.diff submited by Thomas Rösner in patch #795.
Parts were rejected by GNU patch and have to reviewed again.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2467 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-23 17:29:34 +00:00
Dennis Schridde 48b785df17 - Use more defines in nsis script
- Actually define the used defines
- Fix uninstall order
- Fix nls file references


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2466 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-22 21:47:22 +00:00
Dennis Schridde cab88a8a7d - Make "make -C data data" recursively build mods as well. SUBDIRS is apparently ignored for target!=all.
- Add ABOUT-NLS, which is apparently required by gettext. (Copied from gettext-0.16.1)
- Update po


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2465 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-22 11:45:49 +00:00
Dennis Schridde dba5fa6408 More formating and structural parts from Freddie's netprimitives14.patch
- Addition by me: Add NET_ORDER_SUBTYPE enum, which stores the targettype of movement orders and turn associated checks into switches for safety. (Original code had hardcoded numbers and if chains.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2464 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-22 01:15:40 +00:00
Dennis Schridde 47dc79ee1e Formating to match EvilGuru's current version. (14)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2463 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-21 20:43:15 +00:00
Per Inge Mathisen 35df577a0e Add two new cheat codes: "more power" gives you 1000 power, and
"superpower" gives you a very large number of power.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2462 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-20 17:12:02 +00:00
Per Inge Mathisen 46a9f57922 Fix canvas offset of grim mod terrain textures, so that they can be properly
opened in the gimp program.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2461 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-16 17:26:11 +00:00
Dennis Schridde 6627ecbc6a Fix "incompatible declarations" found by batched compiling.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2460 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-16 14:05:01 +00:00
Giel van Schijndel 9db9ca51ea * Add Doxygen comments to lib/framework/strnlen1.h
* Fix some errors in lib/framework/utf8.h comments


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2459 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-15 23:37:32 +00:00
Dennis Schridde 31a5f63fa2 - Remove "PROTOCOL" screen for "Host Game" (only option was "Internet").
- Turn "PROTOCOL" screen into a selection of "Lobby" vs. "IP", with "IP" behaving like the original "Internet" option and "Lobby" proceeding directly to the Lobbyserver.
Tested and approved working by Kreuvf.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2457 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-10 13:48:44 +00:00
Dennis Schridde fd1836d235 Rename protocol "Internet" to "Network" as per Kreuvfs request. http://forums.wz2100.net/index.php?topic=978.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2455 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-10 10:05:52 +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
Dennis Schridde ce19900dbe Watermelon is Carl Hee.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2450 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-30 22:28:34 +00:00
Dennis Schridde c8e5568fbd Add EvilGuru to the authors file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2449 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-30 22:13:55 +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
Roman C e80301537f Allow scripts to set DORDER_DROIDREPAIR order to make repair droids repair some droid.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2440 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-26 11:53:20 +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
Per Inge Mathisen 5088fc3a96 Revert previous patch - turns out zero padding is necessary after all.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2438 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-25 22:33:14 +00:00
Per Inge Mathisen e26e734113 No longer make unnecessary assumptions about leading zeroes in tile filename suffixes
of tile files, not just the tile directories.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2437 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-25 22:23:44 +00:00
Per Inge Mathisen 1c4026134b Fix border artifacts when zooming very close to terrain by turning off linear
magnification filtering and removing the 1 pixel texture coordiante border hack.
This should leave us with a good working (hopefully) baseline from which we can
test various improvements.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2436 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-25 21:53:04 +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